summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeL10n.txt6
-rw-r--r--CMakeLists.txt25
-rw-r--r--ConfigureChecks.cmake134
-rw-r--r--MAINTAINERS2
-rw-r--r--Mainpage.dox3
-rw-r--r--Makefile.am.in3
-rw-r--r--README1
-rw-r--r--README.Kolab5
m---------admin0
-rw-r--r--akregator/HACKING32
-rw-r--r--akregator/src/actionmanagerimpl.cpp128
-rw-r--r--akregator/src/actionmanagerimpl.h2
-rw-r--r--akregator/src/addfeeddialog.cpp14
-rw-r--r--akregator/src/addfeeddialog.h4
-rw-r--r--akregator/src/akregator_part.cpp32
-rw-r--r--akregator/src/akregator_part.h4
-rw-r--r--akregator/src/akregator_run.cpp2
-rw-r--r--akregator/src/akregator_run.h2
-rw-r--r--akregator/src/akregator_view.cpp108
-rw-r--r--akregator/src/akregator_view.h2
-rw-r--r--akregator/src/articlelistview.cpp28
-rw-r--r--akregator/src/articlelistview.h2
-rw-r--r--akregator/src/articleviewer.cpp34
-rw-r--r--akregator/src/articleviewer.h2
-rw-r--r--akregator/src/configdialog.h2
-rw-r--r--akregator/src/feed.cpp6
-rw-r--r--akregator/src/feed.h2
-rw-r--r--akregator/src/feediconmanager.cpp4
-rw-r--r--akregator/src/feediconmanager.h2
-rw-r--r--akregator/src/feedlist.h2
-rw-r--r--akregator/src/feedlistview.cpp58
-rw-r--r--akregator/src/feedlistview.h4
-rw-r--r--akregator/src/fetchqueue.cpp16
-rw-r--r--akregator/src/fetchqueue.h2
-rw-r--r--akregator/src/folder.cpp20
-rw-r--r--akregator/src/folder.h2
-rw-r--r--akregator/src/frame.cpp24
-rw-r--r--akregator/src/frame.h2
-rw-r--r--akregator/src/librss/image.cpp6
-rw-r--r--akregator/src/librss/image.h2
-rw-r--r--akregator/src/librss/loader.cpp26
-rw-r--r--akregator/src/librss/loader.h12
-rw-r--r--akregator/src/librss/testlibrss.cpp4
-rw-r--r--akregator/src/librss/testlibrss.h2
-rw-r--r--akregator/src/listtabwidget.cpp8
-rw-r--r--akregator/src/listtabwidget.h2
-rw-r--r--akregator/src/mainwindow.cpp26
-rw-r--r--akregator/src/mainwindow.h4
-rw-r--r--akregator/src/mk4storage/mk4confwidget.cpp2
-rw-r--r--akregator/src/mk4storage/mk4confwidget.h2
-rw-r--r--akregator/src/mk4storage/mk4confwidgetbase.ui6
-rw-r--r--akregator/src/mk4storage/storagemk4impl.cpp2
-rw-r--r--akregator/src/mk4storage/storagemk4impl.h2
-rw-r--r--akregator/src/nodelist.cpp16
-rw-r--r--akregator/src/nodelist.h2
-rw-r--r--akregator/src/notificationmanager.cpp4
-rw-r--r--akregator/src/notificationmanager.h2
-rw-r--r--akregator/src/pageviewer.cpp46
-rw-r--r--akregator/src/pageviewer.h2
-rw-r--r--akregator/src/progressmanager.cpp22
-rw-r--r--akregator/src/progressmanager.h4
-rw-r--r--akregator/src/propertiesdialog.cpp2
-rw-r--r--akregator/src/propertiesdialog.h4
-rw-r--r--akregator/src/propertieswidgetbase.ui4
-rw-r--r--akregator/src/searchbar.cpp14
-rw-r--r--akregator/src/searchbar.h2
-rw-r--r--akregator/src/settings_advanced.cpp4
-rw-r--r--akregator/src/settings_advanced.h2
-rw-r--r--akregator/src/simplenodeselector.cpp8
-rw-r--r--akregator/src/simplenodeselector.h4
-rw-r--r--akregator/src/speechclient.h2
-rw-r--r--akregator/src/storagedummyimpl.h2
-rw-r--r--akregator/src/tabwidget.cpp14
-rw-r--r--akregator/src/tabwidget.h2
-rw-r--r--akregator/src/tagaction.cpp6
-rw-r--r--akregator/src/tagaction.h2
-rw-r--r--akregator/src/tagnode.cpp8
-rw-r--r--akregator/src/tagnode.h2
-rw-r--r--akregator/src/tagnodelist.cpp6
-rw-r--r--akregator/src/tagnodelist.h2
-rw-r--r--akregator/src/tagpropertiesdialog.cpp2
-rw-r--r--akregator/src/tagpropertiesdialog.h2
-rw-r--r--akregator/src/tagset.h2
-rw-r--r--akregator/src/trayicon.cpp4
-rw-r--r--akregator/src/trayicon.h2
-rw-r--r--akregator/src/treenode.h2
-rw-r--r--akregator/src/viewer.cpp38
-rw-r--r--akregator/src/viewer.h2
-rw-r--r--certmanager/certificateinfowidgetimpl.cpp50
-rw-r--r--certmanager/certificateinfowidgetimpl.h2
-rw-r--r--certmanager/certificatewizard.ui4
-rw-r--r--certmanager/certificatewizardimpl.cpp26
-rw-r--r--certmanager/certificatewizardimpl.h2
-rw-r--r--certmanager/certlistview.h2
-rw-r--r--certmanager/certmanager.cpp176
-rw-r--r--certmanager/certmanager.h2
-rw-r--r--certmanager/conf/appearanceconfigpage.cpp2
-rw-r--r--certmanager/conf/appearanceconfigpage.h2
-rw-r--r--certmanager/conf/appearanceconfigwidget.h2
-rw-r--r--certmanager/conf/appearanceconfigwidgetbase.ui4
-rw-r--r--certmanager/conf/configuredialog.h2
-rw-r--r--certmanager/conf/dirservconfigpage.cpp8
-rw-r--r--certmanager/conf/dirservconfigpage.h2
-rw-r--r--certmanager/conf/dnorderconfigpage.cpp2
-rw-r--r--certmanager/conf/dnorderconfigpage.h2
-rw-r--r--certmanager/crlview.cpp18
-rw-r--r--certmanager/crlview.h2
-rw-r--r--certmanager/customactions.cpp10
-rw-r--r--certmanager/customactions.h6
-rw-r--r--certmanager/hierarchyanalyser.h2
-rw-r--r--certmanager/kwatchgnupg/kwatchgnupgconfig.cpp16
-rw-r--r--certmanager/kwatchgnupg/kwatchgnupgconfig.h2
-rw-r--r--certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp56
-rw-r--r--certmanager/kwatchgnupg/kwatchgnupgmainwin.h2
-rw-r--r--certmanager/kwatchgnupg/tray.h2
-rw-r--r--certmanager/lib/backends/chiasmus/chiasmusbackend.cpp2
-rw-r--r--certmanager/lib/backends/chiasmus/chiasmusjob.cpp6
-rw-r--r--certmanager/lib/backends/chiasmus/chiasmusjob.h2
-rw-r--r--certmanager/lib/backends/chiasmus/obtainkeysjob.cpp4
-rw-r--r--certmanager/lib/backends/chiasmus/obtainkeysjob.h2
-rw-r--r--certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp10
-rw-r--r--certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h2
-rw-r--r--certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp2
-rw-r--r--certmanager/lib/backends/kpgp/kpgpkeylistjob.h2
-rw-r--r--certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp2
-rw-r--r--certmanager/lib/backends/qgpgme/gnupgprocessbase.h2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp8
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h4
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmedeletejob.h2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmeexportjob.h2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmeimportjob.h2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmejob.cpp8
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp6
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp12
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp16
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmesignjob.h2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h2
-rw-r--r--certmanager/lib/cryptplug.cpp4
-rw-r--r--certmanager/lib/cryptplugfactory.h2
-rw-r--r--certmanager/lib/kleo/cryptobackendfactory.h2
-rw-r--r--certmanager/lib/kleo/decryptjob.h2
-rw-r--r--certmanager/lib/kleo/decryptverifyjob.h2
-rw-r--r--certmanager/lib/kleo/deletejob.h2
-rw-r--r--certmanager/lib/kleo/downloadjob.h2
-rw-r--r--certmanager/lib/kleo/encryptjob.h2
-rw-r--r--certmanager/lib/kleo/exportjob.h2
-rw-r--r--certmanager/lib/kleo/hierarchicalkeylistjob.cpp4
-rw-r--r--certmanager/lib/kleo/hierarchicalkeylistjob.h2
-rw-r--r--certmanager/lib/kleo/importjob.h2
-rw-r--r--certmanager/lib/kleo/job.cpp2
-rw-r--r--certmanager/lib/kleo/job.h2
-rw-r--r--certmanager/lib/kleo/keyfiltermanager.cpp2
-rw-r--r--certmanager/lib/kleo/keyfiltermanager.h2
-rw-r--r--certmanager/lib/kleo/keygenerationjob.h2
-rw-r--r--certmanager/lib/kleo/keylistjob.h2
-rw-r--r--certmanager/lib/kleo/multideletejob.cpp2
-rw-r--r--certmanager/lib/kleo/multideletejob.h2
-rw-r--r--certmanager/lib/kleo/refreshkeysjob.h2
-rw-r--r--certmanager/lib/kleo/signencryptjob.h2
-rw-r--r--certmanager/lib/kleo/signjob.h2
-rw-r--r--certmanager/lib/kleo/specialjob.h2
-rw-r--r--certmanager/lib/kleo/verifydetachedjob.h2
-rw-r--r--certmanager/lib/kleo/verifyopaquejob.h2
-rw-r--r--certmanager/lib/tests/gnupgviewer.h2
-rw-r--r--certmanager/lib/tests/test_gnupgprocessbase.cpp16
-rw-r--r--certmanager/lib/tests/test_jobs.cpp4
-rw-r--r--certmanager/lib/tests/test_keygen.cpp6
-rw-r--r--certmanager/lib/tests/test_keygen.h2
-rw-r--r--certmanager/lib/tests/test_keylister.cpp10
-rw-r--r--certmanager/lib/tests/test_keylister.h2
-rw-r--r--certmanager/lib/ui/adddirectoryservicedialogimpl.cpp2
-rw-r--r--certmanager/lib/ui/adddirectoryservicedialogimpl.h2
-rw-r--r--certmanager/lib/ui/backendconfigwidget.cpp14
-rw-r--r--certmanager/lib/ui/backendconfigwidget.h2
-rw-r--r--certmanager/lib/ui/cryptoconfigdialog.cpp2
-rw-r--r--certmanager/lib/ui/cryptoconfigdialog.h2
-rw-r--r--certmanager/lib/ui/cryptoconfigmodule.cpp18
-rw-r--r--certmanager/lib/ui/cryptoconfigmodule.h2
-rw-r--r--certmanager/lib/ui/cryptoconfigmodule_p.h20
-rw-r--r--certmanager/lib/ui/directoryserviceswidget.h2
-rw-r--r--certmanager/lib/ui/directoryserviceswidgetbase.ui4
-rw-r--r--certmanager/lib/ui/dnattributeorderconfigwidget.cpp22
-rw-r--r--certmanager/lib/ui/dnattributeorderconfigwidget.h2
-rw-r--r--certmanager/lib/ui/kdhorizontalline.h2
-rw-r--r--certmanager/lib/ui/keyapprovaldialog.cpp4
-rw-r--r--certmanager/lib/ui/keyapprovaldialog.h2
-rw-r--r--certmanager/lib/ui/keylistview.cpp18
-rw-r--r--certmanager/lib/ui/keylistview.h2
-rw-r--r--certmanager/lib/ui/keyrequester.cpp20
-rw-r--r--certmanager/lib/ui/keyrequester.h6
-rw-r--r--certmanager/lib/ui/keyselectiondialog.cpp58
-rw-r--r--certmanager/lib/ui/keyselectiondialog.h2
-rw-r--r--certmanager/lib/ui/messagebox.cpp2
-rw-r--r--certmanager/lib/ui/passphrasedialog.cpp2
-rw-r--r--certmanager/lib/ui/passphrasedialog.h2
-rw-r--r--certmanager/lib/ui/progressbar.cpp2
-rw-r--r--certmanager/lib/ui/progressbar.h2
-rw-r--r--certmanager/lib/ui/progressdialog.cpp14
-rw-r--r--certmanager/lib/ui/progressdialog.h2
-rw-r--r--certmanager/storedtransferjob.cpp8
-rw-r--r--certmanager/storedtransferjob.h2
-rw-r--r--dependency-graph.dot2
-rw-r--r--doc/api/Doxyfile.pim2
-rw-r--r--doc/kalarm/index.docbook154
-rw-r--r--doc/karm/index.docbook12
-rw-r--r--doc/kontact/index.docbook9
-rw-r--r--indexlib/boost-compat/config/compiler/gcc.h4
-rw-r--r--indexlib/boost-compat/config/stdlib/roguewave.h1
-rw-r--r--indexlib/boost-compat/scoped_ptr.h9
-rw-r--r--indexlib/boost-compat/shared_ptr.h33
-rw-r--r--indexlib/compressed.cpp2
-rw-r--r--indexlib/create.cpp22
-rw-r--r--indexlib/create.h4
-rw-r--r--indexlib/ifile.cpp10
-rw-r--r--indexlib/ifile.h8
-rw-r--r--indexlib/index.h4
-rw-r--r--indexlib/leafdatavector.cpp2
-rw-r--r--indexlib/main.cpp6
-rw-r--r--indexlib/mempool.h6
-rw-r--r--indexlib/mempool.tcc4
-rw-r--r--indexlib/quotes.cpp6
-rw-r--r--indexlib/quotes.h2
-rw-r--r--indexlib/result.h4
-rw-r--r--indexlib/tests/create-test.cpp4
-rw-r--r--indexlib/tests/mempool-test.cpp4
-rw-r--r--indexlib/tests/tokenizer-test.cpp12
-rw-r--r--indexlib/tokenizer.cpp6
-rw-r--r--indexlib/tokenizer.h2
-rw-r--r--kaddressbook/addresseditwidget.cpp36
-rw-r--r--kaddressbook/addresseditwidget.h4
-rw-r--r--kaddressbook/addresseeeditorbase.h2
-rw-r--r--kaddressbook/addresseeeditordialog.cpp2
-rw-r--r--kaddressbook/addresseeeditordialog.h2
-rw-r--r--kaddressbook/addresseeeditorextension.cpp2
-rw-r--r--kaddressbook/addresseeeditorextension.h2
-rw-r--r--kaddressbook/addresseeeditorwidget.cpp112
-rw-r--r--kaddressbook/addresseeeditorwidget.h2
-rw-r--r--kaddressbook/addviewdialog.cpp8
-rw-r--r--kaddressbook/addviewdialog.h2
-rw-r--r--kaddressbook/advancedcustomfields.cpp2
-rw-r--r--kaddressbook/advancedcustomfields.h2
-rw-r--r--kaddressbook/common/locationmap.h2
-rw-r--r--kaddressbook/contacteditorwidgetmanager.cpp4
-rw-r--r--kaddressbook/contacteditorwidgetmanager.h4
-rw-r--r--kaddressbook/customfieldswidget.cpp108
-rw-r--r--kaddressbook/customfieldswidget.h6
-rw-r--r--kaddressbook/distributionlisteditor.cpp18
-rw-r--r--kaddressbook/distributionlisteditor.h2
-rw-r--r--kaddressbook/distributionlisteditor_p.h4
-rw-r--r--kaddressbook/distributionlistentryview.cpp8
-rw-r--r--kaddressbook/distributionlistentryview.h2
-rw-r--r--kaddressbook/distributionlistpicker.cpp8
-rw-r--r--kaddressbook/distributionlistpicker.h2
-rw-r--r--kaddressbook/editors/cryptowidget.cpp14
-rw-r--r--kaddressbook/editors/cryptowidget.h2
-rw-r--r--kaddressbook/editors/imaddressbase.ui4
-rw-r--r--kaddressbook/editors/imaddresswidget.cpp8
-rw-r--r--kaddressbook/editors/imaddresswidget.h2
-rw-r--r--kaddressbook/editors/imeditorwidget.cpp22
-rw-r--r--kaddressbook/editors/imeditorwidget.h2
-rw-r--r--kaddressbook/emaileditwidget.cpp26
-rw-r--r--kaddressbook/emaileditwidget.h4
-rw-r--r--kaddressbook/extensionmanager.cpp26
-rw-r--r--kaddressbook/extensionmanager.h2
-rw-r--r--kaddressbook/features/distributionlistngwidget.cpp40
-rw-r--r--kaddressbook/features/distributionlistngwidget.h4
-rw-r--r--kaddressbook/features/distributionlistwidget.cpp34
-rw-r--r--kaddressbook/features/distributionlistwidget.h4
-rw-r--r--kaddressbook/features/resourceselection.cpp46
-rw-r--r--kaddressbook/features/resourceselection.h2
-rw-r--r--kaddressbook/filtereditdialog.cpp22
-rw-r--r--kaddressbook/filtereditdialog.h4
-rw-r--r--kaddressbook/filterselectionwidget.cpp4
-rw-r--r--kaddressbook/filterselectionwidget.h2
-rw-r--r--kaddressbook/freebusywidget.cpp4
-rw-r--r--kaddressbook/freebusywidget.h2
-rw-r--r--kaddressbook/geowidget.cpp72
-rw-r--r--kaddressbook/geowidget.h6
-rw-r--r--kaddressbook/imagewidget.cpp14
-rw-r--r--kaddressbook/imagewidget.h6
-rw-r--r--kaddressbook/imeditwidget.cpp10
-rw-r--r--kaddressbook/imeditwidget.h2
-rw-r--r--kaddressbook/incsearchwidget.cpp24
-rw-r--r--kaddressbook/incsearchwidget.h2
-rw-r--r--kaddressbook/interfaces/contacteditorwidget.h2
-rw-r--r--kaddressbook/interfaces/core.h14
-rw-r--r--kaddressbook/interfaces/extensionwidget.h2
-rw-r--r--kaddressbook/interfaces/xxport.cpp12
-rw-r--r--kaddressbook/interfaces/xxport.h2
-rw-r--r--kaddressbook/jumpbuttonbar.cpp10
-rw-r--r--kaddressbook/jumpbuttonbar.h2
-rw-r--r--kaddressbook/kabcore.cpp200
-rw-r--r--kaddressbook/kabcore.h16
-rw-r--r--kaddressbook/kaddressbook_part.cpp2
-rw-r--r--kaddressbook/kaddressbook_part.h2
-rw-r--r--kaddressbook/kaddressbookmain.cpp10
-rw-r--r--kaddressbook/kaddressbookmain.h2
-rw-r--r--kaddressbook/kaddressbookview.cpp4
-rw-r--r--kaddressbook/kaddressbookview.h2
-rw-r--r--kaddressbook/kcmconfigs/addhostdialog.h2
-rw-r--r--kaddressbook/kcmconfigs/addresseewidget.cpp22
-rw-r--r--kaddressbook/kcmconfigs/addresseewidget.h4
-rw-r--r--kaddressbook/kcmconfigs/extensionconfigdialog.h2
-rw-r--r--kaddressbook/kcmconfigs/kabconfigwidget.cpp26
-rw-r--r--kaddressbook/kcmconfigs/kabconfigwidget.h2
-rw-r--r--kaddressbook/kcmconfigs/kcmkabconfig.cpp2
-rw-r--r--kaddressbook/kcmconfigs/kcmkabconfig.h2
-rw-r--r--kaddressbook/kcmconfigs/kcmkabldapconfig.cpp2
-rw-r--r--kaddressbook/kcmconfigs/kcmkabldapconfig.h2
-rw-r--r--kaddressbook/kcmconfigs/ldapoptionswidget.cpp22
-rw-r--r--kaddressbook/kcmconfigs/ldapoptionswidget.h2
-rw-r--r--kaddressbook/keywidget.cpp6
-rw-r--r--kaddressbook/keywidget.h2
-rw-r--r--kaddressbook/ldapsearchdialog.cpp46
-rw-r--r--kaddressbook/ldapsearchdialog.h2
-rw-r--r--kaddressbook/nameeditdialog.cpp42
-rw-r--r--kaddressbook/nameeditdialog.h2
-rw-r--r--kaddressbook/phoneeditwidget.cpp26
-rw-r--r--kaddressbook/phoneeditwidget.h8
-rw-r--r--kaddressbook/printing/detailledstyle.h2
-rw-r--r--kaddressbook/printing/mikesstyle.h2
-rw-r--r--kaddressbook/printing/printingwizard.cpp2
-rw-r--r--kaddressbook/printing/printingwizard.h2
-rw-r--r--kaddressbook/printing/printprogress.h2
-rw-r--r--kaddressbook/printing/printstyle.h2
-rw-r--r--kaddressbook/printing/selectionpage.cpp6
-rw-r--r--kaddressbook/printing/selectionpage.h2
-rw-r--r--kaddressbook/printing/stylepage.cpp6
-rw-r--r--kaddressbook/printing/stylepage.h2
-rw-r--r--kaddressbook/searchmanager.h2
-rw-r--r--kaddressbook/secrecywidget.cpp4
-rw-r--r--kaddressbook/secrecywidget.h2
-rw-r--r--kaddressbook/simpleaddresseeeditor.cpp8
-rw-r--r--kaddressbook/simpleaddresseeeditor.h2
-rw-r--r--kaddressbook/soundwidget.cpp28
-rw-r--r--kaddressbook/soundwidget.h2
-rw-r--r--kaddressbook/viewconfigurefieldspage.cpp16
-rw-r--r--kaddressbook/viewconfigurefieldspage.h2
-rw-r--r--kaddressbook/viewconfigurefilterpage.cpp2
-rw-r--r--kaddressbook/viewconfigurefilterpage.h2
-rw-r--r--kaddressbook/viewconfigurewidget.h4
-rw-r--r--kaddressbook/viewmanager.cpp40
-rw-r--r--kaddressbook/viewmanager.h2
-rw-r--r--kaddressbook/views/cardview.cpp16
-rw-r--r--kaddressbook/views/cardview.h2
-rw-r--r--kaddressbook/views/colorlistbox.cpp2
-rw-r--r--kaddressbook/views/colorlistbox.h2
-rw-r--r--kaddressbook/views/configurecardviewdialog.cpp12
-rw-r--r--kaddressbook/views/configurecardviewdialog.h2
-rw-r--r--kaddressbook/views/configuretableviewdialog.cpp6
-rw-r--r--kaddressbook/views/configuretableviewdialog.h2
-rw-r--r--kaddressbook/views/contactlistview.cpp6
-rw-r--r--kaddressbook/views/contactlistview.h2
-rw-r--r--kaddressbook/views/kaddressbookcardview.cpp56
-rw-r--r--kaddressbook/views/kaddressbookcardview.h4
-rw-r--r--kaddressbook/views/kaddressbookiconview.cpp36
-rw-r--r--kaddressbook/views/kaddressbookiconview.h4
-rw-r--r--kaddressbook/views/kaddressbooktableview.cpp56
-rw-r--r--kaddressbook/views/kaddressbooktableview.h2
-rw-r--r--kaddressbook/xxport/bookmark_xxport.h2
-rw-r--r--kaddressbook/xxport/csv_xxport.h2
-rw-r--r--kaddressbook/xxport/csvimportdialog.cpp56
-rw-r--r--kaddressbook/xxport/csvimportdialog.h2
-rw-r--r--kaddressbook/xxport/eudora_xxport.h2
-rw-r--r--kaddressbook/xxport/gnokii_xxport.h2
-rw-r--r--kaddressbook/xxport/kde2_xxport.h2
-rw-r--r--kaddressbook/xxport/ldif_xxport.h2
-rw-r--r--kaddressbook/xxport/opera_xxport.h2
-rw-r--r--kaddressbook/xxport/pab_xxport.h2
-rw-r--r--kaddressbook/xxport/vcard_xxport.h2
-rw-r--r--kaddressbook/xxportmanager.cpp8
-rw-r--r--kaddressbook/xxportmanager.h2
-rw-r--r--kaddressbook/xxportselectdialog.cpp12
-rw-r--r--kaddressbook/xxportselectdialog.h2
-rw-r--r--kalarm/alarmcalendar.cpp2
-rw-r--r--kalarm/alarmcalendar.h2
-rw-r--r--kalarm/alarmlistview.cpp2
-rw-r--r--kalarm/alarmlistview.h2
-rw-r--r--kalarm/alarmtimewidget.cpp12
-rw-r--r--kalarm/alarmtimewidget.h2
-rw-r--r--kalarm/birthdaydlg.cpp16
-rw-r--r--kalarm/birthdaydlg.h6
-rw-r--r--kalarm/daemon.cpp16
-rw-r--r--kalarm/daemon.h4
-rw-r--r--kalarm/dcophandler.cpp10
-rw-r--r--kalarm/deferdlg.cpp2
-rw-r--r--kalarm/deferdlg.h2
-rw-r--r--kalarm/editdlg.cpp28
-rw-r--r--kalarm/editdlg.h2
-rw-r--r--kalarm/editdlgprivate.h4
-rw-r--r--kalarm/emailidcombo.cpp2
-rw-r--r--kalarm/emailidcombo.h2
-rw-r--r--kalarm/eventlistviewbase.cpp2
-rw-r--r--kalarm/eventlistviewbase.h2
-rw-r--r--kalarm/find.cpp6
-rw-r--r--kalarm/find.h2
-rw-r--r--kalarm/fontcolour.cpp10
-rw-r--r--kalarm/fontcolour.h2
-rw-r--r--kalarm/fontcolourbutton.cpp2
-rw-r--r--kalarm/fontcolourbutton.h4
-rw-r--r--kalarm/functions.cpp4
-rw-r--r--kalarm/kalarmapp.cpp26
-rw-r--r--kalarm/kalarmapp.h2
-rw-r--r--kalarm/kalarmd/adapp.h2
-rw-r--r--kalarm/kalarmd/adcalendar.cpp2
-rw-r--r--kalarm/kalarmd/adcalendar.h2
-rw-r--r--kalarm/kalarmd/alarmdaemon.cpp6
-rw-r--r--kalarm/kalarmd/alarmdaemon.h2
-rw-r--r--kalarm/kamail.cpp2
-rw-r--r--kalarm/latecancel.cpp4
-rw-r--r--kalarm/latecancel.h2
-rw-r--r--kalarm/lib/buttongroup.cpp14
-rw-r--r--kalarm/lib/buttongroup.h6
-rw-r--r--kalarm/lib/checkbox.cpp10
-rw-r--r--kalarm/lib/checkbox.h4
-rw-r--r--kalarm/lib/colourcombo.cpp8
-rw-r--r--kalarm/lib/colourcombo.h2
-rw-r--r--kalarm/lib/combobox.cpp2
-rw-r--r--kalarm/lib/combobox.h2
-rw-r--r--kalarm/lib/dateedit.cpp4
-rw-r--r--kalarm/lib/dateedit.h2
-rw-r--r--kalarm/lib/datetime.h2
-rw-r--r--kalarm/lib/label.cpp10
-rw-r--r--kalarm/lib/label.h4
-rw-r--r--kalarm/lib/lineedit.h2
-rw-r--r--kalarm/lib/pushbutton.cpp6
-rw-r--r--kalarm/lib/pushbutton.h4
-rw-r--r--kalarm/lib/radiobutton.cpp10
-rw-r--r--kalarm/lib/radiobutton.h4
-rw-r--r--kalarm/lib/shellprocess.cpp4
-rw-r--r--kalarm/lib/shellprocess.h2
-rw-r--r--kalarm/lib/slider.cpp6
-rw-r--r--kalarm/lib/slider.h6
-rw-r--r--kalarm/lib/spinbox.cpp14
-rw-r--r--kalarm/lib/spinbox.h2
-rw-r--r--kalarm/lib/spinbox2.cpp22
-rw-r--r--kalarm/lib/spinbox2.h2
-rw-r--r--kalarm/lib/spinbox2private.h4
-rw-r--r--kalarm/lib/synchtimer.cpp4
-rw-r--r--kalarm/lib/synchtimer.h6
-rw-r--r--kalarm/lib/timeedit.cpp4
-rw-r--r--kalarm/lib/timeedit.h2
-rw-r--r--kalarm/lib/timeperiod.cpp6
-rw-r--r--kalarm/lib/timeperiod.h2
-rw-r--r--kalarm/lib/timespinbox.cpp4
-rw-r--r--kalarm/lib/timespinbox.h2
-rw-r--r--kalarm/mainwindow.cpp106
-rw-r--r--kalarm/mainwindow.h2
-rw-r--r--kalarm/mainwindowbase.h2
-rw-r--r--kalarm/messagewin.cpp48
-rw-r--r--kalarm/messagewin.h2
-rw-r--r--kalarm/pickfileradio.cpp10
-rw-r--r--kalarm/pickfileradio.h2
-rw-r--r--kalarm/prefdlg.cpp36
-rw-r--r--kalarm/prefdlg.h14
-rw-r--r--kalarm/preferences.h2
-rw-r--r--kalarm/recurrenceedit.cpp44
-rw-r--r--kalarm/recurrenceedit.h2
-rw-r--r--kalarm/recurrenceeditprivate.h10
-rw-r--r--kalarm/reminder.cpp2
-rw-r--r--kalarm/reminder.h2
-rw-r--r--kalarm/repetition.cpp12
-rw-r--r--kalarm/repetition.h4
-rw-r--r--kalarm/sounddlg.cpp16
-rw-r--r--kalarm/sounddlg.h2
-rw-r--r--kalarm/soundpicker.cpp4
-rw-r--r--kalarm/soundpicker.h2
-rw-r--r--kalarm/specialactions.cpp2
-rw-r--r--kalarm/specialactions.h6
-rw-r--r--kalarm/startdaytimer.cpp2
-rw-r--r--kalarm/startdaytimer.h2
-rw-r--r--kalarm/templatedlg.cpp14
-rw-r--r--kalarm/templatedlg.h2
-rw-r--r--kalarm/templatelistview.h2
-rw-r--r--kalarm/templatemenuaction.cpp6
-rw-r--r--kalarm/templatemenuaction.h2
-rw-r--r--kalarm/templatepickdlg.cpp4
-rw-r--r--kalarm/templatepickdlg.h2
-rw-r--r--kalarm/timeselector.cpp4
-rw-r--r--kalarm/timeselector.h2
-rw-r--r--kalarm/traywindow.cpp16
-rw-r--r--kalarm/traywindow.h2
-rw-r--r--kalarm/undo.cpp2
-rw-r--r--kalarm/undo.h2
-rw-r--r--kandy/src/cmdpropertiesdialog.h2
-rw-r--r--kandy/src/cmdpropertiesdialog_base.ui4
-rw-r--r--kandy/src/commandscheduler.cpp4
-rw-r--r--kandy/src/commandscheduler.h2
-rw-r--r--kandy/src/kandy.cpp36
-rw-r--r--kandy/src/kandy.h2
-rw-r--r--kandy/src/kandyprefsdialog.cpp108
-rw-r--r--kandy/src/kandyprefsdialog.h2
-rw-r--r--kandy/src/kandyview.cpp32
-rw-r--r--kandy/src/kandyview.h2
-rw-r--r--kandy/src/main.cpp24
-rw-r--r--kandy/src/mobilegui.cpp8
-rw-r--r--kandy/src/mobilegui.h2
-rw-r--r--kandy/src/mobilegui_base.ui4
-rw-r--r--kandy/src/mobilemain.cpp20
-rw-r--r--kandy/src/mobilemain.h2
-rw-r--r--kandy/src/modem.cpp8
-rw-r--r--kandy/src/modem.h2
-rw-r--r--karm/TODO2
-rw-r--r--karm/csvexportdialog.h2
-rw-r--r--karm/csvexportdialog_base.ui4
-rw-r--r--karm/desktoptracker.cpp6
-rw-r--r--karm/desktoptracker.h2
-rw-r--r--karm/doc/Mainpage.dox18
-rw-r--r--karm/edittaskdialog.cpp8
-rw-r--r--karm/edittaskdialog.h2
-rw-r--r--karm/idletimedetector.cpp2
-rw-r--r--karm/idletimedetector.h2
-rw-r--r--karm/karm_part.cpp130
-rw-r--r--karm/karm_part.h4
-rw-r--r--karm/karmstorage.cpp4
-rw-r--r--karm/ktimewidget.cpp2
-rw-r--r--karm/mainwindow.cpp126
-rw-r--r--karm/mainwindow.h2
-rw-r--r--karm/preferences.cpp8
-rw-r--r--karm/preferences.h2
-rw-r--r--karm/printdialog.cpp2
-rw-r--r--karm/printdialog.h2
-rw-r--r--karm/task.cpp10
-rw-r--r--karm/task.h2
-rw-r--r--karm/taskview.cpp54
-rw-r--r--karm/taskview.h2
-rw-r--r--karm/tdeaccelmenuwatch.cpp2
-rw-r--r--karm/tdeaccelmenuwatch.h2
-rw-r--r--karm/test/script.cpp16
-rw-r--r--karm/test/script.h2
-rw-r--r--karm/tray.cpp4
-rw-r--r--karm/tray.h2
-rw-r--r--kdgantt/KDGanttMinimizeSplitter.cpp60
-rw-r--r--kdgantt/KDGanttMinimizeSplitter.h28
-rw-r--r--kdgantt/KDGanttSemiSizingControl.cpp26
-rw-r--r--kdgantt/KDGanttSemiSizingControl.h12
-rw-r--r--kdgantt/KDGanttSizingControl.h2
-rw-r--r--kdgantt/KDGanttView.cpp72
-rw-r--r--kdgantt/KDGanttView.h2
-rw-r--r--kdgantt/KDGanttViewItem.cpp12
-rw-r--r--kdgantt/KDGanttViewSubwidgets.cpp148
-rw-r--r--kdgantt/KDGanttViewSubwidgets.h10
-rw-r--r--kdgantt/KDGanttViewTaskLink.cpp4
-rw-r--r--kdgantt/KDGanttXMLTools.cpp100
-rw-r--r--kdgantt/KDGanttXMLTools.h8
-rw-r--r--kdgantt/itemAttributeDialog.ui4
-rw-r--r--kgantt/kgantt/KGantt.cpp4
-rw-r--r--kgantt/kgantt/KGantt.h2
-rw-r--r--kgantt/kgantt/KGanttBarConfig.cpp4
-rw-r--r--kgantt/kgantt/KGanttBarConfig.h2
-rw-r--r--kgantt/kgantt/KGanttItem.cpp8
-rw-r--r--kgantt/kgantt/KGanttItem.h2
-rw-r--r--kgantt/kgantt/KGanttRelation.cpp8
-rw-r--r--kgantt/kgantt/KGanttRelation.h2
-rw-r--r--kgantt/kgantt/xQGanttBarView.cpp12
-rw-r--r--kgantt/kgantt/xQGanttBarView.h2
-rw-r--r--kgantt/kgantt/xQGanttBarViewPort.cpp54
-rw-r--r--kgantt/kgantt/xQGanttBarViewPort.h2
-rw-r--r--kgantt/kgantt/xQGanttBarViewPort_Events.cpp18
-rw-r--r--kgantt/kgantt/xQGanttListView.h2
-rw-r--r--kgantt/kgantt/xQGanttListViewPort.cpp12
-rw-r--r--kgantt/kgantt/xQGanttListViewPort.h4
-rw-r--r--kitchensync/CMakeL10n.txt3
-rw-r--r--kitchensync/CMakeLists.txt23
-rw-r--r--kitchensync/Makefile.am3
-rw-r--r--kitchensync/configure.in.bot8
-rw-r--r--kitchensync/configure.in.in68
-rw-r--r--kitchensync/libqopensync/CMakeLists.txt38
-rw-r--r--kitchensync/libqopensync/ConfigureChecks.cmake22
-rw-r--r--kitchensync/libqopensync/Makefile.am19
-rw-r--r--kitchensync/libqopensync/callbackhandler.cpp191
-rw-r--r--kitchensync/libqopensync/callbackhandler.h91
-rw-r--r--kitchensync/libqopensync/conversion.cpp58
-rw-r--r--kitchensync/libqopensync/conversion.h56
-rw-r--r--kitchensync/libqopensync/engine.cpp67
-rw-r--r--kitchensync/libqopensync/engine.h72
-rw-r--r--kitchensync/libqopensync/environment.cpp172
-rw-r--r--kitchensync/libqopensync/environment.h199
-rw-r--r--kitchensync/libqopensync/filter.cpp55
-rw-r--r--kitchensync/libqopensync/filter.h64
-rw-r--r--kitchensync/libqopensync/group.cpp292
-rw-r--r--kitchensync/libqopensync/group.h217
-rw-r--r--kitchensync/libqopensync/groupenv.cpp121
-rw-r--r--kitchensync/libqopensync/groupenv.h86
-rw-r--r--kitchensync/libqopensync/member.cpp188
-rw-r--r--kitchensync/libqopensync/member.h129
-rw-r--r--kitchensync/libqopensync/plugin.cpp62
-rw-r--r--kitchensync/libqopensync/plugin.h67
-rw-r--r--kitchensync/libqopensync/pluginenv.cpp96
-rw-r--r--kitchensync/libqopensync/pluginenv.h80
-rw-r--r--kitchensync/libqopensync/result.cpp149
-rw-r--r--kitchensync/libqopensync/result.h126
-rw-r--r--kitchensync/libqopensync/syncchange.cpp159
-rw-r--r--kitchensync/libqopensync/syncchange.h116
-rw-r--r--kitchensync/libqopensync/syncmapping.cpp100
-rw-r--r--kitchensync/libqopensync/syncmapping.h59
-rw-r--r--kitchensync/libqopensync/syncupdates.cpp251
-rw-r--r--kitchensync/libqopensync/syncupdates.h157
-rw-r--r--kitchensync/opensyncdbus/Makefile.am10
-rw-r--r--kitchensync/opensyncdbus/README5
-rw-r--r--kitchensync/opensyncdbus/dbusclient.cpp273
-rw-r--r--kitchensync/opensyncdbus/dbusclient.h56
-rw-r--r--kitchensync/src/CMakeL10n.txt9
-rw-r--r--kitchensync/src/CMakeLists.txt77
-rw-r--r--kitchensync/src/Makefile.am53
-rw-r--r--kitchensync/src/about/CMakeLists.txt14
-rw-r--r--kitchensync/src/about/Makefile.am6
-rw-r--r--kitchensync/src/about/kitchensync.css27
-rw-r--r--kitchensync/src/about/main.html65
-rw-r--r--kitchensync/src/about/top-right-kitchensync.pngbin17145 -> 0 bytes
-rw-r--r--kitchensync/src/aboutpage.cpp141
-rw-r--r--kitchensync/src/aboutpage.h46
-rw-r--r--kitchensync/src/addresseediffalgo.cpp157
-rw-r--r--kitchensync/src/addresseediffalgo.h53
-rw-r--r--kitchensync/src/calendardiffalgo.cpp217
-rw-r--r--kitchensync/src/calendardiffalgo.h55
-rw-r--r--kitchensync/src/configgui.cpp135
-rw-r--r--kitchensync/src/configgui.h72
-rw-r--r--kitchensync/src/configguiblank.cpp44
-rw-r--r--kitchensync/src/configguiblank.h35
-rw-r--r--kitchensync/src/configguievo2.cpp91
-rw-r--r--kitchensync/src/configguievo2.h46
-rw-r--r--kitchensync/src/configguifile.cpp81
-rw-r--r--kitchensync/src/configguifile.h42
-rw-r--r--kitchensync/src/configguigcalendar.cpp103
-rw-r--r--kitchensync/src/configguigcalendar.h43
-rw-r--r--kitchensync/src/configguignokii.cpp223
-rw-r--r--kitchensync/src/configguignokii.h63
-rw-r--r--kitchensync/src/configguigpe.cpp103
-rw-r--r--kitchensync/src/configguigpe.h50
-rw-r--r--kitchensync/src/configguiirmc.cpp192
-rw-r--r--kitchensync/src/configguiirmc.h62
-rw-r--r--kitchensync/src/configguijescs.cpp98
-rw-r--r--kitchensync/src/configguijescs.h48
-rw-r--r--kitchensync/src/configguildap.cpp153
-rw-r--r--kitchensync/src/configguildap.h61
-rw-r--r--kitchensync/src/configguimoto.cpp71
-rw-r--r--kitchensync/src/configguimoto.h43
-rw-r--r--kitchensync/src/configguiopie.cpp135
-rw-r--r--kitchensync/src/configguiopie.h47
-rw-r--r--kitchensync/src/configguipalm.cpp200
-rw-r--r--kitchensync/src/configguipalm.h59
-rw-r--r--kitchensync/src/configguisunbird.cpp367
-rw-r--r--kitchensync/src/configguisunbird.h133
-rw-r--r--kitchensync/src/configguisynce.cpp93
-rw-r--r--kitchensync/src/configguisynce.h49
-rw-r--r--kitchensync/src/configguisyncmlhttp.cpp227
-rw-r--r--kitchensync/src/configguisyncmlhttp.h68
-rw-r--r--kitchensync/src/configguisyncmlobex.cpp320
-rw-r--r--kitchensync/src/configguisyncmlobex.h88
-rw-r--r--kitchensync/src/conflictdialog.cpp26
-rw-r--r--kitchensync/src/conflictdialog.h40
-rw-r--r--kitchensync/src/connectionwidgets.cpp227
-rw-r--r--kitchensync/src/connectionwidgets.h101
-rw-r--r--kitchensync/src/genericdiffalgo.cpp70
-rw-r--r--kitchensync/src/genericdiffalgo.h45
-rw-r--r--kitchensync/src/groupconfig.cpp179
-rw-r--r--kitchensync/src/groupconfig.h63
-rw-r--r--kitchensync/src/groupconfigcommon.cpp158
-rw-r--r--kitchensync/src/groupconfigcommon.h60
-rw-r--r--kitchensync/src/groupconfigdialog.cpp57
-rw-r--r--kitchensync/src/groupconfigdialog.h44
-rw-r--r--kitchensync/src/groupitem.cpp389
-rw-r--r--kitchensync/src/groupitem.h112
-rw-r--r--kitchensync/src/groupview.cpp99
-rw-r--r--kitchensync/src/groupview.h58
-rw-r--r--kitchensync/src/htmldiffalgodisplay.cpp97
-rw-r--r--kitchensync/src/htmldiffalgodisplay.h54
-rw-r--r--kitchensync/src/kitchensync.desktop16
-rw-r--r--kitchensync/src/kitchensync_part.rc22
-rw-r--r--kitchensync/src/kitchensyncui.rc22
-rw-r--r--kitchensync/src/kwidgetlist.cpp305
-rw-r--r--kitchensync/src/kwidgetlist.h91
-rw-r--r--kitchensync/src/main.cpp58
-rw-r--r--kitchensync/src/mainwidget.cpp191
-rw-r--r--kitchensync/src/mainwidget.h74
-rw-r--r--kitchensync/src/mainwindow.cpp61
-rw-r--r--kitchensync/src/mainwindow.h47
-rw-r--r--kitchensync/src/memberconfig.cpp79
-rw-r--r--kitchensync/src/memberconfig.h48
-rw-r--r--kitchensync/src/memberinfo.cpp99
-rw-r--r--kitchensync/src/memberinfo.h47
-rw-r--r--kitchensync/src/multiconflictdialog.cpp141
-rw-r--r--kitchensync/src/multiconflictdialog.h48
-rw-r--r--kitchensync/src/part.cpp89
-rw-r--r--kitchensync/src/part.h50
-rw-r--r--kitchensync/src/pics/CMakeLists.txt13
-rw-r--r--kitchensync/src/pics/Makefile.am4
-rw-r--r--kitchensync/src/pics/cr128-app-mobile_phone.pngbin12136 -> 0 bytes
-rw-r--r--kitchensync/src/pics/cr16-action-hotsync.pngbin634 -> 0 bytes
-rw-r--r--kitchensync/src/pics/cr16-app-mobile_phone.pngbin850 -> 0 bytes
-rw-r--r--kitchensync/src/pics/cr22-action-hotsync.pngbin932 -> 0 bytes
-rw-r--r--kitchensync/src/pics/cr32-action-hotsync.pngbin1618 -> 0 bytes
-rw-r--r--kitchensync/src/pics/cr32-app-mobile_phone.pngbin2178 -> 0 bytes
-rw-r--r--kitchensync/src/pics/cr48-action-hotsync.pngbin2574 -> 0 bytes
-rw-r--r--kitchensync/src/pics/cr48-app-mobile_phone.pngbin4023 -> 0 bytes
-rw-r--r--kitchensync/src/pics/cr64-app-mobile_phone.pngbin5911 -> 0 bytes
-rw-r--r--kitchensync/src/pics/hi16-app-kitchensync.pngbin634 -> 0 bytes
-rw-r--r--kitchensync/src/pics/hi22-app-kitchensync.pngbin932 -> 0 bytes
-rw-r--r--kitchensync/src/pics/hi32-app-kitchensync.pngbin1618 -> 0 bytes
-rw-r--r--kitchensync/src/pics/hi48-app-kitchensync.pngbin2574 -> 0 bytes
-rw-r--r--kitchensync/src/pluginpicker.cpp136
-rw-r--r--kitchensync/src/pluginpicker.h82
-rw-r--r--kitchensync/src/singleconflictdialog.cpp123
-rw-r--r--kitchensync/src/singleconflictdialog.h55
-rw-r--r--kitchensync/src/syncprocess.cpp108
-rw-r--r--kitchensync/src/syncprocess.h65
-rw-r--r--kitchensync/src/syncprocessmanager.cpp172
-rw-r--r--kitchensync/src/syncprocessmanager.h101
-rw-r--r--kitchensync/src/xmldiffalgo.cpp166
-rw-r--r--kitchensync/src/xmldiffalgo.h54
-rw-r--r--kmail/Mainpage.dox28
-rw-r--r--kmail/accountcombobox.cpp8
-rw-r--r--kmail/accountcombobox.h2
-rw-r--r--kmail/accountdialog.cpp202
-rw-r--r--kmail/accountdialog.h6
-rw-r--r--kmail/accountmanager.cpp12
-rw-r--r--kmail/accountmanager.h2
-rw-r--r--kmail/accountwizard.cpp28
-rw-r--r--kmail/accountwizard.h2
-rw-r--r--kmail/acljobs.cpp10
-rw-r--r--kmail/acljobs.h8
-rw-r--r--kmail/actionscheduler.cpp74
-rw-r--r--kmail/actionscheduler.h2
-rw-r--r--kmail/annotationjobs.cpp10
-rw-r--r--kmail/annotationjobs.h8
-rw-r--r--kmail/antispamwizard.cpp58
-rw-r--r--kmail/antispamwizard.h10
-rw-r--r--kmail/archivefolderdialog.cpp18
-rw-r--r--kmail/archivefolderdialog.h2
-rw-r--r--kmail/attachmentlistview.h2
-rw-r--r--kmail/backupjob.cpp14
-rw-r--r--kmail/backupjob.h2
-rw-r--r--kmail/cachedimapjob.cpp92
-rw-r--r--kmail/cachedimapjob.h2
-rw-r--r--kmail/chiasmuskeyselector.cpp4
-rw-r--r--kmail/chiasmuskeyselector.h2
-rw-r--r--kmail/colorlistbox.cpp2
-rw-r--r--kmail/colorlistbox.h2
-rw-r--r--kmail/compactionjob.cpp4
-rw-r--r--kmail/compactionjob.h4
-rw-r--r--kmail/composer.h2
-rw-r--r--kmail/configuredialog.cpp758
-rw-r--r--kmail/configuredialog.h4
-rw-r--r--kmail/configuredialog_p.cpp26
-rw-r--r--kmail/configuredialog_p.h74
-rw-r--r--kmail/copyfolderjob.cpp16
-rw-r--r--kmail/copyfolderjob.h2
-rw-r--r--kmail/customtemplates.cpp46
-rw-r--r--kmail/customtemplates.h2
-rw-r--r--kmail/customtemplates_base.ui4
-rw-r--r--kmail/dictionarycombobox.cpp8
-rw-r--r--kmail/dictionarycombobox.h2
-rw-r--r--kmail/editorwatcher.cpp6
-rw-r--r--kmail/editorwatcher.h2
-rw-r--r--kmail/expirejob.cpp10
-rw-r--r--kmail/expirejob.h2
-rw-r--r--kmail/expirypropertiesdialog.cpp12
-rw-r--r--kmail/expirypropertiesdialog.h2
-rw-r--r--kmail/favoritefolderview.cpp56
-rw-r--r--kmail/favoritefolderview.h4
-rw-r--r--kmail/filehtmlwriter.cpp2
-rw-r--r--kmail/filterimporterexporter.cpp4
-rw-r--r--kmail/filterimporterexporter.h2
-rw-r--r--kmail/filterlog.h2
-rw-r--r--kmail/filterlogdlg.cpp40
-rw-r--r--kmail/filterlogdlg.h2
-rw-r--r--kmail/folderIface.h2
-rw-r--r--kmail/folderdiaacltab.cpp58
-rw-r--r--kmail/folderdiaacltab.h4
-rw-r--r--kmail/folderdiaquotatab.cpp16
-rw-r--r--kmail/folderdiaquotatab.h2
-rw-r--r--kmail/folderdiaquotatab_p.h2
-rw-r--r--kmail/folderjob.h2
-rw-r--r--kmail/folderpropertiesdialog.ui4
-rw-r--r--kmail/folderrequester.cpp4
-rw-r--r--kmail/folderrequester.h2
-rw-r--r--kmail/foldersetselector.h2
-rw-r--r--kmail/foldershortcutdialog.cpp4
-rw-r--r--kmail/foldershortcutdialog.h2
-rw-r--r--kmail/folderstorage.cpp22
-rw-r--r--kmail/folderstorage.h2
-rw-r--r--kmail/foldertreebase.cpp2
-rw-r--r--kmail/foldertreebase.h2
-rw-r--r--kmail/globalsettings.cpp2
-rw-r--r--kmail/globalsettings.h2
-rw-r--r--kmail/headerlistquicksearch.cpp22
-rw-r--r--kmail/headerlistquicksearch.h2
-rw-r--r--kmail/headerstyle.cpp2
-rw-r--r--kmail/htmlstatusbar.h2
-rw-r--r--kmail/identitydialog.cpp20
-rw-r--r--kmail/identitydialog.h2
-rw-r--r--kmail/identitydrag.h2
-rw-r--r--kmail/identitylistview.h2
-rw-r--r--kmail/imapaccountbase.cpp88
-rw-r--r--kmail/imapaccountbase.h2
-rw-r--r--kmail/imapjob.cpp52
-rw-r--r--kmail/imapjob.h2
-rw-r--r--kmail/importarchivedialog.h2
-rw-r--r--kmail/importjob.cpp10
-rw-r--r--kmail/importjob.h2
-rw-r--r--kmail/index.cpp32
-rw-r--r--kmail/index.h4
-rw-r--r--kmail/jobscheduler.cpp4
-rw-r--r--kmail/jobscheduler.h2
-rw-r--r--kmail/keyresolver.cpp8
-rw-r--r--kmail/kmaccount.cpp12
-rw-r--r--kmail/kmaccount.h4
-rw-r--r--kmail/kmacctcachedimap.cpp16
-rw-r--r--kmail/kmacctcachedimap.h2
-rw-r--r--kmail/kmacctimap.cpp40
-rw-r--r--kmail/kmacctimap.h2
-rw-r--r--kmail/kmacctseldlg.cpp2
-rw-r--r--kmail/kmacctseldlg.h2
-rw-r--r--kmail/kmail_part.cpp24
-rw-r--r--kmail/kmail_part.h2
-rw-r--r--kmail/kmailicalifaceimpl.cpp70
-rw-r--r--kmail/kmailicalifaceimpl.h2
-rw-r--r--kmail/kmatmlistview.cpp12
-rw-r--r--kmail/kmatmlistview.h2
-rw-r--r--kmail/kmcommands.cpp152
-rw-r--r--kmail/kmcommands.h108
-rw-r--r--kmail/kmcomposewin.cpp568
-rw-r--r--kmail/kmcomposewin.h2
-rw-r--r--kmail/kmedit.cpp58
-rw-r--r--kmail/kmedit.h2
-rw-r--r--kmail/kmfawidgets.cpp16
-rw-r--r--kmail/kmfawidgets.h4
-rw-r--r--kmail/kmfilteraction.cpp6
-rw-r--r--kmail/kmfilterdlg.cpp156
-rw-r--r--kmail/kmfilterdlg.h10
-rw-r--r--kmail/kmfiltermgr.cpp4
-rw-r--r--kmail/kmfiltermgr.h2
-rw-r--r--kmail/kmfolder.cpp88
-rw-r--r--kmail/kmfolder.h2
-rw-r--r--kmail/kmfoldercachedimap.cpp164
-rw-r--r--kmail/kmfoldercachedimap.h4
-rw-r--r--kmail/kmfoldercombobox.cpp24
-rw-r--r--kmail/kmfoldercombobox.h2
-rw-r--r--kmail/kmfolderdia.cpp56
-rw-r--r--kmail/kmfolderdia.h8
-rw-r--r--kmail/kmfolderdir.h4
-rw-r--r--kmail/kmfolderimap.cpp148
-rw-r--r--kmail/kmfolderimap.h2
-rw-r--r--kmail/kmfolderindex.h2
-rw-r--r--kmail/kmfoldermaildir.cpp10
-rw-r--r--kmail/kmfoldermaildir.h2
-rw-r--r--kmail/kmfoldermbox.cpp2
-rw-r--r--kmail/kmfoldermbox.h2
-rw-r--r--kmail/kmfoldermgr.cpp16
-rw-r--r--kmail/kmfoldermgr.h2
-rw-r--r--kmail/kmfoldernode.h2
-rw-r--r--kmail/kmfoldersearch.cpp130
-rw-r--r--kmail/kmfoldersearch.h4
-rw-r--r--kmail/kmfolderseldlg.cpp8
-rw-r--r--kmail/kmfolderseldlg.h2
-rw-r--r--kmail/kmfoldertree.cpp230
-rw-r--r--kmail/kmfoldertree.h4
-rw-r--r--kmail/kmheaders.cpp192
-rw-r--r--kmail/kmheaders.h2
-rw-r--r--kmail/kmkernel.cpp36
-rw-r--r--kmail/kmkernel.h2
-rw-r--r--kmail/kmlineeditspell.cpp2
-rw-r--r--kmail/kmlineeditspell.h4
-rw-r--r--kmail/kmmainwidget.cpp683
-rw-r--r--kmail/kmmainwidget.h2
-rw-r--r--kmail/kmmainwin.cpp30
-rw-r--r--kmail/kmmainwin.h2
-rw-r--r--kmail/kmmimeparttree.cpp32
-rw-r--r--kmail/kmmimeparttree.h2
-rw-r--r--kmail/kmmsgpartdlg.cpp6
-rw-r--r--kmail/kmmsgpartdlg.h4
-rw-r--r--kmail/kmpopfiltercnfrmdlg.cpp20
-rw-r--r--kmail/kmpopfiltercnfrmdlg.h4
-rw-r--r--kmail/kmreadermainwin.cpp114
-rw-r--r--kmail/kmreadermainwin.h4
-rw-r--r--kmail/kmreaderwin.cpp202
-rw-r--r--kmail/kmreaderwin.h21
-rw-r--r--kmail/kmsearchpatternedit.cpp30
-rw-r--r--kmail/kmsearchpatternedit.h6
-rw-r--r--kmail/kmsender.cpp42
-rw-r--r--kmail/kmsender.h2
-rw-r--r--kmail/kmsender_p.h6
-rw-r--r--kmail/kmservertest.cpp16
-rw-r--r--kmail/kmservertest.h2
-rw-r--r--kmail/kmsystemtray.cpp34
-rw-r--r--kmail/kmsystemtray.h2
-rw-r--r--kmail/kmtransport.cpp40
-rw-r--r--kmail/kmtransport.h4
-rw-r--r--kmail/listjob.cpp12
-rw-r--r--kmail/listjob.h2
-rw-r--r--kmail/localsubscriptiondialog.cpp2
-rw-r--r--kmail/localsubscriptiondialog.h2
-rw-r--r--kmail/maildirjob.cpp2
-rw-r--r--kmail/maildirjob.h2
-rw-r--r--kmail/mailinglistpropertiesdialog.cpp36
-rw-r--r--kmail/mailinglistpropertiesdialog.h2
-rw-r--r--kmail/mailsourceviewer.cpp4
-rw-r--r--kmail/managesievescriptsdialog.cpp50
-rw-r--r--kmail/managesievescriptsdialog.h2
-rw-r--r--kmail/managesievescriptsdialog_p.h2
-rw-r--r--kmail/mboxjob.cpp2
-rw-r--r--kmail/mboxjob.h2
-rw-r--r--kmail/messageactions.cpp32
-rw-r--r--kmail/messageactions.h2
-rw-r--r--kmail/messagecomposer.cpp18
-rw-r--r--kmail/messagecomposer.h2
-rw-r--r--kmail/messagecopyhelper.cpp2
-rw-r--r--kmail/messagecopyhelper.h2
-rw-r--r--kmail/messageproperty.h2
-rw-r--r--kmail/networkaccount.h2
-rw-r--r--kmail/newfolderdialog.cpp2
-rw-r--r--kmail/newfolderdialog.h2
-rw-r--r--kmail/objecttreeparser.cpp10
-rw-r--r--kmail/objecttreeparser_p.cpp24
-rw-r--r--kmail/objecttreeparser_p.h8
-rw-r--r--kmail/popaccount.cpp28
-rw-r--r--kmail/popaccount.h2
-rw-r--r--kmail/quotajobs.cpp12
-rw-r--r--kmail/quotajobs.h4
-rw-r--r--kmail/recipientseditor.cpp98
-rw-r--r--kmail/recipientseditor.h12
-rw-r--r--kmail/recipientseditortest.cpp4
-rw-r--r--kmail/recipientseditortest.h2
-rw-r--r--kmail/recipientspicker.cpp40
-rw-r--r--kmail/recipientspicker.h4
-rw-r--r--kmail/redirectdialog.cpp4
-rw-r--r--kmail/redirectdialog.h2
-rw-r--r--kmail/regexplineedit.cpp10
-rw-r--r--kmail/regexplineedit.h2
-rw-r--r--kmail/renamejob.cpp6
-rw-r--r--kmail/renamejob.h2
-rw-r--r--kmail/rulewidgethandlermanager.cpp82
-rw-r--r--kmail/searchjob.cpp36
-rw-r--r--kmail/searchjob.h2
-rw-r--r--kmail/searchwindow.cpp144
-rw-r--r--kmail/searchwindow.h2
-rw-r--r--kmail/secondarywindow.h2
-rw-r--r--kmail/sieveconfig.cpp4
-rw-r--r--kmail/sieveconfig.h2
-rw-r--r--kmail/sievedebugdialog.cpp18
-rw-r--r--kmail/sievedebugdialog.h2
-rw-r--r--kmail/sievejob.cpp18
-rw-r--r--kmail/sievejob.h2
-rw-r--r--kmail/signatureconfigurator.cpp26
-rw-r--r--kmail/signatureconfigurator.h2
-rw-r--r--kmail/simplestringlisteditor.cpp28
-rw-r--r--kmail/simplestringlisteditor.h2
-rw-r--r--kmail/snippetdlg.cpp12
-rw-r--r--kmail/snippetdlg.h2
-rw-r--r--kmail/snippetitem.h2
-rw-r--r--kmail/snippetsettings.h2
-rw-r--r--kmail/snippetsettingsbase.ui6
-rw-r--r--kmail/snippetwidget.cpp46
-rw-r--r--kmail/snippetwidget.h2
-rw-r--r--kmail/subscriptiondialog.cpp16
-rw-r--r--kmail/subscriptiondialog.h4
-rw-r--r--kmail/tdehtmlparthtmlwriter.cpp2
-rw-r--r--kmail/tdehtmlparthtmlwriter.h2
-rw-r--r--kmail/tdelistboxdialog.cpp8
-rw-r--r--kmail/tdelistboxdialog.h2
-rw-r--r--kmail/tdelistviewindexedsearchline.h2
-rw-r--r--kmail/templateparser.cpp12
-rw-r--r--kmail/templateparser.h2
-rw-r--r--kmail/templatesconfiguration.cpp26
-rw-r--r--kmail/templatesconfiguration.h2
-rw-r--r--kmail/templatesinsertcommand.cpp138
-rw-r--r--kmail/templatesinsertcommand.h2
-rw-r--r--kmail/tests/messagedicttests.h2
-rw-r--r--kmail/tests/mimelibtests.h2
-rw-r--r--kmail/tests/utiltests.h2
-rw-r--r--kmail/treebase.cpp10
-rw-r--r--kmail/treebase.h2
-rw-r--r--kmail/twindowpositioner.h2
-rw-r--r--kmail/undostack.h2
-rw-r--r--kmail/urlhandlermanager.cpp2
-rw-r--r--kmail/vacation.cpp16
-rw-r--r--kmail/vacation.h2
-rw-r--r--kmail/vacationdialog.cpp8
-rw-r--r--kmail/vacationdialog.h2
-rw-r--r--kmail/vcardviewer.h2
-rw-r--r--kmail/xfaceconfigurator.cpp30
-rw-r--r--kmail/xfaceconfigurator.h2
-rw-r--r--kmailcvt/README12
-rw-r--r--kmailcvt/filter_sylpheed.cpp2
-rw-r--r--kmailcvt/kimportpage.h2
-rw-r--r--kmailcvt/kmailcvt.h2
-rw-r--r--kmailcvt/kselfilterpage.cpp2
-rw-r--r--kmailcvt/kselfilterpage.h2
-rw-r--r--kmobile/TODO8
-rw-r--r--kmobile/devices/gnokii/gnokii_mobile.h4
-rw-r--r--kmobile/devices/gnokii/gnokiiconfig.cpp2
-rw-r--r--kmobile/devices/gnokii/gnokiiconfig.h2
-rw-r--r--kmobile/devices/skeleton/skeleton.h4
-rw-r--r--kmobile/kmobile.cpp48
-rw-r--r--kmobile/kmobile.h2
-rw-r--r--kmobile/kmobileclient.h2
-rw-r--r--kmobile/kmobiledevice.h2
-rw-r--r--kmobile/kmobileitem.h2
-rw-r--r--kmobile/kmobileview.cpp4
-rw-r--r--kmobile/kmobileview.h2
-rw-r--r--kmobile/pref.h6
-rw-r--r--kmobile/systemtray.cpp8
-rw-r--r--kmobile/systemtray.h2
-rw-r--r--knode/articlewidget.cpp80
-rw-r--r--knode/articlewidget.h2
-rw-r--r--knode/headerview.cpp24
-rw-r--r--knode/headerview.h2
-rw-r--r--knode/knaccountmanager.cpp2
-rw-r--r--knode/knaccountmanager.h2
-rw-r--r--knode/knapplication.h2
-rw-r--r--knode/knarticlefactory.cpp18
-rw-r--r--knode/knarticlefactory.h4
-rw-r--r--knode/knarticlemanager.cpp16
-rw-r--r--knode/knarticlemanager.h2
-rw-r--r--knode/knarticlewindow.cpp4
-rw-r--r--knode/knarticlewindow.h2
-rw-r--r--knode/kncleanup.h2
-rw-r--r--knode/kncollectionview.cpp30
-rw-r--r--knode/kncollectionview.h2
-rw-r--r--knode/kncomposer.cpp236
-rw-r--r--knode/kncomposer.h12
-rw-r--r--knode/knconfig.cpp4
-rw-r--r--knode/knconfig.h2
-rw-r--r--knode/knconfigmanager.cpp4
-rw-r--r--knode/knconfigmanager.h4
-rw-r--r--knode/knconfigpages.cpp2
-rw-r--r--knode/knconfigpages.h8
-rw-r--r--knode/knconfigwidgets.cpp258
-rw-r--r--knode/knconfigwidgets.h32
-rw-r--r--knode/knconvert.cpp10
-rw-r--r--knode/knconvert.h2
-rw-r--r--knode/knfilterconfigwidget.h2
-rw-r--r--knode/knfilterdialog.cpp2
-rw-r--r--knode/knfilterdialog.h2
-rw-r--r--knode/knfiltermanager.cpp6
-rw-r--r--knode/knfiltermanager.h4
-rw-r--r--knode/knfoldermanager.h2
-rw-r--r--knode/kngroupbrowser.cpp70
-rw-r--r--knode/kngroupbrowser.h4
-rw-r--r--knode/kngroupdialog.cpp37
-rw-r--r--knode/kngroupdialog.h4
-rw-r--r--knode/kngroupmanager.cpp69
-rw-r--r--knode/kngroupmanager.h13
-rw-r--r--knode/kngrouppropdlg.cpp2
-rw-r--r--knode/kngroupselectdialog.cpp20
-rw-r--r--knode/kngroupselectdialog.h2
-rw-r--r--knode/knjobdata.cpp8
-rw-r--r--knode/knjobdata.h2
-rw-r--r--knode/knmainwidget.cpp374
-rw-r--r--knode/knmainwidget.h4
-rw-r--r--knode/knnetaccess.cpp12
-rw-r--r--knode/knnetaccess.h2
-rw-r--r--knode/knnntpaccount.cpp2
-rw-r--r--knode/knnntpaccount.h2
-rw-r--r--knode/knnntpclient.cpp86
-rw-r--r--knode/knode.cpp16
-rw-r--r--knode/knode.h2
-rw-r--r--knode/knode_part.cpp4
-rw-r--r--knode/knode_part.h2
-rw-r--r--knode/knrangefilter.cpp6
-rw-r--r--knode/knrangefilter.h2
-rw-r--r--knode/knscoring.h2
-rw-r--r--knode/knsearchdialog.cpp6
-rw-r--r--knode/knsearchdialog.h2
-rw-r--r--knode/knsourceviewwindow.cpp2
-rw-r--r--knode/knsourceviewwindow.h2
-rw-r--r--knode/knstatusfilter.cpp2
-rw-r--r--knode/knstatusfilter.h2
-rw-r--r--knode/knstringfilter.h2
-rw-r--r--knode/knwidgets.cpp2
-rw-r--r--knode/knwidgets.h2
-rw-r--r--knode/smtpaccountwidget_base.ui13
-rw-r--r--knode/utilities.h23
-rw-r--r--knotes/knote.cpp68
-rw-r--r--knotes/knote.h2
-rw-r--r--knotes/knotealarmdlg.cpp4
-rw-r--r--knotes/knotealarmdlg.h2
-rw-r--r--knotes/knotebutton.cpp4
-rw-r--r--knotes/knotebutton.h2
-rw-r--r--knotes/knoteconfigdlg.cpp2
-rw-r--r--knotes/knoteconfigdlg.h2
-rw-r--r--knotes/knoteedit.cpp82
-rw-r--r--knotes/knoteedit.h2
-rw-r--r--knotes/knotehostdlg.cpp4
-rw-r--r--knotes/knotehostdlg.h2
-rw-r--r--knotes/knotesalarm.cpp2
-rw-r--r--knotes/knotesalarm.h2
-rw-r--r--knotes/knotesapp.cpp78
-rw-r--r--knotes/knotesapp.h2
-rw-r--r--knotes/knotesnetrecv.cpp8
-rw-r--r--knotes/knotesnetrecv.h2
-rw-r--r--knotes/knotesnetsend.cpp10
-rw-r--r--knotes/knotesnetsend.h2
-rw-r--r--knotes/main.cpp2
-rw-r--r--knotes/resourcelocalconfig.h2
-rw-r--r--knotes/resourcemanager.h2
-rw-r--r--kode/kwsdl/compiler.h2
-rw-r--r--kode/kwsdl/converter.cpp24
-rw-r--r--kode/kwsdl/kung/binaryinputfield.cpp4
-rw-r--r--kode/kwsdl/kung/binaryinputfield.h4
-rw-r--r--kode/kwsdl/kung/boolinputfield.cpp4
-rw-r--r--kode/kwsdl/kung/boolinputfield.h2
-rw-r--r--kode/kwsdl/kung/dateinputfield.cpp4
-rw-r--r--kode/kwsdl/kung/dateinputfield.h2
-rw-r--r--kode/kwsdl/kung/dispatcher.cpp12
-rw-r--r--kode/kwsdl/kung/dispatcher.h2
-rw-r--r--kode/kwsdl/kung/doubleinputfield.cpp4
-rw-r--r--kode/kwsdl/kung/doubleinputfield.h2
-rw-r--r--kode/kwsdl/kung/enuminputfield.cpp4
-rw-r--r--kode/kwsdl/kung/enuminputfield.h2
-rw-r--r--kode/kwsdl/kung/inputfield.h2
-rw-r--r--kode/kwsdl/kung/integerinputfield.cpp4
-rw-r--r--kode/kwsdl/kung/integerinputfield.h2
-rw-r--r--kode/kwsdl/kung/listinputfield.cpp6
-rw-r--r--kode/kwsdl/kung/listinputfield.h4
-rw-r--r--kode/kwsdl/kung/loader.h2
-rw-r--r--kode/kwsdl/kung/main.cpp2
-rw-r--r--kode/kwsdl/kung/pageinputfield.h2
-rw-r--r--kode/kwsdl/kung/stringinputfield.cpp4
-rw-r--r--kode/kwsdl/kung/stringinputfield.h2
-rw-r--r--kode/kwsdl/kung/timeinputfield.cpp4
-rw-r--r--kode/kwsdl/kung/timeinputfield.h2
-rw-r--r--kode/kwsdl/kung/transport.cpp4
-rw-r--r--kode/kwsdl/kung/transport.h2
-rw-r--r--kode/kwsdl/main.cpp2
-rw-r--r--kode/kwsdl/schema/fileprovider.cpp8
-rw-r--r--kode/kwsdl/schema/fileprovider.h2
-rw-r--r--kode/kwsdl/tests/google/googlesearch.cpp12
-rw-r--r--kode/kwsdl/tests/google/googlesearch.h1
-rw-r--r--kode/kwsdl/tests/google/googlesearchservice.cpp12
-rw-r--r--kode/kwsdl/tests/google/googlesearchservice.h2
-rw-r--r--kode/kwsdl/tests/google/transport.cpp4
-rw-r--r--kode/kwsdl/tests/google/transport.h2
-rw-r--r--kode/kwsdl/typemapper.cpp20
-rw-r--r--kode/kxml_compiler/creator.cpp12
-rw-r--r--kode/printer.cpp2
-rw-r--r--konsolekalendar/konsolekalendar.cpp10
-rw-r--r--konsolekalendar/konsolekalendaradd.cpp4
-rw-r--r--konsolekalendar/konsolekalendarchange.cpp8
-rw-r--r--konsolekalendar/konsolekalendardelete.cpp4
-rw-r--r--konsolekalendar/konsolekalendarepoch.cpp6
-rw-r--r--konsolekalendar/main.cpp12
-rw-r--r--kontact/DESIGN.dcopinteraction8
-rw-r--r--kontact/Thoughts2
-rw-r--r--kontact/interfaces/core.cpp8
-rw-r--r--kontact/interfaces/core.h2
-rw-r--r--kontact/interfaces/plugin.cpp2
-rw-r--r--kontact/interfaces/plugin.h2
-rw-r--r--kontact/interfaces/summary.cpp4
-rw-r--r--kontact/interfaces/summary.h2
-rw-r--r--kontact/interfaces/uniqueapphandler.cpp8
-rw-r--r--kontact/interfaces/uniqueapphandler.h2
-rw-r--r--kontact/plugins/akregator/akregator_plugin.cpp6
-rw-r--r--kontact/plugins/akregator/akregator_plugin.h2
-rw-r--r--kontact/plugins/kaddressbook/kaddressbook_plugin.cpp8
-rw-r--r--kontact/plugins/kaddressbook/kaddressbook_plugin.h2
-rw-r--r--kontact/plugins/karm/karm_plugin.cpp4
-rw-r--r--kontact/plugins/karm/karm_plugin.h2
-rw-r--r--kontact/plugins/kitchensync/Makefile.am14
-rw-r--r--kontact/plugins/kitchensync/kitchensync.desktop17
-rw-r--r--kontact/plugins/kitchensync/kitchensync_plugin.cpp67
-rw-r--r--kontact/plugins/kitchensync/kitchensync_plugin.h51
-rw-r--r--kontact/plugins/kmail/kcmkmailsummary.cpp4
-rw-r--r--kontact/plugins/kmail/kcmkmailsummary.h2
-rw-r--r--kontact/plugins/kmail/kmail_plugin.cpp6
-rw-r--r--kontact/plugins/kmail/kmail_plugin.h2
-rw-r--r--kontact/plugins/kmail/summarywidget.cpp6
-rw-r--r--kontact/plugins/kmail/summarywidget.h2
-rw-r--r--kontact/plugins/knode/knode_plugin.cpp4
-rw-r--r--kontact/plugins/knode/knode_plugin.h2
-rw-r--r--kontact/plugins/knotes/knotes_part.cpp44
-rw-r--r--kontact/plugins/knotes/knotes_part.h2
-rw-r--r--kontact/plugins/knotes/knotes_part_p.h4
-rw-r--r--kontact/plugins/knotes/knotes_plugin.cpp6
-rw-r--r--kontact/plugins/knotes/knotes_plugin.h2
-rw-r--r--kontact/plugins/knotes/knotetip.cpp8
-rw-r--r--kontact/plugins/knotes/summarywidget.cpp14
-rw-r--r--kontact/plugins/knotes/summarywidget.h2
-rw-r--r--kontact/plugins/korganizer/journalplugin.cpp6
-rw-r--r--kontact/plugins/korganizer/journalplugin.h2
-rw-r--r--kontact/plugins/korganizer/kcmkorgsummary.cpp14
-rw-r--r--kontact/plugins/korganizer/kcmkorgsummary.h2
-rw-r--r--kontact/plugins/korganizer/korganizerplugin.cpp6
-rw-r--r--kontact/plugins/korganizer/korganizerplugin.h2
-rw-r--r--kontact/plugins/korganizer/summarywidget.cpp16
-rw-r--r--kontact/plugins/korganizer/summarywidget.h2
-rw-r--r--kontact/plugins/korganizer/todoplugin.cpp6
-rw-r--r--kontact/plugins/korganizer/todoplugin.h2
-rw-r--r--kontact/plugins/korganizer/todosummarywidget.cpp18
-rw-r--r--kontact/plugins/korganizer/todosummarywidget.h2
-rw-r--r--kontact/plugins/kpilot/kpilot_plugin.cpp2
-rw-r--r--kontact/plugins/kpilot/summarywidget.cpp10
-rw-r--r--kontact/plugins/kpilot/summarywidget.h2
-rw-r--r--kontact/plugins/newsticker/kcmkontactknt.cpp30
-rw-r--r--kontact/plugins/newsticker/kcmkontactknt.h4
-rw-r--r--kontact/plugins/newsticker/newsticker_plugin.cpp2
-rw-r--r--kontact/plugins/newsticker/summarywidget.cpp20
-rw-r--r--kontact/plugins/newsticker/summarywidget.h2
-rw-r--r--kontact/plugins/specialdates/kcmsdsummary.cpp18
-rw-r--r--kontact/plugins/specialdates/kcmsdsummary.h2
-rw-r--r--kontact/plugins/specialdates/sdsummarywidget.cpp28
-rw-r--r--kontact/plugins/specialdates/sdsummarywidget.h2
-rw-r--r--kontact/plugins/specialdates/specialdates_plugin.cpp2
-rw-r--r--kontact/plugins/summary/dropwidget.h2
-rw-r--r--kontact/plugins/summary/kcmkontactsummary.cpp4
-rw-r--r--kontact/plugins/summary/kcmkontactsummary.h4
-rw-r--r--kontact/plugins/summary/summaryview_part.cpp36
-rw-r--r--kontact/plugins/summary/summaryview_part.h2
-rw-r--r--kontact/plugins/summary/summaryview_plugin.cpp6
-rw-r--r--kontact/plugins/summary/summaryview_plugin.h2
-rw-r--r--kontact/plugins/test/test_part.cpp6
-rw-r--r--kontact/plugins/test/test_part.h2
-rw-r--r--kontact/plugins/test/test_plugin.cpp4
-rw-r--r--kontact/plugins/test/test_plugin.h2
-rw-r--r--kontact/plugins/weather/summarywidget.cpp10
-rw-r--r--kontact/plugins/weather/summarywidget.h2
-rw-r--r--kontact/plugins/weather/weather_plugin.cpp2
-rw-r--r--kontact/src/aboutdialog.h2
-rw-r--r--kontact/src/iconsidepane.cpp26
-rw-r--r--kontact/src/iconsidepane.h4
-rw-r--r--kontact/src/kcmkontact.cpp6
-rw-r--r--kontact/src/kcmkontact.h4
-rw-r--r--kontact/src/mainwindow.cpp74
-rw-r--r--kontact/src/mainwindow.h2
-rw-r--r--kontact/src/profiledialog.cpp44
-rw-r--r--kontact/src/profiledialog.h2
-rw-r--r--kontact/src/profilemanager.h2
-rw-r--r--kontact/src/sidepanebase.h2
-rw-r--r--korganizer/actionmanager.cpp304
-rw-r--r--korganizer/actionmanager.h2
-rw-r--r--korganizer/agendaview.cpp6
-rw-r--r--korganizer/agendaview.h2
-rw-r--r--korganizer/archivedialog.cpp12
-rw-r--r--korganizer/archivedialog.h2
-rw-r--r--korganizer/calendarview.cpp168
-rw-r--r--korganizer/calendarview.h2
-rw-r--r--korganizer/datechecker.cpp4
-rw-r--r--korganizer/datechecker.h2
-rw-r--r--korganizer/datenavigator.h2
-rw-r--r--korganizer/datenavigatorcontainer.cpp44
-rw-r--r--korganizer/datenavigatorcontainer.h2
-rw-r--r--korganizer/eventarchiver.h2
-rw-r--r--korganizer/exportwebdialog.cpp12
-rw-r--r--korganizer/exportwebdialog.h2
-rw-r--r--korganizer/filteredit_base.ui16
-rw-r--r--korganizer/filtereditdialog.cpp26
-rw-r--r--korganizer/filtereditdialog.h4
-rw-r--r--korganizer/freebusymanager.cpp24
-rw-r--r--korganizer/freebusymanager.h4
-rw-r--r--korganizer/freebusyurldialog.h4
-rw-r--r--korganizer/history.h2
-rw-r--r--korganizer/importdialog.cpp2
-rw-r--r--korganizer/importdialog.h2
-rw-r--r--korganizer/incidencechanger.h2
-rw-r--r--korganizer/interfaces/korganizer/baseview.h2
-rw-r--r--korganizer/interfaces/korganizer/incidencechangerbase.h2
-rw-r--r--korganizer/interfaces/korganizer/part.h2
-rw-r--r--korganizer/journalentry.cpp44
-rw-r--r--korganizer/journalentry.h4
-rw-r--r--korganizer/kdatenavigator.cpp26
-rw-r--r--korganizer/kdatenavigator.h2
-rw-r--r--korganizer/koagenda.cpp90
-rw-r--r--korganizer/koagenda.h6
-rw-r--r--korganizer/koagendaitem.h2
-rw-r--r--korganizer/koagendaview.cpp108
-rw-r--r--korganizer/koagendaview.h8
-rw-r--r--korganizer/koapp.h2
-rw-r--r--korganizer/koattendeeeditor.cpp24
-rw-r--r--korganizer/koattendeeeditor.h2
-rw-r--r--korganizer/kocounterdialog.cpp4
-rw-r--r--korganizer/kocounterdialog.h2
-rw-r--r--korganizer/kodaymatrix.cpp8
-rw-r--r--korganizer/kodaymatrix.h2
-rw-r--r--korganizer/kodialogmanager.cpp94
-rw-r--r--korganizer/kodialogmanager.h2
-rw-r--r--korganizer/koeditoralarms.cpp38
-rw-r--r--korganizer/koeditoralarms.h2
-rw-r--r--korganizer/koeditorattachments.cpp50
-rw-r--r--korganizer/koeditorattachments.h6
-rw-r--r--korganizer/koeditordetails.cpp10
-rw-r--r--korganizer/koeditordetails.h4
-rw-r--r--korganizer/koeditorfreebusy.cpp58
-rw-r--r--korganizer/koeditorfreebusy.h2
-rw-r--r--korganizer/koeditorgeneral.cpp26
-rw-r--r--korganizer/koeditorgeneral.h4
-rw-r--r--korganizer/koeditorgeneralevent.cpp38
-rw-r--r--korganizer/koeditorgeneralevent.h2
-rw-r--r--korganizer/koeditorgeneraljournal.cpp6
-rw-r--r--korganizer/koeditorgeneraljournal.h2
-rw-r--r--korganizer/koeditorgeneraltodo.cpp30
-rw-r--r--korganizer/koeditorgeneraltodo.h2
-rw-r--r--korganizer/koeditorrecurrence.cpp72
-rw-r--r--korganizer/koeditorrecurrence.h10
-rw-r--r--korganizer/koeventeditor.cpp72
-rw-r--r--korganizer/koeventeditor.h2
-rw-r--r--korganizer/koeventpopupmenu.cpp24
-rw-r--r--korganizer/koeventpopupmenu.h2
-rw-r--r--korganizer/koeventview.cpp36
-rw-r--r--korganizer/koeventview.h2
-rw-r--r--korganizer/koeventviewer.cpp2
-rw-r--r--korganizer/koeventviewer.h2
-rw-r--r--korganizer/koeventviewerdialog.cpp2
-rw-r--r--korganizer/koeventviewerdialog.h2
-rw-r--r--korganizer/kogroupware.cpp26
-rw-r--r--korganizer/kogroupware.h2
-rw-r--r--korganizer/kogroupwareprefspage.ui8
-rw-r--r--korganizer/koincidenceeditor.cpp20
-rw-r--r--korganizer/koincidenceeditor.h2
-rw-r--r--korganizer/kojournaleditor.h2
-rw-r--r--korganizer/kojournalview.cpp28
-rw-r--r--korganizer/kojournalview.h2
-rw-r--r--korganizer/kolistview.cpp30
-rw-r--r--korganizer/kolistview.h2
-rw-r--r--korganizer/komessagebox.cpp6
-rw-r--r--korganizer/komonthview.cpp26
-rw-r--r--korganizer/komonthview.h6
-rw-r--r--korganizer/koprefsdialog.cpp86
-rw-r--r--korganizer/koprefsdialog.h10
-rw-r--r--korganizer/korgac/alarmdialog.cpp16
-rw-r--r--korganizer/korgac/alarmdialog.h2
-rw-r--r--korganizer/korgac/alarmdockwindow.cpp22
-rw-r--r--korganizer/korgac/alarmdockwindow.h2
-rw-r--r--korganizer/korgac/koalarmclient.cpp14
-rw-r--r--korganizer/korgac/koalarmclient.h2
-rw-r--r--korganizer/korganizer.cpp20
-rw-r--r--korganizer/korganizer.h2
-rw-r--r--korganizer/korganizer_part.cpp10
-rw-r--r--korganizer/korganizer_part.h2
-rw-r--r--korganizer/kotimelineview.cpp24
-rw-r--r--korganizer/kotimelineview.h2
-rw-r--r--korganizer/kotodoeditor.cpp34
-rw-r--r--korganizer/kotodoeditor.h2
-rw-r--r--korganizer/kotodoview.cpp104
-rw-r--r--korganizer/kotodoview.h4
-rw-r--r--korganizer/koviewmanager.cpp132
-rw-r--r--korganizer/koviewmanager.h2
-rw-r--r--korganizer/kowhatsnextview.cpp2
-rw-r--r--korganizer/kowhatsnextview.h4
-rw-r--r--korganizer/kowindowlist.h2
-rw-r--r--korganizer/multiagendaview.cpp126
-rw-r--r--korganizer/multiagendaview.h4
-rw-r--r--korganizer/navigatorbar.cpp12
-rw-r--r--korganizer/navigatorbar.h4
-rw-r--r--korganizer/plugins/datenums/configdialog.h2
-rw-r--r--korganizer/plugins/exchange/exchange.cpp26
-rw-r--r--korganizer/plugins/exchange/exchange.h2
-rw-r--r--korganizer/plugins/exchange/exchangeconfig.cpp6
-rw-r--r--korganizer/plugins/exchange/exchangeconfig.h2
-rw-r--r--korganizer/plugins/exchange/exchangedialog.h2
-rw-r--r--korganizer/plugins/hebrew/configdialog.h2
-rw-r--r--korganizer/plugins/projectview/koprojectview.cpp10
-rw-r--r--korganizer/plugins/projectview/koprojectview.h2
-rw-r--r--korganizer/plugins/projectview/projectview.cpp2
-rw-r--r--korganizer/plugins/projectview/projectview.h2
-rw-r--r--korganizer/plugins/timespanview/kotimespanview.cpp2
-rw-r--r--korganizer/plugins/timespanview/kotimespanview.h2
-rw-r--r--korganizer/plugins/timespanview/lineview.h2
-rw-r--r--korganizer/plugins/timespanview/timeline.h2
-rw-r--r--korganizer/plugins/timespanview/timespanview.cpp2
-rw-r--r--korganizer/plugins/timespanview/timespanview.h2
-rw-r--r--korganizer/plugins/timespanview/timespanwidget.cpp10
-rw-r--r--korganizer/plugins/timespanview/timespanwidget.h2
-rw-r--r--korganizer/previewdialog.cpp4
-rw-r--r--korganizer/previewdialog.h2
-rw-r--r--korganizer/printing/calprinter.cpp4
-rw-r--r--korganizer/printing/calprinter.h4
-rw-r--r--korganizer/printing/calprinttodoconfig_base.ui3
-rw-r--r--korganizer/publishdialog.cpp24
-rw-r--r--korganizer/publishdialog.h2
-rw-r--r--korganizer/resourceview.cpp76
-rw-r--r--korganizer/resourceview.h2
-rw-r--r--korganizer/searchdialog.cpp20
-rw-r--r--korganizer/searchdialog.h2
-rw-r--r--korganizer/statusdialog.cpp4
-rw-r--r--korganizer/statusdialog.h2
-rw-r--r--korganizer/templatemanagementdialog.cpp18
-rw-r--r--korganizer/templatemanagementdialog.h2
-rw-r--r--korganizer/timelabels.cpp8
-rw-r--r--korganizer/timelabels.h2
-rw-r--r--korn/account_input.cpp2
-rw-r--r--korn/accountmanager.cpp18
-rw-r--r--korn/accountmanager.h2
-rw-r--r--korn/boxcontainer.cpp2
-rw-r--r--korn/boxcontainer.h2
-rw-r--r--korn/boxcontaineritem.cpp36
-rw-r--r--korn/boxcontaineritem.h2
-rw-r--r--korn/dcopdrop.cpp2
-rw-r--r--korn/dcopdrop.h2
-rw-r--r--korn/dockedcontainer.h2
-rw-r--r--korn/dockeditem.cpp8
-rw-r--r--korn/dockeditem.h2
-rw-r--r--korn/hvcontainer.cpp4
-rw-r--r--korn/hvcontainer.h4
-rw-r--r--korn/hvitem.cpp4
-rw-r--r--korn/hvitem.h2
-rw-r--r--korn/imap_proto.cpp8
-rw-r--r--korn/keditlistboxman.cpp10
-rw-r--r--korn/keditlistboxman.h2
-rw-r--r--korn/kornaccountcfg.ui4
-rw-r--r--korn/kornaccountcfgimpl.cpp12
-rw-r--r--korn/kornaccountcfgimpl.h2
-rw-r--r--korn/kornapp.h2
-rw-r--r--korn/kornboxcfg.ui4
-rw-r--r--korn/kornboxcfgimpl.cpp10
-rw-r--r--korn/kornboxcfgimpl.h2
-rw-r--r--korn/korncfg.ui4
-rw-r--r--korn/korncfgimpl.cpp12
-rw-r--r--korn/korncfgimpl.h2
-rw-r--r--korn/kornshell.cpp14
-rw-r--r--korn/kornshell.h2
-rw-r--r--korn/label.h2
-rw-r--r--korn/maildlg.cpp12
-rw-r--r--korn/maildlg.h2
-rw-r--r--korn/maildrop.cpp2
-rw-r--r--korn/maildrop.h2
-rw-r--r--korn/mailsubject.cpp2
-rw-r--r--korn/nntp_proto.cpp4
-rw-r--r--korn/polldrop.h2
-rw-r--r--korn/pop3_proto.cpp8
-rw-r--r--korn/progress_dialog.ui8
-rw-r--r--korn/subjectsdlg.cpp64
-rw-r--r--korn/subjectsdlg.h2
-rw-r--r--korn/systemtray.h2
-rw-r--r--korn/tdeio.cpp8
-rw-r--r--korn/tdeio.h2
-rw-r--r--korn/tdeio_count.cpp28
-rw-r--r--korn/tdeio_count.h2
-rw-r--r--korn/tdeio_delete.cpp4
-rw-r--r--korn/tdeio_delete.h2
-rw-r--r--korn/tdeio_read.cpp4
-rw-r--r--korn/tdeio_read.h2
-rw-r--r--korn/tdeio_single_subject.cpp6
-rw-r--r--korn/tdeio_single_subject.h2
-rw-r--r--korn/tdeio_subjects.cpp4
-rw-r--r--korn/tdeio_subjects.h2
-rw-r--r--ktnef/gui/attachpropertydialog.cpp2
-rw-r--r--ktnef/gui/attachpropertydialogbase.ui4
-rw-r--r--ktnef/gui/ktnefmain.cpp48
-rw-r--r--ktnef/gui/ktnefmain.h2
-rw-r--r--ktnef/gui/ktnefview.cpp2
-rw-r--r--ktnef/gui/ktnefview.h2
-rw-r--r--ktnef/gui/messagepropertydialog.h2
-rw-r--r--ktnef/gui/qwmf.cpp56
-rw-r--r--ktnef/lib/ktnefmessage.cpp2
-rw-r--r--ktnef/lib/ktnefparser.cpp2
-rw-r--r--libemailfunctions/networkstatus.h2
-rw-r--r--libkcal/calendar.h2
-rw-r--r--libkcal/calendarresources.cpp20
-rw-r--r--libkcal/calendarresources.h2
-rw-r--r--libkcal/calhelper.cpp2
-rw-r--r--libkcal/calselectdialog.cpp8
-rw-r--r--libkcal/icalformatimpl.cpp15
-rw-r--r--libkcal/incidenceformatter.cpp2
-rw-r--r--libkcal/resourcecached.cpp4
-rw-r--r--libkcal/resourcecached.h2
-rw-r--r--libkcal/resourcecachedconfig.cpp12
-rw-r--r--libkcal/resourcecachedconfig.h4
-rw-r--r--libkcal/resourcecalendar.h2
-rw-r--r--libkcal/resourcelocal.cpp12
-rw-r--r--libkcal/resourcelocal.h2
-rw-r--r--libkcal/resourcelocalconfig.cpp2
-rw-r--r--libkcal/resourcelocalconfig.h2
-rw-r--r--libkcal/resourcelocaldir.cpp12
-rw-r--r--libkcal/resourcelocaldir.h2
-rw-r--r--libkcal/resourcelocaldirconfig.h2
-rw-r--r--libkcal/tests/testresource.h2
-rw-r--r--libkholidays/holidays/holiday_ua220
-rw-r--r--libkmime/kmime_header_parsing.cpp8
-rw-r--r--libkpgp/kpgpui.cpp92
-rw-r--r--libkpgp/kpgpui.h16
-rw-r--r--libkpimexchange/core/README.download4
-rw-r--r--libkpimexchange/core/exchangeaccount.cpp4
-rw-r--r--libkpimexchange/core/exchangeaccount.h2
-rw-r--r--libkpimexchange/core/exchangeclient.cpp44
-rw-r--r--libkpimexchange/core/exchangeclient.h2
-rw-r--r--libkpimexchange/core/exchangedelete.cpp4
-rw-r--r--libkpimexchange/core/exchangedelete.h2
-rw-r--r--libkpimexchange/core/exchangedownload.cpp38
-rw-r--r--libkpimexchange/core/exchangedownload.h2
-rw-r--r--libkpimexchange/core/exchangemonitor.cpp16
-rw-r--r--libkpimexchange/core/exchangemonitor.h2
-rw-r--r--libkpimexchange/core/exchangeprogress.h2
-rw-r--r--libkpimexchange/core/exchangeupload.cpp20
-rw-r--r--libkpimexchange/core/exchangeupload.h2
-rw-r--r--libkpimidentities/identitycombo.cpp6
-rw-r--r--libkpimidentities/identitycombo.h2
-rw-r--r--libkpimidentities/identitymanager.h2
-rw-r--r--libksieve/parser/lexer.cpp6
-rw-r--r--libtdenetwork/qgpgme/eventloopinteractor.cpp8
-rw-r--r--libtdenetwork/qgpgme/eventloopinteractor.h2
-rw-r--r--libtdepim/addresseelineedit.cpp50
-rw-r--r--libtdepim/addresseelineedit.h2
-rw-r--r--libtdepim/addresseeselector.cpp44
-rw-r--r--libtdepim/addresseeselector.h4
-rw-r--r--libtdepim/addresseeview.cpp42
-rw-r--r--libtdepim/addresseeview.h2
-rw-r--r--libtdepim/addressesdialog.cpp108
-rw-r--r--libtdepim/addressesdialog.h4
-rw-r--r--libtdepim/addresspicker.ui3
-rw-r--r--libtdepim/broadcaststatus.h2
-rw-r--r--libtdepim/categoryeditdialog.cpp6
-rw-r--r--libtdepim/categoryeditdialog.h2
-rw-r--r--libtdepim/categoryselectdialog.cpp8
-rw-r--r--libtdepim/categoryselectdialog.h2
-rw-r--r--libtdepim/cfgc/example.cfg4
-rw-r--r--libtdepim/clicklineedit.h2
-rw-r--r--libtdepim/collectingprocess.cpp16
-rw-r--r--libtdepim/collectingprocess.h2
-rw-r--r--libtdepim/completionordereditor.cpp12
-rw-r--r--libtdepim/completionordereditor.h2
-rw-r--r--libtdepim/configmanager.h2
-rw-r--r--libtdepim/designerfields.cpp108
-rw-r--r--libtdepim/designerfields.h2
-rw-r--r--libtdepim/distributionlist.cpp2
-rw-r--r--libtdepim/embeddedurlpage.cpp8
-rw-r--r--libtdepim/embeddedurlpage.h2
-rw-r--r--libtdepim/infoextension.h2
-rw-r--r--libtdepim/kcmdesignerfields.cpp50
-rw-r--r--libtdepim/kcmdesignerfields.h2
-rw-r--r--libtdepim/kdateedit.cpp20
-rw-r--r--libtdepim/kdateedit.h2
-rw-r--r--libtdepim/kdatepickerpopup.cpp18
-rw-r--r--libtdepim/kdatepickerpopup.h2
-rw-r--r--libtdepim/kfoldertree.cpp6
-rw-r--r--libtdepim/kfoldertree.h2
-rw-r--r--libtdepim/kimportdialog.cpp38
-rw-r--r--libtdepim/kimportdialog.h2
-rw-r--r--libtdepim/kincidencechooser.cpp22
-rw-r--r--libtdepim/kincidencechooser.h2
-rw-r--r--libtdepim/kmailcompletion.h2
-rw-r--r--libtdepim/komposer/core/core.cpp28
-rw-r--r--libtdepim/komposer/core/core.h2
-rw-r--r--libtdepim/komposer/core/corewidget.h2
-rw-r--r--libtdepim/komposer/core/editor.h2
-rw-r--r--libtdepim/komposer/core/plugin.h2
-rw-r--r--libtdepim/komposer/core/pluginmanager.cpp20
-rw-r--r--libtdepim/komposer/core/pluginmanager.h2
-rw-r--r--libtdepim/komposer/core/prefsmodule.cpp4
-rw-r--r--libtdepim/komposer/core/prefsmodule.h4
-rw-r--r--libtdepim/komposer/core/tests/managertest.h2
-rw-r--r--libtdepim/komposer/core/tests/testmanager.cpp8
-rw-r--r--libtdepim/komposer/core/tests/testmanager.h2
-rw-r--r--libtdepim/komposer/plugins/default/defaulteditor.cpp96
-rw-r--r--libtdepim/komposer/plugins/default/defaulteditor.h2
-rw-r--r--libtdepim/kpixmapregionselectorwidget.cpp12
-rw-r--r--libtdepim/kpixmapregionselectorwidget.h2
-rw-r--r--libtdepim/kprefsdialog.cpp34
-rw-r--r--libtdepim/kprefsdialog.h10
-rw-r--r--libtdepim/krsqueezedtextlabel.h2
-rw-r--r--libtdepim/kscoring.cpp4
-rw-r--r--libtdepim/kscoring.h4
-rw-r--r--libtdepim/kscoringeditor.cpp78
-rw-r--r--libtdepim/kscoringeditor.h18
-rw-r--r--libtdepim/ksubscription.cpp32
-rw-r--r--libtdepim/ksubscription.h2
-rw-r--r--libtdepim/ktimeedit.cpp10
-rw-r--r--libtdepim/ktimeedit.h2
-rw-r--r--libtdepim/kvcarddrag.h2
-rw-r--r--libtdepim/kwidgetlister.cpp12
-rw-r--r--libtdepim/kwidgetlister.h2
-rw-r--r--libtdepim/kxface.h2
-rw-r--r--libtdepim/ldapclient.cpp30
-rw-r--r--libtdepim/ldapclient.h4
-rw-r--r--libtdepim/ldapsearchdialog.cpp40
-rw-r--r--libtdepim/ldapsearchdialog.h2
-rw-r--r--libtdepim/overlaywidget.cpp2
-rw-r--r--libtdepim/overlaywidget.h2
-rw-r--r--libtdepim/progressdialog.cpp50
-rw-r--r--libtdepim/progressdialog.h6
-rw-r--r--libtdepim/progressmanager.cpp32
-rw-r--r--libtdepim/progressmanager.h4
-rw-r--r--libtdepim/resourceabc.h2
-rw-r--r--libtdepim/sendsmsdialog.cpp8
-rw-r--r--libtdepim/sendsmsdialog.h2
-rw-r--r--libtdepim/sidebarextension.h2
-rw-r--r--libtdepim/statusbarprogresswidget.cpp40
-rw-r--r--libtdepim/statusbarprogresswidget.h2
-rw-r--r--libtdepim/tdeabcresourcecached.cpp4
-rw-r--r--libtdepim/tdeabcresourcecached.h2
-rw-r--r--libtdepim/tdeconfigwizard.cpp6
-rw-r--r--libtdepim/tdeconfigwizard.h2
-rw-r--r--libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp2
-rw-r--r--libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.h2
-rw-r--r--libtdepim/tests/testdateedit.cpp4
-rw-r--r--libtdepim/tests/testdateedit.h2
-rw-r--r--libtdepim/tests/testdistrlist.h2
-rw-r--r--libtdepim/weaver.h4
-rw-r--r--libtdepim/weaverextensions.cpp16
-rw-r--r--libtdepim/weaverextensions.h2
-rw-r--r--libtdepim/weaverlogger.h2
-rw-r--r--plugins/kmail/bodypartformatter/attendeeselector.cpp10
-rw-r--r--plugins/kmail/bodypartformatter/attendeeselector.h2
-rw-r--r--plugins/kmail/bodypartformatter/delegateselector.h2
-rw-r--r--tdeabc/frontend/main.cpp2
-rw-r--r--tdeabc/frontend/mainWindow.ui4
-rw-r--r--tdeabc/frontend/mainWindow.ui.h12
-rw-r--r--tdeabc/tdeabc2mutt/tdeabc2mutt.cpp4
-rw-r--r--tdeabc/tdeabc2mutt/tdeabc2mutt.h2
-rw-r--r--tdefile-plugins/ics/tdefile_ics.h2
-rw-r--r--tdefile-plugins/palm-databases/tdefile_palm.h2
-rw-r--r--tdefile-plugins/rfc822/tdefile_rfc822.h2
-rw-r--r--tdefile-plugins/vcf/tdefile_vcf.h2
-rw-r--r--tdeioslave/opengroupware/opengroupware.cpp4
-rw-r--r--tdeioslave/opengroupware/opengroupware.h2
-rw-r--r--tderesources/birthdays/resourcetdeabc.cpp8
-rw-r--r--tderesources/birthdays/resourcetdeabc.h2
-rw-r--r--tderesources/birthdays/resourcetdeabcconfig.cpp6
-rw-r--r--tderesources/birthdays/resourcetdeabcconfig.h2
-rw-r--r--tderesources/blogging/API_Blog.h2
-rw-r--r--tderesources/blogging/bloggingcalendaradaptor.cpp16
-rw-r--r--tderesources/blogging/bloggingcalendaradaptor.h2
-rw-r--r--tderesources/blogging/kcal_resourceblogging.h2
-rw-r--r--tderesources/blogging/kcal_resourcebloggingconfig.h2
-rw-r--r--tderesources/blogging/xmlrpcjob.h2
-rw-r--r--tderesources/caldav/config.cpp8
-rw-r--r--tderesources/caldav/config.h2
-rw-r--r--tderesources/caldav/configwidgets.cpp12
-rw-r--r--tderesources/caldav/configwidgets.h4
-rw-r--r--tderesources/caldav/resource.cpp10
-rw-r--r--tderesources/caldav/resource.h2
-rw-r--r--tderesources/carddav/config.h2
-rw-r--r--tderesources/carddav/configwidgets.cpp12
-rw-r--r--tderesources/carddav/configwidgets.h4
-rw-r--r--tderesources/carddav/resource.cpp8
-rw-r--r--tderesources/carddav/resource.h2
-rw-r--r--tderesources/egroupware/debugdialog.h2
-rw-r--r--tderesources/egroupware/kcal_resourcexmlrpc.cpp56
-rw-r--r--tderesources/egroupware/kcal_resourcexmlrpc.h2
-rw-r--r--tderesources/egroupware/kcal_resourcexmlrpcconfig.h2
-rw-r--r--tderesources/egroupware/knotes_resourcexmlrpc.cpp20
-rw-r--r--tderesources/egroupware/knotes_resourcexmlrpc.h2
-rw-r--r--tderesources/egroupware/knotes_resourcexmlrpcconfig.h2
-rw-r--r--tderesources/egroupware/synchronizer.h4
-rw-r--r--tderesources/egroupware/tdeabc_resourcexmlrpc.cpp32
-rw-r--r--tderesources/egroupware/tdeabc_resourcexmlrpc.h2
-rw-r--r--tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h2
-rw-r--r--tderesources/egroupware/xmlrpciface.cpp18
-rw-r--r--tderesources/egroupware/xmlrpciface.h4
-rw-r--r--tderesources/exchange/resourceexchange.cpp12
-rw-r--r--tderesources/exchange/resourceexchange.h2
-rw-r--r--tderesources/exchange/resourceexchangeconfig.cpp6
-rw-r--r--tderesources/exchange/resourceexchangeconfig.h2
-rw-r--r--tderesources/featureplan/kcal_resourcefeatureplan.h2
-rw-r--r--tderesources/featureplan/kcal_resourcefeatureplanconfig.h2
-rw-r--r--tderesources/groupdav/kcal_resourcegroupdav.h2
-rw-r--r--tderesources/groupdav/tdeabc_resourcegroupdav.h2
-rw-r--r--tderesources/groupware/kcal_resourcegroupware.cpp12
-rw-r--r--tderesources/groupware/kcal_resourcegroupware.h2
-rw-r--r--tderesources/groupware/kcal_resourcegroupwareconfig.h2
-rw-r--r--tderesources/groupware/tdeabc_resourcegroupware.cpp16
-rw-r--r--tderesources/groupware/tdeabc_resourcegroupware.h2
-rw-r--r--tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp2
-rw-r--r--tderesources/groupware/tdeabc_resourcegroupwareconfig.h2
-rw-r--r--tderesources/groupwise/groupwisesettingswidget.cpp4
-rw-r--r--tderesources/groupwise/groupwisesettingswidget.h2
-rw-r--r--tderesources/groupwise/kcal_resourcegroupwise.cpp12
-rw-r--r--tderesources/groupwise/kcal_resourcegroupwise.h2
-rw-r--r--tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp4
-rw-r--r--tderesources/groupwise/kcal_resourcegroupwiseconfig.h2
-rw-r--r--tderesources/groupwise/soap/groupwiseserver.cpp2
-rw-r--r--tderesources/groupwise/soap/groupwiseserver.h2
-rw-r--r--tderesources/groupwise/soap/gwconverter.cpp12
-rw-r--r--tderesources/groupwise/soap/incidenceconverter.cpp6
-rw-r--r--tderesources/groupwise/soap/ksslsocket.cpp6
-rw-r--r--tderesources/groupwise/soap/ksslsocket.h2
-rw-r--r--tderesources/groupwise/soap/stdsoap2.cpp3
-rw-r--r--tderesources/groupwise/soap/stdsoap2.h31
-rw-r--r--tderesources/groupwise/tdeabc_resourcegroupwise.cpp32
-rw-r--r--tderesources/groupwise/tdeabc_resourcegroupwise.h4
-rw-r--r--tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp2
-rw-r--r--tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h2
-rw-r--r--tderesources/groupwise/tdeioslave/groupwise.cpp24
-rw-r--r--tderesources/groupwise/tdeioslave/groupwise.h2
-rw-r--r--tderesources/kolab/kcal/resourcekolab.cpp10
-rw-r--r--tderesources/kolab/kcal/resourcekolab.h2
-rw-r--r--tderesources/kolab/knotes/resourcekolab.h2
-rw-r--r--tderesources/kolab/shared/kmailconnection.cpp4
-rw-r--r--tderesources/kolab/shared/kmailconnection.h2
-rw-r--r--tderesources/kolab/shared/kolabbase.cpp10
-rw-r--r--tderesources/kolab/tdeabc/resourcekolab.h2
-rw-r--r--tderesources/lib/calendaradaptor.h2
-rw-r--r--tderesources/lib/folderconfig.cpp6
-rw-r--r--tderesources/lib/folderconfig.h2
-rw-r--r--tderesources/lib/folderlister.cpp12
-rw-r--r--tderesources/lib/folderlister.h2
-rw-r--r--tderesources/lib/folderlistview.cpp26
-rw-r--r--tderesources/lib/folderlistview.h2
-rw-r--r--tderesources/lib/folderselectdialog.cpp8
-rw-r--r--tderesources/lib/groupwaredataadaptor.h2
-rw-r--r--tderesources/lib/groupwaredownloadjob.cpp36
-rw-r--r--tderesources/lib/groupwaredownloadjob.h2
-rw-r--r--tderesources/lib/groupwareresourcejob.cpp2
-rw-r--r--tderesources/lib/groupwareresourcejob.h2
-rw-r--r--tderesources/lib/groupwareuploadjob.cpp62
-rw-r--r--tderesources/lib/groupwareuploadjob.h2
-rw-r--r--tderesources/lib/kcal_cachesettingsdlg.h2
-rw-r--r--tderesources/lib/kcal_resourcegroupwarebase.cpp22
-rw-r--r--tderesources/lib/kcal_resourcegroupwarebase.h2
-rw-r--r--tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp8
-rw-r--r--tderesources/lib/kcal_resourcegroupwarebaseconfig.h2
-rw-r--r--tderesources/lib/tdeabc_resourcegroupwarebase.cpp8
-rw-r--r--tderesources/lib/tdeabc_resourcegroupwarebase.h2
-rw-r--r--tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp4
-rw-r--r--tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h2
-rw-r--r--tderesources/lib/webdavhandler.cpp2
-rw-r--r--tderesources/newexchange/exchangecalendaradaptor.cpp2
-rw-r--r--tderesources/newexchange/exchangeconvertercalendar.cpp16
-rw-r--r--tderesources/newexchange/kcal_resourceexchange.h2
-rw-r--r--tderesources/newexchange/tdeabc_resourceexchange.h2
-rw-r--r--tderesources/remote/resourceremote.cpp12
-rw-r--r--tderesources/remote/resourceremote.h2
-rw-r--r--tderesources/remote/resourceremoteconfig.h2
-rw-r--r--tderesources/scalix/kcal/resourcescalix.cpp6
-rw-r--r--tderesources/scalix/kcal/resourcescalix.h2
-rw-r--r--tderesources/scalix/knotes/resourcescalix.h2
-rw-r--r--tderesources/scalix/scalixadmin/delegatedialog.cpp2
-rw-r--r--tderesources/scalix/scalixadmin/delegatedialog.h2
-rw-r--r--tderesources/scalix/scalixadmin/delegatemanager.h2
-rw-r--r--tderesources/scalix/scalixadmin/delegatepage.cpp16
-rw-r--r--tderesources/scalix/scalixadmin/delegatepage.h2
-rw-r--r--tderesources/scalix/scalixadmin/delegateview.cpp2
-rw-r--r--tderesources/scalix/scalixadmin/delegateview.h2
-rw-r--r--tderesources/scalix/scalixadmin/jobs.cpp12
-rw-r--r--tderesources/scalix/scalixadmin/jobs.h6
-rw-r--r--tderesources/scalix/scalixadmin/ldapview.cpp8
-rw-r--r--tderesources/scalix/scalixadmin/ldapview.h2
-rw-r--r--tderesources/scalix/scalixadmin/otherusermanager.h2
-rw-r--r--tderesources/scalix/scalixadmin/otheruserpage.cpp12
-rw-r--r--tderesources/scalix/scalixadmin/otheruserpage.h2
-rw-r--r--tderesources/scalix/scalixadmin/otheruserview.cpp2
-rw-r--r--tderesources/scalix/scalixadmin/otheruserview.h2
-rw-r--r--tderesources/scalix/scalixadmin/outofofficepage.cpp14
-rw-r--r--tderesources/scalix/scalixadmin/outofofficepage.h2
-rw-r--r--tderesources/scalix/scalixadmin/passwordpage.cpp8
-rw-r--r--tderesources/scalix/scalixadmin/passwordpage.h2
-rw-r--r--tderesources/scalix/shared/kmailconnection.cpp4
-rw-r--r--tderesources/scalix/shared/kmailconnection.h2
-rw-r--r--tderesources/scalix/shared/scalixbase.cpp8
-rw-r--r--tderesources/scalix/tdeabc/contact.cpp8
-rw-r--r--tderesources/scalix/tdeabc/resourcescalix.h2
-rw-r--r--tderesources/scalix/tdeioslave/scalix.cpp12
-rw-r--r--tderesources/scalix/tdeioslave/scalix.h2
-rw-r--r--tderesources/slox/kcalresourceslox.cpp36
-rw-r--r--tderesources/slox/kcalresourceslox.h2
-rw-r--r--tderesources/slox/kcalresourcesloxconfig.cpp4
-rw-r--r--tderesources/slox/kcalresourcesloxconfig.h2
-rw-r--r--tderesources/slox/sloxaccounts.cpp4
-rw-r--r--tderesources/slox/sloxaccounts.h2
-rw-r--r--tderesources/slox/sloxfolderdialog.cpp2
-rw-r--r--tderesources/slox/sloxfolderdialog.h2
-rw-r--r--tderesources/slox/sloxfoldermanager.cpp4
-rw-r--r--tderesources/slox/sloxfoldermanager.h2
-rw-r--r--tderesources/slox/tdeabcresourceslox.cpp28
-rw-r--r--tderesources/slox/tdeabcresourceslox.h2
-rw-r--r--tderesources/slox/tdeabcresourcesloxconfig.cpp2
-rw-r--r--tderesources/slox/tdeabcresourcesloxconfig.h2
-rw-r--r--tderesources/slox/testsloxaccounts.cpp2
-rw-r--r--tderesources/slox/webdavhandler.cpp4
-rw-r--r--tderesources/tvanytime/kcal_resourcetvanytime.cpp12
-rw-r--r--tderesources/tvanytime/kcal_resourcetvanytime.h2
-rw-r--r--tderesources/tvanytime/kcal_resourcetvanytimeconfig.h2
-rw-r--r--translations/desktop_files/kaddressbook-desktops/it.po71
-rw-r--r--translations/desktop_files/kalarm-desktops/it.po16
-rw-r--r--translations/desktop_files/kitchensync.desktop/af.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/bg.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/ca.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/cs.po28
-rw-r--r--translations/desktop_files/kitchensync.desktop/cy.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/da.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/de.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/el.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/eo.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/es.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/et.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/eu.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/fa.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/fi.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/fr.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/fy.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/ga.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/gl.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/he.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/hu.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/is.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/it.po28
-rw-r--r--translations/desktop_files/kitchensync.desktop/ja.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/kitchensync.desktop.pot27
-rw-r--r--translations/desktop_files/kitchensync.desktop/kk.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/km.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/lt.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/ms.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/nb.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/nds.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/nl.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/nn.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/pl.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/pt.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/pt_BR.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/ru.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/sk.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/sl.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/sr.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/sr@Latn.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/sv.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/ta.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/tr.po27
-rw-r--r--translations/desktop_files/kitchensync.desktop/uk.po29
-rw-r--r--translations/desktop_files/kitchensync.desktop/zh_CN.po27
-rw-r--r--translations/desktop_files/kmail-desktops/it.po21
-rw-r--r--translations/desktop_files/kmobile-desktops/it.po18
-rw-r--r--translations/desktop_files/knode-desktops/it.po15
-rw-r--r--translations/desktop_files/kontact-desktops/af.po10
-rw-r--r--translations/desktop_files/kontact-desktops/ar.po10
-rw-r--r--translations/desktop_files/kontact-desktops/az.po10
-rw-r--r--translations/desktop_files/kontact-desktops/be.po10
-rw-r--r--translations/desktop_files/kontact-desktops/bg.po10
-rw-r--r--translations/desktop_files/kontact-desktops/br.po10
-rw-r--r--translations/desktop_files/kontact-desktops/bs.po10
-rw-r--r--translations/desktop_files/kontact-desktops/ca.po10
-rw-r--r--translations/desktop_files/kontact-desktops/cs.po10
-rw-r--r--translations/desktop_files/kontact-desktops/cy.po10
-rw-r--r--translations/desktop_files/kontact-desktops/da.po10
-rw-r--r--translations/desktop_files/kontact-desktops/de.po10
-rw-r--r--translations/desktop_files/kontact-desktops/el.po10
-rw-r--r--translations/desktop_files/kontact-desktops/eo.po10
-rw-r--r--translations/desktop_files/kontact-desktops/es.po10
-rw-r--r--translations/desktop_files/kontact-desktops/et.po10
-rw-r--r--translations/desktop_files/kontact-desktops/eu.po10
-rw-r--r--translations/desktop_files/kontact-desktops/fa.po10
-rw-r--r--translations/desktop_files/kontact-desktops/fi.po10
-rw-r--r--translations/desktop_files/kontact-desktops/fr.po10
-rw-r--r--translations/desktop_files/kontact-desktops/fy.po10
-rw-r--r--translations/desktop_files/kontact-desktops/ga.po10
-rw-r--r--translations/desktop_files/kontact-desktops/gl.po10
-rw-r--r--translations/desktop_files/kontact-desktops/he.po10
-rw-r--r--translations/desktop_files/kontact-desktops/hi.po10
-rw-r--r--translations/desktop_files/kontact-desktops/hr.po10
-rw-r--r--translations/desktop_files/kontact-desktops/hu.po10
-rw-r--r--translations/desktop_files/kontact-desktops/id.po10
-rw-r--r--translations/desktop_files/kontact-desktops/is.po10
-rw-r--r--translations/desktop_files/kontact-desktops/it.po50
-rw-r--r--translations/desktop_files/kontact-desktops/ja.po10
-rw-r--r--translations/desktop_files/kontact-desktops/kk.po10
-rw-r--r--translations/desktop_files/kontact-desktops/km.po10
-rw-r--r--translations/desktop_files/kontact-desktops/kontact-desktops.pot10
-rw-r--r--translations/desktop_files/kontact-desktops/lt.po10
-rw-r--r--translations/desktop_files/kontact-desktops/lv.po10
-rw-r--r--translations/desktop_files/kontact-desktops/mk.po10
-rw-r--r--translations/desktop_files/kontact-desktops/ms.po10
-rw-r--r--translations/desktop_files/kontact-desktops/nb.po10
-rw-r--r--translations/desktop_files/kontact-desktops/nds.po10
-rw-r--r--translations/desktop_files/kontact-desktops/ne.po10
-rw-r--r--translations/desktop_files/kontact-desktops/nl.po10
-rw-r--r--translations/desktop_files/kontact-desktops/nn.po10
-rw-r--r--translations/desktop_files/kontact-desktops/nso.po10
-rw-r--r--translations/desktop_files/kontact-desktops/pa.po10
-rw-r--r--translations/desktop_files/kontact-desktops/pl.po10
-rw-r--r--translations/desktop_files/kontact-desktops/pt.po10
-rw-r--r--translations/desktop_files/kontact-desktops/pt_BR.po10
-rw-r--r--translations/desktop_files/kontact-desktops/ro.po10
-rw-r--r--translations/desktop_files/kontact-desktops/ru.po10
-rw-r--r--translations/desktop_files/kontact-desktops/rw.po10
-rw-r--r--translations/desktop_files/kontact-desktops/se.po10
-rw-r--r--translations/desktop_files/kontact-desktops/sk.po10
-rw-r--r--translations/desktop_files/kontact-desktops/sl.po10
-rw-r--r--translations/desktop_files/kontact-desktops/sr.po10
-rw-r--r--translations/desktop_files/kontact-desktops/sr@Latn.po10
-rw-r--r--translations/desktop_files/kontact-desktops/sv.po10
-rw-r--r--translations/desktop_files/kontact-desktops/ta.po10
-rw-r--r--translations/desktop_files/kontact-desktops/tg.po10
-rw-r--r--translations/desktop_files/kontact-desktops/th.po10
-rw-r--r--translations/desktop_files/kontact-desktops/tr.po10
-rw-r--r--translations/desktop_files/kontact-desktops/uk.po10
-rw-r--r--translations/desktop_files/kontact-desktops/uz.po10
-rw-r--r--translations/desktop_files/kontact-desktops/ven.po10
-rw-r--r--translations/desktop_files/kontact-desktops/vi.po10
-rw-r--r--translations/desktop_files/kontact-desktops/xh.po10
-rw-r--r--translations/desktop_files/kontact-desktops/zh_CN.po10
-rw-r--r--translations/desktop_files/kontact-desktops/zh_TW.po10
-rw-r--r--translations/desktop_files/kontact-desktops/zu.po10
-rw-r--r--wizards/groupwarewizard.cpp4
-rw-r--r--wizards/groupwarewizard.h2
-rw-r--r--wizards/groupwisewizard.cpp10
-rw-r--r--wizards/groupwisewizard.h2
-rw-r--r--wizards/overviewpage.cpp10
-rw-r--r--wizards/overviewpage.h2
-rw-r--r--wizards/servertypemanager.h2
1898 files changed, 11159 insertions, 26305 deletions
diff --git a/CMakeL10n.txt b/CMakeL10n.txt
index af2a7034..9a2066a1 100644
--- a/CMakeL10n.txt
+++ b/CMakeL10n.txt
@@ -9,7 +9,11 @@
#
#################################################
-cmake_minimum_required( VERSION 3.1 )
+
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
##### include our cmake modules #################
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1171d5cb..ca0b5652 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,12 @@
#
#################################################
-cmake_minimum_required( VERSION 3.1 )
+
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
+tde_set_project_version( )
##### general package setup #####################
@@ -35,11 +40,6 @@ enable_testing( )
include( TDEMacros )
-##### set version number ########################
-
-tde_set_project_version( )
-
-
##### setup install paths #######################
include( TDESetupPaths )
@@ -48,14 +48,8 @@ tde_setup_paths( )
##### add apidox targets ############
-if( "${CMAKE_VERSION}" VERSION_LESS "3.1" )
- set( CMAKE_ENV "env" )
-else()
- set( CMAKE_ENV "${CMAKE_COMMAND};-E;env" )
-endif()
-
add_custom_target( apidox
- COMMAND ${CMAKE_ENV}
+ COMMAND ${CMAKE_COMMAND} -E env
"TQTDOCDIR=/usr/share/tqt3/doc/html"
"DOXDATA=${HTML_INSTALL_DIR}/en/common"
${CMAKE_SOURCE_DIR}/admin/doxygen.sh
@@ -197,9 +191,6 @@ option( BUILD_KMOBILE "Build kmobile" ${BUILD_ALL} )
option( BUILD_DOC "Build doc" ${BUILD_ALL} )
option( BUILD_KONTACT "Build kontact" ${BUILD_ALL} )
-# deprecated
-option( BUILD_KITCHENSYNC "Build kitchensync" OFF )
-
##### configure checks ##########################
@@ -269,8 +260,6 @@ tde_conditional_add_subdirectory( BUILD_KMOBILE kmobile )
tde_conditional_add_subdirectory( BUILD_DOC doc )
tde_conditional_add_subdirectory( BUILD_KONTACT kontact )
-# deprecated
-tde_conditional_add_subdirectory( BUILD_KITCHENSYNC kitchensync )
##### write configure files #####################
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 2f158cd9..67500f42 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -67,92 +67,90 @@ if( WITH_GNOKII AND (BUILD_KADDRESSBOOK OR BUILD_KMOBILE) )
endif( )
-if( BUILD_LIBTDENETWORK OR BUILD_CERTMANAGER OR BUILD_KMAIL OR BUILD_KADDRESSBOOK OR BUILD_KONTACT )
+if( (BUILD_LIBTDENETWORK OR BUILD_CERTMANAGER OR BUILD_KMAIL OR BUILD_KADDRESSBOOK OR BUILD_KONTACT) AND NOT HAVE_GPGME_0_4_BRANCH )
- if( NOT HAVE_GPGME_0_4_BRANCH )
- message( STATUS "checking for 'gpgme'" )
- endif( )
+ message( STATUS "checking for 'gpgme'" )
- # find gpgme-config
- find_program( GPGME_EXECUTABLE NAMES gpgme-config )
- if( NOT GPGME_EXECUTABLE )
- tde_message_fatal( "gpgme-config was NOT found.\n gpgme library is installed?" )
- endif( )
+ # check for gpgme
+ pkg_search_module( GPGME gpgme )
+ if( NOT GPGME_FOUND )
- # find gpg-error-config
- find_program( GPG_ERR_EXECUTABLE NAMES gpg-error-config )
- if( NOT GPG_ERR_EXECUTABLE )
- tde_message_fatal( "gpg-error-config was NOT found.\n gpg-error library is installed?" )
- endif( )
+ # find gpgme-config
+ find_program( GPGME_EXECUTABLE NAMES gpgme-config )
+ if( NOT GPGME_EXECUTABLE )
+ tde_message_fatal( "gpgme-config was NOT found.\n gpgme library is installed?" )
+ endif( )
- macro( __run_gpgme_config __type __var )
- execute_process(
- COMMAND ${GPGME_EXECUTABLE} --${__type}
- OUTPUT_VARIABLE ${__var}
- RESULT_VARIABLE __result
- OUTPUT_STRIP_TRAILING_WHITESPACE )
- if( _result )
- tde_message_fatal( "Unable to run ${GPGME_EXECUTABLE}!\n gpgme library incorrectly installed?\n Path to gpgme-config incorrect?" )
+ macro( __run_gpgme_config __type __var )
+ execute_process(
+ COMMAND ${GPGME_EXECUTABLE} --${__type}
+ OUTPUT_VARIABLE ${__var}
+ RESULT_VARIABLE __result
+ OUTPUT_STRIP_TRAILING_WHITESPACE )
+ if( _result )
+ tde_message_fatal( "Unable to run ${GPGME_EXECUTABLE}!\n gpgme library incorrectly installed?\n Path to gpgme-config incorrect?" )
+ endif( )
+ endmacro( )
+
+ __run_gpgme_config( version GPGME_VERSION )
+ __run_gpgme_config( cflags GPGME_INCLUDE_DIRS )
+ __run_gpgme_config( libs GPGME_LIBRARIES )
+
+ if( GPGME_INCLUDE_DIRS )
+ string( REGEX REPLACE "(^| +)-I" ";" GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS}" )
endif( )
- endmacro( )
-
- macro( __run_gpgerr_config __type __var )
- execute_process(
- COMMAND ${GPG_ERR_EXECUTABLE} --${__type}
- OUTPUT_VARIABLE ${__var}
- RESULT_VARIABLE __result
- OUTPUT_STRIP_TRAILING_WHITESPACE )
- if( _result )
- tde_message_fatal( "Unable to run ${GPG_ERR_EXECUTABLE}!\n gpg-error library incorrectly installed?\n Path to gpgme-config are incorrect?" )
+ if( GPGME_LIBRARIES )
+ string( REGEX REPLACE "(^| +)-l" ";" GPGME_LIBRARIES "${GPGME_LIBRARIES}" )
endif( )
- endmacro( )
- __run_gpgme_config( version GPGME_VERSION )
- __run_gpgme_config( cflags GPGME_INCLUDE_DIRS )
- __run_gpgme_config( libs GPGME_LIBRARIES )
+ endif()
- __run_gpgerr_config( version GPGERR_VERSION )
- __run_gpgerr_config( cflags GPGERR_INCLUDE_DIRS )
- __run_gpgerr_config( libs GPGERR_LIBRARIES )
+ # check for gpg-error
+ pkg_search_module( GPGERR gpg-error )
+ if( NOT GPGERR_FOUND )
- # cleanup
- if( GPGME_INCLUDE_DIRS )
- string( REGEX REPLACE "(^| )-I" ";" GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS}" )
- endif( )
- if( GPGME_LIBRARIES )
- string( REGEX REPLACE "(^| )-l" ";" GPGME_LIBRARIES "${GPGME_LIBRARIES}" )
- endif( )
- if( GPGERR_INCLUDE_DIRS )
- string( REGEX REPLACE "(^| )-I" ";" GPGERR_INCLUDE_DIRS "${GPGERR_INCLUDE_DIRS}" )
- endif( )
- if( GPGERR_LIBRARIES )
- string( REGEX REPLACE "(^| )-l" ";" GPGERR_LIBRARIES "${GPGERR_LIBRARIES}" )
- endif( )
- set( GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS} ${GPGERR_INCLUDE_DIRS}" CACHE INTERNAL "" FORCE )
- set( GPGME_LIBRARIES "${GPGME_LIBRARIES} ${GPGERR_LIBRARIES}" CACHE INTERNAL "" FORCE )
- string( REGEX REPLACE " ;" ";" GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS}" )
- string( REGEX REPLACE " ;" ";" GPGME_LIBRARIES "${GPGME_LIBRARIES}" )
- set( GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS}" CACHE INTERNAL "" FORCE )
- set( GPGME_LIBRARIES "${GPGME_LIBRARIES}" CACHE INTERNAL "" FORCE )
+ # find gpg-error-config
+ find_program( GPG_ERR_EXECUTABLE NAMES gpgrt-config gpg-error-config )
+ if( NOT GPG_ERR_EXECUTABLE )
+ tde_message_fatal( "gpgrt-config or gpg-error-config was NOT found.\n gpg-error library is installed?" )
+ endif( )
- # assuming that all newer system have gpgme >= 0.4
- set( HAVE_GPGME_0_4_BRANCH 1 CACHE INTERNAL "" )
+ macro( __run_gpgerr_config __type __var )
+ execute_process(
+ COMMAND ${GPG_ERR_EXECUTABLE} --${__type}
+ OUTPUT_VARIABLE ${__var}
+ RESULT_VARIABLE __result
+ OUTPUT_STRIP_TRAILING_WHITESPACE )
+ if( _result )
+ tde_message_fatal( "Unable to run ${GPG_ERR_EXECUTABLE}!\n gpg-error library incorrectly installed?\n Path to gpgme-config are incorrect?" )
+ endif( )
+ endmacro( )
+
+ __run_gpgerr_config( version GPGERR_VERSION )
+ __run_gpgerr_config( cflags GPGERR_INCLUDE_DIRS )
+ __run_gpgerr_config( libs GPGERR_LIBRARIES )
+
+ if( GPGERR_INCLUDE_DIRS )
+ string( REGEX REPLACE "(^| +)-I" ";" GPGERR_INCLUDE_DIRS "${GPGERR_INCLUDE_DIRS}" )
+ endif( )
+ if( GPGERR_LIBRARIES )
+ string( REGEX REPLACE "(^| +)-l" ";" GPGERR_LIBRARIES "${GPGERR_LIBRARIES}" )
+ endif( )
- # NOTE: assume we have largefile support (need for gpgme)
- # FIXME: to be sure, we must check it
- add_definitions( -D_FILE_OFFSET_BITS=64 )
+ endif()
- if( NOT HAVE_GPGME_0_4_BRANCH )
- message( STATUS " found 'gpgme', version ${GPGME_VERSION}" )
- endif( )
+ # assuming that all newer system have gpgme >= 0.4
+ set( GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS};${GPGERR_INCLUDE_DIRS}" CACHE INTERNAL "" FORCE )
+ set( GPGME_LIBRARIES "${GPGME_LIBRARIES};${GPGERR_LIBRARIES}" CACHE INTERNAL "" FORCE )
+ set( HAVE_GPGME_0_4_BRANCH 1 CACHE INTERNAL "" )
+ message( STATUS " found 'gpgme', version ${GPGME_VERSION}" )
# check for various GPGME features
tde_save( CMAKE_CXX_FLAGS )
tde_save( CMAKE_REQUIRED_INCLUDES )
tde_save( CMAKE_REQUIRED_LIBRARIES )
string( REGEX REPLACE "-include tqt.h" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" )
- # See FIXME above regarding -D_FILE_OFFSET_BITS=64
- set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FILE_OFFSET_BITS=64")
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LARGEFILES_DEFINITIONS}")
set( CMAKE_REQUIRED_INCLUDES "${GPGME_INCLUDE_DIRS}")
set( CMAKE_REQUIRED_LIBRARIES "${GPGME_LIBRARIES}")
diff --git a/MAINTAINERS b/MAINTAINERS
index 3a2dc538..02a29d9f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10,8 +10,6 @@ kdgantt Kalle Dalheimer <kalle@klaralvdalens-datakonsult.se>
tdefile-plugins ?
kgantt ? Jochen Hanff <jochen@ifb.bv.tu-berlin.de>
tdeioslaves ? Marc Mutz <mutz@kde.org>
-kitchensync Cornelius Schumacher <schumacher@kde.org>
- Holger Freyther <freyther@kde.org>
kmail Ingo Kloecker <kloecker@kde.org>
Don Sanders <sanders@kde.org>
kmailcvt Danny Kukawka <danny.kukawka@web.de>
diff --git a/Mainpage.dox b/Mainpage.dox
index cd48b5e7..7cc18a94 100644
--- a/Mainpage.dox
+++ b/Mainpage.dox
@@ -34,9 +34,6 @@
* - <a href="kgantt/html/index.html"><b>kgantt</b></a>
* (<a href="kgantt/html/classes.html">classes</a>)\n
* <i></i>
- * - <a href="kitchensync/html/index.html"><b>kitchensync</b></a>
- * (<a href="kitchensync/html/classes.html">classes</a>)\n
- * <i>Generic Syncing.</i>
* - <a href="kmail/html/index.html"><b>kmail</b></a>
* (<a href="kmail/html/classes.html">classes</a>)\n
* <i>A fully-featured email client.</i>
diff --git a/Makefile.am.in b/Makefile.am.in
index 929b518c..c0c3b35e 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -11,7 +11,7 @@
COMPILE_AFTER_libkmime = libemailfunctions
COMPILE_AFTER_libemailfunctions = libkcal libkpimidentities kmail korganizer
COMPILE_AFTER_libkholidays = korganizer kontact
-COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer libkpimexchange libtdepim karm knotes tderesources tdefile-plugins
+COMPILE_AFTER_libkcal = kalarm konsolekalendar korganizer libkpimexchange libtdepim karm knotes tderesources tdefile-plugins
COMPILE_AFTER_mimelib = korn kmail
COMPILE_AFTER_libtdenetwork = kmail knode
COMPILE_AFTER_libksieve = kmail
@@ -34,7 +34,6 @@ COMPILE_BEFORE_kalarm = libtdepim libkmime
COMPILE_BEFORE_tderesources = libkpimexchange knotes kaddressbook kode
COMPILE_BEFORE_wizards = libtdepim tderesources korganizer kaddressbook kmail
COMPILE_BEFORE_korn = libtdenetwork
-COMPILE_BEFORE_kitchensync = libtdepim
COMPILE_BEFORE_akregator = libtdepim
COMPILE_BEFORE_knotes = libtdepim
COMPILE_BEFORE_konsolekalendar = libtdepim
diff --git a/README b/README
index 7d71a059..f4443fd6 100644
--- a/README
+++ b/README
@@ -31,7 +31,6 @@ What it is
* kalarmd: alarm monitoring daemon, shared by korganizer and kalarm.
* kontact: Integrated PIM application
* karm: Time tracker.
-* kitchensync: Synchronization framework, still under heavy development.
* tdefile-plugins: vCard KFIleItem plugin.
* knotes: yellow notes application
* konsolecalendar: Command line tool for accessing calendar files.
diff --git a/README.Kolab b/README.Kolab
index 97e2c5ba..98810c0f 100644
--- a/README.Kolab
+++ b/README.Kolab
@@ -59,11 +59,6 @@ KPilot:
TODO
-KitchenSync:
-
-TODO
-
-
kalarmd:
TODO
diff --git a/admin b/admin
-Subproject a7f75ac0ff587d5b8694a1b78557597161f8104
+Subproject 59a8bf7c09f87fbccd6dc2987145c7216e043e7
diff --git a/akregator/HACKING b/akregator/HACKING
index 7ff48118..3dc85fbd 100644
--- a/akregator/HACKING
+++ b/akregator/HACKING
@@ -87,17 +87,17 @@ class should be roughly as follows:
public typedefs:
public ctors:
public methods:
-public Q_SLOTS:
-Q_SIGNALS:
+public slots:
+signals:
protected methods:
-protected Q_SLOTS:
+protected slots:
protected fields:
private methods:
-private Q_SLOTS:
+private slots:
private fields:
private ctors: // if you define ctors/dtor as private, put them at end
-If there are no private Q_SLOTS there is no need for two private sections, however
+If there are no private slots there is no need for two private sections, however
private functions and private variables should be clearly separated.
The implementations files -- .cpp files -- should follow (when possible) the
@@ -145,15 +145,15 @@ class QSomething;
namespace Akregator {
-class Test : public QObject
+class Test : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
typedef QValueList<Test> list;
Test();
- Test(QString someString);
+ Test(TQString someString);
explicit Test(int i = 0);
virtual ~Test();
@@ -163,10 +163,10 @@ class Test : public QObject
static Test *instance() { return m_instance; }
- public Q_SLOTS:
+ public slots:
void receive(QSomething &);
- Q_SIGNALS:
+ signals:
void send(QSomething &);
protected:
@@ -174,7 +174,7 @@ class Test : public QObject
static void someProtectedStaticFunc();
- protected Q_SLOTS:
+ protected slots:
void protectedSlot();
protected:
@@ -185,7 +185,7 @@ class Test : public QObject
static int staticPrivateMethod();
- private Q_SLOTS:
+ private slots:
void privateSlotIndeed(int youWonder);
private:
@@ -212,7 +212,7 @@ test.cpp:
namespace Akregator {
Test::Test()
- : QObject()
+ : TQObject()
, m_protectedVar(0)
, m_privateVar(0)
, m_tastyThing(0)
@@ -220,8 +220,8 @@ Test::Test()
{
}
-Test::Test(QString someString)
- : QObject()
+Test::Test(TQString someString)
+ : TQObject()
, m_protectedVar(0)
, m_privateVar(0)
, m_tastyThing(someString)
@@ -230,7 +230,7 @@ Test::Test(QString someString)
}
Test::Test(int i);
- : QObject()
+ : TQObject()
, m_protectedVar(0)
, m_privateVar(0)
, m_tastyThing(i)
diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp
index 7fa61cdc..6c7b3cee 100644
--- a/akregator/src/actionmanagerimpl.cpp
+++ b/akregator/src/actionmanagerimpl.cpp
@@ -161,16 +161,16 @@ void ActionManagerImpl::setTagSet(TagSet* tagSet)
if (d->tagSet != 0)
{
- disconnect(d->tagSet, TQT_SIGNAL(signalTagAdded(const Tag&)), this, TQT_SLOT(slotTagAdded(const Tag&)));
- disconnect(d->tagSet, TQT_SIGNAL(signalTagRemoved(const Tag&)), this, TQT_SLOT(slotTagRemoved(const Tag&)));
+ disconnect(d->tagSet, TQ_SIGNAL(signalTagAdded(const Tag&)), this, TQ_SLOT(slotTagAdded(const Tag&)));
+ disconnect(d->tagSet, TQ_SIGNAL(signalTagRemoved(const Tag&)), this, TQ_SLOT(slotTagRemoved(const Tag&)));
}
d->tagSet = tagSet;
if (tagSet != 0)
{
- connect(d->tagSet, TQT_SIGNAL(signalTagAdded(const Tag&)), this, TQT_SLOT(slotTagAdded(const Tag&)));
- connect(d->tagSet, TQT_SIGNAL(signalTagRemoved(const Tag&)), this, TQT_SLOT(slotTagRemoved(const Tag&)));
+ connect(d->tagSet, TQ_SIGNAL(signalTagAdded(const Tag&)), this, TQ_SLOT(slotTagAdded(const Tag&)));
+ connect(d->tagSet, TQ_SIGNAL(signalTagRemoved(const Tag&)), this, TQ_SLOT(slotTagRemoved(const Tag&)));
}
TQValueList<TagAction*> actions = d->tagActions.values();
@@ -200,7 +200,7 @@ void ActionManagerImpl::slotTagAdded(const Tag& tag)
if (!d->tagActions.contains(tag.id()))
{
- d->tagActions[tag.id()] = new TagAction(tag, TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignTag(const Tag&, bool)), d->tagMenu);
+ d->tagActions[tag.id()] = new TagAction(tag, d->view, TQ_SLOT(slotAssignTag(const Tag&, bool)), d->tagMenu);
d->tagMenu->insert(d->tagActions[tag.id()]);
}
}
@@ -263,15 +263,15 @@ void ActionManagerImpl::initTrayIcon(TrayIcon* trayIcon)
void ActionManagerImpl::initPart()
{
- new TDEAction(i18n("&Import Feeds..."), "", "", d->part, TQT_SLOT(fileImport()), d->actionCollection, "file_import");
- new TDEAction(i18n("&Export Feeds..."), "", "", d->part, TQT_SLOT(fileExport()), d->actionCollection, "file_export");
- //new TDEAction(i18n("&Get Feeds From Web..."), "", "", d->part, TQT_SLOT(fileGetFeeds()), d->actionCollection, "file_getfromweb");
+ new TDEAction(i18n("&Import Feeds..."), "", "", d->part, TQ_SLOT(fileImport()), d->actionCollection, "file_import");
+ new TDEAction(i18n("&Export Feeds..."), "", "", d->part, TQ_SLOT(fileExport()), d->actionCollection, "file_export");
+ //new TDEAction(i18n("&Get Feeds From Web..."), "", "", d->part, TQ_SLOT(fileGetFeeds()), d->actionCollection, "file_getfromweb");
- new TDEAction(i18n("Send &Link Address..."), "mail_generic", "", d->part, TQT_SLOT(fileSendLink()), d->actionCollection, "file_sendlink");
- new TDEAction(i18n("Send &File..."), "mail_generic", "", d->part, TQT_SLOT(fileSendFile()), d->actionCollection, "file_sendfile");
+ new TDEAction(i18n("Send &Link Address..."), "mail_generic", "", d->part, TQ_SLOT(fileSendLink()), d->actionCollection, "file_sendlink");
+ new TDEAction(i18n("Send &File..."), "mail_generic", "", d->part, TQ_SLOT(fileSendFile()), d->actionCollection, "file_sendfile");
- KStdAction::configureNotifications(d->part, TQT_SLOT(showKNotifyOptions()), d->actionCollection); // options_configure_notifications
- new TDEAction( i18n("Configure &Akregator..."), "configure", "", d->part, TQT_SLOT(showOptions()), d->actionCollection, "akregator_configure_akregator" );
+ KStdAction::configureNotifications(d->part, TQ_SLOT(showKNotifyOptions()), d->actionCollection); // options_configure_notifications
+ new TDEAction( i18n("Configure &Akregator..."), "configure", "", d->part, TQ_SLOT(showOptions()), d->actionCollection, "akregator_configure_akregator" );
}
void ActionManagerImpl::initView(View* view)
@@ -282,51 +282,51 @@ void ActionManagerImpl::initView(View* view)
d->view = view;
// tag actions
- new TDEAction(i18n("&New Tag..."), "", "", TQT_TQOBJECT(d->view), TQT_SLOT(slotNewTag()), actionCollection(), "tag_new");
+ new TDEAction(i18n("&New Tag..."), "", "", d->view, TQ_SLOT(slotNewTag()), actionCollection(), "tag_new");
// Feed/Feed Group popup menu
- new TDEAction(i18n("&Open Homepage"), "", "Ctrl+H", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenHomepage()), actionCollection(), "feed_homepage");
- new TDEAction(i18n("&Add Feed..."), "bookmark_add", "Insert", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedAdd()), actionCollection(), "feed_add");
- new TDEAction(i18n("Ne&w Folder..."), "folder-new", "Shift+Insert", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedAddGroup()), actionCollection(), "feed_add_group");
- new TDEAction(i18n("&Delete Feed"), "edit-delete", "Alt+Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedRemove()), actionCollection(), "feed_remove");
- new TDEAction(i18n("&Edit Feed..."), "edit", "F2", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedModify()), actionCollection(), "feed_modify");
+ new TDEAction(i18n("&Open Homepage"), "", "Ctrl+H", d->view, TQ_SLOT(slotOpenHomepage()), actionCollection(), "feed_homepage");
+ new TDEAction(i18n("&Add Feed..."), "bookmark_add", "Insert", d->view, TQ_SLOT(slotFeedAdd()), actionCollection(), "feed_add");
+ new TDEAction(i18n("Ne&w Folder..."), "folder-new", "Shift+Insert", d->view, TQ_SLOT(slotFeedAddGroup()), actionCollection(), "feed_add_group");
+ new TDEAction(i18n("&Delete Feed"), "edit-delete", "Alt+Delete", d->view, TQ_SLOT(slotFeedRemove()), actionCollection(), "feed_remove");
+ new TDEAction(i18n("&Edit Feed..."), "edit", "F2", d->view, TQ_SLOT(slotFeedModify()), actionCollection(), "feed_modify");
TDEActionMenu* vm = new TDEActionMenu( i18n( "&View Mode" ), actionCollection(), "view_mode" );
- TDERadioAction *ra = new TDERadioAction(i18n("&Normal View"), "view_top_bottom", "Ctrl+Shift+1", TQT_TQOBJECT(d->view), TQT_SLOT(slotNormalView()), actionCollection(), "normal_view");
+ TDERadioAction *ra = new TDERadioAction(i18n("&Normal View"), "view_top_bottom", "Ctrl+Shift+1", d->view, TQ_SLOT(slotNormalView()), actionCollection(), "normal_view");
ra->setExclusiveGroup( "ViewMode" );
vm->insert(ra);
- ra = new TDERadioAction(i18n("&Widescreen View"), "view_left_right", "Ctrl+Shift+2", TQT_TQOBJECT(d->view), TQT_SLOT(slotWidescreenView()), actionCollection(), "widescreen_view");
+ ra = new TDERadioAction(i18n("&Widescreen View"), "view_left_right", "Ctrl+Shift+2", d->view, TQ_SLOT(slotWidescreenView()), actionCollection(), "widescreen_view");
ra->setExclusiveGroup( "ViewMode" );
vm->insert(ra);
- ra = new TDERadioAction(i18n("C&ombined View"), "view_text", "Ctrl+Shift+3", TQT_TQOBJECT(d->view), TQT_SLOT(slotCombinedView()), actionCollection(), "combined_view");
+ ra = new TDERadioAction(i18n("C&ombined View"), "view_text", "Ctrl+Shift+3", d->view, TQ_SLOT(slotCombinedView()), actionCollection(), "combined_view");
ra->setExclusiveGroup( "ViewMode" );
vm->insert(ra);
// toolbar / feed menu
- new TDEAction(i18n("&Fetch Feed"), "go-down", TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchCurrentFeed()), actionCollection(), "feed_fetch");
- new TDEAction(i18n("Fe&tch All Feeds"), "go-bottom", "Ctrl+L", TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchAllFeeds()), actionCollection(), "feed_fetch_all");
+ new TDEAction(i18n("&Fetch Feed"), "go-down", TDEStdAccel::shortcut(TDEStdAccel::Reload), d->view, TQ_SLOT(slotFetchCurrentFeed()), actionCollection(), "feed_fetch");
+ new TDEAction(i18n("Fe&tch All Feeds"), "go-bottom", "Ctrl+L", d->view, TQ_SLOT(slotFetchAllFeeds()), actionCollection(), "feed_fetch_all");
- TDEAction* stopAction = new TDEAction(i18n( "&Abort Fetches" ), "process-stop", Key_Escape, Kernel::self()->fetchQueue(), TQT_SLOT(slotAbort()), actionCollection(), "feed_stop");
+ TDEAction* stopAction = new TDEAction(i18n( "&Abort Fetches" ), "process-stop", Key_Escape, Kernel::self()->fetchQueue(), TQ_SLOT(slotAbort()), actionCollection(), "feed_stop");
stopAction->setEnabled(false);
- new TDEAction(i18n("&Mark Feed as Read"), "goto", "Ctrl+R", TQT_TQOBJECT(d->view), TQT_SLOT(slotMarkAllRead()), actionCollection(), "feed_mark_all_as_read");
- new TDEAction(i18n("Ma&rk All Feeds as Read"), "goto", "Ctrl+Shift+R", TQT_TQOBJECT(d->view), TQT_SLOT(slotMarkAllFeedsRead()), actionCollection(), "feed_mark_all_feeds_as_read");
+ new TDEAction(i18n("&Mark Feed as Read"), "goto", "Ctrl+R", d->view, TQ_SLOT(slotMarkAllRead()), actionCollection(), "feed_mark_all_as_read");
+ new TDEAction(i18n("Ma&rk All Feeds as Read"), "goto", "Ctrl+Shift+R", d->view, TQ_SLOT(slotMarkAllFeedsRead()), actionCollection(), "feed_mark_all_feeds_as_read");
// Settings menu
- TDEToggleAction* sqf = new TDEToggleAction(i18n("Show Quick Filter"), TQString(), 0, TQT_TQOBJECT(d->view), TQT_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter");
+ TDEToggleAction* sqf = new TDEToggleAction(i18n("Show Quick Filter"), TQString(), 0, d->view, TQ_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter");
sqf->setChecked( Settings::showQuickFilter() );
- new TDEAction( i18n("Open in Tab"), "tab_new", "Shift+Return", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticle()), actionCollection(), "article_open" );
- new TDEAction( i18n("Open in Background Tab"), TQString(), "tab_new", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" );
- new TDEAction( i18n("Open in External Browser"), "window-new", "Ctrl+Shift+Return", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticleExternal()), actionCollection(), "article_open_external" );
- new TDEAction( i18n("Copy Link Address"), TQString(), TQString(), TQT_TQOBJECT(d->view), TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" );
+ new TDEAction( i18n("Open in Tab"), "tab_new", "Shift+Return", d->view, TQ_SLOT(slotOpenCurrentArticle()), actionCollection(), "article_open" );
+ new TDEAction( i18n("Open in Background Tab"), TQString(), "tab_new", d->view, TQ_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" );
+ new TDEAction( i18n("Open in External Browser"), "window-new", "Ctrl+Shift+Return", d->view, TQ_SLOT(slotOpenCurrentArticleExternal()), actionCollection(), "article_open_external" );
+ new TDEAction( i18n("Copy Link Address"), TQString(), TQString(), d->view, TQ_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" );
- new TDEAction(i18n("Pre&vious Unread Article"), "", Key_Minus, TQT_TQOBJECT(d->view), TQT_SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article");
- new TDEAction(i18n("Ne&xt Unread Article"), "", Key_Plus, TQT_TQOBJECT(d->view), TQT_SLOT(slotNextUnreadArticle()),actionCollection(), "go_next_unread_article");
+ new TDEAction(i18n("Pre&vious Unread Article"), "", Key_Minus, d->view, TQ_SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article");
+ new TDEAction(i18n("Ne&xt Unread Article"), "", Key_Plus, d->view, TQ_SLOT(slotNextUnreadArticle()),actionCollection(), "go_next_unread_article");
- new TDEAction(i18n("&Delete"), "edit-delete", "Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotArticleDelete()), actionCollection(), "article_delete");
+ new TDEAction(i18n("&Delete"), "edit-delete", "Delete", d->view, TQ_SLOT(slotArticleDelete()), actionCollection(), "article_delete");
if (Settings::showTaggingGUI())
{
@@ -336,39 +336,39 @@ void ActionManagerImpl::initView(View* view)
TDEActionMenu* statusMenu = new TDEActionMenu ( i18n( "&Mark As" ),
actionCollection(), "article_set_status" );
- d->speakSelectedArticlesAction = new TDEAction(i18n("&Speak Selected Articles"), "kttsd", "", TQT_TQOBJECT(d->view), TQT_SLOT(slotTextToSpeechRequest()), actionCollection(), "akr_texttospeech");
+ d->speakSelectedArticlesAction = new TDEAction(i18n("&Speak Selected Articles"), "kttsd", "", d->view, TQ_SLOT(slotTextToSpeechRequest()), actionCollection(), "akr_texttospeech");
- TDEAction* abortTTS = new TDEAction(i18n( "&Stop Speaking" ), "media-playback-stop", Key_Escape, SpeechClient::self(), TQT_SLOT(slotAbortJobs()), actionCollection(), "akr_aborttexttospeech");
+ TDEAction* abortTTS = new TDEAction(i18n( "&Stop Speaking" ), "media-playback-stop", Key_Escape, SpeechClient::self(), TQ_SLOT(slotAbortJobs()), actionCollection(), "akr_aborttexttospeech");
abortTTS->setEnabled(false);
- connect(SpeechClient::self(), TQT_SIGNAL(signalActivated(bool)),
- abortTTS, TQT_SLOT(setEnabled(bool)));
+ connect(SpeechClient::self(), TQ_SIGNAL(signalActivated(bool)),
+ abortTTS, TQ_SLOT(setEnabled(bool)));
statusMenu->insert(new TDEAction(KGuiItem(i18n("as in: mark as read","&Read"), "",
i18n("Mark selected article as read")),
- "Ctrl+E", TQT_TQOBJECT(d->view), TQT_SLOT(slotSetSelectedArticleRead()),
+ "Ctrl+E", d->view, TQ_SLOT(slotSetSelectedArticleRead()),
actionCollection(), "article_set_status_read"));
statusMenu->insert(new TDEAction(KGuiItem(i18n("&New"), "",
i18n("Mark selected article as new")),
- "Ctrl+N", TQT_TQOBJECT(d->view), TQT_SLOT(slotSetSelectedArticleNew()),
+ "Ctrl+N", d->view, TQ_SLOT(slotSetSelectedArticleNew()),
actionCollection(), "article_set_status_new" ));
statusMenu->insert(new TDEAction(KGuiItem(i18n("&Unread"), "",
i18n("Mark selected article as unread")),
- "Ctrl+U", TQT_TQOBJECT(d->view), TQT_SLOT(slotSetSelectedArticleUnread()),
+ "Ctrl+U", d->view, TQ_SLOT(slotSetSelectedArticleUnread()),
actionCollection(), "article_set_status_unread"));
TDEToggleAction* importantAction = new TDEToggleAction(i18n("&Mark as Important"), "flag", "Ctrl+I", actionCollection(), "article_set_status_important");
importantAction->setCheckedState(i18n("Remove &Important Mark"));
- connect(importantAction, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(d->view), TQT_SLOT(slotArticleToggleKeepFlag(bool)));
+ connect(importantAction, TQ_SIGNAL(toggled(bool)), d->view, TQ_SLOT(slotArticleToggleKeepFlag(bool)));
- new TDEAction( i18n("Move Node Up"), TQString(), "Shift+Alt+Up", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" );
- new TDEAction( i18n("Move Node Down"), TQString(), "Shift+Alt+Down", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" );
- new TDEAction( i18n("Move Node Left"), TQString(), "Shift+Alt+Left", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" );
- new TDEAction( i18n("Move Node Right"), TQString(), "Shift+Alt+Right", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right");
+ new TDEAction( i18n("Move Node Up"), TQString(), "Shift+Alt+Up", view, TQ_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" );
+ new TDEAction( i18n("Move Node Down"), TQString(), "Shift+Alt+Down", view, TQ_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" );
+ new TDEAction( i18n("Move Node Left"), TQString(), "Shift+Alt+Left", view, TQ_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" );
+ new TDEAction( i18n("Move Node Right"), TQString(), "Shift+Alt+Right", view, TQ_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right");
}
void ActionManagerImpl::initArticleViewer(ArticleViewer* articleViewer)
@@ -386,8 +386,8 @@ void ActionManagerImpl::initArticleListView(ArticleListView* articleList)
else
d->articleList = articleList;
- new TDEAction( i18n("&Previous Article"), TQString(), "Left", TQT_TQOBJECT(articleList), TQT_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" );
- new TDEAction( i18n("&Next Article"), TQString(), "Right", TQT_TQOBJECT(articleList), TQT_SLOT(slotNextArticle()), actionCollection(), "go_next_article" );
+ new TDEAction( i18n("&Previous Article"), TQString(), "Left", articleList, TQ_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" );
+ new TDEAction( i18n("&Next Article"), TQString(), "Right", articleList, TQ_SLOT(slotNextArticle()), actionCollection(), "go_next_article" );
}
void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget)
@@ -397,17 +397,17 @@ void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget)
else
d->listTabWidget = listTabWidget;
- new TDEAction(i18n("&Previous Feed"), "", "P", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotPrevFeed()),actionCollection(), "go_prev_feed");
- new TDEAction(i18n("&Next Feed"), "", "N", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotNextFeed()),actionCollection(), "go_next_feed");
- new TDEAction(i18n("N&ext Unread Feed"), "", "Alt+Plus", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotNextUnreadFeed()),actionCollection(), "go_next_unread_feed");
- new TDEAction(i18n("Prev&ious Unread Feed"), "", "Alt+Minus", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotPrevUnreadFeed()),actionCollection(), "go_prev_unread_feed");
-
- new TDEAction( i18n("Go to Top of Tree"), TQString(), "Ctrl+Home", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" );
- new TDEAction( i18n("Go to Bottom of Tree"), TQString(), "Ctrl+End", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" );
- new TDEAction( i18n("Go Left in Tree"), TQString(), "Ctrl+Left", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" );
- new TDEAction( i18n("Go Right in Tree"), TQString(), "Ctrl+Right", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" );
- new TDEAction( i18n("Go Up in Tree"), TQString(), "Ctrl+Up", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" );
- new TDEAction( i18n("Go Down in Tree"), TQString(), "Ctrl+Down", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" );
+ new TDEAction(i18n("&Previous Feed"), "", "P", listTabWidget, TQ_SLOT(slotPrevFeed()),actionCollection(), "go_prev_feed");
+ new TDEAction(i18n("&Next Feed"), "", "N", listTabWidget, TQ_SLOT(slotNextFeed()),actionCollection(), "go_next_feed");
+ new TDEAction(i18n("N&ext Unread Feed"), "", "Alt+Plus", listTabWidget, TQ_SLOT(slotNextUnreadFeed()),actionCollection(), "go_next_unread_feed");
+ new TDEAction(i18n("Prev&ious Unread Feed"), "", "Alt+Minus", listTabWidget, TQ_SLOT(slotPrevUnreadFeed()),actionCollection(), "go_prev_unread_feed");
+
+ new TDEAction( i18n("Go to Top of Tree"), TQString(), "Ctrl+Home", listTabWidget, TQ_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" );
+ new TDEAction( i18n("Go to Bottom of Tree"), TQString(), "Ctrl+End", listTabWidget, TQ_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" );
+ new TDEAction( i18n("Go Left in Tree"), TQString(), "Ctrl+Left", listTabWidget, TQ_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" );
+ new TDEAction( i18n("Go Right in Tree"), TQString(), "Ctrl+Right", listTabWidget, TQ_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" );
+ new TDEAction( i18n("Go Up in Tree"), TQString(), "Ctrl+Up", listTabWidget, TQ_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" );
+ new TDEAction( i18n("Go Down in Tree"), TQString(), "Ctrl+Down", listTabWidget, TQ_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" );
}
void ActionManagerImpl::initTabWidget(TabWidget* tabWidget)
@@ -417,11 +417,11 @@ void ActionManagerImpl::initTabWidget(TabWidget* tabWidget)
else
d->tabWidget = tabWidget;
- new TDEAction(i18n("Select Next Tab"), "", "Ctrl+Period", TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotNextTab()),actionCollection(), "select_next_tab");
- new TDEAction(i18n("Select Previous Tab"), "", "Ctrl+Comma", TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotPreviousTab()),actionCollection(), "select_previous_tab");
- new TDEAction( i18n("Detach Tab"), "tab_breakoff", CTRL+SHIFT+Key_B, TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotDetachTab()), actionCollection(), "tab_detach" );
- new TDEAction( i18n("Copy Link Address"), TQString(), TQString(), TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" );
- new TDEAction( i18n("&Close Tab"), "tab_remove", TDEStdAccel::close(), TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotCloseTab()), actionCollection(), "tab_remove" );
+ new TDEAction(i18n("Select Next Tab"), "", "Ctrl+Period", d->tabWidget, TQ_SLOT(slotNextTab()),actionCollection(), "select_next_tab");
+ new TDEAction(i18n("Select Previous Tab"), "", "Ctrl+Comma", d->tabWidget, TQ_SLOT(slotPreviousTab()),actionCollection(), "select_previous_tab");
+ new TDEAction( i18n("Detach Tab"), "tab_breakoff", CTRL+SHIFT+Key_B, d->tabWidget, TQ_SLOT(slotDetachTab()), actionCollection(), "tab_detach" );
+ new TDEAction( i18n("Copy Link Address"), TQString(), TQString(), d->tabWidget, TQ_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" );
+ new TDEAction( i18n("&Close Tab"), "tab_remove", TDEStdAccel::close(), d->tabWidget, TQ_SLOT(slotCloseTab()), actionCollection(), "tab_remove" );
}
TQWidget* ActionManagerImpl::container(const char* name)
diff --git a/akregator/src/actionmanagerimpl.h b/akregator/src/actionmanagerimpl.h
index adbb6627..6b192986 100644
--- a/akregator/src/actionmanagerimpl.h
+++ b/akregator/src/actionmanagerimpl.h
@@ -49,7 +49,7 @@ class TabWidget;
/** Akregator-specific implementation of the ActionManager interface */
class ActionManagerImpl : public ActionManager
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp
index 24dc8b49..a7b88a11 100644
--- a/akregator/src/addfeeddialog.cpp
+++ b/akregator/src/addfeeddialog.cpp
@@ -53,7 +53,7 @@ AddFeedDialog::AddFeedDialog(TQWidget *parent, const char *name)
: KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, parent, name, true, i18n("Add Feed"), KDialogBase::Ok|KDialogBase::Cancel)
{
widget = new AddFeedWidget(this);
- connect(widget->urlEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(textChanged(const TQString&)));
+ connect(widget->urlEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(textChanged(const TQString&)));
enableButtonOK(false);
setMainWidget(widget);
}
@@ -85,12 +85,12 @@ void AddFeedDialog::slotOk( )
widget->statusLabel->setText( i18n("Downloading %1").arg(feedURL) );
- connect( feed, TQT_SIGNAL(fetched(Feed* )),
- this, TQT_SLOT(fetchCompleted(Feed *)) );
- connect( feed, TQT_SIGNAL(fetchError(Feed* )),
- this, TQT_SLOT(fetchError(Feed *)) );
- connect( feed, TQT_SIGNAL(fetchDiscovery(Feed* )),
- this, TQT_SLOT(fetchDiscovery(Feed *)) );
+ connect( feed, TQ_SIGNAL(fetched(Feed* )),
+ this, TQ_SLOT(fetchCompleted(Feed *)) );
+ connect( feed, TQ_SIGNAL(fetchError(Feed* )),
+ this, TQ_SLOT(fetchError(Feed *)) );
+ connect( feed, TQ_SIGNAL(fetchDiscovery(Feed* )),
+ this, TQ_SLOT(fetchDiscovery(Feed *)) );
f->fetch(true);
}
diff --git a/akregator/src/addfeeddialog.h b/akregator/src/addfeeddialog.h
index 51d93ba2..b81948de 100644
--- a/akregator/src/addfeeddialog.h
+++ b/akregator/src/addfeeddialog.h
@@ -40,7 +40,7 @@ namespace Akregator
class AddFeedWidget : public AddFeedWidgetBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
AddFeedWidget(TQWidget *parent = 0, const char *name = 0);
@@ -49,7 +49,7 @@ namespace Akregator
class AddFeedDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
AddFeedDialog(TQWidget *parent = 0, const char *name = 0);
diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index d7ca0d44..b69d0736 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -195,12 +195,12 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
m_extension = new BrowserExtension(this, "ak_extension");
- connect(m_view, TQT_SIGNAL(setWindowCaption(const TQString&)), this, TQT_SIGNAL(setWindowCaption(const TQString&)));
- connect(m_view, TQT_SIGNAL(setStatusBarText(const TQString&)), this, TQT_SIGNAL(setStatusBarText(const TQString&)));
- connect(m_view, TQT_SIGNAL(setProgress(int)), m_extension, TQT_SIGNAL(loadingProgress(int)));
- connect(m_view, TQT_SIGNAL(signalCanceled(const TQString&)), this, TQT_SIGNAL(canceled(const TQString&)));
- connect(m_view, TQT_SIGNAL(signalStarted(TDEIO::Job*)), this, TQT_SIGNAL(started(TDEIO::Job*)));
- connect(m_view, TQT_SIGNAL(signalCompleted()), this, TQT_SIGNAL(completed()));
+ connect(m_view, TQ_SIGNAL(setWindowCaption(const TQString&)), this, TQ_SIGNAL(setWindowCaption(const TQString&)));
+ connect(m_view, TQ_SIGNAL(setStatusBarText(const TQString&)), this, TQ_SIGNAL(setStatusBarText(const TQString&)));
+ connect(m_view, TQ_SIGNAL(setProgress(int)), m_extension, TQ_SIGNAL(loadingProgress(int)));
+ connect(m_view, TQ_SIGNAL(signalCanceled(const TQString&)), this, TQ_SIGNAL(canceled(const TQString&)));
+ connect(m_view, TQ_SIGNAL(signalStarted(TDEIO::Job*)), this, TQ_SIGNAL(started(TDEIO::Job*)));
+ connect(m_view, TQ_SIGNAL(signalCompleted()), this, TQ_SIGNAL(completed()));
// notify the part that this is our internal widget
setWidget(m_view);
@@ -209,7 +209,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
TrayIcon::setInstance(trayIcon);
m_actionManager->initTrayIcon(trayIcon);
- connect(trayIcon, TQT_SIGNAL(showPart()), this, TQT_SIGNAL(showPart()));
+ connect(trayIcon, TQ_SIGNAL(showPart()), this, TQ_SIGNAL(showPart()));
if ( isTrayIconEnabled() )
{
@@ -219,15 +219,15 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
else
NotificationManager::self()->setWidget(getMainWindow(), instance());
- connect( trayIcon, TQT_SIGNAL(quitSelected()),
- kapp, TQT_SLOT(quit())) ;
+ connect( trayIcon, TQ_SIGNAL(quitSelected()),
+ kapp, TQ_SLOT(quit())) ;
- connect( m_view, TQT_SIGNAL(signalUnreadCountChanged(int)), trayIcon, TQT_SLOT(slotSetUnread(int)) );
+ connect( m_view, TQ_SIGNAL(signalUnreadCountChanged(int)), trayIcon, TQ_SLOT(slotSetUnread(int)) );
- connect(kapp, TQT_SIGNAL(shutDown()), this, TQT_SLOT(slotOnShutdown()));
+ connect(kapp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(slotOnShutdown()));
m_autosaveTimer = new TQTimer(this);
- connect(m_autosaveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSaveFeedList()));
+ connect(m_autosaveTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSaveFeedList()));
m_autosaveTimer->start(5*60*1000); // 5 minutes
setXMLFile("akregator_part.rc", true);
@@ -782,10 +782,10 @@ void Part::showOptions()
TDEConfigDialog* dialog = new ConfigDialog( m_view, "settings", Settings::self() );
- connect( dialog, TQT_SIGNAL(settingsChanged()),
- this, TQT_SLOT(slotSettingsChanged()) );
- connect( dialog, TQT_SIGNAL(settingsChanged()),
- TrayIcon::getInstance(), TQT_SLOT(settingsChanged()) );
+ connect( dialog, TQ_SIGNAL(settingsChanged()),
+ this, TQ_SLOT(slotSettingsChanged()) );
+ connect( dialog, TQ_SIGNAL(settingsChanged()),
+ TrayIcon::getInstance(), TQ_SLOT(settingsChanged()) );
dialog->show();
}
diff --git a/akregator/src/akregator_part.h b/akregator/src/akregator_part.h
index 66abcae5..d84f2f90 100644
--- a/akregator/src/akregator_part.h
+++ b/akregator/src/akregator_part.h
@@ -59,7 +59,7 @@ namespace Akregator
class BrowserExtension : public KParts::BrowserExtension
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -76,7 +76,7 @@ namespace Akregator
*/
class Part : public MyBasePart, virtual public AkregatorPartIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
typedef MyBasePart inherited;
diff --git a/akregator/src/akregator_run.cpp b/akregator/src/akregator_run.cpp
index 89bb190a..d22f2f61 100644
--- a/akregator/src/akregator_run.cpp
+++ b/akregator/src/akregator_run.cpp
@@ -38,7 +38,7 @@ BrowserRun::BrowserRun(TQWidget* mainWindow, Viewer* currentViewer, const KURL&
if (mode == CURRENT_TAB)
{
- connect(m_currentViewer, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotViewerDeleted()));
+ connect(m_currentViewer, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotViewerDeleted()));
}
setEnableExternalBrowser(false);
}
diff --git a/akregator/src/akregator_run.h b/akregator/src/akregator_run.h
index 4d22ca82..82b46db9 100644
--- a/akregator/src/akregator_run.h
+++ b/akregator/src/akregator_run.h
@@ -34,7 +34,7 @@ class Viewer;
class BrowserRun : public KParts::BrowserRun
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** indicates how HTML pages should be opened. It is passed in the constructor and sent back via the openInViewer signal. This is a workaround to fix opening of non-HTML mimetypes in 3.5, which will be refactored for KDE4 anyway. For 3.5.x it's the easiest way to fix the problem without changing too much code TODO KDE4: refactor, remove this enum */
diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp
index a65adf39..bcda5d16 100644
--- a/akregator/src/akregator_view.cpp
+++ b/akregator/src/akregator_view.cpp
@@ -224,26 +224,26 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
m_shuttingDown = false;
m_displayingAboutPage = false;
m_currentFrame = 0L;
- setFocusPolicy(TQ_StrongFocus);
+ setFocusPolicy(TQWidget::StrongFocus);
TQVBoxLayout *lt = new TQVBoxLayout( this );
- m_horizontalSplitter = new TQSplitter(Qt::Horizontal, this);
+ m_horizontalSplitter = new TQSplitter(TQt::Horizontal, this);
m_horizontalSplitter->setOpaqueResize(true);
lt->addWidget(m_horizontalSplitter);
- connect (Kernel::self()->fetchQueue(), TQT_SIGNAL(fetched(Feed*)), this, TQT_SLOT(slotFeedFetched(Feed*)));
- connect (Kernel::self()->fetchQueue(), TQT_SIGNAL(signalStarted()), this, TQT_SLOT(slotFetchingStarted()));
- connect (Kernel::self()->fetchQueue(), TQT_SIGNAL(signalStopped()), this, TQT_SLOT(slotFetchingStopped()));
+ connect (Kernel::self()->fetchQueue(), TQ_SIGNAL(fetched(Feed*)), this, TQ_SLOT(slotFeedFetched(Feed*)));
+ connect (Kernel::self()->fetchQueue(), TQ_SIGNAL(signalStarted()), this, TQ_SLOT(slotFetchingStarted()));
+ connect (Kernel::self()->fetchQueue(), TQ_SIGNAL(signalStopped()), this, TQ_SLOT(slotFetchingStopped()));
- connect(Kernel::self()->tagSet(), TQT_SIGNAL(signalTagAdded(const Tag&)), this, TQT_SLOT(slotTagCreated(const Tag&)));
- connect(Kernel::self()->tagSet(), TQT_SIGNAL(signalTagRemoved(const Tag&)), this, TQT_SLOT(slotTagRemoved(const Tag&)));
+ connect(Kernel::self()->tagSet(), TQ_SIGNAL(signalTagAdded(const Tag&)), this, TQ_SLOT(slotTagCreated(const Tag&)));
+ connect(Kernel::self()->tagSet(), TQ_SIGNAL(signalTagRemoved(const Tag&)), this, TQ_SLOT(slotTagRemoved(const Tag&)));
m_listTabWidget = new ListTabWidget(m_horizontalSplitter);
m_actionManager->initListTabWidget(m_listTabWidget);
- connect(m_listTabWidget, TQT_SIGNAL(signalNodeSelected(TreeNode*)), this, TQT_SLOT(slotNodeSelected(TreeNode*)));
+ connect(m_listTabWidget, TQ_SIGNAL(signalNodeSelected(TreeNode*)), this, TQ_SLOT(slotNodeSelected(TreeNode*)));
if (!Settings::showTaggingGUI())
m_listTabWidget->setViewMode(ListTabWidget::single);
@@ -251,16 +251,16 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
m_feedListView = new NodeListView( this, "feedtree" );
m_listTabWidget->addView(m_feedListView, i18n("Feeds"), TDEGlobal::iconLoader()->loadIcon("folder", TDEIcon::Small));
- connect(m_feedListView, TQT_SIGNAL(signalContextMenu(TDEListView*, TreeNode*, const TQPoint&)), this, TQT_SLOT(slotFeedTreeContextMenu(TDEListView*, TreeNode*, const TQPoint&)));
+ connect(m_feedListView, TQ_SIGNAL(signalContextMenu(TDEListView*, TreeNode*, const TQPoint&)), this, TQ_SLOT(slotFeedTreeContextMenu(TDEListView*, TreeNode*, const TQPoint&)));
- connect(m_feedListView, TQT_SIGNAL(signalDropped (KURL::List &, TreeNode*,
- Folder*)), this, TQT_SLOT(slotFeedURLDropped (KURL::List &,
+ connect(m_feedListView, TQ_SIGNAL(signalDropped (KURL::List &, TreeNode*,
+ Folder*)), this, TQ_SLOT(slotFeedURLDropped (KURL::List &,
TreeNode*, Folder*)));
m_tagNodeListView = new NodeListView(this);
m_listTabWidget->addView(m_tagNodeListView, i18n("Tags"), TDEGlobal::iconLoader()->loadIcon("rss_tag", TDEIcon::Small));
- connect(m_tagNodeListView, TQT_SIGNAL(signalContextMenu(TDEListView*, TreeNode*, const TQPoint&)), this, TQT_SLOT(slotFeedTreeContextMenu(TDEListView*, TreeNode*, const TQPoint&)));
+ connect(m_tagNodeListView, TQ_SIGNAL(signalContextMenu(TDEListView*, TreeNode*, const TQPoint&)), this, TQ_SLOT(slotFeedTreeContextMenu(TDEListView*, TreeNode*, const TQPoint&)));
ProgressManager::self()->setFeedList(m_feedList);
@@ -268,10 +268,10 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
m_tabs = new TabWidget(m_horizontalSplitter);
m_actionManager->initTabWidget(m_tabs);
- connect( m_part, TQT_SIGNAL(signalSettingsChanged()), m_tabs, TQT_SLOT(slotSettingsChanged()));
+ connect( m_part, TQ_SIGNAL(signalSettingsChanged()), m_tabs, TQ_SLOT(slotSettingsChanged()));
- connect( m_tabs, TQT_SIGNAL( currentFrameChanged(Frame *) ), this,
- TQT_SLOT( slotFrameChanged(Frame *) ) );
+ connect( m_tabs, TQ_SIGNAL( currentFrameChanged(Frame *) ), this,
+ TQ_SLOT( slotFrameChanged(Frame *) ) );
TQWhatsThis::add(m_tabs, i18n("You can view multiple articles in several open tabs."));
@@ -287,39 +287,39 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
mainTabLayout->addWidget(m_searchBar);
- m_articleSplitter = new TQSplitter(Qt::Vertical, m_mainTab, "panner2");
+ m_articleSplitter = new TQSplitter(TQt::Vertical, m_mainTab, "panner2");
m_articleList = new ArticleListView( m_articleSplitter, "articles" );
m_actionManager->initArticleListView(m_articleList);
- connect( m_articleList, TQT_SIGNAL(signalMouseButtonPressed(int, const Article&, const TQPoint &, int)), this, TQT_SLOT(slotMouseButtonPressed(int, const Article&, const TQPoint &, int)));
+ connect( m_articleList, TQ_SIGNAL(signalMouseButtonPressed(int, const Article&, const TQPoint &, int)), this, TQ_SLOT(slotMouseButtonPressed(int, const Article&, const TQPoint &, int)));
// use selectionChanged instead of clicked
- connect( m_articleList, TQT_SIGNAL(signalArticleChosen(const Article&)),
- this, TQT_SLOT( slotArticleSelected(const Article&)) );
- connect( m_articleList, TQT_SIGNAL(signalDoubleClicked(const Article&, const TQPoint&, int)),
- this, TQT_SLOT( slotOpenArticleExternal(const Article&, const TQPoint&, int)) );
+ connect( m_articleList, TQ_SIGNAL(signalArticleChosen(const Article&)),
+ this, TQ_SLOT( slotArticleSelected(const Article&)) );
+ connect( m_articleList, TQ_SIGNAL(signalDoubleClicked(const Article&, const TQPoint&, int)),
+ this, TQ_SLOT( slotOpenArticleExternal(const Article&, const TQPoint&, int)) );
m_articleViewer = new ArticleViewer(m_articleSplitter, "article_viewer");
m_articleViewer->setSafeMode(); // disable JS, Java, etc...
m_actionManager->initArticleViewer(m_articleViewer);
- connect(m_searchBar, TQT_SIGNAL(signalSearch(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&)), m_articleList, TQT_SLOT(slotSetFilter(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&)));
+ connect(m_searchBar, TQ_SIGNAL(signalSearch(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&)), m_articleList, TQ_SLOT(slotSetFilter(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&)));
- connect(m_searchBar, TQT_SIGNAL(signalSearch(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&)), m_articleViewer, TQT_SLOT(slotSetFilter(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&)));
+ connect(m_searchBar, TQ_SIGNAL(signalSearch(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&)), m_articleViewer, TQ_SLOT(slotSetFilter(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&)));
- connect( m_articleViewer, TQT_SIGNAL(urlClicked(const KURL&, Viewer*, bool, bool)),
- this, TQT_SLOT(slotUrlClickedInViewer(const KURL&, Viewer*, bool, bool)) );
+ connect( m_articleViewer, TQ_SIGNAL(urlClicked(const KURL&, Viewer*, bool, bool)),
+ this, TQ_SLOT(slotUrlClickedInViewer(const KURL&, Viewer*, bool, bool)) );
- connect( m_articleViewer->browserExtension(), TQT_SIGNAL(mouseOverInfo(const KFileItem *)),
- this, TQT_SLOT(slotMouseOverInfo(const KFileItem *)) );
+ connect( m_articleViewer->browserExtension(), TQ_SIGNAL(mouseOverInfo(const KFileItem *)),
+ this, TQ_SLOT(slotMouseOverInfo(const KFileItem *)) );
- connect( m_part, TQT_SIGNAL(signalSettingsChanged()), m_articleViewer, TQT_SLOT(slotPaletteOrFontChanged()));
+ connect( m_part, TQ_SIGNAL(signalSettingsChanged()), m_articleViewer, TQ_SLOT(slotPaletteOrFontChanged()));
TQWhatsThis::add(m_articleViewer->widget(), i18n("Browsing area."));
mainTabLayout->addWidget( m_articleSplitter );
- m_mainFrame=new Frame(TQT_TQOBJECT(this), m_part, m_mainTab, i18n("Articles"), false);
+ m_mainFrame=new Frame(this, m_part, m_mainTab, i18n("Articles"), false);
connectFrame(m_mainFrame);
m_tabs->addFrame(m_mainFrame);
@@ -342,17 +342,17 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
}
m_fetchTimer = new TQTimer(this);
- connect( m_fetchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDoIntervalFetches()) );
+ connect( m_fetchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDoIntervalFetches()) );
m_fetchTimer->start(1000*60);
// delete expired articles once per hour
m_expiryTimer = new TQTimer(this);
- connect(m_expiryTimer, TQT_SIGNAL(timeout()), this,
- TQT_SLOT(slotDeleteExpiredArticles()) );
+ connect(m_expiryTimer, TQ_SIGNAL(timeout()), this,
+ TQ_SLOT(slotDeleteExpiredArticles()) );
m_expiryTimer->start(3600*1000);
m_markReadTimer = new TQTimer(this);
- connect(m_markReadTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSetCurrentArticleReadDelayed()) );
+ connect(m_markReadTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSetCurrentArticleReadDelayed()) );
switch (Settings::viewMode())
{
@@ -372,7 +372,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
m_searchBar->slotSetText(Settings::textFilter());
}
- TQTimer::singleShot(1000, this, TQT_SLOT(slotDeleteExpiredArticles()) );
+ TQTimer::singleShot(1000, this, TQ_SLOT(slotDeleteExpiredArticles()) );
m_part->mergePart(m_articleViewer);
}
@@ -433,17 +433,17 @@ void View::slotOpenNewTab(const KURL& url, bool background)
{
PageViewer* page = new PageViewer(this, "page");
- connect( m_part, TQT_SIGNAL(signalSettingsChanged()), page, TQT_SLOT(slotPaletteOrFontChanged()));
+ connect( m_part, TQ_SIGNAL(signalSettingsChanged()), page, TQ_SLOT(slotPaletteOrFontChanged()));
- connect( page, TQT_SIGNAL(setTabIcon(const TQPixmap&)),
- this, TQT_SLOT(setTabIcon(const TQPixmap&)));
- connect( page, TQT_SIGNAL(urlClicked(const KURL &, Viewer*, bool, bool)),
- this, TQT_SLOT(slotUrlClickedInViewer(const KURL &, Viewer*, bool, bool)) );
+ connect( page, TQ_SIGNAL(setTabIcon(const TQPixmap&)),
+ this, TQ_SLOT(setTabIcon(const TQPixmap&)));
+ connect( page, TQ_SIGNAL(urlClicked(const KURL &, Viewer*, bool, bool)),
+ this, TQ_SLOT(slotUrlClickedInViewer(const KURL &, Viewer*, bool, bool)) );
- Frame* frame = new Frame(TQT_TQOBJECT(this), page, page->widget(), i18n("Untitled"));
+ Frame* frame = new Frame(this, page, page->widget(), i18n("Untitled"));
frame->setAutoDeletePart(true); // delete page viewer when removing the tab
- connect(page, TQT_SIGNAL(setWindowCaption (const TQString &)), frame, TQT_SLOT(setTitle (const TQString &)));
+ connect(page, TQ_SIGNAL(setWindowCaption (const TQString &)), frame, TQ_SLOT(setTitle (const TQString &)));
connectFrame(frame);
m_tabs->addFrame(frame);
@@ -466,12 +466,12 @@ void View::setTabIcon(const TQPixmap& icon)
void View::connectFrame(Frame *f)
{
- connect(f, TQT_SIGNAL(statusText(const TQString &)), this, TQT_SLOT(slotStatusText(const TQString&)));
- connect(f, TQT_SIGNAL(captionChanged (const TQString &)), this, TQT_SLOT(slotCaptionChanged (const TQString &)));
- connect(f, TQT_SIGNAL(loadingProgress(int)), this, TQT_SLOT(slotLoadingProgress(int)) );
- connect(f, TQT_SIGNAL(started()), this, TQT_SLOT(slotStarted()));
- connect(f, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted()));
- connect(f, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCanceled(const TQString&)));
+ connect(f, TQ_SIGNAL(statusText(const TQString &)), this, TQ_SLOT(slotStatusText(const TQString&)));
+ connect(f, TQ_SIGNAL(captionChanged (const TQString &)), this, TQ_SLOT(slotCaptionChanged (const TQString &)));
+ connect(f, TQ_SIGNAL(loadingProgress(int)), this, TQ_SLOT(slotLoadingProgress(int)) );
+ connect(f, TQ_SIGNAL(started()), this, TQ_SLOT(slotStarted()));
+ connect(f, TQ_SIGNAL(completed()), this, TQ_SLOT(slotCompleted()));
+ connect(f, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(slotCanceled(const TQString&)));
}
void View::slotStatusText(const TQString &c)
@@ -647,7 +647,7 @@ void View::slotNormalView()
m_articleViewer->slotShowSummary(m_listTabWidget->activeView()->selectedNode());
}
- m_articleSplitter->setOrientation(Qt::Vertical);
+ m_articleSplitter->setOrientation(TQt::Vertical);
m_viewMode = NormalView;
Settings::setViewMode( m_viewMode );
@@ -671,7 +671,7 @@ void View::slotWidescreenView()
m_articleViewer->slotShowSummary(m_listTabWidget->activeView()->selectedNode());
}
- m_articleSplitter->setOrientation(Qt::Horizontal);
+ m_articleSplitter->setOrientation(TQt::Horizontal);
m_viewMode = WidescreenView;
Settings::setViewMode( m_viewMode );
@@ -841,8 +841,8 @@ void View::slotOpenURL(const KURL& url, Viewer* currentViewer, BrowserRun::Openi
KParts::URLArgs args = currentViewer ? currentViewer->browserExtension()->urlArgs() : KParts::URLArgs();
BrowserRun* r = new BrowserRun(this, currentViewer, url, args, mode);
- connect(r, TQT_SIGNAL(signalOpenInViewer(const KURL&, Akregator::Viewer*, Akregator::BrowserRun::OpeningMode)),
- this, TQT_SLOT(slotOpenURLReply(const KURL&, Akregator::Viewer*, Akregator::BrowserRun::OpeningMode)));
+ connect(r, TQ_SIGNAL(signalOpenInViewer(const KURL&, Akregator::Viewer*, Akregator::BrowserRun::OpeningMode)),
+ this, TQ_SLOT(slotOpenURLReply(const KURL&, Akregator::Viewer*, Akregator::BrowserRun::OpeningMode)));
}
}
@@ -1109,7 +1109,7 @@ void View::slotFeedFetched(Feed *feed)
void View::slotMouseButtonPressed(int button, const Article& article, const TQPoint &, int)
{
- if (button == Qt::MidButton)
+ if (button == TQt::MidButton)
{
KURL link = article.link();
switch (Settings::mMBBehaviour())
@@ -1518,13 +1518,13 @@ void View::saveProperties(TDEConfig* config)
void View::connectToFeedList(FeedList* feedList)
{
- connect(feedList->rootNode(), TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotSetTotalUnread()));
+ connect(feedList->rootNode(), TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotSetTotalUnread()));
slotSetTotalUnread();
}
void View::disconnectFromFeedList(FeedList* feedList)
{
- disconnect(feedList->rootNode(), TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotSetTotalUnread()));
+ disconnect(feedList->rootNode(), TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotSetTotalUnread()));
}
void View::updateTagActions()
diff --git a/akregator/src/akregator_view.h b/akregator/src/akregator_view.h
index bfc08df4..629f9057 100644
--- a/akregator/src/akregator_view.h
+++ b/akregator/src/akregator_view.h
@@ -79,7 +79,7 @@ namespace Akregator {
*/
class View : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp
index 48114f97..7731c768 100644
--- a/akregator/src/articlelistview.cpp
+++ b/akregator/src/articlelistview.cpp
@@ -271,13 +271,13 @@ ArticleListView::ArticleListView(TQWidget *parent, const char *name)
"You can also manage articles, as marking them as persistent (\"Keep Article\") or delete them, using the right mouse button menu."
"To view the web page of the article, you can open the article internally in a tab or in an external browser window."));
- connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)), this, TQT_SLOT(slotCurrentChanged(TQListViewItem* )));
- connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
- connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(slotDoubleClicked(TQListViewItem*, const TQPoint&, int)) );
- connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
- this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
+ connect(this, TQ_SIGNAL(currentChanged(TQListViewItem*)), this, TQ_SLOT(slotCurrentChanged(TQListViewItem* )));
+ connect(this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()));
+ connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQ_SLOT(slotDoubleClicked(TQListViewItem*, const TQPoint&, int)) );
+ connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+ this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
- connect(this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem *, const TQPoint &, int)), this, TQT_SLOT(slotMouseButtonPressed(int, TQListViewItem *, const TQPoint &, int)));
+ connect(this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem *, const TQPoint &, int)), this, TQ_SLOT(slotMouseButtonPressed(int, TQListViewItem *, const TQPoint &, int)));
}
Article ArticleListView::currentArticle() const
@@ -482,18 +482,18 @@ void ArticleListView::slotArticlesRemoved(TreeNode* /*node*/, const TQValueList<
void ArticleListView::connectToNode(TreeNode* node)
{
- connect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotClear()) );
- connect(node, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)) );
- connect(node, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)) );
- connect(node, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)) );
+ connect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotClear()) );
+ connect(node, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)) );
+ connect(node, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)) );
+ connect(node, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)) );
}
void ArticleListView::disconnectFromNode(TreeNode* node)
{
- disconnect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotClear()) );
- disconnect(node, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)) );
- disconnect(node, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)) );
- disconnect(node, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)) );
+ disconnect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotClear()) );
+ disconnect(node, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)) );
+ disconnect(node, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)) );
+ disconnect(node, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)) );
}
void ArticleListView::applyFilters()
diff --git a/akregator/src/articlelistview.h b/akregator/src/articlelistview.h
index caf1258b..6455aead 100644
--- a/akregator/src/articlelistview.h
+++ b/akregator/src/articlelistview.h
@@ -42,7 +42,7 @@ namespace Akregator
class ArticleListView : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
ArticleListView(TQWidget *parent = 0, const char *name = 0);
diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp
index 8067b732..8da54096 100644
--- a/akregator/src/articleviewer.cpp
+++ b/akregator/src/articleviewer.cpp
@@ -170,13 +170,13 @@ ArticleViewer::ArticleViewer(TQWidget *parent, const char *name)
generateNormalModeCSS();
generateCombinedModeCSS();
- new TDEAction( i18n("&Scroll Up"), TQString(), "Up", this, TQT_SLOT(slotScrollUp()), actionCollection(), "articleviewer_scroll_up" );
- new TDEAction( i18n("&Scroll Down"), TQString(), "Down", this, TQT_SLOT(slotScrollDown()), actionCollection(), "articleviewer_scroll_down" );
+ new TDEAction( i18n("&Scroll Up"), TQString(), "Up", this, TQ_SLOT(slotScrollUp()), actionCollection(), "articleviewer_scroll_up" );
+ new TDEAction( i18n("&Scroll Down"), TQString(), "Down", this, TQ_SLOT(slotScrollDown()), actionCollection(), "articleviewer_scroll_down" );
- connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
+ connect(this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()));
- connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(slotPaletteOrFontChanged()) );
- connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), this, TQT_SLOT(slotPaletteOrFontChanged()) );
+ connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(slotPaletteOrFontChanged()) );
+ connect(kapp, TQ_SIGNAL(tdedisplayFontChanged()), this, TQ_SLOT(slotPaletteOrFontChanged()) );
m_imageDir.setPath(TDEGlobal::dirs()->saveLocation("cache", "akregator/Media/"));
m_htmlFooter = "</body></html>";
@@ -767,15 +767,15 @@ void ArticleViewer::connectToNode(TreeNode* node)
{
if (m_viewMode == CombinedView)
{
-// connect( node, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotUpdateCombinedView() ) );
- connect( node, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)));
- connect( node, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)));
- connect( node, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)));
+// connect( node, TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotUpdateCombinedView() ) );
+ connect( node, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)));
+ connect( node, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)));
+ connect( node, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)));
}
if (m_viewMode == SummaryView)
- connect( node, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotShowSummary(TreeNode*) ) );
+ connect( node, TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotShowSummary(TreeNode*) ) );
- connect( node, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotClear() ) );
+ connect( node, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotClear() ) );
}
}
@@ -783,12 +783,12 @@ void ArticleViewer::disconnectFromNode(TreeNode* node)
{
if (node)
{
-// disconnect( node, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotUpdateCombinedView() ) );
- disconnect( node, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotClear() ) );
- disconnect( node, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotShowSummary(TreeNode*) ) );
- disconnect( node, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)));
- disconnect( node, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)));
- disconnect( node, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)));
+// disconnect( node, TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotUpdateCombinedView() ) );
+ disconnect( node, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotClear() ) );
+ disconnect( node, TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotShowSummary(TreeNode*) ) );
+ disconnect( node, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)));
+ disconnect( node, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)));
+ disconnect( node, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)));
}
}
diff --git a/akregator/src/articleviewer.h b/akregator/src/articleviewer.h
index 44443f7d..e74a86ce 100644
--- a/akregator/src/articleviewer.h
+++ b/akregator/src/articleviewer.h
@@ -47,7 +47,7 @@ namespace Akregator
Use the high-level interface provided by the public slots whereever possible (and extend them when necessary instead of using low-level methods).*/
class ArticleViewer : public Viewer
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Constructor */
diff --git a/akregator/src/configdialog.h b/akregator/src/configdialog.h
index 3fd7c8f2..d165e094 100644
--- a/akregator/src/configdialog.h
+++ b/akregator/src/configdialog.h
@@ -34,7 +34,7 @@ class SettingsAppearance;
class ConfigDialog : public TDEConfigDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp
index 7e7f59e8..53b38f65 100644
--- a/akregator/src/feed.cpp
+++ b/akregator/src/feed.cpp
@@ -579,8 +579,8 @@ void Feed::tryFetch()
{
d->fetchError = false;
- d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, Status)) );
- //connect(d->loader, TQT_SIGNAL(progress(unsigned long)), this, TQT_SLOT(slotSetProgress(unsigned long)));
+ d->loader = RSS::Loader::create( this, TQ_SLOT(fetchCompleted(Loader *, Document, Status)) );
+ //connect(d->loader, TQ_SIGNAL(progress(unsigned long)), this, TQ_SLOT(slotSetProgress(unsigned long)));
d->loader->loadFrom( d->xmlUrl, new RSS::FileRetriever );
}
@@ -635,7 +635,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status)
if (doc.image() && d->imagePixmap.isNull())
{
d->image = *doc.image();
- connect(&d->image, TQT_SIGNAL(gotPixmap(const TQPixmap&)), this, TQT_SLOT(slotImageFetched(const TQPixmap&)));
+ connect(&d->image, TQ_SIGNAL(gotPixmap(const TQPixmap&)), this, TQ_SLOT(slotImageFetched(const TQPixmap&)));
d->image.getPixmap();
}
diff --git a/akregator/src/feed.h b/akregator/src/feed.h
index 2a6c5639..7a376386 100644
--- a/akregator/src/feed.h
+++ b/akregator/src/feed.h
@@ -63,7 +63,7 @@ namespace Akregator
{
friend class Article;
- Q_OBJECT
+ TQ_OBJECT
public:
/** the archiving modes:
diff --git a/akregator/src/feediconmanager.cpp b/akregator/src/feediconmanager.cpp
index 2167abf4..513f845f 100644
--- a/akregator/src/feediconmanager.cpp
+++ b/akregator/src/feediconmanager.cpp
@@ -62,7 +62,7 @@ void FeedIconManager::fetchIcon(Feed* feed)
if (!d->registeredFeeds.contains(feed))
{
d->registeredFeeds.append(feed);
- connect(feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotFeedDestroyed(TreeNode*)));
+ connect(feed, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotFeedDestroyed(TreeNode*)));
}
TQString iconURL = getIconURL(KURL(feed->xmlUrl()));
d->urlDict.insert(iconURL, feed);
@@ -119,7 +119,7 @@ TQString FeedIconManager::iconLocation(const KURL & url) const
kapp->dcopClient()->call("kded", "favicons", "iconForURL(KURL)", data,
replyType, reply);
- if (replyType == TQSTRING_OBJECT_NAME_STRING) {
+ if (replyType == "TQString") {
TQDataStream replyStream(reply, IO_ReadOnly);
TQString result;
replyStream >> result;
diff --git a/akregator/src/feediconmanager.h b/akregator/src/feediconmanager.h
index 83df9d35..55adb33e 100644
--- a/akregator/src/feediconmanager.h
+++ b/akregator/src/feediconmanager.h
@@ -44,7 +44,7 @@ namespace Akregator
class FeedIconManager:public TQObject, public DCOPObject
{
- Q_OBJECT
+ TQ_OBJECT
//
K_DCOP
diff --git a/akregator/src/feedlist.h b/akregator/src/feedlist.h
index 0587e498..cc3473d6 100644
--- a/akregator/src/feedlist.h
+++ b/akregator/src/feedlist.h
@@ -43,7 +43,7 @@ class TreeNode;
class FeedList : public NodeList
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp
index f0a37363..34aa6825 100644
--- a/akregator/src/feedlistview.cpp
+++ b/akregator/src/feedlistview.cpp
@@ -82,16 +82,16 @@ class NodeListView::ConnectNodeVisitor : public TreeNodeVisitor
virtual bool visitTreeNode(TreeNode* node)
{
- connect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQT_SLOT(slotNodeDestroyed(TreeNode*) ));
- connect(node, TQT_SIGNAL(signalChanged(TreeNode*)), m_view, TQT_SLOT(slotNodeChanged(TreeNode*) ));
+ connect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQ_SLOT(slotNodeDestroyed(TreeNode*) ));
+ connect(node, TQ_SIGNAL(signalChanged(TreeNode*)), m_view, TQ_SLOT(slotNodeChanged(TreeNode*) ));
return true;
}
virtual bool visitFolder(Folder* node)
{
visitTreeNode(node);
- connect(node, TQT_SIGNAL(signalChildAdded(TreeNode*)), m_view, TQT_SLOT(slotNodeAdded(TreeNode*) ));
- connect(node, TQT_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_view, TQT_SLOT(slotNodeRemoved(Folder*, TreeNode*) ));
+ connect(node, TQ_SIGNAL(signalChildAdded(TreeNode*)), m_view, TQ_SLOT(slotNodeAdded(TreeNode*) ));
+ connect(node, TQ_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_view, TQ_SLOT(slotNodeRemoved(Folder*, TreeNode*) ));
return true;
}
@@ -99,10 +99,10 @@ class NodeListView::ConnectNodeVisitor : public TreeNodeVisitor
{
visitTreeNode(node);
- connect(node, TQT_SIGNAL(fetchStarted(Feed*)), m_view, TQT_SLOT(slotFeedFetchStarted(Feed*)));
- connect(node, TQT_SIGNAL(fetchAborted(Feed*)), m_view, TQT_SLOT(slotFeedFetchAborted(Feed*)));
- connect(node, TQT_SIGNAL(fetchError(Feed*)), m_view, TQT_SLOT(slotFeedFetchError(Feed*)));
- connect(node, TQT_SIGNAL(fetched(Feed*)), m_view, TQT_SLOT(slotFeedFetchCompleted(Feed*)));
+ connect(node, TQ_SIGNAL(fetchStarted(Feed*)), m_view, TQ_SLOT(slotFeedFetchStarted(Feed*)));
+ connect(node, TQ_SIGNAL(fetchAborted(Feed*)), m_view, TQ_SLOT(slotFeedFetchAborted(Feed*)));
+ connect(node, TQ_SIGNAL(fetchError(Feed*)), m_view, TQ_SLOT(slotFeedFetchError(Feed*)));
+ connect(node, TQ_SIGNAL(fetched(Feed*)), m_view, TQ_SLOT(slotFeedFetchCompleted(Feed*)));
return true;
}
private:
@@ -119,30 +119,30 @@ class NodeListView::DisconnectNodeVisitor : public TreeNodeVisitor
virtual bool visitTagNode(TagNode* node)
{
- disconnect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQT_SLOT(slotNodeDestroyed(TreeNode*) ));
- disconnect(node, TQT_SIGNAL(signalChanged(TreeNode*)), m_view, TQT_SLOT(slotNodeChanged(TreeNode*) ));
+ disconnect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQ_SLOT(slotNodeDestroyed(TreeNode*) ));
+ disconnect(node, TQ_SIGNAL(signalChanged(TreeNode*)), m_view, TQ_SLOT(slotNodeChanged(TreeNode*) ));
return true;
}
virtual bool visitFolder(Folder* node)
{
- disconnect(node, TQT_SIGNAL(signalChildAdded(TreeNode*)), m_view, TQT_SLOT(slotNodeAdded(TreeNode*) ));
- disconnect(node, TQT_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_view, TQT_SLOT(slotNodeRemoved(Folder*, TreeNode*) ));
+ disconnect(node, TQ_SIGNAL(signalChildAdded(TreeNode*)), m_view, TQ_SLOT(slotNodeAdded(TreeNode*) ));
+ disconnect(node, TQ_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_view, TQ_SLOT(slotNodeRemoved(Folder*, TreeNode*) ));
- disconnect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQT_SLOT(slotNodeDestroyed(TreeNode*) ));
- disconnect(node, TQT_SIGNAL(signalChanged(TreeNode*)), m_view, TQT_SLOT(slotNodeChanged(TreeNode*) ));
+ disconnect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQ_SLOT(slotNodeDestroyed(TreeNode*) ));
+ disconnect(node, TQ_SIGNAL(signalChanged(TreeNode*)), m_view, TQ_SLOT(slotNodeChanged(TreeNode*) ));
return true;
}
virtual bool visitFeed(Feed* node)
{
- disconnect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQT_SLOT(slotNodeDestroyed(TreeNode*) ));
- disconnect(node, TQT_SIGNAL(signalChanged(TreeNode*)), m_view, TQT_SLOT(slotNodeChanged(TreeNode*) ));
- disconnect(node, TQT_SIGNAL(fetchStarted(Feed*)), m_view, TQT_SLOT(slotFeedFetchStarted(Feed*)));
- disconnect(node, TQT_SIGNAL(fetchAborted(Feed*)), m_view, TQT_SLOT(slotFeedFetchAborted(Feed*)));
- disconnect(node, TQT_SIGNAL(fetchError(Feed*)), m_view, TQT_SLOT(slotFeedFetchError(Feed*)));
- disconnect(node, TQT_SIGNAL(fetched(Feed*)), m_view, TQT_SLOT(slotFeedFetchCompleted(Feed*)));
+ disconnect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQ_SLOT(slotNodeDestroyed(TreeNode*) ));
+ disconnect(node, TQ_SIGNAL(signalChanged(TreeNode*)), m_view, TQ_SLOT(slotNodeChanged(TreeNode*) ));
+ disconnect(node, TQ_SIGNAL(fetchStarted(Feed*)), m_view, TQ_SLOT(slotFeedFetchStarted(Feed*)));
+ disconnect(node, TQ_SIGNAL(fetchAborted(Feed*)), m_view, TQ_SLOT(slotFeedFetchAborted(Feed*)));
+ disconnect(node, TQ_SIGNAL(fetchError(Feed*)), m_view, TQ_SLOT(slotFeedFetchError(Feed*)));
+ disconnect(node, TQ_SIGNAL(fetched(Feed*)), m_view, TQ_SLOT(slotFeedFetchCompleted(Feed*)));
return true;
}
private:
@@ -381,11 +381,11 @@ NodeListView::NodeListView( TQWidget *parent, const char *name)
setAcceptDrops(true);
setItemsMovable(true);
- connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*)) );
- connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) );
- connect( this, TQT_SIGNAL(itemRenamed(TQListViewItem*, int, const TQString&)), this, TQT_SLOT(slotItemRenamed(TQListViewItem*, int, const TQString&)) );
- connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) );
- connect( &(d->autoopentimer), TQT_SIGNAL( timeout() ), this, TQT_SLOT( openFolder() ) );
+ connect( this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), this, TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*)) );
+ connect( this, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(slotSelectionChanged(TQListViewItem*)) );
+ connect( this, TQ_SIGNAL(itemRenamed(TQListViewItem*, int, const TQString&)), this, TQ_SLOT(slotItemRenamed(TQListViewItem*, int, const TQString&)) );
+ connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) );
+ connect( &(d->autoopentimer), TQ_SIGNAL( timeout() ), this, TQ_SLOT( openFolder() ) );
clear();
@@ -948,8 +948,8 @@ void NodeListView::connectToNodeList(NodeList* list)
if (!list)
return;
- connect(list, TQT_SIGNAL(signalDestroyed(NodeList*)), this, TQT_SLOT(slotNodeListDestroyed(NodeList*)) );
- connect(list->rootNode(), TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotRootNodeChanged(TreeNode*)));
+ connect(list, TQ_SIGNAL(signalDestroyed(NodeList*)), this, TQ_SLOT(slotNodeListDestroyed(NodeList*)) );
+ connect(list->rootNode(), TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotRootNodeChanged(TreeNode*)));
}
void NodeListView::disconnectFromNodeList(NodeList* list)
@@ -957,8 +957,8 @@ void NodeListView::disconnectFromNodeList(NodeList* list)
if (!list)
return;
- disconnect(list, TQT_SIGNAL(signalDestroyed(NodeList*)), this, TQT_SLOT(slotNodeListDestroyed(NodeList*)) );
- disconnect(list->rootNode(), TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotRootNodeChanged(TreeNode*)));
+ disconnect(list, TQ_SIGNAL(signalDestroyed(NodeList*)), this, TQ_SLOT(slotNodeListDestroyed(NodeList*)) );
+ disconnect(list->rootNode(), TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotRootNodeChanged(TreeNode*)));
}
void NodeListView::disconnectFromNode(TreeNode* node)
diff --git a/akregator/src/feedlistview.h b/akregator/src/feedlistview.h
index 28d79d09..d7aff329 100644
--- a/akregator/src/feedlistview.h
+++ b/akregator/src/feedlistview.h
@@ -38,7 +38,7 @@ class TagNodeList;
class NodeListView : public TDEListView
{
-Q_OBJECT
+TQ_OBJECT
public:
NodeListView( TQWidget *parent = 0, const char *name = 0 );
@@ -192,7 +192,7 @@ public: // compat with KDE-3.x assertions, remove for KDE 4
class TagNodeListView : public NodeListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
TagNodeListView(TQWidget *parent = 0, const char *name = 0) {}
diff --git a/akregator/src/fetchqueue.cpp b/akregator/src/fetchqueue.cpp
index c78d9a48..0bc7b38e 100644
--- a/akregator/src/fetchqueue.cpp
+++ b/akregator/src/fetchqueue.cpp
@@ -129,18 +129,18 @@ void FetchQueue::feedDone(Feed *f)
void FetchQueue::connectToFeed(Feed* feed)
{
- connect (feed, TQT_SIGNAL(fetched(Feed*)), this, TQT_SLOT(slotFeedFetched(Feed*)));
- connect (feed, TQT_SIGNAL(fetchError(Feed*)), this, TQT_SLOT(slotFetchError(Feed*)));
- connect (feed, TQT_SIGNAL(fetchAborted(Feed*)), this, TQT_SLOT(slotFetchAborted(Feed*)));
- connect (feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotNodeDestroyed(TreeNode*)));
+ connect (feed, TQ_SIGNAL(fetched(Feed*)), this, TQ_SLOT(slotFeedFetched(Feed*)));
+ connect (feed, TQ_SIGNAL(fetchError(Feed*)), this, TQ_SLOT(slotFetchError(Feed*)));
+ connect (feed, TQ_SIGNAL(fetchAborted(Feed*)), this, TQ_SLOT(slotFetchAborted(Feed*)));
+ connect (feed, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotNodeDestroyed(TreeNode*)));
}
void FetchQueue::disconnectFromFeed(Feed* feed)
{
- disconnect (feed, TQT_SIGNAL(fetched(Feed*)), this, TQT_SLOT(slotFeedFetched(Feed*)));
- disconnect (feed, TQT_SIGNAL(fetchError(Feed*)), this, TQT_SLOT(slotFetchError(Feed*)));
- disconnect (feed, TQT_SIGNAL(fetchAborted(Feed*)), this, TQT_SLOT(slotFetchAborted(Feed*)));
- disconnect (feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotNodeDestroyed(TreeNode*)));
+ disconnect (feed, TQ_SIGNAL(fetched(Feed*)), this, TQ_SLOT(slotFeedFetched(Feed*)));
+ disconnect (feed, TQ_SIGNAL(fetchError(Feed*)), this, TQ_SLOT(slotFetchError(Feed*)));
+ disconnect (feed, TQ_SIGNAL(fetchAborted(Feed*)), this, TQ_SLOT(slotFetchAborted(Feed*)));
+ disconnect (feed, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotNodeDestroyed(TreeNode*)));
}
diff --git a/akregator/src/fetchqueue.h b/akregator/src/fetchqueue.h
index d70413b8..d93b955f 100644
--- a/akregator/src/fetchqueue.h
+++ b/akregator/src/fetchqueue.h
@@ -35,7 +35,7 @@ class TreeNode;
class FetchQueue : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/akregator/src/folder.cpp b/akregator/src/folder.cpp
index 739b0cf1..57105f4f 100644
--- a/akregator/src/folder.cpp
+++ b/akregator/src/folder.cpp
@@ -308,20 +308,20 @@ void Folder::doArticleNotification()
void Folder::connectToNode(TreeNode* child)
{
- connect(child, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotChildChanged(TreeNode*)));
- connect(child, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotChildDestroyed(TreeNode*)));
- connect(child, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)));
- connect(child, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)));
- connect(child, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)));
+ connect(child, TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotChildChanged(TreeNode*)));
+ connect(child, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotChildDestroyed(TreeNode*)));
+ connect(child, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)));
+ connect(child, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)));
+ connect(child, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)));
}
void Folder::disconnectFromNode(TreeNode* child)
{
- disconnect(child, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotChildChanged(TreeNode*)));
- disconnect(child, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotChildDestroyed(TreeNode*)));
- disconnect(child, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)));
- disconnect(child, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)));
- disconnect(child, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)));
+ disconnect(child, TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotChildChanged(TreeNode*)));
+ disconnect(child, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotChildDestroyed(TreeNode*)));
+ disconnect(child, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)));
+ disconnect(child, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)));
+ disconnect(child, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)));
}
TreeNode* Folder::next()
diff --git a/akregator/src/folder.h b/akregator/src/folder.h
index d8060386..504b457f 100644
--- a/akregator/src/folder.h
+++ b/akregator/src/folder.h
@@ -43,7 +43,7 @@ namespace Akregator
*/
class Folder : public TreeNode
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** creates a feed group parsed from a XML dom element.
diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp
index 6e27b915..64e0e37f 100644
--- a/akregator/src/frame.cpp
+++ b/akregator/src/frame.cpp
@@ -50,25 +50,25 @@ Frame::Frame(TQObject * parent, KParts::ReadOnlyPart *p, TQWidget *visWidget, co
if (watchSignals) // e.g, articles tab has no part
{
- connect(m_part, TQT_SIGNAL(setWindowCaption (const TQString &)), this, TQT_SLOT(setCaption (const TQString &)));
- connect(m_part, TQT_SIGNAL(setStatusBarText (const TQString &)), this, TQT_SLOT(setStatusText (const TQString &)));
+ connect(m_part, TQ_SIGNAL(setWindowCaption (const TQString &)), this, TQ_SLOT(setCaption (const TQString &)));
+ connect(m_part, TQ_SIGNAL(setStatusBarText (const TQString &)), this, TQ_SLOT(setStatusText (const TQString &)));
KParts::BrowserExtension *ext=KParts::BrowserExtension::childObject( p );
if (ext)
- connect( ext, TQT_SIGNAL(loadingProgress(int)), this, TQT_SLOT(setProgress(int)) );
+ connect( ext, TQ_SIGNAL(loadingProgress(int)), this, TQ_SLOT(setProgress(int)) );
- connect(p, TQT_SIGNAL(started(TDEIO::Job*)), this, TQT_SLOT(setStarted()));
- connect(p, TQT_SIGNAL(completed()), this, TQT_SLOT(setCompleted()));
- connect(p, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(setCanceled(const TQString&)));
- connect(p, TQT_SIGNAL(completed(bool)), this, TQT_SLOT(setCompleted()));
+ connect(p, TQ_SIGNAL(started(TDEIO::Job*)), this, TQ_SLOT(setStarted()));
+ connect(p, TQ_SIGNAL(completed()), this, TQ_SLOT(setCompleted()));
+ connect(p, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(setCanceled(const TQString&)));
+ connect(p, TQ_SIGNAL(completed(bool)), this, TQ_SLOT(setCompleted()));
/* TDEActionCollection *coll=p->actionCollection();
if (coll)
{
- connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ),
- this, TQT_SLOT( slotActionStatusText( const TQString & ) ) );
- connect( coll, TQT_SIGNAL( clearStatusText() ),
- this, TQT_SLOT( slotClearStatusText() ) );
+ connect( coll, TQ_SIGNAL( actionStatusText( const TQString & ) ),
+ this, TQ_SLOT( slotActionStatusText( const TQString & ) ) );
+ connect( coll, TQ_SIGNAL( clearStatusText() ),
+ this, TQ_SLOT( slotClearStatusText() ) );
}
*/
}
@@ -176,7 +176,7 @@ void Frame::setStarted()
if(m_progressId.isNull() || m_progressId.isEmpty()) m_progressId = KPIM::ProgressManager::getUniqueID();
m_progressItem = KPIM::ProgressManager::createProgressItem(m_progressId, TQStyleSheet::escape( title() ), TQString(), false);
m_progressItem->setStatus(i18n("Loading..."));
- //connect(m_progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQT_SLOT(slotAbortFetch()));
+ //connect(m_progressItem, TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQ_SLOT(slotAbortFetch()));
m_state=Started;
emit started();
}
diff --git a/akregator/src/frame.h b/akregator/src/frame.h
index b5ed013f..1cecfd52 100644
--- a/akregator/src/frame.h
+++ b/akregator/src/frame.h
@@ -42,7 +42,7 @@ namespace Akregator
class Frame : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/akregator/src/librss/image.cpp b/akregator/src/librss/image.cpp
index 174a105b..65aaf539 100644
--- a/akregator/src/librss/image.cpp
+++ b/akregator/src/librss/image.cpp
@@ -112,9 +112,9 @@ void Image::getPixmap()
d->pixmapBuffer->open(IO_WriteOnly);
d->job = TDEIO::get(d->url, false, false);
- connect(d->job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
- this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
- 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(result(TDEIO::Job *)), this, TQ_SLOT(slotResult(TDEIO::Job *)));
}
void Image::slotData(TDEIO::Job *, const TQByteArray &data)
diff --git a/akregator/src/librss/image.h b/akregator/src/librss/image.h
index 299b4292..4c99c7f3 100644
--- a/akregator/src/librss/image.h
+++ b/akregator/src/librss/image.h
@@ -33,7 +33,7 @@ namespace RSS
*/
class KDE_EXPORT Image : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp
index 8e2967b7..5cc6aa22 100644
--- a/akregator/src/librss/loader.cpp
+++ b/akregator/src/librss/loader.cpp
@@ -111,13 +111,13 @@ void FileRetriever::retrieveData(const KURL &url)
d->job->addMetaData("UserAgent", ua);
- TQTimer::singleShot(1000*90, this, TQT_SLOT(slotTimeout()));
+ TQTimer::singleShot(1000*90, this, TQ_SLOT(slotTimeout()));
- connect(d->job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
- TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
- connect(d->job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *)));
- connect(d->job, TQT_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)),
- TQT_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &)));
+ connect(d->job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+ TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+ connect(d->job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *)));
+ connect(d->job, TQ_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)),
+ TQ_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &)));
}
void FileRetriever::slotTimeout()
@@ -207,10 +207,10 @@ void OutputRetriever::retrieveData(const KURL &url)
d->buffer->open(IO_WriteOnly);
d->process = new KShellProcess();
- connect(d->process, TQT_SIGNAL(processExited(TDEProcess *)),
- TQT_SLOT(slotExited(TDEProcess *)));
- connect(d->process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
- TQT_SLOT(slotOutput(TDEProcess *, char *, int)));
+ connect(d->process, TQ_SIGNAL(processExited(TDEProcess *)),
+ TQ_SLOT(slotExited(TDEProcess *)));
+ connect(d->process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+ TQ_SLOT(slotOutput(TDEProcess *, char *, int)));
*d->process << url.path();
d->process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
}
@@ -268,7 +268,7 @@ Loader *Loader::create()
Loader *Loader::create(TQObject *object, const char *slot)
{
Loader *loader = create();
- connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)),
+ connect(loader, TQ_SIGNAL(loadingComplete(Loader *, Document, Status)),
object, slot);
return loader;
}
@@ -290,8 +290,8 @@ void Loader::loadFrom(const KURL &url, DataRetriever *retriever)
d->url=url;
d->retriever = retriever;
- connect(d->retriever, TQT_SIGNAL(dataRetrieved(const TQByteArray &, bool)),
- this, TQT_SLOT(slotRetrieverDone(const TQByteArray &, bool)));
+ connect(d->retriever, TQ_SIGNAL(dataRetrieved(const TQByteArray &, bool)),
+ this, TQ_SLOT(slotRetrieverDone(const TQByteArray &, bool)));
d->retriever->retrieveData(url);
}
diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h
index ed22da22..ea81a0a6 100644
--- a/akregator/src/librss/loader.h
+++ b/akregator/src/librss/loader.h
@@ -34,7 +34,7 @@ namespace RSS
*/
class KDE_EXPORT DataRetriever : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -89,7 +89,7 @@ namespace RSS
*/
class KDE_EXPORT FileRetriever : public DataRetriever
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -161,7 +161,7 @@ namespace RSS
*/
class OutputRetriever : public DataRetriever
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -211,8 +211,8 @@ namespace RSS
*
* \code
* Loader *loader = Loader::create();
- * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)),
- * this, TQT_SLOT(slotLoadingComplete(Loader *, Document, Status)));
+ * connect(loader, TQ_SIGNAL(loadingComplete(Loader *, Document, Status)),
+ * this, TQ_SLOT(slotLoadingComplete(Loader *, Document, Status)));
* loader->loadFrom("http://www.blah.org/foobar.rdf", new FileRetriever);
* \endcode
*
@@ -256,7 +256,7 @@ namespace RSS
*/
class KDE_EXPORT Loader : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
friend class someClassWhichDoesNotExist;
public:
diff --git a/akregator/src/librss/testlibrss.cpp b/akregator/src/librss/testlibrss.cpp
index bef989c6..4515cf7e 100644
--- a/akregator/src/librss/testlibrss.cpp
+++ b/akregator/src/librss/testlibrss.cpp
@@ -19,8 +19,8 @@ static const TDECmdLineOptions options[] =
void Tester::test( const TQString &url )
{
Loader *loader = Loader::create();
- connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ),
- this, TQT_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) );
+ connect( loader, TQ_SIGNAL( loadingComplete( Loader *, Document, Status ) ),
+ this, TQ_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) );
loader->loadFrom( url, new FileRetriever );
}
diff --git a/akregator/src/librss/testlibrss.h b/akregator/src/librss/testlibrss.h
index 222943a6..2a918a5b 100644
--- a/akregator/src/librss/testlibrss.h
+++ b/akregator/src/librss/testlibrss.h
@@ -14,7 +14,7 @@ using RSS::Status;
class Tester : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
void test( const TQString &url );
diff --git a/akregator/src/listtabwidget.cpp b/akregator/src/listtabwidget.cpp
index 1920a5ff..8349f28a 100644
--- a/akregator/src/listtabwidget.cpp
+++ b/akregator/src/listtabwidget.cpp
@@ -170,7 +170,7 @@ ListTabWidget::ListTabWidget(TQWidget* parent, const char* name) : TQWidget(pare
d->stack = new TQWidgetStack(this);
d->layout->addWidget(d->stack/*, 0, 1*/);
-// connect(d->tabBar, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotCurrentChanged(TQWidget*)));
+// connect(d->tabBar, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(slotCurrentChanged(TQWidget*)));
}
ListTabWidget::~ListTabWidget()
@@ -206,11 +206,11 @@ void ListTabWidget::addView(NodeListView* view, const TQString& caption, const T
int tabId = d->idCounter++;
d->tabBar->appendTab(icon, tabId, caption);
d->idToView[tabId] = view;
- connect(d->tabBar->tab(tabId), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotTabClicked(int)));
+ connect(d->tabBar->tab(tabId), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotTabClicked(int)));
- connect(view, TQT_SIGNAL(signalNodeSelected(TreeNode*)), this, TQT_SIGNAL(signalNodeSelected(TreeNode*)));
- connect(view, TQT_SIGNAL(signalRootNodeChanged(NodeListView*, TreeNode*)), this, TQT_SLOT(slotRootNodeChanged(NodeListView*, TreeNode*)));
+ connect(view, TQ_SIGNAL(signalNodeSelected(TreeNode*)), this, TQ_SIGNAL(signalNodeSelected(TreeNode*)));
+ connect(view, TQ_SIGNAL(signalRootNodeChanged(NodeListView*, TreeNode*)), this, TQ_SLOT(slotRootNodeChanged(NodeListView*, TreeNode*)));
if (tabId == 0) // first widget
diff --git a/akregator/src/listtabwidget.h b/akregator/src/listtabwidget.h
index 7e395167..4038f9a2 100644
--- a/akregator/src/listtabwidget.h
+++ b/akregator/src/listtabwidget.h
@@ -45,7 +45,7 @@ class TreeNode;
class ListTabWidget : public TQWidget
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp
index f5654d9b..aa10eb70 100644
--- a/akregator/src/mainwindow.cpp
+++ b/akregator/src/mainwindow.cpp
@@ -62,7 +62,7 @@
namespace Akregator {
BrowserInterface::BrowserInterface( MainWindow *shell, const char *name )
- : KParts::BrowserInterface( TQT_TQOBJECT(shell), name )
+ : KParts::BrowserInterface( shell, name )
{
m_shell = shell;
}
@@ -104,16 +104,16 @@ bool MainWindow::loadPart()
{
// now that the Part is loaded, we cast it to a Part to get
// our hands on it
- m_part = static_cast<Akregator::Part*>(factory->create(TQT_TQOBJECT(this), "akregator_part", "KParts::ReadOnlyPart" ));
+ m_part = static_cast<Akregator::Part*>(factory->create(this, "akregator_part", "KParts::ReadOnlyPart" ));
if (m_part)
{
// tell the KParts::MainWindow that this is indeed the main widget
setCentralWidget(m_part->widget());
- connect(m_part, TQT_SIGNAL(setWindowCaption (const TQString &)), this, TQT_SLOT(setCaption (const TQString &)));
+ connect(m_part, TQ_SIGNAL(setWindowCaption (const TQString &)), this, TQ_SLOT(setCaption (const TQString &)));
- connect(TrayIcon::getInstance(), TQT_SIGNAL(quitSelected()), this, TQT_SLOT(slotQuit()));
+ connect(TrayIcon::getInstance(), TQ_SIGNAL(quitSelected()), this, TQ_SLOT(slotQuit()));
// and integrate the part's GUI with the shell's
connectActionCollection(m_part->actionCollection());
createGUI(m_part);
@@ -154,13 +154,13 @@ void MainWindow::setupActions()
{
connectActionCollection(actionCollection());
- KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
+ KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
setStandardToolBarMenuEnabled(true);
createStandardStatusBarAction();
- KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+ KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection());
+ KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection());
}
void MainWindow::saveProperties(TDEConfig* config)
@@ -203,8 +203,8 @@ void MainWindow::optionsConfigureToolbars()
// use the standard toolbar editor
KEditToolbar dlg(factory());
- connect(&dlg, TQT_SIGNAL(newToolbarConfig()),
- this, TQT_SLOT(applyNewToolbarConfig()));
+ connect(&dlg, TQ_SIGNAL(newToolbarConfig()),
+ this, TQ_SLOT(applyNewToolbarConfig()));
dlg.exec();
}
@@ -226,10 +226,10 @@ KParts::BrowserExtension *MainWindow::browserExtension(KParts::ReadOnlyPart *p)
void MainWindow::connectActionCollection( TDEActionCollection *coll )
{
if (!coll) return;
- connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ),
- m_statusLabel, TQT_SLOT( setText( const TQString & ) ) );
- connect( coll, TQT_SIGNAL( clearStatusText() ),
- this, TQT_SLOT( slotClearStatusText() ) );
+ connect( coll, TQ_SIGNAL( actionStatusText( const TQString & ) ),
+ m_statusLabel, TQ_SLOT( setText( const TQString & ) ) );
+ connect( coll, TQ_SIGNAL( clearStatusText() ),
+ this, TQ_SLOT( slotClearStatusText() ) );
}
bool MainWindow::queryExit()
diff --git a/akregator/src/mainwindow.h b/akregator/src/mainwindow.h
index c5d9529b..23d5d0c0 100644
--- a/akregator/src/mainwindow.h
+++ b/akregator/src/mainwindow.h
@@ -53,7 +53,7 @@ class MainWindow;
class BrowserInterface : public KParts::BrowserInterface
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -72,7 +72,7 @@ private:
*/
class MainWindow : public KParts::MainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/akregator/src/mk4storage/mk4confwidget.cpp b/akregator/src/mk4storage/mk4confwidget.cpp
index c028b156..09b4c2de 100644
--- a/akregator/src/mk4storage/mk4confwidget.cpp
+++ b/akregator/src/mk4storage/mk4confwidget.cpp
@@ -52,7 +52,7 @@ MK4ConfWidget::MK4ConfWidget() : MK4ConfWidgetBase()
label->setEnabled(true);
}
filereq->setURL(MK4Config::archivePath());
- connect(cbUseDefault, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChkBoxUseDefault(bool)));
+ connect(cbUseDefault, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChkBoxUseDefault(bool)));
}
diff --git a/akregator/src/mk4storage/mk4confwidget.h b/akregator/src/mk4storage/mk4confwidget.h
index 194295de..797ad5c0 100644
--- a/akregator/src/mk4storage/mk4confwidget.h
+++ b/akregator/src/mk4storage/mk4confwidget.h
@@ -32,7 +32,7 @@ namespace Backend {
class MK4ConfWidget : public MK4ConfWidgetBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/akregator/src/mk4storage/mk4confwidgetbase.ui b/akregator/src/mk4storage/mk4confwidgetbase.ui
index 896f26f4..9eea1d7d 100644
--- a/akregator/src/mk4storage/mk4confwidgetbase.ui
+++ b/akregator/src/mk4storage/mk4confwidgetbase.ui
@@ -104,9 +104,6 @@
<property name="text">
<string>&amp;OK</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
@@ -132,9 +129,6 @@
<property name="text">
<string>&amp;Cancel</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
diff --git a/akregator/src/mk4storage/storagemk4impl.cpp b/akregator/src/mk4storage/storagemk4impl.cpp
index 1e104bd3..0331e0f1 100644
--- a/akregator/src/mk4storage/storagemk4impl.cpp
+++ b/akregator/src/mk4storage/storagemk4impl.cpp
@@ -263,7 +263,7 @@ void StorageMK4Impl::markDirty()
{
d->modified = true;
// commit changes after 3 seconds
- TQTimer::singleShot(3000, this, TQT_SLOT(slotCommit()));
+ TQTimer::singleShot(3000, this, TQ_SLOT(slotCommit()));
}
}
diff --git a/akregator/src/mk4storage/storagemk4impl.h b/akregator/src/mk4storage/storagemk4impl.h
index d6c4a59c..8fcde1ea 100644
--- a/akregator/src/mk4storage/storagemk4impl.h
+++ b/akregator/src/mk4storage/storagemk4impl.h
@@ -36,7 +36,7 @@ namespace Backend {
*/
class StorageMK4Impl : public Storage
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/akregator/src/nodelist.cpp b/akregator/src/nodelist.cpp
index 8a4123dc..40a8d622 100644
--- a/akregator/src/nodelist.cpp
+++ b/akregator/src/nodelist.cpp
@@ -60,15 +60,15 @@ class NodeList::AddNodeVisitor : public TreeNodeVisitor
m_list->d->idMap[node->id()] = node;
m_list->d->flatList.append(node);
- connect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_list, TQT_SLOT(slotNodeDestroyed(TreeNode*) ));
+ connect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), m_list, TQ_SLOT(slotNodeDestroyed(TreeNode*) ));
m_list->signalNodeAdded(node); // emit
return true;
}
virtual bool visitFolder(Folder* node)
{
- connect(node, TQT_SIGNAL(signalChildAdded(TreeNode*)), m_list, TQT_SLOT(slotNodeAdded(TreeNode*) ));
- connect(node, TQT_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_list, TQT_SLOT(slotNodeRemoved(Folder*, TreeNode*) ));
+ connect(node, TQ_SIGNAL(signalChildAdded(TreeNode*)), m_list, TQ_SLOT(slotNodeAdded(TreeNode*) ));
+ connect(node, TQ_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_list, TQ_SLOT(slotNodeRemoved(Folder*, TreeNode*) ));
visitTreeNode(node);
@@ -99,7 +99,7 @@ class NodeList::RemoveNodeVisitor : public TreeNodeVisitor
m_list->d->idMap.remove(node->id());
m_list->d->flatList.remove(node);
- disconnect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_list, TQT_SLOT(slotNodeDestroyed(TreeNode*) ));
+ disconnect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), m_list, TQ_SLOT(slotNodeDestroyed(TreeNode*) ));
m_list->signalNodeRemoved(node); // emit signal
return true;
@@ -108,8 +108,8 @@ class NodeList::RemoveNodeVisitor : public TreeNodeVisitor
virtual bool visitFolder(Folder* node)
{
- disconnect(node, TQT_SIGNAL(signalChildAdded(TreeNode*)), m_list, TQT_SLOT(slotNodeAdded(TreeNode*) ));
- disconnect(node, TQT_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_list, TQT_SLOT(slotNodeRemoved(Folder*, TreeNode*) ));
+ disconnect(node, TQ_SIGNAL(signalChildAdded(TreeNode*)), m_list, TQ_SLOT(slotNodeAdded(TreeNode*) ));
+ disconnect(node, TQ_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_list, TQ_SLOT(slotNodeRemoved(Folder*, TreeNode*) ));
visitTreeNode(node);
return true;
@@ -184,8 +184,8 @@ void NodeList::setRootNode(Folder* folder)
if (d->rootNode)
{
d->rootNode->setOpen(true);
- connect(d->rootNode, TQT_SIGNAL(signalChildAdded(TreeNode*)), this, TQT_SLOT(slotNodeAdded(TreeNode*)));
- connect(d->rootNode, TQT_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), this, TQT_SLOT(slotNodeRemoved(Folder*, TreeNode*)));
+ connect(d->rootNode, TQ_SIGNAL(signalChildAdded(TreeNode*)), this, TQ_SLOT(slotNodeAdded(TreeNode*)));
+ connect(d->rootNode, TQ_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), this, TQ_SLOT(slotNodeRemoved(Folder*, TreeNode*)));
}
}
diff --git a/akregator/src/nodelist.h b/akregator/src/nodelist.h
index 48703d7e..e023e12b 100644
--- a/akregator/src/nodelist.h
+++ b/akregator/src/nodelist.h
@@ -48,7 +48,7 @@ class TreeNode;
class NodeList : public TQObject
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/akregator/src/notificationmanager.cpp b/akregator/src/notificationmanager.cpp
index 5a144681..23a3a3a8 100644
--- a/akregator/src/notificationmanager.cpp
+++ b/akregator/src/notificationmanager.cpp
@@ -67,7 +67,7 @@ void NotificationManager::slotNotifyArticle(const Article& article)
else if (!m_running)
{
m_running = true;
- TQTimer::singleShot(m_checkInterval, this, TQT_SLOT(slotIntervalCheck()));
+ TQTimer::singleShot(m_checkInterval, this, TQ_SLOT(slotIntervalCheck()));
}
}
@@ -123,7 +123,7 @@ void NotificationManager::slotIntervalCheck()
else
{
m_addedInLastInterval = false;
- TQTimer::singleShot(m_checkInterval, this, TQT_SLOT(slotIntervalCheck()));
+ TQTimer::singleShot(m_checkInterval, this, TQ_SLOT(slotIntervalCheck()));
}
}
diff --git a/akregator/src/notificationmanager.h b/akregator/src/notificationmanager.h
index 1ff1d888..74b3c784 100644
--- a/akregator/src/notificationmanager.h
+++ b/akregator/src/notificationmanager.h
@@ -35,7 +35,7 @@ namespace Akregator
/** this class collects notification requests (new articles etc.) and processes them using KNotify. */
class NotificationManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** singleton instance of notification manager */
diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp
index f818043b..1962824f 100644
--- a/akregator/src/pageviewer.cpp
+++ b/akregator/src/pageviewer.cpp
@@ -109,44 +109,44 @@ PageViewer::PageViewer(TQWidget *parent, const char *name)
d->backAction = new TDEToolBarPopupAction(backForward.first,
TDEStdAccel::shortcut(TDEStdAccel::Back), this,
- TQT_SLOT(slotBack()), actionCollection(),
+ TQ_SLOT(slotBack()), actionCollection(),
"pageviewer_back");
- connect(d->backAction->popupMenu(), TQT_SIGNAL(aboutToShow()),
- this, TQT_SLOT(slotBackAboutToShow()));
- connect(d->backAction->popupMenu(), TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotPopupActivated(int)));
+ connect(d->backAction->popupMenu(), TQ_SIGNAL(aboutToShow()),
+ this, TQ_SLOT(slotBackAboutToShow()));
+ connect(d->backAction->popupMenu(), TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotPopupActivated(int)));
d->forwardAction = new TDEToolBarPopupAction(backForward.second,
TDEStdAccel::shortcut(TDEStdAccel::Forward),this,
- TQT_SLOT(slotForward()), actionCollection(),
+ TQ_SLOT(slotForward()), actionCollection(),
"pageviewer_forward");
- connect(d->forwardAction->popupMenu(), TQT_SIGNAL(aboutToShow()),
- this, TQT_SLOT(slotForwardAboutToShow()));
- connect(d->forwardAction->popupMenu(), TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotPopupActivated(int)));
+ connect(d->forwardAction->popupMenu(), TQ_SIGNAL(aboutToShow()),
+ this, TQ_SLOT(slotForwardAboutToShow()));
+ connect(d->forwardAction->popupMenu(), TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotPopupActivated(int)));
d->reloadAction = new TDEAction(i18n("Reload"), "reload", 0,
- this, TQT_SLOT(slotReload()),
+ this, TQ_SLOT(slotReload()),
actionCollection(), "pageviewer_reload");
d->stopAction = new TDEAction(KStdGuiItem::guiItem(KStdGuiItem::Stop), 0,
- this, TQT_SLOT(slotStop()),
+ this, TQ_SLOT(slotStop()),
actionCollection(), "pageviewer_stop");
- //connect( this, TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQT_SLOT(slotPopupMenu(const TQString &, const TQPoint &)));
+ //connect( this, TQ_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQ_SLOT(slotPopupMenu(const TQString &, const TQPoint &)));
d->backAction->setEnabled(false);
d->forwardAction->setEnabled(false);
d->stopAction->setEnabled(false);
- connect( this, TQT_SIGNAL(setWindowCaption (const TQString &)),
- this, TQT_SLOT(slotSetCaption (const TQString &)) );
+ connect( this, TQ_SIGNAL(setWindowCaption (const TQString &)),
+ this, TQ_SLOT(slotSetCaption (const TQString &)) );
- connect(this, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(slotStarted(TDEIO::Job* )));
- connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted()));
- connect(this, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCancelled(const TQString &)));
+ connect(this, TQ_SIGNAL(started(TDEIO::Job *)), this, TQ_SLOT(slotStarted(TDEIO::Job* )));
+ connect(this, TQ_SIGNAL(completed()), this, TQ_SLOT(slotCompleted()));
+ connect(this, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(slotCancelled(const TQString &)));
d->current = d->history.end();
@@ -362,7 +362,7 @@ void PageViewer::urlSelected(const TQString &url, int button, int state, const T
}
else
{
- if (button == Qt::LeftButton)
+ if (button == TQt::LeftButton)
{
m_url = completeURL(url);
browserExtension()->setURLArgs(args);
@@ -429,9 +429,9 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur
int idNewWindow = -2;
if (isLink)
{
- idNewWindow = popup.insertItem(SmallIcon("tab_new"),i18n("Open Link in New &Tab"), this, TQT_SLOT(slotOpenLinkInForegroundTab()));
+ idNewWindow = popup.insertItem(SmallIcon("tab_new"),i18n("Open Link in New &Tab"), this, TQ_SLOT(slotOpenLinkInForegroundTab()));
popup.setWhatsThis(idNewWindow, i18n("<b>Open Link in New Tab</b><p>Opens current link in a new tab."));
- popup.insertItem(SmallIcon("window-new"), i18n("Open Link in External &Browser"), this, TQT_SLOT(slotOpenLinkInBrowser()));
+ popup.insertItem(SmallIcon("window-new"), i18n("Open Link in External &Browser"), this, TQ_SLOT(slotOpenLinkInBrowser()));
popup.insertSeparator();
action("savelinkas")->plug(&popup);
@@ -472,7 +472,7 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur
popup.insertSeparator();
}
- popup.insertItem(SmallIcon("window-new"), i18n("Open Page in External Browser"), this, TQT_SLOT(slotOpenLinkInBrowser()));
+ popup.insertItem(SmallIcon("window-new"), i18n("Open Page in External Browser"), this, TQ_SLOT(slotOpenLinkInBrowser()));
action("viewer_print")->plug(&popup);
popup.insertSeparator();
@@ -480,7 +480,7 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur
TDEAction *ac = action("setEncoding");
if (ac)
ac->plug(&popup);
- popup.insertItem(SmallIcon("bookmark_add"),i18n("Add to Konqueror Bookmarks"), this, TQT_SLOT(slotGlobalBookmarkArticle()));
+ popup.insertItem(SmallIcon("bookmark_add"),i18n("Add to Konqueror Bookmarks"), this, TQ_SLOT(slotGlobalBookmarkArticle()));
}
int r = popup.exec(p);
diff --git a/akregator/src/pageviewer.h b/akregator/src/pageviewer.h
index d337779a..ba385674 100644
--- a/akregator/src/pageviewer.h
+++ b/akregator/src/pageviewer.h
@@ -39,7 +39,7 @@ namespace Akregator
// the back/forward navigation was taken from KDevelop. Kudos to the KDevelop team!
class PageViewer : public Viewer
{
- Q_OBJECT
+ TQ_OBJECT
public:
PageViewer(TQWidget* parent, const char* name);
diff --git a/akregator/src/progressmanager.cpp b/akregator/src/progressmanager.cpp
index dd27fbe9..1e205c8e 100644
--- a/akregator/src/progressmanager.cpp
+++ b/akregator/src/progressmanager.cpp
@@ -80,8 +80,8 @@ void ProgressManager::setFeedList(FeedList* feedList)
delete *it;
d->handlers.clear();
- disconnect(d->feedList, TQT_SIGNAL(signalNodeAdded(TreeNode*)), this, TQT_SLOT(slotNodeAdded(TreeNode*)));
- disconnect(d->feedList, TQT_SIGNAL(signalNodeRemoved(TreeNode*)), this, TQT_SLOT(slotNodeRemoved(TreeNode*)));
+ disconnect(d->feedList, TQ_SIGNAL(signalNodeAdded(TreeNode*)), this, TQ_SLOT(slotNodeAdded(TreeNode*)));
+ disconnect(d->feedList, TQ_SIGNAL(signalNodeRemoved(TreeNode*)), this, TQ_SLOT(slotNodeRemoved(TreeNode*)));
}
d->feedList = feedList;
@@ -92,8 +92,8 @@ void ProgressManager::setFeedList(FeedList* feedList)
for (TQValueList<TreeNode*>::ConstIterator it = list.begin(); it != list.end(); ++it)
slotNodeAdded(*it);
- connect(feedList, TQT_SIGNAL(signalNodeAdded(TreeNode*)), this, TQT_SLOT(slotNodeAdded(TreeNode*)));
- connect(feedList, TQT_SIGNAL(signalNodeRemoved(TreeNode*)), this, TQT_SLOT(slotNodeRemoved(TreeNode*)));
+ connect(feedList, TQ_SIGNAL(signalNodeAdded(TreeNode*)), this, TQ_SLOT(slotNodeAdded(TreeNode*)));
+ connect(feedList, TQ_SIGNAL(signalNodeRemoved(TreeNode*)), this, TQ_SLOT(slotNodeRemoved(TreeNode*)));
}
}
@@ -104,7 +104,7 @@ void ProgressManager::slotNodeAdded(TreeNode* node)
{
if (!d->handlers.contains(feed))
d->handlers[feed] = new ProgressItemHandler(feed);
- connect(feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotNodeDestroyed(TreeNode*)));
+ connect(feed, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotNodeDestroyed(TreeNode*)));
}
}
@@ -113,7 +113,7 @@ void ProgressManager::slotNodeRemoved(TreeNode* node)
Feed* feed = dynamic_cast<Feed*>(node);
if (feed)
{
- disconnect(feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotNodeDestroyed(TreeNode*)));
+ disconnect(feed, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotNodeDestroyed(TreeNode*)));
delete d->handlers[feed];
d->handlers.remove(feed);
}
@@ -142,10 +142,10 @@ ProgressItemHandler::ProgressItemHandler(Feed* feed) : d(new ProgressItemHandler
d->feed = feed;
d->progressItem = 0;
- connect(feed, TQT_SIGNAL(fetchStarted(Feed*)), this, TQT_SLOT(slotFetchStarted()));
- connect(feed, TQT_SIGNAL(fetched(Feed*)), this, TQT_SLOT(slotFetchCompleted()));
- connect(feed, TQT_SIGNAL(fetchError(Feed*)), this, TQT_SLOT(slotFetchError()));
- connect(feed, TQT_SIGNAL(fetchAborted(Feed*)), this, TQT_SLOT(slotFetchAborted()));
+ connect(feed, TQ_SIGNAL(fetchStarted(Feed*)), this, TQ_SLOT(slotFetchStarted()));
+ connect(feed, TQ_SIGNAL(fetched(Feed*)), this, TQ_SLOT(slotFetchCompleted()));
+ connect(feed, TQ_SIGNAL(fetchError(Feed*)), this, TQ_SLOT(slotFetchError()));
+ connect(feed, TQ_SIGNAL(fetchAborted(Feed*)), this, TQ_SLOT(slotFetchAborted()));
}
ProgressItemHandler::~ProgressItemHandler()
@@ -170,7 +170,7 @@ void ProgressItemHandler::slotFetchStarted()
d->progressItem = KPIM::ProgressManager::createProgressItem(KPIM::ProgressManager::getUniqueID(), TQStyleSheet::escape( d->feed->title() ), TQString(), true);
- connect(d->progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), d->feed, TQT_SLOT(slotAbortFetch()));
+ connect(d->progressItem, TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), d->feed, TQ_SLOT(slotAbortFetch()));
}
diff --git a/akregator/src/progressmanager.h b/akregator/src/progressmanager.h
index 2b5598f3..361c326b 100644
--- a/akregator/src/progressmanager.h
+++ b/akregator/src/progressmanager.h
@@ -35,7 +35,7 @@ class ProgressItemHandler;
class ProgressManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -66,7 +66,7 @@ class ProgressManager : public TQObject
class ProgressItemHandler : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
ProgressItemHandler(Feed* feed);
diff --git a/akregator/src/propertiesdialog.cpp b/akregator/src/propertiesdialog.cpp
index b8d318e8..7bea6f53 100644
--- a/akregator/src/propertiesdialog.cpp
+++ b/akregator/src/propertiesdialog.cpp
@@ -72,7 +72,7 @@ FeedPropertiesDialog::FeedPropertiesDialog(TQWidget *parent, const char *name)
setMainWidget(widget);
widget->feedNameEdit->setFocus();
- connect(widget->feedNameEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotSetCaption(const TQString&)));
+ connect(widget->feedNameEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotSetCaption(const TQString&)));
}
FeedPropertiesDialog::~FeedPropertiesDialog()
diff --git a/akregator/src/propertiesdialog.h b/akregator/src/propertiesdialog.h
index b9652221..6734a565 100644
--- a/akregator/src/propertiesdialog.h
+++ b/akregator/src/propertiesdialog.h
@@ -32,7 +32,7 @@ namespace Akregator
{
class FeedPropertiesWidget : public FeedPropertiesWidgetBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
FeedPropertiesWidget(TQWidget *parent = 0, const char *name = 0);
@@ -44,7 +44,7 @@ namespace Akregator
class FeedPropertiesDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
FeedPropertiesDialog(TQWidget *parent = 0, const char *name = 0);
diff --git a/akregator/src/propertieswidgetbase.ui b/akregator/src/propertieswidgetbase.ui
index fae011b0..073c46b4 100644
--- a/akregator/src/propertieswidgetbase.ui
+++ b/akregator/src/propertieswidgetbase.ui
@@ -452,10 +452,10 @@
<slot>setEnabled(bool)</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot access="protected" specifier="pure virtual">slotUpdateComboBoxActivated( int )</slot>
<slot access="protected" specifier="pure virtual">slotUpdateCheckBoxToggled( bool )</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp
index ff163993..9e705ec5 100644
--- a/akregator/src/searchbar.cpp
+++ b/akregator/src/searchbar.cpp
@@ -75,8 +75,8 @@ SearchBar::SearchBar(TQWidget* parent, const char* name) : TQHBox(parent, name),
searchLabel->setText( i18n("S&earch:") );
d->searchLine = new KLineEdit(this, "searchline");
- connect(d->searchLine, TQT_SIGNAL(textChanged(const TQString &)),
- this, TQT_SLOT(slotSearchStringChanged(const TQString &)));
+ connect(d->searchLine, TQ_SIGNAL(textChanged(const TQString &)),
+ this, TQ_SLOT(slotSearchStringChanged(const TQString &)));
searchLabel->setBuddy(d->searchLine);
@@ -98,13 +98,13 @@ SearchBar::SearchBar(TQWidget* parent, const char* name) : TQHBox(parent, name),
TQToolTip::add( d->searchLine, i18n( "Enter space-separated terms to filter article list" ) );
TQToolTip::add( d->searchCombo, i18n( "Choose what kind of articles to show in article list" ) );
- connect(clearButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT(slotClearSearch()) );
+ connect(clearButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT(slotClearSearch()) );
- connect(d->searchCombo, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotSearchComboChanged(int)));
+ connect(d->searchCombo, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotSearchComboChanged(int)));
- connect(&(d->timer), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotActivateSearch()));
+ connect(&(d->timer), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotActivateSearch()));
}
SearchBar::~SearchBar()
diff --git a/akregator/src/searchbar.h b/akregator/src/searchbar.h
index cbb01a6b..113da699 100644
--- a/akregator/src/searchbar.h
+++ b/akregator/src/searchbar.h
@@ -39,7 +39,7 @@ namespace Filters
class SearchBar : public TQHBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/akregator/src/settings_advanced.cpp b/akregator/src/settings_advanced.cpp
index 7a849ff9..44106cfa 100644
--- a/akregator/src/settings_advanced.cpp
+++ b/akregator/src/settings_advanced.cpp
@@ -25,8 +25,8 @@ SettingsAdvanced::SettingsAdvanced(TQWidget* parent, const char* name) : Setting
cbBackend->insertItem(m_factories[i]->name());
i++;
}
- connect(pbBackendConfigure, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConfigureStorage()));
- connect(cbBackend, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotFactorySelected(int)));
+ connect(pbBackendConfigure, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotConfigureStorage()));
+ connect(cbBackend, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotFactorySelected(int)));
}
TQString SettingsAdvanced::selectedFactory() const
diff --git a/akregator/src/settings_advanced.h b/akregator/src/settings_advanced.h
index cbb7b7f5..e2e14fe7 100644
--- a/akregator/src/settings_advanced.h
+++ b/akregator/src/settings_advanced.h
@@ -17,7 +17,7 @@ namespace Backend
class SettingsAdvanced : public SettingsAdvancedBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp
index a4f1d4be..ddb54505 100644
--- a/akregator/src/simplenodeselector.cpp
+++ b/akregator/src/simplenodeselector.cpp
@@ -50,7 +50,7 @@ SelectNodeDialog::SelectNodeDialog(FeedList* feedList, TQWidget* parent, char* n
{
d->widget = new SimpleNodeSelector(feedList, this);
- connect(d->widget, TQT_SIGNAL(signalNodeSelected(TreeNode*)), this, TQT_SLOT(slotNodeSelected(TreeNode*)));
+ connect(d->widget, TQ_SIGNAL(signalNodeSelected(TreeNode*)), this, TQ_SLOT(slotNodeSelected(TreeNode*)));
setMainWidget(d->widget);
enableButtonOK(false);
@@ -122,7 +122,7 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor
item->setExpandable(false);
m_view->d->nodeToItem.insert(node, item);
m_view->d->itemToNode.insert(item, node);
- connect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQT_SLOT(slotNodeDestroyed(TreeNode*)));
+ connect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQ_SLOT(slotNodeDestroyed(TreeNode*)));
return true;
}
@@ -135,13 +135,13 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor
SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* parent, const char* name) : TQWidget(parent, name), d(new SimpleNodeSelectorPrivate)
{
d->list = feedList;
- connect(feedList, TQT_SIGNAL(signalDestroyed(FeedList*)), this, TQT_SLOT(slotFeedListDestroyed(FeedList*)));
+ connect(feedList, TQ_SIGNAL(signalDestroyed(FeedList*)), this, TQ_SLOT(slotFeedListDestroyed(FeedList*)));
d->view = new TDEListView(this);
d->view->setRootIsDecorated(true);
d->view->addColumn(i18n("Feeds"));
- connect(d->view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotItemSelected(TQListViewItem*)));
+ connect(d->view, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(slotItemSelected(TQListViewItem*)));
TQGridLayout* layout = new TQGridLayout(this, 1, 1);
layout->addWidget(d->view, 0, 0);
diff --git a/akregator/src/simplenodeselector.h b/akregator/src/simplenodeselector.h
index 1ac25b37..e0578d15 100644
--- a/akregator/src/simplenodeselector.h
+++ b/akregator/src/simplenodeselector.h
@@ -43,7 +43,7 @@ class SimpleNodeSelector;
class SelectNodeDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
SelectNodeDialog(FeedList* feedList, TQWidget* parent=0, char* name=0);
@@ -66,7 +66,7 @@ class SelectNodeDialog : public KDialogBase
class SimpleNodeSelector : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/akregator/src/speechclient.h b/akregator/src/speechclient.h
index d4fe8f6f..bc097a9f 100644
--- a/akregator/src/speechclient.h
+++ b/akregator/src/speechclient.h
@@ -41,7 +41,7 @@ class Article;
class SpeechClient : public TQObject, public KSpeech_stub, virtual public KSpeechSink
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/akregator/src/storagedummyimpl.h b/akregator/src/storagedummyimpl.h
index 3288737a..d39fc3c1 100644
--- a/akregator/src/storagedummyimpl.h
+++ b/akregator/src/storagedummyimpl.h
@@ -36,7 +36,7 @@ namespace Backend {
*/
class StorageDummyImpl : public Storage
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp
index 76c8b198..b1cbf9c5 100644
--- a/akregator/src/tabwidget.cpp
+++ b/akregator/src/tabwidget.cpp
@@ -70,15 +70,15 @@ TabWidget::TabWidget(TQWidget * parent, const char *name)
d->currentItem = 0;
setMinimumSize(250,150);
setTabReorderingEnabled(false);
- connect( this, TQT_SIGNAL( currentChanged(TQWidget *) ), this,
- TQT_SLOT( slotTabChanged(TQWidget *) ) );
- connect(this, TQT_SIGNAL(closeRequest(TQWidget*)), this, TQT_SLOT(slotCloseRequest(TQWidget*)));
+ connect( this, TQ_SIGNAL( currentChanged(TQWidget *) ), this,
+ TQ_SLOT( slotTabChanged(TQWidget *) ) );
+ connect(this, TQ_SIGNAL(closeRequest(TQWidget*)), this, TQ_SLOT(slotCloseRequest(TQWidget*)));
setHoverCloseButton(Settings::closeButtonOnTabs());
d->tabsClose = new TQToolButton(this);
d->tabsClose->setAccel(TQKeySequence("Ctrl+W"));
- connect( d->tabsClose, TQT_SIGNAL( clicked() ), this,
- TQT_SLOT( slotRemoveCurrentFrame() ) );
+ connect( d->tabsClose, TQ_SIGNAL( clicked() ), this,
+ TQ_SLOT( slotRemoveCurrentFrame() ) );
d->tabsClose->setIconSet( SmallIconSet( "tab_remove" ) );
d->tabsClose->adjustSize();
@@ -117,7 +117,7 @@ void TabWidget::addFrame(Frame *f)
return;
d->frames.insert(f->widget(), f);
addTab(f->widget(), f->title());
- connect(f, TQT_SIGNAL(titleChanged(Frame*, const TQString& )), this, TQT_SLOT(slotSetTitle(Frame*, const TQString& )));
+ connect(f, TQ_SIGNAL(titleChanged(Frame*, const TQString& )), this, TQ_SLOT(slotSetTitle(Frame*, const TQString& )));
slotSetTitle(f, f->title());
}
@@ -183,7 +183,7 @@ uint TabWidget::tabBarWidthForMaxChars( uint maxLength )
if ( tab->iconSet() )
iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4;
- x += ( tabBar()->style().tqsizeFromContents( TQStyle::CT_TabBarTab, this, TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width();
+ x += ( tabBar()->style().sizeFromContents( TQStyle::CT_TabBarTab, this, TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width();
}
return x;
}
diff --git a/akregator/src/tabwidget.h b/akregator/src/tabwidget.h
index 70fdca04..e190f51d 100644
--- a/akregator/src/tabwidget.h
+++ b/akregator/src/tabwidget.h
@@ -37,7 +37,7 @@ class Frame;
class TabWidget : public KTabWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/akregator/src/tagaction.cpp b/akregator/src/tagaction.cpp
index f987409c..728bf0ab 100644
--- a/akregator/src/tagaction.cpp
+++ b/akregator/src/tagaction.cpp
@@ -49,8 +49,8 @@ TagAction::TagAction(const Tag& tag, const TQObject *receiver, const char *slot,
: TDEToggleAction(tag.name(), TDEShortcut(), 0, 0, parent), d(new TagActionPrivate)
{
d->tag = tag;
- connect(this, TQT_SIGNAL(toggled(const Tag&, bool)), receiver, slot);
- connect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled(bool)));
+ connect(this, TQ_SIGNAL(toggled(const Tag&, bool)), receiver, slot);
+ connect(this, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggled(bool)));
}
TagAction::~TagAction()
@@ -93,7 +93,7 @@ int TagAction::plug(TQWidget* widget, int index)
int id = popup->insertItem(TagMenuItem::checkBoxIconSet(isChecked(), popup->colorGroup()), item, -1, index);
- popup->connectItem (id, this, TQT_SLOT(slotActivated()));
+ popup->connectItem (id, this, TQ_SLOT(slotActivated()));
d->popupToId[popup] = id;
d->idToPopup[id] = popup;
diff --git a/akregator/src/tagaction.h b/akregator/src/tagaction.h
index 26abb636..5837944b 100644
--- a/akregator/src/tagaction.h
+++ b/akregator/src/tagaction.h
@@ -37,7 +37,7 @@ class Tag;
/** a TDEToggleAction for assigning and removing tags. Displays the tag name and emits the tag when activated */
class TagAction : public TDEToggleAction
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/akregator/src/tagnode.cpp b/akregator/src/tagnode.cpp
index 1f5743fd..af64e546 100644
--- a/akregator/src/tagnode.cpp
+++ b/akregator/src/tagnode.cpp
@@ -60,10 +60,10 @@ TagNode::TagNode(const Tag& tag, TreeNode* observed) : d(new TagNodePrivate)
d->observed = observed;
d->unread = 0;
- connect(observed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotObservedDestroyed(TreeNode*)));
- connect(observed, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)) );
- connect(observed, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)) );
- connect(observed, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)) );
+ connect(observed, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotObservedDestroyed(TreeNode*)));
+ connect(observed, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)) );
+ connect(observed, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)) );
+ connect(observed, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)) );
d->articles = observed->articles(tag.id());
calcUnread();
diff --git a/akregator/src/tagnode.h b/akregator/src/tagnode.h
index a41439fc..2266fd0f 100644
--- a/akregator/src/tagnode.h
+++ b/akregator/src/tagnode.h
@@ -44,7 +44,7 @@ class TreeNodeVisitor;
class TagNode : public TreeNode
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/akregator/src/tagnodelist.cpp b/akregator/src/tagnodelist.cpp
index 6d60da63..288ecc77 100644
--- a/akregator/src/tagnodelist.cpp
+++ b/akregator/src/tagnodelist.cpp
@@ -58,9 +58,9 @@ TagNodeList::TagNodeList(FeedList* feedList, TagSet* tagSet) : NodeList(), d(ne
d->feedList = feedList;
d->tagSet = tagSet;
- connect(d->tagSet, TQT_SIGNAL(signalTagAdded(const Tag&)), this, TQT_SLOT(slotTagAdded(const Tag&)));
- connect(d->tagSet, TQT_SIGNAL(signalTagRemoved(const Tag&)), this, TQT_SLOT(slotTagRemoved(const Tag&)));
- connect(d->tagSet, TQT_SIGNAL(signalTagUpdated(const Tag&)), this, TQT_SLOT(slotTagUpdated(const Tag&)));
+ connect(d->tagSet, TQ_SIGNAL(signalTagAdded(const Tag&)), this, TQ_SLOT(slotTagAdded(const Tag&)));
+ connect(d->tagSet, TQ_SIGNAL(signalTagRemoved(const Tag&)), this, TQ_SLOT(slotTagRemoved(const Tag&)));
+ connect(d->tagSet, TQ_SIGNAL(signalTagUpdated(const Tag&)), this, TQ_SLOT(slotTagUpdated(const Tag&)));
setRootNode(new TagFolder(i18n("My Tags")));
diff --git a/akregator/src/tagnodelist.h b/akregator/src/tagnodelist.h
index be85e7e8..c31ee69f 100644
--- a/akregator/src/tagnodelist.h
+++ b/akregator/src/tagnodelist.h
@@ -43,7 +43,7 @@ namespace Akregator {
class TagNodeList : public NodeList
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/akregator/src/tagpropertiesdialog.cpp b/akregator/src/tagpropertiesdialog.cpp
index 4f73467e..b21f1d03 100644
--- a/akregator/src/tagpropertiesdialog.cpp
+++ b/akregator/src/tagpropertiesdialog.cpp
@@ -47,7 +47,7 @@ TagPropertiesDialog::TagPropertiesDialog(TQWidget *parent, const char *name) : K
d->widget->le_title->setFocus();
enableButtonOK(false);
enableButtonApply(false);
- connect(d->widget->le_title, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotTextChanged(const TQString& )));
+ connect(d->widget->le_title, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged(const TQString& )));
}
TagPropertiesDialog::~TagPropertiesDialog()
diff --git a/akregator/src/tagpropertiesdialog.h b/akregator/src/tagpropertiesdialog.h
index 24e6788d..347f1f03 100644
--- a/akregator/src/tagpropertiesdialog.h
+++ b/akregator/src/tagpropertiesdialog.h
@@ -33,7 +33,7 @@ class Tag;
class TagPropertiesDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/akregator/src/tagset.h b/akregator/src/tagset.h
index f0814834..12a4247e 100644
--- a/akregator/src/tagset.h
+++ b/akregator/src/tagset.h
@@ -47,7 +47,7 @@ class Tag;
class TagSet : public TQObject
{
friend class Tag;
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp
index 9cab8b3b..5d04d549 100644
--- a/akregator/src/trayicon.cpp
+++ b/akregator/src/trayicon.cpp
@@ -74,7 +74,7 @@ TrayIcon::~TrayIcon()
void TrayIcon::mousePressEvent(TQMouseEvent *e) {
- if (e->button() == Qt::LeftButton) {
+ if (e->button() == TQt::LeftButton) {
emit showPart();
}
@@ -200,7 +200,7 @@ void TrayIcon::setUnread(int unread, bool force)
void TrayIcon::viewButtonClicked()
{
- TQWidget *p=TQT_TQWIDGET(parent());
+ TQWidget *p=static_cast<TQWidget*>(parent());
KWin::forceActiveWindow(p->winId());
}
diff --git a/akregator/src/trayicon.h b/akregator/src/trayicon.h
index 7c854666..5d9f4fea 100644
--- a/akregator/src/trayicon.h
+++ b/akregator/src/trayicon.h
@@ -34,7 +34,7 @@ namespace Akregator
{
class TrayIcon : public KSystemTray
{
- Q_OBJECT
+ TQ_OBJECT
public:
static TrayIcon* getInstance();
diff --git a/akregator/src/treenode.h b/akregator/src/treenode.h
index 02b64614..1a804440 100644
--- a/akregator/src/treenode.h
+++ b/akregator/src/treenode.h
@@ -50,7 +50,7 @@ class FetchQueue;
*/
class TreeNode : public TQObject
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp
index 02bba26c..603f4efc 100644
--- a/akregator/src/viewer.cpp
+++ b/akregator/src/viewer.cpp
@@ -57,28 +57,28 @@ Viewer::Viewer(TQWidget *parent, const char *name)
setStatusMessagesEnabled(true);
// change the cursor when loading stuff...
- connect( this, TQT_SIGNAL(started(TDEIO::Job *)),
- this, TQT_SLOT(slotStarted(TDEIO::Job *)));
- connect( this, TQT_SIGNAL(completed()),
- this, TQT_SLOT(slotCompleted()));
+ connect( this, TQ_SIGNAL(started(TDEIO::Job *)),
+ this, TQ_SLOT(slotStarted(TDEIO::Job *)));
+ connect( this, TQ_SIGNAL(completed()),
+ this, TQ_SLOT(slotCompleted()));
- connect( browserExtension(), TQT_SIGNAL(popupMenu (KXMLGUIClient*, const TQPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t)), this, TQT_SLOT(slotPopupMenu(KXMLGUIClient*, const TQPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t)));
+ connect( browserExtension(), TQ_SIGNAL(popupMenu (KXMLGUIClient*, const TQPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t)), this, TQ_SLOT(slotPopupMenu(KXMLGUIClient*, const TQPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t)));
- KStdAction::print(this, TQT_SLOT(slotPrint()), actionCollection(), "viewer_print");
- KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection(), "viewer_copy");
+ KStdAction::print(this, TQ_SLOT(slotPrint()), actionCollection(), "viewer_print");
+ KStdAction::copy(this, TQ_SLOT(slotCopy()), actionCollection(), "viewer_copy");
- new TDEAction( i18n("&Increase Font Sizes"), "zoom-in", "Ctrl+Plus", this, TQT_SLOT(slotZoomIn()), actionCollection(), "incFontSizes" );
- new TDEAction( i18n("&Decrease Font Sizes"), "zoom-out", "Ctrl+Minus", this, TQT_SLOT(slotZoomOut()), actionCollection(), "decFontSizes" );
+ new TDEAction( i18n("&Increase Font Sizes"), "zoom-in", "Ctrl+Plus", this, TQ_SLOT(slotZoomIn()), actionCollection(), "incFontSizes" );
+ new TDEAction( i18n("&Decrease Font Sizes"), "zoom-out", "Ctrl+Minus", this, TQ_SLOT(slotZoomOut()), actionCollection(), "decFontSizes" );
- connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
+ connect(this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()));
- connect( browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL&, const KParts::URLArgs&)), this, TQT_SLOT(slotOpenURLRequest(const KURL&, const KParts::URLArgs& )) );
+ connect( browserExtension(), TQ_SIGNAL(openURLRequestDelayed(const KURL&, const KParts::URLArgs&)), this, TQ_SLOT(slotOpenURLRequest(const KURL&, const KParts::URLArgs& )) );
new TDEAction(i18n("Copy &Link Address"), "", 0,
- this, TQT_SLOT(slotCopyLinkAddress()),
+ this, TQ_SLOT(slotCopyLinkAddress()),
actionCollection(), "copylinkaddress");
new TDEAction(i18n("&Save Link As..."), "", 0,
- this, TQT_SLOT(slotSaveLinkAs()),
+ this, TQ_SLOT(slotSaveLinkAs()),
actionCollection(), "savelinkas");
}
@@ -130,7 +130,7 @@ void Viewer::urlSelected(const TQString &url, int button, int state, const TQStr
{
m_url = completeURL(url);
browserExtension()->setURLArgs(args);
- if (button == Qt::LeftButton)
+ if (button == TQt::LeftButton)
{
switch (Settings::lMBBehaviour())
{
@@ -146,7 +146,7 @@ void Viewer::urlSelected(const TQString &url, int button, int state, const TQStr
}
return;
}
- else if (button == Qt::MidButton)
+ else if (button == TQt::MidButton)
{
switch (Settings::mMBBehaviour())
{
@@ -177,8 +177,8 @@ void Viewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kurl, c
if (isLink && !isSelection)
{
- popup.insertItem(SmallIcon("tab_new"), i18n("Open Link in New &Tab"), this, TQT_SLOT(slotOpenLinkInForegroundTab()));
- popup.insertItem(SmallIcon("window-new"), i18n("Open Link in External &Browser"), this, TQT_SLOT(slotOpenLinkInBrowser()));
+ popup.insertItem(SmallIcon("tab_new"), i18n("Open Link in New &Tab"), this, TQ_SLOT(slotOpenLinkInForegroundTab()));
+ popup.insertItem(SmallIcon("window-new"), i18n("Open Link in External &Browser"), this, TQ_SLOT(slotOpenLinkInBrowser()));
popup.insertSeparator();
action("savelinkas")->plug(&popup);
action("copylinkaddress")->plug(&popup);
@@ -204,9 +204,9 @@ void Viewer::slotCopy()
TQString text = selectedText();
text.replace( TQChar( 0xa0 ), ' ' );
TQClipboard *cb = TQApplication::clipboard();
- disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
+ disconnect( cb, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotClearSelection() ) );
cb->setText(text);
- connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
+ connect( cb, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotClearSelection() ) );
}
void Viewer::slotCopyLinkAddress()
diff --git a/akregator/src/viewer.h b/akregator/src/viewer.h
index 112e71b0..3e6fabb1 100644
--- a/akregator/src/viewer.h
+++ b/akregator/src/viewer.h
@@ -38,7 +38,7 @@ namespace Akregator
{
class Viewer : public TDEHTMLPart
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/certmanager/certificateinfowidgetimpl.cpp b/certmanager/certificateinfowidgetimpl.cpp
index 79b02b24..9ff6b15a 100644
--- a/certmanager/certificateinfowidgetimpl.cpp
+++ b/certmanager/certificateinfowidgetimpl.cpp
@@ -84,17 +84,17 @@ CertificateInfoWidgetImpl::CertificateInfoWidgetImpl( const GpgME::Key & key, bo
listView->header()->setClickEnabled( false );
listView->setSorting( -1 );
- connect( listView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ),
- this, TQT_SLOT( slotShowInfo( TQListViewItem* ) ) );
+ connect( listView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ),
+ this, TQ_SLOT( slotShowInfo( TQListViewItem* ) ) );
pathView->setColumnWidthMode( 0, TQListView::Maximum );
pathView->header()->hide();
- connect( pathView, TQT_SIGNAL( doubleClicked( TQListViewItem* ) ),
- this, TQT_SLOT( slotShowCertPathDetails( TQListViewItem* ) ) );
- connect( pathView, TQT_SIGNAL( returnPressed( TQListViewItem* ) ),
- this, TQT_SLOT( slotShowCertPathDetails( TQListViewItem* ) ) );
- connect( importButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotImportCertificate() ) );
+ connect( pathView, TQ_SIGNAL( doubleClicked( TQListViewItem* ) ),
+ this, TQ_SLOT( slotShowCertPathDetails( TQListViewItem* ) ) );
+ connect( pathView, TQ_SIGNAL( returnPressed( TQListViewItem* ) ),
+ this, TQ_SLOT( slotShowCertPathDetails( TQListViewItem* ) ) );
+ connect( importButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotImportCertificate() ) );
dumpView->setFont( TDEGlobalSettings::fixedFont() );
@@ -232,10 +232,10 @@ void CertificateInfoWidgetImpl::startCertificateChainListing() {
Kleo::CryptoBackendFactory::instance()->smime()->keyListJob( false );
assert( job );
- connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)),
- TQT_SLOT(slotCertificateChainListingResult(const GpgME::KeyListResult&)) );
- connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)),
- TQT_SLOT(slotNextKey(const GpgME::Key&)) );
+ connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)),
+ TQ_SLOT(slotCertificateChainListingResult(const GpgME::KeyListResult&)) );
+ connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)),
+ TQ_SLOT(slotNextKey(const GpgME::Key&)) );
kdDebug() << "Going to fetch" << endl
<< " issuer : \"" << mChain.front().issuerName() << "\"" << endl
@@ -253,17 +253,17 @@ void CertificateInfoWidgetImpl::startCertificateChainListing() {
}
void CertificateInfoWidgetImpl::startCertificateDump() {
- TDEProcess* proc = new TDEProcess( TQT_TQOBJECT(this) );
+ TDEProcess* proc = new TDEProcess( this );
(*proc) << "gpgsm"; // must be in the PATH
(*proc) << "--dump-keys";
(*proc) << mChain.front().primaryFingerprint();
- TQObject::connect( proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int) ),
- this, TQT_SLOT( slotCollectStdout(TDEProcess *, char *, int) ) );
- TQObject::connect( proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int) ),
- this, TQT_SLOT( slotCollectStderr(TDEProcess *, char *, int) ) );
- TQObject::connect( proc, TQT_SIGNAL( processExited(TDEProcess*) ),
- this, TQT_SLOT( slotDumpProcessExited(TDEProcess*) ) );
+ TQObject::connect( proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int) ),
+ this, TQ_SLOT( slotCollectStdout(TDEProcess *, char *, int) ) );
+ TQObject::connect( proc, TQ_SIGNAL( receivedStderr(TDEProcess *, char *, int) ),
+ this, TQ_SLOT( slotCollectStderr(TDEProcess *, char *, int) ) );
+ TQObject::connect( proc, TQ_SIGNAL( processExited(TDEProcess*) ),
+ this, TQ_SLOT( slotDumpProcessExited(TDEProcess*) ) );
if ( !proc->start( TDEProcess::NotifyOnExit, (TDEProcess::Communication)(TDEProcess::Stdout | TDEProcess::Stderr) ) ) {
TQString wmsg = i18n("Failed to execute gpgsm:\n%1").arg( i18n( "program not found" ) );
@@ -383,8 +383,8 @@ void CertificateInfoWidgetImpl::slotShowCertPathDetails( TQListViewItem * item )
new CertificateInfoWidgetImpl( mChain[itemIndex], mExternal, dialog );
dialog->setMainWidget( top );
// proxy the signal to our receiver:
- connect( top, TQT_SIGNAL(requestCertificateDownload(const TQString&, const TQString&)),
- TQT_SIGNAL(requestCertificateDownload(const TQString&, const TQString&)) );
+ connect( top, TQ_SIGNAL(requestCertificateDownload(const TQString&, const TQString&)),
+ TQ_SIGNAL(requestCertificateDownload(const TQString&, const TQString&)) );
dialog->show();
}
@@ -415,10 +415,10 @@ void CertificateInfoWidgetImpl::startKeyExistanceCheck() {
Kleo::CryptoBackendFactory::instance()->smime()->keyListJob( false );
assert( job );
- connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)),
- TQT_SLOT(slotKeyExistanceCheckNextCandidate(const GpgME::Key&)) );
- connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)),
- TQT_SLOT(slotKeyExistanceCheckFinished()) );
+ connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)),
+ TQ_SLOT(slotKeyExistanceCheckNextCandidate(const GpgME::Key&)) );
+ connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)),
+ TQ_SLOT(slotKeyExistanceCheckFinished()) );
// nor to check for errors:
job->start( fingerprint );
}
diff --git a/certmanager/certificateinfowidgetimpl.h b/certmanager/certificateinfowidgetimpl.h
index 9536ddb3..5838ec84 100644
--- a/certmanager/certificateinfowidgetimpl.h
+++ b/certmanager/certificateinfowidgetimpl.h
@@ -47,7 +47,7 @@ namespace GpgME {
}
class CertificateInfoWidgetImpl : public CertificateInfoWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
CertificateInfoWidgetImpl( const GpgME::Key & key, bool external,
diff --git a/certmanager/certificatewizard.ui b/certmanager/certificatewizard.ui
index 6eddb9cb..3fdeb600 100644
--- a/certmanager/certificatewizard.ui
+++ b/certmanager/certificatewizard.ui
@@ -546,10 +546,10 @@ If you want to change anything, press Back and make your changes; otherwise, pre
<tabstop>certificateTE</tabstop>
<tabstop>generatePB</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot access="protected">slotEmailAddressChanged(const TQString&amp;)</slot>
<slot access="protected">slotGenerateCertificate()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp
index e1d47f99..f5dd08ad 100644
--- a/certmanager/certificatewizardimpl.cpp
+++ b/certmanager/certificatewizardimpl.cpp
@@ -126,16 +126,16 @@ CertificateWizardImpl::CertificateWizardImpl( TQWidget* parent, const char* nam
// Allow to select remote URLs
storeUR->setMode( KFile::File );
storeUR->setFilter( "application/pkcs10" );
- connect( storeUR, TQT_SIGNAL( urlSelected( const TQString& ) ),
- this, TQT_SLOT( slotURLSelected( const TQString& ) ) );
+ connect( storeUR, TQ_SIGNAL( urlSelected( const TQString& ) ),
+ this, TQ_SLOT( slotURLSelected( const TQString& ) ) );
const TDEConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" );
caEmailED->setText( config.readEntry( "CAEmailAddress" ) );
- connect( this, TQT_SIGNAL( helpClicked() ),
- this, TQT_SLOT( slotHelpClicked() ) );
- connect( insertAddressButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotSetValuesFromWhoAmI() ) );
+ connect( this, TQ_SIGNAL( helpClicked() ),
+ this, TQ_SLOT( slotHelpClicked() ) );
+ connect( insertAddressButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotSetValuesFromWhoAmI() ) );
for ( unsigned int i = 0 ; i < numKeyLengths ; ++i )
keyLengthCB->insertItem( i18n("%n bit", "%n bits", keyLengths[i] ) );
@@ -246,8 +246,8 @@ void CertificateWizardImpl::slotGenerateCertificate()
Kleo::CryptoBackendFactory::instance()->smime()->keyGenerationJob();
assert( job );
- connect( job, TQT_SIGNAL(result(const GpgME::KeyGenerationResult&,const TQByteArray&)),
- TQT_SLOT(slotResult(const GpgME::KeyGenerationResult&,const TQByteArray&)) );
+ connect( job, TQ_SIGNAL(result(const GpgME::KeyGenerationResult&,const TQByteArray&)),
+ TQ_SLOT(slotResult(const GpgME::KeyGenerationResult&,const TQByteArray&)) );
certificateTE->setText( certParms );
@@ -362,10 +362,10 @@ void CertificateWizardImpl::createPersonalDataPage()
if ( config.entryIsImmutable( attr ) )
le->setEnabled( false );
- _attrPairList.append(tqMakePair(key, le));
+ _attrPairList.append(qMakePair(key, le));
- connect( le, TQT_SIGNAL(textChanged(const TQString&)),
- TQT_SLOT(slotEnablePersonalDataPageExit()) );
+ connect( le, TQ_SIGNAL(textChanged(const TQString&)),
+ TQ_SLOT(slotEnablePersonalDataPageExit()) );
}
// enable button only if administrator wants to allow it
@@ -490,8 +490,8 @@ void CertificateWizardImpl::accept()
TDEIO::Job* uploadJob = TDEIOext::put( _keyData, url, -1, overwrite, false /*resume*/ );
uploadJob->setWindow( this );
- connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
- this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) );
+ connect( uploadJob, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQ_SLOT( slotUploadResult( TDEIO::Job* ) ) );
// Can't press finish again during the upload
setFinishEnabled( finishPage, false );
}
diff --git a/certmanager/certificatewizardimpl.h b/certmanager/certificatewizardimpl.h
index 9ac52f7a..844f39ed 100644
--- a/certmanager/certificatewizardimpl.h
+++ b/certmanager/certificatewizardimpl.h
@@ -48,7 +48,7 @@ namespace TDEIO {
class CertificateWizardImpl : public CertificateWizard
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/certmanager/certlistview.h b/certmanager/certlistview.h
index 63154d9f..dd488691 100644
--- a/certmanager/certlistview.h
+++ b/certmanager/certlistview.h
@@ -6,7 +6,7 @@
/// We need to derive from Kleo::KeyListView simply to add support for drop events
class CertKeyListView : public Kleo::KeyListView {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index a972ce9b..ddcdb8a4 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -187,17 +187,17 @@ CertManager::CertManager( bool remote, const TQString& query, const TQString & i
mKeyListView->setSelectionMode( TQListView::Extended );
setCentralWidget( mKeyListView );
- connect( mKeyListView, TQT_SIGNAL(doubleClicked(Kleo::KeyListViewItem*,const TQPoint&,int)),
- TQT_SLOT(slotViewDetails(Kleo::KeyListViewItem*)) );
- connect( mKeyListView, TQT_SIGNAL(returnPressed(Kleo::KeyListViewItem*)),
- TQT_SLOT(slotViewDetails(Kleo::KeyListViewItem*)) );
- connect( mKeyListView, TQT_SIGNAL(selectionChanged()),
- TQT_SLOT(slotSelectionChanged()) );
- connect( mKeyListView, TQT_SIGNAL(contextMenu(Kleo::KeyListViewItem*, const TQPoint&)),
- TQT_SLOT(slotContextMenu(Kleo::KeyListViewItem*, const TQPoint&)) );
-
- connect( mKeyListView, TQT_SIGNAL(dropped(const KURL::List&) ),
- TQT_SLOT( slotDropped(const KURL::List&) ) );
+ connect( mKeyListView, TQ_SIGNAL(doubleClicked(Kleo::KeyListViewItem*,const TQPoint&,int)),
+ TQ_SLOT(slotViewDetails(Kleo::KeyListViewItem*)) );
+ connect( mKeyListView, TQ_SIGNAL(returnPressed(Kleo::KeyListViewItem*)),
+ TQ_SLOT(slotViewDetails(Kleo::KeyListViewItem*)) );
+ connect( mKeyListView, TQ_SIGNAL(selectionChanged()),
+ TQ_SLOT(slotSelectionChanged()) );
+ connect( mKeyListView, TQ_SIGNAL(contextMenu(Kleo::KeyListViewItem*, const TQPoint&)),
+ TQ_SLOT(slotContextMenu(Kleo::KeyListViewItem*, const TQPoint&)) );
+
+ connect( mKeyListView, TQ_SIGNAL(dropped(const KURL::List&) ),
+ TQ_SLOT( slotDropped(const KURL::List&) ) );
mLineEditAction->setText(query);
if ( !mRemote && !mNextFindRemote || !query.isEmpty() )
@@ -244,132 +244,132 @@ void CertManager::createStatusBar() {
}
static inline void connectEnableOperationSignal( TQObject * s, TQObject * d ) {
- TQObject::connect( s, TQT_SIGNAL(enableOperations(bool)),
- d, TQT_SLOT(setEnabled(bool)) );
+ TQObject::connect( s, TQ_SIGNAL(enableOperations(bool)),
+ d, TQ_SLOT(setEnabled(bool)) );
}
void CertManager::createActions() {
TDEAction * action = 0;
- (void)KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() );
+ (void)KStdAction::quit( this, TQ_SLOT(close()), actionCollection() );
- action = KStdAction::redisplay( TQT_TQOBJECT(this), TQT_SLOT(slotRedisplay()), actionCollection() );
+ action = KStdAction::redisplay( this, TQ_SLOT(slotRedisplay()), actionCollection() );
// work around the fact that the stdaction has no shortcut
TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload);
reloadShortcut.append(KKey(CTRL + Key_R));
action->setShortcut( reloadShortcut );
- connectEnableOperationSignal( TQT_TQOBJECT(this), action );
+ connectEnableOperationSignal( this, action );
action = new TDEAction( i18n("Stop Operation"), "process-stop", Key_Escape,
- TQT_TQOBJECT(this), TQT_SIGNAL(stopOperations()),
+ this, TQ_SIGNAL(stopOperations()),
actionCollection(), "view_stop_operations" );
action->setEnabled( false );
(void) new TDEAction( i18n("New Key Pair..."), "document-new", 0,
- TQT_TQOBJECT(this), TQT_SLOT(newCertificate()),
+ this, TQ_SLOT(newCertificate()),
actionCollection(), "file_new_certificate" );
connect( new TDEToggleAction( i18n("Hierarchical Key List"), 0,
actionCollection(), "view_hierarchical" ),
- TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleHierarchicalView(bool)) );
+ TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggleHierarchicalView(bool)) );
action = new TDEAction( i18n("Expand All"), 0, CTRL+Key_Period,
- TQT_TQOBJECT(this), TQT_SLOT(slotExpandAll()),
+ this, TQ_SLOT(slotExpandAll()),
actionCollection(), "view_expandall" );
action = new TDEAction( i18n("Collapse All"), 0, CTRL+Key_Comma,
- TQT_TQOBJECT(this), TQT_SLOT(slotCollapseAll()),
+ this, TQ_SLOT(slotCollapseAll()),
actionCollection(), "view_collapseall" );
(void) new TDEAction( i18n("Refresh CRLs"), 0, 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotRefreshKeys()),
+ this, TQ_SLOT(slotRefreshKeys()),
actionCollection(), "certificates_refresh_clr" );
#ifdef NOT_IMPLEMENTED_ANYWAY
mRevokeCertificateAction = new TDEAction( i18n("Revoke"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(revokeCertificate()),
+ this, TQ_SLOT(revokeCertificate()),
actionCollection(), "edit_revoke_certificate" );
connectEnableOperationSignal( this, mRevokeCertificateAction );
mExtendCertificateAction = new TDEAction( i18n("Extend"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(extendCertificate()),
+ this, TQ_SLOT(extendCertificate()),
actionCollection(), "edit_extend_certificate" );
connectEnableOperationSignal( this, mExtendCertificateAction );
#endif
mDeleteCertificateAction = new TDEAction( i18n("Delete"), "edit-delete", Key_Delete,
- TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCertificate()),
+ this, TQ_SLOT(slotDeleteCertificate()),
actionCollection(), "edit_delete_certificate" );
- connectEnableOperationSignal( TQT_TQOBJECT(this), mDeleteCertificateAction );
+ connectEnableOperationSignal( this, mDeleteCertificateAction );
mValidateCertificateAction = new TDEAction( i18n("Validate"), "reload", SHIFT + Key_F5,
- TQT_TQOBJECT(this), TQT_SLOT(slotValidate()),
+ this, TQ_SLOT(slotValidate()),
actionCollection(), "certificates_validate" );
- connectEnableOperationSignal( TQT_TQOBJECT(this), mValidateCertificateAction );
+ connectEnableOperationSignal( this, mValidateCertificateAction );
mImportCertFromFileAction = new TDEAction( i18n("Import Certificates..."), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotImportCertFromFile()),
+ this, TQ_SLOT(slotImportCertFromFile()),
actionCollection(), "file_import_certificates" );
- connectEnableOperationSignal( TQT_TQOBJECT(this), mImportCertFromFileAction );
+ connectEnableOperationSignal( this, mImportCertFromFileAction );
mImportCRLFromFileAction = new TDEAction( i18n("Import CRLs..."), 0,
- TQT_TQOBJECT(this), TQT_SLOT(importCRLFromFile()),
+ this, TQ_SLOT(importCRLFromFile()),
actionCollection(), "file_import_crls" );
- connectEnableOperationSignal( TQT_TQOBJECT(this), mImportCRLFromFileAction );
+ connectEnableOperationSignal( this, mImportCRLFromFileAction );
mExportCertificateAction = new TDEAction( i18n("Export Certificates..."), "export", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotExportCertificate()),
+ this, TQ_SLOT(slotExportCertificate()),
actionCollection(), "file_export_certificate" );
mExportSecretKeyAction = new TDEAction( i18n("Export Secret Key..."), "export", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotExportSecretKey()),
+ this, TQ_SLOT(slotExportSecretKey()),
actionCollection(), "file_export_secret_keys" );
- connectEnableOperationSignal( TQT_TQOBJECT(this), mExportSecretKeyAction );
+ connectEnableOperationSignal( this, mExportSecretKeyAction );
mViewCertDetailsAction = new TDEAction( i18n("Certificate Details..."), 0, 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotViewDetails()), actionCollection(),
+ this, TQ_SLOT(slotViewDetails()), actionCollection(),
"view_certificate_details" );
mDownloadCertificateAction = new TDEAction( i18n( "Download"), 0, 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotDownloadCertificate()), actionCollection(),
+ this, TQ_SLOT(slotDownloadCertificate()), actionCollection(),
"download_certificate" );
const TQString dirmngr = TDEStandardDirs::findExe( "gpgsm" );
mDirMngrFound = !dirmngr.isEmpty();
action = new TDEAction( i18n("Dump CRL Cache..."), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotViewCRLs()),
+ this, TQ_SLOT(slotViewCRLs()),
actionCollection(), "crl_dump_crl_cache" );
action->setEnabled( mDirMngrFound ); // we also need dirmngr for this
action = new TDEAction( i18n("Clear CRL Cache..."), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotClearCRLs()),
+ this, TQ_SLOT(slotClearCRLs()),
actionCollection(), "crl_clear_crl_cache" );
action->setEnabled( mDirMngrFound ); // we also need dirmngr for this
- action = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg");
+ action = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, this,
+ TQ_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg");
// disable action if no kwatchgnupg binary is around
if (TDEStandardDirs::findExe("kwatchgnupg").isEmpty()) action->setEnabled(false);
(void)new LabelAction( i18n("Search:"), actionCollection(), "label_action" );
- mLineEditAction = new LineEditAction( TQString(), actionCollection(), TQT_TQOBJECT(this),
- TQT_SLOT(slotSearch()),
+ mLineEditAction = new LineEditAction( TQString(), actionCollection(), this,
+ TQ_SLOT(slotSearch()),
"query_lineedit_action");
TQStringList lst;
lst << i18n("In Local Certificates") << i18n("In External Certificates");
- mComboAction = new ComboAction( lst, actionCollection(), TQT_TQOBJECT(this), TQT_SLOT( slotToggleRemote(int) ),
+ mComboAction = new ComboAction( lst, actionCollection(), this, TQ_SLOT( slotToggleRemote(int) ),
"location_combo_action", mNextFindRemote? 1 : 0 );
- mFindAction = new TDEAction( i18n("Find"), "edit-find", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearch()),
+ mFindAction = new TDEAction( i18n("Find"), "edit-find", 0, this, TQ_SLOT(slotSearch()),
actionCollection(), "find" );
- KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotEditKeybindings()), actionCollection() );
- KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotShowConfigurationDialog()), actionCollection() );
+ KStdAction::keyBindings( this, TQ_SLOT(slotEditKeybindings()), actionCollection() );
+ KStdAction::preferences( this, TQ_SLOT(slotShowConfigurationDialog()), actionCollection() );
- new TDEAction( i18n( "Configure &GpgME Backend" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureGpgME()),
+ new TDEAction( i18n( "Configure &GpgME Backend" ), 0, 0, this, TQ_SLOT(slotConfigureGpgME()),
actionCollection(), "configure_gpgme" );
createStandardStatusBarAction();
@@ -387,7 +387,7 @@ void CertManager::slotEditKeybindings() {
void CertManager::slotShowConfigurationDialog() {
ConfigureDialog dlg( this );
- connect( &dlg, TQT_SIGNAL( configCommitted() ), TQT_SLOT( slotRepaint() ) );
+ connect( &dlg, TQ_SIGNAL( configCommitted() ), TQ_SLOT( slotRepaint() ) );
dlg.exec();
}
@@ -451,10 +451,10 @@ void CertManager::connectJobToStatusBarProgress( Kleo::Job * job, const TQString
return;
if ( !initialText.isEmpty() )
statusBar()->message( initialText );
- connect( job, TQT_SIGNAL(progress(const TQString&,int,int)),
- mProgressBar, TQT_SLOT(slotProgress(const TQString&,int,int)) );
- connect( job, TQT_SIGNAL(done()), mProgressBar, TQT_SLOT(reset()) );
- connect( this, TQT_SIGNAL(stopOperations()), job, TQT_SLOT(slotCancel()) );
+ connect( job, TQ_SIGNAL(progress(const TQString&,int,int)),
+ mProgressBar, TQ_SLOT(slotProgress(const TQString&,int,int)) );
+ connect( job, TQ_SIGNAL(done()), mProgressBar, TQ_SLOT(reset()) );
+ connect( this, TQ_SIGNAL(stopOperations()), job, TQ_SLOT(slotCancel()) );
action("view_stop_operations")->setEnabled( true );
emit enableOperations( false );
@@ -509,8 +509,8 @@ void CertManager::slotRefreshKeys() {
Kleo::RefreshKeysJob * job = Kleo::CryptoBackendFactory::instance()->smime()->refreshKeysJob();
assert( job );
- connect( job, TQT_SIGNAL(result(const GpgME::Error&)),
- this, TQT_SLOT(slotRefreshKeysResult(const GpgME::Error&)) );
+ connect( job, TQ_SIGNAL(result(const GpgME::Error&)),
+ this, TQ_SLOT(slotRefreshKeysResult(const GpgME::Error&)) );
connectJobToStatusBarProgress( job, i18n("Refreshing keys...") );
if ( const GpgME::Error err = job->start( keys ) )
@@ -571,10 +571,10 @@ void CertManager::startKeyListing( bool validating, bool refresh, const TQString
job = Kleo::CryptoBackendFactory::instance()->smime()->keyListJob( mRemote, false, validating );
assert( job );
- connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)),
- mKeyListView, refresh ? TQT_SLOT(slotRefreshKey(const GpgME::Key&)) : TQT_SLOT(slotAddKey(const GpgME::Key&)) );
- connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)),
- this, TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) );
+ connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)),
+ mKeyListView, refresh ? TQ_SLOT(slotRefreshKey(const GpgME::Key&)) : TQ_SLOT(slotAddKey(const GpgME::Key&)) );
+ connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)),
+ this, TQ_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) );
connectJobToStatusBarProgress( job, i18n("Fetching keys...") );
@@ -685,7 +685,7 @@ void CertManager::slotImportCertFromFile( const KURL & certURL )
// Download the cert
TDEIOext::StoredTransferJob* importJob = TDEIOext::storedGet( certURL );
importJob->setWindow( this );
- connect( importJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotImportResult(TDEIO::Job*)) );
+ connect( importJob, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotImportResult(TDEIO::Job*)) );
}
void CertManager::slotImportResult( TDEIO::Job* job )
@@ -729,8 +729,8 @@ void CertManager::slotStartCertificateDownload( const TQString& fingerprint, con
Kleo::CryptoBackendFactory::instance()->smime()->downloadJob( false /* no armor */ );
assert( job );
- connect( job, TQT_SIGNAL(result(const GpgME::Error&,const TQByteArray&)),
- TQT_SLOT(slotCertificateDownloadResult(const GpgME::Error&,const TQByteArray&)) );
+ connect( job, TQ_SIGNAL(result(const GpgME::Error&,const TQByteArray&)),
+ TQ_SLOT(slotCertificateDownloadResult(const GpgME::Error&,const TQByteArray&)) );
connectJobToStatusBarProgress( job, i18n("Fetching certificate from server...") );
@@ -782,8 +782,8 @@ void CertManager::startCertificateImport( const TQByteArray & keyData, const TQS
Kleo::ImportJob * job = Kleo::CryptoBackendFactory::instance()->smime()->importJob();
assert( job );
- connect( job, TQT_SIGNAL(result(const GpgME::ImportResult&)),
- TQT_SLOT(slotCertificateImportResult(const GpgME::ImportResult&)) );
+ connect( job, TQ_SIGNAL(result(const GpgME::ImportResult&)),
+ TQ_SLOT(slotCertificateImportResult(const GpgME::ImportResult&)) );
connectJobToStatusBarProgress( job, i18n("Importing certificates...") );
@@ -906,8 +906,8 @@ void CertManager::importCRLFromFile() {
destURL.setPath( tempFile.name() );
TDEIO::Job* copyJob = TDEIO::file_copy( url, destURL, 0600, true, false );
copyJob->setWindow( this );
- connect( copyJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotImportCRLJobFinished( TDEIO::Job * ) ) );
+ connect( copyJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotImportCRLJobFinished( TDEIO::Job * ) ) );
}
}
}
@@ -930,9 +930,9 @@ bool CertManager::connectAndStartDirmngr( const char * slot, const char * proces
assert( processname );
assert( mDirmngrProc );
mErrorbuffer = TQString();
- connect( mDirmngrProc, TQT_SIGNAL(processExited(TDEProcess*)), slot );
- connect( mDirmngrProc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int) ),
- this, TQT_SLOT(slotStderr(TDEProcess*,char*,int)) );
+ connect( mDirmngrProc, TQ_SIGNAL(processExited(TDEProcess*)), slot );
+ connect( mDirmngrProc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int) ),
+ this, TQ_SLOT(slotStderr(TDEProcess*,char*,int)) );
if( !mDirmngrProc->start( TDEProcess::NotifyOnExit, TDEProcess::Stderr ) ) {
delete mDirmngrProc; mDirmngrProc = 0;
KMessageBox::error( this, i18n( "Unable to start %1 process. Please check your installation." ).arg( processname ), i18n( "Certificate Manager Error" ) );
@@ -947,7 +947,7 @@ void CertManager::startImportCRL( const TQString& filename, bool isTempFile )
mImportCRLTempFile = isTempFile ? filename : TQString();
mDirmngrProc = new TDEProcess();
*mDirmngrProc << "gpgsm" << "--call-dirmngr" << "loadcrl" << filename;
- if ( !connectAndStartDirmngr( TQT_SLOT(slotDirmngrExited()), "gpgsm" ) ) {
+ if ( !connectAndStartDirmngr( TQ_SLOT(slotDirmngrExited()), "gpgsm" ) ) {
updateImportActions( true );
if ( isTempFile )
TQFile::remove( mImportCRLTempFile ); // unlink tempfile
@@ -959,7 +959,7 @@ void CertManager::startClearCRLs() {
mDirmngrProc = new TDEProcess();
*mDirmngrProc << "dirmngr" << "--flush";
//*mDirmngrProc << "gpgsm" << "--call-dimngr" << "flush"; // use this once it's implemented!
- connectAndStartDirmngr( TQT_SLOT(slotClearCRLsResult()), "dirmngr" );
+ connectAndStartDirmngr( TQ_SLOT(slotClearCRLsResult()), "dirmngr" );
}
void CertManager::slotStderr( TDEProcess*, char* buf, int len ) {
@@ -1031,13 +1031,13 @@ void CertManager::slotDeleteCertificate() {
return;
if ( !mHierarchyAnalyser ) {
- mHierarchyAnalyser = new HierarchyAnalyser( TQT_TQOBJECT(this), "mHierarchyAnalyser" );
+ mHierarchyAnalyser = new HierarchyAnalyser( this, "mHierarchyAnalyser" );
Kleo::KeyListJob * job = Kleo::CryptoBackendFactory::instance()->smime()->keyListJob();
assert( job );
- connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)),
- mHierarchyAnalyser, TQT_SLOT(slotNextKey(const GpgME::Key&)) );
- connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)),
- this, TQT_SLOT(slotDeleteCertificate()) );
+ connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)),
+ mHierarchyAnalyser, TQ_SLOT(slotNextKey(const GpgME::Key&)) );
+ connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)),
+ this, TQ_SLOT(slotDeleteCertificate()) );
connectJobToStatusBarProgress( job, i18n("Checking key dependencies...") );
if ( const GpgME::Error error = job->start( TQStringList() ) ) {
showKeyListError( this, error );
@@ -1110,8 +1110,8 @@ void CertManager::slotDeleteCertificate() {
Kleo::MultiDeleteJob * job = new Kleo::MultiDeleteJob( Kleo::CryptoBackendFactory::instance()->smime() );
assert( job );
- connect( job, TQT_SIGNAL(result(const GpgME::Error&,const GpgME::Key&)),
- TQT_SLOT(slotDeleteResult(const GpgME::Error&,const GpgME::Key&)) );
+ connect( job, TQ_SIGNAL(result(const GpgME::Error&,const GpgME::Key&)),
+ TQ_SLOT(slotDeleteResult(const GpgME::Error&,const GpgME::Key&)) );
connectJobToStatusBarProgress( job, i18n("Deleting keys...") );
@@ -1156,8 +1156,8 @@ void CertManager::slotViewDetails( Kleo::KeyListViewItem * item ) {
CertificateInfoWidgetImpl * top = new CertificateInfoWidgetImpl( item->key(), isRemote(), dialog );
dialog->setMainWidget( top );
// </UGH>
- connect( top, TQT_SIGNAL(requestCertificateDownload(const TQString&, const TQString&)),
- TQT_SLOT(slotStartCertificateDownload(const TQString&, const TQString&)) );
+ connect( top, TQ_SIGNAL(requestCertificateDownload(const TQString&, const TQString&)),
+ TQ_SLOT(slotStartCertificateDownload(const TQString&, const TQString&)) );
dialog->show();
}
@@ -1219,8 +1219,8 @@ void CertManager::startCertificateExport( const TQStringList & fingerprints ) {
Kleo::ExportJob * job = Kleo::CryptoBackendFactory::instance()->smime()->publicKeyExportJob( true );
assert( job );
- connect( job, TQT_SIGNAL(result(const GpgME::Error&,const TQByteArray&)),
- TQT_SLOT(slotCertificateExportResult(const GpgME::Error&,const TQByteArray&)) );
+ connect( job, TQ_SIGNAL(result(const GpgME::Error&,const TQByteArray&)),
+ TQ_SLOT(slotCertificateExportResult(const GpgME::Error&,const TQByteArray&)) );
connectJobToStatusBarProgress( job, i18n("Exporting certificate...") );
@@ -1271,8 +1271,8 @@ void CertManager::slotCertificateExportResult( const GpgME::Error & err, const T
TDEIO::Job* uploadJob = TDEIOext::put( data, url, -1, overwrite, false /*resume*/ );
uploadJob->setWindow( this );
- connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
- this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) );
+ connect( uploadJob, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQ_SLOT( slotUploadResult( TDEIO::Job* ) ) );
}
@@ -1356,8 +1356,8 @@ void CertManager::startSecretKeyExport( const TQString & fingerprint ) {
Kleo::ExportJob * job = Kleo::CryptoBackendFactory::instance()->smime()->secretKeyExportJob( false, charset );
assert( job );
- connect( job, TQT_SIGNAL(result(const GpgME::Error&,const TQByteArray&)),
- TQT_SLOT(slotSecretKeyExportResult(const GpgME::Error&,const TQByteArray&)) );
+ connect( job, TQ_SIGNAL(result(const GpgME::Error&,const TQByteArray&)),
+ TQ_SLOT(slotSecretKeyExportResult(const GpgME::Error&,const TQByteArray&)) );
connectJobToStatusBarProgress( job, i18n("Exporting secret key...") );
@@ -1390,8 +1390,8 @@ void CertManager::slotSecretKeyExportResult( const GpgME::Error & err, const TQB
TDEIO::Job* uploadJob = TDEIOext::put( data, url, -1, overwrite, false /*resume*/ );
uploadJob->setWindow( this );
- connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
- this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) );
+ connect( uploadJob, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQ_SLOT( slotUploadResult( TDEIO::Job* ) ) );
}
void CertManager::slotUploadResult( TDEIO::Job* job )
diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h
index cf03a710..8a893b36 100644
--- a/certmanager/certmanager.h
+++ b/certmanager/certmanager.h
@@ -77,7 +77,7 @@ namespace GpgME {
}
class KDE_EXPORT CertManager : public TDEMainWindow {
- Q_OBJECT
+ TQ_OBJECT
public:
CertManager( bool remote = false, const TQString& query = TQString(),
diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp
index 087e237e..49723f4d 100644
--- a/certmanager/conf/appearanceconfigpage.cpp
+++ b/certmanager/conf/appearanceconfigpage.cpp
@@ -44,7 +44,7 @@ AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, con
TQVBoxLayout* lay = new TQVBoxLayout( this );
mWidget = new Kleo::AppearanceConfigWidget( this );
lay->addWidget( mWidget );
- connect( mWidget, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
+ connect( mWidget, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) );
#ifndef HAVE_UNBROKEN_KCMULTIDIALOG
load();
diff --git a/certmanager/conf/appearanceconfigpage.h b/certmanager/conf/appearanceconfigpage.h
index 6b6848c4..c8cd8e22 100644
--- a/certmanager/conf/appearanceconfigpage.h
+++ b/certmanager/conf/appearanceconfigpage.h
@@ -42,7 +42,7 @@ namespace Kleo {
* "Appearance" configuration page for kleopatra's configuration dialog
*/
class AppearanceConfigurationPage : public TDECModule {
- Q_OBJECT
+ TQ_OBJECT
public:
AppearanceConfigurationPage( TQWidget * parent=0, const char * name=0 );
diff --git a/certmanager/conf/appearanceconfigwidget.h b/certmanager/conf/appearanceconfigwidget.h
index f6ca9c8e..2609f5dc 100644
--- a/certmanager/conf/appearanceconfigwidget.h
+++ b/certmanager/conf/appearanceconfigwidget.h
@@ -41,7 +41,7 @@ class TDEConfig;
namespace Kleo {
class AppearanceConfigWidget : public AppearanceConfigWidgetBase {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/certmanager/conf/appearanceconfigwidgetbase.ui b/certmanager/conf/appearanceconfigwidgetbase.ui
index 57029201..462963f2 100644
--- a/certmanager/conf/appearanceconfigwidgetbase.ui
+++ b/certmanager/conf/appearanceconfigwidgetbase.ui
@@ -201,7 +201,7 @@
<tabstop>strikeoutCB</tabstop>
<tabstop>defaultLookPB</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot access="protected">slotForegroundClicked()</slot>
<slot access="protected">slotBackgroundClicked()</slot>
<slot access="protected">slotFontClicked()</slot>
@@ -210,6 +210,6 @@
<slot access="protected">slotItalicClicked()</slot>
<slot access="protected">slotBoldClicked()</slot>
<slot access="protected">slotStrikeoutClicked()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/certmanager/conf/configuredialog.h b/certmanager/conf/configuredialog.h
index 95d20d53..8216cbe8 100644
--- a/certmanager/conf/configuredialog.h
+++ b/certmanager/conf/configuredialog.h
@@ -38,7 +38,7 @@
class ConfigureDialog : public KCMultiDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp
index 43373e72..ad2e6099 100644
--- a/certmanager/conf/dirservconfigpage.cpp
+++ b/certmanager/conf/dirservconfigpage.cpp
@@ -146,7 +146,7 @@ DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget
Kleo::CryptoConfigEntry::ArgType_LDAPURL, true );
mWidget = new Kleo::DirectoryServicesWidget( entry, this );
lay->addWidget( mWidget );
- connect( mWidget, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
+ connect( mWidget, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) );
// LDAP timeout
TQHBox* box = new TQHBox( this );
@@ -155,7 +155,7 @@ DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget
TQLabel* label = new TQLabel( i18n( "LDAP &timeout (minutes:seconds)" ), box );
mTimeout = new TQTimeEdit( box );
mTimeout->setDisplay( TQTimeEdit::Minutes | TQTimeEdit::Seconds );
- connect( mTimeout, TQT_SIGNAL( valueChanged( const TQTime& ) ), this, TQT_SLOT( slotChanged() ) );
+ connect( mTimeout, TQ_SIGNAL( valueChanged( const TQTime& ) ), this, TQ_SLOT( slotChanged() ) );
label->setBuddy( mTimeout );
TQWidget* stretch = new TQWidget( box );
box->setStretchFactor( stretch, 2 );
@@ -167,13 +167,13 @@ DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget
mMaxItems = new KIntNumInput( box );
mMaxItems->setLabel( i18n( "&Maximum number of items returned by query" ), TQt::AlignLeft | TQt::AlignVCenter );
mMaxItems->setMinValue( 0 );
- connect( mMaxItems, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotChanged() ) );
+ connect( mMaxItems, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotChanged() ) );
stretch = new TQWidget( box );
box->setStretchFactor( stretch, 2 );
#ifdef NOT_USEFUL_CURRENTLY
mAddNewServersCB = new TQCheckBox( i18n( "Automatically add &new servers discovered in CRL distribution points" ), this );
- connect( mAddNewServersCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) );
+ connect( mAddNewServersCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) );
lay->addWidget( mAddNewServersCB );
#endif
diff --git a/certmanager/conf/dirservconfigpage.h b/certmanager/conf/dirservconfigpage.h
index e9bdd51a..b717b4eb 100644
--- a/certmanager/conf/dirservconfigpage.h
+++ b/certmanager/conf/dirservconfigpage.h
@@ -51,7 +51,7 @@ namespace Kleo {
* remote certificates in kleopatra.
*/
class KDE_EXPORT DirectoryServicesConfigurationPage : public TDECModule {
- Q_OBJECT
+ TQ_OBJECT
public:
DirectoryServicesConfigurationPage( TQWidget * parent=0, const char * name=0 );
diff --git a/certmanager/conf/dnorderconfigpage.cpp b/certmanager/conf/dnorderconfigpage.cpp
index 18668684..5c2d6c20 100644
--- a/certmanager/conf/dnorderconfigpage.cpp
+++ b/certmanager/conf/dnorderconfigpage.cpp
@@ -45,7 +45,7 @@ DNOrderConfigPage::DNOrderConfigPage( TQWidget * parent, const char * name )
mWidget = Kleo::DNAttributeMapper::instance()->configWidget( this, "mWidget" );
vlay->addWidget( mWidget );
- connect( mWidget, TQT_SIGNAL(changed()), TQT_SLOT(slotChanged()) );
+ connect( mWidget, TQ_SIGNAL(changed()), TQ_SLOT(slotChanged()) );
#ifndef HAVE_UNBROKEN_KCMULTIDIALOG
load();
diff --git a/certmanager/conf/dnorderconfigpage.h b/certmanager/conf/dnorderconfigpage.h
index 0830acbc..9c42d5c8 100644
--- a/certmanager/conf/dnorderconfigpage.h
+++ b/certmanager/conf/dnorderconfigpage.h
@@ -42,7 +42,7 @@ namespace Kleo {
* "DN Order" configuration page for kleopatra's configuration dialog
*/
class DNOrderConfigPage : public TDECModule {
- Q_OBJECT
+ TQ_OBJECT
public:
DNOrderConfigPage( TQWidget * parent=0, const char * name=0 );
diff --git a/certmanager/crlview.cpp b/certmanager/crlview.cpp
index f94a4557..2cefe045 100644
--- a/certmanager/crlview.cpp
+++ b/certmanager/crlview.cpp
@@ -71,16 +71,16 @@ CRLView::CRLView( TQWidget* parent, const char* name, bool modal )
hbLayout->addWidget( _closeButton );
// connections:
- connect( _updateButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotUpdateView() ) );
- connect( _closeButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( close() ) );
+ connect( _updateButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotUpdateView() ) );
+ connect( _closeButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( close() ) );
resize( _textView->fontMetrics().width( 'M' ) * 80,
_textView->fontMetrics().lineSpacing() * 25 );
_timer = new TQTimer( this );
- connect( _timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotAppendBuffer()) );
+ connect( _timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotAppendBuffer()) );
}
CRLView::~CRLView()
@@ -101,10 +101,10 @@ void CRLView::slotUpdateView()
if( _process == 0 ) {
_process = new TDEProcess();
*_process << "gpgsm" << "--call-dirmngr" << "listcrls";
- connect( _process, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int) ),
- this, TQT_SLOT( slotReadStdout( TDEProcess*, char*, int ) ) );
- connect( _process, TQT_SIGNAL( processExited( TDEProcess* ) ),
- this, TQT_SLOT( slotProcessExited() ) );
+ connect( _process, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int) ),
+ this, TQ_SLOT( slotReadStdout( TDEProcess*, char*, int ) ) );
+ connect( _process, TQ_SIGNAL( processExited( TDEProcess* ) ),
+ this, TQ_SLOT( slotProcessExited() ) );
}
if( _process->isRunning() ) _process->kill();
if( !_process->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ) ) {
diff --git a/certmanager/crlview.h b/certmanager/crlview.h
index eef97deb..0e500f88 100644
--- a/certmanager/crlview.h
+++ b/certmanager/crlview.h
@@ -42,7 +42,7 @@ class TDEProcess;
class TQTimer;
class CRLView : public TQDialog {
- Q_OBJECT
+ TQ_OBJECT
public:
CRLView( TQWidget* parent = 0, const char* name = 0, bool modal = false );
diff --git a/certmanager/customactions.cpp b/certmanager/customactions.cpp
index bf637538..9c88491e 100644
--- a/certmanager/customactions.cpp
+++ b/certmanager/customactions.cpp
@@ -55,7 +55,7 @@ int LabelAction::plug( TQWidget * widget, int index ) {
TQLabel* label = new TQLabel( text(), bar, "tde toolbar widget" );
bar->insertWidget( id_, label->width(), label, index );
addContainer( bar, id_ );
- connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+ connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
return containerCount() - 1;
}
@@ -82,8 +82,8 @@ int LineEditAction::plug( TQWidget * widget, int index ) {
bar->insertWidget( id_, _le->width(), _le, index );
bar->setStretchableWidget( _le );
addContainer( bar, id_ );
- connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
- connect( _le, TQT_SIGNAL( returnPressed() ), _receiver, _member );
+ connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
+ connect( _le, TQ_SIGNAL( returnPressed() ), _receiver, _member );
return containerCount() - 1;
}
@@ -123,10 +123,10 @@ int ComboAction::plug( TQWidget * widget, int index ) {
if ( widget->inherits( "TDEToolBar" ) ) {
TDEToolBar *bar = (TDEToolBar *)widget;
int id_ = getToolButtonID();
- bar->insertCombo( _lst, id_, false, TQT_SIGNAL( highlighted(int) ), _receiver, _member );
+ bar->insertCombo( _lst, id_, false, TQ_SIGNAL( highlighted(int) ), _receiver, _member );
bar->setCurrentComboItem( id_,_selectedId );
addContainer( bar, id_ );
- connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+ connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
return containerCount() - 1;
}
diff --git a/certmanager/customactions.h b/certmanager/customactions.h
index 67a429f9..97dc68b5 100644
--- a/certmanager/customactions.h
+++ b/certmanager/customactions.h
@@ -40,7 +40,7 @@
class TQLineEdit;
class LabelAction : public TDEAction {
- Q_OBJECT
+ TQ_OBJECT
public:
LabelAction( const TQString & text, TDEActionCollection * parent,
@@ -50,7 +50,7 @@ public:
};
class LineEditAction : public TDEAction {
- Q_OBJECT
+ TQ_OBJECT
public:
LineEditAction( const TQString & text, TDEActionCollection * parent,
@@ -68,7 +68,7 @@ private:
};
class ComboAction : public TDEAction {
- Q_OBJECT
+ TQ_OBJECT
public:
ComboAction( const TQStringList & lst, TDEActionCollection * parent,
diff --git a/certmanager/hierarchyanalyser.h b/certmanager/hierarchyanalyser.h
index 45ef9ccb..34e7b5a6 100644
--- a/certmanager/hierarchyanalyser.h
+++ b/certmanager/hierarchyanalyser.h
@@ -42,7 +42,7 @@
#include <vector>
class HierarchyAnalyser : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
HierarchyAnalyser( TQObject * parent=0, const char * name=0 );
diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
index 6b186178..25b7dc06 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
@@ -93,13 +93,13 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name )
mExeED = new KURLRequester( w );
glay->addWidget( new TQLabel( mExeED, i18n("&Executable:"), w ), row, 0 );
glay->addWidget( mExeED, row, 1 );
- connect( mExeED, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()) );
+ connect( mExeED, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()) );
++row;
mSocketED = new KURLRequester( w );
glay->addWidget( new TQLabel( mSocketED, i18n("&Socket:"), w ), row, 0 );
glay->addWidget( mSocketED, row, 1 );
- connect( mSocketED, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()) );
+ connect( mSocketED, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()) );
++row;
mLogLevelCB = new TQComboBox( false, w );
@@ -110,7 +110,7 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name )
mLogLevelCB->insertItem( i18n("Guru") );
glay->addWidget( new TQLabel( mLogLevelCB, i18n("Default &log level:"), w ), row, 0 );
glay->addWidget( mLogLevelCB, row, 1 );
- connect( mLogLevelCB, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged()) );
+ connect( mLogLevelCB, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged()) );
vlay->addWidget( group );
@@ -134,21 +134,21 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name )
TQPushButton * button = new TQPushButton( i18n("Set &Unlimited"), w );
glay->addWidget( button, row, 2 );
- connect( mLoglenSB, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged()) );
- connect( button, TQT_SIGNAL(clicked()), TQT_SLOT(slotSetHistorySizeUnlimited()) );
+ connect( mLoglenSB, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged()) );
+ connect( button, TQ_SIGNAL(clicked()), TQ_SLOT(slotSetHistorySizeUnlimited()) );
++row;
mWordWrapCB = new TQCheckBox( i18n("Enable &word wrapping"), w );
mWordWrapCB->hide(); // TQTextEdit doesn't support word wrapping in LogText mode
glay->addMultiCellWidget( mWordWrapCB, row, row, 0, 2 );
- connect( mWordWrapCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()) );
+ connect( mWordWrapCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()) );
vlay->addWidget( group );
vlay->addStretch( 1 );
- connect( this, TQT_SIGNAL(applyClicked()), TQT_SLOT(slotSave()) );
- connect( this, TQT_SIGNAL(okClicked()), TQT_SLOT(slotSave()) );
+ connect( this, TQ_SIGNAL(applyClicked()), TQ_SLOT(slotSave()) );
+ connect( this, TQ_SIGNAL(okClicked()), TQ_SLOT(slotSave()) );
}
void KWatchGnuPGConfig::slotSetHistorySizeUnlimited() {
diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.h b/certmanager/kwatchgnupg/kwatchgnupgconfig.h
index 3a58a99a..09fc36a2 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgconfig.h
+++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.h
@@ -41,7 +41,7 @@ class TQSpinBox;
class KURLRequester;
class KWatchGnuPGConfig : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
KWatchGnuPGConfig( TQWidget* parent, const char* name = 0 );
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
index d02a2fad..ef189a6e 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
@@ -69,16 +69,16 @@ KWatchGnuPGMainWindow::KWatchGnuPGMainWindow( TQWidget* parent, const char* name
setCentralWidget( mCentralWidget );
mWatcher = new KProcIO( TQTextCodec::codecForMib( 106 /*utf-8*/ ) );
- connect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ),
- this, TQT_SLOT( slotWatcherExited() ) );
- connect( mWatcher, TQT_SIGNAL( readReady(KProcIO*) ),
- this, TQT_SLOT( slotReadStdout() ) );
+ connect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ),
+ this, TQ_SLOT( slotWatcherExited() ) );
+ connect( mWatcher, TQ_SIGNAL( readReady(KProcIO*) ),
+ this, TQ_SLOT( slotReadStdout() ) );
slotReadConfig();
mSysTray = new KWatchGnuPGTray( this );
mSysTray->show();
- connect( mSysTray, TQT_SIGNAL( quitSelected() ),
- this, TQT_SLOT( slotQuit() ) );
+ connect( mSysTray, TQ_SIGNAL( quitSelected() ),
+ this, TQ_SLOT( slotQuit() ) );
setAutoSaveSettings();
}
@@ -90,24 +90,24 @@ KWatchGnuPGMainWindow::~KWatchGnuPGMainWindow()
void KWatchGnuPGMainWindow::slotClear()
{
mCentralWidget->clear();
- mCentralWidget->append( tqtr("[%1] Log cleared").arg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) );
+ mCentralWidget->append( i18n("[%1] Log cleared").arg( TQDateTime::currentDateTime().toString(TQt::ISODate) ) );
}
void KWatchGnuPGMainWindow::createActions()
{
(void)new TDEAction( i18n("C&lear History"), "history_clear", CTRL+Key_L,
- TQT_TQOBJECT(this), TQT_SLOT( slotClear() ),
+ this, TQ_SLOT( slotClear() ),
actionCollection(), "clear_log" );
- (void)KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection() );
- (void)KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() );
- (void)KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection() );
- (void)KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection() );
- (void)KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureShortcuts()), actionCollection());
- (void)KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), actionCollection());
+ (void)KStdAction::saveAs( this, TQ_SLOT(slotSaveAs()), actionCollection() );
+ (void)KStdAction::close( this, TQ_SLOT(close()), actionCollection() );
+ (void)KStdAction::quit( this, TQ_SLOT(slotQuit()), actionCollection() );
+ (void)KStdAction::preferences( this, TQ_SLOT(slotConfigure()), actionCollection() );
+ (void)KStdAction::keyBindings(this, TQ_SLOT(configureShortcuts()), actionCollection());
+ (void)KStdAction::configureToolbars(this, TQ_SLOT(slotConfigureToolbars()), actionCollection());
#if 0
(void)new TDEAction( i18n("Configure KWatchGnuPG..."), TQString::fromLatin1("configure"),
- 0, this, TQT_SLOT( slotConfigure() ),
+ 0, this, TQ_SLOT( slotConfigure() ),
actionCollection(), "configure" );
#endif
@@ -127,15 +127,15 @@ void KWatchGnuPGMainWindow::slotConfigureToolbars()
void KWatchGnuPGMainWindow::startWatcher()
{
- disconnect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ),
- this, TQT_SLOT( slotWatcherExited() ) );
+ disconnect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ),
+ this, TQ_SLOT( slotWatcherExited() ) );
if( mWatcher->isRunning() ) {
mWatcher->kill();
while( mWatcher->isRunning() ) {
kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
}
- mCentralWidget->append(tqtr("[%1] Log stopped")
- .arg( TQDateTime::currentDateTime().toString(Qt::ISODate)));
+ mCentralWidget->append(i18n("[%1] Log stopped")
+ .arg( TQDateTime::currentDateTime().toString(TQt::ISODate)));
}
mWatcher->clearArguments();
TDEConfig* config = kapp->config();
@@ -147,11 +147,11 @@ void KWatchGnuPGMainWindow::startWatcher()
if( !mWatcher->start() ) {
KMessageBox::sorry( this, i18n("The watchgnupg logging process could not be started.\nPlease install watchgnupg somewhere in your $PATH.\nThis log window is now completely useless." ) );
} else {
- mCentralWidget->append( tqtr("[%1] Log started")
- .arg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) );
+ mCentralWidget->append( i18n("[%1] Log started")
+ .arg( TQDateTime::currentDateTime().toString(TQt::ISODate) ) );
}
- connect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ),
- this, TQT_SLOT( slotWatcherExited() ) );
+ connect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ),
+ this, TQ_SLOT( slotWatcherExited() ) );
}
void KWatchGnuPGMainWindow::setGnuPGConfig()
@@ -213,7 +213,7 @@ void KWatchGnuPGMainWindow::slotReadStdout()
mSysTray->setAttention(true);
}
}
- TQTimer::singleShot( 0, this, TQT_SLOT(slotAckRead()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(slotAckRead()) );
}
void KWatchGnuPGMainWindow::slotAckRead() {
@@ -251,8 +251,8 @@ void KWatchGnuPGMainWindow::slotSaveAs()
void KWatchGnuPGMainWindow::slotQuit()
{
- disconnect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ),
- this, TQT_SLOT( slotWatcherExited() ) );
+ disconnect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ),
+ this, TQ_SLOT( slotWatcherExited() ) );
mWatcher->kill();
kapp->quit();
}
@@ -261,8 +261,8 @@ void KWatchGnuPGMainWindow::slotConfigure()
{
if( !mConfig ) {
mConfig = new KWatchGnuPGConfig( this, "config dialog" );
- connect( mConfig, TQT_SIGNAL( reconfigure() ),
- this, TQT_SLOT( slotReadConfig() ) );
+ connect( mConfig, TQ_SIGNAL( reconfigure() ),
+ this, TQ_SLOT( slotReadConfig() ) );
}
mConfig->loadConfig();
mConfig->exec();
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
index 7df54051..6d08fe05 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
@@ -41,7 +41,7 @@ class KProcIO;
class TQTextEdit;
class KWatchGnuPGMainWindow : public TDEMainWindow {
- Q_OBJECT
+ TQ_OBJECT
public:
KWatchGnuPGMainWindow( TQWidget* parent = 0, const char* name = 0 );
diff --git a/certmanager/kwatchgnupg/tray.h b/certmanager/kwatchgnupg/tray.h
index eb438aa3..f9cc76a1 100644
--- a/certmanager/kwatchgnupg/tray.h
+++ b/certmanager/kwatchgnupg/tray.h
@@ -39,7 +39,7 @@
class KWatchGnuPGMainWindow;
class KWatchGnuPGTray : public KSystemTray {
- Q_OBJECT
+ TQ_OBJECT
public:
KWatchGnuPGTray( KWatchGnuPGMainWindow* mainwin );
diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
index e89070f3..d5083b96 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
@@ -442,7 +442,7 @@ bool Kleo::ChiasmusBackend::checkForSMIME( TQString * reason ) const {
bool Kleo::ChiasmusBackend::checkForChiasmus( TQString * reason ) const {
// kills the protocol instance when we return false:
- std::auto_ptr<Protocol> tmp( mProtocol );
+ std::unique_ptr<Protocol> tmp( mProtocol );
mProtocol = 0;
const CryptoConfigEntry * path = config()->entry( "Chiasmus", "General", "path" );
diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
index 265d759b..5c49478e 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
@@ -90,7 +90,7 @@ GpgME::Error Kleo::ChiasmusJob::setup() {
: SymCryptRunProcessBase::Decrypt,
this, "symcryptrun" );
TQTimer::singleShot( timeoutEntry->uintValue() * 1000, this,
- TQT_SLOT( slotTimeout() ) );
+ TQ_SLOT( slotTimeout() ) );
return 0;
}
@@ -110,8 +110,8 @@ GpgME::Error Kleo::ChiasmusJob::start() {
if ( const GpgME::Error err = setup() )
return mError = err;
- connect( mSymCryptRun, TQT_SIGNAL(processExited(TDEProcess*)),
- this, TQT_SLOT(slotProcessExited(TDEProcess*)) );
+ connect( mSymCryptRun, TQ_SIGNAL(processExited(TDEProcess*)),
+ this, TQ_SLOT(slotProcessExited(TDEProcess*)) );
if ( !mSymCryptRun->launch( mInput ) )
return mError = gpg_error( GPG_ERR_ENOENT ); // what else?
diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.h b/certmanager/lib/backends/chiasmus/chiasmusjob.h
index 69274d10..d46d530d 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusjob.h
+++ b/certmanager/lib/backends/chiasmus/chiasmusjob.h
@@ -50,7 +50,7 @@ namespace Kleo {
@short SpecialJob for Chiasmus operations
*/
class ChiasmusJob : public Kleo::SpecialJob {
- Q_OBJECT
+ TQ_OBJECT
TQ_ENUMS( Mode )
TQ_PROPERTY( Mode mode READ mode )
diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
index d7ae22c1..90f51243 100644
--- a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
+++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
@@ -70,7 +70,7 @@ Kleo::ObtainKeysJob::ObtainKeysJob()
Kleo::ObtainKeysJob::~ObtainKeysJob() {}
GpgME::Error Kleo::ObtainKeysJob::start() {
- TQTimer::singleShot( 0, this, TQT_SLOT(slotPerform()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(slotPerform()) );
return mError = 0;
}
@@ -109,7 +109,7 @@ void Kleo::ObtainKeysJob::slotPerform( bool async ) {
++mIndex;
if ( async )
- TQTimer::singleShot( 0, this, TQT_SLOT(slotPerform()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(slotPerform()) );
else
slotPerform( false );
}
diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.h b/certmanager/lib/backends/chiasmus/obtainkeysjob.h
index 3f7246ab..29557c14 100644
--- a/certmanager/lib/backends/chiasmus/obtainkeysjob.h
+++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.h
@@ -63,7 +63,7 @@ namespace Kleo {
absolute filenames of the keys found in the configured key files.
*/
class ObtainKeysJob : public Kleo::SpecialJob {
- Q_OBJECT
+ TQ_OBJECT
TQ_PROPERTY( TQStringList result READ result )
public:
diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp
index 9391f023..34ac1d66 100644
--- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp
+++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp
@@ -58,10 +58,10 @@ Kleo::SymCryptRunProcessBase::SymCryptRunProcessBase( const TQString & class_, c
Kleo::SymCryptRunProcessBase::~SymCryptRunProcessBase() {}
bool Kleo::SymCryptRunProcessBase::launch( const TQByteArray & input, RunMode rm ) {
- connect( this, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
- this, TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) );
- connect( this, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
- this, TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) );
+ connect( this, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+ this, TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) );
+ connect( this, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+ this, TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) );
if ( rm == Block ) {
KTempFile tempfile;
tempfile.setAutoDelete( true );
@@ -80,7 +80,7 @@ bool Kleo::SymCryptRunProcessBase::launch( const TQByteArray & input, RunMode rm
return ok;
mInput = input.copy();
writeStdin( mInput.begin(), mInput.size() );
- connect( this, TQT_SIGNAL(wroteStdin(TDEProcess*)), this, TQT_SLOT(closeStdin()) );
+ connect( this, TQ_SIGNAL(wroteStdin(TDEProcess*)), this, TQ_SLOT(closeStdin()) );
return true;
}
}
diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h
index 36866e13..5f0c69a3 100644
--- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h
+++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h
@@ -42,7 +42,7 @@ class TQString;
namespace Kleo {
class SymCryptRunProcessBase : public TDEProcess {
- Q_OBJECT
+ TQ_OBJECT
public:
enum Operation {
diff --git a/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp b/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp
index 3d28ac4b..5ab83715 100644
--- a/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp
+++ b/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp
@@ -264,7 +264,7 @@ GpgME::Error Kleo::KpgpKeyListJob::start( const TQStringList & patterns,
bool secretOnly ) {
mPatterns = patterns;
mSecretOnly = secretOnly;
- TQTimer::singleShot( 0, this, TQT_SLOT( slotDoIt() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotDoIt() ) );
return GpgME::Error( 0 );
}
diff --git a/certmanager/lib/backends/kpgp/kpgpkeylistjob.h b/certmanager/lib/backends/kpgp/kpgpkeylistjob.h
index 3434dd97..3ab04cf3 100644
--- a/certmanager/lib/backends/kpgp/kpgpkeylistjob.h
+++ b/certmanager/lib/backends/kpgp/kpgpkeylistjob.h
@@ -50,7 +50,7 @@ namespace Kpgp {
namespace Kleo {
class KpgpKeyListJob : public KeyListJob {
- Q_OBJECT
+ TQ_OBJECT
public:
KpgpKeyListJob( Kpgp::Base * pgpBase );
diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
index bfd00ac9..e0da7eca 100644
--- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
+++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
@@ -113,7 +113,7 @@ int Kleo::GnuPGProcessBase::commSetupDoneP() {
if ( d->usetStatusFD ) {
::close( d->statusFD[1] ); // close the input end of the pipe, we're the reader
d->statnot = new TQSocketNotifier( d->statusFD[0], TQSocketNotifier::Read, this );
- connect( d->statnot, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChildStatus(int)) );
+ connect( d->statnot, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChildStatus(int)) );
}
return TDEProcess::commSetupDoneP();
}
diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
index 528179a2..639c25ed 100644
--- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
+++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
@@ -46,7 +46,7 @@ namespace Kleo {
* @author Marc Mutz <mutz@kde.org>
*/
class GnuPGProcessBase : public TDEProcess {
- Q_OBJECT
+ TQ_OBJECT
public:
GnuPGProcessBase( TQObject * parent=0, const char * name=0 );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
index e73b4363..2b81c6b1 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
@@ -75,8 +75,8 @@ void QGpgMECryptoConfig::runGpgConf( bool showErrors )
proc << "gpgconf"; // must be in the PATH
proc << "--list-components";
- TQObject::connect( &proc, TQT_SIGNAL( readReady(KProcIO*) ),
- this, TQT_SLOT( slotCollectStdOut(KProcIO*) ) );
+ TQObject::connect( &proc, TQ_SIGNAL( readReady(KProcIO*) ),
+ this, TQ_SLOT( slotCollectStdOut(KProcIO*) ) );
// run the process:
int rc = 0;
@@ -173,8 +173,8 @@ void QGpgMECryptoConfigComponent::runGpgConf()
//kdDebug(5150) << "Running gpgconf --list-options " << mName << endl;
- TQObject::connect( &proc, TQT_SIGNAL( readReady(KProcIO*) ),
- this, TQT_SLOT( slotCollectStdOut(KProcIO*) ) );
+ TQObject::connect( &proc, TQ_SIGNAL( readReady(KProcIO*) ),
+ this, TQ_SLOT( slotCollectStdOut(KProcIO*) ) );
mCurrentGroup = 0;
// run the process:
diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h
index 712ce24e..710fa168 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h
@@ -48,7 +48,7 @@ class QGpgMECryptoConfigEntry;
*/
class QGpgMECryptoConfig : public TQObject, public Kleo::CryptoConfig {
- Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -80,7 +80,7 @@ class QGpgMECryptoConfigGroup;
/// For docu, see kleo/cryptoconfig.h
class QGpgMECryptoConfigComponent : public TQObject, public Kleo::CryptoConfigComponent {
- Q_OBJECT
+ TQ_OBJECT
public:
QGpgMECryptoConfigComponent( QGpgMECryptoConfig*, const TQString& name, const TQString& description );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h
index e58ea326..ea3454fe 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h
@@ -47,7 +47,7 @@ namespace GpgME {
namespace Kleo {
class QGpgMEDecryptJob : public DecryptJob, private QGpgMEJob {
- Q_OBJECT
+ TQ_OBJECT
TQGPGME_JOB
public:
QGpgMEDecryptJob( GpgME::Context * context );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h
index 7e4eda03..67cdf357 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h
@@ -48,7 +48,7 @@ namespace GpgME {
namespace Kleo {
class KDE_EXPORT QGpgMEDecryptVerifyJob : public DecryptVerifyJob, private QGpgMEJob {
- Q_OBJECT
+ TQ_OBJECT
TQGPGME_JOB
public:
QGpgMEDecryptVerifyJob( GpgME::Context * context );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h b/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h
index 20dca974..c867b855 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h
@@ -46,7 +46,7 @@ namespace GpgME {
namespace Kleo {
class QGpgMEDeleteJob : public DeleteJob, private QGpgMEJob {
- Q_OBJECT
+ TQ_OBJECT
TQGPGME_JOB
public:
QGpgMEDeleteJob( GpgME::Context * context );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h b/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h
index 5317afd4..1facc509 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h
@@ -45,7 +45,7 @@ namespace GpgME {
namespace Kleo {
class QGpgMEDownloadJob : public DownloadJob, private QGpgMEJob {
- Q_OBJECT
+ TQ_OBJECT
TQGPGME_JOB
public:
QGpgMEDownloadJob( GpgME::Context * context );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h
index 80b5e467..13b7546c 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h
@@ -50,7 +50,7 @@ namespace GpgME {
namespace Kleo {
class QGpgMEEncryptJob : public EncryptJob, private QGpgMEJob {
- Q_OBJECT
+ TQ_OBJECT
TQGPGME_JOB
public:
QGpgMEEncryptJob( GpgME::Context * context );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h
index aa2e0c0a..7e427d6c 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h
@@ -47,7 +47,7 @@ namespace GpgME {
namespace Kleo {
class QGpgMEExportJob : public ExportJob, private QGpgMEJob {
- Q_OBJECT
+ TQ_OBJECT
TQGPGME_JOB
public:
QGpgMEExportJob( GpgME::Context * context );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h b/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h
index 2324da6d..0a5ab681 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h
@@ -47,7 +47,7 @@ namespace GpgME {
namespace Kleo {
class QGpgMEImportJob : public ImportJob, private QGpgMEJob {
- Q_OBJECT
+ TQ_OBJECT
TQGPGME_JOB
public:
QGpgMEImportJob( GpgME::Context * context );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
index 947a5258..71fe0b57 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
@@ -96,8 +96,8 @@ Kleo::QGpgMEJob::QGpgMEJob( Kleo::Job * _this, GpgME::Context * context )
{
InvarianceChecker check( this );
assert( context );
- TQObject::connect( QGpgME::EventLoopInteractor::instance(), TQT_SIGNAL(aboutToDestroy()),
- _this, TQT_SLOT(slotCancel()) );
+ TQObject::connect( QGpgME::EventLoopInteractor::instance(), TQ_SIGNAL(aboutToDestroy()),
+ _this, TQ_SLOT(slotCancel()) );
context->setProgressProvider( this );
// (mmutz) work around a gpgme bug in versions at least <= 0.9.0.
// These versions will return GPG_ERR_NOT_IMPLEMENTED from
@@ -153,8 +153,8 @@ void Kleo::QGpgMEJob::deleteAllPatterns() {
void Kleo::QGpgMEJob::hookupContextToEventLoopInteractor() {
mCtx->setManagedByEventLoopInteractor( true );
TQObject::connect( QGpgME::EventLoopInteractor::instance(),
- TQT_SIGNAL(operationDoneEventSignal(GpgME::Context*,const GpgME::Error&)),
- mThis, TQT_SLOT(slotOperationDoneEvent(GpgME::Context*,const GpgME::Error&)) );
+ TQ_SIGNAL(operationDoneEventSignal(GpgME::Context*,const GpgME::Error&)),
+ mThis, TQ_SLOT(slotOperationDoneEvent(GpgME::Context*,const GpgME::Error&)) );
}
void Kleo::QGpgMEJob::setPatterns( const TQStringList & sl, bool allowEmpty ) {
diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h
index 0b1362c9..6b3e6716 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h
@@ -52,7 +52,7 @@ namespace QGpgME {
namespace Kleo {
class KDE_EXPORT QGpgMEKeyGenerationJob : public KeyGenerationJob, private QGpgMEJob {
- Q_OBJECT
+ TQ_OBJECT
TQGPGME_JOB
public:
QGpgMEKeyGenerationJob( GpgME::Context * context );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
index 5561625c..25edaf84 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
@@ -79,8 +79,8 @@ GpgME::Error Kleo::QGpgMEKeyListJob::start( const TQStringList & pats, bool secr
hookupContextToEventLoopInteractor();
connect( QGpgME::EventLoopInteractor::instance(),
- TQT_SIGNAL(nextKeyEventSignal(GpgME::Context*,const GpgME::Key&)),
- TQT_SLOT(slotNextKeyEvent(GpgME::Context*,const GpgME::Key&)) );
+ TQ_SIGNAL(nextKeyEventSignal(GpgME::Context*,const GpgME::Key&)),
+ TQ_SLOT(slotNextKeyEvent(GpgME::Context*,const GpgME::Key&)) );
// The communication channel between gpgme and gpgsm is limited in
// the number of patterns that can be transported, but they won't
@@ -100,7 +100,7 @@ GpgME::Error Kleo::QGpgMEKeyListJob::start( const TQStringList & pats, bool secr
}
} else if ( err.code() == GPG_ERR_EOF ) {
kdDebug(5150) << "QGpgMEKeyListJob::start(): early end of keylisting, trying to fake an empty result" << endl;
- TQTimer::singleShot( 10, this, TQT_SLOT(slotFakeOperationDoneEvent()) );
+ TQTimer::singleShot( 10, this, TQ_SLOT(slotFakeOperationDoneEvent()) );
return GpgME::Error();
}
deleteLater();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h
index 8e26d791..a62a7379 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h
@@ -48,7 +48,7 @@ namespace GpgME {
namespace Kleo {
class QGpgMEKeyListJob : public KeyListJob, private QGpgMEJob {
- Q_OBJECT
+ TQ_OBJECT
TQGPGME_JOB
public:
QGpgMEKeyListJob( GpgME::Context * context );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
index 6d05e1ec..8088d28a 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
@@ -107,12 +107,12 @@ GpgME::Error Kleo::QGpgMERefreshKeysJob::startAProcess() {
mProcess->setUsetStatusFD( true );
- connect( mProcess, TQT_SIGNAL(processExited(TDEProcess*)),
- TQT_SLOT(slotProcessExited(TDEProcess*)) );
- connect( mProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
- TQT_SLOT(slotStderr(TDEProcess*,char*,int)) );
- connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
- TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+ connect( mProcess, TQ_SIGNAL(processExited(TDEProcess*)),
+ TQ_SLOT(slotProcessExited(TDEProcess*)) );
+ connect( mProcess, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+ TQ_SLOT(slotStderr(TDEProcess*,char*,int)) );
+ connect( mProcess, TQ_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
+ TQ_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
if ( !mProcess->start( TDEProcess::NotifyOnExit, TDEProcess::Stderr ) ) {
mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else?
diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
index ac160036..78c26ef3 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
@@ -50,7 +50,7 @@ class TDEProcess;
namespace Kleo {
class QGpgMERefreshKeysJob : public RefreshKeysJob {
- Q_OBJECT
+ TQ_OBJECT
public:
QGpgMERefreshKeysJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
index f553c703..af72a539 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
@@ -88,14 +88,14 @@ GpgME::Error Kleo::QGpgMESecretKeyExportJob::start( const TQStringList & pattern
mProcess->setUsetStatusFD( true );
- connect( mProcess, TQT_SIGNAL(processExited(TDEProcess*)),
- TQT_SLOT(slotProcessExited(TDEProcess*)) );
- connect( mProcess, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
- TQT_SLOT(slotStdout(TDEProcess*,char*,int)) );
- connect( mProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
- TQT_SLOT(slotStderr(TDEProcess*,char*,int)) );
- connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
- TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+ connect( mProcess, TQ_SIGNAL(processExited(TDEProcess*)),
+ TQ_SLOT(slotProcessExited(TDEProcess*)) );
+ connect( mProcess, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+ TQ_SLOT(slotStdout(TDEProcess*,char*,int)) );
+ connect( mProcess, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+ TQ_SLOT(slotStderr(TDEProcess*,char*,int)) );
+ connect( mProcess, TQ_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
+ TQ_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
if ( !mProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) {
mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else?
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
index 335fd770..1dad417c 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
@@ -55,7 +55,7 @@ class TDEProcess;
namespace Kleo {
class QGpgMESecretKeyExportJob : public ExportJob {
- Q_OBJECT
+ TQ_OBJECT
public:
QGpgMESecretKeyExportJob( bool armour, const TQString& charset );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
index 90079706..f259d754 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
@@ -54,7 +54,7 @@ namespace GpgME {
namespace Kleo {
class KDE_EXPORT QGpgMESignEncryptJob : public SignEncryptJob, private QGpgMEJob {
- Q_OBJECT
+ TQ_OBJECT
TQGPGME_JOB
public:
QGpgMESignEncryptJob( GpgME::Context * context );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignjob.h
index 2b51eada..388b2756 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesignjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmesignjob.h
@@ -50,7 +50,7 @@ namespace GpgME {
namespace Kleo {
class QGpgMESignJob : public SignJob, private QGpgMEJob {
- Q_OBJECT
+ TQ_OBJECT
TQGPGME_JOB
public:
QGpgMESignJob( GpgME::Context * context );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h b/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h
index a62699d3..5e9728d3 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h
@@ -47,7 +47,7 @@ namespace GpgME {
namespace Kleo {
class QGpgMEVerifyDetachedJob : public VerifyDetachedJob, private QGpgMEJob {
- Q_OBJECT
+ TQ_OBJECT
TQGPGME_JOB
public:
QGpgMEVerifyDetachedJob( GpgME::Context * context );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h b/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h
index 87a19619..ea596e13 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h
@@ -47,7 +47,7 @@ namespace GpgME {
namespace Kleo {
class QGpgMEVerifyOpaqueJob : public VerifyOpaqueJob, private QGpgMEJob {
- Q_OBJECT
+ TQ_OBJECT
TQGPGME_JOB
public:
QGpgMEVerifyOpaqueJob( GpgME::Context * context );
diff --git a/certmanager/lib/cryptplug.cpp b/certmanager/lib/cryptplug.cpp
index 20747457..24ded795 100644
--- a/certmanager/lib/cryptplug.cpp
+++ b/certmanager/lib/cryptplug.cpp
@@ -696,8 +696,8 @@ GpgME::ImportResult CryptPlug::importCertificateFromMem( const char* data, size_
{
using namespace GpgME;
- std::auto_ptr<Context> context( Context::createForProtocol( mProtocol ) );
- if ( !context.get() )
+ std::unique_ptr<Context> context( Context::createForProtocol( mProtocol ) );
+ if ( !context )
return ImportResult();
Data keydata( data, length, false );
diff --git a/certmanager/lib/cryptplugfactory.h b/certmanager/lib/cryptplugfactory.h
index 6f3f6f3d..4a0a7a3d 100644
--- a/certmanager/lib/cryptplugfactory.h
+++ b/certmanager/lib/cryptplugfactory.h
@@ -48,7 +48,7 @@ class CryptPlugWrapperList;
namespace KMail {
class KDE_EXPORT CryptPlugFactory : public Kleo::CryptoBackendFactory {
- Q_OBJECT
+ TQ_OBJECT
protected:
CryptPlugFactory();
diff --git a/certmanager/lib/kleo/cryptobackendfactory.h b/certmanager/lib/kleo/cryptobackendfactory.h
index 3fa642f3..03dea6b2 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.h
+++ b/certmanager/lib/kleo/cryptobackendfactory.h
@@ -57,7 +57,7 @@ namespace Kleo {
};
class KDE_EXPORT CryptoBackendFactory : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
protected:
CryptoBackendFactory();
diff --git a/certmanager/lib/kleo/decryptjob.h b/certmanager/lib/kleo/decryptjob.h
index bce60b81..98ff47c8 100644
--- a/certmanager/lib/kleo/decryptjob.h
+++ b/certmanager/lib/kleo/decryptjob.h
@@ -60,7 +60,7 @@ namespace Kleo {
destruction by calling TQObject::deleteLater().
*/
class DecryptJob : public Job {
- Q_OBJECT
+ TQ_OBJECT
protected:
DecryptJob( TQObject * parent, const char * name );
diff --git a/certmanager/lib/kleo/decryptverifyjob.h b/certmanager/lib/kleo/decryptverifyjob.h
index 94b016a0..f804590e 100644
--- a/certmanager/lib/kleo/decryptverifyjob.h
+++ b/certmanager/lib/kleo/decryptverifyjob.h
@@ -63,7 +63,7 @@ namespace Kleo {
destruction by calling TQObject::deleteLater().
*/
class DecryptVerifyJob : public Job {
- Q_OBJECT
+ TQ_OBJECT
protected:
DecryptVerifyJob( TQObject * parent, const char * name );
diff --git a/certmanager/lib/kleo/deletejob.h b/certmanager/lib/kleo/deletejob.h
index 15bd5a51..46c361c3 100644
--- a/certmanager/lib/kleo/deletejob.h
+++ b/certmanager/lib/kleo/deletejob.h
@@ -56,7 +56,7 @@ namespace Kleo {
destruction by calling TQObject::deleteLater().
*/
class DeleteJob : public Job {
- Q_OBJECT
+ TQ_OBJECT
protected:
DeleteJob( TQObject * parent, const char * name );
diff --git a/certmanager/lib/kleo/downloadjob.h b/certmanager/lib/kleo/downloadjob.h
index e1f52cd7..ee2546b4 100644
--- a/certmanager/lib/kleo/downloadjob.h
+++ b/certmanager/lib/kleo/downloadjob.h
@@ -59,7 +59,7 @@ namespace Kleo {
destruction by calling TQObject::deleteLater().
*/
class DownloadJob : public Job {
- Q_OBJECT
+ TQ_OBJECT
protected:
DownloadJob( TQObject * parent, const char * name );
diff --git a/certmanager/lib/kleo/encryptjob.h b/certmanager/lib/kleo/encryptjob.h
index f55ab76d..8fa20d23 100644
--- a/certmanager/lib/kleo/encryptjob.h
+++ b/certmanager/lib/kleo/encryptjob.h
@@ -62,7 +62,7 @@ namespace Kleo {
destruction by calling TQObject::deleteLater().
*/
class EncryptJob : public Job {
- Q_OBJECT
+ TQ_OBJECT
protected:
EncryptJob( TQObject * parent, const char * name );
diff --git a/certmanager/lib/kleo/exportjob.h b/certmanager/lib/kleo/exportjob.h
index 69ad8e5c..4d9259f8 100644
--- a/certmanager/lib/kleo/exportjob.h
+++ b/certmanager/lib/kleo/exportjob.h
@@ -59,7 +59,7 @@ namespace Kleo {
destruction by calling TQObject::deleteLater().
*/
class ExportJob : public Job {
- Q_OBJECT
+ TQ_OBJECT
protected:
ExportJob( TQObject * parent, const char * name );
diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
index 65b59725..03bb267f 100644
--- a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
+++ b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
@@ -142,8 +142,8 @@ GpgME::Error Kleo::HierarchicalKeyListJob::startAJob() {
assert( mJob ); // FIXME: we need a way to generate errors ourselves,
// but I don't like the dependency on gpg-error :/
- connect( mJob, TQT_SIGNAL(nextKey(const GpgME::Key&)), TQT_SLOT(slotNextKey(const GpgME::Key&)) );
- connect( mJob, TQT_SIGNAL(result(const GpgME::KeyListResult&)), TQT_SLOT(slotResult(const GpgME::KeyListResult&)) );
+ connect( mJob, TQ_SIGNAL(nextKey(const GpgME::Key&)), TQ_SLOT(slotNextKey(const GpgME::Key&)) );
+ connect( mJob, TQ_SIGNAL(result(const GpgME::KeyListResult&)), TQ_SLOT(slotResult(const GpgME::KeyListResult&)) );
TQStringList patterns;
for ( std::set<TQString>::const_iterator it = mNextSet.begin() ; it != mNextSet.end() ; ++it )
diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.h b/certmanager/lib/kleo/hierarchicalkeylistjob.h
index ebce19f2..cb971bd0 100644
--- a/certmanager/lib/kleo/hierarchicalkeylistjob.h
+++ b/certmanager/lib/kleo/hierarchicalkeylistjob.h
@@ -69,7 +69,7 @@ namespace Kleo {
schedule its own destruction by calling TQObject::deleteLater().
*/
class KDE_EXPORT HierarchicalKeyListJob : public KeyListJob {
- Q_OBJECT
+ TQ_OBJECT
public:
HierarchicalKeyListJob( const CryptoBackend::Protocol * protocol,
diff --git a/certmanager/lib/kleo/importjob.h b/certmanager/lib/kleo/importjob.h
index bd0a6f04..6468e670 100644
--- a/certmanager/lib/kleo/importjob.h
+++ b/certmanager/lib/kleo/importjob.h
@@ -60,7 +60,7 @@ namespace Kleo {
destruction by calling TQObject::deleteLater().
*/
class ImportJob : public Job {
- Q_OBJECT
+ TQ_OBJECT
protected:
ImportJob( TQObject * parent, const char * name );
diff --git a/certmanager/lib/kleo/job.cpp b/certmanager/lib/kleo/job.cpp
index 907a7448..eb638592 100644
--- a/certmanager/lib/kleo/job.cpp
+++ b/certmanager/lib/kleo/job.cpp
@@ -63,7 +63,7 @@ Kleo::Job::Job( TQObject * parent, const char * name )
: TQObject( parent, name )
{
if ( tqApp )
- connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(slotCancel()) );
+ connect( tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(slotCancel()) );
}
Kleo::Job::~Job() {
diff --git a/certmanager/lib/kleo/job.h b/certmanager/lib/kleo/job.h
index 00087566..52630c30 100644
--- a/certmanager/lib/kleo/job.h
+++ b/certmanager/lib/kleo/job.h
@@ -62,7 +62,7 @@ namespace Kleo {
carry the information that the operation was canceled.
*/
class Job : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
protected:
Job( TQObject * parent, const char * name );
diff --git a/certmanager/lib/kleo/keyfiltermanager.cpp b/certmanager/lib/kleo/keyfiltermanager.cpp
index 1aa2b170..2c5b5a35 100644
--- a/certmanager/lib/kleo/keyfiltermanager.cpp
+++ b/certmanager/lib/kleo/keyfiltermanager.cpp
@@ -73,7 +73,7 @@ Kleo::KeyFilterManager::KeyFilterManager( TQObject * parent, const char * name )
d = new Private();
// ### DF: doesn't a KStaticDeleter work more reliably?
if ( tqApp )
- connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) );
+ connect( tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(deleteLater()) );
reload();
}
diff --git a/certmanager/lib/kleo/keyfiltermanager.h b/certmanager/lib/kleo/keyfiltermanager.h
index e65be1d2..d0022fc0 100644
--- a/certmanager/lib/kleo/keyfiltermanager.h
+++ b/certmanager/lib/kleo/keyfiltermanager.h
@@ -46,7 +46,7 @@ namespace Kleo {
namespace Kleo {
class KDE_EXPORT KeyFilterManager : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
protected:
KeyFilterManager( TQObject * parent=0, const char * name=0 );
diff --git a/certmanager/lib/kleo/keygenerationjob.h b/certmanager/lib/kleo/keygenerationjob.h
index b0d94993..d2f5c50d 100644
--- a/certmanager/lib/kleo/keygenerationjob.h
+++ b/certmanager/lib/kleo/keygenerationjob.h
@@ -59,7 +59,7 @@ namespace Kleo {
destruction by calling TQObject::deleteLater().
*/
class KeyGenerationJob : public Job {
- Q_OBJECT
+ TQ_OBJECT
protected:
KeyGenerationJob( TQObject * parent, const char * name );
diff --git a/certmanager/lib/kleo/keylistjob.h b/certmanager/lib/kleo/keylistjob.h
index 3560f7b8..807c7954 100644
--- a/certmanager/lib/kleo/keylistjob.h
+++ b/certmanager/lib/kleo/keylistjob.h
@@ -63,7 +63,7 @@ namespace Kleo {
TQObject::deleteLater().
*/
class KeyListJob : public Job {
- Q_OBJECT
+ TQ_OBJECT
protected:
KeyListJob( TQObject * parent, const char * name );
diff --git a/certmanager/lib/kleo/multideletejob.cpp b/certmanager/lib/kleo/multideletejob.cpp
index 7c83c24b..9aafdd79 100644
--- a/certmanager/lib/kleo/multideletejob.cpp
+++ b/certmanager/lib/kleo/multideletejob.cpp
@@ -102,7 +102,7 @@ GpgME::Error Kleo::MultiDeleteJob::startAJob() {
assert( mJob ); // FIXME: we need a way to generate errors ourselves,
// but I don't like the dependency on gpg-error :/
- connect( mJob, TQT_SIGNAL(result(const GpgME::Error&)), TQT_SLOT(slotResult(const GpgME::Error&)) );
+ connect( mJob, TQ_SIGNAL(result(const GpgME::Error&)), TQ_SLOT(slotResult(const GpgME::Error&)) );
return mJob->start( *mIt, mAllowSecretKeyDeletion );
}
diff --git a/certmanager/lib/kleo/multideletejob.h b/certmanager/lib/kleo/multideletejob.h
index 31d9d9e9..67ec7492 100644
--- a/certmanager/lib/kleo/multideletejob.h
+++ b/certmanager/lib/kleo/multideletejob.h
@@ -65,7 +65,7 @@ namespace Kleo {
destruction by calling TQObject::deleteLater().
*/
class KDE_EXPORT MultiDeleteJob : public Job {
- Q_OBJECT
+ TQ_OBJECT
public:
MultiDeleteJob( const CryptoBackend::Protocol * protocol );
diff --git a/certmanager/lib/kleo/refreshkeysjob.h b/certmanager/lib/kleo/refreshkeysjob.h
index 7a55f106..aa283fd4 100644
--- a/certmanager/lib/kleo/refreshkeysjob.h
+++ b/certmanager/lib/kleo/refreshkeysjob.h
@@ -60,7 +60,7 @@ namespace Kleo {
destruction by calling TQObject::deleteLater().
*/
class RefreshKeysJob : public Job {
- Q_OBJECT
+ TQ_OBJECT
protected:
RefreshKeysJob( TQObject * parent, const char * name );
diff --git a/certmanager/lib/kleo/signencryptjob.h b/certmanager/lib/kleo/signencryptjob.h
index 0f31897e..160eb32e 100644
--- a/certmanager/lib/kleo/signencryptjob.h
+++ b/certmanager/lib/kleo/signencryptjob.h
@@ -65,7 +65,7 @@ namespace Kleo {
own destruction by calling TQObject::deleteLater().
*/
class SignEncryptJob : public Job {
- Q_OBJECT
+ TQ_OBJECT
protected:
SignEncryptJob( TQObject * parent, const char * name );
diff --git a/certmanager/lib/kleo/signjob.h b/certmanager/lib/kleo/signjob.h
index fdeb9a84..54c64a7f 100644
--- a/certmanager/lib/kleo/signjob.h
+++ b/certmanager/lib/kleo/signjob.h
@@ -63,7 +63,7 @@ namespace Kleo {
destruction by calling TQObject::deleteLater().
*/
class SignJob : public Job {
- Q_OBJECT
+ TQ_OBJECT
protected:
SignJob( TQObject * parent, const char * name );
diff --git a/certmanager/lib/kleo/specialjob.h b/certmanager/lib/kleo/specialjob.h
index c5bc1896..8656b8ac 100644
--- a/certmanager/lib/kleo/specialjob.h
+++ b/certmanager/lib/kleo/specialjob.h
@@ -63,7 +63,7 @@ namespace Kleo {
to be defined in each SpecialJob subclass.
*/
class SpecialJob : public Job {
- Q_OBJECT
+ TQ_OBJECT
protected:
SpecialJob( TQObject * parent, const char * name );
diff --git a/certmanager/lib/kleo/verifydetachedjob.h b/certmanager/lib/kleo/verifydetachedjob.h
index 01cc6377..25f00756 100644
--- a/certmanager/lib/kleo/verifydetachedjob.h
+++ b/certmanager/lib/kleo/verifydetachedjob.h
@@ -60,7 +60,7 @@ namespace Kleo {
it's own destruction by calling TQObject::deleteLater().
*/
class VerifyDetachedJob : public Job {
- Q_OBJECT
+ TQ_OBJECT
protected:
VerifyDetachedJob( TQObject * parent, const char * name );
diff --git a/certmanager/lib/kleo/verifyopaquejob.h b/certmanager/lib/kleo/verifyopaquejob.h
index 387782df..8e0bdd31 100644
--- a/certmanager/lib/kleo/verifyopaquejob.h
+++ b/certmanager/lib/kleo/verifyopaquejob.h
@@ -60,7 +60,7 @@ namespace Kleo {
it's own destruction by calling TQObject::deleteLater().
*/
class VerifyOpaqueJob : public Job {
- Q_OBJECT
+ TQ_OBJECT
protected:
VerifyOpaqueJob( TQObject * parent, const char * name );
diff --git a/certmanager/lib/tests/gnupgviewer.h b/certmanager/lib/tests/gnupgviewer.h
index 9a310d49..f9a0e962 100644
--- a/certmanager/lib/tests/gnupgviewer.h
+++ b/certmanager/lib/tests/gnupgviewer.h
@@ -43,7 +43,7 @@ class TDEProcess;
class TQStringList;
class GnuPGViewer : public TQTextEdit {
- Q_OBJECT
+ TQ_OBJECT
public:
GnuPGViewer( TQWidget * parent=0, const char * name=0 );
diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp
index 01e5d109..3fdc9938 100644
--- a/certmanager/lib/tests/test_gnupgprocessbase.cpp
+++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp
@@ -62,14 +62,14 @@ void GnuPGViewer::setProcess( Kleo::GnuPGProcessBase * process ) {
if ( !process )
return;
mProcess = process;
- connect( mProcess, TQT_SIGNAL(processExited(TDEProcess*)),
- TQT_SLOT(slotProcessExited(TDEProcess*)) );
- connect( mProcess, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
- TQT_SLOT(slotStdout(TDEProcess*,char*,int)) );
- connect( mProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
- TQT_SLOT(slotStderr(TDEProcess*,char*,int)) );
- connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
- TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+ connect( mProcess, TQ_SIGNAL(processExited(TDEProcess*)),
+ TQ_SLOT(slotProcessExited(TDEProcess*)) );
+ connect( mProcess, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+ TQ_SLOT(slotStdout(TDEProcess*,char*,int)) );
+ connect( mProcess, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+ TQ_SLOT(slotStderr(TDEProcess*,char*,int)) );
+ connect( mProcess, TQ_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
+ TQ_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
}
static TQStringList split( char * buffer, int buflen, TQString & old ) {
diff --git a/certmanager/lib/tests/test_jobs.cpp b/certmanager/lib/tests/test_jobs.cpp
index ba26bfb5..661e07da 100644
--- a/certmanager/lib/tests/test_jobs.cpp
+++ b/certmanager/lib/tests/test_jobs.cpp
@@ -61,8 +61,8 @@ static void testSign()
std::vector<GpgME::Key> signingKeys;
- std::auto_ptr<Kleo::KeyListJob> listJob( proto->keyListJob( false, false, true ) ); // use validating keylisting
- if ( listJob.get() ) {
+ std::unique_ptr<Kleo::KeyListJob> listJob( proto->keyListJob( false, false, true ) ); // use validating keylisting
+ if ( listJob ) {
// ##### Adjust this to your own identity
listJob->exec( "faure@kde.org", true /*secret*/, signingKeys );
assert( !signingKeys.empty() );
diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp
index b678e29d..ef8f8878 100644
--- a/certmanager/lib/tests/test_keygen.cpp
+++ b/certmanager/lib/tests/test_keygen.cpp
@@ -96,7 +96,7 @@ KeyGenerator::KeyGenerator( TQWidget * parent, const char * name, WFlags )
glay->setRowStretch( row, 1 );
glay->setColStretch( 1, 1 );
- connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotStartKeyGeneration()) );
+ connect( this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotStartKeyGeneration()) );
}
KeyGenerator::~KeyGenerator() {}
@@ -118,8 +118,8 @@ void KeyGenerator::slotStartKeyGeneration() {
Kleo::KeyGenerationJob * job = proto->keyGenerationJob();
assert( job );
- connect( job, TQT_SIGNAL(result(const GpgME::KeyGenerationResult&,const TQByteArray&)),
- TQT_SLOT(slotResult(const GpgME::KeyGenerationResult&,const TQByteArray&)) );
+ connect( job, TQ_SIGNAL(result(const GpgME::KeyGenerationResult&,const TQByteArray&)),
+ TQ_SLOT(slotResult(const GpgME::KeyGenerationResult&,const TQByteArray&)) );
const GpgME::Error err = job->start( params );
if ( err )
diff --git a/certmanager/lib/tests/test_keygen.h b/certmanager/lib/tests/test_keygen.h
index 4bf2acaa..952b4d53 100644
--- a/certmanager/lib/tests/test_keygen.h
+++ b/certmanager/lib/tests/test_keygen.h
@@ -44,7 +44,7 @@ namespace GpgME {
class TQLineEdit;
class KeyGenerator : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
KeyGenerator( TQWidget * parent=0, const char * name=0, WFlags f=0 );
diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp
index 0e357b59..38b9085b 100644
--- a/certmanager/lib/tests/test_keylister.cpp
+++ b/certmanager/lib/tests/test_keylister.cpp
@@ -115,10 +115,10 @@ void CertListView::slotStart() {
kdDebug() << "CertListView::slotStart()" << endl;
Kleo::KeyListJob * job = Kleo::CryptoBackendFactory::instance()->smime()->keyListJob( false );
assert( job );
- TQObject::connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)),
- this, TQT_SLOT(slotAddKey(const GpgME::Key&)) );
- TQObject::connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)),
- this, TQT_SLOT(slotResult(const GpgME::KeyListResult&)) );
+ TQObject::connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)),
+ this, TQ_SLOT(slotAddKey(const GpgME::Key&)) );
+ TQObject::connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)),
+ this, TQ_SLOT(slotResult(const GpgME::KeyListResult&)) );
#if 0
TQStringList l;
l << "Marc";
@@ -138,7 +138,7 @@ int main( int argc, char** argv ) {
app.setMainWidget( clv );
clv->show();
- TQTimer::singleShot( 5000, clv, TQT_SLOT(slotStart()) );
+ TQTimer::singleShot( 5000, clv, TQ_SLOT(slotStart()) );
return app.exec();
}
diff --git a/certmanager/lib/tests/test_keylister.h b/certmanager/lib/tests/test_keylister.h
index 58eeac4a..1d6b1611 100644
--- a/certmanager/lib/tests/test_keylister.h
+++ b/certmanager/lib/tests/test_keylister.h
@@ -40,7 +40,7 @@ namespace GpgME {
}
class CertListView : public Kleo::KeyListView {
- Q_OBJECT
+ TQ_OBJECT
public:
CertListView( TQWidget * parent=0, const char * name=0, WFlags f=0 );
diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp
index 1c548c5b..c969e875 100644
--- a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp
+++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp
@@ -49,7 +49,7 @@
AddDirectoryServiceDialogImpl::AddDirectoryServiceDialogImpl( TQWidget* parent, const char* name, bool modal, WFlags fl )
: AddDirectoryServiceDialog( parent, name, modal, fl )
{
- portED->setValidator( new TQIntValidator( 0, 65535, TQT_TQOBJECT(portED) ) );
+ portED->setValidator( new TQIntValidator( 0, 65535, portED ) );
}
/*
diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.h b/certmanager/lib/ui/adddirectoryservicedialogimpl.h
index f8924dac..c422c3a4 100644
--- a/certmanager/lib/ui/adddirectoryservicedialogimpl.h
+++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.h
@@ -36,7 +36,7 @@
class AddDirectoryServiceDialogImpl : public AddDirectoryServiceDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp
index 9d8f4d40..82db7d7a 100644
--- a/certmanager/lib/ui/backendconfigwidget.cpp
+++ b/certmanager/lib/ui/backendconfigwidget.cpp
@@ -215,8 +215,8 @@ Kleo::BackendConfigWidget::BackendConfigWidget( CryptoBackendFactory * factory,
hlay->addWidget( d->listView, 1 );
- connect( d->listView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
- TQT_SLOT(slotSelectionChanged(TQListViewItem*)) );
+ connect( d->listView, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+ TQ_SLOT(slotSelectionChanged(TQListViewItem*)) );
TQVBoxLayout * vlay = new TQVBoxLayout( hlay ); // inherits spacing
@@ -224,15 +224,15 @@ Kleo::BackendConfigWidget::BackendConfigWidget( CryptoBackendFactory * factory,
d->configureButton->setAutoDefault( false );
vlay->addWidget( d->configureButton );
- connect( d->configureButton, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotConfigureButtonClicked()) );
+ connect( d->configureButton, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotConfigureButtonClicked()) );
d->rescanButton = new TQPushButton( i18n("Rescan"), this );
d->rescanButton->setAutoDefault( false );
vlay->addWidget( d->rescanButton );
- connect( d->rescanButton, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotRescanButtonClicked()) );
+ connect( d->rescanButton, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotRescanButtonClicked()) );
vlay->addStretch( 1 );
}
@@ -306,7 +306,7 @@ void Kleo::BackendConfigWidget::slotConfigureButtonClicked() {
// Tell other users of gpgconf (e.g. the s/mime page) that the gpgconf data might have changed
kapp->dcopClient()->emitDCOPSignal( "KPIM::CryptoConfig", "changed()", TQByteArray() );
// and schedule a rescan, in case the updates make a backend valid
- TQTimer::singleShot( 0, this, TQT_SLOT(slotRescanButtonClicked()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(slotRescanButtonClicked()) );
}
}
else // shouldn't happen, button is disabled
diff --git a/certmanager/lib/ui/backendconfigwidget.h b/certmanager/lib/ui/backendconfigwidget.h
index ad60654b..041177a2 100644
--- a/certmanager/lib/ui/backendconfigwidget.h
+++ b/certmanager/lib/ui/backendconfigwidget.h
@@ -46,7 +46,7 @@ class TQListViewItem;
namespace Kleo {
class KDE_EXPORT BackendConfigWidget : public TQWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
BackendConfigWidget( CryptoBackendFactory * factory, TQWidget * parent=0, const char * name=0, WFlags f=0 );
diff --git a/certmanager/lib/ui/cryptoconfigdialog.cpp b/certmanager/lib/ui/cryptoconfigdialog.cpp
index 4ec32cbb..40608ee1 100644
--- a/certmanager/lib/ui/cryptoconfigdialog.cpp
+++ b/certmanager/lib/ui/cryptoconfigdialog.cpp
@@ -44,7 +44,7 @@ Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidg
{
mMainWidget = new CryptoConfigModule( config, this );
setMainWidget( mMainWidget );
- connect( mMainWidget, TQT_SIGNAL( changed() ), TQT_SLOT( slotChanged() ) );
+ connect( mMainWidget, TQ_SIGNAL( changed() ), TQ_SLOT( slotChanged() ) );
enableButton( Apply, false );
if ( mMainWidget->hasError() ) {
showButton( Default, false );
diff --git a/certmanager/lib/ui/cryptoconfigdialog.h b/certmanager/lib/ui/cryptoconfigdialog.h
index 0ef8009c..9ed30c9e 100644
--- a/certmanager/lib/ui/cryptoconfigdialog.h
+++ b/certmanager/lib/ui/cryptoconfigdialog.h
@@ -45,7 +45,7 @@ namespace Kleo {
*/
class KDE_EXPORT CryptoConfigDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent = 0, const char* name = 0 );
diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp
index cfe15442..c6e5594f 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.cpp
+++ b/certmanager/lib/ui/cryptoconfigmodule.cpp
@@ -353,7 +353,7 @@ Kleo::CryptoConfigEntryGUI::CryptoConfigEntryGUI(
const char* name )
: TQObject( module, name ), mEntry( entry ), mName( entryName ), mChanged( false )
{
- connect( this, TQT_SIGNAL( changed() ), module, TQT_SIGNAL( changed() ) );
+ connect( this, TQ_SIGNAL( changed() ), module, TQ_SIGNAL( changed() ) );
}
TQString Kleo::CryptoConfigEntryGUI::description() const
@@ -387,7 +387,7 @@ Kleo::CryptoConfigEntryLineEdit::CryptoConfigEntryLineEdit(
label->setEnabled( false );
mLineEdit->setEnabled( false );
} else {
- connect( mLineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) );
+ connect( mLineEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) );
}
}
@@ -419,7 +419,7 @@ Kleo::CryptoConfigEntryPath::CryptoConfigEntryPath(
label->setEnabled( false );
mUrlRequester->setEnabled( false );
} else {
- connect( mUrlRequester, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) );
+ connect( mUrlRequester, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) );
}
}
@@ -453,7 +453,7 @@ Kleo::CryptoConfigEntryDirPath::CryptoConfigEntryDirPath(
label->setEnabled( false );
mUrlRequester->setEnabled( false );
} else {
- connect( mUrlRequester, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) );
+ connect( mUrlRequester, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) );
}
}
@@ -488,7 +488,7 @@ Kleo::CryptoConfigEntryURL::CryptoConfigEntryURL(
label->setEnabled( false );
mUrlRequester->setEnabled( false );
} else {
- connect( mUrlRequester, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) );
+ connect( mUrlRequester, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) );
}
}
@@ -532,7 +532,7 @@ Kleo::CryptoConfigEntrySpinBox::CryptoConfigEntrySpinBox(
} else {
if ( mKind == UInt || mKind == ListOfNone )
mNumInput->setMinValue( 0 );
- connect( mNumInput, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotChanged() ) );
+ connect( mNumInput, TQ_SIGNAL( valueChanged(int) ), TQ_SLOT( slotChanged() ) );
}
}
@@ -584,7 +584,7 @@ Kleo::CryptoConfigEntryCheckBox::CryptoConfigEntryCheckBox(
if ( entry->isReadOnly() ) {
mCheckBox->setEnabled( false );
} else {
- connect( mCheckBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotChanged() ) );
+ connect( mCheckBox, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotChanged() ) );
}
}
@@ -619,7 +619,7 @@ Kleo::CryptoConfigEntryLDAPURL::CryptoConfigEntryLDAPURL(
mLabel->setEnabled( false );
mPushButton->hide();
} else {
- connect( mPushButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOpenDialog() ) );
+ connect( mPushButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOpenDialog() ) );
}
}
@@ -644,7 +644,7 @@ void Kleo::CryptoConfigEntryLDAPURL::slotOpenDialog()
DirectoryServicesWidget* dirserv = new DirectoryServicesWidget( mEntry, &dialog );
dirserv->load();
dialog.setMainWidget( dirserv );
- connect( &dialog, TQT_SIGNAL( defaultClicked() ), dirserv, TQT_SLOT( defaults() ) );
+ connect( &dialog, TQ_SIGNAL( defaultClicked() ), dirserv, TQ_SLOT( defaults() ) );
if ( dialog.exec() ) {
// Note that we just grab the urls from the dialog, we don't call its save method,
// since the user hasn't confirmed the big config dialog yet.
diff --git a/certmanager/lib/ui/cryptoconfigmodule.h b/certmanager/lib/ui/cryptoconfigmodule.h
index 2902423c..dd0d3421 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.h
+++ b/certmanager/lib/ui/cryptoconfigmodule.h
@@ -46,7 +46,7 @@ namespace Kleo {
* It's a simple TQWidget so that it can be embedded into a dialog or into a TDECModule.
*/
class CryptoConfigModule : public KJanusWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
CryptoConfigModule( Kleo::CryptoConfig* config, TQWidget * parent=0, const char * name=0 );
diff --git a/certmanager/lib/ui/cryptoconfigmodule_p.h b/certmanager/lib/ui/cryptoconfigmodule_p.h
index c841a092..652d2071 100644
--- a/certmanager/lib/ui/cryptoconfigmodule_p.h
+++ b/certmanager/lib/ui/cryptoconfigmodule_p.h
@@ -57,7 +57,7 @@ namespace Kleo {
* A widget corresponding to a component in the crypto config
*/
class CryptoConfigComponentGUI : public TQWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -77,7 +77,7 @@ namespace Kleo {
* A class managing widgets corresponding to a group in the crypto config
*/
class CryptoConfigGroupGUI : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -109,7 +109,7 @@ namespace Kleo {
* Base class for the widget managers tied to an entry in the crypto config
*/
class CryptoConfigEntryGUI : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
CryptoConfigEntryGUI( CryptoConfigModule* module,
@@ -147,7 +147,7 @@ namespace Kleo {
* A widget manager for a string entry in the crypto config
*/
class CryptoConfigEntryLineEdit : public CryptoConfigEntryGUI {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -167,7 +167,7 @@ namespace Kleo {
* A widget manager for a path entry in the crypto config
*/
class CryptoConfigEntryPath : public CryptoConfigEntryGUI {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -187,7 +187,7 @@ namespace Kleo {
* A widget manager for a directory path entry in the crypto config
*/
class CryptoConfigEntryDirPath : public CryptoConfigEntryGUI {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -207,7 +207,7 @@ namespace Kleo {
* A widget manager for an URL entry in the crypto config
*/
class CryptoConfigEntryURL : public CryptoConfigEntryGUI {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -227,7 +227,7 @@ namespace Kleo {
* A widget manager for an int/uint entry in the crypto config
*/
class CryptoConfigEntrySpinBox : public CryptoConfigEntryGUI {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -247,7 +247,7 @@ namespace Kleo {
* A widget manager for a bool entry in the crypto config
*/
class CryptoConfigEntryCheckBox : public CryptoConfigEntryGUI {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -266,7 +266,7 @@ namespace Kleo {
* A widget manager for a bool entry in the crypto config
*/
class CryptoConfigEntryLDAPURL : public CryptoConfigEntryGUI {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/certmanager/lib/ui/directoryserviceswidget.h b/certmanager/lib/ui/directoryserviceswidget.h
index 950a87e9..5514e877 100644
--- a/certmanager/lib/ui/directoryserviceswidget.h
+++ b/certmanager/lib/ui/directoryserviceswidget.h
@@ -43,7 +43,7 @@ class CryptoConfigEntry;
class KDE_EXPORT DirectoryServicesWidget : public DirectoryServicesWidgetBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/certmanager/lib/ui/directoryserviceswidgetbase.ui b/certmanager/lib/ui/directoryserviceswidgetbase.ui
index fcc7d493..c34b16f1 100644
--- a/certmanager/lib/ui/directoryserviceswidgetbase.ui
+++ b/certmanager/lib/ui/directoryserviceswidgetbase.ui
@@ -330,13 +330,13 @@ By clicking this button, you can remove the currently selected directory service
<slot>slotMoveDown()</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot access="protected">slotAddService()</slot>
<slot access="protected">slotDeleteService()</slot>
<slot access="protected">slotServiceChanged( TQListViewItem* )</slot>
<slot access="protected">slotServiceSelected( TQListViewItem* )</slot>
<slot access="protected">slotMoveUp()</slot>
<slot access="protected">slotMoveDown()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
index 874ba0fa..38c4df9d 100644
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
@@ -105,10 +105,10 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap
d->currentLV->setSorting( -1 );
glay->addWidget( d->currentLV, row, 2 );
- connect( d->availableLV, TQT_SIGNAL(clicked( TQListViewItem * )),
- TQT_SLOT(slotAvailableSelectionChanged(TQListViewItem*)) );
- connect( d->currentLV, TQT_SIGNAL(clicked(TQListViewItem*)),
- TQT_SLOT(slotCurrentOrderSelectionChanged(TQListViewItem*)) );
+ connect( d->availableLV, TQ_SIGNAL(clicked( TQListViewItem * )),
+ TQ_SLOT(slotAvailableSelectionChanged(TQListViewItem*)) );
+ connect( d->currentLV, TQ_SIGNAL(clicked(TQListViewItem*)),
+ TQ_SLOT(slotCurrentOrderSelectionChanged(TQListViewItem*)) );
d->placeHolderItem = new TQListViewItem( d->availableLV, "_X_", i18n("All others") );
@@ -123,12 +123,12 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap
const char * tooltip;
const char * slot;
} navButtons[] = {
- { "2uparrow", 0, 1, I18N_NOOP( "Move to top" ), TQT_SLOT(slotDoubleUpButtonClicked()) },
- { "1uparrow", 1, 1, I18N_NOOP( "Move one up" ), TQT_SLOT(slotUpButtonClicked()) },
- { "1leftarrow", 2, 0, I18N_NOOP( "Remove from current attribute order" ), TQT_SLOT(slotLeftButtonClicked()) },
- { "1rightarrow", 2, 2, I18N_NOOP( "Add to current attribute order" ), TQT_SLOT(slotRightButtonClicked()) },
- { "1downarrow", 3, 1, I18N_NOOP( "Move one down" ), TQT_SLOT(slotDownButtonClicked()) },
- { "2downarrow", 4, 1, I18N_NOOP( "Move to bottom" ), TQT_SLOT(slotDoubleDownButtonClicked()) }
+ { "2uparrow", 0, 1, I18N_NOOP( "Move to top" ), TQ_SLOT(slotDoubleUpButtonClicked()) },
+ { "1uparrow", 1, 1, I18N_NOOP( "Move one up" ), TQ_SLOT(slotUpButtonClicked()) },
+ { "1leftarrow", 2, 0, I18N_NOOP( "Remove from current attribute order" ), TQ_SLOT(slotLeftButtonClicked()) },
+ { "1rightarrow", 2, 2, I18N_NOOP( "Add to current attribute order" ), TQ_SLOT(slotRightButtonClicked()) },
+ { "1downarrow", 3, 1, I18N_NOOP( "Move one down" ), TQ_SLOT(slotDownButtonClicked()) },
+ { "2downarrow", 4, 1, I18N_NOOP( "Move to bottom" ), TQ_SLOT(slotDoubleDownButtonClicked()) }
};
for ( unsigned int i = 0 ; i < sizeof navButtons / sizeof *navButtons ; ++i ) {
@@ -137,7 +137,7 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap
tb->setEnabled( false );
TQToolTip::add( tb, i18n( navButtons[i].tooltip ) );
xlay->addWidget( tb, navButtons[i].row, navButtons[i].col );
- connect( tb, TQT_SIGNAL(clicked()), navButtons[i].slot );
+ connect( tb, TQ_SIGNAL(clicked()), navButtons[i].slot );
}
glay->addLayout( xlay, row, 1 );
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.h b/certmanager/lib/ui/dnattributeorderconfigwidget.h
index d39220ac..70c093d4 100644
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.h
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.h
@@ -44,7 +44,7 @@ class TQListViewItem;
namespace Kleo {
class KDE_EXPORT DNAttributeOrderConfigWidget : public TQWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
/*! Use Kleo::DNAttributeMapper::instance()->configWidget( parent, name ) instead. */
diff --git a/certmanager/lib/ui/kdhorizontalline.h b/certmanager/lib/ui/kdhorizontalline.h
index 4cae46b1..e9b9646f 100644
--- a/certmanager/lib/ui/kdhorizontalline.h
+++ b/certmanager/lib/ui/kdhorizontalline.h
@@ -45,7 +45,7 @@
#include <tqstring.h>
class KDHorizontalLine : public TQFrame {
- Q_OBJECT
+ TQ_OBJECT
TQ_PROPERTY( TQString title READ title WRITE setTitle )
public:
diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp
index 900605ae..fd796b8d 100644
--- a/certmanager/lib/ui/keyapprovaldialog.cpp
+++ b/certmanager/lib/ui/keyapprovaldialog.cpp
@@ -139,7 +139,7 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients
d->selfRequester->setKeys( sender );
glay->addWidget( d->selfRequester, row, 1 );
++row;
- glay->addMultiCellWidget( new KSeparator( Qt::Horizontal, view ), row, row, 0, 1 );
+ glay->addMultiCellWidget( new KSeparator( TQt::Horizontal, view ), row, row, 0, 1 );
}
const TQStringList prefs = preferencesStrings();
@@ -163,7 +163,7 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients
cb->insertStringList( prefs );
glay->addWidget( cb, row, 1 );
cb->setCurrentItem( pref2cb( it->pref ) );
- connect( cb, TQT_SIGNAL(activated(int)), TQT_SLOT(slotPrefsChanged()) );
+ connect( cb, TQ_SIGNAL(activated(int)), TQ_SLOT(slotPrefsChanged()) );
d->preferences.push_back( cb );
}
diff --git a/certmanager/lib/ui/keyapprovaldialog.h b/certmanager/lib/ui/keyapprovaldialog.h
index a83e124b..d6a59b09 100644
--- a/certmanager/lib/ui/keyapprovaldialog.h
+++ b/certmanager/lib/ui/keyapprovaldialog.h
@@ -56,7 +56,7 @@ class TQStringList;
namespace Kleo {
class KDE_EXPORT KeyApprovalDialog : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
struct Item {
diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp
index 00f69500..af067b1e 100644
--- a/certmanager/lib/ui/keylistview.cpp
+++ b/certmanager/lib/ui/keylistview.cpp
@@ -123,14 +123,14 @@ static const struct {
const char * source;
const char * target;
} signalReplacements[] = {
- { TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)),
- TQT_SLOT(slotEmitDoubleClicked(TQListViewItem*,const TQPoint&,int)) },
- { TQT_SIGNAL(returnPressed(TQListViewItem*)),
- TQT_SLOT(slotEmitReturnPressed(TQListViewItem*)) },
- { TQT_SIGNAL(selectionChanged(TQListViewItem*)),
- TQT_SLOT(slotEmitSelectionChanged(TQListViewItem*)) },
- { TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*,const TQPoint&)),
- TQT_SLOT(slotEmitContextMenu(TDEListView*, TQListViewItem*,const TQPoint&)) },
+ { TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)),
+ TQ_SLOT(slotEmitDoubleClicked(TQListViewItem*,const TQPoint&,int)) },
+ { TQ_SIGNAL(returnPressed(TQListViewItem*)),
+ TQ_SLOT(slotEmitReturnPressed(TQListViewItem*)) },
+ { TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+ TQ_SLOT(slotEmitSelectionChanged(TQListViewItem*)) },
+ { TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*,const TQPoint&)),
+ TQ_SLOT(slotEmitContextMenu(TDEListView*, TQListViewItem*,const TQPoint&)) },
};
static const int numSignalReplacements = sizeof signalReplacements / sizeof *signalReplacements;
@@ -146,7 +146,7 @@ Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const Dis
d = new Private();
d->updateTimer = new TQTimer( this );
- connect( d->updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdateTimeout()) );
+ connect( d->updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotUpdateTimeout()) );
if ( !columnStrategy ) {
kdWarning(5150) << "Kleo::KeyListView: need a column strategy to work with!" << endl;
diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h
index 6eeef5d8..414e4dea 100644
--- a/certmanager/lib/ui/keylistview.h
+++ b/certmanager/lib/ui/keylistview.h
@@ -199,7 +199,7 @@ namespace Kleo {
class KDE_EXPORT KeyListView : public TDEListView {
- Q_OBJECT
+ TQ_OBJECT
friend class KeyListViewItem;
public:
diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp
index e245898e..6dd1b05e 100644
--- a/certmanager/lib/ui/keyrequester.cpp
+++ b/certmanager/lib/ui/keyrequester.cpp
@@ -130,8 +130,8 @@ void Kleo::KeyRequester::init()
hlay->addWidget( mEraseButton );
hlay->addWidget( mDialogButton );
- connect( mEraseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEraseButtonClicked()) );
- connect( mDialogButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDialogButtonClicked()) );
+ connect( mEraseButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEraseButtonClicked()) );
+ connect( mDialogButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotDialogButtonClicked()) );
setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
TQSizePolicy::Fixed ) );
@@ -264,10 +264,10 @@ void Kleo::KeyRequester::startKeyListJob( const TQStringList & fingerprints ) {
"Check your installation."),
i18n("Key Listing Failed") );
} else {
- connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)),
- TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) );
- connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)),
- TQT_SLOT(slotNextKey(const GpgME::Key&)) );
+ connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)),
+ TQ_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) );
+ connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)),
+ TQ_SLOT(slotNextKey(const GpgME::Key&)) );
const GpgME::Error err = job->start( fingerprints,
mKeyUsage & Kleo::KeySelectionDialog::SecretKeys &&
@@ -288,10 +288,10 @@ void Kleo::KeyRequester::startKeyListJob( const TQStringList & fingerprints ) {
"Check your installation."),
i18n("Key Listing Failed") );
} else {
- connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)),
- TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) );
- connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)),
- TQT_SLOT(slotNextKey(const GpgME::Key&)) );
+ connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)),
+ TQ_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) );
+ connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)),
+ TQ_SLOT(slotNextKey(const GpgME::Key&)) );
const GpgME::Error err = job->start( fingerprints,
mKeyUsage & Kleo::KeySelectionDialog::SecretKeys &&
diff --git a/certmanager/lib/ui/keyrequester.h b/certmanager/lib/ui/keyrequester.h
index 30fba80d..2f7b3b26 100644
--- a/certmanager/lib/ui/keyrequester.h
+++ b/certmanager/lib/ui/keyrequester.h
@@ -74,7 +74,7 @@ namespace Kleo {
/// Base class for SigningKeyRequester and EncryptionKeyRequester
class KDE_EXPORT KeyRequester : public TQWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
KeyRequester( unsigned int allowedKeys, bool multipleKeys=false,
@@ -160,7 +160,7 @@ namespace Kleo {
class KDE_EXPORT EncryptionKeyRequester : public KeyRequester {
- Q_OBJECT
+ TQ_OBJECT
public:
enum { OpenPGP = 1, SMIME = 2, AllProtocols = OpenPGP|SMIME };
@@ -188,7 +188,7 @@ namespace Kleo {
class KDE_EXPORT SigningKeyRequester : public KeyRequester {
- Q_OBJECT
+ TQ_OBJECT
public:
enum { OpenPGP = 1, SMIME = 2, AllProtocols = OpenPGP|SMIME };
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index 25a1a225..1de21dc0 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -377,8 +377,8 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection
if ( !text.isEmpty() ) {
if ( text.startsWith( "<qt>" ) ) {
KActiveLabel *textLabel = new KActiveLabel( text, page );
- disconnect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), textLabel, TQT_SLOT(openLink(const TQString&)) );
- connect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), TQT_SLOT(slotStartCertificateManager(const TQString&)) );
+ disconnect( textLabel, TQ_SIGNAL(linkClicked(const TQString&)), textLabel, TQ_SLOT(openLink(const TQString&)) );
+ connect( textLabel, TQ_SIGNAL(linkClicked(const TQString&)), TQ_SLOT(slotStartCertificateManager(const TQString&)) );
textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak );
mTopLayout->addWidget( textLabel );
} else {
@@ -391,7 +391,7 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection
TQPushButton * const searchExternalPB
= new TQPushButton( i18n("Search for &External Certificates"), page );
mTopLayout->addWidget( searchExternalPB, 0, TQt::AlignLeft );
- connect( searchExternalPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStartSearchForExternalCertificates()) );
+ connect( searchExternalPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStartSearchForExternalCertificates()) );
if ( initialQuery.isEmpty() )
searchExternalPB->hide();
@@ -406,10 +406,10 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection
hlay->addWidget( le, 1 );
le->setFocus();
- connect( clearButton, TQT_SIGNAL( clicked() ), le, TQT_SLOT( clear() ) );
- connect( le, TQT_SIGNAL(textChanged(const TQString&)),
- this, TQT_SLOT(slotSearch(const TQString&)) );
- connect( mStartSearchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotFilter()) );
+ connect( clearButton, TQ_SIGNAL( clicked() ), le, TQ_SLOT( clear() ) );
+ connect( le, TQ_SIGNAL(textChanged(const TQString&)),
+ this, TQ_SLOT(slotSearch(const TQString&)) );
+ connect( mStartSearchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotFilter()) );
mKeyListView = new KeyListView( new ColumnStrategy( mKeyUsage ), 0, page, "mKeyListView" );
mKeyListView->setResizeMode( TQListView::LastColumn );
@@ -430,21 +430,21 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection
"</p></qt>") );
}
- connect( mCheckSelectionTimer, TQT_SIGNAL(timeout()),
- TQT_SLOT(slotCheckSelection()) );
+ connect( mCheckSelectionTimer, TQ_SIGNAL(timeout()),
+ TQ_SLOT(slotCheckSelection()) );
connectSignals();
connect( mKeyListView,
- TQT_SIGNAL(doubleClicked(Kleo::KeyListViewItem*,const TQPoint&,int)),
- TQT_SLOT(slotTryOk()) );
+ TQ_SIGNAL(doubleClicked(Kleo::KeyListViewItem*,const TQPoint&,int)),
+ TQ_SLOT(slotTryOk()) );
connect( mKeyListView,
- TQT_SIGNAL(contextMenu(Kleo::KeyListViewItem*,const TQPoint&)),
- TQT_SLOT(slotRMB(Kleo::KeyListViewItem*,const TQPoint&)) );
+ TQ_SIGNAL(contextMenu(Kleo::KeyListViewItem*,const TQPoint&)),
+ TQ_SLOT(slotRMB(Kleo::KeyListViewItem*,const TQPoint&)) );
setButtonText( KDialogBase::Default, i18n("&Reread Keys") );
setButtonGuiItem( KDialogBase::Help, i18n("&Start Certificate Manager") );
- connect( this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(slotRereadKeys()) );
- connect( this, TQT_SIGNAL(helpClicked()), this, TQT_SLOT(slotStartCertificateManager()) );
+ connect( this, TQ_SIGNAL(defaultClicked()), this, TQ_SLOT(slotRereadKeys()) );
+ connect( this, TQ_SIGNAL(helpClicked()), this, TQ_SLOT(slotStartCertificateManager()) );
slotRereadKeys();
mTopLayout->activate();
@@ -468,20 +468,20 @@ Kleo::KeySelectionDialog::~KeySelectionDialog() {
void Kleo::KeySelectionDialog::connectSignals() {
if ( mKeyListView->isMultiSelection() )
- connect( mKeyListView, TQT_SIGNAL(selectionChanged()),
- TQT_SLOT(slotSelectionChanged()) );
+ connect( mKeyListView, TQ_SIGNAL(selectionChanged()),
+ TQ_SLOT(slotSelectionChanged()) );
else
- connect( mKeyListView, TQT_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)),
- TQT_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) );
+ connect( mKeyListView, TQ_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)),
+ TQ_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) );
}
void Kleo::KeySelectionDialog::disconnectSignals() {
if ( mKeyListView->isMultiSelection() )
- disconnect( mKeyListView, TQT_SIGNAL(selectionChanged()),
- this, TQT_SLOT(slotSelectionChanged()) );
+ disconnect( mKeyListView, TQ_SIGNAL(selectionChanged()),
+ this, TQ_SLOT(slotSelectionChanged()) );
else
- disconnect( mKeyListView, TQT_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)),
- this, TQT_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) );
+ disconnect( mKeyListView, TQ_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)),
+ this, TQ_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) );
}
const GpgME::Key & Kleo::KeySelectionDialog::selectedKey() const {
@@ -593,12 +593,12 @@ void Kleo::KeySelectionDialog::startKeyListJobForBackend( const CryptoBackend::P
return;
}
- connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)),
- TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) );
- connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)),
+ connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)),
+ TQ_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) );
+ connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)),
mKeyListView, validate ?
- TQT_SLOT(slotRefreshKey(const GpgME::Key&)) :
- TQT_SLOT(slotAddKey(const GpgME::Key&)) );
+ TQ_SLOT(slotRefreshKey(const GpgME::Key&)) :
+ TQ_SLOT(slotAddKey(const GpgME::Key&)) );
TQStringList fprs;
std::transform( keys.begin(), keys.end(), std::back_inserter( fprs ), ExtractFingerprint() );
@@ -756,7 +756,7 @@ void Kleo::KeySelectionDialog::slotRMB( Kleo::KeyListViewItem * item, const TQPo
mCurrentContextMenuItem = item;
TQPopupMenu menu;
- menu.insertItem( i18n( "Recheck Key" ), this, TQT_SLOT(slotRecheckKey()) );
+ menu.insertItem( i18n( "Recheck Key" ), this, TQ_SLOT(slotRecheckKey()) );
menu.exec( p );
}
diff --git a/certmanager/lib/ui/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h
index 126baa73..c8c833dd 100644
--- a/certmanager/lib/ui/keyselectiondialog.h
+++ b/certmanager/lib/ui/keyselectiondialog.h
@@ -64,7 +64,7 @@ namespace GpgME {
namespace Kleo {
class KDE_EXPORT KeySelectionDialog : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp
index fa14bfbe..689c094e 100644
--- a/certmanager/lib/ui/messagebox.cpp
+++ b/certmanager/lib/ui/messagebox.cpp
@@ -74,7 +74,7 @@ static KGuiItem KGuiItem_showAuditLog() {
}
class AuditLogViewer : public KDialogBase {
- // Q_OBJECT
+ // TQ_OBJECT
public:
explicit AuditLogViewer( const TQString & log, TQWidget * parent=0, const char * name=0, WFlags f=0 )
diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp
index f2771201..68837d38 100644
--- a/certmanager/lib/ui/passphrasedialog.cpp
+++ b/certmanager/lib/ui/passphrasedialog.cpp
@@ -90,7 +90,7 @@ Kleo::PassphraseDialog::PassphraseDialog( const TQString & msg, const TQString &
vlay->addWidget( d->lineedit );
- connect( d->lineedit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotOk()) );
+ connect( d->lineedit, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotOk()) );
disableResize();
}
diff --git a/certmanager/lib/ui/passphrasedialog.h b/certmanager/lib/ui/passphrasedialog.h
index eece8f48..15d0a157 100644
--- a/certmanager/lib/ui/passphrasedialog.h
+++ b/certmanager/lib/ui/passphrasedialog.h
@@ -54,7 +54,7 @@
namespace Kleo {
class PassphraseDialog : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
PassphraseDialog( const TQString & description,
diff --git a/certmanager/lib/ui/progressbar.cpp b/certmanager/lib/ui/progressbar.cpp
index 6fe2f531..8c530a56 100644
--- a/certmanager/lib/ui/progressbar.cpp
+++ b/certmanager/lib/ui/progressbar.cpp
@@ -44,7 +44,7 @@ Kleo::ProgressBar::ProgressBar( TQWidget * parent, const char * name, WFlags f )
mRealProgress( -1 )
{
mBusyTimer = new TQTimer( this );
- connect( mBusyTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotBusyTimerTick()) );
+ connect( mBusyTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotBusyTimerTick()) );
fixup( true );
}
diff --git a/certmanager/lib/ui/progressbar.h b/certmanager/lib/ui/progressbar.h
index c5495d39..ead5b12c 100644
--- a/certmanager/lib/ui/progressbar.h
+++ b/certmanager/lib/ui/progressbar.h
@@ -43,7 +43,7 @@ namespace Kleo {
@short A TQProgressBar with self-powered busy indicator
*/
class KDE_EXPORT ProgressBar : public TQProgressBar {
- Q_OBJECT
+ TQ_OBJECT
public:
ProgressBar( TQWidget * parent=0, const char * name=0, WFlags f=0 );
diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp
index 692ee4cb..b99db7cb 100644
--- a/certmanager/lib/ui/progressdialog.cpp
+++ b/certmanager/lib/ui/progressdialog.cpp
@@ -56,13 +56,13 @@ Kleo::ProgressDialog::ProgressDialog( Job * job, const TQString & baseText,
setLabelText( baseText );
setProgress( 0, 0 ); // activate busy indicator
- connect( job, TQT_SIGNAL(progress(const TQString&,int,int)),
- TQT_SLOT(slotProgress(const TQString&,int,int)) );
- connect( job, TQT_SIGNAL(done()), TQT_SLOT(slotDone()) );
- connect( this, TQT_SIGNAL(canceled()),
- job, TQT_SLOT(slotCancel()) );
+ connect( job, TQ_SIGNAL(progress(const TQString&,int,int)),
+ TQ_SLOT(slotProgress(const TQString&,int,int)) );
+ connect( job, TQ_SIGNAL(done()), TQ_SLOT(slotDone()) );
+ connect( this, TQ_SIGNAL(canceled()),
+ job, TQ_SLOT(slotCancel()) );
- TQTimer::singleShot( minimumDuration(), this, TQT_SLOT(forceShow()) );
+ TQTimer::singleShot( minimumDuration(), this, TQ_SLOT(forceShow()) );
}
Kleo::ProgressDialog::~ProgressDialog() {
@@ -71,7 +71,7 @@ Kleo::ProgressDialog::~ProgressDialog() {
void Kleo::ProgressDialog::setMinimumDuration( int ms ) {
if ( 0 < ms && ms < minimumDuration() )
- TQTimer::singleShot( ms, this, TQT_SLOT(forceShow()) );
+ TQTimer::singleShot( ms, this, TQ_SLOT(forceShow()) );
TQProgressDialog::setMinimumDuration( ms );
}
diff --git a/certmanager/lib/ui/progressdialog.h b/certmanager/lib/ui/progressdialog.h
index eb1b95b7..35b1886d 100644
--- a/certmanager/lib/ui/progressdialog.h
+++ b/certmanager/lib/ui/progressdialog.h
@@ -44,7 +44,7 @@ namespace Kleo {
@short A progress dialog for Kleo::Jobs
*/
class KDE_EXPORT ProgressDialog : public TQProgressDialog {
- Q_OBJECT
+ TQ_OBJECT
public:
ProgressDialog( Job * job, const TQString & baseText,
diff --git a/certmanager/storedtransferjob.cpp b/certmanager/storedtransferjob.cpp
index b9816c89..3803502d 100644
--- a/certmanager/storedtransferjob.cpp
+++ b/certmanager/storedtransferjob.cpp
@@ -30,10 +30,10 @@ StoredTransferJob::StoredTransferJob(const KURL& url, int command,
: TDEIO::TransferJob( url, command, packedArgs, _staticData, showProgressInfo ),
m_uploadOffset( 0 )
{
- connect( this, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
- connect( this, TQT_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ),
- TQT_SLOT( slotDataReq( TDEIO::Job *, TQByteArray & ) ) );
+ connect( this, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( this, TQ_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ),
+ TQ_SLOT( slotDataReq( TDEIO::Job *, TQByteArray & ) ) );
}
void StoredTransferJob::setData( const TQByteArray& arr )
diff --git a/certmanager/storedtransferjob.h b/certmanager/storedtransferjob.h
index cfbc6811..bdd7988e 100644
--- a/certmanager/storedtransferjob.h
+++ b/certmanager/storedtransferjob.h
@@ -45,7 +45,7 @@ namespace TDEIOext {
*
*/
class StoredTransferJob : public TDEIO::TransferJob {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/dependency-graph.dot b/dependency-graph.dot
index 9e9953d4..cfc85ebe 100644
--- a/dependency-graph.dot
+++ b/dependency-graph.dot
@@ -26,7 +26,6 @@ digraph "inter-dependency graph for tdepim" {
"libkcal" -> "kalarm";
"libkcal" -> "karm";
"libkcal" -> "tdefile-plugins";
- "libkcal" -> "kitchensync";
"libkcal" -> "knotes";
"libkcal" -> "konsolekalendar";
"libkcal" -> "korganizer";
@@ -45,7 +44,6 @@ digraph "inter-dependency graph for tdepim" {
"libtdepim" -> "kandy";
"libtdepim" -> "karm";
"libtdepim" -> "tdeioslaves";
- "libtdepim" -> "kitchensync";
"libtdepim" -> "kmail";
"libtdepim" -> "knode";
"libtdepim" -> "knotes";
diff --git a/doc/api/Doxyfile.pim b/doc/api/Doxyfile.pim
index 62cf6790..2f238502 100644
--- a/doc/api/Doxyfile.pim
+++ b/doc/api/Doxyfile.pim
@@ -930,7 +930,7 @@ INCLUDE_FILE_PATTERNS =
PREDEFINED = TQT_VERSION=320 \
__cplusplus \
- Q_WS_X11
+ TQ_WS_X11
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# this tag can be used to specify a list of macro names that should be expanded.
diff --git a/doc/kalarm/index.docbook b/doc/kalarm/index.docbook
index 3362f18c..a85022ff 100644
--- a/doc/kalarm/index.docbook
+++ b/doc/kalarm/index.docbook
@@ -2700,8 +2700,8 @@ at some future date.</para></note>
</refnamediv>
<refsynopsisdiv>
<synopsis>
-void cancelEvent(const QString&amp; <replaceable>calendarFile</replaceable>,
- const QString&amp; <replaceable>eventID</replaceable>)
+void cancelEvent(const TQString&amp; <replaceable>calendarFile</replaceable>,
+ const TQString&amp; <replaceable>eventID</replaceable>)
</synopsis>
<refsect2>
@@ -2751,8 +2751,8 @@ ignored.</para></note>
</refnamediv>
<refsynopsisdiv>
<synopsis>
-void triggerEvent(const QString&amp; <replaceable>calendarFile</replaceable>,
- const QString&amp; <replaceable>eventID</replaceable>)
+void triggerEvent(const TQString&amp; <replaceable>calendarFile</replaceable>,
+ const TQString&amp; <replaceable>eventID</replaceable>)
</synopsis>
<refsect2>
@@ -2809,8 +2809,8 @@ ignored.</para></note>
</refnamediv>
<refsynopsisdiv>
<synopsis>
-void handleEvent(const QString&amp; <replaceable>calendarFile</replaceable>,
- const QString&amp; <replaceable>eventID</replaceable>)
+void handleEvent(const TQString&amp; <replaceable>calendarFile</replaceable>,
+ const TQString&amp; <replaceable>eventID</replaceable>)
</synopsis>
<refsect2>
@@ -2876,26 +2876,26 @@ ignored.</para></note>
</refnamediv>
<refsynopsisdiv>
<synopsis>
-bool scheduleMessage(const QString&amp; <replaceable>message</replaceable>,
- const QString&amp; <replaceable>dateTime</replaceable>,
+bool scheduleMessage(const TQString&amp; <replaceable>message</replaceable>,
+ const TQString&amp; <replaceable>dateTime</replaceable>,
int <replaceable>lateCancel</replaceable>,
int <replaceable>flags</replaceable>,
- const QString&amp; <replaceable>bgColor</replaceable>,
- const QString&amp; <replaceable>fgColor</replaceable>,
- const QString&amp; <replaceable>font</replaceable>,
+ const TQString&amp; <replaceable>bgColor</replaceable>,
+ const TQString&amp; <replaceable>fgColor</replaceable>,
+ const TQString&amp; <replaceable>font</replaceable>,
const KURL&amp; <replaceable>audioURL</replaceable>,
int <replaceable>reminder</replaceable>,
- const QString&amp; <replaceable>recurrence</replaceable>,
+ const TQString&amp; <replaceable>recurrence</replaceable>,
int <replaceable>subRepeatInterval</replaceable>,
int <replaceable>subRepeatCount</replaceable>)
</synopsis>
<synopsis>
-bool scheduleMessage(const QString&amp; <replaceable>message</replaceable>,
- const QString&amp; <replaceable>dateTime</replaceable>,
+bool scheduleMessage(const TQString&amp; <replaceable>message</replaceable>,
+ const TQString&amp; <replaceable>dateTime</replaceable>,
int <replaceable>lateCancel</replaceable>, int <replaceable>flags</replaceable>,
- const QString&amp; <replaceable>bgColor</replaceable>,
- const QString&amp; <replaceable>fgColor</replaceable>,
- const QString&amp; <replaceable>font</replaceable>,
+ const TQString&amp; <replaceable>bgColor</replaceable>,
+ const TQString&amp; <replaceable>fgColor</replaceable>,
+ const TQString&amp; <replaceable>font</replaceable>,
const KURL&amp; <replaceable>audioURL</replaceable>,
int <replaceable>reminder</replaceable>,
int <replaceable>recurType</replaceable>,
@@ -2903,18 +2903,18 @@ bool scheduleMessage(const QString&amp; <replaceable>message</replaceable>,
int <replaceable>recurCount</replaceable>)
</synopsis>
<synopsis>
-bool scheduleMessage(const QString&amp; <replaceable>message</replaceable>,
- const QString&amp; <replaceable>dateTime</replaceable>,
+bool scheduleMessage(const TQString&amp; <replaceable>message</replaceable>,
+ const TQString&amp; <replaceable>dateTime</replaceable>,
int <replaceable>lateCancel</replaceable>,
int <replaceable>flags</replaceable>,
- const QString&amp; <replaceable>bgColor</replaceable>,
- const QString&amp; <replaceable>fgColor</replaceable>,
- const QString&amp; <replaceable>font</replaceable>,
+ const TQString&amp; <replaceable>bgColor</replaceable>,
+ const TQString&amp; <replaceable>fgColor</replaceable>,
+ const TQString&amp; <replaceable>font</replaceable>,
const KURL&amp; <replaceable>audioURL</replaceable>,
int <replaceable>reminder</replaceable>,
int <replaceable>recurType</replaceable>,
int <replaceable>recurInterval</replaceable>,
- const QString&amp; <replaceable>endDateTime</replaceable>)
+ const TQString&amp; <replaceable>endDateTime</replaceable>)
</synopsis>
<refsect2>
@@ -2933,12 +2933,12 @@ bool scheduleMessage(const QString&amp; <replaceable>message</replaceable>,
<para>Specifies the scheduled date, or date and time, at which the
message should be displayed. For a date-only alarm, the string should
be in the format <quote>YYYY-MM-DD</quote> (as returned by
-<methodname>QDate::toString(Qt::ISODate)</methodname>). For an alarm
+<methodname>QDate::toString(TQt::ISODate)</methodname>). For an alarm
with a date and time, the string should be in the format
<quote>YYYY-MM-DDTHH:MM[:SS]</quote> (as returned by
-<methodname>QDateTime::toString(Qt::ISODate)</methodname>) or
+<methodname>QDateTime::toString(TQt::ISODate)</methodname>) or
<quote>HH:MM[:SS]</quote> (as returned by
-<methodname>QTime::toString(Qt::ISODate)</methodname>). If no date is
+<methodname>QTime::toString(TQt::ISODate)</methodname>). If no date is
specified, today's date is used. Note that any seconds value is
ignored.</para>
</listitem>
@@ -2969,10 +2969,10 @@ applicable to message alarms.</para>
<listitem>
<para>Specifies the background color for displaying the message. The
string may be in the format <quote>#RRGGBB</quote> (as returned by
-<methodname>QColor::name()</methodname>) where RR, GG and BB are
+<methodname>TQColor::name()</methodname>) where RR, GG and BB are
two-digit hexadecimal values for red, green and blue. Alternatively
the string may be in any of the other formats accepted by
-<methodname>QColor::setNamedColor()</methodname>, such as a name from
+<methodname>TQColor::setNamedColor()</methodname>, such as a name from
the X color database (&eg; <quote>red</quote> or
<quote>steelblue</quote>). Set the string to null to specify the
current default background color.</para>
@@ -3124,22 +3124,22 @@ text or image file.</refpurpose>
<refsynopsisdiv>
<synopsis>
bool scheduleFile(const KURL&amp; <replaceable>URL</replaceable>,
- const QString&amp; <replaceable>dateTime</replaceable>,
+ const TQString&amp; <replaceable>dateTime</replaceable>,
int <replaceable>lateCancel</replaceable>,
int <replaceable>flags</replaceable>,
- const QString&amp; <replaceable>bgColor</replaceable>,
+ const TQString&amp; <replaceable>bgColor</replaceable>,
const KURL&amp; <replaceable>audioURL</replaceable>,
int <replaceable>reminder</replaceable>,
- const QString&amp; <replaceable>recurrence</replaceable>,
+ const TQString&amp; <replaceable>recurrence</replaceable>,
int <replaceable>subRepeatInterval</replaceable>,
int <replaceable>subRepeatCount</replaceable>)
</synopsis>
<synopsis>
bool scheduleFile(const KURL&amp; <replaceable>URL</replaceable>,
- const QString&amp; <replaceable>dateTime</replaceable>,
+ const TQString&amp; <replaceable>dateTime</replaceable>,
int <replaceable>lateCancel</replaceable>,
int <replaceable>flags</replaceable>,
- const QString&amp; <replaceable>bgColor</replaceable>,
+ const TQString&amp; <replaceable>bgColor</replaceable>,
const KURL&amp; <replaceable>audioURL</replaceable>,
int <replaceable>reminder</replaceable>,
int <replaceable>recurType</replaceable>,
@@ -3148,15 +3148,15 @@ bool scheduleFile(const KURL&amp; <replaceable>URL</replaceable>,
</synopsis>
<synopsis>
bool scheduleFile(const KURL&amp; <replaceable>URL</replaceable>,
- const QString&amp; <replaceable>dateTime</replaceable>,
+ const TQString&amp; <replaceable>dateTime</replaceable>,
int <replaceable>lateCancel</replaceable>,
int <replaceable>flags</replaceable>,
- const QString&amp; <replaceable>bgColor</replaceable>,
+ const TQString&amp; <replaceable>bgColor</replaceable>,
const KURL&amp; <replaceable>audioURL</replaceable>,
int <replaceable>reminder</replaceable>,
int <replaceable>recurType</replaceable>,
int <replaceable>recurInterval</replaceable>,
- const QString&amp; <replaceable>endDateTime</replaceable>)
+ const TQString&amp; <replaceable>endDateTime</replaceable>)
</synopsis>
<refsect2>
@@ -3176,12 +3176,12 @@ displayed in the message to be scheduled.</para>
<para>Specifies the scheduled date, or date and time, at which the
file should be displayed. For a date-only alarm, the string should
be in the format <quote>YYYY-MM-DD</quote> (as returned by
-<methodname>QDate::toString(Qt::ISODate)</methodname>). For an alarm
+<methodname>QDate::toString(TQt::ISODate)</methodname>). For an alarm
with a date and time, the string should be in the format
<quote>YYYY-MM-DDTHH:MM[:SS]</quote> (as returned by
-<methodname>QDateTime::toString(Qt::ISODate)</methodname>) or
+<methodname>QDateTime::toString(TQt::ISODate)</methodname>) or
<quote>HH:MM[:SS]</quote> (as returned by
-<methodname>QTime::toString(Qt::ISODate)</methodname>). If no date is
+<methodname>QTime::toString(TQt::ISODate)</methodname>). If no date is
specified, today's date is used. Note that any seconds value is
ignored.</para>
</listitem>
@@ -3212,10 +3212,10 @@ applicable to file alarms.</para>
<listitem>
<para>Specifies the background color for displaying the file. The
string may be in the format <quote>#RRGGBB</quote> (as returned by
-<methodname>QColor::name()</methodname>) where RR, GG and BB are
+<methodname>TQColor::name()</methodname>) where RR, GG and BB are
two-digit hexadecimal values for red, green and blue. Alternatively
the string may be in any of the other formats accepted by
-<methodname>QColor::setNamedColor()</methodname>, such as a name from
+<methodname>TQColor::setNamedColor()</methodname>, such as a name from
the X color database (&eg; <quote>red</quote> or
<quote>steelblue</quote>). Set the string to null to specify the
current default background color.</para>
@@ -3338,17 +3338,17 @@ command.</refpurpose>
</refnamediv>
<refsynopsisdiv>
<synopsis>
-bool scheduleCommand(const QString&amp; <replaceable>commandLine</replaceable>,
- const QString&amp; <replaceable>dateTime</replaceable>,
+bool scheduleCommand(const TQString&amp; <replaceable>commandLine</replaceable>,
+ const TQString&amp; <replaceable>dateTime</replaceable>,
int <replaceable>lateCancel</replaceable>,
int <replaceable>flags</replaceable>,
- const QString&amp; <replaceable>recurrence</replaceable>,
+ const TQString&amp; <replaceable>recurrence</replaceable>,
int <replaceable>subRepeatInterval</replaceable>,
int <replaceable>subRepeatCount</replaceable>)
</synopsis>
<synopsis>
-bool scheduleCommand(const QString&amp; <replaceable>commandLine</replaceable>,
- const QString&amp; <replaceable>dateTime</replaceable>,
+bool scheduleCommand(const TQString&amp; <replaceable>commandLine</replaceable>,
+ const TQString&amp; <replaceable>dateTime</replaceable>,
int <replaceable>lateCancel</replaceable>,
int <replaceable>flags</replaceable>,
int <replaceable>recurType</replaceable>,
@@ -3356,13 +3356,13 @@ bool scheduleCommand(const QString&amp; <replaceable>commandLine</replaceable>,
int <replaceable>recurCount</replaceable>)
</synopsis>
<synopsis>
-bool scheduleCommand(const QString&amp; <replaceable>commandLine</replaceable>,
- const QString&amp; <replaceable>dateTime</replaceable>,
+bool scheduleCommand(const TQString&amp; <replaceable>commandLine</replaceable>,
+ const TQString&amp; <replaceable>dateTime</replaceable>,
int <replaceable>lateCancel</replaceable>,
int <replaceable>flags</replaceable>,
int <replaceable>recurType</replaceable>,
int <replaceable>recurInterval</replaceable>,
- const QString&amp; <replaceable>endDateTime</replaceable>)
+ const TQString&amp; <replaceable>endDateTime</replaceable>)
</synopsis>
<refsect2>
@@ -3383,12 +3383,12 @@ parameter contains a shell command line or a command script.</para>
<para>Specifies the scheduled date, or date and time, at which the
command should be executed. For a date-only alarm, the string should
be in the format <quote>YYYY-MM-DD</quote> (as returned by
-<methodname>QDate::toString(Qt::ISODate)</methodname>). For an alarm
+<methodname>QDate::toString(TQt::ISODate)</methodname>). For an alarm
with a date and time, the string should be in the format
<quote>YYYY-MM-DDTHH:MM[:SS]</quote> (as returned by
-<methodname>QDateTime::toString(Qt::ISODate)</methodname>) or
+<methodname>QDateTime::toString(TQt::ISODate)</methodname>) or
<quote>HH:MM[:SS]</quote> (as returned by
-<methodname>QTime::toString(Qt::ISODate)</methodname>). If no date is
+<methodname>QTime::toString(TQt::ISODate)</methodname>). If no date is
specified, today's date is used. Note that any seconds value is
ignored.</para>
</listitem>
@@ -3512,25 +3512,25 @@ parameters, its usage is identical to
</refnamediv>
<refsynopsisdiv>
<synopsis>
-bool scheduleEmail(const QString&amp; <replaceable>fromID</replaceable>,
- const QString&amp; <replaceable>addresses</replaceable>,
- const QString&amp; <replaceable>subject</replaceable>,
- const QString&amp; <replaceable>message</replaceable>,
- const QString&amp; <replaceable>attachments</replaceable>,
- const QString&amp; <replaceable>dateTime</replaceable>,
+bool scheduleEmail(const TQString&amp; <replaceable>fromID</replaceable>,
+ const TQString&amp; <replaceable>addresses</replaceable>,
+ const TQString&amp; <replaceable>subject</replaceable>,
+ const TQString&amp; <replaceable>message</replaceable>,
+ const TQString&amp; <replaceable>attachments</replaceable>,
+ const TQString&amp; <replaceable>dateTime</replaceable>,
int <replaceable>lateCancel</replaceable>,
int <replaceable>flags</replaceable>,
- const QString&amp; <replaceable>recurrence</replaceable>,
+ const TQString&amp; <replaceable>recurrence</replaceable>,
int <replaceable>subRepeatInterval</replaceable>,
int <replaceable>subRepeatCount</replaceable>)
</synopsis>
<synopsis>
-bool scheduleEmail(const QString&amp; <replaceable>fromID</replaceable>,
- const QString&amp; <replaceable>addresses</replaceable>,
- const QString&amp; <replaceable>subject</replaceable>,
- const QString&amp; <replaceable>message</replaceable>,
- const QString&amp; <replaceable>attachments</replaceable>,
- const QString&amp; <replaceable>dateTime</replaceable>,
+bool scheduleEmail(const TQString&amp; <replaceable>fromID</replaceable>,
+ const TQString&amp; <replaceable>addresses</replaceable>,
+ const TQString&amp; <replaceable>subject</replaceable>,
+ const TQString&amp; <replaceable>message</replaceable>,
+ const TQString&amp; <replaceable>attachments</replaceable>,
+ const TQString&amp; <replaceable>dateTime</replaceable>,
int <replaceable>lateCancel</replaceable>,
int <replaceable>flags</replaceable>,
int <replaceable>recurType</replaceable>,
@@ -3538,17 +3538,17 @@ bool scheduleEmail(const QString&amp; <replaceable>fromID</replaceable>,
int <replaceable>recurCount</replaceable>)
</synopsis>
<synopsis>
-bool scheduleEmail(const QString&amp; <replaceable>fromID</replaceable>,
- const QString&amp; <replaceable>addresses</replaceable>,
- const QString&amp; <replaceable>subject</replaceable>,
- const QString&amp; <replaceable>message</replaceable>,
- const QString&amp; <replaceable>attachments</replaceable>,
- const QString&amp; <replaceable>dateTime</replaceable>,
+bool scheduleEmail(const TQString&amp; <replaceable>fromID</replaceable>,
+ const TQString&amp; <replaceable>addresses</replaceable>,
+ const TQString&amp; <replaceable>subject</replaceable>,
+ const TQString&amp; <replaceable>message</replaceable>,
+ const TQString&amp; <replaceable>attachments</replaceable>,
+ const TQString&amp; <replaceable>dateTime</replaceable>,
int <replaceable>lateCancel</replaceable>,
nt <replaceable>flags</replaceable>,
int <replaceable>recurType</replaceable>,
int <replaceable>recurInterval</replaceable>,
- const QString&amp; <replaceable>endTime</replaceable>)
+ const TQString&amp; <replaceable>endTime</replaceable>)
</synopsis>
<refsect2>
@@ -3599,12 +3599,12 @@ email attachments.</para>
<para>Specifies the scheduled date, or date and time, at which the
email should be sent. For a date-only alarm, the string should
be in the format <quote>YYYY-MM-DD</quote> (as returned by
-<methodname>QDate::toString(Qt::ISODate)</methodname>). For an alarm
+<methodname>QDate::toString(TQt::ISODate)</methodname>). For an alarm
with a date and time, the string should be in the format
<quote>YYYY-MM-DDTHH:MM[:SS]</quote> (as returned by
-<methodname>QDateTime::toString(Qt::ISODate)</methodname>) or
+<methodname>QDateTime::toString(TQt::ISODate)</methodname>) or
<quote>HH:MM[:SS]</quote> (as returned by
-<methodname>QTime::toString(Qt::ISODate)</methodname>). If no date is
+<methodname>QTime::toString(TQt::ISODate)</methodname>). If no date is
specified, today's date is used. Note that any seconds value is
ignored.</para>
</listitem>
@@ -3728,7 +3728,7 @@ dialog</link> to edit an alarm.</refpurpose>
</refnamediv>
<refsynopsisdiv>
<synopsis>
-bool edit(const QString&amp; <replaceable>eventID</replaceable>)
+bool edit(const TQString&amp; <replaceable>eventID</replaceable>)
</synopsis>
<refsect2>
@@ -3772,7 +3772,7 @@ dialog</link> to edit a new alarm.</refpurpose>
</refnamediv>
<refsynopsisdiv>
<synopsis>
-bool editNew(const QString&amp; <replaceable>templateName</replaceable>)
+bool editNew(const TQString&amp; <replaceable>templateName</replaceable>)
</synopsis>
<refsect2>
diff --git a/doc/karm/index.docbook b/doc/karm/index.docbook
index 08de3cc4..e8d6495e 100644
--- a/doc/karm/index.docbook
+++ b/doc/karm/index.docbook
@@ -1117,7 +1117,7 @@ times were reset.</para></glossdef> </glossentry>
</refnamediv>
<refsynopsisdiv>
<synopsis>
-QString version()
+TQString version()
</synopsis>
</refsynopsisdiv>
<refsect1>
@@ -1138,7 +1138,7 @@ in the typical GNU format of major.minor.bugfix.</para>
</refnamediv>
<refsynopsisdiv>
<synopsis>
-QString quit()
+TQString quit()
</synopsis>
</refsynopsisdiv>
<refsect1>
@@ -1159,7 +1159,7 @@ external program can gracefully shutdown &karm;.
</refnamediv>
<refsynopsisdiv>
<synopsis>
-QString hastodo(QString taskname)
+TQString hastodo(TQString taskname)
</synopsis>
<refsect2>
<title>Parameters</title>
@@ -1175,7 +1175,7 @@ QString hastodo(QString taskname)
</refsynopsisdiv>
<refsect1>
<title>Description</title>
-<para><function>hastodo(QString taskname)</function> is a &DCOP; call that
+<para><function>hastodo(TQString taskname)</function> is a &DCOP; call that
looks for a of the given name. If found, it returns the
iCalendar UID that identifies that todo. If not found, it returns an empty
string.
@@ -1196,7 +1196,7 @@ than one todo has a matching name, the first one found is returned.</para>
</refnamediv>
<refsynopsisdiv>
<synopsis>
-QString addtodo(QString todoname)
+TQString addtodo(TQString todoname)
</synopsis>
<refsect2>
<title>Parameters</title>
@@ -1213,7 +1213,7 @@ QString addtodo(QString todoname)
<refsect1>
<title>Description</title>
-<para><function>addtodo(QString todoname)</function> is a &DCOP; call that
+<para><function>addtodo(TQString todoname)</function> is a &DCOP; call that
adds a new top-level todo to the current storage. The UID of the new todo
is returned.
</para>
diff --git a/doc/kontact/index.docbook b/doc/kontact/index.docbook
index 7829e674..44715899 100644
--- a/doc/kontact/index.docbook
+++ b/doc/kontact/index.docbook
@@ -7,7 +7,6 @@
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE">
<!ENTITY akregator "<application>Akregator</application>">
- <!ENTITY kitchensync "<application>KitchenSync</application>">
]>
<book id="kontact" lang="&language;">
@@ -146,14 +145,6 @@ application.
</para>
</sect1>
-<sect1 id="synchronization">
-<title>&kitchensync;</title>
-<para>
-<ulink url="help:kitchensync">&kitchensync;</ulink>, the &kde; synchronization
-application.
-</para>
-</sect1>
-
<sect1 id="feeds">
<title>&akregator;</title>
<para>
diff --git a/indexlib/boost-compat/config/compiler/gcc.h b/indexlib/boost-compat/config/compiler/gcc.h
index 2c5ad198..4be7f408 100644
--- a/indexlib/boost-compat/config/compiler/gcc.h
+++ b/indexlib/boost-compat/config/compiler/gcc.h
@@ -13,10 +13,6 @@
// GNU C++ compiler setup:
-# if __GNUC__ == 2 && __GNUC_MINOR__ == 91
- // egcs 1.1 won't parse shared_ptr.h without this:
-# define BOOST_NO_AUTO_PTR
-# endif
# if __GNUC__ == 2 && __GNUC_MINOR__ < 95
//
// Prior to gcc 2.95 member templates only partly
diff --git a/indexlib/boost-compat/config/stdlib/roguewave.h b/indexlib/boost-compat/config/stdlib/roguewave.h
index ec3d881b..452b8421 100644
--- a/indexlib/boost-compat/config/stdlib/roguewave.h
+++ b/indexlib/boost-compat/config/stdlib/roguewave.h
@@ -73,7 +73,6 @@
// new-style iostreams, and no conformant std::allocator:
//
#if (BOOST_RWSTD_VER < 0x020000)
-# define BOOST_NO_AUTO_PTR
# define BOOST_NO_STRINGSTREAM
# define BOOST_NO_STD_ALLOCATOR
# define BOOST_NO_STD_LOCALE
diff --git a/indexlib/boost-compat/scoped_ptr.h b/indexlib/boost-compat/scoped_ptr.h
index 60078bf1..41d4f9b8 100644
--- a/indexlib/boost-compat/scoped_ptr.h
+++ b/indexlib/boost-compat/scoped_ptr.h
@@ -15,7 +15,7 @@
#include "checked_delete.h"
-#include <memory> // for std::auto_ptr
+#include <memory>
#include <assert.h>
namespace boost
@@ -25,7 +25,7 @@ namespace boost
// scoped_ptr mimics a built-in pointer except that it guarantees deletion
// of the object pointed to, either on destruction of the scoped_ptr or via
// an explicit reset(). scoped_ptr is a simple solution for simple needs;
-// use shared_ptr or std::auto_ptr if your needs are more complex.
+// use shared_ptr or std::unique_ptr if your needs are more complex.
template<class T> class scoped_ptr // noncopyable
{
@@ -46,11 +46,6 @@ public:
{
}
-
- explicit scoped_ptr(std::auto_ptr<T> p): ptr(p.release()) // never throws
- {
- }
-
~scoped_ptr() // never throws
{
boost::checked_delete(ptr);
diff --git a/indexlib/boost-compat/shared_ptr.h b/indexlib/boost-compat/shared_ptr.h
index c236e3bd..a242c829 100644
--- a/indexlib/boost-compat/shared_ptr.h
+++ b/indexlib/boost-compat/shared_ptr.h
@@ -26,11 +26,11 @@
#include <boost/detail/shared_count.hpp>
#include <boost/detail/workaround.hpp>
-#include <memory> // for std::auto_ptr
-#include <algorithm> // for std::swap
-#include <functional> // for std::less
-#include <typeinfo> // for std::bad_cast
-#include <iosfwd> // for std::basic_ostream
+#include <memory>
+#include <algorithm>
+#include <functional>
+#include <typeinfo>
+#include <iosfwd>
#ifdef BOOST_MSVC // moved here to work around VC++ compiler crash
# pragma warning(push)
@@ -191,18 +191,6 @@ public:
}
}
-#ifndef BOOST_NO_AUTO_PTR
-
- template<class Y>
- explicit shared_ptr(std::auto_ptr<Y> & r): px(r.get()), pn()
- {
- Y * tmp = r.get();
- pn = detail::shared_count(r);
- detail::sp_enable_shared_from_this( pn, tmp, tmp );
- }
-
-#endif
-
#if !defined(BOOST_MSVC) || (BOOST_MSVC > 1200)
template<class Y>
@@ -215,17 +203,6 @@ public:
#endif
-#ifndef BOOST_NO_AUTO_PTR
-
- template<class Y>
- shared_ptr & operator=(std::auto_ptr<Y> & r)
- {
- this_type(r).swap(*this);
- return *this;
- }
-
-#endif
-
void reset() // never throws in 1.30+
{
this_type().swap(*this);
diff --git a/indexlib/compressed.cpp b/indexlib/compressed.cpp
index a60c3f06..9c73c304 100644
--- a/indexlib/compressed.cpp
+++ b/indexlib/compressed.cpp
@@ -53,7 +53,7 @@ memory_manager* get_comp_p() {
compressed_file::compressed_file( std::string base ):
auxdata_( path_concat( base, "table" ) ),
- data_( std::auto_ptr<memory_manager>( new mmap_manager( path_concat( base, "data" ) ) ) )
+ data_( std::unique_ptr<memory_manager>( new mmap_manager( path_concat( base, "data" ) ) ) )
{
if ( auxdata_.empty() ) auxdata_.push_back( 0 );
}
diff --git a/indexlib/create.cpp b/indexlib/create.cpp
index e47d116a..c64e2158 100644
--- a/indexlib/create.cpp
+++ b/indexlib/create.cpp
@@ -56,41 +56,41 @@ indexlib::index_type::type type_of( const char* basename ) {
}
}
-std::auto_ptr<indexlib::index> indexlib::create( const char* basename, indexlib::index_type::type flags ) {
+std::unique_ptr<indexlib::index> indexlib::create( const char* basename, indexlib::index_type::type flags ) {
using namespace indexlib::version;
- if ( type_of( basename ) != indexlib::index_type::none ) return std::auto_ptr<indexlib::index>( 0 );
+ if ( type_of( basename ) != indexlib::index_type::none ) return std::unique_ptr<indexlib::index>();
try {
if ( basename[ strlen( basename ) - 1 ] == '/' && !isdir( basename ) ) {
- if ( !indexlib::detail::mkdir_trailing( basename ) ) return std::auto_ptr<indexlib::index>( 0 );
+ if ( !indexlib::detail::mkdir_trailing( basename ) ) return std::unique_ptr<indexlib::index>();
}
std::ofstream info( path_concat( basename, "info" ).c_str() );
info << marker << std::endl;
info << "version " << major << '.' << minor << "\n";
if ( flags == index_type::quotes ) {
info << "quotes" << std::endl;
- return std::auto_ptr<indexlib::index>( new quotes( basename ) );
+ return std::unique_ptr<indexlib::index>( new quotes( basename ) );
}
if ( flags == index_type::ifile ) {
info << "ifile" << std::endl;
- return std::auto_ptr<indexlib::index>( new ifile( basename ) );
+ return std::unique_ptr<indexlib::index>( new ifile( basename ) );
}
} catch ( const std::exception& e ) {
std::cerr << "index creation failed: " << e.what() << std::endl;
}
- return std::auto_ptr<indexlib::index>( 0 );
+ return std::unique_ptr<indexlib::index>();
}
-std::auto_ptr<indexlib::index> indexlib::open( const char* basename, unsigned flags ) {
+std::unique_ptr<indexlib::index> indexlib::open( const char* basename, unsigned flags ) {
using namespace indexlib;
switch ( type_of( basename ) ) {
- case index_type::ifile: return std::auto_ptr<indexlib::index>( new ifile( basename ) );
- case index_type::quotes: return std::auto_ptr<indexlib::index>( new quotes( basename ) );
+ case index_type::ifile: return std::unique_ptr<indexlib::index>( new ifile( basename ) );
+ case index_type::quotes: return std::unique_ptr<indexlib::index>( new quotes( basename ) );
case index_type::none:
- if ( flags == open_flags::fail_if_nonexistant ) return std::auto_ptr<indexlib::index>();
+ if ( flags == open_flags::fail_if_nonexistant ) return std::unique_ptr<indexlib::index>();
return create( basename, index_type::type( flags ) );
}
logfile() << format( "%s:%s: Unexpected code reached!\n" ) % __FILE__ % __LINE__;
- return std::auto_ptr<indexlib::index>( 0 );
+ return std::unique_ptr<indexlib::index>();
}
bool indexlib::exists( const char* basename ) {
diff --git a/indexlib/create.h b/indexlib/create.h
index e865728e..18e9929b 100644
--- a/indexlib/create.h
+++ b/indexlib/create.h
@@ -57,14 +57,14 @@ namespace indexlib {
* This will return something like "new quotes(basename)" but by using this, you do not need to include quotes.h
* which needs boost headers also.
*/
- std::auto_ptr<index> create( const char* basename, index_type::type flags = index_type::quotes );
+ std::unique_ptr<index> create( const char* basename, index_type::type flags = index_type::quotes );
namespace open_flags {
enum type { none = 0,
create_ifile = index_type::ifile,
create_quotes = index_type::quotes,
fail_if_nonexistant };
}
- std::auto_ptr<index> open( const char* basename, unsigned flags = open_flags::fail_if_nonexistant );
+ std::unique_ptr<index> open( const char* basename, unsigned flags = open_flags::fail_if_nonexistant );
/**
* Removes the index.
diff --git a/indexlib/ifile.cpp b/indexlib/ifile.cpp
index 5709bb41..8ef5d2c6 100644
--- a/indexlib/ifile.cpp
+++ b/indexlib/ifile.cpp
@@ -83,10 +83,10 @@ void ifile::remove_doc( const char* doc ) {
// TODO: remove from words_ too if that's the case
}
-std::auto_ptr<indexlib::result> ifile::everything() const {
+std::unique_ptr<indexlib::result> ifile::everything() const {
std::vector<unsigned> res( ndocs() );
for ( unsigned i = 0; i != ndocs(); ++i ) res[ i ] = i;
- return std::auto_ptr<indexlib::result>( new indexlib::detail::simple_result( res ) );
+ return std::unique_ptr<indexlib::result>( new indexlib::detail::simple_result( res ) );
}
namespace {
@@ -94,13 +94,13 @@ inline
bool word_too_small( std::string str ) { return str.size() < 3; }
}
-std::auto_ptr<indexlib::result> ifile::search( const char* str ) const {
+std::unique_ptr<indexlib::result> ifile::search( const char* str ) const {
using namespace indexlib::detail;
using indexlib::result;
assert( str );
if ( !*str ) return everything();
std::vector<std::string> words = break_clean( str );
- if ( words.empty() ) return std::auto_ptr<result>( new empty_result );
+ if ( words.empty() ) return std::unique_ptr<result>( new empty_result );
words.erase( std::remove_if( words.begin(), words.end(), &word_too_small ), words.end() );
if ( words.empty() ) return everything();
std::set<unsigned> values = find_word( words[ 0 ] );
@@ -113,7 +113,7 @@ std::auto_ptr<indexlib::result> ifile::search( const char* str ) const {
std::set_intersection( now.begin(), now.end(), values.begin(), values.end(), std::inserter( next, next.begin() ) );
next.swap( values );
}
- std::auto_ptr<result> r(new simple_result( std::vector<unsigned>( values.begin(), values.end() ) ) );
+ std::unique_ptr<result> r(new simple_result( std::vector<unsigned>( values.begin(), values.end() ) ) );
return r;
}
diff --git a/indexlib/ifile.h b/indexlib/ifile.h
index 4cfcf585..3fcf772e 100644
--- a/indexlib/ifile.h
+++ b/indexlib/ifile.h
@@ -43,8 +43,10 @@
struct ifile : public indexlib::index {
public:
ifile( std::string );
+ ifile(ifile const &) = delete;
+ ifile& operator=(ifile const &) = delete;
virtual void add( const char* str, const char* doc );
- virtual std::auto_ptr<indexlib::result> search( const char* ) const;
+ virtual std::unique_ptr<indexlib::result> search( const char* ) const;
virtual unsigned ndocs() const { return docnames_.size(); }
virtual std::string lookup_docname( unsigned idx ) const { return docnames_.get( idx ); }
@@ -56,7 +58,7 @@ struct ifile : public indexlib::index {
private:
std::set<unsigned> find_word( std::string ) const;
std::vector<std::string> break_clean( const char* ) const;
- virtual std::auto_ptr<indexlib::result> everything() const;
+ virtual std::unique_ptr<indexlib::result> everything() const;
static bool invalid_word( std::string );
bool is_stop_word( std::string ) const;
@@ -67,7 +69,7 @@ struct ifile : public indexlib::index {
stringset words_;
stringset stopwords_;
leafdatavector files_;
- std::auto_ptr<indexlib::detail::tokenizer> tokenizer_;
+ std::unique_ptr<indexlib::detail::tokenizer> tokenizer_;
};
#endif /* _IFILE_INCLUDE_GUARD_LPC_56465465798732 */
diff --git a/indexlib/index.h b/indexlib/index.h
index b7c68375..5ffab2d4 100644
--- a/indexlib/index.h
+++ b/indexlib/index.h
@@ -61,7 +61,7 @@ struct result {
* @return null if the type does not support this or the particular search string makes it impossible to
* fulfill the search request.
*/
- virtual std::auto_ptr<result> search( const char* ) = 0;
+ virtual std::unique_ptr<result> search( const char* ) = 0;
};
struct index {
@@ -96,7 +96,7 @@ struct index {
/**
* Returns all documents matching \param pattern.
*/
- virtual std::auto_ptr<result> search( const char* pattern ) const = 0;
+ virtual std::unique_ptr<result> search( const char* pattern ) const = 0;
/**
* Returns the number of docs indexed.
diff --git a/indexlib/leafdatavector.cpp b/indexlib/leafdatavector.cpp
index 0dae6555..89b95ab9 100644
--- a/indexlib/leafdatavector.cpp
+++ b/indexlib/leafdatavector.cpp
@@ -45,7 +45,7 @@ typedef mmap_manager leafdatavector_manager;
#endif
leafdatavector::leafdatavector( std::string name ):
- leafs_( std::auto_ptr<memory_manager>( new leafdatavector_manager( path_concat( name, "leafs" ) ) ) ),
+ leafs_( std::unique_ptr<memory_manager>( new leafdatavector_manager( path_concat( name, "leafs" ) ) ) ),
table_( path_concat( name, "table" ) )
{
}
diff --git a/indexlib/main.cpp b/indexlib/main.cpp
index b8685153..dcedbe1c 100644
--- a/indexlib/main.cpp
+++ b/indexlib/main.cpp
@@ -46,7 +46,7 @@
#include <memory>
#include <string.h>
-typedef std::auto_ptr<indexlib::index> index_smart;
+typedef std::unique_ptr<indexlib::index> index_smart;
index_smart get_index( std::string name ) {
return indexlib::open( name.c_str(), indexlib::open_flags::create_quotes );
@@ -92,8 +92,8 @@ int debug( int argc, char* argv[] ) {
std::cout << "compressed_file:\n";
file.print( std::cout );
} else if ( type == "break_up" ) {
- std::auto_ptr<tokenizer> tok = get_tokenizer( "latin-1:european" );
- if ( !tok.get() ) {
+ std::unique_ptr<tokenizer> tok = get_tokenizer( "latin-1:european" );
+ if ( !tok ) {
std::cerr << "Could not get tokenizer\n";
return 1;
}
diff --git a/indexlib/mempool.h b/indexlib/mempool.h
index acf62494..08be8857 100644
--- a/indexlib/mempool.h
+++ b/indexlib/mempool.h
@@ -55,7 +55,9 @@ struct mempool /* : boost::noncopyable */ {
typedef Traits traits_type;
typedef typename traits_type::value_type data_type;
typedef typename traits_type::pointer data_typeptr;
- explicit mempool( std::auto_ptr<memory_manager> source );
+ explicit mempool( std::unique_ptr<memory_manager> &&source );
+ mempool(mempool const &) = delete;
+ mempool& operator=(mempool const &) = delete;
/**
* Returns a memory block of size \param s.
@@ -151,7 +153,7 @@ struct mempool /* : boost::noncopyable */ {
bool join( data_typeptr&, unsigned order );
void deallocate( data_typeptr, unsigned order );
- std::auto_ptr<memory_manager> manager_;
+ std::unique_ptr<memory_manager> manager_;
memory_reference<uint32_t> max_order_;
};
diff --git a/indexlib/mempool.tcc b/indexlib/mempool.tcc
index a130bffe..750209a2 100644
--- a/indexlib/mempool.tcc
+++ b/indexlib/mempool.tcc
@@ -33,8 +33,8 @@
*/
template <typename Traits>
-mempool<Traits>::mempool( std::auto_ptr<memory_manager> source ):
- manager_( source ),
+mempool<Traits>::mempool( std::unique_ptr<memory_manager> &&source ):
+ manager_( std::move(source) ),
max_order_( 0 )
{
if ( !manager_->size() ) init_memory();
diff --git a/indexlib/quotes.cpp b/indexlib/quotes.cpp
index e4c35db4..abf8915c 100644
--- a/indexlib/quotes.cpp
+++ b/indexlib/quotes.cpp
@@ -68,12 +68,12 @@ void quotes::remove_doc( const char* doc ) {
impl_.remove_doc( doc );
}
-std::auto_ptr<indexlib::result> quotes::search( const char* cstr ) const {
+std::unique_ptr<indexlib::result> quotes::search( const char* cstr ) const {
std::string str = cstr;
if ( str[ 0 ] != '\"' ) return impl_.search( cstr );
str = cstr + 1; // cut "
if ( str.size() && str[ str.size() - 1 ] == '\"' ) str.erase( str.size() - 1 );
- std::auto_ptr<indexlib::result> prev = impl_.search( str.c_str() );
+ std::unique_ptr<indexlib::result> prev = impl_.search( str.c_str() );
if ( str.find( ' ' ) != std::string::npos ) {
indexlib::Match m( str );
std::vector<unsigned> candidates = prev->list();
@@ -86,7 +86,7 @@ std::auto_ptr<indexlib::result> quotes::search( const char* cstr ) const {
res.push_back( *first );
}
}
- return std::auto_ptr<indexlib::result>( new indexlib::detail::simple_result( res ) );
+ return std::unique_ptr<indexlib::result>( new indexlib::detail::simple_result( res ) );
} else { return prev; }
}
diff --git a/indexlib/quotes.h b/indexlib/quotes.h
index 7852d0dd..6604e9a9 100644
--- a/indexlib/quotes.h
+++ b/indexlib/quotes.h
@@ -42,7 +42,7 @@ struct quotes : public indexlib::index {
quotes( std::string );
virtual void add( const char* str, const char* doc );
virtual void remove_doc( const char* doc );
- virtual std::auto_ptr<indexlib::result> search( const char* ) const;
+ virtual std::unique_ptr<indexlib::result> search( const char* ) const;
virtual unsigned ndocs() const { return impl_.ndocs(); }
virtual std::string lookup_docname( unsigned d ) const { return impl_.lookup_docname( d ); }
diff --git a/indexlib/result.h b/indexlib/result.h
index 4cad40d7..dd23f25d 100644
--- a/indexlib/result.h
+++ b/indexlib/result.h
@@ -42,7 +42,7 @@ struct simple_result : indexlib::result {
simple_result( std::vector<unsigned> r ):res( r ) { }
std::vector<unsigned> list() const { return res; }
- std::auto_ptr<result> search( const char* ) { return std::auto_ptr<result>( 0 ); }
+ std::unique_ptr<result> search( const char* ) { return std::unique_ptr<result>(); }
private:
std::vector<unsigned> res;
};
@@ -50,7 +50,7 @@ struct simple_result : indexlib::result {
struct empty_result : indexlib::result {
public:
std::vector<unsigned> list() const { return std::vector<unsigned>(); }
- std::auto_ptr<result> search( const char* ) { return std::auto_ptr<result>(); }
+ std::unique_ptr<result> search( const char* ) { return std::unique_ptr<result>(); }
};
} //namespace detail
} //namespace indexlib
diff --git a/indexlib/tests/create-test.cpp b/indexlib/tests/create-test.cpp
index beeb7d5f..da3c91ca 100644
--- a/indexlib/tests/create-test.cpp
+++ b/indexlib/tests/create-test.cpp
@@ -14,8 +14,8 @@ void cleanup() {
void simple() {
cleanup();
- std::auto_ptr<indexlib::index> ptr = indexlib::create( fname );
- BOOST_CHECK( ptr.get() );
+ std::unique_ptr<indexlib::index> ptr = indexlib::create( fname );
+ BOOST_CHECK( ptr );
}
test_suite* get_suite() {
diff --git a/indexlib/tests/mempool-test.cpp b/indexlib/tests/mempool-test.cpp
index a0895243..1c9a4eb6 100644
--- a/indexlib/tests/mempool-test.cpp
+++ b/indexlib/tests/mempool-test.cpp
@@ -11,7 +11,7 @@ void cleanup() {
void deallocate() {
cleanup();
- mempool<leaf_data_pool_traits> pool( std::auto_ptr<memory_manager>( new mmap_manager( fname ) ) );
+ mempool<leaf_data_pool_traits> pool( std::unique_ptr<memory_manager>( new mmap_manager( fname ) ) );
std::vector<leafdataptr> pointers;
for ( int i = 0; i != 32; ++i ) {
@@ -33,7 +33,7 @@ void deallocate() {
void large() {
cleanup();
- mempool<leaf_data_pool_traits> pool( std::auto_ptr<memory_manager>( new mmap_manager( fname ) ) );
+ mempool<leaf_data_pool_traits> pool( std::unique_ptr<memory_manager>( new mmap_manager( fname ) ) );
pool.allocate( 4095 );
pool.allocate( 4097 );
diff --git a/indexlib/tests/tokenizer-test.cpp b/indexlib/tests/tokenizer-test.cpp
index 372859d9..1354ddcd 100644
--- a/indexlib/tests/tokenizer-test.cpp
+++ b/indexlib/tests/tokenizer-test.cpp
@@ -9,8 +9,8 @@ using indexlib::detail::tokenizer;
using indexlib::detail::get_tokenizer;
void simple() {
- std::auto_ptr<tokenizer> tokenizer = get_tokenizer( "latin-1:european" );
- assert(tokenizer.get());
+ std::unique_ptr<tokenizer> tokenizer = get_tokenizer( "latin-1:european" );
+ assert(tokenizer);
std::vector<std::string> tokens = tokenizer->string_to_words( "one ,as, ''#`:ThReE, " );
std::vector<std::string> expected;
expected.push_back( "ONE" );
@@ -26,8 +26,8 @@ void simple() {
}
void with_newlines() {
- std::auto_ptr<tokenizer> tokenizer = get_tokenizer( "latin-1:european" );
- assert(tokenizer.get());
+ std::unique_ptr<tokenizer> tokenizer = get_tokenizer( "latin-1:european" );
+ assert(tokenizer);
std::vector<std::string> tokens = tokenizer->string_to_words( "one\ntwo\nthree" );
std::vector<std::string> expected;
expected.push_back( "ONE" );
@@ -42,8 +42,8 @@ void with_newlines() {
}
void with_numbers() {
- std::auto_ptr<tokenizer> tokenizer = get_tokenizer( "latin-1:european" );
- assert(tokenizer.get());
+ std::unique_ptr<tokenizer> tokenizer = get_tokenizer( "latin-1:european" );
+ assert(tokenizer);
std::vector<std::string> tokens = tokenizer->string_to_words( "one 012 123 four" );
std::vector<std::string> expected;
expected.push_back( "ONE" );
diff --git a/indexlib/tokenizer.cpp b/indexlib/tokenizer.cpp
index b069c748..1c1243a7 100644
--- a/indexlib/tokenizer.cpp
+++ b/indexlib/tokenizer.cpp
@@ -294,7 +294,7 @@ class latin1_tokenizer : public indexlib::detail::tokenizer {
}
-std::auto_ptr<indexlib::detail::tokenizer> indexlib::detail::get_tokenizer( std::string name ) {
- if ( name == "latin-1:european" ) return std::auto_ptr<indexlib::detail::tokenizer>( new latin1_tokenizer );
- return std::auto_ptr<indexlib::detail::tokenizer>( 0 );
+std::unique_ptr<indexlib::detail::tokenizer> indexlib::detail::get_tokenizer( std::string name ) {
+ if ( name == "latin-1:european" ) return std::unique_ptr<indexlib::detail::tokenizer>( new latin1_tokenizer );
+ return std::unique_ptr<indexlib::detail::tokenizer>();
}
diff --git a/indexlib/tokenizer.h b/indexlib/tokenizer.h
index 2494f297..9916df66 100644
--- a/indexlib/tokenizer.h
+++ b/indexlib/tokenizer.h
@@ -20,7 +20,7 @@ class tokenizer {
virtual std::vector<std::string> do_string_to_words( const char* ) = 0;
};
-std::auto_ptr<tokenizer> get_tokenizer( std::string );
+std::unique_ptr<tokenizer> get_tokenizer( std::string );
}}
diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp
index 83f27874..97b01d08 100644
--- a/kaddressbook/addresseditwidget.cpp
+++ b/kaddressbook/addresseditwidget.cpp
@@ -86,8 +86,8 @@ AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name )
layout->setSpacing( KDialog::spacingHint() );
mTypeCombo = new AddressTypeCombo( mAddressList, this );
- connect( mTypeCombo, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( updateAddressEdit() ) );
+ connect( mTypeCombo, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( updateAddressEdit() ) );
layout->addWidget( mTypeCombo );
mAddressField = new KActiveLabel( this );
@@ -98,7 +98,7 @@ AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name )
layout->addWidget( mAddressField );
mEditButton = new TQPushButton( i18n( "street/postal", "&Edit Addresses..." ), this );
- connect( mEditButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( edit() ) );
+ connect( mEditButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( edit() ) );
layout->addWidget( mEditButton );
}
@@ -281,7 +281,7 @@ AddressEditDialog::AddressEditDialog( const TDEABC::Address::List &list,
label->setBuddy( mStreetTextEdit );
topLayout->addWidget( mStreetTextEdit, 1, 1 );
- TabPressEater *eater = new TabPressEater( TQT_TQOBJECT(this) );
+ TabPressEater *eater = new TabPressEater( this );
mStreetTextEdit->installEventFilter( eater );
label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).arg( TDEABC::Address::postOfficeBoxLabel() ), page );
@@ -317,7 +317,7 @@ AddressEditDialog::AddressEditDialog( const TDEABC::Address::List &list,
#if KDE_IS_VERSION(3,3,0)
TQPushButton *labelButton = new TQPushButton( i18n( "Edit Label..." ), page );
topLayout->addMultiCellWidget( labelButton, 7, 7, 0, 1 );
- connect( labelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editLabel() ) );
+ connect( labelButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editLabel() ) );
#endif
fillCountryCombo();
@@ -335,28 +335,28 @@ AddressEditDialog::AddressEditDialog( const TDEABC::Address::List &list,
topLayout->addMultiCellWidget( buttonBox, 10, 10, 0, 1 );
TQPushButton *addButton = new TQPushButton( i18n( "New..." ), buttonBox );
- connect( addButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addAddress() ) );
+ connect( addButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addAddress() ) );
mRemoveButton = new TQPushButton( i18n( "Remove" ), buttonBox );
- connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeAddress() ) );
+ connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeAddress() ) );
mChangeTypeButton = new TQPushButton( i18n( "Change Type..." ), buttonBox );
- connect( mChangeTypeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( changeType() ) );
+ connect( mChangeTypeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( changeType() ) );
mTypeCombo->updateTypes();
mTypeCombo->setCurrentItem( selected );
updateAddressEdits();
- connect( mTypeCombo, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( updateAddressEdits() ) );
- connect( mStreetTextEdit, TQT_SIGNAL( textChanged() ), TQT_SLOT( modified() ) );
- connect( mPOBoxEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) );
- connect( mLocalityEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) );
- connect( mRegionEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) );
- connect( mPostalCodeEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) );
- connect( mCountryCombo, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) );
- connect( mPreferredCheckBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );
+ connect( mTypeCombo, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( updateAddressEdits() ) );
+ connect( mStreetTextEdit, TQ_SIGNAL( textChanged() ), TQ_SLOT( modified() ) );
+ connect( mPOBoxEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) );
+ connect( mLocalityEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) );
+ connect( mRegionEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) );
+ connect( mPostalCodeEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) );
+ connect( mCountryCombo, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) );
+ connect( mPreferredCheckBox, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) );
TDEAcceleratorManager::manage( this );
@@ -606,7 +606,7 @@ AddressTypeDialog::AddressTypeDialog( int type, TQWidget *parent )
TQWidget *page = plainPage();
TQVBoxLayout *layout = new TQVBoxLayout( page );
- mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "street/postal", "Address Types" ), page );
+ mGroup = new TQButtonGroup( 2, TQt::Horizontal, i18n( "street/postal", "Address Types" ), page );
layout->addWidget( mGroup );
mTypeList = TDEABC::Address::typeList();
diff --git a/kaddressbook/addresseditwidget.h b/kaddressbook/addresseditwidget.h
index e52e5960..b90228e5 100644
--- a/kaddressbook/addresseditwidget.h
+++ b/kaddressbook/addresseditwidget.h
@@ -51,7 +51,7 @@ typedef TypeCombo<TDEABC::Address> AddressTypeCombo;
*/
class AddressEditWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -92,7 +92,7 @@ class AddressEditWidget : public TQWidget
*/
class AddressEditDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/addresseeeditorbase.h b/kaddressbook/addresseeeditorbase.h
index 036e47e3..7295ae2c 100644
--- a/kaddressbook/addresseeeditorbase.h
+++ b/kaddressbook/addresseeeditorbase.h
@@ -30,7 +30,7 @@
class AddresseeEditorBase : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp
index 77d7bcbe..202dd9f1 100644
--- a/kaddressbook/addresseeeditordialog.cpp
+++ b/kaddressbook/addresseeeditordialog.cpp
@@ -55,7 +55,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core,
} else {
mEditorWidget = new AddresseeEditorWidget( page );
}
- connect( mEditorWidget, TQT_SIGNAL( modified() ), TQT_SLOT( widgetModified() ) );
+ connect( mEditorWidget, TQ_SIGNAL( modified() ), TQ_SLOT( widgetModified() ) );
layout->addWidget( mEditorWidget );
enableButton( KDialogBase::Apply, false );
diff --git a/kaddressbook/addresseeeditordialog.h b/kaddressbook/addresseeeditordialog.h
index bfdb3ca9..b9a9d349 100644
--- a/kaddressbook/addresseeeditordialog.h
+++ b/kaddressbook/addresseeeditordialog.h
@@ -34,7 +34,7 @@ namespace KAB { class Core; }
class AddresseeEditorDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/addresseeeditorextension.cpp b/kaddressbook/addresseeeditorextension.cpp
index 5ff8a3f1..d271399d 100644
--- a/kaddressbook/addresseeeditorextension.cpp
+++ b/kaddressbook/addresseeeditorextension.cpp
@@ -58,7 +58,7 @@ void AddresseeEditorExtension::contactsSelectionChanged()
mAddresseeEditor->save();
addressees.append( mAddresseeEditor->addressee() );
modifiedAddress = addressees;
- TQTimer::singleShot(0, this, TQT_SLOT(emitModifiedAddresses()));
+ TQTimer::singleShot(0, this, TQ_SLOT(emitModifiedAddresses()));
}
mAddresseeEditor->setAddressee( selectedAddressees[ 0 ] );
diff --git a/kaddressbook/addresseeeditorextension.h b/kaddressbook/addresseeeditorextension.h
index 949fe0b6..5099cfbc 100644
--- a/kaddressbook/addresseeeditorextension.h
+++ b/kaddressbook/addresseeeditorextension.h
@@ -29,7 +29,7 @@
class AddresseeEditorExtension : public KAB::ExtensionWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index c3e2e6fb..16489cf2 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -135,8 +135,8 @@ void AddresseeEditorWidget::initGUI()
setupAdditionalTabs();
setupCustomFieldsTabs();
- connect( mTabWidget, TQT_SIGNAL( currentChanged(TQWidget*) ),
- TQT_SLOT( pageChanged(TQWidget*) ) );
+ connect( mTabWidget, TQ_SIGNAL( currentChanged(TQWidget*) ),
+ TQ_SLOT( pageChanged(TQWidget*) ) );
}
void AddresseeEditorWidget::setupTab1()
@@ -165,9 +165,9 @@ void AddresseeEditorWidget::setupTab1()
button = new TQPushButton( i18n( "Edit Name..." ), tab1 );
TQToolTip::add( button, i18n( "Edit the contact's name" ) );
mNameEdit = new KLineEdit( tab1, "mNameEdit" );
- connect( mNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( nameTextChanged( const TQString& ) ) );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( nameButtonClicked() ) );
+ connect( mNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( nameTextChanged( const TQString& ) ) );
+ connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( nameButtonClicked() ) );
mNameLabel = new KSqueezedTextLabel( tab1 );
if ( KABPrefs::instance()->automaticNameParsing() ) {
@@ -183,8 +183,8 @@ void AddresseeEditorWidget::setupTab1()
layout->addWidget( mNameLabel, 0, 2 );
label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).arg( TDEABC::Addressee::roleLabel() ), tab1 );
mRoleEdit = new KLineEdit( tab1 );
- connect( mRoleEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( textChanged( const TQString& ) ) );
+ connect( mRoleEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mRoleEdit );
layout->addWidget( label, 1, 1 );
layout->addWidget( mRoleEdit, 1, 2 );
@@ -193,8 +193,8 @@ void AddresseeEditorWidget::setupTab1()
label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).arg( TDEABC::Addressee::organizationLabel() ), tab1 );
mOrgEdit = new KLineEdit( tab1 );
label->setBuddy( mOrgEdit );
- connect( mOrgEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( organizationTextChanged( const TQString& ) ) );
+ connect( mOrgEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( organizationTextChanged( const TQString& ) ) );
layout->addWidget( label, 2, 1 );
layout->addWidget( mOrgEdit, 2, 2 );
@@ -217,7 +217,7 @@ void AddresseeEditorWidget::setupTab1()
layout->addMultiCellWidget( label, 0, 1, 3, 3 );
mPhoneEditWidget = new PhoneEditWidget( tab1 );
- connect( mPhoneEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) );
+ connect( mPhoneEditWidget, TQ_SIGNAL( modified() ), TQ_SLOT( emitModified() ) );
layout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 );
bar = new KSeparator( KSeparator::HLine, tab1 );
@@ -231,7 +231,7 @@ void AddresseeEditorWidget::setupTab1()
layout->addMultiCellWidget( label, 5, 6, 0, 0 );
mAddressEditWidget = new AddressEditWidget( tab1 );
- connect( mAddressEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) );
+ connect( mAddressEditWidget, TQ_SIGNAL( modified() ), TQ_SLOT( emitModified() ) );
layout->addMultiCellWidget( mAddressEditWidget, 5, 10, 1, 2 );
//////////////////////////////////////
@@ -242,7 +242,7 @@ void AddresseeEditorWidget::setupTab1()
layout->addMultiCellWidget( label, 5, 6, 3, 3 );
mEmailWidget = new EmailEditWidget( tab1 );
- connect( mEmailWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) );
+ connect( mEmailWidget, TQ_SIGNAL( modified() ), TQ_SLOT( emitModified() ) );
layout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 );
// add the separator
@@ -258,8 +258,8 @@ void AddresseeEditorWidget::setupTab1()
label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).arg( TDEABC::Addressee::urlLabel() ), tab1 );
mURLEdit = new KLineEdit( tab1 );
- connect( mURLEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( textChanged( const TQString& ) ) );
+ connect( mURLEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mURLEdit );
homePageLayout->addWidget( label );
homePageLayout->addWidget( mURLEdit );
@@ -270,13 +270,13 @@ void AddresseeEditorWidget::setupTab1()
blogLayout->addWidget( label );
mBlogEdit = new KLineEdit( tab1 );
blogLayout->addWidget( mBlogEdit );
- connect( mBlogEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- TQT_SLOT( textChanged( const TQString & ) ) );
+ connect( mBlogEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ TQ_SLOT( textChanged( const TQString & ) ) );
label->setBuddy( mBlogEdit );
layout->addMultiCellLayout( blogLayout, 9, 9, 4, 6 );
mIMWidget = new IMEditWidget( tab1, mAddressee );
- connect( mIMWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) );
+ connect( mIMWidget, TQ_SIGNAL( modified() ), TQ_SLOT( emitModified() ) );
layout->addMultiCellWidget( mIMWidget, 10, 10, 4, 6 );
layout->addColSpacing( 6, 50 );
@@ -290,15 +290,15 @@ void AddresseeEditorWidget::setupTab1()
// Categories
mCategoryButton = new TQPushButton( i18n( "Select Categories..." ), categoryBox );
- connect( mCategoryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectCategories() ) );
+ connect( mCategoryButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectCategories() ) );
mCategoryEdit = new KLineEdit( categoryBox );
mCategoryEdit->setReadOnly( true );
- connect( mCategoryEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( textChanged( const TQString& ) ) );
+ connect( mCategoryEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( textChanged( const TQString& ) ) );
mSecrecyWidget = new SecrecyWidget( categoryBox );
- connect( mSecrecyWidget, TQT_SIGNAL( changed() ), TQT_SLOT( emitModified() ) );
+ connect( mSecrecyWidget, TQ_SIGNAL( changed() ), TQ_SLOT( emitModified() ) );
layout->addMultiCellWidget( categoryBox, 12, 12, 0, 6 );
@@ -332,48 +332,48 @@ void AddresseeEditorWidget::setupTab2()
label = new TQLabel( i18n( "Department:" ), tab2 );
layout->addWidget( label, 0, 1 );
mDepartmentEdit = new KLineEdit( tab2 );
- connect( mDepartmentEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( textChanged( const TQString& ) ) );
+ connect( mDepartmentEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mDepartmentEdit );
layout->addWidget( mDepartmentEdit, 0, 2 );
label = new TQLabel( i18n( "Office:" ), tab2 );
layout->addWidget( label, 1, 1 );
mOfficeEdit = new KLineEdit( tab2 );
- connect( mOfficeEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( textChanged( const TQString& ) ) );
+ connect( mOfficeEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mOfficeEdit );
layout->addWidget( mOfficeEdit, 1, 2 );
label = new TQLabel( i18n( "Profession:" ), tab2 );
layout->addWidget( label, 2, 1 );
mProfessionEdit = new KLineEdit( tab2 );
- connect( mProfessionEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( textChanged( const TQString& ) ) );
+ connect( mProfessionEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mProfessionEdit );
layout->addWidget( mProfessionEdit, 2, 2 );
label = new TQLabel( i18n( "Manager\'s name:" ), tab2 );
layout->addWidget( label, 0, 3 );
mManagerEdit = new KPIM::AddresseeLineEdit( tab2 );
- connect( mManagerEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( textChanged( const TQString& ) ) );
+ connect( mManagerEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mManagerEdit );
layout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 );
label = new TQLabel( i18n( "Assistant's name:" ), tab2 );
layout->addWidget( label, 1, 3 );
mAssistantEdit = new KPIM::AddresseeLineEdit( tab2 );
- connect( mAssistantEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( textChanged( const TQString& ) ) );
+ connect( mAssistantEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mAssistantEdit );
layout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 );
label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).arg( TDEABC::Addressee::titleLabel() ), tab2 );
layout->addWidget( label, 2, 3 );
mTitleEdit = new KLineEdit( tab2 );
- connect( mTitleEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( textChanged( const TQString& ) ) );
+ connect( mTitleEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mTitleEdit );
layout->addMultiCellWidget( mTitleEdit, 2, 2, 4, 5 );
@@ -391,36 +391,36 @@ void AddresseeEditorWidget::setupTab2()
label = new TQLabel( i18n( "Nickname:" ), tab2 );
layout->addWidget( label, 4, 1 );
mNicknameEdit = new KLineEdit( tab2 );
- connect( mNicknameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( textChanged( const TQString& ) ) );
+ connect( mNicknameEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mNicknameEdit );
layout->addWidget( mNicknameEdit, 4, 2 );
label = new TQLabel( i18n( "Partner's name:" ), tab2 );
layout->addWidget( label, 5, 1 );
mSpouseEdit = new KPIM::AddresseeLineEdit( tab2 );
- connect( mSpouseEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( textChanged( const TQString& ) ) );
+ connect( mSpouseEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mSpouseEdit );
layout->addWidget( mSpouseEdit, 5, 2 );
label = new TQLabel( i18n( "Birthdate:" ), tab2 );
layout->addWidget( label, 4, 3 );
mBirthdayPicker = new KDateEdit( tab2 );
- connect( mBirthdayPicker, TQT_SIGNAL( dateChanged( const TQDate& ) ),
- TQT_SLOT( dateChanged( const TQDate& ) ) );
- connect( mBirthdayPicker, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( emitModified() ) );
+ connect( mBirthdayPicker, TQ_SIGNAL( dateChanged( const TQDate& ) ),
+ TQ_SLOT( dateChanged( const TQDate& ) ) );
+ connect( mBirthdayPicker, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( emitModified() ) );
label->setBuddy( mBirthdayPicker );
layout->addWidget( mBirthdayPicker, 4, 4 );
label = new TQLabel( i18n( "Anniversary:" ), tab2 );
layout->addWidget( label, 5, 3 );
mAnniversaryPicker = new KDateEdit( tab2 );
- connect( mAnniversaryPicker, TQT_SIGNAL( dateChanged( const TQDate& ) ),
- TQT_SLOT( dateChanged( const TQDate& ) ) );
- connect( mAnniversaryPicker, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( emitModified() ) );
+ connect( mAnniversaryPicker, TQ_SIGNAL( dateChanged( const TQDate& ) ),
+ TQ_SLOT( dateChanged( const TQDate& ) ) );
+ connect( mAnniversaryPicker, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( emitModified() ) );
label->setBuddy( mAnniversaryPicker );
layout->addWidget( mAnniversaryPicker, 5, 4 );
@@ -435,7 +435,7 @@ void AddresseeEditorWidget::setupTab2()
mNoteEdit = new TQTextEdit( tab2 );
mNoteEdit->setWordWrap( TQTextEdit::WidgetWidth );
mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() );
- connect( mNoteEdit, TQT_SIGNAL( textChanged() ), TQT_SLOT( emitModified() ) );
+ connect( mNoteEdit, TQ_SIGNAL( textChanged() ), TQ_SLOT( emitModified() ) );
label->setBuddy( mNoteEdit );
layout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 );
@@ -464,7 +464,7 @@ void AddresseeEditorWidget::setupAdditionalTabs()
mTabWidget->addTab( page, pageTitle );
- connect( page, TQT_SIGNAL( changed() ), TQT_SLOT( emitModified() ) );
+ connect( page, TQ_SIGNAL( changed() ), TQ_SLOT( emitModified() ) );
}
KAB::ContactEditorWidget *widget
@@ -498,7 +498,7 @@ void AddresseeEditorWidget::setupCustomFieldsTabs()
page->addWidget( wdg );
page->updateLayout();
- connect( page, TQT_SIGNAL( changed() ), TQT_SLOT( emitModified() ) );
+ connect( page, TQ_SIGNAL( changed() ), TQ_SLOT( emitModified() ) );
} else
delete page;
}
@@ -558,7 +558,7 @@ void AddresseeEditorWidget::load()
mBirthdayPicker->setDate( mAddressee.birthday().date() );
TQString anniversaryStr = mAddressee.custom( "KADDRESSBOOK", "X-Anniversary" );
- TQDate anniversary = (anniversaryStr.isEmpty() ? TQDate() : TQDate::fromString( anniversaryStr, Qt::ISODate ));
+ TQDate anniversary = (anniversaryStr.isEmpty() ? TQDate() : TQDate::fromString( anniversaryStr, TQt::ISODate ));
mAnniversaryPicker->setDate( anniversary );
mNicknameEdit->setText( mAddressee.nickName() );
mCategoryEdit->setText( mAddressee.categories().join( "," ) );
@@ -652,7 +652,7 @@ void AddresseeEditorWidget::save()
if ( mAnniversaryPicker->date().isValid() )
mAddressee.insertCustom( "KADDRESSBOOK", "X-Anniversary",
- mAnniversaryPicker->date().toString( Qt::ISODate ) );
+ mAnniversaryPicker->date().toString( TQt::ISODate ) );
else
mAddressee.removeCustom( "KADDRESSBOOK", "X-Anniversary" );
@@ -798,10 +798,10 @@ void AddresseeEditorWidget::selectCategories()
// Show the category dialog
if ( mCategorySelectDialog == 0 ) {
mCategorySelectDialog = new KPIM::CategorySelectDialog( KABPrefs::instance(), this );
- connect( mCategorySelectDialog, TQT_SIGNAL( categoriesSelected( const TQStringList& ) ),
- this, TQT_SLOT( categoriesSelected( const TQStringList& ) ) );
- connect( mCategorySelectDialog, TQT_SIGNAL( editCategories() ),
- this, TQT_SLOT( editCategories() ) );
+ connect( mCategorySelectDialog, TQ_SIGNAL( categoriesSelected( const TQStringList& ) ),
+ this, TQ_SLOT( categoriesSelected( const TQStringList& ) ) );
+ connect( mCategorySelectDialog, TQ_SIGNAL( editCategories() ),
+ this, TQ_SLOT( editCategories() ) );
}
mCategorySelectDialog->setSelected( TQStringList::split( ",", mCategoryEdit->text() ) );
@@ -817,8 +817,8 @@ void AddresseeEditorWidget::editCategories()
{
if ( mCategoryEditDialog == 0 ) {
mCategoryEditDialog = new KPIM::CategoryEditDialog( KABPrefs::instance(), this );
- connect( mCategoryEditDialog, TQT_SIGNAL( categoryConfigChanged() ),
- mCategorySelectDialog, TQT_SLOT( updateCategoryConfig() ) );
+ connect( mCategoryEditDialog, TQ_SIGNAL( categoryConfigChanged() ),
+ mCategorySelectDialog, TQ_SLOT( updateCategoryConfig() ) );
}
mCategoryEditDialog->exec();
diff --git a/kaddressbook/addresseeeditorwidget.h b/kaddressbook/addresseeeditorwidget.h
index 918070bb..f2110f75 100644
--- a/kaddressbook/addresseeeditorwidget.h
+++ b/kaddressbook/addresseeeditorwidget.h
@@ -65,7 +65,7 @@ namespace TDEABC { class AddressBook; }
class AddresseeEditorWidget : public AddresseeEditorBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp
index dbec842d..70841834 100644
--- a/kaddressbook/addviewdialog.cpp
+++ b/kaddressbook/addviewdialog.cpp
@@ -53,12 +53,12 @@ AddViewDialog::AddViewDialog( TQDict<ViewFactory> *viewFactoryDict,
layout->addWidget( label, 0, 0 );
mViewNameEdit = new TQLineEdit( page );
- connect( mViewNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( textChanged( const TQString& ) ) );
+ connect( mViewNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( textChanged( const TQString& ) ) );
layout->addWidget( mViewNameEdit, 0, 1 );
- mTypeGroup = new TQButtonGroup( 0, Qt::Horizontal, i18n( "View Type" ), page );
- connect( mTypeGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( clicked( int ) ) );
+ mTypeGroup = new TQButtonGroup( 0, TQt::Horizontal, i18n( "View Type" ), page );
+ connect( mTypeGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( clicked( int ) ) );
layout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 );
TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->layout(), 3, 2 );
groupLayout->setSpacing( spacingHint() );
diff --git a/kaddressbook/addviewdialog.h b/kaddressbook/addviewdialog.h
index 2e5707a3..15084d66 100644
--- a/kaddressbook/addviewdialog.h
+++ b/kaddressbook/addviewdialog.h
@@ -40,7 +40,7 @@ class ViewFactory;
*/
class AddViewDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/advancedcustomfields.cpp b/kaddressbook/advancedcustomfields.cpp
index d5b53479..3f4a477d 100644
--- a/kaddressbook/advancedcustomfields.cpp
+++ b/kaddressbook/advancedcustomfields.cpp
@@ -132,7 +132,7 @@ void AdvancedCustomFields::initGUI( const TQString &uiFile )
mFields = new KPIM::DesignerFields( uiFile, this );
layout->addWidget( mFields );
- connect( mFields, TQT_SIGNAL( modified() ), TQT_SLOT( setModified() ) );
+ connect( mFields, TQ_SIGNAL( modified() ), TQ_SLOT( setModified() ) );
}
TQString AdvancedCustomFields::pageIdentifier() const
diff --git a/kaddressbook/advancedcustomfields.h b/kaddressbook/advancedcustomfields.h
index 5d4b2758..f2d2afff 100644
--- a/kaddressbook/advancedcustomfields.h
+++ b/kaddressbook/advancedcustomfields.h
@@ -38,7 +38,7 @@
class AdvancedCustomFields : public KAB::ContactEditorWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/common/locationmap.h b/kaddressbook/common/locationmap.h
index be625f57..2ba39aa1 100644
--- a/kaddressbook/common/locationmap.h
+++ b/kaddressbook/common/locationmap.h
@@ -30,7 +30,7 @@
class LocationMap : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/contacteditorwidgetmanager.cpp b/kaddressbook/contacteditorwidgetmanager.cpp
index a88a9554..beedc3b6 100644
--- a/kaddressbook/contacteditorwidgetmanager.cpp
+++ b/kaddressbook/contacteditorwidgetmanager.cpp
@@ -118,7 +118,7 @@ void ContactEditorTabPage::addWidget( KAB::ContactEditorWidget *widget )
{
if ( widget->logicalWidth() == 2 ) {
mWidgets.prepend( widget );
- connect( widget, TQT_SIGNAL( changed() ), TQT_SIGNAL( changed() ) );
+ connect( widget, TQ_SIGNAL( changed() ), TQ_SIGNAL( changed() ) );
return;
}
@@ -133,7 +133,7 @@ void ContactEditorTabPage::addWidget( KAB::ContactEditorWidget *widget )
}
mWidgets.insert( ++it, widget );
- connect( widget, TQT_SIGNAL( changed() ), TQT_SIGNAL( changed() ) );
+ connect( widget, TQ_SIGNAL( changed() ), TQ_SIGNAL( changed() ) );
}
void ContactEditorTabPage::loadContact( TDEABC::Addressee *addr )
diff --git a/kaddressbook/contacteditorwidgetmanager.h b/kaddressbook/contacteditorwidgetmanager.h
index 27a4fc62..c4aaf5d7 100644
--- a/kaddressbook/contacteditorwidgetmanager.h
+++ b/kaddressbook/contacteditorwidgetmanager.h
@@ -36,7 +36,7 @@ class TQGridLayout;
class ContactEditorWidgetManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -66,7 +66,7 @@ class ContactEditorWidgetManager : public TQObject
class ContactEditorTabPage : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp
index b267eddc..39867b0e 100644
--- a/kaddressbook/customfieldswidget.cpp
+++ b/kaddressbook/customfieldswidget.cpp
@@ -54,7 +54,7 @@ AddFieldDialog::AddFieldDialog( TQWidget *parent, const char *name )
layout->addWidget( label, 0, 0 );
mTitle = new KLineEdit( page );
- mTitle->setValidator( new TQRegExpValidator( TQRegExp( "([a-zA-Z]|\\d|-)+" ), TQT_TQOBJECT(mTitle) ) );
+ mTitle->setValidator( new TQRegExpValidator( TQRegExp( "([a-zA-Z]|\\d|-)+" ), mTitle ) );
label->setBuddy( mTitle );
layout->addWidget( mTitle, 0, 1 );
@@ -69,8 +69,8 @@ AddFieldDialog::AddFieldDialog( TQWidget *parent, const char *name )
mGlobal->setChecked( true );
layout->addMultiCellWidget( mGlobal, 2, 2, 0, 1 );
- connect( mTitle, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( nameChanged( const TQString& ) ) );
+ connect( mTitle, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( nameChanged( const TQString& ) ) );
TDEAcceleratorManager::manage( this );
@@ -151,33 +151,33 @@ void FieldWidget::addField( const TQString &identifier, const TQString &title,
if ( type == "integer" ) {
TQSpinBox *wdg = new TQSpinBox( 0, 1000, 1, this );
record.mWidget = wdg;
- connect( wdg, TQT_SIGNAL( valueChanged( int ) ),
- this, TQT_SIGNAL( changed() ) );
+ connect( wdg, TQ_SIGNAL( valueChanged( int ) ),
+ this, TQ_SIGNAL( changed() ) );
} else if ( type == "boolean" ) {
TQCheckBox *wdg = new TQCheckBox( this );
record.mWidget = wdg;
- connect( wdg, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SIGNAL( changed() ) );
+ connect( wdg, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SIGNAL( changed() ) );
} else if ( type == "date" ) {
TQDateEdit *wdg = new TQDateEdit( this );
record.mWidget = wdg;
- connect( wdg, TQT_SIGNAL( valueChanged( const TQDate& ) ),
- this, TQT_SIGNAL( changed() ) );
+ connect( wdg, TQ_SIGNAL( valueChanged( const TQDate& ) ),
+ this, TQ_SIGNAL( changed() ) );
} else if ( type == "time" ) {
TQTimeEdit *wdg = new TQTimeEdit( this );
record.mWidget = wdg;
- connect( wdg, TQT_SIGNAL( valueChanged( const TQTime& ) ),
- this, TQT_SIGNAL( changed() ) );
+ connect( wdg, TQ_SIGNAL( valueChanged( const TQTime& ) ),
+ this, TQ_SIGNAL( changed() ) );
} else if ( type == "datetime" ) {
TQDateTimeEdit *wdg = new TQDateTimeEdit( this );
record.mWidget = wdg;
- connect( wdg, TQT_SIGNAL( valueChanged( const TQDateTime& ) ),
- this, TQT_SIGNAL( changed() ) );
+ connect( wdg, TQ_SIGNAL( valueChanged( const TQDateTime& ) ),
+ this, TQ_SIGNAL( changed() ) );
} else if ( type == "text" ) {
TQLineEdit *wdg = new TQLineEdit( this );
record.mWidget = wdg;
- connect( wdg, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SIGNAL( changed() ) );
+ connect( wdg, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SIGNAL( changed() ) );
}
record.mLabel->show();
@@ -227,22 +227,22 @@ void FieldWidget::clearFields()
{
FieldRecordList::ConstIterator fieldIt;
for ( fieldIt = mFieldList.begin(); fieldIt != mFieldList.end(); ++fieldIt ) {
- if ( (*fieldIt).mWidget->isA( TQLINEEDIT_OBJECT_NAME_STRING ) ) {
+ if ( (*fieldIt).mWidget->isA( "TQLineEdit" ) ) {
TQLineEdit *wdg = static_cast<TQLineEdit*>( (*fieldIt).mWidget );
wdg->setText( TQString() );
- } else if ( (*fieldIt).mWidget->isA( TQSPINBOX_OBJECT_NAME_STRING ) ) {
+ } else if ( (*fieldIt).mWidget->isA( "TQSpinBox" ) ) {
TQSpinBox *wdg = static_cast<TQSpinBox*>( (*fieldIt).mWidget );
wdg->setValue( 0 );
- } else if ( (*fieldIt).mWidget->isA( TQCHECKBOX_OBJECT_NAME_STRING ) ) {
+ } else if ( (*fieldIt).mWidget->isA( "TQCheckBox" ) ) {
TQCheckBox *wdg = static_cast<TQCheckBox*>( (*fieldIt).mWidget );
wdg->setChecked( true );
- } else if ( (*fieldIt).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) {
+ } else if ( (*fieldIt).mWidget->isA( "TQDateEdit" ) ) {
TQDateEdit *wdg = static_cast<TQDateEdit*>( (*fieldIt).mWidget );
wdg->setDate( TQDate::currentDate() );
- } else if ( (*fieldIt).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) {
+ } else if ( (*fieldIt).mWidget->isA( "TQTimeEdit" ) ) {
TQTimeEdit *wdg = static_cast<TQTimeEdit*>( (*fieldIt).mWidget );
wdg->setTime( TQTime::currentTime() );
- } else if ( (*fieldIt).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
+ } else if ( (*fieldIt).mWidget->isA( "TQDateTimeEdit" ) ) {
TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( (*fieldIt).mWidget );
wdg->setDateTime( TQDateTime::currentDateTime() );
}
@@ -265,24 +265,24 @@ void FieldWidget::loadContact( TDEABC::Addressee *addr )
FieldRecordList::ConstIterator fieldIt;
for ( fieldIt = mFieldList.begin(); fieldIt != mFieldList.end(); ++fieldIt ) {
if ( (*fieldIt).mIdentifier == name ) {
- if ( (*fieldIt).mWidget->isA( TQLINEEDIT_OBJECT_NAME_STRING ) ) {
+ if ( (*fieldIt).mWidget->isA( "TQLineEdit" ) ) {
TQLineEdit *wdg = static_cast<TQLineEdit*>( (*fieldIt).mWidget );
wdg->setText( value );
- } else if ( (*fieldIt).mWidget->isA( TQSPINBOX_OBJECT_NAME_STRING ) ) {
+ } else if ( (*fieldIt).mWidget->isA( "TQSpinBox" ) ) {
TQSpinBox *wdg = static_cast<TQSpinBox*>( (*fieldIt).mWidget );
wdg->setValue( value.toInt() );
- } else if ( (*fieldIt).mWidget->isA( TQCHECKBOX_OBJECT_NAME_STRING ) ) {
+ } else if ( (*fieldIt).mWidget->isA( "TQCheckBox" ) ) {
TQCheckBox *wdg = static_cast<TQCheckBox*>( (*fieldIt).mWidget );
wdg->setChecked( value == "true" || value == "1" );
- } else if ( (*fieldIt).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) {
+ } else if ( (*fieldIt).mWidget->isA( "TQDateEdit" ) ) {
TQDateEdit *wdg = static_cast<TQDateEdit*>( (*fieldIt).mWidget );
- wdg->setDate( TQDate::fromString( value, Qt::ISODate ) );
- } else if ( (*fieldIt).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) {
+ wdg->setDate( TQDate::fromString( value, TQt::ISODate ) );
+ } else if ( (*fieldIt).mWidget->isA( "TQTimeEdit" ) ) {
TQTimeEdit *wdg = static_cast<TQTimeEdit*>( (*fieldIt).mWidget );
- wdg->setTime( TQTime::fromString( value, Qt::ISODate ) );
- } else if ( (*fieldIt).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
+ wdg->setTime( TQTime::fromString( value, TQt::ISODate ) );
+ } else if ( (*fieldIt).mWidget->isA( "TQDateTimeEdit" ) ) {
TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( (*fieldIt).mWidget );
- wdg->setDateTime( TQDateTime::fromString( value, Qt::ISODate ) );
+ wdg->setDateTime( TQDateTime::fromString( value, TQt::ISODate ) );
}
}
}
@@ -294,22 +294,22 @@ void FieldWidget::setReadOnly( bool readOnly )
FieldRecordList::ConstIterator it;
for ( it = mFieldList.begin(); it != mFieldList.end(); ++it ) {
TQString value;
- if ( (*it).mWidget->isA( TQLINEEDIT_OBJECT_NAME_STRING ) ) {
+ if ( (*it).mWidget->isA( "TQLineEdit" ) ) {
TQLineEdit *wdg = static_cast<TQLineEdit*>( (*it).mWidget );
wdg->setReadOnly(readOnly);
- } else if ( (*it).mWidget->isA( TQSPINBOX_OBJECT_NAME_STRING ) ) {
+ } else if ( (*it).mWidget->isA( "TQSpinBox" ) ) {
TQSpinBox *wdg = static_cast<TQSpinBox*>( (*it).mWidget );
wdg->setEnabled( !readOnly );
- } else if ( (*it).mWidget->isA( TQCHECKBOX_OBJECT_NAME_STRING ) ) {
+ } else if ( (*it).mWidget->isA( "TQCheckBox" ) ) {
TQCheckBox *wdg = static_cast<TQCheckBox*>( (*it).mWidget );
wdg->setEnabled( !readOnly );
- } else if ( (*it).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) {
+ } else if ( (*it).mWidget->isA( "TQDateEdit" ) ) {
TQDateEdit *wdg = static_cast<TQDateEdit*>( (*it).mWidget );
wdg->setEnabled( !readOnly );
- } else if ( (*it).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) {
+ } else if ( (*it).mWidget->isA( "TQTimeEdit" ) ) {
TQTimeEdit *wdg = static_cast<TQTimeEdit*>( (*it).mWidget );
wdg->setEnabled( !readOnly );
- } else if ( (*it).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
+ } else if ( (*it).mWidget->isA( "TQDateTimeEdit" ) ) {
TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( (*it).mWidget );
wdg->setEnabled( !readOnly );
}
@@ -321,24 +321,24 @@ void FieldWidget::storeContact( TDEABC::Addressee *addr )
FieldRecordList::ConstIterator it;
for ( it = mFieldList.begin(); it != mFieldList.end(); ++it ) {
TQString value;
- if ( (*it).mWidget->isA( TQLINEEDIT_OBJECT_NAME_STRING ) ) {
+ if ( (*it).mWidget->isA( "TQLineEdit" ) ) {
TQLineEdit *wdg = static_cast<TQLineEdit*>( (*it).mWidget );
value = wdg->text();
- } else if ( (*it).mWidget->isA( TQSPINBOX_OBJECT_NAME_STRING ) ) {
+ } else if ( (*it).mWidget->isA( "TQSpinBox" ) ) {
TQSpinBox *wdg = static_cast<TQSpinBox*>( (*it).mWidget );
value = TQString::number( wdg->value() );
- } else if ( (*it).mWidget->isA( TQCHECKBOX_OBJECT_NAME_STRING ) ) {
+ } else if ( (*it).mWidget->isA( "TQCheckBox" ) ) {
TQCheckBox *wdg = static_cast<TQCheckBox*>( (*it).mWidget );
value = ( wdg->isChecked() ? "true" : "false" );
- } else if ( (*it).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) {
+ } else if ( (*it).mWidget->isA( "TQDateEdit" ) ) {
TQDateEdit *wdg = static_cast<TQDateEdit*>( (*it).mWidget );
- value = wdg->date().toString( Qt::ISODate );
- } else if ( (*it).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) {
+ value = wdg->date().toString( TQt::ISODate );
+ } else if ( (*it).mWidget->isA( "TQTimeEdit" ) ) {
TQTimeEdit *wdg = static_cast<TQTimeEdit*>( (*it).mWidget );
- value = wdg->time().toString( Qt::ISODate );
- } else if ( (*it).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
+ value = wdg->time().toString( TQt::ISODate );
+ } else if ( (*it).mWidget->isA( "TQDateTimeEdit" ) ) {
TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( (*it).mWidget );
- value = wdg->dateTime().toString( Qt::ISODate );
+ value = wdg->dateTime().toString( TQt::ISODate );
}
if ( value.isEmpty() )
@@ -382,10 +382,10 @@ CustomFieldsWidget::CustomFieldsWidget( TDEABC::AddressBook *ab,
{
initGUI();
- connect( mAddButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addField() ) );
- connect( mRemoveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeField() ) );
+ connect( mAddButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addField() ) );
+ connect( mRemoveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeField() ) );
- connect( mFieldWidget, TQT_SIGNAL( changed() ), this, TQT_SLOT( setModified() ) );
+ connect( mFieldWidget, TQ_SIGNAL( changed() ), this, TQ_SLOT( setModified() ) );
}
void CustomFieldsWidget::loadContact( TDEABC::Addressee *addr )
@@ -523,17 +523,17 @@ TQStringList CustomFieldsWidget::marshallFields( bool global ) const
retval.append( (*it).mTitle );
TQString type = "text";
- if ( (*it).mWidget->isA( TQSPINBOX_OBJECT_NAME_STRING ) ) {
+ if ( (*it).mWidget->isA( "TQSpinBox" ) ) {
type = "integer";
- } else if ( (*it).mWidget->isA( TQCHECKBOX_OBJECT_NAME_STRING ) ) {
+ } else if ( (*it).mWidget->isA( "TQCheckBox" ) ) {
type = "boolean";
- } else if ( (*it).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) {
+ } else if ( (*it).mWidget->isA( "TQDateEdit" ) ) {
type = "date";
- } else if ( (*it).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) {
+ } else if ( (*it).mWidget->isA( "TQTimeEdit" ) ) {
type = "time";
- } else if ( (*it).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
+ } else if ( (*it).mWidget->isA( "TQDateTimeEdit" ) ) {
type = "datetime";
- } else if ( (*it).mWidget->isA( TQLINEEDIT_OBJECT_NAME_STRING ) ) {
+ } else if ( (*it).mWidget->isA( "TQLineEdit" ) ) {
type = "text";
}
diff --git a/kaddressbook/customfieldswidget.h b/kaddressbook/customfieldswidget.h
index e584833a..da8def76 100644
--- a/kaddressbook/customfieldswidget.h
+++ b/kaddressbook/customfieldswidget.h
@@ -60,7 +60,7 @@ typedef TQValueList<FieldRecord> FieldRecordList;
class AddFieldDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -85,7 +85,7 @@ class AddFieldDialog : public KDialogBase
class FieldWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -120,7 +120,7 @@ class FieldWidget : public TQWidget
class CustomFieldsWidget : public KAB::ContactEditorWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp
index 3f7b7353..e0711b64 100644
--- a/kaddressbook/distributionlisteditor.cpp
+++ b/kaddressbook/distributionlisteditor.cpp
@@ -70,14 +70,14 @@ KPIM::DistributionListEditor::Line::Line( TDEABC::AddressBook* book, TQWidget* p
TQBoxLayout* layout = new TQHBoxLayout( this );
layout->setSpacing( KDialog::spacingHint() );
m_lineEdit = new KPIM::DistributionListEditor::LineEdit( this );
- connect( m_lineEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( textChanged( const TQString& ) ) );
+ connect( m_lineEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( textChanged( const TQString& ) ) );
layout->addWidget( m_lineEdit );
m_clearButton = new TQToolButton( this );
m_clearButton->setIconSet( TDEApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) );
m_clearButton->setEnabled( false );
layout->addWidget( m_clearButton );
- connect( m_clearButton, TQT_SIGNAL( clicked() ), m_lineEdit, TQT_SLOT( clear() ) );
+ connect( m_clearButton, TQ_SIGNAL( clicked() ), m_lineEdit, TQ_SLOT( clear() ) );
}
void KPIM::DistributionListEditor::Line::textChanged( const TQString& text )
@@ -159,9 +159,9 @@ KPIM::DistributionListEditor::EditorWidget::EditorWidget( TDEABC::AddressBook* b
d->addressBook = book;
Q_ASSERT( d->addressBook );
d->lastLineId = 0;
- d->mapper = new TQSignalMapper( TQT_TQOBJECT(this) );
- connect( d->mapper, TQT_SIGNAL( mapped( int ) ),
- this, TQT_SLOT( lineTextChanged( int ) ) );
+ d->mapper = new TQSignalMapper( this );
+ connect( d->mapper, TQ_SIGNAL( mapped( int ) ),
+ this, TQ_SLOT( lineTextChanged( int ) ) );
setCaption( i18n( "Edit Distribution List" ) );
TQWidget* main = new TQWidget( this );
TQVBoxLayout* mainLayout = new TQVBoxLayout( main );
@@ -248,9 +248,9 @@ KPIM::DistributionListEditor::Line* KPIM::DistributionListEditor::EditorWidgetPr
line->setEntry( entry );
addresseeLayout->addWidget( line );
addressees.append( line );
- TQObject::connect( line, TQT_SIGNAL( textChanged() ),
- mapper, TQT_SLOT( map() ) );
- mapper->setMapping( TQT_TQOBJECT(line), ++lastLineId );
+ TQObject::connect( line, TQ_SIGNAL( textChanged() ),
+ mapper, TQ_SLOT( map() ) );
+ mapper->setMapping( line, ++lastLineId );
line->setShown( true );
return line;
}
diff --git a/kaddressbook/distributionlisteditor.h b/kaddressbook/distributionlisteditor.h
index d1ec2e11..986b92c2 100644
--- a/kaddressbook/distributionlisteditor.h
+++ b/kaddressbook/distributionlisteditor.h
@@ -38,7 +38,7 @@ namespace DistributionListEditor {
class EditorWidgetPrivate;
class EditorWidget : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
explicit EditorWidget( TDEABC::AddressBook* book, TQWidget* parent = 0 );
diff --git a/kaddressbook/distributionlisteditor_p.h b/kaddressbook/distributionlisteditor_p.h
index 9d3ed755..45670f92 100644
--- a/kaddressbook/distributionlisteditor_p.h
+++ b/kaddressbook/distributionlisteditor_p.h
@@ -41,7 +41,7 @@ namespace DistributionListEditor {
class LineEdit : public KPIM::AddresseeLineEdit
{
- Q_OBJECT
+ TQ_OBJECT
public:
explicit LineEdit( TQWidget* parent = 0 );
@@ -50,7 +50,7 @@ public:
class Line : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
explicit Line( TDEABC::AddressBook* book, TQWidget* parent = 0 );
diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp
index b09d8c97..811e5167 100644
--- a/kaddressbook/distributionlistentryview.cpp
+++ b/kaddressbook/distributionlistentryview.cpp
@@ -49,8 +49,8 @@ KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWi
m_distListLabel = new KURLLabel( this );
distLabel->setBuddy( m_distListLabel );
- connect( m_distListLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
- this, TQT_SIGNAL( distributionListClicked( const TQString& ) ) );
+ connect( m_distListLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+ this, TQ_SIGNAL( distributionListClicked( const TQString& ) ) );
distLayout->addWidget( m_distListLabel );
distLayout->addStretch();
m_mainLayout->addItem( distLayout );
@@ -129,8 +129,8 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis
button->setChecked( true );
button->setShown( true );
}
- connect( m_emailGroup, TQT_SIGNAL( clicked( int ) ),
- this, TQT_SLOT( emailButtonClicked( int ) ) );
+ connect( m_emailGroup, TQ_SIGNAL( clicked( int ) ),
+ this, TQ_SLOT( emailButtonClicked( int ) ) );
m_radioLayout->addWidget( m_emailGroup, 0, 0 );
m_emailGroup->setShown( true );
m_mainLayout->invalidate();
diff --git a/kaddressbook/distributionlistentryview.h b/kaddressbook/distributionlistentryview.h
index 6bd9d2c3..13a9a852 100644
--- a/kaddressbook/distributionlistentryview.h
+++ b/kaddressbook/distributionlistentryview.h
@@ -23,7 +23,7 @@ class Core;
class DistributionListEntryView : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp
index 272a6200..b7295ad8 100644
--- a/kaddressbook/distributionlistpicker.cpp
+++ b/kaddressbook/distributionlistpicker.cpp
@@ -54,10 +54,10 @@ KPIM::DistributionListPickerDialog::DistributionListPickerDialog( TDEABC::Addres
layout->addWidget( m_label, 0, 0 );
m_listBox = new TDEListBox( main );
layout->addWidget( m_listBox, 1, 0 );
- connect( m_listBox, TQT_SIGNAL( highlighted( const TQString& ) ),
- this, TQT_SLOT( entrySelected( const TQString& ) ) );
- connect( m_listBox, TQT_SIGNAL( selected( const TQString& ) ),
- this, TQT_SLOT( entrySelected( const TQString& ) ) );
+ connect( m_listBox, TQ_SIGNAL( highlighted( const TQString& ) ),
+ this, TQ_SLOT( entrySelected( const TQString& ) ) );
+ connect( m_listBox, TQ_SIGNAL( selected( const TQString& ) ),
+ this, TQ_SLOT( entrySelected( const TQString& ) ) );
setMainWidget( main );
#ifdef TDEPIM_NEW_DISTRLISTS
typedef TQValueList<KPIM::DistributionList> DistListList;
diff --git a/kaddressbook/distributionlistpicker.h b/kaddressbook/distributionlistpicker.h
index bc4c0f65..9a2d9f7d 100644
--- a/kaddressbook/distributionlistpicker.h
+++ b/kaddressbook/distributionlistpicker.h
@@ -37,7 +37,7 @@ namespace KPIM {
class DistributionListPickerDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
explicit DistributionListPickerDialog( TDEABC::AddressBook* book, TQWidget* parent = 0 );
diff --git a/kaddressbook/editors/cryptowidget.cpp b/kaddressbook/editors/cryptowidget.cpp
index fc7bef17..f7849d7c 100644
--- a/kaddressbook/editors/cryptowidget.cpp
+++ b/kaddressbook/editors/cryptowidget.cpp
@@ -83,7 +83,7 @@ CryptoWidget::CryptoWidget( TDEABC::AddressBook *ab, TQWidget *parent, const cha
for ( uint i = 0 ; i < NumberOfProtocols ; ++i ) {
Kleo::CryptoMessageFormat f = static_cast<Kleo::CryptoMessageFormat>( msgFormat );
mProtocolCB[ i ] = new TQCheckBox( Kleo::cryptoMessageFormatToLabel( f ), protGB );
- connect( mProtocolCB[i], TQT_SIGNAL( clicked() ), this, TQT_SLOT( setModified() ) );
+ connect( mProtocolCB[i], TQ_SIGNAL( clicked() ), this, TQ_SLOT( setModified() ) );
// Iterating over a bitfield means *2 every time
msgFormat *= 2;
@@ -126,13 +126,13 @@ CryptoWidget::CryptoWidget( TDEABC::AddressBook *ab, TQWidget *parent, const cha
static_cast<Kleo::EncryptionPreference>( i ) ) );
// Emit "changed()" signal
- connect( mSignPref, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( setModified() ) );
- connect( mCryptPref, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( setModified() ) );
+ connect( mSignPref, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( setModified() ) );
+ connect( mCryptPref, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( setModified() ) );
// Not optimal, but KeyRequester doesn't emit any signals when the key changes
- connect( mPgpKey->eraseButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( setModified() ) );
- connect( mPgpKey->dialogButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( setModified() ) );
- connect( mSmimeCert->eraseButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( setModified() ) );
- connect( mSmimeCert->dialogButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( setModified() ) );
+ connect( mPgpKey->eraseButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( setModified() ) );
+ connect( mPgpKey->dialogButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( setModified() ) );
+ connect( mSmimeCert->eraseButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( setModified() ) );
+ connect( mSmimeCert->dialogButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( setModified() ) );
}
CryptoWidget::~CryptoWidget()
diff --git a/kaddressbook/editors/cryptowidget.h b/kaddressbook/editors/cryptowidget.h
index 1d8794ba..101b0034 100644
--- a/kaddressbook/editors/cryptowidget.h
+++ b/kaddressbook/editors/cryptowidget.h
@@ -35,7 +35,7 @@ class TQCheckBox;
class CryptoWidget : public KAB::ContactEditorWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/editors/imaddressbase.ui b/kaddressbook/editors/imaddressbase.ui
index 77988764..f87bdff9 100644
--- a/kaddressbook/editors/imaddressbase.ui
+++ b/kaddressbook/editors/imaddressbase.ui
@@ -81,9 +81,9 @@
<tabstop>cmbProtocol</tabstop>
<tabstop>edtAddress</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot>slotProtocolChanged( const TQString &amp; )</slot>
<slot>slotProtocolChanged()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kaddressbook/editors/imaddresswidget.cpp b/kaddressbook/editors/imaddresswidget.cpp
index 0a3336d6..4cd7813d 100644
--- a/kaddressbook/editors/imaddresswidget.cpp
+++ b/kaddressbook/editors/imaddresswidget.cpp
@@ -60,10 +60,10 @@ IMAddressWidget::IMAddressWidget( TQWidget *parent, TQValueList<KPluginInfo *> p
void IMAddressWidget::init()
{
- connect( cmbProtocol, TQT_SIGNAL( activated( const TQString& ) ),
- this, TQT_SLOT( slotProtocolChanged() ) );
- connect( edtAddress, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( slotAddressChanged( const TQString& ) ) );
+ connect( cmbProtocol, TQ_SIGNAL( activated( const TQString& ) ),
+ this, TQ_SLOT( slotProtocolChanged() ) );
+ connect( edtAddress, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( slotAddressChanged( const TQString& ) ) );
slotProtocolChanged();
}
diff --git a/kaddressbook/editors/imaddresswidget.h b/kaddressbook/editors/imaddresswidget.h
index 9724ce77..a44f69f7 100644
--- a/kaddressbook/editors/imaddresswidget.h
+++ b/kaddressbook/editors/imaddresswidget.h
@@ -41,7 +41,7 @@ class KPluginInfo;
*/
class IMAddressWidget : public IMAddressBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp
index 38d641c4..9db30d9c 100644
--- a/kaddressbook/editors/imeditorwidget.cpp
+++ b/kaddressbook/editors/imeditorwidget.cpp
@@ -148,14 +148,14 @@ IMEditorWidget::IMEditorWidget( TQWidget *parent, const TQString &preferredIM, c
mWidget = new IMEditorBase( this );
setMainWidget( mWidget );
- connect( mWidget->btnAdd, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdd() ) );
- connect( mWidget->btnEdit, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEdit() ) );
- connect( mWidget->btnDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDelete() ) );
- connect( mWidget->btnSetStandard, TQT_SIGNAL( clicked()), TQT_SLOT( slotSetStandard() ) );
- connect( mWidget->lvAddresses, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotUpdateButtons() ) );
+ connect( mWidget->btnAdd, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAdd() ) );
+ connect( mWidget->btnEdit, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEdit() ) );
+ connect( mWidget->btnDelete, TQ_SIGNAL( clicked() ), TQ_SLOT( slotDelete() ) );
+ connect( mWidget->btnSetStandard, TQ_SIGNAL( clicked()), TQ_SLOT( slotSetStandard() ) );
+ connect( mWidget->lvAddresses, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotUpdateButtons() ) );
- connect( mWidget->lvAddresses, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ),
- TQT_SLOT( slotEdit() ) );
+ connect( mWidget->lvAddresses, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ),
+ TQ_SLOT( slotEdit() ) );
setHelp( "managing-contacts-im-addresses" );
@@ -336,8 +336,8 @@ void IMEditorWidget::slotAdd()
IMAddressWidget *addressWid = new IMAddressWidget( &addDialog, mProtocols );
addDialog.enableButtonOK( false );
- connect( addressWid, TQT_SIGNAL( inValidState( bool ) ),
- &addDialog, TQT_SLOT( enableButtonOK( bool ) ) );
+ connect( addressWid, TQ_SIGNAL( inValidState( bool ) ),
+ &addDialog, TQ_SLOT( enableButtonOK( bool ) ) );
addDialog.setMainWidget( addressWid );
if ( addDialog.exec() == TQDialog::Accepted ) {
@@ -372,8 +372,8 @@ void IMEditorWidget::slotEdit()
KDialogBase::Ok | KDialogBase::Cancel );
IMAddressWidget *addressWid = new IMAddressWidget( &editDialog, mProtocols, current->protocol(),
current->address(), current->context() ) ;
- connect( addressWid, TQT_SIGNAL( inValidState( bool ) ),
- &editDialog, TQT_SLOT( enableButtonOK( bool ) ) );
+ connect( addressWid, TQ_SIGNAL( inValidState( bool ) ),
+ &editDialog, TQ_SLOT( enableButtonOK( bool ) ) );
editDialog.setMainWidget( addressWid );
if ( editDialog.exec() == TQDialog::Accepted ) {
diff --git a/kaddressbook/editors/imeditorwidget.h b/kaddressbook/editors/imeditorwidget.h
index 1119144c..4f347ca0 100644
--- a/kaddressbook/editors/imeditorwidget.h
+++ b/kaddressbook/editors/imeditorwidget.h
@@ -48,7 +48,7 @@ enum IMContext { Any, Home, Work };
*/
class IMEditorWidget : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp
index d517f0b6..ead36a0c 100644
--- a/kaddressbook/emaileditwidget.cpp
+++ b/kaddressbook/emaileditwidget.cpp
@@ -97,15 +97,15 @@ EmailEditWidget::EmailEditWidget( TQWidget *parent, const char *name )
mEmailEdit = new KLineEdit( this );
mEmailEdit->setValidator( new EmailValidator );
- connect( mEmailEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( textChanged( const TQString& ) ) );
- connect( mEmailEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SIGNAL( modified() ) );
+ connect( mEmailEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( textChanged( const TQString& ) ) );
+ connect( mEmailEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SIGNAL( modified() ) );
label->setBuddy( mEmailEdit );
topLayout->addWidget( mEmailEdit, 0, 1 );
mEditButton = new TQPushButton( i18n( "Edit Email Addresses..." ), this);
- connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) );
+ connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( edit() ) );
topLayout->addMultiCellWidget( mEditButton, 1, 1, 0, 1 );
topLayout->activate();
@@ -185,26 +185,26 @@ EmailEditDialog::EmailEditDialog( const TQStringList &list, TQWidget *parent,
// Make sure there is room for the scrollbar
mEmailListBox->setMinimumHeight( mEmailListBox->sizeHint().height() + 30 );
- connect( mEmailListBox, TQT_SIGNAL( highlighted( int ) ),
- TQT_SLOT( selectionChanged( int ) ) );
- connect( mEmailListBox, TQT_SIGNAL( selected( int ) ),
- TQT_SLOT( edit() ) );
+ connect( mEmailListBox, TQ_SIGNAL( highlighted( int ) ),
+ TQ_SLOT( selectionChanged( int ) ) );
+ connect( mEmailListBox, TQ_SIGNAL( selected( int ) ),
+ TQ_SLOT( edit() ) );
topLayout->addMultiCellWidget( mEmailListBox, 0, 3, 0, 1 );
mAddButton = new TQPushButton( i18n( "Add..." ), page );
- connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) );
+ connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( add() ) );
topLayout->addWidget( mAddButton, 0, 2 );
mEditButton = new TQPushButton( i18n( "Edit..." ), page );
- connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) );
+ connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( edit() ) );
topLayout->addWidget( mEditButton, 1, 2 );
mRemoveButton = new TQPushButton( i18n( "Remove" ), page );
- connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( remove() ) );
+ connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( remove() ) );
topLayout->addWidget( mRemoveButton, 2, 2 );
mStandardButton = new TQPushButton( i18n( "Set Standard" ), page );
- connect( mStandardButton, TQT_SIGNAL( clicked() ), TQT_SLOT( standard() ) );
+ connect( mStandardButton, TQ_SIGNAL( clicked() ), TQ_SLOT( standard() ) );
topLayout->addWidget( mStandardButton, 3, 2 );
topLayout->activate();
diff --git a/kaddressbook/emaileditwidget.h b/kaddressbook/emaileditwidget.h
index 46d259a4..3f5d0a8d 100644
--- a/kaddressbook/emaileditwidget.h
+++ b/kaddressbook/emaileditwidget.h
@@ -43,7 +43,7 @@ class TDEListView;
*/
class EmailEditWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -70,7 +70,7 @@ class EmailEditWidget : public TQWidget
class EmailEditDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp
index 0e88486c..bdc0801d 100644
--- a/kaddressbook/extensionmanager.cpp
+++ b/kaddressbook/extensionmanager.cpp
@@ -52,7 +52,7 @@ ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detai
Q_ASSERT( mExtensionBar );
TQVBoxLayout* layout = new TQVBoxLayout( mExtensionBar );
mSplitter = new TQSplitter( mExtensionBar );
- mSplitter->setOrientation( Qt::Vertical );
+ mSplitter->setOrientation( TQt::Vertical );
layout->addWidget( mSplitter );
createExtensionWidgets();
@@ -60,7 +60,7 @@ ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detai
mActionCollection = new TDEActionCollection( this, "ActionCollection" );
extensionBar->setShown( false );
- TQTimer::singleShot( 0, this, TQT_SLOT( createActions() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( createActions() ) );
}
ExtensionManager::~ExtensionManager()
@@ -162,13 +162,13 @@ void ExtensionManager::createActions()
delete mMapper;
mMapper = new TQSignalMapper( this, "SignalMapper" );
- connect( mMapper, TQT_SIGNAL( mapped( const TQString& ) ),
- this, TQT_SLOT( activationToggled( const TQString& ) ) );
+ connect( mMapper, TQ_SIGNAL( mapped( const TQString& ) ),
+ this, TQ_SLOT( activationToggled( const TQString& ) ) );
ExtensionData::List::ConstIterator it;
for ( TQMap<TQString, ExtensionData>::Iterator it = mExtensionMap.begin(), end = mExtensionMap.end(); it != end; ++it ) {
ExtensionData& data = it.data();
- data.action = new TDEToggleAction( data.title, 0, mMapper, TQT_SLOT( map() ),
+ data.action = new TDEToggleAction( data.title, 0, mMapper, TQ_SLOT( map() ),
mActionCollection,
TQString( data.identifier + "_extension" ).latin1() );
mMapper->setMapping( data.action, data.identifier );
@@ -202,10 +202,10 @@ void ExtensionManager::createExtensionWidgets()
wdg = new AddresseeEditorExtension( mCore, mDetailsStack );
wdg->hide();
- connect( wdg, TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ),
- TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ) );
- connect( wdg, TQT_SIGNAL( deleted( const TQStringList& ) ),
- TQT_SIGNAL( deleted( const TQStringList& ) ) );
+ connect( wdg, TQ_SIGNAL( modified( const TDEABC::Addressee::List& ) ),
+ TQ_SIGNAL( modified( const TDEABC::Addressee::List& ) ) );
+ connect( wdg, TQ_SIGNAL( deleted( const TQStringList& ) ),
+ TQ_SIGNAL( deleted( const TQStringList& ) ) );
ExtensionData data;
data.identifier = wdg->identifier();
@@ -239,10 +239,10 @@ void ExtensionManager::createExtensionWidgets()
if ( wdg->identifier() == "distribution_list_editor_ng" )
mSplitter->moveToFirst( wdg );
wdg->hide();
- connect( wdg, TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ),
- TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ) );
- connect( wdg, TQT_SIGNAL( deleted( const TQStringList& ) ),
- TQT_SIGNAL( deleted( const TQStringList& ) ) );
+ connect( wdg, TQ_SIGNAL( modified( const TDEABC::Addressee::List& ) ),
+ TQ_SIGNAL( modified( const TDEABC::Addressee::List& ) ) );
+ connect( wdg, TQ_SIGNAL( deleted( const TQStringList& ) ),
+ TQ_SIGNAL( deleted( const TQStringList& ) ) );
ExtensionData data;
data.identifier = wdg->identifier();
diff --git a/kaddressbook/extensionmanager.h b/kaddressbook/extensionmanager.h
index fafa2e3b..a44983ac 100644
--- a/kaddressbook/extensionmanager.h
+++ b/kaddressbook/extensionmanager.h
@@ -55,7 +55,7 @@ class ExtensionData
class ExtensionManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp
index 4a4a20a2..181744ad 100644
--- a/kaddressbook/features/distributionlistngwidget.cpp
+++ b/kaddressbook/features/distributionlistngwidget.cpp
@@ -131,51 +131,51 @@ KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *pare
mAddButton = new TQPushButton( this );
mAddButton->setIconSet( SmallIconSet( "add" ) );
TQToolTip::add( mAddButton, i18n( "Add distribution list" ) );
- connect( mAddButton, TQT_SIGNAL(clicked()), core, TQT_SLOT(newDistributionList()) );
+ connect( mAddButton, TQ_SIGNAL(clicked()), core, TQ_SLOT(newDistributionList()) );
buttonLayout->addWidget( mAddButton );
mEditButton = new TQPushButton( this );
mEditButton->setIconSet( SmallIconSet( "edit" ) );
TQToolTip::add( mEditButton, i18n( "Edit distribution list" ) );
- connect( mEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editSelectedDistributionList()) );
+ connect( mEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editSelectedDistributionList()) );
buttonLayout->addWidget( mEditButton );
mRemoveButton = new TQPushButton( this );
mRemoveButton->setIconSet( SmallIconSet( "remove" ) );
TQToolTip::add( mRemoveButton, i18n( "Remove distribution list" ) );
- connect( mRemoveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSelectedDistributionList()) );
+ connect( mRemoveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSelectedDistributionList()) );
buttonLayout->addWidget( mRemoveButton );
mListBox = new ListBox( this );
- connect( mListBox, TQT_SIGNAL( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ),
- this, TQT_SLOT( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ) );
- connect( mListBox, TQT_SIGNAL( dropped( const TQString &, const TDEABC::Addressee::List & ) ),
- this, TQT_SLOT( contactsDropped( const TQString &, const TDEABC::Addressee::List & ) ) );
- connect( mListBox, TQT_SIGNAL( highlighted( int ) ),
- this, TQT_SLOT( itemSelected( int ) ) );
- connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(editSelectedDistributionList()) );
+ connect( mListBox, TQ_SIGNAL( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ),
+ this, TQ_SLOT( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ) );
+ connect( mListBox, TQ_SIGNAL( dropped( const TQString &, const TDEABC::Addressee::List & ) ),
+ this, TQ_SLOT( contactsDropped( const TQString &, const TDEABC::Addressee::List & ) ) );
+ connect( mListBox, TQ_SIGNAL( highlighted( int ) ),
+ this, TQ_SLOT( itemSelected( int ) ) );
+ connect( mListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), TQ_SLOT(editSelectedDistributionList()) );
layout->addWidget( mListBox );
- connect( core, TQT_SIGNAL( contactsUpdated() ),
- this, TQT_SLOT( updateEntries() ) );
- connect( core->addressBook(), TQT_SIGNAL( addressBookChanged( AddressBook* ) ),
- this, TQT_SLOT( updateEntries() ) );
+ connect( core, TQ_SIGNAL( contactsUpdated() ),
+ this, TQ_SLOT( updateEntries() ) );
+ connect( core->addressBook(), TQ_SIGNAL( addressBookChanged( AddressBook* ) ),
+ this, TQ_SLOT( updateEntries() ) );
// When contacts are changed, update both distr list combo and contents of displayed distr list
- connect( core, TQT_SIGNAL( contactsUpdated() ),
- this, TQT_SLOT( updateEntries() ) );
+ connect( core, TQ_SIGNAL( contactsUpdated() ),
+ this, TQ_SLOT( updateEntries() ) );
- TQTimer::singleShot( 0, this, TQT_SLOT( updateEntries() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( updateEntries() ) );
}
void KAB::DistributionListNg::MainWidget::contextMenuRequested( TQListBoxItem *item, const TQPoint &point )
{
TQGuardedPtr<TDEPopupMenu> menu = new TDEPopupMenu( this );
- menu->insertItem( i18n( "New Distribution List..." ), core(), TQT_SLOT( newDistributionList() ) );
+ menu->insertItem( i18n( "New Distribution List..." ), core(), TQ_SLOT( newDistributionList() ) );
if ( item && ( item->text() !=i18n( "All Contacts" ) ) )
{
- menu->insertItem( i18n( "Edit..." ), this, TQT_SLOT( editSelectedDistributionList() ) );
- menu->insertItem( i18n( "Delete" ), this, TQT_SLOT( deleteSelectedDistributionList() ) );
+ menu->insertItem( i18n( "Edit..." ), this, TQ_SLOT( editSelectedDistributionList() ) );
+ menu->insertItem( i18n( "Delete" ), this, TQ_SLOT( deleteSelectedDistributionList() ) );
}
menu->exec( point );
delete menu;
diff --git a/kaddressbook/features/distributionlistngwidget.h b/kaddressbook/features/distributionlistngwidget.h
index c8cf84d3..75cd50ce 100644
--- a/kaddressbook/features/distributionlistngwidget.h
+++ b/kaddressbook/features/distributionlistngwidget.h
@@ -46,7 +46,7 @@ namespace DistributionListNg {
class ListBox : public TDEListBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
ListBox( TQWidget* parent = 0 );
@@ -66,7 +66,7 @@ protected:
class MainWidget : public KAB::ExtensionWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp
index 28a6f8ff..76324853 100644
--- a/kaddressbook/features/distributionlistwidget.cpp
+++ b/kaddressbook/features/distributionlistwidget.cpp
@@ -158,19 +158,19 @@ DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *paren
mNameCombo = new TQComboBox( this );
topLayout->addWidget( mNameCombo, 0, 0 );
- connect( mNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateContactView() ) );
+ connect( mNameCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( updateContactView() ) );
mCreateListButton = new TQPushButton( i18n( "New List..." ), this );
topLayout->addWidget( mCreateListButton, 0, 1 );
- connect( mCreateListButton, TQT_SIGNAL( clicked() ), TQT_SLOT( createList() ) );
+ connect( mCreateListButton, TQ_SIGNAL( clicked() ), TQ_SLOT( createList() ) );
mEditListButton = new TQPushButton( i18n( "Rename List..." ), this );
topLayout->addWidget( mEditListButton, 0, 2 );
- connect( mEditListButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editList() ) );
+ connect( mEditListButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editList() ) );
mRemoveListButton = new TQPushButton( i18n( "Remove List" ), this );
topLayout->addWidget( mRemoveListButton, 0, 3 );
- connect( mRemoveListButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeList() ) );
+ connect( mRemoveListButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeList() ) );
mContactView = new DistributionListView( this );
mContactView->addColumn( i18n( "Name" ) );
@@ -180,40 +180,40 @@ DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *paren
mContactView->setAllColumnsShowFocus( true );
mContactView->setFullWidth( true );
topLayout->addMultiCellWidget( mContactView, 1, 1, 0, 3 );
- connect( mContactView, TQT_SIGNAL( selectionChanged() ),
- TQT_SLOT( selectionContactViewChanged() ) );
- connect( mContactView, TQT_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ),
- TQT_SLOT( dropped( TQDropEvent*, TQListViewItem* ) ) );
+ connect( mContactView, TQ_SIGNAL( selectionChanged() ),
+ TQ_SLOT( selectionContactViewChanged() ) );
+ connect( mContactView, TQ_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ),
+ TQ_SLOT( dropped( TQDropEvent*, TQListViewItem* ) ) );
mAddContactButton = new TQPushButton( i18n( "Add Contact" ), this );
mAddContactButton->setEnabled( false );
topLayout->addWidget( mAddContactButton, 2, 0 );
- connect( mAddContactButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addContact() ) );
+ connect( mAddContactButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addContact() ) );
mEntryCountLabel = new TQLabel( this );
topLayout->addWidget( mEntryCountLabel, 2, 1 );
mChangeEmailButton = new TQPushButton( i18n( "Change Email..." ), this );
topLayout->addWidget( mChangeEmailButton, 2, 2 );
- connect( mChangeEmailButton, TQT_SIGNAL( clicked() ), TQT_SLOT( changeEmail() ) );
+ connect( mChangeEmailButton, TQ_SIGNAL( clicked() ), TQ_SLOT( changeEmail() ) );
mRemoveContactButton = new TQPushButton( i18n( "Remove Contact" ), this );
topLayout->addWidget( mRemoveContactButton, 2, 3 );
- connect( mRemoveContactButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeContact() ) );
+ connect( mRemoveContactButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeContact() ) );
#ifdef TDEPIM_NEW_DISTRLISTS
// When contacts are changed, update both distr list combo and contents of displayed distr list
- connect( core, TQT_SIGNAL( contactsUpdated() ),
- this, TQT_SLOT( updateNameCombo() ) );
+ connect( core, TQ_SIGNAL( contactsUpdated() ),
+ this, TQ_SLOT( updateNameCombo() ) );
#else
mManager = new TDEABC::DistributionListManager( core->addressBook() );
- connect( TDEABC::DistributionListWatcher::self(), TQT_SIGNAL( changed() ),
- this, TQT_SLOT( updateNameCombo() ) );
+ connect( TDEABC::DistributionListWatcher::self(), TQ_SIGNAL( changed() ),
+ this, TQ_SLOT( updateNameCombo() ) );
#endif
- connect( core->addressBook(), TQT_SIGNAL( addressBookChanged( AddressBook* ) ),
- this, TQT_SLOT( updateNameCombo() ) );
+ connect( core->addressBook(), TQ_SIGNAL( addressBookChanged( AddressBook* ) ),
+ this, TQ_SLOT( updateNameCombo() ) );
updateNameCombo();
diff --git a/kaddressbook/features/distributionlistwidget.h b/kaddressbook/features/distributionlistwidget.h
index e502dda1..0b7e032c 100644
--- a/kaddressbook/features/distributionlistwidget.h
+++ b/kaddressbook/features/distributionlistwidget.h
@@ -47,7 +47,7 @@ class DistributionListManager;
class DistributionListWidget : public KAB::ExtensionWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -107,7 +107,7 @@ class DistributionListWidget : public KAB::ExtensionWidget
*/
class DistributionListView : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp
index 1d80c915..4a16c598 100644
--- a/kaddressbook/features/resourceselection.cpp
+++ b/kaddressbook/features/resourceselection.cpp
@@ -142,19 +142,19 @@ ResourceSelection::ResourceSelection( KAB::Core *core, TQWidget *parent, const c
AddressBookWrapper *wrapper = static_cast<AddressBookWrapper*>( core->addressBook() );
mManager = wrapper->getResourceManager();
- connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) );
- connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) );
- connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( remove() ) );
+ connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( add() ) );
+ connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( edit() ) );
+ connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( remove() ) );
- connect( mListView, TQT_SIGNAL( clicked( TQListViewItem* ) ),
- TQT_SLOT( currentChanged( TQListViewItem* ) ) );
+ connect( mListView, TQ_SIGNAL( clicked( TQListViewItem* ) ),
+ TQ_SLOT( currentChanged( TQListViewItem* ) ) );
- connect( mListView, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *,
+ connect( mListView, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *,
const TQPoint &, int ) ),
- TQT_SLOT( contextMenuRequested( TQListViewItem *, const TQPoint &,
+ TQ_SLOT( contextMenuRequested( TQListViewItem *, const TQPoint &,
int ) ) );
- TQTimer::singleShot( 0, this, TQT_SLOT( updateView() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( updateView() ) );
}
ResourceSelection::~ResourceSelection()
@@ -167,24 +167,24 @@ void ResourceSelection::contextMenuRequested ( TQListViewItem *i,
ResourceItem *item = static_cast<ResourceItem *>( i );
TQPopupMenu *menu = new TQPopupMenu( this );
- connect( menu, TQT_SIGNAL( aboutToHide() ), menu, TQT_SLOT( deleteLater() ) );
+ connect( menu, TQ_SIGNAL( aboutToHide() ), menu, TQ_SLOT( deleteLater() ) );
if ( item ) {
int reloadId = menu->insertItem( i18n("Re&load"), this,
- TQT_SLOT( reloadResource() ) );
+ TQ_SLOT( reloadResource() ) );
menu->setItemEnabled( reloadId, item->resource()->isActive() );
int saveId = menu->insertItem( i18n("&Save"), this,
- TQT_SLOT( saveResource() ) );
+ TQ_SLOT( saveResource() ) );
menu->setItemEnabled( saveId, item->resource()->isActive() );
menu->insertSeparator();
-// menu->insertItem( i18n("Show &Info"), this, TQT_SLOT( showInfo() ) );
+// menu->insertItem( i18n("Show &Info"), this, TQ_SLOT( showInfo() ) );
- menu->insertItem( i18n("&Edit..."), this, TQT_SLOT( edit() ) );
- menu->insertItem( i18n("&Remove"), this, TQT_SLOT( remove() ) );
+ menu->insertItem( i18n("&Edit..."), this, TQ_SLOT( edit() ) );
+ menu->insertItem( i18n("&Remove"), this, TQ_SLOT( remove() ) );
menu->insertSeparator();
}
- menu->insertItem( i18n("&Add..."), this, TQT_SLOT( add() ) );
+ menu->insertItem( i18n("&Add..."), this, TQ_SLOT( add() ) );
menu->popup( pos );
}
@@ -368,23 +368,23 @@ void ResourceSelection::updateView()
KPIM::ResourceABC* resource = dynamic_cast<KPIM::ResourceABC *>( *it );
if ( resource ) {
disconnect( resource, 0, this, 0 );
- connect( resource, TQT_SIGNAL( signalSubresourceAdded( KPIM::ResourceABC *,
+ connect( resource, TQ_SIGNAL( signalSubresourceAdded( KPIM::ResourceABC *,
const TQString &, const TQString & ) ),
- TQT_SLOT( slotSubresourceAdded( KPIM::ResourceABC *,
+ TQ_SLOT( slotSubresourceAdded( KPIM::ResourceABC *,
const TQString &, const TQString & ) ) );
- connect( resource, TQT_SIGNAL( signalSubresourceRemoved( KPIM::ResourceABC *,
+ connect( resource, TQ_SIGNAL( signalSubresourceRemoved( KPIM::ResourceABC *,
const TQString &, const TQString & ) ),
- TQT_SLOT( slotSubresourceRemoved( KPIM::ResourceABC *,
+ TQ_SLOT( slotSubresourceRemoved( KPIM::ResourceABC *,
const TQString &, const TQString & ) ) );
- connect( resource, TQT_SIGNAL( signalSubresourceChanged( KPIM::ResourceABC *,
+ connect( resource, TQ_SIGNAL( signalSubresourceChanged( KPIM::ResourceABC *,
const TQString &, const TQString & ) ),
- TQT_SLOT( slotSubresourceChanged( KPIM::ResourceABC *,
+ TQ_SLOT( slotSubresourceChanged( KPIM::ResourceABC *,
const TQString &, const TQString & ) ) );
- //connect( resource, TQT_SIGNAL( resourceSaved( KPIM::ResourceABC * ) ),
- // TQT_SLOT( closeResource( KPIM::ResourceABC * ) ) );
+ //connect( resource, TQ_SIGNAL( resourceSaved( KPIM::ResourceABC * ) ),
+ // TQ_SLOT( closeResource( KPIM::ResourceABC * ) ) );
item->createSubresourceItems();
}
}
diff --git a/kaddressbook/features/resourceselection.h b/kaddressbook/features/resourceselection.h
index a627fb51..f4914742 100644
--- a/kaddressbook/features/resourceselection.h
+++ b/kaddressbook/features/resourceselection.h
@@ -37,7 +37,7 @@ class ResourceItem;
class ResourceSelection : public KAB::ExtensionWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp
index 09c06ae4..684fe1e6 100644
--- a/kaddressbook/filtereditdialog.cpp
+++ b/kaddressbook/filtereditdialog.cpp
@@ -124,8 +124,8 @@ void FilterEditDialog::initGUI()
mNameEdit->setFocus();
topLayout->addWidget( label, 0, 0 );
topLayout->addWidget( mNameEdit, 0, 1 );
- connect( mNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( filterNameTextChanged( const TQString&) ) );
+ connect( mNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( filterNameTextChanged( const TQString&) ) );
mCategoriesView = new TDEListView( page );
mCategoriesView->addColumn( i18n( "Category" ) );
@@ -260,16 +260,16 @@ void FilterDialog::initGUI()
mFilterListBox = new TDEListBox( page );
topLayout->addWidget( mFilterListBox, 0, 0 );
- connect( mFilterListBox, TQT_SIGNAL( selectionChanged( TQListBoxItem * ) ),
- TQT_SLOT( selectionChanged( TQListBoxItem * ) ) );
- connect( mFilterListBox, TQT_SIGNAL( doubleClicked ( TQListBoxItem * ) ),
- TQT_SLOT( edit() ) );
-
- KButtonBox *buttonBox = new KButtonBox( page, Qt::Vertical );
- buttonBox->addButton( i18n( "&Add..." ), TQT_TQOBJECT(this), TQT_SLOT( add() ) );
- mEditButton = buttonBox->addButton( i18n( "&Edit..." ), TQT_TQOBJECT(this), TQT_SLOT( edit() ) );
+ connect( mFilterListBox, TQ_SIGNAL( selectionChanged( TQListBoxItem * ) ),
+ TQ_SLOT( selectionChanged( TQListBoxItem * ) ) );
+ connect( mFilterListBox, TQ_SIGNAL( doubleClicked ( TQListBoxItem * ) ),
+ TQ_SLOT( edit() ) );
+
+ KButtonBox *buttonBox = new KButtonBox( page, TQt::Vertical );
+ buttonBox->addButton( i18n( "&Add..." ), this, TQ_SLOT( add() ) );
+ mEditButton = buttonBox->addButton( i18n( "&Edit..." ), this, TQ_SLOT( edit() ) );
mEditButton->setEnabled( false );
- mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), TQT_TQOBJECT(this), TQT_SLOT( remove() ) );
+ mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, TQ_SLOT( remove() ) );
mRemoveButton->setEnabled( false );
buttonBox->layout();
diff --git a/kaddressbook/filtereditdialog.h b/kaddressbook/filtereditdialog.h
index 3e2c9acf..39698ad7 100644
--- a/kaddressbook/filtereditdialog.h
+++ b/kaddressbook/filtereditdialog.h
@@ -39,7 +39,7 @@ class TDEListView;
class FilterDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -70,7 +70,7 @@ class FilterDialog : public KDialogBase
class FilterEditDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
FilterEditDialog( TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/filterselectionwidget.cpp b/kaddressbook/filterselectionwidget.cpp
index 7daca0a4..41619cc5 100644
--- a/kaddressbook/filterselectionwidget.cpp
+++ b/kaddressbook/filterselectionwidget.cpp
@@ -38,8 +38,8 @@ FilterSelectionWidget::FilterSelectionWidget( TQWidget *parent, const char *name
mFilterCombo = new KComboBox( this );
label->setBuddy( mFilterCombo );
- connect( mFilterCombo, TQT_SIGNAL( activated( int ) ),
- this, TQT_SIGNAL( filterActivated( int ) ) );
+ connect( mFilterCombo, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SIGNAL( filterActivated( int ) ) );
}
FilterSelectionWidget::~FilterSelectionWidget()
diff --git a/kaddressbook/filterselectionwidget.h b/kaddressbook/filterselectionwidget.h
index 4e0c6728..f0ebba2a 100644
--- a/kaddressbook/filterselectionwidget.h
+++ b/kaddressbook/filterselectionwidget.h
@@ -35,7 +35,7 @@ class KComboBox;
*/
class FilterSelectionWidget : public TQHBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/freebusywidget.cpp b/kaddressbook/freebusywidget.cpp
index 491a9465..f1d11f0b 100644
--- a/kaddressbook/freebusywidget.cpp
+++ b/kaddressbook/freebusywidget.cpp
@@ -45,8 +45,8 @@ FreeBusyWidget::FreeBusyWidget( TDEABC::AddressBook *ab, TQWidget *parent, const
label->setBuddy( mURL );
layout->addWidget( mURL );
- connect( mURL, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( setModified() ) );
+ connect( mURL, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( setModified() ) );
}
FreeBusyWidget::~FreeBusyWidget()
diff --git a/kaddressbook/freebusywidget.h b/kaddressbook/freebusywidget.h
index d9c9ba50..1098b9af 100644
--- a/kaddressbook/freebusywidget.h
+++ b/kaddressbook/freebusywidget.h
@@ -30,7 +30,7 @@
class FreeBusyWidget : public KAB::ContactEditorWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp
index 8e9726c5..b364202e 100644
--- a/kaddressbook/geowidget.cpp
+++ b/kaddressbook/geowidget.cpp
@@ -84,21 +84,21 @@ GeoWidget::GeoWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *nam
mExtendedButton->setEnabled( false );
topLayout->addMultiCellWidget( mExtendedButton, 3, 3, 1, 2 );
- connect( mLatitudeBox, TQT_SIGNAL( valueChanged( double ) ),
- TQT_SLOT( setModified() ) );
- connect( mLongitudeBox, TQT_SIGNAL( valueChanged( double ) ),
- TQT_SLOT( setModified() ) );
- connect( mExtendedButton, TQT_SIGNAL( clicked() ),
- TQT_SLOT( editGeoData() ) );
-
- connect( mGeoIsValid, TQT_SIGNAL( toggled( bool ) ),
- mLatitudeBox, TQT_SLOT( setEnabled( bool ) ) );
- connect( mGeoIsValid, TQT_SIGNAL( toggled( bool ) ),
- mLongitudeBox, TQT_SLOT( setEnabled( bool ) ) );
- connect( mGeoIsValid, TQT_SIGNAL( toggled( bool ) ),
- mExtendedButton, TQT_SLOT( setEnabled( bool ) ) );
- connect( mGeoIsValid, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( setModified() ) );
+ connect( mLatitudeBox, TQ_SIGNAL( valueChanged( double ) ),
+ TQ_SLOT( setModified() ) );
+ connect( mLongitudeBox, TQ_SIGNAL( valueChanged( double ) ),
+ TQ_SLOT( setModified() ) );
+ connect( mExtendedButton, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( editGeoData() ) );
+
+ connect( mGeoIsValid, TQ_SIGNAL( toggled( bool ) ),
+ mLatitudeBox, TQ_SLOT( setEnabled( bool ) ) );
+ connect( mGeoIsValid, TQ_SIGNAL( toggled( bool ) ),
+ mLongitudeBox, TQ_SLOT( setEnabled( bool ) ) );
+ connect( mGeoIsValid, TQ_SIGNAL( toggled( bool ) ),
+ mExtendedButton, TQ_SLOT( setEnabled( bool ) ) );
+ connect( mGeoIsValid, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( setModified() ) );
}
GeoWidget::~GeoWidget()
@@ -174,7 +174,7 @@ GeoDialog::GeoDialog( TQWidget *parent, const char *name )
mCityCombo = new KComboBox( page );
topLayout->addWidget( mCityCombo, 0, 1 );
- TQGroupBox *sexagesimalGroup = new TQGroupBox( 0, Qt::Vertical, i18n( "Sexagesimal" ), page );
+ TQGroupBox *sexagesimalGroup = new TQGroupBox( 0, TQt::Vertical, i18n( "Sexagesimal" ), page );
TQGridLayout *sexagesimalLayout = new TQGridLayout( sexagesimalGroup->layout(),
2, 5, spacingHint() );
@@ -225,26 +225,26 @@ GeoDialog::GeoDialog( TQWidget *parent, const char *name )
loadCityList();
- connect( mMapWidget, TQT_SIGNAL( changed() ),
- TQT_SLOT( geoMapChanged() ) );
- connect( mCityCombo, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( cityInputChanged() ) );
- connect( mLatDegrees, TQT_SIGNAL( valueChanged( int ) ),
- TQT_SLOT( sexagesimalInputChanged() ) );
- connect( mLatMinutes, TQT_SIGNAL( valueChanged( int ) ),
- TQT_SLOT( sexagesimalInputChanged() ) );
- connect( mLatSeconds, TQT_SIGNAL( valueChanged( int ) ),
- TQT_SLOT( sexagesimalInputChanged() ) );
- connect( mLatDirection, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( sexagesimalInputChanged() ) );
- connect( mLongDegrees, TQT_SIGNAL( valueChanged( int ) ),
- TQT_SLOT( sexagesimalInputChanged() ) );
- connect( mLongMinutes, TQT_SIGNAL( valueChanged( int ) ),
- TQT_SLOT( sexagesimalInputChanged() ) );
- connect( mLongSeconds, TQT_SIGNAL( valueChanged( int ) ),
- TQT_SLOT( sexagesimalInputChanged() ) );
- connect( mLongDirection, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( sexagesimalInputChanged() ) );
+ connect( mMapWidget, TQ_SIGNAL( changed() ),
+ TQ_SLOT( geoMapChanged() ) );
+ connect( mCityCombo, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( cityInputChanged() ) );
+ connect( mLatDegrees, TQ_SIGNAL( valueChanged( int ) ),
+ TQ_SLOT( sexagesimalInputChanged() ) );
+ connect( mLatMinutes, TQ_SIGNAL( valueChanged( int ) ),
+ TQ_SLOT( sexagesimalInputChanged() ) );
+ connect( mLatSeconds, TQ_SIGNAL( valueChanged( int ) ),
+ TQ_SLOT( sexagesimalInputChanged() ) );
+ connect( mLatDirection, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( sexagesimalInputChanged() ) );
+ connect( mLongDegrees, TQ_SIGNAL( valueChanged( int ) ),
+ TQ_SLOT( sexagesimalInputChanged() ) );
+ connect( mLongMinutes, TQ_SIGNAL( valueChanged( int ) ),
+ TQ_SLOT( sexagesimalInputChanged() ) );
+ connect( mLongSeconds, TQ_SIGNAL( valueChanged( int ) ),
+ TQ_SLOT( sexagesimalInputChanged() ) );
+ connect( mLongDirection, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( sexagesimalInputChanged() ) );
TDEAcceleratorManager::manage( this );
}
diff --git a/kaddressbook/geowidget.h b/kaddressbook/geowidget.h
index 9694edcc..62742bb6 100644
--- a/kaddressbook/geowidget.h
+++ b/kaddressbook/geowidget.h
@@ -50,7 +50,7 @@ typedef struct {
class GeoWidget : public KAB::ContactEditorWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -77,7 +77,7 @@ class GeoWidget : public KAB::ContactEditorWidget
class GeoDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -123,7 +123,7 @@ class GeoDialog : public KDialogBase
class GeoMapWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index f10bf7b2..2ff5bdef 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -109,7 +109,7 @@ ImageButton::ImageButton( const TQString &title, TQWidget *parent )
{
setAcceptDrops( true );
- connect( this, TQT_SIGNAL( clicked() ), TQT_SLOT( load() ) );
+ connect( this, TQ_SIGNAL( clicked() ), TQ_SLOT( load() ) );
}
void ImageButton::setReadOnly( bool readOnly )
@@ -206,7 +206,7 @@ void ImageButton::mousePressEvent( TQMouseEvent *event )
void ImageButton::mouseMoveEvent( TQMouseEvent *event )
{
- if ( (event->state() & Qt::LeftButton) &&
+ if ( (event->state() & TQt::LeftButton) &&
(event->pos() - mDragStartPos).manhattanLength() >
TDEGlobalSettings::dndEventDelay() ) {
startDrag();
@@ -216,7 +216,7 @@ void ImageButton::mouseMoveEvent( TQMouseEvent *event )
void ImageButton::contextMenuEvent( TQContextMenuEvent *event )
{
TQPopupMenu menu( this );
- menu.insertItem( i18n( "Reset" ), this, TQT_SLOT( clear() ) );
+ menu.insertItem( i18n( "Reset" ), this, TQ_SLOT( clear() ) );
menu.exec( event->globalPos() );
}
@@ -254,7 +254,7 @@ ImageBaseWidget::ImageBaseWidget( const TQString &title,
TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint() );
- TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical, title, this );
+ TQGroupBox *box = new TQGroupBox( 0, TQt::Vertical, title, this );
TQVBoxLayout *layout = new TQVBoxLayout( box->layout(), KDialog::spacingHint() );
mImageButton = new ImageButton( i18n( "Picture" ), box );
@@ -264,7 +264,7 @@ ImageBaseWidget::ImageBaseWidget( const TQString &title,
topLayout->addWidget( box );
- connect( mImageButton, TQT_SIGNAL( changed() ), TQT_SIGNAL( changed() ) );
+ connect( mImageButton, TQ_SIGNAL( changed() ), TQ_SIGNAL( changed() ) );
}
ImageBaseWidget::~ImageBaseWidget()
@@ -302,8 +302,8 @@ ImageWidget::ImageWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char
mLogoWidget = new ImageBaseWidget( TDEABC::Addressee::logoLabel(), this );
layout->addWidget( mLogoWidget );
- connect( mPhotoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) );
- connect( mLogoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) );
+ connect( mPhotoWidget, TQ_SIGNAL( changed() ), TQ_SLOT( setModified() ) );
+ connect( mLogoWidget, TQ_SIGNAL( changed() ), TQ_SLOT( setModified() ) );
}
void ImageWidget::loadContact( TDEABC::Addressee *addr )
diff --git a/kaddressbook/imagewidget.h b/kaddressbook/imagewidget.h
index 77c26478..1cfcdd2d 100644
--- a/kaddressbook/imagewidget.h
+++ b/kaddressbook/imagewidget.h
@@ -37,7 +37,7 @@
*/
class ImageLoader : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -55,7 +55,7 @@ class ImageLoader : public TQObject
*/
class ImageButton : public TQPushButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -97,7 +97,7 @@ class ImageButton : public TQPushButton
class ImageBaseWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/imeditwidget.cpp b/kaddressbook/imeditwidget.cpp
index b7f812db..6f7ebf29 100644
--- a/kaddressbook/imeditwidget.cpp
+++ b/kaddressbook/imeditwidget.cpp
@@ -53,15 +53,15 @@ IMEditWidget::IMEditWidget( TQWidget *parent, TDEABC::Addressee &addr, const cha
topLayout->addWidget( label, 0, 0 );
mIMEdit = new KLineEdit( this );
- connect( mIMEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( textChanged( const TQString& ) ) );
- connect( mIMEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SIGNAL( modified() ) );
+ connect( mIMEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( textChanged( const TQString& ) ) );
+ connect( mIMEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SIGNAL( modified() ) );
label->setBuddy( mIMEdit );
topLayout->addWidget( mIMEdit, 0, 1 );
mEditButton = new TQPushButton( i18n( "Edit IM Addresses..." ), this);
- connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) );
+ connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( edit() ) );
topLayout->addMultiCellWidget( mEditButton, 1, 1, 0, 1 );
topLayout->activate();
diff --git a/kaddressbook/imeditwidget.h b/kaddressbook/imeditwidget.h
index ce6b1a94..571ca64d 100644
--- a/kaddressbook/imeditwidget.h
+++ b/kaddressbook/imeditwidget.h
@@ -43,7 +43,7 @@ class TDEListView;
*/
class IMEditWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp
index efd68ebd..96b655b4 100644
--- a/kaddressbook/incsearchwidget.cpp
+++ b/kaddressbook/incsearchwidget.cpp
@@ -73,18 +73,18 @@ IncSearchWidget::IncSearchWidget( TQWidget *parent, const char *name )
mInputTimer = new TQTimer( this );
- connect( mInputTimer, TQT_SIGNAL( timeout() ),
- TQT_SLOT( timeout() ) );
- connect( mSearchText, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( announceDoSearch() ) );
- connect( mSearchText, TQT_SIGNAL( returnPressed() ),
- TQT_SLOT( announceDoSearch() ) );
- connect( mFieldCombo, TQT_SIGNAL( activated( const TQString& ) ),
- TQT_SLOT( announceDoSearch() ) );
- connect( button, TQT_SIGNAL( clicked() ),
- mSearchText, TQT_SLOT( clear() ) );
- connect( button, TQT_SIGNAL( clicked() ),
- TQT_SLOT( announceDoSearch() ) );
+ connect( mInputTimer, TQ_SIGNAL( timeout() ),
+ TQ_SLOT( timeout() ) );
+ connect( mSearchText, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( announceDoSearch() ) );
+ connect( mSearchText, TQ_SIGNAL( returnPressed() ),
+ TQ_SLOT( announceDoSearch() ) );
+ connect( mFieldCombo, TQ_SIGNAL( activated( const TQString& ) ),
+ TQ_SLOT( announceDoSearch() ) );
+ connect( button, TQ_SIGNAL( clicked() ),
+ mSearchText, TQ_SLOT( clear() ) );
+ connect( button, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( announceDoSearch() ) );
initFields();
diff --git a/kaddressbook/incsearchwidget.h b/kaddressbook/incsearchwidget.h
index 3d573202..6f3c666d 100644
--- a/kaddressbook/incsearchwidget.h
+++ b/kaddressbook/incsearchwidget.h
@@ -34,7 +34,7 @@ class KLineEdit;
class IncSearchWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/interfaces/contacteditorwidget.h b/kaddressbook/interfaces/contacteditorwidget.h
index 6927c7a8..5c44e3ec 100644
--- a/kaddressbook/interfaces/contacteditorwidget.h
+++ b/kaddressbook/interfaces/contacteditorwidget.h
@@ -36,7 +36,7 @@ namespace KAB {
class KDE_EXPORT ContactEditorWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h
index 6632984d..1c578e23 100644
--- a/kaddressbook/interfaces/core.h
+++ b/kaddressbook/interfaces/core.h
@@ -54,7 +54,7 @@ class SearchManager;
class KDE_EXPORT Core : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -155,32 +155,32 @@ class KDE_EXPORT Core : public TQObject
virtual void setContactSelected( const TQString &uid ) = 0;
/**
- DCOP METHOD: Adds the given email address to address book.
+ DCOP method: Adds the given email address to address book.
*/
virtual void addEmail( const TQString& addr ) = 0;
/**
- DCOP METHOD: Imports the vCard, located at the given url.
+ DCOP method: Imports the vCard, located at the given url.
*/
virtual void importVCard( const KURL& url ) = 0;
/**
- DCOP METHOD: Imports the given vCard.
+ DCOP method: Imports the given vCard.
*/
virtual void importVCardFromData( const TQString& vCard ) = 0;
/**
- DCOP METHOD: Opens contact editor to input a new contact.
+ DCOP method: Opens contact editor to input a new contact.
*/
virtual void newContact() = 0;
/**
- DCOP METHOD: Opens distribution list editor to input a new distribution list.
+ DCOP method: Opens distribution list editor to input a new distribution list.
*/
virtual void newDistributionList() = 0;
/**
- DCOP METHOD: Returns the name of the contact, that matches the given
+ DCOP method: Returns the name of the contact, that matches the given
phone number.
*/
virtual TQString getNameByPhone( const TQString& phone ) = 0;
diff --git a/kaddressbook/interfaces/extensionwidget.h b/kaddressbook/interfaces/extensionwidget.h
index bcffc9b8..8422a3c2 100644
--- a/kaddressbook/interfaces/extensionwidget.h
+++ b/kaddressbook/interfaces/extensionwidget.h
@@ -38,7 +38,7 @@ class ConfigureWidget;
class KDE_EXPORT ExtensionWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp
index a2874e8c..ca7da285 100644
--- a/kaddressbook/interfaces/xxport.cpp
+++ b/kaddressbook/interfaces/xxport.cpp
@@ -50,10 +50,10 @@ XXPort::XXPort( TDEABC::AddressBook *ab, TQWidget *parent,
d->mExportMapper = new TQSignalMapper( this );
d->mImportMapper = new TQSignalMapper( this );
- connect( d->mExportMapper, TQT_SIGNAL( mapped( const TQString& ) ),
- TQT_SLOT( slotExportActivated( const TQString& ) ) );
- connect( d->mImportMapper, TQT_SIGNAL( mapped( const TQString& ) ),
- TQT_SLOT( slotImportActivated( const TQString& ) ) );
+ connect( d->mExportMapper, TQ_SIGNAL( mapped( const TQString& ) ),
+ TQ_SLOT( slotExportActivated( const TQString& ) ) );
+ connect( d->mImportMapper, TQ_SIGNAL( mapped( const TQString& ) ),
+ TQ_SLOT( slotImportActivated( const TQString& ) ) );
}
XXPort::~XXPort()
@@ -77,7 +77,7 @@ TDEABC::AddresseeList XXPort::importContacts( const TQString& ) const
void XXPort::createImportAction( const TQString &label, const TQString &data )
{
TQString id = "file_import_" + identifier() + ( data.isEmpty() ? TQString( "" ) : "_" + data );
- TDEAction *action = new TDEAction( label, 0, d->mImportMapper, TQT_SLOT( map() ), actionCollection(), id.latin1() );
+ TDEAction *action = new TDEAction( label, 0, d->mImportMapper, TQ_SLOT( map() ), actionCollection(), id.latin1() );
d->mImportMapper->setMapping( action, ( data.isEmpty() ? TQString( "<empty>" ) : data ) );
@@ -87,7 +87,7 @@ void XXPort::createImportAction( const TQString &label, const TQString &data )
void XXPort::createExportAction( const TQString &label, const TQString &data )
{
TQString id = "file_export_" + identifier() + ( data.isEmpty() ? TQString( "" ) : "_" + data );
- TDEAction *action = new TDEAction( label, 0, d->mExportMapper, TQT_SLOT( map() ), actionCollection(), id.latin1() );
+ TDEAction *action = new TDEAction( label, 0, d->mExportMapper, TQ_SLOT( map() ), actionCollection(), id.latin1() );
d->mExportMapper->setMapping( action, ( data.isEmpty() ? TQString( "<empty>" ) : data ) );
diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h
index a2220595..bed5b057 100644
--- a/kaddressbook/interfaces/xxport.h
+++ b/kaddressbook/interfaces/xxport.h
@@ -67,7 +67,7 @@ namespace KAB {
class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp
index 878fff5d..f58546ca 100644
--- a/kaddressbook/jumpbuttonbar.cpp
+++ b/kaddressbook/jumpbuttonbar.cpp
@@ -72,7 +72,7 @@ JumpButtonBar::JumpButtonBar( KAB::Core *core, TQWidget *parent, const char *nam
layout->setAutoAdd( true );
layout->setResizeMode( TQLayout::FreeResize );
- mGroupBox = new TQButtonGroup( 1, Qt::Horizontal, this );
+ mGroupBox = new TQButtonGroup( 1, TQt::Horizontal, this );
mGroupBox->setExclusive( true );
mGroupBox->layout()->setSpacing( 0 );
mGroupBox->layout()->setMargin( 0 );
@@ -98,7 +98,7 @@ void JumpButtonBar::updateButtons()
TQFontMetrics fm = fontMetrics();
TQPushButton *btn = new TQPushButton( "", this );
btn->hide();
- TQSize buttonSize = style().tqsizeFromContents( TQStyle::CT_PushButton, btn,
+ TQSize buttonSize = style().sizeFromContents( TQStyle::CT_PushButton, btn,
fm.size( ShowPrefix, "X - X") ).
expandedTo( TQApplication::globalStrut() );
delete btn;
@@ -132,7 +132,7 @@ void JumpButtonBar::updateButtons()
for ( uint i = 0; i < characters.count(); ++i ) {
JumpButton *button = new JumpButton( characters[ i ], TQString(),
mGroupBox );
- connect( button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( letterClicked() ) );
+ connect( button, TQ_SIGNAL( clicked() ), this, TQ_SLOT( letterClicked() ) );
mButtons.append( button );
button->show();
}
@@ -151,7 +151,7 @@ void JumpButtonBar::updateButtons()
if ( characters.count() - current <= possibleButtons - i ) {
JumpButton *button = new JumpButton( characters[ current ],
TQString(), mGroupBox );
- connect( button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( letterClicked() ) );
+ connect( button, TQ_SIGNAL( clicked() ), this, TQ_SLOT( letterClicked() ) );
mButtons.append( button );
button->show();
current++;
@@ -163,7 +163,7 @@ void JumpButtonBar::updateButtons()
range.append( characters[ j ] );
JumpButton *button = new JumpButton( characters[ current ],
characters[ pos ], mGroupBox );
- connect( button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( letterClicked() ) );
+ connect( button, TQ_SIGNAL( clicked() ), this, TQ_SLOT( letterClicked() ) );
mButtons.append( button );
button->show();
current = ( i + 1 ) * offset;
diff --git a/kaddressbook/jumpbuttonbar.h b/kaddressbook/jumpbuttonbar.h
index 48a52018..4be2fafc 100644
--- a/kaddressbook/jumpbuttonbar.h
+++ b/kaddressbook/jumpbuttonbar.h
@@ -46,7 +46,7 @@ class Field;
*/
class JumpButtonBar : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 2f60f046..85b08976 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -94,7 +94,7 @@
KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent,
const TQString &file, const char *name )
- : KAB::Core( client, TQT_TQOBJECT(parent), name ), mStatusBar( 0 ), mViewManager( 0 ),
+ : KAB::Core( client, parent, name ), mStatusBar( 0 ), mViewManager( 0 ),
mExtensionManager( 0 ), mJumpButtonBar( 0 ), mCategorySelectDialog( 0 ),
mCategoryEditDialog( 0 ), mLdapSearchDialog( 0 ), mReadWrite( readWrite ),
mModified( false )
@@ -104,8 +104,8 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent,
mIsPart = !parent->isA( "KAddressBookMain" );
mAddressBookChangedTimer = new TQTimer( this );
- connect( mAddressBookChangedTimer, TQT_SIGNAL( timeout() ),
- this, TQT_SLOT( addressBookChanged() ) );
+ connect( mAddressBookChangedTimer, TQ_SIGNAL( timeout() ),
+ this, TQ_SLOT( addressBookChanged() ) );
if ( file.isEmpty() ) {
mAddressBook = TDEABC::StdAddressBook::self( true );
@@ -140,51 +140,51 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent,
mAddressBook->addCustomField( i18n( "Blog" ), TDEABC::Field::Personal,
"BlogFeed", "KADDRESSBOOK" );
- mSearchManager = new KAB::SearchManager( mAddressBook, TQT_TQOBJECT(parent) );
+ mSearchManager = new KAB::SearchManager( mAddressBook, parent );
- connect( mSearchManager, TQT_SIGNAL( contactsUpdated() ),
- this, TQT_SLOT( slotContactsUpdated() ) );
+ connect( mSearchManager, TQ_SIGNAL( contactsUpdated() ),
+ this, TQ_SLOT( slotContactsUpdated() ) );
initGUI();
- connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook* ) ),
- TQT_SLOT( delayedAddressBookChanged() ) );
- connect( mAddressBook, TQT_SIGNAL( loadingFinished( Resource* ) ),
- TQT_SLOT( delayedAddressBookChanged() ) );
+ connect( mAddressBook, TQ_SIGNAL( addressBookChanged( AddressBook* ) ),
+ TQ_SLOT( delayedAddressBookChanged() ) );
+ connect( mAddressBook, TQ_SIGNAL( loadingFinished( Resource* ) ),
+ TQ_SLOT( delayedAddressBookChanged() ) );
mIncSearchWidget->setFocus();
- connect( mViewManager, TQT_SIGNAL( selected( const TQString& ) ),
- TQT_SLOT( setContactSelected( const TQString& ) ) );
- connect( mViewManager, TQT_SIGNAL( executed( const TQString& ) ),
- TQT_SLOT( editContact( const TQString& ) ) );
- connect( mViewManager, TQT_SIGNAL( modified() ),
- TQT_SLOT( setModified() ) );
- connect( mViewManager, TQT_SIGNAL( urlDropped( const KURL& ) ),
- mXXPortManager, TQT_SLOT( importVCard( const KURL& ) ) );
- connect( mViewManager, TQT_SIGNAL( viewFieldsChanged() ),
- TQT_SLOT( updateIncSearchWidget() ) );
- connect( mExtensionManager, TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ),
- this, TQT_SLOT( extensionModified( const TDEABC::Addressee::List& ) ) );
- connect( mExtensionManager, TQT_SIGNAL( deleted( const TQStringList& ) ),
- this, TQT_SLOT( extensionDeleted( const TQStringList& ) ) );
-
- connect( mXXPortManager, TQT_SIGNAL( modified() ),
- TQT_SLOT( setModified() ) );
-
- connect( mDetailsViewer, TQT_SIGNAL( highlightedMessage( const TQString& ) ),
- TQT_SLOT( detailsHighlighted( const TQString& ) ) );
-
- connect( mIncSearchWidget, TQT_SIGNAL( scrollUp() ),
- mViewManager, TQT_SLOT( scrollUp() ) );
- connect( mIncSearchWidget, TQT_SIGNAL( scrollDown() ),
- mViewManager, TQT_SLOT( scrollDown() ) );
+ connect( mViewManager, TQ_SIGNAL( selected( const TQString& ) ),
+ TQ_SLOT( setContactSelected( const TQString& ) ) );
+ connect( mViewManager, TQ_SIGNAL( executed( const TQString& ) ),
+ TQ_SLOT( editContact( const TQString& ) ) );
+ connect( mViewManager, TQ_SIGNAL( modified() ),
+ TQ_SLOT( setModified() ) );
+ connect( mViewManager, TQ_SIGNAL( urlDropped( const KURL& ) ),
+ mXXPortManager, TQ_SLOT( importVCard( const KURL& ) ) );
+ connect( mViewManager, TQ_SIGNAL( viewFieldsChanged() ),
+ TQ_SLOT( updateIncSearchWidget() ) );
+ connect( mExtensionManager, TQ_SIGNAL( modified( const TDEABC::Addressee::List& ) ),
+ this, TQ_SLOT( extensionModified( const TDEABC::Addressee::List& ) ) );
+ connect( mExtensionManager, TQ_SIGNAL( deleted( const TQStringList& ) ),
+ this, TQ_SLOT( extensionDeleted( const TQStringList& ) ) );
+
+ connect( mXXPortManager, TQ_SIGNAL( modified() ),
+ TQ_SLOT( setModified() ) );
+
+ connect( mDetailsViewer, TQ_SIGNAL( highlightedMessage( const TQString& ) ),
+ TQ_SLOT( detailsHighlighted( const TQString& ) ) );
+
+ connect( mIncSearchWidget, TQ_SIGNAL( scrollUp() ),
+ mViewManager, TQ_SLOT( scrollUp() ) );
+ connect( mIncSearchWidget, TQ_SIGNAL( scrollDown() ),
+ mViewManager, TQ_SLOT( scrollDown() ) );
mAddressBookService = new KAddressBookService( this );
mCommandHistory = new KCommandHistory( actionCollection(), true );
- connect( mCommandHistory, TQT_SIGNAL( commandExecuted() ),
- mSearchManager, TQT_SLOT( reload() ) );
+ connect( mCommandHistory, TQ_SIGNAL( commandExecuted() ),
+ mSearchManager, TQ_SLOT( reload() ) );
mSearchManager->reload();
@@ -1026,10 +1026,10 @@ void KABCore::openLDAPDialog()
if ( !mLdapSearchDialog ) {
mLdapSearchDialog = new LDAPSearchDialog( mAddressBook, this, mWidget );
- connect( mLdapSearchDialog, TQT_SIGNAL( addresseesAdded() ),
- TQT_SLOT( addressBookChanged() ) );
- connect( mLdapSearchDialog, TQT_SIGNAL( addresseesAdded() ),
- TQT_SLOT( setModified() ) );
+ connect( mLdapSearchDialog, TQ_SIGNAL( addresseesAdded() ),
+ TQ_SLOT( addressBookChanged() ) );
+ connect( mLdapSearchDialog, TQ_SIGNAL( addresseesAdded() ),
+ TQ_SLOT( setModified() ) );
} else
mLdapSearchDialog->restoreSettings();
@@ -1043,8 +1043,8 @@ void KABCore::configure()
saveSettings();
KCMultiDialog dlg( mWidget, "", true );
- connect( &dlg, TQT_SIGNAL( configCommitted() ),
- this, TQT_SLOT( configurationChanged() ) );
+ connect( &dlg, TQ_SIGNAL( configCommitted() ),
+ this, TQ_SLOT( configurationChanged() ) );
dlg.addModule( "kabconfig.desktop" );
dlg.addModule( "kabldapconfig.desktop" );
@@ -1157,10 +1157,10 @@ AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( TQWidget *parent,
{
AddresseeEditorDialog *dialog = new AddresseeEditorDialog( this, parent,
name ? name : "editorDialog" );
- connect( dialog, TQT_SIGNAL( contactModified( const TDEABC::Addressee& ) ),
- TQT_SLOT( contactModified( const TDEABC::Addressee& ) ) );
- connect( dialog, TQT_SIGNAL( editorDestroyed( const TQString& ) ),
- TQT_SLOT( slotEditorDestroyed( const TQString& ) ) );
+ connect( dialog, TQ_SIGNAL( contactModified( const TDEABC::Addressee& ) ),
+ TQ_SLOT( contactModified( const TDEABC::Addressee& ) ) );
+ connect( dialog, TQ_SIGNAL( editorDestroyed( const TQString& ) ),
+ TQ_SLOT( slotEditorDestroyed( const TQString& ) ) );
return dialog;
}
@@ -1199,23 +1199,23 @@ void KABCore::initGUI()
searchTB->boxLayout()->setSpacing( KDialog::spacingHint() );
mIncSearchWidget = new IncSearchWidget( searchTB, "tde toolbar widget");
searchTB->setStretchableWidget( mIncSearchWidget );
- connect( mIncSearchWidget, TQT_SIGNAL( doSearch( const TQString& ) ),
- TQT_SLOT( incrementalTextSearch( const TQString& ) ) );
+ connect( mIncSearchWidget, TQ_SIGNAL( doSearch( const TQString& ) ),
+ TQ_SLOT( incrementalTextSearch( const TQString& ) ) );
mDetailsSplitter = new TQSplitter( mWidget );
mLeftSplitter = new TQSplitter( mDetailsSplitter );
- mLeftSplitter->setOrientation( KABPrefs::instance()->contactListAboveExtensions() ? Qt::Vertical : Qt::Horizontal );
+ mLeftSplitter->setOrientation( KABPrefs::instance()->contactListAboveExtensions() ? TQt::Vertical : TQt::Horizontal );
topLayout->addWidget( searchTB );
topLayout->addWidget( mDetailsSplitter );
mDetailsStack = new TQWidgetStack( mDetailsSplitter );
mExtensionManager = new ExtensionManager( new TQWidget( mLeftSplitter ), mDetailsStack, this, this );
- connect( mExtensionManager, TQT_SIGNAL( detailsWidgetDeactivated( TQWidget* ) ),
- this, TQT_SLOT( deactivateDetailsWidget( TQWidget* ) ) );
- connect( mExtensionManager, TQT_SIGNAL( detailsWidgetActivated( TQWidget* ) ),
- this, TQT_SLOT( activateDetailsWidget( TQWidget* ) ) );
+ connect( mExtensionManager, TQ_SIGNAL( detailsWidgetDeactivated( TQWidget* ) ),
+ this, TQ_SLOT( deactivateDetailsWidget( TQWidget* ) ) );
+ connect( mExtensionManager, TQ_SIGNAL( detailsWidgetActivated( TQWidget* ) ),
+ this, TQ_SLOT( activateDetailsWidget( TQWidget* ) ) );
TQWidget *viewWidget = new TQWidget( mLeftSplitter );
if ( KABPrefs::instance()->contactListAboveExtensions() )
@@ -1244,8 +1244,8 @@ void KABCore::initGUI()
i18n( "Click this button if you want to add more contacts to "
"the current distribution list. You will be shown a dialog that allows "
"to enter a list of existing contacts to this distribution list." ) );
- connect( mAddDistListButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( editSelectedDistributionList() ) );
+ connect( mAddDistListButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( editSelectedDistributionList() ) );
buttonLayout->addWidget( mAddDistListButton );
mDistListButtonWidget->setShown( false );
viewLayout->addWidget( mDistListButtonWidget );
@@ -1257,16 +1257,16 @@ void KABCore::initGUI()
TQWhatsThis::add( mRemoveDistListButton,
i18n( "Click this button if you want to remove the selected contacts from "
"the current distribution list." ) );
- connect( mRemoveDistListButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( removeSelectedContactsFromDistList() ) );
+ connect( mRemoveDistListButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( removeSelectedContactsFromDistList() ) );
buttonLayout->addWidget( mRemoveDistListButton );
#endif
mFilterSelectionWidget = new FilterSelectionWidget( searchTB , "tde toolbar widget" );
mViewManager->setFilterSelectionWidget( mFilterSelectionWidget );
- connect( mFilterSelectionWidget, TQT_SIGNAL( filterActivated( int ) ),
- mViewManager, TQT_SLOT( setActiveFilter( int ) ) );
+ connect( mFilterSelectionWidget, TQ_SIGNAL( filterActivated( int ) ),
+ mViewManager, TQ_SLOT( setActiveFilter( int ) ) );
mDetailsWidget = new TQWidget( mDetailsSplitter );
mDetailsLayout = new TQHBoxLayout( mDetailsWidget );
@@ -1280,19 +1280,19 @@ void KABCore::initGUI()
detailsPageLayout->addWidget( mDetailsViewer );
mDistListEntryView = new KAB::DistributionListEntryView( this, mWidget );
- connect( mDistListEntryView, TQT_SIGNAL( distributionListClicked( const TQString& ) ),
- this, TQT_SLOT( sendMailToDistributionList( const TQString& ) ) );
+ connect( mDistListEntryView, TQ_SIGNAL( distributionListClicked( const TQString& ) ),
+ this, TQ_SLOT( sendMailToDistributionList( const TQString& ) ) );
mDetailsStack->addWidget( mDistListEntryView );
mDetailsStack->addWidget( mDetailsWidget );
mDetailsStack->raiseWidget( mDetailsWidget );
mDetailsSplitter->moveToLast( mDetailsStack );
- connect( mDetailsViewer, TQT_SIGNAL( addressClicked( const TQString&) ),
- this, TQT_SLOT( showContactsAddress( const TQString& ) ) );
+ connect( mDetailsViewer, TQ_SIGNAL( addressClicked( const TQString&) ),
+ this, TQ_SLOT( showContactsAddress( const TQString& ) ) );
topLayout->setStretchFactor( mDetailsSplitter, 1 );
- mXXPortManager = new XXPortManager( this, TQT_TQOBJECT(mWidget) );
+ mXXPortManager = new XXPortManager( this, mWidget );
initActions();
}
@@ -1303,62 +1303,62 @@ void KABCore::createJumpButtonBar()
mDetailsLayout->addWidget( mJumpButtonBar );
mDetailsLayout->setStretchFactor( mJumpButtonBar, 1 );
- connect( mJumpButtonBar, TQT_SIGNAL( jumpToLetter( const TQString& ) ),
- TQT_SLOT( incrementalJumpButtonSearch( const TQString& ) ) );
- connect( mViewManager, TQT_SIGNAL( sortFieldChanged() ),
- mJumpButtonBar, TQT_SLOT( updateButtons() ) );
+ connect( mJumpButtonBar, TQ_SIGNAL( jumpToLetter( const TQString& ) ),
+ TQ_SLOT( incrementalJumpButtonSearch( const TQString& ) ) );
+ connect( mViewManager, TQ_SIGNAL( sortFieldChanged() ),
+ mJumpButtonBar, TQ_SLOT( updateButtons() ) );
}
void KABCore::initActions()
{
- connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
- TQT_SLOT( clipboardDataChanged() ) );
+ connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ),
+ TQ_SLOT( clipboardDataChanged() ) );
TDEAction *action;
// file menu
mActionMail = new TDEAction( i18n( "&Send Email to Contact..." ), "mail-send", 0,
- this, TQT_SLOT( sendMail() ), actionCollection(), "file_mail" );
- action = KStdAction::print( this, TQT_SLOT( print() ), actionCollection() );
+ this, TQ_SLOT( sendMail() ), actionCollection(), "file_mail" );
+ action = KStdAction::print( this, TQ_SLOT( print() ), actionCollection() );
mActionMail->setWhatsThis( i18n( "Send a mail to all selected contacts." ) );
action->setWhatsThis( i18n( "Print a special number of contacts." ) );
mActionSave = KStdAction::save( this,
- TQT_SLOT( save() ), actionCollection(), "file_sync" );
+ TQ_SLOT( save() ), actionCollection(), "file_sync" );
mActionSave->setWhatsThis( i18n( "Save all changes of the address book to the storage backend." ) );
action = new TDEAction( i18n( "&New Contact..." ), "identity", CTRL+Key_N, this,
- TQT_SLOT( newContact() ), actionCollection(), "file_new_contact" );
+ TQ_SLOT( newContact() ), actionCollection(), "file_new_contact" );
action->setWhatsThis( i18n( "Create a new contact<p>You will be presented with a dialog where you can add all data about a person, including addresses and phone numbers." ) );
action = new TDEAction( i18n( "&New Distribution List..." ), "kontact_contacts", 0, this,
- TQT_SLOT( newDistributionList() ), actionCollection(), "file_new_distributionlist" );
+ TQ_SLOT( newDistributionList() ), actionCollection(), "file_new_distributionlist" );
action->setWhatsThis( i18n( "Create a new distribution list<p>You will be presented with a dialog where you can create a new distribution list." ) );
mActionMailVCard = new TDEAction( i18n("Send &Contact..."), "mail_post_to", 0,
- this, TQT_SLOT( mailVCard() ),
+ this, TQ_SLOT( mailVCard() ),
actionCollection(), "file_mail_vcard" );
mActionMailVCard->setWhatsThis( i18n( "Send a mail with the selected contact as attachment." ) );
mActionChat = new TDEAction( i18n("Chat &With..."), 0,
- this, TQT_SLOT( startChat() ),
+ this, TQ_SLOT( startChat() ),
actionCollection(), "file_chat" );
mActionChat->setWhatsThis( i18n( "Start a chat with the selected contact." ) );
mActionEditAddressee = new TDEAction( i18n( "&Edit Contact..." ), "edit", 0,
- this, TQT_SLOT( editContact() ),
+ this, TQ_SLOT( editContact() ),
actionCollection(), "file_properties" );
mActionEditAddressee->setWhatsThis( i18n( "Edit a contact<p>You will be presented with a dialog where you can change all data about a person, including addresses and phone numbers." ) );
mActionMerge = new TDEAction( i18n( "&Merge Contacts" ), "", 0,
- this, TQT_SLOT( mergeContacts() ),
+ this, TQ_SLOT( mergeContacts() ),
actionCollection(), "edit_merge" );
// edit menu
- mActionCopy = KStdAction::copy( this, TQT_SLOT( copyContacts() ), actionCollection() );
- mActionCut = KStdAction::cut( this, TQT_SLOT( cutContacts() ), actionCollection() );
- mActionPaste = KStdAction::paste( this, TQT_SLOT( pasteContacts() ), actionCollection() );
- action = KStdAction::selectAll( this, TQT_SLOT( selectAllContacts() ), actionCollection() );
+ mActionCopy = KStdAction::copy( this, TQ_SLOT( copyContacts() ), actionCollection() );
+ mActionCut = KStdAction::cut( this, TQ_SLOT( cutContacts() ), actionCollection() );
+ mActionPaste = KStdAction::paste( this, TQ_SLOT( pasteContacts() ), actionCollection() );
+ action = KStdAction::selectAll( this, TQ_SLOT( selectAllContacts() ), actionCollection() );
mActionCopy->setWhatsThis( i18n( "Copy the currently selected contact(s) to system clipboard in vCard format." ) );
mActionCut->setWhatsThis( i18n( "Cuts the currently selected contact(s) to system clipboard in vCard format." ) );
mActionPaste->setWhatsThis( i18n( "Paste the previously cut or copied contacts from clipboard." ) );
@@ -1367,19 +1367,19 @@ void KABCore::initActions()
// mActionRedo->setWhatsThis( i18n( "Redoes the last <b>Cut</b>, <b>Copy</b> or <b>Paste</b>." ) );
mActionDelete = new TDEAction( i18n( "&Delete Contact" ), "edit-delete",
- Key_Delete, this, TQT_SLOT( deleteContacts() ),
+ Key_Delete, this, TQ_SLOT( deleteContacts() ),
actionCollection(), "edit_delete" );
mActionDelete->setWhatsThis( i18n( "Delete all selected contacts." ) );
mActionCopyAddresseeTo = new TDEAction( i18n( "&Copy Contact To..." ), "", 0,
- this, TQT_SLOT( copySelectedContactToResource() ),
+ this, TQ_SLOT( copySelectedContactToResource() ),
actionCollection(), "copy_contact_to" );
const TQString copyMoveWhatsThis = i18n( "Store a contact in a different Addressbook<p>You will be presented with a dialog where you can select a new storage place for this contact." );
mActionCopyAddresseeTo->setWhatsThis( copyMoveWhatsThis );
mActionMoveAddresseeTo = new TDEAction( i18n( "M&ove Contact To..." ), "", 0,
- this, TQT_SLOT( moveSelectedContactToResource() ),
+ this, TQ_SLOT( moveSelectedContactToResource() ),
actionCollection(), "move_contact_to" );
mActionMoveAddresseeTo->setWhatsThis( copyMoveWhatsThis );
@@ -1388,41 +1388,41 @@ void KABCore::initActions()
actionCollection(), "options_show_jump_bar" );
mActionJumpBar->setWhatsThis( i18n( "Toggle whether the jump button bar shall be visible." ) );
mActionJumpBar->setCheckedState( i18n( "Hide Jump Bar") );
- connect( mActionJumpBar, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( setJumpButtonBarVisible( bool ) ) );
+ connect( mActionJumpBar, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( setJumpButtonBarVisible( bool ) ) );
mActionDetails = new TDEToggleAction( i18n( "Show Details" ), 0, 0,
actionCollection(), "options_show_details" );
mActionDetails->setWhatsThis( i18n( "Toggle whether the details page shall be visible." ) );
mActionDetails->setCheckedState( i18n( "Hide Details") );
- connect( mActionDetails, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( setDetailsVisible( bool ) ) );
+ connect( mActionDetails, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( setDetailsVisible( bool ) ) );
if ( mIsPart )
action = new TDEAction( i18n( "&Configure Address Book..." ), "configure", 0,
- this, TQT_SLOT( configure() ), actionCollection(),
+ this, TQ_SLOT( configure() ), actionCollection(),
"kaddressbook_configure" );
else
- action = KStdAction::preferences( this, TQT_SLOT( configure() ), actionCollection() );
+ action = KStdAction::preferences( this, TQ_SLOT( configure() ), actionCollection() );
action->setWhatsThis( i18n( "You will be presented with a dialog, that offers you all possibilities to configure KAddressBook." ) );
// misc
action = new TDEAction( i18n( "&Lookup Addresses in LDAP Directory..." ), "edit-find", 0,
- this, TQT_SLOT( openLDAPDialog() ), actionCollection(), "ldap_lookup" );
+ this, TQ_SLOT( openLDAPDialog() ), actionCollection(), "ldap_lookup" );
action->setWhatsThis( i18n( "Search for contacts on a LDAP server<p>You will be presented with a dialog, where you can search for contacts and select the ones you want to add to your local address book." ) );
mActionWhoAmI = new TDEAction( i18n( "Set as Personal Contact Data" ), "preferences-desktop-personal", 0, this,
- TQT_SLOT( setWhoAmI() ), actionCollection(),
+ TQ_SLOT( setWhoAmI() ), actionCollection(),
"edit_set_personal" );
mActionWhoAmI->setWhatsThis( i18n( "Set the personal contact<p>The data of this contact will be used in many other TDE applications, so you do not have to input your personal data several times." ) );
mActionCategories = new TDEAction( i18n( "Select Categories..." ), 0, this,
- TQT_SLOT( setCategories() ), actionCollection(),
+ TQ_SLOT( setCategories() ), actionCollection(),
"edit_set_categories" );
mActionCategories->setWhatsThis( i18n( "Set the categories for all selected contacts." ) );
TDEAction *clearLocation = new TDEAction( i18n( "Clear Search Bar" ),
TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase",
- CTRL+Key_L, this, TQT_SLOT( slotClearSearchBar() ), actionCollection(), "clear_search" );
+ CTRL+Key_L, this, TQ_SLOT( slotClearSearchBar() ), actionCollection(), "clear_search" );
clearLocation->setWhatsThis( i18n( "Clear Search Bar<p>"
"Clears the content of the quick search bar." ) );
@@ -1490,9 +1490,9 @@ void KABCore::setCategories()
// Show the category dialog
if ( mCategorySelectDialog == 0 ) {
mCategorySelectDialog = new KPIM::CategorySelectDialog( KABPrefs::instance(), mWidget );
- connect( mCategorySelectDialog, TQT_SIGNAL( categoriesSelected( const TQStringList& ) ),
- TQT_SLOT( categoriesSelected( const TQStringList& ) ) );
- connect( mCategorySelectDialog, TQT_SIGNAL( editCategories() ), TQT_SLOT( editCategories() ) );
+ connect( mCategorySelectDialog, TQ_SIGNAL( categoriesSelected( const TQStringList& ) ),
+ TQ_SLOT( categoriesSelected( const TQStringList& ) ) );
+ connect( mCategorySelectDialog, TQ_SIGNAL( editCategories() ), TQ_SLOT( editCategories() ) );
}
mCategorySelectDialog->show();
@@ -1537,8 +1537,8 @@ void KABCore::editCategories()
{
if ( mCategoryEditDialog == 0 ) {
mCategoryEditDialog = new KPIM::CategoryEditDialog( KABPrefs::instance(), mWidget );
- connect( mCategoryEditDialog, TQT_SIGNAL( categoryConfigChanged() ),
- mCategorySelectDialog, TQT_SLOT( updateCategoryConfig() ) );
+ connect( mCategoryEditDialog, TQ_SIGNAL( categoryConfigChanged() ),
+ mCategorySelectDialog, TQ_SLOT( updateCategoryConfig() ) );
}
mCategoryEditDialog->show();
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 40ce444e..43ce8bb3 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -82,7 +82,7 @@ typedef struct {
class KDE_EXPORT KABCore : public KAB::Core
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -293,38 +293,38 @@ class KDE_EXPORT KABCore : public KAB::Core
void contactModified( const TDEABC::Addressee &addr );
/**
- DCOP METHOD: Adds the given email address to address book.
+ DCOP method: Adds the given email address to address book.
*/
virtual void addEmail( const TQString& addr );
/**
- DCOP METHOD: Imports the vCard, located at the given url.
+ DCOP method: Imports the vCard, located at the given url.
*/
virtual void importVCard( const KURL& url );
/**
- DCOP METHOD: Imports the given vCard.
+ DCOP method: Imports the given vCard.
*/
virtual void importVCardFromData( const TQString& vCard );
/**
- DCOP METHOD: Opens contact editor to input a new contact.
+ DCOP method: Opens contact editor to input a new contact.
*/
virtual void newContact();
/**
- DCOP METHOD: Opens distribution list editor to create a new distribution list
+ DCOP method: Opens distribution list editor to create a new distribution list
*/
virtual void newDistributionList();
/**
- DCOP METHOD: Returns the name of the contact, that matches the given
+ DCOP method: Returns the name of the contact, that matches the given
phone number.
*/
virtual TQString getNameByPhone( const TQString& phone );
/**
- DCOP METHOD: Handle command line arguments, return true if handled
+ DCOP method: Handle command line arguments, return true if handled
and false if no args was given. The iface is either the mainwin or the part.
*/
bool handleCommandLine( KAddressBookIface* iface );
diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp
index 566ffd71..ec815ff6 100644
--- a/kaddressbook/kaddressbook_part.cpp
+++ b/kaddressbook/kaddressbook_part.cpp
@@ -51,7 +51,7 @@ KAddressbookPart::KAddressbookPart( TQWidget *parentWidget, const char *widgetNa
// create a canvas to insert our widget
TQWidget *canvas = new TQWidget( parentWidget, widgetName );
- canvas->setFocusPolicy( TQ_ClickFocus );
+ canvas->setFocusPolicy( TQWidget::ClickFocus );
setWidget( canvas );
TQVBoxLayout *topLayout = new TQVBoxLayout( canvas );
diff --git a/kaddressbook/kaddressbook_part.h b/kaddressbook/kaddressbook_part.h
index 1a161c11..7bac322a 100644
--- a/kaddressbook/kaddressbook_part.h
+++ b/kaddressbook/kaddressbook_part.h
@@ -36,7 +36,7 @@ class KABCore;
class KAddressbookPart: public KParts::ReadOnlyPart, virtual public KAddressBookIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp
index bfcea2b6..ca6df18b 100644
--- a/kaddressbook/kaddressbookmain.cpp
+++ b/kaddressbook/kaddressbookmain.cpp
@@ -150,13 +150,13 @@ bool KAddressBookMain::queryClose()
void KAddressBookMain::initActions()
{
- KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
+ KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() );
TDEAction *action;
- action = KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( configureKeyBindings() ), actionCollection() );
+ action = KStdAction::keyBindings( this, TQ_SLOT( configureKeyBindings() ), actionCollection() );
action->setWhatsThis( i18n( "You will be presented with a dialog, where you can configure the application wide shortcuts." ) );
- KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( configureToolbars() ), actionCollection() );
+ KStdAction::configureToolbars( this, TQ_SLOT( configureToolbars() ), actionCollection() );
}
void KAddressBookMain::configureKeyBindings()
@@ -177,8 +177,8 @@ void KAddressBookMain::configureToolbars()
saveMainWindowSettings( TDEGlobal::config(), "MainWindow" );
KEditToolbar edit( factory() );
- connect( &edit, TQT_SIGNAL( newToolbarConfig() ),
- this, TQT_SLOT( newToolbarConfig() ) );
+ connect( &edit, TQ_SIGNAL( newToolbarConfig() ),
+ this, TQ_SLOT( newToolbarConfig() ) );
edit.exec();
}
diff --git a/kaddressbook/kaddressbookmain.h b/kaddressbook/kaddressbookmain.h
index 90420659..0bc2aa39 100644
--- a/kaddressbook/kaddressbookmain.h
+++ b/kaddressbook/kaddressbookmain.h
@@ -44,7 +44,7 @@ class KABCore;
*/
class KAddressBookMain : public TDEMainWindow, virtual public KAddressBookIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp
index d86103db..07df33b6 100644
--- a/kaddressbook/kaddressbookview.cpp
+++ b/kaddressbook/kaddressbookview.cpp
@@ -43,8 +43,8 @@ KAddressBookView::KAddressBookView( KAB::Core *core, TQWidget *parent,
{
initGUI();
- connect( mCore->searchManager(), TQT_SIGNAL( contactsUpdated() ),
- TQT_SLOT( updateView() ) );
+ connect( mCore->searchManager(), TQ_SIGNAL( contactsUpdated() ),
+ TQ_SLOT( updateView() ) );
}
KAddressBookView::~KAddressBookView()
diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h
index 8071b8af..668c5a1d 100644
--- a/kaddressbook/kaddressbookview.h
+++ b/kaddressbook/kaddressbookview.h
@@ -55,7 +55,7 @@ namespace TDEABC { class AddressBook; }
*/
class KDE_EXPORT KAddressBookView : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/kcmconfigs/addhostdialog.h b/kaddressbook/kcmconfigs/addhostdialog.h
index 5c900c07..301b9f9f 100644
--- a/kaddressbook/kcmconfigs/addhostdialog.h
+++ b/kaddressbook/kcmconfigs/addhostdialog.h
@@ -34,7 +34,7 @@ class TQSpinBox;
class AddHostDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index ad1364f5..35bc17a1 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -46,20 +46,20 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label,
{
TQHBoxLayout *layout = new TQHBoxLayout( this );
- TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, title, this );
+ TQGroupBox *group = new TQGroupBox( 0, TQt::Vertical, title, this );
TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 2, 2,
KDialog::spacingHint() );
mBox = new TQListBox( group );
- connect( mBox, TQT_SIGNAL( selectionChanged( TQListBoxItem* ) ),
- TQT_SLOT( selectionChanged( TQListBoxItem* ) ) );
+ connect( mBox, TQ_SIGNAL( selectionChanged( TQListBoxItem* ) ),
+ TQ_SLOT( selectionChanged( TQListBoxItem* ) ) );
groupLayout->addWidget( mBox, 0, 0 );
- KButtonBox *bbox = new KButtonBox( group, Qt::Vertical );
- mAddButton = bbox->addButton( i18n( "Add..." ), TQT_TQOBJECT(this), TQT_SLOT( add() ) );
- mEditButton = bbox->addButton( i18n( "Edit..." ), TQT_TQOBJECT(this), TQT_SLOT( edit() ) );
+ KButtonBox *bbox = new KButtonBox( group, TQt::Vertical );
+ mAddButton = bbox->addButton( i18n( "Add..." ), this, TQ_SLOT( add() ) );
+ mEditButton = bbox->addButton( i18n( "Edit..." ), this, TQ_SLOT( edit() ) );
mEditButton->setEnabled( false );
- mRemoveButton = bbox->addButton( i18n( "Remove" ), TQT_TQOBJECT(this), TQT_SLOT( remove() ) );
+ mRemoveButton = bbox->addButton( i18n( "Remove" ), this, TQ_SLOT( remove() ) );
mRemoveButton->setEnabled( false );
bbox->layout();
groupLayout->addWidget( bbox, 0, 1 );
@@ -157,10 +157,10 @@ AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name )
mFormattedNameCombo->insertItem( i18n( "Reverse Name" ) );
layout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 );
- connect( mPrefix, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) );
- connect( mInclusion, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) );
- connect( mSuffix, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) );
- connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( modified() ) );
+ connect( mPrefix, TQ_SIGNAL( modified() ), TQ_SIGNAL( modified() ) );
+ connect( mInclusion, TQ_SIGNAL( modified() ), TQ_SIGNAL( modified() ) );
+ connect( mSuffix, TQ_SIGNAL( modified() ), TQ_SIGNAL( modified() ) );
+ connect( mFormattedNameCombo, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( modified() ) );
}
AddresseeWidget::~AddresseeWidget()
diff --git a/kaddressbook/kcmconfigs/addresseewidget.h b/kaddressbook/kcmconfigs/addresseewidget.h
index ec476096..46651903 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.h
+++ b/kaddressbook/kcmconfigs/addresseewidget.h
@@ -35,7 +35,7 @@ class TQPushButton;
class NamePartWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -68,7 +68,7 @@ class NamePartWidget : public TQWidget
class AddresseeWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.h b/kaddressbook/kcmconfigs/extensionconfigdialog.h
index 0aa97f74..5c3ae856 100644
--- a/kaddressbook/kcmconfigs/extensionconfigdialog.h
+++ b/kaddressbook/kcmconfigs/extensionconfigdialog.h
@@ -34,7 +34,7 @@ class ConfigureWidget;
class ExtensionConfigDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index b41bdf84..07574e56 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -59,7 +59,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
TQVBoxLayout *layout = new TQVBoxLayout( generalPage, KDialog::marginHint(),
KDialog::spacingHint() );
- TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage );
+ TQGroupBox *groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "General" ), generalPage );
TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->layout() );
boxLayout->setAlignment( TQt::AlignTop );
@@ -96,7 +96,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
layout->addWidget( groupBox );
- groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Script-Hooks" ), generalPage );
+ groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Script-Hooks" ), generalPage );
TQGridLayout *grid = new TQGridLayout( groupBox->layout(), 3, 2,
KDialog::spacingHint() );
label = new TQLabel( i18n( "Phone:" ), groupBox );
@@ -126,7 +126,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
layout->addWidget( groupBox );
- groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Location Map" ), generalPage );
+ groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Location Map" ), generalPage );
boxLayout = new TQVBoxLayout( groupBox->layout(), KDialog::spacingHint() );
boxLayout->setAlignment( TQt::AlignTop );
@@ -141,22 +141,22 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
boxLayout->addWidget( mLocationMapURL );
layout->addWidget( groupBox );
- connect( mNameParsing, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );
- connect( mViewsSingleClickBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );
- connect( mTradeAsFamilyName, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );
- connect( mLimitContactDisplay, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );
- connect( mPhoneHook, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) );
- connect( mSMSHook, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) );
- connect( mFaxHook, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) );
- connect( mLocationMapURL, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) );
- connect( mEditorCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( modified() ) );
+ connect( mNameParsing, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) );
+ connect( mViewsSingleClickBox, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) );
+ connect( mTradeAsFamilyName, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) );
+ connect( mLimitContactDisplay, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) );
+ connect( mPhoneHook, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) );
+ connect( mSMSHook, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) );
+ connect( mFaxHook, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) );
+ connect( mLocationMapURL, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) );
+ connect( mEditorCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( modified() ) );
tabWidget->addTab( generalPage, i18n( "General" ) );
// Addressee page
mAddresseeWidget = new AddresseeWidget( this );
tabWidget->addTab( mAddresseeWidget, i18n( "Contact" ) );
- connect( mAddresseeWidget, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) );
+ connect( mAddresseeWidget, TQ_SIGNAL( modified() ), TQ_SLOT( modified() ) );
}
void KABConfigWidget::restoreSettings()
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.h b/kaddressbook/kcmconfigs/kabconfigwidget.h
index 5ee3c789..5d6c0506 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.h
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.h
@@ -38,7 +38,7 @@ class AddresseeWidget;
class KABConfigWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
index ce2c9973..7bc6abd6 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
@@ -47,7 +47,7 @@ KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name )
mConfigWidget = new KABConfigWidget( this, "mConfigWidget" );
layout->addWidget( mConfigWidget );
- connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );
+ connect( mConfigWidget, TQ_SIGNAL( changed( bool ) ), TQ_SIGNAL( changed( bool ) ) );
load();
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.h b/kaddressbook/kcmconfigs/kcmkabconfig.h
index b4b18b0e..d97eb1d8 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.h
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.h
@@ -30,7 +30,7 @@ class KABConfigWidget;
class KCMKabConfig : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
index 0731ae57..da6bf49b 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
@@ -48,7 +48,7 @@ KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name )
mConfigWidget = new LDAPOptionsWidget( this );
layout->addWidget( mConfigWidget );
- connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );
+ connect( mConfigWidget, TQ_SIGNAL( changed( bool ) ), TQ_SIGNAL( changed( bool ) ) );
load();
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.h b/kaddressbook/kcmconfigs/kcmkabldapconfig.h
index 2e823814..9ea25e83 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.h
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.h
@@ -32,7 +32,7 @@ class LDAPOptionsWidget;
class KCMKabLdapConfig : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
index 4e4b15a9..f8bcfdb9 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
@@ -80,14 +80,14 @@ LDAPOptionsWidget::LDAPOptionsWidget( TQWidget* parent, const char* name )
mHostListView->addColumn( TQString() );
mHostListView->header()->hide();
- connect( mHostListView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ),
- TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) );
- connect( mHostListView, TQT_SIGNAL(doubleClicked( TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT(slotEditHost()));
- connect( mHostListView, TQT_SIGNAL( clicked( TQListViewItem* ) ),
- TQT_SLOT( slotItemClicked( TQListViewItem* ) ) );
-
- connect( mUpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveUp() ) );
- connect( mDownButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveDown() ) );
+ connect( mHostListView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ),
+ TQ_SLOT( slotSelectionChanged( TQListViewItem* ) ) );
+ connect( mHostListView, TQ_SIGNAL(doubleClicked( TQListViewItem *, const TQPoint &, int )), this, TQ_SLOT(slotEditHost()));
+ connect( mHostListView, TQ_SIGNAL( clicked( TQListViewItem* ) ),
+ TQ_SLOT( slotItemClicked( TQListViewItem* ) ) );
+
+ connect( mUpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveUp() ) );
+ connect( mDownButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveDown() ) );
}
LDAPOptionsWidget::~LDAPOptionsWidget()
@@ -288,10 +288,10 @@ void LDAPOptionsWidget::initGUI()
layout->addWidget( groupBox );
KButtonBox *buttons = new KButtonBox( this );
- buttons->addButton( i18n( "&Add Host..." ), TQT_TQOBJECT(this), TQT_SLOT( slotAddHost() ) );
- mEditButton = buttons->addButton( i18n( "&Edit Host..." ), TQT_TQOBJECT(this), TQT_SLOT( slotEditHost() ) );
+ buttons->addButton( i18n( "&Add Host..." ), this, TQ_SLOT( slotAddHost() ) );
+ mEditButton = buttons->addButton( i18n( "&Edit Host..." ), this, TQ_SLOT( slotEditHost() ) );
mEditButton->setEnabled( false );
- mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), TQT_TQOBJECT(this), TQT_SLOT( slotRemoveHost() ) );
+ mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), this, TQ_SLOT( slotRemoveHost() ) );
mRemoveButton->setEnabled( false );
buttons->layout();
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.h b/kaddressbook/kcmconfigs/ldapoptionswidget.h
index 5471b0b6..fbb32a1f 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.h
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.h
@@ -33,7 +33,7 @@ class TQPushButton;
class LDAPOptionsWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp
index c0417b7e..890bf644 100644
--- a/kaddressbook/keywidget.cpp
+++ b/kaddressbook/keywidget.cpp
@@ -61,9 +61,9 @@ KeyWidget::KeyWidget( TQWidget *parent, const char *name )
mExportButton->setEnabled( false );
layout->addMultiCellWidget( mExportButton, 3, 3, 0, 1 );
- connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addKey() ) );
- connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeKey() ) );
- connect( mExportButton, TQT_SIGNAL( clicked() ), TQT_SLOT( exportKey() ) );
+ connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addKey() ) );
+ connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeKey() ) );
+ connect( mExportButton, TQ_SIGNAL( clicked() ), TQ_SLOT( exportKey() ) );
}
KeyWidget::~KeyWidget()
diff --git a/kaddressbook/keywidget.h b/kaddressbook/keywidget.h
index 3507af80..b317eef6 100644
--- a/kaddressbook/keywidget.h
+++ b/kaddressbook/keywidget.h
@@ -33,7 +33,7 @@ class TQPushButton;
class KeyWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp
index 4b01cf6f..07668b71 100644
--- a/kaddressbook/ldapsearchdialog.cpp
+++ b/kaddressbook/ldapsearchdialog.cpp
@@ -152,7 +152,7 @@ LDAPSearchDialog::LDAPSearchDialog( TDEABC::AddressBook *ab, KABCore *core,
page );
groupBox->setFrameShape( TQGroupBox::Box );
groupBox->setFrameShadow( TQGroupBox::Sunken );
- groupBox->setColumnLayout( 0, Qt::Vertical );
+ groupBox->setColumnLayout( 0, TQt::Vertical );
TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 2,
5, spacingHint() );
boxLayout->setColStretch( 1, 1 );
@@ -202,9 +202,9 @@ LDAPSearchDialog::LDAPSearchDialog( TDEABC::AddressBook *ab, KABCore *core,
mResultListView->setShowSortIndicator( true );
topLayout->addWidget( mResultListView );
- KButtonBox *buttons = new KButtonBox( page, Qt::Horizontal );
- buttons->addButton( i18n( "Select All" ), TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ) );
- buttons->addButton( i18n( "Unselect All" ), TQT_TQOBJECT(this), TQT_SLOT( slotUnselectAll() ) );
+ KButtonBox *buttons = new KButtonBox( page, TQt::Horizontal );
+ buttons->addButton( i18n( "Select All" ), this, TQ_SLOT( slotSelectAll() ) );
+ buttons->addButton( i18n( "Unselect All" ), this, TQ_SLOT( slotUnselectAll() ) );
topLayout->addWidget( buttons );
@@ -222,10 +222,10 @@ LDAPSearchDialog::LDAPSearchDialog( TDEABC::AddressBook *ab, KABCore *core,
mNumHosts = 0;
mIsOK = false;
- connect( mRecursiveCheckbox, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotSetScope( bool ) ) );
- connect( mSearchButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotStartSearch() ) );
+ connect( mRecursiveCheckbox, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotSetScope( bool ) ) );
+ connect( mSearchButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotStartSearch() ) );
setTabOrder(mSearchEdit, mFilterCombo);
setTabOrder(mFilterCombo, mSearchButton);
@@ -264,7 +264,7 @@ void LDAPSearchDialog::restoreSettings()
} else {
mIsOK = true;
for ( int j = 0; j < mNumHosts; ++j ) {
- KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, TQT_TQOBJECT(this), "ldapclient" );
+ KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, this, "ldapclient" );
KPIM::LdapServer ldapServer;
KPIM::LdapSearch::readConfig( ldapServer, config, j, true );
ldapClient->setServer( ldapServer );
@@ -275,12 +275,12 @@ void LDAPSearchDialog::restoreSettings()
ldapClient->setAttrs( attrs );
- connect( ldapClient, TQT_SIGNAL( result( const KPIM::LdapObject& ) ),
- this, TQT_SLOT( slotAddResult( const KPIM::LdapObject& ) ) );
- connect( ldapClient, TQT_SIGNAL( done() ),
- this, TQT_SLOT( slotSearchDone() ) );
- connect( ldapClient, TQT_SIGNAL( error( const TQString& ) ),
- this, TQT_SLOT( slotError( const TQString& ) ) );
+ connect( ldapClient, TQ_SIGNAL( result( const KPIM::LdapObject& ) ),
+ this, TQ_SLOT( slotAddResult( const KPIM::LdapObject& ) ) );
+ connect( ldapClient, TQ_SIGNAL( done() ),
+ this, TQ_SLOT( slotSearchDone() ) );
+ connect( ldapClient, TQ_SIGNAL( error( const TQString& ) ),
+ this, TQ_SLOT( slotError( const TQString& ) ) );
mLdapClientList.append( ldapClient );
}
@@ -387,10 +387,10 @@ void LDAPSearchDialog::slotStartSearch()
TQApplication::setOverrideCursor( TQt::waitCursor );
mSearchButton->setText( i18n( "Stop" ) );
- disconnect( mSearchButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotStartSearch() ) );
- connect( mSearchButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotStopSearch() ) );
+ disconnect( mSearchButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotStartSearch() ) );
+ connect( mSearchButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotStopSearch() ) );
bool startsWith = (mSearchType->currentItem() == 1);
@@ -419,10 +419,10 @@ void LDAPSearchDialog::slotSearchDone()
return;
}
- disconnect( mSearchButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotStopSearch() ) );
- connect( mSearchButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotStartSearch() ) );
+ disconnect( mSearchButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotStopSearch() ) );
+ connect( mSearchButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotStartSearch() ) );
mSearchButton->setText( i18n( "&Search" ) );
TQApplication::restoreOverrideCursor();
diff --git a/kaddressbook/ldapsearchdialog.h b/kaddressbook/ldapsearchdialog.h
index 1d38c88a..a10bbfde 100644
--- a/kaddressbook/ldapsearchdialog.h
+++ b/kaddressbook/ldapsearchdialog.h
@@ -49,7 +49,7 @@ namespace TDEABC {
class LDAPSearchDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp
index 0d350ae7..6d90324a 100644
--- a/kaddressbook/nameeditdialog.cpp
+++ b/kaddressbook/nameeditdialog.cpp
@@ -105,7 +105,7 @@ NameEditDialog::NameEditDialog( const TDEABC::Addressee &addr, int type,
mFormattedNameCombo = new KComboBox( page );
mFormattedNameCombo->setEnabled( !readOnly );
layout->addWidget( mFormattedNameCombo, 5, 1 );
- connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( typeChanged( int ) ) );
+ connect( mFormattedNameCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( typeChanged( int ) ) );
mFormattedNameEdit = new KLineEdit( page );
mFormattedNameEdit->setEnabled( type == CustomName && !readOnly );
@@ -113,8 +113,8 @@ NameEditDialog::NameEditDialog( const TDEABC::Addressee &addr, int type,
mParseBox = new TQCheckBox( i18n( "Parse name automatically" ), page );
mParseBox->setEnabled( !readOnly );
- connect( mParseBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( parseBoxChanged(bool) ) );
- connect( mParseBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( modified() ) );
+ connect( mParseBox, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( parseBoxChanged(bool) ) );
+ connect( mParseBox, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( modified() ) );
layout->addMultiCellWidget( mParseBox, 6, 6, 0, 1 );
// Fill in the values
@@ -159,24 +159,24 @@ NameEditDialog::NameEditDialog( const TDEABC::Addressee &addr, int type,
TDEAcceleratorManager::manage( this );
- connect( mPrefixCombo, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( modified() ) );
- connect( mGivenNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( modified() ) );
- connect( mAdditionalNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( modified() ) );
- connect( mFamilyNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( modified() ) );
- connect( mSuffixCombo, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( modified() ) );
- connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( modified() ) );
- connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( formattedNameTypeChanged() ) );
- connect( mFormattedNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( modified() ) );
- connect( mFormattedNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( formattedNameChanged( const TQString& ) ) );
+ connect( mPrefixCombo, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( modified() ) );
+ connect( mGivenNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( modified() ) );
+ connect( mAdditionalNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( modified() ) );
+ connect( mFamilyNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( modified() ) );
+ connect( mSuffixCombo, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( modified() ) );
+ connect( mFormattedNameCombo, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( modified() ) );
+ connect( mFormattedNameCombo, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( formattedNameTypeChanged() ) );
+ connect( mFormattedNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( modified() ) );
+ connect( mFormattedNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( formattedNameChanged( const TQString& ) ) );
initTypeCombo();
mFormattedNameCombo->setCurrentItem( type );
diff --git a/kaddressbook/nameeditdialog.h b/kaddressbook/nameeditdialog.h
index 277031d9..12b74939 100644
--- a/kaddressbook/nameeditdialog.h
+++ b/kaddressbook/nameeditdialog.h
@@ -39,7 +39,7 @@ class KComboBox;
*/
class NameEditDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index 80f45cff..e4857ae7 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -56,10 +56,10 @@ PhoneTypeCombo::PhoneTypeCombo( TQWidget *parent )
update();
- connect( this, TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( selected( int ) ) );
- connect( this, TQT_SIGNAL( activated( int ) ),
- this, TQT_SIGNAL( modified() ) );
+ connect( this, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( selected( int ) ) );
+ connect( this, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SIGNAL( modified() ) );
}
PhoneTypeCombo::~PhoneTypeCombo()
@@ -137,8 +137,8 @@ PhoneNumberWidget::PhoneNumberWidget( TQWidget *parent )
layout->addWidget( mTypeCombo );
layout->addWidget( mNumberEdit );
- connect( mTypeCombo, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) );
- connect( mNumberEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SIGNAL( modified() ) );
+ connect( mTypeCombo, TQ_SIGNAL( modified() ), TQ_SIGNAL( modified() ) );
+ connect( mNumberEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SIGNAL( modified() ) );
}
void PhoneNumberWidget::setNumber( const TDEABC::PhoneNumber &number )
@@ -183,11 +183,11 @@ PhoneEditWidget::PhoneEditWidget( TQWidget *parent, const char *name )
mRemoveButton->setMaximumSize( mRemoveButton->sizeHint() );
layout->addWidget( mRemoveButton, 1, 1 );
- mMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
- connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( changed( int ) ) );
+ mMapper = new TQSignalMapper( this );
+ connect( mMapper, TQ_SIGNAL( mapped( int ) ), TQ_SLOT( changed( int ) ) );
- connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) );
- connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( remove() ) );
+ connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( add() ) );
+ connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( remove() ) );
}
PhoneEditWidget::~PhoneEditWidget()
@@ -271,8 +271,8 @@ void PhoneEditWidget::recreateNumberWidgets()
PhoneNumberWidget *wdg = new PhoneNumberWidget( this );
wdg->setNumber( *it );
- mMapper->setMapping( TQT_TQOBJECT(wdg), counter );
- connect( wdg, TQT_SIGNAL( modified() ), mMapper, TQT_SLOT( map() ) );
+ mMapper->setMapping( wdg, counter );
+ connect( wdg, TQ_SIGNAL( modified() ), mMapper, TQ_SLOT( map() ) );
mWidgetLayout->addWidget( wdg );
mWidgets.append( wdg );
@@ -303,7 +303,7 @@ PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *parent )
mPreferredBox = new TQCheckBox( i18n( "This is the preferred phone number" ), page );
layout->addWidget( mPreferredBox );
- mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "Types" ), page );
+ mGroup = new TQButtonGroup( 2, TQt::Horizontal, i18n( "Types" ), page );
layout->addWidget( mGroup );
// fill widgets
diff --git a/kaddressbook/phoneeditwidget.h b/kaddressbook/phoneeditwidget.h
index 13c08891..eb1fbf0a 100644
--- a/kaddressbook/phoneeditwidget.h
+++ b/kaddressbook/phoneeditwidget.h
@@ -38,7 +38,7 @@ class KComboBox;
class PhoneTypeCombo : public KComboBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -65,7 +65,7 @@ class PhoneTypeCombo : public KComboBox
class PhoneNumberWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -90,7 +90,7 @@ class PhoneNumberWidget : public TQWidget
*/
class PhoneEditWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -130,7 +130,7 @@ class PhoneEditWidget : public TQWidget
*/
class PhoneTypeDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
PhoneTypeDialog( int type, TQWidget *parent );
diff --git a/kaddressbook/printing/detailledstyle.h b/kaddressbook/printing/detailledstyle.h
index 05f30bae..4197755e 100644
--- a/kaddressbook/printing/detailledstyle.h
+++ b/kaddressbook/printing/detailledstyle.h
@@ -35,7 +35,7 @@ namespace KABPrinting {
class DetailledPrintStyle : public PrintStyle
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/printing/mikesstyle.h b/kaddressbook/printing/mikesstyle.h
index fe1be422..ccaf4a66 100644
--- a/kaddressbook/printing/mikesstyle.h
+++ b/kaddressbook/printing/mikesstyle.h
@@ -35,7 +35,7 @@ class PrintProgress;
class MikesStyle : public PrintStyle
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp
index eecf434c..a9375e3c 100644
--- a/kaddressbook/printing/printingwizard.cpp
+++ b/kaddressbook/printing/printingwizard.cpp
@@ -75,7 +75,7 @@ PrintingWizard::PrintingWizard( KPrinter *printer, TDEABC::AddressBook* ab,
mStylePage = new StylePage( mAddressBook, this );
- connect( mStylePage, TQT_SIGNAL( styleChanged(int) ), TQT_SLOT( slotStyleSelected(int) ) );
+ connect( mStylePage, TQ_SIGNAL( styleChanged(int) ), TQ_SLOT( slotStyleSelected(int) ) );
insertPage( mStylePage, i18n("Choose Printing Style"), -1 );
registerStyles();
diff --git a/kaddressbook/printing/printingwizard.h b/kaddressbook/printing/printingwizard.h
index 3d2d0b27..bd26b2c1 100644
--- a/kaddressbook/printing/printingwizard.h
+++ b/kaddressbook/printing/printingwizard.h
@@ -49,7 +49,7 @@ namespace KABPrinting {
*/
class PrintingWizard : public KWizard
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/printing/printprogress.h b/kaddressbook/printing/printprogress.h
index 481543a2..b23f069a 100644
--- a/kaddressbook/printing/printprogress.h
+++ b/kaddressbook/printing/printprogress.h
@@ -39,7 +39,7 @@ namespace KABPrinting {
*/
class PrintProgress : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/printing/printstyle.h b/kaddressbook/printing/printstyle.h
index 9eeca876..6984a7f5 100644
--- a/kaddressbook/printing/printstyle.h
+++ b/kaddressbook/printing/printstyle.h
@@ -59,7 +59,7 @@ class PrintProgress;
class PrintStyle : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp
index 39b1c4a8..5a42444b 100644
--- a/kaddressbook/printing/selectionpage.cpp
+++ b/kaddressbook/printing/selectionpage.cpp
@@ -51,7 +51,7 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name )
mButtonGroup = new TQButtonGroup( this );
mButtonGroup->setFrameShape( TQButtonGroup::NoFrame );
- mButtonGroup->setColumnLayout( 0, Qt::Vertical );
+ mButtonGroup->setColumnLayout( 0, TQt::Vertical );
mButtonGroup->layout()->setSpacing( KDialog::spacingHint() );
mButtonGroup->layout()->setMargin( KDialog::marginHint() );
@@ -90,8 +90,8 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name )
topLayout->addWidget( mButtonGroup );
- connect( mFiltersCombo, TQT_SIGNAL( activated(int) ), TQT_SLOT( filterChanged(int) ) );
- connect( mCategoriesView, TQT_SIGNAL( clicked(TQListViewItem*) ), TQT_SLOT( categoryClicked(TQListViewItem*) ) );
+ connect( mFiltersCombo, TQ_SIGNAL( activated(int) ), TQ_SLOT( filterChanged(int) ) );
+ connect( mCategoriesView, TQ_SIGNAL( clicked(TQListViewItem*) ), TQ_SLOT( categoryClicked(TQListViewItem*) ) );
}
SelectionPage::~SelectionPage()
diff --git a/kaddressbook/printing/selectionpage.h b/kaddressbook/printing/selectionpage.h
index a7b10d26..06a6f3a5 100644
--- a/kaddressbook/printing/selectionpage.h
+++ b/kaddressbook/printing/selectionpage.h
@@ -34,7 +34,7 @@ class TQRadioButton;
class SelectionPage : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp
index 0df14931..2278b6b4 100644
--- a/kaddressbook/printing/stylepage.cpp
+++ b/kaddressbook/printing/stylepage.cpp
@@ -44,7 +44,7 @@ StylePage::StylePage( TDEABC::AddressBook *ab, TQWidget* parent, const char* na
mSortTypeCombo->insertItem( i18n( "Ascending" ) );
mSortTypeCombo->insertItem( i18n( "Descending" ) );
- connect( mStyleCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( styleChanged( int ) ) );
+ connect( mStyleCombo, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( styleChanged( int ) ) );
}
StylePage::~StylePage()
@@ -121,7 +121,7 @@ void StylePage::initGUI()
topLayout->addMultiCellWidget( label, 0, 0, 0, 1 );
TQButtonGroup *group = new TQButtonGroup( i18n( "Sorting" ), this );
- group->setColumnLayout( 0, Qt::Vertical );
+ group->setColumnLayout( 0, TQt::Vertical );
TQGridLayout *sortLayout = new TQGridLayout( group->layout(), 2, 2,
KDialog::spacingHint() );
sortLayout->setAlignment( TQt::AlignTop );
@@ -141,7 +141,7 @@ void StylePage::initGUI()
topLayout->addWidget( group, 1, 0 );
group = new TQButtonGroup( i18n( "Print Style" ), this );
- group->setColumnLayout( 0, Qt::Vertical );
+ group->setColumnLayout( 0, TQt::Vertical );
TQVBoxLayout *styleLayout = new TQVBoxLayout( group->layout(),
KDialog::spacingHint() );
diff --git a/kaddressbook/printing/stylepage.h b/kaddressbook/printing/stylepage.h
index 9b6958f7..6bccdda0 100644
--- a/kaddressbook/printing/stylepage.h
+++ b/kaddressbook/printing/stylepage.h
@@ -37,7 +37,7 @@ class KComboBox;
class StylePage : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/searchmanager.h b/kaddressbook/searchmanager.h
index 3972110c..4646f90b 100644
--- a/kaddressbook/searchmanager.h
+++ b/kaddressbook/searchmanager.h
@@ -36,7 +36,7 @@ namespace KAB {
class SearchManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/secrecywidget.cpp b/kaddressbook/secrecywidget.cpp
index ae2b9c49..56b888ca 100644
--- a/kaddressbook/secrecywidget.cpp
+++ b/kaddressbook/secrecywidget.cpp
@@ -42,8 +42,8 @@ SecrecyWidget::SecrecyWidget( TQWidget *parent, const char *name )
for ( it = list.begin(); it != list.end(); ++it )
mSecrecyCombo->insertItem( TDEABC::Secrecy::typeLabel( *it ), *it );
- connect( mSecrecyCombo, TQT_SIGNAL( activated( const TQString& ) ),
- TQT_SIGNAL( changed() ) );
+ connect( mSecrecyCombo, TQ_SIGNAL( activated( const TQString& ) ),
+ TQ_SIGNAL( changed() ) );
}
SecrecyWidget::~SecrecyWidget()
diff --git a/kaddressbook/secrecywidget.h b/kaddressbook/secrecywidget.h
index 1424d5e5..0d43bc5b 100644
--- a/kaddressbook/secrecywidget.h
+++ b/kaddressbook/secrecywidget.h
@@ -31,7 +31,7 @@ class KComboBox;
class SecrecyWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/simpleaddresseeeditor.cpp b/kaddressbook/simpleaddresseeeditor.cpp
index 7d7914b9..3cfce3f8 100644
--- a/kaddressbook/simpleaddresseeeditor.cpp
+++ b/kaddressbook/simpleaddresseeeditor.cpp
@@ -72,16 +72,16 @@ void SimpleAddresseeEditor::initGui()
mNameEdit = new KLineEdit( this );
topLayout->addWidget( mNameEdit, 0, 1 );
- connect( mNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- TQT_SLOT( emitModified() ) );
+ connect( mNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ TQ_SLOT( emitModified() ) );
label = new TQLabel( i18n( "Email:" ), this );
topLayout->addWidget( label, 1, 0 );
mEmailEdit = new KLineEdit( this );
topLayout->addWidget( mEmailEdit, 1, 1 );
- connect( mEmailEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- TQT_SLOT( emitModified() ) );
+ connect( mEmailEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ TQ_SLOT( emitModified() ) );
}
void SimpleAddresseeEditor::load()
diff --git a/kaddressbook/simpleaddresseeeditor.h b/kaddressbook/simpleaddresseeeditor.h
index 6f297edc..1efda9e8 100644
--- a/kaddressbook/simpleaddresseeeditor.h
+++ b/kaddressbook/simpleaddresseeeditor.h
@@ -31,7 +31,7 @@ class KLineEdit;
class SimpleAddresseeEditor : public AddresseeEditorBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
SimpleAddresseeEditor( TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp
index dd10e211..ff2c2b38 100644
--- a/kaddressbook/soundwidget.cpp
+++ b/kaddressbook/soundwidget.cpp
@@ -62,20 +62,20 @@ SoundWidget::SoundWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char
mUseSoundUrl->setEnabled( false );
topLayout->addWidget( mUseSoundUrl, 1, 2 );
- connect( mSoundUrl, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( setModified() ) );
- connect( mSoundUrl, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( urlChanged( const TQString& ) ) );
- connect( mUseSoundUrl, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( setModified() ) );
- connect( mUseSoundUrl, TQT_SIGNAL( toggled( bool ) ),
- mPlayButton, TQT_SLOT( setDisabled( bool ) ) );
- connect( mSoundUrl, TQT_SIGNAL( urlSelected( const TQString& ) ),
- TQT_SLOT( loadSound() ) );
- connect( mSoundUrl, TQT_SIGNAL( urlSelected( const TQString& ) ),
- TQT_SLOT( updateGUI() ) );
- connect( mPlayButton, TQT_SIGNAL( clicked() ),
- TQT_SLOT( playSound() ) );
+ connect( mSoundUrl, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( setModified() ) );
+ connect( mSoundUrl, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( urlChanged( const TQString& ) ) );
+ connect( mUseSoundUrl, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( setModified() ) );
+ connect( mUseSoundUrl, TQ_SIGNAL( toggled( bool ) ),
+ mPlayButton, TQ_SLOT( setDisabled( bool ) ) );
+ connect( mSoundUrl, TQ_SIGNAL( urlSelected( const TQString& ) ),
+ TQ_SLOT( loadSound() ) );
+ connect( mSoundUrl, TQ_SIGNAL( urlSelected( const TQString& ) ),
+ TQ_SLOT( updateGUI() ) );
+ connect( mPlayButton, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( playSound() ) );
TQWhatsThis::add( this, i18n( "This field stores a sound file which contains the name of the contact to clarify the pronunciation." ) );
TQWhatsThis::add( mUseSoundUrl, i18n( "Save only the URL to the sound file, not the whole object." ) );
diff --git a/kaddressbook/soundwidget.h b/kaddressbook/soundwidget.h
index 12283b4a..530da098 100644
--- a/kaddressbook/soundwidget.h
+++ b/kaddressbook/soundwidget.h
@@ -35,7 +35,7 @@ class TQPushButton;
class SoundWidget : public KAB::ContactEditorWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp
index 828825fa..537e2ced 100644
--- a/kaddressbook/viewconfigurefieldspage.cpp
+++ b/kaddressbook/viewconfigurefieldspage.cpp
@@ -214,7 +214,7 @@ void ViewConfigureFieldsPage::initGUI()
mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::Personal ) );
mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::Organization ) );
mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::CustomCategory ) );
- connect( mCategoryCombo, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotShowFields(int) ) );
+ connect( mCategoryCombo, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotShowFields(int) ) );
gl->addWidget( mCategoryCombo, 0, 0 );
TQLabel *label = new TQLabel( i18n( "&Selected fields:" ), this );
@@ -235,12 +235,12 @@ void ViewConfigureFieldsPage::initGUI()
mAddButton = new TQToolButton( this );
mAddButton->setIconSet( TQApplication::reverseLayout() ? SmallIconSet( "1leftarrow" ) : SmallIconSet( "1rightarrow" ) );
- connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSelect() ) );
+ connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSelect() ) );
vb1->addWidget( mAddButton );
mRemoveButton = new TQToolButton( this );
mRemoveButton->setIconSet( TQApplication::reverseLayout() ? SmallIconSet( "1rightarrow" ) : SmallIconSet( "1leftarrow" ) );
- connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotUnSelect() ) );
+ connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotUnSelect() ) );
vb1->addWidget( mRemoveButton );
vb1->addStretch();
@@ -251,12 +251,12 @@ void ViewConfigureFieldsPage::initGUI()
mUpButton = new TQToolButton( this );
mUpButton->setIconSet( SmallIconSet( "1uparrow" ) );
- connect( mUpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotMoveUp() ) );
+ connect( mUpButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotMoveUp() ) );
vb2->addWidget( mUpButton );
mDownButton = new TQToolButton( this );
mDownButton->setIconSet( SmallIconSet( "1downarrow" ) );
- connect( mDownButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotMoveDown() ) );
+ connect( mDownButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotMoveDown() ) );
vb2->addWidget( mDownButton );
vb2->addStretch();
@@ -275,9 +275,9 @@ void ViewConfigureFieldsPage::initGUI()
gl->activate();
- connect( mUnSelectedBox, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotButtonsEnabled() ) );
- connect( mSelectedBox, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotButtonsEnabled() ) );
- connect( mSelectedBox, TQT_SIGNAL( currentChanged( TQListBoxItem * ) ), TQT_SLOT( slotButtonsEnabled() ) );
+ connect( mUnSelectedBox, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotButtonsEnabled() ) );
+ connect( mSelectedBox, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotButtonsEnabled() ) );
+ connect( mSelectedBox, TQ_SIGNAL( currentChanged( TQListBoxItem * ) ), TQ_SLOT( slotButtonsEnabled() ) );
slotButtonsEnabled();
}
diff --git a/kaddressbook/viewconfigurefieldspage.h b/kaddressbook/viewconfigurefieldspage.h
index 9b66b159..f1718bd0 100644
--- a/kaddressbook/viewconfigurefieldspage.h
+++ b/kaddressbook/viewconfigurefieldspage.h
@@ -37,7 +37,7 @@ class TQToolButton;
class ViewConfigureFieldsPage : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/viewconfigurefilterpage.cpp b/kaddressbook/viewconfigurefilterpage.cpp
index c0d7fa7c..76a355ee 100644
--- a/kaddressbook/viewconfigurefilterpage.cpp
+++ b/kaddressbook/viewconfigurefilterpage.cpp
@@ -41,7 +41,7 @@ ViewConfigureFilterPage::ViewConfigureFilterPage( TQWidget *parent,
TQBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
mFilterGroup = new TQButtonGroup();
- connect( mFilterGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( buttonClicked( int ) ) );
+ connect( mFilterGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( buttonClicked( int ) ) );
TQLabel *label = new TQLabel( i18n( "The default filter will be activated whenever"
" this view is displayed. This feature allows you to configure views that only"
diff --git a/kaddressbook/viewconfigurefilterpage.h b/kaddressbook/viewconfigurefilterpage.h
index a29bf880..a879337f 100644
--- a/kaddressbook/viewconfigurefilterpage.h
+++ b/kaddressbook/viewconfigurefilterpage.h
@@ -33,7 +33,7 @@ class TDEConfig;
class ViewConfigureFilterPage : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/viewconfigurewidget.h b/kaddressbook/viewconfigurewidget.h
index 11957a01..ad6c8e33 100644
--- a/kaddressbook/viewconfigurewidget.h
+++ b/kaddressbook/viewconfigurewidget.h
@@ -47,7 +47,7 @@ class ViewConfigureFilterPage;
*/
class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -87,7 +87,7 @@ class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget
class ViewConfigureDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 47ef542e..125b95c7 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -216,15 +216,15 @@ void ViewManager::setActiveView( const TQString &name )
view->readConfig( config );
// The manager just relays the signals
- connect( view, TQT_SIGNAL( selected( const TQString& ) ),
- TQT_SIGNAL( selected( const TQString & ) ) );
- connect( view, TQT_SIGNAL( executed( const TQString& ) ),
- TQT_SIGNAL( executed( const TQString& ) ) );
- connect( view, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) );
- connect( view, TQT_SIGNAL( dropped( TQDropEvent* ) ),
- TQT_SLOT( dropped( TQDropEvent* ) ) );
- connect( view, TQT_SIGNAL( startDrag() ), TQT_SLOT( startDrag() ) );
- connect( view, TQT_SIGNAL( sortFieldChanged() ), TQT_SIGNAL( sortFieldChanged() ) );
+ connect( view, TQ_SIGNAL( selected( const TQString& ) ),
+ TQ_SIGNAL( selected( const TQString & ) ) );
+ connect( view, TQ_SIGNAL( executed( const TQString& ) ),
+ TQ_SIGNAL( executed( const TQString& ) ) );
+ connect( view, TQ_SIGNAL( modified() ), TQ_SIGNAL( modified() ) );
+ connect( view, TQ_SIGNAL( dropped( TQDropEvent* ) ),
+ TQ_SLOT( dropped( TQDropEvent* ) ) );
+ connect( view, TQ_SIGNAL( startDrag() ), TQ_SLOT( startDrag() ) );
+ connect( view, TQ_SIGNAL( sortFieldChanged() ), TQ_SIGNAL( sortFieldChanged() ) );
}
}
@@ -568,33 +568,33 @@ void ViewManager::initActions()
#if TDE_VERSION >= 309
mActionSelectView->setMenuAccelsEnabled( false );
#endif
- connect( mActionSelectView, TQT_SIGNAL( activated( const TQString& ) ),
- TQT_SLOT( setActiveView( const TQString& ) ) );
+ connect( mActionSelectView, TQ_SIGNAL( activated( const TQString& ) ),
+ TQ_SLOT( setActiveView( const TQString& ) ) );
TDEAction *action;
- action = new TDEAction( i18n( "Modify View..." ), "configure", 0, TQT_TQOBJECT(this),
- TQT_SLOT( editView() ), mCore->actionCollection(),
+ action = new TDEAction( i18n( "Modify View..." ), "configure", 0, this,
+ TQ_SLOT( editView() ), mCore->actionCollection(),
"view_modify" );
action->setWhatsThis( i18n( "By pressing this button a dialog opens that allows you to modify the view of the addressbook. There you can add or remove fields that you want to be shown or hidden in the addressbook like the name for example." ) );
- action = new TDEAction( i18n( "Add View..." ), "window-new", 0, TQT_TQOBJECT(this),
- TQT_SLOT( addView() ), mCore->actionCollection(),
+ action = new TDEAction( i18n( "Add View..." ), "window-new", 0, this,
+ TQ_SLOT( addView() ), mCore->actionCollection(),
"view_add" );
action->setWhatsThis( i18n( "You can add a new view by choosing one from the dialog that appears after pressing the button. You have to give the view a name, so that you can distinguish between the different views." ) );
mActionDeleteView = new TDEAction( i18n( "Delete View" ), "view_remove", 0,
- TQT_TQOBJECT(this), TQT_SLOT( deleteView() ),
+ this, TQ_SLOT( deleteView() ),
mCore->actionCollection(), "view_delete" );
mActionDeleteView->setWhatsThis( i18n( "By pressing this button you can delete the actual view, which you have added before." ) );
- action = new TDEAction( i18n( "Refresh View" ), "reload", 0, TQT_TQOBJECT(this),
- TQT_SLOT( refreshView() ), mCore->actionCollection(),
+ action = new TDEAction( i18n( "Refresh View" ), "reload", 0, this,
+ TQ_SLOT( refreshView() ), mCore->actionCollection(),
"view_refresh" );
action->setWhatsThis( i18n( "The view will be refreshed by pressing this button." ) );
- action = new TDEAction( i18n( "Edit &Filters..." ), "filter", 0, TQT_TQOBJECT(this),
- TQT_SLOT( configureFilters() ), mCore->actionCollection(),
+ action = new TDEAction( i18n( "Edit &Filters..." ), "filter", 0, this,
+ TQ_SLOT( configureFilters() ), mCore->actionCollection(),
"options_edit_filters" );
action->setWhatsThis( i18n( "Edit the contact filters<p>You will be presented with a dialog, where you can add, remove and edit filters." ) );
}
diff --git a/kaddressbook/viewmanager.h b/kaddressbook/viewmanager.h
index 9820607e..ce9abbc2 100644
--- a/kaddressbook/viewmanager.h
+++ b/kaddressbook/viewmanager.h
@@ -49,7 +49,7 @@ namespace TDEABC { class AddressBook; }
*/
class ViewManager : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index 9b1ef52a..749dc13f 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -316,7 +316,7 @@ void CardViewItem::paintCard( TQPainter *p, TQColorGroup &cg )
// if we are the current item and the view has focus, draw focus rect
if ( mView->currentItem() == this && mView->hasFocus() ) {
- mView->style().tqdrawPrimitive( TQStyle::PE_FocusRect, p,
+ mView->style().drawPrimitive( TQStyle::PE_FocusRect, p,
TQRect( 0, 0, mView->itemWidth(), h + (2 * mg) ), cg,
TQStyle::Style_FocusAtBorder,
TQStyleOption( isSelected() ? cg.highlight() : cg.base() ) );
@@ -587,10 +587,10 @@ CardView::CardView( TQWidget *parent, const char *name )
viewport()->setMouseTracking( true );
viewport()->setFocusProxy( this );
- viewport()->setFocusPolicy(TQ_WheelFocus );
+ viewport()->setFocusPolicy(TQWidget::WheelFocus );
viewport()->setBackgroundMode( PaletteBase );
- connect( d->mTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( tryShowFullText() ) );
+ connect( d->mTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( tryShowFullText() ) );
setBackgroundMode( PaletteBackground, PaletteBase );
@@ -1022,7 +1022,7 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
emit clicked( item );
// The RMB click
- if ( e->button() & Qt::RightButton ) {
+ if ( e->button() & TQt::RightButton ) {
// clear previous selection
bool blocked = signalsBlocked();
blockSignals( true );
@@ -1056,7 +1056,7 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
item->repaintCard();
emit selectionChanged();
} else if ( d->mSelectionMode == CardView::Extended ) {
- if ( (e->button() & Qt::LeftButton) && (e->state() & TQt::ShiftButton) ) {
+ if ( (e->button() & TQt::LeftButton) && (e->state() & TQt::ShiftButton) ) {
if ( item == other )
return;
@@ -1083,11 +1083,11 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
}
emit selectionChanged();
- } else if ( (e->button() & Qt::LeftButton) && (e->state() & TQt::ControlButton) ) {
+ } else if ( (e->button() & TQt::LeftButton) && (e->state() & TQt::ControlButton) ) {
item->setSelected( !item->isSelected() );
item->repaintCard();
emit selectionChanged();
- } else if ( e->button() & Qt::LeftButton ) {
+ } else if ( e->button() & TQt::LeftButton ) {
bool b = signalsBlocked();
blockSignals( true );
selectAll( false );
@@ -1158,7 +1158,7 @@ void CardView::contentsMouseMoveEvent( TQMouseEvent *e )
return;
}
- if ( d->mLastClickOnItem && (e->state() & Qt::LeftButton) &&
+ if ( d->mLastClickOnItem && (e->state() & TQt::LeftButton) &&
((e->pos() - d->mLastClickPos).manhattanLength() > 4)) {
startDrag();
diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h
index d064e03d..92c7f8f2 100644
--- a/kaddressbook/views/cardview.h
+++ b/kaddressbook/views/cardview.h
@@ -195,7 +195,7 @@ class CardView : public TQScrollView
{
friend class CardViewItem;
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/views/colorlistbox.cpp b/kaddressbook/views/colorlistbox.cpp
index 54ad38b3..a72a644b 100644
--- a/kaddressbook/views/colorlistbox.cpp
+++ b/kaddressbook/views/colorlistbox.cpp
@@ -28,7 +28,7 @@
ColorListBox::ColorListBox( TQWidget *parent, const char *name, WFlags f )
:TDEListBox( parent, name, f ), mCurrentOnDragEnter(-1)
{
- connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) );
+ connect( this, TQ_SIGNAL(selected(int)), this, TQ_SLOT(newColor(int)) );
setAcceptDrops( true);
}
diff --git a/kaddressbook/views/colorlistbox.h b/kaddressbook/views/colorlistbox.h
index 62b7e5a8..f860bf82 100644
--- a/kaddressbook/views/colorlistbox.h
+++ b/kaddressbook/views/colorlistbox.h
@@ -25,7 +25,7 @@
class ColorListBox : public TDEListBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index 2fe22f8c..cbe70109 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -201,7 +201,7 @@ void CardViewLookNFeelPage::initGUI()
loTab->setSpacing( spacing );
loTab->setMargin( margin );
- TQGroupBox *gbGeneral = new TQGroupBox( 1, Qt::Horizontal, i18n("General"), loTab );
+ TQGroupBox *gbGeneral = new TQGroupBox( 1, TQt::Horizontal, i18n("General"), loTab );
cbDrawSeps = new TQCheckBox( i18n("Draw &separators"), gbGeneral );
@@ -215,7 +215,7 @@ void CardViewLookNFeelPage::initGUI()
sbSpacing = new TQSpinBox( 0, 100, 1, hbPadding );
lSpacing->setBuddy( sbSpacing );
- TQGroupBox *gbCards = new TQGroupBox( 1, Qt::Horizontal, i18n("Cards"), loTab );
+ TQGroupBox *gbCards = new TQGroupBox( 1, TQt::Horizontal, i18n("Cards"), loTab );
TQHBox *hbMargin = new TQHBox( gbCards );
TQLabel *lMargin = new TQLabel( i18n("&Margin:"), hbMargin );
@@ -246,7 +246,7 @@ void CardViewLookNFeelPage::initGUI()
colorTab->setSpacing( spacing );
colorTab->setMargin( spacing );
cbEnableCustomColors = new TQCheckBox( i18n("&Enable custom colors"), colorTab );
- connect( cbEnableCustomColors, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableColors()) );
+ connect( cbEnableCustomColors, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableColors()) );
lbColors = new ColorListBox( colorTab );
tabs->addTab( colorTab, i18n("&Colors") );
@@ -265,7 +265,7 @@ void CardViewLookNFeelPage::initGUI()
fntTab->setMargin( spacing );
cbEnableCustomFonts = new TQCheckBox( i18n("&Enable custom fonts"), fntTab );
- connect( cbEnableCustomFonts, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableFonts()) );
+ connect( cbEnableCustomFonts, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableFonts()) );
vbFonts = new TQWidget( fntTab );
TQGridLayout *gFnts = new TQGridLayout( vbFonts, 2, 3 );
@@ -277,14 +277,14 @@ void CardViewLookNFeelPage::initGUI()
lTextFont->setFrameStyle( TQFrame::Panel|TQFrame::Sunken );
btnFont = new KPushButton( i18n("Choose..."), vbFonts );
lTFnt->setBuddy( btnFont );
- connect( btnFont, TQT_SIGNAL(clicked()), this, TQT_SLOT(setTextFont()) );
+ connect( btnFont, TQ_SIGNAL(clicked()), this, TQ_SLOT(setTextFont()) );
TQLabel *lHFnt = new TQLabel( i18n("&Header font:"), vbFonts );
lHeaderFont = new TQLabel( vbFonts );
lHeaderFont->setFrameStyle( TQFrame::Panel|TQFrame::Sunken );
btnHeaderFont = new KPushButton( i18n("Choose..."), vbFonts );
lHFnt->setBuddy( btnHeaderFont );
- connect( btnHeaderFont, TQT_SIGNAL(clicked()), this, TQT_SLOT(setHeaderFont()) );
+ connect( btnHeaderFont, TQ_SIGNAL(clicked()), this, TQ_SLOT(setHeaderFont()) );
fntTab->setStretchFactor( new TQWidget( fntTab ), 1 );
diff --git a/kaddressbook/views/configurecardviewdialog.h b/kaddressbook/views/configurecardviewdialog.h
index afb938a6..c57594cb 100644
--- a/kaddressbook/views/configurecardviewdialog.h
+++ b/kaddressbook/views/configurecardviewdialog.h
@@ -79,7 +79,7 @@ class ConfigureCardViewWidget : public ViewConfigureWidget
class CardViewLookNFeelPage : public TQVBox {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index 1bd70c29..eb508b3d 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -113,7 +113,7 @@ void LookAndFeelPage::initGUI()
{
TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint());
- TQButtonGroup *group = new TQButtonGroup(1, Qt::Horizontal,
+ TQButtonGroup *group = new TQButtonGroup(1, TQt::Horizontal,
i18n("Row Separator"), this);
layout->addWidget(group);
@@ -128,8 +128,8 @@ void LookAndFeelPage::initGUI()
mBackgroundBox = new TQCheckBox(i18n("Enable background image:"), this,
"mBackgroundBox");
- connect(mBackgroundBox, TQT_SIGNAL(toggled(bool)),
- TQT_SLOT(enableBackgroundToggled(bool)));
+ connect(mBackgroundBox, TQ_SIGNAL(toggled(bool)),
+ TQ_SLOT(enableBackgroundToggled(bool)));
backgroundLayout->addWidget(mBackgroundBox);
mBackgroundName = new KURLRequester(this, "mBackgroundName");
diff --git a/kaddressbook/views/configuretableviewdialog.h b/kaddressbook/views/configuretableviewdialog.h
index fc38d0da..fdc644be 100644
--- a/kaddressbook/views/configuretableviewdialog.h
+++ b/kaddressbook/views/configuretableviewdialog.h
@@ -62,7 +62,7 @@ class ConfigureTableViewWidget : public ViewConfigureWidget
*/
class LookAndFeelPage : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index 3a01974b..b23f415c 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -278,8 +278,8 @@ ContactListView::ContactListView(KAddressBookTableView *view,
setSelectionModeExt( TDEListView::Extended );
setDropVisualizer(false);
- connect(this, TQT_SIGNAL(dropped(TQDropEvent*)),
- this, TQT_SLOT(itemDropped(TQDropEvent*)));
+ connect(this, TQ_SIGNAL(dropped(TQDropEvent*)),
+ this, TQ_SLOT(itemDropped(TQDropEvent*)));
new DynamicTip( this );
}
@@ -314,7 +314,7 @@ void ContactListView::contentsMousePressEvent(TQMouseEvent* e)
// To initiate a drag operation
void ContactListView::contentsMouseMoveEvent( TQMouseEvent *e )
{
- if ((e->state() & Qt::LeftButton) && (e->pos() - presspos).manhattanLength() > 4 ) {
+ if ((e->state() & TQt::LeftButton) && (e->pos() - presspos).manhattanLength() > 4 ) {
emit startAddresseeDrag();
}
else
diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h
index 138830b6..a2d70aa2 100644
--- a/kaddressbook/views/contactlistview.h
+++ b/kaddressbook/views/contactlistview.h
@@ -84,7 +84,7 @@ private:
class ContactListView : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index 9c6b55e1..a61ba3a9 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -156,16 +156,16 @@ KAddressBookCardView::KAddressBookCardView( KAB::Core *core,
layout->addWidget( mCardView );
// Connect up the signals
- connect( mCardView, TQT_SIGNAL( executed( CardViewItem* ) ),
- this, TQT_SLOT( addresseeExecuted( CardViewItem* ) ) );
- connect( mCardView, TQT_SIGNAL( selectionChanged() ),
- this, TQT_SLOT( addresseeSelected() ) );
- connect( mCardView, TQT_SIGNAL( addresseeDropped( TQDropEvent* ) ),
- this, TQT_SIGNAL( dropped( TQDropEvent* ) ) );
- connect( mCardView, TQT_SIGNAL( startAddresseeDrag() ),
- this, TQT_SIGNAL( startDrag() ) );
- connect( mCardView, TQT_SIGNAL( contextMenuRequested( CardViewItem*, const TQPoint& ) ),
- this, TQT_SLOT( rmbClicked( CardViewItem*, const TQPoint& ) ) );
+ connect( mCardView, TQ_SIGNAL( executed( CardViewItem* ) ),
+ this, TQ_SLOT( addresseeExecuted( CardViewItem* ) ) );
+ connect( mCardView, TQ_SIGNAL( selectionChanged() ),
+ this, TQ_SLOT( addresseeSelected() ) );
+ connect( mCardView, TQ_SIGNAL( addresseeDropped( TQDropEvent* ) ),
+ this, TQ_SIGNAL( dropped( TQDropEvent* ) ) );
+ connect( mCardView, TQ_SIGNAL( startAddresseeDrag() ),
+ this, TQ_SIGNAL( startDrag() ) );
+ connect( mCardView, TQ_SIGNAL( contextMenuRequested( CardViewItem*, const TQPoint& ) ),
+ this, TQ_SLOT( rmbClicked( CardViewItem*, const TQPoint& ) ) );
}
KAddressBookCardView::~KAddressBookCardView()
@@ -185,18 +185,18 @@ void KAddressBookCardView::readConfig( TDEConfig *config )
// costum colors?
if ( config->readBoolEntry( "EnableCustomColors", false ) ) {
TQPalette p( mCardView->palette() );
- TQColor c = p.color( TQPalette::Normal, TQColorGroup::Base );
- p.setColor( TQPalette::Normal, TQColorGroup::Base, config->readColorEntry( "BackgroundColor", &c ) );
- c = p.color( TQPalette::Normal, TQColorGroup::Text );
- p.setColor( TQPalette::Normal, TQColorGroup::Text, config->readColorEntry( "TextColor", &c ) );
- c = p.color( TQPalette::Normal, TQColorGroup::Button );
- p.setColor( TQPalette::Normal, TQColorGroup::Button, config->readColorEntry( "HeaderColor", &c ) );
- c = p.color( TQPalette::Normal, TQColorGroup::ButtonText );
- p.setColor( TQPalette::Normal, TQColorGroup::ButtonText, config->readColorEntry( "HeaderTextColor", &c ) );
- c = p.color( TQPalette::Normal, TQColorGroup::Highlight );
- p.setColor( TQPalette::Normal, TQColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) );
- c = p.color( TQPalette::Normal, TQColorGroup::HighlightedText );
- p.setColor( TQPalette::Normal, TQColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) );
+ TQColor c = p.color( TQPalette::Active, TQColorGroup::Base );
+ p.setColor( TQPalette::Active, TQColorGroup::Base, config->readColorEntry( "BackgroundColor", &c ) );
+ c = p.color( TQPalette::Active, TQColorGroup::Text );
+ p.setColor( TQPalette::Active, TQColorGroup::Text, config->readColorEntry( "TextColor", &c ) );
+ c = p.color( TQPalette::Active, TQColorGroup::Button );
+ p.setColor( TQPalette::Active, TQColorGroup::Button, config->readColorEntry( "HeaderColor", &c ) );
+ c = p.color( TQPalette::Active, TQColorGroup::ButtonText );
+ p.setColor( TQPalette::Active, TQColorGroup::ButtonText, config->readColorEntry( "HeaderTextColor", &c ) );
+ c = p.color( TQPalette::Active, TQColorGroup::Highlight );
+ p.setColor( TQPalette::Active, TQColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) );
+ c = p.color( TQPalette::Active, TQColorGroup::HighlightedText );
+ p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) );
mCardView->viewport()->setPalette( p );
} else {
// needed if turned off during a session.
@@ -227,15 +227,15 @@ void KAddressBookCardView::readConfig( TDEConfig *config )
mCardView->setItemSpacing( config->readNumEntry( "ItemSpacing", 10 ) );
mCardView->setSeparatorWidth( config->readNumEntry( "SeparatorWidth", 2 ) );
- disconnect( mCardView, TQT_SIGNAL( executed( CardViewItem* ) ),
- this, TQT_SLOT( addresseeExecuted( CardViewItem* ) ) );
+ disconnect( mCardView, TQ_SIGNAL( executed( CardViewItem* ) ),
+ this, TQ_SLOT( addresseeExecuted( CardViewItem* ) ) );
if ( KABPrefs::instance()->honorSingleClick() )
- connect( mCardView, TQT_SIGNAL( executed( CardViewItem* ) ),
- this, TQT_SLOT( addresseeExecuted( CardViewItem* ) ) );
+ connect( mCardView, TQ_SIGNAL( executed( CardViewItem* ) ),
+ this, TQ_SLOT( addresseeExecuted( CardViewItem* ) ) );
else
- connect( mCardView, TQT_SIGNAL( doubleClicked( CardViewItem* ) ),
- this, TQT_SLOT( addresseeExecuted( CardViewItem* ) ) );
+ connect( mCardView, TQ_SIGNAL( doubleClicked( CardViewItem* ) ),
+ this, TQ_SLOT( addresseeExecuted( CardViewItem* ) ) );
}
void KAddressBookCardView::writeConfig( TDEConfig *config )
diff --git a/kaddressbook/views/kaddressbookcardview.h b/kaddressbook/views/kaddressbookcardview.h
index 15c77a7c..447614ad 100644
--- a/kaddressbook/views/kaddressbookcardview.h
+++ b/kaddressbook/views/kaddressbookcardview.h
@@ -42,7 +42,7 @@ class AddresseeCardView;
*/
class KAddressBookCardView : public KAddressBookView
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -77,7 +77,7 @@ class KAddressBookCardView : public KAddressBookView
class AddresseeCardView : public CardView
{
- Q_OBJECT
+ TQ_OBJECT
public:
AddresseeCardView( TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index 3021f692..66aff6d1 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -70,8 +70,8 @@ AddresseeIconView::AddresseeIconView( TQWidget *parent, const char *name )
setSorting( true, true );
setMode( TDEIconView::Select );
- connect( this, TQT_SIGNAL( dropped( TQDropEvent*, const TQValueList<TQIconDragItem>& ) ),
- this, TQT_SLOT( itemDropped( TQDropEvent*, const TQValueList<TQIconDragItem>& ) ) );
+ connect( this, TQ_SIGNAL( dropped( TQDropEvent*, const TQValueList<TQIconDragItem>& ) ),
+ this, TQ_SLOT( itemDropped( TQDropEvent*, const TQValueList<TQIconDragItem>& ) ) );
}
AddresseeIconView::~AddresseeIconView()
@@ -145,16 +145,16 @@ KAddressBookIconView::KAddressBookIconView( KAB::Core *core,
layout->addWidget( mIconView );
// Connect up the signals
- connect( mIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ),
- this, TQT_SLOT( addresseeExecuted( TQIconViewItem* ) ) );
- connect( mIconView, TQT_SIGNAL( selectionChanged() ),
- this, TQT_SLOT( addresseeSelected() ) );
- connect( mIconView, TQT_SIGNAL( addresseeDropped( TQDropEvent* ) ),
- this, TQT_SIGNAL( dropped( TQDropEvent* ) ) );
- connect( mIconView, TQT_SIGNAL( startAddresseeDrag() ),
- this, TQT_SIGNAL( startDrag() ) );
- connect( mIconView, TQT_SIGNAL( contextMenuRequested( TQIconViewItem*, const TQPoint& ) ),
- this, TQT_SLOT( rmbClicked( TQIconViewItem*, const TQPoint& ) ) );
+ connect( mIconView, TQ_SIGNAL( executed( TQIconViewItem* ) ),
+ this, TQ_SLOT( addresseeExecuted( TQIconViewItem* ) ) );
+ connect( mIconView, TQ_SIGNAL( selectionChanged() ),
+ this, TQ_SLOT( addresseeSelected() ) );
+ connect( mIconView, TQ_SIGNAL( addresseeDropped( TQDropEvent* ) ),
+ this, TQ_SIGNAL( dropped( TQDropEvent* ) ) );
+ connect( mIconView, TQ_SIGNAL( startAddresseeDrag() ),
+ this, TQ_SIGNAL( startDrag() ) );
+ connect( mIconView, TQ_SIGNAL( contextMenuRequested( TQIconViewItem*, const TQPoint& ) ),
+ this, TQ_SLOT( rmbClicked( TQIconViewItem*, const TQPoint& ) ) );
}
KAddressBookIconView::~KAddressBookIconView()
@@ -171,15 +171,15 @@ void KAddressBookIconView::readConfig( TDEConfig *config )
{
KAddressBookView::readConfig( config );
- disconnect( mIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ),
- this, TQT_SLOT( addresseeExecuted( TQIconViewItem* ) ) );
+ disconnect( mIconView, TQ_SIGNAL( executed( TQIconViewItem* ) ),
+ this, TQ_SLOT( addresseeExecuted( TQIconViewItem* ) ) );
if ( KABPrefs::instance()->honorSingleClick() )
- connect( mIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ),
- this, TQT_SLOT( addresseeExecuted( TQIconViewItem* ) ) );
+ connect( mIconView, TQ_SIGNAL( executed( TQIconViewItem* ) ),
+ this, TQ_SLOT( addresseeExecuted( TQIconViewItem* ) ) );
else
- connect( mIconView, TQT_SIGNAL( doubleClicked( TQIconViewItem* ) ),
- this, TQT_SLOT( addresseeExecuted( TQIconViewItem* ) ) );
+ connect( mIconView, TQ_SIGNAL( doubleClicked( TQIconViewItem* ) ),
+ this, TQ_SLOT( addresseeExecuted( TQIconViewItem* ) ) );
}
TQStringList KAddressBookIconView::selectedUids()
diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h
index feb9edf3..d4d7bf93 100644
--- a/kaddressbook/views/kaddressbookiconview.h
+++ b/kaddressbook/views/kaddressbookiconview.h
@@ -41,7 +41,7 @@ namespace TDEABC { class AddressBook; }
*/
class KAddressBookIconView : public KAddressBookView
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -75,7 +75,7 @@ class KAddressBookIconView : public KAddressBookView
class AddresseeIconView : public TDEIconView
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index ad39eb64..6b633303 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -103,16 +103,16 @@ KAddressBookTableView::~KAddressBookTableView()
void KAddressBookTableView::reconstructListView()
{
if ( mListView ) {
- disconnect( mListView, TQT_SIGNAL( selectionChanged() ),
- this, TQT_SLOT( addresseeSelected() ) );
- disconnect( mListView, TQT_SIGNAL( executed( TQListViewItem* ) ),
- this, TQT_SLOT( addresseeExecuted( TQListViewItem* ) ) );
- disconnect( mListView, TQT_SIGNAL( doubleClicked( TQListViewItem* ) ),
- this, TQT_SLOT( addresseeExecuted( TQListViewItem* ) ) );
- disconnect( mListView, TQT_SIGNAL( startAddresseeDrag() ),
- this, TQT_SIGNAL( startDrag() ) );
- disconnect( mListView, TQT_SIGNAL( addresseeDropped( TQDropEvent* ) ),
- this, TQT_SIGNAL( dropped( TQDropEvent* ) ) );
+ disconnect( mListView, TQ_SIGNAL( selectionChanged() ),
+ this, TQ_SLOT( addresseeSelected() ) );
+ disconnect( mListView, TQ_SIGNAL( executed( TQListViewItem* ) ),
+ this, TQ_SLOT( addresseeExecuted( TQListViewItem* ) ) );
+ disconnect( mListView, TQ_SIGNAL( doubleClicked( TQListViewItem* ) ),
+ this, TQ_SLOT( addresseeExecuted( TQListViewItem* ) ) );
+ disconnect( mListView, TQ_SIGNAL( startAddresseeDrag() ),
+ this, TQ_SIGNAL( startDrag() ) );
+ disconnect( mListView, TQ_SIGNAL( addresseeDropped( TQDropEvent* ) ),
+ this, TQ_SIGNAL( dropped( TQDropEvent* ) ) );
delete mListView;
}
@@ -141,23 +141,23 @@ void KAddressBookTableView::reconstructListView()
mListView->setFullWidth( true );
- connect( mListView, TQT_SIGNAL( selectionChanged() ),
- this, TQT_SLOT( addresseeSelected() ) );
- connect( mListView, TQT_SIGNAL( startAddresseeDrag() ),
- this, TQT_SIGNAL( startDrag() ) );
- connect( mListView, TQT_SIGNAL( addresseeDropped( TQDropEvent* ) ),
- this, TQT_SIGNAL( dropped( TQDropEvent* ) ) );
- connect( mListView, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ),
- this, TQT_SLOT( rmbClicked( TDEListView*, TQListViewItem*, const TQPoint& ) ) );
- connect( mListView->header(), TQT_SIGNAL( clicked( int ) ),
- this, TQT_SIGNAL( sortFieldChanged() ) );
+ connect( mListView, TQ_SIGNAL( selectionChanged() ),
+ this, TQ_SLOT( addresseeSelected() ) );
+ connect( mListView, TQ_SIGNAL( startAddresseeDrag() ),
+ this, TQ_SIGNAL( startDrag() ) );
+ connect( mListView, TQ_SIGNAL( addresseeDropped( TQDropEvent* ) ),
+ this, TQ_SIGNAL( dropped( TQDropEvent* ) ) );
+ connect( mListView, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ),
+ this, TQ_SLOT( rmbClicked( TDEListView*, TQListViewItem*, const TQPoint& ) ) );
+ connect( mListView->header(), TQ_SIGNAL( clicked( int ) ),
+ this, TQ_SIGNAL( sortFieldChanged() ) );
if ( KABPrefs::instance()->honorSingleClick() )
- connect( mListView, TQT_SIGNAL( executed( TQListViewItem* ) ),
- this, TQT_SLOT( addresseeExecuted( TQListViewItem* ) ) );
+ connect( mListView, TQ_SIGNAL( executed( TQListViewItem* ) ),
+ this, TQ_SLOT( addresseeExecuted( TQListViewItem* ) ) );
else
- connect( mListView, TQT_SIGNAL( doubleClicked( TQListViewItem* ) ),
- this, TQT_SLOT( addresseeExecuted( TQListViewItem* ) ) );
+ connect( mListView, TQ_SIGNAL( doubleClicked( TQListViewItem* ) ),
+ this, TQ_SLOT( addresseeExecuted( TQListViewItem* ) ) );
refresh();
@@ -187,13 +187,13 @@ void KAddressBookTableView::readConfig( TDEConfig *config )
if ( config->readBoolEntry( "InstantMessagingPresence", false ) ) {
if ( !mIMProxy ) {
mIMProxy = KIMProxy::instance( kapp->dcopClient() );
- connect( mIMProxy, TQT_SIGNAL( sigContactPresenceChanged( const TQString& ) ),
- this, TQT_SLOT( updatePresence( const TQString& ) ) );
+ connect( mIMProxy, TQ_SIGNAL( sigContactPresenceChanged( const TQString& ) ),
+ this, TQ_SLOT( updatePresence( const TQString& ) ) );
}
} else {
if ( mIMProxy ) {
- disconnect( mIMProxy, TQT_SIGNAL( sigContactPresenceChanged( const TQString& ) ),
- this, TQT_SLOT( updatePresence( const TQString& ) ) );
+ disconnect( mIMProxy, TQ_SIGNAL( sigContactPresenceChanged( const TQString& ) ),
+ this, TQ_SLOT( updatePresence( const TQString& ) ) );
mIMProxy = 0;
}
}
diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h
index 7d258d2a..432a2164 100644
--- a/kaddressbook/views/kaddressbooktableview.h
+++ b/kaddressbook/views/kaddressbooktableview.h
@@ -61,7 +61,7 @@ class KAddressBookTableView : public KAddressBookView
{
friend class ContactListView;
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/xxport/bookmark_xxport.h b/kaddressbook/xxport/bookmark_xxport.h
index fde6fe4d..03fe7d0d 100644
--- a/kaddressbook/xxport/bookmark_xxport.h
+++ b/kaddressbook/xxport/bookmark_xxport.h
@@ -29,7 +29,7 @@
class BookmarkXXPort : public KAB::XXPort
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/xxport/csv_xxport.h b/kaddressbook/xxport/csv_xxport.h
index f0a28fde..473507b6 100644
--- a/kaddressbook/xxport/csv_xxport.h
+++ b/kaddressbook/xxport/csv_xxport.h
@@ -28,7 +28,7 @@
class CSVXXPort : public KAB::XXPort
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 091d277f..589bfb24 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -121,33 +121,33 @@ CSVImportDialog::CSVImportDialog( TDEABC::AddressBook *ab, TQWidget *parent,
reloadCodecs();
- connect( mDelimiterBox, TQT_SIGNAL( clicked( int ) ),
- this, TQT_SLOT( delimiterClicked( int ) ) );
- connect( mDelimiterEdit, TQT_SIGNAL( returnPressed() ),
- this, TQT_SLOT( returnPressed() ) );
- connect( mDelimiterEdit, TQT_SIGNAL( textChanged ( const TQString& ) ),
- this, TQT_SLOT( textChanged ( const TQString& ) ) );
- connect( mComboLine, TQT_SIGNAL( activated( const TQString& ) ),
- this, TQT_SLOT( lineSelected( const TQString& ) ) );
- connect( mComboQuote, TQT_SIGNAL( activated( const TQString& ) ),
- this, TQT_SLOT( textquoteSelected( const TQString& ) ) );
- connect( mIgnoreDuplicates, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( ignoreDuplicatesChanged( int ) ) );
- connect( mCodecCombo, TQT_SIGNAL( activated( const TQString& ) ),
- this, TQT_SLOT( codecChanged() ) );
-
- connect( mUrlRequester, TQT_SIGNAL( returnPressed( const TQString& ) ),
- this, TQT_SLOT( setFile( const TQString& ) ) );
- connect( mUrlRequester, TQT_SIGNAL( urlSelected( const TQString& ) ),
- this, TQT_SLOT( setFile( const TQString& ) ) );
- connect( mUrlRequester->lineEdit(), TQT_SIGNAL( textChanged ( const TQString& ) ),
- this, TQT_SLOT( urlChanged( const TQString& ) ) );
-
- connect( this, TQT_SIGNAL( user1Clicked() ),
- this, TQT_SLOT( applyTemplate() ) );
-
- connect( this, TQT_SIGNAL( user2Clicked() ),
- this, TQT_SLOT( saveTemplate() ) );
+ connect( mDelimiterBox, TQ_SIGNAL( clicked( int ) ),
+ this, TQ_SLOT( delimiterClicked( int ) ) );
+ connect( mDelimiterEdit, TQ_SIGNAL( returnPressed() ),
+ this, TQ_SLOT( returnPressed() ) );
+ connect( mDelimiterEdit, TQ_SIGNAL( textChanged ( const TQString& ) ),
+ this, TQ_SLOT( textChanged ( const TQString& ) ) );
+ connect( mComboLine, TQ_SIGNAL( activated( const TQString& ) ),
+ this, TQ_SLOT( lineSelected( const TQString& ) ) );
+ connect( mComboQuote, TQ_SIGNAL( activated( const TQString& ) ),
+ this, TQ_SLOT( textquoteSelected( const TQString& ) ) );
+ connect( mIgnoreDuplicates, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( ignoreDuplicatesChanged( int ) ) );
+ connect( mCodecCombo, TQ_SIGNAL( activated( const TQString& ) ),
+ this, TQ_SLOT( codecChanged() ) );
+
+ connect( mUrlRequester, TQ_SIGNAL( returnPressed( const TQString& ) ),
+ this, TQ_SLOT( setFile( const TQString& ) ) );
+ connect( mUrlRequester, TQ_SIGNAL( urlSelected( const TQString& ) ),
+ this, TQ_SLOT( setFile( const TQString& ) ) );
+ connect( mUrlRequester->lineEdit(), TQ_SIGNAL( textChanged ( const TQString& ) ),
+ this, TQ_SLOT( urlChanged( const TQString& ) ) );
+
+ connect( this, TQ_SIGNAL( user1Clicked() ),
+ this, TQ_SLOT( applyTemplate() ) );
+
+ connect( this, TQ_SIGNAL( user2Clicked() ),
+ this, TQ_SLOT( saveTemplate() ) );
}
CSVImportDialog::~CSVImportDialog()
@@ -383,7 +383,7 @@ void CSVImportDialog::initGUI()
// Delimiter: comma, semicolon, tab, space, other
mDelimiterBox = new TQButtonGroup( i18n( "Delimiter" ), mPage );
- mDelimiterBox->setColumnLayout( 0, Qt::Vertical );
+ mDelimiterBox->setColumnLayout( 0, TQt::Vertical );
mDelimiterBox->layout()->setSpacing( spacingHint() );
mDelimiterBox->layout()->setMargin( marginHint() );
TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->layout() );
diff --git a/kaddressbook/xxport/csvimportdialog.h b/kaddressbook/xxport/csvimportdialog.h
index da91c019..2dce71f4 100644
--- a/kaddressbook/xxport/csvimportdialog.h
+++ b/kaddressbook/xxport/csvimportdialog.h
@@ -40,7 +40,7 @@ class TQTable;
class CSVImportDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/xxport/eudora_xxport.h b/kaddressbook/xxport/eudora_xxport.h
index b6b34602..1f6007f5 100644
--- a/kaddressbook/xxport/eudora_xxport.h
+++ b/kaddressbook/xxport/eudora_xxport.h
@@ -28,7 +28,7 @@
class EudoraXXPort : public KAB::XXPort
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/xxport/gnokii_xxport.h b/kaddressbook/xxport/gnokii_xxport.h
index b41aace1..c24c4b14 100644
--- a/kaddressbook/xxport/gnokii_xxport.h
+++ b/kaddressbook/xxport/gnokii_xxport.h
@@ -28,7 +28,7 @@
class GNOKIIXXPort : public KAB::XXPort
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/xxport/kde2_xxport.h b/kaddressbook/xxport/kde2_xxport.h
index 694b0b1b..146fa117 100644
--- a/kaddressbook/xxport/kde2_xxport.h
+++ b/kaddressbook/xxport/kde2_xxport.h
@@ -28,7 +28,7 @@
class KDE2XXPort : public KAB::XXPort
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/xxport/ldif_xxport.h b/kaddressbook/xxport/ldif_xxport.h
index 1e8282a8..11cbd40b 100644
--- a/kaddressbook/xxport/ldif_xxport.h
+++ b/kaddressbook/xxport/ldif_xxport.h
@@ -29,7 +29,7 @@
class LDIFXXPort : public KAB::XXPort
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/xxport/opera_xxport.h b/kaddressbook/xxport/opera_xxport.h
index ce0a33ec..e0723c58 100644
--- a/kaddressbook/xxport/opera_xxport.h
+++ b/kaddressbook/xxport/opera_xxport.h
@@ -29,7 +29,7 @@
class OperaXXPort : public KAB::XXPort
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/xxport/pab_xxport.h b/kaddressbook/xxport/pab_xxport.h
index 796894a0..b3b6fb29 100644
--- a/kaddressbook/xxport/pab_xxport.h
+++ b/kaddressbook/xxport/pab_xxport.h
@@ -29,7 +29,7 @@
class PABXXPort : public KAB::XXPort
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/xxport/vcard_xxport.h b/kaddressbook/xxport/vcard_xxport.h
index c5f66f93..780d7ccc 100644
--- a/kaddressbook/xxport/vcard_xxport.h
+++ b/kaddressbook/xxport/vcard_xxport.h
@@ -29,7 +29,7 @@
class VCardXXPort : public KAB::XXPort
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index bdc48f6b..3424e98e 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -146,10 +146,10 @@ void XXPortManager::loadPlugins()
mCore->guiClient()->insertChildClient( obj );
mXXPortObjects.insert( obj->identifier(), obj );
- connect( obj, TQT_SIGNAL( exportActivated( const TQString&, const TQString& ) ),
- this, TQT_SLOT( slotExport( const TQString&, const TQString& ) ) );
- connect( obj, TQT_SIGNAL( importActivated( const TQString&, const TQString& ) ),
- this, TQT_SLOT( slotImport( const TQString&, const TQString& ) ) );
+ connect( obj, TQ_SIGNAL( exportActivated( const TQString&, const TQString& ) ),
+ this, TQ_SLOT( slotExport( const TQString&, const TQString& ) ) );
+ connect( obj, TQ_SIGNAL( importActivated( const TQString&, const TQString& ) ),
+ this, TQ_SLOT( slotImport( const TQString&, const TQString& ) ) );
obj->setTDEApplication( kapp );
}
diff --git a/kaddressbook/xxportmanager.h b/kaddressbook/xxportmanager.h
index 04323636..02057213 100644
--- a/kaddressbook/xxportmanager.h
+++ b/kaddressbook/xxportmanager.h
@@ -39,7 +39,7 @@ class Core;
class KDE_EXPORT XXPortManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index b6849aac..449ea60d 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -51,10 +51,10 @@ XXPortSelectDialog::XXPortSelectDialog( KAB::Core *core, bool sort,
{
initGUI();
- connect( mFiltersCombo, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( filterChanged( int ) ) );
- connect( mCategoriesView, TQT_SIGNAL( clicked( TQListViewItem* ) ),
- TQT_SLOT( categoryClicked( TQListViewItem* ) ) );
+ connect( mFiltersCombo, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( filterChanged( int ) ) );
+ connect( mCategoriesView, TQ_SIGNAL( clicked( TQListViewItem* ) ),
+ TQ_SLOT( categoryClicked( TQListViewItem* ) ) );
// setup filters
mFilters = Filter::restore( kapp->config(), "Filter" );
@@ -186,7 +186,7 @@ void XXPortSelectDialog::initGUI()
topLayout->addWidget( label );
mButtonGroup = new TQButtonGroup( i18n( "Selection" ), page );
- mButtonGroup->setColumnLayout( 0, Qt::Vertical );
+ mButtonGroup->setColumnLayout( 0, TQt::Vertical );
mButtonGroup->layout()->setSpacing( KDialog::spacingHint() );
mButtonGroup->layout()->setMargin( KDialog::marginHint() );
@@ -225,7 +225,7 @@ void XXPortSelectDialog::initGUI()
topLayout->addWidget( mButtonGroup );
TQButtonGroup *sortingGroup = new TQButtonGroup( i18n( "Sorting" ), page );
- sortingGroup->setColumnLayout( 0, Qt::Vertical );
+ sortingGroup->setColumnLayout( 0, TQt::Vertical );
TQGridLayout *sortLayout = new TQGridLayout( sortingGroup->layout(), 2, 2,
KDialog::spacingHint() );
sortLayout->setAlignment( TQt::AlignTop );
diff --git a/kaddressbook/xxportselectdialog.h b/kaddressbook/xxportselectdialog.h
index d9355e5b..725dfd22 100644
--- a/kaddressbook/xxportselectdialog.h
+++ b/kaddressbook/xxportselectdialog.h
@@ -44,7 +44,7 @@ class KComboBox;
class XXPortSelectDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp
index d0150d00..f47e962c 100644
--- a/kalarm/alarmcalendar.cpp
+++ b/kalarm/alarmcalendar.cpp
@@ -717,7 +717,7 @@ void AlarmCalendar::purgeIfQueued()
void AlarmCalendar::startPurgeTimer()
{
if (mPurgeDays > 0)
- StartOfDayTimer::connect(this, TQT_SLOT(slotPurge()));
+ StartOfDayTimer::connect(this, TQ_SLOT(slotPurge()));
}
/******************************************************************************
diff --git a/kalarm/alarmcalendar.h b/kalarm/alarmcalendar.h
index 91977ea9..a06498e7 100644
--- a/kalarm/alarmcalendar.h
+++ b/kalarm/alarmcalendar.h
@@ -35,7 +35,7 @@ class TDEConfig;
*/
class AlarmCalendar : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
virtual ~AlarmCalendar();
diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp
index 6d7e5f9e..a436e3d0 100644
--- a/kalarm/alarmlistview.cpp
+++ b/kalarm/alarmlistview.cpp
@@ -348,7 +348,7 @@ TQString AlarmListView::whatsThisText(int column) const
void AlarmListView::contentsMousePressEvent(TQMouseEvent* e)
{
TQListView::contentsMousePressEvent(e);
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
{
TQPoint p(contentsToViewport(e->pos()));
if (itemAt(p))
diff --git a/kalarm/alarmlistview.h b/kalarm/alarmlistview.h
index a48def33..9da667ed 100644
--- a/kalarm/alarmlistview.h
+++ b/kalarm/alarmlistview.h
@@ -63,7 +63,7 @@ class AlarmListViewItem : public EventListViewItemBase
class AlarmListView : public EventListViewBase
{
- Q_OBJECT
+ TQ_OBJECT
// needed by TQObject::isA() calls
public:
enum ColumnIndex { // default column order
diff --git a/kalarm/alarmtimewidget.cpp b/kalarm/alarmtimewidget.cpp
index 615696cf..6586b896 100644
--- a/kalarm/alarmtimewidget.cpp
+++ b/kalarm/alarmtimewidget.cpp
@@ -83,7 +83,7 @@ void AlarmTimeWidget::init(int mode)
"If a recurrence is configured, the start date/time will be adjusted "
"to the first recurrence on or after the entered date/time.");
- connect(this, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotButtonSet(int)));
+ connect(this, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotButtonSet(int)));
TQBoxLayout* topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
if (!title().isEmpty())
{
@@ -101,7 +101,7 @@ void AlarmTimeWidget::init(int mode)
// Date edit box
mDateEdit = new DateEdit(this);
mDateEdit->setFixedSize(mDateEdit->sizeHint());
- connect(mDateEdit, TQT_SIGNAL(dateEntered(const TQDate&)), TQT_SLOT(dateTimeChanged()));
+ connect(mDateEdit, TQ_SIGNAL(dateEntered(const TQDate&)), TQ_SLOT(dateTimeChanged()));
static const TQString enterDateText = i18n("Enter the date to schedule the alarm.");
TQWhatsThis::add(mDateEdit, ((mode & DEFER_TIME) ? enterDateText
: TQString("%1\n%2").arg(enterDateText).arg(recurText)));
@@ -112,7 +112,7 @@ void AlarmTimeWidget::init(int mode)
timeBox->setSpacing(2*KDialog::spacingHint());
mTimeEdit = new TimeEdit(timeBox);
mTimeEdit->setFixedSize(mTimeEdit->sizeHint());
- connect(mTimeEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(dateTimeChanged()));
+ connect(mTimeEdit, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(dateTimeChanged()));
static const TQString enterTimeText = i18n("Enter the time to schedule the alarm.");
TQWhatsThis::add(mTimeEdit,
((mode & DEFER_TIME) ? TQString("%1\n\n%2").arg(enterTimeText).arg(TimeSpinBox::shiftWhatsThis())
@@ -129,7 +129,7 @@ void AlarmTimeWidget::init(int mode)
mAnyTimeAllowed = true;
mAnyTimeCheckBox = new CheckBox(i18n("An&y time"), timeBox);
mAnyTimeCheckBox->setFixedSize(mAnyTimeCheckBox->sizeHint());
- connect(mAnyTimeCheckBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAnyTimeToggled(bool)));
+ connect(mAnyTimeCheckBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAnyTimeToggled(bool)));
TQWhatsThis::add(mAnyTimeCheckBox, i18n("Schedule the alarm for any time during the day"));
}
@@ -145,7 +145,7 @@ void AlarmTimeWidget::init(int mode)
mDelayTimeEdit = new TimeSpinBox(1, maxDelayTime, this);
mDelayTimeEdit->setValue(maxDelayTime);
mDelayTimeEdit->setFixedSize(mDelayTimeEdit->sizeHint());
- connect(mDelayTimeEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(delayTimeChanged(int)));
+ connect(mDelayTimeEdit, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(delayTimeChanged(int)));
TQWhatsThis::add(mDelayTimeEdit,
((mode & DEFER_TIME) ? TQString("%1\n\n%2").arg(i18n_TimeAfterPeriod()).arg(TimeSpinBox::shiftWhatsThis())
: TQString("%1\n%2\n\n%3").arg(i18n_TimeAfterPeriod()).arg(recurText).arg(TimeSpinBox::shiftWhatsThis())));
@@ -182,7 +182,7 @@ void AlarmTimeWidget::init(int mode)
setButton(id(mAtTimeRadio));
// Timeout every minute to update alarm time fields.
- MinuteTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(slotTimer()));
+ MinuteTimer::connect(this, TQ_SLOT(slotTimer()));
}
/******************************************************************************
diff --git a/kalarm/alarmtimewidget.h b/kalarm/alarmtimewidget.h
index 47659adb..d384c054 100644
--- a/kalarm/alarmtimewidget.h
+++ b/kalarm/alarmtimewidget.h
@@ -33,7 +33,7 @@ class TimeSpinBox;
class AlarmTimeWidget : public ButtonGroup
{
- Q_OBJECT
+ TQ_OBJECT
public:
enum { // 'mode' values for constructor. May be OR'ed together.
diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp
index c98a9987..0a1cd157 100644
--- a/kalarm/birthdaydlg.cpp
+++ b/kalarm/birthdaydlg.cpp
@@ -85,13 +85,13 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent)
mPrefixText = config->readEntry(TQString::fromLatin1("BirthdayPrefix"), i18n("Birthday: "));
mSuffixText = config->readEntry(TQString::fromLatin1("BirthdaySuffix"));
- TQGroupBox* textGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Alarm Text"), topWidget);
+ TQGroupBox* textGroup = new TQGroupBox(2, TQt::Horizontal, i18n("Alarm Text"), topWidget);
topLayout->addWidget(textGroup);
TQLabel* label = new TQLabel(i18n("Pre&fix:"), textGroup);
mPrefix = new BLineEdit(mPrefixText, textGroup);
mPrefix->setMinimumSize(mPrefix->sizeHint());
label->setBuddy(mPrefix);
- connect(mPrefix, TQT_SIGNAL(focusLost()), TQT_SLOT(slotTextLostFocus()));
+ connect(mPrefix, TQ_SIGNAL(focusLost()), TQ_SLOT(slotTextLostFocus()));
TQWhatsThis::add(mPrefix,
i18n("Enter text to appear before the person's name in the alarm message, "
"including any necessary trailing spaces."));
@@ -100,12 +100,12 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent)
mSuffix = new BLineEdit(mSuffixText, textGroup);
mSuffix->setMinimumSize(mSuffix->sizeHint());
label->setBuddy(mSuffix);
- connect(mSuffix, TQT_SIGNAL(focusLost()), TQT_SLOT(slotTextLostFocus()));
+ connect(mSuffix, TQ_SIGNAL(focusLost()), TQ_SLOT(slotTextLostFocus()));
TQWhatsThis::add(mSuffix,
i18n("Enter text to appear after the person's name in the alarm message, "
"including any necessary leading spaces."));
- TQGroupBox* group = new TQGroupBox(1, Qt::Horizontal, i18n("Select Birthdays"), topWidget);
+ TQGroupBox* group = new TQGroupBox(1, TQt::Horizontal, i18n("Select Birthdays"), topWidget);
topLayout->addWidget(group);
mAddresseeList = new BListView(group);
mAddresseeList->setMultiSelection(true);
@@ -114,7 +114,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent)
mAddresseeList->setFullWidth(true);
mAddresseeList->addColumn(i18n("Name"));
mAddresseeList->addColumn(i18n("Birthday"));
- connect(mAddresseeList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged()));
+ connect(mAddresseeList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged()));
TQWhatsThis::add(mAddresseeList,
i18n("Select birthdays to set alarms for.\n"
"This list shows all birthdays in KAddressBook except those for which alarms already exist.\n\n"
@@ -198,7 +198,7 @@ void BirthdayDlg::loadAddressBook()
#if KDE_IS_VERSION(3,1,90)
mAddressBook = TDEABC::StdAddressBook::self(true);
if (mAddressBook)
- connect(mAddressBook, TQT_SIGNAL(addressBookChanged(AddressBook*)), TQT_SLOT(updateSelectionList()));
+ connect(mAddressBook, TQ_SIGNAL(addressBookChanged(AddressBook*)), TQ_SLOT(updateSelectionList()));
#else
mAddressBook = TDEABC::StdAddressBook::self();
if (mAddressBook)
@@ -421,7 +421,7 @@ BListView::BListView(TQWidget* parent, const char* name)
: TDEListView(parent, name)
{
TDEAccel* accel = new TDEAccel(this);
- accel->insert(TDEStdAccel::SelectAll, TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()));
- accel->insert(TDEStdAccel::Deselect, TQT_TQOBJECT(this), TQT_SLOT(slotDeselect()));
+ accel->insert(TDEStdAccel::SelectAll, this, TQ_SLOT(slotSelectAll()));
+ accel->insert(TDEStdAccel::Deselect, this, TQ_SLOT(slotDeselect()));
accel->readSettings();
}
diff --git a/kalarm/birthdaydlg.h b/kalarm/birthdaydlg.h
index ee551146..aa7c66ae 100644
--- a/kalarm/birthdaydlg.h
+++ b/kalarm/birthdaydlg.h
@@ -42,7 +42,7 @@ class BListView;
class BirthdayDlg : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
BirthdayDlg(TQWidget* parent = 0);
@@ -79,7 +79,7 @@ class BirthdayDlg : public KDialogBase
class BLineEdit : public TQLineEdit
{
- Q_OBJECT
+ TQ_OBJECT
public:
BLineEdit(TQWidget* parent = 0, const char* name = 0)
@@ -94,7 +94,7 @@ class BLineEdit : public TQLineEdit
class BListView : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
BListView(TQWidget* parent = 0, const char* name = 0);
diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp
index 842514d9..fd099632 100644
--- a/kalarm/daemon.cpp
+++ b/kalarm/daemon.cpp
@@ -95,7 +95,7 @@ void Daemon::initialise()
{
if (!mInstance)
mInstance = new Daemon();
- connect(AlarmCalendar::activeCalendar(), TQT_SIGNAL(calendarSaved(AlarmCalendar*)), mInstance, TQT_SLOT(slotCalendarSaved(AlarmCalendar*)));
+ connect(AlarmCalendar::activeCalendar(), TQ_SIGNAL(calendarSaved(AlarmCalendar*)), mInstance, TQ_SLOT(slotCalendarSaved(AlarmCalendar*)));
}
/******************************************************************************
@@ -111,10 +111,10 @@ void Daemon::createDcopHandler()
mRunning = isRunning(false);
mStatusTimerInterval = Preferences::daemonTrayCheckInterval();
- Preferences::connect(TQT_SIGNAL(preferencesChanged()), mInstance, TQT_SLOT(slotPreferencesChanged()));
+ Preferences::connect(TQ_SIGNAL(preferencesChanged()), mInstance, TQ_SLOT(slotPreferencesChanged()));
mStatusTimer = new TQTimer(mInstance);
- connect(mStatusTimer, TQT_SIGNAL(timeout()), mInstance, TQT_SLOT(timerCheckIfRunning()));
+ connect(mStatusTimer, TQ_SIGNAL(timeout()), mInstance, TQ_SLOT(timerCheckIfRunning()));
mStatusTimer->start(mStatusTimerInterval * 1000); // check regularly if daemon is running
}
@@ -145,7 +145,7 @@ bool Daemon::start()
kdDebug(5950) << "Daemon::start(): Alarm daemon started" << endl;
mStartTimeout = 5000/startCheckInterval + 1; // check daemon status for 5 seconds before giving up
mStartTimer = new TQTimer(mInstance);
- connect(mStartTimer, TQT_SIGNAL(timeout()), mInstance, TQT_SLOT(checkIfStarted()));
+ connect(mStartTimer, TQ_SIGNAL(timeout()), mInstance, TQ_SLOT(checkIfStarted()));
mStartTimer->start(startCheckInterval);
mInstance->checkIfStarted();
return true;
@@ -201,7 +201,7 @@ bool Daemon::registerWith(bool reregister)
return false;
}
mRegisterTimer = new TQTimer(mInstance);
- connect(mRegisterTimer, TQT_SIGNAL(timeout()), mInstance, TQT_SLOT(registerTimerExpired()));
+ connect(mRegisterTimer, TQ_SIGNAL(timeout()), mInstance, TQ_SLOT(registerTimerExpired()));
mRegisterTimer->start(REGISTER_TIMEOUT * 1000); // wait for the reply
return true;
}
@@ -327,7 +327,7 @@ void Daemon::updateRegisteredStatus(bool timeout)
// The daemon has newly been detected as registered with DCOP.
// Wait for a short time to ensure that it is ready for DCOP calls.
mStatus = RUNNING;
- TQTimer::singleShot(startCheckInterval, mInstance, TQT_SLOT(slotStarted()));
+ TQTimer::singleShot(startCheckInterval, mInstance, TQ_SLOT(slotStarted()));
break;
case RUNNING:
if (timeout)
@@ -569,8 +569,8 @@ void Daemon::slotPreferencesChanged()
AlarmEnableAction* Daemon::createAlarmEnableAction(TDEActionCollection* actions, const char* name)
{
AlarmEnableAction* a = new AlarmEnableAction(0, actions, name);
- connect(a, TQT_SIGNAL(userClicked(bool)), mInstance, TQT_SLOT(setAlarmsEnabled(bool)));
- connect(mInstance, TQT_SIGNAL(daemonRunning(bool)), a, TQT_SLOT(setCheckedActual(bool)));
+ connect(a, TQ_SIGNAL(userClicked(bool)), mInstance, TQ_SLOT(setAlarmsEnabled(bool)));
+ connect(mInstance, TQ_SIGNAL(daemonRunning(bool)), a, TQ_SLOT(setCheckedActual(bool)));
return a;
}
diff --git a/kalarm/daemon.h b/kalarm/daemon.h
index 4feba1bb..b7441038 100644
--- a/kalarm/daemon.h
+++ b/kalarm/daemon.h
@@ -36,7 +36,7 @@ class NotificationHandler;
class Daemon : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
static void initialise();
@@ -119,7 +119,7 @@ class Daemon : public TQObject
class AlarmEnableAction : public TDEToggleAction
{
- Q_OBJECT
+ TQ_OBJECT
public:
AlarmEnableAction(int accel, TQObject* parent, const char* name = 0);
diff --git a/kalarm/dcophandler.cpp b/kalarm/dcophandler.cpp
index 5fa716e1..45eddac6 100644
--- a/kalarm/dcophandler.cpp
+++ b/kalarm/dcophandler.cpp
@@ -323,7 +323,7 @@ DateTime DcopHandler::convertStartDateTime(const TQString& startDateTime)
if (startDateTime.length() > 10)
{
// Both a date and a time are specified
- start = TQDateTime::fromString(startDateTime, Qt::ISODate);
+ start = TQDateTime::fromString(startDateTime, TQt::ISODate);
}
else
{
@@ -337,12 +337,12 @@ DateTime DcopHandler::convertStartDateTime(const TQString& startDateTime)
if (t.isEmpty())
{
// It's a date
- start = TQDate::fromString(startDateTime, Qt::ISODate);
+ start = TQDate::fromString(startDateTime, TQt::ISODate);
}
else
{
// It's a time, so use today as the date
- start.set(TQDate::currentDate(), TQTime::fromString(t, Qt::ISODate));
+ start.set(TQDate::currentDate(), TQTime::fromString(t, TQt::ISODate));
}
}
if (!start.isValid())
@@ -424,7 +424,7 @@ bool DcopHandler::convertRecurrence(DateTime& start, KARecurrence& recurrence, c
kdError(5950) << "DCOP call: alarm is date-only, but recurrence end is date/time" << endl;
return false;
}
- end.setDate(TQDate::fromString(endDateTime, Qt::ISODate));
+ end.setDate(TQDate::fromString(endDateTime, TQt::ISODate));
}
else
{
@@ -433,7 +433,7 @@ bool DcopHandler::convertRecurrence(DateTime& start, KARecurrence& recurrence, c
kdError(5950) << "DCOP call: alarm is timed, but recurrence end is date-only" << endl;
return false;
}
- end = TQDateTime::fromString(endDateTime, Qt::ISODate);
+ end = TQDateTime::fromString(endDateTime, TQt::ISODate);
}
if (!end.isValid())
{
diff --git a/kalarm/deferdlg.cpp b/kalarm/deferdlg.cpp
index c5fab880..7a37f3f9 100644
--- a/kalarm/deferdlg.cpp
+++ b/kalarm/deferdlg.cpp
@@ -53,7 +53,7 @@ DeferAlarmDlg::DeferAlarmDlg(const TQString& caption, const DateTime& initialDT,
mTimeWidget = new AlarmTimeWidget(AlarmTimeWidget::DEFER_TIME, page, "timeGroup");
mTimeWidget->setDateTime(initialDT);
mTimeWidget->setMinDateTimeIsCurrent();
- connect(mTimeWidget, TQT_SIGNAL(pastMax()), TQT_SLOT(slotPastLimit()));
+ connect(mTimeWidget, TQ_SIGNAL(pastMax()), TQ_SLOT(slotPastLimit()));
layout->addWidget(mTimeWidget);
layout->addSpacing(spacingHint());
diff --git a/kalarm/deferdlg.h b/kalarm/deferdlg.h
index 37f8b144..70fb1e6e 100644
--- a/kalarm/deferdlg.h
+++ b/kalarm/deferdlg.h
@@ -29,7 +29,7 @@ class AlarmTimeWidget;
class DeferAlarmDlg : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
DeferAlarmDlg(const TQString& caption, const DateTime& initialDT,
diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp
index ff35e918..a95b35db 100644
--- a/kalarm/editdlg.cpp
+++ b/kalarm/editdlg.cpp
@@ -211,7 +211,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
mTabs->addTab(mainPageBox, i18n("&Alarm"));
mMainPageIndex = 0;
PageFrame* mainPage = new PageFrame(mainPageBox);
- connect(mainPage, TQT_SIGNAL(shown()), TQT_SLOT(slotShowMainPage()));
+ connect(mainPage, TQ_SIGNAL(shown()), TQ_SLOT(slotShowMainPage()));
TQVBoxLayout* topLayout = new TQVBoxLayout(mainPage, 0, spacingHint());
// Recurrence tab
@@ -220,15 +220,15 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
mTabs->addTab(recurTab, TQString());
mRecurPageIndex = 1;
mRecurrenceEdit = new RecurrenceEdit(readOnly, recurTab, "recurPage");
- connect(mRecurrenceEdit, TQT_SIGNAL(shown()), TQT_SLOT(slotShowRecurrenceEdit()));
- connect(mRecurrenceEdit, TQT_SIGNAL(typeChanged(int)), TQT_SLOT(slotRecurTypeChange(int)));
- connect(mRecurrenceEdit, TQT_SIGNAL(frequencyChanged()), TQT_SLOT(slotRecurFrequencyChange()));
- connect(mRecurrenceEdit, TQT_SIGNAL(repeatNeedsInitialisation()), TQT_SLOT(slotSetSubRepetition()));
+ connect(mRecurrenceEdit, TQ_SIGNAL(shown()), TQ_SLOT(slotShowRecurrenceEdit()));
+ connect(mRecurrenceEdit, TQ_SIGNAL(typeChanged(int)), TQ_SLOT(slotRecurTypeChange(int)));
+ connect(mRecurrenceEdit, TQ_SIGNAL(frequencyChanged()), TQ_SLOT(slotRecurFrequencyChange()));
+ connect(mRecurrenceEdit, TQ_SIGNAL(repeatNeedsInitialisation()), TQ_SLOT(slotSetSubRepetition()));
// Alarm action
mActionGroup = new ButtonGroup(i18n("Action"), mainPage, "actionGroup");
- connect(mActionGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotAlarmTypeChanged(int)));
+ connect(mActionGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotAlarmTypeChanged(int)));
topLayout->addWidget(mActionGroup, 1);
TQBoxLayout* layout = new TQVBoxLayout(mActionGroup, marginHint(), spacingHint());
layout->addSpacing(fontMetrics().lineSpacing()/2);
@@ -273,7 +273,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
layout->addWidget(mEmailFrame);
// Deferred date/time: visible only for a deferred recurring event.
- mDeferGroup = new TQGroupBox(1, Qt::Vertical, i18n("Deferred Alarm"), mainPage, "deferGroup");
+ mDeferGroup = new TQGroupBox(1, TQt::Vertical, i18n("Deferred Alarm"), mainPage, "deferGroup");
topLayout->addWidget(mDeferGroup);
TQLabel* label = new TQLabel(i18n("Deferred to:"), mDeferGroup);
label->setFixedSize(label->sizeHint());
@@ -281,7 +281,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
mDeferChangeButton = new TQPushButton(i18n("C&hange..."), mDeferGroup);
mDeferChangeButton->setFixedSize(mDeferChangeButton->sizeHint());
- connect(mDeferChangeButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditDeferral()));
+ connect(mDeferChangeButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditDeferral()));
TQWhatsThis::add(mDeferChangeButton, i18n("Change the alarm's deferred time, or cancel the deferral"));
mDeferGroup->addSpace(0);
@@ -291,7 +291,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
if (mTemplate)
{
mTemplateTimeGroup = new ButtonGroup(i18n("Time"), mainPage, "templateGroup");
- connect(mTemplateTimeGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotTemplateTimeType(int)));
+ connect(mTemplateTimeGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotTemplateTimeType(int)));
layout->addWidget(mTemplateTimeGroup);
grid = new TQGridLayout(mTemplateTimeGroup, 2, 2, marginHint(), spacingHint());
grid->addRowSpacing(0, fontMetrics().lineSpacing()/2);
@@ -355,7 +355,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
else
{
mTimeWidget = new AlarmTimeWidget(i18n("Time"), AlarmTimeWidget::AT_TIME, mainPage, "timeGroup");
- connect(mTimeWidget, TQT_SIGNAL(anyTimeToggled(bool)), TQT_SLOT(slotAnyTimeToggled(bool)));
+ connect(mTimeWidget, TQ_SIGNAL(anyTimeToggled(bool)), TQ_SLOT(slotAnyTimeToggled(bool)));
topLayout->addWidget(mTimeWidget);
}
@@ -489,7 +489,7 @@ void EditAlarmDlg::initCommand(TQWidget* parent)
mCmdTypeScript = new CheckBox(i18n_p_EnterScript(), mCommandFrame);
mCmdTypeScript->setFixedSize(mCmdTypeScript->sizeHint());
- connect(mCmdTypeScript, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCmdScriptToggled(bool)));
+ connect(mCmdTypeScript, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotCmdScriptToggled(bool)));
TQWhatsThis::add(mCmdTypeScript, i18n("Check to enter the contents of a script instead of a shell command line"));
frameLayout->addWidget(mCmdTypeScript, 0, TQt::AlignAuto);
@@ -595,7 +595,7 @@ void EditAlarmDlg::initEmail(TQWidget* parent)
mEmailAddressButton = new TQPushButton(mEmailFrame);
mEmailAddressButton->setPixmap(SmallIcon("contents"));
mEmailAddressButton->setFixedSize(mEmailAddressButton->sizeHint());
- connect(mEmailAddressButton, TQT_SIGNAL(clicked()), TQT_SLOT(openAddressBook()));
+ connect(mEmailAddressButton, TQ_SIGNAL(clicked()), TQ_SLOT(openAddressBook()));
TQToolTip::add(mEmailAddressButton, i18n("Open address book"));
TQWhatsThis::add(mEmailAddressButton, i18n("Select email addresses from your address book."));
grid->addWidget(mEmailAddressButton, 1, 2);
@@ -635,12 +635,12 @@ list->setGeometry(rect.left() - 50, rect.top(), rect.width(), rect.height());
grid->setColStretch(1, 1);
mEmailAddAttachButton = new TQPushButton(i18n("Add..."), mEmailFrame);
- connect(mEmailAddAttachButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddAttachment()));
+ connect(mEmailAddAttachButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddAttachment()));
TQWhatsThis::add(mEmailAddAttachButton, i18n("Add an attachment to the email."));
grid->addWidget(mEmailAddAttachButton, 0, 2);
mEmailRemoveButton = new TQPushButton(i18n("Remo&ve"), mEmailFrame);
- connect(mEmailRemoveButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveAttachment()));
+ connect(mEmailRemoveButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveAttachment()));
TQWhatsThis::add(mEmailRemoveButton, i18n("Remove the highlighted attachment from the email."));
grid->addWidget(mEmailRemoveButton, 1, 2);
diff --git a/kalarm/editdlg.h b/kalarm/editdlg.h
index 93a3de07..f6e2b16a 100644
--- a/kalarm/editdlg.h
+++ b/kalarm/editdlg.h
@@ -57,7 +57,7 @@ class PickAlarmFileRadio;
class EditAlarmDlg : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
enum MessageType { MESSAGE, FILE };
diff --git a/kalarm/editdlgprivate.h b/kalarm/editdlgprivate.h
index 8851b58b..f44824fb 100644
--- a/kalarm/editdlgprivate.h
+++ b/kalarm/editdlgprivate.h
@@ -26,7 +26,7 @@
class PageFrame : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
PageFrame(TQWidget* parent = 0, const char* name = 0) : TQFrame(parent, name) { }
@@ -38,7 +38,7 @@ class PageFrame : public TQFrame
class TextEdit : public KTextEdit
{
- Q_OBJECT
+ TQ_OBJECT
public:
TextEdit(TQWidget* parent, const char* name = 0);
diff --git a/kalarm/emailidcombo.cpp b/kalarm/emailidcombo.cpp
index 99f754c8..88cf3900 100644
--- a/kalarm/emailidcombo.cpp
+++ b/kalarm/emailidcombo.cpp
@@ -31,7 +31,7 @@ void EmailIdCombo::mousePressEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
return;
}
KPIM::IdentityCombo::mousePressEvent(e);
diff --git a/kalarm/emailidcombo.h b/kalarm/emailidcombo.h
index a2cbabc2..630212d5 100644
--- a/kalarm/emailidcombo.h
+++ b/kalarm/emailidcombo.h
@@ -27,7 +27,7 @@
class EmailIdCombo : public KPIM::IdentityCombo
{
- Q_OBJECT
+ TQ_OBJECT
public:
explicit EmailIdCombo(KPIM::IdentityManager*, TQWidget* parent = 0, const char* name = 0);
diff --git a/kalarm/eventlistviewbase.cpp b/kalarm/eventlistviewbase.cpp
index 14a7afd6..2425a11b 100644
--- a/kalarm/eventlistviewbase.cpp
+++ b/kalarm/eventlistviewbase.cpp
@@ -199,7 +199,7 @@ void EventListViewBase::slotFind()
if (!mFind)
{
mFind = new Find(this);
- connect(mFind, TQT_SIGNAL(active(bool)), TQT_SIGNAL(findActive(bool)));
+ connect(mFind, TQ_SIGNAL(active(bool)), TQ_SIGNAL(findActive(bool)));
}
mFind->display();
}
diff --git a/kalarm/eventlistviewbase.h b/kalarm/eventlistviewbase.h
index 9f043f77..18d1a771 100644
--- a/kalarm/eventlistviewbase.h
+++ b/kalarm/eventlistviewbase.h
@@ -35,7 +35,7 @@ class Find;
class EventListViewBase : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
typedef TQValueList<EventListViewBase*> InstanceList;
diff --git a/kalarm/find.cpp b/kalarm/find.cpp
index 8e35cbe9..9e30388e 100644
--- a/kalarm/find.cpp
+++ b/kalarm/find.cpp
@@ -113,7 +113,7 @@ void Find::display()
"This option is only available if expired alarms are currently being displayed."));
grid->addWidget(mExpired, 1, 2, TQt::AlignAuto);
- mActiveExpiredSep = new KSeparator(Qt::Horizontal, kalarmWidgets);
+ mActiveExpiredSep = new KSeparator(TQt::Horizontal, kalarmWidgets);
grid->addMultiCellWidget(mActiveExpiredSep, 2, 2, 0, 2);
// Alarm actions
@@ -146,7 +146,7 @@ void Find::display()
mEmailType->setChecked(mOptions & FIND_EMAIL);
#ifndef MODAL_FIND
- connect(mDialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotFind()));
+ connect(mDialog, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotFind()));
#endif
}
@@ -245,7 +245,7 @@ void Find::slotFind()
#else
mFind = new KFind(mLastPattern, options, mListView, mDialog);
#endif
- connect(mFind, TQT_SIGNAL(destroyed()), TQT_SLOT(slotKFindDestroyed()));
+ connect(mFind, TQ_SIGNAL(destroyed()), TQ_SLOT(slotKFindDestroyed()));
mFind->closeFindNextDialog(); // prevent 'Find Next' dialog appearing
}
diff --git a/kalarm/find.h b/kalarm/find.h
index 493f10cc..dc838f3b 100644
--- a/kalarm/find.h
+++ b/kalarm/find.h
@@ -35,7 +35,7 @@ class EventListViewItemBase;
class Find : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
explicit Find(EventListViewBase* parent);
diff --git a/kalarm/fontcolour.cpp b/kalarm/fontcolour.cpp
index 74feffb6..64a8cdce 100644
--- a/kalarm/fontcolour.cpp
+++ b/kalarm/fontcolour.cpp
@@ -68,7 +68,7 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name,
TQLabel* label = new TQLabel(i18n("&Foreground color:"), box);
box->setStretchFactor(new TQWidget(box), 0);
mFgColourButton = new ColourCombo(box);
- connect(mFgColourButton, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(setSampleColour()));
+ connect(mFgColourButton, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(setSampleColour()));
label->setBuddy(mFgColourButton);
TQWhatsThis::add(box, i18n("Select the alarm message foreground color"));
}
@@ -80,7 +80,7 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name,
TQLabel* label = new TQLabel(i18n("&Background color:"), box);
box->setStretchFactor(new TQWidget(box), 0);
mBgColourButton = new ColourCombo(box);
- connect(mBgColourButton, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(setSampleColour()));
+ connect(mBgColourButton, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(setSampleColour()));
label->setBuddy(mBgColourButton);
TQWhatsThis::add(box, i18n("Select the alarm message background color"));
hlayout->addStretch();
@@ -90,13 +90,13 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name,
TQHBoxLayout* layout = new TQHBoxLayout(topLayout);
TQPushButton* button = new TQPushButton(i18n("Add Co&lor..."), page);
button->setFixedSize(button->sizeHint());
- connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddColour()));
+ connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddColour()));
TQWhatsThis::add(button, i18n("Choose a new color to add to the color selection list."));
layout->addWidget(button);
mRemoveColourButton = new TQPushButton(i18n("&Remove Color"), page);
mRemoveColourButton->setFixedSize(mRemoveColourButton->sizeHint());
- connect(mRemoveColourButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveColour()));
+ connect(mRemoveColourButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveColour()));
TQWhatsThis::add(mRemoveColourButton,
i18n("Remove the color currently shown in the background color chooser, from the color selection list."));
layout->addWidget(mRemoveColourButton);
@@ -107,7 +107,7 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name,
TQHBoxLayout* layout = new TQHBoxLayout(topLayout);
mDefaultFont = new CheckBox(i18n("Use &default font"), page);
mDefaultFont->setMinimumSize(mDefaultFont->sizeHint());
- connect(mDefaultFont, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDefaultFontToggled(bool)));
+ connect(mDefaultFont, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotDefaultFontToggled(bool)));
TQWhatsThis::add(mDefaultFont,
i18n("Check to use the default font current at the time the alarm is displayed."));
layout->addWidget(mDefaultFont);
diff --git a/kalarm/fontcolour.h b/kalarm/fontcolour.h
index e550831e..c70bcc56 100644
--- a/kalarm/fontcolour.h
+++ b/kalarm/fontcolour.h
@@ -34,7 +34,7 @@ class CheckBox;
class FontColourChooser : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
explicit FontColourChooser(TQWidget* parent = 0, const char* name = 0,
diff --git a/kalarm/fontcolourbutton.cpp b/kalarm/fontcolourbutton.cpp
index 5321cdc9..a291a376 100644
--- a/kalarm/fontcolourbutton.cpp
+++ b/kalarm/fontcolourbutton.cpp
@@ -47,7 +47,7 @@ FontColourButton::FontColourButton(TQWidget* parent, const char* name)
mButton = new PushButton(i18n("Font && Co&lor..."), this);
mButton->setFixedSize(mButton->sizeHint());
- connect(mButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonPressed()));
+ connect(mButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonPressed()));
TQWhatsThis::add(mButton,
i18n("Choose the font, and foreground and background color, for the alarm message."));
layout->addWidget(mButton);
diff --git a/kalarm/fontcolourbutton.h b/kalarm/fontcolourbutton.h
index 6126ad64..efe799d4 100644
--- a/kalarm/fontcolourbutton.h
+++ b/kalarm/fontcolourbutton.h
@@ -33,7 +33,7 @@ class PushButton;
class FontColourButton : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
FontColourButton(TQWidget* parent = 0, const char* name = 0);
@@ -67,7 +67,7 @@ class FontColourButton : public TQFrame
// Font and colour selection dialog displayed by the push button
class FontColourDlg : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
FontColourDlg(const TQColor& bg, const TQColor& fg, const TQFont&, bool defaultFont,
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index 9ae28740..455c27a2 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -747,7 +747,7 @@ bool readConfigWindowSize(const char* window, TQSize& result)
{
TDEConfig* config = TDEGlobal::config();
config->setGroup(TQString::fromLatin1(window));
- TQWidget* desktop = TQT_TQWIDGET(TDEApplication::desktop());
+ TQWidget* desktop = TDEApplication::desktop();
TQSize s = TQSize(config->readNumEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), 0),
config->readNumEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), 0));
if (s.isEmpty())
@@ -764,7 +764,7 @@ void writeConfigWindowSize(const char* window, const TQSize& size)
{
TDEConfig* config = TDEGlobal::config();
config->setGroup(TQString::fromLatin1(window));
- TQWidget* desktop = TQT_TQWIDGET(TDEApplication::desktop());
+ TQWidget* desktop = TDEApplication::desktop();
config->writeEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), size.width());
config->writeEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), size.height());
config->sync();
diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
index 476a8c1f..d9adbf7c 100644
--- a/kalarm/kalarmapp.cpp
+++ b/kalarm/kalarmapp.cpp
@@ -109,7 +109,7 @@ KAlarmApp::KAlarmApp()
mSpeechEnabled(false)
{
Preferences::initialise();
- Preferences::connect(TQT_SIGNAL(preferencesChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotPreferencesChanged()));
+ Preferences::connect(TQ_SIGNAL(preferencesChanged()), this, TQ_SLOT(slotPreferencesChanged()));
KCal::CalFormat::setApplication(aboutData()->programName(), AlarmCalendar::icalProductId());
KARecurrence::setDefaultFeb29Type(Preferences::defaultFeb29Type());
@@ -118,7 +118,7 @@ KAlarmApp::KAlarmApp()
if (AlarmCalendar::initialiseCalendars())
{
- connect(AlarmCalendar::expiredCalendar(), TQT_SIGNAL(purged()), TQT_SLOT(slotExpiredPurged()));
+ connect(AlarmCalendar::expiredCalendar(), TQ_SIGNAL(purged()), TQ_SLOT(slotExpiredPurged()));
TDEConfig* config = kapp->config();
config->setGroup(TQString::fromLatin1("General"));
@@ -849,7 +849,7 @@ void KAlarmApp::displayFatalError(const TQString& message)
mFatalError = 1;
mFatalMessage = message;
if (theInstance)
- TQTimer::singleShot(0, theInstance, TQT_SLOT(quitFatal()));
+ TQTimer::singleShot(0, theInstance, TQ_SLOT(quitFatal()));
}
}
@@ -873,7 +873,7 @@ void KAlarmApp::quitFatal()
theInstance->quitIf(1, true);
break;
}
- TQTimer::singleShot(1000, this, TQT_SLOT(quitFatal()));
+ TQTimer::singleShot(1000, this, TQ_SLOT(quitFatal()));
}
/******************************************************************************
@@ -989,7 +989,7 @@ bool KAlarmApp::displayTrayIcon(bool show, MainWindow* parent)
creating = false;
}
mTrayWindow = new TrayWindow(parent ? parent : MainWindow::firstWindow());
- connect(mTrayWindow, TQT_SIGNAL(deleted()), TQT_SIGNAL(trayIconToggled()));
+ connect(mTrayWindow, TQ_SIGNAL(deleted()), TQ_SIGNAL(trayIconToggled()));
mTrayWindow->show();
emit trayIconToggled();
@@ -998,7 +998,7 @@ bool KAlarmApp::displayTrayIcon(bool show, MainWindow* parent)
mCheckingSystemTray = true;
mSavedNoSystemTray = mNoSystemTray;
mNoSystemTray = false;
- TQTimer::singleShot(0, this, TQT_SLOT(slotSystemTrayTimer()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotSystemTrayTimer()));
}
}
else if (mTrayWindow)
@@ -1212,7 +1212,7 @@ bool KAlarmApp::scheduleEvent(KAEvent::Action action, const TQString& text, cons
// Queue the alarm for insertion into the calendar file
mDcopQueue.append(DcopTQEntry(event));
if (mInitialised)
- TQTimer::singleShot(0, this, TQT_SLOT(processQueue()));
+ TQTimer::singleShot(0, this, TQ_SLOT(processQueue()));
return true;
}
@@ -1234,7 +1234,7 @@ bool KAlarmApp::handleEvent(const TQString& urlString, const TQString& eventID,
}
mDcopQueue.append(DcopTQEntry(function, eventID));
if (mInitialised)
- TQTimer::singleShot(0, this, TQT_SLOT(processQueue()));
+ TQTimer::singleShot(0, this, TQ_SLOT(processQueue()));
return true;
}
@@ -1751,16 +1751,16 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent&
comms = TDEProcess::AllOutput;
}
ShellProcess* proc = new ShellProcess(cmd);
- connect(proc, TQT_SIGNAL(shellExited(ShellProcess*)), TQT_SLOT(slotCommandExited(ShellProcess*)));
+ connect(proc, TQ_SIGNAL(shellExited(ShellProcess*)), TQ_SLOT(slotCommandExited(ShellProcess*)));
TQGuardedPtr<ShellProcess> logproc = 0;
if (comms == TDEProcess::AllOutput && !event.logFile().isEmpty())
{
// Output is to be appended to a log file.
// Set up a logging process to write the command's output to.
- connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotCommandOutput(TDEProcess*,char*,int)));
- connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotCommandOutput(TDEProcess*,char*,int)));
+ connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQ_SLOT(slotCommandOutput(TDEProcess*,char*,int)));
+ connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQ_SLOT(slotCommandOutput(TDEProcess*,char*,int)));
logproc = new ShellProcess(TQString::fromLatin1("cat >>%1").arg(event.logFile()));
- connect(logproc, TQT_SIGNAL(shellExited(ShellProcess*)), TQT_SLOT(slotLogProcExited(ShellProcess*)));
+ connect(logproc, TQ_SIGNAL(shellExited(ShellProcess*)), TQ_SLOT(slotLogProcExited(ShellProcess*)));
logproc->start(TDEProcess::Stdin);
TQCString heading;
if (alarm && alarm->dateTime().isValid())
@@ -1940,7 +1940,7 @@ void KAlarmApp::setUpDcop()
{
mInitialised = true; // we're now ready to handle DCOP calls
Daemon::createDcopHandler();
- TQTimer::singleShot(0, this, TQT_SLOT(processQueue())); // process anything already queued
+ TQTimer::singleShot(0, this, TQ_SLOT(processQueue())); // process anything already queued
}
}
diff --git a/kalarm/kalarmapp.h b/kalarm/kalarmapp.h
index 852143ed..17f707ea 100644
--- a/kalarm/kalarmapp.h
+++ b/kalarm/kalarmapp.h
@@ -47,7 +47,7 @@ class ShellProcess;
class KAlarmApp : public KUniqueApplication
{
- Q_OBJECT
+ TQ_OBJECT
public:
~KAlarmApp();
diff --git a/kalarm/kalarmd/adapp.h b/kalarm/kalarmd/adapp.h
index 96b24d92..62992094 100644
--- a/kalarm/kalarmd/adapp.h
+++ b/kalarm/kalarmd/adapp.h
@@ -30,7 +30,7 @@ class AlarmDaemon;
class AlarmDaemonApp : public KUniqueApplication
{
- Q_OBJECT
+ TQ_OBJECT
public:
AlarmDaemonApp();
diff --git a/kalarm/kalarmd/adcalendar.cpp b/kalarm/kalarmd/adcalendar.cpp
index b1033eb0..699e9684 100644
--- a/kalarm/kalarmd/adcalendar.cpp
+++ b/kalarm/kalarmd/adcalendar.cpp
@@ -96,7 +96,7 @@ bool ADCalendar::loadFile(bool reset)
KURL dest;
dest.setPath(mTempFileName);
TDEIO::FileCopyJob* job = TDEIO::file_copy(url, dest, -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*)));
}
return true;
}
diff --git a/kalarm/kalarmd/adcalendar.h b/kalarm/kalarmd/adcalendar.h
index bbc96214..3ba59978 100644
--- a/kalarm/kalarmd/adcalendar.h
+++ b/kalarm/kalarmd/adcalendar.h
@@ -29,7 +29,7 @@ class ADCalendar;
// Alarm Daemon calendar access
class ADCalendar : public KCal::CalendarLocal
{
- Q_OBJECT
+ TQ_OBJECT
public:
typedef TQValueList<ADCalendar*>::ConstIterator ConstIterator;
diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp
index 573cac0d..71c39f1e 100644
--- a/kalarm/kalarmd/alarmdaemon.cpp
+++ b/kalarm/kalarmd/alarmdaemon.cpp
@@ -119,7 +119,7 @@ AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name)
}
}
// Give some extra time to KAlarm to be fully restored, then proceed as usual
- TQTimer::singleShot(3000, this, TQT_SLOT(autostartKAlarm()));
+ TQTimer::singleShot(3000, this, TQ_SLOT(autostartKAlarm()));
}
}
}
@@ -168,7 +168,7 @@ void AlarmDaemon::startMonitoring()
{
// Set up the alarm timer
mAlarmTimer = new TQTimer(this);
- connect(mAlarmTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAlarmsSlot()));
+ connect(mAlarmTimer, TQ_SIGNAL(timeout()), TQ_SLOT(checkAlarmsSlot()));
setTimerStatus();
// Start monitoring calendar files.
@@ -216,7 +216,7 @@ void AlarmDaemon::reloadCal(ADCalendar* cal, bool reset)
{
cal->close();
if (!cal->setLoadedConnected())
- connect(cal, TQT_SIGNAL(loaded(ADCalendar*, bool)), TQT_SLOT(calendarLoaded(ADCalendar*, bool)));
+ connect(cal, TQ_SIGNAL(loaded(ADCalendar*, bool)), TQ_SLOT(calendarLoaded(ADCalendar*, bool)));
cal->loadFile(reset);
}
else if (reset)
diff --git a/kalarm/kalarmd/alarmdaemon.h b/kalarm/kalarmd/alarmdaemon.h
index a3260a58..85509ebd 100644
--- a/kalarm/kalarmd/alarmdaemon.h
+++ b/kalarm/kalarmd/alarmdaemon.h
@@ -31,7 +31,7 @@ class ADCalendar;
class AlarmDaemon : public TQObject, virtual public AlarmDaemonIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
AlarmDaemon(bool autostart, TQObject* parent = 0, const char* name = 0);
diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp
index faf3e5c3..0c33a3ae 100644
--- a/kalarm/kamail.cpp
+++ b/kalarm/kamail.cpp
@@ -944,7 +944,7 @@ TQString KAMail::getMailBody(TQ_UINT32 serialNumber)
arg << (int)0;
TQString body;
if (kapp->dcopClient()->call("kmail", "KMailIface", "getDecodedBodyPart(TQ_UINT32,int)", data, replyType, replyData)
- && replyType == TQSTRING_OBJECT_NAME_STRING)
+ && replyType == "TQString")
{
TQDataStream reply_stream(replyData, IO_ReadOnly);
reply_stream >> body;
diff --git a/kalarm/latecancel.cpp b/kalarm/latecancel.cpp
index ff684a77..6f656410 100644
--- a/kalarm/latecancel.cpp
+++ b/kalarm/latecancel.cpp
@@ -61,7 +61,7 @@ LateCancelSelector::LateCancelSelector(bool allowHourMinute, TQWidget* parent, c
TQBoxLayout* layout = new TQVBoxLayout(mCheckboxFrame, 0, 0);
mCheckbox = new CheckBox(i18n_n_CancelIfLate(), mCheckboxFrame);
mCheckbox->setFixedSize(mCheckbox->sizeHint());
- connect(mCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool)));
+ connect(mCheckbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggled(bool)));
TQWhatsThis::add(mCheckbox, whatsThis);
layout->addWidget(mCheckbox, 0, TQt::AlignAuto);
@@ -72,7 +72,7 @@ LateCancelSelector::LateCancelSelector(bool allowHourMinute, TQWidget* parent, c
mTimeSelector = new TimeSelector(i18n("Cancel if late by 10 minutes", "Ca&ncel if late by"), TQString(),
whatsThis, i18n("Enter how late will cause the alarm to be canceled"),
allowHourMinute, mTimeSelectorFrame);
- connect(mTimeSelector, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool)));
+ connect(mTimeSelector, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggled(bool)));
layout->addWidget(mTimeSelector);
mLayout->addWidget(mStack);
diff --git a/kalarm/latecancel.h b/kalarm/latecancel.h
index 73bf7130..7baefb42 100644
--- a/kalarm/latecancel.h
+++ b/kalarm/latecancel.h
@@ -32,7 +32,7 @@ class CheckBox;
class LateCancelSelector : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
LateCancelSelector(bool allowHourMinute, TQWidget* parent, const char* name = 0);
diff --git a/kalarm/lib/buttongroup.cpp b/kalarm/lib/buttongroup.cpp
index 01864012..d1ba243f 100644
--- a/kalarm/lib/buttongroup.cpp
+++ b/kalarm/lib/buttongroup.cpp
@@ -29,25 +29,25 @@
ButtonGroup::ButtonGroup(TQWidget* parent, const char* name)
: TQButtonGroup(parent, name)
{
- connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int)));
+ connect(this, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(buttonSet(int)));
}
ButtonGroup::ButtonGroup(const TQString& title, TQWidget* parent, const char* name)
: TQButtonGroup(title, parent, name)
{
- connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int)));
+ connect(this, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(buttonSet(int)));
}
-ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, TQWidget* parent, const char* name)
+ButtonGroup::ButtonGroup(int strips, TQt::Orientation orient, TQWidget* parent, const char* name)
: TQButtonGroup(strips, orient, parent, name)
{
- connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int)));
+ connect(this, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(buttonSet(int)));
}
-ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* parent, const char* name)
+ButtonGroup::ButtonGroup(int strips, TQt::Orientation orient, const TQString& title, TQWidget* parent, const char* name)
: TQButtonGroup(strips, orient, title, parent, name)
{
- connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int)));
+ connect(this, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(buttonSet(int)));
}
/******************************************************************************
@@ -57,7 +57,7 @@ ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, const TQString& tit
int ButtonGroup::insert(TQButton* button, int id)
{
id = TQButtonGroup::insert(button, id);
- connect(button, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotButtonToggled(bool)));
+ connect(button, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotButtonToggled(bool)));
return id;
}
diff --git a/kalarm/lib/buttongroup.h b/kalarm/lib/buttongroup.h
index d1038918..f26ab26d 100644
--- a/kalarm/lib/buttongroup.h
+++ b/kalarm/lib/buttongroup.h
@@ -37,7 +37,7 @@
*/
class ButtonGroup : public TQButtonGroup
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Constructor.
@@ -57,7 +57,7 @@ class ButtonGroup : public TQButtonGroup
* @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- ButtonGroup(int strips, Qt::Orientation orient, TQWidget* parent, const char* name = 0);
+ ButtonGroup(int strips, TQt::Orientation orient, TQWidget* parent, const char* name = 0);
/** Constructor.
* @param strips The number of rows or columns of buttons.
* @param orient The orientation (TQt::Horizontal or TQt::Vertical) of the button group.
@@ -65,7 +65,7 @@ class ButtonGroup : public TQButtonGroup
* @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* parent, const char* name = 0);
+ ButtonGroup(int strips, TQt::Orientation orient, const TQString& title, TQWidget* parent, const char* name = 0);
/** Inserts a button in the group.
* This overrides the insert() method of TQButtonGroup, which should really be a virtual method...
* @param button The button to insert.
diff --git a/kalarm/lib/checkbox.cpp b/kalarm/lib/checkbox.cpp
index d6b02373..4b29d927 100644
--- a/kalarm/lib/checkbox.cpp
+++ b/kalarm/lib/checkbox.cpp
@@ -44,7 +44,7 @@ void CheckBox::setReadOnly(bool ro)
if ((int)ro != (int)mReadOnly)
{
mReadOnly = ro;
- setFocusPolicy(ro ? TQ_NoFocus : mFocusPolicy);
+ setFocusPolicy(ro ? TQWidget::NoFocus : mFocusPolicy);
if (ro)
clearFocus();
}
@@ -58,9 +58,9 @@ void CheckBox::setFocusWidget(TQWidget* w, bool enable)
mFocusWidget = w;
mFocusWidgetEnable = enable;
if (w)
- connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked()));
+ connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotClicked()));
else
- disconnect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked()));
+ disconnect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked()));
}
/******************************************************************************
@@ -86,7 +86,7 @@ void CheckBox::mousePressEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
return;
}
TQCheckBox::mousePressEvent(e);
@@ -97,7 +97,7 @@ void CheckBox::mouseReleaseEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
return;
}
TQCheckBox::mouseReleaseEvent(e);
diff --git a/kalarm/lib/checkbox.h b/kalarm/lib/checkbox.h
index 020f9594..eb9afc88 100644
--- a/kalarm/lib/checkbox.h
+++ b/kalarm/lib/checkbox.h
@@ -41,7 +41,7 @@
*/
class CheckBox : public TQCheckBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Constructor.
@@ -80,7 +80,7 @@ class CheckBox : public TQCheckBox
protected slots:
void slotClicked();
private:
- TQ_FocusPolicy mFocusPolicy; // default focus policy for the TQCheckBox
+ TQWidget::FocusPolicy mFocusPolicy; // default focus policy for the TQCheckBox
TQWidget* mFocusWidget; // widget to receive focus when button is clicked on
bool mFocusWidgetEnable; // enable focus widget before setting focus
bool mReadOnly; // value cannot be changed
diff --git a/kalarm/lib/colourcombo.cpp b/kalarm/lib/colourcombo.cpp
index 625933c7..d612180a 100644
--- a/kalarm/lib/colourcombo.cpp
+++ b/kalarm/lib/colourcombo.cpp
@@ -39,9 +39,9 @@ ColourCombo::ColourCombo(TQWidget* parent, const char* name, const TQColor& defa
mDisabled(false)
{
addColours();
- connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
- connect(this, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotHighlighted(int)));
- Preferences::connect(TQT_SIGNAL(preferencesChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotPreferencesChanged()));
+ connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
+ connect(this, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotHighlighted(int)));
+ Preferences::connect(TQ_SIGNAL(preferencesChanged()), this, TQ_SLOT(slotPreferencesChanged()));
}
void ColourCombo::setColour(const TQColor& colour)
@@ -208,7 +208,7 @@ void ColourCombo::mousePressEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
return;
}
TQComboBox::mousePressEvent(e);
diff --git a/kalarm/lib/colourcombo.h b/kalarm/lib/colourcombo.h
index 10be36da..d6c00343 100644
--- a/kalarm/lib/colourcombo.h
+++ b/kalarm/lib/colourcombo.h
@@ -42,7 +42,7 @@
*/
class ColourCombo : public TQComboBox
{
- Q_OBJECT
+ TQ_OBJECT
TQ_PROPERTY(TQColor color READ color WRITE setColor)
public:
diff --git a/kalarm/lib/combobox.cpp b/kalarm/lib/combobox.cpp
index 99577506..253881f5 100644
--- a/kalarm/lib/combobox.cpp
+++ b/kalarm/lib/combobox.cpp
@@ -47,7 +47,7 @@ void ComboBox::mousePressEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
return;
}
TQComboBox::mousePressEvent(e);
diff --git a/kalarm/lib/combobox.h b/kalarm/lib/combobox.h
index f0402c72..cc915f0d 100644
--- a/kalarm/lib/combobox.h
+++ b/kalarm/lib/combobox.h
@@ -36,7 +36,7 @@
*/
class ComboBox : public TQComboBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Constructor.
diff --git a/kalarm/lib/dateedit.cpp b/kalarm/lib/dateedit.cpp
index 29475f71..862e859f 100644
--- a/kalarm/lib/dateedit.cpp
+++ b/kalarm/lib/dateedit.cpp
@@ -28,7 +28,7 @@
DateEdit::DateEdit(TQWidget* parent, const char* name)
: KDateEdit(parent, name)
{
- connect(this, TQT_SIGNAL(dateEntered(const TQDate&)), TQT_SLOT(newDateEntered(const TQDate&)));
+ connect(this, TQ_SIGNAL(dateEntered(const TQDate&)), TQ_SLOT(newDateEntered(const TQDate&)));
}
void DateEdit::setMinDate(const TQDate& d, const TQString& errorDate)
@@ -91,7 +91,7 @@ void DateEdit::mousePressEvent(TQMouseEvent *e)
if (isReadOnly())
{
// Swallow up the event if it's the left button
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
return;
}
KDateEdit::mousePressEvent(e);
diff --git a/kalarm/lib/dateedit.h b/kalarm/lib/dateedit.h
index 405566ec..47a040cb 100644
--- a/kalarm/lib/dateedit.h
+++ b/kalarm/lib/dateedit.h
@@ -36,7 +36,7 @@
*/
class DateEdit : public KDateEdit
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Constructor.
diff --git a/kalarm/lib/datetime.h b/kalarm/lib/datetime.h
index d75aa94d..6b620494 100644
--- a/kalarm/lib/datetime.h
+++ b/kalarm/lib/datetime.h
@@ -169,7 +169,7 @@ class DateTime
* If it is a date-time, both time and date are included in the output.
* If it is date-only, only the date is included in the output.
*/
- TQString toString(Qt::DateFormat f = Qt::TextDate) const
+ TQString toString(TQt::DateFormat f = TQt::TextDate) const
{
if (mDateOnly)
return mDateTime.date().toString(f);
diff --git a/kalarm/lib/label.cpp b/kalarm/lib/label.cpp
index 7767a765..8a41d624 100644
--- a/kalarm/lib/label.cpp
+++ b/kalarm/lib/label.cpp
@@ -50,13 +50,13 @@ Label::Label(TQWidget* buddy, const TQString& text, TQWidget* parent, const char
void Label::setBuddy(TQWidget* bud)
{
if (mRadioButton)
- disconnect(mRadioButton, TQT_SIGNAL(destroyed()), this, TQT_SLOT(buddyDead()));
+ disconnect(mRadioButton, TQ_SIGNAL(destroyed()), this, TQ_SLOT(buddyDead()));
TQWidget* w = bud;
if (w)
{
while (w->focusProxy())
- w = TQT_TQWIDGET(w->focusProxy());
- if (!w->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING))
+ w = w->focusProxy();
+ if (!w->inherits("TQRadioButton"))
w = 0;
}
if (!w)
@@ -74,7 +74,7 @@ void Label::setBuddy(TQWidget* bud)
mFocusWidget = new LabelFocusWidget(this);
TQLabel::setBuddy(mFocusWidget);
mRadioButton = (TQRadioButton*)bud;
- connect(mRadioButton, TQT_SIGNAL(destroyed()), this, TQT_SLOT(buddyDead()));
+ connect(mRadioButton, TQ_SIGNAL(destroyed()), this, TQ_SLOT(buddyDead()));
}
}
@@ -106,7 +106,7 @@ void Label::activated()
LabelFocusWidget::LabelFocusWidget(TQWidget* parent, const char* name)
: TQWidget(parent, name)
{
- setFocusPolicy(TQ_ClickFocus);
+ setFocusPolicy(TQWidget::ClickFocus);
setFixedSize(TQSize(1,1));
}
diff --git a/kalarm/lib/label.h b/kalarm/lib/label.h
index 5f26adc8..deae350f 100644
--- a/kalarm/lib/label.h
+++ b/kalarm/lib/label.h
@@ -40,7 +40,7 @@ class LabelFocusWidget;
*/
class Label : public TQLabel
{
- Q_OBJECT
+ TQ_OBJECT
friend class LabelFocusWidget;
public:
@@ -87,7 +87,7 @@ class Label : public TQLabel
// Private class for use by Label
class LabelFocusWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
LabelFocusWidget(TQWidget* parent, const char* name = 0);
diff --git a/kalarm/lib/lineedit.h b/kalarm/lib/lineedit.h
index ecfd5242..d715770f 100644
--- a/kalarm/lib/lineedit.h
+++ b/kalarm/lib/lineedit.h
@@ -42,7 +42,7 @@
*/
class LineEdit : public KLineEdit
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Types of drag and drop content which will be accepted.
diff --git a/kalarm/lib/pushbutton.cpp b/kalarm/lib/pushbutton.cpp
index f1f824d2..d47c1d9f 100644
--- a/kalarm/lib/pushbutton.cpp
+++ b/kalarm/lib/pushbutton.cpp
@@ -44,7 +44,7 @@ void PushButton::setReadOnly(bool ro)
if ((int)ro != (int)mReadOnly)
{
mReadOnly = ro;
- setFocusPolicy(ro ? TQ_NoFocus : mFocusPolicy);
+ setFocusPolicy(ro ? TQWidget::NoFocus : mFocusPolicy);
if (ro)
clearFocus();
}
@@ -55,7 +55,7 @@ void PushButton::mousePressEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
return;
}
TQPushButton::mousePressEvent(e);
@@ -66,7 +66,7 @@ void PushButton::mouseReleaseEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
return;
}
TQPushButton::mouseReleaseEvent(e);
diff --git a/kalarm/lib/pushbutton.h b/kalarm/lib/pushbutton.h
index fd357402..091060af 100644
--- a/kalarm/lib/pushbutton.h
+++ b/kalarm/lib/pushbutton.h
@@ -36,7 +36,7 @@
*/
class PushButton : public TQPushButton
{
- Q_OBJECT
+ TQ_OBJECT
TQ_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
public:
@@ -71,7 +71,7 @@ class PushButton : public TQPushButton
virtual void keyPressEvent(TQKeyEvent*);
virtual void keyReleaseEvent(TQKeyEvent*);
private:
- TQ_FocusPolicy mFocusPolicy; // default focus policy for the TQPushButton
+ TQWidget::FocusPolicy mFocusPolicy; // default focus policy for the TQPushButton
bool mReadOnly; // value cannot be changed
};
diff --git a/kalarm/lib/radiobutton.cpp b/kalarm/lib/radiobutton.cpp
index 18571ad7..62fb9b63 100644
--- a/kalarm/lib/radiobutton.cpp
+++ b/kalarm/lib/radiobutton.cpp
@@ -44,7 +44,7 @@ void RadioButton::setReadOnly(bool ro)
if ((int)ro != (int)mReadOnly)
{
mReadOnly = ro;
- setFocusPolicy(ro ? TQ_NoFocus : mFocusPolicy);
+ setFocusPolicy(ro ? TQWidget::NoFocus : mFocusPolicy);
if (ro)
clearFocus();
}
@@ -58,9 +58,9 @@ void RadioButton::setFocusWidget(TQWidget* w, bool enable)
mFocusWidget = w;
mFocusWidgetEnable = enable;
if (w)
- connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked()));
+ connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotClicked()));
else
- disconnect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked()));
+ disconnect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked()));
}
/******************************************************************************
@@ -86,7 +86,7 @@ void RadioButton::mousePressEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
return;
}
TQRadioButton::mousePressEvent(e);
@@ -97,7 +97,7 @@ void RadioButton::mouseReleaseEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
return;
}
TQRadioButton::mouseReleaseEvent(e);
diff --git a/kalarm/lib/radiobutton.h b/kalarm/lib/radiobutton.h
index e983ebac..d3b47785 100644
--- a/kalarm/lib/radiobutton.h
+++ b/kalarm/lib/radiobutton.h
@@ -41,7 +41,7 @@
*/
class RadioButton : public TQRadioButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Constructor.
@@ -80,7 +80,7 @@ class RadioButton : public TQRadioButton
protected slots:
void slotClicked();
private:
- TQ_FocusPolicy mFocusPolicy; // default focus policy for the TQRadioButton
+ TQWidget::FocusPolicy mFocusPolicy; // default focus policy for the TQRadioButton
TQWidget* mFocusWidget; // widget to receive focus when button is clicked on
bool mFocusWidgetEnable; // enable focus widget before setting focus
bool mReadOnly; // value cannot be changed
diff --git a/kalarm/lib/shellprocess.cpp b/kalarm/lib/shellprocess.cpp
index 1ed64df7..0fe0159b 100644
--- a/kalarm/lib/shellprocess.cpp
+++ b/kalarm/lib/shellprocess.cpp
@@ -56,8 +56,8 @@ bool ShellProcess::start(Communication comm)
return false;
}
KShellProcess::operator<<(mCommand);
- connect(this, TQT_SIGNAL(wroteStdin(TDEProcess*)), TQT_SLOT(writtenStdin(TDEProcess*)));
- connect(this, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotExited(TDEProcess*)));
+ connect(this, TQ_SIGNAL(wroteStdin(TDEProcess*)), TQ_SLOT(writtenStdin(TDEProcess*)));
+ connect(this, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotExited(TDEProcess*)));
if (!KShellProcess::start(TDEProcess::NotifyOnExit, comm))
{
mStatus = START_FAIL;
diff --git a/kalarm/lib/shellprocess.h b/kalarm/lib/shellprocess.h
index 3b198028..316d6ef7 100644
--- a/kalarm/lib/shellprocess.h
+++ b/kalarm/lib/shellprocess.h
@@ -49,7 +49,7 @@
*/
class ShellProcess : public KShellProcess
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Current status of the shell process.
diff --git a/kalarm/lib/slider.cpp b/kalarm/lib/slider.cpp
index 189c8941..5ee7a65a 100644
--- a/kalarm/lib/slider.cpp
+++ b/kalarm/lib/slider.cpp
@@ -26,12 +26,12 @@ Slider::Slider(TQWidget* parent, const char* name)
mReadOnly(false)
{ }
-Slider::Slider(Qt::Orientation o, TQWidget* parent, const char* name)
+Slider::Slider(TQt::Orientation o, TQWidget* parent, const char* name)
: TQSlider(o, parent, name),
mReadOnly(false)
{ }
-Slider::Slider(int minval, int maxval, int pageStep, int value, Qt::Orientation o, TQWidget* parent, const char* name)
+Slider::Slider(int minval, int maxval, int pageStep, int value, TQt::Orientation o, TQWidget* parent, const char* name)
: TQSlider(minval, maxval, pageStep, value, o, parent, name),
mReadOnly(false)
{ }
@@ -54,7 +54,7 @@ void Slider::mousePressEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
return;
}
TQSlider::mousePressEvent(e);
diff --git a/kalarm/lib/slider.h b/kalarm/lib/slider.h
index bd8e750a..dc36e3ce 100644
--- a/kalarm/lib/slider.h
+++ b/kalarm/lib/slider.h
@@ -36,7 +36,7 @@
*/
class Slider : public TQSlider
{
- Q_OBJECT
+ TQ_OBJECT
TQ_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
public:
@@ -50,7 +50,7 @@ class Slider : public TQSlider
* @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit Slider(Qt::Orientation orient, TQWidget* parent = 0, const char* name = 0);
+ explicit Slider(TQt::Orientation orient, TQWidget* parent = 0, const char* name = 0);
/** Constructor.
* @param minValue The minimum value which the slider can have.
* @param maxValue The maximum value which the slider can have.
@@ -60,7 +60,7 @@ class Slider : public TQSlider
* @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- Slider(int minValue, int maxValue, int pageStep, int value, Qt::Orientation orient,
+ Slider(int minValue, int maxValue, int pageStep, int value, TQt::Orientation orient,
TQWidget* parent = 0, const char* name = 0);
/** Returns true if the slider is read only. */
bool isReadOnly() const { return mReadOnly; }
diff --git a/kalarm/lib/spinbox.cpp b/kalarm/lib/spinbox.cpp
index a55492ec..667d5c7c 100644
--- a/kalarm/lib/spinbox.cpp
+++ b/kalarm/lib/spinbox.cpp
@@ -56,7 +56,7 @@ void SpinBox::init()
// Find the spin widgets which are part of the spin boxes, in order to
// handle their shift-button presses.
- TQObjectList* spinwidgets = queryList(TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true);
+ TQObjectList* spinwidgets = queryList("TQSpinWidget", 0, false, true);
TQSpinWidget* spin = (TQSpinWidget*)spinwidgets->getFirst();
if (spin)
spin->installEventFilter(this); // handle shift-button presses
@@ -65,7 +65,7 @@ void SpinBox::init()
#if KDE_IS_VERSION(3,1,90)
// Detect when the text field is edited
- connect(editor(), TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(textEdited()));
+ connect(editor(), TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(textEdited()));
#endif
}
@@ -201,7 +201,7 @@ void SpinBox::updateDisplay()
*/
bool SpinBox::eventFilter(TQObject* obj, TQEvent* e)
{
- if (TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(editor()))
+ if (obj == editor())
{
int step = 0;
bool shift = false;
@@ -263,7 +263,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e)
case TQEvent::MouseButtonDblClick:
{
TQMouseEvent* me = (TQMouseEvent*)e;
- if (me->button() == Qt::LeftButton)
+ if (me->button() == TQt::LeftButton)
{
// It's a left button press. Set normal or shift stepping as appropriate.
if (mReadOnly)
@@ -281,7 +281,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e)
case TQEvent::MouseButtonRelease:
{
TQMouseEvent* me = (TQMouseEvent*)e;
- if (me->button() == Qt::LeftButton && mShiftMouse)
+ if (me->button() == TQt::LeftButton && mShiftMouse)
{
setShiftStepping(false, mCurrentButton); // cancel shift stepping
return false; // forward event to the destination widget
@@ -291,7 +291,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e)
case TQEvent::MouseMove:
{
TQMouseEvent* me = (TQMouseEvent*)e;
- if (me->state() & Qt::LeftButton)
+ if (me->state() & TQt::LeftButton)
{
// The left button is down. Track which spin button it's in.
if (mReadOnly)
@@ -325,7 +325,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e)
TQKeyEvent* ke = (TQKeyEvent*)e;
int key = ke->key();
int state = ke->state();
- if ((state & Qt::LeftButton)
+ if ((state & TQt::LeftButton)
&& (key == TQt::Key_Shift || key == TQt::Key_Alt))
{
// The left mouse button is down, and the Shift or Alt key has changed
diff --git a/kalarm/lib/spinbox.h b/kalarm/lib/spinbox.h
index 7712cdec..930e8235 100644
--- a/kalarm/lib/spinbox.h
+++ b/kalarm/lib/spinbox.h
@@ -41,7 +41,7 @@
*/
class SpinBox : public TQSpinBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Constructor.
diff --git a/kalarm/lib/spinbox2.cpp b/kalarm/lib/spinbox2.cpp
index 360d2a2a..328813e2 100644
--- a/kalarm/lib/spinbox2.cpp
+++ b/kalarm/lib/spinbox2.cpp
@@ -85,15 +85,15 @@ void SpinBox2::init()
mSpinbox->setSelectOnStep(false); // default
mUpdown2->setSelectOnStep(false); // always false
setFocusProxy(mSpinbox);
- mUpdown2->setFocusPolicy(TQ_NoFocus);
+ mUpdown2->setFocusPolicy(TQWidget::NoFocus);
mSpinMirror = new SpinMirror(mUpdown2, mUpdown2Frame, this);
if (!mirrorStyle(style()))
mSpinMirror->hide(); // hide mirrored spin buttons when they are inappropriate
- connect(mSpinbox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(valueChange()));
- connect(mSpinbox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(valueChanged(int)));
- connect(mSpinbox, TQT_SIGNAL(valueChanged(const TQString&)), TQT_SIGNAL(valueChanged(const TQString&)));
- connect(mUpdown2, TQT_SIGNAL(stepped(int)), TQT_SLOT(stepPage(int)));
- connect(mUpdown2, TQT_SIGNAL(styleUpdated()), TQT_SLOT(updateMirror()));
+ connect(mSpinbox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(valueChange()));
+ connect(mSpinbox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(valueChanged(int)));
+ connect(mSpinbox, TQ_SIGNAL(valueChanged(const TQString&)), TQ_SIGNAL(valueChanged(const TQString&)));
+ connect(mUpdown2, TQ_SIGNAL(stepped(int)), TQ_SLOT(stepPage(int)));
+ connect(mUpdown2, TQ_SIGNAL(styleUpdated()), TQ_SLOT(updateMirror()));
}
void SpinBox2::setReadOnly(bool ro)
@@ -291,7 +291,7 @@ void SpinBox2::getMetrics() const
wGap = 0;
// Make style-specific adjustments for a better appearance
- if (style().inherits(TQMOTIFPLUSSTYLE_OBJECT_NAME_STRING))
+ if (style().inherits("TQMotifPlusStyle"))
{
xSpinbox = 0; // show the edit control left border
wGap = 2; // leave a space to the right of the left-hand pair of spin buttons
@@ -403,7 +403,7 @@ SpinMirror::SpinMirror(SpinBox* spinbox, TQFrame* spinFrame, TQWidget* parent, c
// Find the spin widget which is part of the spin box, in order to
// pass on its shift-button presses.
- TQObjectList* spinwidgets = spinbox->queryList(TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true);
+ TQObjectList* spinwidgets = spinbox->queryList("TQSpinWidget", 0, false, true);
mSpinWidget = (SpinBox*)spinwidgets->getFirst();
delete spinwidgets;
}
@@ -451,7 +451,7 @@ void SpinMirror::contentsMouseEvent(TQMouseEvent* e)
{
case TQEvent::MouseButtonPress:
case TQEvent::MouseButtonRelease:
- TQTimer::singleShot(0, this, TQT_SLOT(redraw()));
+ TQTimer::singleShot(0, this, TQ_SLOT(redraw()));
break;
default:
break;
@@ -481,11 +481,11 @@ bool SpinMirror::event(TQEvent* e)
case TQEvent::Leave:
case TQEvent::Enter:
TQApplication::postEvent(mSpinWidget, new TQEvent(e->type()));
- TQTimer::singleShot(0, this, TQT_SLOT(redraw()));
+ TQTimer::singleShot(0, this, TQ_SLOT(redraw()));
break;
case TQEvent::FocusIn:
mSpinbox->setFocus();
- TQTimer::singleShot(0, this, TQT_SLOT(redraw()));
+ TQTimer::singleShot(0, this, TQ_SLOT(redraw()));
break;
default:
break;
diff --git a/kalarm/lib/spinbox2.h b/kalarm/lib/spinbox2.h
index fe082524..c63f9152 100644
--- a/kalarm/lib/spinbox2.h
+++ b/kalarm/lib/spinbox2.h
@@ -55,7 +55,7 @@ class ExtraSpinBox;
*/
class SpinBox2 : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Constructor.
diff --git a/kalarm/lib/spinbox2private.h b/kalarm/lib/spinbox2private.h
index 093d8c8a..2aac3f6b 100644
--- a/kalarm/lib/spinbox2private.h
+++ b/kalarm/lib/spinbox2private.h
@@ -33,7 +33,7 @@
class ExtraSpinBox : public SpinBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
explicit ExtraSpinBox(TQWidget* parent, const char* name = 0)
@@ -60,7 +60,7 @@ class ExtraSpinBox : public SpinBox
class SpinMirror : public TQCanvasView
{
- Q_OBJECT
+ TQ_OBJECT
public:
explicit SpinMirror(SpinBox*, TQFrame* spinFrame, TQWidget* parent = 0, const char* name = 0);
diff --git a/kalarm/lib/synchtimer.cpp b/kalarm/lib/synchtimer.cpp
index eecef7d4..e32cf659 100644
--- a/kalarm/lib/synchtimer.cpp
+++ b/kalarm/lib/synchtimer.cpp
@@ -48,11 +48,11 @@ void SynchTimer::connecT(TQObject* receiver, const char* member)
Connection connection(receiver, member);
if (mConnections.find(connection) != mConnections.end())
return; // the slot is already connected, so ignore request
- connect(mTimer, TQT_SIGNAL(timeout()), receiver, member);
+ connect(mTimer, TQ_SIGNAL(timeout()), receiver, member);
mConnections.append(connection);
if (!mTimer->isActive())
{
- connect(mTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimer()));
+ connect(mTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimer()));
start();
}
}
diff --git a/kalarm/lib/synchtimer.h b/kalarm/lib/synchtimer.h
index 8d640f0b..2263589c 100644
--- a/kalarm/lib/synchtimer.h
+++ b/kalarm/lib/synchtimer.h
@@ -36,7 +36,7 @@ class TQTimer;
*/
class SynchTimer : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
virtual ~SynchTimer();
@@ -76,7 +76,7 @@ class SynchTimer : public TQObject
*/
class MinuteTimer : public SynchTimer
{
- Q_OBJECT
+ TQ_OBJECT
public:
virtual ~MinuteTimer() { mInstance = 0; }
@@ -116,7 +116,7 @@ class MinuteTimer : public SynchTimer
*/
class DailyTimer : public SynchTimer
{
- Q_OBJECT
+ TQ_OBJECT
public:
virtual ~DailyTimer();
diff --git a/kalarm/lib/timeedit.cpp b/kalarm/lib/timeedit.cpp
index 80713f2f..21215a6c 100644
--- a/kalarm/lib/timeedit.cpp
+++ b/kalarm/lib/timeedit.cpp
@@ -38,13 +38,13 @@ TimeEdit::TimeEdit(TQWidget* parent, const char* name)
bool use12hour = TDEGlobal::locale()->use12Clock();
mSpinBox = new TimeSpinBox(!use12hour, this);
mSpinBox->setFixedSize(mSpinBox->sizeHint());
- connect(mSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)));
+ connect(mSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)));
if (use12hour)
{
mAmPm = new ComboBox(this);
setAmPmCombo(1, 1); // add "am" and "pm" options to the combo box
mAmPm->setFixedSize(mAmPm->sizeHint());
- connect(mAmPm, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotAmPmChanged(int)));
+ connect(mAmPm, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotAmPmChanged(int)));
}
}
diff --git a/kalarm/lib/timeedit.h b/kalarm/lib/timeedit.h
index 4a74d576..cfe9185b 100644
--- a/kalarm/lib/timeedit.h
+++ b/kalarm/lib/timeedit.h
@@ -49,7 +49,7 @@ class TimeSpinBox;
*/
class TimeEdit : public TQHBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Constructor.
diff --git a/kalarm/lib/timeperiod.cpp b/kalarm/lib/timeperiod.cpp
index 37c78702..b2290a77 100644
--- a/kalarm/lib/timeperiod.cpp
+++ b/kalarm/lib/timeperiod.cpp
@@ -63,12 +63,12 @@ TimePeriod::TimePeriod(bool allowHourMinute, TQWidget* parent, const char* name)
mSpinBox->setLineStep(1);
mSpinBox->setLineShiftStep(10);
mSpinBox->setRange(1, mMaxDays);
- connect(mSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotDaysChanged(int)));
+ connect(mSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotDaysChanged(int)));
mSpinStack->addWidget(mSpinBox, 0);
mTimeSpinBox = new TimeSpinBox(0, 99999, mSpinStack);
mTimeSpinBox->setRange(1, maxMinutes); // max 999H59M
- connect(mTimeSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotTimeChanged(int)));
+ connect(mTimeSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotTimeChanged(int)));
mSpinStack->addWidget(mTimeSpinBox, 1);
mSpinStack->setFixedSize(mSpinBox->sizeHint().expandedTo(mTimeSpinBox->sizeHint()));
@@ -88,7 +88,7 @@ TimePeriod::TimePeriod(bool allowHourMinute, TQWidget* parent, const char* name)
mUnitsCombo->insertItem(i18n_weeks());
mMaxUnitShown = WEEKS;
mUnitsCombo->setFixedSize(mUnitsCombo->sizeHint());
- connect(mUnitsCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotUnitsSelected(int)));
+ connect(mUnitsCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotUnitsSelected(int)));
setFocusProxy(mUnitsCombo);
setTabOrder(mUnitsCombo, mSpinStack);
diff --git a/kalarm/lib/timeperiod.h b/kalarm/lib/timeperiod.h
index e2e24819..e5cacc9b 100644
--- a/kalarm/lib/timeperiod.h
+++ b/kalarm/lib/timeperiod.h
@@ -49,7 +49,7 @@ class TimeSpinBox;
*/
class TimePeriod : public TQHBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Units for the time period.
diff --git a/kalarm/lib/timespinbox.cpp b/kalarm/lib/timespinbox.cpp
index 0ac932e6..db3d5400 100644
--- a/kalarm/lib/timespinbox.cpp
+++ b/kalarm/lib/timespinbox.cpp
@@ -31,7 +31,7 @@ class TimeSpinBox::TimeValidator : public TQValidator
{
public:
TimeValidator(int minMin, int maxMin, TQWidget* parent, const char* name = 0)
- : TQValidator(TQT_TQOBJECT(parent), name),
+ : TQValidator(parent, name),
minMinute(minMin), maxMinute(maxMin), m12Hour(false), mPm(false) { }
virtual State validate(TQString&, int&) const;
int minMinute, maxMinute;
@@ -70,7 +70,7 @@ TimeSpinBox::TimeSpinBox(bool use24hour, TQWidget* parent, const char* name)
setShiftSteps(5, 360); // shift-left button increments 5 min / 6 hours
setSelectOnStep(false);
setAlignment(TQt::AlignHCenter);
- connect(this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)));
+ connect(this, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)));
}
/******************************************************************************
diff --git a/kalarm/lib/timespinbox.h b/kalarm/lib/timespinbox.h
index 6d9f5dbe..56482875 100644
--- a/kalarm/lib/timespinbox.h
+++ b/kalarm/lib/timespinbox.h
@@ -44,7 +44,7 @@
*/
class TimeSpinBox : public SpinBox2
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Constructor for a wrapping time spin box which can be used to enter a time of day.
diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp
index d0791216..66a93a9c 100644
--- a/kalarm/mainwindow.cpp
+++ b/kalarm/mainwindow.cpp
@@ -149,14 +149,14 @@ MainWindow::MainWindow(bool restored)
mListView->refresh(); // populate the alarm list
mListView->clearSelection();
- connect(mListView, TQT_SIGNAL(itemDeleted()), TQT_SLOT(slotDeletion()));
- connect(mListView, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelection()));
- connect(mListView, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)),
- TQT_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&, int)));
- connect(mListView, TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem*, const TQPoint&, int)),
- TQT_SLOT(slotMouseClicked(int, TQListViewItem*, const TQPoint&, int)));
- connect(mListView, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(slotDoubleClicked(TQListViewItem*)));
- connect(mListView->header(), TQT_SIGNAL(indexChange(int, int, int)), TQT_SLOT(columnsReordered()));
+ connect(mListView, TQ_SIGNAL(itemDeleted()), TQ_SLOT(slotDeletion()));
+ connect(mListView, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelection()));
+ connect(mListView, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)),
+ TQ_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&, int)));
+ connect(mListView, TQ_SIGNAL(mouseButtonClicked(int, TQListViewItem*, const TQPoint&, int)),
+ TQ_SLOT(slotMouseClicked(int, TQListViewItem*, const TQPoint&, int)));
+ connect(mListView, TQ_SIGNAL(executed(TQListViewItem*)), TQ_SLOT(slotDoubleClicked(TQListViewItem*)));
+ connect(mListView->header(), TQ_SIGNAL(indexChange(int, int, int)), TQ_SLOT(columnsReordered()));
initActions();
mWindowList.append(this);
@@ -182,7 +182,7 @@ MainWindow::~MainWindow()
else
theApp()->trayWindow()->removeWindow(this);
}
- MinuteTimer::disconnect(TQT_TQOBJECT(this));
+ MinuteTimer::disconnect(this);
mMinuteTimerActive = false; // to ensure that setUpdateTimer() works correctly
setUpdateTimer();
MainWindow* main = mainMainWindow();
@@ -326,70 +326,70 @@ void MainWindow::columnsReordered()
void MainWindow::initActions()
{
TDEActionCollection* actions = actionCollection();
- mActionTemplates = new TDEAction(i18n("&Templates..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTemplates()), actions, "templates");
- mActionNew = KAlarm::createNewAlarmAction(i18n("&New..."), TQT_TQOBJECT(this), TQT_SLOT(slotNew()), actions, "new");
- mActionNewFromTemplate = KAlarm::createNewFromTemplateAction(i18n("New &From Template"), TQT_TQOBJECT(this), TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actions, "newFromTempl");
- mActionCreateTemplate = new TDEAction(i18n("Create Tem&plate..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewTemplate()), actions, "createTemplate");
- mActionCopy = new TDEAction(i18n("&Copy..."), "edit-copy", TQt::SHIFT+TQt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actions, "copy");
- mActionModify = new TDEAction(i18n("&Edit..."), "edit", TQt::CTRL+TQt::Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotModify()), actions, "modify");
- mActionDelete = new TDEAction(i18n("&Delete"), "edit-delete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDelete()), actions, "delete");
- mActionReactivate = new TDEAction(i18n("Reac&tivate"), 0, TQt::CTRL+TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotReactivate()), actions, "undelete");
- mActionEnable = new TDEAction(TQString(), 0, TQt::CTRL+TQt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(slotEnable()), actions, "disable");
- mActionView = new TDEAction(i18n("&View"), "viewmag", TQt::CTRL+TQt::Key_W, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actions, "view");
- mActionShowTime = new TDEToggleAction(i18n_a_ShowAlarmTimes(), TQt::CTRL+TQt::Key_M, TQT_TQOBJECT(this), TQT_SLOT(slotShowTime()), actions, "showAlarmTimes");
+ mActionTemplates = new TDEAction(i18n("&Templates..."), 0, this, TQ_SLOT(slotTemplates()), actions, "templates");
+ mActionNew = KAlarm::createNewAlarmAction(i18n("&New..."), this, TQ_SLOT(slotNew()), actions, "new");
+ mActionNewFromTemplate = KAlarm::createNewFromTemplateAction(i18n("New &From Template"), this, TQ_SLOT(slotNewFromTemplate(const KAEvent&)), actions, "newFromTempl");
+ mActionCreateTemplate = new TDEAction(i18n("Create Tem&plate..."), 0, this, TQ_SLOT(slotNewTemplate()), actions, "createTemplate");
+ mActionCopy = new TDEAction(i18n("&Copy..."), "edit-copy", TQt::SHIFT+TQt::Key_Insert, this, TQ_SLOT(slotCopy()), actions, "copy");
+ mActionModify = new TDEAction(i18n("&Edit..."), "edit", TQt::CTRL+TQt::Key_E, this, TQ_SLOT(slotModify()), actions, "modify");
+ mActionDelete = new TDEAction(i18n("&Delete"), "edit-delete", TQt::Key_Delete, this, TQ_SLOT(slotDelete()), actions, "delete");
+ mActionReactivate = new TDEAction(i18n("Reac&tivate"), 0, TQt::CTRL+TQt::Key_R, this, TQ_SLOT(slotReactivate()), actions, "undelete");
+ mActionEnable = new TDEAction(TQString(), 0, TQt::CTRL+TQt::Key_B, this, TQ_SLOT(slotEnable()), actions, "disable");
+ mActionView = new TDEAction(i18n("&View"), "viewmag", TQt::CTRL+TQt::Key_W, this, TQ_SLOT(slotView()), actions, "view");
+ mActionShowTime = new TDEToggleAction(i18n_a_ShowAlarmTimes(), TQt::CTRL+TQt::Key_M, this, TQ_SLOT(slotShowTime()), actions, "showAlarmTimes");
mActionShowTime->setCheckedState(i18n("Hide &Alarm Times"));
- mActionShowTimeTo = new TDEToggleAction(i18n_o_ShowTimeToAlarms(), TQt::CTRL+TQt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotShowTimeTo()), actions, "showTimeToAlarms");
+ mActionShowTimeTo = new TDEToggleAction(i18n_o_ShowTimeToAlarms(), TQt::CTRL+TQt::Key_I, this, TQ_SLOT(slotShowTimeTo()), actions, "showTimeToAlarms");
mActionShowTimeTo->setCheckedState(i18n("Hide Time t&o Alarms"));
- mActionShowExpired = new TDEToggleAction(i18n_e_ShowExpiredAlarms(), "history", TQt::CTRL+TQt::Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotShowExpired()), actions, "showExpiredAlarms");
+ mActionShowExpired = new TDEToggleAction(i18n_e_ShowExpiredAlarms(), "history", TQt::CTRL+TQt::Key_P, this, TQ_SLOT(slotShowExpired()), actions, "showExpiredAlarms");
mActionShowExpired->setCheckedState(i18n_e_HideExpiredAlarms());
- mActionToggleTrayIcon = new TDEToggleAction(i18n("Show in System &Tray"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTrayIcon()), actions, "showInSystemTray");
+ mActionToggleTrayIcon = new TDEToggleAction(i18n("Show in System &Tray"), 0, this, TQ_SLOT(slotToggleTrayIcon()), actions, "showInSystemTray");
mActionToggleTrayIcon->setCheckedState(i18n("Hide From System &Tray"));
- new TDEAction(i18n("Import &Alarms..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportAlarms()), actions, "importAlarms");
- new TDEAction(i18n("Import &Birthdays..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBirthdays()), actions, "importBirthdays");
- new TDEAction(i18n("&Refresh Alarms"), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT(slotResetDaemon()), actions, "refreshAlarms");
+ new TDEAction(i18n("Import &Alarms..."), 0, this, TQ_SLOT(slotImportAlarms()), actions, "importAlarms");
+ new TDEAction(i18n("Import &Birthdays..."), 0, this, TQ_SLOT(slotBirthdays()), actions, "importBirthdays");
+ new TDEAction(i18n("&Refresh Alarms"), "reload", 0, this, TQ_SLOT(slotResetDaemon()), actions, "refreshAlarms");
Daemon::createAlarmEnableAction(actions, "alarmEnable");
if (undoText.isNull())
{
// Get standard texts, etc., for Undo and Redo actions
- TDEAction* act = KStdAction::undo(TQT_TQOBJECT(this), 0, actions);
+ TDEAction* act = KStdAction::undo(this, 0, actions);
undoIcon = act->icon();
undoShortcut = act->shortcut();
undoText = act->text();
undoTextStripped = KAlarm::stripAccel(undoText);
delete act;
- act = KStdAction::redo(TQT_TQOBJECT(this), 0, actions);
+ act = KStdAction::redo(this, 0, actions);
redoIcon = act->icon();
redoShortcut = act->shortcut();
redoText = act->text();
redoTextStripped = KAlarm::stripAccel(redoText);
delete act;
}
- mActionUndo = new TDEToolBarPopupAction(undoText, undoIcon, undoShortcut, TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actions, "edit_undo");
- mActionRedo = new TDEToolBarPopupAction(redoText, redoIcon, redoShortcut, TQT_TQOBJECT(this), TQT_SLOT(slotRedo()), actions, "edit_redo");
- KStdAction::find(TQT_TQOBJECT(mListView), TQT_SLOT(slotFind()), actions);
- mActionFindNext = KStdAction::findNext(TQT_TQOBJECT(mListView), TQT_SLOT(slotFindNext()), actions);
- mActionFindPrev = KStdAction::findPrev(TQT_TQOBJECT(mListView), TQT_SLOT(slotFindPrev()), actions);
- KStdAction::selectAll(TQT_TQOBJECT(mListView), TQT_SLOT(slotSelectAll()), actions);
- KStdAction::deselect(TQT_TQOBJECT(mListView), TQT_SLOT(slotDeselect()), actions);
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actions);
- KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), actions);
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbar()), actions);
- KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actions);
+ mActionUndo = new TDEToolBarPopupAction(undoText, undoIcon, undoShortcut, this, TQ_SLOT(slotUndo()), actions, "edit_undo");
+ mActionRedo = new TDEToolBarPopupAction(redoText, redoIcon, redoShortcut, this, TQ_SLOT(slotRedo()), actions, "edit_redo");
+ KStdAction::find(mListView, TQ_SLOT(slotFind()), actions);
+ mActionFindNext = KStdAction::findNext(mListView, TQ_SLOT(slotFindNext()), actions);
+ mActionFindPrev = KStdAction::findPrev(mListView, TQ_SLOT(slotFindPrev()), actions);
+ KStdAction::selectAll(mListView, TQ_SLOT(slotSelectAll()), actions);
+ KStdAction::deselect(mListView, TQ_SLOT(slotDeselect()), actions);
+ KStdAction::quit(this, TQ_SLOT(slotQuit()), actions);
+ KStdAction::keyBindings(this, TQ_SLOT(slotConfigureKeys()), actions);
+ KStdAction::configureToolbars(this, TQ_SLOT(slotConfigureToolbar()), actions);
+ KStdAction::preferences(this, TQ_SLOT(slotPreferences()), actions);
setStandardToolBarMenuEnabled(true);
createGUI(UI_FILE);
mContextMenu = static_cast<TDEPopupMenu*>(factory()->container("listContext", this));
mActionsMenu = static_cast<TDEPopupMenu*>(factory()->container("actions", this));
mMenuError = (!mContextMenu || !mActionsMenu);
- connect(mActionsMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(updateActionsMenu()));
- connect(mActionUndo->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotInitUndoMenu()));
- connect(mActionUndo->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotUndoItem(int)));
- connect(mActionRedo->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotInitRedoMenu()));
- connect(mActionRedo->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotRedoItem(int)));
- connect(Undo::instance(), TQT_SIGNAL(changed(const TQString&, const TQString&)), TQT_SLOT(slotUndoStatus(const TQString&, const TQString&)));
- connect(mListView, TQT_SIGNAL(findActive(bool)), TQT_SLOT(slotFindActive(bool)));
- Preferences::connect(TQT_SIGNAL(preferencesChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotPrefsChanged()));
- connect(theApp(), TQT_SIGNAL(trayIconToggled()), TQT_SLOT(updateTrayIconAction()));
+ connect(mActionsMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(updateActionsMenu()));
+ connect(mActionUndo->popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotInitUndoMenu()));
+ connect(mActionUndo->popupMenu(), TQ_SIGNAL(activated(int)), TQ_SLOT(slotUndoItem(int)));
+ connect(mActionRedo->popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotInitRedoMenu()));
+ connect(mActionRedo->popupMenu(), TQ_SIGNAL(activated(int)), TQ_SLOT(slotRedoItem(int)));
+ connect(Undo::instance(), TQ_SIGNAL(changed(const TQString&, const TQString&)), TQ_SLOT(slotUndoStatus(const TQString&, const TQString&)));
+ connect(mListView, TQ_SIGNAL(findActive(bool)), TQ_SLOT(slotFindActive(bool)));
+ Preferences::connect(TQ_SIGNAL(preferencesChanged()), this, TQ_SLOT(slotPrefsChanged()));
+ connect(theApp(), TQ_SIGNAL(trayIconToggled()), TQ_SLOT(updateTrayIconAction()));
// Set menu item states
setEnableText(true);
@@ -485,13 +485,13 @@ void MainWindow::setUpdateTimer()
{
// Timeout every minute.
needTimer->mMinuteTimerActive = true;
- MinuteTimer::connect(TQT_TQOBJECT(needTimer), TQT_SLOT(slotUpdateTimeTo()));
+ MinuteTimer::connect(needTimer, TQ_SLOT(slotUpdateTimeTo()));
kdDebug(5950) << "MainWindow::setUpdateTimer(): started timer" << endl;
}
else if (!needTimer && timerWindow)
{
timerWindow->mMinuteTimerActive = false;
- MinuteTimer::disconnect(TQT_TQOBJECT(timerWindow));
+ MinuteTimer::disconnect(timerWindow);
kdDebug(5950) << "MainWindow::setUpdateTimer(): stopped timer" << endl;
}
}
@@ -895,7 +895,7 @@ void MainWindow::slotTemplates()
{
mTemplateDlg = TemplateDlg::create(this);
enableTemplateMenuItem(false); // disable menu item in all windows
- connect(mTemplateDlg, TQT_SIGNAL(finished()), TQT_SLOT(slotTemplatesEnd()));
+ connect(mTemplateDlg, TQ_SIGNAL(finished()), TQ_SLOT(slotTemplatesEnd()));
mTemplateDlg->show();
}
}
@@ -1088,7 +1088,7 @@ void MainWindow::slotConfigureToolbar()
{
saveMainWindowSettings(TDEGlobal::config(), WINDOW_NAME);
KEditToolbar dlg(factory());
- connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig()));
+ connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(slotNewToolbarConfig()));
dlg.exec();
}
@@ -1350,7 +1350,7 @@ void MainWindow::slotContextMenuRequested(TQListViewItem* item, const TQPoint& p
*/
void MainWindow::slotMouseClicked(int button, TQListViewItem* item, const TQPoint& pt, int)
{
- if (button != Qt::RightButton && !item)
+ if (button != TQt::RightButton && !item)
{
kdDebug(5950) << "MainWindow::slotMouseClicked(left)" << endl;
mListView->clearSelection();
diff --git a/kalarm/mainwindow.h b/kalarm/mainwindow.h
index 2e39e027..fdb05b38 100644
--- a/kalarm/mainwindow.h
+++ b/kalarm/mainwindow.h
@@ -41,7 +41,7 @@ class TemplateMenuAction;
class MainWindow : public MainWindowBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kalarm/mainwindowbase.h b/kalarm/mainwindowbase.h
index 8ecdffe2..41e7867d 100644
--- a/kalarm/mainwindowbase.h
+++ b/kalarm/mainwindowbase.h
@@ -33,7 +33,7 @@
*/
class MainWindowBase : public TDEMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp
index 293d92b0..7479ce4e 100644
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@ -429,12 +429,12 @@ void MessageWin::initView()
if (mDateTime.isDateOnly() || TQDate::currentDate().daysTo(mDateTime.date()) > 0)
{
setRemainingTextDay();
- MidnightTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(setRemainingTextDay())); // update every day
+ MidnightTimer::connect(this, TQ_SLOT(setRemainingTextDay())); // update every day
}
else
{
setRemainingTextMinute();
- MinuteTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(setRemainingTextMinute())); // update every minute
+ MinuteTimer::connect(this, TQ_SLOT(setRemainingTextMinute())); // update every minute
}
topLayout->addWidget(mRemainingText, 0, TQt::AlignHCenter);
topLayout->addSpacing(KDialog::spacingHint());
@@ -510,9 +510,9 @@ void MessageWin::initView()
mOkButton = new KPushButton(KStdGuiItem::close(), topWidget);
// Prevent accidental acknowledgement of the message if the user is typing when the window appears
mOkButton->clearFocus();
- mOkButton->setFocusPolicy(TQ_ClickFocus); // don't allow keyboard selection
+ mOkButton->setFocusPolicy(TQWidget::ClickFocus); // don't allow keyboard selection
mOkButton->setFixedSize(mOkButton->sizeHint());
- connect(mOkButton, TQT_SIGNAL(clicked()), TQT_SLOT(close()));
+ connect(mOkButton, TQ_SIGNAL(clicked()), TQ_SLOT(close()));
grid->addWidget(mOkButton, 0, gridIndex++, AlignHCenter);
TQWhatsThis::add(mOkButton, i18n("Acknowledge the alarm"));
@@ -520,9 +520,9 @@ void MessageWin::initView()
{
// Edit button
mEditButton = new TQPushButton(i18n("&Edit..."), topWidget);
- mEditButton->setFocusPolicy(TQ_ClickFocus); // don't allow keyboard selection
+ mEditButton->setFocusPolicy(TQWidget::ClickFocus); // don't allow keyboard selection
mEditButton->setFixedSize(mEditButton->sizeHint());
- connect(mEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit()));
+ connect(mEditButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEdit()));
grid->addWidget(mEditButton, 0, gridIndex++, AlignHCenter);
TQWhatsThis::add(mEditButton, i18n("Edit the alarm."));
}
@@ -531,9 +531,9 @@ void MessageWin::initView()
{
// Defer button
mDeferButton = new TQPushButton(i18n("&Defer..."), topWidget);
- mDeferButton->setFocusPolicy(TQ_ClickFocus); // don't allow keyboard selection
+ mDeferButton->setFocusPolicy(TQWidget::ClickFocus); // don't allow keyboard selection
mDeferButton->setFixedSize(mDeferButton->sizeHint());
- connect(mDeferButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefer()));
+ connect(mDeferButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotDefer()));
grid->addWidget(mDeferButton, 0, gridIndex++, AlignHCenter);
TQWhatsThis::add(mDeferButton,
i18n("Defer the alarm until later.\n"
@@ -550,7 +550,7 @@ void MessageWin::initView()
mSilenceButton = new TQPushButton(topWidget);
mSilenceButton->setPixmap(pixmap);
mSilenceButton->setFixedSize(mSilenceButton->sizeHint());
- connect(mSilenceButton, TQT_SIGNAL(clicked()), TQT_SLOT(stopPlay()));
+ connect(mSilenceButton, TQ_SIGNAL(clicked()), TQ_SLOT(stopPlay()));
grid->addWidget(mSilenceButton, 0, gridIndex++, AlignHCenter);
TQToolTip::add(mSilenceButton, i18n("Stop sound"));
TQWhatsThis::add(mSilenceButton, i18n("Stop playing the sound"));
@@ -567,7 +567,7 @@ void MessageWin::initView()
mKMailButton = new TQPushButton(topWidget);
mKMailButton->setPixmap(pixmap);
mKMailButton->setFixedSize(mKMailButton->sizeHint());
- connect(mKMailButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotShowKMailMessage()));
+ connect(mKMailButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotShowKMailMessage()));
grid->addWidget(mKMailButton, 0, gridIndex++, AlignHCenter);
TQToolTip::add(mKMailButton, i18n("Locate this email in KMail", "Locate in KMail"));
TQWhatsThis::add(mKMailButton, i18n("Locate and highlight this email in KMail"));
@@ -580,7 +580,7 @@ void MessageWin::initView()
mKAlarmButton = new TQPushButton(topWidget);
mKAlarmButton->setPixmap(pixmap);
mKAlarmButton->setFixedSize(mKAlarmButton->sizeHint());
- connect(mKAlarmButton, TQT_SIGNAL(clicked()), TQT_SLOT(displayMainWindow()));
+ connect(mKAlarmButton, TQ_SIGNAL(clicked()), TQ_SLOT(displayMainWindow()));
grid->addWidget(mKAlarmButton, 0, gridIndex++, AlignHCenter);
TQString actKAlarm = i18n("Activate KAlarm");
TQToolTip::add(mKAlarmButton, actKAlarm);
@@ -619,9 +619,9 @@ void MessageWin::setRemainingTextDay()
if (days <= 0 && !mDateTime.isDateOnly())
{
// The alarm is due today, so start refreshing every minute
- MidnightTimer::disconnect(TQT_TQOBJECT(this), TQT_SLOT(setRemainingTextDay()));
+ MidnightTimer::disconnect(this, TQ_SLOT(setRemainingTextDay()));
setRemainingTextMinute();
- MinuteTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(setRemainingTextMinute())); // update every minute
+ MinuteTimer::connect(this, TQ_SLOT(setRemainingTextMinute())); // update every minute
}
else
{
@@ -796,14 +796,14 @@ void MessageWin::playAudio()
#else
// An audio file is specified. Because loading it may take some time,
// call it on a timer to allow the window to display first.
- TQTimer::singleShot(0, this, TQT_SLOT(slotPlayAudio()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotPlayAudio()));
#endif
}
else if (mSpeak)
{
// The message is to be spoken. In case of error messges,
// call it on a timer to allow the window to display first.
- TQTimer::singleShot(0, this, TQT_SLOT(slotSpeak()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotSpeak()));
}
}
@@ -868,7 +868,7 @@ void MessageWin::slotPlayAudio()
{
mFadeTimer = 0;
mPlayTimer = new TQTimer(this);
- connect(mPlayTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAudioPlay()));
+ connect(mPlayTimer, TQ_SIGNAL(timeout()), TQ_SLOT(checkAudioPlay()));
mArtsDispatcher = new KArtsDispatcher;
mPlayedOnce = false;
mAudioFileStart = TQTime::currentTime();
@@ -935,7 +935,7 @@ void MessageWin::initAudio(bool firstTime)
}
mSilenceButton->setEnabled(true);
mPlayed = false;
- connect(mPlayObject, TQT_SIGNAL(playObjectCreated()), TQT_SLOT(checkAudioPlay()));
+ connect(mPlayObject, TQ_SIGNAL(playObjectCreated()), TQ_SLOT(checkAudioPlay()));
if (!mPlayObject->object().isNull())
checkAudioPlay();
}
@@ -976,7 +976,7 @@ void MessageWin::checkAudioPlay()
// Set up volume fade
mAudioFileStart = now;
mFadeTimer = new TQTimer(this);
- connect(mFadeTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotFade()));
+ connect(mFadeTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotFade()));
mFadeTimer->start(1000); // adjust volume every second
}
mPlayedOnce = true;
@@ -1186,7 +1186,7 @@ void MessageWin::show()
int delay = TQDateTime::currentDateTime().secsTo(mCloseTime);
if (delay < 0)
delay = 0;
- TQTimer::singleShot(delay * 1000, this, TQT_SLOT(close()));
+ TQTimer::singleShot(delay * 1000, this, TQ_SLOT(close()));
if (!delay)
return; // don't show the window if auto-closing is already due
}
@@ -1302,7 +1302,7 @@ void MessageWin::showEvent(TQShowEvent* se)
if (mAction == KAEvent::MESSAGE)
{
// Set the window size once the frame size is known
- TQTimer::singleShot(0, this, TQT_SLOT(setMaxSize()));
+ TQTimer::singleShot(0, this, TQ_SLOT(setMaxSize()));
}
}
mShown = true;
@@ -1345,7 +1345,7 @@ void MessageWin::displayComplete()
// Enable the window's buttons either now or after the configured delay
if (mButtonDelay > 0)
- TQTimer::singleShot(mButtonDelay, this, TQT_SLOT(enableButtons()));
+ TQTimer::singleShot(mButtonDelay, this, TQ_SLOT(enableButtons()));
else
enableButtons();
}
@@ -1497,7 +1497,7 @@ void MessageWin::setDeferralLimit(const KAEvent& event)
if (mDeferButton)
{
mDeferLimit = event.deferralLimit().dateTime();
- MidnightTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(checkDeferralLimit())); // check every day
+ MidnightTimer::connect(this, TQ_SLOT(checkDeferralLimit())); // check every day
mDisableDeferral = false;
checkDeferralLimit();
}
@@ -1519,14 +1519,14 @@ void MessageWin::checkDeferralLimit()
int n = TQDate::currentDate().daysTo(mDeferLimit.date());
if (n > 0)
return;
- MidnightTimer::disconnect(TQT_TQOBJECT(this), TQT_SLOT(checkDeferralLimit()));
+ MidnightTimer::disconnect(this, TQ_SLOT(checkDeferralLimit()));
if (n == 0)
{
// The deferral limit will be reached today
n = TQTime::currentTime().secsTo(mDeferLimit.time());
if (n > 0)
{
- TQTimer::singleShot(n * 1000, this, TQT_SLOT(checkDeferralLimit()));
+ TQTimer::singleShot(n * 1000, this, TQ_SLOT(checkDeferralLimit()));
return;
}
}
diff --git a/kalarm/messagewin.h b/kalarm/messagewin.h
index 96f8b1f9..8cf48740 100644
--- a/kalarm/messagewin.h
+++ b/kalarm/messagewin.h
@@ -43,7 +43,7 @@ namespace KDE { class PlayObject; }
*/
class MessageWin : public MainWindowBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
MessageWin(); // for session management restoration only
diff --git a/kalarm/pickfileradio.cpp b/kalarm/pickfileradio.cpp
index 15b56d94..bdfb2bb4 100644
--- a/kalarm/pickfileradio.cpp
+++ b/kalarm/pickfileradio.cpp
@@ -41,10 +41,10 @@ PickFileRadio::PickFileRadio(TQPushButton* button, LineEdit* edit, const TQStrin
Q_ASSERT(parent);
Q_ASSERT(button);
mButton->setEnabled(false);
- connect(mButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile()));
+ connect(mButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotPickFile()));
if (mEdit)
mEdit->setEnabled(false);
- connect(mGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotSelectionChanged(int)));
+ connect(mGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotSelectionChanged(int)));
}
PickFileRadio::PickFileRadio(const TQString& text, TQButtonGroup* parent, const char* name)
@@ -64,10 +64,10 @@ void PickFileRadio::init(TQPushButton* button, LineEdit* edit)
mEdit = edit;
mButton = button;
mButton->setEnabled(false);
- connect(mButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile()));
+ connect(mButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotPickFile()));
if (mEdit)
mEdit->setEnabled(false);
- connect(mGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotSelectionChanged(int)));
+ connect(mGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotSelectionChanged(int)));
setReadOnly(RadioButton::isReadOnly());
}
@@ -165,7 +165,7 @@ void PickFileRadio::slotPickFile()
// No file is selected, so revert to the previous radio button selection.
// But wait a moment before setting the radio button, or it won't work.
mRevertId = true; // prevent picker dialogue popping up twice
- TQTimer::singleShot(0, this, TQT_SLOT(setLastId()));
+ TQTimer::singleShot(0, this, TQ_SLOT(setLastId()));
}
}
diff --git a/kalarm/pickfileradio.h b/kalarm/pickfileradio.h
index f30ca7f6..ba72d58c 100644
--- a/kalarm/pickfileradio.h
+++ b/kalarm/pickfileradio.h
@@ -49,7 +49,7 @@ class LineEdit;
*/
class PickFileRadio : public RadioButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Constructor.
diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp
index f439d609..38cd5603 100644
--- a/kalarm/prefdlg.cpp
+++ b/kalarm/prefdlg.cpp
@@ -263,7 +263,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
// Run-on-demand radio button
mRunOnDemand = new TQRadioButton(i18n("&Run only on demand"), group, "runDemand");
mRunOnDemand->setFixedSize(mRunOnDemand->sizeHint());
- connect(mRunOnDemand, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRunModeToggled(bool)));
+ connect(mRunOnDemand, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotRunModeToggled(bool)));
TQWhatsThis::add(mRunOnDemand,
i18n("Check to run KAlarm only when required.\n\n"
"Notes:\n"
@@ -274,7 +274,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
// Run-in-system-tray radio button
mRunInSystemTray = new TQRadioButton(i18n("Run continuously in system &tray"), group, "runTray");
mRunInSystemTray->setFixedSize(mRunInSystemTray->sizeHint());
- connect(mRunInSystemTray, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRunModeToggled(bool)));
+ connect(mRunInSystemTray, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotRunModeToggled(bool)));
TQWhatsThis::add(mRunInSystemTray,
i18n("Check to run KAlarm continuously in the TDE system tray.\n\n"
"Notes:\n"
@@ -286,7 +286,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
// Run continuously options
mDisableAlarmsIfStopped = new TQCheckBox(i18n("Disa&ble alarms while not running"), group, "disableAl");
mDisableAlarmsIfStopped->setFixedSize(mDisableAlarmsIfStopped->sizeHint());
- connect(mDisableAlarmsIfStopped, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDisableIfStoppedToggled(bool)));
+ connect(mDisableAlarmsIfStopped, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotDisableIfStoppedToggled(bool)));
TQWhatsThis::add(mDisableAlarmsIfStopped,
i18n("Check to disable alarms whenever KAlarm is not running. Alarms will only appear while the system tray icon is visible."));
grid->addMultiCellWidget(mDisableAlarmsIfStopped, 3, 3, 1, 2, alignment);
@@ -299,14 +299,14 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
mAutostartTrayIcon = new TQCheckBox(i18n("Autostart at &login"), group, "autoTray");
#ifdef AUTOSTART_BY_KALARMD
- connect(mAutostartTrayIcon, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAutostartToggled(bool)));
+ connect(mAutostartTrayIcon, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAutostartToggled(bool)));
#endif
grid->addMultiCellWidget(mAutostartTrayIcon, 5, 5, 0, 2, alignment);
// Autostart alarm daemon
mAutostartDaemon = new TQCheckBox(i18n("Start alarm monitoring at lo&gin"), group, "startDaemon");
mAutostartDaemon->setFixedSize(mAutostartDaemon->sizeHint());
- connect(mAutostartDaemon, TQT_SIGNAL(clicked()), TQT_SLOT(slotAutostartDaemonClicked()));
+ connect(mAutostartDaemon, TQ_SIGNAL(clicked()), TQ_SLOT(slotAutostartDaemonClicked()));
TQWhatsThis::add(mAutostartDaemon,
i18n("Automatically start alarm monitoring whenever you start TDE, by running the alarm daemon (%1).\n\n"
"This option should always be checked unless you intend to discontinue use of KAlarm.")
@@ -346,7 +346,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
grid->addRowSpacing(0, fontMetrics().lineSpacing()/2);
mKeepExpired = new TQCheckBox(i18n("Keep alarms after e&xpiry"), group, "keepExpired");
mKeepExpired->setFixedSize(mKeepExpired->sizeHint());
- connect(mKeepExpired, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotExpiredToggled(bool)));
+ connect(mKeepExpired, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotExpiredToggled(bool)));
TQWhatsThis::add(mKeepExpired,
i18n("Check to store alarms after expiry or deletion (except deleted alarms which were never triggered)."));
grid->addMultiCellWidget(mKeepExpired, 1, 1, 0, 1, alignment);
@@ -355,7 +355,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
box->setSpacing(KDialog::spacingHint());
mPurgeExpired = new TQCheckBox(i18n("Discard ex&pired alarms after:"), box, "purgeExpired");
mPurgeExpired->setMinimumSize(mPurgeExpired->sizeHint());
- connect(mPurgeExpired, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotExpiredToggled(bool)));
+ connect(mPurgeExpired, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotExpiredToggled(bool)));
mPurgeAfter = new SpinBox(box);
mPurgeAfter->setMinValue(1);
mPurgeAfter->setLineShiftStep(10);
@@ -369,7 +369,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
mClearExpired = new TQPushButton(i18n("Clear Expired Alar&ms"), group);
mClearExpired->setFixedSize(mClearExpired->sizeHint());
- connect(mClearExpired, TQT_SIGNAL(clicked()), TQT_SLOT(slotClearExpired()));
+ connect(mClearExpired, TQ_SIGNAL(clicked()), TQ_SLOT(slotClearExpired()));
TQWhatsThis::add(mClearExpired,
i18n("Delete all existing expired alarms."));
grid->addWidget(mClearExpired, 3, 1, alignment);
@@ -413,7 +413,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
grid->addMultiCellWidget(box, row + 1, row + 1, 0, 2, TQt::AlignAuto);
TQRadioButton* radio = new TQRadioButton(i18n("Other:"), box);
radio->setFixedSize(radio->sizeHint());
- connect(radio, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotOtherTerminalToggled(bool)));
+ connect(radio, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotOtherTerminalToggled(bool)));
mXtermType->insert(radio, mXtermCount);
if (mXtermFirst < 0)
mXtermFirst = mXtermCount; // note the id of the first button
@@ -609,7 +609,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
radio = new RadioButton(i18n("&Sendmail"), box, "sendmail");
radio->setMinimumSize(radio->sizeHint());
mEmailClient->insert(radio, Preferences::SENDMAIL);
- connect(mEmailClient, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotEmailClientChanged(int)));
+ connect(mEmailClient, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotEmailClientChanged(int)));
box->setFixedHeight(box->sizeHint().height());
TQWhatsThis::add(box,
i18n("Choose how to send email when an email alarm is triggered.\n"
@@ -637,7 +637,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
grid->addWidget(label, 1, 0);
mFromAddressGroup = new ButtonGroup(group);
mFromAddressGroup->hide();
- connect(mFromAddressGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotFromAddrChanged(int)));
+ connect(mFromAddressGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotFromAddrChanged(int)));
// Line edit to enter a 'From' email address
radio = new RadioButton(group);
@@ -646,7 +646,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
label->setBuddy(radio);
grid->addWidget(radio, 1, 1);
mEmailAddress = new TQLineEdit(group);
- connect(mEmailAddress, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotAddressChanged()));
+ connect(mEmailAddress, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotAddressChanged()));
TQString whatsThis = i18n("Your email address, used to identify you as the sender when sending email alarms.");
TQWhatsThis::add(radio, whatsThis);
TQWhatsThis::add(mEmailAddress, whatsThis);
@@ -678,7 +678,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
grid->addWidget(label, 5, 0);
mBccAddressGroup = new ButtonGroup(group);
mBccAddressGroup->hide();
- connect(mBccAddressGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotBccAddrChanged(int)));
+ connect(mBccAddressGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotBccAddrChanged(int)));
// Line edit to enter a 'Bcc' email address
radio = new RadioButton(group);
@@ -962,7 +962,7 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
mSoundFileBrowse = new TQPushButton(box);
mSoundFileBrowse->setPixmap(SmallIcon("document-open"));
mSoundFileBrowse->setFixedSize(mSoundFileBrowse->sizeHint());
- connect(mSoundFileBrowse, TQT_SIGNAL(clicked()), TQT_SLOT(slotBrowseSoundFile()));
+ connect(mSoundFileBrowse, TQ_SIGNAL(clicked()), TQ_SLOT(slotBrowseSoundFile()));
TQToolTip::add(mSoundFileBrowse, i18n("Choose a sound file"));
TQWhatsThis::add(box,
i18n("Enter the default sound file to use in the alarm edit dialog."));
@@ -1201,7 +1201,7 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame)
mTooltipShowAlarms = new TQCheckBox(i18n("Show next &24 hours' alarms"), group, "tooltipShow");
mTooltipShowAlarms->setMinimumSize(mTooltipShowAlarms->sizeHint());
- connect(mTooltipShowAlarms, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipAlarmsToggled(bool)));
+ connect(mTooltipShowAlarms, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTooltipAlarmsToggled(bool)));
TQWhatsThis::add(mTooltipShowAlarms,
i18n("Specify whether to include in the system tray tooltip, a summary of alarms due in the next 24 hours"));
grid->addMultiCellWidget(mTooltipShowAlarms, 1, 1, 0, 2, TQt::AlignAuto);
@@ -1210,7 +1210,7 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame)
box->setSpacing(KDialog::spacingHint());
mTooltipMaxAlarms = new TQCheckBox(i18n("Ma&ximum number of alarms to show:"), box, "tooltipMax");
mTooltipMaxAlarms->setMinimumSize(mTooltipMaxAlarms->sizeHint());
- connect(mTooltipMaxAlarms, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipMaxToggled(bool)));
+ connect(mTooltipMaxAlarms, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTooltipMaxToggled(bool)));
mTooltipMaxAlarmCount = new SpinBox(1, 99, 1, box);
mTooltipMaxAlarmCount->setLineShiftStep(5);
mTooltipMaxAlarmCount->setMinimumSize(mTooltipMaxAlarmCount->sizeHint());
@@ -1221,14 +1221,14 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame)
mTooltipShowTime = new TQCheckBox(MainWindow::i18n_m_ShowAlarmTime(), group, "tooltipTime");
mTooltipShowTime->setMinimumSize(mTooltipShowTime->sizeHint());
- connect(mTooltipShowTime, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipTimeToggled(bool)));
+ connect(mTooltipShowTime, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTooltipTimeToggled(bool)));
TQWhatsThis::add(mTooltipShowTime,
i18n("Specify whether to show in the system tray tooltip, the time at which each alarm is due"));
grid->addMultiCellWidget(mTooltipShowTime, 3, 3, 1, 2, TQt::AlignAuto);
mTooltipShowTimeTo = new TQCheckBox(MainWindow::i18n_l_ShowTimeToAlarm(), group, "tooltipTimeTo");
mTooltipShowTimeTo->setMinimumSize(mTooltipShowTimeTo->sizeHint());
- connect(mTooltipShowTimeTo, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipTimeToToggled(bool)));
+ connect(mTooltipShowTimeTo, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTooltipTimeToToggled(bool)));
TQWhatsThis::add(mTooltipShowTimeTo,
i18n("Specify whether to show in the system tray tooltip, how long until each alarm is due"));
grid->addMultiCellWidget(mTooltipShowTimeTo, 4, 4, 1, 2, TQt::AlignAuto);
diff --git a/kalarm/prefdlg.h b/kalarm/prefdlg.h
index a58e22d7..94a7da45 100644
--- a/kalarm/prefdlg.h
+++ b/kalarm/prefdlg.h
@@ -53,7 +53,7 @@ class MiscPrefTab;
// The Preferences dialog
class KAlarmPrefDlg : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
static void display();
@@ -83,7 +83,7 @@ class KAlarmPrefDlg : public KDialogBase
// Base class for each tab in the Preferences dialog
class PrefsTabBase : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
PrefsTabBase(TQVBox*);
@@ -105,7 +105,7 @@ class PrefsTabBase : public TQWidget
// Miscellaneous tab of the Preferences dialog
class MiscPrefTab : public PrefsTabBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
MiscPrefTab(TQVBox*);
@@ -151,7 +151,7 @@ class MiscPrefTab : public PrefsTabBase
// Email tab of the Preferences dialog
class EmailPrefTab : public PrefsTabBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
EmailPrefTab(TQVBox*);
@@ -187,7 +187,7 @@ class EmailPrefTab : public PrefsTabBase
// Edit defaults tab of the Preferences dialog
class EditPrefTab : public PrefsTabBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
EditPrefTab(TQVBox*);
@@ -226,7 +226,7 @@ class EditPrefTab : public PrefsTabBase
// View tab of the Preferences dialog
class ViewPrefTab : public PrefsTabBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
ViewPrefTab(TQVBox*);
@@ -259,7 +259,7 @@ class ViewPrefTab : public PrefsTabBase
// Font & Colour tab of the Preferences dialog
class FontColourPrefTab : public PrefsTabBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
FontColourPrefTab(TQVBox*);
diff --git a/kalarm/preferences.h b/kalarm/preferences.h
index 77adeb58..cce6c6bb 100644
--- a/kalarm/preferences.h
+++ b/kalarm/preferences.h
@@ -41,7 +41,7 @@ class TQWidget;
// Settings configured in the Preferences dialog
class Preferences : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
enum MailClient { SENDMAIL, KMAIL };
diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp
index 4a61ed66..feee5e84 100644
--- a/kalarm/recurrenceedit.cpp
+++ b/kalarm/recurrenceedit.cpp
@@ -103,7 +103,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
* selection of its corresponding radio button.
*/
- TQGroupBox* recurGroup = new TQGroupBox(1, Qt::Vertical, i18n("Recurrence Rule"), this, "recurGroup");
+ TQGroupBox* recurGroup = new TQGroupBox(1, TQt::Vertical, i18n("Recurrence Rule"), this, "recurGroup");
topLayout->addWidget(recurGroup);
TQFrame* ruleFrame = new TQFrame(recurGroup, "ruleFrame");
layout = new TQVBoxLayout(ruleFrame, 0);
@@ -111,12 +111,12 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
layout = new TQHBoxLayout(layout, 0);
TQBoxLayout* lay = new TQVBoxLayout(layout, 0);
- mRuleButtonGroup = new ButtonGroup(1, Qt::Horizontal, ruleFrame);
+ mRuleButtonGroup = new ButtonGroup(1, TQt::Horizontal, ruleFrame);
mRuleButtonGroup->setInsideMargin(0);
mRuleButtonGroup->setFrameStyle(TQFrame::NoFrame);
lay->addWidget(mRuleButtonGroup);
lay->addStretch(); // top-adjust the interval radio buttons
- connect(mRuleButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(periodClicked(int)));
+ connect(mRuleButtonGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(periodClicked(int)));
mNoneButton = new RadioButton(i18n_Norecur(), mRuleButtonGroup);
mNoneButton->setFixedSize(mNoneButton->sizeHint());
@@ -172,8 +172,8 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
mSubRepetition = new RepetitionButton(i18n("Sub-Repetition"), true, ruleFrame);
mSubRepetition->setFixedSize(mSubRepetition->sizeHint());
mSubRepetition->setReadOnly(mReadOnly);
- connect(mSubRepetition, TQT_SIGNAL(needsInitialisation()), TQT_SIGNAL(repeatNeedsInitialisation()));
- connect(mSubRepetition, TQT_SIGNAL(changed()), TQT_SIGNAL(frequencyChanged()));
+ connect(mSubRepetition, TQ_SIGNAL(needsInitialisation()), TQ_SIGNAL(repeatNeedsInitialisation()));
+ connect(mSubRepetition, TQ_SIGNAL(changed()), TQ_SIGNAL(frequencyChanged()));
TQWhatsThis::add(mSubRepetition, i18n("Set up a repetition within the recurrence, to trigger the alarm multiple times each time the recurrence is due."));
lay->addSpacing(KDialog::spacingHint());
lay->addWidget(mSubRepetition);
@@ -196,11 +196,11 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
mMonthlyRule = new MonthlyRule(mReadOnly, ruleFrame, "monthFrame");
mYearlyRule = new YearlyRule(mReadOnly, ruleFrame, "yearFrame");
- connect(mSubDailyRule, TQT_SIGNAL(frequencyChanged()), this, TQT_SIGNAL(frequencyChanged()));
- connect(mDailyRule, TQT_SIGNAL(frequencyChanged()), this, TQT_SIGNAL(frequencyChanged()));
- connect(mWeeklyRule, TQT_SIGNAL(frequencyChanged()), this, TQT_SIGNAL(frequencyChanged()));
- connect(mMonthlyRule, TQT_SIGNAL(frequencyChanged()), this, TQT_SIGNAL(frequencyChanged()));
- connect(mYearlyRule, TQT_SIGNAL(frequencyChanged()), this, TQT_SIGNAL(frequencyChanged()));
+ connect(mSubDailyRule, TQ_SIGNAL(frequencyChanged()), this, TQ_SIGNAL(frequencyChanged()));
+ connect(mDailyRule, TQ_SIGNAL(frequencyChanged()), this, TQ_SIGNAL(frequencyChanged()));
+ connect(mWeeklyRule, TQ_SIGNAL(frequencyChanged()), this, TQ_SIGNAL(frequencyChanged()));
+ connect(mMonthlyRule, TQ_SIGNAL(frequencyChanged()), this, TQ_SIGNAL(frequencyChanged()));
+ connect(mYearlyRule, TQ_SIGNAL(frequencyChanged()), this, TQ_SIGNAL(frequencyChanged()));
mRuleStack = new TQWidgetStack(ruleFrame);
layout->addWidget(mRuleStack);
@@ -217,7 +217,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
// which specify how long the recurrence is to last.
mRangeButtonGroup = new ButtonGroup(i18n("Recurrence End"), this, "mRangeButtonGroup");
- connect(mRangeButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(rangeTypeClicked()));
+ connect(mRangeButtonGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(rangeTypeClicked()));
topLayout->addWidget(mRangeButtonGroup);
TQVBoxLayout* vlayout = new TQVBoxLayout(mRangeButtonGroup, KDialog::marginHint(), KDialog::spacingHint());
@@ -239,7 +239,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
mRepeatCountEntry->setLineShiftStep(10);
mRepeatCountEntry->setSelectOnStep(false);
mRepeatCountEntry->setReadOnly(mReadOnly);
- connect(mRepeatCountEntry, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(repeatCountChanged(int)));
+ connect(mRepeatCountEntry, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(repeatCountChanged(int)));
TQWhatsThis::add(mRepeatCountEntry,
i18n("Enter the total number of times to trigger the alarm"));
mRepeatCountButton->setFocusWidget(mRepeatCountEntry);
@@ -272,7 +272,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
mEndAnyTimeCheckBox = new CheckBox(i18n("Any time"), mRangeButtonGroup);
mEndAnyTimeCheckBox->setFixedSize(mEndAnyTimeCheckBox->sizeHint());
mEndAnyTimeCheckBox->setReadOnly(mReadOnly);
- connect(mEndAnyTimeCheckBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAnyTimeToggled(bool)));
+ connect(mEndAnyTimeCheckBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAnyTimeToggled(bool)));
TQWhatsThis::add(mEndAnyTimeCheckBox,
i18n("Stop repeating the alarm after your first login on or after the specified end date"));
layout->addWidget(mEndDateButton);
@@ -300,7 +300,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
mExceptionDateList = new TQListBox(mExceptionGroup);
mExceptionDateList->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
- connect(mExceptionDateList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(enableExceptionButtons()));
+ connect(mExceptionDateList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(enableExceptionButtons()));
TQWhatsThis::add(mExceptionDateList,
i18n("The list of exceptions, i.e. dates/times excluded from the recurrence"));
vlayout->addWidget(mExceptionDateList);
@@ -325,21 +325,21 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
layout = new TQHBoxLayout(vlayout, KDialog::spacingHint());
TQPushButton* button = new TQPushButton(i18n("Add"), mExceptionGroup);
button->setFixedSize(button->sizeHint());
- connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addException()));
+ connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(addException()));
TQWhatsThis::add(button,
i18n("Add the date entered above to the exceptions list"));
layout->addWidget(button);
mChangeExceptionButton = new TQPushButton(i18n("Change"), mExceptionGroup);
mChangeExceptionButton->setFixedSize(mChangeExceptionButton->sizeHint());
- connect(mChangeExceptionButton, TQT_SIGNAL(clicked()), TQT_SLOT(changeException()));
+ connect(mChangeExceptionButton, TQ_SIGNAL(clicked()), TQ_SLOT(changeException()));
TQWhatsThis::add(mChangeExceptionButton,
i18n("Replace the currently highlighted item in the exceptions list with the date entered above"));
layout->addWidget(mChangeExceptionButton);
mDeleteExceptionButton = new TQPushButton(i18n("Delete"), mExceptionGroup);
mDeleteExceptionButton->setFixedSize(mDeleteExceptionButton->sizeHint());
- connect(mDeleteExceptionButton, TQT_SIGNAL(clicked()), TQT_SLOT(deleteException()));
+ connect(mDeleteExceptionButton, TQ_SIGNAL(clicked()), TQ_SLOT(deleteException()));
TQWhatsThis::add(mDeleteExceptionButton,
i18n("Remove the currently highlighted item from the exceptions list"));
layout->addWidget(mDeleteExceptionButton);
@@ -712,7 +712,7 @@ void RecurrenceEdit::enableExceptionButtons()
mChangeExceptionButton->setEnabled(enable);
// Prevent the exceptions list box receiving keyboard focus is it's empty
- mExceptionDateList->setFocusPolicy(mExceptionDateList->count() ? TQ_WheelFocus : TQ_NoFocus);
+ mExceptionDateList->setFocusPolicy(mExceptionDateList->count() ? TQWidget::WheelFocus : TQWidget::NoFocus);
}
/******************************************************************************
@@ -1137,7 +1137,7 @@ Rule::Rule(const TQString& freqText, const TQString& freqWhatsThis, bool time, b
mIntSpinBox->setFixedSize(mIntSpinBox->sizeHint());
mIntSpinBox->setReadOnly(readOnly);
}
- connect(mSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(frequencyChanged()));
+ connect(mSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(frequencyChanged()));
label->setBuddy(mSpinBox);
label = new TQLabel(freqText, box);
label->setFixedSize(label->sizeHint());
@@ -1368,7 +1368,7 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats
mDayCombo->setReadOnly(readOnly);
TQWhatsThis::add(mDayCombo, i18n("Select the day of the month on which to repeat the alarm"));
mDayButton->setFocusWidget(mDayCombo);
- connect(mDayCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotDaySelected(int)));
+ connect(mDayCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotDaySelected(int)));
box->setStretchFactor(new TQWidget(box), 1); // left adjust the controls
box->setFixedHeight(box->sizeHint().height());
@@ -1418,7 +1418,7 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats
box->setStretchFactor(new TQWidget(box), 1); // left adjust the controls
box->setFixedHeight(box->sizeHint().height());
- connect(mButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(clicked(int)));
+ connect(mButtonGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(clicked(int)));
}
MonthYearRule::DayPosType MonthYearRule::type() const
@@ -1567,7 +1567,7 @@ YearlyRule::YearlyRule(bool readOnly, TQWidget* parent, const char* name)
mMonthBox[i]->setReadOnly(readOnly);
grid->addWidget(mMonthBox[i], i%3, i/3, TQt::AlignAuto);
}
- connect(mMonthBox[1], TQT_SIGNAL(toggled(bool)), TQT_SLOT(enableFeb29()));
+ connect(mMonthBox[1], TQ_SIGNAL(toggled(bool)), TQ_SLOT(enableFeb29()));
w->setFixedHeight(w->sizeHint().height());
TQWhatsThis::add(w, i18n("Select the months of the year in which to repeat the alarm"));
diff --git a/kalarm/recurrenceedit.h b/kalarm/recurrenceedit.h
index 03d492c0..df99e4c7 100644
--- a/kalarm/recurrenceedit.h
+++ b/kalarm/recurrenceedit.h
@@ -55,7 +55,7 @@ class YearlyRule;
class RecurrenceEdit : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
// Don't alter the order of these recurrence types
diff --git a/kalarm/recurrenceeditprivate.h b/kalarm/recurrenceeditprivate.h
index a3824851..b8bf7818 100644
--- a/kalarm/recurrenceeditprivate.h
+++ b/kalarm/recurrenceeditprivate.h
@@ -46,7 +46,7 @@ class NoRule : public TQFrame
class Rule : public NoRule
{
- Q_OBJECT
+ TQ_OBJECT
public:
Rule(const TQString& freqText, const TQString& freqWhatsThis, bool time, bool readOnly,
@@ -72,7 +72,7 @@ class Rule : public NoRule
// Subdaily rule choices
class SubDailyRule : public Rule
{
- Q_OBJECT
+ TQ_OBJECT
public:
SubDailyRule(bool readOnly, TQWidget* parent, const char* name = 0);
@@ -81,7 +81,7 @@ class SubDailyRule : public Rule
// Daily/weekly rule choices base class
class DayWeekRule : public Rule
{
- Q_OBJECT
+ TQ_OBJECT
public:
DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis, const TQString& daysWhatsThis,
@@ -116,7 +116,7 @@ class WeeklyRule : public DayWeekRule
// Monthly/yearly rule choices base class
class MonthYearRule : public Rule
{
- Q_OBJECT
+ TQ_OBJECT
public:
enum DayPosType { DATE, POS };
@@ -171,7 +171,7 @@ class MonthlyRule : public MonthYearRule
// Yearly rule choices
class YearlyRule : public MonthYearRule
{
- Q_OBJECT
+ TQ_OBJECT
public:
YearlyRule(bool readOnly, TQWidget* parent, const char* name = 0);
diff --git a/kalarm/reminder.cpp b/kalarm/reminder.cpp
index dd4b4151..7f327a85 100644
--- a/kalarm/reminder.cpp
+++ b/kalarm/reminder.cpp
@@ -52,7 +52,7 @@ Reminder::Reminder(const TQString& caption, const TQString& reminderWhatsThis, c
mTime = new TimeSelector(caption, i18n("in advance"), reminderWhatsThis,
valueWhatsThis, allowHourMinute, this, "timeOption");
mTime->setFixedSize(mTime->sizeHint());
- connect(mTime, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotReminderToggled(bool)));
+ connect(mTime, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotReminderToggled(bool)));
topLayout->addWidget(mTime);
if (showOnceOnly)
diff --git a/kalarm/reminder.h b/kalarm/reminder.h
index 14e2e9df..c8e55953 100644
--- a/kalarm/reminder.h
+++ b/kalarm/reminder.h
@@ -29,7 +29,7 @@ class CheckBox;
class Reminder : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
Reminder(const TQString& caption, const TQString& reminderWhatsThis, const TQString& valueWhatsThis,
diff --git a/kalarm/repetition.cpp b/kalarm/repetition.cpp
index 4305cd65..8a964eac 100644
--- a/kalarm/repetition.cpp
+++ b/kalarm/repetition.cpp
@@ -52,7 +52,7 @@ RepetitionButton::RepetitionButton(const TQString& caption, bool waitForInitiali
{
setToggleButton(true);
setOn(false);
- connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotPressed()));
+ connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotPressed()));
}
void RepetitionButton::set(int interval, int count)
@@ -166,12 +166,12 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p
i18n("Enter the time between repetitions of the alarm"),
true, page);
mTimeSelector->setFixedSize(mTimeSelector->sizeHint());
- connect(mTimeSelector, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(intervalChanged(int)));
- connect(mTimeSelector, TQT_SIGNAL(toggled(bool)), TQT_SLOT(repetitionToggled(bool)));
+ connect(mTimeSelector, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(intervalChanged(int)));
+ connect(mTimeSelector, TQ_SIGNAL(toggled(bool)), TQ_SLOT(repetitionToggled(bool)));
topLayout->addWidget(mTimeSelector, 0, TQt::AlignAuto);
mButtonGroup = new ButtonGroup(page, "buttonGroup");
- connect(mButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(typeClicked()));
+ connect(mButtonGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(typeClicked()));
topLayout->addWidget(mButtonGroup);
TQBoxLayout* vlayout = new TQVBoxLayout(mButtonGroup, marginHint(), spacing);
@@ -185,7 +185,7 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p
mCount->setFixedSize(mCount->sizeHint());
mCount->setLineShiftStep(10);
mCount->setSelectOnStep(false);
- connect(mCount, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(countChanged(int)));
+ connect(mCount, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(countChanged(int)));
TQWhatsThis::add(mCount,
i18n("Enter the number of times to trigger the alarm after its initial occurrence"));
layout->addWidget(mCount);
@@ -200,7 +200,7 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p
layout->addWidget(mDurationButton);
mDuration = new TimePeriod(true, mButtonGroup);
mDuration->setFixedSize(mDuration->sizeHint());
- connect(mDuration, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(durationChanged(int)));
+ connect(mDuration, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(durationChanged(int)));
TQWhatsThis::add(mDuration,
i18n("Enter the length of time to repeat the alarm"));
layout->addWidget(mDuration);
diff --git a/kalarm/repetition.h b/kalarm/repetition.h
index b28293c3..b59216ca 100644
--- a/kalarm/repetition.h
+++ b/kalarm/repetition.h
@@ -34,7 +34,7 @@ class RepetitionDlg;
class RepetitionButton : public TQPushButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
RepetitionButton(const TQString& caption, bool waitForInitialisation, TQWidget* parent, const char* name = 0);
@@ -70,7 +70,7 @@ class RepetitionButton : public TQPushButton
class RepetitionDlg : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* parent = 0, const char* name = 0);
diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp
index cb539512..a94bb6fe 100644
--- a/kalarm/sounddlg.cpp
+++ b/kalarm/sounddlg.cpp
@@ -86,7 +86,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad
mFilePlay = new TQPushButton(box);
mFilePlay->setPixmap(SmallIcon("media-playback-start"));
mFilePlay->setFixedSize(mFilePlay->sizeHint());
- connect(mFilePlay, TQT_SIGNAL(clicked()), TQT_SLOT(playSound()));
+ connect(mFilePlay, TQ_SIGNAL(clicked()), TQ_SLOT(playSound()));
TQToolTip::add(mFilePlay, i18n("Test the sound"));
TQWhatsThis::add(mFilePlay, i18n("Play the selected sound file."));
@@ -99,7 +99,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad
mFileBrowseButton = new PushButton(box);
mFileBrowseButton->setPixmap(SmallIcon("document-open"));
mFileBrowseButton->setFixedSize(mFileBrowseButton->sizeHint());
- connect(mFileBrowseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile()));
+ connect(mFileBrowseButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotPickFile()));
TQToolTip::add(mFileBrowseButton, i18n("Choose a file"));
TQWhatsThis::add(mFileBrowseButton, i18n("Select a sound file to play."));
@@ -128,12 +128,12 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad
grid->addMultiCellWidget(box, 1, 1, 0, 2);
mVolumeCheckbox = new CheckBox(i18n_v_SetVolume(), box);
mVolumeCheckbox->setFixedSize(mVolumeCheckbox->sizeHint());
- connect(mVolumeCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotVolumeToggled(bool)));
+ connect(mVolumeCheckbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotVolumeToggled(bool)));
TQWhatsThis::add(mVolumeCheckbox,
i18n("Select to choose the volume for playing the sound file."));
// Volume slider
- mVolumeSlider = new Slider(0, 100, 10, 0, Qt::Horizontal, box);
+ mVolumeSlider = new Slider(0, 100, 10, 0, TQt::Horizontal, box);
mVolumeSlider->setTickmarks(TQSlider::Below);
mVolumeSlider->setTickInterval(10);
mVolumeSlider->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
@@ -143,7 +143,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad
// Fade checkbox
mFadeCheckbox = new CheckBox(i18n("Fade"), group);
mFadeCheckbox->setFixedSize(mFadeCheckbox->sizeHint());
- connect(mFadeCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotFadeToggled(bool)));
+ connect(mFadeCheckbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotFadeToggled(bool)));
TQWhatsThis::add(mFadeCheckbox,
i18n("Select to fade the volume when the sound file first starts to play."));
grid->addMultiCellWidget(mFadeCheckbox, 2, 2, 1, 2, alignment);
@@ -168,7 +168,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad
grid->addWidget(mFadeVolumeBox, 4, 2);
label = new TQLabel(i18n("Initial volume:"), mFadeVolumeBox);
label->setFixedSize(label->sizeHint());
- mFadeSlider = new Slider(0, 100, 10, 0, Qt::Horizontal, mFadeVolumeBox);
+ mFadeSlider = new Slider(0, 100, 10, 0, TQt::Horizontal, mFadeVolumeBox);
mFadeSlider->setTickmarks(TQSlider::Below);
mFadeSlider->setTickInterval(10);
mFadeSlider->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
@@ -303,7 +303,7 @@ void SoundDlg::playSound()
return;
}
mPlayTimer = new TQTimer(this);
- connect(mPlayTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAudioPlay()));
+ connect(mPlayTimer, TQ_SIGNAL(timeout()), TQ_SLOT(checkAudioPlay()));
mArtsDispatcher = new KArtsDispatcher;
mPlayStarted = false;
KArtsServer aserver;
@@ -313,7 +313,7 @@ void SoundDlg::playSound()
mFilePlay->setPixmap(SmallIcon("media-playback-stop"));
TQToolTip::add(mFilePlay, i18n("Stop sound"));
TQWhatsThis::add(mFilePlay, i18n("Stop playing the sound"));
- connect(mPlayObject, TQT_SIGNAL(playObjectCreated()), TQT_SLOT(checkAudioPlay()));
+ connect(mPlayObject, TQ_SIGNAL(playObjectCreated()), TQ_SLOT(checkAudioPlay()));
if (!mPlayObject->object().isNull())
checkAudioPlay();
#endif
diff --git a/kalarm/sounddlg.h b/kalarm/sounddlg.h
index 70f01add..62c46ade 100644
--- a/kalarm/sounddlg.h
+++ b/kalarm/sounddlg.h
@@ -38,7 +38,7 @@ class Slider;
class SoundDlg : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
SoundDlg(const TQString& file, float volume, float fadeVolume, int fadeSeconds, bool repeat,
diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp
index 947e9fb9..d9e43190 100644
--- a/kalarm/soundpicker.cpp
+++ b/kalarm/soundpicker.cpp
@@ -74,7 +74,7 @@ SoundPicker::SoundPicker(TQWidget* parent, const char* name)
mTypeCombo->insertItem(i18n_File()); // index PLAY_FILE
mSpeakShowing = !theApp()->speechEnabled();
showSpeak(!mSpeakShowing); // index SPEAK (only displayed if appropriate)
- connect(mTypeCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeSelected(int)));
+ connect(mTypeCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeSelected(int)));
label->setBuddy(mTypeCombo);
soundLayout->addWidget(mTypeBox);
@@ -82,7 +82,7 @@ SoundPicker::SoundPicker(TQWidget* parent, const char* name)
mFilePicker = new PushButton(this);
mFilePicker->setPixmap(SmallIcon("playsound"));
mFilePicker->setFixedSize(mFilePicker->sizeHint());
- connect(mFilePicker, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile()));
+ connect(mFilePicker, TQ_SIGNAL(clicked()), TQ_SLOT(slotPickFile()));
TQToolTip::add(mFilePicker, i18n("Configure sound file"));
TQWhatsThis::add(mFilePicker, i18n("Configure a sound file to play when the alarm is displayed."));
soundLayout->addWidget(mFilePicker);
diff --git a/kalarm/soundpicker.h b/kalarm/soundpicker.h
index 3f150b19..72ff4a86 100644
--- a/kalarm/soundpicker.h
+++ b/kalarm/soundpicker.h
@@ -32,7 +32,7 @@ class PushButton;
class SoundPicker : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Sound options which can be selected for when the alarm is displayed.
diff --git a/kalarm/specialactions.cpp b/kalarm/specialactions.cpp
index fd4b7a7d..f2599e35 100644
--- a/kalarm/specialactions.cpp
+++ b/kalarm/specialactions.cpp
@@ -46,7 +46,7 @@ SpecialActionsButton::SpecialActionsButton(const TQString& caption, TQWidget* pa
{
setToggleButton(true);
setOn(false);
- connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonPressed()));
+ connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonPressed()));
TQWhatsThis::add(this,
i18n("Specify actions to execute before and after the alarm is displayed."));
}
diff --git a/kalarm/specialactions.h b/kalarm/specialactions.h
index 31df5545..db7192e5 100644
--- a/kalarm/specialactions.h
+++ b/kalarm/specialactions.h
@@ -30,7 +30,7 @@ class KLineEdit;
class SpecialActionsButton : public TQPushButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
SpecialActionsButton(const TQString& caption, TQWidget* parent = 0, const char* name = 0);
@@ -56,7 +56,7 @@ class SpecialActionsButton : public TQPushButton
// Pre- and post-alarm actions widget
class SpecialActions : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
SpecialActions(TQWidget* parent = 0, const char* name = 0);
@@ -76,7 +76,7 @@ class SpecialActions : public TQWidget
// Pre- and post-alarm actions dialogue displayed by the push button
class SpecialActionsDlg : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
SpecialActionsDlg(const TQString& preAction, const TQString& postAction,
diff --git a/kalarm/startdaytimer.cpp b/kalarm/startdaytimer.cpp
index 84f0096c..ef8ddf86 100644
--- a/kalarm/startdaytimer.cpp
+++ b/kalarm/startdaytimer.cpp
@@ -29,7 +29,7 @@ StartOfDayTimer* StartOfDayTimer::mInstance = 0;
StartOfDayTimer::StartOfDayTimer()
: DailyTimer(Preferences::startOfDay(), false)
{
- Preferences::connect(TQT_SIGNAL(startOfDayChanged(const TQTime&)), this, TQT_SLOT(startOfDayChanged(const TQTime&)));
+ Preferences::connect(TQ_SIGNAL(startOfDayChanged(const TQTime&)), this, TQ_SLOT(startOfDayChanged(const TQTime&)));
}
StartOfDayTimer* StartOfDayTimer::instance()
diff --git a/kalarm/startdaytimer.h b/kalarm/startdaytimer.h
index e422f617..23d84073 100644
--- a/kalarm/startdaytimer.h
+++ b/kalarm/startdaytimer.h
@@ -34,7 +34,7 @@
*/
class StartOfDayTimer : public DailyTimer
{
- Q_OBJECT
+ TQ_OBJECT
public:
virtual ~StartOfDayTimer() { }
diff --git a/kalarm/templatedlg.cpp b/kalarm/templatedlg.cpp
index 3754487a..ebf7f1c6 100644
--- a/kalarm/templatedlg.cpp
+++ b/kalarm/templatedlg.cpp
@@ -54,34 +54,34 @@ TemplateDlg::TemplateDlg(TQWidget* parent, const char* name)
mTemplateList = new TemplateListView(true, i18n("The list of alarm templates"), topWidget);
mTemplateList->setSelectionMode(TQListView::Extended);
mTemplateList->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
- connect(mTemplateList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged()));
+ connect(mTemplateList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged()));
layout->addWidget(mTemplateList);
layout = new TQVBoxLayout(topLayout);
TQPushButton* button = new TQPushButton(i18n("&New..."), topWidget);
- connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(slotNew()));
+ connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(slotNew()));
TQWhatsThis::add(button, i18n("Create a new alarm template"));
layout->addWidget(button);
mEditButton = new TQPushButton(i18n("&Edit..."), topWidget);
- connect(mEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit()));
+ connect(mEditButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEdit()));
TQWhatsThis::add(mEditButton, i18n("Edit the currently highlighted alarm template"));
layout->addWidget(mEditButton);
mCopyButton = new TQPushButton(i18n("Co&py"), topWidget);
- connect(mCopyButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotCopy()));
+ connect(mCopyButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotCopy()));
TQWhatsThis::add(mCopyButton,
i18n("Create a new alarm template based on a copy of the currently highlighted template"));
layout->addWidget(mCopyButton);
mDeleteButton = new TQPushButton(i18n("&Delete"), topWidget);
- connect(mDeleteButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelete()));
+ connect(mDeleteButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotDelete()));
TQWhatsThis::add(mDeleteButton, i18n("Delete the currently highlighted alarm template"));
layout->addWidget(mDeleteButton);
TDEAccel* accel = new TDEAccel(this);
- accel->insert(TDEStdAccel::SelectAll, TQT_TQOBJECT(mTemplateList), TQT_SLOT(slotSelectAll()));
- accel->insert(TDEStdAccel::Deselect, TQT_TQOBJECT(mTemplateList), TQT_SLOT(slotDeselect()));
+ accel->insert(TDEStdAccel::SelectAll, mTemplateList, TQ_SLOT(slotSelectAll()));
+ accel->insert(TDEStdAccel::Deselect, mTemplateList, TQ_SLOT(slotDeselect()));
accel->readSettings();
mTemplateList->refresh();
diff --git a/kalarm/templatedlg.h b/kalarm/templatedlg.h
index f85c1058..4d814eb8 100644
--- a/kalarm/templatedlg.h
+++ b/kalarm/templatedlg.h
@@ -29,7 +29,7 @@ class KAEvent;
class TemplateDlg : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
static TemplateDlg* create(TQWidget* parent = 0, const char* name = 0);
diff --git a/kalarm/templatelistview.h b/kalarm/templatelistview.h
index 530a073a..7d7d084d 100644
--- a/kalarm/templatelistview.h
+++ b/kalarm/templatelistview.h
@@ -48,7 +48,7 @@ class TemplateListViewItem : public EventListViewItemBase
class TemplateListView : public EventListViewBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
explicit TemplateListView(bool includeCmdAlarms, const TQString& whatsThisText, TQWidget* parent = 0, const char* name = 0);
diff --git a/kalarm/templatemenuaction.cpp b/kalarm/templatemenuaction.cpp
index 5da72a6d..1bcabf12 100644
--- a/kalarm/templatemenuaction.cpp
+++ b/kalarm/templatemenuaction.cpp
@@ -35,9 +35,9 @@ TemplateMenuAction::TemplateMenuAction(const TQString& label, const TQString& ic
: TDEActionMenu(label, icon, actions, name)
{
setDelayed(false);
- connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotInitMenu()));
- connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelected(int)));
- connect(this, TQT_SIGNAL(selected(const KAEvent&)), receiver, slot);
+ connect(popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotInitMenu()));
+ connect(popupMenu(), TQ_SIGNAL(activated(int)), TQ_SLOT(slotSelected(int)));
+ connect(this, TQ_SIGNAL(selected(const KAEvent&)), receiver, slot);
}
/******************************************************************************
diff --git a/kalarm/templatemenuaction.h b/kalarm/templatemenuaction.h
index abcbf92c..51a1e4fa 100644
--- a/kalarm/templatemenuaction.h
+++ b/kalarm/templatemenuaction.h
@@ -27,7 +27,7 @@ class KAEvent;
class TemplateMenuAction : public TDEActionMenu
{
- Q_OBJECT
+ TQ_OBJECT
public:
TemplateMenuAction(const TQString& label, const TQString& icon, TQObject* receiver,
diff --git a/kalarm/templatepickdlg.cpp b/kalarm/templatepickdlg.cpp
index b3bc4488..9acd8fb8 100644
--- a/kalarm/templatepickdlg.cpp
+++ b/kalarm/templatepickdlg.cpp
@@ -46,9 +46,9 @@ TemplatePickDlg::TemplatePickDlg(TQWidget* parent, const char* name)
mTemplateList = new TemplateListView(includeCmdAlarms, i18n("Select a template to base the new alarm on."), topWidget, "list");
mTemplateList->setSelectionMode(TQListView::Single);
mTemplateList->refresh(); // populate the template list
- connect(mTemplateList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged()));
+ connect(mTemplateList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged()));
// Require a real double click (even if KDE is in single-click mode) to accept the selection
- connect(mTemplateList, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), TQT_SLOT(slotOk()));
+ connect(mTemplateList, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), TQ_SLOT(slotOk()));
topLayout->addWidget(mTemplateList);
slotSelectionChanged(); // enable or disable the OK button
diff --git a/kalarm/templatepickdlg.h b/kalarm/templatepickdlg.h
index d0a68536..a72ef216 100644
--- a/kalarm/templatepickdlg.h
+++ b/kalarm/templatepickdlg.h
@@ -28,7 +28,7 @@ class KAEvent;
class TemplatePickDlg : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
TemplatePickDlg(TQWidget* parent = 0, const char* name = 0);
diff --git a/kalarm/timeselector.cpp b/kalarm/timeselector.cpp
index de7ef828..710152b4 100644
--- a/kalarm/timeselector.cpp
+++ b/kalarm/timeselector.cpp
@@ -44,7 +44,7 @@ TimeSelector::TimeSelector(const TQString& selectText, const TQString& postfix,
TQHBoxLayout* layout = new TQHBoxLayout(topLayout, KDialog::spacingHint());
mSelect = new CheckBox(selectText, this);
mSelect->setFixedSize(mSelect->sizeHint());
- connect(mSelect, TQT_SIGNAL(toggled(bool)), TQT_SLOT(selectToggled(bool)));
+ connect(mSelect, TQ_SIGNAL(toggled(bool)), TQ_SLOT(selectToggled(bool)));
TQWhatsThis::add(mSelect, selectWhatsThis);
layout->addWidget(mSelect);
@@ -54,7 +54,7 @@ TimeSelector::TimeSelector(const TQString& selectText, const TQString& postfix,
mPeriod = new TimePeriod(allowHourMinute, box);
mPeriod->setFixedSize(mPeriod->sizeHint());
mPeriod->setSelectOnStep(false);
- connect(mPeriod, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(periodChanged(int)));
+ connect(mPeriod, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(periodChanged(int)));
mSelect->setFocusWidget(mPeriod);
mPeriod->setEnabled(false);
diff --git a/kalarm/timeselector.h b/kalarm/timeselector.h
index 00cf15c5..7bb8d332 100644
--- a/kalarm/timeselector.h
+++ b/kalarm/timeselector.h
@@ -30,7 +30,7 @@ class CheckBox;
class TimeSelector : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
TimeSelector(const TQString& selectText, const TQString& postfix, const TQString& selectWhatsThis,
diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp
index 93afa2e5..90bd92ed 100644
--- a/kalarm/traywindow.cpp
+++ b/kalarm/traywindow.cpp
@@ -87,16 +87,16 @@ TrayWindow::TrayWindow(MainWindow* parent, const char* name)
TDEActionCollection* actcol = actionCollection();
AlarmEnableAction* a = Daemon::createAlarmEnableAction(actcol, "tAlarmEnable");
a->plug(contextMenu());
- connect(a, TQT_SIGNAL(switched(bool)), TQT_SLOT(setEnabledStatus(bool)));
- KAlarm::createNewAlarmAction(i18n("&New Alarm..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewAlarm()), actcol, "tNew")->plug(contextMenu());
- KAlarm::createNewFromTemplateAction(i18n("New Alarm From &Template"), TQT_TQOBJECT(this), TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actcol, "tNewFromTempl")->plug(contextMenu());
- KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actcol)->plug(contextMenu());
+ connect(a, TQ_SIGNAL(switched(bool)), TQ_SLOT(setEnabledStatus(bool)));
+ KAlarm::createNewAlarmAction(i18n("&New Alarm..."), this, TQ_SLOT(slotNewAlarm()), actcol, "tNew")->plug(contextMenu());
+ KAlarm::createNewFromTemplateAction(i18n("New Alarm From &Template"), this, TQ_SLOT(slotNewFromTemplate(const KAEvent&)), actcol, "tNewFromTempl")->plug(contextMenu());
+ KStdAction::preferences(this, TQ_SLOT(slotPreferences()), actcol)->plug(contextMenu());
// Replace the default handler for the Quit context menu item
const char* quitName = KStdAction::name(KStdAction::Quit);
actcol->remove(actcol->action(quitName));
actcol->tdeaccel()->remove(quitName);
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actcol);
+ KStdAction::quit(this, TQ_SLOT(slotQuit()), actcol);
// Set icon to correspond with the alarms enabled menu status
Daemon::checkStatus();
@@ -173,12 +173,12 @@ void TrayWindow::setEnabledStatus(bool status)
*/
void TrayWindow::mousePressEvent(TQMouseEvent* e)
{
- if (e->button() == Qt::LeftButton && !theApp()->wantRunInSystemTray())
+ if (e->button() == TQt::LeftButton && !theApp()->wantRunInSystemTray())
{
// Left click: display/hide the first main window
mAssocMainWindow = MainWindow::toggleWindow(mAssocMainWindow);
}
- else if (e->button() == Qt::MidButton)
+ else if (e->button() == TQt::MidButton)
MainWindow::executeNew(); // display a New Alarm dialog
else
KSystemTray::mousePressEvent(e);
@@ -191,7 +191,7 @@ void TrayWindow::mousePressEvent(TQMouseEvent* e)
*/
void TrayWindow::mouseReleaseEvent(TQMouseEvent* e)
{
- if (e->button() == Qt::LeftButton && mAssocMainWindow && mAssocMainWindow->isVisible())
+ if (e->button() == TQt::LeftButton && mAssocMainWindow && mAssocMainWindow->isVisible())
{
mAssocMainWindow->raise();
mAssocMainWindow->setActiveWindow();
diff --git a/kalarm/traywindow.h b/kalarm/traywindow.h
index 322df238..eecc7663 100644
--- a/kalarm/traywindow.h
+++ b/kalarm/traywindow.h
@@ -31,7 +31,7 @@ class TrayTooltip;
class TrayWindow : public KSystemTray
{
- Q_OBJECT
+ TQ_OBJECT
public:
TrayWindow(MainWindow* parent, const char* name = 0);
diff --git a/kalarm/undo.cpp b/kalarm/undo.cpp
index d1d3602f..38d152c7 100644
--- a/kalarm/undo.cpp
+++ b/kalarm/undo.cpp
@@ -207,7 +207,7 @@ Undo::List Undo::mRedoList;
Undo* Undo::instance()
{
if (!mInstance)
- mInstance = new Undo(TQT_TQOBJECT(kapp));
+ mInstance = new Undo(kapp);
return mInstance;
}
diff --git a/kalarm/undo.h b/kalarm/undo.h
index 0f76408a..2f964e75 100644
--- a/kalarm/undo.h
+++ b/kalarm/undo.h
@@ -32,7 +32,7 @@ class UndoItem;
class Undo : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
enum Type { NONE, UNDO, REDO };
diff --git a/kandy/src/cmdpropertiesdialog.h b/kandy/src/cmdpropertiesdialog.h
index 62ab0e3e..ca75dd1e 100644
--- a/kandy/src/cmdpropertiesdialog.h
+++ b/kandy/src/cmdpropertiesdialog.h
@@ -30,7 +30,7 @@ class ATCommand;
class CmdPropertiesDialog : public CmdPropertiesDialog_base
{
- Q_OBJECT
+ TQ_OBJECT
public:
CmdPropertiesDialog(ATCommand *cmd,TQWidget* parent=0,const char* name=0,
diff --git a/kandy/src/cmdpropertiesdialog_base.ui b/kandy/src/cmdpropertiesdialog_base.ui
index 7454b740..9b589d73 100644
--- a/kandy/src/cmdpropertiesdialog_base.ui
+++ b/kandy/src/cmdpropertiesdialog_base.ui
@@ -164,9 +164,9 @@
<slot>reject()</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot>editParameterName(TQListViewItem *)</slot>
<slot access="protected">slotAccept()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kandy/src/commandscheduler.cpp b/kandy/src/commandscheduler.cpp
index cc18a666..d6a95390 100644
--- a/kandy/src/commandscheduler.cpp
+++ b/kandy/src/commandscheduler.cpp
@@ -35,8 +35,8 @@ CommandScheduler::CommandScheduler(Modem *modem,TQObject *parent,
TQObject(parent,name),
mModem(modem)
{
- connect(mModem,TQT_SIGNAL(gotLine(const char *)),
- TQT_SLOT(processOutput(const char *)));
+ connect(mModem,TQ_SIGNAL(gotLine(const char *)),
+ TQ_SLOT(processOutput(const char *)));
}
void CommandScheduler::execute(ATCommand *command)
diff --git a/kandy/src/commandscheduler.h b/kandy/src/commandscheduler.h
index 5e3323e0..a1fd9a23 100644
--- a/kandy/src/commandscheduler.h
+++ b/kandy/src/commandscheduler.h
@@ -33,7 +33,7 @@
class Modem;
class CommandScheduler : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
CommandScheduler (Modem *modem,TQObject *parent = 0, const char *name = 0);
diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp
index 13bd4ff6..cd2e9826 100644
--- a/kandy/src/kandy.cpp
+++ b/kandy/src/kandy.cpp
@@ -81,12 +81,12 @@ Kandy::Kandy(CommandScheduler *scheduler)
setAutoSaveSettings();
// allow the view to change the statusbar and caption
- connect(mView, TQT_SIGNAL(signalChangeStatusbar(const TQString&)),
- this, TQT_SLOT(changeStatusbar(const TQString&)));
- connect(mView, TQT_SIGNAL(signalChangeCaption(const TQString&)),
- this, TQT_SLOT(changeCaption(const TQString&)));
+ connect(mView, TQ_SIGNAL(signalChangeStatusbar(const TQString&)),
+ this, TQ_SLOT(changeStatusbar(const TQString&)));
+ connect(mView, TQ_SIGNAL(signalChangeCaption(const TQString&)),
+ this, TQ_SLOT(changeCaption(const TQString&)));
- connect(mView,TQT_SIGNAL(modifiedChanged(bool)),TQT_SLOT(setTitle()));
+ connect(mView,TQ_SIGNAL(modifiedChanged(bool)),TQ_SLOT(setTitle()));
TDEConfig *config = TDEGlobal::config();
config->setGroup("General");
@@ -123,26 +123,26 @@ void Kandy::save(const TQString & filename)
void Kandy::setupActions()
{
- KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
- KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection());
- KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(fileSaveAs()), actionCollection());
-// KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(filePrint()), actionCollection());
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+ KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
+ KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection());
+ KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection());
+// KStdAction::print(this, TQ_SLOT(filePrint()), actionCollection());
+ KStdAction::quit(this, TQ_SLOT(close()), actionCollection());
createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true);
- KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
- KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection());
+ KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection());
+ KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection());
+ KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection());
- new TDEAction(i18n("Mobile GUI"),0,TQT_TQOBJECT(this),TQT_SLOT(showMobileGui()),
+ new TDEAction(i18n("Mobile GUI"),0,this,TQ_SLOT(showMobileGui()),
actionCollection(),"show_mobilegui");
- mConnectAction = new TDEAction(i18n("Connect"),0,TQT_TQOBJECT(this),TQT_SLOT(modemConnect()),
+ mConnectAction = new TDEAction(i18n("Connect"),0,this,TQ_SLOT(modemConnect()),
actionCollection(),"modem_connect");
- mDisconnectAction = new TDEAction(i18n("Disconnect"),0,TQT_TQOBJECT(this),
- TQT_SLOT(modemDisconnect()),actionCollection(),
+ mDisconnectAction = new TDEAction(i18n("Disconnect"),0,this,
+ TQ_SLOT(modemDisconnect()),actionCollection(),
"modem_disconnect");
createGUI();
@@ -252,7 +252,7 @@ void Kandy::optionsConfigureToolbars()
// use the standard toolbar editor
saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
KEditToolbar dlg(actionCollection());
- connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig()));
+ connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(newToolbarConfig()));
dlg.exec();
}
diff --git a/kandy/src/kandy.h b/kandy/src/kandy.h
index 77a646ba..18848541 100644
--- a/kandy/src/kandy.h
+++ b/kandy/src/kandy.h
@@ -47,7 +47,7 @@ class KandyPrefsDialog;
*/
class Kandy : public TDEMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kandy/src/kandyprefsdialog.cpp b/kandy/src/kandyprefsdialog.cpp
index 60ec1a67..db7781de 100644
--- a/kandy/src/kandyprefsdialog.cpp
+++ b/kandy/src/kandyprefsdialog.cpp
@@ -292,60 +292,60 @@ void KandyPrefsDialog::setupAddressbookTab()
}
- connect( useHomeSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
- HomeSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
- connect( useHomeSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
- HomeSuff->label(), TQT_SLOT(setEnabled(bool)) );
-
- connect( useWorkSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
- WorkSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
- connect( useWorkSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
- WorkSuff->label(), TQT_SLOT(setEnabled(bool)) );
-
- connect( useMessagingSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
- MessagingSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
- connect( useMessagingSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
- MessagingSuff->label(), TQT_SLOT(setEnabled(bool)) );
-
- connect( useFaxSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
- FaxSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
- connect( useFaxSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
- FaxSuff->label(), TQT_SLOT(setEnabled(bool)) );
-
- connect( useCellSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
- CellSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
- connect( useCellSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
- CellSuff->label(), TQT_SLOT(setEnabled(bool)) );
-
- connect( useVideoSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
- VideoSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
- connect( useVideoSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
- VideoSuff->label(), TQT_SLOT(setEnabled(bool)) );
-
- connect( useMailboxSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
- MailboxSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
- connect( useMailboxSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
- MailboxSuff->label(), TQT_SLOT(setEnabled(bool)) );
-
- connect( useModemSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
- ModemSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
- connect( useModemSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
- ModemSuff->label(), TQT_SLOT(setEnabled(bool)) );
-
- connect( useCarSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
- CarSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
- connect( useCarSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
- CarSuff->label(), TQT_SLOT(setEnabled(bool)) );
-
- connect( useISDNSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
- ISDNSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
- connect( useISDNSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
- ISDNSuff->label(), TQT_SLOT(setEnabled(bool)) );
-
- connect( usePagerSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
- PagerSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
- connect( usePagerSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
- PagerSuff->label(), TQT_SLOT(setEnabled(bool)) );
+ connect( useHomeSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+ HomeSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+ connect( useHomeSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+ HomeSuff->label(), TQ_SLOT(setEnabled(bool)) );
+
+ connect( useWorkSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+ WorkSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+ connect( useWorkSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+ WorkSuff->label(), TQ_SLOT(setEnabled(bool)) );
+
+ connect( useMessagingSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+ MessagingSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+ connect( useMessagingSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+ MessagingSuff->label(), TQ_SLOT(setEnabled(bool)) );
+
+ connect( useFaxSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+ FaxSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+ connect( useFaxSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+ FaxSuff->label(), TQ_SLOT(setEnabled(bool)) );
+
+ connect( useCellSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+ CellSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+ connect( useCellSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+ CellSuff->label(), TQ_SLOT(setEnabled(bool)) );
+
+ connect( useVideoSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+ VideoSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+ connect( useVideoSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+ VideoSuff->label(), TQ_SLOT(setEnabled(bool)) );
+
+ connect( useMailboxSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+ MailboxSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+ connect( useMailboxSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+ MailboxSuff->label(), TQ_SLOT(setEnabled(bool)) );
+
+ connect( useModemSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+ ModemSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+ connect( useModemSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+ ModemSuff->label(), TQ_SLOT(setEnabled(bool)) );
+
+ connect( useCarSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+ CarSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+ connect( useCarSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+ CarSuff->label(), TQ_SLOT(setEnabled(bool)) );
+
+ connect( useISDNSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+ ISDNSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+ connect( useISDNSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+ ISDNSuff->label(), TQ_SLOT(setEnabled(bool)) );
+
+ connect( usePagerSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+ PagerSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+ connect( usePagerSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+ PagerSuff->label(), TQ_SLOT(setEnabled(bool)) );
}
void KandyPrefsDialog::setupWindowsTab()
diff --git a/kandy/src/kandyprefsdialog.h b/kandy/src/kandyprefsdialog.h
index b927083b..24037602 100644
--- a/kandy/src/kandyprefsdialog.h
+++ b/kandy/src/kandyprefsdialog.h
@@ -41,7 +41,7 @@
*/
class KandyPrefsDialog : public KPrefsDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Initialize dialog and pages */
diff --git a/kandy/src/kandyview.cpp b/kandy/src/kandyview.cpp
index 52e9de0a..51987b30 100644
--- a/kandy/src/kandyview.cpp
+++ b/kandy/src/kandyview.cpp
@@ -65,7 +65,7 @@ KandyView::KandyView(CommandScheduler *scheduler,TQWidget *parent)
TQBoxLayout *topLayout = new TQVBoxLayout( this );
- TQSplitter *mainSplitter = new TQSplitter( Qt::Horizontal, this );
+ TQSplitter *mainSplitter = new TQSplitter( TQt::Horizontal, this );
topLayout->addWidget( mainSplitter );
TQWidget *commandBox = new TQWidget( mainSplitter );
@@ -80,26 +80,26 @@ KandyView::KandyView(CommandScheduler *scheduler,TQWidget *parent)
mCommandList->addColumn( i18n( "Hex" ) );
commandLayout->addWidget( mCommandList );
- connect( mCommandList, TQT_SIGNAL( doubleClicked(TQListViewItem*) ),
- TQT_SLOT( executeCommand() ) );
+ connect( mCommandList, TQ_SIGNAL( doubleClicked(TQListViewItem*) ),
+ TQ_SLOT( executeCommand() ) );
TQPushButton *buttonAdd = new TQPushButton( i18n("Add..."), commandBox );
commandLayout->addWidget( buttonAdd );
- connect( buttonAdd, TQT_SIGNAL( clicked() ), TQT_SLOT( addCommand() ) );
+ connect( buttonAdd, TQ_SIGNAL( clicked() ), TQ_SLOT( addCommand() ) );
TQPushButton *buttonEdit = new TQPushButton( i18n("Edit..."), commandBox );
commandLayout->addWidget( buttonEdit );
- connect( buttonEdit, TQT_SIGNAL( clicked() ), TQT_SLOT( editCommand() ) );
+ connect( buttonEdit, TQ_SIGNAL( clicked() ), TQ_SLOT( editCommand() ) );
TQPushButton *buttonDelete = new TQPushButton( i18n("Delete"), commandBox );
commandLayout->addWidget( buttonDelete );
- connect( buttonDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( deleteCommand() ) );
+ connect( buttonDelete, TQ_SIGNAL( clicked() ), TQ_SLOT( deleteCommand() ) );
TQPushButton *buttonExecute = new TQPushButton( i18n("Execute"), commandBox );
commandLayout->addWidget( buttonExecute );
- connect( buttonExecute, TQT_SIGNAL( clicked() ), TQT_SLOT( executeCommand() ) );
+ connect( buttonExecute, TQ_SIGNAL( clicked() ), TQ_SLOT( executeCommand() ) );
- TQSplitter *ioSplitter = new TQSplitter( Qt::Vertical, mainSplitter );
+ TQSplitter *ioSplitter = new TQSplitter( TQt::Vertical, mainSplitter );
TQWidget *inBox = new TQWidget( ioSplitter );
@@ -132,15 +132,15 @@ KandyView::KandyView(CommandScheduler *scheduler,TQWidget *parent)
mResultView = new TQTextEdit( resultBox );
mResultView->setReadOnly( true );
- connect (mInput,TQT_SIGNAL(returnPressed()),TQT_SLOT(processLastLine()));
+ connect (mInput,TQ_SIGNAL(returnPressed()),TQ_SLOT(processLastLine()));
- connect(mScheduler->modem(),TQT_SIGNAL(gotLine(const char *)),
- TQT_SLOT(appendOutput(const char *)));
+ connect(mScheduler->modem(),TQ_SIGNAL(gotLine(const char *)),
+ TQ_SLOT(appendOutput(const char *)));
- connect(mScheduler,TQT_SIGNAL(result(const TQString &)),
- mResultView,TQT_SLOT(setText(const TQString &)));
- connect(mScheduler,TQT_SIGNAL(commandProcessed(ATCommand *)),
- TQT_SLOT(setResult(ATCommand *)));
+ connect(mScheduler,TQ_SIGNAL(result(const TQString &)),
+ mResultView,TQ_SLOT(setText(const TQString &)));
+ connect(mScheduler,TQ_SIGNAL(commandProcessed(ATCommand *)),
+ TQ_SLOT(setResult(ATCommand *)));
}
KandyView::~KandyView()
@@ -158,7 +158,7 @@ void KandyView::importPhonebook()
{
#if 0
createMobileGui();
- connect (mMobileGui,TQT_SIGNAL(phonebookRead()),mMobileGui,TQT_SLOT(writeKab()));
+ connect (mMobileGui,TQ_SIGNAL(phonebookRead()),mMobileGui,TQ_SLOT(writeKab()));
mMobileGui->readPhonebook();
#endif
}
diff --git a/kandy/src/kandyview.h b/kandy/src/kandyview.h
index 5e6461d3..746d9916 100644
--- a/kandy/src/kandyview.h
+++ b/kandy/src/kandyview.h
@@ -50,7 +50,7 @@ class CmdPropertiesDialog;
*/
class KandyView : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kandy/src/main.cpp b/kandy/src/main.cpp
index a22229d5..00ca8764 100644
--- a/kandy/src/main.cpp
+++ b/kandy/src/main.cpp
@@ -135,18 +135,18 @@ int main(int argc, char **argv)
args->clear();
- TQObject::connect(k,TQT_SIGNAL(showMobileWin()),m,TQT_SLOT(show()));
- TQObject::connect(m,TQT_SIGNAL(showTerminalWin()),k,TQT_SLOT(show()));
- TQObject::connect(m,TQT_SIGNAL(showPreferencesWin()),
- k,TQT_SLOT(optionsPreferences()));
-
- TQObject::connect( m->view(), TQT_SIGNAL( connectModem() ), k,
- TQT_SLOT( modemConnect() ) );
- TQObject::connect( m->view(), TQT_SIGNAL( disconnectModem() ), k,
- TQT_SLOT( modemDisconnect() ) );
-
- TQObject::connect( modem, TQT_SIGNAL( errorMessage( const TQString & ) ),
- k, TQT_SLOT( showErrorMessage( const TQString & ) ) );
+ TQObject::connect(k,TQ_SIGNAL(showMobileWin()),m,TQ_SLOT(show()));
+ TQObject::connect(m,TQ_SIGNAL(showTerminalWin()),k,TQ_SLOT(show()));
+ TQObject::connect(m,TQ_SIGNAL(showPreferencesWin()),
+ k,TQ_SLOT(optionsPreferences()));
+
+ TQObject::connect( m->view(), TQ_SIGNAL( connectModem() ), k,
+ TQ_SLOT( modemConnect() ) );
+ TQObject::connect( m->view(), TQ_SIGNAL( disconnectModem() ), k,
+ TQ_SLOT( modemDisconnect() ) );
+
+ TQObject::connect( modem, TQ_SIGNAL( errorMessage( const TQString & ) ),
+ k, TQ_SLOT( showErrorMessage( const TQString & ) ) );
initModem( modem );
diff --git a/kandy/src/mobilegui.cpp b/kandy/src/mobilegui.cpp
index 819d7e0f..eb1f79a7 100644
--- a/kandy/src/mobilegui.cpp
+++ b/kandy/src/mobilegui.cpp
@@ -220,10 +220,10 @@ MobileGui::MobileGui( CommandScheduler *scheduler, KandyPrefs *kprefs,
setMobState( UNLOADED );
// Setup signal handlers
- connect( mScheduler, TQT_SIGNAL( commandProcessed( ATCommand * ) ),
- TQT_SLOT( processResult( ATCommand * ) ) );
- connect( mScheduler->modem(), TQT_SIGNAL( gotLine( const char * ) ),
- TQT_SLOT( termAddOutput( const char * ) ) );
+ connect( mScheduler, TQ_SIGNAL( commandProcessed( ATCommand * ) ),
+ TQ_SLOT( processResult( ATCommand * ) ) );
+ connect( mScheduler->modem(), TQ_SIGNAL( gotLine( const char * ) ),
+ TQ_SLOT( termAddOutput( const char * ) ) );
}
diff --git a/kandy/src/mobilegui.h b/kandy/src/mobilegui.h
index 16431ae4..a8e27eaa 100644
--- a/kandy/src/mobilegui.h
+++ b/kandy/src/mobilegui.h
@@ -38,7 +38,7 @@ class AddressSyncer;
class MobileGui : public MobileGui_base, virtual public KandyIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kandy/src/mobilegui_base.ui b/kandy/src/mobilegui_base.ui
index 83f8149e..01d77f27 100644
--- a/kandy/src/mobilegui_base.ui
+++ b/kandy/src/mobilegui_base.ui
@@ -565,7 +565,7 @@
<tabstop>PushButton1</tabstop>
<tabstop>PushButton8_3</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot>readKabc()</slot>
<slot>readModelInformation()</slot>
<slot>readPhonebook()</slot>
@@ -578,6 +578,6 @@
<slot>termAddOutput( const char *line )</slot>
<slot>toggleConnection()</slot>
<slot>deleteMobPhonebook()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp
index 33da5f56..277ec288 100644
--- a/kandy/src/mobilemain.cpp
+++ b/kandy/src/mobilemain.cpp
@@ -55,10 +55,10 @@ MobileMain::MobileMain(CommandScheduler *scheduler, KandyPrefs *prefs)
setupActions();
statusBar()->insertItem(i18n(" Disconnected "),1,0,true);
- connect(mView,TQT_SIGNAL(statusMessage(const TQString &)),
- TQT_SLOT(showStatusMessage(const TQString &)));
- connect(mView,TQT_SIGNAL(transienStatusMessage(const TQString &)),
- TQT_SLOT(showTransienStatusMessage(const TQString &)));
+ connect(mView,TQ_SIGNAL(statusMessage(const TQString &)),
+ TQ_SLOT(showStatusMessage(const TQString &)));
+ connect(mView,TQ_SIGNAL(transienStatusMessage(const TQString &)),
+ TQ_SLOT(showTransienStatusMessage(const TQString &)));
statusBar()->show();
@@ -71,17 +71,17 @@ MobileMain::~MobileMain()
void MobileMain::setupActions()
{
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+ KStdAction::quit(this, TQ_SLOT(close()), actionCollection());
- new TDEAction(i18n("Terminal"),0,TQT_TQOBJECT(this),TQT_SLOT(showTerminal()),
+ new TDEAction(i18n("Terminal"),0,this,TQ_SLOT(showTerminal()),
actionCollection(),"show_terminal");
createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true);
- KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
- KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection());
+ KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection());
+ KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection());
+ KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection());
createGUI("kandymobileui.rc");
}
@@ -130,7 +130,7 @@ void MobileMain::optionsConfigureToolbars()
// use the standard toolbar editor
saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
KEditToolbar dlg(actionCollection());
- connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig()));
+ connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(newToolbarConfig()));
dlg.exec();
}
diff --git a/kandy/src/mobilemain.h b/kandy/src/mobilemain.h
index 9270fb94..3d1ba2a3 100644
--- a/kandy/src/mobilemain.h
+++ b/kandy/src/mobilemain.h
@@ -45,7 +45,7 @@ class CommandScheduler;
*/
class MobileMain : public TDEMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kandy/src/modem.cpp b/kandy/src/modem.cpp
index 2a275bf4..ef16d00d 100644
--- a/kandy/src/modem.cpp
+++ b/kandy/src/modem.cpp
@@ -84,7 +84,7 @@ Modem::Modem( KandyPrefs *kprefs, TQObject *parent, const char *name ) :
timer = new TQTimer( this, "modemtimer" );
TQ_CHECK_PTR( timer );
- connect( timer, TQT_SIGNAL( timeout() ), TQT_SLOT( timerDone() ) );
+ connect( timer, TQ_SIGNAL( timeout() ), TQ_SLOT( timerDone() ) );
init();
xreset();
@@ -234,7 +234,7 @@ bool Modem::open()
sn = new TQSocketNotifier( fd, TQSocketNotifier::Read, this,
"modemsocketnotifier" );
TQ_CHECK_PTR( sn );
- connect( sn, TQT_SIGNAL( activated( int ) ), TQT_SLOT( readChar( int ) ) );
+ connect( sn, TQ_SIGNAL( activated( int ) ), TQ_SLOT( readChar( int ) ) );
mOpen = true;
@@ -372,7 +372,7 @@ void Modem::timerStart( int msec )
void Modem::receiveXModem( bool crc )
{
disconnect( sn, 0, this, 0 );
- connect( sn, TQT_SIGNAL( activated( int ) ), TQT_SLOT( readXChar( int ) ) );
+ connect( sn, TQ_SIGNAL( activated( int ) ), TQ_SLOT( readXChar( int ) ) );
xcrc = crc;
@@ -598,7 +598,7 @@ void Modem::xreset()
if ( sn ) {
disconnect( sn, 0, this, 0 );
- connect( sn, TQT_SIGNAL( activated( int ) ), TQT_SLOT( readChar( int ) ) );
+ connect( sn, TQ_SIGNAL( activated( int ) ), TQ_SLOT( readChar( int ) ) );
}
}
diff --git a/kandy/src/modem.h b/kandy/src/modem.h
index 65a5dd37..9c1216cb 100644
--- a/kandy/src/modem.h
+++ b/kandy/src/modem.h
@@ -45,7 +45,7 @@
class Modem : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
Modem(KandyPrefs *kprefs, TQObject *parent = 0, const char *name = 0);
diff --git a/karm/TODO b/karm/TODO
index e9024454..3669fe3f 100644
--- a/karm/TODO
+++ b/karm/TODO
@@ -1,6 +1,6 @@
* KarmWindow::makeMenus -> export TDEAction? KarmWindow::contextMenuRequest
* QPopupMenu should be static! put connect( ..contextMenu at the right place
-* mainwindow: move tray Q_SIGNALS into tray.cpp add mouse double-click action
+* mainwindow: move tray signals into tray.cpp add mouse double-click action
* (start new timer, stop old) to "Configure
Shortcuts" dialog.
diff --git a/karm/csvexportdialog.h b/karm/csvexportdialog.h
index 08bebd9d..7e4a6028 100644
--- a/karm/csvexportdialog.h
+++ b/karm/csvexportdialog.h
@@ -26,7 +26,7 @@
class CSVExportDialog : public CSVExportDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/karm/csvexportdialog_base.ui b/karm/csvexportdialog_base.ui
index 361ff510..091262c3 100644
--- a/karm/csvexportdialog_base.ui
+++ b/karm/csvexportdialog_base.ui
@@ -402,9 +402,9 @@
<tabstop>btnExport</tabstop>
<tabstop>btnCancel</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot>enableExportButton()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">kdateedit.h</include>
diff --git a/karm/desktoptracker.cpp b/karm/desktoptracker.cpp
index 06216570..cf41d5b3 100644
--- a/karm/desktoptracker.cpp
+++ b/karm/desktoptracker.cpp
@@ -11,8 +11,8 @@ const int minimumInterval = 5; // seconds
DesktopTracker::DesktopTracker ()
{
// Setup desktop change handling
- connect( &kWinModule, TQT_SIGNAL( currentDesktopChanged(int) ),
- this, TQT_SLOT( handleDesktopChange(int) ));
+ connect( &kWinModule, TQ_SIGNAL( currentDesktopChanged(int) ),
+ this, TQ_SLOT( handleDesktopChange(int) ));
_desktopCount = kWinModule.numberOfDesktops();
_previousDesktop = kWinModule.currentDesktop()-1;
@@ -21,7 +21,7 @@ DesktopTracker::DesktopTracker ()
if( _previousDesktop < 0 ) _previousDesktop = 0;
_timer = new TQTimer(this);
- connect( _timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( changeTimers() ) );
+ connect( _timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( changeTimers() ) );
}
void DesktopTracker::handleDesktopChange( int desktop )
diff --git a/karm/desktoptracker.h b/karm/desktoptracker.h
index 78bc7fb8..d02931bd 100644
--- a/karm/desktoptracker.h
+++ b/karm/desktoptracker.h
@@ -20,7 +20,7 @@ const int maxDesktops = 20;
class DesktopTracker: public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/karm/doc/Mainpage.dox b/karm/doc/Mainpage.dox
index 44aae4ee..b1228f32 100644
--- a/karm/doc/Mainpage.dox
+++ b/karm/doc/Mainpage.dox
@@ -24,7 +24,7 @@ order and can return a pointer to a KCal::Todo object that holds the same
information.
Preferences is a singleton that stores configuration options. It raises
-Q_SIGNALS when options change (for example, the location where the karm data is
+signals when options change (for example, the location where the karm data is
stored) so the application can react and adjust.
KarmStorage is a singleton that creates an interface for storing KArm data.
@@ -35,7 +35,7 @@ format.
/** \page sig_slot_index Index of Signals and Slots
-To get an understanding of the flow program, it may be useful to see an overview of all of the Q_SIGNALS, Q_SLOTS, and
+To get an understanding of the flow program, it may be useful to see an overview of all of the signals, slots, and
connections. See \see connections to get an index of what signal is connected to which slot.
\section overview Summary of what each class provides
@@ -60,9 +60,9 @@ connections. See \see connections to get an index of what signal is connected to
<tr><td>Task</td> <td>&nbsp;</td> <td>&nbsp;</td> <td>Y </td> <td>&nbsp;</td></tr>
</table>
-\section Q_SIGNALS Listing of all of the Q_SIGNALS
+\section signals Listing of all of the signals
-These are the Q_SIGNALS:
+These are the signals:
<ol>
<li>IdleTimer::extractTime(int)
<li>IdleTimer::stopTimer()
@@ -76,14 +76,14 @@ These are the Q_SIGNALS:
<li>Preferences::autoSavePeriod(int)
<li>Preferences::detectIdleness(bool)
<li>Preferences::idlenessTimeout(int)
- <li>Preferences::saveFile(QString)
+ <li>Preferences::saveFile(TQString)
<li>Preferences::setupChanged()
- <li>Preferences::timeLog(QString)
+ <li>Preferences::timeLog(TQString)
<li>Preferences::timeLoging(bool)
<li>Preferences::hideOnClose(bool)
</ol>
-\section Q_SLOTS Listing of the Q_SLOTS
+\section slots Listing of the slots
\subsection public Public Slots
@@ -100,8 +100,8 @@ These are the Q_SIGNALS:
<li>Karm::load()
<li>Karm::newSubTask()
<li>Karm::newTask()
- <li>Karm::newTask(QString, QListViewItem*)
- <li>Karm::parseLine(QString, long*, QString*, int*)
+ <li>Karm::newTask(TQString, QListViewItem*)
+ <li>Karm::parseLine(TQString, long*, TQString*, int*)
<li>Karm::resetSessionTimeForAllTasks()
<li>Karm::save()
<li>Karm::startTimer()
diff --git a/karm/edittaskdialog.cpp b/karm/edittaskdialog.cpp
index 3f18faa1..37d215d5 100644
--- a/karm/edittaskdialog.cpp
+++ b/karm/edittaskdialog.cpp
@@ -72,7 +72,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
_absoluteRB = new TQRadioButton( i18n( "Edit &absolute" ), page,
"_absoluteRB" );
lay1->addWidget( _absoluteRB );
- connect( _absoluteRB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAbsolutePressed() ) );
+ connect( _absoluteRB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAbsolutePressed() ) );
// Absolute times
@@ -124,7 +124,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
_relativeRB = new TQRadioButton( i18n( "Edit &relative (apply to both time and"
" session time)" ), page, "_relativeRB" );
lay1->addWidget( _relativeRB );
- connect( _relativeRB, TQT_SIGNAL( clicked() ), this, TQT_SLOT(slotRelativePressed()) );
+ connect( _relativeRB, TQ_SIGNAL( clicked() ), this, TQ_SLOT(slotRelativePressed()) );
// The relative times
TQHBoxLayout *lay4 = new TQHBoxLayout();
@@ -173,7 +173,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
{
int lines = (int)(desktopCount/2);
if (lines*2 != desktopCount) lines++;
- groupBox = new TQButtonGroup( lines, Qt::Horizontal,
+ groupBox = new TQButtonGroup( lines, TQt::Horizontal,
i18n("In Desktop"), page, "_desktopsGB");
}
lay1->addWidget(groupBox);
@@ -207,7 +207,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
for (int i=0; i<desktopCount; i++)
_deskBox[i]->setEnabled(enableDesktops);
- connect(_desktopCB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAutoTrackingPressed()));
+ connect(_desktopCB, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAutoTrackingPressed()));
lay1->addStretch(1);
diff --git a/karm/edittaskdialog.h b/karm/edittaskdialog.h
index f913c978..cd173d33 100644
--- a/karm/edittaskdialog.h
+++ b/karm/edittaskdialog.h
@@ -42,7 +42,7 @@ class KArmTimeWidget;
class EditTaskDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/karm/idletimedetector.cpp b/karm/idletimedetector.cpp
index 110eacd0..bf4092f5 100644
--- a/karm/idletimedetector.cpp
+++ b/karm/idletimedetector.cpp
@@ -27,7 +27,7 @@ IdleTimeDetector::IdleTimeDetector(int maxIdle)
}
_timer = new TQTimer(this);
- connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(check()));
+ connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(check()));
#else
_idleDetectionPossible = false;
#endif // HAVE_LIBXSS
diff --git a/karm/idletimedetector.h b/karm/idletimedetector.h
index 1b0b4497..b5645431 100644
--- a/karm/idletimedetector.h
+++ b/karm/idletimedetector.h
@@ -27,7 +27,7 @@ const int testInterval= secsPerMinute * 1000;
class IdleTimeDetector :public TQObject
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp
index d1d6e509..25531967 100644
--- a/karm/karm_part.cpp
+++ b/karm/karm_part.cpp
@@ -25,7 +25,7 @@ karmPart::karmPart( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name )
: DCOPObject ( "KarmDCOPIface" ), KParts::ReadWritePart(parent, name),
_accel ( new TDEAccel( parentWidget ) ),
- _watcher ( new TDEAccelMenuWatch( _accel, TQT_TQOBJECT(parentWidget) ) )
+ _watcher ( new TDEAccelMenuWatch( _accel, parentWidget ) )
{
// we need an instance
setInstance( karmPartFactory::instance() );
@@ -40,9 +40,9 @@ karmPart::karmPart( TQWidget *parentWidget, const char *widgetName,
setWidget(_taskView);
// create our actions
- KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
- KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection());
- KStdAction::save(this, TQT_SLOT(save()), actionCollection());
+ KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
+ KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection());
+ KStdAction::save(this, TQ_SLOT(save()), actionCollection());
makeMenus();
@@ -50,29 +50,29 @@ karmPart::karmPart( TQWidget *parentWidget, const char *widgetName,
// connections
- connect( _taskView, TQT_SIGNAL( totalTimesChanged( long, long ) ),
- this, TQT_SLOT( updateTime( long, long ) ) );
- connect( _taskView, TQT_SIGNAL( selectionChanged ( TQListViewItem * )),
- this, TQT_SLOT(slotSelectionChanged()));
- connect( _taskView, TQT_SIGNAL( updateButtons() ),
- this, TQT_SLOT(slotSelectionChanged()));
+ connect( _taskView, TQ_SIGNAL( totalTimesChanged( long, long ) ),
+ this, TQ_SLOT( updateTime( long, long ) ) );
+ connect( _taskView, TQ_SIGNAL( selectionChanged ( TQListViewItem * )),
+ this, TQ_SLOT(slotSelectionChanged()));
+ connect( _taskView, TQ_SIGNAL( updateButtons() ),
+ this, TQ_SLOT(slotSelectionChanged()));
// Setup context menu request handling
connect( _taskView,
- TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int )),
+ TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int )),
this,
- TQT_SLOT( contextMenuRequest( TQListViewItem*, const TQPoint&, int )));
+ TQ_SLOT( contextMenuRequest( TQListViewItem*, const TQPoint&, int )));
_tray = new KarmTray( this );
- connect( _tray, TQT_SIGNAL( quitSelected() ), TQT_SLOT( quit() ) );
+ connect( _tray, TQ_SIGNAL( quitSelected() ), TQ_SLOT( quit() ) );
- connect( _taskView, TQT_SIGNAL( timersActive() ), _tray, TQT_SLOT( startClock() ) );
- connect( _taskView, TQT_SIGNAL( timersActive() ), this, TQT_SLOT( enableStopAll() ));
- connect( _taskView, TQT_SIGNAL( timersInactive() ), _tray, TQT_SLOT( stopClock() ) );
- connect( _taskView, TQT_SIGNAL( timersInactive() ), this, TQT_SLOT( disableStopAll()));
- connect( _taskView, TQT_SIGNAL( tasksChanged( TQPtrList<Task> ) ),
- _tray, TQT_SLOT( updateToolTip( TQPtrList<Task> ) ));
+ connect( _taskView, TQ_SIGNAL( timersActive() ), _tray, TQ_SLOT( startClock() ) );
+ connect( _taskView, TQ_SIGNAL( timersActive() ), this, TQ_SLOT( enableStopAll() ));
+ connect( _taskView, TQ_SIGNAL( timersInactive() ), _tray, TQ_SLOT( stopClock() ) );
+ connect( _taskView, TQ_SIGNAL( timersInactive() ), this, TQ_SLOT( disableStopAll()));
+ connect( _taskView, TQ_SIGNAL( tasksChanged( TQPtrList<Task> ) ),
+ _tray, TQ_SLOT( updateToolTip( TQPtrList<Task> ) ));
_taskView->load();
@@ -113,119 +113,119 @@ void karmPart::makeMenus()
*actionNew,
*actionNewSub;
- (void) KStdAction::quit( this, TQT_SLOT( quit() ), actionCollection());
- (void) KStdAction::print( this, TQT_SLOT( print() ), actionCollection());
- actionKeyBindings = KStdAction::keyBindings( this, TQT_SLOT( keyBindings() ),
+ (void) KStdAction::quit( this, TQ_SLOT( quit() ), actionCollection());
+ (void) KStdAction::print( this, TQ_SLOT( print() ), actionCollection());
+ actionKeyBindings = KStdAction::keyBindings( this, TQ_SLOT( keyBindings() ),
actionCollection() );
- actionPreferences = KStdAction::preferences(TQT_TQOBJECT(_preferences),
- TQT_SLOT(showDialog()),
+ actionPreferences = KStdAction::preferences(_preferences,
+ TQ_SLOT(showDialog()),
actionCollection() );
- (void) KStdAction::save( this, TQT_SLOT( save() ), actionCollection() );
+ (void) KStdAction::save( this, TQ_SLOT( save() ), actionCollection() );
TDEAction* actionStartNewSession = new TDEAction( i18n("Start &New Session"),
0,
- TQT_TQOBJECT(this),
- TQT_SLOT( startNewSession() ),
+ this,
+ TQ_SLOT( startNewSession() ),
actionCollection(),
"start_new_session");
TDEAction* actionResetAll = new TDEAction( i18n("&Reset All Times"),
0,
- TQT_TQOBJECT(this),
- TQT_SLOT( resetAllTimes() ),
+ this,
+ TQ_SLOT( resetAllTimes() ),
actionCollection(),
"reset_all_times");
actionStart = new TDEAction( i18n("&Start"),
TQString::fromLatin1("1rightarrow"), Key_S,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( startCurrentTimer() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( startCurrentTimer() ), actionCollection(),
"start");
actionStop = new TDEAction( i18n("S&top"),
TQString::fromLatin1("process-stop"), 0,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( stopCurrentTimer() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( stopCurrentTimer() ), actionCollection(),
"stop");
actionStopAll = new TDEAction( i18n("Stop &All Timers"),
Key_Escape,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( stopAllTimers() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( stopAllTimers() ), actionCollection(),
"stopAll");
actionStopAll->setEnabled(false);
actionNew = new TDEAction( i18n("&New..."),
TQString::fromLatin1("document-new"), CTRL+Key_N,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( newTask() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( newTask() ), actionCollection(),
"new_task");
actionNewSub = new TDEAction( i18n("New &Subtask..."),
TQString::fromLatin1("application-vnd.tde.tdemultiple"), CTRL+ALT+Key_N,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( newSubTask() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( newSubTask() ), actionCollection(),
"new_sub_task");
actionDelete = new TDEAction( i18n("&Delete"),
TQString::fromLatin1("edit-delete"), Key_Delete,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( deleteTask() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( deleteTask() ), actionCollection(),
"delete_task");
actionEdit = new TDEAction( i18n("&Edit..."),
TQString::fromLatin1("edit"), CTRL + Key_E,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( editTask() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( editTask() ), actionCollection(),
"edit_task");
// actionAddComment = new TDEAction( i18n("&Add Comment..."),
// TQString::fromLatin1("text-x-generic"),
// CTRL+ALT+Key_E,
-// TQT_TQOBJECT(_taskView),
-// TQT_SLOT( addCommentToTask() ),
+// _taskView,
+// TQ_SLOT( addCommentToTask() ),
// actionCollection(),
// "add_comment_to_task");
actionMarkAsComplete = new TDEAction( i18n("&Mark as Complete"),
TQString::fromLatin1("text-x-generic"),
CTRL+Key_M,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( markTaskAsComplete() ),
+ _taskView,
+ TQ_SLOT( markTaskAsComplete() ),
actionCollection(),
"mark_as_complete");
actionMarkAsIncomplete = new TDEAction( i18n("&Mark as Incomplete"),
TQString::fromLatin1("text-x-generic"),
CTRL+Key_M,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( markTaskAsIncomplete() ),
+ _taskView,
+ TQ_SLOT( markTaskAsIncomplete() ),
actionCollection(),
"mark_as_incomplete");
actionClipTotals = new TDEAction( i18n("&Copy Totals to Clipboard"),
TQString::fromLatin1("klipper"),
CTRL+Key_C,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( clipTotals() ),
+ _taskView,
+ TQ_SLOT( clipTotals() ),
actionCollection(),
"clip_totals");
actionClipHistory = new TDEAction( i18n("Copy &History to Clipboard"),
TQString::fromLatin1("klipper"),
CTRL+ALT+Key_C,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( clipHistory() ),
+ _taskView,
+ TQ_SLOT( clipHistory() ),
actionCollection(),
"clip_history");
new TDEAction( i18n("Import &Legacy Flat File..."), 0,
- TQT_TQOBJECT(_taskView), TQT_SLOT(loadFromFlatFile()), actionCollection(),
+ _taskView, TQ_SLOT(loadFromFlatFile()), actionCollection(),
"import_flatfile");
new TDEAction( i18n("&Export to CSV File..."), 0,
- TQT_TQOBJECT(_taskView), TQT_SLOT(exportcsvFile()), actionCollection(),
+ _taskView, TQ_SLOT(exportcsvFile()), actionCollection(),
"export_csvfile");
new TDEAction( i18n("Export &History to CSV File..."), 0,
- TQT_TQOBJECT(this), TQT_SLOT(exportcsvHistory()), actionCollection(),
+ this, TQ_SLOT(exportcsvHistory()), actionCollection(),
"export_csvhistory");
new TDEAction( i18n("Import Tasks From &Planner..."), 0,
- TQT_TQOBJECT(_taskView), TQT_SLOT(importPlanner()), actionCollection(),
+ _taskView, TQ_SLOT(importPlanner()), actionCollection(),
"import_planner");
new TDEAction( i18n("Configure KArm..."), 0,
- TQT_TQOBJECT(_preferences), TQT_SLOT(showDialog()), actionCollection(),
+ _preferences, TQ_SLOT(showDialog()), actionCollection(),
"configure_karm");
/*
new TDEAction( i18n("Import E&vents"), 0,
_taskView,
- TQT_SLOT( loadFromKOrgEvents() ), actionCollection(),
+ TQ_SLOT( loadFromKOrgEvents() ), actionCollection(),
"import_korg_events");
*/
@@ -287,12 +287,12 @@ void karmPart::setReadWrite(bool rw)
{
// notify your internal widget of the read-write state
if (rw)
- connect(_taskView, TQT_SIGNAL(textChanged()),
- this, TQT_SLOT(setModified()));
+ connect(_taskView, TQ_SIGNAL(textChanged()),
+ this, TQ_SLOT(setModified()));
else
{
- disconnect(_taskView, TQT_SIGNAL(textChanged()),
- this, TQT_SLOT(setModified()));
+ disconnect(_taskView, TQ_SIGNAL(textChanged()),
+ this, TQ_SLOT(setModified()));
}
ReadWritePart::setReadWrite(rw);
@@ -544,10 +544,10 @@ int karmPart::bookTime
// Parse datetime
if ( !rval )
{
- startDate = TQDate::fromString( datetime, Qt::ISODate );
+ startDate = TQDate::fromString( datetime, TQt::ISODate );
if ( datetime.length() > 10 ) // "YYYY-MM-DD".length() = 10
{
- startTime = TQTime::fromString( datetime, Qt::ISODate );
+ startTime = TQTime::fromString( datetime, TQt::ISODate );
}
else startTime = TQTime( 12, 0 );
if ( startDate.isValid() && startTime.isValid() )
diff --git a/karm/karm_part.h b/karm/karm_part.h
index 22a63cff..d4d50209 100644
--- a/karm/karm_part.h
+++ b/karm/karm_part.h
@@ -29,7 +29,7 @@ class TaskView;
*/
class karmPart : public KParts::ReadWritePart, virtual public KarmDCOPIface
{
- Q_OBJECT
+ TQ_OBJECT
private:
@@ -121,7 +121,7 @@ class TDEAboutData;
class karmPartFactory : public KParts::Factory
{
- Q_OBJECT
+ TQ_OBJECT
public:
karmPartFactory();
diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp
index 1992c0f8..92f69ff6 100644
--- a/karm/karmstorage.cpp
+++ b/karm/karmstorage.cpp
@@ -132,8 +132,8 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt
}
_calendar = resource;
- TQObject::connect (_calendar, TQT_SIGNAL(resourceChanged(ResourceCalendar *)),
- view, TQT_SLOT(iCalFileModified(ResourceCalendar *)));
+ TQObject::connect (_calendar, TQ_SIGNAL(resourceChanged(ResourceCalendar *)),
+ view, TQ_SLOT(iCalFileModified(ResourceCalendar *)));
_calendar->setTimeZoneId( KPimPrefs::timezone() );
_calendar->setResourceName( TQString::fromLatin1("KArm") );
_calendar->open();
diff --git a/karm/ktimewidget.cpp b/karm/ktimewidget.cpp
index fb18e8be..ecf632a7 100644
--- a/karm/ktimewidget.cpp
+++ b/karm/ktimewidget.cpp
@@ -17,7 +17,7 @@ class TimeValidator : public TQValidator
{
public:
TimeValidator( ValidatorType tp, TQWidget *parent=0, const char *name=0)
- : TQValidator(TQT_TQOBJECT(parent), name)
+ : TQValidator(parent, name)
{
_tp = tp;
}
diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index 9c892f18..6edc6b2d 100644
--- a/karm/mainwindow.cpp
+++ b/karm/mainwindow.cpp
@@ -38,7 +38,7 @@ MainWindow::MainWindow( const TQString &icsfile )
: DCOPObject ( "KarmDCOPIface" ),
KParts::MainWindow(0,TQt::WStyle_ContextHelp),
_accel ( new TDEAccel( this ) ),
- _watcher ( new TDEAccelMenuWatch( _accel, TQT_TQOBJECT(this) ) ),
+ _watcher ( new TDEAccelMenuWatch( _accel, this ) ),
_totalSum ( 0 ),
_sessionSum( 0 )
{
@@ -57,33 +57,33 @@ MainWindow::MainWindow( const TQString &icsfile )
_watcher->updateMenus();
// connections
- connect( _taskView, TQT_SIGNAL( totalTimesChanged( long, long ) ),
- this, TQT_SLOT( updateTime( long, long ) ) );
- connect( _taskView, TQT_SIGNAL( selectionChanged ( TQListViewItem * )),
- this, TQT_SLOT(slotSelectionChanged()));
- connect( _taskView, TQT_SIGNAL( updateButtons() ),
- this, TQT_SLOT(slotSelectionChanged()));
- connect( _taskView, TQT_SIGNAL( setStatusBar( TQString ) ),
- this, TQT_SLOT(setStatusBar( TQString )));
+ connect( _taskView, TQ_SIGNAL( totalTimesChanged( long, long ) ),
+ this, TQ_SLOT( updateTime( long, long ) ) );
+ connect( _taskView, TQ_SIGNAL( selectionChanged ( TQListViewItem * )),
+ this, TQ_SLOT(slotSelectionChanged()));
+ connect( _taskView, TQ_SIGNAL( updateButtons() ),
+ this, TQ_SLOT(slotSelectionChanged()));
+ connect( _taskView, TQ_SIGNAL( setStatusBar( TQString ) ),
+ this, TQ_SLOT(setStatusBar( TQString )));
loadGeometry();
// Setup context menu request handling
connect( _taskView,
- TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int )),
+ TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int )),
this,
- TQT_SLOT( contextMenuRequest( TQListViewItem*, const TQPoint&, int )));
+ TQ_SLOT( contextMenuRequest( TQListViewItem*, const TQPoint&, int )));
_tray = new KarmTray( this );
- connect( _tray, TQT_SIGNAL( quitSelected() ), TQT_SLOT( quit() ) );
+ connect( _tray, TQ_SIGNAL( quitSelected() ), TQ_SLOT( quit() ) );
- connect( _taskView, TQT_SIGNAL( timersActive() ), _tray, TQT_SLOT( startClock() ) );
- connect( _taskView, TQT_SIGNAL( timersActive() ), this, TQT_SLOT( enableStopAll() ));
- connect( _taskView, TQT_SIGNAL( timersInactive() ), _tray, TQT_SLOT( stopClock() ) );
- connect( _taskView, TQT_SIGNAL( timersInactive() ), this, TQT_SLOT( disableStopAll()));
- connect( _taskView, TQT_SIGNAL( tasksChanged( TQPtrList<Task> ) ),
- _tray, TQT_SLOT( updateToolTip( TQPtrList<Task> ) ));
+ connect( _taskView, TQ_SIGNAL( timersActive() ), _tray, TQ_SLOT( startClock() ) );
+ connect( _taskView, TQ_SIGNAL( timersActive() ), this, TQ_SLOT( enableStopAll() ));
+ connect( _taskView, TQ_SIGNAL( timersInactive() ), _tray, TQ_SLOT( stopClock() ) );
+ connect( _taskView, TQ_SIGNAL( timersInactive() ), this, TQ_SLOT( disableStopAll()));
+ connect( _taskView, TQ_SIGNAL( tasksChanged( TQPtrList<Task> ) ),
+ _tray, TQ_SLOT( updateToolTip( TQPtrList<Task> ) ));
_taskView->load();
@@ -251,124 +251,124 @@ void MainWindow::makeMenus()
*actionNew,
*actionNewSub;
- (void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( quit() ), actionCollection());
- (void) KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection());
- actionKeyBindings = KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( keyBindings() ),
+ (void) KStdAction::quit( this, TQ_SLOT( quit() ), actionCollection());
+ (void) KStdAction::print( this, TQ_SLOT( print() ), actionCollection());
+ actionKeyBindings = KStdAction::keyBindings( this, TQ_SLOT( keyBindings() ),
actionCollection() );
- actionPreferences = KStdAction::preferences(TQT_TQOBJECT(_preferences),
- TQT_SLOT(showDialog()),
+ actionPreferences = KStdAction::preferences(_preferences,
+ TQ_SLOT(showDialog()),
actionCollection() );
- (void) KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( save() ), actionCollection() );
+ (void) KStdAction::save( this, TQ_SLOT( save() ), actionCollection() );
TDEAction* actionStartNewSession = new TDEAction( i18n("Start &New Session"),
0,
- TQT_TQOBJECT(this),
- TQT_SLOT( startNewSession() ),
+ this,
+ TQ_SLOT( startNewSession() ),
actionCollection(),
"start_new_session");
TDEAction* actionResetAll = new TDEAction( i18n("&Reset All Times"),
0,
- TQT_TQOBJECT(this),
- TQT_SLOT( resetAllTimes() ),
+ this,
+ TQ_SLOT( resetAllTimes() ),
actionCollection(),
"reset_all_times");
actionStart = new TDEAction( i18n("&Start"),
TQString::fromLatin1("1rightarrow"), Key_S,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( startCurrentTimer() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( startCurrentTimer() ), actionCollection(),
"start");
actionStop = new TDEAction( i18n("S&top"),
TQString::fromLatin1("process-stop"), Key_S,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( stopCurrentTimer() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( stopCurrentTimer() ), actionCollection(),
"stop");
actionStopAll = new TDEAction( i18n("Stop &All Timers"),
Key_Escape,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( stopAllTimers() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( stopAllTimers() ), actionCollection(),
"stopAll");
actionStopAll->setEnabled(false);
actionNew = new TDEAction( i18n("&New..."),
TQString::fromLatin1("document-new"), CTRL+Key_N,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( newTask() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( newTask() ), actionCollection(),
"new_task");
actionNewSub = new TDEAction( i18n("New &Subtask..."),
TQString::fromLatin1("application-vnd.tde.tdemultiple"), CTRL+ALT+Key_N,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( newSubTask() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( newSubTask() ), actionCollection(),
"new_sub_task");
actionDelete = new TDEAction( i18n("&Delete"),
TQString::fromLatin1("edit-delete"), Key_Delete,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( deleteTask() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( deleteTask() ), actionCollection(),
"delete_task");
actionEdit = new TDEAction( i18n("&Edit..."),
TQString::fromLatin1("edit"), CTRL + Key_E,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( editTask() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( editTask() ), actionCollection(),
"edit_task");
// actionAddComment = new TDEAction( i18n("&Add Comment..."),
// TQString::fromLatin1("text-x-generic"),
// CTRL+ALT+Key_E,
-// TQT_TQOBJECT(_taskView),
-// TQT_SLOT( addCommentToTask() ),
+// _taskView,
+// TQ_SLOT( addCommentToTask() ),
// actionCollection(),
// "add_comment_to_task");
actionMarkAsComplete = new TDEAction( i18n("&Mark as Complete"),
TQString::fromLatin1("text-x-generic"),
CTRL+Key_M,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( markTaskAsComplete() ),
+ _taskView,
+ TQ_SLOT( markTaskAsComplete() ),
actionCollection(),
"mark_as_complete");
actionMarkAsIncomplete = new TDEAction( i18n("&Mark as Incomplete"),
TQString::fromLatin1("text-x-generic"),
CTRL+Key_M,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( markTaskAsIncomplete() ),
+ _taskView,
+ TQ_SLOT( markTaskAsIncomplete() ),
actionCollection(),
"mark_as_incomplete");
actionClipTotals = new TDEAction( i18n("&Copy Totals to Clipboard"),
TQString::fromLatin1("klipper"),
CTRL+Key_C,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( clipTotals() ),
+ _taskView,
+ TQ_SLOT( clipTotals() ),
actionCollection(),
"clip_totals");
// actionClipTotals will never be used again, overwrite it
actionClipTotals = new TDEAction( i18n("&Copy Session Time to Clipboard"),
TQString::fromLatin1("klipper"),
0,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( clipSession() ),
+ _taskView,
+ TQ_SLOT( clipSession() ),
actionCollection(),
"clip_session");
actionClipHistory = new TDEAction( i18n("Copy &History to Clipboard"),
TQString::fromLatin1("klipper"),
CTRL+ALT+Key_C,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( clipHistory() ),
+ _taskView,
+ TQ_SLOT( clipHistory() ),
actionCollection(),
"clip_history");
new TDEAction( i18n("Import &Legacy Flat File..."), 0,
- TQT_TQOBJECT(_taskView), TQT_SLOT(loadFromFlatFile()), actionCollection(),
+ _taskView, TQ_SLOT(loadFromFlatFile()), actionCollection(),
"import_flatfile");
new TDEAction( i18n("&Export to CSV File..."), 0,
- TQT_TQOBJECT(_taskView), TQT_SLOT(exportcsvFile()), actionCollection(),
+ _taskView, TQ_SLOT(exportcsvFile()), actionCollection(),
"export_csvfile");
new TDEAction( i18n("Export &History to CSV File..."), 0,
- TQT_TQOBJECT(this), TQT_SLOT(exportcsvHistory()), actionCollection(),
+ this, TQ_SLOT(exportcsvHistory()), actionCollection(),
"export_csvhistory");
new TDEAction( i18n("Import Tasks From &Planner..."), 0,
- TQT_TQOBJECT(_taskView), TQT_SLOT(importPlanner()), actionCollection(),
+ _taskView, TQ_SLOT(importPlanner()), actionCollection(),
"import_planner");
/*
new TDEAction( i18n("Import E&vents"), 0,
_taskView,
- TQT_SLOT( loadFromKOrgEvents() ), actionCollection(),
+ TQ_SLOT( loadFromKOrgEvents() ), actionCollection(),
"import_korg_events");
*/
@@ -578,10 +578,10 @@ int MainWindow::bookTime
// Parse datetime
if ( !rval )
{
- startDate = TQDate::fromString( datetime, Qt::ISODate );
+ startDate = TQDate::fromString( datetime, TQt::ISODate );
if ( datetime.length() > 10 ) // "YYYY-MM-DD".length() = 10
{
- startTime = TQTime::fromString( datetime, Qt::ISODate );
+ startTime = TQTime::fromString( datetime, TQt::ISODate );
}
else startTime = TQTime( 12, 0 );
if ( startDate.isValid() && startTime.isValid() )
@@ -718,10 +718,10 @@ TQString MainWindow::exportcsvfile( TQString filename, TQString from, TQString t
ReportCriteria rc;
rc.url=filename;
rc.from=TQDate::fromString( from );
- if ( rc.from.isNull() ) rc.from=TQDate::fromString( from, Qt::ISODate );
+ if ( rc.from.isNull() ) rc.from=TQDate::fromString( from, TQt::ISODate );
kdDebug(5970) << "rc.from " << rc.from << endl;
rc.to=TQDate::fromString( to );
- if ( rc.to.isNull() ) rc.to=TQDate::fromString( to, Qt::ISODate );
+ if ( rc.to.isNull() ) rc.to=TQDate::fromString( to, TQt::ISODate );
kdDebug(5970) << "rc.to " << rc.to << endl;
rc.reportType=(ReportCriteria::REPORTTYPE) type; // history report or totals report
rc.decimalMinutes=decimalMinutes;
diff --git a/karm/mainwindow.h b/karm/mainwindow.h
index 0e932484..7d055802 100644
--- a/karm/mainwindow.h
+++ b/karm/mainwindow.h
@@ -25,7 +25,7 @@ class TaskView;
class MainWindow : public KParts::MainWindow, virtual public KarmDCOPIface
{
- Q_OBJECT
+ TQ_OBJECT
private:
diff --git a/karm/preferences.cpp b/karm/preferences.cpp
index 29b242cf..e8a437ef 100644
--- a/karm/preferences.cpp
+++ b/karm/preferences.cpp
@@ -68,8 +68,8 @@ void Preferences::makeBehaviorPage()
topLevel->addStretch();
- connect( _doIdleDetectionW, TQT_SIGNAL( clicked() ), this,
- TQT_SLOT( idleDetectCheckBoxChanged() ));
+ connect( _doIdleDetectionW, TQ_SIGNAL( clicked() ), this,
+ TQ_SLOT( idleDetectCheckBoxChanged() ));
}
void Preferences::makeDisplayPage()
@@ -138,8 +138,8 @@ void Preferences::makeStoragePage()
topLevel->addStretch();
// checkboxes disable file selection controls
- connect( _doAutoSaveW, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( autoSaveCheckBoxChanged() ));
+ connect( _doAutoSaveW, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( autoSaveCheckBoxChanged() ));
}
void Preferences::disableIdleDetection()
diff --git a/karm/preferences.h b/karm/preferences.h
index 8ac92fed..51b52640 100644
--- a/karm/preferences.h
+++ b/karm/preferences.h
@@ -15,7 +15,7 @@ class KURLRequester;
class Preferences :public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/karm/printdialog.cpp b/karm/printdialog.cpp
index 9b4e3b78..128c892a 100644
--- a/karm/printdialog.cpp
+++ b/karm/printdialog.cpp
@@ -53,7 +53,7 @@ PrintDialog::PrintDialog()
layout->addStretch(1);
// Date Range
- TQGroupBox *rangeGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Date Range"),
+ TQGroupBox *rangeGroup = new TQGroupBox(1, TQt::Horizontal, i18n("Date Range"),
page);
layout->addWidget(rangeGroup);
diff --git a/karm/printdialog.h b/karm/printdialog.h
index 18eb2695..d5316f8a 100644
--- a/karm/printdialog.h
+++ b/karm/printdialog.h
@@ -30,7 +30,7 @@ class KDateEdit;
class PrintDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/karm/task.cpp b/karm/task.cpp
index 5b05407d..88c0e099 100644
--- a/karm/task.cpp
+++ b/karm/task.cpp
@@ -54,11 +54,11 @@ void Task::init( const TQString& taskName, long minutes, long sessionTime,
// If our parent is the taskview then connect our totalTimesChanged
// signal to its receiver
if ( ! parent() )
- connect( this, TQT_SIGNAL( totalTimesChanged ( long, long ) ),
- listView(), TQT_SLOT( taskTotalTimesChanged( long, long) ));
+ connect( this, TQ_SIGNAL( totalTimesChanged ( long, long ) ),
+ listView(), TQ_SLOT( taskTotalTimesChanged( long, long) ));
- connect( this, TQT_SIGNAL( deletingTask( Task* ) ),
- listView(), TQT_SLOT( deletingTask( Task* ) ));
+ connect( this, TQ_SIGNAL( deletingTask( Task* ) ),
+ listView(), TQ_SLOT( deletingTask( Task* ) ));
if (icons == 0) {
icons = new TQPtrVector<TQPixmap>(8);
@@ -80,7 +80,7 @@ void Task::init( const TQString& taskName, long minutes, long sessionTime,
_totalSessionTime = _sessionTime = sessionTime;
_timer = new TQTimer(this);
_desktops = desktops;
- connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateActiveIcon()));
+ connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateActiveIcon()));
setPixmap(1, UserIcon(TQString::fromLatin1("empty-watch.xpm")));
_currentPic = 0;
_percentcomplete = percent_complete;
diff --git a/karm/task.h b/karm/task.h
index f375e271..97cc6109 100644
--- a/karm/task.h
+++ b/karm/task.h
@@ -40,7 +40,7 @@ class TQPixmap;
*/
class Task : public TQObject, public TQListViewItem
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/karm/taskview.cpp b/karm/taskview.cpp
index 796e46d2..ad0877f1 100644
--- a/karm/taskview.cpp
+++ b/karm/taskview.cpp
@@ -42,10 +42,10 @@ TaskView::TaskView(TQWidget *parent, const char *name, const TQString &icsfile )
_preferences = Preferences::instance( icsfile );
_storage = KarmStorage::instance();
- connect( this, TQT_SIGNAL( expanded( TQListViewItem * ) ),
- this, TQT_SLOT( itemStateChanged( TQListViewItem * ) ) );
- connect( this, TQT_SIGNAL( collapsed( TQListViewItem * ) ),
- this, TQT_SLOT( itemStateChanged( TQListViewItem * ) ) );
+ connect( this, TQ_SIGNAL( expanded( TQListViewItem * ) ),
+ this, TQ_SLOT( itemStateChanged( TQListViewItem * ) ) );
+ connect( this, TQ_SIGNAL( collapsed( TQListViewItem * ) ),
+ this, TQ_SLOT( itemStateChanged( TQListViewItem * ) ) );
// setup default values
previousColumnWidths[0] = previousColumnWidths[1]
@@ -65,49 +65,49 @@ TaskView::TaskView(TQWidget *parent, const char *name, const TQString &icsfile )
// set up the minuteTimer
_minuteTimer = new TQTimer(this);
- connect( _minuteTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( minuteUpdate() ));
+ connect( _minuteTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( minuteUpdate() ));
_minuteTimer->start(1000 * secsPerMinute);
// React when user changes iCalFile
- connect(_preferences, TQT_SIGNAL(iCalFile(TQString)),
- this, TQT_SLOT(iCalFileChanged(TQString)));
+ connect(_preferences, TQ_SIGNAL(iCalFile(TQString)),
+ this, TQ_SLOT(iCalFileChanged(TQString)));
// resize columns when config is changed
- connect(_preferences, TQT_SIGNAL( setupChanged() ), this,TQT_SLOT( adaptColumns() ));
+ connect(_preferences, TQ_SIGNAL( setupChanged() ), this,TQ_SLOT( adaptColumns() ));
_minuteTimer->start(1000 * secsPerMinute);
// Set up the idle detection.
_idleTimeDetector = new IdleTimeDetector( _preferences->idlenessTimeout() );
- connect( _idleTimeDetector, TQT_SIGNAL( extractTime(int) ),
- this, TQT_SLOT( extractTime(int) ));
- connect( _idleTimeDetector, TQT_SIGNAL( stopAllTimersAt(TQDateTime) ),
- this, TQT_SLOT( stopAllTimersAt(TQDateTime) ));
- connect( _preferences, TQT_SIGNAL( idlenessTimeout(int) ),
- _idleTimeDetector, TQT_SLOT( setMaxIdle(int) ));
- connect( _preferences, TQT_SIGNAL( detectIdleness(bool) ),
- _idleTimeDetector, TQT_SLOT( toggleOverAllIdleDetection(bool) ));
+ connect( _idleTimeDetector, TQ_SIGNAL( extractTime(int) ),
+ this, TQ_SLOT( extractTime(int) ));
+ connect( _idleTimeDetector, TQ_SIGNAL( stopAllTimersAt(TQDateTime) ),
+ this, TQ_SLOT( stopAllTimersAt(TQDateTime) ));
+ connect( _preferences, TQ_SIGNAL( idlenessTimeout(int) ),
+ _idleTimeDetector, TQ_SLOT( setMaxIdle(int) ));
+ connect( _preferences, TQ_SIGNAL( detectIdleness(bool) ),
+ _idleTimeDetector, TQ_SLOT( toggleOverAllIdleDetection(bool) ));
if (!_idleTimeDetector->isIdleDetectionPossible())
_preferences->disableIdleDetection();
// Setup auto save timer
_autoSaveTimer = new TQTimer(this);
- connect( _preferences, TQT_SIGNAL( autoSave(bool) ),
- this, TQT_SLOT( autoSaveChanged(bool) ));
- connect( _preferences, TQT_SIGNAL( autoSavePeriod(int) ),
- this, TQT_SLOT( autoSavePeriodChanged(int) ));
- connect( _autoSaveTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( save() ));
+ connect( _preferences, TQ_SIGNAL( autoSave(bool) ),
+ this, TQ_SLOT( autoSaveChanged(bool) ));
+ connect( _preferences, TQ_SIGNAL( autoSavePeriod(int) ),
+ this, TQ_SLOT( autoSavePeriodChanged(int) ));
+ connect( _autoSaveTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( save() ));
// Setup manual save timer (to save changes a little while after they happen)
_manualSaveTimer = new TQTimer(this);
- connect( _manualSaveTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( save() ));
+ connect( _manualSaveTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( save() ));
// Connect desktop tracker events to task starting/stopping
_desktopTracker = new DesktopTracker();
- connect( _desktopTracker, TQT_SIGNAL( reachedtActiveDesktop( Task* ) ),
- this, TQT_SLOT( startTimerFor(Task*) ));
- connect( _desktopTracker, TQT_SIGNAL( leftActiveDesktop( Task* ) ),
- this, TQT_SLOT( stopTimerFor(Task*) ));
+ connect( _desktopTracker, TQ_SIGNAL( reachedtActiveDesktop( Task* ) ),
+ this, TQ_SLOT( startTimerFor(Task*) ));
+ connect( _desktopTracker, TQ_SIGNAL( leftActiveDesktop( Task* ) ),
+ this, TQ_SLOT( stopTimerFor(Task*) ));
new TaskViewWhatsThis( this );
}
@@ -131,7 +131,7 @@ void TaskView::contentsMousePressEvent ( TQMouseEvent * e )
int leftborder = treeStepSize() * ( task->depth() + ( rootIsDecorated() ? 1 : 0)) + itemMargin();
if ((leftborder < e->x()) && (e->x() < 19 + leftborder ))
{
- if ( e->button() == Qt::LeftButton )
+ if ( e->button() == TQt::LeftButton )
if ( task->isComplete() ) task->setPercentComplete( 0, _storage );
else task->setPercentComplete( 100, _storage );
}
diff --git a/karm/taskview.h b/karm/taskview.h
index cbb5def7..c74f86cf 100644
--- a/karm/taskview.h
+++ b/karm/taskview.h
@@ -41,7 +41,7 @@ using namespace KCal;
class TaskView : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/karm/tdeaccelmenuwatch.cpp b/karm/tdeaccelmenuwatch.cpp
index 5cb22366..3cc72ea8 100644
--- a/karm/tdeaccelmenuwatch.cpp
+++ b/karm/tdeaccelmenuwatch.cpp
@@ -27,7 +27,7 @@ void TDEAccelMenuWatch::setMenu( TQPopupMenu *menu )
if ( !_menuList.findRef( menu ) ) {
_menuList.append( menu );
- connect( menu, TQT_SIGNAL(destroyed()), this, TQT_SLOT(removeDeadMenu()) );
+ connect( menu, TQ_SIGNAL(destroyed()), this, TQ_SLOT(removeDeadMenu()) );
}
_menu = menu;
diff --git a/karm/tdeaccelmenuwatch.h b/karm/tdeaccelmenuwatch.h
index 89f96d94..c9e8aae6 100644
--- a/karm/tdeaccelmenuwatch.h
+++ b/karm/tdeaccelmenuwatch.h
@@ -34,7 +34,7 @@ class TQPopupMenu;
class TDEAccelMenuWatch : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
private:
diff --git a/karm/test/script.cpp b/karm/test/script.cpp
index f9fa9d9e..ab6f7579 100644
--- a/karm/test/script.cpp
+++ b/karm/test/script.cpp
@@ -47,14 +47,14 @@ Script::Script( const TQDir& workingDirectory )
m_proc = new TQProcess( this );
m_proc->setWorkingDirectory( workingDirectory );
- connect ( m_proc, TQT_SIGNAL( readyReadStdout() ),
- this , TQT_SLOT ( stdout() )
+ connect ( m_proc, TQ_SIGNAL( readyReadStdout() ),
+ this , TQ_SLOT ( stdout() )
);
- connect ( m_proc, TQT_SIGNAL( readyReadStderr() ),
- this , TQT_SLOT ( stderr() )
+ connect ( m_proc, TQ_SIGNAL( readyReadStderr() ),
+ this , TQ_SLOT ( stderr() )
);
- connect ( m_proc, TQT_SIGNAL( processExited() ),
- this , TQT_SLOT ( exit() )
+ connect ( m_proc, TQ_SIGNAL( processExited() ),
+ this , TQ_SLOT ( exit() )
);
}
@@ -79,7 +79,7 @@ int Script::run()
{
m_proc->start();
// This didn't work. But Ctrl-C does. :P
- //TQTimer::singleShot( m_timeoutInSeconds * 1000, m_proc, TQT_SLOT( kill() ) );
+ //TQTimer::singleShot( m_timeoutInSeconds * 1000, m_proc, TQ_SLOT( kill() ) );
//while ( ! m_proc->normalExit() );
while ( m_proc->isRunning() );
return m_status;
@@ -89,7 +89,7 @@ void Script::terminate()
{
// These both trigger processExited, so exit() will run.
m_proc->tryTerminate();
- TQTimer::singleShot( NICE_KILL_TIMEOUT_IN_SECS*1000, m_proc, TQT_SLOT( kill() ) );
+ TQTimer::singleShot( NICE_KILL_TIMEOUT_IN_SECS*1000, m_proc, TQ_SLOT( kill() ) );
}
void Script::exit()
diff --git a/karm/test/script.h b/karm/test/script.h
index 3aad9c87..89d2d3f7 100644
--- a/karm/test/script.h
+++ b/karm/test/script.h
@@ -30,7 +30,7 @@ class TQStringList;
class Script : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
Script( const TQDir& workingDirectory );
diff --git a/karm/tray.cpp b/karm/tray.cpp
index 5187c7e4..9332d1e0 100644
--- a/karm/tray.cpp
+++ b/karm/tray.cpp
@@ -35,8 +35,8 @@ KarmTray::KarmTray(MainWindow* parent)
{
// the timer that updates the "running" icon in the tray
_taskActiveTimer = new TQTimer(this);
- connect( _taskActiveTimer, TQT_SIGNAL( timeout() ), this,
- TQT_SLOT( advanceClock()) );
+ connect( _taskActiveTimer, TQ_SIGNAL( timeout() ), this,
+ TQ_SLOT( advanceClock()) );
if (icons == 0) {
icons = new TQPtrVector<TQPixmap>(8);
diff --git a/karm/tray.h b/karm/tray.h
index 45b3b702..1740a222 100644
--- a/karm/tray.h
+++ b/karm/tray.h
@@ -23,7 +23,7 @@ class MainWindow;
class KarmTray : public KSystemTray
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp
index ef40a626..2339d1ce 100644
--- a/kdgantt/KDGanttMinimizeSplitter.cpp
+++ b/kdgantt/KDGanttMinimizeSplitter.cpp
@@ -55,7 +55,7 @@ static int mouseOffset;
static int opaqueOldPos = -1; //### there's only one mouse, but this is a bit risky
-KDGanttSplitterHandle::KDGanttSplitterHandle( Qt::Orientation o,
+KDGanttSplitterHandle::KDGanttSplitterHandle( TQt::Orientation o,
KDGanttMinimizeSplitter *parent, const char * name )
: TQWidget( parent, name ), _activeButton( 0 ), _collapsed( false )
{
@@ -69,11 +69,11 @@ TQSize KDGanttSplitterHandle::sizeHint() const
return TQSize(8,8);
}
-void KDGanttSplitterHandle::setOrientation( Qt::Orientation o )
+void KDGanttSplitterHandle::setOrientation( TQt::Orientation o )
{
orient = o;
#ifndef TQT_NO_CURSOR
- if ( o == Qt::Horizontal )
+ if ( o == TQt::Horizontal )
setCursor( splitHCursor );
else
setCursor( splitVCursor );
@@ -84,7 +84,7 @@ void KDGanttSplitterHandle::setOrientation( Qt::Orientation o )
void KDGanttSplitterHandle::mouseMoveEvent( TQMouseEvent *e )
{
updateCursor( e->pos() );
- if ( !(e->state()&Qt::LeftButton) )
+ if ( !(e->state()&TQt::LeftButton) )
return;
if ( _activeButton != 0)
@@ -104,7 +104,7 @@ void KDGanttSplitterHandle::mouseMoveEvent( TQMouseEvent *e )
void KDGanttSplitterHandle::mousePressEvent( TQMouseEvent *e )
{
- if ( e->button() == Qt::LeftButton ) {
+ if ( e->button() == TQt::LeftButton ) {
_activeButton = onButton( e->pos() );
mouseOffset = s->pick(e->pos());
if ( _activeButton != 0)
@@ -119,7 +119,7 @@ void KDGanttSplitterHandle::updateCursor( const TQPoint& p)
setCursor( arrowCursor );
}
else {
- if ( orient == Qt::Horizontal )
+ if ( orient == TQt::Horizontal )
setCursor( splitHCursor );
else
setCursor( splitVCursor );
@@ -158,7 +158,7 @@ void KDGanttSplitterHandle::mouseReleaseEvent( TQMouseEvent *e )
updateCursor( e->pos() );
}
else {
- if ( !opaque() && e->button() == Qt::LeftButton ) {
+ if ( !opaque() && e->button() == TQt::LeftButton ) {
TQCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos()))
- mouseOffset;
s->setRubberband( -1 );
@@ -241,7 +241,7 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * )
p.setBrush( colorGroup().background() );
p.setPen( colorGroup().foreground() );
p.drawRect( rect() );
- parentWidget()->style().tqdrawPrimitive( TQStyle::PE_Panel, &p, rect(),
+ parentWidget()->style().drawPrimitive( TQStyle::PE_Panel, &p, rect(),
parentWidget()->colorGroup());
int sw = 8; // Hardcoded, given I didn't use styles anymore, I didn't like to use their size
@@ -384,7 +384,7 @@ static TQSize minSizeHint( const TQWidget* w )
KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( TQWidget *parent, const char *name )
:TQFrame(parent,name,WPaintUnclipped)
{
- orient = Qt::Horizontal;
+ orient = TQt::Horizontal;
init();
}
@@ -392,7 +392,7 @@ KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( TQWidget *parent, const char *
Constructs a splitter with orientation \a o with the \a parent
and \a name arguments being passed on to the TQFrame constructor.
*/
-KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Qt::Orientation o, TQWidget *parent, const char *name )
+KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( TQt::Orientation o, TQWidget *parent, const char *name )
:TQFrame(parent,name,WPaintUnclipped)
{
orient = o;
@@ -412,7 +412,7 @@ KDGanttMinimizeSplitter::~KDGanttMinimizeSplitter()
void KDGanttMinimizeSplitter::init()
{
data = new TQSplitterData;
- if ( orient == Qt::Horizontal )
+ if ( orient == TQt::Horizontal )
setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Minimum) );
else
setSizePolicy( TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Expanding) );
@@ -424,15 +424,15 @@ void KDGanttMinimizeSplitter::init()
\brief the orientation of the splitter
By default the orientation is horizontal (the widgets are side by side).
- The possible orientations are TQt:Vertical and Qt::Horizontal (the default).
+ The possible orientations are TQt:Vertical and TQt::Horizontal (the default).
*/
-void KDGanttMinimizeSplitter::setOrientation( Qt::Orientation o )
+void KDGanttMinimizeSplitter::setOrientation( TQt::Orientation o )
{
if ( orient == o )
return;
orient = o;
- if ( orient == Qt::Horizontal )
+ if ( orient == TQt::Horizontal )
setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ) );
else
setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
@@ -562,7 +562,7 @@ void KDGanttMinimizeSplitter::setRubberband( int p )
TQRect r = contentsRect();
const int rBord = 3; //Themable????
int sw = style().pixelMetric(TQStyle::PM_SplitterWidth, this);
- if ( orient == Qt::Horizontal ) {
+ if ( orient == TQt::Horizontal ) {
if ( opaqueOldPos >= 0 )
paint.drawRect( opaqueOldPos + sw/2 - rBord , r.y(),
2*rBord, r.height() );
@@ -601,8 +601,8 @@ bool KDGanttMinimizeSplitter::event( TQEvent *e )
void KDGanttMinimizeSplitter::drawSplitter( TQPainter *p,
TQCOORD x, TQCOORD y, TQCOORD w, TQCOORD h )
{
- style().tqdrawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), colorGroup(),
- (orientation() == Qt::Horizontal ?
+ style().drawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), colorGroup(),
+ (orientation() == TQt::Horizontal ?
TQStyle::Style_Horizontal : 0));
}
@@ -644,9 +644,9 @@ void KDGanttMinimizeSplitter::moveSplitter( TQCOORD p, int id )
p = adjustPos( p, id );
TQSplitterLayoutStruct *s = data->list.at(id);
- int oldP = orient == Qt::Horizontal ? s->wid->x() : s->wid->y();
+ int oldP = orient == TQt::Horizontal ? s->wid->x() : s->wid->y();
bool upLeft;
- if ( TQApplication::reverseLayout() && orient == Qt::Horizontal ) {
+ if ( TQApplication::reverseLayout() && orient == TQt::Horizontal ) {
p += s->wid->width();
upLeft = p > oldP;
} else
@@ -661,8 +661,8 @@ void KDGanttMinimizeSplitter::moveSplitter( TQCOORD p, int id )
void KDGanttMinimizeSplitter::setG( TQWidget *w, int p, int s, bool isSplitter )
{
- if ( orient == Qt::Horizontal ) {
- if ( TQApplication::reverseLayout() && orient == Qt::Horizontal && !isSplitter )
+ if ( orient == TQt::Horizontal ) {
+ if ( TQApplication::reverseLayout() && orient == TQt::Horizontal && !isSplitter )
p = contentsRect().width() - p - s;
w->setGeometry( p, contentsRect().y(), s, contentsRect().height() );
} else
@@ -688,7 +688,7 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft )
} else if ( s->isSplitter ) {
int pos1, pos2;
int dd = s->sizer;
- if( TQApplication::reverseLayout() && orient == Qt::Horizontal ) {
+ if( TQApplication::reverseLayout() && orient == TQt::Horizontal ) {
pos1 = pos;
pos2 = pos + dd;
} else {
@@ -704,7 +704,7 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft )
}
} else {
int dd, newLeft, nextPos;
- if( TQApplication::reverseLayout() && orient == Qt::Horizontal ) {
+ if( TQApplication::reverseLayout() && orient == TQt::Horizontal ) {
dd = w->geometry().right() - pos;
dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize())));
newLeft = pos+1;
@@ -741,7 +741,7 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft )
} else if ( s->isSplitter ) {
int dd = s->sizer;
int pos1, pos2;
- if( TQApplication::reverseLayout() && orient == Qt::Horizontal ) {
+ if( TQApplication::reverseLayout() && orient == TQt::Horizontal ) {
pos2 = pos - dd;
pos1 = pos2 + 1;
} else {
@@ -758,7 +758,7 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft )
} else {
int left = pick( w->pos() );
int right, dd,/* newRight,*/ newLeft, nextPos;
- if ( TQApplication::reverseLayout() && orient == Qt::Horizontal ) {
+ if ( TQApplication::reverseLayout() && orient == TQt::Horizontal ) {
dd = pos - left + 1;
dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize())));
newLeft = pos-dd+1;
@@ -836,7 +836,7 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max )
}
}
TQRect r = contentsRect();
- if ( orient == Qt::Horizontal && TQApplication::reverseLayout() ) {
+ if ( orient == TQt::Horizontal && TQApplication::reverseLayout() ) {
int splitterWidth = style().pixelMetric(TQStyle::PM_SplitterWidth, this);
if ( min )
*min = pick(r.topRight()) - TQMIN( maxB, pick(r.size())-minA ) - splitterWidth;
@@ -975,7 +975,7 @@ void KDGanttMinimizeSplitter::recalc( bool update )
if ( maxt < mint )
maxt = mint;
- if ( orient == Qt::Horizontal ) {
+ if ( orient == TQt::Horizontal ) {
setMaximumSize( maxl, maxt );
setMinimumSize( minl, mint );
} else {
@@ -1127,7 +1127,7 @@ TQSize KDGanttMinimizeSplitter::sizeHint() const
}
}
}
- return orientation() == Qt::Horizontal ? TQSize( l, t ) : TQSize( t, l );
+ return orientation() == TQt::Horizontal ? TQSize( l, t ) : TQSize( t, l );
}
@@ -1157,7 +1157,7 @@ TQSize KDGanttMinimizeSplitter::minimumSizeHint() const
}
}
}
- return orientation() == Qt::Horizontal ? TQSize( l, t ) : TQSize( t, l );
+ return orientation() == TQt::Horizontal ? TQSize( l, t ) : TQSize( t, l );
}
@@ -1531,7 +1531,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i
*/
/*!
- \fn Qt::Orientation KDGanttMinimizeSplitter::orientation() const
+ \fn TQt::Orientation KDGanttMinimizeSplitter::orientation() const
Returns the orientation of the splitter.
*/
diff --git a/kdgantt/KDGanttMinimizeSplitter.h b/kdgantt/KDGanttMinimizeSplitter.h
index 4eb88df7..3dfa659a 100644
--- a/kdgantt/KDGanttMinimizeSplitter.h
+++ b/kdgantt/KDGanttMinimizeSplitter.h
@@ -42,7 +42,7 @@ class TQSplitterLayoutStruct;
class KDGanttMinimizeSplitter : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
TQ_ENUMS( Direction )
TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
@@ -53,11 +53,11 @@ public:
enum Direction { Left, Right, Up, Down };
KDGanttMinimizeSplitter( TQWidget* parent=0, const char* name=0 );
- KDGanttMinimizeSplitter( Qt::Orientation, TQWidget* parent=0, const char* name=0 );
+ KDGanttMinimizeSplitter( TQt::Orientation, TQWidget* parent=0, const char* name=0 );
~KDGanttMinimizeSplitter();
- virtual void setOrientation( Qt::Orientation );
- Qt::Orientation orientation() const { return orient; }
+ virtual void setOrientation( TQt::Orientation );
+ TQt::Orientation orientation() const { return orient; }
void setMinimizeDirection( Direction );
Direction minimizeDirection() const;
@@ -106,19 +106,19 @@ private:
void setG( TQWidget *w, int p, int s, bool isSplitter = FALSE );
TQCOORD pick( const TQPoint &p ) const
- { return orient == Qt::Horizontal ? p.x() : p.y(); }
+ { return orient == TQt::Horizontal ? p.x() : p.y(); }
TQCOORD pick( const TQSize &s ) const
- { return orient == Qt::Horizontal ? s.width() : s.height(); }
+ { return orient == TQt::Horizontal ? s.width() : s.height(); }
TQCOORD trans( const TQPoint &p ) const
- { return orient == Qt::Vertical ? p.x() : p.y(); }
+ { return orient == TQt::Vertical ? p.x() : p.y(); }
TQCOORD trans( const TQSize &s ) const
- { return orient == Qt::Vertical ? s.width() : s.height(); }
+ { return orient == TQt::Vertical ? s.width() : s.height(); }
TQSplitterData *data;
private:
- Qt::Orientation orient;
+ TQt::Orientation orient;
Direction _direction;
#ifndef DOXYGEN_SKIP_INTERNAL
friend class KDGanttSplitterHandle;
@@ -137,13 +137,13 @@ private: // Disabled copy constructor and operator=
// avoid a symbol clash on some platforms.
class KDGanttSplitterHandle : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
- KDGanttSplitterHandle( Qt::Orientation o,
+ KDGanttSplitterHandle( TQt::Orientation o,
KDGanttMinimizeSplitter *parent, const char* name=0 );
- void setOrientation( Qt::Orientation o );
- Qt::Orientation orientation() const { return orient; }
+ void setOrientation( TQt::Orientation o );
+ TQt::Orientation orientation() const { return orient; }
bool opaque() const { return s->opaqueResize(); }
@@ -162,7 +162,7 @@ protected:
void updateCursor( const TQPoint& p );
private:
- Qt::Orientation orient;
+ TQt::Orientation orient;
bool opaq;
int myId;
diff --git a/kdgantt/KDGanttSemiSizingControl.cpp b/kdgantt/KDGanttSemiSizingControl.cpp
index 879d25e5..6ea8375d 100644
--- a/kdgantt/KDGanttSemiSizingControl.cpp
+++ b/kdgantt/KDGanttSemiSizingControl.cpp
@@ -65,7 +65,7 @@
KDGanttSemiSizingControl::KDGanttSemiSizingControl( TQWidget* parent,
const char* name ) :
- KDGanttSizingControl( parent, name ), _orient( Qt::Horizontal ),
+ KDGanttSizingControl( parent, name ), _orient( TQt::Horizontal ),
_arrowPos( Before ), _minimizedWidget(0), _maximizedWidget(0)
{
init();
@@ -84,7 +84,7 @@ KDGanttSemiSizingControl::KDGanttSemiSizingControl( TQWidget* parent,
the base class.
*/
-KDGanttSemiSizingControl::KDGanttSemiSizingControl( Qt::Orientation orientation,
+KDGanttSemiSizingControl::KDGanttSemiSizingControl( TQt::Orientation orientation,
TQWidget* parent,
const char* name ) :
KDGanttSizingControl( parent, name ), _orient( orientation ),
@@ -108,7 +108,7 @@ KDGanttSemiSizingControl::KDGanttSemiSizingControl( Qt::Orientation orientation,
*/
KDGanttSemiSizingControl::KDGanttSemiSizingControl( ArrowPosition arrowPosition,
- Qt::Orientation orientation,
+ TQt::Orientation orientation,
TQWidget* parent,
const char* name ) :
KDGanttSizingControl( parent, name ), _orient( orientation ),
@@ -186,7 +186,7 @@ TQWidget* KDGanttSemiSizingControl::maximizedWidget() const
\sa orientation()
*/
-void KDGanttSemiSizingControl::setOrientation( Qt::Orientation orientation )
+void KDGanttSemiSizingControl::setOrientation( TQt::Orientation orientation )
{
if ( _orient != orientation ) {
_orient = orientation;
@@ -201,7 +201,7 @@ void KDGanttSemiSizingControl::setOrientation( Qt::Orientation orientation )
\sa setOrientation()
*/
-Qt::Orientation KDGanttSemiSizingControl::orientation() const
+TQt::Orientation KDGanttSemiSizingControl::orientation() const
{
return _orient;
}
@@ -248,7 +248,7 @@ void KDGanttSemiSizingControl::init()
{
_but = new TQPushButton( this );
_but->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
- connect( _but, TQT_SIGNAL( clicked() ), this, TQT_SLOT(changeState()) );
+ connect( _but, TQ_SIGNAL( clicked() ), this, TQ_SLOT(changeState()) );
_layout = 0;
TQWhatsThis::add( _but, "Click on this button to show the \nlegend at the bottom of the widget");
TQToolTip::add( _but, "Show / hide legend");
@@ -262,12 +262,12 @@ void KDGanttSemiSizingControl::setup()
delete _layout;
TQBoxLayout* butLayout; // _layout will delete me
- if ( _orient == Qt::Horizontal || isMinimized() )
+ if ( _orient == TQt::Horizontal || isMinimized() )
_layout = new TQHBoxLayout( this );
else
_layout = new TQVBoxLayout( this );
- if ( _orient == Qt::Vertical && !isMinimized() )
+ if ( _orient == TQt::Vertical && !isMinimized() )
butLayout = new TQHBoxLayout( _layout );
else
butLayout = new TQVBoxLayout( _layout );
@@ -288,7 +288,7 @@ void KDGanttSemiSizingControl::setup()
}
//------------------------------ Setup the button at the correct possition
- if ( _arrowPos == After && _orient == Qt::Vertical && !isMinimized() ) {
+ if ( _arrowPos == After && _orient == TQt::Vertical && !isMinimized() ) {
butLayout->addStretch( 1 );
butLayout->addWidget( _but, 0, TQt::AlignLeft );
}
@@ -305,7 +305,7 @@ void KDGanttSemiSizingControl::setup()
else
widget = _maximizedWidget;
if( widget ) {
- if ( _arrowPos == Before || _orient == Qt::Vertical && !isMinimized() )
+ if ( _arrowPos == Before || _orient == TQt::Vertical && !isMinimized() )
_layout->addWidget( widget, 1 );
else
_layout->insertWidget( 0, widget, 1 );
@@ -318,20 +318,20 @@ void KDGanttSemiSizingControl::setup()
if ( isMinimized() ) {
widget = _minimizedWidget;
if( widget ) {
- if ( _arrowPos == Before || _orient == Qt::Vertical && !isMinimized() )
+ if ( _arrowPos == Before || _orient == TQt::Vertical && !isMinimized() )
_layout->addWidget( widget, 1 );
else
_layout->insertWidget( 0, widget, 1 );
}
}
else {
- if ( _arrowPos == Before || _orient == Qt::Vertical && !isMinimized() )
+ if ( _arrowPos == Before || _orient == TQt::Vertical && !isMinimized() )
_layout->addStretch( 1 );
else
_layout->insertStretch( 0, 1 );
widget = _maximizedWidget;
// the following is only the special case
- // arrowPos == Before and _orient == Qt::Vertical
+ // arrowPos == Before and _orient == TQt::Vertical
//widget->move( 0+x(), _but->height()+y());
}
}
diff --git a/kdgantt/KDGanttSemiSizingControl.h b/kdgantt/KDGanttSemiSizingControl.h
index 4f14b1ad..a6d29e54 100644
--- a/kdgantt/KDGanttSemiSizingControl.h
+++ b/kdgantt/KDGanttSemiSizingControl.h
@@ -44,17 +44,17 @@ class KDGanttSemiSizingControl : public KDGanttSizingControl
{
TQ_PROPERTY( ArrowPosition arrowPosition READ arrowPosition WRITE setArrowPosition )
TQ_ENUMS( ArrowPosition )
- Q_OBJECT
+ TQ_OBJECT
public:
enum ArrowPosition { Before, After };
KDGanttSemiSizingControl( TQWidget* parent = 0, const char* name = 0 );
- KDGanttSemiSizingControl( Qt::Orientation orientation, TQWidget* parent = 0,
+ KDGanttSemiSizingControl( TQt::Orientation orientation, TQWidget* parent = 0,
const char* name = 0 );
KDGanttSemiSizingControl( ArrowPosition arrowPosition,
- Qt::Orientation orientation, TQWidget* parent = 0,
+ TQt::Orientation orientation, TQWidget* parent = 0,
const char* name = 0 );
void setMinimizedWidget( TQWidget* widget );
@@ -62,8 +62,8 @@ public:
TQWidget* minimizedWidget() const;
TQWidget* maximizedWidget() const;
- void setOrientation( Qt::Orientation orientation );
- Qt::Orientation orientation() const;
+ void setOrientation( TQt::Orientation orientation );
+ TQt::Orientation orientation() const;
void setArrowPosition( ArrowPosition arrowPosition );
ArrowPosition arrowPosition() const;
@@ -79,7 +79,7 @@ protected:
TQPixmap pixmap( Direction );
private:
- Qt::Orientation _orient;
+ TQt::Orientation _orient;
ArrowPosition _arrowPos;
TQWidget* _minimizedWidget;
TQWidget* _maximizedWidget;
diff --git a/kdgantt/KDGanttSizingControl.h b/kdgantt/KDGanttSizingControl.h
index 31ac59c0..3ef84e7b 100644
--- a/kdgantt/KDGanttSizingControl.h
+++ b/kdgantt/KDGanttSizingControl.h
@@ -37,7 +37,7 @@
class KDGanttSizingControl : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp
index d490da85..e9adada9 100644
--- a/kdgantt/KDGanttView.cpp
+++ b/kdgantt/KDGanttView.cpp
@@ -81,7 +81,7 @@
*/
KDGanttView::KDGanttView( TQWidget* parent, const char* name )
- : KDGanttMinimizeSplitter( Qt::Vertical, parent, name ),
+ : KDGanttMinimizeSplitter( TQt::Vertical, parent, name ),
myCanvasView(0),
myTimeHeaderScroll(0),
mFixedHorizon( false )
@@ -100,17 +100,17 @@ KDGanttView::KDGanttView( TQWidget* parent, const char* name )
spacerLeft = new TQHBox( leftWidget );
myListView = new KDListView(leftWidget, this);
myListView->setVScrollBarMode (TQScrollView::AlwaysOff );
- connect( myListView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ),
- this, TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) );
+ connect( myListView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ),
+ this, TQ_SLOT( slotSelectionChanged( TQListViewItem* ) ) );
- connect( myListView, TQT_SIGNAL( mouseButtonClicked ( int, TQListViewItem * , const TQPoint &, int ) ), this, TQT_SLOT( slotmouseButtonClicked ( int , TQListViewItem * , const TQPoint &, int ) ) );
- connect( myListView, TQT_SIGNAL( contextMenuRequested ( TQListViewItem * , const TQPoint &, int ) ), this, TQT_SLOT( slotcontextMenuRequested ( TQListViewItem * , const TQPoint & , int ) ) );
+ connect( myListView, TQ_SIGNAL( mouseButtonClicked ( int, TQListViewItem * , const TQPoint &, int ) ), this, TQ_SLOT( slotmouseButtonClicked ( int , TQListViewItem * , const TQPoint &, int ) ) );
+ connect( myListView, TQ_SIGNAL( contextMenuRequested ( TQListViewItem * , const TQPoint &, int ) ), this, TQ_SLOT( slotcontextMenuRequested ( TQListViewItem * , const TQPoint & , int ) ) );
- connect( myListView, TQT_SIGNAL(currentChanged( TQListViewItem * ) ), this, TQT_SLOT(slotCurrentChanged ( TQListViewItem * ) ) );
- connect( myListView, TQT_SIGNAL(itemRenamed ( TQListViewItem * , int , const TQString & ) ), this, TQT_SLOT(slotItemRenamed ( TQListViewItem *, int , const TQString & ) ) );
- connect( myListView, TQT_SIGNAL(mouseButtonPressed( int, TQListViewItem * , const TQPoint &, int ) ), this, TQT_SLOT(slotMouseButtonPressed ( int , TQListViewItem * , const TQPoint & , int ) ) );
+ connect( myListView, TQ_SIGNAL(currentChanged( TQListViewItem * ) ), this, TQ_SLOT(slotCurrentChanged ( TQListViewItem * ) ) );
+ connect( myListView, TQ_SIGNAL(itemRenamed ( TQListViewItem * , int , const TQString & ) ), this, TQ_SLOT(slotItemRenamed ( TQListViewItem *, int , const TQString & ) ) );
+ connect( myListView, TQ_SIGNAL(mouseButtonPressed( int, TQListViewItem * , const TQPoint &, int ) ), this, TQ_SLOT(slotMouseButtonPressed ( int , TQListViewItem * , const TQPoint & , int ) ) );
- //connect( myListView, TQT_SIGNAL( ), this, TQT_SLOT( ) );
+ //connect( myListView, TQ_SIGNAL( ), this, TQ_SLOT( ) );
myTimeTable = new KDTimeTableWidget (rightWidget,this);
spacerRight = new TQWidget( rightWidget );
@@ -145,8 +145,8 @@ KDGanttView::KDGanttView( TQWidget* parent, const char* name )
setLineWidth( 2 );
myListView->setFrameStyle( TQFrame::NoFrame );
myListView->setMargin( 0 );
- TQObject::connect(myListView, TQT_SIGNAL ( expanded ( TQListViewItem * ) ) , myTimeTable , TQT_SLOT( expandItem(TQListViewItem * ))) ;
- TQObject::connect(myListView, TQT_SIGNAL (collapsed ( TQListViewItem * ) ) , myTimeTable , TQT_SLOT(collapseItem(TQListViewItem * ))) ;
+ TQObject::connect(myListView, TQ_SIGNAL ( expanded ( TQListViewItem * ) ) , myTimeTable , TQ_SLOT( expandItem(TQListViewItem * ))) ;
+ TQObject::connect(myListView, TQ_SIGNAL (collapsed ( TQListViewItem * ) ) , myTimeTable , TQ_SLOT(collapseItem(TQListViewItem * ))) ;
timeHeaderSpacerWidget->setFixedWidth(myCanvasView->verticalScrollBar()->width() );
listViewIsVisible = true;
@@ -158,7 +158,7 @@ KDGanttView::KDGanttView( TQWidget* parent, const char* name )
myTextColor = TQt::black;
myLegendItems = new TQPtrList<legendItem>;
- //TQObject::connect( this, TQT_SIGNAL (itemDoubleClicked( KDGanttViewItem* ) ) , this, TQT_SLOT( editItem( KDGanttViewItem* ))) ;
+ //TQObject::connect( this, TQ_SIGNAL (itemDoubleClicked( KDGanttViewItem* ) ) , this, TQ_SLOT( editItem( KDGanttViewItem* ))) ;
myItemAttributeDialog = new itemAttributeDialog();
setRepaintMode( KDGanttView::Medium );
//setRepaintMode( KDGanttView::Always );
@@ -166,19 +166,19 @@ KDGanttView::KDGanttView( TQWidget* parent, const char* name )
setHeaderVisible( false );
// now connecting the widgets
- connect(myCanvasView->horizontalScrollBar(), TQT_SIGNAL ( valueChanged ( int )) ,myTimeHeaderScroll->horizontalScrollBar(), TQT_SLOT( setValue ( int))) ;
- connect(myCanvasView, TQT_SIGNAL ( heightResized( int )) ,myTimeTable, TQT_SLOT( checkHeight ( int))) ;
- connect(myCanvasView, TQT_SIGNAL ( widthResized( int )) ,myTimeHeader, TQT_SLOT( checkWidth ( int))) ;
-
- TQObject::connect(myCanvasView->verticalScrollBar(), TQT_SIGNAL ( valueChanged ( int ) ) ,myListView->verticalScrollBar(), TQT_SLOT( setValue ( int ))) ;
- connect(myTimeHeader, TQT_SIGNAL ( sizeChanged( int ) ) ,this, TQT_SLOT(slotHeaderSizeChanged() )) ;
- connect(myTimeHeader, TQT_SIGNAL ( sizeChanged( int ) ) ,myTimeTable, TQT_SLOT(resetWidth( int ) )) ;
- connect(myListView, TQT_SIGNAL ( contentsMoving ( int, int ) ) ,myCanvasView, TQT_SLOT( moveMyContent( int, int ))) ;
- connect(myTimeTable, TQT_SIGNAL ( heightComputed ( int ) ) ,myCanvasView, TQT_SLOT( setMyContentsHeight( int ))) ;
+ connect(myCanvasView->horizontalScrollBar(), TQ_SIGNAL ( valueChanged ( int )) ,myTimeHeaderScroll->horizontalScrollBar(), TQ_SLOT( setValue ( int))) ;
+ connect(myCanvasView, TQ_SIGNAL ( heightResized( int )) ,myTimeTable, TQ_SLOT( checkHeight ( int))) ;
+ connect(myCanvasView, TQ_SIGNAL ( widthResized( int )) ,myTimeHeader, TQ_SLOT( checkWidth ( int))) ;
+
+ TQObject::connect(myCanvasView->verticalScrollBar(), TQ_SIGNAL ( valueChanged ( int ) ) ,myListView->verticalScrollBar(), TQ_SLOT( setValue ( int ))) ;
+ connect(myTimeHeader, TQ_SIGNAL ( sizeChanged( int ) ) ,this, TQ_SLOT(slotHeaderSizeChanged() )) ;
+ connect(myTimeHeader, TQ_SIGNAL ( sizeChanged( int ) ) ,myTimeTable, TQ_SLOT(resetWidth( int ) )) ;
+ connect(myListView, TQ_SIGNAL ( contentsMoving ( int, int ) ) ,myCanvasView, TQ_SLOT( moveMyContent( int, int ))) ;
+ connect(myTimeTable, TQ_SIGNAL ( heightComputed ( int ) ) ,myCanvasView, TQ_SLOT( setMyContentsHeight( int ))) ;
// the next three are for adding new ticks at left/right
- connect( myCanvasView->horizontalScrollBar(), TQT_SIGNAL (prevLine () ) ,this, TQT_SLOT(addTickLeft()));
- connect( myCanvasView->horizontalScrollBar(), TQT_SIGNAL (nextLine () ) ,this, TQT_SLOT(addTickRight()));
- connect( myCanvasView->horizontalScrollBar(), TQT_SIGNAL (valueChanged ( int ) ) ,this, TQT_SLOT( enableAdding( int )));
+ connect( myCanvasView->horizontalScrollBar(), TQ_SIGNAL (prevLine () ) ,this, TQ_SLOT(addTickLeft()));
+ connect( myCanvasView->horizontalScrollBar(), TQ_SIGNAL (nextLine () ) ,this, TQ_SLOT(addTickRight()));
+ connect( myCanvasView->horizontalScrollBar(), TQ_SIGNAL (valueChanged ( int ) ) ,this, TQ_SLOT( enableAdding( int )));
// now initing
fCenterTimeLineAfterShow = false;
@@ -458,11 +458,11 @@ void KDGanttView::slotmouseButtonClicked ( int button, TQListViewItem * item,
//emit mouseButtonClicked ( button , gItem, pos, c );
{
switch ( button ) {
- case Qt::LeftButton:
+ case TQt::LeftButton:
emit lvItemLeftClicked( gItem );
emit itemLeftClicked( gItem );
break;
- case Qt::MidButton:
+ case TQt::MidButton:
emit lvItemMidClicked( gItem );
emit itemMidClicked( gItem );
break;
@@ -553,18 +553,18 @@ void KDGanttView::setRepaintMode( RepaintMode mode )
break;
case Medium:
- connect( cvv, TQT_SIGNAL (sliderReleased () ) ,this, TQT_SLOT(forceRepaint()));
- connect( cvh, TQT_SIGNAL (sliderReleased () ) ,this, TQT_SLOT(forceRepaint()));
- connect( cvv, TQT_SIGNAL (nextLine () ) ,this, TQT_SLOT(forceRepaint()));
- connect( cvh, TQT_SIGNAL (nextLine () ) ,this, TQT_SLOT(forceRepaint()));
- connect( cvv, TQT_SIGNAL (prevLine () ) ,this, TQT_SLOT(forceRepaint()));
- connect( cvh, TQT_SIGNAL (prevLine () ) ,this, TQT_SLOT(forceRepaint()));
+ connect( cvv, TQ_SIGNAL (sliderReleased () ) ,this, TQ_SLOT(forceRepaint()));
+ connect( cvh, TQ_SIGNAL (sliderReleased () ) ,this, TQ_SLOT(forceRepaint()));
+ connect( cvv, TQ_SIGNAL (nextLine () ) ,this, TQ_SLOT(forceRepaint()));
+ connect( cvh, TQ_SIGNAL (nextLine () ) ,this, TQ_SLOT(forceRepaint()));
+ connect( cvv, TQ_SIGNAL (prevLine () ) ,this, TQ_SLOT(forceRepaint()));
+ connect( cvh, TQ_SIGNAL (prevLine () ) ,this, TQ_SLOT(forceRepaint()));
break;
case Always:
- connect( cvv, TQT_SIGNAL (valueChanged ( int ) ) ,this, TQT_SLOT(forceRepaint( int )));
- connect( cvh, TQT_SIGNAL (valueChanged ( int ) ) ,this, TQT_SLOT(forceRepaint( int )));
- connect( cvv, TQT_SIGNAL (sliderReleased () ) ,this, TQT_SLOT(forceRepaint()));
- connect( cvh, TQT_SIGNAL (sliderReleased () ) ,this, TQT_SLOT(forceRepaint()));
+ connect( cvv, TQ_SIGNAL (valueChanged ( int ) ) ,this, TQ_SLOT(forceRepaint( int )));
+ connect( cvh, TQ_SIGNAL (valueChanged ( int ) ) ,this, TQ_SLOT(forceRepaint( int )));
+ connect( cvv, TQ_SIGNAL (sliderReleased () ) ,this, TQ_SLOT(forceRepaint()));
+ connect( cvh, TQ_SIGNAL (sliderReleased () ) ,this, TQ_SLOT(forceRepaint()));
break;
}
}
diff --git a/kdgantt/KDGanttView.h b/kdgantt/KDGanttView.h
index 18e77bbc..cf528230 100644
--- a/kdgantt/KDGanttView.h
+++ b/kdgantt/KDGanttView.h
@@ -69,7 +69,7 @@ class KDGanttMinimizeSplitter;
class KDGanttView : public KDGanttMinimizeSplitter
{
- Q_OBJECT
+ TQ_OBJECT
TQ_PROPERTY( bool showLegend READ showLegend WRITE setShowLegend )
diff --git a/kdgantt/KDGanttViewItem.cpp b/kdgantt/KDGanttViewItem.cpp
index 70cfcedf..a3648a64 100644
--- a/kdgantt/KDGanttViewItem.cpp
+++ b/kdgantt/KDGanttViewItem.cpp
@@ -916,10 +916,10 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape,
// items which don't have any shapes
return;
}
- item->setBrush(Qt::SolidPattern);
+ item->setBrush(TQt::SolidPattern);
item->setZ(5);
itemShape = (KDCanvasPolygonItem*) item;
- itemBack->setBrush(Qt::SolidPattern);
+ itemBack->setBrush(TQt::SolidPattern);
itemBack->setZ(3);
itemShapeBack = (KDCanvasPolygonItem*) itemBack;
@@ -1306,11 +1306,11 @@ void KDGanttViewItem::updateCanvasItems()
if (blockUpdating) return;
TQPen p,pBack;
TQBrush b;
- b.setStyle(Qt::SolidPattern);
+ b.setStyle(TQt::SolidPattern);
if ( enabled() ) {
textCanvas->setColor(myTextColor);
if (isHighlighted) {
- b.setStyle(Qt::SolidPattern);
+ b.setStyle(TQt::SolidPattern);
b.setColor(myStartColorHL);
startShape->setBrush(b);
b.setColor(myMiddleColorHL);
@@ -1323,7 +1323,7 @@ void KDGanttViewItem::updateCanvasItems()
p.setColor(myEndColorHL);
endLine->setPen(p);
} else {
- b.setStyle(Qt::SolidPattern);
+ b.setStyle(TQt::SolidPattern);
b.setColor(myStartColor);
// tqDebug("update color %s %s", listViewText().latin1(),myStartColor.name().latin1() );
startShape->setBrush(b);
@@ -1341,7 +1341,7 @@ void KDGanttViewItem::updateCanvasItems()
//TQColor discol = TQt::lightGray;
TQColor discol = TQColor(232,232,232);
textCanvas->setColor( TQColor(150,150,150) );
- b.setStyle(Qt::SolidPattern);
+ b.setStyle(TQt::SolidPattern);
b.setColor(discol);
startShape->setBrush(b);
midShape->setBrush(b);
diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp
index a708699f..4b1e3472 100644
--- a/kdgantt/KDGanttViewSubwidgets.cpp
+++ b/kdgantt/KDGanttViewSubwidgets.cpp
@@ -59,13 +59,13 @@
#include <kdebug.h>
KDTimeTableWidget:: KDTimeTableWidget( TQWidget* parent,KDGanttView* myGantt)
- : TQCanvas (TQT_TQOBJECT(parent))
+ : TQCanvas (parent)
{
myGanttView = myGantt;
taskLinksVisible = true;
flag_blockUpdating = false;
int_blockUpdating = 0;
- gridPen.setStyle(Qt::DotLine);
+ gridPen.setStyle(TQt::DotLine);
gridPen.setColor(TQColor(100,100,100));
maximumComputedGridHeight = 0;
denseLineCount = 0;
@@ -230,7 +230,7 @@ void KDTimeTableWidget::computeVerticalGrid()
*/
itcol.current()->setPen( TQPen(TQPen::NoPen) );
- itcol.current()->setBrush( TQBrush( colcol, Qt::SolidPattern) );
+ itcol.current()->setBrush( TQBrush( colcol, TQt::SolidPattern) );
itcol.current()->setSize(cw ,h );
itcol.current()->move( i, 0 );
itcol.current()->show();
@@ -244,7 +244,7 @@ void KDTimeTableWidget::computeVerticalGrid()
*/
temprect = new KDCanvasRectangle(this,0,Type_is_KDGanttGridItem);
temprect->setPen( TQPen(TQPen::NoPen) );
- temprect->setBrush( TQBrush( colcol, Qt::SolidPattern) );
+ temprect->setBrush( TQBrush( colcol, TQt::SolidPattern) );
temprect->setSize(cw ,h );
temprect->move( i, 0 );
temprect->setZ(-20);
@@ -276,7 +276,7 @@ void KDTimeTableWidget::computeVerticalGrid()
itcol.current()->setPoints(i+(cw/2),0,i+(cw/2),h);
*/
itcol.current()->setPen( TQPen(TQPen::NoPen) );
- itcol.current()->setBrush( TQBrush( colcol, Qt::SolidPattern) );
+ itcol.current()->setBrush( TQBrush( colcol, TQt::SolidPattern) );
itcol.current()->setSize(cw ,h );
itcol.current()->move( i, 0 );
itcol.current()->show();
@@ -284,7 +284,7 @@ void KDTimeTableWidget::computeVerticalGrid()
} else {
temprect = new KDCanvasRectangle(this,0,Type_is_KDGanttGridItem);
temprect->setPen( TQPen(TQPen::NoPen) );
- temprect->setBrush( TQBrush( colcol, Qt::SolidPattern) );
+ temprect->setBrush( TQBrush( colcol, TQt::SolidPattern) );
temprect->setSize(cw ,h );
temprect->move( i, 0 );
temprect->setZ(-20);
@@ -332,7 +332,7 @@ void KDTimeTableWidget::computeVerticalGrid()
itcol.current()->setPoints(i+mid,0,mid,h);
*/
itcol.current()->setPen( TQPen(TQPen::NoPen) );
- itcol.current()->setBrush( TQBrush( colcol, Qt::SolidPattern) );
+ itcol.current()->setBrush( TQBrush( colcol, TQt::SolidPattern) );
itcol.current()->setSize(mid ,h );
itcol.current()->move( left, 0 );
itcol.current()->show();
@@ -340,7 +340,7 @@ void KDTimeTableWidget::computeVerticalGrid()
} else {
temprect = new KDCanvasRectangle(this,0,Type_is_KDGanttGridItem);
temprect->setPen( TQPen(TQPen::NoPen) );
- temprect->setBrush( TQBrush( colcol, Qt::SolidPattern) );
+ temprect->setBrush( TQBrush( colcol, TQt::SolidPattern) );
temprect->setSize(mid,h );
temprect->move( left, 0 );
temprect->setZ(-20);
@@ -386,7 +386,7 @@ void KDTimeTableWidget::computeVerticalGrid()
itcol.current()->setPoints(i+mid,0,mid,h);
*/
itcol.current()->setPen( TQPen(TQPen::NoPen) );
- itcol.current()->setBrush( TQBrush( colcol, Qt::SolidPattern) );
+ itcol.current()->setBrush( TQBrush( colcol, TQt::SolidPattern) );
itcol.current()->setSize(mid ,h );
itcol.current()->move( left, 0 );
itcol.current()->show();
@@ -394,7 +394,7 @@ void KDTimeTableWidget::computeVerticalGrid()
} else {
temprect = new KDCanvasRectangle(this,0,Type_is_KDGanttGridItem);
temprect->setPen( TQPen(TQPen::NoPen) );
- temprect->setBrush( TQBrush( colcol, Qt::SolidPattern) );
+ temprect->setBrush( TQBrush( colcol, TQt::SolidPattern) );
temprect->setSize(mid ,h );
temprect->move( left, 0 );
temprect->setZ(-20);
@@ -725,42 +725,42 @@ KDTimeHeaderWidget:: KDTimeHeaderWidget( TQWidget* parent,KDGanttView* gant )
myPopupMenu = new TQPopupMenu(this);
TQPopupMenu * zoomPopupMenu = new TQPopupMenu(this);
myPopupMenu->insertItem (i18n("Zoom"),zoomPopupMenu, 1);
- zoomPopupMenu->insertItem( i18n("Zoom to 100%"),this, TQT_SLOT(setSettings(int)),0 ,21,21 );
- zoomPopupMenu->insertItem( i18n("Zoom to Fit"),this, TQT_SLOT(setSettings(int)),0 ,20,20 );
- zoomPopupMenu->insertItem( i18n("Zoom In (x 2)"),this, TQT_SLOT(setSettings(int)),0 ,22,22 );
- zoomPopupMenu->insertItem( i18n("Zoom In (x 6)"),this, TQT_SLOT(setSettings(int)),0 ,24,24 );
- zoomPopupMenu->insertItem( i18n("Zoom In (x 12)"),this, TQT_SLOT(setSettings(int)),0 ,26,26 );
- zoomPopupMenu->insertItem( i18n("Zoom Out (x 1/2)"),this, TQT_SLOT(setSettings(int)),0 ,23,23 );
- zoomPopupMenu->insertItem( i18n("Zoom Out (x 1/6)"),this, TQT_SLOT(setSettings(int)),0 ,25,25 );
- zoomPopupMenu->insertItem( i18n("Zoom Out (x 1/12)"),this, TQT_SLOT(setSettings(int)),0 ,27,27 );
+ zoomPopupMenu->insertItem( i18n("Zoom to 100%"),this, TQ_SLOT(setSettings(int)),0 ,21,21 );
+ zoomPopupMenu->insertItem( i18n("Zoom to Fit"),this, TQ_SLOT(setSettings(int)),0 ,20,20 );
+ zoomPopupMenu->insertItem( i18n("Zoom In (x 2)"),this, TQ_SLOT(setSettings(int)),0 ,22,22 );
+ zoomPopupMenu->insertItem( i18n("Zoom In (x 6)"),this, TQ_SLOT(setSettings(int)),0 ,24,24 );
+ zoomPopupMenu->insertItem( i18n("Zoom In (x 12)"),this, TQ_SLOT(setSettings(int)),0 ,26,26 );
+ zoomPopupMenu->insertItem( i18n("Zoom Out (x 1/2)"),this, TQ_SLOT(setSettings(int)),0 ,23,23 );
+ zoomPopupMenu->insertItem( i18n("Zoom Out (x 1/6)"),this, TQ_SLOT(setSettings(int)),0 ,25,25 );
+ zoomPopupMenu->insertItem( i18n("Zoom Out (x 1/12)"),this, TQ_SLOT(setSettings(int)),0 ,27,27 );
scalePopupMenu = new TQPopupMenu(this);
myPopupMenu->insertItem (i18n("Scale"),scalePopupMenu, 2);
- scalePopupMenu->insertItem( i18n("Minute"),this, TQT_SLOT(setSettings(int)),0 ,1,1 );
- scalePopupMenu->insertItem( i18n("Hour"),this, TQT_SLOT(setSettings(int)),0 ,2,2 );
- scalePopupMenu->insertItem( i18n("Day"),this, TQT_SLOT(setSettings(int)),0 ,3,3 );
- scalePopupMenu->insertItem( i18n("Week"),this, TQT_SLOT(setSettings(int)),0 ,4,4 );
- scalePopupMenu->insertItem( i18n("Month"),this, TQT_SLOT(setSettings(int)),0 ,5,5 );
- scalePopupMenu->insertItem( i18n("Auto"),this, TQT_SLOT(setSettings(int)),0 ,6,6 );
+ scalePopupMenu->insertItem( i18n("Minute"),this, TQ_SLOT(setSettings(int)),0 ,1,1 );
+ scalePopupMenu->insertItem( i18n("Hour"),this, TQ_SLOT(setSettings(int)),0 ,2,2 );
+ scalePopupMenu->insertItem( i18n("Day"),this, TQ_SLOT(setSettings(int)),0 ,3,3 );
+ scalePopupMenu->insertItem( i18n("Week"),this, TQ_SLOT(setSettings(int)),0 ,4,4 );
+ scalePopupMenu->insertItem( i18n("Month"),this, TQ_SLOT(setSettings(int)),0 ,5,5 );
+ scalePopupMenu->insertItem( i18n("Auto"),this, TQ_SLOT(setSettings(int)),0 ,6,6 );
scalePopupMenu->setCheckable ( true );
timePopupMenu = new TQPopupMenu(this);
myPopupMenu->insertItem (i18n("Time Format"),timePopupMenu, 3);
- timePopupMenu->insertItem( i18n("24 Hour"),this, TQT_SLOT(setSettings(int)),0 ,40,40 );
- timePopupMenu->insertItem( i18n("12 PM Hour"),this, TQT_SLOT(setSettings(int)),0 ,41,41 );
- timePopupMenu->insertItem( i18n("24:00 Hour"),this, TQT_SLOT(setSettings(int)),0 ,42,42 );
+ timePopupMenu->insertItem( i18n("24 Hour"),this, TQ_SLOT(setSettings(int)),0 ,40,40 );
+ timePopupMenu->insertItem( i18n("12 PM Hour"),this, TQ_SLOT(setSettings(int)),0 ,41,41 );
+ timePopupMenu->insertItem( i18n("24:00 Hour"),this, TQ_SLOT(setSettings(int)),0 ,42,42 );
yearPopupMenu = new TQPopupMenu(this);
myPopupMenu->insertItem (i18n("Year Format"),yearPopupMenu, 4);
- yearPopupMenu->insertItem( i18n("Four Digit"),this, TQT_SLOT(setSettings(int)),0 ,50,50 );
- yearPopupMenu->insertItem( i18n("Two Digit"),this, TQT_SLOT(setSettings(int)),0 ,51,51 );
- yearPopupMenu->insertItem( i18n("Two Digit Apostrophe"),this, TQT_SLOT(setSettings(int)),0 ,52,52 );
- yearPopupMenu->insertItem( i18n("No Date on Minute/Hour Scale"),this, TQT_SLOT(setSettings(int)),0 ,53,53 );
+ yearPopupMenu->insertItem( i18n("Four Digit"),this, TQ_SLOT(setSettings(int)),0 ,50,50 );
+ yearPopupMenu->insertItem( i18n("Two Digit"),this, TQ_SLOT(setSettings(int)),0 ,51,51 );
+ yearPopupMenu->insertItem( i18n("Two Digit Apostrophe"),this, TQ_SLOT(setSettings(int)),0 ,52,52 );
+ yearPopupMenu->insertItem( i18n("No Date on Minute/Hour Scale"),this, TQ_SLOT(setSettings(int)),0 ,53,53 );
gridPopupMenu = new TQPopupMenu(this);
myPopupMenu->insertItem (i18n("Grid"),gridPopupMenu,5);
- gridPopupMenu->insertItem( i18n("Show Minor Grid"),this, TQT_SLOT(setSettings(int)),0 ,10,10 );
- gridPopupMenu->insertItem( i18n("Show Major Grid"),this, TQT_SLOT(setSettings(int)),0 ,11,11 );
- gridPopupMenu->insertItem( i18n("Show No Grid"),this, TQT_SLOT(setSettings(int)),0 ,12,12 );
- myPopupMenu->insertItem( i18n("Print"),this, TQT_SLOT(setSettings(int)),0 ,30,30 );
- connect(myPopupMenu, TQT_SIGNAL ( aboutToShow () ) , this, TQT_SLOT( preparePopupMenu() )) ;
+ gridPopupMenu->insertItem( i18n("Show Minor Grid"),this, TQ_SLOT(setSettings(int)),0 ,10,10 );
+ gridPopupMenu->insertItem( i18n("Show Major Grid"),this, TQ_SLOT(setSettings(int)),0 ,11,11 );
+ gridPopupMenu->insertItem( i18n("Show No Grid"),this, TQ_SLOT(setSettings(int)),0 ,12,12 );
+ myPopupMenu->insertItem( i18n("Print"),this, TQ_SLOT(setSettings(int)),0 ,30,30 );
+ connect(myPopupMenu, TQ_SIGNAL ( aboutToShow () ) , this, TQ_SLOT( preparePopupMenu() )) ;
flagZoomToFit = false;
setShowMinorTicks( true );
myRealEnd = myHorizonEnd;
@@ -2447,16 +2447,16 @@ void KDTimeHeaderWidget::mousePressEvent ( TQMouseEvent * e )
{
mouseDown = false;
switch ( e->button() ) {
- case Qt::LeftButton:
+ case TQt::LeftButton:
mouseDown = true;
beginMouseDown = e->pos().x();
endMouseDown = e->pos().x();
break;
- case Qt::RightButton:
+ case TQt::RightButton:
if (flagShowPopupMenu)
myPopupMenu->popup(e->globalPos());
break;
- case Qt::MidButton:
+ case TQt::MidButton:
break;
default:
break;
@@ -2539,7 +2539,7 @@ void KDTimeHeaderWidget::mouseMoveEvent ( TQMouseEvent * e )
***************************************************************** */
KDLegendWidget:: KDLegendWidget( TQWidget* parent,
KDGanttMinimizeSplitter* legendParent ) :
- KDGanttSemiSizingControl ( KDGanttSemiSizingControl::Before, Qt::Vertical,
+ KDGanttSemiSizingControl ( KDGanttSemiSizingControl::Before, TQt::Vertical,
parent)
{
myLegendParent = legendParent;
@@ -2645,9 +2645,9 @@ void KDLegendWidget::clearLegend ( )
{
if ( myLegend ) delete myLegend;
if ( dock )
- myLegend = new TQGroupBox( 1, Qt::Horizontal, scroll->viewport() );
+ myLegend = new TQGroupBox( 1, TQt::Horizontal, scroll->viewport() );
else
- myLegend = new TQGroupBox( 1, Qt::Horizontal, i18n( "Legend" ), scroll->viewport() );
+ myLegend = new TQGroupBox( 1, TQt::Horizontal, i18n( "Legend" ), scroll->viewport() );
myLegend->setBackgroundColor( TQt::white );
myLegend->setFont( font() );
scroll->addChild( myLegend );
@@ -2702,7 +2702,7 @@ KDListView::KDListView(TQWidget* parent, KDGanttView* gantView):TQListView (pare
setDefaultRenameAction(TQListView::Accept);
setColumnWidthMode ( 0,Maximum );
_calendarMode = false;
- // TQObject::connect(this, TQT_SIGNAL ( pressed ( TQListViewItem * )) , this, TQT_SLOT( dragItem( TQListViewItem *))) ;
+ // TQObject::connect(this, TQ_SIGNAL ( pressed ( TQListViewItem * )) , this, TQ_SLOT( dragItem( TQListViewItem *))) ;
}
@@ -3177,52 +3177,52 @@ KDGanttCanvasView::KDGanttCanvasView( KDGanttView* sender,TQCanvas* canvas, TQWi
TQPopupMenu * newMenu = new TQPopupMenu( this );
TQPopupMenu * onView = new TQPopupMenu( this );
onView->insertItem( i18n( "Summary" ), this,
- TQT_SLOT ( newRootItem( int ) ), 0, 0 );
+ TQ_SLOT ( newRootItem( int ) ), 0, 0 );
onView->insertItem( i18n( "Event" ), this,
- TQT_SLOT ( newRootItem( int ) ), 0, 1);
+ TQ_SLOT ( newRootItem( int ) ), 0, 1);
onView->insertItem( i18n( "Task" ), this,
- TQT_SLOT ( newRootItem( int ) ), 0, 2 );
+ TQ_SLOT ( newRootItem( int ) ), 0, 2 );
onItem->insertItem( i18n( "New Root" ), onView );
newMenu->insertItem( i18n( "Summary" ),
- this, TQT_SLOT ( newChildItem( int) ), 0, 0 );
+ this, TQ_SLOT ( newChildItem( int) ), 0, 0 );
newMenu->insertItem( i18n( "Event" ),
- this, TQT_SLOT ( newChildItem( int ) ), 0, 1 );
+ this, TQ_SLOT ( newChildItem( int ) ), 0, 1 );
newMenu->insertItem( i18n( "Task" ),
- this, TQT_SLOT ( newChildItem( int ) ), 0, 2 );
+ this, TQ_SLOT ( newChildItem( int ) ), 0, 2 );
onItem->insertItem( i18n( "New Child" ), newMenu );
TQPopupMenu * afterMenu = new TQPopupMenu( this );
afterMenu->insertItem( i18n( "Summary" ),
- this, TQT_SLOT ( newChildItem( int) ), 0, 0+4 );
+ this, TQ_SLOT ( newChildItem( int) ), 0, 0+4 );
afterMenu->insertItem( i18n( "Event" ),
- this, TQT_SLOT ( newChildItem( int ) ), 0, 1+4 );
+ this, TQ_SLOT ( newChildItem( int ) ), 0, 1+4 );
afterMenu->insertItem( i18n( "Task" ),
- this, TQT_SLOT ( newChildItem( int ) ), 0, 2+4 );
+ this, TQ_SLOT ( newChildItem( int ) ), 0, 2+4 );
onItem->insertItem( i18n( "New After" ), afterMenu );
TQPopupMenu *pasteMenu = new TQPopupMenu( this );
pasteMenu->insertItem( i18n( "As Root" ),
- this, TQT_SLOT ( pasteItem( int ) ), 0, 0 );
+ this, TQ_SLOT ( pasteItem( int ) ), 0, 0 );
pasteMenu->insertItem( i18n( "As Child" ),
- this, TQT_SLOT ( pasteItem( int ) ), 0, 1 );
+ this, TQ_SLOT ( pasteItem( int ) ), 0, 1 );
pasteMenu->insertItem( i18n( "After" ),
- this, TQT_SLOT ( pasteItem( int ) ), 0, 2 );
+ this, TQ_SLOT ( pasteItem( int ) ), 0, 2 );
onItem->insertItem( i18n( "Paste" ), pasteMenu, 3 );
- onItem->insertItem( i18n( "Cut Item" ), this, TQT_SLOT ( cutItem() ) );
+ onItem->insertItem( i18n( "Cut Item" ), this, TQ_SLOT ( cutItem() ) );
onItem->setItemEnabled( 3, false );
myMyContentsHeight = 0;
_showItemAddPopupMenu = false;
- TQObject *scrollViewTimer = child( "scrollview scrollbar timer", TQTIMER_OBJECT_NAME_STRING, false );
+ TQObject *scrollViewTimer = child( "scrollview scrollbar timer", "TQTimer", false );
Q_ASSERT( scrollViewTimer );
if ( scrollViewTimer ) {
- disconnect( scrollViewTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateScrollBars() ) );
+ disconnect( scrollViewTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateScrollBars() ) );
}
// If they needed a scrollbar timer in scrollview...
- connect( &scrollBarTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(myUpdateScrollBars() ) );
+ connect( &scrollBarTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(myUpdateScrollBars() ) );
myScrollTimer = new TQTimer( this, "myScrollTimer" );
- connect( myScrollTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotScrollTimer() ) );
+ connect( myScrollTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotScrollTimer() ) );
autoScrollEnabled = false;
}
@@ -3516,7 +3516,7 @@ void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e )
currentItem = 0;
movingItem = 0;
mouseDown = true;
- if (e->button() == Qt::RightButton && mySignalSender->editable()) {
+ if (e->button() == TQt::RightButton && mySignalSender->editable()) {
lastClickedItem = (KDGanttViewItem*) mySignalSender->myListView->itemAt( TQPoint(2,e->pos().y()));
if ( lastClickedItem ) {
if ( lastClickedItem->displaySubitemsAsGroup() && ! lastClickedItem->isOpen() ) {
@@ -3537,7 +3537,7 @@ void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e )
TQCanvasItemList::Iterator it;
for ( it = il.begin(); it != il.end(); ++it ) {
switch ( e->button() ) {
- case Qt::LeftButton:
+ case TQt::LeftButton:
switch (getType(*it)) {
case Type_is_KDGanttViewItem:
currentItem = getItem(*it);
@@ -3590,7 +3590,7 @@ void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e )
break;
}
break;
- case Qt::RightButton:
+ case TQt::RightButton:
switch (getType(*it)) {
case Type_is_KDGanttViewItem:
currentItem = getItem(*it);
@@ -3602,7 +3602,7 @@ void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e )
break;
}
break;
- case Qt::MidButton:
+ case TQt::MidButton:
switch (getType(*it)) {
case Type_is_KDGanttViewItem:
currentItem = getItem(*it);
@@ -3618,10 +3618,10 @@ void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e )
break;
}
}
- if (e->button() == Qt::RightButton ) {
+ if (e->button() == TQt::RightButton ) {
mySignalSender->gvContextMenuRequested( currentItem, e->globalPos() );
}
- if (autoScrollEnabled && e->button() == Qt::LeftButton) {
+ if (autoScrollEnabled && e->button() == TQt::LeftButton) {
myScrollTimer->start(50);
}
}
@@ -3643,7 +3643,7 @@ void KDGanttCanvasView::contentsMouseReleaseEvent ( TQMouseEvent * e )
// if ( currentLink || currentItem )
{
switch ( e->button() ) {
- case Qt::LeftButton:
+ case TQt::LeftButton:
myScrollTimer->stop();
{
mySignalSender->itemLeftClicked( currentItem );
@@ -3675,7 +3675,7 @@ void KDGanttCanvasView::contentsMouseReleaseEvent ( TQMouseEvent * e )
movingGVItem = 0;
}
break;
- case Qt::RightButton:
+ case TQt::RightButton:
{
mySignalSender->itemRightClicked( currentItem );
mySignalSender->gvItemRightClicked( currentItem );
@@ -3684,7 +3684,7 @@ void KDGanttCanvasView::contentsMouseReleaseEvent ( TQMouseEvent * e )
if ( currentLink )
mySignalSender->taskLinkRightClicked( currentLink );
break;
- case Qt::MidButton:
+ case TQt::MidButton:
{
mySignalSender->itemMidClicked( currentItem );
mySignalSender->gvItemMidClicked( currentItem );
@@ -3713,7 +3713,7 @@ void KDGanttCanvasView::contentsMouseDoubleClickEvent ( TQMouseEvent * e )
{
TQCanvasItemList il = canvas() ->collisions ( e->pos() );
- if ( il.isEmpty() && e->button() == Qt::LeftButton ) {
+ if ( il.isEmpty() && e->button() == TQt::LeftButton ) {
//not directly sending a signal here (encapsulation and whatnot)
mySignalSender->emptySpaceDoubleClicked(e);
return;
@@ -3722,7 +3722,7 @@ void KDGanttCanvasView::contentsMouseDoubleClickEvent ( TQMouseEvent * e )
TQCanvasItemList::Iterator it;
for ( it = il.begin(); it != il.end(); ++it ) {
switch ( e->button() ) {
- case Qt::LeftButton:
+ case TQt::LeftButton:
switch (getType(*it)) {
case Type_is_KDGanttViewItem:
if ( getItem(*it)->enabled() )
@@ -3739,7 +3739,7 @@ void KDGanttCanvasView::contentsMouseDoubleClickEvent ( TQMouseEvent * e )
}
break;
/*
- case Qt::RightButton:
+ case TQt::RightButton:
switch (getType(*it)) {
case Type_is_KDGanttViewItem:
mySignalSender->itemRightClicked(getItem(*it));
@@ -3751,7 +3751,7 @@ void KDGanttCanvasView::contentsMouseDoubleClickEvent ( TQMouseEvent * e )
break;
}
break;
- case Qt::MidButton:
+ case TQt::MidButton:
switch (getType(*it)) {
case Type_is_KDGanttViewItem:
mySignalSender->itemMidClicked(getItem(*it));
@@ -4025,7 +4025,7 @@ void KDIntervalColorRectangle::layout( KDTimeHeaderWidget* timeHeader, int heigh
if ( right == left )
++right;
setPen( TQPen(TQPen::NoPen) );
- setBrush( TQBrush(mColor, Qt::SolidPattern) );
+ setBrush( TQBrush(mColor, TQt::SolidPattern) );
setSize( right - left, height );
move( left, 0 );
show();
diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h
index 965977e1..ae700916 100644
--- a/kdgantt/KDGanttViewSubwidgets.h
+++ b/kdgantt/KDGanttViewSubwidgets.h
@@ -75,7 +75,7 @@ class KDTimeHeaderToolTip;
class KDTimeHeaderWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -253,7 +253,7 @@ class KDListView ;
class KDTimeTableWidget : public TQCanvas
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -330,7 +330,7 @@ private:
class KDLegendWidget : public KDGanttSemiSizingControl
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -357,7 +357,7 @@ public:
class KDGanttView;
class KDListView : public TQListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -486,7 +486,7 @@ class KDCanvasToolTip;
class KDGanttCanvasView : public TQCanvasView
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kdgantt/KDGanttViewTaskLink.cpp b/kdgantt/KDGanttViewTaskLink.cpp
index f6fa6883..9b044fc4 100644
--- a/kdgantt/KDGanttViewTaskLink.cpp
+++ b/kdgantt/KDGanttViewTaskLink.cpp
@@ -268,7 +268,7 @@ void KDGanttViewTaskLink::showMe( bool visible )
TQPen p;
TQBrush b;
p.setWidth(wid);
- b.setStyle(Qt::SolidPattern);
+ b.setStyle(TQt::SolidPattern);
if (ishighlighted) {
b.setColor(myColorHL);
p.setColor(myColorHL);
@@ -333,7 +333,7 @@ void KDGanttViewTaskLink::showMeType( bool visible )
TQPen p;
TQBrush b;
p.setWidth(wid);
- b.setStyle(Qt::SolidPattern);
+ b.setStyle(TQt::SolidPattern);
if (ishighlighted) {
b.setColor(myColorHL);
p.setColor(myColorHL);
diff --git a/kdgantt/KDGanttXMLTools.cpp b/kdgantt/KDGanttXMLTools.cpp
index 5f181934..02c3537a 100644
--- a/kdgantt/KDGanttXMLTools.cpp
+++ b/kdgantt/KDGanttXMLTools.cpp
@@ -266,20 +266,20 @@ void createTimeNode( TQDomDocument& doc, TQDomNode& parent,
}
-TQString penStyleToString( Qt::PenStyle style )
+TQString penStyleToString( TQt::PenStyle style )
{
switch( style ) {
- case Qt::NoPen:
+ case TQt::NoPen:
return "NoPen";
- case Qt::SolidLine:
+ case TQt::SolidLine:
return "SolidLine";
- case Qt::DashLine:
+ case TQt::DashLine:
return "DashLine";
- case Qt::DotLine:
+ case TQt::DotLine:
return "DotLine";
- case Qt::DashDotLine:
+ case TQt::DashDotLine:
return "DashDotLine";
- case Qt::DashDotDotLine:
+ case TQt::DashDotDotLine:
return "DashDotDotLine";
default: // should not happen
return "SolidLine";
@@ -288,39 +288,39 @@ TQString penStyleToString( Qt::PenStyle style )
-TQString brushStyleToString( Qt::BrushStyle style )
+TQString brushStyleToString( TQt::BrushStyle style )
{
// PENDING(kalle) Support custom patterns
switch( style ) {
- case Qt::NoBrush:
+ case TQt::NoBrush:
return "NoBrush";
- case Qt::SolidPattern:
+ case TQt::SolidPattern:
return "SolidPattern";
- case Qt::Dense1Pattern:
+ case TQt::Dense1Pattern:
return "Dense1Pattern";
- case Qt::Dense2Pattern:
+ case TQt::Dense2Pattern:
return "Dense2Pattern";
- case Qt::Dense3Pattern:
+ case TQt::Dense3Pattern:
return "Dense3Pattern";
- case Qt::Dense4Pattern:
+ case TQt::Dense4Pattern:
return "Dense4Pattern";
- case Qt::Dense5Pattern:
+ case TQt::Dense5Pattern:
return "Dense5Pattern";
- case Qt::Dense6Pattern:
+ case TQt::Dense6Pattern:
return "Dense6Pattern";
- case Qt::Dense7Pattern:
+ case TQt::Dense7Pattern:
return "Dense7Pattern";
- case Qt::HorPattern:
+ case TQt::HorPattern:
return "HorPattern";
- case Qt::VerPattern:
+ case TQt::VerPattern:
return "VerPattern";
- case Qt::CrossPattern:
+ case TQt::CrossPattern:
return "CrossPattern";
- case Qt::BDiagPattern:
+ case TQt::BDiagPattern:
return "BDiagPattern";
- case Qt::FDiagPattern:
+ case TQt::FDiagPattern:
return "FDiagPattern";
- case Qt::DiagCrossPattern:
+ case TQt::DiagCrossPattern:
return "DiagCrossPattern";
default: // should not happen (but can for a custom pattern)
return "SolidPattern";
@@ -399,7 +399,7 @@ bool readBrushNode( const TQDomElement& element, TQBrush& brush )
{
bool ok = true;
TQColor tempColor;
- Qt::BrushStyle tempStyle;
+ TQt::BrushStyle tempStyle;
TQPixmap tempPixmap;
TQDomNode node = element.firstChild();
while( !node.isNull() ) {
@@ -506,7 +506,7 @@ bool readPenNode( const TQDomElement& element, TQPen& pen )
bool ok = true;
int tempWidth;
TQColor tempColor;
- Qt::PenStyle tempStyle;
+ TQt::PenStyle tempStyle;
TQDomNode node = element.firstChild();
while( !node.isNull() ) {
TQDomElement element = node.toElement();
@@ -705,60 +705,60 @@ bool readTimeNode( const TQDomElement& element, TQTime& value )
-Qt::PenStyle stringToPenStyle( const TQString& style )
+TQt::PenStyle stringToPenStyle( const TQString& style )
{
if( style == "NoPen" )
- return Qt::NoPen;
+ return TQt::NoPen;
else if( style == "SolidLine" )
- return Qt::SolidLine;
+ return TQt::SolidLine;
else if( style == "DashLine" )
- return Qt::DashLine;
+ return TQt::DashLine;
else if( style == "DotLine" )
- return Qt::DotLine;
+ return TQt::DotLine;
else if( style == "DashDotLine" )
- return Qt::DashDotLine;
+ return TQt::DashDotLine;
else if( style == "DashDotDotLine" )
- return Qt::DashDotDotLine;
+ return TQt::DashDotDotLine;
else // should not happen
- return Qt::SolidLine;
+ return TQt::SolidLine;
}
-Qt::BrushStyle stringToBrushStyle( const TQString& style )
+TQt::BrushStyle stringToBrushStyle( const TQString& style )
{
// PENDING(kalle) Support custom patterns
if( style == "NoBrush" )
- return Qt::NoBrush;
+ return TQt::NoBrush;
else if( style == "SolidPattern" )
- return Qt::SolidPattern;
+ return TQt::SolidPattern;
else if( style == "Dense1Pattern" )
- return Qt::Dense1Pattern;
+ return TQt::Dense1Pattern;
else if( style == "Dense2Pattern" )
- return Qt::Dense2Pattern;
+ return TQt::Dense2Pattern;
else if( style == "Dense3Pattern" )
- return Qt::Dense3Pattern;
+ return TQt::Dense3Pattern;
else if( style == "Dense4Pattern" )
- return Qt::Dense4Pattern;
+ return TQt::Dense4Pattern;
else if( style == "Dense5Pattern" )
- return Qt::Dense5Pattern;
+ return TQt::Dense5Pattern;
else if( style == "Dense6Pattern" )
- return Qt::Dense6Pattern;
+ return TQt::Dense6Pattern;
else if( style == "Dense7Pattern" )
- return Qt::Dense7Pattern;
+ return TQt::Dense7Pattern;
else if( style == "HorPattern" )
- return Qt::HorPattern;
+ return TQt::HorPattern;
else if( style == "VerPattern" )
- return Qt::VerPattern;
+ return TQt::VerPattern;
else if( style == "CrossPattern" )
- return Qt::CrossPattern;
+ return TQt::CrossPattern;
else if( style == "BDiagPattern" )
- return Qt::BDiagPattern;
+ return TQt::BDiagPattern;
else if( style == "FDiagPattern" )
- return Qt::FDiagPattern;
+ return TQt::FDiagPattern;
else if( style == "DiagCrossPattern" )
- return Qt::DiagCrossPattern;
+ return TQt::DiagCrossPattern;
else // should not happen (but can with custom patterns)
- return Qt::SolidPattern;
+ return TQt::SolidPattern;
}
}
diff --git a/kdgantt/KDGanttXMLTools.h b/kdgantt/KDGanttXMLTools.h
index 8a7067c0..a7a61c1d 100644
--- a/kdgantt/KDGanttXMLTools.h
+++ b/kdgantt/KDGanttXMLTools.h
@@ -45,10 +45,10 @@
#include <tqdatetime.h>
namespace KDGanttXML {
- TQString penStyleToString( Qt::PenStyle style );
- Qt::PenStyle stringToPenStyle( const TQString& style );
- TQString brushStyleToString( Qt::BrushStyle style );
- Qt::BrushStyle stringToBrushStyle( const TQString& style );
+ TQString penStyleToString( TQt::PenStyle style );
+ TQt::PenStyle stringToPenStyle( const TQString& style );
+ TQString brushStyleToString( TQt::BrushStyle style );
+ TQt::BrushStyle stringToBrushStyle( const TQString& style );
void createBoolNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, bool value );
diff --git a/kdgantt/itemAttributeDialog.ui b/kdgantt/itemAttributeDialog.ui
index 5a34dbb5..2eaa3173 100644
--- a/kdgantt/itemAttributeDialog.ui
+++ b/kdgantt/itemAttributeDialog.ui
@@ -702,7 +702,7 @@
<variables>
<variable>KDGanttViewItem * myItem</variable>
</variables>
-<Q_SLOTS>
+<slots>
<slot>init()</slot>
<slot>ChangeText_clicked()</slot>
<slot>ChangeStart_clicked()</slot>
@@ -732,6 +732,6 @@
<slot>CalBox_toggled( bool mode )</slot>
<slot>PrioSlider_valueChanged( int val )</slot>
<slot returnType="KDGanttViewItem *">getItem()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kgantt/kgantt/KGantt.cpp b/kgantt/kgantt/KGantt.cpp
index f16d4776..59df7764 100644
--- a/kgantt/kgantt/KGantt.cpp
+++ b/kgantt/kgantt/KGantt.cpp
@@ -58,8 +58,8 @@ KGantt::KGantt(KGanttItem* toplevelitem,
_ganttbar = new xQGanttBarView(_toplevelitem, _splitter);
_ganttbar->setPalette(pal1);
- connect(_ganttbar, TQT_SIGNAL(contentsMoving(int,int)),
- _ganttlist, TQT_SLOT(contentsMoved(int,int)));
+ connect(_ganttbar, TQ_SIGNAL(contentsMoving(int,int)),
+ _ganttlist, TQ_SLOT(contentsMoved(int,int)));
_ganttlist->setBarView(_ganttbar);
diff --git a/kgantt/kgantt/KGantt.h b/kgantt/kgantt/KGantt.h
index ea83a213..e49e9045 100644
--- a/kgantt/kgantt/KGantt.h
+++ b/kgantt/kgantt/KGantt.h
@@ -91,7 +91,7 @@ class KDE_EXPORT KGantt : public TQWidget
////////////////////////////////
{
- Q_OBJECT
+ TQ_OBJECT
diff --git a/kgantt/kgantt/KGanttBarConfig.cpp b/kgantt/kgantt/KGanttBarConfig.cpp
index ff5f4ee8..547373b1 100644
--- a/kgantt/kgantt/KGanttBarConfig.cpp
+++ b/kgantt/kgantt/KGanttBarConfig.cpp
@@ -20,8 +20,8 @@ KGanttBarConfig::KGanttBarConfig(xQGanttBarView* barview,
_barview = barview;
KColorButton* b = new KColorButton(this);
- connect(b, TQT_SIGNAL(changed(const TQColor&)),
- this, TQT_SLOT(changeBackground(const TQColor&)));
+ connect(b, TQ_SIGNAL(changed(const TQColor&)),
+ this, TQ_SLOT(changeBackground(const TQColor&)));
}
diff --git a/kgantt/kgantt/KGanttBarConfig.h b/kgantt/kgantt/KGanttBarConfig.h
index 2cd0f11d..0aac5082 100644
--- a/kgantt/kgantt/KGanttBarConfig.h
+++ b/kgantt/kgantt/KGanttBarConfig.h
@@ -37,7 +37,7 @@ class xQGanttBarView;
class KGanttBarConfig : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kgantt/kgantt/KGanttItem.cpp b/kgantt/kgantt/KGanttItem.cpp
index f032ede0..c517e767 100644
--- a/kgantt/kgantt/KGanttItem.cpp
+++ b/kgantt/kgantt/KGanttItem.cpp
@@ -94,8 +94,8 @@ KGanttItem::addRelation(KGanttItem* from, KGanttItem* to,
KGanttRelation* rel = new KGanttRelation(from,to,text);
_relations.append(rel);
- connect(rel, TQT_SIGNAL(destroyed(KGanttRelation*)),
- this, TQT_SLOT(removeRelation(KGanttRelation*)));
+ connect(rel, TQ_SIGNAL(destroyed(KGanttRelation*)),
+ this, TQ_SLOT(removeRelation(KGanttRelation*)));
emit changed(this, RelationAdded);
return rel;
@@ -130,8 +130,8 @@ KGanttItem::registerItem(KGanttItem* item)
{
_subitems.append(item);
- connect(item, TQT_SIGNAL(changed(KGanttItem*, KGanttItem::Change)),
- this, TQT_SLOT(subItemChanged(KGanttItem*, KGanttItem::Change)) );
+ connect(item, TQ_SIGNAL(changed(KGanttItem*, KGanttItem::Change)),
+ this, TQ_SLOT(subItemChanged(KGanttItem*, KGanttItem::Change)) );
bool minChanged = false;
bool maxChanged = false;
diff --git a/kgantt/kgantt/KGanttItem.h b/kgantt/kgantt/KGanttItem.h
index 67c1a198..3472b889 100644
--- a/kgantt/kgantt/KGanttItem.h
+++ b/kgantt/kgantt/KGanttItem.h
@@ -55,7 +55,7 @@ class KDE_EXPORT KGanttItem : public TQObject
//////////////////////////////////
{
- Q_OBJECT
+ TQ_OBJECT
diff --git a/kgantt/kgantt/KGanttRelation.cpp b/kgantt/kgantt/KGanttRelation.cpp
index e5eab3b4..13bba2aa 100644
--- a/kgantt/kgantt/KGanttRelation.cpp
+++ b/kgantt/kgantt/KGanttRelation.cpp
@@ -23,11 +23,11 @@ KGanttRelation::KGanttRelation(KGanttItem* from, KGanttItem* to,
_text = text;
_pen = TQPen(TQColor(20,20,20),1);
- connect(from, TQT_SIGNAL(destroyed(KGanttItem*)),
- this, TQT_SLOT(itemDestroyed(KGanttItem*)));
+ connect(from, TQ_SIGNAL(destroyed(KGanttItem*)),
+ this, TQ_SLOT(itemDestroyed(KGanttItem*)));
- connect(to, TQT_SIGNAL(destroyed(KGanttItem*)),
- this, TQT_SLOT(itemDestroyed(KGanttItem*)));
+ connect(to, TQ_SIGNAL(destroyed(KGanttItem*)),
+ this, TQ_SLOT(itemDestroyed(KGanttItem*)));
}
diff --git a/kgantt/kgantt/KGanttRelation.h b/kgantt/kgantt/KGanttRelation.h
index 08080bea..30028e80 100644
--- a/kgantt/kgantt/KGanttRelation.h
+++ b/kgantt/kgantt/KGanttRelation.h
@@ -49,7 +49,7 @@ class KGanttRelation : public TQObject
//////////////////////////////////
{
- Q_OBJECT
+ TQ_OBJECT
friend class KGanttItem;
diff --git a/kgantt/kgantt/xQGanttBarView.cpp b/kgantt/kgantt/xQGanttBarView.cpp
index 60d25797..3e691c04 100644
--- a/kgantt/kgantt/xQGanttBarView.cpp
+++ b/kgantt/kgantt/xQGanttBarView.cpp
@@ -33,14 +33,14 @@ xQGanttBarView::xQGanttBarView(KGanttItem* toplevelitem,
_viewport->setMode(xQGanttBarViewPort::Select);
- connect(_viewport, TQT_SIGNAL(scroll(int,int)),
- this, TQT_SLOT(scrollBy(int,int)) );
+ connect(_viewport, TQ_SIGNAL(scroll(int,int)),
+ this, TQ_SLOT(scrollBy(int,int)) );
- connect(_viewport, TQT_SIGNAL(recalculated()),
- this, TQT_SLOT(drawHeader()) );
+ connect(_viewport, TQ_SIGNAL(recalculated()),
+ this, TQ_SLOT(drawHeader()) );
- connect(horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(horizontalScrollBarChanged(int)) );
+ connect(horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(horizontalScrollBarChanged(int)) );
}
diff --git a/kgantt/kgantt/xQGanttBarView.h b/kgantt/kgantt/xQGanttBarView.h
index bec47a61..c1f4b1ba 100644
--- a/kgantt/kgantt/xQGanttBarView.h
+++ b/kgantt/kgantt/xQGanttBarView.h
@@ -51,7 +51,7 @@ class xQGanttBarView : public TQScrollView
//////////////////////////////////////////
{
- Q_OBJECT
+ TQ_OBJECT
diff --git a/kgantt/kgantt/xQGanttBarViewPort.cpp b/kgantt/kgantt/xQGanttBarViewPort.cpp
index 2c3a348e..5aca74c9 100644
--- a/kgantt/kgantt/xQGanttBarViewPort.cpp
+++ b/kgantt/kgantt/xQGanttBarViewPort.cpp
@@ -52,8 +52,8 @@ xQGanttBarViewPort::xQGanttBarViewPort(KGanttItem* toplevelitem,
_itemTextEdit->hide();
_itemTextEdit->setFrame(false);
- connect(_itemTextEdit, TQT_SIGNAL(returnPressed ()),
- this, TQT_SLOT(textEdited()));
+ connect(_itemTextEdit, TQ_SIGNAL(returnPressed ()),
+ this, TQ_SLOT(textEdited()));
_iconloader = new TDEIconLoader();
@@ -83,12 +83,12 @@ xQGanttBarViewPort::xQGanttBarViewPort(KGanttItem* toplevelitem,
_cursor_lupe = new TQCursor( TQPixmap(lupe) );
- connect(_toplevelitem, TQT_SIGNAL(changed(KGanttItem*, KGanttItem::Change)),
- this, TQT_SLOT(toplevelitemChanged(KGanttItem*, KGanttItem::Change)) );
+ connect(_toplevelitem, TQ_SIGNAL(changed(KGanttItem*, KGanttItem::Change)),
+ this, TQ_SLOT(toplevelitemChanged(KGanttItem*, KGanttItem::Change)) );
recalc(); adjustSize();
- setFocusPolicy(TQ_StrongFocus);
+ setFocusPolicy(TQWidget::StrongFocus);
_mode = Init;
}
@@ -116,8 +116,8 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw)
_toolbar->insertButton("ganttSelect.png", 0,
- TQT_SIGNAL(clicked()),
- TQT_TQOBJECT(this), TQT_SLOT(setSelect()),
+ TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(setSelect()),
true, i18n("Select") );
TDEPopupMenu *selectMenu = new TDEPopupMenu(_toolbar);
@@ -128,7 +128,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw)
*/
TQPixmap pix = _iconloader->loadIcon("ganttSelecttask.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("ganttSelecttask.png not found !\n");
- selectMenu->insertItem(pix, i18n("Select All"), TQT_TQOBJECT(this), TQT_SLOT(selectAll()) );
+ selectMenu->insertItem(pix, i18n("Select All"), this, TQ_SLOT(selectAll()) );
/*
@@ -136,7 +136,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw)
*/
pix = _iconloader->loadIcon("ganttUnselecttask", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("ganttUnselecttask.png not found !\n");
- selectMenu->insertItem(pix, i18n("Unselect All"), TQT_TQOBJECT(this), TQT_SLOT(unselectAll()) );
+ selectMenu->insertItem(pix, i18n("Unselect All"), this, TQ_SLOT(unselectAll()) );
TDEToolBarButton* b = _toolbar->getButton(0);
@@ -144,31 +144,31 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw)
_toolbar->insertButton("viewmag.png", 1,
- TQT_SIGNAL(clicked()),
- TQT_TQOBJECT(this), TQT_SLOT(setZoom()),
+ TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(setZoom()),
true, i18n("Zoom") );
TDEPopupMenu* zoomMenu = new TDEPopupMenu(_toolbar);
pix = _iconloader->loadIcon("viewmag.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("viewmag.png not found !\n");
- zoomMenu->insertItem(pix, i18n("Zoom All"), TQT_TQOBJECT(this), TQT_SLOT(zoomAll()) );
+ zoomMenu->insertItem(pix, i18n("Zoom All"), this, TQ_SLOT(zoomAll()) );
zoomMenu->insertSeparator();
pix = _iconloader->loadIcon("viewmag+.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("viewmag+.png not found !\n");
- zoomMenu->insertItem(pix, i18n("Zoom In +"), TQT_TQOBJECT(this), TQT_SLOT(zoomIn()) );
+ zoomMenu->insertItem(pix, i18n("Zoom In +"), this, TQ_SLOT(zoomIn()) );
pix = _iconloader->loadIcon("viewmag-.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("viewmag-.png not found !\n");
- zoomMenu->insertItem(pix, i18n("Zoom Out -"), TQT_TQOBJECT(this), TQT_SLOT(zoomOut()) );
+ zoomMenu->insertItem(pix, i18n("Zoom Out -"), this, TQ_SLOT(zoomOut()) );
b = _toolbar->getButton(1);
b->setDelayedPopup(zoomMenu);
_toolbar->insertButton("move.png", 2,
- TQT_SIGNAL(clicked()),
- TQT_TQOBJECT(this), TQT_SLOT(setMove()),
+ TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(setMove()),
true, i18n("Move") );
return _toolbar;
@@ -191,17 +191,17 @@ xQGanttBarViewPort::initMenu()
TQPixmap pix = _iconloader->loadIcon("ganttSelect.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("ganttSelect.png not found !\n");
- _selectMenu->insertItem(pix, i18n("Select Mode"), this, TQT_SLOT(setSelect()));
+ _selectMenu->insertItem(pix, i18n("Select Mode"), this, TQ_SLOT(setSelect()));
_selectMenu->insertSeparator();
pix = _iconloader->loadIcon("ganttSelecttask.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("ganttSelecttask.png not found !\n");
- _selectMenu->insertItem(pix, i18n("Select All"), this, TQT_SLOT(selectAll()) );
+ _selectMenu->insertItem(pix, i18n("Select All"), this, TQ_SLOT(selectAll()) );
pix = _iconloader->loadIcon("ganttUnselecttask", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("ganttUnselecttask.png not found !\n");
- _selectMenu->insertItem(pix, i18n("Unselect All"), this, TQT_SLOT(unselectAll()) );
+ _selectMenu->insertItem(pix, i18n("Unselect All"), this, TQ_SLOT(unselectAll()) );
_menu->insertItem( i18n("Select"), _selectMenu);
@@ -214,32 +214,32 @@ xQGanttBarViewPort::initMenu()
pix = _iconloader->loadIcon("viewmag.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("viewmag.png not found !\n");
- _zoomMenu->insertItem(i18n("Zoom Mode"), this, TQT_SLOT(setZoom()) );
+ _zoomMenu->insertItem(i18n("Zoom Mode"), this, TQ_SLOT(setZoom()) );
_zoomMenu->insertSeparator();
- _zoomMenu->insertItem(pix, i18n("Zoom All"), this, TQT_SLOT(zoomAll()) );
+ _zoomMenu->insertItem(pix, i18n("Zoom All"), this, TQ_SLOT(zoomAll()) );
_zoomMenu->insertSeparator();
pix = _iconloader->loadIcon("viewmag+.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("viewmag+.png not found !\n");
- _zoomMenu->insertItem(pix, i18n("Zoom In +"), this, TQT_SLOT(zoomIn()) );
+ _zoomMenu->insertItem(pix, i18n("Zoom In +"), this, TQ_SLOT(zoomIn()) );
pix = _iconloader->loadIcon("viewmag-.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("viewmag-.png not found !\n");
- _zoomMenu->insertItem(pix, i18n("Zoom Out -"), this, TQT_SLOT(zoomOut()) );
+ _zoomMenu->insertItem(pix, i18n("Zoom Out -"), this, TQ_SLOT(zoomOut()) );
_menu->insertItem( "Zoom", _zoomMenu);
pix = _iconloader->loadIcon("move.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("move.png not found !\n");
- _menu->insertItem(pix, i18n("Move Mode"), this, TQT_SLOT(setMove()) );
+ _menu->insertItem(pix, i18n("Move Mode"), this, TQ_SLOT(setMove()) );
_menu->insertSeparator();
pix = _iconloader->loadIcon("configure.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("configure.png not found !\n");
- _menu->insertItem(pix, i18n("Configure Gantt..."), _parent, TQT_SLOT(showConfig()));
+ _menu->insertItem(pix, i18n("Configure Gantt..."), _parent, TQ_SLOT(showConfig()));
}
@@ -1017,8 +1017,8 @@ xQGanttBarViewPort::deleteSelectedItems()
#ifdef _DEBUG_
printf(" : %s \n", subitem->getText().latin1() );
#endif
- connect(subitem, TQT_SIGNAL(destroyed(KGanttItem*)),
- this, TQT_SLOT(itemDestroyed(KGanttItem*)));
+ connect(subitem, TQ_SIGNAL(destroyed(KGanttItem*)),
+ this, TQ_SLOT(itemDestroyed(KGanttItem*)));
}
list.remove(_toplevelitem);
diff --git a/kgantt/kgantt/xQGanttBarViewPort.h b/kgantt/kgantt/xQGanttBarViewPort.h
index c78ffd5a..09054552 100644
--- a/kgantt/kgantt/xQGanttBarViewPort.h
+++ b/kgantt/kgantt/xQGanttBarViewPort.h
@@ -89,7 +89,7 @@ class KDE_EXPORT xQGanttBarViewPort : public TQFrame
////////////////////////////////////////
{
- Q_OBJECT
+ TQ_OBJECT
friend class xQGanttBarView;
diff --git a/kgantt/kgantt/xQGanttBarViewPort_Events.cpp b/kgantt/kgantt/xQGanttBarViewPort_Events.cpp
index 52f017e2..94b59726 100644
--- a/kgantt/kgantt/xQGanttBarViewPort_Events.cpp
+++ b/kgantt/kgantt/xQGanttBarViewPort_Events.cpp
@@ -43,7 +43,7 @@ xQGanttBarViewPort::mousePressEvent(TQMouseEvent* e)
_itemTextEdit->hide();
// right mousebutton & control -> popup menu
- if(e->button() == Qt::RightButton && e->state() == ControlButton ) {
+ if(e->button() == TQt::RightButton && e->state() == ControlButton ) {
_menu->popup(e->globalPos());
return;
}
@@ -64,7 +64,7 @@ xQGanttBarViewPort::mousePressEvent(TQMouseEvent* e)
/*
* edit text
*/
- if(e->button() == Qt::MidButton && _mode == Select) {
+ if(e->button() == TQt::MidButton && _mode == Select) {
xTQTaskPosition* tp = _gItemList.find(_currentItem);
TQPainter p(this);
@@ -91,7 +91,7 @@ xQGanttBarViewPort::mousePressEvent(TQMouseEvent* e)
/*
* open/close item, move start, end, item
*/
- if(e->button() == Qt::LeftButton && _mode == Select) {
+ if(e->button() == TQt::LeftButton && _mode == Select) {
_timediff = 0;
@@ -210,21 +210,21 @@ xQGanttBarViewPort::mouseReleaseEvent(TQMouseEvent* e)
if(!_Mousemoved) {
- if(e->button() == Qt::LeftButton)
+ if(e->button() == TQt::LeftButton)
zoom(1.4, e->x(), e->y() );
- if(e->button() == Qt::RightButton)
+ if(e->button() == TQt::RightButton)
zoom(0.7, e->x(), e->y() );
- if(e->button() == Qt::MidButton)
+ if(e->button() == TQt::MidButton)
zoomAll();
}
else {
- if(_currentMButton == Qt::LeftButton) {
+ if(_currentMButton == TQt::LeftButton) {
TQPainter p(this);
TQPen pen(DashLine);
@@ -284,7 +284,7 @@ xQGanttBarViewPort::mouseMoveEvent(TQMouseEvent* e)
case Select: {
- if(_currentMButton == Qt::LeftButton && _currentItem) {
+ if(_currentMButton == TQt::LeftButton && _currentItem) {
TQPainter p(this);
p.setRasterOp(XorROP);
@@ -442,7 +442,7 @@ xQGanttBarViewPort::mouseMoveEvent(TQMouseEvent* e)
case Zoom: {
- if(_currentMButton == Qt::LeftButton) {
+ if(_currentMButton == TQt::LeftButton) {
static TQString strpos;
diff --git a/kgantt/kgantt/xQGanttListView.h b/kgantt/kgantt/xQGanttListView.h
index 34a89eb8..ec4f880a 100644
--- a/kgantt/kgantt/xQGanttListView.h
+++ b/kgantt/kgantt/xQGanttListView.h
@@ -48,7 +48,7 @@ class xQGanttListView : public TQScrollView
//////////////////////////////////////////////
{
- Q_OBJECT
+ TQ_OBJECT
diff --git a/kgantt/kgantt/xQGanttListViewPort.cpp b/kgantt/kgantt/xQGanttListViewPort.cpp
index d643fe8c..e12534ef 100644
--- a/kgantt/kgantt/xQGanttListViewPort.cpp
+++ b/kgantt/kgantt/xQGanttListViewPort.cpp
@@ -50,16 +50,16 @@ xQGanttListViewPort::setBarViewPort(xQGanttBarViewPort* v)
printf("setBarViewPort()\n");
- connect(_barviewport, TQT_SIGNAL(resized()),
- this, TQT_SLOT(barViewResized()));
+ connect(_barviewport, TQ_SIGNAL(resized()),
+ this, TQ_SLOT(barViewResized()));
- connect(_barviewport, TQT_SIGNAL(recalculated()),
- this, TQT_SLOT(update()));
+ connect(_barviewport, TQ_SIGNAL(recalculated()),
+ this, TQ_SLOT(update()));
/*
- connect(_barviewport, TQT_SIGNAL(contentsRepainted()),
- this, TQT_SLOT(barViewRepainted()));
+ connect(_barviewport, TQ_SIGNAL(contentsRepainted()),
+ this, TQ_SLOT(barViewRepainted()));
*/
}
diff --git a/kgantt/kgantt/xQGanttListViewPort.h b/kgantt/kgantt/xQGanttListViewPort.h
index ee2f4924..1f937521 100644
--- a/kgantt/kgantt/xQGanttListViewPort.h
+++ b/kgantt/kgantt/xQGanttListViewPort.h
@@ -48,7 +48,7 @@ class xQGanttListViewPort : public TQFrame
////////////////////////////////////////////
{
- Q_OBJECT
+ TQ_OBJECT
friend class xQGanttListView;
@@ -114,7 +114,7 @@ protected:
void mousePressEvent(TQMouseEvent* e) {
- if(e->button() == Qt::RightButton && e->state() == ControlButton ) {
+ if(e->button() == TQt::RightButton && e->state() == ControlButton ) {
_menu->popup(e->globalPos());
return;
}
diff --git a/kitchensync/CMakeL10n.txt b/kitchensync/CMakeL10n.txt
deleted file mode 100644
index b585ce4a..00000000
--- a/kitchensync/CMakeL10n.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-##### create translation templates ##############
-
-tde_l10n_auto_add_subdirectories( )
diff --git a/kitchensync/CMakeLists.txt b/kitchensync/CMakeLists.txt
deleted file mode 100644
index b5a2236b..00000000
--- a/kitchensync/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-#################################################
-#
-# (C) 2010-2011 Serghei Amelian
-# serghei (DOT) amelian (AT) gmail.com
-#
-# Improvements and feedback are welcome
-#
-# This file is released under GPL >= 2
-#
-#################################################
-
-message( AUTHOR_WARNING
- " \n"
- " ---------------------------------------------------------- \n"
- " *** NOTE *** \n"
- " Building kitchensync is deprecated and should not be done. \n"
- " kitchensync will be dropped starting from R14.2.0. \n"
- " Please contact the TDE development team on ML if you wish \n"
- " kitchensync to be continued. \n"
- " ---------------------------------------------------------- \n")
-
-add_subdirectory( libqopensync )
-add_subdirectory( src )
diff --git a/kitchensync/Makefile.am b/kitchensync/Makefile.am
deleted file mode 100644
index f2bf61b4..00000000
--- a/kitchensync/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = libqopensync src
-
-include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kitchensync/configure.in.bot b/kitchensync/configure.in.bot
deleted file mode 100644
index a612d1b7..00000000
--- a/kitchensync/configure.in.bot
+++ /dev/null
@@ -1,8 +0,0 @@
-if test "$HAVE_OPENSYNC" = 0 -o "$HAVE_OPENSYNC_ENGINE" = 0; then
- echo ""
- echo "You're missing a compatible version of libopensync."
- echo "Version 0.19 or greater is needed."
- echo "kitchensync will not be built."
- echo ""
- all_tests=bad
-fi
diff --git a/kitchensync/configure.in.in b/kitchensync/configure.in.in
deleted file mode 100644
index 31bb902c..00000000
--- a/kitchensync/configure.in.in
+++ /dev/null
@@ -1,68 +0,0 @@
-dnl configure.in.in for OpenSync based KitchenSync
-dnl
-dnl Copyright (C) 2005 Holger Hans Peter Freyther
-dnl
-dnl Based on KPilot's configure.in
-dnl Copyright (C) 2000,2001 Adriaan de Groot
-dnl
-dnl This file is released under the terms of the GNU General Public
-dnl Licence (GPL) Version 2.
-
-
-
-dnl we need PKG_CONFIG for doing these tests
-AC_DEFUN([KITCHENSYNC_CHECK_OPENSYNC],[
-dnl AC_REQUIRE([PKG_CHECK_MODULES])
-
-dnl Say what we're doing
-AC_MSG_CHECKING(for opensync (for KitchenSync))
-AC_ARG_WITH(opensync,
-[ --with-opensync=PATH set prefix for opensync files],
-)dnl
-
-dnl change pkg_config_path if we have a OpenSync prefix
-dnl and also set it to our prefix
-if test -d "$with_opensync"; then
- export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/usr/lib/pkgconfig:$with_opensync/lib/pkgconfig
-fi
-export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:$prefix/lib/pkgconfig:/usr/local/lib/pkgconfig
-
-
-HAVE_OPENSYNC=0
-HAVE_OPENSYNC_ENGINE=0
-PKG_CHECK_MODULES(OPENSYNC, opensync-1.0 >= 0.19, HAVE_OPENSYNC=1,HAVE_OPENSYNC=0)
-PKG_CHECK_MODULES(OPENSYNCENGINE, osengine-1.0 >= 0.19, HAVE_OPENSYNC_ENGINE=1, HAVE_OPENSYNC_ENGINE=0)
-PKG_CHECK_MODULES(LIBXML, libxml-2.0, , HAVE_OPENSYNC=0)
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.6, , HAVE_OPENSYNC=0)
-
-if test -z "PKG_CONFIG"; then
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-fi
-
-if test "$PKG_CONFIG" != "no"; then
- OPENSYNC_CONFIGDIR=`$PKG_CONFIG --variable=configdir "opensync-1.0"`
- OPENSYNC_PLUGINDIR=`$PKG_CONFIG --variable=plugindir "opensync-1.0"`
- OPENSYNC_FORMATSDIR=`$PKG_CONFIG --variable=formatsdir "opensync-1.0"`
- OPENSYNC_HEADERDIR=`$PKG_CONFIG --variable=headerdir "opensync-1.0"`
-fi
-
-AC_SUBST(OPENSYNC_CONFIGDIR)
-AC_SUBST(OPENSYNC_PLUGINDIR)
-AC_SUBST(OPENSYNC_FORMATSDIR)
-AC_SUBST(OPENSYNC_HEADERDIR)
-
-dnl Check if we can compile KitchenSync
-AM_CONDITIONAL(compile_kitchensync, test "$HAVE_OPENSYNC" = 1 -a "$HAVE_OPENSYNC_ENGINE" = 1)
-
-if test "$HAVE_OPENSYNC" = 1 -a "$HAVE_OPENSYNC_ENGINE" = 1 ; then
- AC_MSG_RESULT([found])
-else
- AC_MSG_RESULT([not found])
- DO_NOT_COMPILE="$DO_NOT_COMPILE kitchensync"
-fi
-
-])
-
-
-dnl Check For OpenSync support
-KITCHENSYNC_CHECK_OPENSYNC
diff --git a/kitchensync/libqopensync/CMakeLists.txt b/kitchensync/libqopensync/CMakeLists.txt
deleted file mode 100644
index c933d286..00000000
--- a/kitchensync/libqopensync/CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-#################################################
-#
-# (C) 2010-2011 Serghei Amelian
-# serghei (DOT) amelian (AT) gmail.com
-#
-# Improvements and feedback are welcome
-#
-# This file is released under GPL >= 2
-#
-#################################################
-
-include( ConfigureChecks.cmake )
-
-include_directories(
- ${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/..
- ${TDE_INCLUDE_DIR}
- ${TQT_INCLUDE_DIRS}
- ${OSENGINE_INCLUDE_DIRS}
- ${OPENSYNC_INCLUDE_DIRS}
-)
-
-link_directories(
- ${TQT_LIBRARY_DIRS}
-)
-
-
-##### qopensync (shared) ########################
-
-tde_add_library( qopensync SHARED AUTOMOC
- SOURCES
- callbackhandler.cpp conversion.cpp engine.cpp environment.cpp
- filter.cpp group.cpp member.cpp plugin.cpp result.cpp syncmapping.cpp
- syncupdates.cpp syncchange.cpp
- VERSION 0.0.0
- LINK tdeui-shared ${OSENGINE_LIBRARIES} ${OPENSYNC_LIBRARIES}
- DESTINATION ${LIB_INSTALL_DIR}
-)
diff --git a/kitchensync/libqopensync/ConfigureChecks.cmake b/kitchensync/libqopensync/ConfigureChecks.cmake
deleted file mode 100644
index 92d32930..00000000
--- a/kitchensync/libqopensync/ConfigureChecks.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-#################################################
-#
-# (C) 2010-2011 Serghei Amelian
-# serghei (DOT) amelian (AT) gmail.com
-#
-# Improvements and feedback are welcome
-#
-# This file is released under GPL >= 2
-#
-#################################################
-
-# NOTE is needed libopensync-0.22
-
-pkg_search_module( OPENSYNC opensync-1.0 )
-if( NOT OPENSYNC_FOUND )
- tde_message_fatal( "opensync-1.0 is requested, but was not found on your system" )
-endif( )
-
-pkg_search_module( OSENGINE osengine-1.0 )
-if( NOT OSENGINE_FOUND )
- tde_message_fatal( "osengine-1.0 is requested, but was not found on your system" )
-endif( )
diff --git a/kitchensync/libqopensync/Makefile.am b/kitchensync/libqopensync/Makefile.am
deleted file mode 100644
index 73bdae04..00000000
--- a/kitchensync/libqopensync/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-INCLUDES = -I$(top_srcdir)/kitchensync/src \
- -I$(top_srcdir)/kitchensync \
- -I$(top_srcdir) \
- $(OPENSYNC_CFLAGS) \
- $(OPENSYNCENGINE_CFLAGS) \
- $(all_includes)
-
-lib_LTLIBRARIES = libqopensync.la
-
-libqopensync_la_SOURCES = callbackhandler.cpp conversion.cpp engine.cpp environment.cpp filter.cpp group.cpp \
- member.cpp plugin.cpp result.cpp syncmapping.cpp syncupdates.cpp \
- syncchange.cpp
-libqopensync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-libqopensync_la_LIBADD = $(LIB_TDEUI) $(OPENSYNC_LIBS) $(OPENSYNCENGINE_LIBS)
-
-METASOURCES = AUTO
-
-messages: rc.cpp
- $(XGETTEXT) *.cpp *.h -o $(podir)/libqopensync.pot
diff --git a/kitchensync/libqopensync/callbackhandler.cpp b/kitchensync/libqopensync/callbackhandler.cpp
deleted file mode 100644
index f3ae4c68..00000000
--- a/kitchensync/libqopensync/callbackhandler.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <osengine/engine.h>
-
-#include <libqopensync/engine.h>
-
-#include <tqapplication.h>
-
-#include "callbackhandler.h"
-
-using namespace QSync;
-
-class CallbackHandler::ConflictEvent : public TQCustomEvent
-{
- public:
- ConflictEvent( const SyncMapping& mapping )
- : TQCustomEvent( ConflictEventType ), mMapping( mapping )
- {
- }
-
- SyncMapping mapping() const { return mMapping; }
-
- private:
- SyncMapping mMapping;
-};
-
-class CallbackHandler::ChangeEvent : public TQCustomEvent
-{
- public:
- ChangeEvent( const SyncChangeUpdate& change )
- : TQCustomEvent( ChangeEventType ), mChange( change )
- {
- }
-
- SyncChangeUpdate change() const { return mChange; }
-
- private:
- SyncChangeUpdate mChange;
-};
-
-class CallbackHandler::MappingEvent : public TQCustomEvent
-{
- public:
- MappingEvent( const SyncMappingUpdate& mapping )
- : TQCustomEvent( MappingEventType ), mMapping( mapping )
- {
- }
-
- SyncMappingUpdate mapping() const { return mMapping; }
-
- private:
- SyncMappingUpdate mMapping;
-};
-
-class CallbackHandler::EngineEvent : public TQCustomEvent
-{
- public:
- EngineEvent( const SyncEngineUpdate& engine )
- : TQCustomEvent( EngineEventType ), mEngine( engine )
- {
- }
-
- SyncEngineUpdate engine() const { return mEngine; }
-
- private:
- SyncEngineUpdate mEngine;
-};
-
-class CallbackHandler::MemberEvent : public TQCustomEvent
-{
- public:
- MemberEvent( const SyncMemberUpdate& member )
- : TQCustomEvent( MemberEventType ), mMember( member )
- {
- }
-
- SyncMemberUpdate member() const { return mMember; }
-
- private:
- SyncMemberUpdate mMember;
-};
-
-CallbackHandler::CallbackHandler()
-{
-}
-
-CallbackHandler::~CallbackHandler()
-{
-}
-
-void CallbackHandler::setEngine( Engine *engine )
-{
- mEngine = engine;
-
- osengine_set_conflict_callback( engine->mEngine, &conflict_callback, this );
- osengine_set_changestatus_callback( engine->mEngine, &change_callback, this );
- osengine_set_mappingstatus_callback( engine->mEngine, &mapping_callback, this );
- osengine_set_enginestatus_callback( engine->mEngine, &engine_callback, this );
- osengine_set_memberstatus_callback( engine->mEngine, &member_callback, this );
-}
-
-Engine* CallbackHandler::engine() const
-{
- return mEngine;
-}
-
-void CallbackHandler::customEvent( TQCustomEvent *event )
-{
- if ( event->type() == static_cast<TQEvent::Type>( ConflictEventType ) ) {
- ConflictEvent *conflictEvent = static_cast<ConflictEvent*>( event );
- emit conflict( conflictEvent->mapping() );
- } else if ( event->type() == static_cast<TQEvent::Type>( ChangeEventType ) ) {
- ChangeEvent *changeEvent = static_cast<ChangeEvent*>( event );
- emit change( changeEvent->change() );
- } else if ( event->type() == static_cast<TQEvent::Type>( MappingEventType ) ) {
- MappingEvent *mappingEvent = static_cast<MappingEvent*>( event );
- emit mapping( mappingEvent->mapping() );
- } else if ( event->type() == static_cast<TQEvent::Type>( EngineEventType ) ) {
- EngineEvent *engineEvent = static_cast<EngineEvent*>( event );
- emit engine( engineEvent->engine() );
- } else if ( event->type() == static_cast<TQEvent::Type>( MemberEventType ) ) {
- MemberEvent *memberEvent = static_cast<MemberEvent*>( event );
- emit member( memberEvent->member() );
- }
-}
-
-void CallbackHandler::conflict_callback( OSyncEngine *engine, OSyncMapping *omapping, void *data )
-{
- SyncMapping mapping( omapping, engine );
-
- CallbackHandler *handler = static_cast<CallbackHandler*>( data );
-
- TQApplication::postEvent( handler, new ConflictEvent( mapping ) );
-}
-
-void CallbackHandler::change_callback( OSyncEngine*, OSyncChangeUpdate *update, void *data )
-{
- SyncChangeUpdate change( update );
-
- CallbackHandler *handler = static_cast<CallbackHandler*>( data );
-
- TQApplication::postEvent( handler, new ChangeEvent( change ) );
-}
-
-void CallbackHandler::mapping_callback( OSyncMappingUpdate *update, void *data )
-{
- CallbackHandler *handler = static_cast<CallbackHandler*>( data );
-
- SyncMappingUpdate mapping( update, handler->engine()->mEngine );
-
- TQApplication::postEvent( handler, new MappingEvent( mapping ) );
-}
-
-void CallbackHandler::engine_callback( OSyncEngine*, OSyncEngineUpdate *update, void *data )
-{
- SyncEngineUpdate engine( update );
-
- CallbackHandler *handler = static_cast<CallbackHandler*>( data );
-
- TQApplication::postEvent( handler, new EngineEvent( engine ) );
-}
-
-void CallbackHandler::member_callback( OSyncMemberUpdate *update, void *data )
-{
- SyncMemberUpdate member( update );
-
- CallbackHandler *handler = static_cast<CallbackHandler*>( data );
-
- TQApplication::postEvent( handler, new MemberEvent( member ) );
-}
-
-#include "callbackhandler.moc"
diff --git a/kitchensync/libqopensync/callbackhandler.h b/kitchensync/libqopensync/callbackhandler.h
deleted file mode 100644
index 703e81fb..00000000
--- a/kitchensync/libqopensync/callbackhandler.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef TQSYNC_CALLBACKHANDLER_H
-#define TQSYNC_CALLBACKHANDLER_H
-
-#include <libqopensync/syncmapping.h>
-#include <libqopensync/syncupdates.h>
-
-#include <tqobject.h>
-
-class OSyncEngine;
-class OSyncMapping;
-class OSyncChangeUpdate;
-class OSyncMappingUpdate;
-class OSyncEngineUpdate;
-class OSyncMemberUpdate;
-
-class TQCustomEvent;
-
-namespace QSync {
-
-class Engine;
-
-class CallbackHandler : public TQObject
-{
- Q_OBJECT
-
-
- public:
- CallbackHandler();
- ~CallbackHandler();
-
- void setEngine( Engine *engine );
- Engine* engine() const;
-
- signals:
- void conflict( QSync::SyncMapping mapping );
- void change( const QSync::SyncChangeUpdate &update );
- void mapping( const QSync::SyncMappingUpdate &update );
- void engine( const QSync::SyncEngineUpdate &update );
- void member( const QSync::SyncMemberUpdate &update );
-
- protected:
- virtual void customEvent( TQCustomEvent *event );
-
- private:
- enum EventType {
- ConflictEventType = 4044,
- ChangeEventType,
- MappingEventType,
- EngineEventType,
- MemberEventType
- };
-
- class ConflictEvent;
- class ChangeEvent;
- class MappingEvent;
- class EngineEvent;
- class MemberEvent;
-
- static void conflict_callback( OSyncEngine*, OSyncMapping*, void* );
- static void change_callback( OSyncEngine*, OSyncChangeUpdate*, void* );
- static void mapping_callback( OSyncMappingUpdate*, void* );
- static void engine_callback( OSyncEngine*, OSyncEngineUpdate*, void* );
- static void member_callback( OSyncMemberUpdate*, void* );
-
- Engine* mEngine;
-};
-
-}
-
-#endif
diff --git a/kitchensync/libqopensync/conversion.cpp b/kitchensync/libqopensync/conversion.cpp
deleted file mode 100644
index 0be2fdb7..00000000
--- a/kitchensync/libqopensync/conversion.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2006 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <opensync/opensync.h>
-
-#include "conversion.h"
-
-using namespace QSync;
-
-Conversion::Conversion()
- : mEnvironment( 0 )
-{
-}
-
-Conversion::~Conversion()
-{
-}
-
-bool Conversion::isValid() const
-{
- return mEnvironment != 0;
-}
-
-TQStringList Conversion::objectTypes() const
-{
- Q_ASSERT( mEnvironment );
-
- OSyncFormatEnv *formatEnv = osync_conv_env_new( mEnvironment );
- Q_ASSERT( formatEnv );
-
- TQStringList types;
- for ( int i = 0; i < osync_conv_num_objtypes( formatEnv ); i++ ) {
- OSyncObjType *type = osync_conv_nth_objtype( formatEnv, i );
- types.append( TQString::fromUtf8( osync_objtype_get_name( type ) ) );
- }
-
- osync_conv_env_free( formatEnv );
-
- return types;
-}
diff --git a/kitchensync/libqopensync/conversion.h b/kitchensync/libqopensync/conversion.h
deleted file mode 100644
index 3e5204c9..00000000
--- a/kitchensync/libqopensync/conversion.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2006 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef TQSYNC_CONVERSION_H
-#define TQSYNC_CONVERSION_H
-
-#include <tqstringlist.h>
-
-class OSyncEnv;
-
-namespace QSync {
-
-class Conversion
-{
- friend class Environment;
-
- public:
- Conversion();
- ~Conversion();
-
- /**
- Returns whether the object is a valid conversion.
- */
- bool isValid() const;
-
- /**
- Returns the list of names of supported object types.
- */
- TQStringList objectTypes() const;
-
- private:
- OSyncEnv *mEnvironment;
-};
-
-}
-
-#endif
-
diff --git a/kitchensync/libqopensync/engine.cpp b/kitchensync/libqopensync/engine.cpp
deleted file mode 100644
index 6d48c72f..00000000
--- a/kitchensync/libqopensync/engine.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <opensync/opensync.h>
-#include <osengine/engine.h>
-
-#include "engine.h"
-
-using namespace QSync;
-
-Engine::Engine( const Group &group )
-{
- OSyncError *error = 0;
- mEngine = osengine_new( group.mGroup, &error );
-}
-
-Engine::~Engine()
-{
- osengine_free( mEngine );
- mEngine = 0;
-}
-
-Result Engine::initialize()
-{
- OSyncError *error = 0;
- if ( !osengine_init( mEngine, &error ) )
- return Result( &error );
- else
- return Result();
-}
-
-void Engine::finalize()
-{
- osengine_finalize( mEngine );
-}
-
-Result Engine::synchronize()
-{
- OSyncError *error = 0;
- if ( !osengine_synchronize( mEngine, &error ) )
- return Result( &error );
- else
- return Result();
-}
-
-void Engine::abort()
-{
- osengine_abort( mEngine );
-}
diff --git a/kitchensync/libqopensync/engine.h b/kitchensync/libqopensync/engine.h
deleted file mode 100644
index e014d3f4..00000000
--- a/kitchensync/libqopensync/engine.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef TQSYNC_ENGINE_H
-#define TQSYNC_ENGINE_H
-
-#include <libqopensync/group.h>
-
-class OSyncEngine;
-
-namespace QSync {
-
-class Engine
-{
- friend class CallbackHandler;
-
- public:
- /**
- Constructs an engine .
- */
- Engine( const Group &group );
-
- /**
- Destroys the engine.
- */
- ~Engine();
-
- /**
- Initializes the engine.
- */
- Result initialize();
-
- /**
- Finalizes the engine.
- */
- void finalize();
-
- /**
- Starts the synchronization process.
- */
- Result synchronize();
-
- /**
- Stops the synchronization process.
- */
- void abort();
-
- private:
- OSyncEngine *mEngine;
-};
-
-}
-
-#endif
diff --git a/kitchensync/libqopensync/environment.cpp b/kitchensync/libqopensync/environment.cpp
deleted file mode 100644
index f0d91808..00000000
--- a/kitchensync/libqopensync/environment.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include "environment.h"
-
-#include <opensync/opensync.h>
-
-using namespace QSync;
-
-Environment::Environment()
-{
- mEnvironment = osync_env_new();
-}
-
-Environment::~Environment()
-{
- osync_env_free( mEnvironment );
-}
-
-Environment::GroupIterator Environment::groupBegin()
-{
- GroupIterator it( this );
- it.mPos = 0;
-
- return it;
-}
-
-Environment::GroupIterator Environment::groupEnd()
-{
- GroupIterator it( this );
- it.mPos = groupCount();
-
- return it;
-}
-
-Environment::PluginIterator Environment::pluginBegin()
-{
- PluginIterator it( this );
- it.mPos = 0;
-
- return it;
-}
-
-Environment::PluginIterator Environment::pluginEnd()
-{
- PluginIterator it( this );
- it.mPos = pluginCount();
-
- return it;
-}
-
-Result Environment::initialize()
-{
- OSyncError *error = 0;
- if ( !osync_env_initialize( mEnvironment, &error ) )
- return Result( &error );
- else
- return Result();
-}
-
-Result Environment::finalize()
-{
- OSyncError *error = 0;
- if ( !osync_env_finalize( mEnvironment, &error ) )
- return Result( &error);
- else
- return Result();
-}
-
-int Environment::groupCount() const
-{
- return osync_env_num_groups( mEnvironment );
-}
-
-Group Environment::groupAt( int pos ) const
-{
- Group group;
-
- if ( pos < 0 || pos >= groupCount() )
- return group;
-
- OSyncGroup *ogroup = osync_env_nth_group( mEnvironment, pos );
- group.mGroup = ogroup;
-
- return group;
-}
-
-Group Environment::groupByName( const TQString &name ) const
-{
- Group group;
-
- OSyncGroup *ogroup = osync_env_find_group( mEnvironment, name.latin1() );
- if ( ogroup )
- group.mGroup = ogroup;
-
- return group;
-}
-
-Group Environment::addGroup()
-{
- Group group;
-
- OSyncGroup *ogroup = osync_group_new( mEnvironment );
- if ( ogroup )
- group.mGroup = ogroup;
-
- return group;
-}
-
-Result Environment::removeGroup( const Group &group )
-{
- OSyncError *error = 0;
- if ( !osync_group_delete( group.mGroup, &error ) )
- return Result( &error );
- else
- return Result();
-}
-
-int Environment::pluginCount() const
-{
- return osync_env_num_plugins( mEnvironment );
-}
-
-Plugin Environment::pluginAt( int pos ) const
-{
- Plugin plugin;
-
- if ( pos < 0 || pos >= pluginCount() )
- return plugin;
-
- OSyncPlugin *oplugin = osync_env_nth_plugin( mEnvironment, pos );
- plugin.mPlugin = oplugin;
-
- return plugin;
-}
-
-Plugin Environment::pluginByName( const TQString &name ) const
-{
- Plugin plugin;
-
- OSyncPlugin *oplugin = osync_env_find_plugin( mEnvironment, name.latin1() );
- if ( oplugin )
- plugin.mPlugin = oplugin;
-
- return plugin;
-}
-
-Conversion Environment::conversion() const
-{
- Conversion conversion;
- conversion.mEnvironment = mEnvironment;
-
- return conversion;
-}
diff --git a/kitchensync/libqopensync/environment.h b/kitchensync/libqopensync/environment.h
deleted file mode 100644
index 469ffd97..00000000
--- a/kitchensync/libqopensync/environment.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef OSYNC_ENVIRONMENT_H
-#define OSYNC_ENVIRONMENT_H
-
-#include <tqstring.h>
-
-#include <libqopensync/group.h>
-#include <libqopensync/plugin.h>
-#include <libqopensync/result.h>
-#include <libqopensync/conversion.h>
-
-struct OSyncEnv;
-
-namespace QSync {
-
-class Environment
-{
- public:
- Environment();
- ~Environment();
-
- class GroupIterator
- {
- friend class Environment;
-
- public:
- GroupIterator( Environment *environment )
- : mEnvironment( environment ), mPos( -1 )
- {
- }
-
- GroupIterator( const GroupIterator &it )
- {
- mEnvironment = it.mEnvironment;
- mPos = it.mPos;
- }
-
- Group operator*()
- {
- return mEnvironment->groupAt( mPos );
- }
-
- GroupIterator &operator++() { mPos++; return *this; }
- GroupIterator &operator++( int ) { mPos++; return *this; }
- GroupIterator &operator--() { mPos--; return *this; }
- GroupIterator &operator--( int ) { mPos--; return *this; }
- bool operator==( const GroupIterator &it ) { return mEnvironment == it.mEnvironment && mPos == it.mPos; }
- bool operator!=( const GroupIterator &it ) { return mEnvironment == it.mEnvironment && mPos != it.mPos; }
-
- private:
- Environment *mEnvironment;
- int mPos;
- };
-
- class PluginIterator
- {
- friend class Environment;
-
- public:
- PluginIterator( Environment *environment )
- : mEnvironment( environment ), mPos( -1 )
- {
- }
-
- PluginIterator( const PluginIterator &it )
- {
- mEnvironment = it.mEnvironment;
- mPos = it.mPos;
- }
-
- Plugin operator*()
- {
- return mEnvironment->pluginAt( mPos );
- }
-
- PluginIterator &operator++() { mPos++; return *this; }
- PluginIterator &operator++( int ) { mPos++; return *this; }
- PluginIterator &operator--() { mPos--; return *this; }
- PluginIterator &operator--( int ) { mPos--; return *this; }
- bool operator==( const PluginIterator &it ) { return mEnvironment == it.mEnvironment && mPos == it.mPos; }
- bool operator!=( const PluginIterator &it ) { return mEnvironment == it.mEnvironment && mPos != it.mPos; }
-
- private:
- Environment *mEnvironment;
- int mPos;
- };
-
- /**
- Returns an iterator pointing to the first item in the group list.
- This iterator equals groupEnd() if the group list is empty.
- */
- GroupIterator groupBegin();
-
- /**
- Returns an iterator pointing past the last item in the group list.
- This iterator equals groupBegin() if the group list is empty.
- */
- GroupIterator groupEnd();
-
- /**
- Returns an iterator pointing to the first item in the plugin list.
- This iterator equals pluginEnd() if the group list is empty.
- */
- PluginIterator pluginBegin();
-
- /**
- Returns an iterator pointing past the last item in the plugin list.
- This iterator equals pluginBegin() if the plugin list is empty.
- */
- PluginIterator pluginEnd();
-
- /**
- Initializes the environment ( e.g. loads the groups and plugins ).
- Has to be called before the groups or plugins can be accessed.
- */
- Result initialize();
-
- /**
- Finalizes the environment ( e.g. unloads the groups and plugins ).
- Should be the last call before the object is deleted.
- */
- Result finalize();
-
- /**
- Returns the number of groups.
- */
- int groupCount() const;
-
- /**
- Returns the group at position @param pos.
- */
- Group groupAt( int pos ) const;
-
- /**
- Returns a group by name or an invalid group when the group with this
- name doesn't exists.
- */
- Group groupByName( const TQString &name ) const;
-
- /**
- Adds a new group to the environment.
-
- @returns the new group.
- */
- Group addGroup();
-
- /**
- Removes a group from the environment.
- */
- Result removeGroup( const Group &group );
-
- /**
- Returns the number of plugins.
- */
- int pluginCount() const;
-
- /**
- Returns the plugin at position @param pos.
- */
- Plugin pluginAt( int pos ) const;
-
- /**
- Returns a plugin by name or an invalid plugin when the plugin with this
- name doesn't exists.
- */
- Plugin pluginByName( const TQString &name ) const;
-
- /**
- Returns the conversion object of this environment.
- */
- Conversion conversion() const;
-
- private:
- OSyncEnv *mEnvironment;
-};
-
-}
-
-#endif
diff --git a/kitchensync/libqopensync/filter.cpp b/kitchensync/libqopensync/filter.cpp
deleted file mode 100644
index dc5fe2ee..00000000
--- a/kitchensync/libqopensync/filter.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <opensync/opensync.h>
-
-#include "filter.h"
-
-using namespace QSync;
-
-Filter::Filter()
- : mFilter( 0 )
-{
-}
-
-Filter::~Filter()
-{
-}
-
-bool Filter::isValid() const
-{
- return (mFilter != 0);
-}
-
-void Filter::setConfiguration( const TQString &configuration )
-{
- Q_ASSERT( mFilter );
-
- osync_filter_set_config( mFilter, (const char*)configuration.utf8() );
-}
-
-TQString Filter::configuration() const
-{
- Q_ASSERT( mFilter );
-
- return TQString::fromUtf8( osync_filter_get_config( mFilter ) );
-}
-
diff --git a/kitchensync/libqopensync/filter.h b/kitchensync/libqopensync/filter.h
deleted file mode 100644
index 94d419a9..00000000
--- a/kitchensync/libqopensync/filter.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef TQSYNC_FILTER_H
-#define TQSYNC_FILTER_H
-
-#include <tqstring.h>
-
-class OSyncFilter;
-
-namespace QSync {
-
-class Filter
-{
- friend class Group;
-
- public:
- Filter();
- ~Filter();
-
- /**
- Returns whether the object is a valid filter.
- */
- bool isValid() const;
-
- /**
- Sets the configuration string of this filter. The format of
- string is filter specific.
- */
- void setConfiguration( const TQString &configuration );
-
- /**
- Returns the configuration string of this filter.
- */
- TQString configuration() const;
-
- bool operator==( const Filter &filter ) const { return mFilter == filter.mFilter; }
-
- private:
- OSyncFilter *mFilter;
-};
-
-}
-
-#endif
-
diff --git a/kitchensync/libqopensync/group.cpp b/kitchensync/libqopensync/group.cpp
deleted file mode 100644
index 85f6384d..00000000
--- a/kitchensync/libqopensync/group.cpp
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-/** hack includes **/
-#include <tqdom.h>
-#include <tqfile.h>
-/** hack includes **/
-
-#include <opensync/opensync.h>
-
-#include "conversion.h"
-#include "group.h"
-
-using namespace QSync;
-
-/**
- This class is a quick hack for OpenSync 0.19 and 0.20 because
- the engine doesn't stores the filter settings itself when calling
- osync_group_set_objtype_enabled(), so we have to store it for every
- group in a separated config file. This class encapsulates it.
- */
-GroupConfig::GroupConfig()
- : mGroup( 0 )
-{
-}
-
-TQStringList GroupConfig::activeObjectTypes() const
-{
- Q_ASSERT( mGroup );
-
- const TQString fileName = TQString( "%1/filter.conf" ).arg( osync_group_get_configdir( mGroup ) );
-
- TQFile file( fileName );
- if ( !file.open( IO_ReadOnly ) )
- return TQStringList();
-
- TQDomDocument document;
-
- TQString message;
- if ( !document.setContent( &file, &message ) ) {
- tqDebug( "Error on loading %s: %s", fileName.latin1(), message.latin1() );
- return TQStringList();
- }
- file.close();
-
- TQStringList objectTypes;
-
- TQDomElement element = document.documentElement();
- TQDomNode node = element.firstChild();
- while ( !node.isNull() ) {
- TQDomElement childElement = node.toElement();
- if ( !childElement.isNull() )
- objectTypes.append( childElement.tagName() );
-
- node = node.nextSibling();
- }
-
- return objectTypes;
-}
-
-void GroupConfig::setActiveObjectTypes( const TQStringList &objectTypes )
-{
- Q_ASSERT( mGroup );
-
- TQDomDocument document( "Filter" );
- document.appendChild( document.createProcessingInstruction(
- "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) );
-
- TQDomElement element = document.createElement( "filter" );
- document.appendChild( element );
-
- for ( uint i = 0; i < objectTypes.count(); ++i ) {
- TQDomElement entry = document.createElement( objectTypes[ i ] );
- element.appendChild( entry );
- }
-
- const TQString fileName = TQString( "%1/filter.conf" ).arg( osync_group_get_configdir( mGroup ) );
-
- TQFile file( fileName );
- if ( !file.open( IO_WriteOnly ) )
- return;
-
- TQTextStream s( &file );
- s.setEncoding( TQTextStream::UnicodeUTF8 );
- s << document.toString();
- file.close();
-}
-
-
-Group::Group()
- : mGroup( 0 )
-{
-}
-
-Group::~Group()
-{
-}
-
-bool Group::isValid() const
-{
- return ( mGroup != 0 );
-}
-
-Group::Iterator Group::begin()
-{
- Iterator it( this );
- it.mPos = 0;
-
- return it;
-}
-
-Group::Iterator Group::end()
-{
- Iterator it( this );
- it.mPos = memberCount();
-
- return it;
-}
-
-void Group::setName( const TQString &name )
-{
- Q_ASSERT( mGroup );
-
- osync_group_set_name( mGroup, name.latin1() );
-}
-
-TQString Group::name() const
-{
- Q_ASSERT( mGroup );
-
- return TQString::fromLatin1( osync_group_get_name( mGroup ) );
-}
-
-void Group::setLastSynchronization( const TQDateTime &dateTime )
-{
- Q_ASSERT( mGroup );
-
- if ( dateTime.isValid() )
- osync_group_set_last_synchronization( mGroup, dateTime.toTime_t() );
-}
-
-TQDateTime Group::lastSynchronization() const
-{
- Q_ASSERT( mGroup );
-
- TQDateTime dateTime;
- time_t time = osync_group_get_last_synchronization( mGroup );
- if ( time != 0 )
- dateTime.setTime_t( time );
-
- return dateTime;
-}
-
-Group::LockType Group::lock()
-{
- Q_ASSERT( mGroup );
-
- OSyncLockState state = osync_group_lock( mGroup );
- switch ( state ) {
- default:
- case OSYNC_LOCK_OK:
- return LockOk;
- break;
- case OSYNC_LOCKED:
- return Locked;
- break;
- case OSYNC_LOCK_STALE:
- return LockStale;
- break;
- }
-}
-
-void Group::unlock( bool removeFile )
-{
- Q_ASSERT( mGroup );
-
- osync_group_unlock( mGroup, removeFile );
-}
-
-Member Group::addMember()
-{
- Q_ASSERT( mGroup );
-
- OSyncMember *omember = osync_member_new( mGroup );
-
- Member member;
- member.mMember = omember;
-
- save();
-
- return member;
-}
-
-void Group::removeMember( const Member &member )
-{
- Q_ASSERT( mGroup );
-
- osync_group_remove_member( mGroup, member.mMember );
-}
-
-int Group::memberCount() const
-{
- Q_ASSERT( mGroup );
-
- return osync_group_num_members( mGroup );
-}
-
-Member Group::memberAt( int pos ) const
-{
- Q_ASSERT( mGroup );
-
- Member member;
-
- if ( pos < 0 || pos >= memberCount() )
- return member;
-
- member.mMember = osync_group_nth_member( mGroup, pos );
-
- return member;
-}
-
-int Group::filterCount() const
-{
- Q_ASSERT( mGroup );
-
- return osync_group_num_filters( mGroup );
-}
-
-Filter Group::filterAt( int pos )
-{
- Q_ASSERT( mGroup );
-
- Filter filter;
-
- if ( pos < 0 || pos >= filterCount() )
- return filter;
-
- filter.mFilter = osync_group_nth_filter( mGroup, pos );
-
- return filter;
-}
-
-Result Group::save()
-{
- Q_ASSERT( mGroup );
-
- OSyncError *error = 0;
- if ( !osync_group_save( mGroup, &error ) )
- return Result( &error );
- else
- return Result();
-}
-
-void Group::setObjectTypeEnabled( const TQString &objectType, bool enabled )
-{
- Q_ASSERT( mGroup );
-
- osync_group_set_objtype_enabled( mGroup, objectType.utf8(), enabled );
-}
-
-bool Group::isObjectTypeEnabled( const TQString &objectType ) const
-{
- return osync_group_objtype_enabled( mGroup, objectType.utf8() );
-}
-
-GroupConfig Group::config() const
-{
- Q_ASSERT( mGroup );
-
- GroupConfig config;
- config.mGroup = mGroup;
-
- return config;
-}
diff --git a/kitchensync/libqopensync/group.h b/kitchensync/libqopensync/group.h
deleted file mode 100644
index fe9ceaeb..00000000
--- a/kitchensync/libqopensync/group.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef TQSYNC_GROUP_H
-#define TQSYNC_GROUP_H
-
-#include <tqdatetime.h>
-#include <tqstringlist.h>
-
-#include <libqopensync/filter.h>
-#include <libqopensync/member.h>
-
-class OSyncGroup;
-
-namespace QSync {
-
-/**
- @internal
- */
-class GroupConfig
-{
- friend class Group;
-
- public:
- GroupConfig();
-
- TQStringList activeObjectTypes() const;
- void setActiveObjectTypes( const TQStringList &objectTypes );
-
- private:
- OSyncGroup *mGroup;
-};
-
-
-class Group
-{
- friend class Engine;
- friend class Environment;
-
- public:
- enum LockType
- {
- LockOk,
- Locked,
- LockStale
- };
-
- Group();
- ~Group();
-
- /**
- Returns whether the object is a valid group.
- */
- bool isValid() const;
-
- class Iterator
- {
- friend class Group;
-
- public:
- Iterator( Group *group )
- : mGroup( group ), mPos( -1 )
- {
- }
-
- Iterator( const Iterator &it )
- {
- mGroup = it.mGroup;
- mPos = it.mPos;
- }
-
- Member operator*()
- {
- return mGroup->memberAt( mPos );
- }
-
- Iterator &operator++() { mPos++; return *this; }
- Iterator &operator++( int ) { mPos++; return *this; }
- Iterator &operator--() { mPos--; return *this; }
- Iterator &operator--( int ) { mPos--; return *this; }
- bool operator==( const Iterator &it ) { return mGroup == it.mGroup && mPos == it.mPos; }
- bool operator!=( const Iterator &it ) { return mGroup == it.mGroup && mPos != it.mPos; }
-
- private:
- Group *mGroup;
- int mPos;
- };
-
- /**
- Returns an iterator pointing to the first item in the member list.
- This iterator equals end() if the member list is empty.
- */
- Iterator begin();
-
- /**
- Returns an iterator pointing past the last item in the member list.
- This iterator equals begin() if the member list is empty.
- */
- Iterator end();
-
- /**
- Sets the name of the group.
- */
- void setName( const TQString &name );
-
- /**
- Returns the name of the group.
- */
- TQString name() const;
-
- /**
- Sets the time of the last successfull synchronization.
- */
- void setLastSynchronization( const TQDateTime &dateTime );
-
- /**
- Returns the time of the last successfull synchronization.
- */
- TQDateTime lastSynchronization() const;
-
- /**
- Locks the group.
-
- @returns The the result of the locking request.
- */
- LockType lock();
-
- /**
- Unlocks the group.
-
- @param removeFile Whether the lock file shall be removed.
- */
- void unlock( bool removeFile = true );
-
- /**
- Adds a new member to the group.
-
- @returns the new member.
- */
- Member addMember();
-
- /**
- Removes a member from the group.
- */
- void removeMember( const Member &member );
-
- /**
- Returns the number of members.
- */
- int memberCount() const;
-
- /**
- Returns the member at position @param pos.
- */
- Member memberAt( int pos ) const;
-
- /**
- Returns the number of filters.
- */
- int filterCount() const;
-
- /**
- Returns the filter at position @param pos.
- */
- Filter filterAt( int pos );
-
- /**
- Set, if the object type with given name is enabled for synchronisation for
- this group.
- */
- void setObjectTypeEnabled( const TQString &objectType, bool enabled );
-
- /**
- Returns whether the object type with given name is enabled for synchronisation for
- this group.
- */
- bool isObjectTypeEnabled( const TQString &objectType ) const;
-
- /**
- Saves the configuration to hard disc.
- */
- Result save();
-
- /**
- Returns the config object of this group.
-
- Note: This method is only available for OpenSync 0.19 and 0.20.
- */
- GroupConfig config() const;
-
- bool operator==( const Group &group ) const { return mGroup == group.mGroup; }
-
- private:
- OSyncGroup *mGroup;
-};
-
-}
-
-#endif
diff --git a/kitchensync/libqopensync/groupenv.cpp b/kitchensync/libqopensync/groupenv.cpp
deleted file mode 100644
index f392fd10..00000000
--- a/kitchensync/libqopensync/groupenv.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <opensync/opensync.h>
-#include <opensync/opensync-group.h>
-
-#include "group.h"
-#include "result.h"
-
-#include "groupenv.h"
-
-using namespace QSync;
-
-GroupEnv::GroupEnv()
-{
- OSyncError *error = 0;
- mGroupEnv = osync_group_env_new( &error );
-}
-
-GroupEnv::~GroupEnv()
-{
- osync_group_env_free( mGroupEnv );
-}
-
-Result GroupEnv::initialize()
-{
- Q_ASSERT( mGroupEnv );
-
- OSyncError *error = 0;
- if ( !osync_group_env_load_groups( mGroupEnv, NULL, &error ) )
- return Result( &error );
- else
- return Result();
-}
-
-void GroupEnv::finalize()
-{
-}
-
-int GroupEnv::groupCount() const
-{
- Q_ASSERT( mGroupEnv );
-
- return osync_group_env_num_groups( mGroupEnv );
-}
-
-Group GroupEnv::groupAt( int pos ) const
-{
- Q_ASSERT( mGroupEnv );
-
- Group group;
-
- if ( pos < 0 || pos >= groupCount() )
- return group;
-
- OSyncGroup *ogroup = osync_group_env_nth_group( mGroupEnv, pos );
- group.mGroup = ogroup;
-
- return group;
-}
-
-Group GroupEnv::groupByName( const TQString &name ) const
-{
- Q_ASSERT( mGroupEnv );
-
- Group group;
-
- OSyncGroup *ogroup = osync_group_env_find_group( mGroupEnv, name.latin1() );
- if ( ogroup )
- group.mGroup = ogroup;
-
- return group;
-}
-
-Group GroupEnv::addGroup( const TQString &name )
-{
- Q_ASSERT( mGroupEnv );
-
- Group group;
- OSyncError *error = 0;
-
- OSyncGroup *ogroup = osync_group_new( &error );
- if ( ogroup )
- group.mGroup = ogroup;
-
- group.setName( name );
-
- if ( !osync_group_env_add_group( mGroupEnv, ogroup, &error ) ) {
- Result res( &error );
- tqDebug( "Error on adding group: %s", res.message().latin1() );
- }
-
- return group;
-}
-
-void GroupEnv::removeGroup( const Group &group )
-{
- Q_ASSERT( mGroupEnv );
-
- group.cleanup();
-
- osync_group_env_remove_group( mGroupEnv, group.mGroup );
-}
diff --git a/kitchensync/libqopensync/groupenv.h b/kitchensync/libqopensync/groupenv.h
deleted file mode 100644
index 80179826..00000000
--- a/kitchensync/libqopensync/groupenv.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef OSYNC_GROUPENV_H
-#define OSYNC_GROUPENV_H
-
-#include <tqstring.h>
-
-struct OSyncGroupEnv;
-
-namespace QSync {
-
-class Group;
-class Result;
-
-class GroupEnv
-{
- public:
- GroupEnv();
- ~GroupEnv();
-
- /**
- Initializes the environment ( e.g. loads the groups and plugins ).
- Has to be called before the groups or plugins can be accessed.
- */
- Result initialize();
-
- /**
- Finalizes the environment ( e.g. unloads the groups and plugins ).
- Should be the last call before the object is deleted.
- */
- void finalize();
-
- /**
- Returns the number of groups.
- */
- int groupCount() const;
-
- /**
- Returns the group at position @param pos.
- */
- Group groupAt( int pos ) const;
-
- /**
- Returns a group by name or an invalid group when the group with this
- name doesn't exists.
- */
- Group groupByName( const TQString &name ) const;
-
- /**
- Adds a new group to the environment.
-
- @returns the new group.
- */
- Group addGroup( const TQString &name );
-
- /**
- Removes a group from the environment.
- */
- void removeGroup( const Group &group );
-
- private:
- OSyncGroupEnv *mGroupEnv;
-};
-
-}
-
-#endif
diff --git a/kitchensync/libqopensync/member.cpp b/kitchensync/libqopensync/member.cpp
deleted file mode 100644
index b672dd0f..00000000
--- a/kitchensync/libqopensync/member.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <opensync/opensync.h>
-#include <stdlib.h>
-
-#include "member.h"
-
-using namespace QSync;
-
-Member::Member()
- : mMember( 0 )
-{
-}
-
-Member::~Member()
-{
-}
-
-bool Member::isValid() const
-{
- OSyncError *error = 0;
-
- if ( !mMember )
- return false;
-
- if ( !osync_member_instance_plugin( mMember, pluginName().utf8(), &error ) ) {
- tqDebug( "Plugin %s is not valid: %s", pluginName().latin1(), osync_error_print( &error ) );
- osync_error_free( &error );
- return false;
- }
-
- return true;
-}
-
-TQString Member::configurationDirectory() const
-{
- Q_ASSERT( mMember );
-
- return TQString::fromLatin1( osync_member_get_configdir( mMember ) );
-}
-
-TQString Member::pluginName() const
-{
- Q_ASSERT( mMember );
-
- return TQString::fromLatin1( osync_member_get_pluginname( mMember ) );
-}
-
-Plugin Member::plugin() const
-{
- Q_ASSERT( mMember );
-
- Plugin plugin;
-
- OSyncPlugin *oplugin = osync_member_get_plugin( mMember );
- if ( oplugin )
- plugin.mPlugin = oplugin;
-
- return plugin;
-}
-
-int Member::id() const
-{
- Q_ASSERT( mMember );
-
- return osync_member_get_id( mMember );
-}
-
-void Member::setName( const TQString &name )
-{
- Q_ASSERT( mMember );
-
- osync_member_set_name( mMember, (const char*)name.utf8() );
-}
-
-TQString Member::name() const
-{
- Q_ASSERT( mMember );
-
- return TQString::fromUtf8( osync_member_get_name( mMember ) );
-}
-
-void Member::setConfiguration( const TQByteArray &configurationData )
-{
- Q_ASSERT( mMember );
-
- osync_member_set_config( mMember, configurationData.data(), configurationData.size() );
-}
-
-Result Member::configuration( TQByteArray &configurationData, bool useDefault )
-{
- Q_ASSERT( mMember );
-
- char *data;
- int size;
-
- OSyncError *error = 0;
- osync_bool ok = false;
- if ( useDefault )
- ok = osync_member_get_config_or_default( mMember, &data, &size, &error );
- else
- ok = osync_member_get_config( mMember, &data, &size, &error );
-
- if ( !ok ) {
- return Result( &error );
- } else {
- configurationData.resize( size );
- memcpy( configurationData.data(), data, size );
-
- return Result();
- }
-}
-
-Result Member::save()
-{
- Q_ASSERT( mMember );
-
- OSyncError *error = 0;
- if ( !osync_member_save( mMember, &error ) )
- return Result( &error );
- else
- return Result();
-}
-
-Result Member::instance( const Plugin &plugin )
-{
- OSyncError *error = 0;
- if ( !osync_member_instance_plugin( mMember, plugin.name().utf8(), &error ) )
- return Result( &error );
- else
- return Result();
-}
-
-bool Member::operator==( const Member &member ) const
-{
- return mMember == member.mMember;
-}
-
-TQString Member::scanDevices( const TQString &query )
-{
- Q_ASSERT( mMember );
-
- OSyncError *error = 0;
- char *data = (char*)osync_member_call_plugin( mMember, "scan_devices", const_cast<char*>( query.utf8().data() ), &error );
- if ( error != 0 ) {
- osync_error_free( &error );
- return TQString();
- } else {
- TQString xml = TQString::fromUtf8( data );
- free( data );
- return xml;
- }
-}
-
-bool Member::testConnection( const TQString &configuration )
-{
- Q_ASSERT( mMember );
-
- OSyncError *error = 0;
- int *result = (int*)osync_member_call_plugin( mMember, "test_connection", const_cast<char*>( configuration.utf8().data() ), &error );
- if ( error != 0 ) {
- osync_error_free( &error );
- return false;
- } else {
- bool value = ( *result == 1 ? true : false );
- free( result );
- return value;
- }
-}
diff --git a/kitchensync/libqopensync/member.h b/kitchensync/libqopensync/member.h
deleted file mode 100644
index 6fa3ee73..00000000
--- a/kitchensync/libqopensync/member.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef TQSYNC_MEMBER_H
-#define TQSYNC_MEMBER_H
-
-#include <libqopensync/plugin.h>
-#include <libqopensync/result.h>
-#include <libqopensync/plugin.h>
-
-class OSyncMember;
-
-namespace QSync {
-
-class Member
-{
- friend class Group;
- friend class SyncChange;
- friend class SyncMemberUpdate;
-
- public:
- Member();
- ~Member();
-
- /**
- Returns whether the member object is valid.
- */
- bool isValid() const;
-
- /**
- Returns the configuration directory.
- */
- TQString configurationDirectory() const;
-
- /**
- Returns the name of the plugin, the member belongs to.
- */
- TQString pluginName() const;
-
- /**
- Returns the plugin, the member belongs to.
- */
- Plugin plugin() const;
-
- /**
- Returns the id of the plugin.
- */
- int id() const;
-
- /**
- Sets the name of this member.
- */
- void setName( const TQString &name );
-
- /**
- Returns the name of this member.
- */
- TQString name() const;
-
- /**
- Sets the configuration data as byte array. The developer has to decide the
- type of the data ( e.g. xml, plain text, binary ).
- */
- void setConfiguration( const TQByteArray &configurationData );
-
- /**
- Gets the configuration data as byte array. The developer has to decide the
- type of the data ( e.g. xml, plain text, binary ).
-
- @param useDefault If set to true, return default config, if no config
- exists. If set to false, return error when no config
- exists.
-
- @returns The result of this operation.
- */
- Result configuration( TQByteArray &configurationData,
- bool useDefault = true );
-
- /**
- Saves the changes to the configuration to hard disc.
- */
- Result save();
-
- /**
- Make this member an instance of the given plugin.
- */
- Result instance( const Plugin & );
-
- bool operator==( const Member& ) const;
-
- /**
- This method can be used to query the plugin for scanning devices.
- The @param query is a plugin specific xml document as well as
- the return value.
- */
- TQString scanDevices( const TQString &query );
-
- /**
- This method can be used to test whether the plugin can connect
- to the device with the given configuration.
- */
- bool testConnection( const TQString &configuration );
-
- private:
- OSyncMember *mMember;
-};
-
-}
-
-#endif
-
diff --git a/kitchensync/libqopensync/plugin.cpp b/kitchensync/libqopensync/plugin.cpp
deleted file mode 100644
index acd54447..00000000
--- a/kitchensync/libqopensync/plugin.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <opensync/opensync.h>
-
-#include "plugin.h"
-
-using namespace QSync;
-
-Plugin::Plugin()
- : mPlugin( 0 )
-{
-}
-
-Plugin::~Plugin()
-{
-}
-
-bool Plugin::isValid() const
-{
- return ( mPlugin != 0 );
-}
-
-TQString Plugin::name() const
-{
- Q_ASSERT( mPlugin );
-
- return TQString::fromLatin1( osync_plugin_get_name( mPlugin ) );
-}
-
-TQString Plugin::longName() const
-{
- Q_ASSERT( mPlugin );
-
- return TQString::fromLatin1( osync_plugin_get_longname( mPlugin ) );
-}
-
-TQString Plugin::description() const
-{
- Q_ASSERT( mPlugin );
-
- return TQString::fromLatin1( osync_plugin_get_description( mPlugin ) );
-}
-
diff --git a/kitchensync/libqopensync/plugin.h b/kitchensync/libqopensync/plugin.h
deleted file mode 100644
index 1c6c219e..00000000
--- a/kitchensync/libqopensync/plugin.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef TQSYNC_PLUGIN_H
-#define TQSYNC_PLUGIN_H
-
-#include <tqstring.h>
-
-class OSyncPlugin;
-
-namespace QSync {
-
-class Plugin
-{
- friend class Environment;
- friend class Member;
-
- public:
- Plugin();
- ~Plugin();
-
- /**
- Returns whether the object is a valid plugin.
- */
- bool isValid() const;
-
- /**
- Returns the name of the plugin.
- */
- TQString name() const;
-
- /**
- Returns the long name of the plugin.
- */
- TQString longName() const;
-
- /**
- Returns the description of the plugin.
- */
- TQString description() const;
-
- private:
- OSyncPlugin *mPlugin;
-};
-
-}
-
-#endif
-
diff --git a/kitchensync/libqopensync/pluginenv.cpp b/kitchensync/libqopensync/pluginenv.cpp
deleted file mode 100644
index 5efcb97b..00000000
--- a/kitchensync/libqopensync/pluginenv.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2007 Daniel Gollub <dgollub@suse.de>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <opensync/opensync.h>
-#include <opensync/opensync-plugin.h>
-
-#include "plugin.h"
-#include "result.h"
-
-#include "pluginenv.h"
-
-using namespace QSync;
-
-PluginEnv::PluginEnv()
-{
- OSyncError *error = 0;
- mPluginEnv = osync_plugin_env_new( &error );
-}
-
-PluginEnv::~PluginEnv()
-{
- osync_plugin_env_free( mPluginEnv );
-}
-
-Result PluginEnv::initialize()
-{
- OSyncError *error = 0;
- if ( !osync_plugin_env_load( mPluginEnv, NULL, &error ) )
- return Result( &error );
- else
- return Result();
-}
-
-Result PluginEnv::finalize()
-{
- osync_plugin_env_free( mPluginEnv );
- return Result();
-}
-
-int PluginEnv::pluginCount() const
-{
- return osync_plugin_env_num_plugins( mPluginEnv );
-}
-
-Plugin PluginEnv::pluginAt( int pos ) const
-{
- Plugin plugin;
-
- if ( pos < 0 || pos >= pluginCount() )
- return plugin;
-
- OSyncPlugin *oplugin = osync_plugin_env_nth_plugin( mPluginEnv, pos );
- plugin.mPlugin = oplugin;
-
- return plugin;
-}
-
-Plugin PluginEnv::pluginByName( const TQString &name ) const
-{
- Plugin plugin;
-
- OSyncPlugin *oplugin = osync_plugin_env_find_plugin( mPluginEnv, name.latin1() );
- if ( oplugin )
- plugin.mPlugin = oplugin;
-
- return plugin;
-}
-
-/*
-Conversion PluginEnv::conversion() const
-{
- Conversion conversion;
- conversion.mPluginEnv = mPluginEnv;
-
- return conversion;
-}
-*/
diff --git a/kitchensync/libqopensync/pluginenv.h b/kitchensync/libqopensync/pluginenv.h
deleted file mode 100644
index 2acc4e54..00000000
--- a/kitchensync/libqopensync/pluginenv.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2007 Daniel Gollub <dgollub@suse.de>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef OSYNC_PLUGINENV_H
-#define OSYNC_PLUGINENV_H
-
-#include <tqstring.h>
-
-struct OSyncPluginEnv;
-
-namespace QSync {
-
-class Plugin;
-class Result;
-
-class PluginEnv
-{
- public:
- PluginEnv();
- ~PluginEnv();
-
- /**
- Initializes the environment ( e.g. loads the groups and plugins ).
- Has to be called before the groups or plugins can be accessed.
- */
- Result initialize();
-
- /**
- Finalizes the environment ( e.g. unloads the groups and plugins ).
- Should be the last call before the object is deleted.
- */
- Result finalize();
-
- /**
- Returns the number of plugins.
- */
- int pluginCount() const;
-
- /**
- Returns the plugin at position @param pos.
- */
- Plugin pluginAt( int pos ) const;
-
- /**
- Returns a plugin by name or an invalid plugin when the plugin with this
- name doesn't exists.
- */
- Plugin pluginByName( const TQString &name ) const;
-
- /**
- Returns the conversion object of this environment.
- */
-// Conversion conversion() const;
-
- private:
- OSyncPluginEnv *mPluginEnv;
-};
-
-}
-
-#endif
diff --git a/kitchensync/libqopensync/result.cpp b/kitchensync/libqopensync/result.cpp
deleted file mode 100644
index d38c32a3..00000000
--- a/kitchensync/libqopensync/result.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include "result.h"
-
-#include <opensync/opensync.h>
-
-using namespace QSync;
-
-Result::Result()
- : mType( NoError )
-{
-}
-
-Result::Result( Type type )
- : mType( type )
-{
-}
-
-Result::Result( OSyncError **error, bool deleteError )
-{
- OSyncErrorType otype = osync_error_get_type( error );
- Type type;
-
- switch ( otype ) {
- case OSYNC_NO_ERROR:
- type = NoError;
- break;
- default:
- case OSYNC_ERROR_GENERIC:
- type = GenericError;
- break;
- case OSYNC_ERROR_IO_ERROR:
- type = IOError;
- break;
- case OSYNC_ERROR_NOT_SUPPORTED:
- type = NotSupported;
- break;
- case OSYNC_ERROR_TIMEOUT:
- type = Timeout;
- break;
- case OSYNC_ERROR_DISCONNECTED:
- type = Disconnected;
- break;
- case OSYNC_ERROR_FILE_NOT_FOUND:
- type = FileNotFound;
- break;
- case OSYNC_ERROR_EXISTS:
- type = Exists;
- break;
- case OSYNC_ERROR_CONVERT:
- type = Convert;
- break;
- case OSYNC_ERROR_MISCONFIGURATION:
- type = Misconfiguration;
- break;
- case OSYNC_ERROR_INITIALIZATION:
- type = Initialization;
- break;
- case OSYNC_ERROR_PARAMETER:
- type = Parameter;
- break;
- case OSYNC_ERROR_EXPECTED:
- type = Expected;
- break;
- case OSYNC_ERROR_NO_CONNECTION:
- type = NoConnection;
- break;
- case OSYNC_ERROR_TEMPORARY:
- type = Temporary;
- break;
- case OSYNC_ERROR_LOCKED:
- type = Locked;
- break;
- case OSYNC_ERROR_PLUGIN_NOT_FOUND:
- type = PluginNotFound;
- break;
- }
-
- mType = type;
- mName = TQString::fromUtf8( osync_error_get_name( error ) );
- mMessage = TQString::fromUtf8( osync_error_print( error ) );
-
- if ( deleteError )
- osync_error_free( error );
-}
-
-Result::~Result()
-{
-}
-
-void Result::setName( const TQString &name )
-{
- mName = name;
-}
-
-TQString Result::name() const
-{
- return mName;
-}
-
-void Result::setMessage( const TQString &message )
-{
- mMessage = message;
-}
-
-TQString Result::message() const
-{
- return mMessage;
-}
-
-void Result::setType( Type type )
-{
- mType = type;
-}
-
-Result::Type Result::type() const
-{
- return mType;
-}
-
-bool Result::isError() const
-{
- return mType != NoError;
-}
-
-Result::operator bool () const
-{
- return ( mType != NoError );
-}
-
diff --git a/kitchensync/libqopensync/result.h b/kitchensync/libqopensync/result.h
deleted file mode 100644
index 29d3dad8..00000000
--- a/kitchensync/libqopensync/result.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef TQSYNC_RESULT_H
-#define TQSYNC_RESULT_H
-
-#include <tqstring.h>
-
-struct OSyncError;
-
-namespace QSync {
-
-class Result
-{
- public:
- /**
- Result types.
- */
- enum Type {
- NoError,
- GenericError,
- IOError,
- NotSupported,
- Timeout,
- Disconnected,
- FileNotFound,
- Exists,
- Convert,
- Misconfiguration,
- Initialization,
- Parameter,
- Expected,
- NoConnection,
- Temporary,
- Locked,
- PluginNotFound
- };
-
- /**
- Constructs a NoError result.
- */
- Result();
-
- /**
- Constructs a result of the given type.
- */
- Result( Type type );
-
- /**
- Construct Result from OpenSync error object. Deletes the OpenSync error
- object.
- */
- Result( OSyncError **, bool deleteError = true );
-
- /**
- Destroys the result.
- */
- ~Result();
-
- /**
- Sets the name of the result.
- */
- void setName( const TQString &name );
-
- /**
- Returns the name of the result.
- */
- TQString name() const;
-
- /**
- Sets the message text of the result.
- */
- void setMessage( const TQString &message );
-
- /**
- Returns the message text of the result.
- */
- TQString message() const;
-
- /**
- Sets the type of the result.
- */
- void setType( Type type );
-
- /**
- Returns the type of the result.
- */
- Type type() const;
-
- /**
- Reimplemented boolean operator.
- */
- operator bool () const;
-
- /**
- Return true, if this Result is an error, return false otherwise.
- */
- bool isError() const;
-
- private:
- TQString mName;
- TQString mMessage;
- Type mType;
-};
-
-}
-
-#endif
diff --git a/kitchensync/libqopensync/syncchange.cpp b/kitchensync/libqopensync/syncchange.cpp
deleted file mode 100644
index 5dd72d7f..00000000
--- a/kitchensync/libqopensync/syncchange.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <opensync/file.h>
-#include <opensync/opensync.h>
-
-#include "syncchange.h"
-
-using namespace QSync;
-
-SyncChange::SyncChange()
-{
-}
-
-SyncChange::SyncChange( OSyncChange *change )
-{
- mSyncChange = change;
-}
-
-SyncChange::~SyncChange()
-{
-}
-
-bool SyncChange::isValid() const
-{
- return ( mSyncChange != 0 );
-}
-
-void SyncChange::setUid( const TQString &uid )
-{
- osync_change_set_uid( mSyncChange, uid.utf8() );
-}
-
-TQString SyncChange::uid() const
-{
- return TQString::fromUtf8( osync_change_get_uid( mSyncChange ) );
-}
-
-void SyncChange::setHash( const TQString &hash )
-{
- osync_change_set_hash( mSyncChange, hash.utf8() );
-}
-
-TQString SyncChange::hash() const
-{
- return TQString::fromUtf8( osync_change_get_hash( mSyncChange ) );
-}
-
-void SyncChange::setData( const TQString &data )
-{
- osync_change_set_data( mSyncChange, const_cast<char*>( data.utf8().data() ), data.utf8().size(), true );
-}
-
-TQString SyncChange::data() const
-{
- int size = osync_change_get_datasize( mSyncChange );
-
- TQString content;
- if ( objectFormatName() == "file" ) {
- fileFormat *format = (fileFormat*)osync_change_get_data( mSyncChange );
- if ( format )
- content = TQString::fromUtf8( format->data, format->size );
- } else
- content = TQString::fromUtf8( osync_change_get_data( mSyncChange ), size );
-
- return content;
-}
-
-bool SyncChange::hasData() const
-{
- return osync_change_has_data( mSyncChange );
-}
-
-TQString SyncChange::objectFormatName() const
-{
- OSyncObjFormat *format = osync_change_get_objformat( mSyncChange );
- Q_ASSERT( format );
-
- return TQString::fromUtf8( osync_objformat_get_name( format ) );
-}
-
-Member SyncChange::member() const
-{
- OSyncMember *omember = osync_change_get_member( mSyncChange );
-
- Member m;
- m.mMember = omember;
-
- return m;
-}
-
-void SyncChange::setChangeType( Type changeType )
-{
- OSyncChangeType ochangeType;
-
- switch ( changeType ) {
- case AddedChange:
- ochangeType = CHANGE_ADDED;
- break;
- case UnmodifiedChange:
- ochangeType = CHANGE_UNMODIFIED;
- break;
- case DeletedChange:
- ochangeType = CHANGE_DELETED;
- break;
- case ModifiedChange:
- ochangeType = CHANGE_MODIFIED;
- break;
- case UnknownChange:
- default:
- ochangeType = CHANGE_UNKNOWN;
- break;
- }
-
- osync_change_set_changetype( mSyncChange, ochangeType );
-}
-
-SyncChange::Type SyncChange::changeType() const
-{
- OSyncChangeType ochangeType = osync_change_get_changetype( mSyncChange );
-
- switch ( ochangeType ) {
- case CHANGE_ADDED:
- return AddedChange;
- break;
- case CHANGE_UNMODIFIED:
- return UnmodifiedChange;
- break;
- case CHANGE_DELETED:
- return DeletedChange;
- break;
- case CHANGE_MODIFIED:
- return ModifiedChange;
- break;
- case CHANGE_UNKNOWN:
- default:
- return UnknownChange;
- break;
- }
-}
-
diff --git a/kitchensync/libqopensync/syncchange.h b/kitchensync/libqopensync/syncchange.h
deleted file mode 100644
index 4b356dcf..00000000
--- a/kitchensync/libqopensync/syncchange.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef TQSYNC_SYNCCHANGE_H
-#define TQSYNC_SYNCCHANGE_H
-
-#include <libqopensync/member.h>
-
-class OSyncChange;
-
-namespace QSync {
-
-class SyncChange
-{
- friend class SyncMapping;
-
- public:
- enum Type
- {
- UnknownChange,
- AddedChange,
- UnmodifiedChange,
- DeletedChange,
- ModifiedChange
- };
-
- SyncChange();
- SyncChange( OSyncChange* );
- ~SyncChange();
-
- /**
- Returns whether it's a valid SyncChange.
- */
- bool isValid() const;
-
- /**
- Sets the uid of this change.
- */
- void setUid( const TQString &uid );
-
- /**
- Returns the uid of this change.
- */
- TQString uid() const;
-
- /**
- Sets the hash of this change.
- */
- void setHash( const TQString &hash );
-
- /**
- Returns the hash of this change.
- */
- TQString hash() const;
-
- /**
- Sets the data provided by the plugin.
- */
- void setData( const TQString &data );
-
- /**
- Returns the data provided by the plugin.
- */
- TQString data() const;
-
- /**
- Returns whether the change contains data.
- */
- bool hasData() const;
-
- /**
- Returns the object format name.
- */
- TQString objectFormatName() const;
-
- /**
- Returns the parent member of this change.
- */
- Member member() const;
-
- /**
- Sets the change type.
- */
- void setChangeType( Type changeType );
-
- /**
- Returns the change type.
- */
- Type changeType() const;
-
- private:
- OSyncChange *mSyncChange;
-};
-
-}
-
-#endif
-
diff --git a/kitchensync/libqopensync/syncmapping.cpp b/kitchensync/libqopensync/syncmapping.cpp
deleted file mode 100644
index 95939ab8..00000000
--- a/kitchensync/libqopensync/syncmapping.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <tqstring.h>
-#include <osengine/engine.h>
-
-#include "syncmapping.h"
-
-using namespace QSync;
-
-SyncMapping::SyncMapping()
- : mEngine( 0 ), mMapping( 0 )
-{
-}
-
-SyncMapping::SyncMapping( OSyncMapping *mapping, OSyncEngine *engine )
- : mEngine( engine ), mMapping( mapping )
-{
-}
-
-SyncMapping::~SyncMapping()
-{
-}
-
-bool SyncMapping::isValid() const
-{
- return ( mEngine != 0 && mMapping != 0 );
-}
-
-long long SyncMapping::id() const
-{
- Q_ASSERT( mMapping );
-
- return osengine_mapping_get_id( mMapping );
-}
-
-void SyncMapping::duplicate()
-{
- Q_ASSERT( mEngine );
- Q_ASSERT( mMapping );
-
- osengine_mapping_duplicate( mEngine, mMapping );
-}
-
-void SyncMapping::solve( const SyncChange &change )
-{
- Q_ASSERT( mEngine );
- Q_ASSERT( mMapping );
- Q_ASSERT( change.isValid() );
-
- osengine_mapping_solve( mEngine, mMapping, change.mSyncChange );
-}
-
-void SyncMapping::ignore()
-{
- Q_ASSERT( mEngine );
- Q_ASSERT( mMapping );
-
- //TODO: error should be returned as Result
- OSyncError *error = 0;
- osengine_mapping_ignore_conflict( mEngine, mMapping, &error );
-}
-
-int SyncMapping::changesCount() const
-{
- Q_ASSERT( mMapping );
-
- return osengine_mapping_num_changes( mMapping );
-}
-
-SyncChange SyncMapping::changeAt( int pos )
-{
- Q_ASSERT( mMapping );
-
- if ( pos < 0 || pos >= osengine_mapping_num_changes( mMapping ) )
- return SyncChange();
-
- OSyncChange *ochange = osengine_mapping_nth_change( mMapping, pos );
-
- return SyncChange( ochange );
-}
-
diff --git a/kitchensync/libqopensync/syncmapping.h b/kitchensync/libqopensync/syncmapping.h
deleted file mode 100644
index a9eee670..00000000
--- a/kitchensync/libqopensync/syncmapping.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef TQSYNC_SYNCMAPPING_H
-#define TQSYNC_SYNCMAPPING_H
-
-#include <libqopensync/syncchange.h>
-
-class OSyncEngine;
-class OSyncMapping;
-
-namespace QSync {
-
-class SyncMapping
-{
- friend class SyncMappingUpdate;
-
- public:
- SyncMapping();
- SyncMapping( OSyncMapping*, OSyncEngine* );
- ~SyncMapping();
-
- bool isValid() const;
-
- long long id() const;
-
- void duplicate();
- void solve( const SyncChange &change );
- void ignore();
-
- int changesCount() const;
- SyncChange changeAt( int pos );
-
- private:
- OSyncEngine *mEngine;
- OSyncMapping *mMapping;
-};
-
-}
-
-#endif
diff --git a/kitchensync/libqopensync/syncupdates.cpp b/kitchensync/libqopensync/syncupdates.cpp
deleted file mode 100644
index 653ccf7f..00000000
--- a/kitchensync/libqopensync/syncupdates.cpp
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <osengine/engine.h>
-
-#include "syncupdates.h"
-
-using namespace QSync;
-
-SyncMemberUpdate::SyncMemberUpdate()
-{
-}
-
-SyncMemberUpdate::SyncMemberUpdate( OSyncMemberUpdate *update )
-{
- switch ( update->type ) {
- case MEMBER_CONNECTED:
- mType = Connected;
- break;
- case MEMBER_SENT_CHANGES:
- mType = SentChanges;
- break;
- case MEMBER_COMMITTED_ALL:
- mType = CommittedAll;
- break;
- case MEMBER_DISCONNECTED:
- mType = Disconnected;
- break;
- case MEMBER_CONNECT_ERROR:
- mType = ConnectError;
- break;
- case MEMBER_GET_CHANGES_ERROR:
- mType = GetChangesError;
- break;
- case MEMBER_COMMITTED_ALL_ERROR:
- mType = CommittedAllError;
- break;
- case MEMBER_SYNC_DONE_ERROR:
- mType = SyncDoneError;
- break;
- case MEMBER_DISCONNECT_ERROR:
- mType = DisconnectedError;
- break;
- }
-
- if ( update->error )
- mResult = Result( &(update->error) );
-
- mMember.mMember = update->member;
-}
-
-SyncMemberUpdate::~SyncMemberUpdate()
-{
-}
-
-SyncMemberUpdate::Type SyncMemberUpdate::type() const
-{
- return mType;
-}
-
-Result SyncMemberUpdate::result() const
-{
- return mResult;
-}
-
-Member SyncMemberUpdate::member() const
-{
- return mMember;
-}
-
-
-SyncChangeUpdate::SyncChangeUpdate()
-{
-}
-
-SyncChangeUpdate::SyncChangeUpdate( OSyncChangeUpdate *update )
-{
- switch ( update->type ) {
- case CHANGE_RECEIVED:
- mType = Received;
- break;
- case CHANGE_RECEIVED_INFO:
- mType = ReceivedInfo;
- break;
- case CHANGE_SENT:
- mType = Sent;
- break;
- case CHANGE_WRITE_ERROR:
- mType = WriteError;
- break;
- case CHANGE_RECV_ERROR:
- mType = ReceiveError;
- break;
- }
-
- if ( update->error )
- mResult = Result( &(update->error) );
-
- mChange = SyncChange( update->change );
- mMemberId = update->member_id;
- mMappingId = update->mapping_id;
-}
-
-SyncChangeUpdate::~SyncChangeUpdate()
-{
-}
-
-SyncChangeUpdate::Type SyncChangeUpdate::type() const
-{
- return mType;
-}
-
-Result SyncChangeUpdate::result() const
-{
- return mResult;
-}
-
-SyncChange SyncChangeUpdate::change() const
-{
- return mChange;
-}
-
-int SyncChangeUpdate::memberId() const
-{
- return mMemberId;
-}
-
-int SyncChangeUpdate::mappingId() const
-{
- return mMappingId;
-}
-
-SyncMappingUpdate::SyncMappingUpdate()
-{
-}
-
-SyncMappingUpdate::SyncMappingUpdate( OSyncMappingUpdate *update, OSyncEngine *engine )
-{
- switch ( update->type ) {
- case MAPPING_SOLVED:
- mType = Solved;
- break;
- case MAPPING_SYNCED:
- mType = Synced;
- break;
- case MAPPING_WRITE_ERROR:
- mType = WriteError;
- break;
- }
-
- if ( update->error )
- mResult = Result( &(update->error) );
-
- mWinner = update->winner;
- mMapping.mEngine = engine;
- mMapping.mMapping = update->mapping;
-}
-
-SyncMappingUpdate::~SyncMappingUpdate()
-{
-}
-
-SyncMappingUpdate::Type SyncMappingUpdate::type() const
-{
- return mType;
-}
-
-Result SyncMappingUpdate::result() const
-{
- return mResult;
-}
-
-long long int SyncMappingUpdate::winner() const
-{
- return mWinner;
-}
-
-SyncMapping SyncMappingUpdate::mapping() const
-{
- return mMapping;
-}
-
-SyncEngineUpdate::SyncEngineUpdate()
-{
-}
-
-SyncEngineUpdate::SyncEngineUpdate( OSyncEngineUpdate *update )
-{
- switch ( update->type ) {
- case ENG_ENDPHASE_CON:
- mType = EndPhaseConnected;
- break;
- case ENG_ENDPHASE_READ:
- mType = EndPhaseRead;
- break;
- case ENG_ENDPHASE_WRITE:
- mType = EndPhaseWrite;
- break;
- case ENG_ENDPHASE_DISCON:
- mType = EndPhaseDisconnected;
- break;
- case ENG_ERROR:
- mType = Error;
- break;
- case ENG_SYNC_SUCCESSFULL:
- mType = SyncSuccessfull;
- break;
- case ENG_PREV_UNCLEAN:
- mType = PrevUnclean;
- break;
- case ENG_END_CONFLICTS:
- mType = EndConflicts;
- break;
- }
-
- if ( update->error )
- mResult = Result( &(update->error) );
-}
-
-SyncEngineUpdate::~SyncEngineUpdate()
-{
-}
-
-SyncEngineUpdate::Type SyncEngineUpdate::type() const
-{
- return mType;
-}
-
-Result SyncEngineUpdate::result() const
-{
- return mResult;
-}
-
diff --git a/kitchensync/libqopensync/syncupdates.h b/kitchensync/libqopensync/syncupdates.h
deleted file mode 100644
index 29f2ce78..00000000
--- a/kitchensync/libqopensync/syncupdates.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- This file is part of libqopensync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef TQSYNC_SYNCUPDATES_H
-#define TQSYNC_SYNCUPDATES_H
-
-#include <libqopensync/member.h>
-#include <libqopensync/result.h>
-#include <libqopensync/syncchange.h>
-#include <libqopensync/syncmapping.h>
-
-class OSyncMemberUpdate;
-class OSyncChangeUpdate;
-class OSyncMappingUpdate;
-class OSyncEngineUpdate;
-class OSyncMemberUpdate;
-
-namespace QSync {
-
-class SyncMemberUpdate
-{
- friend class CallbackHandler;
-
- public:
- enum Type {
- Connected,
- SentChanges,
- CommittedAll,
- Disconnected,
- ConnectError,
- GetChangesError,
- CommittedAllError,
- SyncDoneError,
- DisconnectedError
- };
-
- SyncMemberUpdate();
- SyncMemberUpdate( OSyncMemberUpdate* );
- ~SyncMemberUpdate();
-
- Type type() const;
- Result result() const;
- Member member() const;
-
- private:
- Type mType;
- Result mResult;
- Member mMember;
-};
-
-class SyncChangeUpdate
-{
- friend class CallbackHandler;
-
- public:
- enum Type {
- Received = 1,
- ReceivedInfo,
- Sent,
- WriteError,
- ReceiveError
- };
-
- SyncChangeUpdate();
- SyncChangeUpdate( OSyncChangeUpdate* );
- ~SyncChangeUpdate();
-
- Type type() const;
- Result result() const;
- SyncChange change() const;
- int memberId() const;
- int mappingId() const;
-
- private:
- Type mType;
- Result mResult;
- SyncChange mChange;
- int mMemberId;
- int mMappingId;
-};
-
-class SyncMappingUpdate
-{
- friend class CallbackHandler;
-
- public:
- enum Type {
- Solved = 1,
- Synced,
- WriteError
- };
-
- SyncMappingUpdate();
- SyncMappingUpdate( OSyncMappingUpdate*, OSyncEngine* );
- ~SyncMappingUpdate();
-
- Type type() const;
- Result result() const;
- long long int winner() const;
- SyncMapping mapping() const;
-
- private:
- Type mType;
- Result mResult;
- long long int mWinner;
- SyncMapping mMapping;
-};
-
-class SyncEngineUpdate
-{
- friend class CallbackHandler;
-
- public:
- enum Type {
- EndPhaseConnected = 1,
- EndPhaseRead,
- EndPhaseWrite,
- EndPhaseDisconnected,
- Error,
- SyncSuccessfull,
- PrevUnclean,
- EndConflicts
- };
-
- SyncEngineUpdate();
- SyncEngineUpdate( OSyncEngineUpdate* );
- ~SyncEngineUpdate();
-
- Type type() const;
- Result result() const;
-
- private:
- Type mType;
- Result mResult;
-};
-
-}
-
-#endif
diff --git a/kitchensync/opensyncdbus/Makefile.am b/kitchensync/opensyncdbus/Makefile.am
deleted file mode 100644
index 9b1721f6..00000000
--- a/kitchensync/opensyncdbus/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-INCLUDES = -I/usr/local/include/dbus-1.0/qt3 $(all_includes) \
- -I$(top_srcdir)/kitchensync
-
-bin_PROGRAMS = opensyncdbus
-
-opensyncdbus_SOURCES = dbusclient.cpp
-opensyncdbus_LDADD = $(top_builddir)/kitchensync/libqopensync/libqopensync.la
-opensyncdbus_LDFLAGS = -ldbus-1-qt3 -ldbus-1 $(all_libraries) $(KDE_RPATH)
-
-METASOURCES = AUTO
diff --git a/kitchensync/opensyncdbus/README b/kitchensync/opensyncdbus/README
deleted file mode 100644
index e1aa1e3c..00000000
--- a/kitchensync/opensyncdbus/README
+++ /dev/null
@@ -1,5 +0,0 @@
-This directory contains opensyncdbus, a D-BUS frontend for OpenSync. It's a
-daemon which provides a D-BUS interface for controlling OpenSync.
-
-To compile opensyncdbus you need the Qt3 bindings for D-BUS.
-They are in SVN under branches/work/dbus-qt4-qt3backport/
diff --git a/kitchensync/opensyncdbus/dbusclient.cpp b/kitchensync/opensyncdbus/dbusclient.cpp
deleted file mode 100644
index 21d4f798..00000000
--- a/kitchensync/opensyncdbus/dbusclient.cpp
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- This file is part of KDE.
-
- Copyright (c) 2006 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#include "dbusclient.h"
-
-#include <libqopensync/environment.h>
-#include <libqopensync/group.h>
-
-#include <dbus/qdbuserror.h>
-#include <dbus/qdbusconnection.h>
-#include <dbus/qdbusmessage.h>
-#include <dbus/qdbusproxy.h>
-
-#include <tqapplication.h>
-#include <tqtimer.h>
-
-#include <iostream>
-
-OpenSyncService::OpenSyncService()
- : mConnection( 0 )
-{
-}
-
-void OpenSyncService::setConnection( TQDBusConnection *connection )
-{
- mConnection = connection;
- mConnection->registerObject( "/ABC", this );
-}
-
-bool OpenSyncService::handleMethodCall( const TQDBusMessage &message )
-{
- tqDebug( "OpenSyncService::handleMethodCall()" );
-
- tqDebug( " Interface: %s", message.interface().latin1() );
- tqDebug( " Path: %s", message.path().latin1() );
- tqDebug( " Member: %s", message.member().latin1() );
- tqDebug( " Sender: %s", message.sender().latin1() );
-
- if ( message.interface() != "org.opensync.SyncEngine" ) return false;
-
- TQDBusMessage reply;
-
- TQString function = message.member();
- if ( function == "hello" ) {
- reply = hello( message );
- } else if ( function == "randomNumber" ) {
- reply = randomNumber( message );
- } else if ( function == "listGroups" ) {
- reply = listGroups( message );
- } else if ( function == "listPlugins" ) {
- reply = listPlugins( message );
- } else if ( function == "showGroup" ) {
- reply = showGroup( message );
- } else if ( function == "showMember" ) {
- reply = showMember( message );
- } else {
- return false;
- }
-
- mConnection->send( reply );
-
- return true;
-}
-
-TQDBusMessage OpenSyncService::showMember( const TQDBusMessage &message )
-{
- if ( message.count() != 2 ) {
- return error( message, "arg_count",
- TQString("Wrong number of arguments. Expected 2, got %1.")
- .arg( message.count() ) );
- }
-
- TQString groupName = message[ 0 ].toString();
- if ( groupName.isEmpty() ) {
- return error( message, "missing_arg", "Missing argument: group name." );
- }
-
- bool ok;
- int memberId = message[ 1 ].toInt( &ok );
- if ( !ok ) {
- return error( message, "missing_arg", "Missing argument: member id." );
- }
-
- TQDBusMessage reply;
-
- QSync::Environment env;
- QSync::Result result = env.initialize();
- if ( result.isError() ) {
- return error( message, result.name(), result.message() );
- } else {
- reply = TQDBusMessage::methodReply( message );
-
- QSync::Group group = env.groupByName( groupName );
- if ( !group.isValid() ) {
- return error( message, "group_name", TQString("Unknown group '%1'.")
- .arg( groupName ) );
- }
-
- QSync::Member member = group.memberById( memberId );
- if ( !member.isValid() ) {
- return error( message, "member_id",
- TQString("Unknown member id '%1' in group '%2'.").arg( groupName )
- .arg( memberId ) );
- }
-
- reply.append( memberId );
- reply.append( member.pluginName() );
-
- env.finalize();
- }
-
- return reply;
-}
-
-
-TQDBusMessage OpenSyncService::showGroup( const TQDBusMessage &message )
-{
- if ( message.count() != 1 ) {
- return error( message, "arg_count",
- TQString("Wrong number of arguments. Expected 1, got %1")
- .arg( message.count() ) );
- }
-
- TQString groupName = message[ 0 ].toString();
- if ( groupName.isEmpty() ) {
- return error( message, "missing_arg", "Missing argument group name." );
- }
-
- TQDBusMessage reply;
-
- QSync::Environment env;
- QSync::Result result = env.initialize();
- if ( result.isError() ) {
- return error( message, result.name(), result.message() );
- } else {
- reply = TQDBusMessage::methodReply( message );
-
- QSync::Group group = env.groupByName( groupName );
- if ( !group.isValid() ) {
- return error( message, "group_name", TQString("Unknown group '%1'")
- .arg( groupName ) );
- }
-
- QSync::Group::Iterator it( &group );
- for( it = group.begin(); it != group.end(); ++it ) {
- QSync::Member member = *it;
- reply.append( TQVariant( member.id() ) );
- }
-
- env.finalize();
- }
-
- return reply;
-}
-
-TQDBusMessage OpenSyncService::error( const TQDBusMessage &message,
- const TQString &errorCode,
- const TQString &errorMessage )
-{
- TQDBusError error( "org.opensync." + errorCode, errorMessage );
- return TQDBusMessage::methodError( message, error );
-}
-
-TQDBusMessage OpenSyncService::listPlugins( const TQDBusMessage &message )
-{
- TQDBusMessage reply;
-
- QSync::Environment env;
- QSync::Result result = env.initialize();
- if ( result.isError() ) {
- TQDBusError error( result.name(), result.message() );
- reply = TQDBusMessage::methodError( message, error );
- } else {
- reply = TQDBusMessage::methodReply( message );
-
- QSync::Environment::PluginIterator it( env.pluginBegin() );
- for ( ; it != env.pluginEnd(); ++it ) {
- reply.append( TQVariant( (*it).name() ) );
- }
-
- env.finalize();
- }
-
- return reply;
-}
-
-TQDBusMessage OpenSyncService::listGroups( const TQDBusMessage &message )
-{
- TQDBusMessage reply;
-
- QSync::Environment env;
- QSync::Result result = env.initialize();
- if ( result.isError() ) {
- TQDBusError error( result.name(), result.message() );
- reply = TQDBusMessage::methodError( message, error );
- } else {
- reply = TQDBusMessage::methodReply( message );
-
- QSync::Environment::GroupIterator it( env.groupBegin() );
- for ( ; it != env.groupEnd(); ++it ) {
- reply.append( TQVariant( (*it).name() ) );
- }
-
- env.finalize();
- }
-
- return reply;
-}
-
-TQDBusMessage OpenSyncService::hello( const TQDBusMessage &message )
-{
- TQDBusMessage reply = TQDBusMessage::methodReply( message );
-
-// TQDBusError error;
-// reply = TQDBusMessage::methodError( message, error );
-
- reply.append( TQVariant( TQString( "Hello!" ) ) );
-
- return reply;
-}
-
-TQDBusMessage OpenSyncService::randomNumber( const TQDBusMessage &message )
-{
- TQDBusMessage reply = TQDBusMessage::methodReply( message );
-
- int number = rand();
-
- reply.append( TQVariant( number ) );
-
- return reply;
-}
-
-int main( int argc, char *argv[] )
-{
- TQApplication app(argc, argv);
-
- std::cout << "Hello" << std::endl;
-
- TQDBusConnection connection = TQDBusConnection::addConnection(
- TQDBusConnection::SessionBus );
-
- if ( !connection.isConnected() ) {
- tqFatal("Cannot connect to session bus");
- }
-
- connection.requestName( "org.opensync.SyncEngine",
- TQDBusConnection::NoReplace );
-
- OpenSyncService service;
- service.setConnection( &connection );
-
- return app.exec();
-}
-
-//#include "dbusclient.moc"
diff --git a/kitchensync/opensyncdbus/dbusclient.h b/kitchensync/opensyncdbus/dbusclient.h
deleted file mode 100644
index b0493c85..00000000
--- a/kitchensync/opensyncdbus/dbusclient.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- This file is part of KDE.
-
- Copyright (c) 2006 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-#ifndef DBUSCLIENT_H
-#define DBUSCLIENT_H
-
-#include <tqobject.h>
-
-#include <dbus/qdbusobject.h>
-
-class TQDBusMessage;
-class TQDBusConnection;
-
-class OpenSyncService : public TQDBusObjectBase
-{
- public:
- OpenSyncService();
-
- void setConnection( TQDBusConnection *connection );
-
- protected:
- virtual bool handleMethodCall( const TQDBusMessage &message );
-
- TQDBusMessage hello( const TQDBusMessage & );
- TQDBusMessage randomNumber( const TQDBusMessage & );
-
- TQDBusMessage listGroups( const TQDBusMessage &message );
- TQDBusMessage listPlugins( const TQDBusMessage &message );
- TQDBusMessage showGroup( const TQDBusMessage &message );
- TQDBusMessage showMember( const TQDBusMessage &message );
-
- TQDBusMessage error( const TQDBusMessage &, const TQString &errorCode,
- const TQString &errorMessage );
-
- private:
- TQDBusConnection *mConnection;
-};
-
-#endif
diff --git a/kitchensync/src/CMakeL10n.txt b/kitchensync/src/CMakeL10n.txt
deleted file mode 100644
index 9520b5e6..00000000
--- a/kitchensync/src/CMakeL10n.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-##### create translation templates ##############
-
-tde_l10n_create_template( "kitchensync" )
-
-tde_l10n_create_template(
- CATALOG "desktop_files/kitchensync.desktop/"
- SOURCES kitchensync.desktop
- DESTINATION "${CMAKE_SOURCE_DIR}/translations"
-)
diff --git a/kitchensync/src/CMakeLists.txt b/kitchensync/src/CMakeLists.txt
deleted file mode 100644
index 18e76a0a..00000000
--- a/kitchensync/src/CMakeLists.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-#################################################
-#
-# (C) 2010-2011 Serghei Amelian
-# serghei (DOT) amelian (AT) gmail.com
-#
-# Improvements and feedback are welcome
-#
-# This file is released under GPL >= 2
-#
-#################################################
-
-tde_import( libkmime )
-tde_import( ktnef )
-tde_import( libkcal )
-tde_import( libtdepim )
-
-add_subdirectory( about )
-add_subdirectory( pics )
-
-include_directories(
- ${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/..
- ${CMAKE_SOURCE_DIR}
- ${CMAKE_SOURCE_DIR}/libtdepim
- ${TDE_INCLUDE_DIR}
- ${TQT_INCLUDE_DIRS}
-)
-
-link_directories(
- ${TQT_LIBRARY_DIRS}
-)
-
-
-##### other data ################################
-
-tde_create_translated_desktop( kitchensync.desktop )
-install( FILES kitchensyncui.rc kitchensync_part.rc DESTINATION ${DATA_INSTALL_DIR}/kitchensync )
-
-
-##### libkitchensyncpart (module) ###############
-
-tde_add_kpart( libkitchensyncpart AUTOMOC
- SOURCES part.cpp
- LINK kitchensync-shared
- DESTINATION ${PLUGIN_INSTALL_DIR}
-)
-
-##### kitchensync (executable) ##################
-
-tde_add_executable( kitchensync AUTOMOC
- SOURCES main.cpp mainwindow.cpp
- LINK kitchensync-shared
- DESTINATION ${BIN_INSTALL_DIR}
-)
-
-
-##### kitchensync (shared) ######################
-
-tde_add_library( kitchensync SHARED AUTOMOC
- SOURCES
- aboutpage.cpp mainwidget.cpp groupconfigdialog.cpp groupconfig.cpp
- groupitem.cpp groupview.cpp memberconfig.cpp syncprocess.cpp
- syncprocessmanager.cpp connectionwidgets.cpp pluginpicker.cpp
- configgui.cpp configguiblank.cpp configguifile.cpp memberinfo.cpp
- groupconfigcommon.cpp kwidgetlist.cpp configguipalm.cpp
- conflictdialog.cpp singleconflictdialog.cpp addresseediffalgo.cpp
- calendardiffalgo.cpp htmldiffalgodisplay.cpp genericdiffalgo.cpp
- multiconflictdialog.cpp configguiirmc.cpp configguisyncmlobex.cpp
- configguisyncmlhttp.cpp configguiopie.cpp configguignokii.cpp
- configguigcalendar.cpp configguildap.cpp configguigpe.cpp
- configguijescs.cpp configguievo2.cpp configguimoto.cpp
- configguisynce.cpp configguisunbird.cpp
- VERSION 0.0.0
- LINK qopensync-shared tdepim-shared tdehtml-shared
- DESTINATION ${LIB_INSTALL_DIR}
-)
diff --git a/kitchensync/src/Makefile.am b/kitchensync/src/Makefile.am
deleted file mode 100644
index acfaf530..00000000
--- a/kitchensync/src/Makefile.am
+++ /dev/null
@@ -1,53 +0,0 @@
-SUBDIRS = about pics
-
-INCLUDES = -I$(top_srcdir)/kitchensync/src \
- -I$(top_srcdir)/kitchensync \
- -I$(top_srcdir)/libtdepim \
- -I$(top_srcdir) \
- $(all_includes)
-
-# Application
-bin_PROGRAMS = kitchensync
-
-kitchensync_SOURCES = main.cpp mainwindow.cpp
-kitchensync_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-kitchensync_LDADD = libkitchensync.la
-
-xdg_apps_DATA = kitchensync.desktop
-
-# Library
-lib_LTLIBRARIES = libkitchensync.la
-
-libkitchensync_la_SOURCES = aboutpage.cpp mainwidget.cpp groupconfigdialog.cpp \
- groupconfig.cpp groupitem.cpp groupview.cpp memberconfig.cpp \
- syncprocess.cpp syncprocessmanager.cpp connectionwidgets.cpp \
- pluginpicker.cpp configgui.cpp configguiblank.cpp configguifile.cpp \
- memberinfo.cpp groupconfigcommon.cpp kwidgetlist.cpp \
- configguipalm.cpp conflictdialog.cpp singleconflictdialog.cpp \
- addresseediffalgo.cpp calendardiffalgo.cpp \
- htmldiffalgodisplay.cpp genericdiffalgo.cpp multiconflictdialog.cpp \
- configguiirmc.cpp \
- configguisyncmlobex.cpp configguisyncmlhttp.cpp configguiopie.cpp \
- configguignokii.cpp configguigcalendar.cpp configguildap.cpp configguigpe.cpp \
- configguijescs.cpp configguievo2.cpp configguimoto.cpp configguisynce.cpp \
- configguisunbird.cpp
-libkitchensync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-libkitchensync_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEHTML) $(top_builddir)/kitchensync/libqopensync/libqopensync.la \
- $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la $(top_builddir)/libkcal/libkcal.la \
- $(LIB_TQT)
-
-# KPart
-kde_module_LTLIBRARIES = libkitchensyncpart.la
-
-libkitchensyncpart_la_SOURCES = part.cpp
-libkitchensyncpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkitchensyncpart_la_LIBADD = $(LIB_TDEPARTS) libkitchensync.la $(LIB_TQT) $(LIB_TDEIO) $(LIB_TDEHTML) $(LIB_TDEABC) $(LIB_TDECORE) $(LIB_TDEUI)
-
-# Resources
-kitchensyncdatadir = $(kde_datadir)/kitchensync
-kitchensyncdata_DATA = kitchensyncui.rc kitchensync_part.rc
-
-METASOURCES = AUTO
-
-messages: rc.cpp
- $(XGETTEXT) *.cpp *.h -o $(podir)/kitchensync.pot
diff --git a/kitchensync/src/about/CMakeLists.txt b/kitchensync/src/about/CMakeLists.txt
deleted file mode 100644
index 1381982b..00000000
--- a/kitchensync/src/about/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-#################################################
-#
-# (C) 2010-2011 Serghei Amelian
-# serghei (DOT) amelian (AT) gmail.com
-#
-# Improvements and feedback are welcome
-#
-# This file is released under GPL >= 2
-#
-#################################################
-
-install( FILES
- top-right-kitchensync.png main.html kitchensync.css
- DESTINATION ${DATA_INSTALL_DIR}/kitchensync/about )
diff --git a/kitchensync/src/about/Makefile.am b/kitchensync/src/about/Makefile.am
deleted file mode 100644
index 6a4c77c5..00000000
--- a/kitchensync/src/about/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-about_DATA = \
- top-right-kitchensync.png \
- main.html \
- kitchensync.css
-
-aboutdir = $(kde_datadir)/kitchensync/about
diff --git a/kitchensync/src/about/kitchensync.css b/kitchensync/src/about/kitchensync.css
deleted file mode 100644
index c37ba7f7..00000000
--- a/kitchensync/src/about/kitchensync.css
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#headerR {
- position: absolute;
- right: 0px;
- width: 430px;
- height: 131px;
- background-image: url(top-right-kontact.png);
-}
-
-#title {
- right: 125px;
-}
-
-#tagline {
- right: 125px;
-}
-
-#boxCenter {
- background-image: url(box-center-kontact.png);
- background-repeat: no-repeat;
- background-color: #dfe7f3;
- background-position: bottom right;
-}
-
-#subtext {
- font-style: italic;
-}
diff --git a/kitchensync/src/about/main.html b/kitchensync/src/about/main.html
deleted file mode 100644
index 8f948ffa..00000000
--- a/kitchensync/src/about/main.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 1st August 2004), see www.w3.org" />
-
- <style type="text/css">
- /*<![CDATA[*/
- @import "%1"; /* kde_infopage.css */
- %1 /* maybe @import "kde_infopage_rtl.css"; */
- @import "kitchensync.css";
- body {font-size: %1px;}
- /*]]>*/
- </style>
-
- <title>KitchenSync</title>
-</head>
-
-<body>
- <div id="header">
- <div id="headerL"/>
- <div id="headerR"/>
-
- <div id="title">
- %2 <!-- KitchenSync -->
- </div>
-
- <div id="tagline">
- %3 <!-- Catchphrase -->
- </div>
- </div>
-
- <!-- the bar -->
- <div id="bar">
- <div id="barT"><div id="barTL"/><div id="barTR"/><div id="barTC"/></div>
- <div id="barL">
- <div id="barR">
- <div id="barCenter" class="bar_text">
- %4<!-- KitchenSync is ... -->
- </div>
- </div>
- </div>
- <div id="barB"><div id="barBL"/><div id="barBR"/><div id="barBC"/></div>
- </div>
-
- <!-- the main text box -->
- <div id="box">
- <div id="boxT"><div id="boxTL"/><div id="boxTR"/><div id="boxTC"/></div>
- <div id="boxL">
- <div id="boxR">
- <div id="boxCenter">
- <!--Welcome to KitchenSync-->
- %5
- </div>
- </div>
- </div>
- <div id="boxB"><div id="boxBL"/><div id="boxBR"/><div id="boxBC"/></div>
- </div>
-
- <div id="footer"><div id="footerL"/><div id="footerR"/></div>
-</body>
-</html>
diff --git a/kitchensync/src/about/top-right-kitchensync.png b/kitchensync/src/about/top-right-kitchensync.png
deleted file mode 100644
index 9e169d8b..00000000
--- a/kitchensync/src/about/top-right-kitchensync.png
+++ /dev/null
Binary files differ
diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp
deleted file mode 100644
index 4de6987e..00000000
--- a/kitchensync/src/aboutpage.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#include <tqfile.h>
-#include <tqlayout.h>
-
-#include <tdeaboutdata.h>
-#include <tdeapplication.h>
-#include <kdebug.h>
-#include <tdehtml_part.h>
-#include <tdehtmlview.h>
-#include <kiconloader.h>
-#include <tdelocale.h>
-#include <krun.h>
-#include <kstandarddirs.h>
-
-#include "aboutpage.h"
-
-static TQString readFile( const TQString &fileName )
-{
- TQFile file( fileName );
- if ( !file.open( IO_ReadOnly ) ) {
- kdDebug() << "Unable to open file '" << fileName << "'" << endl;
- return TQCString();
- }
-
- TQString content = TQString::fromUtf8( file.readAll() );
-
- file.close();
-
- return content;
-}
-
-AboutPage::AboutPage( TQWidget *parent )
- : TQWidget( parent, "AboutPage" )
-{
- TQVBoxLayout *layout = new TQVBoxLayout( this );
-
- TQString location = locate( "data", "kitchensync/about/main.html" );
- TQString content = readFile( location );
- content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
- if ( kapp->reverseLayout() )
- content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
- else
- content = content.arg( "" );
-
- TDEHTMLPart *part = new TDEHTMLPart( this );
- layout->addWidget( part->view() );
-
- part->begin( KURL( location ) );
-
- TQString appName( i18n( "TDE KitchenSync" ) );
- TQString catchPhrase( i18n( "Get Synchronized!" ) );
- TQString quickDescription( i18n( "The TDE Synchronization Tool" ) );
-
- part->write( content.arg( TQFont().pointSize() + 2 ).arg( appName )
- .arg( catchPhrase ).arg( quickDescription ).arg( htmlText() ) );
- part->end();
-
- connect( part->browserExtension(),
- TQT_SIGNAL( openURLRequest( const KURL&, const KParts::URLArgs& ) ),
- TQT_SLOT( handleUrl( const KURL& ) ) );
-
- connect( part->browserExtension(),
- TQT_SIGNAL( createNewWindow( const KURL&, const KParts::URLArgs& ) ),
- TQT_SLOT( handleUrl( const KURL& ) ) );
-}
-
-void AboutPage::handleUrl( const KURL &url )
-{
- if ( url.protocol() == "exec" ) {
- if ( url.path() == "/addGroup" )
- emit addGroup();
- } else
- new KRun( url, this );
-}
-
-TQString AboutPage::htmlText() const
-{
- TDEIconLoader *iconloader = TDEGlobal::iconLoader();
- int iconSize = iconloader->currentSize( TDEIcon::Desktop );
-
- TQString handbook_icon_path = iconloader->iconPath( "contents2", TDEIcon::Desktop );
- TQString html_icon_path = iconloader->iconPath( "text-html", TDEIcon::Desktop );
- TQString wizard_icon_path = iconloader->iconPath( "wizard", TDEIcon::Desktop );
-
- TQString info = i18n( "<h2 style='text-align:center; margin-top: 0px;'>Welcome to KitchenSync %1</h2>"
- "<p>%1</p>"
- "<table align=\"center\">"
- "<tr><td><a href=\"%1\"><img width=\"%1\" height=\"%1\" src=\"%1\" /></a></td>"
- "<td><a href=\"%1\">%1</a><br><span id=\"subtext\"><nobr>%1</td></tr>"
- "<tr><td><a href=\"%1\"><img width=\"%1\" height=\"%1\" src=\"%1\" /></a></td>"
- "<td><a href=\"%1\">%1</a><br><span id=\"subtext\"><nobr>%1</td></tr>"
- "<tr><td><a href=\"%1\"><img width=\"%1\" height=\"%1\" src=\"%1\" /></a></td>"
- "<td><a href=\"%1\">%1</a><br><span id=\"subtext\"><nobr>%1</td></tr>"
- "</table>" )
- .arg( kapp->aboutData()->version() )
- .arg( i18n( "KitchenSync synchronizes your e-mail, addressbook, calendar, to-do list and more." ) )
- .arg( "help:/kitchensync" )
- .arg( iconSize )
- .arg( iconSize )
- .arg( handbook_icon_path )
- .arg( "help:/kitchensync" )
- .arg( i18n( "Read Manual" ) )
- .arg( i18n( "Learn more about KitchenSync and its components" ) )
- .arg( "http://pim.kde.org" )
- .arg( iconSize )
- .arg( iconSize )
- .arg( html_icon_path )
- .arg( "http://pim.kde.org" )
- .arg( i18n( "Visit KitchenSync Website" ) )
- .arg( i18n( "Access online resources and tutorials" ) )
- .arg( "exec:/addGroup" )
- .arg( iconSize )
- .arg( iconSize )
- .arg( wizard_icon_path )
- .arg( "exec:/addGroup" )
- .arg( i18n( "Add Synchronization Group" ) )
- .arg( i18n( "Create group of devices for synchronization" ) );
-
- return info;
-}
-
-#include "aboutpage.moc"
diff --git a/kitchensync/src/aboutpage.h b/kitchensync/src/aboutpage.h
deleted file mode 100644
index b364e0fe..00000000
--- a/kitchensync/src/aboutpage.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#ifndef ABOUTPAGE_H
-#define ABOUTPAGE_H
-
-#include <kurl.h>
-
-#include <tqwidget.h>
-
-class AboutPage : public TQWidget
-{
- Q_OBJECT
-
-
- public:
- AboutPage( TQWidget *parent );
-
- signals:
- void addGroup();
-
- private slots:
- void handleUrl( const KURL& );
-
- private:
- TQString htmlText() const;
-};
-
-#endif
diff --git a/kitchensync/src/addresseediffalgo.cpp b/kitchensync/src/addresseediffalgo.cpp
deleted file mode 100644
index e9847284..00000000
--- a/kitchensync/src/addresseediffalgo.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- This file is part of libtdepim.
-
- Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <tdeabc/vcardconverter.h>
-
-#include "addresseediffalgo.h"
-
-using namespace KSync;
-
-static bool compareString( const TQString &left, const TQString &right )
-{
- if ( left.isEmpty() && right.isEmpty() )
- return true;
- else
- return left == right;
-}
-
-AddresseeDiffAlgo::AddresseeDiffAlgo( const TDEABC::Addressee &leftAddressee,
- const TDEABC::Addressee &rightAddressee )
- : mLeftAddressee( leftAddressee ), mRightAddressee( rightAddressee )
-{
-}
-
-AddresseeDiffAlgo::AddresseeDiffAlgo( const TQString &leftAddressee,
- const TQString &rightAddressee )
-{
- TDEABC::VCardConverter converter;
-
- mLeftAddressee = converter.parseVCard( leftAddressee );
- mRightAddressee = converter.parseVCard( rightAddressee );
-}
-
-void AddresseeDiffAlgo::run()
-{
- begin();
-
- if ( !compareString( mLeftAddressee.uid(), mRightAddressee.uid() ) )
- conflictField( TDEABC::Addressee::uidLabel(), mLeftAddressee.uid(), mRightAddressee.uid() );
-
- if ( !compareString( mLeftAddressee.name(), mRightAddressee.name() ) )
- conflictField( TDEABC::Addressee::nameLabel(), mLeftAddressee.name(), mRightAddressee.name() );
-
- if ( !compareString( mLeftAddressee.formattedName(), mRightAddressee.formattedName() ) )
- conflictField( TDEABC::Addressee::formattedNameLabel(), mLeftAddressee.formattedName(), mRightAddressee.formattedName() );
-
- if ( !compareString( mLeftAddressee.familyName(), mRightAddressee.familyName() ) )
- conflictField( TDEABC::Addressee::familyNameLabel(), mLeftAddressee.familyName(), mRightAddressee.familyName() );
-
- if ( !compareString( mLeftAddressee.givenName(), mRightAddressee.givenName() ) )
- conflictField( TDEABC::Addressee::givenNameLabel(), mLeftAddressee.givenName(), mRightAddressee.givenName() );
-
- if ( !compareString( mLeftAddressee.additionalName(), mRightAddressee.additionalName() ) )
- conflictField( TDEABC::Addressee::additionalNameLabel(), mLeftAddressee.additionalName(), mRightAddressee.additionalName() );
-
- if ( !compareString( mLeftAddressee.prefix(), mRightAddressee.prefix() ) )
- conflictField( TDEABC::Addressee::prefixLabel(), mLeftAddressee.prefix(), mRightAddressee.prefix() );
-
- if ( !compareString( mLeftAddressee.suffix(), mRightAddressee.suffix() ) )
- conflictField( TDEABC::Addressee::suffixLabel(), mLeftAddressee.suffix(), mRightAddressee.suffix() );
-
- if ( !compareString( mLeftAddressee.nickName(), mRightAddressee.nickName() ) )
- conflictField( TDEABC::Addressee::nickNameLabel(), mLeftAddressee.nickName(), mRightAddressee.nickName() );
-
- if ( mLeftAddressee.birthday() != mRightAddressee.birthday() )
- conflictField( TDEABC::Addressee::birthdayLabel(), mLeftAddressee.birthday().toString(),
- mRightAddressee.birthday().toString() );
-
- if ( !compareString( mLeftAddressee.mailer(), mRightAddressee.mailer() ) )
- conflictField( TDEABC::Addressee::mailerLabel(), mLeftAddressee.mailer(), mRightAddressee.mailer() );
-
- if ( mLeftAddressee.timeZone() != mRightAddressee.timeZone() )
- conflictField( TDEABC::Addressee::timeZoneLabel(), mLeftAddressee.timeZone().asString(), mRightAddressee.timeZone().asString() );
-
- if ( mLeftAddressee.geo() != mRightAddressee.geo() )
- conflictField( TDEABC::Addressee::geoLabel(), mLeftAddressee.geo().asString(), mRightAddressee.geo().asString() );
-
- if ( !compareString( mLeftAddressee.title(), mRightAddressee.title() ) )
- conflictField( TDEABC::Addressee::titleLabel(), mLeftAddressee.title(), mRightAddressee.title() );
-
- if ( !compareString( mLeftAddressee.role(), mRightAddressee.role() ) )
- conflictField( TDEABC::Addressee::roleLabel(), mLeftAddressee.role(), mRightAddressee.role() );
-
- if ( !compareString( mLeftAddressee.organization(), mRightAddressee.organization() ) )
- conflictField( TDEABC::Addressee::organizationLabel(), mLeftAddressee.organization(), mRightAddressee.organization() );
-
- if ( !compareString( mLeftAddressee.note(), mRightAddressee.note() ) )
- conflictField( TDEABC::Addressee::noteLabel(), mLeftAddressee.note(), mRightAddressee.note() );
-
- if ( !compareString( mLeftAddressee.productId(), mRightAddressee.productId() ) )
- conflictField( TDEABC::Addressee::productIdLabel(), mLeftAddressee.productId(), mRightAddressee.productId() );
-
- if ( !compareString( mLeftAddressee.sortString(), mRightAddressee.sortString() ) )
- conflictField( TDEABC::Addressee::sortStringLabel(), mLeftAddressee.sortString(), mRightAddressee.sortString() );
-
- if ( mLeftAddressee.secrecy() != mRightAddressee.secrecy() ) {
- conflictField( TDEABC::Addressee::secrecyLabel(), mLeftAddressee.secrecy().asString(), mRightAddressee.secrecy().asString() );
- }
- if ( mLeftAddressee.url()!= mRightAddressee.url() )
- conflictField( TDEABC::Addressee::urlLabel(), mLeftAddressee.url().prettyURL(),
- mRightAddressee.url().prettyURL() );
-
- if ( mLeftAddressee.logo() != mRightAddressee.logo() ) {
- }
-
- if ( mLeftAddressee.photo() != mRightAddressee.photo() ) {
- }
-
- diffList( "emails", mLeftAddressee.emails(), mRightAddressee.emails() );
-
- diffList( "Phone Numbers", mLeftAddressee.phoneNumbers(), mRightAddressee.phoneNumbers() );
- diffList( "Addresses", mLeftAddressee.addresses(), mRightAddressee.addresses() );
-
- end();
-}
-
-TQString AddresseeDiffAlgo::toString( const TDEABC::PhoneNumber &number )
-{
- return number.number();
-}
-
-TQString AddresseeDiffAlgo::toString( const TDEABC::Address &addr )
-{
- return addr.formattedAddress();
-}
-
-template <class L>
-void AddresseeDiffAlgo::diffList( const TQString &id,
- const TQValueList<L> &left, const TQValueList<L> &right )
-{
- for ( uint i = 0; i < left.count(); ++i ) {
- if ( right.find( left[ i ] ) == right.end() )
- additionalLeftField( id, toString( left[ i ] ) );
- }
-
- for ( uint i = 0; i < right.count(); ++i ) {
- if ( left.find( right[ i ] ) == left.end() )
- additionalRightField( id, toString( right[ i ] ) );
- }
-}
diff --git a/kitchensync/src/addresseediffalgo.h b/kitchensync/src/addresseediffalgo.h
deleted file mode 100644
index 2cf33eea..00000000
--- a/kitchensync/src/addresseediffalgo.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- This file is part of libtdepim.
-
- Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef KSYNC_ADDRESSEEDIFFALGO_H
-#define KSYNC_ADDRESSEEDIFFALGO_H
-
-#include <tdeabc/addressee.h>
-#include <libtdepim/diffalgo.h>
-
-using namespace KPIM;
-
-namespace KSync {
-
-class AddresseeDiffAlgo : public DiffAlgo
-{
- public:
- AddresseeDiffAlgo( const TDEABC::Addressee &leftAddressee, const TDEABC::Addressee &rightAddressee );
- AddresseeDiffAlgo( const TQString &leftAddressee, const TQString &rightAddressee );
-
- void run();
-
- private:
- template <class L>
- void diffList( const TQString &id, const TQValueList<L> &left, const TQValueList<L> &right );
-
- TQString toString( const TDEABC::PhoneNumber &number );
- TQString toString( const TDEABC::Address &address );
-
- TDEABC::Addressee mLeftAddressee;
- TDEABC::Addressee mRightAddressee;
-};
-
-}
-
-#endif
diff --git a/kitchensync/src/calendardiffalgo.cpp b/kitchensync/src/calendardiffalgo.cpp
deleted file mode 100644
index 8d925322..00000000
--- a/kitchensync/src/calendardiffalgo.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- This file is part of libtdepim.
-
- Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <tdelocale.h>
-
-#include <libkcal/kcalversion.h>
-
-#include "calendardiffalgo.h"
-
-using namespace KSync;
-
-#ifndef KDE_USE_FINAL
-static bool compareString( const TQString &left, const TQString &right )
-{
- if ( left.isEmpty() && right.isEmpty() )
- return true;
- else
- return left == right;
-}
-#endif
-
-static TQString toString( KCal::Attendee *attendee )
-{
- return attendee->name() + "<" + attendee->email() + ">";
-}
-
-static TQString toString( KCal::Alarm * )
-{
- return TQString();
-}
-
-static TQString toString( KCal::Incidence * )
-{
- return TQString();
-}
-
-static TQString toString( KCal::Attachment * )
-{
- return TQString();
-}
-
-static TQString toString( const TQDate &date )
-{
- return date.toString();
-}
-
-static TQString toString( const TQDateTime &dateTime )
-{
- return dateTime.toString();
-}
-
-static TQString toString( const TQString str )
-{
- return str;
-}
-
-static TQString toString( bool value )
-{
- if ( value )
- return i18n( "Yes" );
- else
- return i18n( "No" );
-}
-
-CalendarDiffAlgo::CalendarDiffAlgo( KCal::Incidence *leftIncidence,
- KCal::Incidence *rightIncidence )
- : mLeftIncidence( leftIncidence ), mRightIncidence( rightIncidence )
-{
-}
-
-void CalendarDiffAlgo::run()
-{
- begin();
-
- diffIncidenceBase( mLeftIncidence, mRightIncidence );
- diffIncidence( mLeftIncidence, mRightIncidence );
-
- KCal::Event *leftEvent = dynamic_cast<KCal::Event*>( mLeftIncidence );
- KCal::Event *rightEvent = dynamic_cast<KCal::Event*>( mRightIncidence );
- if ( leftEvent && rightEvent ) {
- diffEvent( leftEvent, rightEvent );
- } else {
- KCal::Todo *leftTodo = dynamic_cast<KCal::Todo*>( mLeftIncidence );
- KCal::Todo *rightTodo = dynamic_cast<KCal::Todo*>( mRightIncidence );
- if ( leftTodo && rightTodo ) {
- diffTodo( leftTodo, rightTodo );
- }
- }
-
- end();
-}
-
-void CalendarDiffAlgo::diffIncidenceBase( KCal::IncidenceBase *left, KCal::IncidenceBase *right )
-{
- diffList( i18n( "Attendees" ), left->attendees(), right->attendees() );
-
- if ( left->dtStart() != right->dtStart() )
- conflictField( i18n( "Start time" ), left->dtStartStr(), right->dtStartStr() );
-
- if ( !compareString( left->organizer().fullName(), right->organizer().fullName() ) )
- conflictField( i18n( "Organizer" ), left->organizer().fullName(), right->organizer().fullName() );
-
- if ( !compareString( left->uid(), right->uid() ) )
- conflictField( i18n( "UID" ), left->uid(), right->uid() );
-
- if ( left->doesFloat() != right->doesFloat() )
- conflictField( i18n( "Is floating" ), toString( left->doesFloat() ), toString( right->doesFloat() ) );
-
- if ( left->hasDuration() != right->hasDuration() )
- conflictField( i18n( "Has duration" ), toString( left->hasDuration() ), toString( right->hasDuration() ) );
-
- if ( left->duration() != right->duration() )
- conflictField( i18n( "Duration" ), TQString::number( left->duration() ), TQString::number( right->duration() ) );
-}
-
-void CalendarDiffAlgo::diffIncidence( KCal::Incidence *left, KCal::Incidence *right )
-{
- if ( !compareString( left->description(), right->description() ) )
- conflictField( i18n( "Description" ), left->description(), right->description() );
-
- if ( !compareString( left->summary(), right->summary() ) )
- conflictField( i18n( "Summary" ), left->summary(), right->summary() );
-
- if ( left->status() != right->status() )
- conflictField( i18n( "Status" ), left->statusStr(), right->statusStr() );
-
- if ( left->secrecy() != right->secrecy() )
- conflictField( i18n( "Secrecy" ), toString( left->secrecy() ), toString( right->secrecy() ) );
-
- if ( left->priority() != right->priority() )
- conflictField( i18n( "Priority" ), toString( left->priority() ), toString( right->priority() ) );
-
- if ( !compareString( left->location(), right->location() ) )
- conflictField( i18n( "Location" ), left->location(), right->location() );
-
- diffList( i18n( "Categories" ), left->categories(), right->categories() );
- diffList( i18n( "Alarms" ), left->alarms(), right->alarms() );
- diffList( i18n( "Resources" ), left->resources(), right->resources() );
- diffList( i18n( "Relations" ), left->relations(), right->relations() );
- diffList( i18n( "Attachments" ), left->attachments(), right->attachments() );
-#if LIBKCAL_IS_VERSION( 1, 3, 1 )
- diffList( i18n( "Exception Dates" ), left->recurrence()->exDates(), right->recurrence()->exDates() );
- diffList( i18n( "Exception Times" ), left->recurrence()->exDateTimes(), right->recurrence()->exDateTimes() );
-#endif
- // TODO: recurrence dates and date/times, exrules, rrules
-
- if ( left->created() != right->created() )
- conflictField( i18n( "Created" ), left->created().toString(), right->created().toString() );
-
- if ( !compareString( left->relatedToUid(), right->relatedToUid() ) )
- conflictField( i18n( "Related Uid" ), left->relatedToUid(), right->relatedToUid() );
-}
-
-void CalendarDiffAlgo::diffEvent( KCal::Event *left, KCal::Event *right )
-{
- if ( left->hasEndDate() != right->hasEndDate() )
- conflictField( i18n( "Has End Date" ), toString( left->hasEndDate() ), toString( right->hasEndDate() ) );
-
- if ( left->dtEnd() != right->dtEnd() )
- conflictField( i18n( "End Date" ), left->dtEndStr(), right->dtEndStr() );
-
- // TODO: check transparency
-}
-
-void CalendarDiffAlgo::diffTodo( KCal::Todo *left, KCal::Todo *right )
-{
- if ( left->hasStartDate() != right->hasStartDate() )
- conflictField( i18n( "Has Start Date" ), toString( left->hasStartDate() ), toString( right->hasStartDate() ) );
-
- if ( left->hasDueDate() != right->hasDueDate() )
- conflictField( i18n( "Has Due Date" ), toString( left->hasDueDate() ), toString( right->hasDueDate() ) );
-
- if ( left->dtDue() != right->dtDue() )
- conflictField( i18n( "Due Date" ), left->dtDue().toString(), right->dtDue().toString() );
-
- if ( left->hasCompletedDate() != right->hasCompletedDate() )
- conflictField( i18n( "Has Complete Date" ), toString( left->hasCompletedDate() ), toString( right->hasCompletedDate() ) );
-
- if ( left->percentComplete() != right->percentComplete() )
- conflictField( i18n( "Complete" ), TQString::number( left->percentComplete() ), TQString::number( right->percentComplete() ) );
-
- if ( left->completed() != right->completed() )
- conflictField( i18n( "Completed" ), toString( left->completed() ), toString( right->completed() ) );
-}
-
-template <class L>
-void CalendarDiffAlgo::diffList( const TQString &id,
- const TQValueList<L> &left, const TQValueList<L> &right )
-{
- for ( uint i = 0; i < left.count(); ++i ) {
- if ( right.find( left[ i ] ) == right.end() )
- additionalLeftField( id, toString( left[ i ] ) );
- }
-
- for ( uint i = 0; i < right.count(); ++i ) {
- if ( left.find( right[ i ] ) == left.end() )
- additionalRightField( id, toString( right[ i ] ) );
- }
-}
diff --git a/kitchensync/src/calendardiffalgo.h b/kitchensync/src/calendardiffalgo.h
deleted file mode 100644
index 1d9497b9..00000000
--- a/kitchensync/src/calendardiffalgo.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- This file is part of libtdepim.
-
- Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef KSYNC_CALENDARDIFFALGO_H
-#define KSYNC_CALENDARDIFFALGO_H
-
-#include <libkcal/event.h>
-#include <libkcal/todo.h>
-#include <libtdepim/diffalgo.h>
-
-using namespace KPIM;
-
-namespace KSync {
-
-class CalendarDiffAlgo : public DiffAlgo
-{
- public:
- CalendarDiffAlgo( KCal::Incidence *leftIncidence, KCal::Incidence *rightIncidence );
-
- void run();
-
- private:
- template <class L>
- void diffList( const TQString &id, const TQValueList<L> &left, const TQValueList<L> &right );
-
- void diffIncidenceBase( KCal::IncidenceBase*, KCal::IncidenceBase* );
- void diffIncidence( KCal::Incidence*, KCal::Incidence* );
- void diffEvent( KCal::Event*, KCal::Event* );
- void diffTodo( KCal::Todo*, KCal::Todo* );
-
- KCal::Incidence *mLeftIncidence;
- KCal::Incidence *mRightIncidence;
-};
-
-}
-
-#endif
diff --git a/kitchensync/src/configgui.cpp b/kitchensync/src/configgui.cpp
deleted file mode 100644
index 6a41032e..00000000
--- a/kitchensync/src/configgui.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#include "configgui.h"
-
-
-#include "configguiblank.h"
-#include "configguifile.h"
-#include "configguignokii.h"
-#include "configguigpe.h"
-#include "configguiirmc.h"
-#include "configguildap.h"
-#include "configguiopie.h"
-#include "configguipalm.h"
-#include "configguisyncmlhttp.h"
-#include "configguisyncmlobex.h"
-#include "configguigcalendar.h"
-#include "configguijescs.h"
-#include "configguievo2.h"
-#include "configguimoto.h"
-#include "configguisynce.h"
-#include "configguisunbird.h"
-
-#include "memberinfo.h"
-
-#include <kdialog.h>
-#include <tdelocale.h>
-#include <klineedit.h>
-
-#include <tqlayout.h>
-#include <tqlabel.h>
-#include <tqtextedit.h>
-
-ConfigGui::ConfigGui( const QSync::Member &member, TQWidget *parent )
- : TQWidget( parent ), mMember( member )
-{
- mTopLayout = new TQVBoxLayout( this );
- mTopLayout->setSpacing( KDialog::spacingHint() );
- mTopLayout->setMargin( KDialog::marginHint() );
-
- TQBoxLayout *nameLayout = new TQHBoxLayout( mTopLayout );
-
- TQLabel *label = new TQLabel( i18n("Name:"), this );
- nameLayout->addWidget( label );
-
- mNameEdit = new KLineEdit( this );
- nameLayout->addWidget( mNameEdit );
-}
-
-void ConfigGui::setInstanceName( const TQString &t )
-{
- mNameEdit->setText( t );
-}
-
-TQString ConfigGui::instanceName() const
-{
- return mNameEdit->text();
-}
-
-ConfigGui *ConfigGui::Factory::create( const QSync::Member &member,
- TQWidget *parent )
-{
- TQString name = member.pluginName();
- if ( name == "file-sync" ) {
- return new ConfigGuiFile( member, parent );
- } else if ( name == "palm-sync" ) {
- return new ConfigGuiPalm( member, parent );
- } else if ( name == "irmc-sync" ) {
- return new ConfigGuiIRMC( member, parent );
- } else if ( name == "syncml-obex-client" ) {
- return new ConfigGuiSyncmlObex( member, parent );
- } else if ( name == "syncml-http-server" ) {
- return new ConfigGuiSyncmlHttp( member, parent );
- } else if ( name == "opie-sync" ) {
- return new ConfigGuiOpie( member, parent );
- } else if ( name == "gnokii-sync" ) {
- return new ConfigGuiGnokii( member, parent );
- } else if ( name == "gpe-sync" ) {
- return new ConfigGuiGpe( member, parent );
- } else if ( name == "google-calendar" ) {
- return new ConfigGuiGoogleCalendar( member, parent );
- } else if ( name == "ldap-sync" ) {
- return new ConfigGuiLdap( member, parent );
- } else if ( name == "tdepim-sync" ) {
- return new ConfigGuiBlank( member, parent );
- } else if ( name == "jescs-sync" ) {
- return new ConfigGuiJescs( member, parent );
- } else if ( name == "evo2-sync" ) {
- return new ConfigGuiEvo2( member, parent );
- } else if ( name == "moto-sync" ) {
- return new ConfigGuiMoto( member, parent );
- } else if ( name == "synce-plugin" ) {
- return new ConfigGuiSynce( member, parent );
- } else if ( name == "sunbird-sync" ) {
- return new ConfigGuiSunbird( member, parent );
- } else {
- return new ConfigGuiXml( member, parent );
- }
-}
-
-
-ConfigGuiXml::ConfigGuiXml( const QSync::Member &member, TQWidget *parent )
- : ConfigGui( member, parent )
-{
- mTextEdit = new TQTextEdit( this );
- topLayout()->addWidget( mTextEdit );
-}
-
-void ConfigGuiXml::load( const TQString &xml )
-{
- mTextEdit->setText( xml );
-}
-
-TQString ConfigGuiXml::save() const
-{
- return mTextEdit->text();
-}
diff --git a/kitchensync/src/configgui.h b/kitchensync/src/configgui.h
deleted file mode 100644
index 6b7b1b10..00000000
--- a/kitchensync/src/configgui.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-#ifndef CONFIGGUI_H
-#define CONFIGGUI_H
-
-#include <libqopensync/member.h>
-
-#include <tqwidget.h>
-
-class TQBoxLayout;
-class KLineEdit;
-class TQTextEdit;
-
-class ConfigGui : public TQWidget
-{
- public:
- ConfigGui( const QSync::Member &, TQWidget *parent );
-
- class Factory
- {
- public:
- static ConfigGui *create( const QSync::Member &, TQWidget *parent );
- };
-
- void setInstanceName( const TQString & );
- TQString instanceName() const;
-
- virtual void load( const TQString &xml ) = 0;
- virtual TQString save() const = 0;
-
- QSync::Member member() const { return mMember; }
-
- TQBoxLayout *topLayout() const { return mTopLayout; }
-
- private:
- QSync::Member mMember;
-
- TQBoxLayout *mTopLayout;
- KLineEdit *mNameEdit;
-};
-
-class ConfigGuiXml : public ConfigGui
-{
- public:
- ConfigGuiXml( const QSync::Member &, TQWidget *parent );
-
- void load( const TQString & );
- TQString save() const;
-
- private:
- TQTextEdit *mTextEdit;
-};
-
-#endif
diff --git a/kitchensync/src/configguiblank.cpp b/kitchensync/src/configguiblank.cpp
deleted file mode 100644
index b16c1f83..00000000
--- a/kitchensync/src/configguiblank.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2006 Daniel Gollub <dgollub@suse.de>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#include "configguiblank.h"
-
-#include <tdelocale.h>
-
-#include <tqlabel.h>
-#include <tqlayout.h>
-
-ConfigGuiBlank::ConfigGuiBlank( const QSync::Member &member, TQWidget *parent )
- : ConfigGui( member, parent )
-{
- TQLabel *label = new TQLabel( i18n( "This member/plugin needs no configuration." ), this );
- topLayout()->addWidget( label );
-}
-
-void ConfigGuiBlank::load( const TQString& )
-{
-}
-
-TQString ConfigGuiBlank::save() const
-{
- TQString xml = "<config></config>";
- return xml;
-}
diff --git a/kitchensync/src/configguiblank.h b/kitchensync/src/configguiblank.h
deleted file mode 100644
index e2048ac7..00000000
--- a/kitchensync/src/configguiblank.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2006 Daniel Gollub <dgollub@suse.de>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-#ifndef CONFIGGUIBLANK_H
-#define CONFIGGUIBLANK_H
-
-#include "configgui.h"
-
-class ConfigGuiBlank : public ConfigGui
-{
- public:
- ConfigGuiBlank( const QSync::Member &member, TQWidget *parent = 0 );
-
- void load( const TQString &xml );
- TQString save() const;
-};
-
-#endif
diff --git a/kitchensync/src/configguievo2.cpp b/kitchensync/src/configguievo2.cpp
deleted file mode 100644
index fb7116cb..00000000
--- a/kitchensync/src/configguievo2.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2007 Anirudh Ramesh <abattoir@abattoir.in>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#include "configguievo2.h"
-
-#include <tqdom.h>
-#include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqstring.h>
-
-#include <kurlrequester.h>
-#include <kurl.h>
-#include <tdefile.h>
-#include <kdialog.h>
-#include <tdelocale.h>
-
-ConfigGuiEvo2::ConfigGuiEvo2( const QSync::Member &member, TQWidget *parent )
- : ConfigGui( member, parent )
-{
- initGUI();
-}
-
-void ConfigGuiEvo2::load( const TQString &xml )
-{
- TQDomDocument doc;
- doc.setContent( xml );
- TQDomElement docElement = doc.documentElement();
- TQDomNode node;
- for( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) {
- TQDomElement element = node.toElement();
- if ( element.tagName() == "address_path" ) {
- mAddressPath->setURL( element.text() );
- } else if ( element.tagName() == "calendar_path" ) {
- mCalendarPath->setURL( element.text() ) ;
- } else if ( element.tagName() == "tasks_path" ) {
- mTasksPath->setURL( element.text() );
- }
- }
-}
-
-TQString ConfigGuiEvo2::save() const
-{
- TQString config = "<config>\n";
-
- config += TQString( "<address_path>%1</address_path>\n" ).arg( mAddressPath->url() );
- config += TQString( "<calendar_path>%1</calendar_path>\n" ).arg( mCalendarPath->url() );
- config += TQString( "<tasks_path>%1</tasks_path>\n" ).arg( mTasksPath->url() );
-
- config += "</config>";
-
- return config;
-}
-
-void ConfigGuiEvo2::initGUI()
-{
- TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
- layout->setMargin( KDialog::marginHint() );
-
- layout->addWidget( new TQLabel( i18n( "Address Book location:" ), this ), 0, 0 );
- mAddressPath = new KURLRequester( this );
- mAddressPath->setMode( KFile::Directory );
- layout->addMultiCellWidget( mAddressPath, 0, 0, 1, 2 );
-
- layout->addWidget( new TQLabel( i18n( "Calendar location:" ), this ), 1, 0 );
- mCalendarPath = new KURLRequester( this );
- mCalendarPath->setMode( KFile::Directory );
- layout->addMultiCellWidget( mCalendarPath, 1, 1, 1, 2 );
-
- layout->addWidget( new TQLabel( i18n( "Task list location:" ), this ), 2, 0 );
- mTasksPath = new KURLRequester( this );
- mTasksPath->setMode( KFile::Directory );
- layout->addMultiCellWidget( mTasksPath, 2, 2, 1, 2 );
-}
diff --git a/kitchensync/src/configguievo2.h b/kitchensync/src/configguievo2.h
deleted file mode 100644
index 7e3a1767..00000000
--- a/kitchensync/src/configguievo2.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2007 Anirudh Ramesh <abattoir@abattoir.in>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#ifndef CONFIGGUIEVO2_H
-#define CONFIGGUIEVO2_H
-
-#include "configgui.h"
-
-class KURLRequester;
-
-class ConfigGuiEvo2 : public ConfigGui
-{
- public:
- ConfigGuiEvo2( const QSync::Member &, TQWidget *parent );
-
- void load( const TQString &xml );
-
- TQString save() const;
-
- private:
- void initGUI();
-
- KURLRequester *mAddressPath;
- KURLRequester *mCalendarPath;
- KURLRequester *mTasksPath;
-};
-
-#endif
diff --git a/kitchensync/src/configguifile.cpp b/kitchensync/src/configguifile.cpp
deleted file mode 100644
index 22767ab8..00000000
--- a/kitchensync/src/configguifile.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#include "configguifile.h"
-
-#include <kurlrequester.h>
-#include <tdelocale.h>
-#include <kdialog.h>
-
-#include <tqlayout.h>
-#include <tqcheckbox.h>
-#include <tqlabel.h>
-#include <tqdom.h>
-
-ConfigGuiFile::ConfigGuiFile( const QSync::Member &member, TQWidget *parent )
- : ConfigGui( member, parent )
-{
- TQBoxLayout *filenameLayout = new TQHBoxLayout( topLayout() );
-
- TQLabel *label = new TQLabel( i18n("Directory name:"), this );
- filenameLayout->addWidget( label );
-
- mFilename = new KURLRequester( this );
- mFilename->setMode( KFile::Directory | KFile::LocalOnly );
- filenameLayout->addWidget( mFilename );
-
- TQBoxLayout *recursiveLayout = new TQHBoxLayout( topLayout() );
-
- mRecursive = new TQCheckBox( i18n("Sync all subdirectories"), this );
- recursiveLayout->addWidget( mRecursive );
-
- topLayout()->addStretch( 1 );
-}
-
-void ConfigGuiFile::load( const TQString &xml )
-{
- TQDomDocument doc;
- doc.setContent( xml );
- TQDomElement docElement = doc.documentElement();
- TQDomNode n;
- for( n = docElement.firstChild(); !n.isNull(); n = n.nextSibling() ) {
- TQDomElement e = n.toElement();
- if ( e.tagName() == "path" ) {
- mFilename->setURL( e.text() );
- } else if ( e.tagName() == "recursive" ) {
- mRecursive->setChecked( e.text() == "TRUE" );
- }
- }
-}
-
-TQString ConfigGuiFile::save() const
-{
- TQString xml;
- xml = "<config>";
- xml += "<path>" + mFilename->url() + "</path>";
- xml += "<recursive>";
- if ( mRecursive->isChecked() ) xml += "TRUE";
- else xml += "FALSE";
- xml += "</recursive>";
- xml += "</config>";
-
- return xml;
-}
diff --git a/kitchensync/src/configguifile.h b/kitchensync/src/configguifile.h
deleted file mode 100644
index db938522..00000000
--- a/kitchensync/src/configguifile.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-#ifndef CONFIGGUIFILE_H
-#define CONFIGGUIFILE_H
-
-#include "configgui.h"
-
-class KURLRequester;
-class TQCheckBox;
-
-class ConfigGuiFile : public ConfigGui
-{
- public:
- ConfigGuiFile( const QSync::Member &, TQWidget *parent );
-
- void load( const TQString &xml );
- TQString save() const;
-
- private:
- KURLRequester *mFilename;
- TQCheckBox *mRecursive;
-};
-
-#endif
diff --git a/kitchensync/src/configguigcalendar.cpp b/kitchensync/src/configguigcalendar.cpp
deleted file mode 100644
index 8fb4fd0e..00000000
--- a/kitchensync/src/configguigcalendar.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
- Copyright (c) 2006 Eduardo Habkost <ehabkost@raisama.net>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#include "configguigcalendar.h"
-
-#include <tdelocale.h>
-
-#include <tqlayout.h>
-#include <tqlabel.h>
-#include <tqdom.h>
-#include <tqlineedit.h>
-
-ConfigGuiGoogleCalendar::ConfigGuiGoogleCalendar( const QSync::Member &member, TQWidget *parent )
- : ConfigGui( member, parent )
-{
- TQBoxLayout *userLayout = new TQHBoxLayout( topLayout() );
-
- TQLabel *userLbl= new TQLabel( i18n("Username:"), this );
- userLayout->addWidget(userLbl);
-
- mUsername = new TQLineEdit(this);
- userLayout->addWidget(mUsername);
-
-
- TQBoxLayout *passLayout = new TQHBoxLayout( topLayout() );
-
- TQLabel *passLbl = new TQLabel( i18n("Password:"), this );
- passLayout->addWidget(passLbl);
-
- mPassword = new TQLineEdit(this);
- mPassword->setEchoMode(TQLineEdit::Password);
- passLayout->addWidget(mPassword);
-
- topLayout()->addWidget(new TQLabel( i18n("Please notice that currently the password is stored as plain text in the plugin configuration file"), this ));
-
- TQBoxLayout *urlLayout = new TQHBoxLayout( topLayout() );
- TQLabel *urlLbl = new TQLabel( i18n("Calendar URL:"), this );
- urlLayout->addWidget(urlLbl);
-
- mUrl = new TQLineEdit(this);
- urlLayout->addWidget(mUrl);
-
- topLayout()->addStretch( 1 );
-}
-
-void ConfigGuiGoogleCalendar::load( const TQString &xml )
-{
- TQDomDocument doc;
- doc.setContent( xml );
- TQDomElement docElement = doc.documentElement();
- TQDomNode n;
- for( n = docElement.firstChild(); !n.isNull(); n = n.nextSibling() ) {
- TQDomElement e = n.toElement();
- if ( e.tagName() == "username" ) {
- mUsername->setText(e.text());
- } else if ( e.tagName() == "password" ) {
- mPassword->setText(e.text());
- } else if ( e.tagName() == "url" ) {
- mUrl->setText(e.text());
- }
- }
-}
-
-TQString ConfigGuiGoogleCalendar::save() const
-{
- TQDomDocument doc;
- TQDomElement root = doc.createElement("config");
- doc.appendChild(root);
-
- TQDomElement un = doc.createElement("username");
- root.appendChild(un);
- un.appendChild(doc.createTextNode(mUsername->text()));
-
- TQDomElement pass = doc.createElement("password");
- root.appendChild(pass);
- pass.appendChild(doc.createTextNode(mPassword->text()));
-
- TQDomElement url = doc.createElement("url");
- root.appendChild(url);
- url.appendChild(doc.createTextNode(mUrl->text()));
-
- //TODO: Implement me!
- return doc.toString();
-}
diff --git a/kitchensync/src/configguigcalendar.h b/kitchensync/src/configguigcalendar.h
deleted file mode 100644
index 198cf77c..00000000
--- a/kitchensync/src/configguigcalendar.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
- Copyright (c) 2006 Eduardo Habkost <ehabkost@raisama.net>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-#ifndef CONFIGGUIGCALENDAR_H
-#define CONFIGGUIGCALENDAR_H
-
-#include "configgui.h"
-
-class TQLineEdit;
-
-class ConfigGuiGoogleCalendar : public ConfigGui
-{
- public:
- ConfigGuiGoogleCalendar( const QSync::Member &, TQWidget *parent );
-
- void load( const TQString &xml );
- TQString save() const;
-
- private:
- TQLineEdit *mUsername;
- TQLineEdit *mPassword;
- TQLineEdit *mUrl;
-};
-
-#endif
diff --git a/kitchensync/src/configguignokii.cpp b/kitchensync/src/configguignokii.cpp
deleted file mode 100644
index cd392cb6..00000000
--- a/kitchensync/src/configguignokii.cpp
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2006 David Förster <david@dfoerster.de>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#include "configguignokii.h"
-
-#include <tdelocale.h>
-#include <kdialog.h>
-#include <kcombobox.h>
-
-#include <kdebug.h>
-
-#include <tqlayout.h>
-#include <tqlabel.h>
-#include <tqlineedit.h>
-#include <tqcombobox.h>
-#include <tqdom.h>
-#include <tqvbox.h>
-
-ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent )
- : ConfigGui( member, parent )
-{
- TQGridLayout *layout = new TQGridLayout( topLayout() );
-
- // Model
- TQLabel *label = new TQLabel( i18n("Model:"), this );
- layout->addWidget( label, 0, 0 );
-
- mModel = new KComboBox( true, this );
- layout->addWidget( mModel, 0, 1 );
- mModel->insertItem( "2110" );
- mModel->insertItem( "3110" );
- mModel->insertItem( "6110" );
- mModel->insertItem( "6110" );
- mModel->insertItem( "6160" );
- mModel->insertItem( "6230" );
- mModel->insertItem( "6230i" );
- mModel->insertItem( "6510" );
- mModel->insertItem( "7110" );
- mModel->insertItem( "AT" );
- // This one requires the gnapplet and rfcomm_channel
- mModel->insertItem( "3650" );
- mModel->insertItem( "6600" );
- mModel->insertItem( "gnapplet" );
- mModel->insertItem( "symbian" );
- mModel->insertItem( "sx1" );
-
- connect( mModel, TQT_SIGNAL (activated( int ) ),
- this, TQT_SLOT( slotModelChanged () ) );
-
- // Connection
- label = new TQLabel( i18n("Connection:"), this );
- layout->addWidget( label, 1, 0 );
-
- mConnection = new TQComboBox( this );
- layout->addWidget( mConnection, 1, 1 );
-
- connect( mConnection, TQT_SIGNAL (activated( int ) ),
- this, TQT_SLOT( slotConnectionChanged ( int ) ) );
-
- // this is a list of all connection types accepted by the gnokii-sync plugin
- mConnectionTypes.append( ConnectionType( "bluetooth", i18n( "Bluetooth" ) ) );
- mConnectionTypes.append( ConnectionType( "irda", i18n( "IrDA" ) ) );
- mConnectionTypes.append( ConnectionType( "serial", i18n( "Serial" ) ) );
- mConnectionTypes.append( ConnectionType( "infrared", i18n( "Infrared" ) ) );
- mConnectionTypes.append( ConnectionType( "tcp", i18n( "TCP" ) ) );
- mConnectionTypes.append( ConnectionType( "dku2", i18n( "USB (nokia_dku2)" ) ) );
- mConnectionTypes.append( ConnectionType( "dku2libusb", i18n( "USB (libusb)" ) ) );
- mConnectionTypes.append( ConnectionType( "dau9p", i18n( "Serial (DAU9P cable)" ) ) );
- mConnectionTypes.append( ConnectionType( "dlr3p", i18n( "Serial (DLR3P cable)" ) ) );
- mConnectionTypes.append( ConnectionType( "tekram", i18n( "Tekram Ir-Dongle" ) ) );
- mConnectionTypes.append( ConnectionType( "m2bus", i18n( "Serial (M2BUS protocol)" ) ) );
-
- ConnectionTypeList::ConstIterator it;
- for ( it = mConnectionTypes.begin(); it != mConnectionTypes.end(); it++ ) {
- mConnection->insertItem( (*it).second );
- }
-
- TQVBox *connectionWidget = new TQVBox( this );
- connectionWidget->setMargin( KDialog::marginHint() );
- connectionWidget->setSpacing( 5 );
-
- mBluetooth = new BluetoothWidget( connectionWidget );
- mBluetooth->hide();
-
- layout->addMultiCellWidget( connectionWidget, 2, 2, 0, 1 );
-
- // Port
- mPortLabel = new TQLabel( i18n("Port:"), this );
- layout->addWidget( mPortLabel, 2, 0 );
- mPortLabel->hide();
-
- mPort = new KComboBox( true, this );
- layout->addWidget( mPort, 2, 1 );
- mPort->hide();
-
- mPort->insertItem( "/dev/ircomm0" );
- mPort->insertItem( "/dev/ircomm1" );
- mPort->insertItem( "/dev/ttyS0" );
- mPort->insertItem( "/dev/ttyS1" );
- mPort->insertItem( "/dev/ttyUSB0" );
- mPort->insertItem( "/dev/ttyUSB1" );
-
- layout->setColStretch( 1, 1 );
-
- topLayout()->addStretch( 1 );
-}
-
-void ConfigGuiGnokii::slotConnectionChanged( int nth )
-{
- mPort->hide();
- mPortLabel->hide();
- mBluetooth->hide();
-
- // Bluetooth
- if ( nth == 0 ) {
- mBluetooth->show();
- slotModelChanged();
-
- if ( !mPort->currentText().isEmpty() )
- mBluetooth->setAddress( mPort->currentText() );
-
- // dku2libusb
- } else if ( nth == 6 ) {
- // No widget needed.
- } else {
- mPort->show();
- mPortLabel->show();
- }
-
-}
-
-void ConfigGuiGnokii::slotModelChanged()
-{
- mBluetooth->hideChannel();
-
- if ( mModel->currentText() == "gnapplet"
- || mModel->currentText() == "symbian"
- || mModel->currentText() == "3650"
- || mModel->currentText() == "6600"
- || mModel->currentText() == "sx1")
- mBluetooth->showChannel();
- else
- mBluetooth->setChannel("");
-}
-
-void ConfigGuiGnokii::load( const TQString &xml )
-{
- TQDomDocument doc;
- doc.setContent( xml );
- TQDomElement docElement = doc.documentElement();
- TQDomNode n;
- for( n = docElement.firstChild(); !n.isNull(); n = n.nextSibling() ) {
- TQDomElement e = n.toElement();
- if ( e.tagName() == "connection" ) {
- for ( uint i = 0; i < mConnectionTypes.count(); i++ ) {
- if ( mConnectionTypes[i].first == e.text()) {
- mConnection->setCurrentItem( i );
- slotConnectionChanged( i );
- break;
- }
- }
- } else if ( e.tagName() == "port" ) {
- mPort->setCurrentText( e.text() );
- } else if ( e.tagName() == "model" ) {
- mModel->setCurrentText( e.text() );
- } else if ( e.tagName() == "rfcomm_channel" ) {
- mBluetooth->setChannel( e.text() );
- mBluetooth->showChannel();
- }
- }
-}
-
-TQString ConfigGuiGnokii::save() const
-{
- TQString xml;
- xml = "<config>";
-
- ConnectionTypeList::ConstIterator it;
- for ( it = mConnectionTypes.begin(); it != mConnectionTypes.end(); it++ ) {
- if ( mConnection->currentText() == (*it).second ) {
- xml += "<connection>" + (*it).first + "</connection>";
- break;
- }
- }
-
- if ( (*it).first == "bluetooth" )
- xml += "<port>" + mBluetooth->address() + "</port>";
- else if ( (*it).first == "dku2libusb" )
- xml += "<port>" + TQString("FF:FF:FF:FF:FF:FF") + "</port>"; // Only place holder for libgnokii
- else
- xml += "<port>" + mPort->currentText() + "</port>";
-
- // model
- xml += "<model>" + mModel->currentText() + "</model>";
-
- // rfcomm_channel
- if ( !mBluetooth->channel().isNull() )
- xml += "<rfcomm_channel>" + mBluetooth->channel() + "</rfcomm_channel>";
-
- xml += "</config>";
-
- return xml;
-}
-
-#include "configguignokii.moc"
diff --git a/kitchensync/src/configguignokii.h b/kitchensync/src/configguignokii.h
deleted file mode 100644
index 9dbbdd9a..00000000
--- a/kitchensync/src/configguignokii.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2006 David Förster <david@dfoerster.de>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-#ifndef CONFIGGUIGNOKII_H
-#define CONFIGGUIGNOKII_H
-
-#include "configgui.h"
-#include "connectionwidgets.h"
-
-#include <tqvaluelist.h>
-#include <tqpair.h>
-
-class TQLabel;
-class TQLineEdit;
-class TQComboBox;
-
-class ConfigGuiGnokii : public ConfigGui
-{
- Q_OBJECT
-
-
- public:
- ConfigGuiGnokii( const QSync::Member &, TQWidget *parent );
-
- void load( const TQString &xml );
- TQString save() const;
-
- private:
- TQComboBox *mConnection;
- KComboBox *mPort;
- TQLabel *mPortLabel;
- KComboBox *mModel;
-
- BluetoothWidget *mBluetooth;
-
- typedef TQPair<TQString, TQString> ConnectionType;
- typedef TQValueList<ConnectionType> ConnectionTypeList;
- ConnectionTypeList mConnectionTypes;
-
- protected slots:
- void slotConnectionChanged( int nth );
- void slotModelChanged();
-
-};
-
-#endif
diff --git a/kitchensync/src/configguigpe.cpp b/kitchensync/src/configguigpe.cpp
deleted file mode 100644
index 4dce7d9b..00000000
--- a/kitchensync/src/configguigpe.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2007 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#include "configguigpe.h"
-
-#include <tqcheckbox.h>
-#include <tqdom.h>
-#include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqspinbox.h>
-
-#include <kcombobox.h>
-#include <kdialog.h>
-#include <klineedit.h>
-#include <tdelocale.h>
-
-ConfigGuiGpe::ConfigGuiGpe( const QSync::Member &member, TQWidget *parent )
- : ConfigGui( member, parent )
-{
- initGUI();
-
- mConnectionMode->insertItem( i18n( "Local" ) );
- mConnectionMode->insertItem( i18n( "Ssh" ) );
-}
-
-void ConfigGuiGpe::load( const TQString &xml )
-{
- TQDomDocument doc;
- doc.setContent( xml );
- TQDomElement docElement = doc.documentElement();
- TQDomNode node;
- for( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) {
- TQDomElement element = node.toElement();
- if ( element.tagName() == "use_local" ) {
- if ( element.text().toInt() == 1 )
- mConnectionMode->setCurrentItem( 0 );
- else
- mConnectionMode->setCurrentItem( 1 );
- } else if ( element.tagName() == "handheld_ip" ) {
- mIP->setText( element.text() );
- } else if ( element.tagName() == "handheld_port" ) {
- mPort->setValue( element.text().toInt() );
- } else if ( element.tagName() == "handheld_user" ) {
- mUser->setText( element.text() );
- }
- }
-}
-
-TQString ConfigGuiGpe::save() const
-{
- TQString config = "<config>";
-
- config += TQString( "<use_local>%1</use_local>" ).arg( mConnectionMode->currentItem() == 0 );
- config += TQString( "<use_ssh>%1</use_ssh>" ).arg( mConnectionMode->currentItem() == 1 );
- config += TQString( "<handheld_ip>%1</handheld_ip>" ).arg( mIP->text() );
- config += TQString( "<handheld_port>%1</handheld_port>" ).arg( mPort->value() );
- config += TQString( "<handheld_user>%1</handheld_user>" ).arg( mUser->text() );
-
- config += "</config>";
-
- return config;
-}
-
-void ConfigGuiGpe::initGUI()
-{
- TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
- layout->setMargin( KDialog::marginHint() );
-
- layout->addWidget( new TQLabel( i18n( "Connection Mode:" ), this ), 0, 0 );
- mConnectionMode = new KComboBox( this );
- layout->addMultiCellWidget( mConnectionMode, 0, 0, 0, 3 );
-
- layout->addWidget( new TQLabel( i18n( "IP Address:" ), this ), 1, 0 );
- mIP = new KLineEdit( this );
- mIP->setInputMask( "000.000.000.000" );
- layout->addWidget( mIP, 1, 1 );
-
- layout->addWidget( new TQLabel( i18n( "Port:" ), this ), 1, 2, TQt::AlignRight );
- mPort = new TQSpinBox( 1, 65536, 1, this );
- layout->addWidget( mPort, 1, 3 );
-
- layout->addWidget( new TQLabel( i18n( "User:" ), this ), 2, 0 );
- mUser = new KLineEdit( this );
- layout->addMultiCellWidget( mUser, 2, 2, 1, 3 );
-}
diff --git a/kitchensync/src/configguigpe.h b/kitchensync/src/configguigpe.h
deleted file mode 100644
index e1fc10c6..00000000
--- a/kitchensync/src/configguigpe.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2007 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#ifndef CONFIGGUIGPE_H
-#define CONFIGGUIGPE_H
-
-#include "configgui.h"
-
-class TQSpinBox;
-
-class KComboBox;
-class KLineEdit;
-
-class ConfigGuiGpe : public ConfigGui
-{
- public:
- ConfigGuiGpe( const QSync::Member &, TQWidget *parent );
-
- void load( const TQString &xml );
- TQString save() const;
-
- private:
- void initGUI();
-
- KComboBox *mConnectionMode;
-
- KLineEdit *mIP;
- TQSpinBox *mPort;
- KLineEdit *mUser;
-};
-
-#endif
diff --git a/kitchensync/src/configguiirmc.cpp b/kitchensync/src/configguiirmc.cpp
deleted file mode 100644
index 331f9daa..00000000
--- a/kitchensync/src/configguiirmc.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#include <kcombobox.h>
-#include <kdialog.h>
-#include <tdeglobal.h>
-#include <kiconloader.h>
-#include <kinputdialog.h>
-#include <klineedit.h>
-#include <tdelocale.h>
-#include <tdemessagebox.h>
-
-#include <kdebug.h>
-
-#include <tqapplication.h>
-#include <tqeventloop.h>
-#include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqpushbutton.h>
-#include <tqspinbox.h>
-#include <tqtabwidget.h>
-#include <tqtooltip.h>
-#include <tqvbox.h>
-
-#include "configguiirmc.h"
-
-ConfigGuiIRMC::ConfigGuiIRMC( const QSync::Member &member, TQWidget *parent )
- : ConfigGui( member, parent )
-{
- initGUI();
-
- mConnectionType->insertItem( i18n( "Bluetooth" ) );
- mConnectionType->insertItem( i18n( "InfraRed (IR)" ) );
- mConnectionType->insertItem( i18n( "Cable" ) );
-
- connect( mConnectionType, TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( connectionTypeChanged( int ) ) );
-
- connectionTypeChanged( 0 );
-}
-
-void ConfigGuiIRMC::load( const TQString &xml )
-{
- TQDomDocument doc;
- doc.setContent( xml );
- TQDomElement docElement = doc.documentElement();
- TQDomNode node;
- for ( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) {
- TQDomElement element = node.toElement();
- if ( element.tagName() == "connectmedium" ) {
- if ( element.text() == "bluetooth" ) {
- mConnectionType->setCurrentItem( 0 );
- connectionTypeChanged( 0 );
- } else if ( element.text() == "ir" ) {
- mConnectionType->setCurrentItem( 1 );
- connectionTypeChanged( 1 );
- } else if ( element.text() == "cable" ) {
- mConnectionType->setCurrentItem( 2 );
- connectionTypeChanged( 2 );
- }
- } else if (element.tagName() == "btunit" ) {
- mBluetoothWidget->setAddress( element.text() );
- } else if (element.tagName() == "btchannel" ) {
- mBluetoothWidget->setChannel( element.text() );
- } else if (element.tagName() == "donttellsync" ) {
- mDontTellSync->setChecked( element.text() == "true" );
- }
-
-
- }
-
- mIRWidget->load( docElement );
- mCableWidget->load( docElement );
-}
-
-TQString ConfigGuiIRMC::save() const
-{
- TQDomDocument doc;
- TQDomElement config = doc.createElement( "config" );
- doc.appendChild( config );
-
- TQDomElement element = doc.createElement( "connectmedium" );
- if ( mConnectionType->currentItem() == 0 )
- element.appendChild( doc.createTextNode( "bluetooth" ) );
- if ( mConnectionType->currentItem() == 1 )
- element.appendChild( doc.createTextNode( "ir" ) );
- if ( mConnectionType->currentItem() == 2 )
- element.appendChild( doc.createTextNode( "cable" ) );
-
- config.appendChild( element );
-
- if ( mConnectionType->currentItem() == 0 ) {
- TQDomElement btunit = doc.createElement( "btunit" );
- if ( !mBluetoothWidget->address().isEmpty() )
- btunit.appendChild( doc.createTextNode( mBluetoothWidget->address() ) );
-
- TQDomElement btchannel = doc.createElement( "btchannel" );
- if ( !mBluetoothWidget->channel().isEmpty() )
- btchannel.appendChild( doc.createTextNode( mBluetoothWidget->channel() ) );
-
- config.appendChild( btunit );
- config.appendChild( btchannel );
- }
-
- if ( mDontTellSync->isChecked() ) {
- TQDomElement dontellsync = doc.createElement( "donttellsync" );
- dontellsync.appendChild( doc.createTextNode( "true" ) );
- config.appendChild( dontellsync );
- }
-
- mIRWidget->save( doc, config );
- mCableWidget->save( doc, config );
-
- return doc.toString();
-}
-
-void ConfigGuiIRMC::connectionTypeChanged( int type )
-{
- mBluetoothWidget->hide();
- mIRWidget->hide();
- mCableWidget->hide();
-
- if ( type == 0 )
- mBluetoothWidget->show();
- else if ( type == 1 )
- mIRWidget->show();
- else
- mCableWidget->show();
-}
-
-void ConfigGuiIRMC::initGUI()
-{
- TQTabWidget *tabWidget = new TQTabWidget( this );
- topLayout()->addWidget( tabWidget );
-
- TQVBox *connectionWidget = new TQVBox( tabWidget );
- connectionWidget->setMargin( KDialog::marginHint() );
- connectionWidget->setSpacing( 5 );
-
- tabWidget->addTab( connectionWidget, i18n( "Connection" ) );
-
- mConnectionType = new KComboBox( connectionWidget );
- TQToolTip::add( mConnectionType, i18n( "Select your connection type." ) );
-
- mBluetoothWidget = new BluetoothWidget( connectionWidget );
- mBluetoothWidget->hide();
-
- mIRWidget = new IRWidget( connectionWidget );
- mIRWidget->hide();
-
- mCableWidget = new CableWidget( connectionWidget );
- mCableWidget->hide();
-
- connectionWidget->setStretchFactor( mBluetoothWidget, 1 );
- connectionWidget->setStretchFactor( mIRWidget, 1 );
- connectionWidget->setStretchFactor( mCableWidget, 1 );
-
- TQVBox *optionsWidget = new TQVBox( tabWidget );
- optionsWidget->setMargin( KDialog::marginHint() );
- optionsWidget->setSpacing( 5 );
-
- tabWidget->addTab( optionsWidget, i18n( "Options" ) );
-
- TQHBox *optionBox = new TQHBox( optionsWidget );
- optionBox->setSpacing( KDialog::spacingHint() );
-
- TQLabel *label = new TQLabel( i18n( "Don't send OBEX UUID (IRMC-SYNC)" ), optionBox );
- mDontTellSync = new TQCheckBox( optionBox );
- TQToolTip::add( mDontTellSync, i18n( "Don't send OBEX UUID while connecting. Needed for older IrMC based mobile phones." ) );
- label->setBuddy( mDontTellSync );
-
-}
-
-#include "configguiirmc.moc"
diff --git a/kitchensync/src/configguiirmc.h b/kitchensync/src/configguiirmc.h
deleted file mode 100644
index a76dd782..00000000
--- a/kitchensync/src/configguiirmc.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#ifndef CONFIGGUIIRMC_H
-#define CONFIGGUIIRMC_H
-
-#include <tqcheckbox.h>
-#include <tqdom.h>
-
-#include "configgui.h"
-#include "connectionwidgets.h"
-
-class KComboBox;
-class KLineEdit;
-class TQCheckBox;
-class TQPushButton;
-class TQSpinBox;
-
-class ConfigGuiIRMC : public ConfigGui
-{
- Q_OBJECT
-
-
- public:
- ConfigGuiIRMC( const QSync::Member &, TQWidget *parent );
-
- void load( const TQString &xml );
- TQString save() const;
-
- protected slots:
- void connectionTypeChanged( int type );
-
- private:
- void initGUI();
-
- KComboBox *mConnectionType;
- TQCheckBox *mDontTellSync;
-
- BluetoothWidget *mBluetoothWidget;
- IRWidget *mIRWidget;
- CableWidget *mCableWidget;
-};
-
-#endif
diff --git a/kitchensync/src/configguijescs.cpp b/kitchensync/src/configguijescs.cpp
deleted file mode 100644
index c4167bb3..00000000
--- a/kitchensync/src/configguijescs.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2007 Anirudh Ramesh <abattoir@abattoir.in>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#include "configguijescs.h"
-
-#include <tqcheckbox.h>
-#include <tqdom.h>
-#include <tqlabel.h>
-#include <tqlayout.h>
-
-#include <klineedit.h>
-#include <kdialog.h>
-#include <tdelocale.h>
-
-ConfigGuiJescs::ConfigGuiJescs( const QSync::Member &member, TQWidget *parent )
- : ConfigGui( member, parent )
-{
- initGUI();
-}
-
-void ConfigGuiJescs::load( const TQString &xml )
-{
- TQDomDocument doc;
- doc.setContent( xml );
- TQDomElement docElement = doc.documentElement();
- TQDomNode node;
- for( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) {
- TQDomElement element = node.toElement();
- if ( element.tagName() == "url" ) {
- mUrl->setText( element.text() );
- } else if ( element.tagName() == "username" ) {
- mUsername->setText( element.text() );
- } else if ( element.tagName() == "password" ) {
- mPassword->setText( element.text() );
- } else if ( element.tagName() == "del_notify" ) {
- mDelNotify->setChecked( element.text() == "1" );
- }
- }
-}
-
-TQString ConfigGuiJescs::save() const
-{
- int delNotifyState;
- TQString config = "<config>\n";
-
- config += TQString( "<url>%1</url>\n" ).arg( mUrl->text() );
- config += TQString( "<username>%1</username>\n" ).arg( mUsername->text() );
- config += TQString( "<password>%1</password>\n" ).arg( mPassword->text() );
- if ( mDelNotify->isChecked() ) { delNotifyState = 1;
- } else { delNotifyState = 0;
- }
- config += TQString( "<del_notify>%1</del_notify>\n" ).arg( delNotifyState );
-
- config += "</config>";
-
- return config;
-}
-
-void ConfigGuiJescs::initGUI()
-{
- TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
- layout->setMargin( KDialog::marginHint() );
-
- layout->addWidget( new TQLabel( i18n( "URL:" ), this ), 0, 0 );
- mUrl = new KLineEdit( this );
- layout->addMultiCellWidget( mUrl, 0, 0, 1, 2 );
-
- layout->addWidget( new TQLabel( i18n( "Username:" ), this ), 1, 0 );
- mUsername = new KLineEdit( this );
- layout->addMultiCellWidget( mUsername, 1, 1, 1, 2 );
-
- layout->addWidget( new TQLabel( i18n( "Password:" ), this ), 2, 0 );
- mPassword = new KLineEdit( this );
- mPassword->setEchoMode( KLineEdit::Password );
- layout->addMultiCellWidget( mPassword, 2, 2, 1, 2 );
-
- mDelNotify = new TQCheckBox( this );
- mDelNotify->setText( "Notify attendees about event/task deletion" );
- layout->addMultiCellWidget( mDelNotify, 3, 3, 0, 2 );
-}
diff --git a/kitchensync/src/configguijescs.h b/kitchensync/src/configguijescs.h
deleted file mode 100644
index 1667900c..00000000
--- a/kitchensync/src/configguijescs.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2007 Anirudh Ramesh <abattoir@abattoir.in>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#ifndef CONFIGGUIJESCS_H
-#define CONFIGGUIJESCS_H
-
-#include "configgui.h"
-
-class KLineEdit;
-class TQCheckBox;
-
-class ConfigGuiJescs : public ConfigGui
-{
- public:
- ConfigGuiJescs( const QSync::Member &, TQWidget *parent );
-
- void load( const TQString &xml );
-
- TQString save() const;
-
- private:
- void initGUI();
-
- KLineEdit *mUrl;
- KLineEdit *mUsername;
- KLineEdit *mPassword;
- TQCheckBox *mDelNotify;
-};
-
-#endif
diff --git a/kitchensync/src/configguildap.cpp b/kitchensync/src/configguildap.cpp
deleted file mode 100644
index 1b1c3622..00000000
--- a/kitchensync/src/configguildap.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2007 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#include "configguildap.h"
-
-#include <tqcheckbox.h>
-#include <tqdom.h>
-#include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqspinbox.h>
-
-#include <kcombobox.h>
-#include <kdialog.h>
-#include <klineedit.h>
-#include <tdelocale.h>
-
-ConfigGuiLdap::ConfigGuiLdap( const QSync::Member &member, TQWidget *parent )
- : ConfigGui( member, parent )
-{
- initGUI();
-
- mSearchScope->insertItem( i18n( "Base" ) );
- mSearchScope->insertItem( i18n( "One" ) );
- mSearchScope->insertItem( i18n( "Sub" ) );
-}
-
-void ConfigGuiLdap::load( const TQString &xml )
-{
- TQDomDocument doc;
- doc.setContent( xml );
- TQDomElement docElement = doc.documentElement();
- TQDomNode node;
- for( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) {
- TQDomElement element = node.toElement();
- if ( element.tagName() == "servername" ) {
- mLdapWidget->setHost( element.text() );
- } else if ( element.tagName() == "serverport" ) {
- mLdapWidget->setPort( element.text().toInt() );
- } else if ( element.tagName() == "binddn" ) {
- mLdapWidget->setBindDN( element.text() );
- } else if ( element.tagName() == "password" ) {
- mLdapWidget->setPassword( element.text() );
- } else if ( element.tagName() == "anonymous" ) {
- mLdapWidget->setAuthAnon( element.text().toInt() == 1 );
- } else if ( element.tagName() == "searchbase" ) {
- mLdapWidget->setDn( element.text() );
- } else if ( element.tagName() == "searchfilter" ) {
- mLdapWidget->setFilter( element.text() );
- } else if ( element.tagName() == "storebase" ) {
- mLdapWidget->setDn( element.text() );
- } else if ( element.tagName() == "keyattr" ) {
- mKeyAttribute->setText( element.text() );
- } else if ( element.tagName() == "scope" ) {
- TQStringList list;
- list << "base" << "one" << "sub";
- for ( uint i = 0; i < list.count(); ++i )
- if ( list[ i ] == element.text() )
- mSearchScope->setCurrentItem( i );
-
- } else if ( element.tagName() == "authmech" ) {
- if ( element.text() == "SIMPLE" ) {
- mLdapWidget->setAuthSimple( true );
- }
- } else if ( element.tagName() == "encryption" ) {
- mEncryption->setChecked( element.text().toInt() == 1 );
- } else if ( element.tagName() == "ldap_read" ) {
- mReadLdap->setChecked( element.text().toInt() == 1 );
- } else if ( element.tagName() == "ldap_write" ) {
- mWriteLdap->setChecked( element.text().toInt() == 1 );
- }
- }
-}
-
-TQString ConfigGuiLdap::save() const
-{
- TQString config = "<config>\n";
-
- config += TQString( "<servername>%1</servername>\n" ).arg( mLdapWidget->host() );
- config += TQString( "<serverport>%1</serverport>\n" ).arg( mLdapWidget->port() );
- config += TQString( "<binddn>%1</binddn>\n" ).arg( mLdapWidget->bindDN() );
- config += TQString( "<password>%1</password>\n" ).arg( mLdapWidget->password() );
- config += TQString( "<anonymous>%1</anonymous>\n" ).arg( mLdapWidget->isAuthAnon() ? "1" : "0" );
- config += TQString( "<searchbase>%1</searchbase>\n" ).arg( mLdapWidget->dn() );
- config += TQString( "<searchfilter>%1</searchfilter>\n" ).arg( mLdapWidget->filter() );
- config += TQString( "<storebase>%1</storebase>\n" ).arg( mLdapWidget->dn() );
- config += TQString( "<keyattr>%1</keyattr>\n" ).arg( mKeyAttribute->text() );
-
- TQStringList scopes;
- scopes << "base" << "one" << "sub";
-
- config += TQString( "<scope>%1</scope>\n" ).arg( scopes[ mSearchScope->currentItem() ] );
-
- config += TQString( "<authmech>SIMPLE</authmech>\n" );
- config += TQString( "<encryption>%1</encryption>\n" ).arg( mEncryption->isChecked() ? "1" : "0" );
-
- config += TQString( "<ldap_read>%1</ldap_read>\n" ).arg( mReadLdap->isChecked() ? "1" : "0" );
- config += TQString( "<ldap_write>%1</ldap_write>\n" ).arg( mWriteLdap->isChecked() ? "1" : "0" );
-
- config += "</config>";
-
- return config;
-}
-
-void ConfigGuiLdap::initGUI()
-{
- TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
- layout->setMargin( KDialog::marginHint() );
-
- mLdapWidget = new TDEABC::LdapConfigWidget( TDEABC::LdapConfigWidget::W_HOST |
- TDEABC::LdapConfigWidget::W_PORT |
- TDEABC::LdapConfigWidget::W_USER |
- TDEABC::LdapConfigWidget::W_PASS |
- TDEABC::LdapConfigWidget::W_BINDDN |
- TDEABC::LdapConfigWidget::W_DN |
- TDEABC::LdapConfigWidget::W_FILTER |
- TDEABC::LdapConfigWidget::W_AUTHBOX, this );
-
- mKeyAttribute = new KLineEdit( this );
- mSearchScope = new KComboBox( this );
- mEncryption = new TQCheckBox( i18n( "Use encryption" ), this );
- mReadLdap = new TQCheckBox( i18n( "Load data from LDAP" ), this );
- mWriteLdap = new TQCheckBox( i18n( "Save data to LDAP" ), this );
-
- layout->addMultiCellWidget( mLdapWidget, 0, 9, 0, 3 );
- layout->addWidget( new TQLabel( i18n( "Key Attribute:" ), this ), 10, 0 );
- layout->addMultiCellWidget( mKeyAttribute, 10, 10, 1, 2 );
- layout->addWidget( new TQLabel( i18n( "Search Scope:" ), this ), 11, 0 );
- layout->addMultiCellWidget( mSearchScope, 11, 11, 1, 2 );
- layout->addWidget( mEncryption, 12, 0 );
- layout->addWidget( mReadLdap, 13, 0 );
- layout->addWidget( mWriteLdap, 13, 3 );
-
-}
-
-#include "configguildap.moc"
diff --git a/kitchensync/src/configguildap.h b/kitchensync/src/configguildap.h
deleted file mode 100644
index 81b8857b..00000000
--- a/kitchensync/src/configguildap.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2007 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#ifndef CONFIGGUILDAP_H
-#define CONFIGGUILDAP_H
-
-#include "configgui.h"
-#include "tdeabc/ldapconfigwidget.h"
-
-class TQCheckBox;
-class TQLabel;
-class TQSpinBox;
-
-namespace TDEABC {
- class LdapConfigWidget;
-}
-class KComboBox;
-class KLineEdit;
-
-class ConfigGuiLdap : public ConfigGui
-{
- Q_OBJECT
-
-
- public:
- ConfigGuiLdap( const QSync::Member &, TQWidget *parent );
-
- void load( const TQString &xml );
- TQString save() const;
-
- private:
- void initGUI();
-
- TDEABC::LdapConfigWidget *mLdapWidget;
- KLineEdit *mKeyAttribute;
- KComboBox *mSearchScope;
- TQCheckBox *mEncryption;
- TQCheckBox *mReadLdap;
- TQCheckBox *mWriteLdap;
-
-};
-
-#endif
diff --git a/kitchensync/src/configguimoto.cpp b/kitchensync/src/configguimoto.cpp
deleted file mode 100644
index bcb9bd59..00000000
--- a/kitchensync/src/configguimoto.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2007 Anirudh Ramesh <abattoir@abattoir.in>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#include "configguimoto.h"
-
-#include <tqdom.h>
-#include <tqlabel.h>
-#include <tqlayout.h>
-
-#include <klineedit.h>
-#include <kdialog.h>
-#include <tdelocale.h>
-
-ConfigGuiMoto::ConfigGuiMoto( const QSync::Member &member, TQWidget *parent )
- : ConfigGui( member, parent )
-{
- initGUI();
-}
-
-void ConfigGuiMoto::load( const TQString &xml )
-{
- TQDomDocument doc;
- doc.setContent( xml );
- TQDomElement docElement = doc.documentElement();
- TQDomNode node;
- for( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) {
- TQDomElement element = node.toElement();
- if ( element.tagName() == "device" ) {
- mDeviceString->setText( element.text() );
- }
- }
-}
-
-TQString ConfigGuiMoto::save() const
-{
- TQString config = "<config>\n";
-
- config += TQString( "<device>%1</device>\n" ).arg( mDeviceString->text() );
-
- config += "</config>";
-
- return config;
-}
-
-void ConfigGuiMoto::initGUI()
-{
- TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
- layout->setMargin( KDialog::marginHint() );
-
- layout->addWidget( new TQLabel( i18n( "Device String:" ), this ), 0, 0 );
- mDeviceString = new KLineEdit( this );
- layout->addMultiCellWidget( mDeviceString, 0, 0, 1, 2 );
-}
diff --git a/kitchensync/src/configguimoto.h b/kitchensync/src/configguimoto.h
deleted file mode 100644
index cd588fac..00000000
--- a/kitchensync/src/configguimoto.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2007 Anirudh Ramesh <abattoir@abattoir.in>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#ifndef CONFIGGUIMOTO_H
-#define CONFIGGUIMOTO_H
-
-#include "configgui.h"
-
-class KLineEdit;
-
-class ConfigGuiMoto : public ConfigGui
-{
- public:
- ConfigGuiMoto( const QSync::Member &, TQWidget *parent );
-
- void load( const TQString &xml );
- TQString save() const;
-
- private:
- void initGUI();
-
- KLineEdit *mDeviceString;
-};
-
-#endif
diff --git a/kitchensync/src/configguiopie.cpp b/kitchensync/src/configguiopie.cpp
deleted file mode 100644
index 33bf9e08..00000000
--- a/kitchensync/src/configguiopie.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2006 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#include "configguiopie.h"
-
-#include <tdelocale.h>
-
-#include <tqcombobox.h>
-#include <tqdom.h>
-#include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqlineedit.h>
-#include <tqspinbox.h>
-
-ConfigGuiOpie::ConfigGuiOpie( const QSync::Member &member, TQWidget *parent )
- : ConfigGui( member, parent )
-{
- TQGridLayout *layout = new TQGridLayout( topLayout() );
-
- TQLabel *label = new TQLabel( i18n("Device IP:"), this );
- layout->addWidget( label, 0, 0 );
-
- mDeviceIP = new TQLineEdit( this );
- mDeviceIP->setInputMask( "000.000.000.000" );
- label->setBuddy( mDeviceIP );
- layout->addWidget( mDeviceIP, 0, 1 );
-
- label = new TQLabel( i18n("Device Type:"), this );
- layout->addWidget( label, 1, 0 );
-
- mDeviceType = new TQComboBox( this );
- label->setBuddy( mDeviceType );
- layout->addWidget( mDeviceType, 1, 1 );
-
- label = new TQLabel( i18n("Username:"), this );
- layout->addWidget( label, 2, 0 );
-
- mUserName = new TQLineEdit( this );
- label->setBuddy( mUserName );
- layout->addWidget( mUserName, 2, 1 );
-
- label = new TQLabel( i18n("Password:"), this );
- layout->addWidget( label, 3, 0 );
-
- mPassword = new TQLineEdit( this );
- mPassword->setEchoMode( TQLineEdit::Password );
- label->setBuddy( mPassword );
- layout->addWidget( mPassword, 3, 1 );
-
- label = new TQLabel( i18n("Protocol:"), this );
- layout->addWidget( label, 4, 0 );
-
- mConnectionType = new TQComboBox( this );
- label->setBuddy( mConnectionType );
- layout->addWidget( mConnectionType, 4, 1 );
-
- label = new TQLabel( i18n("Port:"), this );
- layout->addWidget( label, 5, 0 );
-
- mPort = new TQSpinBox( this );
- mPort->setRange( 0, 65335 );
- label->setBuddy( mPort );
- layout->addWidget( mPort, 5, 1 );
-
- mDeviceType->insertItem( i18n("Opie/OpenZaurus") );
- mDeviceType->insertItem( i18n("TQtopia2") );
-
- mConnectionType->insertItem( i18n("SCP") );
- mConnectionType->insertItem( i18n("FTP") );
-
- topLayout()->addStretch( 1 );
-}
-
-void ConfigGuiOpie::load( const TQString &xml )
-{
- TQDomDocument doc;
- doc.setContent( xml );
- TQDomElement docElement = doc.documentElement();
- TQDomNode n;
- for( n = docElement.firstChild(); !n.isNull(); n = n.nextSibling() ) {
- TQDomElement e = n.toElement();
- if ( e.tagName() == "username" ) {
- mUserName->setText( e.text() );
- } else if ( e.tagName() == "password" ) {
- mPassword->setText( e.text() );
- } else if ( e.tagName() == "url" ) {
- mDeviceIP->setText( e.text() );
- } else if ( e.tagName() == "port" ) {
- mPort->setValue( e.text().toInt() );
- } else if ( e.tagName() == "device" ) {
- if ( e.text() == "opie" )
- mDeviceType->setCurrentItem( 0 );
- else
- mDeviceType->setCurrentItem( 1 );
- } else if ( e.tagName() == "conntype" ) {
- if ( e.text() == "scp" )
- mConnectionType->setCurrentItem( 0 );
- else
- mConnectionType->setCurrentItem( 1 );
- }
- }
-}
-
-TQString ConfigGuiOpie::save() const
-{
- TQString xml;
- xml = "<config>";
- xml += "<username>" + mUserName->text() + "</username>";
- xml += "<password>" + mPassword->text() + "</password>";
- xml += "<url>" + mDeviceIP->text() + "</url>";
- xml += "<device>" + TQString( mDeviceType->currentItem() == 0 ? "opie" : "qtopia2" ) + "</device>";
- xml += "<port>" + TQString::number( mPort->value() ) + "</port>";
- xml += "<conntype>" + TQString( mConnectionType->currentItem() == 0 ? "scp" : "ftp" ) + "</conntype>";
- xml += "</config>";
-
- return xml;
-}
diff --git a/kitchensync/src/configguiopie.h b/kitchensync/src/configguiopie.h
deleted file mode 100644
index e90f4acf..00000000
--- a/kitchensync/src/configguiopie.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2006 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-#ifndef CONFIGGUIOPIE_H
-#define CONFIGGUIOPIE_H
-
-#include "configgui.h"
-
-class TQComboBox;
-class TQLineEdit;
-class TQSpinBox;
-
-class ConfigGuiOpie : public ConfigGui
-{
- public:
- ConfigGuiOpie( const QSync::Member &, TQWidget *parent );
-
- void load( const TQString &xml );
- TQString save() const;
-
- private:
- TQLineEdit *mDeviceIP;
- TQComboBox *mDeviceType;
- TQLineEdit *mUserName;
- TQLineEdit *mPassword;
- TQComboBox *mConnectionType;
- TQSpinBox *mPort;
-};
-
-#endif
diff --git a/kitchensync/src/configguipalm.cpp b/kitchensync/src/configguipalm.cpp
deleted file mode 100644
index ee85ba29..00000000
--- a/kitchensync/src/configguipalm.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#include <kcombobox.h>
-#include <kdialog.h>
-#include <klineedit.h>
-#include <tdelocale.h>
-
-#include <tqbuttongroup.h>
-#include <tqcheckbox.h>
-#include <tqdom.h>
-#include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqradiobutton.h>
-#include <tqspinbox.h>
-#include <tqtabwidget.h>
-
-#include "configguipalm.h"
-
-ConfigGuiPalm::ConfigGuiPalm( const QSync::Member &member, TQWidget *parent )
- : ConfigGui( member, parent )
-{
- initGUI();
-
- mDevice->insertItem( "/dev/pilot" );
- mDevice->insertItem( "/dev/ttyUSB0" );
- mDevice->insertItem( "/dev/ttyUSB1" );
- mDevice->insertItem( "/dev/ttyUSB2" );
- mDevice->insertItem( "/dev/ttyUSB3" );
-
- mSpeed->insertItem( "9600" );
- mSpeed->insertItem( "19200" );
- mSpeed->insertItem( "38400" );
- mSpeed->insertItem( "57600" );
- mSpeed->insertItem( "115200" );
-}
-
-void ConfigGuiPalm::load( const TQString &xml )
-{
- TQDomDocument doc;
- doc.setContent( xml );
- TQDomElement docElement = doc.documentElement();
- TQDomNode node;
- for( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) {
- TQDomElement element = node.toElement();
- if ( element.tagName() == "sockaddr" ) {
- mDevice->setCurrentText( element.text() );
- } else if ( element.tagName() == "speed" ) {
- mSpeed->setCurrentText( element.text() );
- } else if ( element.tagName() == "timeout" ) {
- mTimeout->setValue( element.text().toInt() );
- } else if ( element.tagName() == "username" ) {
- mUserName->setText( element.text() );
- } else if ( element.tagName() == "mismatch" ) {
- switch ( element.text().toInt() ) {
- case 0:
- mSyncAlways->setChecked( true );
- break;
- case 2:
- mSyncAbort->setChecked( true );
- break;
- case 1:
- default:
- mSyncAsk->setChecked( true );
- break;
- }
- } else if ( element.tagName() == "popup" ) {
- mPopup->setChecked( element.text() == "1" );
- }
- }
-}
-
-TQString ConfigGuiPalm::save() const
-{
- TQString config = "<config>";
-
- config += "<sockaddr>" + mDevice->currentText() + "</sockaddr>";
- config += "<username>" + mUserName->text() + "</username>";
- config += "<timeout>" + TQString::number( mTimeout->value() ) + "</timeout>";
- config += "<type>0</type>";
- config += "<speed>" + mSpeed->currentText() + "</speed>";
- config += "<id>0</id>";
- config += "<codepage>cp1252</codepage>";
- config += "<popup>" + TQString( mPopup->isChecked() ? "1" : "0" ) + "</popup>";
-
- TQString popup;
- if ( mSyncAlways->isChecked() )
- popup = "0";
- else if ( mSyncAsk->isChecked() )
- popup = "1";
- else if ( mSyncAbort->isChecked() )
- popup = "2";
-
- config += "<mismatch>" + popup + "</mismatch>";
-
- config += "</config>";
-
- return config;
-}
-
-void ConfigGuiPalm::initGUI()
-{
- TQFont boldFont = font();
- boldFont.setBold( true );
-
- TQTabWidget *tabWidget = new TQTabWidget( this );
-
- TQWidget *connectionWidget = new TQWidget( tabWidget );
- TQVBoxLayout *connectionLayout = new TQVBoxLayout( connectionWidget,
- KDialog::marginHint(), KDialog::spacingHint() );
-
- TQLabel *label = new TQLabel( i18n( "Connection" ), connectionWidget );
- label->setFont( boldFont );
- connectionLayout->addWidget( label );
-
- TQGridLayout *gridLayout = new TQGridLayout( connectionLayout, 3, 2, KDialog::spacingHint() );
- gridLayout->setMargin( KDialog::marginHint() );
-
- gridLayout->addWidget( new TQLabel( i18n( "Port:" ), connectionWidget ), 0, 0 );
- gridLayout->addWidget( new TQLabel( i18n( "Speed:" ), connectionWidget ), 1, 0 );
- gridLayout->addWidget( new TQLabel( i18n( "Timeout:" ), connectionWidget ), 2, 0 );
-
- mDevice = new KComboBox( true, connectionWidget );
- mSpeed = new KComboBox( connectionWidget );
- mTimeout = new TQSpinBox( 1, 60, 1, connectionWidget );
- mTimeout->setSuffix( i18n( " sec" ) );
-
- gridLayout->addWidget( mDevice, 0, 1 );
- gridLayout->addWidget( mSpeed, 1, 1 );
- gridLayout->addWidget( mTimeout, 2, 1 );
- gridLayout->setColStretch( 1, 1 );
-
- label = new TQLabel( i18n( "User" ), connectionWidget );
- label->setFont( boldFont );
- connectionLayout->addWidget( label );
-
- gridLayout = new TQGridLayout( connectionLayout, 1, 2, KDialog::spacingHint() );
- gridLayout->setMargin( KDialog::marginHint() );
-
- gridLayout->addWidget( new TQLabel( i18n( "Username:" ), connectionWidget ), 0, 0 );
-
- mUserName = new KLineEdit( connectionWidget );
- gridLayout->addWidget( mUserName, 0, 1 );
-
- label = new TQLabel( i18n( "What to do if Username does not match" ), connectionWidget );
- label->setFont( boldFont );
- connectionLayout->addWidget( label );
-
- gridLayout = new TQGridLayout( connectionLayout, 1, 2, KDialog::spacingHint() );
- gridLayout->setMargin( KDialog::marginHint() );
-
- TQButtonGroup *buttonGroup = new TQButtonGroup( 1, Qt::Horizontal, connectionWidget );
- buttonGroup->setExclusive( true );
- buttonGroup->setFrameStyle( TQFrame::NoFrame );
- mSyncAlways = new TQRadioButton( i18n( "Sync Anyway" ), buttonGroup );
- mSyncAsk = new TQRadioButton( i18n( "Ask What To Do" ), buttonGroup );
- mSyncAbort = new TQRadioButton( i18n( "Abort Sync" ), buttonGroup );
-
- gridLayout->addMultiCellWidget( buttonGroup, 0, 0, 0, 1 );
-
- connectionLayout->addStretch( 1 );
- tabWidget->addTab( connectionWidget, i18n( "Connection" ) );
-
- TQWidget *optionWidget = new TQWidget( tabWidget );
- TQVBoxLayout *optionLayout = new TQVBoxLayout( optionWidget,
- KDialog::marginHint(), KDialog::spacingHint() );
-
- label = new TQLabel( i18n( "Hotsync Notification" ), optionWidget );
- label->setFont( boldFont );
- optionLayout->addWidget( label );
-
- gridLayout = new TQGridLayout( optionLayout, 1, 2, KDialog::spacingHint() );
- gridLayout->setMargin( KDialog::marginHint() );
-
- mPopup = new TQCheckBox( i18n( "Popup when interaction is required" ), optionWidget );
- gridLayout->addMultiCellWidget( mPopup, 0, 0, 0, 1 );
-
- optionLayout->addStretch( 1 );
- tabWidget->addTab( optionWidget, i18n( "Options" ) );
-
- topLayout()->addWidget( tabWidget );
-}
diff --git a/kitchensync/src/configguipalm.h b/kitchensync/src/configguipalm.h
deleted file mode 100644
index 354e5a29..00000000
--- a/kitchensync/src/configguipalm.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#ifndef CONFIGGUIPALM_H
-#define CONFIGGUIPALM_H
-
-#include "configgui.h"
-
-class KComboBox;
-class KLineEdit;
-class TQCheckBox;
-class TQRadioButton;
-class TQSpinBox;
-
-class ConfigGuiPalm : public ConfigGui
-{
- public:
- ConfigGuiPalm( const QSync::Member &, TQWidget *parent );
-
- void load( const TQString &xml );
- TQString save() const;
-
- private:
- void initGUI();
-
- KComboBox *mDevice;
- KComboBox *mSpeed;
- TQSpinBox *mTimeout;
-
- KLineEdit *mUserName;
-
- TQRadioButton *mSyncAlways;
- TQRadioButton *mSyncAsk;
- TQRadioButton *mSyncAbort;
-
- TQCheckBox *mPopup;
- KComboBox *mVerbosity;
- KComboBox *mCodePage;
-};
-
-#endif
diff --git a/kitchensync/src/configguisunbird.cpp b/kitchensync/src/configguisunbird.cpp
deleted file mode 100644
index 7623e413..00000000
--- a/kitchensync/src/configguisunbird.cpp
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2007 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2007 Anirudh Ramesh <abattoir@abattoir.in>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#include "configguisunbird.h"
-
-#include <tqdom.h>
-#include <tqtabwidget.h>
-#include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqbuttongroup.h>
-#include <tqcheckbox.h>
-#include <tqsizepolicy.h>
-#include <tqptrlist.h>
-#include <tqspinbox.h>
-#include <tqwidget.h>
-
-#include <kurlrequester.h>
-#include <klineedit.h>
-#include <kpushbutton.h>
-#include <kdialog.h>
-#include <tdelocale.h>
-#include <tdefile.h>
-
-ConfigGuiSunbird::ConfigGuiSunbird( const QSync::Member &member, TQWidget *parent )
- : ConfigGui( member, parent )
-{
- TQTabWidget *tabWidget = new TQTabWidget( this );
- topLayout()->addWidget( tabWidget );
-
- mLocalWidget = new TQWidget( tabWidget );
- mLocalLayout = new TQVBoxLayout( mLocalWidget, KDialog::spacingHint() );
-
- mWebdavWidget = new TQWidget( tabWidget );
- mWebdavLayout = new TQVBoxLayout( mWebdavWidget, KDialog::spacingHint() );
-
- tabWidget->addTab( mLocalWidget, i18n( "Local Calendars" ) );
- tabWidget->addTab( mWebdavWidget, i18n( "WebDAV Calendars" ) );
-
- KPushButton *mLocalAddButton = new KPushButton( mLocalWidget );
- mLocalAddButton->setText( i18n( "Add new calendar" ) );
- mLocalAddButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
- mLocalLayout->addWidget( mLocalAddButton );
- connect( mLocalAddButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( addLocalCalendar() ) );
-
- KPushButton *mWebdavAddButton = new KPushButton( mWebdavWidget );
- mWebdavAddButton->setText( i18n( "Add new calendar" ) );
- mWebdavAddButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
- mWebdavLayout->addWidget( mWebdavAddButton );
- connect( mWebdavAddButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( addWebdavCalendar() ) );
-
- mLocalSpacer = new TQSpacerItem( 20, 40, TQSizePolicy::Expanding );
- mLocalLayout->addItem( mLocalSpacer );
- mWebdavSpacer = new TQSpacerItem( 20, 40, TQSizePolicy::Expanding );
- mWebdavLayout->addItem( mWebdavSpacer );
-}
-
-void ConfigGuiSunbird::load( const TQString &xml )
-{
- TQString path;
- TQString url;
- TQString username;
- TQString password;
- TQString defaultcal;
- TQString days;
-
- TQDomDocument doc;
- doc.setContent( xml );
- TQDomElement docElement = doc.documentElement();
- TQDomNode node;
- for( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) {
- TQDomElement element = node.toElement();
- if ( element.tagName() == "file" ) {
- TQDomAttr pathAttr = element.attributeNode( "path" );
- path = pathAttr.value();
- TQDomAttr defaultAttr = element.attributeNode( "default" );
- defaultcal = defaultAttr.value();
- TQDomAttr daysAttr = element.attributeNode( "deletedaysold" );
- days = daysAttr.value();
-
- LocalCalendar *cal = new LocalCalendar( path, defaultcal, days, mLocalWidget );
- mLocalLayout->removeItem( mLocalSpacer );
- cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
- mLocalLayout->addWidget( cal );
- mLocalLayout->addItem( mLocalSpacer );
- mLocalList.append( cal );
-
- connect( cal, TQT_SIGNAL( deleteRequest( LocalCalendar* ) ), TQT_SLOT( delLocalCalendar( LocalCalendar* ) ) );
- cal->show();
- } else if ( element.tagName() == "webdav" ) {
- TQDomAttr urlAttr = element.attributeNode( "url" );
- url = urlAttr.value();
- TQDomAttr unameAttr = element.attributeNode( "username" );
- username = unameAttr.value();
- TQDomAttr pwordAttr = element.attributeNode( "password" );
- password = pwordAttr.value();
- TQDomAttr defaultAttr = element.attributeNode( "default" );
- defaultcal = defaultAttr.value();
- TQDomAttr daysAttr = element.attributeNode( "deletedaysold" );
- days = daysAttr.value();
-
- WebdavCalendar *cal = new WebdavCalendar( username, password,
- url, defaultcal, days, mWebdavWidget );
- mWebdavLayout->removeItem( mWebdavSpacer );
- cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
- mWebdavLayout->addWidget( cal );
- mWebdavLayout->addItem( mWebdavSpacer );
- mWebdavList.append( cal );
-
- connect( cal, TQT_SIGNAL( deleteRequest( WebdavCalendar* ) ), TQT_SLOT( delWebdavCalendar( WebdavCalendar* ) ) );
- cal->show();
- }
- }
-}
-
-TQString ConfigGuiSunbird::save() const
-{
- TQString config = "<config>\n";
-
- for ( uint i = 0; i < mLocalList.count(); ++i ) {
- LocalCalendar *lcal = mLocalList[ i ];
- config += TQString( "<file " );
- config += TQString( "path=\"%1\" " ).arg( lcal->mPathRequester->url() );
-
- if ( lcal->mDaysCheckBox->isChecked() ) {
- config += TQString( "deletedaysold=\"%1\" " ).arg( lcal->mDaysSpinBox->value() );
- }
- if ( lcal->mDefaultCheckBox->isChecked() ) {
- config += TQString( "default=\"1\" " );
- }
- config += TQString( "/>\n" );
- }
-
- for ( uint i = 0; i < mWebdavList.count(); ++i ) {
- WebdavCalendar *wcal = mWebdavList[ i ];
- config += TQString( "<webdav " );
- config += TQString( "username=\"%1\" " ).arg( wcal->mUsername->text() );
- config += TQString( "password=\"%1\" " ).arg( wcal->mPassword->text() );
- config += TQString( "url=\"%1\" " ).arg( wcal->mUrl->text() );
-
- if ( wcal->mDaysCheckBox->isChecked() ) {
- config += TQString( "deletedaysold=\"%1\" " ).arg( wcal->mDaysSpinBox->value() );
- }
- if ( wcal->mDefaultCheckBox->isChecked() ) {
- config += TQString( "default=\"1\" " );
- }
- config += TQString( "/>\n" );
- }
- config += "</config>";
-
- return config;
-}
-
-void ConfigGuiSunbird::addLocalCalendar()
-{
- LocalCalendar *cal = new LocalCalendar( mLocalWidget );
- mLocalLayout->removeItem( mLocalSpacer );
- cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
- mLocalLayout->addWidget( cal );
- mLocalLayout->addItem( mLocalSpacer );
- mLocalList.append( cal );
-
- connect( cal, TQT_SIGNAL( deleteRequest( LocalCalendar* ) ), TQT_SLOT( delLocalCalendar( LocalCalendar* ) ) );
- cal->show();
-}
-
-void ConfigGuiSunbird::delLocalCalendar( LocalCalendar *calendar )
-{
- mLocalList.remove( calendar );
- calendar->deleteLater();
-}
-
-void ConfigGuiSunbird::addWebdavCalendar()
-{
- WebdavCalendar *cal = new WebdavCalendar( mWebdavWidget );
- mWebdavLayout->removeItem( mWebdavSpacer );
- cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
- mWebdavLayout->addWidget( cal );
- mWebdavLayout->addItem( mWebdavSpacer );
- mWebdavList.append( cal );
-
- connect( cal, TQT_SIGNAL( deleteRequest( WebdavCalendar* ) ), TQT_SLOT( delWebdavCalendar( WebdavCalendar* ) ) );
- cal->show();
-}
-
-void ConfigGuiSunbird::delWebdavCalendar( WebdavCalendar *calendar )
-{
- mWebdavList.remove( calendar );
- calendar->deleteLater();
-}
-
-LocalCalendar::LocalCalendar( TQWidget *parent )
- : TQWidget( parent )
-{
- initGui();
-}
-
-LocalCalendar::LocalCalendar( const TQString &path, const TQString &defaultcal, const TQString &days, TQWidget *parent )
- : TQWidget( parent )
-{
- initGui();
-
- mPathRequester->setURL( path );
- mDefaultCheckBox->setChecked( defaultcal.toInt() == 1 );
-
- if ( !days.isEmpty() ) {
- mDaysCheckBox->setChecked( true );
- mDaysSpinBox->setEnabled( true );
- mDaysSpinBox->setValue( days.toInt() );
- }
-}
-
-void LocalCalendar::initGui()
-{
- TQBoxLayout *bottomLayout = new TQHBoxLayout();
-
- mDaysCheckBox = new TQCheckBox( this );
- mDaysCheckBox->setText( i18n( "Sync only events newer than" ) );
-
- mDaysSpinBox = new TQSpinBox( this );
- mDaysSpinBox->setDisabled( true );
- mDaysSpinBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
-
- connect( mDaysCheckBox, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( toggleDays( bool ) ) );
-
- bottomLayout->addWidget( mDaysCheckBox );
- bottomLayout->addWidget( mDaysSpinBox );
- bottomLayout->addWidget( new TQLabel( i18n( "day(s)" ), this ) );
-
- TQGridLayout *localLayout = new TQGridLayout( this );
-
- mPathRequester = new KURLRequester( this );
-
- KPushButton *removeButton = new KPushButton( this );
- removeButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
- removeButton->setText( i18n( "Remove" ) );
- connect( removeButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( deleteWidget() ) );
-
- mDefaultCheckBox = new TQCheckBox( this );
- mDefaultCheckBox->setText( i18n( "Set as Default" ) );
-
- localLayout->addItem( new TQSpacerItem( 40, 20, TQSizePolicy::Expanding ), 0, 0 );
- localLayout->addWidget( new TQLabel( i18n( "Location:" ), this ), 1, 0 );
- localLayout->addWidget( mPathRequester, 1, 1 );
- localLayout->addItem( new TQSpacerItem( 40, 20, TQSizePolicy::Fixed ), 1, 2 );
- localLayout->addWidget( removeButton, 1, 3 );
- localLayout->addMultiCellLayout( bottomLayout, 2, 2, 0, 2 );
- localLayout->addWidget( mDefaultCheckBox, 2, 3 );
-}
-
-void LocalCalendar::deleteWidget()
-{
- emit deleteRequest( this );
-}
-
-WebdavCalendar::WebdavCalendar( TQWidget *parent )
- : TQWidget( parent )
-{
- initGui();
-};
-
-WebdavCalendar::WebdavCalendar( const TQString &username, const TQString &password, const TQString &url,
- const TQString &defaultcal, const TQString &days, TQWidget *parent )
- : TQWidget( parent )
-{
- initGui();
-
- mUsername->setText( username );
- mPassword->setText( password );
- mUrl->setText( url );
- mDefaultCheckBox->setChecked( defaultcal.toInt() == 1 );
-
- if ( !days.isEmpty() ) {
- mDaysCheckBox->setChecked( true );
- mDaysSpinBox->setEnabled( true );
- mDaysSpinBox->setValue( days.toInt() );
- }
-}
-
-void WebdavCalendar::initGui()
-{
- TQBoxLayout *bottomLayout = new TQHBoxLayout();
-
- mDaysCheckBox = new TQCheckBox( this );
- mDaysCheckBox->setText( i18n( "Sync only events newer than" ) );
-
- mDaysSpinBox = new TQSpinBox( this );
- mDaysSpinBox->setDisabled( true );
- mDaysSpinBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
-
- connect( mDaysCheckBox, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( toggleDays( bool ) ) );
-
- bottomLayout->addWidget( mDaysCheckBox );
- bottomLayout->addWidget( mDaysSpinBox );
- bottomLayout->addWidget( new TQLabel( i18n( "day(s)" ), this ) );
-
- TQGridLayout *webdavLayout = new TQGridLayout();
-
- mUrl = new KLineEdit( this );
- mUsername = new KLineEdit( this );
- mPassword = new KLineEdit( this );
- mPassword->setEchoMode( KLineEdit::Password );
-
- KPushButton *removeButton = new KPushButton( this );
- removeButton->setText( i18n( "Remove" ) );
- connect( removeButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( deleteWidget() ) );
-
- mDefaultCheckBox = new TQCheckBox( this );
- mDefaultCheckBox->setText( i18n( "Set as Default" ) );
-
- webdavLayout->addWidget( new TQLabel( i18n( "Location:" ), this ), 0, 0 );
- webdavLayout->addWidget( mUrl, 0, 1 );
- webdavLayout->addItem( new TQSpacerItem( 40, 20, TQSizePolicy::Fixed ), 0, 2 );
- webdavLayout->addWidget( removeButton, 0, 3 );
- webdavLayout->addMultiCellLayout( bottomLayout, 1, 1, 0, 1 );
- webdavLayout->addWidget( mDefaultCheckBox, 1, 3 );
-
- TQGridLayout *mainLayout = new TQGridLayout( this );
- mainLayout->addItem( new TQSpacerItem( 40, 20, TQSizePolicy::Fixed ), 0, 0 );
- mainLayout->addMultiCellLayout( webdavLayout, 1, 1, 0, 4 );
- mainLayout->addWidget( new TQLabel( i18n( "Username:" ), this ), 2, 0 );
- mainLayout->addWidget( mUsername, 2, 1 );
- mainLayout->addItem( new TQSpacerItem( 40, 20, TQSizePolicy::Fixed ), 2, 2 );
- mainLayout->addWidget( new TQLabel( i18n( "Password:" ), this ), 2, 3 );
- mainLayout->addWidget( mPassword, 2, 4 );
-}
-
-void WebdavCalendar::deleteWidget()
-{
- emit deleteRequest( this );
-}
-
-void LocalCalendar::toggleDays( bool state )
-{
- mDaysSpinBox->setEnabled( state );
-}
-
-void WebdavCalendar::toggleDays( bool state )
-{
- mDaysSpinBox->setEnabled( state );
-}
-
-#include "configguisunbird.moc"
diff --git a/kitchensync/src/configguisunbird.h b/kitchensync/src/configguisunbird.h
deleted file mode 100644
index 67d61bf6..00000000
--- a/kitchensync/src/configguisunbird.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2007 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2007 Anirudh Ramesh <abattoir@abattoir.in>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#ifndef CONFIGGUISUNBIRD_H
-#define CONFIGGUISUNBIRD_H
-
-#include "configgui.h"
-
-class TQWidget;
-class TQSpinBox;
-class TQCheckBox;
-class TQVBoxLayout;
-class TQSpacerItem;
-class TQSignalMapper;
-
-class KURLRequester;
-class KPushButton;
-class KLineEdit;
-
-class LocalCalendar : public TQWidget
-{
- Q_OBJECT
-
-
- public:
- LocalCalendar( TQWidget *parent = 0 );
- LocalCalendar( const TQString &path,
- const TQString &defaultcal,
- const TQString &days, TQWidget *parent = 0 );
-
- KURLRequester *mPathRequester;
- TQCheckBox *mDaysCheckBox;
- TQSpinBox *mDaysSpinBox;
- TQCheckBox *mDefaultCheckBox;
-
- signals:
- void deleteRequest( LocalCalendar* );
-
- private slots:
- void deleteWidget();
- void toggleDays( bool days );
-
- private:
- void initGui();
-};
-
-class WebdavCalendar : public TQWidget
-{
- Q_OBJECT
-
-
- public:
- WebdavCalendar( TQWidget *parent = 0 );
- WebdavCalendar( const TQString &username,
- const TQString &password,
- const TQString &url,
- const TQString &defaultcal,
- const TQString &days, TQWidget *parent = 0 );
-
- KLineEdit *mUrl;
- TQCheckBox *mDaysCheckBox;
- TQSpinBox *mDaysSpinBox;
- TQCheckBox *mDefaultCheckBox;
- KLineEdit *mUsername;
- KLineEdit *mPassword;
-
- signals:
- void deleteRequest( WebdavCalendar* );
-
- private slots:
- void deleteWidget();
- void toggleDays( bool state );
-
- private:
- void initGui();
-};
-
-class ConfigGuiSunbird : public ConfigGui
-{
- Q_OBJECT
-
-
- public:
- ConfigGuiSunbird( const QSync::Member &, TQWidget *parent );
-
- void load( const TQString &xml );
-
- TQString save() const;
-
- public slots:
- void addLocalCalendar();
- void addWebdavCalendar();
-
- void delLocalCalendar( LocalCalendar* );
- void delWebdavCalendar( WebdavCalendar* );
-
- private:
- TQValueList<LocalCalendar*> mLocalList;
- TQValueList<WebdavCalendar*> mWebdavList;
-
- TQWidget *mLocalWidget;
- TQWidget *mWebdavWidget;
-
- TQVBoxLayout *mLocalLayout;
- TQVBoxLayout *mWebdavLayout;
-
- KPushButton *mLocalAddButton;
- KPushButton *mWebdavAddButton;
-
- TQSpacerItem *mLocalSpacer;
- TQSpacerItem *mWebdavSpacer;
-};
-
-#endif
diff --git a/kitchensync/src/configguisynce.cpp b/kitchensync/src/configguisynce.cpp
deleted file mode 100644
index 8a09c385..00000000
--- a/kitchensync/src/configguisynce.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2007 Anirudh Ramesh <abattoir@abattoir.in>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#include "configguisynce.h"
-
-#include <tqdom.h>
-#include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqcheckbox.h>
-
-#include <klineedit.h>
-#include <kdialog.h>
-#include <tdelocale.h>
-
-ConfigGuiSynce::ConfigGuiSynce( const QSync::Member &member, TQWidget *parent )
- : ConfigGui( member, parent )
-{
- initGUI();
-}
-
-void ConfigGuiSynce::load( const TQString &xml )
-{
- TQDomDocument doc;
- doc.setContent( xml );
- TQDomElement docElement = doc.documentElement();
- TQDomNode node;
- for( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) {
- TQDomElement element = node.toElement();
- if ( element.tagName() == "contact" ) {
- mContacts->setChecked( element.text().toInt() == 1 );
- } else if ( element.tagName() == "todos" ) {
- mTodos->setChecked( element.text().toInt() == 1 );
- } else if ( element.tagName() == "calendar" ) {
- mCalendar->setChecked( element.text().toInt() == 1 );
- } else if ( element.tagName() == "file" ) {
- mFile->setText( element.text() );
- }
- }
-}
-
-TQString ConfigGuiSynce::save() const
-{
- TQString config = "<config>\n";
-
- config += TQString( "<contact>%1</contact>\n" ).arg( mContacts->isChecked() ? "1" : "0" );
- config += TQString( "<todos>%1</todos>\n" ).arg( mTodos->isChecked() ? "1" : "0" );
- config += TQString( "<calendar>%1</calendar>\n" ).arg( mCalendar->isChecked() ? "1" : "0" );
- config += TQString( "<file>%1</file>\n" ).arg( mFile->text() );
-
- config += "</config>";
-
- return config;
-}
-
-void ConfigGuiSynce::initGUI()
-{
- TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 2, KDialog::spacingHint() );
- layout->setMargin( KDialog::marginHint() );
-
- mContacts = new TQCheckBox( this );
- mContacts->setText( "Sync Contacts" );
- layout->addMultiCellWidget( mContacts, 0, 0, 0, 1 );
-
- mTodos = new TQCheckBox( this );
- mTodos->setText( "Sync \'Todo\' items" );
- layout->addMultiCellWidget( mTodos, 1, 1, 0, 1 );
-
- mCalendar = new TQCheckBox( this );
- mCalendar->setText( "Sync Calendar" );
- layout->addMultiCellWidget( mCalendar, 2, 2, 0, 1 );
-
- layout->addWidget( new TQLabel( i18n( "File:" ), this ), 3, 0 );
- mFile = new KLineEdit( this );
- layout->addWidget( mFile, 3, 1 );
-}
diff --git a/kitchensync/src/configguisynce.h b/kitchensync/src/configguisynce.h
deleted file mode 100644
index 680b1b12..00000000
--- a/kitchensync/src/configguisynce.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2007 Anirudh Ramesh <abattoir@abattoir.in>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#ifndef CONFIGGUISYNCE_H
-#define CONFIGGUISYNCE_H
-
-#include "configgui.h"
-
-class TQCheckBox;
-
-class KLineEdit;
-
-class ConfigGuiSynce : public ConfigGui
-{
- public:
- ConfigGuiSynce( const QSync::Member &, TQWidget *parent );
-
- void load( const TQString &xml );
-
- TQString save() const;
-
- private:
- void initGUI();
-
- TQCheckBox *mContacts;
- TQCheckBox *mTodos;
- TQCheckBox *mCalendar;
- KLineEdit *mFile;
-};
-
-#endif
diff --git a/kitchensync/src/configguisyncmlhttp.cpp b/kitchensync/src/configguisyncmlhttp.cpp
deleted file mode 100644
index 6f91d2fa..00000000
--- a/kitchensync/src/configguisyncmlhttp.cpp
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#include "configguisyncmlhttp.h"
-
-#include <kcombobox.h>
-#include <kdialog.h>
-#include <klineedit.h>
-#include <tdelocale.h>
-#include <kurlrequester.h>
-
-#include <tqcheckbox.h>
-#include <tqdom.h>
-#include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqspinbox.h>
-#include <tqtabwidget.h>
-#include <tqvbox.h>
-
-ConfigGuiSyncmlHttp::ConfigGuiSyncmlHttp( const QSync::Member &member, TQWidget *parent )
- : ConfigGui( member, parent ), mUrl( 0 ), mPort( 0 )
-{
-
- TQTabWidget *tabWidget = new TQTabWidget( this );
- topLayout()->addWidget( tabWidget );
-
- // Connection
- TQWidget *connectionWidget = new TQWidget( tabWidget );
- TQVBoxLayout *connectionLayout = new TQVBoxLayout( connectionWidget,
- KDialog::marginHint(), KDialog::spacingHint() );
-
- tabWidget->addTab( connectionWidget, i18n( "Connection" ) );
-
- mGridLayout = new TQGridLayout( connectionLayout );
-
- TQLabel *label = new TQLabel( i18n("Port:"), connectionWidget );
- mGridLayout->addWidget( label, 0, 0 );
-
- mPort = new TQSpinBox( connectionWidget );
- mPort->setMinValue( 1 );
- mPort->setMaxValue( 65536 );
- mGridLayout->addWidget( mPort, 0, 1 );
-
- // Database
- TQWidget *databaseWidget = new TQWidget( tabWidget );
- TQVBoxLayout *databaseLayout = new TQVBoxLayout( databaseWidget,
- KDialog::marginHint(), KDialog::spacingHint() );
-
- tabWidget->addTab( databaseWidget, i18n( "Databases" ) );
-
- mGridLayout = new TQGridLayout( databaseLayout );
- addLineEdit( databaseWidget, i18n("Contact Database:"), &mContactDb, 0 );
- addLineEdit( databaseWidget, i18n("Calendar Database:"), &mCalendarDb, 1 );
- addLineEdit( databaseWidget, i18n("Note Database:"), &mNoteDb, 2 );
-
- mContactDb->insertItem( "addressbook" );
- mContactDb->insertItem( "contacts" );
-
- mCalendarDb->insertItem( "agenda" );
- mCalendarDb->insertItem( "calendar" );
-
- mNoteDb->insertItem( "notes" );
-
-
- // Options
- TQWidget *optionWidget = new TQWidget( tabWidget );
- TQVBoxLayout *optionLayout = new TQVBoxLayout( optionWidget,
- KDialog::marginHint(), KDialog::spacingHint() );
-
- tabWidget->addTab( optionWidget, i18n( "Options" ) );
-
- mGridLayout = new TQGridLayout( optionLayout );
-
- label = new TQLabel( i18n("User name:"), optionWidget );
- mGridLayout->addWidget( label, 0, 0 );
-
- mUsername = new KLineEdit( optionWidget );
- mGridLayout->addWidget( mUsername, 0, 1 );
-
- label = new TQLabel( i18n("Password:"), optionWidget );
- mGridLayout->addWidget( label, 1, 0 );
-
- mPassword = new KLineEdit( optionWidget );
- mPassword->setEchoMode( TQLineEdit::Password );
- mGridLayout->addWidget( mPassword, 1, 1 );
-
-
- mUseStringTable = new TQCheckBox( i18n("Use String Table"), optionWidget );
- mGridLayout->addMultiCellWidget( mUseStringTable, 2, 2, 0, 1 );
-
- mOnlyReplace = new TQCheckBox( i18n("Only Replace Entries"), optionWidget );
- mGridLayout->addMultiCellWidget( mOnlyReplace, 3, 3, 0, 1 );
-
- // Url
- label = new TQLabel( i18n("URL:"), optionWidget );
- mGridLayout->addWidget( label, 4, 0 );
-
- mUrl = new KLineEdit( optionWidget );
- mGridLayout->addWidget( mUrl, 4, 1 );
-
- // recvLimit
- label = new TQLabel( i18n("Receive Limit:"), optionWidget );
- mGridLayout->addWidget( label, 5, 0 );
-
- mRecvLimit = new TQSpinBox( optionWidget );
- mRecvLimit->setMinValue( 1 );
- mRecvLimit->setMaxValue( 65536 );
- mGridLayout->addWidget( mRecvLimit, 5, 1 );
-
- // maxObjSize
- label = new TQLabel( i18n("Maximum Object Size"), optionWidget );
- mGridLayout->addWidget( label, 6, 0 );
-
- mMaxObjSize = new TQSpinBox( optionWidget );
- mMaxObjSize->setMinValue( 1 );
- mMaxObjSize->setMaxValue( 65536 );
- mGridLayout->addWidget( mMaxObjSize, 6, 1 );
-
- topLayout()->addStretch( 1 );
-}
-
-void ConfigGuiSyncmlHttp::addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row )
-{
- TQLabel *label = new TQLabel( text, parent);
- mGridLayout->addWidget( label, row, 0 );
-
- *edit = new KComboBox( true, parent );
- mGridLayout->addWidget( *edit, row, 1 );
-}
-
-void ConfigGuiSyncmlHttp::load( const TQString &xml )
-{
- TQDomDocument document;
- document.setContent( xml );
-
- TQDomElement docElement = document.documentElement();
- TQDomNode node;
-
- for ( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) {
- TQDomElement element = node.toElement();
- if ( element.tagName() == "username" ) {
- mUsername->setText( element.text() );
- } else if ( element.tagName() == "password" ) {
- mPassword->setText( element.text() );
- } else if ( element.tagName() == "url" ) {
- if ( mUrl )
- mUrl->setText( element.text() );
- } else if ( element.tagName() == "port" ) {
- if ( mPort )
- mPort->setValue( element.text().toInt() );
- } else if ( element.tagName() == "recvLimit" ) {
- if ( mRecvLimit )
- mRecvLimit->setValue( element.text().toInt() );
- } else if ( element.tagName() == "maxObjSize" ) {
- if ( mMaxObjSize )
- mMaxObjSize->setValue( element.text().toInt() );
- } else if ( element.tagName() == "usestringtable" ) {
- mUseStringTable->setChecked( element.text() == "1" );
- } else if ( element.tagName() == "onlyreplace" ) {
- mOnlyReplace->setChecked( element.text() == "1" );
- } else if ( element.tagName() == "contact_db" ) {
- mContactDb->setCurrentText( element.text() );
- } else if ( element.tagName() == "calendar_db" ) {
- mCalendarDb->setCurrentText( element.text() );
- } else if ( element.tagName() == "note_db" ) {
- mNoteDb->setCurrentText( element.text() );
- }
- }
-}
-
-TQString ConfigGuiSyncmlHttp::save() const
-{
- TQString xml;
- xml = "<config>\n";
- xml += "<username>" + mUsername->text() + "</username>\n";
- xml += "<password>" + mPassword->text() + "</password>\n";
-
- xml += "<url>" + mUrl->text() + "</url>\n";
- xml += "<port>" + TQString::number( mPort->value() ) + "</port>\n";
- // Receive Limit
- xml += "<recvLimit>" + TQString::number( mRecvLimit->value() ) + "</recvLimit>\n";
-
- // Maximal Object Size
- xml += "<maxObjSize>" + TQString::number( mMaxObjSize->value() ) + "</maxObjSize>\n";
-
- xml += "<usestringtable>";
- if ( mUseStringTable->isChecked() )
- xml += "1";
- else
- xml += "0";
- xml += "</usestringtable>\n";
-
- xml += "<onlyreplace>";
- if ( mOnlyReplace->isChecked() )
- xml += "1";
- else
- xml += "0";
- xml += "</onlyreplace>\n";
-
- xml += "<contact_db>" + mContactDb->currentText() + "</contact_db>\n";
- xml += "<calendar_db>" + mCalendarDb->currentText() + "</calendar_db>\n";
- xml += "<note_db>" + mNoteDb->currentText() + "</note_db>\n";
- xml += "</config>";
-
- return xml;
-}
-
-#include "configguisyncmlhttp.moc"
-
diff --git a/kitchensync/src/configguisyncmlhttp.h b/kitchensync/src/configguisyncmlhttp.h
deleted file mode 100644
index aad3a937..00000000
--- a/kitchensync/src/configguisyncmlhttp.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-#ifndef CONFIGGUISYNCML_H
-#define CONFIGGUISYNCML_H
-
-#include <tqdom.h>
-
-#include "configgui.h"
-
-class TQCheckBox;
-class TQComboBox;
-class TQGridLayout;
-class TQSpinBox;
-class KComboBox;
-class KLineEdit;
-
-class ConfigGuiSyncmlHttp : public ConfigGui
-{
-
- Q_OBJECT
-
-
- public:
- ConfigGuiSyncmlHttp( const QSync::Member &, TQWidget *parent );
-
- void load( const TQString &xml );
- TQString save() const;
-
- private:
- TQGridLayout *mGridLayout;
-
- KLineEdit *mUsername;
- KLineEdit *mPassword;
- KLineEdit *mUrl;
- TQSpinBox *mPort;
- TQCheckBox *mUseStringTable;
- TQCheckBox *mOnlyReplace;
-
- TQSpinBox *mRecvLimit;
- TQSpinBox *mMaxObjSize;
-
- KComboBox *mContactDb;
- KComboBox *mCalendarDb;
- KComboBox *mNoteDb;
-
- protected slots:
- void addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row );
-};
-
-#endif
diff --git a/kitchensync/src/configguisyncmlobex.cpp b/kitchensync/src/configguisyncmlobex.cpp
deleted file mode 100644
index 4074787a..00000000
--- a/kitchensync/src/configguisyncmlobex.cpp
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
- Copyright (c) 2006 Daniel Gollub <dgollub@suse.de>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#include "configguisyncmlobex.h"
-
-#include <kcombobox.h>
-#include <kdialog.h>
-#include <klineedit.h>
-#include <tdelocale.h>
-#include <kurlrequester.h>
-
-#include <tqlayout.h>
-#include <tqcheckbox.h>
-#include <tqcombobox.h>
-#include <tqlabel.h>
-#include <tqdom.h>
-#include <tqspinbox.h>
-#include <tqtabwidget.h>
-#include <tqvbox.h>
-
-ConfigGuiSyncmlObex::ConfigGuiSyncmlObex( const QSync::Member &member, TQWidget *parent )
- : ConfigGui( member, parent )
-{
- TQTabWidget *tabWidget = new TQTabWidget( this );
- topLayout()->addWidget( tabWidget );
-
- // Connection
- TQVBox *connectionWidget = new TQVBox( this );
- connectionWidget->setMargin( KDialog::marginHint() );
- connectionWidget->setSpacing( 5 );
-
- tabWidget->addTab( connectionWidget, i18n( "Connection" ) );
-
- mConnection = new KComboBox( connectionWidget );
-
- connect( mConnection, TQT_SIGNAL (activated( int ) ),
- this, TQT_SLOT( slotConnectionChanged ( int ) ) );
-
- mConnectionTypes.append( ConnectionType( 2, i18n( "Bluetooth" ) ) );
- mConnectionTypes.append( ConnectionType( 5, i18n( "USB" ) ) );
-
- ConnectionTypeList::ConstIterator it;
- for ( it = mConnectionTypes.begin(); it != mConnectionTypes.end(); it++ )
- mConnection->insertItem( (*it).second );
-
- mBluetooth = new BluetoothWidget( connectionWidget );
- mBluetooth->hide();
-
- mUsb = new UsbWidget( connectionWidget );
- mUsb->hide();
-
- connectionWidget->setStretchFactor( mBluetooth, 1 );
- connectionWidget->setStretchFactor( mUsb, 1 );
-
- // Databases
- TQWidget *databaseWidget = new TQWidget( tabWidget );
- TQVBoxLayout *databaseLayout = new TQVBoxLayout( databaseWidget,
- KDialog::marginHint(), KDialog::spacingHint() );
-
- tabWidget->addTab( databaseWidget, i18n( "Databases" ) );
-
- mGridLayout = new TQGridLayout( databaseLayout );
- addLineEdit( databaseWidget, i18n("Contact Database:"), &mContactDb, 0 );
- addLineEdit( databaseWidget, i18n("Calendar Database:"), &mCalendarDb, 1 );
- addLineEdit( databaseWidget, i18n("Note Database:"), &mNoteDb, 2 );
-
- mContactDb->insertItem( "addressbook" );
- mContactDb->insertItem( "contacts" );
-
- mCalendarDb->insertItem( "agenda" );
- mCalendarDb->insertItem( "calendar" );
-
- mNoteDb->insertItem( "notes" );
-
- // Options
- TQWidget *optionsWidget = new TQWidget( tabWidget );
- TQVBoxLayout *optionsLayout = new TQVBoxLayout( optionsWidget,
- KDialog::marginHint(), KDialog::spacingHint() );
-
- tabWidget->addTab( optionsWidget, i18n( "Options" ) );
-
- mGridLayout = new TQGridLayout( optionsLayout );
-
- TQLabel *label = new TQLabel( i18n("User name:"), optionsWidget );
- mGridLayout->addWidget( label, 0, 0 );
-
- mUsername = new KLineEdit( optionsWidget );
- mGridLayout->addWidget( mUsername, 0, 1 );
-
- label = new TQLabel( i18n("Password:"), optionsWidget );
- mGridLayout->addWidget( label, 1, 0 );
-
- mPassword = new KLineEdit( optionsWidget );
- mPassword->setEchoMode( TQLineEdit::Password );
- mGridLayout->addWidget( mPassword, 1, 1 );
-
- mUseStringTable = new TQCheckBox( i18n("Use String Table"), optionsWidget );
- mGridLayout->addMultiCellWidget( mUseStringTable, 2, 2, 0, 1 );
-
- mOnlyReplace = new TQCheckBox( i18n("Only Replace Entries"), optionsWidget );
- mGridLayout->addMultiCellWidget( mOnlyReplace, 3, 3, 0, 1 );
-
- // SynML Version
- label = new TQLabel( i18n("SyncML Version:"), optionsWidget );
- mGridLayout->addWidget( label, 4, 0 );
-
- mSyncmlVersion = new TQComboBox( optionsWidget );
- mGridLayout->addWidget( mSyncmlVersion, 4, 1 );
-
- mSyncmlVersions.append( SyncmlVersion( 0, i18n( "1.0" ) ) );
- mSyncmlVersions.append( SyncmlVersion( 1, i18n( "1.1" ) ) );
- mSyncmlVersions.append( SyncmlVersion( 2, i18n( "1.2" ) ) );
-
- SyncmlVersionList::ConstIterator itVersion;
- for ( itVersion = mSyncmlVersions.begin(); itVersion != mSyncmlVersions.end(); itVersion++ )
- mSyncmlVersion->insertItem( (*itVersion).second );
-
- // WBXML
- mWbxml = new TQCheckBox( i18n("WAP Binary XML"), optionsWidget );
- mGridLayout->addMultiCellWidget( mWbxml, 12, 12, 0, 1 );
-
- // Identifier
- label = new TQLabel( i18n("Software Identifier:"), optionsWidget );
- mGridLayout->addWidget( label, 13, 0 );
-
- mIdentifier = new KComboBox( true, optionsWidget );
- mGridLayout->addWidget( mIdentifier, 13, 1 );
-
- mIdentifier->insertItem( "" );
- mIdentifier->insertItem( "PC Suite" );
-
- // recvLimit
- label = new TQLabel( i18n("Receive Limit:"), optionsWidget );
- mGridLayout->addWidget( label, 14, 0 );
-
- mRecvLimit = new TQSpinBox( optionsWidget );
- mRecvLimit->setMinValue( 1 );
- mRecvLimit->setMaxValue( 65536 );
- mGridLayout->addWidget( mRecvLimit, 14, 1 );
-
- // maxObjSize
- label = new TQLabel( i18n("Maximum Object Size"), optionsWidget );
- mGridLayout->addWidget( label, 15, 0 );
-
- mMaxObjSize = new TQSpinBox( optionsWidget );
- mMaxObjSize->setMinValue( 1 );
- mMaxObjSize->setMaxValue( 65536 );
- mGridLayout->addWidget( mMaxObjSize, 15, 1 );
-
- topLayout()->addStretch( 1 );
-}
-
-void ConfigGuiSyncmlObex::slotConnectionChanged( int pos )
-{
- mUsb->hide();
- mBluetooth->hide();
-
- if ( pos == 0 )
- mBluetooth->show();
- else if ( pos == 1 )
- mUsb->show();
-}
-
-void ConfigGuiSyncmlObex::load( const TQString &xml )
-{
- TQDomDocument document;
- document.setContent( xml );
-
- TQDomElement docElement = document.documentElement();
-
- TQDomNode node;
- for( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) {
- TQDomElement element = node.toElement();
- if ( element.tagName() == "username" ) {
- mUsername->setText( element.text() );
- } else if ( element.tagName() == "password" ) {
- mPassword->setText( element.text() );
- } else if ( element.tagName() == "type" ) {
- for ( uint i = 0; i < mConnectionTypes.count(); i++ ) {
- if ( mConnectionTypes[i].first == element.text().toInt() ) {
- mConnection->setCurrentItem( i );
- slotConnectionChanged( i );
- break;
- }
- }
- } else if ( element.tagName() == "version" ) {
- for ( uint i = 0; i < mSyncmlVersions.count(); i++ ) {
- if ( mSyncmlVersions[i].first == element.text().toInt() ) {
- mSyncmlVersion->setCurrentItem( i );
- break;
- }
- }
- } else if ( element.tagName() == "bluetooth_address" ) {
- if ( mBluetooth ) mBluetooth->setAddress( element.text() );
- } else if ( element.tagName() == "bluetooth_channel" ) {
- if ( mBluetooth ) mBluetooth->setChannel( element.text() );
- } else if ( element.tagName() == "identifier" ) {
- if ( mIdentifier ) mIdentifier->setCurrentText( element.text() );
- } else if ( element.tagName() == "interface" ) {
- if ( mUsb ) mUsb->setInterface( element.text().toInt() );
- } else if ( element.tagName() == "wbxml" ) {
- if ( mWbxml) mWbxml->setChecked( element.text() == "1" );
- } else if ( element.tagName() == "recvLimit" ) {
- if ( mRecvLimit ) mRecvLimit->setValue( element.text().toInt() );
- } else if ( element.tagName() == "maxObjSize" ) {
- if ( mMaxObjSize ) mMaxObjSize->setValue( element.text().toInt() );
- } else if ( element.tagName() == "usestringtable" ) {
- mUseStringTable->setChecked( element.text() == "1" );
- } else if ( element.tagName() == "onlyreplace" ) {
- mOnlyReplace->setChecked( element.text() == "1" );
- } else if ( element.tagName() == "contact_db" ) {
- mContactDb->setCurrentText( element.text() );
- } else if ( element.tagName() == "calendar_db" ) {
- mCalendarDb->setCurrentText( element.text() );
- } else if ( element.tagName() == "note_db" ) {
- mNoteDb->setCurrentText( element.text() );
- }
- }
-}
-
-TQString ConfigGuiSyncmlObex::save() const
-{
- TQString xml;
- xml = "<config>\n";
- xml += "<username>" + mUsername->text() + "</username>\n";
- xml += "<password>" + mPassword->text() + "</password>\n";
- ConnectionTypeList::ConstIterator it;
- for ( it = mConnectionTypes.begin(); it != mConnectionTypes.end(); it++ ) {
- if ( mConnection->currentText() == (*it).second ) {
- xml += "<type>" + TQString("%1").arg((*it).first) + "</type>\n";
- break;
- }
- }
-
- // Bluetooth Address
- xml += "<bluetooth_address>" + mBluetooth->address() + "</bluetooth_address>\n";
-
- // Bluetooth Channel
- xml += "<bluetooth_channel>" + mBluetooth->channel() + "</bluetooth_channel>\n";
-
- // USB Interface
- xml += "<interface>" + TQString::number( mUsb->interface() ) +"</interface>\n";
-
- // SyncML Version
- SyncmlVersionList::ConstIterator itVersion;
- for ( itVersion = mSyncmlVersions.begin(); itVersion != mSyncmlVersions.end(); itVersion++ ) {
- if ( mSyncmlVersion->currentText() == (*itVersion).second ) {
- xml += "<version>" + TQString("%1").arg((*itVersion).first) + "</version>\n";
- break;
- }
- }
-
- // (Software) Identifier
- xml += "<identifier>" + mIdentifier->currentText() + "</identifier>\n";
-
- // WBXML
- xml += "<wbxml>";
- if ( mWbxml->isChecked() )
- xml += "1";
- else
- xml += "0";
- xml += "</wbxml>\n";
-
- // Receive Limit
- xml += "<recvLimit>" + TQString::number( mRecvLimit->value() ) + "</recvLimit>\n";
-
- // Maximal Object Size
- xml += "<maxObjSize>" + TQString::number( mMaxObjSize->value() ) + "</maxObjSize>\n";
-
- xml += "<usestringtable>";
- if ( mUseStringTable->isChecked() )
- xml += "1";
- else
- xml += "0";
- xml += "</usestringtable>\n";
-
- xml += "<onlyreplace>";
- if ( mOnlyReplace->isChecked() )
- xml += "1";
- else
- xml += "0";
- xml += "</onlyreplace>\n";
-
- xml += "<contact_db>" + mContactDb->currentText() + "</contact_db>\n";
- xml += "<calendar_db>" + mCalendarDb->currentText() + "</calendar_db>\n";
- xml += "<note_db>" + mNoteDb->currentText() + "</note_db>\n";
- xml += "</config>";
-
- return xml;
-}
-
-void ConfigGuiSyncmlObex::addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row )
-{
- TQLabel *label = new TQLabel( text, parent );
- mGridLayout->addWidget( label, row, 0 );
-
- *edit = new KComboBox( true, parent );
- mGridLayout->addWidget( *edit, row, 1 );
-}
-
-#include "configguisyncmlobex.moc"
diff --git a/kitchensync/src/configguisyncmlobex.h b/kitchensync/src/configguisyncmlobex.h
deleted file mode 100644
index 9c873db8..00000000
--- a/kitchensync/src/configguisyncmlobex.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
- Copyright (c) 2006 Daniel Gollub <dgollub@suse.de>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-#ifndef CONFIGGUISYNCMLOBEX_H
-#define CONFIGGUISYNCMLOBEX_H
-
-#include <tqdom.h>
-
-#include "configgui.h"
-#include "connectionwidgets.h"
-
-class TQCheckBox;
-class TQComboBox;
-class TQGridLayout;
-class TQSpinBox;
-class KComboBox;
-class KLineEdit;
-class KURLRequester;
-
-class ConfigGuiSyncmlObex : public ConfigGui
-{
- Q_OBJECT
-
-
- public:
- ConfigGuiSyncmlObex( const QSync::Member &, TQWidget *parent = 0 );
-
- void load( const TQString &xml );
- TQString save() const;
-
- public slots:
- void slotConnectionChanged( int pos );
-
- private:
- // Connection
- typedef TQPair<int, TQString> ConnectionType;
- typedef TQValueList<ConnectionType> ConnectionTypeList;
- ConnectionTypeList mConnectionTypes;
-
- TQComboBox *mConnection;
- BluetoothWidget *mBluetooth;
- UsbWidget *mUsb;
-
- // Options
- typedef TQPair<int, TQString> SyncmlVersion;
- typedef TQValueList<SyncmlVersion> SyncmlVersionList;
- SyncmlVersionList mSyncmlVersions;
-
- TQStringList mIdentiferList;
- KLineEdit *mUsername;
- KLineEdit *mPassword;
- TQCheckBox *mUseStringTable;
- TQCheckBox *mOnlyReplace;
- TQSpinBox *mRecvLimit;
- TQSpinBox *mMaxObjSize;
- TQComboBox *mSyncmlVersion;
- KComboBox *mIdentifier;
- TQCheckBox *mWbxml;
-
- TQGridLayout *mGridLayout;
-
- KComboBox *mContactDb;
- KComboBox *mCalendarDb;
- KComboBox *mNoteDb;
-
- protected slots:
- void addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row );
-};
-
-#endif
diff --git a/kitchensync/src/conflictdialog.cpp b/kitchensync/src/conflictdialog.cpp
deleted file mode 100644
index 39943ffe..00000000
--- a/kitchensync/src/conflictdialog.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#include "conflictdialog.h"
-
-ConflictDialog::ConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent )
- : TQDialog( parent ), mMapping( mapping )
-{
-}
diff --git a/kitchensync/src/conflictdialog.h b/kitchensync/src/conflictdialog.h
deleted file mode 100644
index 2e48c039..00000000
--- a/kitchensync/src/conflictdialog.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#ifndef CONFLICTDIALOG_H
-#define CONFLICTDIALOG_H
-
-#include <tqdialog.h>
-
-#include <libqopensync/syncmapping.h>
-
-/**
- Base class for SingleConflictDialog and MultiConflictDialog.
- */
-class ConflictDialog : public TQDialog
-{
- public:
- ConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent );
-
- protected:
- QSync::SyncMapping mMapping;
-};
-
-#endif
diff --git a/kitchensync/src/connectionwidgets.cpp b/kitchensync/src/connectionwidgets.cpp
deleted file mode 100644
index 37844be3..00000000
--- a/kitchensync/src/connectionwidgets.cpp
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2006 Daniel Gollub <dgollub@suse.de>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#include <kcombobox.h>
-#include <kdialog.h>
-#include <tdeglobal.h>
-#include <kiconloader.h>
-#include <kinputdialog.h>
-#include <klineedit.h>
-#include <tdelocale.h>
-#include <tdemessagebox.h>
-
-#include <tqapplication.h>
-#include <tqeventloop.h>
-#include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqpushbutton.h>
-#include <tqspinbox.h>
-#include <tqtabwidget.h>
-#include <tqtooltip.h>
-#include <tqvbox.h>
-
-#include "connectionwidgets.h"
-
-BluetoothWidget::BluetoothWidget( TQWidget *parent )
- : TQWidget( parent )
-{
- TQGridLayout *layout = new TQGridLayout( this );
-
- mAddress = new KLineEdit( this );
- mAddress->setInputMask( ">NN:NN:NN:NN:NN:NN;" );
- layout->addWidget( mAddress, 1, 0 );
-
- TQLabel *label = new TQLabel( i18n( "Bluetooth address:" ), this );
- label->setBuddy( mAddress );
- layout->addWidget( label, 0, 0 );
-
- mChannel = new KLineEdit( this );
- layout->addWidget( mChannel, 1, 1 );
-
- mChannelLabel = new TQLabel( i18n( "Channel:" ), this );
- mChannelLabel->setBuddy( mChannel );
- layout->addWidget( mChannelLabel, 0, 1 );
-
- layout->setRowStretch( 2, 1 );
-}
-
-void BluetoothWidget::hideChannel()
-{
- mChannelLabel->hide();
- mChannel->hide();
-}
-
-void BluetoothWidget::showChannel()
-{
- mChannelLabel->show();
- mChannel->show();
-}
-
-void BluetoothWidget::setAddress( const TQString address )
-{
- mAddress->setText( address );
-}
-
-void BluetoothWidget::setChannel( const TQString channel )
-{
- if ( mChannel )
- mChannel->setText( channel );
-}
-
-TQString BluetoothWidget::address() const
-{
- return mAddress->text();
-}
-
-TQString BluetoothWidget::channel() const
-{
- if ( mChannel->text().isEmpty() )
- return TQString();
-
- return mChannel->text();
-}
-
-// FIXME - Only IrMC specific
-IRWidget::IRWidget( TQWidget *parent )
- : TQWidget( parent )
-{
- TQGridLayout *layout = new TQGridLayout( this, 3, 3, 11, 3 );
-
- mDevice = new KLineEdit( this );
- mSerialNumber = new KLineEdit( this );
-
- layout->addWidget( mDevice, 1, 0 );
- layout->addWidget( mSerialNumber, 1, 1 );
-
- TQLabel *label = new TQLabel( i18n( "Device Name:" ), this );
- label->setBuddy( mDevice );
- layout->addWidget( label, 0, 0 );
-
- label = new TQLabel( i18n( "Serial Number:" ), this );
- label->setBuddy( mSerialNumber );
- layout->addWidget( label, 0, 1 );
-
- layout->setRowStretch( 2, 1 );
-}
-
-void IRWidget::load( const TQDomElement &parent )
-{
- TQDomNode node;
- for ( node = parent.firstChild(); !node.isNull(); node = node.nextSibling() ) {
- TQDomElement element = node.toElement();
- if ( element.tagName() == "irname" )
- mDevice->setText( element.text() );
- else if ( element.tagName() == "irserial" )
- mSerialNumber->setText( element.text() );
- }
-}
-
-void IRWidget::save( TQDomDocument &doc, TQDomElement &parent )
-{
- TQDomElement element = doc.createElement( "irname" );
- element.appendChild( doc.createTextNode( mDevice->text() ) );
- parent.appendChild( element );
-
- element = doc.createElement( "irserial" );
- element.appendChild( doc.createTextNode( mSerialNumber->text() ) );
- parent.appendChild( element );
-}
-
-// FIXME - Only IrMC specific
-CableWidget::CableWidget( TQWidget *parent )
- : TQWidget( parent )
-{
- TQGridLayout *layout = new TQGridLayout( this, 3, 2, 11, 3 );
-
- mManufacturer = new KComboBox( this );
- mDevice = new KComboBox( true, this );
-
- layout->addWidget( mManufacturer, 0, 1 );
- layout->addWidget( mDevice, 1, 1 );
-
- TQLabel *label = new TQLabel( i18n( "Device Manufacturer:" ), this );
- label->setBuddy( mManufacturer );
- layout->addWidget( label, 0, 0 );
-
- label = new TQLabel( i18n( "Device:" ), this );
- label->setBuddy( mDevice );
- layout->addWidget( label, 1, 0 );
-
- layout->setRowStretch( 2, 1 );
-
- mManufacturer->insertItem( i18n( "SonyEricsson/Ericsson" ) );
- mManufacturer->insertItem( i18n( "Siemens" ) );
-
- mDevice->insertItem( "/dev/ttyS0" );
- mDevice->insertItem( "/dev/ttyS1" );
- mDevice->insertItem( "/dev/ttyUSB0" );
- mDevice->insertItem( "/dev/ttyUSB1" );
-}
-
-void CableWidget::load( const TQDomElement &parent )
-{
- TQDomNode node;
- for ( node = parent.firstChild(); !node.isNull(); node = node.nextSibling() ) {
- TQDomElement element = node.toElement();
- if ( element.tagName() == "cabletype" )
- mManufacturer->setCurrentItem( element.text().toInt() );
- else if ( element.tagName() == "cabledev" )
- mDevice->setCurrentText( element.text() );
- }
-}
-
-void CableWidget::save( TQDomDocument &doc, TQDomElement &parent )
-{
- TQDomElement element = doc.createElement( "cabletype" );
- element.appendChild( doc.createTextNode( TQString::number( mManufacturer->currentItem() ) ) );
- parent.appendChild( element );
-
- element = doc.createElement( "cabledev" );
- element.appendChild( doc.createTextNode( mDevice->currentText() ) );
- parent.appendChild( element );
-}
-
-UsbWidget::UsbWidget( TQWidget *parent )
- : TQWidget( parent )
-{
- TQGridLayout *layout = new TQGridLayout( this, 3, 2, 11, 3);
-
- mInterface = new TQSpinBox( this );
- layout->addWidget( mInterface, 0, 1 );
-
- TQLabel *label = new TQLabel( i18n( "USB Interface:" ), this );
- label->setBuddy( mInterface );
- layout->addWidget( label, 0, 0 );
-
- layout->setRowStretch( 2, 1 );
-}
-
-void UsbWidget::setInterface( int interface )
-{
- mInterface->setValue( interface );
-}
-
-int UsbWidget::interface() const
-{
- return mInterface->value();
-}
-
-#include "connectionwidgets.moc"
diff --git a/kitchensync/src/connectionwidgets.h b/kitchensync/src/connectionwidgets.h
deleted file mode 100644
index 4f51c168..00000000
--- a/kitchensync/src/connectionwidgets.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2006 Daniel Gollub <dgollub@suse.de>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#ifndef CONNECTIONWIDGETS_H
-#define CONNECTIONWIDGETS_H
-
-#include <tqdom.h>
-
-#include "configgui.h"
-
-class TQCheckBox;
-class TQLabel;
-class TQPushButton;
-class TQSpinBox;
-
-class KComboBox;
-class KLineEdit;
-
-class BluetoothWidget : public TQWidget
-{
- Q_OBJECT
-
-
- public:
- BluetoothWidget( TQWidget *parent );
-
- void hideChannel();
- void showChannel();
-
- void setAddress( const TQString address );
- void setChannel( const TQString channel );
- TQString address() const;
- TQString channel() const;
-
- private:
- KLineEdit *mAddress;
- KLineEdit *mChannel;
- TQLabel *mChannelLabel;
-};
-
-class IRWidget : public TQWidget
-{
- Q_OBJECT
-
-
- public:
- IRWidget( TQWidget *parent );
-
- void load( const TQDomElement& );
- void save( TQDomDocument&, TQDomElement& );
-
- private:
- KLineEdit *mDevice;
- KLineEdit *mSerialNumber;
-};
-
-class CableWidget : public TQWidget
-{
- public:
- CableWidget( TQWidget *parent );
-
- void load( const TQDomElement& );
- void save( TQDomDocument&, TQDomElement& );
-
- private:
- KComboBox *mManufacturer;
- KComboBox *mDevice;
-};
-
-class UsbWidget : public TQWidget
-{
- public:
- UsbWidget( TQWidget *parent );
-
- int interface() const;
- void setInterface( int interface );
-
- private:
- TQSpinBox *mInterface;
-};
-
-#endif // CONNECTIONWIDGETS_H
diff --git a/kitchensync/src/genericdiffalgo.cpp b/kitchensync/src/genericdiffalgo.cpp
deleted file mode 100644
index 5255c096..00000000
--- a/kitchensync/src/genericdiffalgo.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- This file is part of libtdepim.
-
- Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <tqstringlist.h>
-
-#include <tdelocale.h>
-
-#include "genericdiffalgo.h"
-
-using namespace KSync;
-
-#define MAX( a, b ) ( a > b ? a : b )
-
-#ifndef KDE_USE_FINAL
-// With --enable-final, we get the (identical) compareString from
-// addresseediffalgo.cpp
-static bool compareString( const TQString &left, const TQString &right )
-{
- if ( left.isEmpty() && right.isEmpty() )
- return true;
- else
- return left == right;
-}
-#endif
-
-GenericDiffAlgo::GenericDiffAlgo( const TQString &leftData, const TQString &rightData )
- : mLeftData( leftData ), mRightData( rightData )
-{
-}
-
-void GenericDiffAlgo::run()
-{
- begin();
-
- TQStringList leftList = TQStringList::split( '\n', mLeftData, true );
- TQStringList rightList = TQStringList::split( '\n', mRightData, true );
-
- uint lines = MAX( leftList.count(), rightList.count() );
- for ( uint i = 0; i < lines; ++i ) {
- if ( i < leftList.count() && i < rightList.count() ) {
- if ( !compareString( leftList[ i ], rightList[ i ] ) )
- conflictField( i18n( "Line %1" ).arg( i ), leftList[ i ], rightList[ i ] );
- } else if ( i < leftList.count() && i >= rightList.count() ) {
- additionalLeftField( i18n( "Line %1" ).arg( i ), leftList[ i ] );
- } else if ( i >= leftList.count() && i < rightList.count() ) {
- additionalRightField( i18n( "Line %1" ).arg( i ), rightList[ i ] );
- }
- }
-
- end();
-}
-
diff --git a/kitchensync/src/genericdiffalgo.h b/kitchensync/src/genericdiffalgo.h
deleted file mode 100644
index 424d9c4f..00000000
--- a/kitchensync/src/genericdiffalgo.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- This file is part of libtdepim.
-
- Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef KSYNC_GENERICDIFFALGO_H
-#define KSYNC_GENERICDIFFALGO_H
-
-#include <libtdepim/diffalgo.h>
-
-using namespace KPIM;
-
-namespace KSync {
-
-class GenericDiffAlgo : public DiffAlgo
-{
- public:
- GenericDiffAlgo( const TQString &left, const TQString &right );
-
- void run();
-
- private:
- TQString mLeftData;
- TQString mRightData;
-};
-
-}
-
-#endif
diff --git a/kitchensync/src/groupconfig.cpp b/kitchensync/src/groupconfig.cpp
deleted file mode 100644
index 9f961ddc..00000000
--- a/kitchensync/src/groupconfig.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#include "groupconfig.h"
-
-#include "groupconfigcommon.h"
-#include "memberconfig.h"
-#include "memberinfo.h"
-#include "pluginpicker.h"
-#include "syncprocess.h"
-#include "syncprocessmanager.h"
-
-#include <libqopensync/group.h>
-#include <libqopensync/plugin.h>
-
-#include <kdialog.h>
-#include <kiconloader.h>
-#include <kjanuswidget.h>
-#include <tdelocale.h>
-#include <tdemessagebox.h>
-
-
-#include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqpushbutton.h>
-
-GroupConfig::GroupConfig( TQWidget *parent )
- : TQWidget( parent )
-{
- TQBoxLayout *topLayout = new TQVBoxLayout( this );
- topLayout->setSpacing( KDialog::spacingHint() );
-
- TQFrame *titleFrame = new TQFrame( this );
- topLayout->addWidget( titleFrame );
-
- titleFrame->setPaletteForegroundColor( colorGroup().light() );
- titleFrame->setPaletteBackgroundColor( colorGroup().mid() );
-
- TQBoxLayout *nameLayout = new TQHBoxLayout( titleFrame );
- nameLayout->setMargin( 4 );
-
- TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_summary",
- TDEIcon::Desktop );
-
- TQLabel *iconLabel = new TQLabel( titleFrame );
- iconLabel->setPixmap( icon );
- nameLayout->addWidget( iconLabel );
-
- nameLayout->addSpacing( 8 );
-
- TQLabel *label = new TQLabel( i18n("Group:"), titleFrame );
- TQFont font = label->font();
- font.setBold( true );
- font.setPointSize( font.pointSize() + 2 );
- label->setFont( font );
- nameLayout->addWidget( label );
-
- mNameLabel = new TQLabel( titleFrame );
- font = mNameLabel->font();
- font.setBold( true );
- font.setPointSize( font.pointSize() + 2 );
- mNameLabel->setFont( font );
- nameLayout->addWidget( mNameLabel );
-
- nameLayout->addStretch( 1 );
-
- mMemberView = new KJanusWidget( this, 0, KJanusWidget::IconList );
- topLayout->addWidget( mMemberView );
-
- TQBoxLayout *buttonLayout = new TQHBoxLayout( topLayout );
-
- TQPushButton *addButton = new TQPushButton( i18n("Add Member..."), this );
- connect( addButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addMember() ) );
- buttonLayout->addWidget( addButton );
-
- buttonLayout->addStretch( 1 );
-
- icon = TDEGlobal::iconLoader()->loadIcon( "bookmark", TDEIcon::Desktop );
- TQFrame *page = mMemberView->addPage( i18n("Group"),
- i18n("General Group Settings"), icon );
- TQBoxLayout *pageLayout = new TQVBoxLayout( page );
-
- mCommonConfig = new GroupConfigCommon( page );
- pageLayout->addWidget( mCommonConfig );
-}
-
-void GroupConfig::setSyncProcess( SyncProcess *process )
-{
- mProcess = process;
-
- mNameLabel->setText( mProcess->group().name() );
- mCommonConfig->setSyncProcess( mProcess );
-
- updateMembers();
-}
-
-void GroupConfig::updateMembers()
-{
- TQValueList<MemberConfig *>::ConstIterator memberIt;
- for ( memberIt = mMemberConfigs.begin(); memberIt != mMemberConfigs.end(); ++memberIt )
- (*memberIt)->saveData();
-
- TQValueList<TQFrame *>::ConstIterator it2;
- for ( it2 = mConfigPages.begin(); it2 != mConfigPages.end(); ++it2 ) {
- mMemberView->removePage( *it2 );
- delete *it2;
- }
- mConfigPages.clear();
- mMemberConfigs.clear();
-
- QSync::Group group = mProcess->group();
- QSync::Group::Iterator it( group.begin() );
- for ( ; it != group.end(); ++it ) {
- QSync::Member member = *it;
- MemberInfo mi( member );
- TQFrame *page = mMemberView->addPage( mi.name(),
- TQString( "%1 (%2)" ).arg( mi.name() ).arg(member.pluginName()), mi.desktopIcon() );
-
- TQBoxLayout *pageLayout = new TQVBoxLayout( page );
- mConfigPages.append( page );
-
- MemberConfig *memberConfig = new MemberConfig( page, member );
- mMemberConfigs.append( memberConfig );
- pageLayout->addWidget( memberConfig );
-
- memberConfig->loadData();
- }
-}
-
-void GroupConfig::saveConfig()
-{
- mProcess->group().save();
-
- TQValueList<MemberConfig *>::ConstIterator it;
- for ( it = mMemberConfigs.begin(); it != mMemberConfigs.end(); ++it )
- (*it)->saveData();
-
- mCommonConfig->save();
-
- mProcess->reinitEngine();
-}
-
-void GroupConfig::addMember()
-{
- QSync::Plugin plugin = PluginPickerDialog::getPlugin( this );
-
- if ( plugin.isValid() ) {
- QSync::Result result = SyncProcessManager::self()->addMember( mProcess, plugin );
- if ( result.isError() ) {
- KMessageBox::error( this, i18n("Error adding member %1\n%2\nType: %3")
- .arg( plugin.name() ).arg( result.message() ).arg( result.type() ) );
- } else {
- updateMembers();
-
- // select last (added) page
- int index = mMemberView->pageIndex( mConfigPages.last() );
- mMemberView->showPage( index );
- }
- }
-}
-
-#include "groupconfig.moc"
diff --git a/kitchensync/src/groupconfig.h b/kitchensync/src/groupconfig.h
deleted file mode 100644
index 6cf6da2e..00000000
--- a/kitchensync/src/groupconfig.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-#ifndef GROUPCONFIG_H
-#define GROUPCONFIG_H
-
-#include <tqwidget.h>
-#include <tqvaluelist.h>
-
-class TQFrame;
-class TQLabel;
-class KJanusWidget;
-
-class GroupConfigCommon;
-class MemberConfig;
-class SyncProcess;
-
-class GroupConfig : public TQWidget
-{
- Q_OBJECT
-
-
- public:
- GroupConfig( TQWidget *parent );
-
- void setSyncProcess( SyncProcess *process );
-
- void updateMembers();
-
- void saveConfig();
-
- protected slots:
- void addMember();
-
- private:
- TQLabel *mNameLabel;
-
- KJanusWidget *mMemberView;
-
- SyncProcess *mProcess;
-
- GroupConfigCommon *mCommonConfig;
- TQValueList<MemberConfig *> mMemberConfigs;
- TQValueList<TQFrame *> mConfigPages;
-};
-
-#endif
diff --git a/kitchensync/src/groupconfigcommon.cpp b/kitchensync/src/groupconfigcommon.cpp
deleted file mode 100644
index a3f89844..00000000
--- a/kitchensync/src/groupconfigcommon.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-
-#include <kdialog.h>
-#include <klineedit.h>
-#include <tdelocale.h>
-#include <kdebug.h>
-
-#include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqcheckbox.h>
-
-#include <libqopensync/group.h>
-#include <libqopensync/conversion.h>
-#include <libqopensync/environment.h>
-
-#include "syncprocess.h"
-#include "syncprocessmanager.h"
-
-#include "groupconfigcommon.h"
-
-ObjectTypeSelector::ObjectTypeSelector( TQWidget *parent )
- : TQWidget( parent )
-{
- TQGridLayout *layout = new TQGridLayout( this );
- layout->setMargin( 0 );
-
- const QSync::Conversion conversion = SyncProcessManager::self()->environment()->conversion();
-
- TQMap<TQString, TQString> objectTypeMap;
- objectTypeMap.insert( "contact", i18n( "Contacts" ) );
- objectTypeMap.insert( "event", i18n( "Events" ) );
- objectTypeMap.insert( "todo", i18n( "To-dos" ) );
- objectTypeMap.insert( "note", i18n( "Notes" ) );
-
- TQStringList objectTypes = conversion.objectTypes();
-
- // reorder the entries so that contact and event are the first one
- qHeapSort( objectTypes );
-
- TQStringList reoderedObjectTypes, stack;
- for ( uint i = 0; i < objectTypes.count(); ++i ) {
- if ( objectTypes[ i ] == "contact" || objectTypes[ i ] == "event" )
- reoderedObjectTypes.append( objectTypes[ i ] );
- else
- stack.append( objectTypes[ i ] );
- }
- reoderedObjectTypes += stack;
-
- TQStringList::ConstIterator it;
-
- int row = 0;
- int col = 0;
- for( it = reoderedObjectTypes.begin(); it != reoderedObjectTypes.end(); ++it ) {
- TQString objectType = *it;
-
- // Don't display object type "data". Object type "data" is a kind of wildcard - so don't filter *
- if ( objectType == "data" )
- continue;
-
- TQCheckBox *objectCheckBox = new TQCheckBox( objectTypeMap[ objectType ], this );
- layout->addWidget( objectCheckBox, row, col );
- mObjectTypeChecks.insert( objectType, objectCheckBox );
-
- col++;
- if ( (row == 0 && col == 2) || col == 3 ) {
- col = 0;
- row++;
- }
- }
-}
-
-void ObjectTypeSelector::load( const QSync::Group &group )
-{
- const QSync::GroupConfig config = group.config();
-
- const TQStringList objectTypes = config.activeObjectTypes();
-
- // Enable everything on the inital load
- bool initialLoad = false;
- if ( objectTypes.isEmpty() )
- initialLoad = true;
-
- TQMap<TQString, TQCheckBox*>::ConstIterator it;
- for( it = mObjectTypeChecks.begin(); it != mObjectTypeChecks.end(); ++it ) {
- TQCheckBox *check = it.data();
- check->setChecked( objectTypes.contains( it.key() ) || initialLoad );
- }
-}
-
-void ObjectTypeSelector::save( QSync::Group group )
-{
- TQStringList objectTypes;
-
- TQMap<TQString,TQCheckBox *>::ConstIterator it;
- for( it = mObjectTypeChecks.begin(); it != mObjectTypeChecks.end(); ++it ) {
- TQCheckBox *check = it.data();
- if ( check->isChecked() )
- objectTypes.append( it.key() );
- }
-
- // Always add object type "data"
- objectTypes.append( "data" );
-
- QSync::GroupConfig config = group.config();
- config.setActiveObjectTypes( objectTypes );
-}
-
-GroupConfigCommon::GroupConfigCommon( TQWidget *parent )
- : TQWidget( parent )
-{
- TQGridLayout *layout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
-
- layout->addWidget( new TQLabel( i18n( "Name:" ), this ), 0, 0 );
-
- mGroupName = new KLineEdit( this );
- layout->addWidget( mGroupName, 0, 1 );
-
- layout->addWidget( new TQLabel( i18n( "Object Types to be Synchronized:"), this ), 1, 0, TQt::AlignTop );
-
- mObjectTypeSelector = new ObjectTypeSelector( this );
- layout->addWidget( mObjectTypeSelector, 1, 1 );
-
- layout->setRowStretch( 2, 1 );
-}
-
-void GroupConfigCommon::setSyncProcess( SyncProcess *syncProcess )
-{
- mSyncProcess = syncProcess;
-
- mGroupName->setText( mSyncProcess->group().name() );
- mObjectTypeSelector->load( mSyncProcess->group() );
-}
-
-void GroupConfigCommon::save()
-{
- mSyncProcess->group().setName( mGroupName->text() );
- mObjectTypeSelector->save( mSyncProcess->group() );
-}
diff --git a/kitchensync/src/groupconfigcommon.h b/kitchensync/src/groupconfigcommon.h
deleted file mode 100644
index 8b298316..00000000
--- a/kitchensync/src/groupconfigcommon.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-#ifndef GROUPCONFIGCOMMON_H
-#define GROUPCONFIGCOMMON_H
-
-#include <tqwidget.h>
-#include <tqmap.h>
-
-#include <libqopensync/group.h>
-
-class KLineEdit;
-class SyncProcess;
-class TQCheckBox;
-
-class ObjectTypeSelector : public TQWidget
-{
- public:
- ObjectTypeSelector( TQWidget *parent );
-
- void load( const QSync::Group &group );
- void save( QSync::Group group );
-
- private:
- TQMap<TQString,TQCheckBox *> mObjectTypeChecks;
-};
-
-class GroupConfigCommon : public TQWidget
-{
- public:
- GroupConfigCommon( TQWidget *parent );
-
- void setSyncProcess( SyncProcess *syncProcess );
- void save();
-
- private:
- KLineEdit *mGroupName;
- ObjectTypeSelector *mObjectTypeSelector;
-
- SyncProcess *mSyncProcess;
-};
-
-#endif
diff --git a/kitchensync/src/groupconfigdialog.cpp b/kitchensync/src/groupconfigdialog.cpp
deleted file mode 100644
index 522e54b1..00000000
--- a/kitchensync/src/groupconfigdialog.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#include "groupconfigdialog.h"
-
-#include "groupconfig.h"
-
-#include <tdelocale.h>
-
-#include <tqlayout.h>
-
-GroupConfigDialog::GroupConfigDialog( TQWidget *parent, SyncProcess *process )
- : KDialogBase( parent, 0, true, i18n("Configure Synchronization Group"),
- Ok )
-{
- TQFrame *topFrame = makeMainWidget();
-
- TQBoxLayout *topLayout = new TQVBoxLayout( topFrame );
-
- mConfigWidget = new GroupConfig( topFrame );
- topLayout->addWidget( mConfigWidget );
-
- mConfigWidget->setSyncProcess( process );
-
- setInitialSize( configDialogSize( "size_groupconfigdialog" ) );
-}
-
-GroupConfigDialog::~GroupConfigDialog()
-{
- saveDialogSize( "size_groupconfigdialog" );
-}
-
-void GroupConfigDialog::slotOk()
-{
- mConfigWidget->saveConfig();
-
- accept();
-}
-
-#include "groupconfigdialog.moc"
diff --git a/kitchensync/src/groupconfigdialog.h b/kitchensync/src/groupconfigdialog.h
deleted file mode 100644
index 988c2487..00000000
--- a/kitchensync/src/groupconfigdialog.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-#ifndef GROUPCONFIGDIALOG_H
-#define GROUPCONFIGDIALOG_H
-
-#include <kdialogbase.h>
-
-class GroupConfig;
-class SyncProcess;
-
-class GroupConfigDialog : public KDialogBase
-{
- Q_OBJECT
-
-
- public:
- GroupConfigDialog( TQWidget *parent, SyncProcess * );
- ~GroupConfigDialog();
-
- protected slots:
- void slotOk();
-
- private:
- GroupConfig *mConfigWidget;
-};
-
-#endif
diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp
deleted file mode 100644
index d87ac37e..00000000
--- a/kitchensync/src/groupitem.cpp
+++ /dev/null
@@ -1,389 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#include <tdeapplication.h>
-#include <kdialog.h>
-#include <tdeglobal.h>
-#include <tdeglobalsettings.h>
-#include <kiconloader.h>
-#include <tdelocale.h>
-#include <kpassivepopup.h>
-#include <kurllabel.h>
-
-#include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqpixmap.h>
-#include <tqprogressbar.h>
-#include <tqvbox.h>
-
-#include "memberinfo.h"
-#include "multiconflictdialog.h"
-#include "singleconflictdialog.h"
-#include "syncprocessmanager.h"
-
-#include "groupitem.h"
-
-GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process )
- : KWidgetListItem( parent ), mSyncProcess( process ),
- mCallbackHandler( new QSync::CallbackHandler ),
- mProcessedItems( 0 ), mMaxProcessedItems( 0 ),
- mSynchronizing( false )
-{
- TQFont boldFont;
- boldFont.setBold( true );
- boldFont.setPointSize( boldFont.pointSize() + 2 );
-
- TQGridLayout *layout = new TQGridLayout( this, 4, 4, KDialog::marginHint(), KDialog::spacingHint() );
-
- mBox = new TQVBox( this );
- mBox->setMargin( 5 );
- mProgressBar = new TQProgressBar( this );
- mProgressBar->setTotalSteps( 100 );
-
- mTime = new TQLabel( this );
- mSyncAction = new KURLLabel( "exec:/sync", i18n( "Synchronize Now" ), this );
- mConfigureAction = new KURLLabel( "exec:/config", i18n( "Configure" ), this );
-
- // header
- TQHBox* hbox = new TQHBox( this );
- hbox->setMargin( 2 );
-
- static TQPixmap icon;
- if ( icon.isNull() )
- icon = TDEGlobal::iconLoader()->loadIcon( "kontact_summary", TDEIcon::Desktop );
-
- mIcon = new TQLabel( hbox );
- mIcon->setPixmap( icon );
- mIcon->setFixedSize( mIcon->sizeHint() );
- mIcon->setPaletteBackgroundColor( colorGroup().mid() );
-
- mGroupName = new TQLabel( hbox );
- mGroupName->setAlignment( AlignLeft | AlignVCenter );
- mGroupName->setIndent( KDialog::spacingHint() );
- mGroupName->setFont( boldFont );
- mGroupName->setPaletteForegroundColor( colorGroup().light() );
- mGroupName->setPaletteBackgroundColor( colorGroup().mid() );
-
- mStatus = new TQLabel( hbox );
- mStatus->setAlignment( TQt::AlignRight );
- mStatus->setAlignment( AlignRight | AlignVCenter );
- mStatus->setIndent( KDialog::spacingHint() );
- mStatus->setFont( boldFont );
- mStatus->setPaletteForegroundColor( colorGroup().light() );
- mStatus->setPaletteBackgroundColor( colorGroup().mid() );
- mStatus->setText( i18n( "Ready" ) );
-
- hbox->setPaletteBackgroundColor( colorGroup().mid() );
- hbox->setMaximumHeight( hbox->minimumSizeHint().height() );
-
- layout->addMultiCellWidget( hbox, 0, 0, 0, 3 );
- layout->addMultiCellWidget( mBox, 1, 1, 0, 3 );
- layout->addWidget( mTime, 2, 0 );
- layout->addWidget( mSyncAction, 2, 1 );
- layout->addWidget( mConfigureAction, 2, 2 );
- layout->addWidget( mProgressBar, 2, 3 );
- layout->setColStretch( 0, 1 );
- layout->setRowStretch( 3, 1 );
-
- setPaletteBackgroundColor( kapp->palette().active().base() );
-
- connect( mCallbackHandler, TQT_SIGNAL( conflict( QSync::SyncMapping ) ),
- this, TQT_SLOT( conflict( QSync::SyncMapping ) ) );
- connect( mCallbackHandler, TQT_SIGNAL( change( const QSync::SyncChangeUpdate& ) ),
- this, TQT_SLOT( change( const QSync::SyncChangeUpdate& ) ) );
- connect( mCallbackHandler, TQT_SIGNAL( mapping( const QSync::SyncMappingUpdate& ) ),
- this, TQT_SLOT( mapping( const QSync::SyncMappingUpdate& ) ) );
- connect( mCallbackHandler, TQT_SIGNAL( engine( const QSync::SyncEngineUpdate& ) ),
- this, TQT_SLOT( engine( const QSync::SyncEngineUpdate& ) ) );
- connect( mCallbackHandler, TQT_SIGNAL( member( const QSync::SyncMemberUpdate& ) ),
- this, TQT_SLOT( member( const QSync::SyncMemberUpdate& ) ) );
- connect( mSyncAction, TQT_SIGNAL( leftClickedURL() ),
- this, TQT_SLOT( synchronize() ) );
- connect( mConfigureAction, TQT_SIGNAL( leftClickedURL() ),
- this, TQT_SLOT( configure() ) );
- connect( mSyncProcess, TQT_SIGNAL( engineChanged( QSync::Engine* ) ),
- this, TQT_SLOT( engineChanged( QSync::Engine* ) ) );
-
- mCallbackHandler->setEngine( mSyncProcess->engine() );
-
- setSelectionForegroundColor( TDEGlobalSettings::textColor() );
- setSelectionBackgroundColor( TDEGlobalSettings::alternateBackgroundColor() );
-
- update();
-}
-
-GroupItem::~GroupItem()
-{
- delete mCallbackHandler;
- mCallbackHandler = 0;
-}
-
-void GroupItem::update()
-{
- clear();
-
- mGroupName->setText( i18n( "Group: %1" ).arg( mSyncProcess->group().name() ) );
-
- TQDateTime dateTime = mSyncProcess->group().lastSynchronization();
- if ( dateTime.isValid() )
- mTime->setText( i18n( "Last synchronized on: %1" ).arg( TDEGlobal::locale()->formatDateTime( dateTime ) ) );
- else
- mTime->setText( i18n( "Not synchronized yet" ) );
-
- mProgressBar->reset();
- mProgressBar->hide();
-
- QSync::Group group = mSyncProcess->group();
- QSync::Group::Iterator memberIt( group.begin() );
- QSync::Group::Iterator memberEndIt( group.end() );
-
- for ( ; memberIt != memberEndIt; ++memberIt ) {
- MemberItem *item = new MemberItem( mBox, mSyncProcess, *memberIt );
- item->show();
- item->setStatusMessage( i18n( "Ready" ) );
- mMemberItems.append( item );
- }
-}
-
-void GroupItem::clear()
-{
- mGroupName->setText( TQString() );
-
- TQValueList<MemberItem*>::Iterator it;
- for ( it = mMemberItems.begin(); it != mMemberItems.end(); ++it )
- delete *it;
-
- mMemberItems.clear();
-}
-
-void GroupItem::conflict( QSync::SyncMapping mapping )
-{
- if ( mapping.changesCount() == 2 ) {
- SingleConflictDialog dlg( mapping, this );
- dlg.exec();
- } else {
- MultiConflictDialog dlg( mapping, this );
- dlg.exec();
- }
-}
-
-void GroupItem::change( const QSync::SyncChangeUpdate &update )
-{
- switch ( update.type() ) {
- case QSync::SyncChangeUpdate::Received:
- mProcessedItems++;
- mStatus->setText( i18n( "%1 entries read" ).arg( mProcessedItems ) );
- break;
- case QSync::SyncChangeUpdate::ReceivedInfo:
- mStatus->setText( i18n( "Receive information" ) );
- break;
- case QSync::SyncChangeUpdate::Sent:
- mProcessedItems--;
- mStatus->setText( i18n( "%1 entries written" ).arg( mMaxProcessedItems - mProcessedItems ) );
-
- mProgressBar->show();
-
- {
- int progress = 100;
- if ( mMaxProcessedItems != 0 )
- progress = (mProcessedItems * 100) / mMaxProcessedItems;
-
- if ( progress < 0 )
- progress = 0;
-
- mProgressBar->setProgress( 100 - progress );
- }
- break;
- case QSync::SyncChangeUpdate::WriteError:
- mStatus->setText( i18n( "Error" ) );
- KPassivePopup::message( update.result().message(), this );
- break;
- case QSync::SyncChangeUpdate::ReceiveError:
- mStatus->setText( i18n( "Error" ) );
- KPassivePopup::message( update.result().message(), this );
- break;
- default:
- mStatus->setText( TQString() );
- break;
- }
-}
-
-void GroupItem::mapping( const QSync::SyncMappingUpdate& )
-{
-}
-
-void GroupItem::engine( const QSync::SyncEngineUpdate &update )
-{
- switch ( update.type() ) {
- case QSync::SyncEngineUpdate::EndPhaseConnected:
- mStatus->setText( i18n( "Connected" ) );
- mProgressBar->setProgress( 0 );
- mSynchronizing = true;
- mSyncAction->setText( "Abort Synchronization" );
- break;
- case QSync::SyncEngineUpdate::EndPhaseRead:
- mStatus->setText( i18n( "Data read" ) );
- break;
- case QSync::SyncEngineUpdate::EndPhaseWrite:
- mStatus->setText( i18n( "Data written" ) );
- mProgressBar->setProgress( 100 );
- mProcessedItems = mMaxProcessedItems = 0;
- break;
- case QSync::SyncEngineUpdate::EndPhaseDisconnected:
- mStatus->setText( i18n( "Disconnected" ) );
- break;
- case QSync::SyncEngineUpdate::Error:
- mStatus->setText( i18n( "Synchronization failed" ) );
- KPassivePopup::message( update.result().message(), this );
- this->update();
-
- mSynchronizing = false;
- mSyncAction->setText( i18n( "Synchronize Now" ) );
- break;
- case QSync::SyncEngineUpdate::SyncSuccessfull:
- mStatus->setText( i18n( "Successfully synchronized" ) );
- mSyncProcess->group().setLastSynchronization( TQDateTime::currentDateTime() );
- mSyncProcess->group().save();
- this->update();
-
- mSynchronizing = false;
- mSyncAction->setText( i18n( "Synchronize Now" ) );
- break;
- case QSync::SyncEngineUpdate::PrevUnclean:
- mStatus->setText( i18n( "Previous synchronization failed" ) );
- break;
- case QSync::SyncEngineUpdate::EndConflicts:
- mStatus->setText( i18n( "Conflicts solved" ) );
- mMaxProcessedItems = mProcessedItems;
- break;
- default:
- mStatus->setText( TQString() );
- break;
- }
-}
-
-void GroupItem::member( const QSync::SyncMemberUpdate &update )
-{
- TQValueList<MemberItem*>::Iterator it;
- for ( it = mMemberItems.begin(); it != mMemberItems.end(); ++it ) {
- if ( (*it)->member() == update.member() ) {
- switch ( update.type() ) {
- case QSync::SyncMemberUpdate::Connected:
- (*it)->setStatusMessage( i18n( "Connected" ) );
- break;
- case QSync::SyncMemberUpdate::SentChanges:
- (*it)->setStatusMessage( i18n( "Changes read" ) );
- break;
- case QSync::SyncMemberUpdate::CommittedAll:
- (*it)->setStatusMessage( i18n( "Changes written" ) );
- break;
- case QSync::SyncMemberUpdate::Disconnected:
- (*it)->setStatusMessage( i18n( "Disconnected" ) );
- break;
- case QSync::SyncMemberUpdate::ConnectError:
- (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
- break;
- case QSync::SyncMemberUpdate::GetChangesError:
- (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
- break;
- case QSync::SyncMemberUpdate::CommittedAllError:
- (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
- break;
- case QSync::SyncMemberUpdate::SyncDoneError:
- (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
- break;
- case QSync::SyncMemberUpdate::DisconnectedError:
- (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
- break;
- default:
- break;
- }
-
- return;
- }
- }
-}
-
-void GroupItem::synchronize()
-{
- if ( !mSynchronizing )
- emit synchronizeGroup( mSyncProcess );
- else
- emit abortSynchronizeGroup( mSyncProcess );
-}
-
-void GroupItem::configure()
-{
- emit configureGroup( mSyncProcess );
-
- this->update();
-}
-
-void GroupItem::engineChanged( QSync::Engine *engine )
-{
- Q_ASSERT( engine );
-
- mCallbackHandler->setEngine( engine );
-
- this->update();
-}
-
-MemberItem::MemberItem( TQWidget *parent, SyncProcess *process,
- const QSync::Member &member )
- : TQWidget( parent ), mSyncProcess( process ), mMember( member )
-{
- TQFont boldFont;
- boldFont.setBold( true );
-
- MemberInfo mi( member );
-
- TQPixmap icon = mi.smallIcon();
-
- QSync::Plugin plugin = member.plugin();
-
- TQVBoxLayout *layout = new TQVBoxLayout( this );
-
- TQHBox* box = new TQHBox( this );
- box->setMargin( 5 );
- box->setSpacing( 6 );
- layout->addWidget( box );
-
- mIcon = new TQLabel( box );
- mIcon->setPixmap( icon );
- mIcon->setAlignment( TQt::AlignTop );
- mIcon->setFixedWidth( mIcon->sizeHint().width() );
-
- TQVBox *nameBox = new TQVBox( box );
- mMemberName = new TQLabel( nameBox );
- mMemberName->setFont( boldFont );
- mDescription = new TQLabel( nameBox );
-
- mStatus = new TQLabel( box );
-
- mMemberName->setText( member.name() );
- mDescription->setText( plugin.longName() );
-}
-
-void MemberItem::setStatusMessage( const TQString &msg )
-{
- mStatus->setText( msg );
-}
-
-#include "groupitem.moc"
diff --git a/kitchensync/src/groupitem.h b/kitchensync/src/groupitem.h
deleted file mode 100644
index 469b8329..00000000
--- a/kitchensync/src/groupitem.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#ifndef GROUPITEM_H
-#define GROUPITEM_H
-
-#include "syncprocess.h"
-
-#include <libqopensync/callbackhandler.h>
-
-#include <kwidgetlist.h>
-
-namespace QSync {
-class Engine;
-}
-
-class MemberItem;
-class KURLLabel;
-class TQLabel;
-class TQProgressBar;
-class TQVBox;
-
-class GroupItem : public KWidgetListItem
-{
- Q_OBJECT
-
-
- public:
- GroupItem( KWidgetList*, SyncProcess *syncProcess );
- ~GroupItem();
-
- SyncProcess *syncProcess() const { return mSyncProcess; }
-
- void update();
-
- void clear();
-
- signals:
- void synchronizeGroup( SyncProcess *syncProcess );
- void abortSynchronizeGroup( SyncProcess *syncProcess );
- void configureGroup( SyncProcess *syncProcess );
-
- protected slots:
- void conflict( QSync::SyncMapping );
- void change( const QSync::SyncChangeUpdate& );
- void mapping( const QSync::SyncMappingUpdate& );
- void engine( const QSync::SyncEngineUpdate& );
- void member( const QSync::SyncMemberUpdate& );
-
- void synchronize();
- void configure();
-
- void engineChanged( QSync::Engine *engine );
-
- private:
- SyncProcess *mSyncProcess;
- QSync::CallbackHandler *mCallbackHandler;
- TQValueList<MemberItem*> mMemberItems;
-
- TQLabel *mIcon;
- TQLabel *mGroupName;
- TQLabel *mStatus;
- TQLabel *mTime;
- KURLLabel *mSyncAction;
- KURLLabel *mConfigureAction;
- TQVBox *mBox;
- TQProgressBar *mProgressBar;
-
- int mProcessedItems;
- int mMaxProcessedItems;
- bool mSynchronizing;
-};
-
-class MemberItem : public TQWidget
-{
- public:
- MemberItem( TQWidget *parent, SyncProcess *syncProcess,
- const QSync::Member &member );
-
- SyncProcess* syncProcess() const { return mSyncProcess; }
- QSync::Member member() const { return mMember; }
-
- void setStatusMessage( const TQString &msg );
-
- private:
- SyncProcess *mSyncProcess;
- QSync::Member mMember;
-
- TQLabel *mIcon;
- TQLabel *mMemberName;
- TQLabel *mDescription;
- TQLabel *mStatus;
-};
-
-#endif
diff --git a/kitchensync/src/groupview.cpp b/kitchensync/src/groupview.cpp
deleted file mode 100644
index 8e1adf87..00000000
--- a/kitchensync/src/groupview.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#include <tqlayout.h>
-
-#include "aboutpage.h"
-#include "groupitem.h"
-#include "syncprocessmanager.h"
-
-#include "groupview.h"
-
-GroupView::GroupView( TQWidget *parent )
- : TQWidget( parent ), mAboutPage( 0 )
-{
- mLayout = new TQVBoxLayout( this );
-
- mWidgetList = new KWidgetList( this );
-
- mLayout->addWidget( mWidgetList );
-}
-
-SyncProcess* GroupView::selectedSyncProcess() const
-{
- GroupItem *item = static_cast<GroupItem*>( mWidgetList->selectedItem() );
- if ( item )
- return item->syncProcess();
- else
- return 0;
-}
-
-void GroupView::clear()
-{
- mWidgetList->clear();
-}
-
-void GroupView::updateView()
-{
- clear();
-
- if ( SyncProcessManager::self()->count() == 0 ) {
- mWidgetList->hide();
-
- if ( !mAboutPage ) {
- mAboutPage = new AboutPage( this );
- mLayout->addWidget( mAboutPage );
-
- connect( mAboutPage, TQT_SIGNAL( addGroup() ), TQT_SIGNAL( addGroup() ) );
- }
-
- mAboutPage->show();
-
- } else {
- if ( mAboutPage )
- mAboutPage->hide();
- mWidgetList->show();
- }
-
- for ( int i = 0; i < SyncProcessManager::self()->count(); ++i ) {
- SyncProcess *process = SyncProcessManager::self()->at( i );
-
- GroupItem *item = new GroupItem( mWidgetList, process );
- connect( item, TQT_SIGNAL( synchronizeGroup( SyncProcess* ) ),
- TQT_SIGNAL( synchronizeGroup( SyncProcess* ) ) );
- connect( item, TQT_SIGNAL( abortSynchronizeGroup( SyncProcess* ) ),
- TQT_SIGNAL( abortSynchronizeGroup( SyncProcess* ) ) );
- connect( item, TQT_SIGNAL( configureGroup( SyncProcess* ) ),
- TQT_SIGNAL( configureGroup( SyncProcess* ) ) );
-
- mWidgetList->appendItem( item );
- }
-}
-
-void GroupView::updateSyncProcess( SyncProcess *syncProcess )
-{
- for ( int i = 0; i < (int)mWidgetList->count(); ++i ) {
- GroupItem *item = static_cast<GroupItem*>( mWidgetList->item( i ) );
- if ( item && item->syncProcess() == syncProcess )
- item->update();
- }
-}
-
-#include "groupview.moc"
diff --git a/kitchensync/src/groupview.h b/kitchensync/src/groupview.h
deleted file mode 100644
index 63a14279..00000000
--- a/kitchensync/src/groupview.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-#ifndef GROUPVIEW_H
-#define GROUPVIEW_H
-
-#include <kwidgetlist.h>
-
-class AboutPage;
-class SyncProcess;
-class TQVBoxLayout;
-
-class GroupView : public TQWidget
-{
- Q_OBJECT
-
-
- public:
- GroupView( TQWidget *parent );
-
- SyncProcess* selectedSyncProcess() const;
-
- void clear();
-
- public slots:
- void updateView();
- void updateSyncProcess( SyncProcess *process );
-
- signals:
- void addGroup();
- void synchronizeGroup( SyncProcess *syncProcess );
- void abortSynchronizeGroup( SyncProcess *syncProcess );
- void configureGroup( SyncProcess *syncProcess );
-
- private:
- AboutPage *mAboutPage;
- KWidgetList *mWidgetList;
-
- TQVBoxLayout *mLayout;
-};
-
-#endif
diff --git a/kitchensync/src/htmldiffalgodisplay.cpp b/kitchensync/src/htmldiffalgodisplay.cpp
deleted file mode 100644
index d91b7590..00000000
--- a/kitchensync/src/htmldiffalgodisplay.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- This file is part of libtdepim.
-
- Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <tdeglobalsettings.h>
-
-#include "htmldiffalgodisplay.h"
-
-using namespace KSync;
-
-static TQString textToHTML( const TQString &text )
-{
- return TQStyleSheet::convertFromPlainText( text );
-}
-
-HTMLDiffAlgoDisplay::HTMLDiffAlgoDisplay( TQWidget *parent )
- : KTextBrowser( parent )
-{
- setWrapPolicy( TQTextEdit::AtWordBoundary );
- setVScrollBarMode( TQScrollView::AlwaysOff );
- setHScrollBarMode( TQScrollView::AlwaysOff );
-}
-
-void HTMLDiffAlgoDisplay::begin()
-{
- clear();
- mText = "";
-
- mText.append( "<html>" );
- mText.append( TQString( "<body text=\"%1\" bgcolor=\"%2\">" )
- .arg( TDEGlobalSettings::textColor().name() )
- .arg( TDEGlobalSettings::baseColor().name() ) );
-
- mText.append( "<center><table>" );
- mText.append( TQString( "<tr><th></th><th align=\"center\">%1</th><td> </td><th align=\"center\">%2</th></tr>" )
- .arg( mLeftTitle )
- .arg( mRightTitle ) );
-}
-
-void HTMLDiffAlgoDisplay::end()
-{
- mText.append( "</table></center>"
- "</body>"
- "</html>" );
-
- setText( mText );
-}
-
-void HTMLDiffAlgoDisplay::setLeftSourceTitle( const TQString &title )
-{
- mLeftTitle = title;
-}
-
-void HTMLDiffAlgoDisplay::setRightSourceTitle( const TQString &title )
-{
- mRightTitle = title;
-}
-
-void HTMLDiffAlgoDisplay::additionalLeftField( const TQString &id, const TQString &value )
-{
- mText.append( TQString( "<tr><td align=\"right\"><b>%1:</b></td><td bgcolor=\"#9cff83\">%2</td><td></td><td></td></tr>" )
- .arg( id )
- .arg( textToHTML( value ) ) );
-}
-
-void HTMLDiffAlgoDisplay::additionalRightField( const TQString &id, const TQString &value )
-{
- mText.append( TQString( "<tr><td align=\"right\"><b>%1:</b></td><td></td><td></td><td bgcolor=\"#9cff83\">%2</td></tr>" )
- .arg( id )
- .arg( textToHTML( value ) ) );
-}
-
-void HTMLDiffAlgoDisplay::conflictField( const TQString &id, const TQString &leftValue,
- const TQString &rightValue )
-{
- mText.append( TQString( "<tr><td align=\"right\"><b>%1:</b></td><td bgcolor=\"#ff8686\">%2</td><td></td><td bgcolor=\"#ff8686\">%3</td></tr>" )
- .arg( id )
- .arg( textToHTML( leftValue ) )
- .arg( textToHTML( rightValue ) ) );
-}
diff --git a/kitchensync/src/htmldiffalgodisplay.h b/kitchensync/src/htmldiffalgodisplay.h
deleted file mode 100644
index 0dd92f01..00000000
--- a/kitchensync/src/htmldiffalgodisplay.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- This file is part of libtdepim.
-
- Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef KSYNC_HTMLDIFFALGODISPLAY_H
-#define KSYNC_HTMLDIFFALGODISPLAY_H
-
-#include <ktextbrowser.h>
-#include <libtdepim/diffalgo.h>
-
-using namespace KPIM;
-
-namespace KSync {
-
-class HTMLDiffAlgoDisplay : virtual public DiffAlgoDisplay, public KTextBrowser
-{
- public:
- HTMLDiffAlgoDisplay( TQWidget *parent );
-
- void begin();
- void end();
- void setLeftSourceTitle( const TQString &title );
- void setRightSourceTitle( const TQString &title );
- void additionalLeftField( const TQString &id, const TQString &value );
- void additionalRightField( const TQString &id, const TQString &value );
- void conflictField( const TQString &id, const TQString &leftValue,
- const TQString &rightValue );
-
- private:
- TQString mLeftTitle;
- TQString mRightTitle;
- TQString mText;
-};
-
-}
-
-#endif
diff --git a/kitchensync/src/kitchensync.desktop b/kitchensync/src/kitchensync.desktop
deleted file mode 100644
index 6b5bdff7..00000000
--- a/kitchensync/src/kitchensync.desktop
+++ /dev/null
@@ -1,16 +0,0 @@
-[Desktop Entry]
-Name=KitchenSync
-
-GenericName=Synchronization
-
-Exec=kitchensync
-Icon=kitchensync
-Type=Application
-X-DocPath=kitchensync/index.html
-Terminal=false
-X-TDE-StartupNotify=true
-X-DCOP-ServiceType=Unique
-X-DCOP-ServiceName=kitchensync
-X-TDE-ServiceTypes=KParts/ReadOnlyPart
-X-TDE-Library=libkitchensyncpart
-Categories=Qt;TDE;Utility;Telephony;X-TDE-Utilities-Peripherals;
diff --git a/kitchensync/src/kitchensync_part.rc b/kitchensync/src/kitchensync_part.rc
deleted file mode 100644
index 03a13ba6..00000000
--- a/kitchensync/src/kitchensync_part.rc
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE kpartgui>
-<kpartgui name="kitchensync" version="1">
- <MenuBar>
- <Menu name="file">
- <Action name="sync" />
- </Menu>
-
- <Menu name="groups"><text>&amp;Groups</text>
- <Action name="add_group" />
- <Action name="edit_group" />
- <Action name="delete_group" />
- </Menu>
- </MenuBar>
-
- <ToolBar name="mainToolBar"><text>Main</text>
- <Action name="sync" />
- <Separator />
- <Action name="add_group" />
- <Action name="edit_group" />
- <Action name="delete_group" />
- </ToolBar>
-</kpartgui>
diff --git a/kitchensync/src/kitchensyncui.rc b/kitchensync/src/kitchensyncui.rc
deleted file mode 100644
index df2e49be..00000000
--- a/kitchensync/src/kitchensyncui.rc
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE kpartgui>
-<kpartgui name="kitchensync" version="2">
- <MenuBar>
- <Menu name="file">
- <Action name="sync" />
- </Menu>
-
- <Menu name="groups"><text>&amp;Groups</text>
- <Action name="add_group" />
- <Action name="edit_group" />
- <Action name="delete_group" />
- </Menu>
- </MenuBar>
-
- <ToolBar name="mainToolBar"><text>Main</text>
- <Action name="sync" />
- <Separator />
- <Action name="add_group" />
- <Action name="edit_group" />
- <Action name="delete_group" />
- </ToolBar>
-</kpartgui>
diff --git a/kitchensync/src/kwidgetlist.cpp b/kitchensync/src/kwidgetlist.cpp
deleted file mode 100644
index f26f8d68..00000000
--- a/kitchensync/src/kwidgetlist.cpp
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <tqvbox.h>
-
-#include <tdeglobalsettings.h>
-
-#include "kwidgetlist.h"
-
-class KWidgetList::Private
-{
- public:
- Private()
- : mSelectedItem( 0 )
- {
- }
-
- TQValueList<KWidgetListItem*> mItems;
- KWidgetListItem *mSelectedItem;
- TQVBox *mBox;
-};
-
-KWidgetList::KWidgetList( TQWidget *parent, const char *name )
- : TQScrollView( parent, name ),
- d( new Private )
-{
- d->mBox = new TQVBox( viewport() );
- addChild( d->mBox );
-
- setResizePolicy( AutoOneFit );
- setFocusPolicy( TQ_StrongFocus );
-
- viewport()->setFocus();
-}
-
-KWidgetList::~KWidgetList()
-{
- clear();
-
- delete d;
- d = 0;
-}
-
-uint KWidgetList::count() const
-{
- return d->mItems.count();
-}
-
-void KWidgetList::appendItem( KWidgetListItem *item )
-{
- if ( !item )
- return;
-
- if ( !d->mItems.contains( item ) ) {
- d->mItems.append( item );
- item->reparent( d->mBox, 0, TQPoint( 0, 0 ), true );
- item->setSelected( false );
- item->installEventFilter( this );
-
- if ( d->mItems.count() == 1 ) {
- d->mSelectedItem = item;
- } else {
- if ( !d->mSelectedItem )
- setSelected( item );
- else
- d->mSelectedItem->setSelected( true );
- }
- }
-}
-
-void KWidgetList::removeItem( int index )
-{
- if ( index < 0 || index >= (int)d->mItems.count() )
- return;
-
- KWidgetListItem *item = d->mItems[ index ];
- d->mItems.remove( item );
-
- if ( d->mSelectedItem == item ) {
- // TODO: smarter selection
- if ( !d->mItems.isEmpty() )
- setSelected( d->mItems.first() );
- else
- d->mSelectedItem = 0;
- }
-
- delete item;
-
- if ( d->mItems.count() == 1 )
- d->mItems.first()->setSelected( false );
-}
-
-void KWidgetList::takeItem( KWidgetListItem *item )
-{
- d->mItems.remove( item );
- item->reparent( 0, 0, TQPoint( 0, 0 ) );
- item->removeEventFilter( this );
- item->hide();
-
- if ( d->mSelectedItem == item ) {
- // TODO: smarter selection
- if ( !d->mItems.isEmpty() )
- setSelected( d->mItems.first() );
- else
- d->mSelectedItem = 0;
- }
-}
-
-void KWidgetList::setSelected( KWidgetListItem *item )
-{
- if ( !item )
- return;
-
- if ( d->mItems.contains( item ) == 0 )
- return;
-
- if ( d->mSelectedItem )
- d->mSelectedItem->setSelected( false );
-
- item->setSelected( true );
- d->mSelectedItem = item;
-}
-
-void KWidgetList::setSelected( int index )
-{
- setSelected( item( index ) );
-}
-
-bool KWidgetList::isSelected( KWidgetListItem *item ) const
-{
- return ( d->mSelectedItem == item );
-}
-
-bool KWidgetList::isSelected( int index ) const
-{
- return isSelected( item( index ) );
-}
-
-KWidgetListItem *KWidgetList::selectedItem() const
-{
- return d->mSelectedItem;
-}
-
-KWidgetListItem *KWidgetList::item( int index ) const
-{
- if ( index < 0 || index >= (int)d->mItems.count() )
- return 0;
- else
- return d->mItems[ index ];
-}
-
-int KWidgetList::index( KWidgetListItem *item ) const
-{
- return d->mItems.findIndex( item );
-}
-
-void KWidgetList::clear()
-{
- TQValueList<KWidgetListItem*>::Iterator it;
- for ( it = d->mItems.begin(); it != d->mItems.end(); ++it )
- delete *it;
-
- d->mItems.clear();
-
- d->mSelectedItem = 0;
-}
-
-void KWidgetList::setFocus()
-{
- viewport()->setFocus();
-}
-
-bool KWidgetList::eventFilter( TQObject *object, TQEvent *event )
-{
- if ( event->type() == TQEvent::MouseButtonPress ) {
- TQMouseEvent *mouseEvent = TQT_TQMOUSEEVENT( event );
- if ( mouseEvent->button() & Qt::LeftButton ) {
- TQValueList<KWidgetListItem*>::Iterator it;
- for ( it = d->mItems.begin(); it != d->mItems.end(); ++it ) {
- if ( TQT_BASE_OBJECT(*it) == TQT_BASE_OBJECT(object) ) {
- if ( d->mItems.count() != 1 ) {
- setSelected( *it );
- emit selectionChanged( *it );
- }
- return true;
- }
- }
- }
- } else if ( event->type() == TQEvent::MouseButtonDblClick ) {
- TQValueList<KWidgetListItem*>::Iterator it;
- for ( it = d->mItems.begin(); it != d->mItems.end(); ++it ) {
- if ( TQT_BASE_OBJECT(*it) == TQT_BASE_OBJECT(object) ) {
- if ( d->mItems.count() != 1 ) {
- setSelected( *it );
- emit doubleClicked( *it );
- }
- return true;
- }
- }
- } else if ( event->type() == TQEvent::KeyPress ) {
- TQKeyEvent *keyEvent = TQT_TQKEYEVENT( event );
- if ( keyEvent->key() == TQt::Key_Up ) {
- if ( d->mSelectedItem == 0 ) {
- if ( !d->mItems.isEmpty() ) {
- setSelected( d->mItems.first() );
- return true;
- }
- }
-
- for ( int i = 0; i < (int)d->mItems.count(); ++i ) {
- if ( d->mItems[ i ] == d->mSelectedItem ) {
- if ( ( i - 1 ) >= 0 ) {
- setSelected( d->mItems[ i - 1 ] );
- return true;
- }
- }
- }
- return true;
- } else if ( keyEvent->key() == TQt::Key_Down ) {
- if ( d->mSelectedItem == 0 ) {
- if ( !d->mItems.isEmpty() ) {
- setSelected( d->mItems.last() );
- return true;
- }
- }
-
- for ( int i = 0; i < (int)d->mItems.count(); ++i )
- if ( d->mItems[ i ] == d->mSelectedItem ) {
- if ( ( i + 1 ) < (int)d->mItems.count() ) {
- setSelected( d->mItems[ i + 1 ] );
- return true;
- }
- }
- return true;
- }
- }
-
- return TQScrollView::eventFilter( object, event );
-}
-
-KWidgetListItem::KWidgetListItem( KWidgetList *parent, const char *name )
- : TQWidget( parent, name )
-{
- mForegroundColor = TDEGlobalSettings::textColor();
- mBackgroundColor = TDEGlobalSettings::baseColor();
- mSelectionForegroundColor = TDEGlobalSettings::highlightedTextColor();
- mSelectionBackgroundColor = TDEGlobalSettings::highlightColor();
-
- setFocusPolicy( TQ_StrongFocus );
-}
-
-KWidgetListItem::~KWidgetListItem()
-{
-}
-
-void KWidgetListItem::setSelected( bool select )
-{
- if ( select ) {
- setPaletteForegroundColor( mSelectionForegroundColor );
- setPaletteBackgroundColor( mSelectionBackgroundColor );
- } else {
- setPaletteForegroundColor( mForegroundColor );
- setPaletteBackgroundColor( mBackgroundColor );
- }
-}
-
-void KWidgetListItem::setForegroundColor( const TQColor &color )
-{
- mForegroundColor = color;
-}
-
-void KWidgetListItem::setBackgroundColor( const TQColor &color )
-{
- mBackgroundColor = color;
-}
-
-void KWidgetListItem::setSelectionForegroundColor( const TQColor &color )
-{
- mSelectionForegroundColor = color;
-}
-
-void KWidgetListItem::setSelectionBackgroundColor( const TQColor &color )
-{
- mSelectionBackgroundColor = color;
-}
-
-#include "kwidgetlist.moc"
diff --git a/kitchensync/src/kwidgetlist.h b/kitchensync/src/kwidgetlist.h
deleted file mode 100644
index 54eaf88b..00000000
--- a/kitchensync/src/kwidgetlist.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef KWIDGETLIST_H
-#define KWIDGETLIST_H
-
-#include <tqscrollview.h>
-
-class KWidgetListItem;
-
-class KWidgetList : public TQScrollView
-{
- Q_OBJECT
-
-
- public:
- KWidgetList( TQWidget *parent = 0, const char *name = 0 );
- ~KWidgetList();
-
- uint count() const;
-
- void appendItem( KWidgetListItem *item );
- void removeItem( int index );
- void takeItem( KWidgetListItem *item );
-
- void setSelected( KWidgetListItem *item );
- void setSelected( int index );
-
- bool isSelected( KWidgetListItem *item ) const;
- bool isSelected( int index ) const;
-
- KWidgetListItem *selectedItem() const;
- KWidgetListItem *item( int index ) const;
-
- int index( KWidgetListItem *item ) const;
-
- virtual bool eventFilter( TQObject *object, TQEvent *event );
-
- public slots:
- void clear();
- virtual void setFocus();
-
- signals:
- void selectionChanged( KWidgetListItem *item );
- void doubleClicked( KWidgetListItem *item );
-
- private:
- class Private;
- Private *d;
-};
-
-class KWidgetListItem : public TQWidget
-{
- public:
- KWidgetListItem( KWidgetList *parent, const char *name = 0 );
- ~KWidgetListItem();
-
- void setSelected( bool selected );
-
- protected:
- void setForegroundColor( const TQColor& );
- void setBackgroundColor( const TQColor& );
- void setSelectionForegroundColor( const TQColor& );
- void setSelectionBackgroundColor( const TQColor& );
-
- private:
- TQColor mForegroundColor;
- TQColor mBackgroundColor;
- TQColor mSelectionForegroundColor;
- TQColor mSelectionBackgroundColor;
-};
-
-#endif
diff --git a/kitchensync/src/main.cpp b/kitchensync/src/main.cpp
deleted file mode 100644
index d5a0c267..00000000
--- a/kitchensync/src/main.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#include <kdebug.h>
-#include <tdeaboutdata.h>
-#include <tdecmdlineargs.h>
-#include <kuniqueapplication.h>
-#include <stdlib.h>
-
-#include "mainwidget.h"
-#include "mainwindow.h"
-
-static TDECmdLineOptions options[] =
-{
- TDECmdLineLastOption
-};
-
-int main( int argc, char **argv )
-{
- TDEAboutData *about = MainWidget::aboutData();
-
- TDECmdLineArgs::init( argc, argv, about );
- TDECmdLineArgs::addCmdLineOptions( options );
- KUniqueApplication::addCmdLineOptions();
-
- KUniqueApplication::addCmdLineOptions();
-
- if( !KUniqueApplication::start() ) {
- kdDebug() << "kitchensync already runs." << endl;
- exit( 0 );
- };
-
- KUniqueApplication app;
-
- TDEGlobal::locale()->insertCatalogue( "libkcal" );
-
- MainWindow *mainWindow = new MainWindow;
- mainWindow->show();
-
- app.exec();
-}
diff --git a/kitchensync/src/mainwidget.cpp b/kitchensync/src/mainwidget.cpp
deleted file mode 100644
index 611c0a22..00000000
--- a/kitchensync/src/mainwidget.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#include "mainwidget.h"
-
-#include "groupconfigdialog.h"
-#include "groupview.h"
-#include "syncprocess.h"
-#include "syncprocessmanager.h"
-
-#include <libqopensync/environment.h>
-
-#include <tdeaboutdata.h>
-#include <tdeaction.h>
-#include <kdebug.h>
-#include <kinputdialog.h>
-#include <tdelistview.h>
-#include <tdelocale.h>
-#include <tdemessagebox.h>
-#include <kstdaction.h>
-#include <kxmlguiclient.h>
-
-#include <tqlayout.h>
-
-MainWidget::MainWidget( KXMLGUIClient *guiClient, TQWidget *widget, const char *name )
- : TQWidget( widget, name ), mGUIClient( guiClient )
-{
- initGUI();
- initActions();
-
- /** apply object type filter hack **/
- int count = SyncProcessManager::self()->count();
- for ( int i = 0; i < count; ++i ) {
- SyncProcessManager::self()->at( i )->applyObjectTypeFilter();
- }
- /** apply object type filter hack **/
-
- mGroupView->updateView();
-
- connect( SyncProcessManager::self(), TQT_SIGNAL( changed() ),
- mGroupView, TQT_SLOT( updateView() ) );
- connect( SyncProcessManager::self(), TQT_SIGNAL( syncProcessChanged( SyncProcess* ) ),
- mGroupView, TQT_SLOT( updateSyncProcess( SyncProcess* ) ) );
-
- enableActions();
-}
-
-MainWidget::~MainWidget()
-{
-}
-
-KXMLGUIClient *MainWidget::guiClient() const
-{
- return mGUIClient;
-}
-
-TDEAboutData *MainWidget::aboutData()
-{
- TDEAboutData *about = new TDEAboutData( "kitchensync", I18N_NOOP( "KitchenSync" ),
- "0.1", I18N_NOOP( "The TDE Syncing Application" ),
- TDEAboutData::License_GPL_V2,
- I18N_NOOP( "(c) 2005, The KDE PIM Team" ) );
- about->addAuthor( "Tobias Koenig", I18N_NOOP( "Current maintainer" ), "tokoe@kde.org" );
- about->addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
-
- return about;
-}
-
-void MainWidget::initGUI()
-{
- TQVBoxLayout *topLayout = new TQVBoxLayout( this );
-
- mGroupView = new GroupView( this );
- topLayout->addWidget( mGroupView );
-
- connect( mGroupView, TQT_SIGNAL( addGroup() ), TQT_SLOT( addGroup() ) );
- connect( mGroupView, TQT_SIGNAL( synchronizeGroup( SyncProcess* ) ),
- TQT_SLOT( sync( SyncProcess* ) ) );
- connect( mGroupView, TQT_SIGNAL( abortSynchronizeGroup( SyncProcess* ) ),
- TQT_SLOT( abortSync( SyncProcess* ) ) );
- connect( mGroupView, TQT_SIGNAL( configureGroup( SyncProcess* ) ),
- TQT_SLOT( editGroup( SyncProcess* ) ) );
-}
-
-void MainWidget::initActions()
-{
- mActionSynchronize = new TDEAction( i18n("Synchronize"), "hotsync", 0, TQT_TQOBJECT(this), TQT_SLOT( sync() ),
- mGUIClient->actionCollection(), "sync" );
- mActionAddGroup = new TDEAction( i18n("Add Group..."), "document-new", 0, TQT_TQOBJECT(this), TQT_SLOT( addGroup() ),
- mGUIClient->actionCollection(), "add_group" );
- mActionDeleteGroup = new TDEAction( i18n("Delete Group..."), "edit-delete", 0, TQT_TQOBJECT(this), TQT_SLOT( deleteGroup() ),
- mGUIClient->actionCollection(), "delete_group" );
- mActionEditGroup = new TDEAction( i18n("Edit Group..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT( editGroup() ),
- mGUIClient->actionCollection(), "edit_group" );
-}
-
-void MainWidget::enableActions()
-{
- bool state = ( SyncProcessManager::self()->count() > 0 );
-
- mActionSynchronize->setEnabled( state );
- mActionDeleteGroup->setEnabled( state );
- mActionEditGroup->setEnabled( state );
-}
-
-void MainWidget::addGroup()
-{
- bool ok;
- TQString name = KInputDialog::getText( i18n("Create Synchronization Group"),
- i18n("Name for new synchronization group."), TQString(), &ok, this );
- if ( ok ) {
- SyncProcessManager::self()->addGroup( name );
- enableActions();
-
- SyncProcess *process = SyncProcessManager::self()->byGroupName( name );
- if ( process )
- editGroup( process );
- }
-}
-
-void MainWidget::deleteGroup()
-{
- SyncProcess *syncProcess = mGroupView->selectedSyncProcess();
- if ( syncProcess ) {
- int result = KMessageBox::warningContinueCancel( this,
- i18n("Delete synchronization group '%1'?").arg( syncProcess->group().name() ) );
- if ( result == KMessageBox::Continue ) {
- SyncProcessManager::self()->remove( syncProcess );
- enableActions();
- }
- }
-}
-
-void MainWidget::editGroup()
-{
- editGroup( mGroupView->selectedSyncProcess() );
-}
-
-void MainWidget::editGroup( SyncProcess *syncProcess )
-{
- if ( syncProcess ) {
- GroupConfigDialog dlg( this, syncProcess );
- dlg.exec();
-
- enableActions();
- }
-}
-
-void MainWidget::sync()
-{
- sync( mGroupView->selectedSyncProcess() );
-}
-
-void MainWidget::sync( SyncProcess *syncProcess )
-{
- if ( syncProcess ) {
- syncProcess->reinitEngine();
- QSync::Result result = syncProcess->engine()->synchronize();
- if ( result ) {
- tqDebug( "%s", result.message().latin1() );
- } else {
- tqDebug( "synchronization worked" );
- }
- }
-}
-
-void MainWidget::abortSync( SyncProcess *syncProcess )
-{
- if ( syncProcess )
- syncProcess->engine()->abort();
-}
-
-#include "mainwidget.moc"
diff --git a/kitchensync/src/mainwidget.h b/kitchensync/src/mainwidget.h
deleted file mode 100644
index 87939450..00000000
--- a/kitchensync/src/mainwidget.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-#ifndef MAINWIDGET_H
-#define MAINWIDGET_H
-
-#include <libqopensync/engine.h>
-#include <kdemacros.h>
-
-#include <tqwidget.h>
-
-class TDEAboutData;
-class TDEAction;
-class KXMLGUIClient;
-class GroupView;
-class SyncProcess;
-class SyncProcessManager;
-
-namespace QSync {
-class Environment;
-}
-
-class KDE_EXPORT MainWidget : public TQWidget
-{
- Q_OBJECT
-
- public:
- MainWidget( KXMLGUIClient *guiClient, TQWidget *widget = 0, const char *name = 0 );
- ~MainWidget();
-
- virtual KXMLGUIClient *guiClient() const;
- static TDEAboutData *aboutData();
-
- public slots:
- void addGroup();
- void deleteGroup();
- void editGroup();
- void editGroup( SyncProcess *syncProcess );
-
- void sync();
- void sync( SyncProcess *syncProcess );
- void abortSync( SyncProcess *syncProcess );
-
- private:
- void initGUI();
- void initActions();
- void enableActions();
-
- KXMLGUIClient *mGUIClient;
- TDEAction *mActionSynchronize;
- TDEAction *mActionAddGroup;
- TDEAction *mActionDeleteGroup;
- TDEAction *mActionEditGroup;
-
- GroupView *mGroupView;
-};
-
-#endif
diff --git a/kitchensync/src/mainwindow.cpp b/kitchensync/src/mainwindow.cpp
deleted file mode 100644
index a267956d..00000000
--- a/kitchensync/src/mainwindow.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#include <tdeaction.h>
-#include <tdelocale.h>
-#include <kstdaction.h>
-#include <tdetoolbar.h>
-
-#include "mainwidget.h"
-
-#include "mainwindow.h"
-
-MainWindow::MainWindow()
- : TDEMainWindow( 0 )
-{
- setWFlags( getWFlags() | WGroupLeader );
-
- setCaption( i18n( "PIM Synchronization" ) );
-
- mWidget = new MainWidget( this, this, "MainWidget" );
-
- setCentralWidget( mWidget );
-
- initActions();
-
- createGUI( "kitchensyncui.rc", false );
- createGUI( 0 );
-
- toolBar()->setIconText( TDEToolBar::IconTextBottom );
-
- resize( 760, 530 ); // initial size
- setAutoSaveSettings();
-}
-
-MainWindow::~MainWindow()
-{
-}
-
-void MainWindow::initActions()
-{
- KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
-}
-
-#include "mainwindow.moc"
diff --git a/kitchensync/src/mainwindow.h b/kitchensync/src/mainwindow.h
deleted file mode 100644
index d3a0bb6e..00000000
--- a/kitchensync/src/mainwindow.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
-
-#include <tdemainwindow.h>
-
-class MainWidget;
-
-/**
- This class serves as the main window for Kitchensync. It handles the
- menus, toolbars, and status bars.
- */
-class MainWindow : public TDEMainWindow
-{
- Q_OBJECT
-
-
- public:
- MainWindow();
- virtual ~MainWindow();
-
- private:
- void initActions();
-
- MainWidget *mWidget;
-};
-
-#endif
diff --git a/kitchensync/src/memberconfig.cpp b/kitchensync/src/memberconfig.cpp
deleted file mode 100644
index 93e5f1ff..00000000
--- a/kitchensync/src/memberconfig.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#include "memberconfig.h"
-
-#include "configgui.h"
-#include "memberinfo.h"
-
-#include <tdelocale.h>
-#include <tdemessagebox.h>
-
-#include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqtabwidget.h>
-
-MemberConfig::MemberConfig( TQWidget *parent, const QSync::Member &member )
- : TQWidget( parent ), mMember( member )
-{
- TQBoxLayout *topLayout = new TQVBoxLayout( this );
-
- mGui = ConfigGui::Factory::create( member, this );
- topLayout->addWidget( mGui );
-}
-
-MemberConfig::~MemberConfig()
-{
-}
-
-void MemberConfig::loadData()
-{
- TQByteArray cfg;
- QSync::Result error = mMember.configuration( cfg );
-
- if ( error ) {
- KMessageBox::error( this,
- i18n("Unable to read config from plugin '%1':\n%2")
- .arg( mMember.pluginName() ).arg( error.message() ) );
- } else {
- TQString txt = TQString::fromUtf8( cfg.data(), cfg.size() );
- mGui->load( txt );
- MemberInfo mi( mMember );
- mGui->setInstanceName( mi.name() );
- }
-}
-
-void MemberConfig::saveData()
-{
- TQString txt = mGui->save();
-
- if ( txt.isEmpty() ) {
- KMessageBox::sorry( this, i18n("Configuration of %1 is empty.").arg( mMember.pluginName() ) );
- } else {
- TQByteArray cfg = txt.utf8();
- cfg.truncate(cfg.size() - 1); /* discard NUL terminator */
- mMember.setConfiguration( cfg );
- mMember.setName( mGui->instanceName() );
- // TODO: Check for save() error.
- mMember.save();
- }
-}
-
-#include "memberconfig.moc"
diff --git a/kitchensync/src/memberconfig.h b/kitchensync/src/memberconfig.h
deleted file mode 100644
index b79fc644..00000000
--- a/kitchensync/src/memberconfig.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-#ifndef MEMBERCONFIG_H
-#define MEMBERCONFIG_H
-
-#include <libqopensync/member.h>
-
-#include <tqwidget.h>
-
-class TQTextEdit;
-class ConfigGui;
-
-class MemberConfig : public TQWidget
-{
- Q_OBJECT
-
-
- public:
- MemberConfig( TQWidget *parent, const QSync::Member & );
- ~MemberConfig();
-
- void loadData();
- void saveData();
-
- private:
- QSync::Member mMember;
-
- ConfigGui *mGui;
-};
-
-#endif
diff --git a/kitchensync/src/memberinfo.cpp b/kitchensync/src/memberinfo.cpp
deleted file mode 100644
index fb52c7a7..00000000
--- a/kitchensync/src/memberinfo.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#include "memberinfo.h"
-
-#include <tdeglobal.h>
-#include <kiconloader.h>
-#include <tdelocale.h>
-
-MemberInfo::MemberInfo( const QSync::Member &member )
- : mMember( member )
-{
-}
-
-TQPixmap MemberInfo::smallIcon() const
-{
- return TDEGlobal::iconLoader()->loadIcon( iconName(), TDEIcon::Small );
-}
-
-TQPixmap MemberInfo::desktopIcon() const
-{
- return TDEGlobal::iconLoader()->loadIcon( iconName(), TDEIcon::Desktop );
-}
-
-TQString MemberInfo::iconName() const
-{
- return pluginIconName( mMember.pluginName() );
-}
-
-TQString MemberInfo::name() const
-{
- static TQMap<TQString, TQString> nameMap;
- if ( nameMap.isEmpty() ) {
- nameMap.insert( "file-sync", i18n( "File" ) );
- nameMap.insert( "palm-sync", i18n( "Palm" ) );
- nameMap.insert( "tdepim-sync", i18n( "TDE PIM" ) );
- nameMap.insert( "tdeio-sync", i18n( "Remote File" ) );
- nameMap.insert( "irmc-sync", i18n( "Mobile Phone" ) );
- nameMap.insert( "evo2-sync", i18n( "Evolution" ) );
- nameMap.insert( "opie-sync", i18n( "Handheld" ) );
- nameMap.insert( "ldap-sync", i18n( "LDAP" ) );
- nameMap.insert( "syncml-obex-client", i18n( "Mobile Phone" ) );
- nameMap.insert( "syncml-http-server", i18n( "Mobile Phone" ) );
- nameMap.insert( "moto-sync", i18n( "Mobile Phone" ) );
- nameMap.insert( "gnokii-sync", i18n( "Mobile Phone" ) );
- nameMap.insert( "google-calendar", i18n( "Google Calendar" ) );
- nameMap.insert( "gpe-sync", i18n( "Handheld" ) );
- nameMap.insert( "sunbird-sync", i18n( "Sunbird Calendar" ) );
- nameMap.insert( "jescs-sync", i18n( "Java Enterprise System Calendar" ) );
- nameMap.insert( "synce-plugin", i18n( "WinCE Devices" ) );
- }
-
- if ( mMember.name().isEmpty() )
- return nameMap[ mMember.pluginName() ] + " (" + TQString::number( mMember.id() ) + ") ";
- else
- return mMember.name();
-}
-
-TQString MemberInfo::pluginIconName( const TQString &pluginName )
-{
- if ( pluginName == "file-sync" ) return "folder";
- if ( pluginName == "palm-sync" ) return "pda_black";
- if ( pluginName == "tdepim-sync" ) return "kontact";
- if ( pluginName == "tdeio-sync" ) return "network";
- if ( pluginName == "irmc-sync" ) return "mobile_phone";
- if ( pluginName == "evo2-sync" ) return "evolution";
- if ( pluginName == "opie-sync" ) return "pda_blue";
- if ( pluginName == "synce-plugin" ) return "pda_blue";
- if ( pluginName == "ldap-sync" ) return "contents2";
- if ( pluginName == "syncml-obex-client" ) return "mobile_phone";
- if ( pluginName == "syncml-http-server" ) return "pda_blue";
- if ( pluginName == "moto-sync" ) return "mobile_phone";
- if ( pluginName == "gnokii-sync" ) return "mobile_phone";
- if ( pluginName == "google-calendar" ) return "www";
- if ( pluginName == "gpe-sync" ) return "pda_blue";
- if ( pluginName == "sunbird-sync" ) return "www";
- if ( pluginName == "jescs-sync" ) return "www";
-
-
- return TQString();
-}
diff --git a/kitchensync/src/memberinfo.h b/kitchensync/src/memberinfo.h
deleted file mode 100644
index 8f0d7f4f..00000000
--- a/kitchensync/src/memberinfo.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-#ifndef MEMBERINFO_H
-#define MEMBERINFO_H
-
-#include <libqopensync/member.h>
-
-#include <tqstring.h>
-#include <tqpixmap.h>
-
-class MemberInfo
-{
- public:
- MemberInfo( const QSync::Member &member );
-
- TQPixmap smallIcon() const;
- TQPixmap desktopIcon() const;
-
- TQString iconName() const;
-
- TQString name() const;
-
- static TQString pluginIconName( const TQString &pluginName );
-
- private:
- QSync::Member mMember;
-};
-
-#endif
diff --git a/kitchensync/src/multiconflictdialog.cpp b/kitchensync/src/multiconflictdialog.cpp
deleted file mode 100644
index 608d33a8..00000000
--- a/kitchensync/src/multiconflictdialog.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#include <kdialog.h>
-#include <tdelocale.h>
-#include <kwidgetlist.h>
-
-#include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqpushbutton.h>
-
-#include "memberinfo.h"
-
-#include "multiconflictdialog.h"
-
-class ChangeItem : public KWidgetListItem
-{
- public:
- ChangeItem( KWidgetList *parent, const QSync::SyncChange &change )
- : KWidgetListItem( parent ),
- mChange( change )
- {
- TQGridLayout *layout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() );
-
- MemberInfo mi( change.member() );
- layout->addWidget( new TQLabel( mi.name(), this ), 0, 0 );
-
- TQString type;
- switch ( change.changeType() ) {
- case QSync::SyncChange::UnknownChange:
- type = i18n( "Unknown" );
- break;
- case QSync::SyncChange::AddedChange:
- type = i18n( "Added" );
- break;
- case QSync::SyncChange::DeletedChange:
- type = i18n( "Deleted" );
- break;
- case QSync::SyncChange::ModifiedChange:
- type = i18n( "Modified" );
- break;
- case QSync::SyncChange::UnmodifiedChange:
- default:
- type = i18n( "Unmodified" );
- break;
- }
-
- layout->addWidget( new TQLabel( type, this ), 1, 0 );
- }
-
- QSync::SyncChange change() const { return mChange; }
-
- private:
- QSync::SyncChange mChange;
-};
-
-MultiConflictDialog::MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent )
- : ConflictDialog( mapping, parent )
-{
- initGUI();
-
- for ( int i = 0; i < mMapping.changesCount(); ++i ) {
- QSync::SyncChange change = mMapping.changeAt( i );
- if ( change.isValid() ) {
- ChangeItem *item = new ChangeItem( mWidgetList, change );
- mWidgetList->appendItem( item );
- }
- }
-
- mWidgetList->setFocus();
-}
-
-MultiConflictDialog::~MultiConflictDialog()
-{
-}
-
-void MultiConflictDialog::useSelectedChange()
-{
- ChangeItem *item = static_cast<ChangeItem*>( mWidgetList->selectedItem() );
- if ( !item )
- return;
-
- mMapping.solve( item->change() );
-
- accept();
-}
-
-void MultiConflictDialog::duplicateChange()
-{
- mMapping.duplicate();
-
- accept();
-}
-
-void MultiConflictDialog::ignoreChange()
-{
- mMapping.ignore();
-
- accept();
-}
-
-void MultiConflictDialog::initGUI()
-{
- TQGridLayout *layout = new TQGridLayout( this, 3, 3, KDialog::marginHint(), KDialog::spacingHint() );
-
- layout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 2 );
-
- mWidgetList = new KWidgetList( this );
- layout->addMultiCellWidget( mWidgetList, 1, 1, 0, 2 );
-
- TQPushButton *button = new TQPushButton( i18n( "Use Selected Item" ), this );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useSelectedChange() ) );
- layout->addWidget( button, 2, 0 );
-
- button = new TQPushButton( i18n( "Duplicate Items" ), this );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( duplicateChange() ) );
- layout->addWidget( button, 2, 1 );
-
- button = new TQPushButton( i18n( "Ignore Conflict" ), this );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( ignoreChange() ) );
- layout->addWidget( button, 2, 2 );
-}
-
-#include "multiconflictdialog.moc"
diff --git a/kitchensync/src/multiconflictdialog.h b/kitchensync/src/multiconflictdialog.h
deleted file mode 100644
index 64455311..00000000
--- a/kitchensync/src/multiconflictdialog.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#ifndef MULTICONFLICTDIALOG_H
-#define MULTICONFLICTDIALOG_H
-
-#include "conflictdialog.h"
-
-class KWidgetList;
-
-class MultiConflictDialog : public ConflictDialog
-{
- Q_OBJECT
-
-
- public:
- MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent );
- ~MultiConflictDialog();
-
- private slots:
- void useSelectedChange();
- void duplicateChange();
- void ignoreChange();
-
- private:
- void initGUI();
-
- KWidgetList *mWidgetList;
-};
-
-#endif
diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp
deleted file mode 100644
index c52b28ae..00000000
--- a/kitchensync/src/part.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#include <tqlayout.h>
-#include <tqvbox.h>
-
-#include <tdeaction.h>
-#include <tdeapplication.h>
-#include <kdebug.h>
-#include <kiconloader.h>
-#include <kinstance.h>
-#include <tdelocale.h>
-#include <tdeparts/genericfactory.h>
-
-#include "mainwidget.h"
-
-#include "part.h"
-
-typedef KParts::GenericFactory< KitchenSyncPart > KitchenSyncFactory;
-K_EXPORT_COMPONENT_FACTORY( libkitchensyncpart, KitchenSyncFactory )
-
-KitchenSyncPart::KitchenSyncPart( TQWidget *parentWidget, const char *widgetName,
- TQObject *parent, const char *name,
- const TQStringList& )
- : KParts::ReadOnlyPart( parent, name )
-{
- setInstance( KitchenSyncFactory::instance() );
-
- TQVBox *canvas = new TQVBox( parentWidget, widgetName );
- setWidget( canvas );
-
- new MainWidget( this, canvas );
-
- TDEGlobal::iconLoader()->addAppDir( "kitchensync" );
-
- setXMLFile( "kitchensync_part.rc" );
-}
-
-KitchenSyncPart::~KitchenSyncPart()
-{
- closeURL();
-}
-
-TDEAboutData *KitchenSyncPart::createAboutData()
-{
- return MainWidget::aboutData();
-}
-
-void KitchenSyncPart::exit()
-{
- delete this;
-}
-
-bool KitchenSyncPart::openURL( const KURL &url )
-{
- emit setWindowCaption( url.prettyURL() );
-
- return true;
-}
-
-bool KitchenSyncPart::openFile()
-{
- return true;
-}
-
-void KitchenSyncPart::guiActivateEvent( KParts::GUIActivateEvent *e )
-{
- KParts::ReadOnlyPart::guiActivateEvent( e );
-}
-
-#include "part.moc"
-
diff --git a/kitchensync/src/part.h b/kitchensync/src/part.h
deleted file mode 100644
index b799cea5..00000000
--- a/kitchensync/src/part.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#ifndef PART_H
-#define PART_H
-
-#include <tdeparts/event.h>
-#include <tdeparts/factory.h>
-#include <tdeparts/part.h>
-
-class TDEAboutData;
-
-class KitchenSyncPart: public KParts::ReadOnlyPart
-{
- Q_OBJECT
-
-
- public:
- KitchenSyncPart( TQWidget *parentWidget, const char *widgetName,
- TQObject *parent, const char *name, const TQStringList& );
- virtual ~KitchenSyncPart();
-
- static TDEAboutData *createAboutData();
-
- virtual void exit();
- virtual bool openURL( const KURL &url );
-
- protected:
- virtual bool openFile();
- virtual void guiActivateEvent( KParts::GUIActivateEvent* );
-};
-
-#endif
diff --git a/kitchensync/src/pics/CMakeLists.txt b/kitchensync/src/pics/CMakeLists.txt
deleted file mode 100644
index aeb0522e..00000000
--- a/kitchensync/src/pics/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-#################################################
-#
-# (C) 2010-2011 Serghei Amelian
-# serghei (DOT) amelian (AT) gmail.com
-#
-# Improvements and feedback are welcome
-#
-# This file is released under GPL >= 2
-#
-#################################################
-
-tde_install_icons( kitchensync )
-tde_install_icons( hotsync mobile_phone DESTINATION ${DATA_INSTALL_DIR}/kitchensync/icons )
diff --git a/kitchensync/src/pics/Makefile.am b/kitchensync/src/pics/Makefile.am
deleted file mode 100644
index ddb7cc45..00000000
--- a/kitchensync/src/pics/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-kitchensyncicondir = $(kde_datadir)/kitchensync/icons
-kitchensyncicon_ICON = hotsync mobile_phone
-
-KDE_ICON = kitchensync
diff --git a/kitchensync/src/pics/cr128-app-mobile_phone.png b/kitchensync/src/pics/cr128-app-mobile_phone.png
deleted file mode 100644
index bfdefe7a..00000000
--- a/kitchensync/src/pics/cr128-app-mobile_phone.png
+++ /dev/null
Binary files differ
diff --git a/kitchensync/src/pics/cr16-action-hotsync.png b/kitchensync/src/pics/cr16-action-hotsync.png
deleted file mode 100644
index 1f779008..00000000
--- a/kitchensync/src/pics/cr16-action-hotsync.png
+++ /dev/null
Binary files differ
diff --git a/kitchensync/src/pics/cr16-app-mobile_phone.png b/kitchensync/src/pics/cr16-app-mobile_phone.png
deleted file mode 100644
index d4dac16b..00000000
--- a/kitchensync/src/pics/cr16-app-mobile_phone.png
+++ /dev/null
Binary files differ
diff --git a/kitchensync/src/pics/cr22-action-hotsync.png b/kitchensync/src/pics/cr22-action-hotsync.png
deleted file mode 100644
index 4f2faf57..00000000
--- a/kitchensync/src/pics/cr22-action-hotsync.png
+++ /dev/null
Binary files differ
diff --git a/kitchensync/src/pics/cr32-action-hotsync.png b/kitchensync/src/pics/cr32-action-hotsync.png
deleted file mode 100644
index 88603e5d..00000000
--- a/kitchensync/src/pics/cr32-action-hotsync.png
+++ /dev/null
Binary files differ
diff --git a/kitchensync/src/pics/cr32-app-mobile_phone.png b/kitchensync/src/pics/cr32-app-mobile_phone.png
deleted file mode 100644
index f4497358..00000000
--- a/kitchensync/src/pics/cr32-app-mobile_phone.png
+++ /dev/null
Binary files differ
diff --git a/kitchensync/src/pics/cr48-action-hotsync.png b/kitchensync/src/pics/cr48-action-hotsync.png
deleted file mode 100644
index d2cbff52..00000000
--- a/kitchensync/src/pics/cr48-action-hotsync.png
+++ /dev/null
Binary files differ
diff --git a/kitchensync/src/pics/cr48-app-mobile_phone.png b/kitchensync/src/pics/cr48-app-mobile_phone.png
deleted file mode 100644
index 6d38be09..00000000
--- a/kitchensync/src/pics/cr48-app-mobile_phone.png
+++ /dev/null
Binary files differ
diff --git a/kitchensync/src/pics/cr64-app-mobile_phone.png b/kitchensync/src/pics/cr64-app-mobile_phone.png
deleted file mode 100644
index 41e852a6..00000000
--- a/kitchensync/src/pics/cr64-app-mobile_phone.png
+++ /dev/null
Binary files differ
diff --git a/kitchensync/src/pics/hi16-app-kitchensync.png b/kitchensync/src/pics/hi16-app-kitchensync.png
deleted file mode 100644
index 1f779008..00000000
--- a/kitchensync/src/pics/hi16-app-kitchensync.png
+++ /dev/null
Binary files differ
diff --git a/kitchensync/src/pics/hi22-app-kitchensync.png b/kitchensync/src/pics/hi22-app-kitchensync.png
deleted file mode 100644
index 4f2faf57..00000000
--- a/kitchensync/src/pics/hi22-app-kitchensync.png
+++ /dev/null
Binary files differ
diff --git a/kitchensync/src/pics/hi32-app-kitchensync.png b/kitchensync/src/pics/hi32-app-kitchensync.png
deleted file mode 100644
index 88603e5d..00000000
--- a/kitchensync/src/pics/hi32-app-kitchensync.png
+++ /dev/null
Binary files differ
diff --git a/kitchensync/src/pics/hi48-app-kitchensync.png b/kitchensync/src/pics/hi48-app-kitchensync.png
deleted file mode 100644
index d2cbff52..00000000
--- a/kitchensync/src/pics/hi48-app-kitchensync.png
+++ /dev/null
Binary files differ
diff --git a/kitchensync/src/pluginpicker.cpp b/kitchensync/src/pluginpicker.cpp
deleted file mode 100644
index 0b869248..00000000
--- a/kitchensync/src/pluginpicker.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#include "pluginpicker.h"
-
-#include "memberinfo.h"
-#include "syncprocessmanager.h"
-
-#include <libqopensync/environment.h>
-
-#include <kdialog.h>
-#include <tdeglobal.h>
-#include <kiconloader.h>
-#include <tdelocale.h>
-
-#include <tqlabel.h>
-#include <tqlayout.h>
-
-PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin )
- : KWidgetListItem( list ), mPlugin( plugin )
-{
- TQString iconName = MemberInfo::pluginIconName( mPlugin.name() );
- TQGridLayout *layout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
-
- TQLabel *icon = new TQLabel( this );
- icon->setPixmap( TDEGlobal::iconLoader()->loadIcon( iconName, TDEIcon::Desktop ) );
- icon->setFixedSize( icon->sizeHint() );
-
- TQLabel *name = new TQLabel( plugin.longName(), this );
- TQLabel *description = new TQLabel( plugin.description(), this );
-
- TQFont font = name->font();
- font.setBold( true );
- name->setFont( font );
-
- layout->addWidget( icon, 0, 0 );
- layout->addWidget( name, 0, 1 );
- layout->addWidget( description, 1, 1 );
-}
-
-
-PluginPicker::PluginPicker( TQWidget *parent )
- : TQWidget( parent )
-{
- TQBoxLayout *layout = new TQVBoxLayout( this );
-
- mPluginList = new KWidgetList( this );
- layout->addWidget( mPluginList );
-
- connect( mPluginList, TQT_SIGNAL( doubleClicked( KWidgetListItem* ) ),
- TQT_SIGNAL( selected() ) );
-
- updatePluginList();
-
- mPluginList->setFocus();
-}
-
-void PluginPicker::updatePluginList()
-{
- mPluginList->clear();
-
- QSync::Environment *env = SyncProcessManager::self()->environment();
-
- QSync::Environment::PluginIterator it( env->pluginBegin() );
- for( ; it != env->pluginEnd(); ++it ) {
- QSync::Plugin plugin = *it;
- mPluginList->appendItem( new PluginItem( mPluginList, plugin ) );
- }
-}
-
-QSync::Plugin PluginPicker::selectedPlugin() const
-{
- PluginItem *item = static_cast<PluginItem *>( mPluginList->selectedItem() );
- if ( item ) return item->plugin();
- else return QSync::Plugin();
-}
-
-
-PluginPickerDialog::PluginPickerDialog( TQWidget *parent )
- : KDialogBase( parent, 0, true, i18n("Select Member Type"), Ok | Cancel )
-{
- TQFrame *topFrame = makeMainWidget();
-
- TQBoxLayout *topLayout = new TQVBoxLayout( topFrame );
-
- mPicker = new PluginPicker( topFrame );
- topLayout->addWidget( mPicker );
-
- connect( mPicker, TQT_SIGNAL( selected() ), TQT_SLOT( slotOk() ) );
-
- setInitialSize( TQSize( 460, 380 ) );
-}
-
-QSync::Plugin PluginPickerDialog::selectedPlugin() const
-{
- return mPicker->selectedPlugin();
-}
-
-QSync::Plugin PluginPickerDialog::getPlugin( TQWidget *parent )
-{
- PluginPickerDialog dlg( parent );
- if ( dlg.exec() )
- return dlg.selectedPlugin();
- else
- return QSync::Plugin();
-}
-
-void PluginPickerDialog::slotOk()
-{
- accept();
-}
-
-void PluginPickerDialog::slotCancel()
-{
- reject();
-}
-
-#include "pluginpicker.moc"
diff --git a/kitchensync/src/pluginpicker.h b/kitchensync/src/pluginpicker.h
deleted file mode 100644
index 04e8d9fb..00000000
--- a/kitchensync/src/pluginpicker.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-#ifndef PLUGINPICKER_H
-#define PLUGINPICKER_H
-
-#include <libqopensync/plugin.h>
-
-#include <kdialogbase.h>
-#include <kwidgetlist.h>
-
-#include <tqwidget.h>
-
-class PluginItem : public KWidgetListItem
-{
- public:
- PluginItem( KWidgetList *, const QSync::Plugin & );
-
- QSync::Plugin plugin() const { return mPlugin; }
-
- private:
- QSync::Plugin mPlugin;
-};
-
-class PluginPicker : public TQWidget
-{
- Q_OBJECT
-
-
- public:
- PluginPicker( TQWidget *parent );
-
- QSync::Plugin selectedPlugin() const;
-
- signals:
- void selected();
-
- protected:
- void updatePluginList();
-
- private:
- KWidgetList *mPluginList;
-};
-
-class PluginPickerDialog : public KDialogBase
-{
- Q_OBJECT
-
-
- public:
- PluginPickerDialog( TQWidget *parent );
-
- QSync::Plugin selectedPlugin() const;
-
- static QSync::Plugin getPlugin( TQWidget *parent );
-
- protected slots:
- void slotOk();
- void slotCancel();
-
- private:
- PluginPicker *mPicker;
-};
-
-#endif
diff --git a/kitchensync/src/singleconflictdialog.cpp b/kitchensync/src/singleconflictdialog.cpp
deleted file mode 100644
index bac94835..00000000
--- a/kitchensync/src/singleconflictdialog.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#include <kdialog.h>
-#include <tdelocale.h>
-
-#include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqpushbutton.h>
-
-#include "addresseediffalgo.h"
-#include "genericdiffalgo.h"
-#include "htmldiffalgodisplay.h"
-#include "memberinfo.h"
-
-#include "singleconflictdialog.h"
-
-SingleConflictDialog::SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent )
- : ConflictDialog( mapping, parent ), mDiffAlgo( 0 )
-{
- initGUI();
-
- TQString format = mapping.changeAt( 0 ).objectFormatName();
- QSync::SyncChange leftChange = mapping.changeAt( 0 );
- QSync::SyncChange rightChange = mapping.changeAt( 1 );
-
- if ( format == "file" ) {
- mDiffAlgo = new KSync::GenericDiffAlgo( leftChange.data(), rightChange.data() );
- } else if ( format == "vcard" ) {
- } else if ( format == "calendar" ) {
- } else if ( format == "xml-contact" ) {
- mDiffAlgo = new KSync::AddresseeDiffAlgo( leftChange.data(), rightChange.data() );
- }
-
- MemberInfo miLeft( leftChange.member() );
- mDiffAlgoDisplay->setLeftSourceTitle( miLeft.name() );
- MemberInfo miRight( rightChange.member() );
- mDiffAlgoDisplay->setRightSourceTitle( miRight.name() );
-
- if ( mDiffAlgo ) {
- mDiffAlgo->addDisplay( mDiffAlgoDisplay );
- mDiffAlgo->run();
- }
-}
-
-SingleConflictDialog::~SingleConflictDialog()
-{
- delete mDiffAlgo;
- mDiffAlgo = 0;
-}
-
-void SingleConflictDialog::useFirstChange()
-{
- mMapping.solve( mMapping.changeAt( 0 ) );
-
- accept();
-}
-
-void SingleConflictDialog::useSecondChange()
-{
- mMapping.solve( mMapping.changeAt( 1 ) );
-
- accept();
-}
-
-void SingleConflictDialog::duplicateChange()
-{
- mMapping.duplicate();
-
- accept();
-}
-
-void SingleConflictDialog::ignoreChange()
-{
- mMapping.ignore();
-
- accept();
-}
-
-void SingleConflictDialog::initGUI()
-{
- TQGridLayout *layout = new TQGridLayout( this, 3, 4, KDialog::marginHint(), KDialog::spacingHint() );
-
- layout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 3 );
- mDiffAlgoDisplay = new KSync::HTMLDiffAlgoDisplay( this );
-
- layout->addMultiCellWidget( mDiffAlgoDisplay, 1, 1, 0, 3 );
-
- TQPushButton *button = new TQPushButton( i18n( "Use Item" ), this );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useFirstChange() ) );
- layout->addWidget( button, 2, 0 );
-
- button = new TQPushButton( i18n( "Duplicate Items" ), this );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( duplicateChange() ) );
- layout->addWidget( button, 2, 1 );
-
- button = new TQPushButton( i18n( "Ignore Conflict" ), this );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( ignoreChange() ) );
- layout->addWidget( button, 2, 2 );
-
- button = new TQPushButton( i18n( "Use Item" ), this );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useSecondChange() ) );
- layout->addWidget( button, 2, 3 );
-}
-
-#include "singleconflictdialog.moc"
diff --git a/kitchensync/src/singleconflictdialog.h b/kitchensync/src/singleconflictdialog.h
deleted file mode 100644
index 4422a3c2..00000000
--- a/kitchensync/src/singleconflictdialog.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#ifndef SINGLECONFLICTDIALOG_H
-#define SINGLECONFLICTDIALOG_H
-
-#include "conflictdialog.h"
-#include <libtdepim/diffalgo.h>
-
-using namespace KPIM;
-
-namespace KSync {
-class HTMLDiffAlgoDisplay;
-}
-
-class SingleConflictDialog : public ConflictDialog
-{
- Q_OBJECT
-
-
- public:
- SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent );
- ~SingleConflictDialog();
-
- private slots:
- void useFirstChange();
- void useSecondChange();
- void duplicateChange();
- void ignoreChange();
-
- private:
- void initGUI();
-
- DiffAlgo *mDiffAlgo;
- KSync::HTMLDiffAlgoDisplay *mDiffAlgoDisplay;
-};
-
-#endif
diff --git a/kitchensync/src/syncprocess.cpp b/kitchensync/src/syncprocess.cpp
deleted file mode 100644
index 4e9c46b6..00000000
--- a/kitchensync/src/syncprocess.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#include <libqopensync/engine.h>
-#include <libqopensync/environment.h>
-
-#include <kdebug.h>
-#include <tdelocale.h>
-
-#include "syncprocess.h"
-#include "syncprocessmanager.h"
-
-using namespace QSync;
-
-SyncProcess::SyncProcess( const QSync::Group &group )
- : TQObject( 0, "SyncProcess" )
-{
- mGroup = group;
- mEngine = new QSync::Engine( mGroup );
-
- Result result = mEngine->initialize();
- if ( result.isError() )
- kdDebug() << "SyncProcess::SyncProcess: " << result.message() << endl;
-}
-
-SyncProcess::~SyncProcess()
-{
- mEngine->finalize();
-
- delete mEngine;
- mEngine = 0;
-}
-
-TQString SyncProcess::groupStatus() const
-{
- return i18n( "Ready" );
-}
-
-TQString SyncProcess::memberStatus( const QSync::Member& ) const
-{
- return i18n( "Ready" );
-}
-
-QSync::Result SyncProcess::addMember( const QSync::Plugin &plugin )
-{
- QSync::Member member = mGroup.addMember();
- QSync::Result result = member.instance( plugin );
-
- if ( !result.isError() )
- mGroup.save();
-
- return result;
-}
-
-void SyncProcess::reinitEngine()
-{
- mEngine->finalize();
- delete mEngine;
- mEngine = new QSync::Engine( mGroup );
- Result result = mEngine->initialize();
- if ( result.isError() )
- kdDebug() << "SyncProcess::reinitEngine: " << result.message() << endl;
-
- applyObjectTypeFilter();
-
- emit engineChanged( mEngine );
-}
-
-void SyncProcess::applyObjectTypeFilter()
-{
- const QSync::Conversion conversion = SyncProcessManager::self()->environment()->conversion();
- const TQStringList objectTypes = conversion.objectTypes();
- const TQStringList activeObjectTypes = mGroup.config().activeObjectTypes();
-
- for ( uint i = 0; i < objectTypes.count(); ++i ) {
- if ( activeObjectTypes.contains( objectTypes[ i ] ) ) {
- kdDebug() << "Enabled object type: " << objectTypes[ i ] << endl;
- /*
- * This is not required. Also this lead to filtering problems when sync with "file-sync".
- * Uncomment this line again when OpenSync is fixed!
- *
- * mGroup.setObjectTypeEnabled( objectTypes[ i ], true );
- */
- } else {
- kdDebug() << "Disabled object type: " << objectTypes[ i ] << endl;
- mGroup.setObjectTypeEnabled( objectTypes[ i ], false );
- }
- }
-}
-
-#include "syncprocess.moc"
diff --git a/kitchensync/src/syncprocess.h b/kitchensync/src/syncprocess.h
deleted file mode 100644
index f510875c..00000000
--- a/kitchensync/src/syncprocess.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#ifndef SYNCPROCESS_H
-#define SYNCPROCESS_H
-
-#include <tqobject.h>
-
-#include <libqopensync/group.h>
-
-namespace QSync {
-class Engine;
-}
-
-class SyncProcess : public TQObject
-{
- Q_OBJECT
-
-
- public:
- SyncProcess( const QSync::Group &group );
- ~SyncProcess();
-
- QSync::Group group() const { return mGroup; }
- QSync::Engine* engine() const { return mEngine; }
-
- TQString groupStatus() const;
- TQString memberStatus( const QSync::Member &member ) const;
-
- QSync::Result addMember( const QSync::Plugin &plugin );
-
- void reinitEngine();
-
- /** apply object type filter hack **/
- void applyObjectTypeFilter();
-
- signals:
- /**
- This signal is emitted whenever the engine has changed ( reinitialized ).
- */
- void engineChanged( QSync::Engine *engine );
-
- private:
- QSync::Group mGroup;
- QSync::Engine *mEngine;
-};
-
-#endif
diff --git a/kitchensync/src/syncprocessmanager.cpp b/kitchensync/src/syncprocessmanager.cpp
deleted file mode 100644
index 0485e156..00000000
--- a/kitchensync/src/syncprocessmanager.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#include "syncprocessmanager.h"
-
-#include "syncprocess.h"
-
-#include <libqopensync/environment.h>
-
-#include <kstaticdeleter.h>
-#include <tdemessagebox.h>
-#include <tdelocale.h>
-
-static KStaticDeleter<SyncProcessManager> selfDeleter;
-
-SyncProcessManager *SyncProcessManager::mSelf = 0;
-
-SyncProcessManager *SyncProcessManager::self()
-{
- if ( !mSelf ) {
- selfDeleter.setObject( mSelf, new SyncProcessManager() );
- }
- return mSelf;
-}
-
-SyncProcessManager::SyncProcessManager()
-{
- mEnvironment = new QSync::Environment;
- QSync::Result result = mEnvironment->initialize();
- if ( result.isError() ) {
- KMessageBox::error( 0, i18n("Error initializing OpenSync.\n%1")
- .arg( result.message() ) );
- } else {
- init( mEnvironment );
- }
-}
-
-SyncProcessManager::~SyncProcessManager()
-{
- TQValueList<SyncProcess*>::Iterator it;
- for ( it = mProcesses.begin(); it != mProcesses.end(); ++it )
- delete *it;
-
- mProcesses.clear();
-
- mEnvironment->finalize();
- delete mEnvironment;
-}
-
-int SyncProcessManager::count() const
-{
- return mProcesses.count();
-}
-
-SyncProcess* SyncProcessManager::at( int pos ) const
-{
- if ( pos < 0 || pos >= (int)mProcesses.count() )
- return 0;
-
- return mProcesses[ pos ];
-}
-
-SyncProcess* SyncProcessManager::byGroup( const QSync::Group &group )
-{
- TQValueList<SyncProcess*>::Iterator it;
- for ( it = mProcesses.begin(); it != mProcesses.end(); ++it )
- if ( (*it)->group() == group )
- return *it;
-
- return 0;
-}
-
-SyncProcess* SyncProcessManager::byGroupName( const TQString &name )
-{
- TQValueList<SyncProcess*>::Iterator it;
- for ( it = mProcesses.begin(); it != mProcesses.end(); ++it )
- if ( (*it)->group().name() == name )
- return *it;
-
- return 0;
-}
-
-void SyncProcessManager::addGroup( const TQString &name )
-{
- SyncProcess* process = byGroupName( name );
- if ( !process ) {
- QSync::Group group = mEnvironment->addGroup();
- group.setName( name );
- group.save();
-
- mProcesses.append( new SyncProcess( group ) );
-
- emit changed();
- } else
- tqDebug( "Try to add duplicate" );
-}
-
-void SyncProcessManager::remove( SyncProcess *syncProcess )
-{
- if ( syncProcess ) {
- mProcesses.remove( syncProcess );
- const QSync::Group group = syncProcess->group();
- delete syncProcess;
-
- mEnvironment->removeGroup( group );
-
- emit changed();
- }
-}
-
-void SyncProcessManager::init( QSync::Environment *environment )
-{
- QSync::Environment::GroupIterator it( environment->groupBegin() );
- for ( ; it != environment->groupEnd(); ++it ) {
- /**
- * We check whether the group is valid before we append them
- * to mProcesses. That avoids crashes if the plugin of one of
- * the members isn't loaded (e.g. not installed).
- */
- const QSync::Group group = *it;
- int count = group.memberCount();
-
- bool isValid = true;
- for ( int i = 0; i < count; ++i ) {
- const QSync::Member member = group.memberAt( i );
-
- if ( !member.isValid() ) {
- isValid = false;
- break;
- }
- }
-
- if ( isValid )
- mProcesses.append( new SyncProcess( *it ) );
- }
-
- emit changed();
-}
-
-QSync::Result SyncProcessManager::addMember( SyncProcess *process,
- const QSync::Plugin &plugin )
-{
- Q_ASSERT( process );
-
- QSync::Result result = process->addMember( plugin );
- if ( !result.isError() ) {
- process->group().save();
- emit syncProcessChanged( process );
- }
-
- return result;
-}
-
-#include "syncprocessmanager.moc"
diff --git a/kitchensync/src/syncprocessmanager.h b/kitchensync/src/syncprocessmanager.h
deleted file mode 100644
index 17adf19d..00000000
--- a/kitchensync/src/syncprocessmanager.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-#ifndef SYNCPROCESSMANAGER_H
-#define SYNCPROCESSMANAGER_H
-
-#include <tqobject.h>
-
-#include <libqopensync/group.h>
-
-namespace QSync {
-class Environment;
-}
-
-class SyncProcess;
-
-class SyncProcessManager : public TQObject
-{
- Q_OBJECT
-
- public:
- static SyncProcessManager *self();
-
- /**
- Destroys the SyncProcessList.
- */
- ~SyncProcessManager();
-
- /**
- Return OpenSync Environment.
- */
- QSync::Environment *environment() const { return mEnvironment; }
-
- /**
- Returns the number of SyncProcesses.
- */
- int count() const;
-
- /**
- Returns the SyncProcess at position @param pos.
- */
- SyncProcess* at( int pos ) const;
-
- /**
- Returns the SyncProcess with the given @param group.
- */
- SyncProcess* byGroup( const QSync::Group &group );
-
- /**
- Returns the SyncProcess with the given group @param name.
- */
- SyncProcess* byGroupName( const TQString &name );
-
- /**
- Adds a group with given @param name.
- */
- void addGroup( const TQString &name );
-
- /**
- Removes the given @param sync process.
- */
- void remove( SyncProcess *syncProcess );
-
- /**
- Adds @param plugin instance as member to the group of @param process.
- */
- QSync::Result addMember( SyncProcess *process, const QSync::Plugin &plugin );
-
- signals:
- void changed();
- void syncProcessChanged( SyncProcess *process );
-
- private:
- SyncProcessManager();
-
- void init( QSync::Environment *environment );
-
- TQValueList<SyncProcess*> mProcesses;
- QSync::Environment *mEnvironment;
-
- static SyncProcessManager *mSelf;
-};
-
-#endif
diff --git a/kitchensync/src/xmldiffalgo.cpp b/kitchensync/src/xmldiffalgo.cpp
deleted file mode 100644
index b5f4890f..00000000
--- a/kitchensync/src/xmldiffalgo.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2006 Daniel Gollub <dgollub@suse.de>
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include "xmldiffalgo.h"
-
-#include <kdebug.h>
-
-using namespace KSync;
-
-#ifndef KDE_USE_FINAL
-// With --enable-final, we get the (identical) compareString from
-// addresseediffalgo.cpp
-//
-static bool compareString( const TQString &left, const TQString &right )
-{
- if ( left.isEmpty() && right.isEmpty() )
- return true;
- else
- return left == right;
-}
-#endif
-
-XmlDiffAlgo::XmlDiffAlgo( const TQString &leftXml, const TQString &rightXml )
-{
- kdDebug() << __func__ << " " << __LINE__ << endl;
-
- mLeftXml.setContent( leftXml );
- mRightXml.setContent( rightXml );
-
-}
-
-XmlDiffAlgo::XmlDiffAlgo( const TQDomDocument &leftXml, const TQDomDocument &rightXml )
- : mLeftXml( leftXml ), mRightXml( rightXml )
-{
- kdDebug() << __func__ << " " << __LINE__ << endl;
-}
-
-void XmlDiffAlgo::appendSingleNodes(TQDomElement &element, bool isLeft)
-{
- TQDomNode node;
-
- for ( node = element.firstChild(); !node.isNull(); node = node.nextSibling() ) {
- TQDomElement child = node.toElement();
-
- if (isLeft)
- additionalLeftField( node.nodeName(), child.text() );
- else
- additionalRightField( node.nodeName(), child.text() );
- }
-
-}
-
-void XmlDiffAlgo::appendConflictNodes(TQDomElement &leftElement, TQDomElement &rightElement)
-{
- TQDomNode left, right;
- TQDomElement leftChild, rightChild;
-
- for ( left = leftElement.firstChild(); !left.isNull(); left = left.nextSibling() ) {
- leftChild = left.toElement();
-
- for ( right = rightElement.firstChild(); !right.isNull(); right = right.nextSibling() ) {
- rightChild = right.toElement();
-
- if ( leftChild.tagName() != rightChild.tagName() )
- continue;
-
- if (leftChild.text().isEmpty() || rightChild.text().isEmpty())
- continue;
-
- TQString id = leftChild.tagName();
- if (id == "Content")
- id = left.parentNode().nodeName();
-
- conflictField( id, leftChild.text(), rightChild.text() );
-
- left.parentNode().removeChild( left );
- left = leftElement.firstChild();
-
- right.parentNode().removeChild( right );
- right = rightElement.firstChild();
-
- }
- }
-}
-
-void XmlDiffAlgo::compareNode(TQDomElement &leftElement, TQDomElement &rightElement)
-{
- TQDomNode left, right;
- TQDomElement leftChild, rightChild;
- TQDomNodeList nlist;
-top:;
-
- for ( left = leftElement.firstChild(); !left.isNull(); left = left.nextSibling() ) {
- leftChild = left.toElement();
-
- for ( right = rightElement.firstChild(); !right.isNull(); right = right.nextSibling() ) {
- rightChild = right.toElement();
-
- if (leftChild.tagName() != rightChild.tagName())
- continue;
-
- if ( left.childNodes().count() > 1 && right.childNodes().count() > 1 ) {
- compareNode( leftChild, rightChild );
-
- if ( !left.hasChildNodes() && !right.hasChildNodes() ) {
- left.parentNode().removeChild( left );
- right.parentNode().removeChild( right );
- goto top;
- }
-
- break;
- }
-
- if ( leftChild.text() == rightChild.text() ) {
- TQString id = leftChild.tagName();
-
- if ( id == "Content" )
- id = left.parentNode().nodeName();
-
- if ( id != "Type" )
- //matchingField( id, leftChild.text(), rightChild.text() );
-
- left.parentNode().removeChild( left );
- right.parentNode().removeChild( right );
- goto top;
- }
- }
- }
-
- appendConflictNodes(rightElement, leftElement);
-
- appendSingleNodes(rightElement, false);
- appendSingleNodes(leftElement, true);
-}
-
-void XmlDiffAlgo::run()
-{
- kdDebug() << __func__ << endl;
- begin();
-
- TQDomElement leftElement = mLeftXml.documentElement();
- TQDomElement rightElement = mRightXml.documentElement();
-
- compareNode( leftElement, rightElement );
-
- end();
-}
-
diff --git a/kitchensync/src/xmldiffalgo.h b/kitchensync/src/xmldiffalgo.h
deleted file mode 100644
index 8e3dcbfa..00000000
--- a/kitchensync/src/xmldiffalgo.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- This file is part of KitchenSync
-
- Copyright (c) 2006 Daniel Gollub <dgollub@suse.de>
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef KSYNC_XMLDIFFALGO_H
-#define KSYNC_XMLDIFFALGO_H
-
-#include <tqdom.h>
-
-#include <libtdepim/diffalgo.h>
-
-using namespace KPIM;
-
-namespace KSync {
-
-class XmlDiffAlgo : public DiffAlgo
-{
- public:
- XmlDiffAlgo( const TQString &leftXml, const TQString &rightXml );
- XmlDiffAlgo( const TQDomDocument &leftXml, const TQDomDocument &rightXml );
-
- void run();
-
- private:
- void appendConflictNodes(TQDomElement &leftElement, TQDomElement &rightElement);
- void appendSingleNodes(TQDomElement &element, bool isLeft);
-
-
- void compareNode(TQDomElement &leftElement, TQDomElement &rightElement);
-
- TQDomDocument mLeftXml;
- TQDomDocument mRightXml;
-};
-
-}
-
-#endif
diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox
index 3121e2d9..148f9e60 100644
--- a/kmail/Mainpage.dox
+++ b/kmail/Mainpage.dox
@@ -71,7 +71,7 @@ is not modal and the user may hit apply/ok anytime between calls to
function that want to use the identity reference. Store the UOID
instead if you need to keep track of the identity. You may also want
to connect to one of the KPIM::IdentityManager::changed() or ::deleted()
-Q_SIGNALS, if you want to do special processing in case the identity
+signals, if you want to do special processing in case the identity
changes.
Thus, in the ConfigureDialog, you will see non-const KPIM::Identity
@@ -109,8 +109,8 @@ instance of the filter manager is held by the kernel
The search pattern is a QPtrList of search rules (kmsearchpattern.h) and a
boolean operator that defines their relation (and/or).
-A search rule consists of a field-QString, a "function"-enum and a
-"contents" or "value" QString. The first gives the header (or
+A search rule consists of a field-TQString, a "function"-enum and a
+"contents" or "value" TQString. The first gives the header (or
pseudoheader) to match against, the second says how to match (equals,
consists, is less than,...) and the third holds the pattern to match
against.
@@ -155,7 +155,7 @@ the corresponding config manager instead. But that won't change the
basic principle.
Thus, there is an abstract base class ConfigurePage (defined in
-configuredialog_p.h), which derives from QWidget. It has four methods
+configuredialog_p.h), which derives from TQWidget. It has four methods
of which you have to reimplement at least the first two:
- void setup()
@@ -239,7 +239,7 @@ as follows :
---< actual folder types: KMFolderImap, KMFolderMbox... >--
At the base KMail's folder design starts with KMFolderNode which
-inherits QObject. KMFolderNode is the base class encapsulating
+inherits TQObject. KMFolderNode is the base class encapsulating
common folder properties such as the name and a boolean signifying whether
the folder is a folder holding mail directly or a KMFolderDir.
KMFolderNode's often do not have an on-disk representation, they are
@@ -277,13 +277,13 @@ accessed via KMKernel ( the "kmkernel" construct ). Those methods are :
FolderJob classes - These classes allow asynchronous operations on
KMFolder's. You create a Job on the heap, connect to one of its
-Q_SIGNALS and wait for the job to finish. Folders serve as FolderJob
+signals and wait for the job to finish. Folders serve as FolderJob
factories. For example, to retrieve the full message from a folder
you do :
FolderJob *job = folderParent->createJob( aMsg, tGetMessage );
-connect( job, SIGNAL(messageRetrieved(KMMessage*)),
- SLOT(msgWasRetrieved(KMMessage*)) );
+connect( job, TQ_SIGNAL(messageRetrieved(KMMessage*)),
+ TQ_SLOT(msgWasRetrieved(KMMessage*)) );
job->start();
@@ -410,7 +410,7 @@ uniq: 3 bits = max. 8 different types with same chunk size:
010 Offset32
011 SerNum/UOID
100 DateTime
- 101 Color (QRgb: (a,r,g,b))
+ 101 Color (TQRgb: (a,r,g,b))
110 reserved
111 Extend
@@ -821,7 +821,7 @@ During the design phase we identified a need for BodyPartFormatters to
request their being called on some form of events, e.g. a dcop
signal. Thus, the Memento interface also includes the IObserver and
ISubject interfaces. If a BodyPartFormatter needs to react to a signal
-(Qt or DCOP), it implements the Memento interface using a QObject,
+(Qt or DCOP), it implements the Memento interface using a TQObject,
connects the signal to a slot on the Memento and (as an ISubject)
notifies it's IObservers when the slot is called. If a Memento is
created, the reader window registers itself as an observer of the
@@ -850,16 +850,16 @@ public:
};
class DelayedHelloWorldBodyPartMemento
- : public QObject, public KMail::BodyPartMemento {
+ : public TQObject, public KMail::BodyPartMemento {
public:
DelayedHelloWorldBodyPartMemento()
- : QObject( 0, "DelayedHelloWorldBodyPartMemento" ),
+ : TQObject( 0, "DelayedHelloWorldBodyPartMemento" ),
KMail::BodyPartMemento()
{
- QTimer::singleShot( 10*1000, this, SLOT(slotTimeout()) );
+ QTimer::singleShot( 10*1000, this, TQ_SLOT(slotTimeout()) );
}
-private Q_SLOTS:
+private slots:
void slotTimeout() { notify(): }
private:
diff --git a/kmail/accountcombobox.cpp b/kmail/accountcombobox.cpp
index 97f95b11..3f200f66 100644
--- a/kmail/accountcombobox.cpp
+++ b/kmail/accountcombobox.cpp
@@ -37,10 +37,10 @@ using namespace KMail;
AccountComboBox::AccountComboBox( TQWidget* parent, const char* name )
: TQComboBox( parent, name )
{
- connect( kmkernel->acctMgr(), TQT_SIGNAL( accountAdded( KMAccount* ) ),
- this, TQT_SLOT( slotRefreshAccounts() ) );
- connect( kmkernel->acctMgr(), TQT_SIGNAL( accountRemoved( KMAccount* ) ),
- this, TQT_SLOT( slotRefreshAccounts() ) );
+ connect( kmkernel->acctMgr(), TQ_SIGNAL( accountAdded( KMAccount* ) ),
+ this, TQ_SLOT( slotRefreshAccounts() ) );
+ connect( kmkernel->acctMgr(), TQ_SIGNAL( accountRemoved( KMAccount* ) ),
+ this, TQ_SLOT( slotRefreshAccounts() ) );
slotRefreshAccounts();
}
diff --git a/kmail/accountcombobox.h b/kmail/accountcombobox.h
index 2fa27f39..b0d0df6d 100644
--- a/kmail/accountcombobox.h
+++ b/kmail/accountcombobox.h
@@ -41,7 +41,7 @@ namespace KMail {
*/
class AccountComboBox : public TQComboBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp
index 3c6265e7..c8ac7e29 100644
--- a/kmail/accountdialog.cpp
+++ b/kmail/accountdialog.cpp
@@ -353,11 +353,11 @@ void AccountDialog::makeLocalAccountPage()
TQPushButton *choose = new TQPushButton( i18n("Choo&se..."), page );
choose->setAutoDefault( false );
- connect( choose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLocationChooser()) );
+ connect( choose, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLocationChooser()) );
topLayout->addWidget( choose, 3, 2 );
TQButtonGroup *group = new TQButtonGroup(i18n("Locking Method"), page );
- group->setColumnLayout(0, Qt::Horizontal);
+ group->setColumnLayout(0, TQt::Horizontal);
group->layout()->setSpacing( 0 );
group->layout()->setMargin( 0 );
TQGridLayout *groupLayout = new TQGridLayout( group->layout() );
@@ -373,8 +373,8 @@ void AccountDialog::makeLocalAccountPage()
mLocal.procmailLockFileName->insertStringList(procmailrcParser.getLockFilesList());
mLocal.procmailLockFileName->setEnabled(false);
- TQObject::connect(mLocal.lockProcmail, TQT_SIGNAL(toggled(bool)),
- mLocal.procmailLockFileName, TQT_SLOT(setEnabled(bool)));
+ TQObject::connect(mLocal.lockProcmail, TQ_SIGNAL(toggled(bool)),
+ mLocal.procmailLockFileName, TQ_SLOT(setEnabled(bool)));
mLocal.lockMutt = new TQRadioButton(
i18n("&Mutt dotlock"), group);
@@ -404,19 +404,19 @@ void AccountDialog::makeLocalAccountPage()
TQWhatsThis::add( mLocal.resourceClearButton,
i18n( "Delete all allocations for the resource represented by this account." ) );
mLocal.resourceClearButton->setEnabled( false );
- connect( mLocal.resourceCheck, TQT_SIGNAL( toggled(bool) ),
- mLocal.resourceClearButton, TQT_SLOT( setEnabled(bool) ) );
- connect( mLocal.resourceClearButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotClearResourceAllocations() ) );
+ connect( mLocal.resourceCheck, TQ_SIGNAL( toggled(bool) ),
+ mLocal.resourceClearButton, TQ_SLOT( setEnabled(bool) ) );
+ connect( mLocal.resourceClearButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotClearResourceAllocations() ) );
mLocal.resourceClearPastButton =
new TQPushButton( i18n( "Clear Past" ), resourceHB );
mLocal.resourceClearPastButton->setEnabled( false );
- connect( mLocal.resourceCheck, TQT_SIGNAL( toggled(bool) ),
- mLocal.resourceClearPastButton, TQT_SLOT( setEnabled(bool) ) );
+ connect( mLocal.resourceCheck, TQ_SIGNAL( toggled(bool) ),
+ mLocal.resourceClearPastButton, TQ_SLOT( setEnabled(bool) ) );
TQWhatsThis::add( mLocal.resourceClearPastButton,
i18n( "Delete all outdated allocations for the resource represented by this account." ) );
- connect( mLocal.resourceClearPastButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotClearPastResourceAllocations() ) );
+ connect( mLocal.resourceClearPastButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotClearPastResourceAllocations() ) );
topLayout->addMultiCellWidget( resourceHB, 5, 5, 0, 2 );
#endif
@@ -428,8 +428,8 @@ void AccountDialog::makeLocalAccountPage()
mLocal.intervalCheck =
new TQCheckBox( i18n("Enable &interval mail checking"), page );
topLayout->addMultiCellWidget( mLocal.intervalCheck, 6, 6, 0, 2 );
- connect( mLocal.intervalCheck, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(slotEnableLocalInterval(bool)) );
+ connect( mLocal.intervalCheck, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(slotEnableLocalInterval(bool)) );
mLocal.intervalLabel = new TQLabel( i18n("Check inter&val:"), page );
topLayout->addWidget( mLocal.intervalLabel, 7, 0 );
mLocal.intervalSpin = new KIntNumInput( page );
@@ -457,7 +457,7 @@ void AccountDialog::makeLocalAccountPage()
mLocal.identityLabel->setBuddy( mLocal.identityCombo );
topLayout->addWidget( mLocal.identityCombo, 10, 1 );
- connect(kapp,TQT_SIGNAL(tdedisplayFontChanged()),TQT_SLOT(slotFontChanged()));
+ connect(kapp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged()));
}
void AccountDialog::makeMaildirAccountPage()
@@ -492,7 +492,7 @@ void AccountDialog::makeMaildirAccountPage()
TQPushButton *choose = new TQPushButton( i18n("Choo&se..."), page );
choose->setAutoDefault( false );
- connect( choose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMaildirChooser()) );
+ connect( choose, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMaildirChooser()) );
topLayout->addWidget( choose, 3, 2 );
#if 0
@@ -503,21 +503,21 @@ void AccountDialog::makeMaildirAccountPage()
mMaildir.resourceClearButton =
new TQPushButton( i18n( "Clear" ), resourceHB );
mMaildir.resourceClearButton->setEnabled( false );
- connect( mMaildir.resourceCheck, TQT_SIGNAL( toggled(bool) ),
- mMaildir.resourceClearButton, TQT_SLOT( setEnabled(bool) ) );
+ connect( mMaildir.resourceCheck, TQ_SIGNAL( toggled(bool) ),
+ mMaildir.resourceClearButton, TQ_SLOT( setEnabled(bool) ) );
TQWhatsThis::add( mMaildir.resourceClearButton,
i18n( "Delete all allocations for the resource represented by this account." ) );
- connect( mMaildir.resourceClearButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotClearResourceAllocations() ) );
+ connect( mMaildir.resourceClearButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotClearResourceAllocations() ) );
mMaildir.resourceClearPastButton =
new TQPushButton( i18n( "Clear Past" ), resourceHB );
mMaildir.resourceClearPastButton->setEnabled( false );
- connect( mMaildir.resourceCheck, TQT_SIGNAL( toggled(bool) ),
- mMaildir.resourceClearPastButton, TQT_SLOT( setEnabled(bool) ) );
+ connect( mMaildir.resourceCheck, TQ_SIGNAL( toggled(bool) ),
+ mMaildir.resourceClearPastButton, TQ_SLOT( setEnabled(bool) ) );
TQWhatsThis::add( mMaildir.resourceClearPastButton,
i18n( "Delete all outdated allocations for the resource represented by this account." ) );
- connect( mMaildir.resourceClearPastButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotClearPastResourceAllocations() ) );
+ connect( mMaildir.resourceClearPastButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotClearPastResourceAllocations() ) );
topLayout->addMultiCellWidget( resourceHB, 4, 4, 0, 2 );
#endif
@@ -528,8 +528,8 @@ void AccountDialog::makeMaildirAccountPage()
mMaildir.intervalCheck =
new TQCheckBox( i18n("Enable &interval mail checking"), page );
topLayout->addMultiCellWidget( mMaildir.intervalCheck, 5, 5, 0, 2 );
- connect( mMaildir.intervalCheck, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(slotEnableMaildirInterval(bool)) );
+ connect( mMaildir.intervalCheck, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(slotEnableMaildirInterval(bool)) );
mMaildir.intervalLabel = new TQLabel( i18n("Check inter&val:"), page );
topLayout->addWidget( mMaildir.intervalLabel, 6, 0 );
mMaildir.intervalSpin = new KIntNumInput( page );
@@ -557,7 +557,7 @@ void AccountDialog::makeMaildirAccountPage()
mMaildir.identityLabel->setBuddy( mMaildir.identityCombo );
topLayout->addWidget( mMaildir.identityCombo, 9, 1 );
- connect(kapp,TQT_SIGNAL(tdedisplayFontChanged()),TQT_SLOT(slotFontChanged()));
+ connect(kapp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged()));
}
@@ -618,7 +618,7 @@ void AccountDialog::makePopAccountPage()
label = new TQLabel( i18n("&Port:"), page1 );
grid->addWidget( label, 4, 0 );
mPop.portEdit = new KLineEdit( page1 );
- mPop.portEdit->setValidator( new TQIntValidator(TQT_TQOBJECT(this)) );
+ mPop.portEdit->setValidator( new TQIntValidator(this) );
label->setBuddy( mPop.portEdit );
grid->addWidget( mPop.portEdit, 4, 1 );
@@ -638,19 +638,19 @@ void AccountDialog::makePopAccountPage()
mPop.leaveOnServerCheck =
new TQCheckBox( i18n("Lea&ve fetched messages on the server"), page1 );
- connect( mPop.leaveOnServerCheck, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotLeaveOnServerClicked() ) );
+ connect( mPop.leaveOnServerCheck, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotLeaveOnServerClicked() ) );
grid->addMultiCellWidget( mPop.leaveOnServerCheck, 6, 6, 0, 1 );
TQHBox *afterDaysBox = new TQHBox( page1 );
afterDaysBox->setSpacing( KDialog::spacingHint() );
mPop.leaveOnServerDaysCheck =
new TQCheckBox( i18n("Leave messages on the server for"), afterDaysBox );
- connect( mPop.leaveOnServerDaysCheck, TQT_SIGNAL( toggled(bool) ),
- this, TQT_SLOT( slotEnableLeaveOnServerDays(bool)) );
+ connect( mPop.leaveOnServerDaysCheck, TQ_SIGNAL( toggled(bool) ),
+ this, TQ_SLOT( slotEnableLeaveOnServerDays(bool)) );
mPop.leaveOnServerDaysSpin = new KIntNumInput( afterDaysBox );
mPop.leaveOnServerDaysSpin->setRange( 1, 365, 1, false );
- connect( mPop.leaveOnServerDaysSpin, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotLeaveOnServerDaysChanged(int)));
+ connect( mPop.leaveOnServerDaysSpin, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotLeaveOnServerDaysChanged(int)));
mPop.leaveOnServerDaysSpin->setValue( 1 );
afterDaysBox->setStretchFactor( mPop.leaveOnServerDaysSpin, 1 );
grid->addMultiCellWidget( afterDaysBox, 7, 7, 0, 1 );
@@ -658,20 +658,20 @@ void AccountDialog::makePopAccountPage()
leaveOnServerCountBox->setSpacing( KDialog::spacingHint() );
mPop.leaveOnServerCountCheck =
new TQCheckBox( i18n("Keep only the last"), leaveOnServerCountBox );
- connect( mPop.leaveOnServerCountCheck, TQT_SIGNAL( toggled(bool) ),
- this, TQT_SLOT( slotEnableLeaveOnServerCount(bool)) );
+ connect( mPop.leaveOnServerCountCheck, TQ_SIGNAL( toggled(bool) ),
+ this, TQ_SLOT( slotEnableLeaveOnServerCount(bool)) );
mPop.leaveOnServerCountSpin = new KIntNumInput( leaveOnServerCountBox );
mPop.leaveOnServerCountSpin->setRange( 1, 999999, 1, false );
- connect( mPop.leaveOnServerCountSpin, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotLeaveOnServerCountChanged(int)));
+ connect( mPop.leaveOnServerCountSpin, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotLeaveOnServerCountChanged(int)));
mPop.leaveOnServerCountSpin->setValue( 100 );
grid->addMultiCellWidget( leaveOnServerCountBox, 8, 8, 0, 1 );
TQHBox *leaveOnServerSizeBox = new TQHBox( page1 );
leaveOnServerSizeBox->setSpacing( KDialog::spacingHint() );
mPop.leaveOnServerSizeCheck =
new TQCheckBox( i18n("Keep only the last"), leaveOnServerSizeBox );
- connect( mPop.leaveOnServerSizeCheck, TQT_SIGNAL( toggled(bool) ),
- this, TQT_SLOT( slotEnableLeaveOnServerSize(bool)) );
+ connect( mPop.leaveOnServerSizeCheck, TQ_SIGNAL( toggled(bool) ),
+ this, TQ_SLOT( slotEnableLeaveOnServerSize(bool)) );
mPop.leaveOnServerSizeSpin = new KIntNumInput( leaveOnServerSizeBox );
mPop.leaveOnServerSizeSpin->setRange( 1, 999999, 1, false );
mPop.leaveOnServerSizeSpin->setSuffix( i18n(" MB") );
@@ -685,21 +685,21 @@ void AccountDialog::makePopAccountPage()
mPop.resourceClearButton =
new TQPushButton( i18n( "Clear" ), resourceHB );
mPop.resourceClearButton->setEnabled( false );
- connect( mPop.resourceCheck, TQT_SIGNAL( toggled(bool) ),
- mPop.resourceClearButton, TQT_SLOT( setEnabled(bool) ) );
+ connect( mPop.resourceCheck, TQ_SIGNAL( toggled(bool) ),
+ mPop.resourceClearButton, TQ_SLOT( setEnabled(bool) ) );
TQWhatsThis::add( mPop.resourceClearButton,
i18n( "Delete all allocations for the resource represented by this account." ) );
- connect( mPop.resourceClearButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotClearResourceAllocations() ) );
+ connect( mPop.resourceClearButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotClearResourceAllocations() ) );
mPop.resourceClearPastButton =
new TQPushButton( i18n( "Clear Past" ), resourceHB );
mPop.resourceClearPastButton->setEnabled( false );
- connect( mPop.resourceCheck, TQT_SIGNAL( toggled(bool) ),
- mPop.resourceClearPastButton, TQT_SLOT( setEnabled(bool) ) );
+ connect( mPop.resourceCheck, TQ_SIGNAL( toggled(bool) ),
+ mPop.resourceClearPastButton, TQ_SLOT( setEnabled(bool) ) );
TQWhatsThis::add( mPop.resourceClearPastButton,
i18n( "Delete all outdated allocations for the resource represented by this account." ) );
- connect( mPop.resourceClearPastButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotClearPastResourceAllocations() ) );
+ connect( mPop.resourceClearPastButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotClearPastResourceAllocations() ) );
grid->addMultiCellWidget( resourceHB, 10, 10, 0, 2 );
#endif
@@ -715,14 +715,14 @@ void AccountDialog::makePopAccountPage()
mPop.filterOnServerSizeSpin->setEnabled( false );
hbox->setStretchFactor( mPop.filterOnServerSizeSpin, 1 );
mPop.filterOnServerSizeSpin->setRange( 1, 10000000, 100, false );
- connect(mPop.filterOnServerSizeSpin, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotFilterOnServerSizeChanged(int)));
+ connect(mPop.filterOnServerSizeSpin, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotFilterOnServerSizeChanged(int)));
mPop.filterOnServerSizeSpin->setValue( 50000 );
grid->addMultiCellWidget( hbox, 11, 11, 0, 1 );
- connect( mPop.filterOnServerCheck, TQT_SIGNAL(toggled(bool)),
- mPop.filterOnServerSizeSpin, TQT_SLOT(setEnabled(bool)) );
- connect( mPop.filterOnServerCheck, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotFilterOnServerClicked() ) );
+ connect( mPop.filterOnServerCheck, TQ_SIGNAL(toggled(bool)),
+ mPop.filterOnServerSizeSpin, TQ_SLOT(setEnabled(bool)) );
+ connect( mPop.filterOnServerCheck, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotFilterOnServerClicked() ) );
TQString msg = i18n("If you select this option, POP Filters will be used to "
"decide what to do with messages. You can then select "
"to download, delete or keep them on the server." );
@@ -732,8 +732,8 @@ void AccountDialog::makePopAccountPage()
mPop.intervalCheck =
new TQCheckBox( i18n("Enable &interval mail checking"), page1 );
grid->addMultiCellWidget( mPop.intervalCheck, 12, 12, 0, 1 );
- connect( mPop.intervalCheck, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(slotEnablePopInterval(bool)) );
+ connect( mPop.intervalCheck, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(slotEnablePopInterval(bool)) );
mPop.intervalLabel = new TQLabel( i18n("Chec&k interval:"), page1 );
grid->addWidget( mPop.intervalLabel, 13, 0 );
mPop.intervalSpin = new KIntNumInput( page1 );
@@ -770,15 +770,15 @@ void AccountDialog::makePopAccountPage()
TQHBoxLayout *buttonLay = new TQHBoxLayout( vlay );
mPop.checkCapabilities =
new TQPushButton( i18n("Check &What the Server Supports"), page2 );
- connect(mPop.checkCapabilities, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotCheckPopCapabilities()));
+ connect(mPop.checkCapabilities, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotCheckPopCapabilities()));
buttonLay->addStretch();
buttonLay->addWidget( mPop.checkCapabilities );
buttonLay->addStretch();
vlay->addSpacing( KDialog::spacingHint() );
- mPop.encryptionGroup = new TQButtonGroup( 1, Qt::Horizontal,
+ mPop.encryptionGroup = new TQButtonGroup( 1, TQt::Horizontal,
i18n("Encryption"), page2 );
mPop.encryptionNone =
new TQRadioButton( i18n("&None"), mPop.encryptionGroup );
@@ -788,11 +788,11 @@ void AccountDialog::makePopAccountPage()
mPop.encryptionTLS =
new TQRadioButton( i18n("Use &TLS for secure mail download"),
mPop.encryptionGroup );
- connect(mPop.encryptionGroup, TQT_SIGNAL(clicked(int)),
- TQT_SLOT(slotPopEncryptionChanged(int)));
+ connect(mPop.encryptionGroup, TQ_SIGNAL(clicked(int)),
+ TQ_SLOT(slotPopEncryptionChanged(int)));
vlay->addWidget( mPop.encryptionGroup );
- mPop.authGroup = new TQButtonGroup( 1, Qt::Horizontal,
+ mPop.authGroup = new TQButtonGroup( 1, TQt::Horizontal,
i18n("Authentication Method"), page2 );
mPop.authUser = new TQRadioButton( i18n("Clear te&xt") , mPop.authGroup,
"auth clear text" );
@@ -817,13 +817,13 @@ void AccountDialog::makePopAccountPage()
mPop.usePipeliningCheck =
new TQCheckBox( i18n("&Use pipelining for faster mail download"), page2 );
- connect(mPop.usePipeliningCheck, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotPipeliningClicked()));
+ connect(mPop.usePipeliningCheck, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotPipeliningClicked()));
vlay->addWidget( mPop.usePipeliningCheck );
vlay->addStretch();
- connect(kapp,TQT_SIGNAL(tdedisplayFontChanged()),TQT_SLOT(slotFontChanged()));
+ connect(kapp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged()));
}
@@ -891,7 +891,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
label = new TQLabel( i18n("&Port:"), page1 );
grid->addWidget( label, row, 0 );
mImap.portEdit = new KLineEdit( page1 );
- mImap.portEdit->setValidator( new TQIntValidator(TQT_TQOBJECT(this)) );
+ mImap.portEdit->setValidator( new TQIntValidator(this) );
label->setBuddy( mImap.portEdit );
grid->addWidget( mImap.portEdit, row, 1 );
@@ -909,7 +909,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
button->setFixedSize( 22, 22 );
button->setIconSet(
TDEGlobal::iconLoader()->loadIconSet( "reload", TDEIcon::Small, 0 ) );
- connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotReloadNamespaces()) );
+ connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotReloadNamespaces()) );
TQWhatsThis::add( button,
i18n("Reload the namespaces from the server. This overwrites any changes.") );
grid->addWidget( box, row, 0 );
@@ -926,7 +926,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
mImap.editPNS->setAutoRaise( true );
mImap.editPNS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
mImap.editPNS->setFixedSize( 22, 22 );
- connect( mImap.editPNS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditPersonalNamespace()) );
+ connect( mImap.editPNS, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditPersonalNamespace()) );
label = new TQLabel( i18n("Other Users"), listbox );
TQWhatsThis::add( label, i18n( "These namespaces include the folders of other users." ) );
@@ -938,7 +938,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
mImap.editONS->setAutoRaise( true );
mImap.editONS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
mImap.editONS->setFixedSize( 22, 22 );
- connect( mImap.editONS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditOtherUsersNamespace()) );
+ connect( mImap.editONS, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditOtherUsersNamespace()) );
label = new TQLabel( i18n("Shared"), listbox );
TQWhatsThis::add( label, i18n( "These namespaces include the shared folders." ) );
@@ -950,7 +950,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
mImap.editSNS->setAutoRaise( true );
mImap.editSNS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
mImap.editSNS->setFixedSize( 22, 22 );
- connect( mImap.editSNS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditSharedNamespace()) );
+ connect( mImap.editSNS, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditSharedNamespace()) );
label->setBuddy( listbox );
grid->addWidget( listbox, row, 1 );
@@ -1021,21 +1021,21 @@ void AccountDialog::makeImapAccountPage( bool connected )
mImap.resourceClearButton =
new TQPushButton( i18n( "Clear" ), resourceHB );
mImap.resourceClearButton->setEnabled( false );
- connect( mImap.resourceCheck, TQT_SIGNAL( toggled(bool) ),
- mImap.resourceClearButton, TQT_SLOT( setEnabled(bool) ) );
+ connect( mImap.resourceCheck, TQ_SIGNAL( toggled(bool) ),
+ mImap.resourceClearButton, TQ_SLOT( setEnabled(bool) ) );
TQWhatsThis::add( mImap.resourceClearButton,
i18n( "Delete all allocations for the resource represented by this account." ) );
- connect( mImap.resourceClearButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotClearResourceAllocations() ) );
+ connect( mImap.resourceClearButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotClearResourceAllocations() ) );
mImap.resourceClearPastButton =
new TQPushButton( i18n( "Clear Past" ), resourceHB );
mImap.resourceClearPastButton->setEnabled( false );
- connect( mImap.resourceCheck, TQT_SIGNAL( toggled(bool) ),
- mImap.resourceClearPastButton, TQT_SLOT( setEnabled(bool) ) );
+ connect( mImap.resourceCheck, TQ_SIGNAL( toggled(bool) ),
+ mImap.resourceClearPastButton, TQ_SLOT( setEnabled(bool) ) );
TQWhatsThis::add( mImap.resourceClearPastButton,
i18n( "Delete all outdated allocations for the resource represented by this account." ) );
- connect( mImap.resourceClearPastButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotClearPastResourceAllocations() ) );
+ connect( mImap.resourceClearPastButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotClearPastResourceAllocations() ) );
grid->addMultiCellWidget( resourceHB, row, row, 0, 2 );
#endif
@@ -1048,8 +1048,8 @@ void AccountDialog::makeImapAccountPage( bool connected )
mImap.intervalCheck =
new TQCheckBox( i18n("Enable &interval mail checking"), page1 );
grid->addMultiCellWidget( mImap.intervalCheck, row, row, 0, 2 );
- connect( mImap.intervalCheck, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(slotEnableImapInterval(bool)) );
+ connect( mImap.intervalCheck, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(slotEnableImapInterval(bool)) );
++row;
mImap.intervalLabel = new TQLabel( i18n("Check inter&val:"), page1 );
grid->addWidget( mImap.intervalLabel, row, 0 );
@@ -1085,15 +1085,15 @@ void AccountDialog::makeImapAccountPage( bool connected )
TQHBoxLayout *buttonLay = new TQHBoxLayout( vlay );
mImap.checkCapabilities =
new TQPushButton( i18n("Check &What the Server Supports"), page2 );
- connect(mImap.checkCapabilities, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotCheckImapCapabilities()));
+ connect(mImap.checkCapabilities, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotCheckImapCapabilities()));
buttonLay->addStretch();
buttonLay->addWidget( mImap.checkCapabilities );
buttonLay->addStretch();
vlay->addSpacing( KDialog::spacingHint() );
- mImap.encryptionGroup = new TQButtonGroup( 1, Qt::Horizontal,
+ mImap.encryptionGroup = new TQButtonGroup( 1, TQt::Horizontal,
i18n("Encryption"), page2 );
mImap.encryptionNone =
new TQRadioButton( i18n("&None"), mImap.encryptionGroup );
@@ -1103,11 +1103,11 @@ void AccountDialog::makeImapAccountPage( bool connected )
mImap.encryptionTLS =
new TQRadioButton( i18n("Use &TLS for secure mail download"),
mImap.encryptionGroup );
- connect(mImap.encryptionGroup, TQT_SIGNAL(clicked(int)),
- TQT_SLOT(slotImapEncryptionChanged(int)));
+ connect(mImap.encryptionGroup, TQ_SIGNAL(clicked(int)),
+ TQ_SLOT(slotImapEncryptionChanged(int)));
vlay->addWidget( mImap.encryptionGroup );
- mImap.authGroup = new TQButtonGroup( 1, Qt::Horizontal,
+ mImap.authGroup = new TQButtonGroup( 1, TQt::Horizontal,
i18n("Authentication Method"), page2 );
mImap.authUser = new TQRadioButton( i18n("Clear te&xt"), mImap.authGroup );
mImap.authLogin = new TQRadioButton( i18n("Please translate this "
@@ -1130,7 +1130,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
mSieveConfigEditor->layout()->setMargin( KDialog::marginHint() );
tabWidget->addTab( mSieveConfigEditor, i18n("&Filtering") );
- connect(kapp,TQT_SIGNAL(tdedisplayFontChanged()),TQT_SLOT(slotFontChanged()));
+ connect(kapp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged()));
}
@@ -1542,9 +1542,9 @@ void AccountDialog::slotCheckPopCapabilities()
delete mServerTest;
mServerTest = new KMServerTest(POP_PROTOCOL, mPop.hostEdit->text(),
mPop.portEdit->text().toInt());
- connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList &,
+ connect( mServerTest, TQ_SIGNAL( capabilities( const TQStringList &,
const TQStringList & ) ),
- this, TQT_SLOT( slotPopCapabilities( const TQStringList &,
+ this, TQ_SLOT( slotPopCapabilities( const TQStringList &,
const TQStringList & ) ) );
mPop.checkCapabilities->setEnabled(false);
}
@@ -1561,9 +1561,9 @@ void AccountDialog::slotCheckImapCapabilities()
delete mServerTest;
mServerTest = new KMServerTest(IMAP_PROTOCOL, mImap.hostEdit->text(),
mImap.portEdit->text().toInt());
- connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList &,
+ connect( mServerTest, TQ_SIGNAL( capabilities( const TQStringList &,
const TQStringList & ) ),
- this, TQT_SLOT( slotImapCapabilities( const TQStringList &,
+ this, TQ_SLOT( slotImapCapabilities( const TQStringList &,
const TQStringList & ) ) );
mImap.checkCapabilities->setEnabled(false);
}
@@ -2120,10 +2120,10 @@ void AccountDialog::slotReloadNamespaces()
mImap.otherUsersNS->setText( TQString() );
mImap.sharedNS->setText( TQString() );
ImapAccountBase* ai = static_cast<ImapAccountBase*>( mAccount );
- connect( ai, TQT_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ),
- this, TQT_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) );
- connect( ai, TQT_SIGNAL( connectionResult(int, const TQString&) ),
- this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
+ connect( ai, TQ_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ),
+ this, TQ_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) );
+ connect( ai, TQ_SIGNAL( connectionResult(int, const TQString&) ),
+ this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) );
ai->getNamespaces();
}
}
@@ -2132,17 +2132,17 @@ void AccountDialog::slotConnectionResult( int errorCode, const TQString& )
{
if ( errorCode > 0 ) {
ImapAccountBase* ai = static_cast<ImapAccountBase*>( mAccount );
- disconnect( ai, TQT_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ),
- this, TQT_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) );
- disconnect( ai, TQT_SIGNAL( connectionResult(int, const TQString&) ),
- this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
+ disconnect( ai, TQ_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ),
+ this, TQ_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) );
+ disconnect( ai, TQ_SIGNAL( connectionResult(int, const TQString&) ),
+ this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) );
mImap.personalNS->setText( TQString() );
}
}
void AccountDialog::slotSetupNamespaces( const ImapAccountBase::nsDelimMap& map )
{
- disconnect( this, TQT_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) );
+ disconnect( this, TQ_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) );
mImap.personalNS->setText( TQString() );
mImap.otherUsersNS->setText( TQString() );
mImap.sharedNS->setText( TQString() );
@@ -2297,7 +2297,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent,
TQGrid* grid = new TQGrid( 2, page );
mBg = new TQButtonGroup( 0 );
- connect( mBg, TQT_SIGNAL( clicked(int) ), this, TQT_SLOT( slotRemoveEntry(int) ) );
+ connect( mBg, TQ_SIGNAL( clicked(int) ), this, TQ_SLOT( slotRemoveEntry(int) ) );
mDelimMap = mNamespaceMap->find( mType ).data();
ImapAccountBase::namespaceDelim::Iterator it;
for ( it = mDelimMap.begin(); it != mDelimMap.end(); ++it ) {
diff --git a/kmail/accountdialog.h b/kmail/accountdialog.h
index fb15cb38..417d0e28 100644
--- a/kmail/accountdialog.h
+++ b/kmail/accountdialog.h
@@ -54,7 +54,7 @@ class FolderRequester;
class AccountDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -302,7 +302,7 @@ class AccountDialog : public KDialogBase
class NamespaceLineEdit: public KLineEdit
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -319,7 +319,7 @@ class NamespaceLineEdit: public KLineEdit
class NamespaceEditDialog: public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp
index 6b9f38fe..4f05eb16 100644
--- a/kmail/accountmanager.cpp
+++ b/kmail/accountmanager.cpp
@@ -149,8 +149,8 @@ void AccountManager::processNextCheck( bool _newMail )
kdDebug(5006) << "account " << acct->name() << " finished check" << endl;
mAcctChecking.remove( acct );
kmkernel->filterMgr()->deref();
- disconnect( acct, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
- this, TQT_SLOT( processNextCheck( bool ) ) );
+ disconnect( acct, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+ this, TQ_SLOT( processNextCheck( bool ) ) );
}
if ( mAcctChecking.isEmpty() ) {
// all checks finished, display summary
@@ -219,8 +219,8 @@ void AccountManager::processNextCheck( bool _newMail )
}
}
- connect( curAccount, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
- this, TQT_SLOT( processNextCheck( bool ) ) );
+ connect( curAccount, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+ this, TQ_SLOT( processNextCheck( bool ) ) );
KPIM::BroadcastStatus::instance()->setStatusMsg(
i18n("Checking account %1 for new mail").arg(curAccount->name()));
@@ -258,8 +258,8 @@ KMAccount* AccountManager::create( const TQString &aType, const TQString &aName,
kdWarning(5006) << "Attempt to instantiate a non-existing account type!" << endl;
return 0;
}
- connect( act, TQT_SIGNAL( newMailsProcessed( const TQMap<TQString, int> & ) ),
- this, TQT_SLOT( addToTotalNewMailCount( const TQMap<TQString, int> & ) ) );
+ connect( act, TQ_SIGNAL( newMailsProcessed( const TQMap<TQString, int> & ) ),
+ this, TQ_SLOT( addToTotalNewMailCount( const TQMap<TQString, int> & ) ) );
return act;
}
diff --git a/kmail/accountmanager.h b/kmail/accountmanager.h
index b1c1ef7c..ddc82e47 100644
--- a/kmail/accountmanager.h
+++ b/kmail/accountmanager.h
@@ -34,7 +34,7 @@ namespace KMail {
*/
class KDE_EXPORT AccountManager: public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
friend class ::KMAccount;
diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp
index 92e6a232..b050275c 100644
--- a/kmail/accountwizard.cpp
+++ b/kmail/accountwizard.cpp
@@ -282,8 +282,8 @@ void AccountWizard::setupServerInformationPage()
mIncomingLocation = new KLineEdit( mIncomingLocationWdg );
mChooseLocation = new TQPushButton( i18n( "Choose..." ), mIncomingLocationWdg );
- connect( mChooseLocation, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( chooseLocation() ) );
+ connect( mChooseLocation, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( chooseLocation() ) );
layout->addWidget( mIncomingLabel, 0, 0, AlignTop );
layout->addWidget( mIncomingLocationWdg, 0, 1 );
@@ -303,8 +303,8 @@ void AccountWizard::setupServerInformationPage()
mServerInformationPage );
layout->addWidget( mLocalDelivery, 3, 0 );
- connect( mLocalDelivery, TQT_SIGNAL( toggled( bool ) ),
- mOutgoingServer, TQT_SLOT( setDisabled( bool ) ) );
+ connect( mLocalDelivery, TQ_SIGNAL( toggled( bool ) ),
+ mOutgoingServer, TQ_SLOT( setDisabled( bool ) ) );
addPage( mServerInformationPage, i18n( "Server Information" ) );
}
@@ -361,7 +361,7 @@ void AccountWizard::accept()
manager->commit();
- TQTimer::singleShot( 0, this, TQT_SLOT( createTransport() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( createTransport() ) );
}
void AccountWizard::createTransport()
@@ -386,7 +386,7 @@ void AccountWizard::createTransport()
mTransportInfo->auth = false;
mTransportInfo->setStorePasswd( false );
- TQTimer::singleShot( 0, this, TQT_SLOT( transportCreated() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( transportCreated() ) );
} else { // delivery via SMTP
mTransportInfo->type = "smtp";
mTransportInfo->name = accountName();
@@ -425,7 +425,7 @@ void AccountWizard::transportCreated()
mTransportInfoList.setAutoDelete( true );
mTransportInfoList.clear();
- TQTimer::singleShot( 0, this, TQT_SLOT( createAccount() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( createAccount() ) );
}
void AccountWizard::createAccount()
@@ -485,7 +485,7 @@ void AccountWizard::createAccount()
else if ( mTypeBox->type() == AccountTypeBox::IMAP || mTypeBox->type() == AccountTypeBox::dIMAP )
checkImapCapabilities( mIncomingServer->text(), port );
else
- TQTimer::singleShot( 0, this, TQT_SLOT( accountCreated() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( accountCreated() ) );
}
void AccountWizard::accountCreated()
@@ -513,8 +513,8 @@ void AccountWizard::checkPopCapabilities( const TQString &server, int port )
delete mServerTest;
mServerTest = new KMServerTest( POP_PROTOCOL, server, port );
- connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ),
- this, TQT_SLOT( popCapabilities( const TQStringList&, const TQStringList& ) ) );
+ connect( mServerTest, TQ_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ),
+ this, TQ_SLOT( popCapabilities( const TQStringList&, const TQStringList& ) ) );
mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) );
}
@@ -524,8 +524,8 @@ void AccountWizard::checkImapCapabilities( const TQString &server, int port )
delete mServerTest;
mServerTest = new KMServerTest( IMAP_PROTOCOL, server, port );
- connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ),
- this, TQT_SLOT( imapCapabilities( const TQStringList&, const TQStringList& ) ) );
+ connect( mServerTest, TQ_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ),
+ this, TQ_SLOT( imapCapabilities( const TQStringList&, const TQStringList& ) ) );
mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) );
}
@@ -535,9 +535,9 @@ void AccountWizard::checkSmtpCapabilities( const TQString &server, int port )
delete mServerTest;
mServerTest = new KMServerTest( SMTP_PROTOCOL, server, port );
- connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList&, const TQStringList&,
+ connect( mServerTest, TQ_SIGNAL( capabilities( const TQStringList&, const TQStringList&,
const TQString&, const TQString&, const TQString& ) ),
- this, TQT_SLOT( smtpCapabilities( const TQStringList&, const TQStringList&,
+ this, TQ_SLOT( smtpCapabilities( const TQStringList&, const TQStringList&,
const TQString&, const TQString&, const TQString& ) ) );
mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) );
diff --git a/kmail/accountwizard.h b/kmail/accountwizard.h
index b6cfe158..0b30ca80 100644
--- a/kmail/accountwizard.h
+++ b/kmail/accountwizard.h
@@ -44,7 +44,7 @@ class KMTransportInfo;
class AccountWizard : public KWizard
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/acljobs.cpp b/kmail/acljobs.cpp
index 4b5f54f6..036ed51d 100644
--- a/kmail/acljobs.cpp
+++ b/kmail/acljobs.cpp
@@ -170,8 +170,8 @@ ACLJobs::GetACLJob::GetACLJob( const KURL& url, const TQByteArray &packedArgs,
bool showProgressInfo )
: TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
{
- connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
- TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) );
+ connect( this, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
+ TQ_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) );
}
void ACLJobs::GetACLJob::slotInfoMessage( TDEIO::Job*, const TQString& str )
@@ -191,8 +191,8 @@ ACLJobs::GetUserRightsJob::GetUserRightsJob( const KURL& url, const TQByteArray
bool showProgressInfo )
: TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
{
- connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
- TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) );
+ connect( this, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
+ TQ_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) );
}
void ACLJobs::GetUserRightsJob::slotInfoMessage( TDEIO::Job*, const TQString& str )
@@ -216,7 +216,7 @@ ACLJobs::MultiSetACLJob::MultiSetACLJob( TDEIO::Slave* slave, const KURL& url, c
mSlave( slave ),
mUrl( url ), mACLList( acl ), mACLListIterator( mACLList.begin() )
{
- TQTimer::singleShot(0, this, TQT_SLOT(slotStart()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotStart()));
}
void ACLJobs::MultiSetACLJob::slotStart()
diff --git a/kmail/acljobs.h b/kmail/acljobs.h
index dd988343..025fc168 100644
--- a/kmail/acljobs.h
+++ b/kmail/acljobs.h
@@ -107,7 +107,7 @@ namespace ACLJobs {
/// List all ACLs for a given url
class GetACLJob : public TDEIO::SimpleJob
{
- Q_OBJECT
+ TQ_OBJECT
public:
GetACLJob( const KURL& url, const TQByteArray &packedArgs,
@@ -124,7 +124,7 @@ namespace ACLJobs {
/// Get the users' rights for a given url
class GetUserRightsJob : public TDEIO::SimpleJob
{
- Q_OBJECT
+ TQ_OBJECT
public:
GetUserRightsJob( const KURL& url, const TQByteArray &packedArgs,
@@ -141,7 +141,7 @@ namespace ACLJobs {
/// This class only exists to store the userid in the job
class DeleteACLJob : public TDEIO::SimpleJob
{
- Q_OBJECT
+ TQ_OBJECT
public:
DeleteACLJob( const KURL& url, const TQString& userId,
@@ -156,7 +156,7 @@ namespace ACLJobs {
/// Set and delete a list of permissions for different users on a given url
class MultiSetACLJob : public TDEIO::Job {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp
index 738d6285..ec892d00 100644
--- a/kmail/actionscheduler.cpp
+++ b/kmail/actionscheduler.cpp
@@ -82,19 +82,19 @@ ActionScheduler::ActionScheduler(KMFilterMgr::FilterSet set,
lastCommand = 0;
lastJob = 0;
finishTimer = new TQTimer( this, "finishTimer" );
- connect( finishTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(finish()));
+ connect( finishTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(finish()));
fetchMessageTimer = new TQTimer( this, "fetchMessageTimer" );
- connect( fetchMessageTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fetchMessage()));
+ connect( fetchMessageTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fetchMessage()));
tempCloseFoldersTimer = new TQTimer( this, "tempCloseFoldersTimer" );
- connect( tempCloseFoldersTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(tempCloseFolders()));
+ connect( tempCloseFoldersTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(tempCloseFolders()));
processMessageTimer = new TQTimer( this, "processMessageTimer" );
- connect( processMessageTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(processMessage()));
+ connect( processMessageTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processMessage()));
filterMessageTimer = new TQTimer( this, "filterMessageTimer" );
- connect( filterMessageTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(filterMessage()));
+ connect( filterMessageTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(filterMessage()));
timeOutTimer = new TQTimer( this, "timeOutTimer" );
- connect( timeOutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeOut()));
+ connect( timeOutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeOut()));
fetchTimeOutTimer = new TQTimer( this, "fetchTimeOutTimer" );
- connect( fetchTimeOutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fetchTimeOut()));
+ connect( fetchTimeOutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fetchTimeOut()));
TQValueList<KMFilter*>::Iterator it = filters.begin();
for (; it != filters.end(); ++it)
@@ -122,10 +122,10 @@ ActionScheduler::~ActionScheduler()
{
schedulerList->remove( this );
tempCloseFolders();
- disconnect( mSrcFolder, TQT_SIGNAL(closed()),
- this, TQT_SLOT(folderClosedOrExpunged()) );
- disconnect( mSrcFolder, TQT_SIGNAL(expunged(KMFolder*)),
- this, TQT_SLOT(folderClosedOrExpunged()) );
+ disconnect( mSrcFolder, TQ_SIGNAL(closed()),
+ this, TQ_SLOT(folderClosedOrExpunged()) );
+ disconnect( mSrcFolder, TQ_SIGNAL(expunged(KMFolder*)),
+ this, TQ_SLOT(folderClosedOrExpunged()) );
mSrcFolder->close("actionschedsrc");
if (mDeleteSrcFolder)
@@ -157,12 +157,12 @@ void ActionScheduler::setSourceFolder( KMFolder *srcFolder )
{
srcFolder->open("actionschedsrc");
if (mSrcFolder) {
- disconnect( mSrcFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
- this, TQT_SLOT(msgAdded(KMFolder*, TQ_UINT32)) );
- disconnect( mSrcFolder, TQT_SIGNAL(closed()),
- this, TQT_SLOT(folderClosedOrExpunged()) );
- disconnect( mSrcFolder, TQT_SIGNAL(expunged(KMFolder*)),
- this, TQT_SLOT(folderClosedOrExpunged()) );
+ disconnect( mSrcFolder, TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+ this, TQ_SLOT(msgAdded(KMFolder*, TQ_UINT32)) );
+ disconnect( mSrcFolder, TQ_SIGNAL(closed()),
+ this, TQ_SLOT(folderClosedOrExpunged()) );
+ disconnect( mSrcFolder, TQ_SIGNAL(expunged(KMFolder*)),
+ this, TQ_SLOT(folderClosedOrExpunged()) );
mSrcFolder->close("actionschedsrc");
}
mSrcFolder = srcFolder;
@@ -170,12 +170,12 @@ void ActionScheduler::setSourceFolder( KMFolder *srcFolder )
for (i = 0; i < mSrcFolder->count(); ++i)
enqueue( mSrcFolder->getMsgBase( i )->getMsgSerNum() );
if (mSrcFolder) {
- connect( mSrcFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
- this, TQT_SLOT(msgAdded(KMFolder*, TQ_UINT32)) );
- connect( mSrcFolder, TQT_SIGNAL(closed()),
- this, TQT_SLOT(folderClosedOrExpunged()) );
- connect( mSrcFolder, TQT_SIGNAL(expunged(KMFolder*)),
- this, TQT_SLOT(folderClosedOrExpunged()) );
+ connect( mSrcFolder, TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+ this, TQ_SLOT(msgAdded(KMFolder*, TQ_UINT32)) );
+ connect( mSrcFolder, TQ_SIGNAL(closed()),
+ this, TQ_SLOT(folderClosedOrExpunged()) );
+ connect( mSrcFolder, TQ_SIGNAL(expunged(KMFolder*)),
+ this, TQ_SLOT(folderClosedOrExpunged()) );
}
}
@@ -422,8 +422,8 @@ void ActionScheduler::fetchMessage()
fetchTimeOutTime = TQTime::currentTime();
fetchTimeOutTimer->start( 60 * 1000, true );
FolderJob *job = msg->parent()->createJob( msg );
- connect( job, TQT_SIGNAL(messageRetrieved( KMMessage* )),
- TQT_SLOT(messageFetched( KMMessage* )) );
+ connect( job, TQ_SIGNAL(messageRetrieved( KMMessage* )),
+ TQ_SLOT(messageFetched( KMMessage* )) );
lastJob = job;
job->start();
} else {
@@ -563,8 +563,8 @@ void ActionScheduler::processMessage()
}
if (msg) {
FolderJob *job = msg->parent()->createJob( msg );
- connect( job, TQT_SIGNAL(messageRetrieved( KMMessage* )),
- TQT_SLOT(messageRetrieved( KMMessage* )) );
+ connect( job, TQ_SIGNAL(messageRetrieved( KMMessage* )),
+ TQ_SLOT(messageRetrieved( KMMessage* )) );
job->start();
} else {
mExecuting = false;
@@ -689,8 +689,8 @@ void ActionScheduler::moveMessage()
timeOutTime = TQTime::currentTime();
KMCommand *cmd = new KMMoveCommand( folder, msg );
- connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ),
- this, TQT_SLOT( moveMessageFinished( KMCommand * ) ) );
+ connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ),
+ this, TQ_SLOT( moveMessageFinished( KMCommand * ) ) );
cmd->start();
// sometimes the move command doesn't complete so time out after a minute
// and move onto the next message
@@ -727,16 +727,16 @@ void ActionScheduler::moveMessageFinished( KMCommand *command )
if (mResult == ResultOk) {
mExecutingLock = false;
if (cmd)
- connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ),
- this, TQT_SLOT( processMessage() ) );
+ connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ),
+ this, TQ_SLOT( processMessage() ) );
else
processMessageTimer->start( 0, true );
} else {
// Note: An alternative to consider is just calling
// finishTimer->start and returning
if (cmd)
- connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ),
- this, TQT_SLOT( finish() ) );
+ connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ),
+ this, TQ_SLOT( finish() ) );
else
finishTimer->start( 0, true );
}
@@ -758,8 +758,8 @@ void ActionScheduler::timeOut()
// Note: This is a good place for a debug statement
assert( lastCommand );
// sometimes imap jobs seem to just stall so give up and move on
- disconnect( lastCommand, TQT_SIGNAL( completed( KMCommand * ) ),
- this, TQT_SLOT( moveMessageFinished( KMCommand * ) ) );
+ disconnect( lastCommand, TQ_SIGNAL( completed( KMCommand * ) ),
+ this, TQ_SLOT( moveMessageFinished( KMCommand * ) ) );
lastCommand = 0;
mExecutingLock = false;
mExecuting = false;
@@ -773,8 +773,8 @@ void ActionScheduler::fetchTimeOut()
// Note: This is a good place for a debug statement
assert( lastJob );
// sometimes imap jobs seem to just stall so give up and move on
- disconnect( lastJob, TQT_SIGNAL(messageRetrieved( KMMessage* )),
- this, TQT_SLOT(messageFetched( KMMessage* )) );
+ disconnect( lastJob, TQ_SIGNAL(messageRetrieved( KMMessage* )),
+ this, TQ_SLOT(messageFetched( KMMessage* )) );
lastJob->kill();
lastJob = 0;
fetchMessageTimer->start( 0, true );
diff --git a/kmail/actionscheduler.h b/kmail/actionscheduler.h
index 4551b3d2..b837c450 100644
--- a/kmail/actionscheduler.h
+++ b/kmail/actionscheduler.h
@@ -48,7 +48,7 @@ namespace KMail {
/* A class for asynchronous filtering of messages */
class ActionScheduler : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/annotationjobs.cpp b/kmail/annotationjobs.cpp
index c2fd8267..37f16d64 100644
--- a/kmail/annotationjobs.cpp
+++ b/kmail/annotationjobs.cpp
@@ -66,8 +66,8 @@ AnnotationJobs::GetAnnotationJob::GetAnnotationJob( const KURL& url, const TQStr
: TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ),
mEntry( entry )
{
- connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
- TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) );
+ connect( this, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
+ TQ_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) );
}
void AnnotationJobs::GetAnnotationJob::slotInfoMessage( TDEIO::Job*, const TQString& str )
@@ -88,7 +88,7 @@ AnnotationJobs::MultiGetAnnotationJob::MultiGetAnnotationJob(
mSlave( slave ),
mUrl( url ), mEntryList( entries ), mEntryListIterator( mEntryList.begin() )
{
- TQTimer::singleShot(0, this, TQT_SLOT(slotStart()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotStart()));
}
@@ -143,7 +143,7 @@ AnnotationJobs::MultiSetAnnotationJob::MultiSetAnnotationJob(
mSlave( slave ),
mUrl( url ), mAnnotationList( annotations ), mAnnotationListIterator( mAnnotationList.begin() )
{
- TQTimer::singleShot(0, this, TQT_SLOT(slotStart()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotStart()));
}
@@ -196,7 +196,7 @@ AnnotationJobs::MultiUrlGetAnnotationJob::MultiUrlGetAnnotationJob( TDEIO::Slave
mPathListIterator( mPathList.begin() ),
mAnnotation( annotation )
{
- TQTimer::singleShot(0, this, TQT_SLOT(slotStart()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotStart()));
}
diff --git a/kmail/annotationjobs.h b/kmail/annotationjobs.h
index 2e7529f2..954a1dea 100644
--- a/kmail/annotationjobs.h
+++ b/kmail/annotationjobs.h
@@ -107,7 +107,7 @@ MultiUrlGetAnnotationJob* multiUrlGetAnnotation( TDEIO::Slave* slave,
/// for getAnnotation()
class GetAnnotationJob : public TDEIO::SimpleJob
{
- Q_OBJECT
+ TQ_OBJECT
public:
GetAnnotationJob( const KURL& url, const TQString& entry, const TQByteArray &packedArgs,
@@ -125,7 +125,7 @@ private:
/// for multiGetAnnotation
class MultiGetAnnotationJob : public TDEIO::Job
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -149,7 +149,7 @@ private:
/// for multiUrlGetAnnotation
class MultiUrlGetAnnotationJob : public TDEIO::Job
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -174,7 +174,7 @@ private:
/// for multiSetAnnotation
class MultiSetAnnotationJob : public TDEIO::Job
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp
index 5552b058..e512e701 100644
--- a/kmail/antispamwizard.cpp
+++ b/kmail/antispamwizard.cpp
@@ -104,24 +104,24 @@ AntiSpamWizard::AntiSpamWizard( WizardMode mode,
( mMode == AntiSpam )
? i18n( "Welcome to the KMail Anti-Spam Wizard" )
: i18n( "Welcome to the KMail Anti-Virus Wizard" ) );
- connect( mInfoPage, TQT_SIGNAL( selectionChanged( void ) ),
- this, TQT_SLOT( checkProgramsSelections( void ) ) );
+ connect( mInfoPage, TQ_SIGNAL( selectionChanged( void ) ),
+ this, TQ_SLOT( checkProgramsSelections( void ) ) );
if ( mMode == AntiSpam ) {
mSpamRulesPage = new ASWizSpamRulesPage( 0, "", mainFolderTree );
addPage( mSpamRulesPage, i18n( "Options to fine-tune the handling of spam messages" ));
- connect( mSpamRulesPage, TQT_SIGNAL( selectionChanged( void ) ),
- this, TQT_SLOT( slotBuildSummary( void ) ) );
+ connect( mSpamRulesPage, TQ_SIGNAL( selectionChanged( void ) ),
+ this, TQ_SLOT( slotBuildSummary( void ) ) );
}
else {
mVirusRulesPage = new ASWizVirusRulesPage( 0, "", mainFolderTree );
addPage( mVirusRulesPage, i18n( "Options to fine-tune the handling of virus messages" ));
- connect( mVirusRulesPage, TQT_SIGNAL( selectionChanged( void ) ),
- this, TQT_SLOT( checkVirusRulesSelections( void ) ) );
+ connect( mVirusRulesPage, TQ_SIGNAL( selectionChanged( void ) ),
+ this, TQ_SLOT( checkVirusRulesSelections( void ) ) );
}
- connect( this, TQT_SIGNAL( helpClicked( void) ),
- this, TQT_SLOT( slotHelpClicked( void ) ) );
+ connect( this, TQ_SIGNAL( helpClicked( void) ),
+ this, TQ_SLOT( slotHelpClicked( void ) ) );
setNextEnabled( mInfoPage, false );
@@ -132,7 +132,7 @@ AntiSpamWizard::AntiSpamWizard( WizardMode mode,
setFinishEnabled( mSummaryPage, true );
}
- TQTimer::singleShot( 0, this, TQT_SLOT( checkToolAvailability( void ) ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( checkToolAvailability( void ) ) );
}
@@ -891,8 +891,8 @@ ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode,
mToolsList->setRowMode( TQListBox::FixedNumber );
mToolsList->setRowMode( 10 );
layout->addWidget( mToolsList );
- connect( mToolsList, TQT_SIGNAL(selectionChanged()),
- this, TQT_SLOT(processSelectionChange(void)) );
+ connect( mToolsList, TQ_SIGNAL(selectionChanged()),
+ this, TQ_SLOT(processSelectionChange(void)) );
mSelectionHint = new TQLabel( this );
mSelectionHint->setText( "" );
@@ -983,16 +983,16 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name,
layout->addStretch();
- connect( mMarkRules, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(processSelectionChange(void)) );
- connect( mMoveSpamRules, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(processSelectionChange(void)) );
- connect( mMoveUnsureRules, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(processSelectionChange(void)) );
- connect( mFolderReqForSpamFolder, TQT_SIGNAL(folderChanged(KMFolder*)),
- this, TQT_SLOT(processSelectionChange(KMFolder*)) );
- connect( mFolderReqForUnsureFolder, TQT_SIGNAL(folderChanged(KMFolder*)),
- this, TQT_SLOT(processSelectionChange(KMFolder*)) );
+ connect( mMarkRules, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(processSelectionChange(void)) );
+ connect( mMoveSpamRules, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(processSelectionChange(void)) );
+ connect( mMoveUnsureRules, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(processSelectionChange(void)) );
+ connect( mFolderReqForSpamFolder, TQ_SIGNAL(folderChanged(KMFolder*)),
+ this, TQ_SLOT(processSelectionChange(KMFolder*)) );
+ connect( mFolderReqForUnsureFolder, TQ_SIGNAL(folderChanged(KMFolder*)),
+ this, TQ_SLOT(processSelectionChange(KMFolder*)) );
mMarkRules->setChecked( true );
mMoveSpamRules->setChecked( true );
@@ -1093,14 +1093,14 @@ ASWizVirusRulesPage::ASWizVirusRulesPage( TQWidget * parent, const char * name,
mFolderTree = new SimpleFolderTree( this, mainFolderTree, s, true );
grid->addWidget( mFolderTree, 3, 0 );
- connect( mPipeRules, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(processSelectionChange(void)) );
- connect( mMoveRules, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(processSelectionChange(void)) );
- connect( mMarkRules, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(processSelectionChange(void)) );
- connect( mMoveRules, TQT_SIGNAL( toggled( bool ) ),
- mMarkRules, TQT_SLOT( setEnabled( bool ) ) );
+ connect( mPipeRules, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(processSelectionChange(void)) );
+ connect( mMoveRules, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(processSelectionChange(void)) );
+ connect( mMarkRules, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(processSelectionChange(void)) );
+ connect( mMoveRules, TQ_SIGNAL( toggled( bool ) ),
+ mMarkRules, TQ_SLOT( setEnabled( bool ) ) );
}
bool ASWizVirusRulesPage::pipeRulesSelected() const
diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h
index e93480c1..3f13ce8e 100644
--- a/kmail/antispamwizard.h
+++ b/kmail/antispamwizard.h
@@ -103,7 +103,7 @@ namespace KMail {
*/
class AntiSpamWizard : public KWizard
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -298,7 +298,7 @@ namespace KMail {
//---------------------------------------------------------------------------
class ASWizInfoPage : public ASWizPage
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -325,7 +325,7 @@ namespace KMail {
//---------------------------------------------------------------------------
class ASWizSpamRulesPage : public ASWizPage
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -358,7 +358,7 @@ namespace KMail {
//-------------------------------------------------------------------------
class ASWizVirusRulesPage : public ASWizPage
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -385,7 +385,7 @@ namespace KMail {
//---------------------------------------------------------------------------
class ASWizSummaryPage : public ASWizPage
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/archivefolderdialog.cpp b/kmail/archivefolderdialog.cpp
index 435752c6..4a62497c 100644
--- a/kmail/archivefolderdialog.cpp
+++ b/kmail/archivefolderdialog.cpp
@@ -46,7 +46,7 @@ static TQString standardArchivePath( const TQString &folderName )
}
return currentPath +
i18n( "Start of the filename for a mail archive file" , "Archive" ) + "_" + folderName +
- "_" + TQDate::currentDate().toString( Qt::ISODate ) + ".tar.bz2";
+ "_" + TQDate::currentDate().toString( TQt::ISODate ) + ".tar.bz2";
}
ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent )
@@ -71,8 +71,8 @@ ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent )
mainLayout->addWidget( folderLabel, row, 0 );
mFolderRequester = new FolderRequester( mainWidget, kmkernel->getKMMainWidget()->folderTree() );
mFolderRequester->setMustBeReadWrite( false );
- connect( mFolderRequester, TQT_SIGNAL(folderChanged(KMFolder *)),
- TQT_SLOT(slotFolderChanged(KMFolder *)) );
+ connect( mFolderRequester, TQ_SIGNAL(folderChanged(KMFolder *)),
+ TQ_SLOT(slotFolderChanged(KMFolder *)) );
folderLabel->setBuddy( mFolderRequester );
mainLayout->addWidget( mFolderRequester, row, 1 );
row++;
@@ -88,8 +88,8 @@ ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent )
mFormatComboBox->insertItem( i18n( "BZ2-Compressed Tar Archive (.tar.bz2)" ) );
mFormatComboBox->insertItem( i18n( "GZ-Compressed Tar Archive (.tar.gz)" ) );
mFormatComboBox->setCurrentItem( 2 );
- connect( mFormatComboBox, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotFixFileExtension()) );
+ connect( mFormatComboBox, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotFixFileExtension()) );
mainLayout->addWidget( mFormatComboBox, row, 1 );
row++;
@@ -100,10 +100,10 @@ ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent )
mUrlRequester->setFilter( "*.tar *.zip *.tar.gz *.tar.bz2" );
mUrlRequester->fileDialog()->setKeepLocation( true );
fileNameLabel->setBuddy( mUrlRequester );
- connect( mUrlRequester->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)),
- TQT_SLOT(slotUrlChanged(const TQString &)) );
- connect( mUrlRequester, TQT_SIGNAL(urlSelected(const TQString&)),
- this, TQT_SLOT(slotFixFileExtension()) );
+ connect( mUrlRequester->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)),
+ TQ_SLOT(slotUrlChanged(const TQString &)) );
+ connect( mUrlRequester, TQ_SIGNAL(urlSelected(const TQString&)),
+ this, TQ_SLOT(slotFixFileExtension()) );
mainLayout->addWidget( mUrlRequester, row, 1 );
row++;
diff --git a/kmail/archivefolderdialog.h b/kmail/archivefolderdialog.h
index cf9133e6..7e5b7853 100644
--- a/kmail/archivefolderdialog.h
+++ b/kmail/archivefolderdialog.h
@@ -32,7 +32,7 @@ class FolderRequester;
class ArchiveFolderDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/attachmentlistview.h b/kmail/attachmentlistview.h
index d0a0b63e..7a6e1353 100644
--- a/kmail/attachmentlistview.h
+++ b/kmail/attachmentlistview.h
@@ -29,7 +29,7 @@ class Composer;
class AttachmentListView : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
AttachmentListView( KMail::Composer * composer = 0, TQWidget* parent = 0,
diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp
index bf78e68c..b67834c4 100644
--- a/kmail/backupjob.cpp
+++ b/kmail/backupjob.cpp
@@ -234,15 +234,15 @@ void BackupJob::archiveNextMessage()
// Use a singleshot timer, or otherwise we risk ending up in a very big recursion
// for folders that have many messages
mCurrentMessage = message;
- TQTimer::singleShot( 0, this, TQT_SLOT( processCurrentMessage() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( processCurrentMessage() ) );
}
else if ( message->parent() ) {
mCurrentJob = message->parent()->createJob( message );
mCurrentJob->setCancellable( false );
- connect( mCurrentJob, TQT_SIGNAL( messageRetrieved( KMMessage* ) ),
- this, TQT_SLOT( messageRetrieved( KMMessage* ) ) );
- connect( mCurrentJob, TQT_SIGNAL( result( KMail::FolderJob* ) ),
- this, TQT_SLOT( folderJobFinished( KMail::FolderJob* ) ) );
+ connect( mCurrentJob, TQ_SIGNAL( messageRetrieved( KMMessage* ) ),
+ this, TQ_SLOT( messageRetrieved( KMMessage* ) ) );
+ connect( mCurrentJob, TQ_SIGNAL( result( KMail::FolderJob* ) ),
+ this, TQ_SLOT( folderJobFinished( KMail::FolderJob* ) ) );
mCurrentJob->start();
}
else {
@@ -490,8 +490,8 @@ void BackupJob::start()
TQString(),
true );
mProgressItem->setUsesBusyIndicator( true );
- connect( mProgressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)),
- this, TQT_SLOT(cancelJob()) );
+ connect( mProgressItem, TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)),
+ this, TQ_SLOT(cancelJob()) );
archiveNextFolder();
}
diff --git a/kmail/backupjob.h b/kmail/backupjob.h
index 4ca6728f..495641a6 100644
--- a/kmail/backupjob.h
+++ b/kmail/backupjob.h
@@ -47,7 +47,7 @@ namespace KMail
*/
class BackupJob : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp
index bba5b1b6..89dd1116 100644
--- a/kmail/cachedimapjob.cpp
+++ b/kmail/cachedimapjob.cpp
@@ -200,11 +200,11 @@ void CachedImapJob::listMessages()
ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
jd.cancellable = true;
mAccount->insertJob( job, jd );
- connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
- this, TQT_SLOT( slotListMessagesResult( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( result(TDEIO::Job *) ),
+ this, TQ_SLOT( slotListMessagesResult( TDEIO::Job* ) ) );
// send the data directly for KMFolderCachedImap
- connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
- mFolder, TQT_SLOT( slotGetMessagesData( TDEIO::Job* , const TQByteArray& ) ) );
+ connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+ mFolder, TQ_SLOT( slotGetMessagesData( TDEIO::Job* , const TQByteArray& ) ) );
}
void CachedImapJob::slotDeleteNextMessages( TDEIO::Job* job )
@@ -240,8 +240,8 @@ void CachedImapJob::slotDeleteNextMessages( TDEIO::Job* job )
TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob );
ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
mAccount->insertJob( simpleJob, jd );
- connect( simpleJob, TQT_SIGNAL( result(TDEIO::Job *) ),
- this, TQT_SLOT( slotDeleteNextMessages(TDEIO::Job *) ) );
+ connect( simpleJob, TQ_SIGNAL( result(TDEIO::Job *) ),
+ this, TQ_SLOT( slotDeleteNextMessages(TDEIO::Job *) ) );
}
void CachedImapJob::expungeFolder()
@@ -254,8 +254,8 @@ void CachedImapJob::expungeFolder()
TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
mAccount->insertJob( job, jd );
- connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
- this, TQT_SLOT( slotExpungeResult(TDEIO::Job *) ) );
+ connect( job, TQ_SIGNAL( result(TDEIO::Job *) ),
+ this, TQ_SLOT( slotExpungeResult(TDEIO::Job *) ) );
}
void CachedImapJob::slotExpungeResult( TDEIO::Job * job )
@@ -349,12 +349,12 @@ void CachedImapJob::slotGetNextMessage(TDEIO::Job * job)
TDEIO::SimpleJob *simpleJob = TDEIO::get(url, false, false);
TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
mAccount->insertJob(simpleJob, jd);
- connect(simpleJob, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)),
- this, TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t)));
- connect(simpleJob, TQT_SIGNAL(result(TDEIO::Job *)),
- this, TQT_SLOT(slotGetNextMessage(TDEIO::Job *)));
- connect(simpleJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
- mFolder, TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)));
+ connect(simpleJob, TQ_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)),
+ this, TQ_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t)));
+ connect(simpleJob, TQ_SIGNAL(result(TDEIO::Job *)),
+ this, TQ_SLOT(slotGetNextMessage(TDEIO::Job *)));
+ connect(simpleJob, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+ mFolder, TQ_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)));
}
void CachedImapJob::slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t processed)
@@ -420,14 +420,14 @@ void CachedImapJob::slotPutNextMessage()
TDEIO::SimpleJob *simpleJob = TDEIO::put(url, 0, false, false, false);
TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
mAccount->insertJob(simpleJob, jd);
- connect( simpleJob, TQT_SIGNAL( result(TDEIO::Job *) ),
- TQT_SLOT( slotPutMessageResult(TDEIO::Job *) ) );
- connect( simpleJob, TQT_SIGNAL( dataReq(TDEIO::Job *, TQByteArray &) ),
- TQT_SLOT( slotPutMessageDataReq(TDEIO::Job *, TQByteArray &) ) );
- connect( simpleJob, TQT_SIGNAL( data(TDEIO::Job *, const TQByteArray &) ),
- mFolder, TQT_SLOT( slotSimpleData(TDEIO::Job *, const TQByteArray &) ) );
- connect( simpleJob, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)),
- TQT_SLOT(slotPutMessageInfoData(TDEIO::Job *, const TQString &)) );
+ connect( simpleJob, TQ_SIGNAL( result(TDEIO::Job *) ),
+ TQ_SLOT( slotPutMessageResult(TDEIO::Job *) ) );
+ connect( simpleJob, TQ_SIGNAL( dataReq(TDEIO::Job *, TQByteArray &) ),
+ TQ_SLOT( slotPutMessageDataReq(TDEIO::Job *, TQByteArray &) ) );
+ connect( simpleJob, TQ_SIGNAL( data(TDEIO::Job *, const TQByteArray &) ),
+ mFolder, TQ_SLOT( slotSimpleData(TDEIO::Job *, const TQByteArray &) ) );
+ connect( simpleJob, TQ_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)),
+ TQ_SLOT(slotPutMessageInfoData(TDEIO::Job *, const TQString &)) );
}
@@ -590,8 +590,8 @@ void CachedImapJob::slotAddNextSubfolder( TDEIO::Job * job )
TDEIO::SimpleJob *simpleJob = TDEIO::mkdir(url);
TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
mAccount->insertJob(simpleJob, jd);
- connect( simpleJob, TQT_SIGNAL(result(TDEIO::Job *)),
- this, TQT_SLOT(slotAddNextSubfolder(TDEIO::Job *)) );
+ connect( simpleJob, TQ_SIGNAL(result(TDEIO::Job *)),
+ this, TQ_SLOT(slotAddNextSubfolder(TDEIO::Job *)) );
} else {
TQByteArray packedArgs;
TQDataStream stream( packedArgs, IO_WriteOnly );
@@ -608,8 +608,8 @@ void CachedImapJob::slotAddNextSubfolder( TDEIO::Job * job )
TDEIO::SimpleJob *simpleJob = TDEIO::special( url.url(), packedArgs, false );
TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
mAccount->insertJob(simpleJob, jd);
- connect( simpleJob, TQT_SIGNAL(result(TDEIO::Job *)),
- this, TQT_SLOT(slotAddNextSubfolder(TDEIO::Job *)) );
+ connect( simpleJob, TQ_SIGNAL(result(TDEIO::Job *)),
+ this, TQ_SLOT(slotAddNextSubfolder(TDEIO::Job *)) );
}
}
@@ -648,8 +648,8 @@ void CachedImapJob::slotDeleteNextFolder( TDEIO::Job *job )
TDEIO::SimpleJob *simpleJob = TDEIO::file_delete(url, false);
TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
mAccount->insertJob(simpleJob, jd);
- connect( simpleJob, TQT_SIGNAL( result(TDEIO::Job *) ),
- TQT_SLOT( slotDeleteNextFolder(TDEIO::Job *) ) );
+ connect( simpleJob, TQ_SIGNAL( result(TDEIO::Job *) ),
+ TQ_SLOT( slotDeleteNextFolder(TDEIO::Job *) ) );
}
void CachedImapJob::checkUidValidity()
@@ -663,10 +663,10 @@ void CachedImapJob::checkUidValidity()
TDEIO::SimpleJob *job = TDEIO::get( url, false, false );
TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
mAccount->insertJob( job, jd );
- connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
- TQT_SLOT(slotCheckUidValidityResult(TDEIO::Job *)) );
- connect( job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
- mFolder, TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)));
+ connect( job, TQ_SIGNAL(result(TDEIO::Job *)),
+ TQ_SLOT(slotCheckUidValidityResult(TDEIO::Job *)) );
+ connect( job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+ mFolder, TQ_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)));
}
void CachedImapJob::slotCheckUidValidityResult(TDEIO::Job * job)
@@ -752,8 +752,8 @@ void CachedImapJob::renameFolder( const TQString &newName )
TDEIO::SimpleJob *simpleJob = TDEIO::rename( urlSrc, urlDst, false );
TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob );
mAccount->insertJob( simpleJob, jd );
- connect( simpleJob, TQT_SIGNAL(result(TDEIO::Job *)),
- TQT_SLOT(slotRenameFolderResult(TDEIO::Job *)) );
+ connect( simpleJob, TQ_SIGNAL(result(TDEIO::Job *)),
+ TQ_SLOT(slotRenameFolderResult(TDEIO::Job *)) );
}
static void renameChildFolders( KMFolderDir* dir, const TQString& oldPath,
@@ -826,14 +826,14 @@ void CachedImapJob::slotSubscribtionChange2Failed( const TQString &errorMessage
void CachedImapJob::slotSubscribtionChange1Done( const TQString&, bool )
{
- disconnect( mAccount, TQT_SIGNAL( subscriptionChanged( const TQString&, bool ) ),
- this, TQT_SLOT( slotSubscribtionChange1Done( const TQString&, bool ) ) );
- connect( mAccount, TQT_SIGNAL( subscriptionChanged( const TQString&, bool ) ),
- this, TQT_SLOT( slotSubscribtionChange2Done( const TQString&, bool ) ) );
- disconnect( mAccount, TQT_SIGNAL( subscriptionChangeFailed( const TQString& ) ),
- this, TQT_SLOT( slotSubscribtionChange1Failed( const TQString& ) ) );
- connect( mAccount, TQT_SIGNAL( subscriptionChangeFailed( const TQString& ) ),
- this, TQT_SLOT( slotSubscribtionChange2Failed( const TQString& ) ) );
+ disconnect( mAccount, TQ_SIGNAL( subscriptionChanged( const TQString&, bool ) ),
+ this, TQ_SLOT( slotSubscribtionChange1Done( const TQString&, bool ) ) );
+ connect( mAccount, TQ_SIGNAL( subscriptionChanged( const TQString&, bool ) ),
+ this, TQ_SLOT( slotSubscribtionChange2Done( const TQString&, bool ) ) );
+ disconnect( mAccount, TQ_SIGNAL( subscriptionChangeFailed( const TQString& ) ),
+ this, TQ_SLOT( slotSubscribtionChange1Failed( const TQString& ) ) );
+ connect( mAccount, TQ_SIGNAL( subscriptionChangeFailed( const TQString& ) ),
+ this, TQ_SLOT( slotSubscribtionChange2Failed( const TQString& ) ) );
mAccount->changeSubscription( false, mOldImapPath, true /* quiet */ );
}
@@ -865,10 +865,10 @@ void CachedImapJob::slotRenameFolderResult( TDEIO::Job *job )
// Okay, the folder seems to be renamed on the server and on disk.
// Now unsubscribe from the old folder name and subscribe to the new folder name,
// so that the folder doesn't suddenly disappear after renaming it
- connect( mAccount, TQT_SIGNAL( subscriptionChangeFailed( const TQString& ) ),
- this, TQT_SLOT( slotSubscribtionChange1Failed( const TQString& ) ) );
- connect( mAccount, TQT_SIGNAL( subscriptionChanged( const TQString&, bool ) ),
- this, TQT_SLOT( slotSubscribtionChange1Done( const TQString&, bool ) ) );
+ connect( mAccount, TQ_SIGNAL( subscriptionChangeFailed( const TQString& ) ),
+ this, TQ_SLOT( slotSubscribtionChange1Failed( const TQString& ) ) );
+ connect( mAccount, TQ_SIGNAL( subscriptionChanged( const TQString&, bool ) ),
+ this, TQ_SLOT( slotSubscribtionChange1Done( const TQString&, bool ) ) );
mAccount->changeSubscription( true, mNewImapPath, true /* quiet */ );
}
}
diff --git a/kmail/cachedimapjob.h b/kmail/cachedimapjob.h
index f2daa6c7..aa9094bf 100644
--- a/kmail/cachedimapjob.h
+++ b/kmail/cachedimapjob.h
@@ -59,7 +59,7 @@ class KMMessage;
namespace KMail {
class CachedImapJob : public FolderJob {
- Q_OBJECT
+ TQ_OBJECT
public:
/** Information about a message to be downloaded (from the 'IMAP envelope') */
diff --git a/kmail/chiasmuskeyselector.cpp b/kmail/chiasmuskeyselector.cpp
index 9e25743e..c4e546ff 100644
--- a/kmail/chiasmuskeyselector.cpp
+++ b/kmail/chiasmuskeyselector.cpp
@@ -35,8 +35,8 @@ ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* parent, const TQString& capt
layout->addStretch();
- connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQT_SLOT( slotOk() ) );
- connect( mListBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), this, TQT_SLOT( slotOk() ) );
+ connect( mListBox, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQ_SLOT( slotOk() ) );
+ connect( mListBox, TQ_SIGNAL( returnPressed( TQListBoxItem * ) ), this, TQ_SLOT( slotOk() ) );
mListBox->setFocus();
}
diff --git a/kmail/chiasmuskeyselector.h b/kmail/chiasmuskeyselector.h
index 7e0d36fb..7039e05a 100644
--- a/kmail/chiasmuskeyselector.h
+++ b/kmail/chiasmuskeyselector.h
@@ -8,7 +8,7 @@ class TQLabel;
class ChiasmusKeySelector : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/colorlistbox.cpp b/kmail/colorlistbox.cpp
index c7481924..a8610dcd 100644
--- a/kmail/colorlistbox.cpp
+++ b/kmail/colorlistbox.cpp
@@ -32,7 +32,7 @@
ColorListBox::ColorListBox( TQWidget *parent, const char *name, WFlags f )
:TDEListBox( parent, name, f ), mCurrentOnDragEnter(-1)
{
- connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) );
+ connect( this, TQ_SIGNAL(selected(int)), this, TQ_SLOT(newColor(int)) );
setAcceptDrops( true);
}
diff --git a/kmail/colorlistbox.h b/kmail/colorlistbox.h
index 03ae5069..b6ae2551 100644
--- a/kmail/colorlistbox.h
+++ b/kmail/colorlistbox.h
@@ -25,7 +25,7 @@
class ColorListBox : public TDEListBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/compactionjob.cpp b/kmail/compactionjob.cpp
index a2ace485..90d0e9f4 100644
--- a/kmail/compactionjob.cpp
+++ b/kmail/compactionjob.cpp
@@ -131,7 +131,7 @@ int MboxCompactionJob::executeNow( bool silent )
mCurrentIndex = 0;
kdDebug(5006) << "MboxCompactionJob: starting to compact folder " << mSrcFolder->location() << " into " << mTempName << endl;
- connect( &mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDoWork() ) );
+ connect( &mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDoWork() ) );
if ( !mImmediate )
mTimer.start( COMPACTIONJOB_TIMERINTERVAL );
slotDoWork();
@@ -229,7 +229,7 @@ int MaildirCompactionJob::executeNow( bool silent )
mCurrentIndex = 0;
kdDebug(5006) << "MaildirCompactionJob: starting to compact in folder " << mSrcFolder->location() << endl;
- connect( &mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDoWork() ) );
+ connect( &mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDoWork() ) );
if ( !mImmediate )
mTimer.start( COMPACTIONJOB_TIMERINTERVAL );
slotDoWork();
diff --git a/kmail/compactionjob.h b/kmail/compactionjob.h
index 2b80f006..c7279fe1 100644
--- a/kmail/compactionjob.h
+++ b/kmail/compactionjob.h
@@ -38,7 +38,7 @@ namespace KMail {
*/
class MboxCompactionJob : public ScheduledJob
{
- Q_OBJECT
+ TQ_OBJECT
public:
/// @p folder should be a folder with a KMFolderMbox storage.
@@ -72,7 +72,7 @@ private:
*/
class MaildirCompactionJob : public ScheduledJob
{
- Q_OBJECT
+ TQ_OBJECT
public:
/// @p folder should be a folder with a KMFolderMaildir storage.
diff --git a/kmail/composer.h b/kmail/composer.h
index 709bfb73..b02a2418 100644
--- a/kmail/composer.h
+++ b/kmail/composer.h
@@ -34,7 +34,7 @@ namespace KMail {
Composer * makeComposer( KMMessage * msg=0, uint identity=0 );
class Composer : public KMail::SecondaryWindow {
- Q_OBJECT
+ TQ_OBJECT
protected:
Composer( const char * name=0 ) : KMail::SecondaryWindow( name ) {}
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 3f5d3fa5..c0beb0fd 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -270,8 +270,8 @@ void ConfigureDialog::slotUser2() {
return;
}
mProfileDialog = new ProfileDialog( this, "mProfileDialog" );
- connect( mProfileDialog, TQT_SIGNAL(profileSelected(TDEConfig*)),
- this, TQT_SIGNAL(installProfile(TDEConfig*)) );
+ connect( mProfileDialog, TQ_SIGNAL(profileSelected(TDEConfig*)),
+ this, TQ_SIGNAL(installProfile(TDEConfig*)) );
mProfileDialog->show();
}
@@ -291,14 +291,14 @@ IdentityPage::IdentityPage( TQWidget * parent, const char * name )
TQHBoxLayout * hlay = new TQHBoxLayout( this, 0, KDialog::spacingHint() );
mIdentityList = new IdentityListView( this );
- connect( mIdentityList, TQT_SIGNAL(selectionChanged()),
- TQT_SLOT(slotIdentitySelectionChanged()) );
- connect( mIdentityList, TQT_SIGNAL(itemRenamed(TQListViewItem*,const TQString&,int)),
- TQT_SLOT(slotRenameIdentity(TQListViewItem*,const TQString&,int)) );
- connect( mIdentityList, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)),
- TQT_SLOT(slotModifyIdentity()) );
- connect( mIdentityList, TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)),
- TQT_SLOT(slotContextMenu(TDEListView*,TQListViewItem*,const TQPoint&)) );
+ connect( mIdentityList, TQ_SIGNAL(selectionChanged()),
+ TQ_SLOT(slotIdentitySelectionChanged()) );
+ connect( mIdentityList, TQ_SIGNAL(itemRenamed(TQListViewItem*,const TQString&,int)),
+ TQ_SLOT(slotRenameIdentity(TQListViewItem*,const TQString&,int)) );
+ connect( mIdentityList, TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)),
+ TQ_SLOT(slotModifyIdentity()) );
+ connect( mIdentityList, TQ_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)),
+ TQ_SLOT(slotContextMenu(TDEListView*,TQListViewItem*,const TQPoint&)) );
// ### connect dragged(...), ...
hlay->addWidget( mIdentityList, 1 );
@@ -319,16 +319,16 @@ IdentityPage::IdentityPage( TQWidget * parent, const char * name )
mRemoveButton->setEnabled( false );
mSetAsDefaultButton->setAutoDefault( false );
mSetAsDefaultButton->setEnabled( false );
- connect( button, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotNewIdentity()) );
- connect( mModifyButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotModifyIdentity()) );
- connect( mRenameButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotRenameIdentity()) );
- connect( mRemoveButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotRemoveIdentity()) );
- connect( mSetAsDefaultButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotSetAsDefault()) );
+ connect( button, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotNewIdentity()) );
+ connect( mModifyButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotModifyIdentity()) );
+ connect( mRenameButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotRenameIdentity()) );
+ connect( mRemoveButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotRemoveIdentity()) );
+ connect( mSetAsDefaultButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotSetAsDefault()) );
vlay->addWidget( button );
vlay->addWidget( mModifyButton );
vlay->addWidget( mRenameButton );
@@ -493,13 +493,13 @@ void IdentityPage::slotContextMenu( TDEListView *, TQListViewItem * i,
IdentityListViewItem * item = dynamic_cast<IdentityListViewItem*>( i );
TQPopupMenu * menu = new TQPopupMenu( this );
- menu->insertItem( i18n("Add..."), this, TQT_SLOT(slotNewIdentity()) );
+ menu->insertItem( i18n("Add..."), this, TQ_SLOT(slotNewIdentity()) );
if ( item ) {
- menu->insertItem( i18n("Modify..."), this, TQT_SLOT(slotModifyIdentity()) );
+ menu->insertItem( i18n("Modify..."), this, TQ_SLOT(slotModifyIdentity()) );
if ( mIdentityList->childCount() > 1 )
- menu->insertItem( i18n("Remove"), this, TQT_SLOT(slotRemoveIdentity()) );
+ menu->insertItem( i18n("Remove"), this, TQ_SLOT(slotRemoveIdentity()) );
if ( !item->identity().isDefault() )
- menu->insertItem( i18n("Set as Default"), this, TQT_SLOT(slotSetAsDefault()) );
+ menu->insertItem( i18n("Set as Default"), this, TQ_SLOT(slotSetAsDefault()) );
}
menu->exec( pos );
delete menu;
@@ -563,16 +563,16 @@ AccountsPage::AccountsPage( TQWidget * parent, const char * name )
//
mReceivingTab = new ReceivingTab();
addTab( mReceivingTab, i18n( "&Receiving" ) );
- connect( mReceivingTab, TQT_SIGNAL(accountListChanged(const TQStringList &)),
- this, TQT_SIGNAL(accountListChanged(const TQStringList &)) );
+ connect( mReceivingTab, TQ_SIGNAL(accountListChanged(const TQStringList &)),
+ this, TQ_SIGNAL(accountListChanged(const TQStringList &)) );
//
// "Sending" tab:
//
mSendingTab = new SendingTab();
addTab( mSendingTab, i18n( "&Sending" ) );
- connect( mSendingTab, TQT_SIGNAL(transportListChanged(const TQStringList&)),
- this, TQT_SIGNAL(transportListChanged(const TQStringList&)) );
+ connect( mSendingTab, TQ_SIGNAL(transportListChanged(const TQStringList&)),
+ this, TQ_SIGNAL(transportListChanged(const TQStringList&)) );
load();
}
@@ -608,10 +608,10 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char *
mTransportList->addColumn( i18n("Type") );
mTransportList->setAllColumnsShowFocus( true );
mTransportList->setSorting( -1 );
- connect( mTransportList, TQT_SIGNAL(selectionChanged()),
- this, TQT_SLOT(slotTransportSelected()) );
- connect( mTransportList, TQT_SIGNAL(doubleClicked( TQListViewItem *)),
- this, TQT_SLOT(slotModifySelectedTransport()) );
+ connect( mTransportList, TQ_SIGNAL(selectionChanged()),
+ this, TQ_SLOT(slotTransportSelected()) );
+ connect( mTransportList, TQ_SIGNAL(doubleClicked( TQListViewItem *)),
+ this, TQ_SLOT(slotModifySelectedTransport()) );
hlay->addWidget( mTransportList, 1 );
// a vbox layout for the buttons: zero stretch, spacing inherited from hlay
@@ -620,36 +620,36 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char *
// "add..." button: stretch 0
button = new TQPushButton( i18n("A&dd..."), this );
button->setAutoDefault( false );
- connect( button, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotAddTransport()) );
+ connect( button, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotAddTransport()) );
btn_vlay->addWidget( button );
// "modify..." button: stretch 0
mModifyTransportButton = new TQPushButton( i18n("&Modify..."), this );
mModifyTransportButton->setAutoDefault( false );
mModifyTransportButton->setEnabled( false ); // b/c no item is selected yet
- connect( mModifyTransportButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotModifySelectedTransport()) );
+ connect( mModifyTransportButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotModifySelectedTransport()) );
btn_vlay->addWidget( mModifyTransportButton );
// "remove" button: stretch 0
mRemoveTransportButton = new TQPushButton( i18n("R&emove"), this );
mRemoveTransportButton->setAutoDefault( false );
mRemoveTransportButton->setEnabled( false ); // b/c no item is selected yet
- connect( mRemoveTransportButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotRemoveSelectedTransport()) );
+ connect( mRemoveTransportButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotRemoveSelectedTransport()) );
btn_vlay->addWidget( mRemoveTransportButton );
mSetDefaultTransportButton = new TQPushButton( i18n("Set Default"), this );
mSetDefaultTransportButton->setAutoDefault( false );
mSetDefaultTransportButton->setEnabled( false );
- connect ( mSetDefaultTransportButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotSetDefaultTransport()) );
+ connect ( mSetDefaultTransportButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotSetDefaultTransport()) );
btn_vlay->addWidget( mSetDefaultTransportButton );
btn_vlay->addStretch( 1 ); // spacer
// "Common options" groupbox:
- group = new TQGroupBox( 0, Qt::Vertical,
+ group = new TQGroupBox( 0, TQt::Vertical,
i18n("Common Options"), this );
vlay->addWidget(group);
@@ -660,8 +660,8 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char *
// "confirm before send" check box:
mConfirmSendCheck = new TQCheckBox( i18n("Confirm &before send"), group );
glay->addMultiCellWidget( mConfirmSendCheck, 0, 0, 0, 1 );
- connect( mConfirmSendCheck, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mConfirmSendCheck, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
// "send on check" combo:
mSendOnCheckCombo = new TQComboBox( false, group );
@@ -670,8 +670,8 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char *
<< i18n("On Manual Mail Checks")
<< i18n("On All Mail Checks") );
glay->addWidget( mSendOnCheckCombo, 1, 1 );
- connect( mSendOnCheckCombo, TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mSendOnCheckCombo, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
// "default send method" combo:
mSendMethodCombo = new TQComboBox( false, group );
@@ -679,8 +679,8 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char *
<< i18n("Send Now")
<< i18n("Send Later") );
glay->addWidget( mSendMethodCombo, 2, 1 );
- connect( mSendMethodCombo, TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mSendMethodCombo, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
// "message property" combo:
@@ -690,14 +690,14 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char *
<< i18n("Allow 8-bit")
<< i18n("MIME Compliant (Quoted Printable)") );
glay->addWidget( mMessagePropertyCombo, 3, 1 );
- connect( mMessagePropertyCombo, TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mMessagePropertyCombo, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
// "default domain" input field:
mDefaultDomainEdit = new KLineEdit( group );
glay->addMultiCellWidget( mDefaultDomainEdit, 4, 4, 1, 2 );
- connect( mDefaultDomainEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mDefaultDomainEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
// labels:
TQLabel *l = new TQLabel( mSendOnCheckCombo, /*buddy*/
@@ -1082,10 +1082,10 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha
mAccountList->addColumn( i18n("Folder") );
mAccountList->setAllColumnsShowFocus( true );
mAccountList->setSorting( -1 );
- connect( mAccountList, TQT_SIGNAL(selectionChanged()),
- this, TQT_SLOT(slotAccountSelected()) );
- connect( mAccountList, TQT_SIGNAL(doubleClicked( TQListViewItem *)),
- this, TQT_SLOT(slotModifySelectedAccount()) );
+ connect( mAccountList, TQ_SIGNAL(selectionChanged()),
+ this, TQ_SLOT(slotAccountSelected()) );
+ connect( mAccountList, TQ_SIGNAL(doubleClicked( TQListViewItem *)),
+ this, TQ_SLOT(slotModifySelectedAccount()) );
hlay->addWidget( mAccountList, 1 );
// a vbox layout for the buttons: zero stretch, spacing inherited from hlay
@@ -1094,31 +1094,31 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha
// "add..." button: stretch 0
button = new TQPushButton( i18n("A&dd..."), this );
button->setAutoDefault( false );
- connect( button, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotAddAccount()) );
+ connect( button, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotAddAccount()) );
btn_vlay->addWidget( button );
// "modify..." button: stretch 0
mModifyAccountButton = new TQPushButton( i18n("&Modify..."), this );
mModifyAccountButton->setAutoDefault( false );
mModifyAccountButton->setEnabled( false ); // b/c no item is selected yet
- connect( mModifyAccountButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotModifySelectedAccount()) );
+ connect( mModifyAccountButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotModifySelectedAccount()) );
btn_vlay->addWidget( mModifyAccountButton );
// "remove..." button: stretch 0
mRemoveAccountButton = new TQPushButton( i18n("R&emove"), this );
mRemoveAccountButton->setAutoDefault( false );
mRemoveAccountButton->setEnabled( false ); // b/c no item is selected yet
- connect( mRemoveAccountButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotRemoveSelectedAccount()) );
+ connect( mRemoveAccountButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotRemoveSelectedAccount()) );
btn_vlay->addWidget( mRemoveAccountButton );
btn_vlay->addStretch( 1 ); // spacer
mCheckmailStartupCheck = new TQCheckBox( i18n("Chec&k mail on startup"), this );
vlay->addWidget( mCheckmailStartupCheck );
- connect( mCheckmailStartupCheck, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mCheckmailStartupCheck, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
// "New Mail Notification" group box: stretch 0
group = new TQVGroupBox( i18n("New Mail Notification"), this );
@@ -1129,8 +1129,8 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha
mBeepNewMailCheck = new TQCheckBox(i18n("&Beep"), group );
mBeepNewMailCheck->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
TQSizePolicy::Fixed ) );
- connect( mBeepNewMailCheck, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mBeepNewMailCheck, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
// "Detailed new mail notification" check box
mVerboseNotificationCheck =
@@ -1142,15 +1142,15 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha
"messages" ) );
TQWhatsThis::add( mVerboseNotificationCheck,
GlobalSettings::self()->verboseNewMailNotificationItem()->whatsThis() );
- connect( mVerboseNotificationCheck, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged() ) );
+ connect( mVerboseNotificationCheck, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged() ) );
// "Other Actions" button:
mOtherNewMailActionsButton = new TQPushButton( i18n("Other Actio&ns"), group );
mOtherNewMailActionsButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed,
TQSizePolicy::Fixed ) );
- connect( mOtherNewMailActionsButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotEditNotifications()) );
+ connect( mOtherNewMailActionsButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotEditNotifications()) );
}
AccountsPageReceivingTab::~AccountsPageReceivingTab()
@@ -1412,7 +1412,7 @@ void AccountsPage::ReceivingTab::doLoadOther() {
mBeepNewMailCheck->setChecked( general.readBoolEntry("beep-on-mail", false ) );
mCheckmailStartupCheck->setChecked( general.readBoolEntry("checkmail-startup", false) );
- TQTimer::singleShot( 0, this, TQT_SLOT( slotTweakAccountList() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotTweakAccountList() ) );
}
void AccountsPage::ReceivingTab::slotTweakAccountList()
@@ -1565,8 +1565,8 @@ AppearancePageFontsTab::AppearancePageFontsTab( TQWidget * parent, const char *
mCustomFontCheck = new TQCheckBox( i18n("&Use custom fonts"), this );
vlay->addWidget( mCustomFontCheck );
vlay->addWidget( new KSeparator( KSeparator::HLine, this ) );
- connect ( mCustomFontCheck, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect ( mCustomFontCheck, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
// "font location" combo box and label:
hlay = new TQHBoxLayout( vlay ); // inherites spacing
@@ -1589,20 +1589,20 @@ AppearancePageFontsTab::AppearancePageFontsTab( TQWidget * parent, const char *
false, 4 );
mFontChooser->setEnabled( false ); // since !mCustomFontCheck->isChecked()
vlay->addWidget( mFontChooser );
- connect ( mFontChooser, TQT_SIGNAL( fontSelected( const TQFont& ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect ( mFontChooser, TQ_SIGNAL( fontSelected( const TQFont& ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
// {en,dis}able widgets depending on the state of mCustomFontCheck:
- connect( mCustomFontCheck, TQT_SIGNAL(toggled(bool)),
- label, TQT_SLOT(setEnabled(bool)) );
- connect( mCustomFontCheck, TQT_SIGNAL(toggled(bool)),
- mFontLocationCombo, TQT_SLOT(setEnabled(bool)) );
- connect( mCustomFontCheck, TQT_SIGNAL(toggled(bool)),
- mFontChooser, TQT_SLOT(setEnabled(bool)) );
+ connect( mCustomFontCheck, TQ_SIGNAL(toggled(bool)),
+ label, TQ_SLOT(setEnabled(bool)) );
+ connect( mCustomFontCheck, TQ_SIGNAL(toggled(bool)),
+ mFontLocationCombo, TQ_SLOT(setEnabled(bool)) );
+ connect( mCustomFontCheck, TQ_SIGNAL(toggled(bool)),
+ mFontChooser, TQ_SLOT(setEnabled(bool)) );
// load the right font settings into mFontChooser:
- connect( mFontLocationCombo, TQT_SIGNAL(activated(int) ),
- this, TQT_SLOT(slotFontSelectorChanged(int)) );
+ connect( mFontLocationCombo, TQ_SIGNAL(activated(int) ),
+ this, TQ_SLOT(slotFontSelectorChanged(int)) );
}
@@ -1629,14 +1629,14 @@ void AppearancePage::FontsTab::slotFontSelectorChanged( int index )
mActiveFontIndex = index;
// Disonnect so the "Apply" button is not activated by the change
- disconnect ( mFontChooser, TQT_SIGNAL( fontSelected( const TQFont& ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ disconnect ( mFontChooser, TQ_SIGNAL( fontSelected( const TQFont& ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
// Display the new setting:
mFontChooser->setFont( mFont[index], fontNames[index].onlyFixed );
- connect ( mFontChooser, TQT_SIGNAL( fontSelected( const TQFont& ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect ( mFontChooser, TQ_SIGNAL( fontSelected( const TQFont& ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
// Disable Family and Size list if we have selected a quote font:
mFontChooser->enableColumn( TDEFontChooser::FamilyList|TDEFontChooser::SizeList,
@@ -1739,8 +1739,8 @@ AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * parent, const char
vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
mCustomColorCheck = new TQCheckBox( i18n("&Use custom colors"), this );
vlay->addWidget( mCustomColorCheck );
- connect( mCustomColorCheck, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mCustomColorCheck, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
// color list box:
mColorList = new ColorListBox( this );
@@ -1755,8 +1755,8 @@ AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * parent, const char
new TQCheckBox( i18n("Recycle colors on deep &quoting"), this );
mRecycleColorCheck->setEnabled( false );
vlay->addWidget( mRecycleColorCheck );
- connect( mRecycleColorCheck, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mRecycleColorCheck, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
// close to quota threshold
TQHBoxLayout *hbox = new TQHBoxLayout(vlay);
@@ -1764,25 +1764,25 @@ AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * parent, const char
hbox->addWidget( l );
l->setEnabled( false );
mCloseToQuotaThreshold = new TQSpinBox( 0, 100, 1, this );
- connect( mCloseToQuotaThreshold, TQT_SIGNAL( valueChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mCloseToQuotaThreshold, TQ_SIGNAL( valueChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
mCloseToQuotaThreshold->setEnabled( false );
mCloseToQuotaThreshold->setSuffix( i18n("%"));
hbox->addWidget( mCloseToQuotaThreshold );
hbox->addWidget( new TQWidget(this), 2 );
// {en,dir}able widgets depending on the state of mCustomColorCheck:
- connect( mCustomColorCheck, TQT_SIGNAL(toggled(bool)),
- mColorList, TQT_SLOT(setEnabled(bool)) );
- connect( mCustomColorCheck, TQT_SIGNAL(toggled(bool)),
- mRecycleColorCheck, TQT_SLOT(setEnabled(bool)) );
- connect( mCustomColorCheck, TQT_SIGNAL(toggled(bool)),
- l, TQT_SLOT(setEnabled(bool)) );
- connect( mCustomColorCheck, TQT_SIGNAL(toggled(bool)),
- mCloseToQuotaThreshold, TQT_SLOT(setEnabled(bool)) );
+ connect( mCustomColorCheck, TQ_SIGNAL(toggled(bool)),
+ mColorList, TQ_SLOT(setEnabled(bool)) );
+ connect( mCustomColorCheck, TQ_SIGNAL(toggled(bool)),
+ mRecycleColorCheck, TQ_SLOT(setEnabled(bool)) );
+ connect( mCustomColorCheck, TQ_SIGNAL(toggled(bool)),
+ l, TQ_SLOT(setEnabled(bool)) );
+ connect( mCustomColorCheck, TQ_SIGNAL(toggled(bool)),
+ mCloseToQuotaThreshold, TQ_SLOT(setEnabled(bool)) );
- connect( mCustomColorCheck, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mCustomColorCheck, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
}
void AppearancePage::ColorsTab::doLoadOther() {
@@ -1823,8 +1823,8 @@ void AppearancePage::ColorsTab::doLoadOther() {
mColorList->setColor( i,
reader.readColorEntry( colorNames[i].configName, &defaultColor[i] ) );
}
- connect( mColorList, TQT_SIGNAL( changed( ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mColorList, TQ_SIGNAL( changed( ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
}
void AppearancePage::ColorsTab::installProfile( TDEConfig * profile ) {
@@ -1911,30 +1911,30 @@ AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * parent, const char
// "folder list" radio buttons:
populateButtonGroup( mFolderListGroup = new TQHButtonGroup( this ), folderListMode );
vlay->addWidget( mFolderListGroup );
- connect( mFolderListGroup, TQT_SIGNAL ( clicked( int ) ),
- this, TQT_SLOT( slotEmitChanged() ) );
+ connect( mFolderListGroup, TQ_SIGNAL ( clicked( int ) ),
+ this, TQ_SLOT( slotEmitChanged() ) );
mFavoriteFolderViewCB = new TQCheckBox( i18n("Show favorite folder view"), this );
- connect( mFavoriteFolderViewCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) );
+ connect( mFavoriteFolderViewCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) );
vlay->addWidget( mFavoriteFolderViewCB );
// "show reader window" radio buttons:
populateButtonGroup( mReaderWindowModeGroup = new TQVButtonGroup( this ), readerWindowMode );
vlay->addWidget( mReaderWindowModeGroup );
- connect( mReaderWindowModeGroup, TQT_SIGNAL ( clicked( int ) ),
- this, TQT_SLOT( slotEmitChanged() ) );
+ connect( mReaderWindowModeGroup, TQ_SIGNAL ( clicked( int ) ),
+ this, TQ_SLOT( slotEmitChanged() ) );
// "Show MIME Tree" radio buttons:
populateButtonGroup( mMIMETreeModeGroup = new TQVButtonGroup( this ), mimeTreeMode );
vlay->addWidget( mMIMETreeModeGroup );
- connect( mMIMETreeModeGroup, TQT_SIGNAL ( clicked( int ) ),
- this, TQT_SLOT( slotEmitChanged() ) );
+ connect( mMIMETreeModeGroup, TQ_SIGNAL ( clicked( int ) ),
+ this, TQ_SLOT( slotEmitChanged() ) );
// "MIME Tree Location" radio buttons:
populateButtonGroup( mMIMETreeLocationGroup = new TQHButtonGroup( this ), mimeTreeLocation );
vlay->addWidget( mMIMETreeLocationGroup );
- connect( mMIMETreeLocationGroup, TQT_SIGNAL ( clicked( int ) ),
- this, TQT_SLOT( slotEmitChanged() ) );
+ connect( mMIMETreeLocationGroup, TQ_SIGNAL ( clicked( int ) ),
+ this, TQ_SLOT( slotEmitChanged() ) );
vlay->addStretch( 10 ); // spacer
}
@@ -2015,14 +2015,14 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
mNestedMessagesCheck =
new TQCheckBox( i18n("&Threaded message list"), group );
- connect( mMessageSizeCheck, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
- connect( mAttachmentCheck, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
- connect( mCryptoIconsCheck, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
- connect( mNestedMessagesCheck, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mMessageSizeCheck, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
+ connect( mAttachmentCheck, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
+ connect( mCryptoIconsCheck, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
+ connect( mNestedMessagesCheck, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
vlay->addWidget( group );
@@ -2048,8 +2048,8 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
vlay->addWidget( mNestingPolicy );
- connect( mNestingPolicy, TQT_SIGNAL( clicked( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mNestingPolicy, TQ_SIGNAL( clicked( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
// "Date Display" group:
mDateDisplay = new TQVButtonGroup( i18n("Date Display"), this );
@@ -2064,10 +2064,10 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
if ( dateDisplayConfig[i].dateDisplay == DateFormatter::Custom ) {
mCustomDateFormatEdit = new KLineEdit( mDateDisplay );
mCustomDateFormatEdit->setEnabled( false );
- connect( radio, TQT_SIGNAL(toggled(bool)),
- mCustomDateFormatEdit, TQT_SLOT(setEnabled(bool)) );
- connect( mCustomDateFormatEdit, TQT_SIGNAL(textChanged(const TQString&)),
- this, TQT_SLOT(slotEmitChanged(void)) );
+ connect( radio, TQ_SIGNAL(toggled(bool)),
+ mCustomDateFormatEdit, TQ_SLOT(setEnabled(bool)) );
+ connect( mCustomDateFormatEdit, TQ_SIGNAL(textChanged(const TQString&)),
+ this, TQ_SLOT(slotEmitChanged(void)) );
TQString customDateWhatsThis =
i18n("<qt><p><strong>These expressions may be used for the date:"
"</strong></p>"
@@ -2106,8 +2106,8 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
} // end for loop populating mDateDisplay
vlay->addWidget( mDateDisplay );
- connect( mDateDisplay, TQT_SIGNAL( clicked( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mDateDisplay, TQ_SIGNAL( clicked( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
vlay->addStretch( 10 ); // spacer
@@ -2261,40 +2261,40 @@ AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent,
TQToolTip::add( mCloseAfterReplyOrForwardCheck,
i18n( "Close the standalone message window after replying or forwarding the message" ) );
vlay->addWidget( mCloseAfterReplyOrForwardCheck );
- connect( mCloseAfterReplyOrForwardCheck, TQT_SIGNAL ( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged() ) );
+ connect( mCloseAfterReplyOrForwardCheck, TQ_SIGNAL ( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged() ) );
// "show colorbar" check box:
populateCheckBox( mShowColorbarCheck = new TQCheckBox( this ), showColorbarMode );
vlay->addWidget( mShowColorbarCheck );
- connect( mShowColorbarCheck, TQT_SIGNAL ( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged() ) );
+ connect( mShowColorbarCheck, TQ_SIGNAL ( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged() ) );
// "show spam status" check box;
populateCheckBox( mShowSpamStatusCheck = new TQCheckBox( this ), showSpamStatusMode );
vlay->addWidget( mShowSpamStatusCheck );
- connect( mShowSpamStatusCheck, TQT_SIGNAL ( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged() ) );
+ connect( mShowSpamStatusCheck, TQ_SIGNAL ( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged() ) );
// "replace smileys by emoticons" check box;
populateCheckBox( mShowEmoticonsCheck = new TQCheckBox( this ), showEmoticons );
vlay->addWidget( mShowEmoticonsCheck );
- connect( mShowEmoticonsCheck, TQT_SIGNAL ( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged() ) );
+ connect( mShowEmoticonsCheck, TQ_SIGNAL ( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged() ) );
// "Use smaller font for quoted text" check box
mShrinkQuotesCheck = new TQCheckBox( i18n( shrinkQuotes.desc ), this,
"kcfg_ShrinkQuotes" );
vlay->addWidget( mShrinkQuotesCheck );
- connect( mShrinkQuotesCheck, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged() ) );
+ connect( mShrinkQuotesCheck, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged() ) );
// "Show expand/collaps quote marks" check box;
TQHBoxLayout *hlay= new TQHBoxLayout( vlay ); // inherits spacing
populateCheckBox( mShowExpandQuotesMark= new TQCheckBox( this ), showExpandQuotesMark);
hlay->addWidget( mShowExpandQuotesMark);
- connect( mShowExpandQuotesMark, TQT_SIGNAL ( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged() ) );
+ connect( mShowExpandQuotesMark, TQ_SIGNAL ( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged() ) );
hlay->addStretch( 1 );
mCollapseQuoteLevelSpin = new KIntSpinBox( 0/*min*/,10/*max*/,1/*step*/,
@@ -2306,20 +2306,20 @@ AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent,
hlay->addWidget( label );
mCollapseQuoteLevelSpin->setEnabled( false ); //since !mShowExpandQuotesMark->isCheckec()
- connect( mCollapseQuoteLevelSpin, TQT_SIGNAL( valueChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mCollapseQuoteLevelSpin, TQ_SIGNAL( valueChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
hlay->addWidget( mCollapseQuoteLevelSpin);
- connect( mShowExpandQuotesMark, TQT_SIGNAL( toggled( bool ) ),
- mCollapseQuoteLevelSpin, TQT_SLOT( setEnabled( bool ) ) );
+ connect( mShowExpandQuotesMark, TQ_SIGNAL( toggled( bool ) ),
+ mCollapseQuoteLevelSpin, TQ_SLOT( setEnabled( bool ) ) );
// Fallback Character Encoding
hlay = new TQHBoxLayout( vlay ); // inherits spacing
mCharsetCombo = new TQComboBox( this );
mCharsetCombo->insertStringList( KMMsgBase::supportedEncodings( false ) );
- connect( mCharsetCombo, TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mCharsetCombo, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
TQString fallbackCharsetWhatsThis =
i18n( GlobalSettings::self()->fallbackCharacterEncodingItem()->whatsThis().utf8() );
@@ -2339,8 +2339,8 @@ AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent,
mOverrideCharsetCombo->insertStringList( encodings );
mOverrideCharsetCombo->setCurrentItem(0);
- connect( mOverrideCharsetCombo, TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mOverrideCharsetCombo, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
TQString overrideCharsetWhatsThis =
i18n( GlobalSettings::self()->overrideCharacterEncodingItem()->whatsThis().utf8() );
@@ -2354,8 +2354,8 @@ AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent,
populateCheckBox( mShowCurrentTimeCheck = new TQCheckBox( this ), showCurrentTime );
vlay->addWidget( mShowCurrentTimeCheck );
- connect( mShowCurrentTimeCheck, TQT_SIGNAL ( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged() ) );
+ connect( mShowCurrentTimeCheck, TQ_SIGNAL ( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged() ) );
vlay->addStretch( 100 ); // spacer
}
@@ -2485,17 +2485,17 @@ AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent,
// "Enable system tray applet" check box
mSystemTrayCheck = new TQCheckBox( i18n("Enable system tray icon"), this );
vlay->addWidget( mSystemTrayCheck );
- connect( mSystemTrayCheck, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mSystemTrayCheck, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
// System tray modes
mSystemTrayGroup = new TQVButtonGroup( i18n("System Tray Mode"), this );
mSystemTrayGroup->layout()->setSpacing( KDialog::spacingHint() );
vlay->addWidget( mSystemTrayGroup );
- connect( mSystemTrayGroup, TQT_SIGNAL( clicked( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
- connect( mSystemTrayCheck, TQT_SIGNAL( toggled( bool ) ),
- mSystemTrayGroup, TQT_SLOT( setEnabled( bool ) ) );
+ connect( mSystemTrayGroup, TQ_SIGNAL( clicked( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
+ connect( mSystemTrayCheck, TQ_SIGNAL( toggled( bool ) ),
+ mSystemTrayGroup, TQ_SLOT( setEnabled( bool ) ) );
mSystemTrayGroup->insert( new TQRadioButton( i18n("Always show KMail in system tray"), mSystemTrayGroup ),
GlobalSettings::EnumSystemTrayPolicy::ShowAlways );
@@ -2617,14 +2617,14 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char *
GlobalSettings::self()->autoTextSignatureItem()->label(),
this );
vlay->addWidget( mAutoAppSignFileCheck );
- connect( mAutoAppSignFileCheck, TQT_SIGNAL( stateChanged(int) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mAutoAppSignFileCheck, TQ_SIGNAL( stateChanged(int) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
mTopQuoteCheck =
new TQCheckBox( GlobalSettings::self()->prependSignatureItem()->label(), this );
vlay->addWidget( mTopQuoteCheck);
- connect( mTopQuoteCheck, TQT_SIGNAL( stateChanged(int) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mTopQuoteCheck, TQ_SIGNAL( stateChanged(int) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
mSmartQuoteCheck = new TQCheckBox(
GlobalSettings::self()->smartQuoteItem()->label(),
@@ -2634,8 +2634,8 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char *
"even when the line was created by adding an additional linebreak while\n"
"word-wrapping the text." ) );
vlay->addWidget( mSmartQuoteCheck );
- connect( mSmartQuoteCheck, TQT_SIGNAL( stateChanged(int) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mSmartQuoteCheck, TQ_SIGNAL( stateChanged(int) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
mQuoteSelectionOnlyCheck = new TQCheckBox( GlobalSettings::self()->quoteSelectionOnlyItem()->label(),
this, "kcfg_QuoteSelectionOnly" );
@@ -2643,28 +2643,28 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char *
i18n( "When replying, only quote the selected text instead of the complete message "
"when there is text selected in the message window." ) );
vlay->addWidget( mQuoteSelectionOnlyCheck );
- connect( mQuoteSelectionOnlyCheck, TQT_SIGNAL( stateChanged(int) ),
- this, TQT_SLOT( slotEmitChanged(void) ) );
+ connect( mQuoteSelectionOnlyCheck, TQ_SIGNAL( stateChanged(int) ),
+ this, TQ_SLOT( slotEmitChanged(void) ) );
mStripSignatureCheck = new TQCheckBox( GlobalSettings::self()->stripSignatureItem()->label(),
this, "kcfg_StripSignature" );
vlay->addWidget( mStripSignatureCheck );
- connect( mStripSignatureCheck, TQT_SIGNAL( stateChanged(int) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mStripSignatureCheck, TQ_SIGNAL( stateChanged(int) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
mAutoRequestMDNCheck = new TQCheckBox(
GlobalSettings::self()->requestMDNItem()->label(),
this, "kcfg_RequestMDN" );
vlay->addWidget( mAutoRequestMDNCheck );
- connect( mAutoRequestMDNCheck, TQT_SIGNAL( stateChanged(int) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mAutoRequestMDNCheck, TQ_SIGNAL( stateChanged(int) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
mShowRecentAddressesInComposer = new TQCheckBox(
GlobalSettings::self()->showRecentAddressesInComposerItem()->label(),
this, "kcfg_ShowRecentAddressesInComposer" );
vlay->addWidget( mShowRecentAddressesInComposer );
- connect( mShowRecentAddressesInComposer, TQT_SIGNAL( stateChanged(int) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mShowRecentAddressesInComposer, TQ_SIGNAL( stateChanged(int) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
// a checkbox for "word wrap" and a spinbox for the column in
// which to wrap:
@@ -2673,20 +2673,20 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char *
GlobalSettings::self()->wordWrapItem()->label(),
this, "kcfg_WordWrap" );
hlay->addWidget( mWordWrapCheck );
- connect( mWordWrapCheck, TQT_SIGNAL( stateChanged(int) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mWordWrapCheck, TQ_SIGNAL( stateChanged(int) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
mWrapColumnSpin = new KIntSpinBox( 30/*min*/, 78/*max*/, 1/*step*/,
78/*init*/, 10 /*base*/, this, "kcfg_LineWrapWidth" );
mWrapColumnSpin->setEnabled( false ); // since !mWordWrapCheck->isChecked()
- connect( mWrapColumnSpin, TQT_SIGNAL( valueChanged(int) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mWrapColumnSpin, TQ_SIGNAL( valueChanged(int) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
hlay->addWidget( mWrapColumnSpin );
hlay->addStretch( 1 );
// only enable the spinbox if the checkbox is checked:
- connect( mWordWrapCheck, TQT_SIGNAL(toggled(bool)),
- mWrapColumnSpin, TQT_SLOT(setEnabled(bool)) );
+ connect( mWordWrapCheck, TQ_SIGNAL(toggled(bool)),
+ mWrapColumnSpin, TQ_SLOT(setEnabled(bool)) );
// a checkbox for "too many recipient warning" and a spinbox for the recipient threshold
hlay = new TQHBoxLayout( vlay ); // inherits spacing
@@ -2694,8 +2694,8 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char *
GlobalSettings::self()->tooManyRecipientsItem()->label(),
this, "kcfg_TooManyRecipients" );
hlay->addWidget( mRecipientCheck );
- connect( mRecipientCheck, TQT_SIGNAL( stateChanged(int) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mRecipientCheck, TQ_SIGNAL( stateChanged(int) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
TQString recipientCheckWhatsthis =
i18n( GlobalSettings::self()->tooManyRecipientsItem()->whatsThis().utf8() );
@@ -2706,8 +2706,8 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char *
mRecipientSpin = new KIntSpinBox( 1/*min*/, 100/*max*/, 1/*step*/,
5/*init*/, 10 /*base*/, this, "kcfg_RecipientThreshold" );
mRecipientSpin->setEnabled( false );
- connect( mRecipientSpin, TQT_SIGNAL( valueChanged(int) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mRecipientSpin, TQ_SIGNAL( valueChanged(int) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
TQString recipientWhatsthis =
i18n( GlobalSettings::self()->recipientThresholdItem()->whatsThis().utf8() );
@@ -2719,8 +2719,8 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char *
hlay->addWidget( mRecipientSpin );
hlay->addStretch( 1 );
// only enable the spinbox if the checkbox is checked:
- connect( mRecipientCheck, TQT_SIGNAL(toggled(bool)),
- mRecipientSpin, TQT_SLOT(setEnabled(bool)) );
+ connect( mRecipientCheck, TQ_SIGNAL(toggled(bool)),
+ mRecipientSpin, TQ_SLOT(setEnabled(bool)) );
hlay = new TQHBoxLayout( vlay ); // inherits spacing
@@ -2732,8 +2732,8 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char *
mAutoSave->setSpecialValueText( i18n("No autosave") );
mAutoSave->setSuffix( i18n(" min") );
hlay->addStretch( 1 );
- connect( mAutoSave, TQT_SIGNAL( valueChanged(int) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mAutoSave, TQ_SIGNAL( valueChanged(int) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
hlay = new TQHBoxLayout( vlay ); // inherits spacing
mForwardTypeCombo = new KComboBox( false, this );
@@ -2746,21 +2746,21 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char *
hlay->addWidget( label );
hlay->addWidget( mForwardTypeCombo );
hlay->addStretch( 1 );
- connect( mForwardTypeCombo, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mForwardTypeCombo, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
hlay = new TQHBoxLayout( vlay ); // inherits spacing
TQPushButton *completionOrderBtn = new TQPushButton( i18n( "Configure Completion Order" ), this );
- connect( completionOrderBtn, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotConfigureCompletionOrder() ) );
+ connect( completionOrderBtn, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotConfigureCompletionOrder() ) );
hlay->addWidget( completionOrderBtn );
hlay->addItem( new TQSpacerItem(0, 0) );
// recent addresses
hlay = new TQHBoxLayout( vlay ); // inherits spacing
TQPushButton *recentAddressesBtn = new TQPushButton( i18n( "Edit Recent Addresses..." ), this );
- connect( recentAddressesBtn, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotConfigureRecentAddresses() ) );
+ connect( recentAddressesBtn, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotConfigureRecentAddresses() ) );
hlay->addWidget( recentAddressesBtn );
hlay->addItem( new TQSpacerItem(0, 0) );
@@ -2771,17 +2771,17 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char *
mExternalEditorCheck = new TQCheckBox(
GlobalSettings::self()->useExternalEditorItem()->label(),
group, "kcfg_UseExternalEditor" );
- connect( mExternalEditorCheck, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mExternalEditorCheck, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
hbox = new TQHBox( group );
label = new TQLabel( GlobalSettings::self()->externalEditorItem()->label(),
hbox );
mEditorRequester = new KURLRequester( hbox, "kcfg_ExternalEditor" );
- connect( mEditorRequester, TQT_SIGNAL( urlSelected(const TQString&) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
- connect( mEditorRequester, TQT_SIGNAL( textChanged(const TQString&) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mEditorRequester, TQ_SIGNAL( urlSelected(const TQString&) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
+ connect( mEditorRequester, TQ_SIGNAL( textChanged(const TQString&) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
hbox->setStretchFactor( mEditorRequester, 1 );
label->setBuddy( mEditorRequester );
@@ -2791,16 +2791,16 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char *
"application/x-shellscript "
"application/x-desktop" );
mEditorRequester->setEnabled( false ); // !mExternalEditorCheck->isChecked()
- connect( mExternalEditorCheck, TQT_SIGNAL(toggled(bool)),
- label, TQT_SLOT(setEnabled(bool)) );
- connect( mExternalEditorCheck, TQT_SIGNAL(toggled(bool)),
- mEditorRequester, TQT_SLOT(setEnabled(bool)) );
+ connect( mExternalEditorCheck, TQ_SIGNAL(toggled(bool)),
+ label, TQ_SLOT(setEnabled(bool)) );
+ connect( mExternalEditorCheck, TQ_SIGNAL(toggled(bool)),
+ mEditorRequester, TQ_SLOT(setEnabled(bool)) );
label = new TQLabel( i18n("<b>%f</b> will be replaced with the "
"filename to edit."), group );
label->setEnabled( false ); // see above
- connect( mExternalEditorCheck, TQT_SIGNAL(toggled(bool)),
- label, TQT_SLOT(setEnabled(bool)) );
+ connect( mExternalEditorCheck, TQ_SIGNAL(toggled(bool)),
+ label, TQ_SLOT(setEnabled(bool)) );
vlay->addWidget( group );
vlay->addStretch( 100 );
@@ -2942,8 +2942,8 @@ ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * parent, const char *
glay->addWidget( new TQLabel( mPhraseLanguageCombo,
i18n("Lang&uage:"), this ), 1, 0 );
glay->addMultiCellWidget( mPhraseLanguageCombo, 1, 1, 1, 2 );
- connect( mPhraseLanguageCombo, TQT_SIGNAL(activated(const TQString&)),
- this, TQT_SLOT(slotLanguageChanged(const TQString&)) );
+ connect( mPhraseLanguageCombo, TQ_SIGNAL(activated(const TQString&)),
+ this, TQ_SLOT(slotLanguageChanged(const TQString&)) );
// row 2: "add..." and "remove" push buttons:
button = new TQPushButton( i18n("A&dd..."), this );
@@ -2953,39 +2953,39 @@ ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * parent, const char *
mRemoveButton->setAutoDefault( false );
mRemoveButton->setEnabled( false ); // combo doesn't contain anything...
glay->addWidget( mRemoveButton, 2, 2 );
- connect( button, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotNewLanguage()) );
- connect( mRemoveButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotRemoveLanguage()) );
+ connect( button, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotNewLanguage()) );
+ connect( mRemoveButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotRemoveLanguage()) );
// row 3: "reply to sender" line edit and label:
mPhraseReplyEdit = new KLineEdit( this );
- connect( mPhraseReplyEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mPhraseReplyEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
glay->addWidget( new TQLabel( mPhraseReplyEdit,
i18n("Reply to se&nder:"), this ), 3, 0 );
glay->addMultiCellWidget( mPhraseReplyEdit, 3, 3, 1, 2 ); // cols 1..2
// row 4: "reply to all" line edit and label:
mPhraseReplyAllEdit = new KLineEdit( this );
- connect( mPhraseReplyAllEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mPhraseReplyAllEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
glay->addWidget( new TQLabel( mPhraseReplyAllEdit,
i18n("Repl&y to all:"), this ), 4, 0 );
glay->addMultiCellWidget( mPhraseReplyAllEdit, 4, 4, 1, 2 ); // cols 1..2
// row 5: "forward" line edit and label:
mPhraseForwardEdit = new KLineEdit( this );
- connect( mPhraseForwardEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mPhraseForwardEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
glay->addWidget( new TQLabel( mPhraseForwardEdit,
i18n("&Forward:"), this ), 5, 0 );
glay->addMultiCellWidget( mPhraseForwardEdit, 5, 5, 1, 2 ); // cols 1..2
// row 6: "quote indicator" line edit and label:
mPhraseIndentPrefixEdit = new KLineEdit( this );
- connect( mPhraseIndentPrefixEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mPhraseIndentPrefixEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
glay->addWidget( new TQLabel( mPhraseIndentPrefixEdit,
i18n("&Quote indicator:"), this ), 6, 0 );
glay->addMultiCellWidget( mPhraseIndentPrefixEdit, 6, 6, 1, 2 );
@@ -3133,8 +3133,8 @@ ComposerPageTemplatesTab::ComposerPageTemplatesTab( TQWidget * parent, const cha
mWidget = new TemplatesConfiguration( this );
vlay->addWidget( mWidget );
- connect( mWidget, TQT_SIGNAL( changed() ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mWidget, TQ_SIGNAL( changed() ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
}
void ComposerPage::TemplatesTab::doLoadFromGlobalSettings() {
@@ -3157,8 +3157,8 @@ ComposerPageCustomTemplatesTab::ComposerPageCustomTemplatesTab( TQWidget * paren
mWidget = new CustomTemplates( this );
vlay->addWidget( mWidget );
- connect( mWidget, TQT_SIGNAL( changed() ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mWidget, TQ_SIGNAL( changed() ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
}
void ComposerPage::CustomTemplatesTab::doLoadFromGlobalSettings() {
@@ -3200,15 +3200,15 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char *
i18n("A&dd..."), i18n("Re&move"),
i18n("Mod&ify..."),
i18n("Enter new reply prefix:") );
- connect( mReplyListEditor, TQT_SIGNAL( changed( void ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mReplyListEditor, TQ_SIGNAL( changed( void ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
// row 2: "replace [...]" check box:
mReplaceReplyPrefixCheck = new TQCheckBox(
GlobalSettings::self()->replaceReplyPrefixItem()->label(),
group, "kcfg_ReplaceReplyPrefix" );
- connect( mReplaceReplyPrefixCheck, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mReplaceReplyPrefixCheck, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
vlay->addWidget( group );
@@ -3228,15 +3228,15 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char *
i18n("Remo&ve"),
i18n("Modify..."),
i18n("Enter new forward prefix:") );
- connect( mForwardListEditor, TQT_SIGNAL( changed( void ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mForwardListEditor, TQ_SIGNAL( changed( void ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
// row 3: "replace [...]" check box:
mReplaceForwardPrefixCheck = new TQCheckBox(
GlobalSettings::self()->replaceForwardPrefixItem()->label(),
group, "kcfg_ReplaceForwardPrefix" );
- connect( mReplaceForwardPrefixCheck, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mReplaceForwardPrefixCheck, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
vlay->addWidget( group );
}
@@ -3276,20 +3276,20 @@ ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * parent, const char *
new SimpleStringListEditor( this, 0, SimpleStringListEditor::All,
i18n("A&dd..."), i18n("Remo&ve"),
i18n("&Modify..."), i18n("Enter charset:") );
- connect( mCharsetListEditor, TQT_SIGNAL( changed( void ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mCharsetListEditor, TQ_SIGNAL( changed( void ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
vlay->addWidget( mCharsetListEditor, 1 );
mKeepReplyCharsetCheck = new TQCheckBox( i18n("&Keep original charset when "
"replying or forwarding (if "
"possible)"), this );
- connect( mKeepReplyCharsetCheck, TQT_SIGNAL ( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mKeepReplyCharsetCheck, TQ_SIGNAL ( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
vlay->addWidget( mKeepReplyCharsetCheck );
- connect( mCharsetListEditor, TQT_SIGNAL(aboutToAdd(TQString&)),
- this, TQT_SLOT(slotVerifyCharset(TQString&)) );
+ connect( mCharsetListEditor, TQ_SIGNAL(aboutToAdd(TQString&)),
+ this, TQ_SLOT(slotVerifyCharset(TQString&)) );
}
void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) {
@@ -3367,8 +3367,8 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char *
// "Use custom Message-Id suffix" checkbox:
mCreateOwnMessageIdCheck =
new TQCheckBox( i18n("&Use custom message-id suffix"), this );
- connect( mCreateOwnMessageIdCheck, TQT_SIGNAL ( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mCreateOwnMessageIdCheck, TQ_SIGNAL ( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
vlay->addWidget( mCreateOwnMessageIdCheck );
// "Message-Id suffix" line edit and label:
@@ -3376,7 +3376,7 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char *
mMessageIdSuffixEdit = new KLineEdit( this );
// only ASCII letters, digits, plus, minus and dots are allowed
mMessageIdSuffixValidator =
- new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), TQT_TQOBJECT(this) );
+ new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), this );
mMessageIdSuffixEdit->setValidator( mMessageIdSuffixValidator );
label = new TQLabel( mMessageIdSuffixEdit,
i18n("Custom message-&id suffix:"), this );
@@ -3384,12 +3384,12 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char *
mMessageIdSuffixEdit->setEnabled( false );
hlay->addWidget( label );
hlay->addWidget( mMessageIdSuffixEdit, 1 );
- connect( mCreateOwnMessageIdCheck, TQT_SIGNAL(toggled(bool) ),
- label, TQT_SLOT(setEnabled(bool)) );
- connect( mCreateOwnMessageIdCheck, TQT_SIGNAL(toggled(bool) ),
- mMessageIdSuffixEdit, TQT_SLOT(setEnabled(bool)) );
- connect( mMessageIdSuffixEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mCreateOwnMessageIdCheck, TQ_SIGNAL(toggled(bool) ),
+ label, TQ_SLOT(setEnabled(bool)) );
+ connect( mCreateOwnMessageIdCheck, TQ_SIGNAL(toggled(bool) ),
+ mMessageIdSuffixEdit, TQ_SLOT(setEnabled(bool)) );
+ connect( mMessageIdSuffixEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
// horizontal rule and "custom header fields" label:
vlay->addWidget( new KSeparator( KSeparator::HLine, this ) );
@@ -3404,18 +3404,18 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char *
mTagList->addColumn( i18n("Value") );
mTagList->setAllColumnsShowFocus( true );
mTagList->setSorting( -1 );
- connect( mTagList, TQT_SIGNAL(selectionChanged()),
- this, TQT_SLOT(slotMimeHeaderSelectionChanged()) );
+ connect( mTagList, TQ_SIGNAL(selectionChanged()),
+ this, TQ_SLOT(slotMimeHeaderSelectionChanged()) );
glay->addMultiCellWidget( mTagList, 0, 2, 0, 1 );
// "new" and "remove" buttons:
button = new TQPushButton( i18n("Ne&w"), this );
- connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewMimeHeader()) );
+ connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewMimeHeader()) );
button->setAutoDefault( false );
glay->addWidget( button, 0, 2 );
mRemoveHeaderButton = new TQPushButton( i18n("Re&move"), this );
- connect( mRemoveHeaderButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotRemoveMimeHeader()) );
+ connect( mRemoveHeaderButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotRemoveMimeHeader()) );
button->setAutoDefault( false );
glay->addWidget( mRemoveHeaderButton, 1, 2 );
@@ -3426,8 +3426,8 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char *
mTagNameLabel->setEnabled( false );
glay->addWidget( mTagNameLabel, 3, 0 );
glay->addWidget( mTagNameEdit, 3, 1 );
- connect( mTagNameEdit, TQT_SIGNAL(textChanged(const TQString&)),
- this, TQT_SLOT(slotMimeHeaderNameChanged(const TQString&)) );
+ connect( mTagNameEdit, TQ_SIGNAL(textChanged(const TQString&)),
+ this, TQ_SLOT(slotMimeHeaderNameChanged(const TQString&)) );
mTagValueEdit = new KLineEdit( this );
mTagValueEdit->setEnabled( false );
@@ -3435,8 +3435,8 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char *
mTagValueLabel->setEnabled( false );
glay->addWidget( mTagValueLabel, 4, 0 );
glay->addWidget( mTagValueEdit, 4, 1 );
- connect( mTagValueEdit, TQT_SIGNAL(textChanged(const TQString&)),
- this, TQT_SLOT(slotMimeHeaderValueChanged(const TQString&)) );
+ connect( mTagValueEdit, TQ_SIGNAL(textChanged(const TQString&)),
+ this, TQ_SLOT(slotMimeHeaderValueChanged(const TQString&)) );
}
void ComposerPage::HeadersTab::slotMimeHeaderSelectionChanged()
@@ -3583,10 +3583,10 @@ ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent,
TQToolTip::add( mOutlookCompatibleCheck, i18n(
"Turn this option on to make Outlook(tm) understand attachment names "
"containing non-English characters" ) );
- connect( mOutlookCompatibleCheck, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
- connect( mOutlookCompatibleCheck, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotOutlookCompatibleClicked() ) );
+ connect( mOutlookCompatibleCheck, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
+ connect( mOutlookCompatibleCheck, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotOutlookCompatibleClicked() ) );
vlay->addWidget( mOutlookCompatibleCheck );
vlay->addSpacing( 5 );
@@ -3594,8 +3594,8 @@ ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent,
mMissingAttachmentDetectionCheck =
new TQCheckBox( i18n("E&nable detection of missing attachments"), this );
mMissingAttachmentDetectionCheck->setChecked( true );
- connect( mMissingAttachmentDetectionCheck, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mMissingAttachmentDetectionCheck, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
vlay->addWidget( mMissingAttachmentDetectionCheck );
// "Attachment key words" label and string list editor
@@ -3611,14 +3611,14 @@ ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent,
i18n("A&dd..."), i18n("Re&move"),
i18n("Mod&ify..."),
i18n("Enter new key word:") );
- connect( mAttachWordsListEditor, TQT_SIGNAL( changed( void ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mAttachWordsListEditor, TQ_SIGNAL( changed( void ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
vlay->addWidget( mAttachWordsListEditor );
- connect( mMissingAttachmentDetectionCheck, TQT_SIGNAL(toggled(bool) ),
- label, TQT_SLOT(setEnabled(bool)) );
- connect( mMissingAttachmentDetectionCheck, TQT_SIGNAL(toggled(bool) ),
- mAttachWordsListEditor, TQT_SLOT(setEnabled(bool)) );
+ connect( mMissingAttachmentDetectionCheck, TQ_SIGNAL(toggled(bool) ),
+ label, TQ_SLOT(setEnabled(bool)) );
+ connect( mMissingAttachmentDetectionCheck, TQ_SIGNAL(toggled(bool) ),
+ mAttachWordsListEditor, TQ_SLOT(setEnabled(bool)) );
}
void ComposerPage::AttachmentsTab::doLoadFromGlobalSettings() {
@@ -3802,13 +3802,13 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
mHtmlMailCheck = new TQCheckBox( i18n("Prefer H&TML to plain text"), group );
TQWhatsThis::add( mHtmlMailCheck, htmlWhatsThis );
- connect( mHtmlMailCheck, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mHtmlMailCheck, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
mExternalReferences = new TQCheckBox( i18n("Allow messages to load e&xternal "
"references from the Internet" ), group );
TQWhatsThis::add( mExternalReferences, externalWhatsThis );
- connect( mExternalReferences, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mExternalReferences, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
label = new KActiveLabel( i18n("<b>WARNING:</b> Allowing HTML in email may "
"increase the risk that your system will be "
"compromised by present and anticipated security "
@@ -3824,7 +3824,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
group = new TQVGroupBox( i18n("Encrypted Messages"), this );
group->layout()->setSpacing( KDialog::spacingHint() );
mAlwaysDecrypt = new TQCheckBox( i18n( "Attempt decryption of encrypted messages when viewing" ), group );
- connect( mAlwaysDecrypt, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotEmitChanged()) );
+ connect( mAlwaysDecrypt, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(slotEmitChanged()) );
vlay->addWidget( group );
// "Message Disposition Notification" groupbox:
@@ -3835,8 +3835,8 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
// "ignore", "ask", "deny", "always send" radiobutton line:
mMDNGroup = new TQButtonGroup( group );
mMDNGroup->hide();
- connect( mMDNGroup, TQT_SIGNAL( clicked( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mMDNGroup, TQ_SIGNAL( clicked( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
hbox = new TQHBox( group );
hbox->setSpacing( KDialog::spacingHint() );
@@ -3863,8 +3863,8 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
// "Original Message quote" radiobutton line:
mOrigQuoteGroup = new TQButtonGroup( group );
mOrigQuoteGroup->hide();
- connect( mOrigQuoteGroup, TQT_SIGNAL( clicked( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mOrigQuoteGroup, TQ_SIGNAL( clicked( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
hbox = new TQHBox( group );
hbox->setSpacing( KDialog::spacingHint() );
@@ -3884,7 +3884,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
hbox->setStretchFactor( w, 1 );
mNoMDNsWhenEncryptedCheck = new TQCheckBox( i18n("Do not send MDNs in response to encrypted messages"), group );
- connect( mNoMDNsWhenEncryptedCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) );
+ connect( mNoMDNsWhenEncryptedCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) );
// Warning label:
label = new KActiveLabel( i18n("<b>WARNING:</b> Unconditionally returning "
@@ -3900,7 +3900,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
group->layout()->setSpacing( KDialog::spacingHint() );
mAutomaticallyImportAttachedKeysCheck = new TQCheckBox( i18n("Automatically import keys and certificates"), group );
- connect( mAutomaticallyImportAttachedKeysCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) );
+ connect( mAutomaticallyImportAttachedKeysCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) );
vlay->addWidget( group );
@@ -4003,13 +4003,13 @@ SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * parent,
TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, 0 );
mWidget = new ComposerCryptoConfiguration( this );
- connect( mWidget->mAutoSignature, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) );
- connect( mWidget->mEncToSelf, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) );
- connect( mWidget->mShowEncryptionResult, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) );
- connect( mWidget->mShowKeyApprovalDlg, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) );
- connect( mWidget->mAutoEncrypt, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) );
- connect( mWidget->mNeverEncryptWhenSavingInDrafts, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) );
- connect( mWidget->mStoreEncrypted, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) );
+ connect( mWidget->mAutoSignature, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) );
+ connect( mWidget->mEncToSelf, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) );
+ connect( mWidget->mShowEncryptionResult, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) );
+ connect( mWidget->mShowKeyApprovalDlg, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) );
+ connect( mWidget->mAutoEncrypt, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) );
+ connect( mWidget->mNeverEncryptWhenSavingInDrafts, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) );
+ connect( mWidget->mStoreEncrypted, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) );
vlay->addWidget( mWidget );
}
@@ -4080,20 +4080,20 @@ SecurityPageWarningTab::SecurityPageWarningTab( TQWidget * parent, const char *
mWidget = new WarningConfiguration( this );
vlay->addWidget( mWidget );
- connect( mWidget->warnGroupBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) );
- connect( mWidget->mWarnUnsigned, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) );
- connect( mWidget->warnUnencryptedCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) );
- connect( mWidget->warnReceiverNotInCertificateCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) );
- connect( mWidget->mWarnSignKeyExpiresSB, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEmitChanged() ) );
- connect( mWidget->mWarnSignChainCertExpiresSB, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEmitChanged() ) );
- connect( mWidget->mWarnSignRootCertExpiresSB, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEmitChanged() ) );
+ connect( mWidget->warnGroupBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) );
+ connect( mWidget->mWarnUnsigned, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) );
+ connect( mWidget->warnUnencryptedCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) );
+ connect( mWidget->warnReceiverNotInCertificateCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) );
+ connect( mWidget->mWarnSignKeyExpiresSB, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEmitChanged() ) );
+ connect( mWidget->mWarnSignChainCertExpiresSB, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEmitChanged() ) );
+ connect( mWidget->mWarnSignRootCertExpiresSB, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEmitChanged() ) );
- connect( mWidget->mWarnEncrKeyExpiresSB, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEmitChanged() ) );
- connect( mWidget->mWarnEncrChainCertExpiresSB, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEmitChanged() ) );
- connect( mWidget->mWarnEncrRootCertExpiresSB, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEmitChanged() ) );
+ connect( mWidget->mWarnEncrKeyExpiresSB, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEmitChanged() ) );
+ connect( mWidget->mWarnEncrChainCertExpiresSB, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEmitChanged() ) );
+ connect( mWidget->mWarnEncrRootCertExpiresSB, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEmitChanged() ) );
- connect( mWidget->enableAllWarningsPB, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotReenableAllWarningsClicked()) );
+ connect( mWidget->enableAllWarningsPB, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotReenableAllWarningsClicked()) );
}
void SecurityPage::WarningTab::doLoadOther() {
@@ -4206,28 +4206,28 @@ SecurityPageSMimeTab::SecurityPageSMimeTab( TQWidget * parent, const char * name
mConfig = Kleo::CryptoBackendFactory::instance()->config();
- connect( mWidget->CRLRB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) );
- connect( mWidget->OCSPRB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) );
- connect( mWidget->OCSPResponderURL, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotEmitChanged() ) );
- connect( mWidget->OCSPResponderSignature, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotEmitChanged() ) );
- connect( mWidget->doNotCheckCertPolicyCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) );
- connect( mWidget->neverConsultCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) );
- connect( mWidget->fetchMissingCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) );
-
- connect( mWidget->ignoreServiceURLCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) );
- connect( mWidget->ignoreHTTPDPCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) );
- connect( mWidget->disableHTTPCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) );
- connect( mWidget->honorHTTPProxyRB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) );
- connect( mWidget->useCustomHTTPProxyRB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) );
- connect( mWidget->customHTTPProxy, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotEmitChanged() ) );
- connect( mWidget->ignoreLDAPDPCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) );
- connect( mWidget->disableLDAPCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) );
- connect( mWidget->customLDAPProxy, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotEmitChanged() ) );
-
- connect( mWidget->disableHTTPCB, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotUpdateHTTPActions() ) );
- connect( mWidget->ignoreHTTPDPCB, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotUpdateHTTPActions() ) );
+ connect( mWidget->CRLRB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) );
+ connect( mWidget->OCSPRB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) );
+ connect( mWidget->OCSPResponderURL, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotEmitChanged() ) );
+ connect( mWidget->OCSPResponderSignature, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotEmitChanged() ) );
+ connect( mWidget->doNotCheckCertPolicyCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) );
+ connect( mWidget->neverConsultCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) );
+ connect( mWidget->fetchMissingCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) );
+
+ connect( mWidget->ignoreServiceURLCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) );
+ connect( mWidget->ignoreHTTPDPCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) );
+ connect( mWidget->disableHTTPCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) );
+ connect( mWidget->honorHTTPProxyRB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) );
+ connect( mWidget->useCustomHTTPProxyRB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) );
+ connect( mWidget->customHTTPProxy, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotEmitChanged() ) );
+ connect( mWidget->ignoreLDAPDPCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) );
+ connect( mWidget->disableLDAPCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) );
+ connect( mWidget->customLDAPProxy, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotEmitChanged() ) );
+
+ connect( mWidget->disableHTTPCB, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotUpdateHTTPActions() ) );
+ connect( mWidget->ignoreHTTPDPCB, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotUpdateHTTPActions() ) );
// Button-group for exclusive radiobuttons
TQButtonGroup* bgHTTPProxy = new TQButtonGroup( mWidget );
@@ -4504,7 +4504,7 @@ SecurityPageCryptPlugTab::SecurityPageCryptPlugTab( TQWidget * parent, const cha
TQVBoxLayout * vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
mBackendConfig = Kleo::CryptoBackendFactory::instance()->configWidget( this, "mBackendConfig" );
- connect( mBackendConfig, TQT_SIGNAL( changed( bool ) ), this, TQT_SIGNAL( changed( bool ) ) );
+ connect( mBackendConfig, TQ_SIGNAL( changed( bool ) ), this, TQ_SIGNAL( changed( bool ) ) );
vlay->addWidget( mBackendConfig );
}
@@ -4563,13 +4563,13 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name )
"trash"),
this );
vlay->addWidget( mEmptyFolderConfirmCheck );
- connect( mEmptyFolderConfirmCheck, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mEmptyFolderConfirmCheck, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
mExcludeImportantFromExpiry =
new TQCheckBox( i18n("E&xclude important messages from expiry"), this );
vlay->addWidget( mExcludeImportantFromExpiry );
- connect( mExcludeImportantFromExpiry, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mExcludeImportantFromExpiry, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
// "when trying to find unread messages" combo + label: stretch 0
hlay = new TQHBoxLayout( vlay ); // inherits spacing
@@ -4587,8 +4587,8 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name )
"Loop in All Folders"));
hlay->addWidget( label );
hlay->addWidget( mLoopOnGotoUnread, 1 );
- connect( mLoopOnGotoUnread, TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mLoopOnGotoUnread, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
// when entering a folder
hlay = new TQHBoxLayout( vlay ); // inherits spacing
@@ -4611,8 +4611,8 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name )
"Jump to Oldest Message") );
hlay->addWidget( label );
hlay->addWidget( mActionEnterFolder, 1 );
- connect( mActionEnterFolder, TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mActionEnterFolder, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
hlay = new TQHBoxLayout( vlay ); // inherits spacing
mDelayedMarkAsRead = new TQCheckBox( i18n("Mar&k selected message as read after"), this );
@@ -4623,19 +4623,19 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name )
mDelayedMarkTime->setEnabled( false ); // since mDelayedMarkAsREad is off
hlay->addWidget( mDelayedMarkTime );
hlay->addStretch( 1 );
- connect( mDelayedMarkTime, TQT_SIGNAL( valueChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
- connect( mDelayedMarkAsRead, TQT_SIGNAL(toggled(bool)),
- mDelayedMarkTime, TQT_SLOT(setEnabled(bool)));
- connect( mDelayedMarkAsRead, TQT_SIGNAL(toggled(bool)),
- this , TQT_SLOT(slotEmitChanged( void )));
+ connect( mDelayedMarkTime, TQ_SIGNAL( valueChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
+ connect( mDelayedMarkAsRead, TQ_SIGNAL(toggled(bool)),
+ mDelayedMarkTime, TQ_SLOT(setEnabled(bool)));
+ connect( mDelayedMarkAsRead, TQ_SIGNAL(toggled(bool)),
+ this , TQ_SLOT(slotEmitChanged( void )));
// "show popup after Drag'n'Drop" checkbox: stretch 0
mShowPopupAfterDnD =
new TQCheckBox( i18n("Ask for action after &dragging messages to another folder"), this );
vlay->addWidget( mShowPopupAfterDnD );
- connect( mShowPopupAfterDnD, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mShowPopupAfterDnD, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
// "default mailbox format" combo + label: stretch 0
hlay = new TQHBoxLayout( vlay ); // inherits spacing
@@ -4668,8 +4668,8 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name )
TQWhatsThis::add( label, msg );
hlay->addWidget( label );
hlay->addWidget( mMailboxPrefCombo, 1 );
- connect( mMailboxPrefCombo, TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mMailboxPrefCombo, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
// "On startup..." option:
hlay = new TQHBoxLayout( vlay ); // inherits spacing
@@ -4679,23 +4679,23 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name )
i18n("Open this folder on startup:"), this );
hlay->addWidget( label );
hlay->addWidget( mOnStartupOpenFolder, 1 );
- connect( mOnStartupOpenFolder, TQT_SIGNAL( folderChanged( KMFolder* ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mOnStartupOpenFolder, TQ_SIGNAL( folderChanged( KMFolder* ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
// "Empty &trash on program exit" option:
hlay = new TQHBoxLayout( vlay ); // inherits spacing
mEmptyTrashCheck = new TQCheckBox( i18n("Empty local &trash folder on program exit"),
this );
hlay->addWidget( mEmptyTrashCheck );
- connect( mEmptyTrashCheck, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mEmptyTrashCheck, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
#ifdef HAVE_INDEXLIB
// indexing enabled option:
mIndexingEnabled = new TQCheckBox( i18n("Enable full text &indexing"), this );
vlay->addWidget( mIndexingEnabled );
- connect( mIndexingEnabled, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mIndexingEnabled, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
#endif
// "Quota Units"
@@ -4709,7 +4709,7 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name )
<< i18n("GB") );
hlay->addWidget( label );
hlay->addWidget( mQuotaCmbBox, 1 );
- connect( mQuotaCmbBox, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mQuotaCmbBox, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotEmitChanged( void ) ) );
vlay->addStretch( 1 );
@@ -4817,14 +4817,14 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name )
"the Kontact applications" ) );
TQWhatsThis::add( mEnableImapResCB,
i18n( GlobalSettings::self()->theIMAPResourceEnabledItem()->whatsThis().utf8() ) );
- connect( mEnableImapResCB, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mEnableImapResCB, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
mBox = new TQWidget( b1 );
TQGridLayout* grid = new TQGridLayout( mBox, 5, 2, 0, KDialog::spacingHint() );
grid->setColStretch( 1, 1 );
- connect( mEnableImapResCB, TQT_SIGNAL( toggled(bool) ),
- mBox, TQT_SLOT( setEnabled(bool) ) );
+ connect( mEnableImapResCB, TQ_SIGNAL( toggled(bool) ),
+ mBox, TQ_SLOT( setEnabled(bool) ) );
TQLabel* storageFormatLA = new TQLabel( i18n("&Format used for the groupware folders:"),
mBox );
@@ -4842,8 +4842,8 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name )
grid->addWidget( mStorageFormatCombo, 0, 1 );
TQToolTip::add( mStorageFormatCombo, toolTip );
TQWhatsThis::add( mStorageFormatCombo, whatsThis );
- connect( mStorageFormatCombo, TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( slotStorageFormatChanged( int ) ) );
+ connect( mStorageFormatCombo, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( slotStorageFormatChanged( int ) ) );
TQLabel* languageLA = new TQLabel( i18n("&Language of the groupware folders:"),
mBox );
@@ -4862,8 +4862,8 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name )
grid->addWidget( mLanguageCombo, 1, 1 );
TQToolTip::add( mLanguageCombo, toolTip );
TQWhatsThis::add( mLanguageCombo, whatsThis );
- connect( mLanguageCombo, TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mLanguageCombo, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
mFolderComboLabel = new TQLabel( mBox ); // text depends on storage format
toolTip = i18n( "Set the parent of the resource folders" );
@@ -4882,8 +4882,8 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name )
mFolderComboStack->addWidget( mFolderCombo, 0 );
TQToolTip::add( mFolderCombo, toolTip );
TQWhatsThis::add( mFolderCombo, whatsThis );
- connect( mFolderCombo, TQT_SIGNAL( folderChanged( KMFolder* ) ),
- this, TQT_SLOT( slotEmitChanged() ) );
+ connect( mFolderCombo, TQ_SIGNAL( folderChanged( KMFolder* ) ),
+ this, TQ_SLOT( slotEmitChanged() ) );
// Second possibility in the widgetstack: a combo showing the list of accounts
// This is used with the kolab xml storage since the groupware folders
@@ -4892,8 +4892,8 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name )
mFolderComboStack->addWidget( mAccountCombo, 1 );
TQToolTip::add( mAccountCombo, toolTip );
TQWhatsThis::add( mAccountCombo, whatsThis );
- connect( mAccountCombo, TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( slotEmitChanged() ) );
+ connect( mAccountCombo, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( slotEmitChanged() ) );
mHideGroupwareFolders = new TQCheckBox( i18n( "&Hide groupware folders" ),
mBox, "HideGroupwareFoldersBox" );
@@ -4903,8 +4903,8 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name )
"resource folders in the folder tree." ) );
TQWhatsThis::add( mHideGroupwareFolders, i18n( GlobalSettings::self()
->hideGroupwareFoldersItem()->whatsThis().utf8() ) );
- connect( mHideGroupwareFolders, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotEmitChanged() ) );
+ connect( mHideGroupwareFolders, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotEmitChanged() ) );
mOnlyShowGroupwareFolders = new TQCheckBox( i18n( "&Only show groupware folders for this account" ),
mBox, "OnlyGroupwareFoldersBox" );
@@ -4915,20 +4915,20 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name )
"configured for groupware." ) );
TQWhatsThis::add( mOnlyShowGroupwareFolders, i18n( GlobalSettings::self()
->showOnlyGroupwareFoldersForGroupwareAccountItem()->whatsThis().utf8() ) );
- connect( mOnlyShowGroupwareFolders, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotEmitChanged() ) );
+ connect( mOnlyShowGroupwareFolders, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotEmitChanged() ) );
mSyncImmediately = new TQCheckBox( i18n( "Synchronize groupware changes immediately" ), mBox );
TQToolTip::add( mSyncImmediately,
i18n( "Synchronize groupware changes in disconnected IMAP folders immediately when being online." ) );
- connect( mSyncImmediately, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) );
+ connect( mSyncImmediately, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) );
grid->addMultiCellWidget( mSyncImmediately, 4, 4, 0, 1 );
mDeleteInvitations = new TQCheckBox(
i18n( GlobalSettings::self()->deleteInvitationEmailsAfterSendingReplyItem()->label().utf8() ), mBox );
TQWhatsThis::add( mDeleteInvitations, i18n( GlobalSettings::self()
->deleteInvitationEmailsAfterSendingReplyItem()->whatsThis().utf8() ) );
- connect( mDeleteInvitations, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) );
+ connect( mDeleteInvitations, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) );
grid->addMultiCellWidget( mDeleteInvitations, 5, 5, 0, 1 );
// Groupware functionality compatibility setup
@@ -4939,47 +4939,47 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name )
// Currently believed to be disused.
mEnableGwCB = new TQCheckBox( i18n("&Enable groupware functionality"), b1 );
gBox->setSpacing( KDialog::spacingHint() );
- connect( mEnableGwCB, TQT_SIGNAL( toggled(bool) ),
- gBox, TQT_SLOT( setEnabled(bool) ) );
- connect( mEnableGwCB, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mEnableGwCB, TQ_SIGNAL( toggled(bool) ),
+ gBox, TQ_SLOT( setEnabled(bool) ) );
+ connect( mEnableGwCB, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
#endif
mEnableGwCB = 0;
mLegacyMangleFromTo = new TQCheckBox( i18n( "Mangle From:/To: headers in replies to invitations" ), gBox );
TQToolTip::add( mLegacyMangleFromTo, i18n( "Turn this option on in order to make Outlook(tm) understand your answers to invitation replies" ) );
TQWhatsThis::add( mLegacyMangleFromTo, i18n( GlobalSettings::self()->
legacyMangleFromToHeadersItem()->whatsThis().utf8() ) );
- connect( mLegacyMangleFromTo, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mLegacyMangleFromTo, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
mLegacyBodyInvites = new TQCheckBox( i18n( "Send invitations in the mail body" ), gBox );
TQToolTip::add( mLegacyBodyInvites, i18n( "Turn this option on in order to make Outlook(tm) understand your answers to invitations" ) );
TQWhatsThis::add( mLegacyMangleFromTo, i18n( GlobalSettings::self()->
legacyBodyInvitesItem()->whatsThis().utf8() ) );
- connect( mLegacyBodyInvites, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotLegacyBodyInvitesToggled( bool ) ) );
- connect( mLegacyBodyInvites, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mLegacyBodyInvites, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotLegacyBodyInvitesToggled( bool ) ) );
+ connect( mLegacyBodyInvites, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
mExchangeCompatibleInvitations = new TQCheckBox( i18n( "Exchange compatible invitation naming" ), gBox );
TQToolTip::add( mExchangeCompatibleInvitations, i18n( "Outlook(tm), when used in combination with a Microsoft Exchange server,\nhas a problem understanding standards-compliant groupware e-mail.\nTurn this option on to send groupware invitations and replies in an Exchange compatible way." ) );
TQWhatsThis::add( mExchangeCompatibleInvitations, i18n( GlobalSettings::self()->
exchangeCompatibleInvitationsItem()->whatsThis().utf8() ) );
- connect( mExchangeCompatibleInvitations, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mExchangeCompatibleInvitations, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
mOutlookCompatibleInvitationComments = new TQCheckBox( i18n( "Outlook compatible invitation reply comments" ), gBox );
TQToolTip::add( mOutlookCompatibleInvitationComments, i18n( "Send invitation reply comments in a way that Microsoft Outlook(tm) understands." ) );
TQWhatsThis::add( mOutlookCompatibleInvitationComments, i18n( GlobalSettings::self()->
outlookCompatibleInvitationReplyCommentsItem()->whatsThis().utf8() ) );
- connect( mOutlookCompatibleInvitationComments, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mOutlookCompatibleInvitationComments, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
mAutomaticSending = new TQCheckBox( i18n( "Automatic invitation sending" ), gBox );
TQToolTip::add( mAutomaticSending, i18n( "When this is on, the user will not see the mail composer window. Invitation mails are sent automatically" ) );
TQWhatsThis::add( mAutomaticSending, i18n( GlobalSettings::self()->
automaticSendingItem()->whatsThis().utf8() ) );
- connect( mAutomaticSending, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mAutomaticSending, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
// Open space padding at the end
new TQLabel( this );
@@ -5174,8 +5174,8 @@ AccountUpdater::AccountUpdater(ImapAccountBase *account)
void AccountUpdater::update()
{
- connect( mAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ),
- this, TQT_SLOT( namespacesFetched() ) );
+ connect( mAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ),
+ this, TQ_SLOT( namespacesFetched() ) );
mAccount->makeConnection();
}
diff --git a/kmail/configuredialog.h b/kmail/configuredialog.h
index acd0bc5a..84887169 100644
--- a/kmail/configuredialog.h
+++ b/kmail/configuredialog.h
@@ -33,7 +33,7 @@ namespace KMail {
class ConfigureDialog : public KCMultiDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -78,7 +78,7 @@ private:
* takes care of that.
*/
class AccountUpdater : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
AccountUpdater(KMail::ImapAccountBase *account);
diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp
index 83c13a31..f244bc8e 100644
--- a/kmail/configuredialog_p.cpp
+++ b/kmail/configuredialog_p.cpp
@@ -53,8 +53,8 @@ NewIdentityDialog::NewIdentityDialog( const TQStringList & identities,
mLineEdit->setFocus();
hlay->addWidget( new TQLabel( mLineEdit, i18n("&New identity:"), page ) );
hlay->addWidget( mLineEdit, 1 );
- connect( mLineEdit, TQT_SIGNAL(textChanged(const TQString&)),
- this, TQT_SLOT(slotEnableOK(const TQString&)) );
+ connect( mLineEdit, TQ_SIGNAL(textChanged(const TQString&)),
+ this, TQ_SLOT(slotEnableOK(const TQString&)) );
mButtonGroup = new TQButtonGroup( page );
mButtonGroup->hide();
@@ -89,10 +89,10 @@ NewIdentityDialog::NewIdentityDialog( const TQStringList & identities,
// enable/disable combobox and label depending on the third radio
// button's state:
- connect( radio, TQT_SIGNAL(toggled(bool)),
- label, TQT_SLOT(setEnabled(bool)) );
- connect( radio, TQT_SIGNAL(toggled(bool)),
- mComboBox, TQT_SLOT(setEnabled(bool)) );
+ connect( radio, TQ_SIGNAL(toggled(bool)),
+ label, TQ_SLOT(setEnabled(bool)) );
+ connect( radio, TQ_SIGNAL(toggled(bool)),
+ mComboBox, TQ_SLOT(setEnabled(bool)) );
enableButtonOK( false ); // since line edit is empty
}
@@ -305,12 +305,12 @@ ProfileDialog::ProfileDialog( TQWidget * parent, const char * name, bool modal )
setup();
- connect( mListView, TQT_SIGNAL(selectionChanged()),
- TQT_SLOT(slotSelectionChanged()) );
- connect( mListView, TQT_SIGNAL(doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
- TQT_SLOT(slotOk()) );
+ connect( mListView, TQ_SIGNAL(selectionChanged()),
+ TQ_SLOT(slotSelectionChanged()) );
+ connect( mListView, TQ_SIGNAL(doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
+ TQ_SLOT(slotOk()) );
- connect( this, TQT_SIGNAL(finished()), TQT_SLOT(delayedDestruct()) );
+ connect( this, TQ_SIGNAL(finished()), TQ_SLOT(delayedDestruct()) );
enableButtonOK( false );
}
@@ -375,8 +375,8 @@ ConfigModuleWithTabs::ConfigModuleWithTabs( TQWidget * parent,
void ConfigModuleWithTabs::addTab( ConfigModuleTab* tab, const TQString & title ) {
mTabWidget->addTab( tab, title );
- connect( tab, TQT_SIGNAL(changed( bool )),
- this, TQT_SIGNAL(changed( bool )) );
+ connect( tab, TQ_SIGNAL(changed( bool )),
+ this, TQ_SIGNAL(changed( bool )) );
}
void ConfigModuleWithTabs::load() {
diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h
index 3d8447a0..f8eecdeb 100644
--- a/kmail/configuredialog_p.h
+++ b/kmail/configuredialog_p.h
@@ -76,7 +76,7 @@ namespace Kleo {
class NewIdentityDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -122,7 +122,7 @@ typedef TQValueList<LanguageItem> LanguageItemList;
class NewLanguageDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -137,7 +137,7 @@ class NewLanguageDialog : public KDialogBase
class LanguageComboBox : public TQComboBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -154,7 +154,7 @@ class LanguageComboBox : public TQComboBox
//
class ProfileDialog : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
ProfileDialog( TQWidget * parent=0, const char * name=0, bool modal=false );
@@ -176,7 +176,7 @@ private:
#include <kdialog.h>
class ConfigModule : public TDECModule {
- Q_OBJECT
+ TQ_OBJECT
public:
ConfigModule( TQWidget * parent=0, const char * name=0 )
@@ -204,7 +204,7 @@ signals:
// Individual tab of a ConfigModuleWithTabs
class ConfigModuleTab : public TQWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
ConfigModuleTab( TQWidget *parent=0, const char* name=0 )
@@ -239,7 +239,7 @@ private:
* It simply forwards load and save operations to all tabs.
*/
class ConfigModuleWithTabs : public ConfigModule {
- Q_OBJECT
+ TQ_OBJECT
public:
ConfigModuleWithTabs( TQWidget * parent=0, const char * name=0 );
@@ -267,7 +267,7 @@ private:
//
class KDE_EXPORT IdentityPage : public ConfigModule {
- Q_OBJECT
+ TQ_OBJECT
public:
IdentityPage( TQWidget * parent=0, const char * name=0 );
@@ -318,7 +318,7 @@ private: // data members
// subclasses: one class per tab:
class AccountsPageSendingTab : public ConfigModuleTab {
- Q_OBJECT
+ TQ_OBJECT
public:
AccountsPageSendingTab( TQWidget * parent=0, const char * name=0 );
@@ -356,7 +356,7 @@ private:
class AccountsPageReceivingTab : public ConfigModuleTab {
- Q_OBJECT
+ TQ_OBJECT
public:
AccountsPageReceivingTab( TQWidget * parent=0, const char * name=0 );
@@ -401,7 +401,7 @@ private:
};
class KDE_EXPORT AccountsPage : public ConfigModuleWithTabs {
- Q_OBJECT
+ TQ_OBJECT
public:
AccountsPage( TQWidget * parent=0, const char * name=0 );
@@ -429,7 +429,7 @@ private:
//
class AppearancePageFontsTab : public ConfigModuleTab {
- Q_OBJECT
+ TQ_OBJECT
public:
AppearancePageFontsTab( TQWidget * parent=0, const char * name=0 );
@@ -457,7 +457,7 @@ private:
};
class AppearancePageColorsTab : public ConfigModuleTab {
- Q_OBJECT
+ TQ_OBJECT
public:
AppearancePageColorsTab( TQWidget * parent=0, const char * name=0 );
@@ -479,7 +479,7 @@ private:
};
class AppearancePageLayoutTab : public ConfigModuleTab {
- Q_OBJECT
+ TQ_OBJECT
public:
AppearancePageLayoutTab( TQWidget * parent=0, const char * name=0 );
@@ -502,7 +502,7 @@ private: // data
};
class AppearancePageHeadersTab : public ConfigModuleTab {
- Q_OBJECT
+ TQ_OBJECT
public:
AppearancePageHeadersTab( TQWidget * parent=0, const char * name=0 );
@@ -529,7 +529,7 @@ private: // data
};
class AppearancePageReaderTab : public ConfigModuleTab {
- Q_OBJECT
+ TQ_OBJECT
public:
AppearancePageReaderTab( TQWidget * parent=0, const char * name=0 );
@@ -561,7 +561,7 @@ private: // data
class AppearancePageSystemTrayTab : public ConfigModuleTab {
- Q_OBJECT
+ TQ_OBJECT
public:
AppearancePageSystemTrayTab( TQWidget * parent=0, const char * name=0 );
@@ -580,7 +580,7 @@ private: // data
};
class KDE_EXPORT AppearancePage : public ConfigModuleWithTabs {
- Q_OBJECT
+ TQ_OBJECT
public:
AppearancePage( TQWidget * parent=0, const char * name=0 );
@@ -611,7 +611,7 @@ private:
//
class ComposerPageGeneralTab : public ConfigModuleTab {
- Q_OBJECT
+ TQ_OBJECT
public:
ComposerPageGeneralTab( TQWidget * parent=0, const char * name=0 );
@@ -645,7 +645,7 @@ private:
};
class ComposerPagePhrasesTab : public ConfigModuleTab {
- Q_OBJECT
+ TQ_OBJECT
public:
ComposerPagePhrasesTab( TQWidget * parent=0, const char * name=0 );
@@ -677,7 +677,7 @@ private:
};
class ComposerPageTemplatesTab : public ConfigModuleTab {
- Q_OBJECT
+ TQ_OBJECT
public:
ComposerPageTemplatesTab( TQWidget * parent=0, const char * name=0 );
@@ -695,7 +695,7 @@ private:
};
class ComposerPageCustomTemplatesTab : public ConfigModuleTab {
- Q_OBJECT
+ TQ_OBJECT
public:
ComposerPageCustomTemplatesTab( TQWidget * parent=0, const char * name=0 );
@@ -713,7 +713,7 @@ private:
};
class ComposerPageSubjectTab : public ConfigModuleTab {
- Q_OBJECT
+ TQ_OBJECT
public:
ComposerPageSubjectTab( TQWidget * parent=0, const char * name=0 );
@@ -732,7 +732,7 @@ private:
};
class ComposerPageCharsetTab : public ConfigModuleTab {
- Q_OBJECT
+ TQ_OBJECT
public:
ComposerPageCharsetTab( TQWidget * parent=0, const char * name=0 );
@@ -754,7 +754,7 @@ private:
};
class ComposerPageHeadersTab : public ConfigModuleTab {
- Q_OBJECT
+ TQ_OBJECT
public:
ComposerPageHeadersTab( TQWidget * parent=0, const char * name=0 );
@@ -787,7 +787,7 @@ private:
};
class ComposerPageAttachmentsTab : public ConfigModuleTab {
- Q_OBJECT
+ TQ_OBJECT
public:
ComposerPageAttachmentsTab( TQWidget * parent=0, const char * name=0 );
@@ -809,7 +809,7 @@ private:
};
class KDE_EXPORT ComposerPage : public ConfigModuleWithTabs {
- Q_OBJECT
+ TQ_OBJECT
public:
ComposerPage( TQWidget * parent=0, const char * name=0 );
@@ -844,7 +844,7 @@ private:
//
class SecurityPageGeneralTab : public ConfigModuleTab {
- Q_OBJECT
+ TQ_OBJECT
public:
SecurityPageGeneralTab( TQWidget * parent=0, const char * name=0 );
@@ -870,7 +870,7 @@ private:
class SecurityPageComposerCryptoTab : public ConfigModuleTab {
- Q_OBJECT
+ TQ_OBJECT
public:
SecurityPageComposerCryptoTab( TQWidget * parent=0, const char * name=0 );
@@ -890,7 +890,7 @@ private:
};
class SecurityPageWarningTab : public ConfigModuleTab {
- Q_OBJECT
+ TQ_OBJECT
public:
SecurityPageWarningTab( TQWidget * parent=0, const char * name=0 );
@@ -913,7 +913,7 @@ private:
};
class SecurityPageSMimeTab : public ConfigModuleTab, public DCOPObject {
- Q_OBJECT
+ TQ_OBJECT
K_DCOP
public:
@@ -941,7 +941,7 @@ private:
class SecurityPageCryptPlugTab : public ConfigModuleTab
{
- Q_OBJECT
+ TQ_OBJECT
public:
SecurityPageCryptPlugTab( TQWidget * parent = 0, const char* name = 0 );
@@ -960,7 +960,7 @@ private:
};
class KDE_EXPORT SecurityPage : public ConfigModuleWithTabs {
- Q_OBJECT
+ TQ_OBJECT
public:
SecurityPage( TQWidget * parent=0, const char * name=0 );
@@ -992,7 +992,7 @@ private:
//
class MiscPageFolderTab : public ConfigModuleTab {
- Q_OBJECT
+ TQ_OBJECT
public:
MiscPageFolderTab( TQWidget * parent=0, const char * name=0 );
@@ -1023,7 +1023,7 @@ private:
};
class MiscPageGroupwareTab : public ConfigModuleTab {
- Q_OBJECT
+ TQ_OBJECT
public:
MiscPageGroupwareTab( TQWidget * parent=0, const char * name=0 );
@@ -1065,7 +1065,7 @@ private:
};
class KDE_EXPORT MiscPage : public ConfigModuleWithTabs {
- Q_OBJECT
+ TQ_OBJECT
public:
MiscPage( TQWidget * parent=0, const char * name=0 );
@@ -1086,7 +1086,7 @@ private:
//
class ListView : public TDEListView {
- Q_OBJECT
+ TQ_OBJECT
public:
ListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 );
diff --git a/kmail/copyfolderjob.cpp b/kmail/copyfolderjob.cpp
index 165d9468..a237db10 100644
--- a/kmail/copyfolderjob.cpp
+++ b/kmail/copyfolderjob.cpp
@@ -95,8 +95,8 @@ void CopyFolderJob::copyMessagesToTargetDir()
slotCopyNextChild(); // no contents, check subfolders
} else {
KMCommand *command = new KMCopyCommand( mNewFolder, msgList );
- connect( command, TQT_SIGNAL( completed( KMCommand * ) ),
- this, TQT_SLOT( slotCopyCompleted( KMCommand * ) ) );
+ connect( command, TQ_SIGNAL( completed( KMCommand * ) ),
+ this, TQ_SLOT( slotCopyCompleted( KMCommand * ) ) );
command->start();
}
}
@@ -104,8 +104,8 @@ void CopyFolderJob::copyMessagesToTargetDir()
void CopyFolderJob::slotCopyCompleted( KMCommand* command )
{
kdDebug(5006) << k_funcinfo << (command?command->result():0) << endl;
- disconnect( command, TQT_SIGNAL( completed( KMCommand * ) ),
- this, TQT_SLOT( slotCopyCompleted( KMCommand * ) ) );
+ disconnect( command, TQ_SIGNAL( completed( KMCommand * ) ),
+ this, TQ_SLOT( slotCopyCompleted( KMCommand * ) ) );
mStorage->blockSignals( false );
@@ -160,8 +160,8 @@ void CopyFolderJob::slotCopyNextChild( bool success )
// let it do its thing and report back when we are ready to do the next sibling
mNextChildFolder->open( "copyfolder" ); // refcount
FolderJob* job = new CopyFolderJob( mNextChildFolder->storage(), dir);
- connect( job, TQT_SIGNAL( folderCopyComplete( bool ) ),
- this, TQT_SLOT( slotCopyNextChild( bool ) ) );
+ connect( job, TQ_SIGNAL( folderCopyComplete( bool ) ),
+ this, TQ_SLOT( slotCopyNextChild( bool ) ) );
job->start();
}
@@ -194,8 +194,8 @@ bool CopyFolderJob::createTargetDir()
TQString imapPath;
imapPath = anAccount->createImapPath( selectedStorage->imapPath(), mStorage->folder()->name() );
KMFolderImap* newStorage = static_cast<KMFolderImap*>( mNewFolder->storage() );
- connect( selectedStorage, TQT_SIGNAL(folderCreationResult(const TQString&, bool)),
- this, TQT_SLOT(folderCreationDone(const TQString&, bool)) );
+ connect( selectedStorage, TQ_SIGNAL(folderCreationResult(const TQString&, bool)),
+ this, TQ_SLOT(folderCreationDone(const TQString&, bool)) );
selectedStorage->createFolder(mStorage->folder()->name(), TQString()); // create it on the server
newStorage->initializeFrom( selectedStorage, imapPath, TQString() );
static_cast<KMFolderImap*>(mNewParent->owner()->storage())->setAccount( selectedStorage->account() );
diff --git a/kmail/copyfolderjob.h b/kmail/copyfolderjob.h
index 02f05d2d..43f08ec3 100644
--- a/kmail/copyfolderjob.h
+++ b/kmail/copyfolderjob.h
@@ -49,7 +49,7 @@ namespace KMail {
*/
class CopyFolderJob : public FolderJob
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp
index 5daf001d..4d4080ed 100644
--- a/kmail/customtemplates.cpp
+++ b/kmail/customtemplates.cpp
@@ -68,29 +68,29 @@ CustomTemplates::CustomTemplates( TQWidget *parent, const char *name )
mEditFrame->setEnabled( false );
- connect( mName, TQT_SIGNAL( textChanged ( const TQString &) ),
- this, TQT_SLOT( slotNameChanged( const TQString & ) ) );
- connect( mEdit, TQT_SIGNAL( textChanged() ),
- this, TQT_SLOT( slotTextChanged( void ) ) );
- connect( mToEdit, TQT_SIGNAL( textChanged(const TQString&) ),
- this, TQT_SLOT( slotTextChanged( void ) ) );
- connect( mCCEdit, TQT_SIGNAL( textChanged(const TQString&) ),
- this, TQT_SLOT( slotTextChanged( void ) ) );
-
- connect( mInsertCommand, TQT_SIGNAL( insertCommand(TQString, int) ),
- this, TQT_SLOT( slotInsertCommand(TQString, int) ) );
-
- connect( mAdd, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotAddClicked() ) );
- connect( mRemove, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotRemoveClicked() ) );
- connect( mList, TQT_SIGNAL( selectionChanged() ),
- this, TQT_SLOT( slotListSelectionChanged() ) );
- connect( mType, TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( slotTypeActivated( int ) ) );
-
- connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ),
- this, TQT_SLOT( slotShortcutCaptured( const TDEShortcut& ) ) );
+ connect( mName, TQ_SIGNAL( textChanged ( const TQString &) ),
+ this, TQ_SLOT( slotNameChanged( const TQString & ) ) );
+ connect( mEdit, TQ_SIGNAL( textChanged() ),
+ this, TQ_SLOT( slotTextChanged( void ) ) );
+ connect( mToEdit, TQ_SIGNAL( textChanged(const TQString&) ),
+ this, TQ_SLOT( slotTextChanged( void ) ) );
+ connect( mCCEdit, TQ_SIGNAL( textChanged(const TQString&) ),
+ this, TQ_SLOT( slotTextChanged( void ) ) );
+
+ connect( mInsertCommand, TQ_SIGNAL( insertCommand(TQString, int) ),
+ this, TQ_SLOT( slotInsertCommand(TQString, int) ) );
+
+ connect( mAdd, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotAddClicked() ) );
+ connect( mRemove, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotRemoveClicked() ) );
+ connect( mList, TQ_SIGNAL( selectionChanged() ),
+ this, TQ_SLOT( slotListSelectionChanged() ) );
+ connect( mType, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( slotTypeActivated( int ) ) );
+
+ connect( mKeyButton, TQ_SIGNAL( capturedShortcut( const TDEShortcut& ) ),
+ this, TQ_SLOT( slotShortcutCaptured( const TDEShortcut& ) ) );
mReplyPix = TDEIconLoader().loadIcon( "mail-reply-sender", TDEIcon::Small );
mReplyAllPix = TDEIconLoader().loadIcon( "mail-reply-all", TDEIcon::Small );
diff --git a/kmail/customtemplates.h b/kmail/customtemplates.h
index b117dd69..e8bca882 100644
--- a/kmail/customtemplates.h
+++ b/kmail/customtemplates.h
@@ -34,7 +34,7 @@ class TDEShortcut;
class CustomTemplates : public CustomTemplatesBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/customtemplates_base.ui b/kmail/customtemplates_base.ui
index 82d477b5..2d0d7796 100644
--- a/kmail/customtemplates_base.ui
+++ b/kmail/customtemplates_base.ui
@@ -351,10 +351,10 @@
<data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data>
</image>
</images>
-<Q_SLOTS>
+<slots>
<slot>mAdd_clicked()</slot>
<slot>mRemove_clicked()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">kactivelabel.h</include>
diff --git a/kmail/dictionarycombobox.cpp b/kmail/dictionarycombobox.cpp
index be705d3d..b6da5abf 100644
--- a/kmail/dictionarycombobox.cpp
+++ b/kmail/dictionarycombobox.cpp
@@ -48,10 +48,10 @@ namespace KMail {
mDefaultDictionary( 0 )
{
reloadCombo();
- connect( this, TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( slotDictionaryChanged( int ) ) );
- connect( this, TQT_SIGNAL( dictionaryChanged( int ) ),
- mSpellConfig, TQT_SLOT( sSetDictionary( int ) ) );
+ connect( this, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( slotDictionaryChanged( int ) ) );
+ connect( this, TQ_SIGNAL( dictionaryChanged( int ) ),
+ mSpellConfig, TQ_SLOT( sSetDictionary( int ) ) );
}
DictionaryComboBox::~DictionaryComboBox()
diff --git a/kmail/dictionarycombobox.h b/kmail/dictionarycombobox.h
index a6d3584a..101b86e7 100644
--- a/kmail/dictionarycombobox.h
+++ b/kmail/dictionarycombobox.h
@@ -46,7 +46,7 @@ namespace KMail {
**/
class DictionaryComboBox : public TQComboBox {
- Q_OBJECT
+ TQ_OBJECT
public:
DictionaryComboBox( TQWidget * parent=0, const char * name=0 );
diff --git a/kmail/editorwatcher.cpp b/kmail/editorwatcher.cpp
index a7f25c3b..fdff42f7 100644
--- a/kmail/editorwatcher.cpp
+++ b/kmail/editorwatcher.cpp
@@ -63,7 +63,7 @@ EditorWatcher::EditorWatcher(const KURL & url, const TQString &mimeType, bool op
mDone( false )
{
assert( mUrl.isLocalFile() );
- connect( &mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkEditDone()) );
+ connect( &mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(checkEditDone()) );
}
bool EditorWatcher::start()
@@ -88,7 +88,7 @@ bool EditorWatcher::start()
mInotifyWatch = inotify_add_watch( mInotifyFd, mUrl.path().latin1(), IN_CLOSE | IN_OPEN | IN_MODIFY );
if ( mInotifyWatch >= 0 ) {
TQSocketNotifier *sn = new TQSocketNotifier( mInotifyFd, TQSocketNotifier::Read, this );
- connect( sn, TQT_SIGNAL(activated(int)), TQT_SLOT(inotifyEvent()) );
+ connect( sn, TQ_SIGNAL(activated(int)), TQ_SLOT(inotifyEvent()) );
mHaveInotify = true;
mFileModified = false;
}
@@ -101,7 +101,7 @@ bool EditorWatcher::start()
TQStringList params = KRun::processDesktopExec( *offer, list, false );
mEditor = new TDEProcess( this );
*mEditor << params;
- connect( mEditor, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(editorExited()) );
+ connect( mEditor, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(editorExited()) );
if ( !mEditor->start() )
return false;
mEditorRunning = true;
diff --git a/kmail/editorwatcher.h b/kmail/editorwatcher.h
index 9a408d69..9d85a061 100644
--- a/kmail/editorwatcher.h
+++ b/kmail/editorwatcher.h
@@ -37,7 +37,7 @@ namespace KMail {
*/
class EditorWatcher : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kmail/expirejob.cpp b/kmail/expirejob.cpp
index a3749947..b38ad294 100644
--- a/kmail/expirejob.cpp
+++ b/kmail/expirejob.cpp
@@ -107,7 +107,7 @@ void ExpireJob::execute()
mFolderOpen = true;
mCurrentIndex = storage->count()-1;
kdDebug(5006) << "ExpireJob: starting to expire in folder " << mSrcFolder->location() << endl;
- connect( &mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDoWork() ) );
+ connect( &mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDoWork() ) );
mTimer.start( EXPIREJOB_TIMERINTERVAL );
slotDoWork();
// do nothing here, we might be deleted!
@@ -169,8 +169,8 @@ void ExpireJob::done()
<< mSrcFolder->location()
<< " " << count << " messages to remove." << endl;
KMMoveCommand* cmd = new KMMoveCommand( 0, mRemovedMsgs );
- connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ),
- this, TQT_SLOT( slotMessagesMoved( KMCommand * ) ) );
+ connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ),
+ this, TQ_SLOT( slotMessagesMoved( KMCommand * ) ) );
cmd->start();
moving = true;
str = i18n( "Removing 1 old message from folder %1...",
@@ -191,8 +191,8 @@ void ExpireJob::done()
<< mRemovedMsgs.count() << " messages to move to "
<< mMoveToFolder->label() << endl;
KMMoveCommand* cmd = new KMMoveCommand( mMoveToFolder, mRemovedMsgs );
- connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ),
- this, TQT_SLOT( slotMessagesMoved( KMCommand * ) ) );
+ connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ),
+ this, TQ_SLOT( slotMessagesMoved( KMCommand * ) ) );
cmd->start();
moving = true;
str = i18n( "Moving 1 old message from folder %1 to folder %2...",
diff --git a/kmail/expirejob.h b/kmail/expirejob.h
index dbdb6a3a..4371ed0f 100644
--- a/kmail/expirejob.h
+++ b/kmail/expirejob.h
@@ -35,7 +35,7 @@ namespace KMail {
class ExpireJob : public ScheduledJob
{
- Q_OBJECT
+ TQ_OBJECT
public:
ExpireJob( KMFolder* folder, bool immediate );
diff --git a/kmail/expirypropertiesdialog.cpp b/kmail/expirypropertiesdialog.cpp
index f1c3274f..76e8d219 100644
--- a/kmail/expirypropertiesdialog.cpp
+++ b/kmail/expirypropertiesdialog.cpp
@@ -44,8 +44,8 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo
expireReadMailCB = new TQCheckBox( privateLayoutWidget, "expireReadMailCB" );
expireReadMailCB->setText( i18n( "Expire read mails after" ) );
- connect( expireReadMailCB, TQT_SIGNAL( toggled( bool )),
- this, TQT_SLOT( slotUpdateControls() ) );
+ connect( expireReadMailCB, TQ_SIGNAL( toggled( bool )),
+ this, TQ_SLOT( slotUpdateControls() ) );
readHBox->addWidget( expireReadMailCB );
expireReadMailSB = new TQSpinBox( privateLayoutWidget, "expireReadMailSB" );
@@ -62,8 +62,8 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo
expireUnreadMailCB = new TQCheckBox( privateLayoutWidget, "expireUnreadMailCB" );
expireUnreadMailCB->setText( i18n( "Expire unread mails after" ) );
- connect( expireUnreadMailCB, TQT_SIGNAL( toggled( bool )),
- this, TQT_SLOT( slotUpdateControls() ) );
+ connect( expireUnreadMailCB, TQ_SIGNAL( toggled( bool )),
+ this, TQ_SLOT( slotUpdateControls() ) );
unreadHBox->addWidget( expireUnreadMailCB );
expireUnreadMailSB = new TQSpinBox( privateLayoutWidget, "expireUnreadMailSB" );
@@ -92,8 +92,8 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo
moveToRB = new TQRadioButton( privateLayoutWidget, "moveToRB" );
actionsGroup->insert( moveToRB );
- connect( moveToRB, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotUpdateControls() ) );
+ connect( moveToRB, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotUpdateControls() ) );
moveToRB->setText( i18n( "Move to:" ) );
moveToHBox->addWidget( moveToRB );
diff --git a/kmail/expirypropertiesdialog.h b/kmail/expirypropertiesdialog.h
index b50a73db..36e11a7f 100644
--- a/kmail/expirypropertiesdialog.h
+++ b/kmail/expirypropertiesdialog.h
@@ -32,7 +32,7 @@ namespace KMail {
class ExpiryPropertiesDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp
index 22d093aa..543ea18f 100644
--- a/kmail/favoritefolderview.cpp
+++ b/kmail/favoritefolderview.cpp
@@ -55,15 +55,15 @@ FavoriteFolderViewItem::FavoriteFolderViewItem(FavoriteFolderView * parent, cons
{
// same stuff as in KMFolderTreeItem again, this time even with virtual methods working
init();
- connect( folder, TQT_SIGNAL(nameChanged()), TQT_SLOT(nameChanged()) );
- connect( folder, TQT_SIGNAL(iconsChanged()), TQT_SLOT(slotIconsChanged()) );
+ connect( folder, TQ_SIGNAL(nameChanged()), TQ_SLOT(nameChanged()) );
+ connect( folder, TQ_SIGNAL(iconsChanged()), TQ_SLOT(slotIconsChanged()) );
- connect( folder, TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), TQT_SLOT(updateCount()) );
- connect( folder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), TQT_SLOT(updateCount()) );
- connect( folder, TQT_SIGNAL(msgRemoved(KMFolder*)), TQT_SLOT(updateCount()) );
- connect( folder, TQT_SIGNAL(folderSizeChanged( KMFolder* )), TQT_SLOT(updateCount()) );
+ connect( folder, TQ_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), TQ_SLOT(updateCount()) );
+ connect( folder, TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)), TQ_SLOT(updateCount()) );
+ connect( folder, TQ_SIGNAL(msgRemoved(KMFolder*)), TQ_SLOT(updateCount()) );
+ connect( folder, TQ_SIGNAL(folderSizeChanged( KMFolder* )), TQ_SLOT(updateCount()) );
- TQTimer::singleShot( 0, this, TQT_SLOT(updateCount()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(updateCount()) );
if ( unreadCount() > 0 )
setPixmap( 0, unreadIcon( iconSize() ) );
@@ -97,23 +97,23 @@ FavoriteFolderView::FavoriteFolderView( KMMainWidget *mainWidget, TQWidget * par
setSorting( -1 );
setShowSortIndicator( false );
- connect( this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(selectionChanged()) );
- connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(itemClicked(TQListViewItem*)) );
- connect( this, TQT_SIGNAL(dropped(TQDropEvent*,TQListViewItem*)), TQT_SLOT(dropped(TQDropEvent*,TQListViewItem*)) );
- connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)),
- TQT_SLOT(contextMenu(TQListViewItem*,const TQPoint&)) );
- connect( this, TQT_SIGNAL(moved()), TQT_SLOT(notifyInstancesOnChange()) );
- connect( this, TQT_SIGNAL(triggerRefresh()), TQT_SLOT(refresh()) );
+ connect( this, TQ_SIGNAL(selectionChanged()), TQ_SLOT(selectionChanged()) );
+ connect( this, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(itemClicked(TQListViewItem*)) );
+ connect( this, TQ_SIGNAL(dropped(TQDropEvent*,TQListViewItem*)), TQ_SLOT(dropped(TQDropEvent*,TQListViewItem*)) );
+ connect( this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)),
+ TQ_SLOT(contextMenu(TQListViewItem*,const TQPoint&)) );
+ connect( this, TQ_SIGNAL(moved()), TQ_SLOT(notifyInstancesOnChange()) );
+ connect( this, TQ_SIGNAL(triggerRefresh()), TQ_SLOT(refresh()) );
- connect( kmkernel->folderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(initializeFavorites()) );
- connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(initializeFavorites()) );
- connect( kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(initializeFavorites()) );
- connect( kmkernel->searchFolderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(initializeFavorites()) );
+ connect( kmkernel->folderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(initializeFavorites()) );
+ connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(initializeFavorites()) );
+ connect( kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(initializeFavorites()) );
+ connect( kmkernel->searchFolderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(initializeFavorites()) );
- connect( kmkernel->folderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), TQT_SLOT(folderRemoved(KMFolder*)) );
- connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), TQT_SLOT(folderRemoved(KMFolder*)) );
- connect( kmkernel->imapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), TQT_SLOT(folderRemoved(KMFolder*)) );
- connect( kmkernel->searchFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), TQT_SLOT(folderRemoved(KMFolder*)) );
+ connect( kmkernel->folderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), TQ_SLOT(folderRemoved(KMFolder*)) );
+ connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), TQ_SLOT(folderRemoved(KMFolder*)) );
+ connect( kmkernel->imapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), TQ_SLOT(folderRemoved(KMFolder*)) );
+ connect( kmkernel->searchFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), TQ_SLOT(folderRemoved(KMFolder*)) );
TQFont f = font();
f.setItalic( true );
@@ -153,7 +153,7 @@ void FavoriteFolderView::readConfig()
ensureItemVisible( firstChild() );
// folder tree is not yet populated at this point
- TQTimer::singleShot( 0, this, TQT_SLOT(initializeFavorites()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(initializeFavorites()) );
readColorConfig();
mReadingConfig = false;
@@ -334,18 +334,18 @@ void FavoriteFolderView::contextMenu(TQListViewItem * item, const TQPoint & poin
mainWidget()->action("empty")->plug( &contextMenu );
contextMenu.insertSeparator();
- contextMenu.insertItem( SmallIconSet("configure_shortcuts"), i18n("&Assign Shortcut..."), fti, TQT_SLOT(assignShortcut()) );
- contextMenu.insertItem( i18n("Expire..."), fti, TQT_SLOT(slotShowExpiryProperties()) );
+ contextMenu.insertItem( SmallIconSet("configure_shortcuts"), i18n("&Assign Shortcut..."), fti, TQ_SLOT(assignShortcut()) );
+ contextMenu.insertItem( i18n("Expire..."), fti, TQ_SLOT(slotShowExpiryProperties()) );
mainWidget()->action("modify")->plug( &contextMenu );
contextMenu.insertSeparator();
contextMenu.insertItem( SmallIconSet("edit-delete"), i18n("Remove From Favorites"),
- this, TQT_SLOT(removeFolder()) );
- contextMenu.insertItem( SmallIconSet("edit"), i18n("Rename Favorite"), this, TQT_SLOT(renameFolder()) );
+ this, TQ_SLOT(removeFolder()) );
+ contextMenu.insertItem( SmallIconSet("edit"), i18n("Rename Favorite"), this, TQ_SLOT(renameFolder()) );
} else {
contextMenu.insertItem( SmallIconSet("bookmark_add"), i18n("Add Favorite Folder..."),
- this, TQT_SLOT(addFolder()) );
+ this, TQ_SLOT(addFolder()) );
}
contextMenu.exec( point, 0 );
}
diff --git a/kmail/favoritefolderview.h b/kmail/favoritefolderview.h
index 19fd49a9..604c5e44 100644
--- a/kmail/favoritefolderview.h
+++ b/kmail/favoritefolderview.h
@@ -27,7 +27,7 @@ class FavoriteFolderView;
class FavoriteFolderViewItem : public KMFolderTreeItem
{
- Q_OBJECT
+ TQ_OBJECT
public:
FavoriteFolderViewItem( FavoriteFolderView *parent, const TQString & name, KMFolder* folder );
@@ -45,7 +45,7 @@ class FavoriteFolderViewItem : public KMFolderTreeItem
class FavoriteFolderView : public FolderTreeBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/filehtmlwriter.cpp b/kmail/filehtmlwriter.cpp
index abad6420..8c74ebb6 100644
--- a/kmail/filehtmlwriter.cpp
+++ b/kmail/filehtmlwriter.cpp
@@ -96,7 +96,7 @@ namespace KMail {
if ( !mFile.open( IO_WriteOnly ) )
kdWarning( 5006 ) << "FileHtmlWriter: Cannot open file " << mFile.name() << endl;
else
- mStream.setDevice( &TQT_TQIODEVICE_OBJECT(mFile) );
+ mStream.setDevice( &mFile );
}
void FileHtmlWriter::embedPart( const TQCString & contentId, const TQString & url ) {
diff --git a/kmail/filterimporterexporter.cpp b/kmail/filterimporterexporter.cpp
index df91b8dc..6703ef1d 100644
--- a/kmail/filterimporterexporter.cpp
+++ b/kmail/filterimporterexporter.cpp
@@ -66,8 +66,8 @@ FilterSelectionDialog::FilterSelectionDialog( TQWidget * parent )
buttonLayout->addWidget( selectAllButton );
unselectAllButton = new KPushButton( i18n( "Unselect All" ), w );
buttonLayout->addWidget( unselectAllButton );
- connect( selectAllButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSelectAllButton() ) );
- connect( unselectAllButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUnselectAllButton() ) );
+ connect( selectAllButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSelectAllButton() ) );
+ connect( unselectAllButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUnselectAllButton() ) );
resize( 300, 350 );
}
diff --git a/kmail/filterimporterexporter.h b/kmail/filterimporterexporter.h
index 37f4aab9..fcdf1765 100644
--- a/kmail/filterimporterexporter.h
+++ b/kmail/filterimporterexporter.h
@@ -67,7 +67,7 @@ private:
};
class FilterSelectionDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
FilterSelectionDialog( TQWidget * parent = 0 );
diff --git a/kmail/filterlog.h b/kmail/filterlog.h
index 6e84d6f1..432be2f4 100644
--- a/kmail/filterlog.h
+++ b/kmail/filterlog.h
@@ -52,7 +52,7 @@ namespace KMail {
*/
class FilterLog : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/filterlogdlg.cpp b/kmail/filterlogdlg.cpp
index eaaefd79..6ea6e29d 100644
--- a/kmail/filterlogdlg.cpp
+++ b/kmail/filterlogdlg.cpp
@@ -73,8 +73,8 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent )
mLogActiveBox = new TQCheckBox( i18n("&Log filter activities"), page );
mLogActiveBox->setChecked( FilterLog::instance()->isLogging() );
- connect( mLogActiveBox, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotSwitchLogState(void)) );
+ connect( mLogActiveBox, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotSwitchLogState(void)) );
TQWhatsThis::add( mLogActiveBox,
i18n( "You can turn logging of filter activities on and off here. "
"Of course, log data is collected and shown only when logging "
@@ -82,15 +82,15 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent )
mLogDetailsBox = new TQVGroupBox( i18n( "Logging Details" ), page );
mLogDetailsBox->setEnabled( mLogActiveBox->isChecked() );
- connect( mLogActiveBox, TQT_SIGNAL( toggled( bool ) ),
- mLogDetailsBox, TQT_SLOT( setEnabled( bool ) ) );
+ connect( mLogActiveBox, TQ_SIGNAL( toggled( bool ) ),
+ mLogDetailsBox, TQ_SLOT( setEnabled( bool ) ) );
mLogPatternDescBox = new TQCheckBox( i18n("Log pattern description"),
mLogDetailsBox );
mLogPatternDescBox->setChecked(
FilterLog::instance()->isContentTypeEnabled( FilterLog::patternDesc ) );
- connect( mLogPatternDescBox, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotChangeLogDetail(void)) );
+ connect( mLogPatternDescBox, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotChangeLogDetail(void)) );
// TODO
//TQWhatsThis::add( mLogPatternDescBox,
// i18n( "" ) );
@@ -99,8 +99,8 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent )
mLogDetailsBox );
mLogRuleEvaluationBox->setChecked(
FilterLog::instance()->isContentTypeEnabled( FilterLog::ruleResult ) );
- connect( mLogRuleEvaluationBox, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotChangeLogDetail(void)) );
+ connect( mLogRuleEvaluationBox, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotChangeLogDetail(void)) );
TQWhatsThis::add( mLogRuleEvaluationBox,
i18n( "You can control the feedback in the log concerning the "
"evaluation of the filter rules of applied filters: "
@@ -113,8 +113,8 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent )
mLogDetailsBox );
mLogPatternResultBox->setChecked(
FilterLog::instance()->isContentTypeEnabled( FilterLog::patternResult ) );
- connect( mLogPatternResultBox, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotChangeLogDetail(void)) );
+ connect( mLogPatternResultBox, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotChangeLogDetail(void)) );
// TODO
//TQWhatsThis::add( mLogPatternResultBox,
// i18n( "" ) );
@@ -123,8 +123,8 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent )
mLogDetailsBox );
mLogFilterActionBox->setChecked(
FilterLog::instance()->isContentTypeEnabled( FilterLog::appliedAction ) );
- connect( mLogFilterActionBox, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotChangeLogDetail(void)) );
+ connect( mLogFilterActionBox, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotChangeLogDetail(void)) );
// TODO
//TQWhatsThis::add( mLogFilterActionBox,
// i18n( "" ) );
@@ -138,8 +138,8 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent )
mLogMemLimitSpin->setValue( FilterLog::instance()->getMaxLogSize() / 1024 );
mLogMemLimitSpin->setSuffix( " KB" );
mLogMemLimitSpin->setSpecialValueText( i18n("unlimited") );
- connect( mLogMemLimitSpin, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotChangeLogMemLimit(int)) );
+ connect( mLogMemLimitSpin, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotChangeLogMemLimit(int)) );
TQWhatsThis::add( mLogMemLimitSpin,
i18n( "Collecting log data uses memory to temporarily store the "
"log data; here you can limit the maximum amount of memory "
@@ -147,12 +147,12 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent )
"this limit then the oldest data will be discarded until "
"the limit is no longer exceeded. " ) );
- connect(FilterLog::instance(), TQT_SIGNAL(logEntryAdded(TQString)),
- this, TQT_SLOT(slotLogEntryAdded(TQString)));
- connect(FilterLog::instance(), TQT_SIGNAL(logShrinked(void)),
- this, TQT_SLOT(slotLogShrinked(void)));
- connect(FilterLog::instance(), TQT_SIGNAL(logStateChanged(void)),
- this, TQT_SLOT(slotLogStateChanged(void)));
+ connect(FilterLog::instance(), TQ_SIGNAL(logEntryAdded(TQString)),
+ this, TQ_SLOT(slotLogEntryAdded(TQString)));
+ connect(FilterLog::instance(), TQ_SIGNAL(logShrinked(void)),
+ this, TQ_SLOT(slotLogShrinked(void)));
+ connect(FilterLog::instance(), TQ_SIGNAL(logStateChanged(void)),
+ this, TQ_SLOT(slotLogStateChanged(void)));
setInitialSize( TQSize( 500, 500 ) );
#if !KDE_IS_VERSION( 3, 2, 91 )
diff --git a/kmail/filterlogdlg.h b/kmail/filterlogdlg.h
index d7b6a6dc..88daaf47 100644
--- a/kmail/filterlogdlg.h
+++ b/kmail/filterlogdlg.h
@@ -47,7 +47,7 @@ namespace KMail {
*/
class FilterLogDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/folderIface.h b/kmail/folderIface.h
index c8593d2c..37e6edff 100644
--- a/kmail/folderIface.h
+++ b/kmail/folderIface.h
@@ -42,7 +42,7 @@ namespace KMail {
class FolderIface : public TQObject,
public DCOPObject
{
- Q_OBJECT
+ TQ_OBJECT
//
K_DCOP
diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index 43d15a51..94cf2d48 100644
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@@ -117,9 +117,9 @@ KMail::ACLEntryDialog::ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQSt
TQLabel *noteLabel = new TQLabel( i18n( "<b>Note: </b>Renaming requires write permissions on the parent folder." ), page );
topLayout->addMultiCellWidget( noteLabel, 2, 2, 0, 2 );
- connect( mUserIdLineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) );
- connect( kabBtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSelectAddresses() ) );
- connect( mButtonGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotChanged() ) );
+ connect( mUserIdLineEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) );
+ connect( kabBtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSelectAddresses() ) );
+ connect( mButtonGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotChanged() ) );
enableButtonOK( false );
mUserIdLineEdit->setFocus();
@@ -338,12 +338,12 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent,
mListView->addColumn( i18n( "User Id" ) );
mListView->addColumn( i18n( "Permissions" ) );
- connect( mListView, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)),
- TQT_SLOT(slotEditACL(TQListViewItem*)) );
- connect( mListView, TQT_SIGNAL(returnPressed(TQListViewItem*)),
- TQT_SLOT(slotEditACL(TQListViewItem*)) );
- connect( mListView, TQT_SIGNAL(currentChanged(TQListViewItem*)),
- TQT_SLOT(slotSelectionChanged(TQListViewItem*)) );
+ connect( mListView, TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)),
+ TQ_SLOT(slotEditACL(TQListViewItem*)) );
+ connect( mListView, TQ_SIGNAL(returnPressed(TQListViewItem*)),
+ TQ_SLOT(slotEditACL(TQListViewItem*)) );
+ connect( mListView, TQ_SIGNAL(currentChanged(TQListViewItem*)),
+ TQ_SLOT(slotSelectionChanged(TQListViewItem*)) );
TQVBox* buttonBox = new TQVBox( mACLWidget );
buttonBox->setSpacing( KDialog::spacingHint() );
@@ -353,13 +353,13 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent,
TQWidget *spacer = new TQWidget( buttonBox );
spacer->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding );
- connect( mAddACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAddACL() ) );
- connect( mEditACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditACL() ) );
- connect( mRemoveACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemoveACL() ) );
+ connect( mAddACL, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAddACL() ) );
+ connect( mEditACL, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEditACL() ) );
+ connect( mRemoveACL, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemoveACL() ) );
mEditACL->setEnabled( false );
mRemoveACL->setEnabled( false );
- connect( this, TQT_SIGNAL( changed(bool) ), TQT_SLOT( slotChanged(bool) ) );
+ connect( this, TQ_SIGNAL( changed(bool) ), TQ_SLOT( slotChanged(bool) ) );
}
// Warning before save() this will return the url of the _parent_ folder, when creating a new one
@@ -457,8 +457,8 @@ void KMail::FolderDiaACLTab::load()
if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start
slotConnectionResult( -1, TQString() );
} else if ( state == ImapAccountBase::Connecting ) {
- connect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ),
- this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
+ connect( mImapAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ),
+ this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) );
} else { // Connected
slotConnectionResult( 0, TQString() );
}
@@ -466,8 +466,8 @@ void KMail::FolderDiaACLTab::load()
void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString& errorMsg )
{
- disconnect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ),
- this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
+ disconnect( mImapAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ),
+ this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) );
if ( errorCode ) {
if ( errorCode == -1 ) // unspecified error
mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) );
@@ -478,8 +478,8 @@ void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString
}
if ( mUserRightsState != KMail::ACLJobs::Ok ) {
- connect( mImapAccount, TQT_SIGNAL( receivedUserRights( KMFolder* ) ),
- this, TQT_SLOT( slotReceivedUserRights( KMFolder* ) ) );
+ connect( mImapAccount, TQ_SIGNAL( receivedUserRights( KMFolder* ) ),
+ this, TQ_SLOT( slotReceivedUserRights( KMFolder* ) ) );
KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
mImapAccount->getUserRights( folder, mImapPath );
}
@@ -506,15 +506,15 @@ void KMail::FolderDiaACLTab::startListing()
{
// List ACLs of folder - or its parent, if creating a new folder
mImapAccount->getACL( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(), mImapPath );
- connect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
- this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
+ connect( mImapAccount, TQ_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
+ this, TQ_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
}
void KMail::FolderDiaACLTab::slotReceivedACL( KMFolder* folder, TDEIO::Job* job, const KMail::ACLList& aclList )
{
if ( folder == ( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) ) {
- disconnect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
- this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
+ disconnect( mImapAccount, TQ_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
+ this, TQ_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
if ( job && job->error() ) {
if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION )
@@ -727,8 +727,8 @@ bool KMail::FolderDiaACLTab::save()
if ( mDlg->isNewFolder() ) {
// The folder isn't created yet, wait for it
// It's a two-step process (mkdir+listDir) so we wait for the dir listing to be complete
- connect( parentImap, TQT_SIGNAL( directoryListingFinished(KMFolderImap*) ),
- this, TQT_SLOT( slotDirectoryListingFinished(KMFolderImap*) ) );
+ connect( parentImap, TQ_SIGNAL( directoryListingFinished(KMFolderImap*) ),
+ this, TQ_SLOT( slotDirectoryListingFinished(KMFolderImap*) ) );
} else {
slotDirectoryListingFinished( parentImap );
}
@@ -756,10 +756,10 @@ void KMail::FolderDiaACLTab::slotDirectoryListingFinished(KMFolderImap* f)
jd.total = 1; jd.done = 0; jd.parent = 0;
mImapAccount->insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
- TQT_SLOT(slotMultiSetACLResult(TDEIO::Job *)));
- connect(job, TQT_SIGNAL(aclChanged( const TQString&, int )),
- TQT_SLOT(slotACLChanged( const TQString&, int )) );
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+ TQ_SLOT(slotMultiSetACLResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(aclChanged( const TQString&, int )),
+ TQ_SLOT(slotACLChanged( const TQString&, int )) );
}
void KMail::FolderDiaACLTab::slotMultiSetACLResult(TDEIO::Job* job)
diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h
index 0a5d6465..1c65f162 100644
--- a/kmail/folderdiaacltab.h
+++ b/kmail/folderdiaacltab.h
@@ -57,7 +57,7 @@ class ImapAccountBase;
* Internal class, only used by FolderDiaACLTab
*/
class ACLEntryDialog :public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -85,7 +85,7 @@ private:
*/
class FolderDiaACLTab : public FolderDiaTab
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp
index 2fd950b2..3afc0905 100644
--- a/kmail/folderdiaquotatab.cpp
+++ b/kmail/folderdiaquotatab.cpp
@@ -121,8 +121,8 @@ void KMail::FolderDiaQuotaTab::load()
if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start
slotConnectionResult( -1, TQString() );
} else if ( state == ImapAccountBase::Connecting ) {
- connect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ),
- this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
+ connect( mImapAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ),
+ this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) );
} else { // Connected
slotConnectionResult( 0, TQString() );
}
@@ -131,8 +131,8 @@ void KMail::FolderDiaQuotaTab::load()
void KMail::FolderDiaQuotaTab::slotConnectionResult( int errorCode, const TQString& errorMsg )
{
- disconnect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ),
- this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
+ disconnect( mImapAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ),
+ this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) );
if ( errorCode ) {
if ( errorCode == -1 ) // unspecified error
mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) );
@@ -141,8 +141,8 @@ void KMail::FolderDiaQuotaTab::slotConnectionResult( int errorCode, const TQStri
mLabel->setText( TDEIO::buildErrorString( errorCode, errorMsg ) );
return;
}
- connect( mImapAccount, TQT_SIGNAL( receivedStorageQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& ) ),
- this, TQT_SLOT( slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& ) ) );
+ connect( mImapAccount, TQ_SIGNAL( receivedStorageQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& ) ),
+ this, TQ_SLOT( slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& ) ) );
KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
mImapAccount->getStorageQuotaInfo( folder, mImapPath );
}
@@ -154,8 +154,8 @@ void KMail::FolderDiaQuotaTab::slotReceivedQuotaInfo( KMFolder* folder,
if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) {
//KMFolderImap* folderImap = static_cast<KMFolderImap*>( folder->storage() );
- disconnect( mImapAccount, TQT_SIGNAL(receivedStorageQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& )),
- this, TQT_SLOT(slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& )) );
+ disconnect( mImapAccount, TQ_SIGNAL(receivedStorageQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& )),
+ this, TQ_SLOT(slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& )) );
if ( job && job->error() ) {
if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION )
diff --git a/kmail/folderdiaquotatab.h b/kmail/folderdiaquotatab.h
index fe7af431..e5aab5ff 100644
--- a/kmail/folderdiaquotatab.h
+++ b/kmail/folderdiaquotatab.h
@@ -51,7 +51,7 @@ class ImapAccountBase;
*/
class FolderDiaQuotaTab : public FolderDiaTab
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/folderdiaquotatab_p.h b/kmail/folderdiaquotatab_p.h
index 16b6cb5a..428d4597 100644
--- a/kmail/folderdiaquotatab_p.h
+++ b/kmail/folderdiaquotatab_p.h
@@ -44,7 +44,7 @@ namespace KMail {
class QuotaWidget : public TQWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
QuotaWidget( TQWidget* parent, const char* name = 0 );
diff --git a/kmail/folderjob.h b/kmail/folderjob.h
index 5b7f4037..31a6857b 100644
--- a/kmail/folderjob.h
+++ b/kmail/folderjob.h
@@ -43,7 +43,7 @@ namespace KMail {
class FolderJob : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/folderpropertiesdialog.ui b/kmail/folderpropertiesdialog.ui
index 80bdfad2..d9532133 100644
--- a/kmail/folderpropertiesdialog.ui
+++ b/kmail/folderpropertiesdialog.ui
@@ -630,9 +630,9 @@
<variable>TQValueList&lt;TQGuardedPtr&lt;KMFolder&gt; &gt; mFolders;</variable>
<variable>KMFolderDir *mFolderDIr;</variable>
</variables>
-<Q_SLOTS>
+<slots>
<slot access="protected">slotChangeIcon( TQString )</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includes>
diff --git a/kmail/folderrequester.cpp b/kmail/folderrequester.cpp
index f2f7ec16..29c557f9 100644
--- a/kmail/folderrequester.cpp
+++ b/kmail/folderrequester.cpp
@@ -53,11 +53,11 @@ FolderRequester::FolderRequester( TQWidget *parent, KMFolderTree *tree )
TQToolButton* button = new TQToolButton( this );
button->setIconSet( TDEGlobal::iconLoader()->loadIconSet( "folder", TDEIcon::Small, 0 ) );
- connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpenDialog()) );
+ connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOpenDialog()) );
setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
TQSizePolicy::Fixed ) );
- setFocusPolicy( TQ_StrongFocus );
+ setFocusPolicy( TQWidget::StrongFocus );
}
//-----------------------------------------------------------------------------
diff --git a/kmail/folderrequester.h b/kmail/folderrequester.h
index 7434d82a..c3408d19 100644
--- a/kmail/folderrequester.h
+++ b/kmail/folderrequester.h
@@ -45,7 +45,7 @@ namespace KMail {
*/
class FolderRequester: public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/foldersetselector.h b/kmail/foldersetselector.h
index 0173327b..217e170e 100644
--- a/kmail/foldersetselector.h
+++ b/kmail/foldersetselector.h
@@ -28,7 +28,7 @@ namespace KMail {
class FolderSetSelector : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/foldershortcutdialog.cpp b/kmail/foldershortcutdialog.cpp
index 1c4e79cf..75b77fb5 100644
--- a/kmail/foldershortcutdialog.cpp
+++ b/kmail/foldershortcutdialog.cpp
@@ -71,8 +71,8 @@ FolderShortcutDialog::FolderShortcutDialog( KMFolder *folder,
mKeyButton = new KKeyButton( hb, "FolderShortcutSelector" );
new TQWidget(hb);
- connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ),
- this, TQT_SLOT( slotCapturedShortcut( const TDEShortcut& ) ) );
+ connect( mKeyButton, TQ_SIGNAL( capturedShortcut( const TDEShortcut& ) ),
+ this, TQ_SLOT( slotCapturedShortcut( const TDEShortcut& ) ) );
mKeyButton->setShortcut( folder->shortcut(), false );
}
diff --git a/kmail/foldershortcutdialog.h b/kmail/foldershortcutdialog.h
index 930ac36f..ccd93125 100644
--- a/kmail/foldershortcutdialog.h
+++ b/kmail/foldershortcutdialog.h
@@ -50,7 +50,7 @@ namespace KMail
class FolderShortcutDialog : public KDialogBase
{
-Q_OBJECT
+TQ_OBJECT
public:
FolderShortcutDialog( KMFolder *folder, KMMainWidget *mw,
diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp
index f6d1a358..f9605df3 100644
--- a/kmail/folderstorage.cpp
+++ b/kmail/folderstorage.cpp
@@ -80,20 +80,20 @@ FolderStorage::FolderStorage( KMFolder* folder, const char* aName )
mNoChildren = false;
mRDict = 0;
mDirtyTimer = new TQTimer(this, "mDirtyTimer");
- connect(mDirtyTimer, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(updateIndex()));
+ connect(mDirtyTimer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(updateIndex()));
mHasChildren = HasNoChildren;
mContentsType = KMail::ContentsTypeMail;
- connect(this, TQT_SIGNAL(closed(KMFolder*)), mFolder, TQT_SIGNAL(closed()));
+ connect(this, TQ_SIGNAL(closed(KMFolder*)), mFolder, TQ_SIGNAL(closed()));
}
//-----------------------------------------------------------------------------
FolderStorage::~FolderStorage()
{
mJobList.setAutoDelete( true );
- TQObject::disconnect( TQT_SIGNAL(destroyed(TQObject*)), this, 0 );
+ TQObject::disconnect( TQ_SIGNAL(destroyed(TQObject*)), this, 0 );
mJobList.clear();
KMMsgDict::deleteRentry(mRDict);
}
@@ -118,8 +118,8 @@ TQString FolderStorage::dotEscape(const TQString& aStr)
void FolderStorage::addJob( FolderJob* job ) const
{
- TQObject::connect( job, TQT_SIGNAL(destroyed(TQObject*)),
- TQT_SLOT(removeJob(TQObject*)) );
+ TQObject::connect( job, TQ_SIGNAL(destroyed(TQObject*)),
+ TQ_SLOT(removeJob(TQObject*)) );
mJobList.append( job );
}
@@ -212,8 +212,8 @@ void FolderStorage::quiet(bool beQuiet)
*/
if ( !mEmitChangedTimer) {
mEmitChangedTimer= new TQTimer( this, "mEmitChangedTimer" );
- connect( mEmitChangedTimer, TQT_SIGNAL( timeout() ),
- this, TQT_SLOT( slotEmitChangedTimer() ) );
+ connect( mEmitChangedTimer, TQ_SIGNAL( timeout() ),
+ this, TQ_SLOT( slotEmitChangedTimer() ) );
}
mQuiet++;
} else {
@@ -309,8 +309,8 @@ bool FolderStorage::canAddMsgNow(KMMessage* aMsg, int* aIndex_ret)
if (!aMsg->isComplete() && msgParent && msgParent->folderType() == KMFolderTypeImap)
{
FolderJob *job = msgParent->createJob(aMsg);
- connect(job, TQT_SIGNAL(messageRetrieved(KMMessage*)),
- TQT_SLOT(reallyAddMsg(KMMessage*)));
+ connect(job, TQ_SIGNAL(messageRetrieved(KMMessage*)),
+ TQ_SLOT(reallyAddMsg(KMMessage*)));
job->start();
aMsg->setTransferInProgress( true );
return false;
@@ -1147,7 +1147,7 @@ void FolderStorage::slotProcessNextSearchBatch()
bool complete = ( end >= count() );
emit searchResult( folder(), matchingSerNums, mSearchPattern, complete );
if ( !complete )
- TQTimer::singleShot( 0, this, TQT_SLOT(slotProcessNextSearchBatch()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(slotProcessNextSearchBatch()) );
}
//-----------------------------------------------------------------------------
diff --git a/kmail/folderstorage.h b/kmail/folderstorage.h
index 9771a708..13f2ba0f 100644
--- a/kmail/folderstorage.h
+++ b/kmail/folderstorage.h
@@ -78,7 +78,7 @@ typedef TQValueList<TQ_UINT32> SerNumList;
class FolderStorage : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp
index 9d18138a..10d7af2f 100644
--- a/kmail/foldertreebase.cpp
+++ b/kmail/foldertreebase.cpp
@@ -235,7 +235,7 @@ void FolderTreeBase::handleMailListDrop(TQDropEvent * event, KMFolder *destinati
else
action = dndMode();
if ( action == DRAG_COPY || action == DRAG_MOVE ) {
- new MessageCopyHelper( serNums, destination, action == DRAG_MOVE, TQT_TQOBJECT(this) );
+ new MessageCopyHelper( serNums, destination, action == DRAG_MOVE, this );
}
}
}
diff --git a/kmail/foldertreebase.h b/kmail/foldertreebase.h
index 7f5c8545..49441f74 100644
--- a/kmail/foldertreebase.h
+++ b/kmail/foldertreebase.h
@@ -28,7 +28,7 @@ namespace KMail {
class FolderTreeBase : public KFolderTree
{
- Q_OBJECT
+ TQ_OBJECT
public:
FolderTreeBase( KMMainWidget *mainWidget, TQWidget *parent = 0, const char *name = 0 );
diff --git a/kmail/globalsettings.cpp b/kmail/globalsettings.cpp
index c09b0591..4a33d2cb 100644
--- a/kmail/globalsettings.cpp
+++ b/kmail/globalsettings.cpp
@@ -41,7 +41,7 @@ GlobalSettings *GlobalSettings::self()
GlobalSettings::GlobalSettings()
{
mConfigSyncTimer = new TQTimer( this, "mConfigSyncTimer" );
- connect( mConfigSyncTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotSyncNow() ) );
+ connect( mConfigSyncTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotSyncNow() ) );
}
void GlobalSettings::requestSync()
diff --git a/kmail/globalsettings.h b/kmail/globalsettings.h
index dd8cd5b5..8ddd2230 100644
--- a/kmail/globalsettings.h
+++ b/kmail/globalsettings.h
@@ -30,7 +30,7 @@ class TQTimer;
class GlobalSettings : public TQObject, public GlobalSettingsBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
virtual ~GlobalSettings();
diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp
index eeb8d797..ab2491aa 100644
--- a/kmail/headerlistquicksearch.cpp
+++ b/kmail/headerlistquicksearch.cpp
@@ -57,8 +57,8 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent,
TQApplication::reverseLayout()
? "clear_left"
: "locationbar_erase",
- 0, TQT_TQOBJECT(this),
- TQT_SLOT( reset() ),
+ 0, this,
+ TQ_SLOT( reset() ),
actionCollection,
"reset_quicksearch" );
resetQuickSearch->plug( parent );
@@ -84,24 +84,24 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent,
inserStatus( StatusIgnored );
mStatusCombo->setCurrentItem( 0 );
mStatusCombo->installEventFilter( this );
- connect( mStatusCombo, TQT_SIGNAL ( activated( int ) ),
- this, TQT_SLOT( slotStatusChanged( int ) ) );
+ connect( mStatusCombo, TQ_SIGNAL ( activated( int ) ),
+ this, TQ_SLOT( slotStatusChanged( int ) ) );
label->setBuddy( mStatusCombo );
TDEToolBarButton * btn = new TDEToolBarButton( "mail_find", 0, parent,
0, i18n( "Open Full Search" ) );
- connect( btn, TQT_SIGNAL( clicked() ), TQT_SIGNAL( requestFullSearch() ) );
+ connect( btn, TQ_SIGNAL( clicked() ), TQ_SIGNAL( requestFullSearch() ) );
/* Disable the signal connected by TDEListViewSearchLine since it will call
* itemAdded during KMHeaders::readSortOrder() which will in turn result
* in getMsgBaseForItem( item ) wanting to access items which are no longer
* there. Rather rely on KMHeaders::msgAdded and its signal. */
- disconnect(listView, TQT_SIGNAL(itemAdded(TQListViewItem *)),
- this, TQT_SLOT(itemAdded(TQListViewItem *)));
+ disconnect(listView, TQ_SIGNAL(itemAdded(TQListViewItem *)),
+ this, TQ_SLOT(itemAdded(TQListViewItem *)));
KMHeaders *headers = static_cast<KMHeaders*>( listView );
- connect( headers, TQT_SIGNAL( msgAddedToListView( TQListViewItem* ) ),
- this, TQT_SLOT( itemAdded( TQListViewItem* ) ) );
+ connect( headers, TQ_SIGNAL( msgAddedToListView( TQListViewItem* ) ),
+ this, TQ_SLOT( itemAdded( TQListViewItem* ) ) );
}
@@ -112,12 +112,12 @@ HeaderListQuickSearch::~HeaderListQuickSearch()
bool HeaderListQuickSearch::eventFilter( TQObject *watched, TQEvent *event )
{
- if ( TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(mStatusCombo) ) {
+ if ( watched == mStatusCombo ) {
KMMainWidget *mainWidget = 0;
// Travel up the parents list until we find the main widget
for ( TQWidget *curWidget = parentWidget(); curWidget; curWidget = curWidget->parentWidget() ) {
- mainWidget = ::tqqt_cast<KMMainWidget *>( curWidget );
+ mainWidget = ::tqt_cast<KMMainWidget *>( curWidget );
if ( mainWidget )
break;
}
diff --git a/kmail/headerlistquicksearch.h b/kmail/headerlistquicksearch.h
index 4a3aa098..56753ed9 100644
--- a/kmail/headerlistquicksearch.h
+++ b/kmail/headerlistquicksearch.h
@@ -44,7 +44,7 @@ namespace KMail {
class HeaderListQuickSearch : public TDEListViewSearchLine
{
-Q_OBJECT
+TQ_OBJECT
public:
HeaderListQuickSearch( TQWidget *parent,
diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp
index 44f12b38..6ad867a9 100644
--- a/kmail/headerstyle.cpp
+++ b/kmail/headerstyle.cpp
@@ -645,7 +645,7 @@ namespace KMail {
// kdDebug() << "FancyHeaderStyle::format() local zone offset (in minutes): " << lzone << endl;
- TQTime currTime = TQTime::currentTime( Qt::UTC );
+ TQTime currTime = TQTime::currentTime( TQt::UTC );
// kdDebug() << "FancyHeaderStyle::format() current time: " << currTime << endl;
diff --git a/kmail/htmlstatusbar.h b/kmail/htmlstatusbar.h
index 9a86302f..caf01d7d 100644
--- a/kmail/htmlstatusbar.h
+++ b/kmail/htmlstatusbar.h
@@ -59,7 +59,7 @@ namespace KMail {
* @author Ingo Kloecker <kloecker@kde.org>, Marc Mutz <mutz@kde.org>
**/
class HtmlStatusBar : public TQLabel {
- Q_OBJECT
+ TQ_OBJECT
public:
HtmlStatusBar( TQWidget * parent=0, const char * name=0, WFlags f=0 );
diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp
index 91b108c9..a5c9af36 100644
--- a/kmail/identitydialog.cpp
+++ b/kmail/identitydialog.cpp
@@ -396,8 +396,8 @@ namespace KMail {
mTransportCombo->setEnabled( false ); // since !mTransportCheck->isChecked()
mTransportCombo->insertStringList( KMail::TransportManager::transportNames() );
glay->addWidget( mTransportCombo, row, 1 );
- connect( mTransportCheck, TQT_SIGNAL(toggled(bool)),
- mTransportCombo, TQT_SLOT(setEnabled(bool)) );
+ connect( mTransportCheck, TQ_SIGNAL(toggled(bool)),
+ mTransportCombo, TQ_SLOT(setEnabled(bool)) );
// the last row is a spacer
@@ -416,12 +416,12 @@ namespace KMail {
mCopyGlobal = new KPushButton( i18n("&Copy global templates"), tab );
mCopyGlobal->setEnabled( false );
btns->addWidget( mCopyGlobal );
- connect( mCustom, TQT_SIGNAL( toggled( bool ) ),
- mWidget, TQT_SLOT( setEnabled( bool ) ) );
- connect( mCustom, TQT_SIGNAL( toggled( bool ) ),
- mCopyGlobal, TQT_SLOT( setEnabled( bool ) ) );
- connect( mCopyGlobal, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotCopyGlobal()) );
+ connect( mCustom, TQ_SIGNAL( toggled( bool ) ),
+ mWidget, TQ_SLOT( setEnabled( bool ) ) );
+ connect( mCustom, TQ_SIGNAL( toggled( bool ) ),
+ mCopyGlobal, TQ_SLOT( setEnabled( bool ) ) );
+ connect( mCopyGlobal, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotCopyGlobal()) );
//
// Tab Widget: Signature
@@ -439,8 +439,8 @@ namespace KMail {
resize( geometry.readSizeEntry( "Identity Dialog size" ) );
mNameEdit->setFocus();
- connect( tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)),
- TQT_SLOT(slotAboutToShow(TQWidget*)) );
+ connect( tabWidget, TQ_SIGNAL(currentChanged(TQWidget*)),
+ TQ_SLOT(slotAboutToShow(TQWidget*)) );
}
IdentityDialog::~IdentityDialog() {
diff --git a/kmail/identitydialog.h b/kmail/identitydialog.h
index fc9b4594..cfa27bd9 100644
--- a/kmail/identitydialog.h
+++ b/kmail/identitydialog.h
@@ -60,7 +60,7 @@ namespace KMail {
namespace KMail {
class IdentityDialog : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
IdentityDialog( TQWidget * parent=0, const char * name = 0 );
diff --git a/kmail/identitydrag.h b/kmail/identitydrag.h
index 295c83ad..b7aa2250 100644
--- a/kmail/identitydrag.h
+++ b/kmail/identitydrag.h
@@ -42,7 +42,7 @@ namespace KMail {
@author Marc Mutz <mutz@kde.org>
**/
class IdentityDrag : public TQDragObject {
- Q_OBJECT
+ TQ_OBJECT
public:
IdentityDrag( const KPIM::Identity & ident,
diff --git a/kmail/identitylistview.h b/kmail/identitylistview.h
index 586767c7..eabd63d7 100644
--- a/kmail/identitylistview.h
+++ b/kmail/identitylistview.h
@@ -67,7 +67,7 @@ namespace KMail {
@author Marc Mutz <mutz@kde.org>
**/
class IdentityListView : public TDEListView {
- Q_OBJECT
+ TQ_OBJECT
public:
IdentityListView( TQWidget * parent=0, const char * name=0 );
diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index 40ff81f7..47d169f9 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -105,12 +105,12 @@ namespace KMail {
{
mPort = imapDefaultPort;
mBodyPartList.setAutoDelete(true);
- TDEIO::Scheduler::connect(TQT_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)),
- this, TQT_SLOT(slotSchedulerSlaveError(TDEIO::Slave *, int, const TQString &)));
- TDEIO::Scheduler::connect(TQT_SIGNAL(slaveConnected(TDEIO::Slave *)),
- this, TQT_SLOT(slotSchedulerSlaveConnected(TDEIO::Slave *)));
- connect(&mNoopTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotNoopTimeout()));
- connect(&mIdleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotIdleTimeout()));
+ TDEIO::Scheduler::connect(TQ_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)),
+ this, TQ_SLOT(slotSchedulerSlaveError(TDEIO::Slave *, int, const TQString &)));
+ TDEIO::Scheduler::connect(TQ_SIGNAL(slaveConnected(TDEIO::Slave *)),
+ this, TQ_SLOT(slotSchedulerSlaveConnected(TDEIO::Slave *)));
+ connect(&mNoopTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotNoopTimeout()));
+ connect(&mIdleTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotIdleTimeout()));
}
ImapAccountBase::~ImapAccountBase() {
@@ -385,8 +385,8 @@ namespace KMail {
jd.quiet = quiet;
insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
- TQT_SLOT(slotSubscriptionResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+ TQ_SLOT(slotSubscriptionResult(TDEIO::Job *)));
}
//-----------------------------------------------------------------------------
@@ -437,8 +437,8 @@ namespace KMail {
jd.cancellable = true;
insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
- TQT_SLOT(slotGetUserRightsResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+ TQ_SLOT(slotGetUserRightsResult(TDEIO::Job *)));
}
void ImapAccountBase::slotGetUserRightsResult( TDEIO::Job* _job )
@@ -481,8 +481,8 @@ namespace KMail {
jd.cancellable = true;
insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
- TQT_SLOT(slotGetACLResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+ TQ_SLOT(slotGetACLResult(TDEIO::Job *)));
}
void ImapAccountBase::slotGetACLResult( TDEIO::Job* _job )
@@ -509,8 +509,8 @@ namespace KMail {
jd.cancellable = true;
insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
- TQT_SLOT(slotGetStorageQuotaInfoResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+ TQ_SLOT(slotGetStorageQuotaInfoResult(TDEIO::Job *)));
}
void ImapAccountBase::slotGetStorageQuotaInfoResult( TDEIO::Job* _job )
@@ -536,8 +536,8 @@ namespace KMail {
TDEIO::SimpleJob *job = TDEIO::special( getUrl(), packedArgs, false );
TDEIO::Scheduler::assignJobToSlave(mSlave, job);
- connect( job, TQT_SIGNAL(result( TDEIO::Job * ) ),
- this, TQT_SLOT( slotSimpleResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL(result( TDEIO::Job * ) ),
+ this, TQ_SLOT( slotSimpleResult( TDEIO::Job * ) ) );
} else {
/* Stop the timer, we have disconnected. We have to make sure it is
started again when a new slave appears. */
@@ -596,8 +596,8 @@ namespace KMail {
emit connectionResult( 0, TQString() ); // success
if ( mNamespaces.isEmpty() || mNamespaceToDelimiter.isEmpty() ) {
- connect( this, TQT_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ),
- this, TQT_SLOT( slotSaveNamespaces( const ImapAccountBase::nsDelimMap& ) ) );
+ connect( this, TQ_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ),
+ this, TQ_SLOT( slotSaveNamespaces( const ImapAccountBase::nsDelimMap& ) ) );
getNamespaces();
}
@@ -607,8 +607,8 @@ namespace KMail {
stream << (int) 'c';
TDEIO::SimpleJob *job = TDEIO::special( getUrl(), packedArgs, false );
TDEIO::Scheduler::assignJobToSlave( mSlave, job );
- connect( job, TQT_SIGNAL(infoMessage(TDEIO::Job*, const TQString&)),
- TQT_SLOT(slotCapabilitiesResult(TDEIO::Job*, const TQString&)) );
+ connect( job, TQ_SIGNAL(infoMessage(TDEIO::Job*, const TQString&)),
+ TQ_SLOT(slotCapabilitiesResult(TDEIO::Job*, const TQString&)) );
}
//-----------------------------------------------------------------------------
@@ -621,16 +621,16 @@ namespace KMail {
//-----------------------------------------------------------------------------
void ImapAccountBase::getNamespaces()
{
- disconnect( this, TQT_SIGNAL( connectionResult(int, const TQString&) ),
- this, TQT_SLOT( getNamespaces() ) );
+ disconnect( this, TQ_SIGNAL( connectionResult(int, const TQString&) ),
+ this, TQ_SLOT( getNamespaces() ) );
if ( makeConnection() != Connected || !mSlave ) {
kdDebug(5006) << "getNamespaces - wait for connection" << endl;
if ( mNamespaces.isEmpty() || mNamespaceToDelimiter.isEmpty() ) {
// when the connection is established slotSchedulerSlaveConnected notifies us
} else {
// getNamespaces was called by someone else
- connect( this, TQT_SIGNAL( connectionResult(int, const TQString&) ),
- this, TQT_SLOT( getNamespaces() ) );
+ connect( this, TQ_SIGNAL( connectionResult(int, const TQString&) ),
+ this, TQ_SLOT( getNamespaces() ) );
}
return;
}
@@ -646,14 +646,14 @@ namespace KMail {
TQString(), true, useSSL() || useTLS() );
jd.progressItem->setTotalItems( 1 );
connect ( jd.progressItem,
- TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
+ TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
this,
- TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) );
+ TQ_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) );
TDEIO::SimpleJob *job = TDEIO::special( getUrl(), packedArgs, false );
TDEIO::Scheduler::assignJobToSlave( mSlave, job );
insertJob( job, jd );
- connect( job, TQT_SIGNAL( infoMessage(TDEIO::Job*, const TQString&) ),
- TQT_SLOT( slotNamespaceResult(TDEIO::Job*, const TQString&) ) );
+ connect( job, TQ_SIGNAL( infoMessage(TDEIO::Job*, const TQString&) ),
+ TQ_SLOT( slotNamespaceResult(TDEIO::Job*, const TQString&) ) );
}
//-----------------------------------------------------------------------------
@@ -958,7 +958,7 @@ namespace KMail {
if ( errorCode == TDEIO::ERR_SERVER_TIMEOUT || errorCode == TDEIO::ERR_CONNECTION_BROKEN ) {
msg = i18n("The connection to the server %1 was unexpectedly closed or timed out. It will be re-established automatically if possible.").
arg( name() );
- KMessageBox::information( TQT_TQWIDGET(kapp->activeWindow()), msg, caption, "kmailConnectionBrokenErrorDialog" );
+ KMessageBox::information( kapp->activeWindow(), msg, caption, "kmailConnectionBrokenErrorDialog" );
// Show it in the status bar, in case the user has ticked "don't show again"
if ( errorCode == TDEIO::ERR_CONNECTION_BROKEN )
KPIM::BroadcastStatus::instance()->setStatusMsg(
@@ -968,9 +968,9 @@ namespace KMail {
i18n( "The connection to account %1 timed out." ).arg( name() ) );
} else {
if ( !errors.isEmpty() )
- KMessageBox::detailedError( TQT_TQWIDGET(kapp->activeWindow()), msg, errors.join("\n").prepend("<qt>"), caption );
+ KMessageBox::detailedError( kapp->activeWindow(), msg, errors.join("\n").prepend("<qt>"), caption );
else
- KMessageBox::error( TQT_TQWIDGET(kapp->activeWindow()), msg, caption );
+ KMessageBox::error( kapp->activeWindow(), msg, caption );
}
} else { // i.e. we have a chance to continue, ask the user about it
if ( errors.count() >= 3 ) { // there is no detailedWarningContinueCancel... (#86517)
@@ -978,7 +978,7 @@ namespace KMail {
msg = TQString( "<qt>") + context + error + '\n' + errors[2];
caption = errors[0];
}
- int ret = KMessageBox::warningContinueCancel( TQT_TQWIDGET(kapp->activeWindow()), msg, caption );
+ int ret = KMessageBox::warningContinueCancel( kapp->activeWindow(), msg, caption );
if ( ret == KMessageBox::Cancel ) {
jobsKilled = true;
killAllJobs( false );
@@ -1031,10 +1031,10 @@ namespace KMail {
mCheckingSingleFolder = ( type == Single );
if ( checkingMail() )
{
- disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
- this, TQT_SLOT( slotCheckQueuedFolders() ) );
- connect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
- this, TQT_SLOT( slotCheckQueuedFolders() ) );
+ disconnect( this, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+ this, TQ_SLOT( slotCheckQueuedFolders() ) );
+ connect( this, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+ this, TQ_SLOT( slotCheckQueuedFolders() ) );
} else {
slotCheckQueuedFolders();
}
@@ -1043,8 +1043,8 @@ namespace KMail {
//-----------------------------------------------------------------------------
void ImapAccountBase::slotCheckQueuedFolders()
{
- disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
- this, TQT_SLOT( slotCheckQueuedFolders() ) );
+ disconnect( this, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+ this, TQ_SLOT( slotCheckQueuedFolders() ) );
TQValueList<TQGuardedPtr<KMFolder> > mSaveList = mMailCheckFolders;
mMailCheckFolders = mFoldersQueuedForChecking;
@@ -1214,8 +1214,8 @@ namespace KMail {
ImapAccountBase::jobData jd( url.url(), folder );
jd.path = path;
insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
- TQT_SLOT(slotSetStatusResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+ TQ_SLOT(slotSetStatusResult(TDEIO::Job *)));
}
void ImapAccountBase::setImapSeenStatus(KMFolder * folder, const TQString & path, bool seen)
@@ -1236,8 +1236,8 @@ namespace KMail {
ImapAccountBase::jobData jd( url.url(), folder );
jd.path = path;
insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
- TQT_SLOT(slotSetStatusResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+ TQ_SLOT(slotSetStatusResult(TDEIO::Job *)));
}
//-----------------------------------------------------------------------------
@@ -1299,9 +1299,9 @@ namespace KMail {
true,
useSSL() || useTLS() );
connect ( mListDirProgressItem,
- TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
+ TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
this,
- TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) );
+ TQ_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) );
// Start with a guessed value of the old folder count plus 5%. As long
// as the list of folders doesn't constantly change, that should be good
// enough.
diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h
index 1c022044..3c97567f 100644
--- a/kmail/imapaccountbase.h
+++ b/kmail/imapaccountbase.h
@@ -59,7 +59,7 @@ namespace KMail {
class AttachmentStrategy;
class ImapAccountBase : public KMail::NetworkAccount {
- Q_OBJECT
+ TQ_OBJECT
protected:
ImapAccountBase( AccountManager * parent, const TQString & name, uint id );
diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp
index 1f7682b5..ecf2b5e7 100644
--- a/kmail/imapjob.cpp
+++ b/kmail/imapjob.cpp
@@ -155,19 +155,19 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
true,
account->useSSL() || account->useTLS() );
jd.progressItem->setTotalItems( jd.total );
- connect ( jd.progressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)),
- account, TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) );
+ connect ( jd.progressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)),
+ account, TQ_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) );
TDEIO::SimpleJob *job = TDEIO::put( url, 0, false, false, false );
TDEIO::Scheduler::assignJobToSlave( account->slave(), job );
account->insertJob( job, jd );
- connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
- TQT_SLOT(slotPutMessageResult(TDEIO::Job *)) );
- connect( job, TQT_SIGNAL(dataReq(TDEIO::Job *, TQByteArray &)),
- TQT_SLOT(slotPutMessageDataReq(TDEIO::Job *, TQByteArray &)) );
- connect( job, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)),
- TQT_SLOT(slotPutMessageInfoData(TDEIO::Job *, const TQString &)) );
- connect( job, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)),
- TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t)));
+ connect( job, TQ_SIGNAL(result(TDEIO::Job *)),
+ TQ_SLOT(slotPutMessageResult(TDEIO::Job *)) );
+ connect( job, TQ_SIGNAL(dataReq(TDEIO::Job *, TQByteArray &)),
+ TQ_SLOT(slotPutMessageDataReq(TDEIO::Job *, TQByteArray &)) );
+ connect( job, TQ_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)),
+ TQ_SLOT(slotPutMessageInfoData(TDEIO::Job *, const TQString &)) );
+ connect( job, TQ_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)),
+ TQ_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t)));
}
}
else if ( jt == tCopyMessage || jt == tMoveMessage )
@@ -196,18 +196,18 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
true,
account->useSSL() || account->useTLS() );
jd.progressItem->setTotalItems( jd.total );
- connect ( jd.progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)),
- account, TQT_SLOT( slotAbortRequested(KPIM::ProgressItem* ) ) );
+ connect ( jd.progressItem, TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)),
+ account, TQ_SLOT( slotAbortRequested(KPIM::ProgressItem* ) ) );
TDEIO::SimpleJob *simpleJob = TDEIO::special( url, packedArgs, false );
TDEIO::Scheduler::assignJobToSlave( account->slave(), simpleJob );
mJob = simpleJob;
account->insertJob( mJob, jd );
- connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)),
- TQT_SLOT(slotCopyMessageResult(TDEIO::Job *)) );
+ connect( mJob, TQ_SIGNAL(result(TDEIO::Job *)),
+ TQ_SLOT(slotCopyMessageResult(TDEIO::Job *)) );
if ( jt == tMoveMessage )
{
- connect( mJob, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)),
- TQT_SLOT(slotCopyMessageInfoData(TDEIO::Job *, const TQString &)) );
+ connect( mJob, TQ_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)),
+ TQ_SLOT(slotCopyMessageInfoData(TDEIO::Job *, const TQString &)) );
}
}
else {
@@ -317,8 +317,8 @@ void ImapJob::slotGetNextMessage()
TQStyleSheet::escape( msg->subject() ),
true,
account->useSSL() || account->useTLS() );
- connect ( jd.progressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)),
- account, TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) );
+ connect ( jd.progressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)),
+ account, TQ_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) );
jd.progressItem->setTotalItems( jd.total );
TDEIO::SimpleJob *simpleJob = TDEIO::get( url, false, false );
@@ -327,18 +327,18 @@ void ImapJob::slotGetNextMessage()
account->insertJob( mJob, jd );
if ( mPartSpecifier.find( "STRUCTURE", 0, false ) != -1 )
{
- connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)),
- this, TQT_SLOT(slotGetBodyStructureResult(TDEIO::Job *)) );
+ connect( mJob, TQ_SIGNAL(result(TDEIO::Job *)),
+ this, TQ_SLOT(slotGetBodyStructureResult(TDEIO::Job *)) );
} else {
- connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)),
- this, TQT_SLOT(slotGetMessageResult(TDEIO::Job *)) );
+ connect( mJob, TQ_SIGNAL(result(TDEIO::Job *)),
+ this, TQ_SLOT(slotGetMessageResult(TDEIO::Job *)) );
}
- connect( mJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
- msgParent, TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)) );
+ connect( mJob, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+ msgParent, TQ_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)) );
if ( jd.total > 1 )
{
- connect(mJob, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)),
- this, TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t)));
+ connect(mJob, TQ_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)),
+ this, TQ_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t)));
}
}
diff --git a/kmail/imapjob.h b/kmail/imapjob.h
index e348b2df..cd4b9ab7 100644
--- a/kmail/imapjob.h
+++ b/kmail/imapjob.h
@@ -53,7 +53,7 @@ class AttachmentStrategy;
class ImapJob : public FolderJob
{
- Q_OBJECT
+ TQ_OBJECT
friend class ::KMAcctImap;
diff --git a/kmail/importarchivedialog.h b/kmail/importarchivedialog.h
index b37c519c..11bcc00d 100644
--- a/kmail/importarchivedialog.h
+++ b/kmail/importarchivedialog.h
@@ -31,7 +31,7 @@ class FolderRequester;
// TODO: Common base class for ArchiveFolderDialog and ImportArchiveDialog?
class ImportArchiveDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/importjob.cpp b/kmail/importjob.cpp
index 58f9d974..9fe9bbbe 100644
--- a/kmail/importjob.cpp
+++ b/kmail/importjob.cpp
@@ -174,7 +174,7 @@ void KMail::ImportJob::messageAdded()
mCurrentMessage = 0;
mCurrentMessageFile = 0;
- TQTimer::singleShot( 0, this, TQT_SLOT( importNextMessage() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( importNextMessage() ) );
}
void KMail::ImportJob::importNextMessage()
@@ -239,8 +239,8 @@ void KMail::ImportJob::importNextMessage()
else {
ImapJob *imapJob = new ImapJob( mCurrentMessage, ImapJob::tPutMessage,
dynamic_cast<KMFolderImap*>( mCurrentFolder->storage() ) );
- connect( imapJob, TQT_SIGNAL(result(KMail::FolderJob*)),
- TQT_SLOT(messagePutResult(KMail::FolderJob*)) );
+ connect( imapJob, TQ_SIGNAL(result(KMail::FolderJob*)),
+ TQ_SLOT(messagePutResult(KMail::FolderJob*)) );
imapJob->start();
}
}
@@ -383,8 +383,8 @@ void KMail::ImportJob::start()
TQString(),
true );
mProgressItem->setUsesBusyIndicator( true );
- connect( mProgressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)),
- this, TQT_SLOT(cancelJob()) );
+ connect( mProgressItem, TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)),
+ this, TQ_SLOT(cancelJob()) );
Folder nextFolder;
nextFolder.archiveDir = mArchive->directory();
diff --git a/kmail/importjob.h b/kmail/importjob.h
index 01b60bef..e7c88881 100644
--- a/kmail/importjob.h
+++ b/kmail/importjob.h
@@ -51,7 +51,7 @@ namespace KMail
*/
class ImportJob : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/index.cpp b/kmail/index.cpp
index af4f4cb5..c21e15d5 100644
--- a/kmail/index.cpp
+++ b/kmail/index.cpp
@@ -91,13 +91,13 @@ KMMsgIndex::KMMsgIndex( TQObject* parent ):
mSlowDown( false ) {
kdDebug( 5006 ) << "KMMsgIndex::KMMsgIndex()" << endl;
- connect( kmkernel->folderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotRemoveMessage( KMFolder*, TQ_UINT32 ) ) );
- connect( kmkernel->folderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotAddMessage( KMFolder*, TQ_UINT32 ) ) );
- connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotRemoveMessage( KMFolder*, TQ_UINT32 ) ) );
- connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotAddMessage( KMFolder*, TQ_UINT32 ) ) );
+ connect( kmkernel->folderMgr(), TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQ_SLOT( slotRemoveMessage( KMFolder*, TQ_UINT32 ) ) );
+ connect( kmkernel->folderMgr(), TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQ_SLOT( slotAddMessage( KMFolder*, TQ_UINT32 ) ) );
+ connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQ_SLOT( slotRemoveMessage( KMFolder*, TQ_UINT32 ) ) );
+ connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQ_SLOT( slotAddMessage( KMFolder*, TQ_UINT32 ) ) );
- connect( mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( act() ) );
- //connect( mSyncTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( syncIndex() ) );
+ connect( mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( act() ) );
+ //connect( mSyncTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( syncIndex() ) );
#ifdef HAVE_INDEXLIB
TDEConfigGroup cfg( KMKernel::config(), "text-index" );
@@ -116,11 +116,11 @@ KMMsgIndex::KMMsgIndex( TQObject* parent ):
mIndex = indexlib::open( mIndexPath, indexlib::open_flags::fail_if_nonexistant ).release();
}
if ( !mIndex ) {
- TQTimer::singleShot( 8000, this, TQT_SLOT( create() ) );
+ TQTimer::singleShot( 8000, this, TQ_SLOT( create() ) );
mState = s_willcreate;
} else {
if ( cfg.readBoolEntry( "creating" ) ) {
- TQTimer::singleShot( 8000, this, TQT_SLOT( continueCreation() ) );
+ TQTimer::singleShot( 8000, this, TQ_SLOT( continueCreation() ) );
mState = s_creating;
} else {
mPendingMsgs = TQValueListToVector( cfg.readIntListEntry( "pending" ) );
@@ -182,7 +182,7 @@ void KMMsgIndex::setEnabled( bool e ) {
// nothing can be done, probably
return;
case s_disabled:
- TQTimer::singleShot( 8000, this, TQT_SLOT( create() ) );
+ TQTimer::singleShot( 8000, this, TQ_SLOT( create() ) );
mState = s_willcreate;
}
} else {
@@ -265,7 +265,7 @@ void KMMsgIndex::clear() {
void KMMsgIndex::maintenance() {
#ifdef HAVE_INDEXLIB
if ( mState != s_idle || kapp->hasPendingEvents() ) {
- TQTimer::singleShot( 8000, this, TQT_SLOT( maintenance() ) );
+ TQTimer::singleShot( 8000, this, TQ_SLOT( maintenance() ) );
return;
}
mIndex->maintenance();
@@ -404,10 +404,10 @@ bool KMMsgIndex::startQuery( KMSearch* s ) {
kdDebug( 5006 ) << "KMMsgIndex::startQuery( . ) starting query" << endl;
Search* search = new Search( s );
- connect( search, TQT_SIGNAL( finished( bool ) ), s, TQT_SIGNAL( finished( bool ) ) );
- connect( search, TQT_SIGNAL( finished( bool ) ), s, TQT_SLOT( indexFinished() ) );
- connect( search, TQT_SIGNAL( destroyed( TQObject* ) ), TQT_SLOT( removeSearch( TQObject* ) ) );
- connect( search, TQT_SIGNAL( found( TQ_UINT32 ) ), s, TQT_SIGNAL( found( TQ_UINT32 ) ) );
+ connect( search, TQ_SIGNAL( finished( bool ) ), s, TQ_SIGNAL( finished( bool ) ) );
+ connect( search, TQ_SIGNAL( finished( bool ) ), s, TQ_SLOT( indexFinished() ) );
+ connect( search, TQ_SIGNAL( destroyed( TQObject* ) ), TQ_SLOT( removeSearch( TQObject* ) ) );
+ connect( search, TQ_SIGNAL( found( TQ_UINT32 ) ), s, TQ_SIGNAL( found( TQ_UINT32 ) ) );
mSearches.push_back( search );
return true;
}
@@ -517,7 +517,7 @@ void KMMsgIndex::removeMessage( TQ_UINT32 serNum ) {
mIndex->remove_doc( TQString::number( serNum ).latin1() );
++mMaintenanceCount;
if ( mMaintenanceCount > MaintenanceLimit && mRemovedMsgs.empty() ) {
- TQTimer::singleShot( 100, this, TQT_SLOT( maintenance() ) );
+ TQTimer::singleShot( 100, this, TQ_SLOT( maintenance() ) );
}
#endif
}
@@ -535,7 +535,7 @@ KMMsgIndex::Search::Search( KMSearch* s ):
mTimer( new TQTimer( this, "mTimer" ) ),
mResidual( new KMSearchPattern ),
mState( s_starting ) {
- connect( mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( act() ) );
+ connect( mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( act() ) );
mTimer->start( 0 );
}
diff --git a/kmail/index.h b/kmail/index.h
index 015bc106..4ac6ca45 100644
--- a/kmail/index.h
+++ b/kmail/index.h
@@ -50,7 +50,7 @@ class KMSearchRule;
class KMSearchPattern;
class KMMsgIndex : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
explicit KMMsgIndex( TQObject* parent );
@@ -194,7 +194,7 @@ class KMMsgIndex : public TQObject {
class KMMsgIndex::Search : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
explicit Search( KMSearch* s );
diff --git a/kmail/jobscheduler.cpp b/kmail/jobscheduler.cpp
index d5374fe4..dc2ef506 100644
--- a/kmail/jobscheduler.cpp
+++ b/kmail/jobscheduler.cpp
@@ -39,7 +39,7 @@ JobScheduler::JobScheduler( TQObject* parent, const char* name )
mPendingImmediateTasks( 0 ),
mCurrentTask( 0 ), mCurrentJob( 0 )
{
- connect( &mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotRunNextJob() ) );
+ connect( &mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotRunNextJob() ) );
// No need to start the internal timer yet, we wait for a task to be scheduled
}
@@ -212,7 +212,7 @@ void JobScheduler::runTaskNow( ScheduledTask* task )
}
// Register the job in the folder. This makes it autodeleted if the folder is deleted.
mCurrentTask->folder()->storage()->addJob( mCurrentJob );
- connect( mCurrentJob, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotJobFinished() ) );
+ connect( mCurrentJob, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotJobFinished() ) );
mCurrentJob->start();
}
diff --git a/kmail/jobscheduler.h b/kmail/jobscheduler.h
index 52e2cb85..0c649a57 100644
--- a/kmail/jobscheduler.h
+++ b/kmail/jobscheduler.h
@@ -95,7 +95,7 @@ private:
*/
class JobScheduler : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
JobScheduler( TQObject* parent, const char* name = 0 );
diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp
index fcd2f279..68187d2a 100644
--- a/kmail/keyresolver.cpp
+++ b/kmail/keyresolver.cpp
@@ -1701,8 +1701,8 @@ std::vector<GpgME::Key> Kleo::KeyResolver::lookup( const TQStringList & patterns
std::vector<GpgME::Key> result;
if ( mCryptoMessageFormats & (InlineOpenPGPFormat|OpenPGPMIMEFormat) )
if ( const Kleo::CryptoBackend::Protocol * p = Kleo::CryptoBackendFactory::instance()->openpgp() ) {
- std::auto_ptr<Kleo::KeyListJob> job( p->keyListJob( false, false, true ) ); // use validating keylisting
- if ( job.get() ) {
+ std::unique_ptr<Kleo::KeyListJob> job( p->keyListJob( false, false, true ) ); // use validating keylisting
+ if ( job ) {
std::vector<GpgME::Key> keys;
job->exec( patterns, secret, keys );
result.insert( result.end(), keys.begin(), keys.end() );
@@ -1710,8 +1710,8 @@ std::vector<GpgME::Key> Kleo::KeyResolver::lookup( const TQStringList & patterns
}
if ( mCryptoMessageFormats & (SMIMEFormat|SMIMEOpaqueFormat) )
if ( const Kleo::CryptoBackend::Protocol * p = Kleo::CryptoBackendFactory::instance()->smime() ) {
- std::auto_ptr<Kleo::KeyListJob> job( p->keyListJob( false, false, true ) ); // use validating keylisting
- if ( job.get() ) {
+ std::unique_ptr<Kleo::KeyListJob> job( p->keyListJob( false, false, true ) ); // use validating keylisting
+ if ( job ) {
std::vector<GpgME::Key> keys;
job->exec( patterns, secret, keys );
result.insert( result.end(), keys.begin(), keys.end() );
diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp
index 825e0cef..a15def1f 100644
--- a/kmail/kmaccount.cpp
+++ b/kmail/kmaccount.cpp
@@ -51,8 +51,8 @@ KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *parent)
mPrecommandProcess.setUseShell(true);
mPrecommandProcess << precommand;
- connect(&mPrecommandProcess, TQT_SIGNAL(processExited(TDEProcess *)),
- TQT_SLOT(precommandExited(TDEProcess *)));
+ connect(&mPrecommandProcess, TQ_SIGNAL(processExited(TDEProcess *)),
+ TQ_SLOT(precommandExited(TDEProcess *)));
}
//-----------------------------------------------------------------------------
@@ -207,7 +207,7 @@ void KMAccount::sendReceipt(KMMessage* aMsg)
KMMessage *newMsg = aMsg->createDeliveryReceipt();
if (newMsg) {
mReceipts.append(newMsg);
- TQTimer::singleShot( 0, this, TQT_SLOT( sendReceipts() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( sendReceipts() ) );
}
}
@@ -351,7 +351,7 @@ void KMAccount::installTimer()
if(!mTimer)
{
mTimer = new TQTimer(0, "mTimer");
- connect(mTimer,TQT_SIGNAL(timeout()),TQT_SLOT(mailCheck()));
+ connect(mTimer,TQ_SIGNAL(timeout()),TQ_SLOT(mailCheck()));
}
else
{
@@ -380,8 +380,8 @@ bool KMAccount::runPrecommand(const TQString &precommand)
BroadcastStatus::instance()->setStatusMsg(
i18n("Executing precommand %1").arg(precommand ));
- connect(&precommandProcess, TQT_SIGNAL(finished(bool)),
- TQT_SLOT(precommandExited(bool)));
+ connect(&precommandProcess, TQ_SIGNAL(finished(bool)),
+ TQ_SLOT(precommandExited(bool)));
kdDebug(5006) << "Running precommand " << precommand << endl;
if (!precommandProcess.start()) return false;
diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h
index 8445d55e..60a23c51 100644
--- a/kmail/kmaccount.h
+++ b/kmail/kmaccount.h
@@ -51,7 +51,7 @@ typedef TQValueList< ::KMAccount* > AccountList;
class KMPrecommand : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -73,7 +73,7 @@ protected:
class KMAccount: public TQObject, public KAccount
{
- Q_OBJECT
+ TQ_OBJECT
friend class KMail::AccountManager;
friend class ::KMail::FolderJob;
diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp
index 9de08019..4d07b152 100644
--- a/kmail/kmacctcachedimap.cpp
+++ b/kmail/kmacctcachedimap.cpp
@@ -186,8 +186,8 @@ void KMAcctCachedImap::slotCheckQueuedFolders()
mMailCheckFolders.append( mFoldersQueuedForChecking.front() );
mFoldersQueuedForChecking.pop_front();
if ( mFoldersQueuedForChecking.isEmpty() )
- disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
- this, TQT_SLOT( slotCheckQueuedFolders() ) );
+ disconnect( this, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+ this, TQ_SLOT( slotCheckQueuedFolders() ) );
kmkernel->acctMgr()->singleCheckMail(this, true);
mMailCheckFolders.clear();
@@ -246,20 +246,20 @@ void KMAcctCachedImap::processNewMail( KMFolderCachedImap* folder,
TQString(),
true, // can be cancelled
useSSL() || useTLS() );
- connect( mMailCheckProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
- this, TQT_SLOT( slotProgressItemCanceled( KPIM::ProgressItem* ) ) );
+ connect( mMailCheckProgressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
+ this, TQ_SLOT( slotProgressItemCanceled( KPIM::ProgressItem* ) ) );
folder->setAccount(this);
- connect(folder, TQT_SIGNAL(folderComplete(KMFolderCachedImap*, bool)),
- this, TQT_SLOT(postProcessNewMail(KMFolderCachedImap*, bool)));
+ connect(folder, TQ_SIGNAL(folderComplete(KMFolderCachedImap*, bool)),
+ this, TQ_SLOT(postProcessNewMail(KMFolderCachedImap*, bool)));
folder->serverSync( recurse );
}
void KMAcctCachedImap::postProcessNewMail( KMFolderCachedImap* folder, bool )
{
mNoopTimer.start( 60000 ); // send a noop every minute to avoid "connection broken" errors
- disconnect(folder, TQT_SIGNAL(folderComplete(KMFolderCachedImap*, bool)),
- this, TQT_SLOT(postProcessNewMail(KMFolderCachedImap*, bool)));
+ disconnect(folder, TQ_SIGNAL(folderComplete(KMFolderCachedImap*, bool)),
+ this, TQ_SLOT(postProcessNewMail(KMFolderCachedImap*, bool)));
mMailCheckProgressItem->setComplete();
mMailCheckProgressItem = 0;
diff --git a/kmail/kmacctcachedimap.h b/kmail/kmacctcachedimap.h
index a580b90c..8f9fd6c9 100644
--- a/kmail/kmacctcachedimap.h
+++ b/kmail/kmacctcachedimap.h
@@ -53,7 +53,7 @@ namespace TDEIO {
class KMAcctCachedImap: public KMail::ImapAccountBase
{
- Q_OBJECT
+ TQ_OBJECT
friend class ::KMail::ImapJob;
friend class ::KMail::CachedImapJob;
diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp
index 8fd2bea0..6ee04967 100644
--- a/kmail/kmacctimap.cpp
+++ b/kmail/kmacctimap.cpp
@@ -64,9 +64,9 @@ KMAcctImap::KMAcctImap(AccountManager* aOwner, const TQString& aAccountName, uin
mScheduler = 0;
mNoopTimer.start( 60000 ); // // send a noop every minute
mOpenFolders.setAutoDelete(true);
- connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()),
- this, TQT_SLOT(slotUpdateFolderList()));
- connect(&mErrorTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotResetConnectionError()));
+ connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()),
+ this, TQ_SLOT(slotUpdateFolderList()));
+ connect(&mErrorTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotResetConnectionError()));
TQString serNumUri = locateLocal( "data", "kmail/unfiltered." +
TQString("%1").arg(KAccount::id()) );
@@ -304,9 +304,9 @@ void KMAcctImap::processNewMail(bool interactive)
mMailCheckProgressItem->setTotalItems( mMailCheckFolders.count() );
connect ( mMailCheckProgressItem,
- TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*) ),
+ TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem*) ),
this,
- TQT_SLOT( slotMailCheckCanceled() ) );
+ TQ_SLOT( slotMailCheckCanceled() ) );
TQValueList<TQGuardedPtr<KMFolder> >::Iterator it;
// first get the current count of unread-messages
@@ -336,8 +336,8 @@ void KMAcctImap::processNewMail(bool interactive)
mCountRemainChecks++;
if (imapFolder->isSelected()) {
- connect(imapFolder, TQT_SIGNAL(folderComplete(KMFolderImap*, bool)),
- this, TQT_SLOT(postProcessNewMail(KMFolderImap*, bool)));
+ connect(imapFolder, TQ_SIGNAL(folderComplete(KMFolderImap*, bool)),
+ this, TQ_SLOT(postProcessNewMail(KMFolderImap*, bool)));
imapFolder->getFolder();
} else if ( kmkernel->filterMgr()->atLeastOneIncomingFilterAppliesTo( id() ) &&
imapFolder->folder()->isSystemFolder() &&
@@ -345,13 +345,13 @@ void KMAcctImap::processNewMail(bool interactive)
imapFolder->open("acctimap"); // will be closed in the folderSelected slot
// first get new headers before we select the folder
imapFolder->setSelected( true );
- connect( imapFolder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ),
- this, TQT_SLOT( slotFolderSelected( KMFolderImap*, bool) ) );
+ connect( imapFolder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ),
+ this, TQ_SLOT( slotFolderSelected( KMFolderImap*, bool) ) );
imapFolder->getFolder();
}
else {
- connect(imapFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
- this, TQT_SLOT(postProcessNewMail(KMFolder*)));
+ connect(imapFolder, TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
+ this, TQ_SLOT(postProcessNewMail(KMFolder*)));
bool ok = imapFolder->processNewMail(interactive);
if (!ok)
{
@@ -382,15 +382,15 @@ void KMAcctImap::processNewMail(bool interactive)
//-----------------------------------------------------------------------------
void KMAcctImap::postProcessNewMail(KMFolderImap* folder, bool)
{
- disconnect(folder, TQT_SIGNAL(folderComplete(KMFolderImap*, bool)),
- this, TQT_SLOT(postProcessNewMail(KMFolderImap*, bool)));
+ disconnect(folder, TQ_SIGNAL(folderComplete(KMFolderImap*, bool)),
+ this, TQ_SLOT(postProcessNewMail(KMFolderImap*, bool)));
postProcessNewMail(static_cast<KMFolder*>(folder->folder()));
}
void KMAcctImap::postProcessNewMail( KMFolder * folder )
{
- disconnect( folder->storage(), TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
- this, TQT_SLOT(postProcessNewMail(KMFolder*)) );
+ disconnect( folder->storage(), TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
+ this, TQ_SLOT(postProcessNewMail(KMFolder*)) );
if ( mMailCheckProgressItem ) {
mMailCheckProgressItem->incCompletedItems();
@@ -420,7 +420,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
if (!mScheduler) {
mScheduler = new KMail::ActionScheduler( set, filters );
mScheduler->setAccountId( id() );
- connect( mScheduler, TQT_SIGNAL(filtered(TQ_UINT32)), this, TQT_SLOT(slotFiltered(TQ_UINT32)) );
+ connect( mScheduler, TQ_SIGNAL(filtered(TQ_UINT32)), this, TQ_SLOT(slotFiltered(TQ_UINT32)) );
} else {
mScheduler->setFilterList( filters );
}
@@ -469,8 +469,8 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
msg->setTransferInProgress(true);
if ( !msg->isComplete() ) {
FolderJob *job = folder->createJob(msg);
- connect(job, TQT_SIGNAL(messageRetrieved(KMMessage*)),
- TQT_SLOT(slotFilterMsg(KMMessage*)));
+ connect(job, TQ_SIGNAL(messageRetrieved(KMMessage*)),
+ TQ_SLOT(slotFilterMsg(KMMessage*)));
job->start();
} else {
mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) );
@@ -571,8 +571,8 @@ void KMAcctImap::slotResetConnectionError()
void KMAcctImap::slotFolderSelected( KMFolderImap* folder, bool )
{
folder->setSelected( false );
- disconnect( folder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ),
- this, TQT_SLOT( slotFolderSelected( KMFolderImap*, bool) ) );
+ disconnect( folder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ),
+ this, TQ_SLOT( slotFolderSelected( KMFolderImap*, bool) ) );
postProcessNewMail( static_cast<KMFolder*>(folder->folder()) );
folder->close( "acctimap" );
}
diff --git a/kmail/kmacctimap.h b/kmail/kmacctimap.h
index 6be22c01..6a7bb89a 100644
--- a/kmail/kmacctimap.h
+++ b/kmail/kmacctimap.h
@@ -39,7 +39,7 @@ class FolderStorage;
//-----------------------------------------------------------------------------
class KMAcctImap: public KMail::ImapAccountBase
{
- Q_OBJECT
+ TQ_OBJECT
friend class KMail::ImapJob;
diff --git a/kmail/kmacctseldlg.cpp b/kmail/kmacctseldlg.cpp
index 35f1fc42..cac1f81f 100644
--- a/kmail/kmacctseldlg.cpp
+++ b/kmail/kmacctseldlg.cpp
@@ -39,7 +39,7 @@ KMAcctSelDlg::KMAcctSelDlg( TQWidget *parent, const char *name, bool modal )
TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
TQButtonGroup *group = new TQButtonGroup( i18n("Account Type"), page );
- connect(group, TQT_SIGNAL(clicked(int)), TQT_SLOT(buttonClicked(int)) );
+ connect(group, TQ_SIGNAL(clicked(int)), TQ_SLOT(buttonClicked(int)) );
topLayout->addWidget( group, 10 );
TQVBoxLayout *vlay = new TQVBoxLayout( group, spacingHint()*2, spacingHint() );
diff --git a/kmail/kmacctseldlg.h b/kmail/kmacctseldlg.h
index b28e1f52..d3f02b2f 100644
--- a/kmail/kmacctseldlg.h
+++ b/kmail/kmacctseldlg.h
@@ -29,7 +29,7 @@
/** Select account from given list of account types */
class KMAcctSelDlg: public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp
index 4d665422..55722c3c 100644
--- a/kmail/kmail_part.cpp
+++ b/kmail/kmail_part.cpp
@@ -99,14 +99,14 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
// create a canvas to insert our widget
TQWidget *canvas = new TQWidget(parentWidget, widgetName);
- canvas->setFocusPolicy(TQ_ClickFocus);
+ canvas->setFocusPolicy(TQWidget::ClickFocus);
setWidget(canvas);
TDEGlobal::iconLoader()->addAppDir("kmail");
#if 0
//It's also possible to make a part out of a readerWin
KMReaderWin *mReaderWin = new KMReaderWin( canvas, canvas, actionCollection() );
- connect(mReaderWin, TQT_SIGNAL(urlClicked(const KURL&,int)),
- mReaderWin, TQT_SLOT(slotUrlClicked()));
+ connect(mReaderWin, TQ_SIGNAL(urlClicked(const KURL&,int)),
+ mReaderWin, TQ_SLOT(slotUrlClicked()));
TQVBoxLayout *topLayout = new TQVBoxLayout(canvas);
topLayout->addWidget(mReaderWin);
mReaderWin->setAutoDelete( true );
@@ -124,7 +124,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
kapp->config());
TQVBoxLayout *topLayout = new TQVBoxLayout(canvas);
topLayout->addWidget(mainWidget);
- mainWidget->setFocusPolicy(TQ_ClickFocus);
+ mainWidget->setFocusPolicy(TQWidget::ClickFocus);
mStatusBar = new KMailStatusBarExtension(this);
mStatusBar->addStatusBarItem( mainWidget->vacationScriptIndicator(), 2, false );
@@ -134,20 +134,20 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
// Get to know when the user clicked on a folder in the KMail part and update the headerWidget of Kontact
KParts::InfoExtension *ie = new KParts::InfoExtension( this, "KMailInfo" );
- connect( mainWidget->folderTree(), TQT_SIGNAL(folderSelected(KMFolder*)), this, TQT_SLOT(exportFolder(KMFolder*)) );
- connect( mainWidget->folderTree(), TQT_SIGNAL(iconChanged(KMFolderTreeItem*)),
- this, TQT_SLOT(slotIconChanged(KMFolderTreeItem*)) );
- connect( mainWidget->folderTree(), TQT_SIGNAL(nameChanged(KMFolderTreeItem*)),
- this, TQT_SLOT(slotNameChanged(KMFolderTreeItem*)) );
- connect( this, TQT_SIGNAL(textChanged(const TQString&)), ie, TQT_SIGNAL(textChanged(const TQString&)) );
- connect( this, TQT_SIGNAL(iconChanged(const TQPixmap&)), ie, TQT_SIGNAL(iconChanged(const TQPixmap&)) );
+ connect( mainWidget->folderTree(), TQ_SIGNAL(folderSelected(KMFolder*)), this, TQ_SLOT(exportFolder(KMFolder*)) );
+ connect( mainWidget->folderTree(), TQ_SIGNAL(iconChanged(KMFolderTreeItem*)),
+ this, TQ_SLOT(slotIconChanged(KMFolderTreeItem*)) );
+ connect( mainWidget->folderTree(), TQ_SIGNAL(nameChanged(KMFolderTreeItem*)),
+ this, TQ_SLOT(slotNameChanged(KMFolderTreeItem*)) );
+ connect( this, TQ_SIGNAL(textChanged(const TQString&)), ie, TQ_SIGNAL(textChanged(const TQString&)) );
+ connect( this, TQ_SIGNAL(iconChanged(const TQPixmap&)), ie, TQ_SIGNAL(iconChanged(const TQPixmap&)) );
TDEGlobal::iconLoader()->addAppDir( "kmail" );
setXMLFile( "kmail_part.rc" );
#endif
KSettings::Dispatcher::self()->registerInstance( KMailFactory::instance(), mKMailKernel,
- TQT_SLOT( slotConfigChanged() ) );
+ TQ_SLOT( slotConfigChanged() ) );
}
KMailPart::~KMailPart()
diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h
index 3738aed7..079cb617 100644
--- a/kmail/kmail_part.h
+++ b/kmail/kmail_part.h
@@ -51,7 +51,7 @@ class ActionManager;
class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPartIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMailPart(TQWidget *parentWidget, const char *widgetName,
diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp
index 8f10be35..a65b6cdd 100644
--- a/kmail/kmailicalifaceimpl.cpp
+++ b/kmail/kmailicalifaceimpl.cpp
@@ -161,9 +161,9 @@ KMailICalIfaceImpl::KMailICalIfaceImpl()
mUseResourceIMAP( false ), mResourceQuiet( false ), mHideFolders( true )
{
// Listen to config changes
- connect( kmkernel, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( readConfig() ) );
- connect( kmkernel, TQT_SIGNAL( folderRemoved( KMFolder* ) ),
- this, TQT_SLOT( slotFolderRemoved( KMFolder* ) ) );
+ connect( kmkernel, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( readConfig() ) );
+ connect( kmkernel, TQ_SIGNAL( folderRemoved( KMFolder* ) ),
+ this, TQ_SLOT( slotFolderRemoved( KMFolder* ) ) );
mExtraFolders.setAutoDelete( true );
mAccumulators.setAutoDelete( true );
@@ -1140,8 +1140,8 @@ void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder,
// TODO: Till, port me
if ( unget ) mTheUnGetMes.insert( msg->getMsgSerNum(), true );
FolderJob *job = msg->parent()->createJob( msg );
- connect( job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ),
- this, TQT_SLOT( slotMessageRetrieved( KMMessage* ) ) );
+ connect( job, TQ_SIGNAL( messageRetrieved( KMMessage* ) ),
+ this, TQ_SLOT( slotMessageRetrieved( KMMessage* ) ) );
job->start();
return;
}
@@ -1717,10 +1717,10 @@ void KMailICalIfaceImpl::readConfig()
Q_ASSERT( account );
if ( account ) {
// just in case we were connected already
- disconnect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
- this, TQT_SLOT( slotCheckDone() ) );
- connect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
- this, TQT_SLOT( slotCheckDone() ) );
+ disconnect( account, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+ this, TQ_SLOT( slotCheckDone() ) );
+ connect( account, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+ this, TQ_SLOT( slotCheckDone() ) );
}
mUseResourceIMAP = false;
// We can't really call cleanup(), if those folders were completely deleted.
@@ -1966,8 +1966,8 @@ void KMailICalIfaceImpl::slotCheckDone()
{
KMAccount* account = kmkernel->acctMgr()->find( GlobalSettings::self()->theIMAPResourceAccount() );
if ( account )
- disconnect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
- this, TQT_SLOT( slotCheckDone() ) );
+ disconnect( account, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+ this, TQ_SLOT( slotCheckDone() ) );
readConfig();
}
}
@@ -2084,32 +2084,32 @@ KMFolder* KMailICalIfaceImpl::initScalixFolder( KMail::FolderContentsType conten
void KMailICalIfaceImpl::connectFolder( KMFolder* folder )
{
// avoid multiple connections
- disconnect( folder, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ),
- this, TQT_SLOT( slotIncidenceAdded( KMFolder*, TQ_UINT32 ) ) );
- disconnect( folder, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ),
- this, TQT_SLOT( slotIncidenceDeleted( KMFolder*, TQ_UINT32 ) ) );
- disconnect( folder, TQT_SIGNAL( expunged( KMFolder* ) ),
- this, TQT_SLOT( slotRefreshFolder( KMFolder* ) ) );
- disconnect( folder->storage(), TQT_SIGNAL( readOnlyChanged( KMFolder* ) ),
- this, TQT_SLOT( slotFolderPropertiesChanged( KMFolder* ) ) );
- disconnect( folder, TQT_SIGNAL( nameChanged() ),
- this, TQT_SLOT( slotFolderRenamed() ) );
- disconnect( folder->storage(), TQT_SIGNAL( locationChanged( const TQString&, const TQString&) ),
- this, TQT_SLOT( slotFolderLocationChanged( const TQString&, const TQString&) ) );
+ disconnect( folder, TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ),
+ this, TQ_SLOT( slotIncidenceAdded( KMFolder*, TQ_UINT32 ) ) );
+ disconnect( folder, TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ),
+ this, TQ_SLOT( slotIncidenceDeleted( KMFolder*, TQ_UINT32 ) ) );
+ disconnect( folder, TQ_SIGNAL( expunged( KMFolder* ) ),
+ this, TQ_SLOT( slotRefreshFolder( KMFolder* ) ) );
+ disconnect( folder->storage(), TQ_SIGNAL( readOnlyChanged( KMFolder* ) ),
+ this, TQ_SLOT( slotFolderPropertiesChanged( KMFolder* ) ) );
+ disconnect( folder, TQ_SIGNAL( nameChanged() ),
+ this, TQ_SLOT( slotFolderRenamed() ) );
+ disconnect( folder->storage(), TQ_SIGNAL( locationChanged( const TQString&, const TQString&) ),
+ this, TQ_SLOT( slotFolderLocationChanged( const TQString&, const TQString&) ) );
// Setup the signals to listen for changes
- connect( folder, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ),
- this, TQT_SLOT( slotIncidenceAdded( KMFolder*, TQ_UINT32 ) ) );
- connect( folder, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ),
- this, TQT_SLOT( slotIncidenceDeleted( KMFolder*, TQ_UINT32 ) ) );
- connect( folder, TQT_SIGNAL( expunged( KMFolder* ) ),
- this, TQT_SLOT( slotRefreshFolder( KMFolder* ) ) );
- connect( folder->storage(), TQT_SIGNAL( readOnlyChanged( KMFolder* ) ),
- this, TQT_SLOT( slotFolderPropertiesChanged( KMFolder* ) ) );
- connect( folder, TQT_SIGNAL( nameChanged() ),
- this, TQT_SLOT( slotFolderRenamed() ) );
- connect( folder->storage(), TQT_SIGNAL( locationChanged( const TQString&, const TQString&) ),
- this, TQT_SLOT( slotFolderLocationChanged( const TQString&, const TQString&) ) );
+ connect( folder, TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ),
+ this, TQ_SLOT( slotIncidenceAdded( KMFolder*, TQ_UINT32 ) ) );
+ connect( folder, TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ),
+ this, TQ_SLOT( slotIncidenceDeleted( KMFolder*, TQ_UINT32 ) ) );
+ connect( folder, TQ_SIGNAL( expunged( KMFolder* ) ),
+ this, TQ_SLOT( slotRefreshFolder( KMFolder* ) ) );
+ connect( folder->storage(), TQ_SIGNAL( readOnlyChanged( KMFolder* ) ),
+ this, TQ_SLOT( slotFolderPropertiesChanged( KMFolder* ) ) );
+ connect( folder, TQ_SIGNAL( nameChanged() ),
+ this, TQ_SLOT( slotFolderRenamed() ) );
+ connect( folder->storage(), TQ_SIGNAL( locationChanged( const TQString&, const TQString&) ),
+ this, TQ_SLOT( slotFolderLocationChanged( const TQString&, const TQString&) ) );
}
diff --git a/kmail/kmailicalifaceimpl.h b/kmail/kmailicalifaceimpl.h
index 3b4a194c..b047ed98 100644
--- a/kmail/kmailicalifaceimpl.h
+++ b/kmail/kmailicalifaceimpl.h
@@ -82,7 +82,7 @@ public:
/** The implementation of the interface. */
class KMailICalIfaceImpl : public TQObject, virtual public KMailICalIface {
- Q_OBJECT
+ TQ_OBJECT
public:
KMailICalIfaceImpl();
diff --git a/kmail/kmatmlistview.cpp b/kmail/kmatmlistview.cpp
index d6a9c4c4..f8a573ed 100644
--- a/kmail/kmatmlistview.cpp
+++ b/kmail/kmatmlistview.cpp
@@ -18,12 +18,12 @@ KMAtmListViewItem::KMAtmListViewItem( TQListView *parent )
mCBCompress->setShown( true );
updateAllCheckBoxes();
- connect( mCBCompress, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCompress() ) );
- connect( listView()->header(), TQT_SIGNAL( sizeChange(int, int, int) ),
- TQT_SLOT( slotHeaderChange( int, int, int ) ) );
- connect( listView()->header(), TQT_SIGNAL( indexChange(int, int, int) ),
- TQT_SLOT( slotHeaderChange( int, int, int ) ) );
- connect( listView()->header(), TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotHeaderClick( int ) ) );
+ connect( mCBCompress, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCompress() ) );
+ connect( listView()->header(), TQ_SIGNAL( sizeChange(int, int, int) ),
+ TQ_SLOT( slotHeaderChange( int, int, int ) ) );
+ connect( listView()->header(), TQ_SIGNAL( indexChange(int, int, int) ),
+ TQ_SLOT( slotHeaderChange( int, int, int ) ) );
+ connect( listView()->header(), TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotHeaderClick( int ) ) );
}
KMAtmListViewItem::~KMAtmListViewItem()
diff --git a/kmail/kmatmlistview.h b/kmail/kmatmlistview.h
index 30f0bd5f..a1e0797b 100644
--- a/kmail/kmatmlistview.h
+++ b/kmail/kmatmlistview.h
@@ -14,7 +14,7 @@ class TQCheckBox;
class KMAtmListViewItem : public TQObject, public TQListViewItem
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index 5239ceda..833144a8 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -202,7 +202,7 @@ KMCommand::Result KMCommand::result()
void KMCommand::start()
{
- TQTimer::singleShot( 0, this, TQT_SLOT( slotStart() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotStart() ) );
}
@@ -225,8 +225,8 @@ int KMCommand::mCountJobs = 0;
void KMCommand::slotStart()
{
- connect( this, TQT_SIGNAL( messagesTransfered( KMCommand::Result ) ),
- this, TQT_SLOT( slotPostTransfer( KMCommand::Result ) ) );
+ connect( this, TQ_SIGNAL( messagesTransfered( KMCommand::Result ) ),
+ this, TQ_SLOT( slotPostTransfer( KMCommand::Result ) ) );
kmkernel->filterMgr()->ref();
if (mMsgList.find(0) != -1) {
@@ -261,8 +261,8 @@ void KMCommand::slotStart()
void KMCommand::slotPostTransfer( KMCommand::Result result )
{
- disconnect( this, TQT_SIGNAL( messagesTransfered( KMCommand::Result ) ),
- this, TQT_SLOT( slotPostTransfer( KMCommand::Result ) ) );
+ disconnect( this, TQ_SIGNAL( messagesTransfered( KMCommand::Result ) ),
+ this, TQ_SLOT( slotPostTransfer( KMCommand::Result ) ) );
if ( result == OK )
result = execute();
mResult = result;
@@ -339,13 +339,13 @@ void KMCommand::transferSelectedMsgs()
job->setCancellable( false );
totalSize += thisMsg->msgSizeServer();
// emitted when the message was transferred successfully
- connect(job, TQT_SIGNAL(messageRetrieved(KMMessage*)),
- this, TQT_SLOT(slotMsgTransfered(KMMessage*)));
+ connect(job, TQ_SIGNAL(messageRetrieved(KMMessage*)),
+ this, TQ_SLOT(slotMsgTransfered(KMMessage*)));
// emitted when the job is destroyed
- connect(job, TQT_SIGNAL(finished()),
- this, TQT_SLOT(slotJobFinished()));
- connect(job, TQT_SIGNAL(progress(unsigned long, unsigned long)),
- this, TQT_SLOT(slotProgress(unsigned long, unsigned long)));
+ connect(job, TQ_SIGNAL(finished()),
+ this, TQ_SLOT(slotJobFinished()));
+ connect(job, TQ_SIGNAL(progress(unsigned long, unsigned long)),
+ this, TQ_SLOT(slotProgress(unsigned long, unsigned long)));
// msg musn't be deleted
thisMsg->setTransferInProgress(true);
job->start();
@@ -363,8 +363,8 @@ void KMCommand::transferSelectedMsgs()
} else {
// wait for the transfer and tell the progressBar the necessary steps
if ( mProgressDialog ) {
- connect(mProgressDialog, TQT_SIGNAL(cancelClicked()),
- this, TQT_SLOT(slotTransferCancelled()));
+ connect(mProgressDialog, TQ_SIGNAL(cancelClicked()),
+ this, TQ_SLOT(slotTransferCancelled()));
mProgressDialog->progressBar()->setTotalSteps(totalSize);
}
}
@@ -645,7 +645,7 @@ KMCommand::Result KMUrlSaveCommand::execute()
return Canceled;
}
TDEIO::Job *job = TDEIO::file_copy(mUrl, saveUrl, -1, true);
- connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotUrlSaveResult(TDEIO::Job*)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotUrlSaveResult(TDEIO::Job*)));
setEmitsCompletedItself( true );
return OK;
}
@@ -845,10 +845,10 @@ KMCommand::Result KMSaveMsgCommand::execute()
mJob->slotTotalSize( mTotalSize );
mJob->setAsyncDataEnabled( true );
mJob->setReportDataSent( true );
- connect(mJob, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray &)),
- TQT_SLOT(slotSaveDataReq()));
- connect(mJob, TQT_SIGNAL(result(TDEIO::Job*)),
- TQT_SLOT(slotSaveResult(TDEIO::Job*)));
+ connect(mJob, TQ_SIGNAL(dataReq(TDEIO::Job*, TQByteArray &)),
+ TQ_SLOT(slotSaveDataReq()));
+ connect(mJob, TQ_SIGNAL(result(TDEIO::Job*)),
+ TQ_SLOT(slotSaveResult(TDEIO::Job*)));
setEmitsCompletedItself( true );
return OK;
}
@@ -898,8 +898,8 @@ void KMSaveMsgCommand::slotSaveDataReq()
if ( msg->parent() && !msg->isComplete() ) {
FolderJob *job = msg->parent()->createJob( msg );
job->setCancellable( false );
- connect(job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ),
- this, TQT_SLOT( slotMessageRetrievedForSaving( KMMessage* ) ) );
+ connect(job, TQ_SIGNAL( messageRetrieved( KMMessage* ) ),
+ this, TQ_SLOT( slotMessageRetrievedForSaving( KMMessage* ) ) );
job->start();
}
}
@@ -971,10 +971,10 @@ void KMSaveMsgCommand::slotSaveResult(TDEIO::Job *job)
mJob->slotTotalSize( mTotalSize );
mJob->setAsyncDataEnabled( true );
mJob->setReportDataSent( true );
- connect(mJob, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray &)),
- TQT_SLOT(slotSaveDataReq()));
- connect(mJob, TQT_SIGNAL(result(TDEIO::Job*)),
- TQT_SLOT(slotSaveResult(TDEIO::Job*)));
+ connect(mJob, TQ_SIGNAL(dataReq(TDEIO::Job*, TQByteArray &)),
+ TQ_SLOT(slotSaveDataReq()));
+ connect(mJob, TQ_SIGNAL(result(TDEIO::Job*)),
+ TQ_SLOT(slotSaveResult(TDEIO::Job*)));
}
}
else
@@ -1014,10 +1014,10 @@ KMCommand::Result KMOpenMsgCommand::execute()
}
mJob = TDEIO::get( mUrl, false, false );
mJob->setReportDataSent( true );
- connect( mJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- this, TQT_SLOT( slotDataArrived( TDEIO::Job*, const TQByteArray & ) ) );
- connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ connect( mJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ this, TQ_SLOT( slotDataArrived( TDEIO::Job*, const TQByteArray & ) ) );
+ connect( mJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotResult( TDEIO::Job * ) ) );
setEmitsCompletedItself( true );
return OK;
}
@@ -1904,15 +1904,15 @@ void KMMenuCommand::makeFolderMenu(KMFolderNode* node, bool move,
// connect the signals
if (move)
{
- disconnect(menu, TQT_SIGNAL(activated(int)), receiver,
- TQT_SLOT(moveSelectedToFolder(int)));
- connect(menu, TQT_SIGNAL(activated(int)), receiver,
- TQT_SLOT(moveSelectedToFolder(int)));
+ disconnect(menu, TQ_SIGNAL(activated(int)), receiver,
+ TQ_SLOT(moveSelectedToFolder(int)));
+ connect(menu, TQ_SIGNAL(activated(int)), receiver,
+ TQ_SLOT(moveSelectedToFolder(int)));
} else {
- disconnect(menu, TQT_SIGNAL(activated(int)), receiver,
- TQT_SLOT(copySelectedToFolder(int)));
- connect(menu, TQT_SIGNAL(activated(int)), receiver,
- TQT_SLOT(copySelectedToFolder(int)));
+ disconnect(menu, TQ_SIGNAL(activated(int)), receiver,
+ TQ_SLOT(copySelectedToFolder(int)));
+ connect(menu, TQ_SIGNAL(activated(int)), receiver,
+ TQ_SLOT(copySelectedToFolder(int)));
}
KMFolder *folder = 0;
@@ -2036,10 +2036,10 @@ KMCommand::Result KMCopyCommand::execute()
FolderJob *job = srcFolder->createJob(newMsg);
job->setCancellable( false );
mPendingJobs << job;
- connect(job, TQT_SIGNAL(messageRetrieved(KMMessage*)),
- mDestFolder, TQT_SLOT(reallyAddCopyOfMsg(KMMessage*)));
- connect( job, TQT_SIGNAL(result(KMail::FolderJob*)),
- this, TQT_SLOT(slotJobFinished(KMail::FolderJob*)) );
+ connect(job, TQ_SIGNAL(messageRetrieved(KMMessage*)),
+ mDestFolder, TQ_SLOT(reallyAddCopyOfMsg(KMMessage*)));
+ connect( job, TQ_SIGNAL(result(KMail::FolderJob*)),
+ this, TQ_SLOT(slotJobFinished(KMail::FolderJob*)) );
job->start();
} else {
// local => others
@@ -2067,8 +2067,8 @@ KMCommand::Result KMCopyCommand::execute()
if ( mPendingJobs.isEmpty() ) {
// wait for the end of the copy before closing the folder
KMFolderImap *imapDestFolder = static_cast<KMFolderImap*>(mDestFolder->storage());
- connect( imapDestFolder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ),
- this, TQT_SLOT( slotFolderComplete( KMFolderImap*, bool ) ) );
+ connect( imapDestFolder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ),
+ this, TQ_SLOT( slotFolderComplete( KMFolderImap*, bool ) ) );
}
} else {
deleteNow = list.isEmpty() && mPendingJobs.isEmpty(); // we're done if there are no other mails we need to fetch
@@ -2081,8 +2081,8 @@ KMCommand::Result KMCopyCommand::execute()
{
// copy the message(s); note: the list is empty afterwards!
KMFolderImap *imapDestFolder = static_cast<KMFolderImap*>(mDestFolder->storage());
- connect( imapDestFolder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ),
- this, TQT_SLOT( slotFolderComplete( KMFolderImap*, bool ) ) );
+ connect( imapDestFolder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ),
+ this, TQ_SLOT( slotFolderComplete( KMFolderImap*, bool ) ) );
imapDestFolder->copyMsg(list);
imapDestFolder->getFolder();
}
@@ -2107,8 +2107,8 @@ void KMCopyCommand::slotJobFinished(KMail::FolderJob * job)
kdDebug(5006) << k_funcinfo << "folder job failed: " << job->error() << endl;
// kill all pending jobs
for ( TQValueList<KMail::FolderJob*>::Iterator it = mPendingJobs.begin(); it != mPendingJobs.end(); ++it ) {
- disconnect( (*it), TQT_SIGNAL(result(KMail::FolderJob*)),
- this, TQT_SLOT(slotJobFinished(KMail::FolderJob*)) );
+ disconnect( (*it), TQ_SIGNAL(result(KMail::FolderJob*)),
+ this, TQ_SLOT(slotJobFinished(KMail::FolderJob*)) );
(*it)->kill();
}
mPendingJobs.clear();
@@ -2181,8 +2181,8 @@ KMCommand::Result KMMoveCommand::execute()
ProgressManager::createProgressItem (
"move"+ProgressManager::getUniqueID(),
mDestFolder ? i18n( "Moving messages" ) : i18n( "Deleting messages" ) );
- connect( mProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
- this, TQT_SLOT( slotMoveCanceled() ) );
+ connect( mProgressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
+ this, TQ_SLOT( slotMoveCanceled() ) );
KMMessage *msg;
int rc = 0;
@@ -2192,8 +2192,8 @@ KMCommand::Result KMMoveCommand::execute()
mCompleteWithAddedMsg = false;
if (mDestFolder) {
- connect (mDestFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
- this, TQT_SLOT(slotMsgAddedToDestFolder(KMFolder*, TQ_UINT32)));
+ connect (mDestFolder, TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+ this, TQ_SLOT(slotMsgAddedToDestFolder(KMFolder*, TQ_UINT32)));
mLostBoys = mSerNumList;
}
mProgressItem->setTotalItems( mSerNumList.count() );
@@ -2235,11 +2235,11 @@ KMCommand::Result KMMoveCommand::execute()
* signal so we notice when all the mails should have showed up in it
* but haven't for some reason. */
KMFolderImap *imapFolder = static_cast<KMFolderImap*> ( mDestFolder->storage() );
- disconnect (imapFolder, TQT_SIGNAL(folderComplete( KMFolderImap*, bool )),
- this, TQT_SLOT(slotImapFolderCompleted( KMFolderImap*, bool )));
+ disconnect (imapFolder, TQ_SIGNAL(folderComplete( KMFolderImap*, bool )),
+ this, TQ_SLOT(slotImapFolderCompleted( KMFolderImap*, bool )));
- connect (imapFolder, TQT_SIGNAL(folderComplete( KMFolderImap*, bool )),
- this, TQT_SLOT(slotImapFolderCompleted( KMFolderImap*, bool )));
+ connect (imapFolder, TQ_SIGNAL(folderComplete( KMFolderImap*, bool )),
+ this, TQ_SLOT(slotImapFolderCompleted( KMFolderImap*, bool )));
list.append(msg);
} else {
// We are moving to a local folder.
@@ -2297,8 +2297,8 @@ KMCommand::Result KMMoveCommand::execute()
void KMMoveCommand::slotImapFolderCompleted(KMFolderImap* imapFolder, bool success)
{
- disconnect (imapFolder, TQT_SIGNAL(folderComplete( KMFolderImap*, bool )),
- this, TQT_SLOT(slotImapFolderCompleted( KMFolderImap*, bool )));
+ disconnect (imapFolder, TQ_SIGNAL(folderComplete( KMFolderImap*, bool )),
+ this, TQ_SLOT(slotImapFolderCompleted( KMFolderImap*, bool )));
if ( success ) {
// the folder was checked successfully but we were still called, so check
// if we are still waiting for messages to show up. If so, uidValidity
@@ -2327,8 +2327,8 @@ void KMMoveCommand::slotMsgAddedToDestFolder(KMFolder *folder, TQ_UINT32 serNum)
mLostBoys.remove(serNum);
if ( mLostBoys.isEmpty() ) {
// we are done. All messages transferred to the host succesfully
- disconnect (mDestFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
- this, TQT_SLOT(slotMsgAddedToDestFolder(KMFolder*, TQ_UINT32)));
+ disconnect (mDestFolder, TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+ this, TQ_SLOT(slotMsgAddedToDestFolder(KMFolder*, TQ_UINT32)));
if (mDestFolder && mDestFolder->folderType() != KMFolderTypeImap) {
mDestFolder->sync();
}
@@ -2526,8 +2526,8 @@ KMCommand::Result KMSaveAttachmentsCommand::execute()
setDeletesItself( true );
// load all parts
KMLoadPartsCommand *command = new KMLoadPartsCommand( mAttachmentMap );
- connect( command, TQT_SIGNAL( partsRetrieved() ),
- this, TQT_SLOT( slotSaveAll() ) );
+ connect( command, TQ_SIGNAL( partsRetrieved() ),
+ this, TQ_SLOT( slotSaveAll() ) );
command->start();
return OK;
@@ -2832,8 +2832,8 @@ void KMLoadPartsCommand::slotStart()
curFolder->createJob( it.data(), FolderJob::tGetMessage,
0, it.key()->msgPart().partSpecifier() );
job->setCancellable( false );
- connect( job, TQT_SIGNAL(messageUpdated(KMMessage*, TQString)),
- this, TQT_SLOT(slotPartRetrieved(KMMessage*, TQString)) );
+ connect( job, TQ_SIGNAL(messageUpdated(KMMessage*, TQString)),
+ this, TQ_SLOT(slotPartRetrieved(KMMessage*, TQString)) );
job->start();
} else
kdWarning(5006) << "KMLoadPartsCommand - msg has no parent" << endl;
@@ -2928,8 +2928,8 @@ KMCommand::Result KMMailingListCommand::execute()
new KMUrlClickedCommand( lst.first(), mFolder->identity(), 0, false );
}
if ( command ) {
- connect( command, TQT_SIGNAL( completed( KMCommand * ) ),
- this, TQT_SLOT( commandCompleted( KMCommand * ) ) );
+ connect( command, TQ_SIGNAL( completed( KMCommand * ) ),
+ this, TQ_SLOT( commandCompleted( KMCommand * ) ) );
setDeletesItself( true );
setEmitsCompletedItself( true );
command->start();
@@ -3049,8 +3049,8 @@ void KMHandleAttachmentCommand::slotStart()
// load the part
kdDebug(5006) << "load part" << endl;
KMLoadPartsCommand *command = new KMLoadPartsCommand( mNode, mMsg );
- connect( command, TQT_SIGNAL( partsRetrieved() ),
- this, TQT_SLOT( slotPartComplete() ) );
+ connect( command, TQ_SIGNAL( partsRetrieved() ),
+ this, TQ_SLOT( slotPartComplete() ) );
command->start();
} else
{
@@ -3239,8 +3239,8 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus()
if ( !chiasmus )
return;
- const STD_NAMESPACE_PREFIX auto_ptr<Kleo::SpecialJob> listjob( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) );
- if ( !listjob.get() ) {
+ const STD_NAMESPACE_PREFIX unique_ptr<Kleo::SpecialJob> listjob( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) );
+ if ( !listjob ) {
const TQString msg = i18n( "Chiasmus backend does not offer the "
"\"x-obtain-keys\" function. Please report this bug." );
KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
@@ -3306,8 +3306,8 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus()
}
mJob = job;
- connect( job, TQT_SIGNAL(result(const GpgME::Error&,const TQVariant&)),
- this, TQT_SLOT(slotAtmDecryptWithChiasmusResult(const GpgME::Error&,const TQVariant&)) );
+ connect( job, TQ_SIGNAL(result(const GpgME::Error&,const TQVariant&)),
+ this, TQ_SLOT(slotAtmDecryptWithChiasmusResult(const GpgME::Error&,const TQVariant&)) );
}
static const TQString chomp( const TQString & base, const TQString & suffix, bool cs ) {
@@ -3350,8 +3350,8 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::E
d.setDisabled( true ); // we got this far, don't delete yet
TDEIO::Job * uploadJob = TDEIO::storedPut( result.toByteArray(), url, -1, overwrite, false /*resume*/ );
uploadJob->setWindow( parentWidget() );
- connect( uploadJob, TQT_SIGNAL(result(TDEIO::Job*)),
- this, TQT_SLOT(slotAtmDecryptWithChiasmusUploadResult(TDEIO::Job*)) );
+ connect( uploadJob, TQ_SIGNAL(result(TDEIO::Job*)),
+ this, TQ_SLOT(slotAtmDecryptWithChiasmusUploadResult(TDEIO::Job*)) );
}
void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusUploadResult( TDEIO::Job * job )
@@ -3412,8 +3412,8 @@ void AttachmentModifyCommand::storeChangedMessage(KMMessage * msg)
int res = mFolder->addMsg( msg ) != 0;
if ( mFolder->folderType() == KMFolderTypeImap ) {
KMFolderImap *f = static_cast<KMFolderImap*>( mFolder->storage() );
- connect( f, TQT_SIGNAL(folderComplete(KMFolderImap*,bool)),
- TQT_SLOT(messageStoreResult(KMFolderImap*,bool)) );
+ connect( f, TQ_SIGNAL(folderComplete(KMFolderImap*,bool)),
+ TQ_SLOT(messageStoreResult(KMFolderImap*,bool)) );
} else {
messageStoreResult( 0, res == 0 );
}
@@ -3424,7 +3424,7 @@ void AttachmentModifyCommand::messageStoreResult(KMFolderImap* folder, bool succ
Q_UNUSED( folder );
if ( success ) {
KMCommand *delCmd = new KMDeleteMsgCommand( mSernum );
- connect( delCmd, TQT_SIGNAL(completed(KMCommand*)), TQT_SLOT(messageDeleteResult(KMCommand*)) );
+ connect( delCmd, TQ_SIGNAL(completed(KMCommand*)), TQ_SLOT(messageDeleteResult(KMCommand*)) );
delCmd->start();
return;
}
@@ -3515,7 +3515,7 @@ KMCommand::Result KMEditAttachmentCommand::doAttachmentModify()
new KMail::EditorWatcher( KURL( mTempFile.file()->name() ),
part.typeStr() + "/" + part.subtypeStr(),
false, this, parentWidget() );
- connect( watcher, TQT_SIGNAL(editDone(KMail::EditorWatcher*)), TQT_SLOT(editDone(KMail::EditorWatcher*)) );
+ connect( watcher, TQ_SIGNAL(editDone(KMail::EditorWatcher*)), TQ_SLOT(editDone(KMail::EditorWatcher*)) );
if ( !watcher->start() )
return Failed;
setEmitsCompletedItself( true );
diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h
index 24e42524..bf74c909 100644
--- a/kmail/kmcommands.h
+++ b/kmail/kmcommands.h
@@ -48,7 +48,7 @@ typedef TQMap<partNode*, KMMessage*> PartNodeMessageMap;
class KDE_EXPORT KMCommand : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
friend class LaterDeleterWithCommandCompletion;
@@ -162,7 +162,7 @@ private:
class KDE_EXPORT KMMailtoComposeCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -177,7 +177,7 @@ private:
class KDE_EXPORT KMMailtoReplyCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -193,7 +193,7 @@ private:
class KDE_EXPORT KMMailtoForwardCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -208,7 +208,7 @@ private:
class KDE_EXPORT KMMailtoAddAddrBookCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -222,7 +222,7 @@ private:
class KDE_EXPORT KMAddBookmarksCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -237,7 +237,7 @@ private:
class KDE_EXPORT KMMailtoOpenAddrBookCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -251,7 +251,7 @@ private:
class KDE_EXPORT KMUrlCopyCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -266,7 +266,7 @@ private:
class KDE_EXPORT KMUrlOpenCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -281,7 +281,7 @@ private:
class KDE_EXPORT KMUrlSaveCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -298,7 +298,7 @@ private:
class KDE_EXPORT KMEditMsgCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -310,7 +310,7 @@ private:
class KDE_EXPORT KMUseTemplateCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -322,7 +322,7 @@ private:
class KDE_EXPORT KMShowMsgSrcCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -337,7 +337,7 @@ private:
class KDE_EXPORT KMSaveMsgCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -369,7 +369,7 @@ private:
class KDE_EXPORT KMOpenMsgCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -393,7 +393,7 @@ private:
class KDE_EXPORT KMSaveAttachmentsCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Use this to save all attachments of the given message.
@@ -432,7 +432,7 @@ private:
class KDE_EXPORT KMReplyToCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -448,7 +448,7 @@ private:
class KDE_EXPORT KMNoQuoteReplyToCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -460,7 +460,7 @@ private:
class KMReplyListCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -476,7 +476,7 @@ private:
class KDE_EXPORT KMReplyToAllCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -492,7 +492,7 @@ private:
class KDE_EXPORT KMReplyAuthorCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -508,7 +508,7 @@ private:
class KDE_EXPORT KMForwardInlineCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -526,7 +526,7 @@ private:
class KDE_EXPORT KMForwardAttachedCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -544,7 +544,7 @@ private:
class KDE_EXPORT KMForwardDigestCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -562,7 +562,7 @@ private:
class KDE_EXPORT KMRedirectCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -574,7 +574,7 @@ private:
class KDE_EXPORT KMCustomReplyToCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -592,7 +592,7 @@ private:
class KDE_EXPORT KMCustomReplyAllToCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -610,7 +610,7 @@ private:
class KDE_EXPORT KMCustomForwardCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -628,7 +628,7 @@ private:
class KDE_EXPORT KMPrintCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -656,7 +656,7 @@ private:
class KDE_EXPORT KMSeStatusCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -675,7 +675,7 @@ private:
class KDE_EXPORT KMFilterCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -691,7 +691,7 @@ private:
class KDE_EXPORT KMFilterActionCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -708,7 +708,7 @@ private:
class KDE_EXPORT KMMetaFilterActionCommand : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -726,7 +726,7 @@ private:
class KDE_EXPORT FolderShortcutCommand : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -749,7 +749,7 @@ private:
class KDE_EXPORT KMMailingListFilterCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -769,7 +769,7 @@ private:
class KDE_EXPORT KMMenuCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -782,7 +782,7 @@ public:
class KDE_EXPORT KMCopyCommand : public KMMenuCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -808,7 +808,7 @@ namespace KPIM {
}
class KDE_EXPORT KMMoveCommand : public KMMenuCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -844,7 +844,7 @@ private:
class KDE_EXPORT KMDeleteMsgCommand : public KMMoveCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -859,7 +859,7 @@ private:
class KDE_EXPORT KMUrlClickedCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -878,7 +878,7 @@ private:
class KDE_EXPORT KMLoadPartsCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -904,7 +904,7 @@ private:
class KDE_EXPORT KMResendMessageCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -916,7 +916,7 @@ private:
class KDE_EXPORT KMMailingListCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMMailingListCommand( TQWidget *parent, KMFolder *folder );
@@ -932,7 +932,7 @@ protected:
class KDE_EXPORT KMMailingListPostCommand : public KMMailingListCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMMailingListPostCommand( TQWidget *parent, KMFolder *folder );
@@ -942,7 +942,7 @@ protected:
class KDE_EXPORT KMMailingListSubscribeCommand : public KMMailingListCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMMailingListSubscribeCommand( TQWidget *parent, KMFolder *folder );
@@ -952,7 +952,7 @@ protected:
class KDE_EXPORT KMMailingListUnsubscribeCommand : public KMMailingListCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMMailingListUnsubscribeCommand( TQWidget *parent, KMFolder *folder );
@@ -962,7 +962,7 @@ protected:
class KDE_EXPORT KMMailingListArchivesCommand : public KMMailingListCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMMailingListArchivesCommand( TQWidget *parent, KMFolder *folder );
@@ -972,7 +972,7 @@ protected:
class KDE_EXPORT KMMailingListHelpCommand : public KMMailingListCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMMailingListHelpCommand( TQWidget *parent, KMFolder *folder );
@@ -982,7 +982,7 @@ protected:
class KDE_EXPORT KMIMChatCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -1003,7 +1003,7 @@ private:
class KDE_EXPORT KMHandleAttachmentCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -1090,7 +1090,7 @@ private:
/** Base class for commands modifying attachements of existing messages. */
class KDE_EXPORT AttachmentModifyCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
AttachmentModifyCommand( partNode *node, KMMessage *msg, TQWidget *parent );
@@ -1118,7 +1118,7 @@ class KDE_EXPORT AttachmentModifyCommand : public KMCommand
class KDE_EXPORT KMDeleteAttachmentCommand : public AttachmentModifyCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMDeleteAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *parent );
@@ -1132,7 +1132,7 @@ class KDE_EXPORT KMDeleteAttachmentCommand : public AttachmentModifyCommand
class KDE_EXPORT KMEditAttachmentCommand : public AttachmentModifyCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMEditAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *parent );
@@ -1151,7 +1151,7 @@ class KDE_EXPORT KMEditAttachmentCommand : public AttachmentModifyCommand
class KDE_EXPORT CreateTodoCommand : public KMCommand
{
- Q_OBJECT
+ TQ_OBJECT
public:
CreateTodoCommand( TQWidget *parent, KMMessage *msg );
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index 9125f56f..f83ac714 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -195,7 +195,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id )
setInstance( kmkernel->xmlGuiInstance() );
mMainWidget = new TQWidget(this);
// splitter between the headers area and the actual editor
- mHeadersToEditorSplitter = new TQSplitter( Qt::Vertical, mMainWidget, "mHeadersToEditorSplitter" );
+ mHeadersToEditorSplitter = new TQSplitter( TQt::Vertical, mMainWidget, "mHeadersToEditorSplitter" );
mHeadersToEditorSplitter->setChildrenCollapsible( false );
mHeadersArea = new TQWidget( mHeadersToEditorSplitter );
mHeadersArea->setSizePolicy( mHeadersToEditorSplitter->sizePolicy().horData(), TQSizePolicy::Maximum );
@@ -225,8 +225,8 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id )
mEdtReplyTo = new KMLineEdit(true,mHeadersArea, "replyToLine");
TQToolTip::add( mEdtReplyTo,
i18n( "Set the \"Reply-To:\" email address for this message" ) );
- connect(mEdtReplyTo,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
- TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion)));
+ connect(mEdtReplyTo,TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
+ TQ_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion)));
if ( mClassicalRecipients ) {
mRecipientsEditor = 0;
@@ -249,22 +249,22 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id )
TQToolTip::add( mBtnCc, tip );
TQToolTip::add( mBtnBcc, tip );
- mBtnTo->setFocusPolicy(TQ_NoFocus);
- mBtnCc->setFocusPolicy(TQ_NoFocus);
- mBtnBcc->setFocusPolicy(TQ_NoFocus);
- //mBtnFrom->setFocusPolicy(TQ_NoFocus);
+ mBtnTo->setFocusPolicy(TQWidget::NoFocus);
+ mBtnCc->setFocusPolicy(TQWidget::NoFocus);
+ mBtnBcc->setFocusPolicy(TQWidget::NoFocus);
+ //mBtnFrom->setFocusPolicy(TQWidget::NoFocus);
- connect(mBtnTo,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookTo()));
- connect(mBtnCc,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookTo()));
- connect(mBtnBcc,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookTo()));
- //connect(mBtnFrom,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookFrom()));
+ connect(mBtnTo,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddrBookTo()));
+ connect(mBtnCc,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddrBookTo()));
+ connect(mBtnBcc,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddrBookTo()));
+ //connect(mBtnFrom,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddrBookFrom()));
- connect(mEdtTo,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
- TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion)));
- connect(mEdtCc,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
- TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion)));
- connect(mEdtBcc,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
- TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion)));
+ connect(mEdtTo,TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
+ TQ_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion)));
+ connect(mEdtCc,TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
+ TQ_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion)));
+ connect(mEdtBcc,TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
+ TQ_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion)));
mEdtTo->setFocus();
} else {
@@ -283,9 +283,9 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id )
mRecipientsEditor = new RecipientsEditor( mHeadersArea );
connect( mRecipientsEditor,
- TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ),
- TQT_SLOT( slotCompletionModeChanged( TDEGlobalSettings::Completion ) ) );
- connect( mRecipientsEditor, TQT_SIGNAL(sizeHintChanged()), TQT_SLOT(recipientEditorSizeHintChanged()) );
+ TQ_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ),
+ TQ_SLOT( slotCompletionModeChanged( TDEGlobalSettings::Completion ) ) );
+ connect( mRecipientsEditor, TQ_SIGNAL(sizeHintChanged()), TQ_SLOT(recipientEditorSizeHintChanged()) );
mRecipientsEditor->setFocus();
}
@@ -330,9 +330,9 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id )
mFixedFontAction = 0;
mTempDir = 0;
// the attachment view is separated from the editor by a splitter
- mSplitter = new TQSplitter( Qt::Vertical, mHeadersToEditorSplitter, "mSplitter" );
+ mSplitter = new TQSplitter( TQt::Vertical, mHeadersToEditorSplitter, "mSplitter" );
mSplitter->setChildrenCollapsible( false );
- mSnippetSplitter = new TQSplitter( Qt::Horizontal, mSplitter, "mSnippetSplitter");
+ mSnippetSplitter = new TQSplitter( TQt::Horizontal, mSplitter, "mSnippetSplitter");
mSnippetSplitter->setChildrenCollapsible( false );
TQWidget *editorAndCryptoStateIndicators = new TQWidget( mSnippetSplitter );
@@ -385,10 +385,10 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id )
setCaption( i18n("Composer") );
setMinimumSize(200,200);
- mBtnIdentity->setFocusPolicy(TQ_NoFocus);
- mBtnFcc->setFocusPolicy(TQ_NoFocus);
- mBtnTransport->setFocusPolicy(TQ_NoFocus);
- mBtnDictionary->setFocusPolicy( TQ_NoFocus );
+ mBtnIdentity->setFocusPolicy(TQWidget::NoFocus);
+ mBtnFcc->setFocusPolicy(TQWidget::NoFocus);
+ mBtnTransport->setFocusPolicy(TQWidget::NoFocus);
+ mBtnDictionary->setFocusPolicy( TQWidget::NoFocus );
mAtmListView = new AttachmentListView( this, mSplitter,
"attachment list view" );
@@ -413,20 +413,20 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id )
mAtmListView->setAllColumnsShowFocus( true );
connect( mAtmListView,
- TQT_SIGNAL( doubleClicked( TQListViewItem* ) ),
- TQT_SLOT( slotAttachEdit() ) );
+ TQ_SIGNAL( doubleClicked( TQListViewItem* ) ),
+ TQ_SLOT( slotAttachEdit() ) );
connect( mAtmListView,
- TQT_SIGNAL( rightButtonPressed( TQListViewItem*, const TQPoint&, int ) ),
- TQT_SLOT( slotAttachPopupMenu( TQListViewItem*, const TQPoint&, int ) ) );
+ TQ_SIGNAL( rightButtonPressed( TQListViewItem*, const TQPoint&, int ) ),
+ TQ_SLOT( slotAttachPopupMenu( TQListViewItem*, const TQPoint&, int ) ) );
connect( mAtmListView,
- TQT_SIGNAL( selectionChanged() ),
- TQT_SLOT( slotUpdateAttachActions() ) );
+ TQ_SIGNAL( selectionChanged() ),
+ TQ_SLOT( slotUpdateAttachActions() ) );
connect( mAtmListView,
- TQT_SIGNAL( attachmentDeleted() ),
- TQT_SLOT( slotAttachRemove() ) );
+ TQ_SIGNAL( attachmentDeleted() ),
+ TQ_SLOT( slotAttachRemove() ) );
connect( mAtmListView,
- TQT_SIGNAL( dragStarted() ),
- TQT_SLOT( slotAttachmentDragStarted() ) );
+ TQ_SIGNAL( dragStarted() ),
+ TQ_SLOT( slotAttachmentDragStarted() ) );
mAttachMenu = 0;
readConfig();
@@ -437,32 +437,32 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id )
applyMainWindowSettings(KMKernel::config(), "Composer");
- connect( mEdtSubject, TQT_SIGNAL( subjectTextSpellChecked() ),
- TQT_SLOT( slotSubjectTextSpellChecked() ) );
- connect(mEdtSubject,TQT_SIGNAL(textChanged(const TQString&)),
- TQT_SLOT(slotUpdWinTitle(const TQString&)));
- connect(mIdentity,TQT_SIGNAL(identityChanged(uint)),
- TQT_SLOT(slotIdentityChanged(uint)));
- connect( kmkernel->identityManager(), TQT_SIGNAL(changed(uint)),
- TQT_SLOT(slotIdentityChanged(uint)));
-
- connect(mEdtFrom,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
- TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion)));
- connect(kmkernel->folderMgr(),TQT_SIGNAL(folderRemoved(KMFolder*)),
- TQT_SLOT(slotFolderRemoved(KMFolder*)));
- connect(kmkernel->imapFolderMgr(),TQT_SIGNAL(folderRemoved(KMFolder*)),
- TQT_SLOT(slotFolderRemoved(KMFolder*)));
- connect(kmkernel->dimapFolderMgr(),TQT_SIGNAL(folderRemoved(KMFolder*)),
- TQT_SLOT(slotFolderRemoved(KMFolder*)));
- connect( kmkernel, TQT_SIGNAL( configChanged() ),
- TQT_TQOBJECT(this), TQT_SLOT( slotConfigChanged() ) );
-
- connect (mEditor, TQT_SIGNAL (spellcheck_done(int)),
- this, TQT_SLOT (slotSpellcheckDone (int)));
- connect (mEditor, TQT_SIGNAL( attachPNGImageData(const TQByteArray &) ),
- this, TQT_SLOT ( slotAttachPNGImageData(const TQByteArray &) ) );
- connect (mEditor, TQT_SIGNAL( focusChanged(bool) ),
- this, TQT_SLOT (editorFocusChanged(bool)) );
+ connect( mEdtSubject, TQ_SIGNAL( subjectTextSpellChecked() ),
+ TQ_SLOT( slotSubjectTextSpellChecked() ) );
+ connect(mEdtSubject,TQ_SIGNAL(textChanged(const TQString&)),
+ TQ_SLOT(slotUpdWinTitle(const TQString&)));
+ connect(mIdentity,TQ_SIGNAL(identityChanged(uint)),
+ TQ_SLOT(slotIdentityChanged(uint)));
+ connect( kmkernel->identityManager(), TQ_SIGNAL(changed(uint)),
+ TQ_SLOT(slotIdentityChanged(uint)));
+
+ connect(mEdtFrom,TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
+ TQ_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion)));
+ connect(kmkernel->folderMgr(),TQ_SIGNAL(folderRemoved(KMFolder*)),
+ TQ_SLOT(slotFolderRemoved(KMFolder*)));
+ connect(kmkernel->imapFolderMgr(),TQ_SIGNAL(folderRemoved(KMFolder*)),
+ TQ_SLOT(slotFolderRemoved(KMFolder*)));
+ connect(kmkernel->dimapFolderMgr(),TQ_SIGNAL(folderRemoved(KMFolder*)),
+ TQ_SLOT(slotFolderRemoved(KMFolder*)));
+ connect( kmkernel, TQ_SIGNAL( configChanged() ),
+ this, TQ_SLOT( slotConfigChanged() ) );
+
+ connect (mEditor, TQ_SIGNAL (spellcheck_done(int)),
+ this, TQ_SLOT (slotSpellcheckDone (int)));
+ connect (mEditor, TQ_SIGNAL( attachPNGImageData(const TQByteArray &) ),
+ this, TQ_SLOT ( slotAttachPNGImageData(const TQByteArray &) ) );
+ connect (mEditor, TQ_SIGNAL( focusChanged(bool) ),
+ this, TQ_SLOT (editorFocusChanged(bool)) );
mMainWidget->resize(480,510);
setCentralWidget(mMainWidget);
@@ -553,7 +553,7 @@ void KMComposeWin::addAttachmentsAndSend(const KURL::List &urls, const TQString
}
mAttachFilesSend = how;
mAttachFilesPending = urls;
- connect(this, TQT_SIGNAL(attachmentAdded(const KURL&, bool)), TQT_SLOT(slotAttachedFile(const KURL&)));
+ connect(this, TQ_SIGNAL(attachmentAdded(const KURL&, bool)), TQ_SLOT(slotAttachedFile(const KURL&)));
for( KURL::List::ConstIterator itr = urls.begin(); itr != urls.end(); ++itr ) {
if (!addAttach( *itr ))
mAttachFilesPending.remove(mAttachFilesPending.find(*itr)); // only remove one copy of the url
@@ -815,8 +815,8 @@ void KMComposeWin::autoSaveMessage()
if ( mAutoSaveTimer )
mAutoSaveTimer->stop();
- connect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotContinueAutoSave() ) );
+ connect( this, TQ_SIGNAL( applyChangesDone( bool ) ),
+ this, TQ_SLOT( slotContinueAutoSave() ) );
// This method is called when KMail crashed, so don't try signing/encryption
// and don't disable controls because it is also called from a timer and
// then the disabling is distracting.
@@ -827,8 +827,8 @@ void KMComposeWin::autoSaveMessage()
void KMComposeWin::slotContinueAutoSave()
{
- disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotContinueAutoSave() ) );
+ disconnect( this, TQ_SIGNAL( applyChangesDone( bool ) ),
+ this, TQ_SLOT( slotContinueAutoSave() ) );
// Ok, it's done now - continue dead letter saving
if ( mComposedMessages.isEmpty() ) {
@@ -887,7 +887,7 @@ void KMComposeWin::slotView(void)
//This sucks awfully, but no, I cannot get an activated(int id) from
// actionContainer()
- if (!TQT_TQOBJECT_CONST(sender())->isA("TDEToggleAction"))
+ if (!sender()->isA("TDEToggleAction"))
return;
TDEToggleAction *act = (TDEToggleAction *) sender();
@@ -1076,22 +1076,22 @@ void KMComposeWin::rethinkFields(bool fromSlot)
++row;
if ( showHeaders & HDR_REPLY_TO ) {
- connect( mEdtReplyTo, TQT_SIGNAL( focusDown() ), mRecipientsEditor,
- TQT_SLOT( setFocusTop() ) );
+ connect( mEdtReplyTo, TQ_SIGNAL( focusDown() ), mRecipientsEditor,
+ TQ_SLOT( setFocusTop() ) );
} else {
- connect( mEdtFrom, TQT_SIGNAL( focusDown() ), mRecipientsEditor,
- TQT_SLOT( setFocusTop() ) );
+ connect( mEdtFrom, TQ_SIGNAL( focusDown() ), mRecipientsEditor,
+ TQ_SLOT( setFocusTop() ) );
}
if ( showHeaders & HDR_REPLY_TO ) {
- connect( mRecipientsEditor, TQT_SIGNAL( focusUp() ), mEdtReplyTo, TQT_SLOT( setFocus() ) );
+ connect( mRecipientsEditor, TQ_SIGNAL( focusUp() ), mEdtReplyTo, TQ_SLOT( setFocus() ) );
} else {
- connect( mRecipientsEditor, TQT_SIGNAL( focusUp() ), mEdtFrom, TQT_SLOT( setFocus() ) );
+ connect( mRecipientsEditor, TQ_SIGNAL( focusUp() ), mEdtFrom, TQ_SLOT( setFocus() ) );
}
- connect( mRecipientsEditor, TQT_SIGNAL( focusDown() ), mEdtSubject,
- TQT_SLOT( setFocus() ) );
- connect( mEdtSubject, TQT_SIGNAL( focusUp() ), mRecipientsEditor,
- TQT_SLOT( setFocusBottom() ) );
+ connect( mRecipientsEditor, TQ_SIGNAL( focusDown() ), mEdtSubject,
+ TQ_SLOT( setFocus() ) );
+ connect( mEdtSubject, TQ_SIGNAL( focusUp() ), mRecipientsEditor,
+ TQ_SLOT( setFocusBottom() ) );
prevFocus = mRecipientsEditor;
}
@@ -1131,8 +1131,8 @@ void KMComposeWin::rethinkFields(bool fromSlot)
TQWidget *KMComposeWin::connectFocusMoving( TQWidget *prev, TQWidget *next )
{
- connect( prev, TQT_SIGNAL( focusDown() ), next, TQT_SLOT( setFocus() ) );
- connect( next, TQT_SIGNAL( focusUp() ), prev, TQT_SLOT( setFocus() ) );
+ connect( prev, TQ_SIGNAL( focusDown() ), next, TQ_SLOT( setFocus() ) );
+ connect( next, TQ_SIGNAL( focusUp() ), prev, TQ_SLOT( setFocus() ) );
return next;
}
@@ -1233,14 +1233,14 @@ void KMComposeWin::setupActions(void)
{
//default = send now, alternative = queue
( void ) new TDEAction( i18n("&Send Mail"), "mail-send", CTRL+Key_Return,
- TQT_TQOBJECT(this), TQT_SLOT(slotSendNow()), actionCollection(),"send_default");
+ this, TQ_SLOT(slotSendNow()), actionCollection(),"send_default");
// FIXME: change to mail_send_via icon when this exits.
actActionNowMenu = new TDEActionMenu (i18n("&Send Mail Via"), "mail-send",
actionCollection(), "send_default_via" );
- (void) new TDEAction (i18n("Send &Later"), "queue", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotSendLater()), actionCollection(),"send_alternative");
+ (void) new TDEAction (i18n("Send &Later"), "queue", 0, this,
+ TQ_SLOT(slotSendLater()), actionCollection(),"send_alternative");
actActionLaterMenu = new TDEActionMenu (i18n("Send &Later Via"), "queue",
actionCollection(), "send_alternative_via" );
@@ -1250,12 +1250,12 @@ void KMComposeWin::setupActions(void)
//default = queue, alternative = send now
(void) new TDEAction (i18n("Send &Later"), "queue",
CTRL+Key_Return,
- TQT_TQOBJECT(this), TQT_SLOT(slotSendLater()), actionCollection(),"send_default");
+ this, TQ_SLOT(slotSendLater()), actionCollection(),"send_default");
actActionLaterMenu = new TDEActionMenu (i18n("Send &Later Via"), "queue",
actionCollection(), "send_default_via" );
( void ) new TDEAction( i18n("&Send Mail"), "mail-send", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotSendNow()), actionCollection(),"send_alternative");
+ this, TQ_SLOT(slotSendNow()), actionCollection(),"send_alternative");
// FIXME: change to mail_send_via icon when this exits.
actActionNowMenu = new TDEActionMenu (i18n("&Send Mail Via"), "mail-send",
@@ -1267,102 +1267,102 @@ void KMComposeWin::setupActions(void)
actActionNowMenu->setDelayed(true);
actActionLaterMenu->setDelayed(true);
- connect( actActionNowMenu, TQT_SIGNAL( activated() ), this,
- TQT_SLOT( slotSendNow() ) );
- connect( actActionLaterMenu, TQT_SIGNAL( activated() ), this,
- TQT_SLOT( slotSendLater() ) );
+ connect( actActionNowMenu, TQ_SIGNAL( activated() ), this,
+ TQ_SLOT( slotSendNow() ) );
+ connect( actActionLaterMenu, TQ_SIGNAL( activated() ), this,
+ TQ_SLOT( slotSendLater() ) );
mActNowMenu = actActionNowMenu->popupMenu();
mActLaterMenu = actActionLaterMenu->popupMenu();
- connect( mActNowMenu, TQT_SIGNAL( activated( int ) ), this,
- TQT_SLOT( slotSendNowVia( int ) ) );
- connect( mActNowMenu, TQT_SIGNAL( aboutToShow() ), this,
- TQT_SLOT( getTransportMenu() ) );
+ connect( mActNowMenu, TQ_SIGNAL( activated( int ) ), this,
+ TQ_SLOT( slotSendNowVia( int ) ) );
+ connect( mActNowMenu, TQ_SIGNAL( aboutToShow() ), this,
+ TQ_SLOT( getTransportMenu() ) );
- connect( mActLaterMenu, TQT_SIGNAL( activated( int ) ), this,
- TQT_SLOT( slotSendLaterVia( int ) ) );
- connect( mActLaterMenu, TQT_SIGNAL( aboutToShow() ), this,
- TQT_SLOT( getTransportMenu() ) );
+ connect( mActLaterMenu, TQ_SIGNAL( activated( int ) ), this,
+ TQ_SLOT( slotSendLaterVia( int ) ) );
+ connect( mActLaterMenu, TQ_SIGNAL( aboutToShow() ), this,
+ TQ_SLOT( getTransportMenu() ) );
(void) new TDEAction (i18n("Save as &Draft"), "document-save", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotSaveDraft()),
+ this, TQ_SLOT(slotSaveDraft()),
actionCollection(), "save_in_drafts");
(void) new TDEAction (i18n("Save as &Template"), "document-save", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotSaveTemplate()),
+ this, TQ_SLOT(slotSaveTemplate()),
actionCollection(), "save_in_templates");
(void) new TDEAction (i18n("&Insert File..."), "document-open", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotInsertFile()),
+ this, TQ_SLOT(slotInsertFile()),
actionCollection(), "insert_file");
mRecentAction = new TDERecentFilesAction (i18n("&Insert File Recent"),
"document-open", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotInsertRecentFile(const KURL&)),
+ this, TQ_SLOT(slotInsertRecentFile(const KURL&)),
actionCollection(), "insert_file_recent");
mRecentAction->loadEntries( KMKernel::config() );
(void) new TDEAction (i18n("&Address Book"), "contents",0,
- TQT_TQOBJECT(this), TQT_SLOT(slotAddrBook()),
+ this, TQ_SLOT(slotAddrBook()),
actionCollection(), "addressbook");
(void) new TDEAction (i18n("&New Composer"), "mail-message-new",
TDEStdAccel::shortcut(TDEStdAccel::New),
- TQT_TQOBJECT(this), TQT_SLOT(slotNewComposer()),
+ this, TQ_SLOT(slotNewComposer()),
actionCollection(), "new_composer");
(void) new TDEAction (i18n("New Main &Window"), "window-new", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotNewMailReader()),
+ this, TQ_SLOT(slotNewMailReader()),
actionCollection(), "open_mailreader");
if ( !mClassicalRecipients ) {
- new TDEAction( i18n("Select &Recipients..."), CTRL + Key_L, TQT_TQOBJECT(mRecipientsEditor),
- TQT_SLOT( selectRecipients() ), actionCollection(), "select_recipients" );
- new TDEAction( i18n("Save &Distribution List..."), 0, TQT_TQOBJECT(mRecipientsEditor),
- TQT_SLOT( saveDistributionList() ), actionCollection(),
+ new TDEAction( i18n("Select &Recipients..."), CTRL + Key_L, mRecipientsEditor,
+ TQ_SLOT( selectRecipients() ), actionCollection(), "select_recipients" );
+ new TDEAction( i18n("Save &Distribution List..."), 0, mRecipientsEditor,
+ TQ_SLOT( saveDistributionList() ), actionCollection(),
"save_distribution_list" );
}
- //KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(), actionCollection(), "save_message");
- KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), actionCollection());
- KStdAction::close (TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection());
+ //KStdAction::save(this, TQ_SLOT(), actionCollection(), "save_message");
+ KStdAction::print (this, TQ_SLOT(slotPrint()), actionCollection());
+ KStdAction::close (this, TQ_SLOT(slotClose()), actionCollection());
- KStdAction::undo (TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actionCollection());
- KStdAction::redo (TQT_TQOBJECT(this), TQT_SLOT(slotRedo()), actionCollection());
- KStdAction::cut (TQT_TQOBJECT(this), TQT_SLOT(slotCut()), actionCollection());
- KStdAction::copy (TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actionCollection());
- KStdAction::pasteText (TQT_TQOBJECT(this), TQT_SLOT(slotPasteClipboard()), actionCollection());
- KStdAction::selectAll (TQT_TQOBJECT(this), TQT_SLOT(slotMarkAll()), actionCollection());
+ KStdAction::undo (this, TQ_SLOT(slotUndo()), actionCollection());
+ KStdAction::redo (this, TQ_SLOT(slotRedo()), actionCollection());
+ KStdAction::cut (this, TQ_SLOT(slotCut()), actionCollection());
+ KStdAction::copy (this, TQ_SLOT(slotCopy()), actionCollection());
+ KStdAction::pasteText (this, TQ_SLOT(slotPasteClipboard()), actionCollection());
+ KStdAction::selectAll (this, TQ_SLOT(slotMarkAll()), actionCollection());
- KStdAction::find (TQT_TQOBJECT(this), TQT_SLOT(slotFind()), actionCollection());
- KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(slotSearchAgain()), actionCollection());
+ KStdAction::find (this, TQ_SLOT(slotFind()), actionCollection());
+ KStdAction::findNext(this, TQ_SLOT(slotSearchAgain()), actionCollection());
- KStdAction::replace (TQT_TQOBJECT(this), TQT_SLOT(slotReplace()), actionCollection());
- KStdAction::spelling (TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheck()), actionCollection(), "tools-check-spelling");
+ KStdAction::replace (this, TQ_SLOT(slotReplace()), actionCollection());
+ KStdAction::spelling (this, TQ_SLOT(slotSpellcheck()), actionCollection(), "tools-check-spelling");
- mPasteQuotation = new TDEAction (i18n("Pa&ste as Quotation"),0,TQT_TQOBJECT(this),TQT_SLOT( slotPasteClipboardAsQuotation()),
+ mPasteQuotation = new TDEAction (i18n("Pa&ste as Quotation"),0,this,TQ_SLOT( slotPasteClipboardAsQuotation()),
actionCollection(), "paste_quoted");
- (void) new TDEAction (i18n("Paste as Attac&hment"),0,TQT_TQOBJECT(this),TQT_SLOT( slotPasteClipboardAsAttachment()),
+ (void) new TDEAction (i18n("Paste as Attac&hment"),0,this,TQ_SLOT( slotPasteClipboardAsAttachment()),
actionCollection(), "paste_att");
- TDEAction * addq = new TDEAction(i18n("Add &Quote Characters"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotAddQuotes()), actionCollection(), "tools_quote");
- connect( mEditor, TQT_SIGNAL(selectionAvailable(bool)),
- addq, TQT_SLOT(setEnabled(bool)) );
+ TDEAction * addq = new TDEAction(i18n("Add &Quote Characters"), 0, this,
+ TQ_SLOT(slotAddQuotes()), actionCollection(), "tools_quote");
+ connect( mEditor, TQ_SIGNAL(selectionAvailable(bool)),
+ addq, TQ_SLOT(setEnabled(bool)) );
- TDEAction * remq = new TDEAction(i18n("Re&move Quote Characters"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote");
- connect( mEditor, TQT_SIGNAL(selectionAvailable(bool)),
- remq, TQT_SLOT(setEnabled(bool)) );
+ TDEAction * remq = new TDEAction(i18n("Re&move Quote Characters"), 0, this,
+ TQ_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote");
+ connect( mEditor, TQ_SIGNAL(selectionAvailable(bool)),
+ remq, TQ_SLOT(setEnabled(bool)) );
- (void) new TDEAction (i18n("Cl&ean Spaces"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleanSpace()),
+ (void) new TDEAction (i18n("Cl&ean Spaces"), 0, this, TQ_SLOT(slotCleanSpace()),
actionCollection(), "clean_spaces");
- mFixedFontAction = new TDEToggleAction( i18n("Use Fi&xed Font"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotUpdateFont()), actionCollection(), "toggle_fixedfont" );
+ mFixedFontAction = new TDEToggleAction( i18n("Use Fi&xed Font"), 0, this,
+ TQ_SLOT(slotUpdateFont()), actionCollection(), "toggle_fixedfont" );
mFixedFontAction->setChecked( GlobalSettings::self()->useFixedFont() );
//these are checkable!!!
@@ -1375,16 +1375,16 @@ void KMComposeWin::setupActions(void)
mRequestMDNAction->setChecked(GlobalSettings::self()->requestMDN());
//----- Message-Encoding Submenu
mEncodingAction = new TDESelectAction( i18n( "Se&t Encoding" ), "charset",
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetCharset() ),
+ 0, this, TQ_SLOT(slotSetCharset() ),
actionCollection(), "charsets" );
mWordWrapAction = new TDEToggleAction (i18n("&Wordwrap"), 0,
actionCollection(), "wordwrap");
mWordWrapAction->setChecked(GlobalSettings::self()->wordWrap());
- connect(mWordWrapAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotWordWrapToggled(bool)));
+ connect(mWordWrapAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotWordWrapToggled(bool)));
mSnippetAction = new TDEToggleAction ( i18n("&Snippets"), 0,
actionCollection(), "snippets");
- connect(mSnippetAction, TQT_SIGNAL(toggled(bool)), mSnippetWidget, TQT_SLOT(setShown(bool)) );
+ connect(mSnippetAction, TQ_SIGNAL(toggled(bool)), mSnippetWidget, TQ_SLOT(setShown(bool)) );
mSnippetAction->setChecked( GlobalSettings::self()->showSnippetManager() );
mAutoSpellCheckingAction =
@@ -1394,8 +1394,8 @@ void KMComposeWin::setupActions(void)
mAutoSpellCheckingAction->setEnabled( !GlobalSettings::self()->useExternalEditor() );
mAutoSpellCheckingAction->setChecked( !GlobalSettings::self()->useExternalEditor() && spellChecking );
slotAutoSpellCheckingToggled( !GlobalSettings::self()->useExternalEditor() && spellChecking );
- connect( mAutoSpellCheckingAction, TQT_SIGNAL( toggled( bool ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotAutoSpellCheckingToggled( bool ) ) );
+ connect( mAutoSpellCheckingAction, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotAutoSpellCheckingToggled( bool ) ) );
TQStringList encodings = KMMsgBase::supportedEncodings(true);
encodings.prepend( i18n("Auto-Detect"));
@@ -1403,84 +1403,84 @@ void KMComposeWin::setupActions(void)
mEncodingAction->setCurrentItem( -1 );
//these are checkable!!!
- markupAction = new TDEToggleAction (i18n("Formatting (HTML)"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotToggleMarkup()),
+ markupAction = new TDEToggleAction (i18n("Formatting (HTML)"), 0, this,
+ TQ_SLOT(slotToggleMarkup()),
actionCollection(), "html");
- mAllFieldsAction = new TDEToggleAction (i18n("&All Fields"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotView()),
+ mAllFieldsAction = new TDEToggleAction (i18n("&All Fields"), 0, this,
+ TQ_SLOT(slotView()),
actionCollection(), "show_all_fields");
- mIdentityAction = new TDEToggleAction (i18n("&Identity"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotView()),
+ mIdentityAction = new TDEToggleAction (i18n("&Identity"), 0, this,
+ TQ_SLOT(slotView()),
actionCollection(), "show_identity");
- mDictionaryAction = new TDEToggleAction (i18n("&Dictionary"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotView()),
+ mDictionaryAction = new TDEToggleAction (i18n("&Dictionary"), 0, this,
+ TQ_SLOT(slotView()),
actionCollection(), "show_dictionary");
- mFccAction = new TDEToggleAction (i18n("&Sent-Mail Folder"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotView()),
+ mFccAction = new TDEToggleAction (i18n("&Sent-Mail Folder"), 0, this,
+ TQ_SLOT(slotView()),
actionCollection(), "show_fcc");
- mTransportAction = new TDEToggleAction (i18n("&Mail Transport"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotView()),
+ mTransportAction = new TDEToggleAction (i18n("&Mail Transport"), 0, this,
+ TQ_SLOT(slotView()),
actionCollection(), "show_transport");
- mFromAction = new TDEToggleAction (i18n("&From"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotView()),
+ mFromAction = new TDEToggleAction (i18n("&From"), 0, this,
+ TQ_SLOT(slotView()),
actionCollection(), "show_from");
- mReplyToAction = new TDEToggleAction (i18n("&Reply To"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotView()),
+ mReplyToAction = new TDEToggleAction (i18n("&Reply To"), 0, this,
+ TQ_SLOT(slotView()),
actionCollection(), "show_reply_to");
if ( mClassicalRecipients ) {
- mToAction = new TDEToggleAction (i18n("&To"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotView()),
+ mToAction = new TDEToggleAction (i18n("&To"), 0, this,
+ TQ_SLOT(slotView()),
actionCollection(), "show_to");
- mCcAction = new TDEToggleAction (i18n("&CC"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotView()),
+ mCcAction = new TDEToggleAction (i18n("&CC"), 0, this,
+ TQ_SLOT(slotView()),
actionCollection(), "show_cc");
- mBccAction = new TDEToggleAction (i18n("&BCC"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotView()),
+ mBccAction = new TDEToggleAction (i18n("&BCC"), 0, this,
+ TQ_SLOT(slotView()),
actionCollection(), "show_bcc");
}
- mSubjectAction = new TDEToggleAction (i18n("S&ubject"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotView()),
+ mSubjectAction = new TDEToggleAction (i18n("S&ubject"), 0, this,
+ TQ_SLOT(slotView()),
actionCollection(), "show_subject");
//end of checkable
- mAppendSignatureAction = new TDEAction (i18n("Append S&ignature"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotAppendSignature()),
+ mAppendSignatureAction = new TDEAction (i18n("Append S&ignature"), 0, this,
+ TQ_SLOT(slotAppendSignature()),
actionCollection(), "append_signature");
- mPrependSignatureAction = new TDEAction (i18n("Prepend S&ignature"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotPrependSignature()),
+ mPrependSignatureAction = new TDEAction (i18n("Prepend S&ignature"), 0, this,
+ TQ_SLOT(slotPrependSignature()),
actionCollection(), "prepend_signature");
- mInsertSignatureAction = new TDEAction (i18n("Insert Signature At C&ursor Position"), "edit", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotInsertSignatureAtCursor()),
+ mInsertSignatureAction = new TDEAction (i18n("Insert Signature At C&ursor Position"), "edit", 0, this,
+ TQ_SLOT(slotInsertSignatureAtCursor()),
actionCollection(), "insert_signature_at_cursor_position");
- mAttachPK = new TDEAction (i18n("Attach &Public Key..."), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotInsertPublicKey()),
+ mAttachPK = new TDEAction (i18n("Attach &Public Key..."), 0, this,
+ TQ_SLOT(slotInsertPublicKey()),
actionCollection(), "attach_public_key");
- mAttachMPK = new TDEAction (i18n("Attach &My Public Key"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotInsertMyPublicKey()),
+ mAttachMPK = new TDEAction (i18n("Attach &My Public Key"), 0, this,
+ TQ_SLOT(slotInsertMyPublicKey()),
actionCollection(), "attach_my_public_key");
(void) new TDEAction (i18n("&Attach File..."), "attach",
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachFile()),
+ 0, this, TQ_SLOT(slotAttachFile()),
actionCollection(), "attach");
- mAttachRemoveAction = new TDEAction (i18n("&Remove Attachment"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotAttachRemove()),
+ mAttachRemoveAction = new TDEAction (i18n("&Remove Attachment"), 0, this,
+ TQ_SLOT(slotAttachRemove()),
actionCollection(), "remove");
mAttachSaveAction = new TDEAction (i18n("&Save Attachment As..."), "document-save",0,
- TQT_TQOBJECT(this), TQT_SLOT(slotAttachSave()),
+ this, TQ_SLOT(slotAttachSave()),
actionCollection(), "attach_save");
- mAttachPropertiesAction = new TDEAction (i18n("Attachment Pr&operties"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotAttachProperties()),
+ mAttachPropertiesAction = new TDEAction (i18n("Attachment Pr&operties"), 0, this,
+ TQ_SLOT(slotAttachProperties()),
actionCollection(), "attach_properties");
setStandardToolBarMenuEnabled(true);
- KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), actionCollection());
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection());
- KStdAction::preferences(kmkernel, TQT_SLOT(slotShowConfigurationDialog()), actionCollection());
+ KStdAction::keyBindings(this, TQ_SLOT(slotEditKeys()), actionCollection());
+ KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbars()), actionCollection());
+ KStdAction::preferences(kmkernel, TQ_SLOT(slotShowConfigurationDialog()), actionCollection());
- (void) new TDEAction (i18n("&Spellchecker..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheckConfig()),
+ (void) new TDEAction (i18n("&Spellchecker..."), 0, this, TQ_SLOT(slotSpellcheckConfig()),
actionCollection(), "setup_spellchecker");
if ( Kleo::CryptoBackendFactory::instance()->protocol( "Chiasmus" ) ) {
@@ -1489,8 +1489,8 @@ void KMComposeWin::setupActions(void)
"encrypt_message_chiasmus" );
a->setCheckedState( KGuiItem( i18n( "Encrypt Message with Chiasmus..." ), "chiencrypted" ) );
mEncryptChiasmusAction = a;
- connect( mEncryptChiasmusAction, TQT_SIGNAL(toggled(bool)),
- TQT_TQOBJECT(this), TQT_SLOT(slotEncryptChiasmusToggled(bool)) );
+ connect( mEncryptChiasmusAction, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(slotEncryptChiasmusToggled(bool)) );
} else {
mEncryptChiasmusAction = 0;
}
@@ -1536,17 +1536,17 @@ void KMComposeWin::setupActions(void)
setSigning( ( canOpenPGPSign || canSMIMESign ) && GlobalSettings::self()->pgpAutoSign() );
}
- connect(mEncryptAction, TQT_SIGNAL(toggled(bool)),
- TQT_SLOT(slotEncryptToggled( bool )));
- connect(mSignAction, TQT_SIGNAL(toggled(bool)),
- TQT_SLOT(slotSignToggled( bool )));
+ connect(mEncryptAction, TQ_SIGNAL(toggled(bool)),
+ TQ_SLOT(slotEncryptToggled( bool )));
+ connect(mSignAction, TQ_SIGNAL(toggled(bool)),
+ TQ_SLOT(slotSignToggled( bool )));
TQStringList l;
for ( int i = 0 ; i < numCryptoMessageFormats ; ++i )
l.push_back( Kleo::cryptoMessageFormatToLabel( cryptoMessageFormats[i] ) );
mCryptoModuleAction = new TDESelectAction( i18n( "&Cryptographic Message Format" ), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotSelectCryptoModule()),
+ this, TQ_SLOT(slotSelectCryptoModule()),
actionCollection(), "options_select_crypto" );
mCryptoModuleAction->setItems( l );
mCryptoModuleAction->setCurrentItem( format2cb( ident.preferredCryptoMessageFormat() ) );
@@ -1566,50 +1566,50 @@ void KMComposeWin::setupActions(void)
"text_list" );
listAction->setItems( styleItems );
listAction->setToolTip( i18n( "Select a list style" ) );
- connect( listAction, TQT_SIGNAL( activated( const TQString& ) ),
- TQT_SLOT( slotListAction( const TQString& ) ) );
+ connect( listAction, TQ_SIGNAL( activated( const TQString& ) ),
+ TQ_SLOT( slotListAction( const TQString& ) ) );
fontAction = new TDEFontAction( "Select Font", 0, actionCollection(),
"text_font" );
fontAction->setToolTip( i18n( "Select a font" ) );
- connect( fontAction, TQT_SIGNAL( activated( const TQString& ) ),
- TQT_SLOT( slotFontAction( const TQString& ) ) );
+ connect( fontAction, TQ_SIGNAL( activated( const TQString& ) ),
+ TQ_SLOT( slotFontAction( const TQString& ) ) );
fontSizeAction = new TDEFontSizeAction( "Select Size", 0, actionCollection(),
"text_size" );
fontSizeAction->setToolTip( i18n( "Select a font size" ) );
- connect( fontSizeAction, TQT_SIGNAL( fontSizeChanged( int ) ),
- TQT_SLOT( slotSizeAction( int ) ) );
+ connect( fontSizeAction, TQ_SIGNAL( fontSizeChanged( int ) ),
+ TQ_SLOT( slotSizeAction( int ) ) );
alignLeftAction = new TDEToggleAction (i18n("Align Left"), "format-text-direction-ltr", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotAlignLeft()), actionCollection(),
+ this, TQ_SLOT(slotAlignLeft()), actionCollection(),
"align_left");
alignLeftAction->setChecked( true );
alignRightAction = new TDEToggleAction (i18n("Align Right"), "format-text-direction-rtl", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotAlignRight()), actionCollection(),
+ this, TQ_SLOT(slotAlignRight()), actionCollection(),
"align_right");
alignCenterAction = new TDEToggleAction (i18n("Align Center"), "text_center", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotAlignCenter()), actionCollection(),
+ this, TQ_SLOT(slotAlignCenter()), actionCollection(),
"align_center");
textBoldAction = new TDEToggleAction( i18n("&Bold"), "format-text-bold", CTRL+Key_B,
- TQT_TQOBJECT(this), TQT_SLOT(slotTextBold()),
+ this, TQ_SLOT(slotTextBold()),
actionCollection(), "format-text-bold");
textItalicAction = new TDEToggleAction( i18n("&Italic"), "format-text-italic", CTRL+Key_I,
- TQT_TQOBJECT(this), TQT_SLOT(slotTextItalic()),
+ this, TQ_SLOT(slotTextItalic()),
actionCollection(), "format-text-italic");
textUnderAction = new TDEToggleAction( i18n("&Underline"), "format-text-underline", CTRL+Key_U,
- TQT_TQOBJECT(this), TQT_SLOT(slotTextUnder()),
+ this, TQ_SLOT(slotTextUnder()),
actionCollection(), "format-text-underline");
actionFormatReset = new TDEAction( i18n( "Reset Font Settings" ), "eraser", 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotFormatReset() ),
+ this, TQ_SLOT( slotFormatReset() ),
actionCollection(), "format_reset");
actionFormatColor = new TDEAction( i18n( "Text Color..." ), "colorize", 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotTextColor() ),
+ this, TQ_SLOT( slotTextColor() ),
actionCollection(), "format_color");
// editorFocusChanged(false);
createGUI("kmcomposerui.rc");
- connect( toolBar("htmlToolBar"), TQT_SIGNAL( visibilityChanged(bool) ),
- TQT_TQOBJECT(this), TQT_SLOT( htmlToolBarVisibilityChanged(bool) ) );
+ connect( toolBar("htmlToolBar"), TQ_SIGNAL( visibilityChanged(bool) ),
+ this, TQ_SLOT( htmlToolBarVisibilityChanged(bool) ) );
// In Kontact, this entry would read "Configure Kontact", but bring
// up KMail's config dialog. That's sensible, though, so fix the label.
@@ -1663,28 +1663,28 @@ void KMComposeWin::setupEditor(void)
menu = new TQPopupMenu(this);
//#ifdef BROKEN
menu->insertItem(i18n("Undo"),mEditor,
- TQT_SLOT(undo()), TDEStdAccel::shortcut(TDEStdAccel::Undo));
+ TQ_SLOT(undo()), TDEStdAccel::shortcut(TDEStdAccel::Undo));
menu->insertItem(i18n("Redo"),mEditor,
- TQT_SLOT(redo()), TDEStdAccel::shortcut(TDEStdAccel::Redo));
+ TQ_SLOT(redo()), TDEStdAccel::shortcut(TDEStdAccel::Redo));
menu->insertSeparator();
//#endif //BROKEN
- menu->insertItem(i18n("Cut"), this, TQT_SLOT(slotCut()));
- menu->insertItem(i18n("Copy"), this, TQT_SLOT(slotCopy()));
- menu->insertItem(i18n("Paste"), this, TQT_SLOT(slotPasteClipboard()));
- menu->insertItem(i18n("Mark All"),this, TQT_SLOT(slotMarkAll()));
+ menu->insertItem(i18n("Cut"), this, TQ_SLOT(slotCut()));
+ menu->insertItem(i18n("Copy"), this, TQ_SLOT(slotCopy()));
+ menu->insertItem(i18n("Paste"), this, TQ_SLOT(slotPasteClipboard()));
+ menu->insertItem(i18n("Mark All"),this, TQ_SLOT(slotMarkAll()));
menu->insertSeparator();
- menu->insertItem(i18n("Find..."), this, TQT_SLOT(slotFind()));
- menu->insertItem(i18n("Replace..."), this, TQT_SLOT(slotReplace()));
+ menu->insertItem(i18n("Find..."), this, TQ_SLOT(slotFind()));
+ menu->insertItem(i18n("Replace..."), this, TQ_SLOT(slotReplace()));
menu->insertSeparator();
- menu->insertItem(i18n("Fixed Font Widths"), this, TQT_SLOT(slotUpdateFont()));
+ menu->insertItem(i18n("Fixed Font Widths"), this, TQ_SLOT(slotUpdateFont()));
mEditor->installRBPopup(menu);
*/
updateCursorPosition();
- connect(mEditor,TQT_SIGNAL(CursorPositionChanged()),TQT_SLOT(updateCursorPosition()));
- connect( mEditor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ),
- TQT_TQOBJECT(this), TQT_SLOT( fontChanged( const TQFont & ) ) );
- connect( mEditor, TQT_SIGNAL( currentAlignmentChanged( int ) ),
- TQT_TQOBJECT(this), TQT_SLOT( alignmentChanged( int ) ) );
+ connect(mEditor,TQ_SIGNAL(CursorPositionChanged()),TQ_SLOT(updateCursorPosition()));
+ connect( mEditor, TQ_SIGNAL( currentFontChanged( const TQFont & ) ),
+ this, TQ_SLOT( fontChanged( const TQFont & ) ) );
+ connect( mEditor, TQ_SIGNAL( currentAlignmentChanged( int ) ),
+ this, TQ_SLOT( alignmentChanged( int ) ) );
}
@@ -1874,15 +1874,15 @@ void KMComposeWin::setMsg(KMMessage* newMsg, bool mayAutoSign,
// don't overwrite the header values with identity specific values
// unless the identity is sticky
if ( !stickyIdentity ) {
- disconnect(mIdentity,TQT_SIGNAL(identityChanged(uint)),
- TQT_TQOBJECT(this), TQT_SLOT(slotIdentityChanged(uint)));
+ disconnect(mIdentity,TQ_SIGNAL(identityChanged(uint)),
+ this, TQ_SLOT(slotIdentityChanged(uint)));
}
// load the mId into the gui, sticky or not, without emitting
mIdentity->setCurrentIdentity( mId );
const uint idToApply = mId;
if ( !stickyIdentity ) {
- connect(mIdentity,TQT_SIGNAL(identityChanged(uint)),
- TQT_TQOBJECT(this), TQT_SLOT(slotIdentityChanged(uint)));
+ connect(mIdentity,TQ_SIGNAL(identityChanged(uint)),
+ this, TQ_SLOT(slotIdentityChanged(uint)));
} else {
// load the message's state into the mId, without applying it to the gui
// that's so we can detect that the id changed (because a sticky was set)
@@ -2165,11 +2165,11 @@ void KMComposeWin::setMsg(KMMessage* newMsg, bool mayAutoSign,
// Not user friendy if this modal fileseletor opens before the
// composer.
//
- //TQTimer::singleShot( 200, this, TQT_SLOT(slotAppendSignature()) );
+ //TQTimer::singleShot( 200, this, TQ_SLOT(slotAppendSignature()) );
if ( GlobalSettings::self()->prependSignature() ) {
- TQTimer::singleShot( 0, this, TQT_SLOT(slotPrependSignature()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(slotPrependSignature()) );
} else {
- TQTimer::singleShot( 0, this, TQT_SLOT(slotAppendSignature()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(slotAppendSignature()) );
}
}
@@ -2358,8 +2358,8 @@ void KMComposeWin::applyChanges( bool dontSignNorEncrypt, bool dontDisable )
// Make new job and execute it
mComposer = new MessageComposer( this );
- connect( mComposer, TQT_SIGNAL( done( bool ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotComposerDone( bool ) ) );
+ connect( mComposer, TQ_SIGNAL( done( bool ) ),
+ this, TQ_SLOT( slotComposerDone( bool ) ) );
// TODO: Add a cancel button for the following operations?
// Disable any input to the window, so that we have a snapshot of the
@@ -2435,10 +2435,10 @@ bool KMComposeWin::addAttach(const KURL aUrl)
mMapAtmLoadData.insert(job, ld);
mAttachJobs[job] = aUrl;
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
- TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(TDEIO::Job *)));
- connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
- TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+ this, TQ_SLOT(slotAttachFileResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+ this, TQ_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &)));
return true;
}
@@ -2467,10 +2467,10 @@ void KMComposeWin::addAttach(const KMMessagePart* msgPart)
mTempDir = 0;
}
- connect( lvi, TQT_SIGNAL( compress( int ) ),
- TQT_TQOBJECT(this), TQT_SLOT( compressAttach( int ) ) );
- connect( lvi, TQT_SIGNAL( uncompress( int ) ),
- TQT_TQOBJECT(this), TQT_SLOT( uncompressAttach( int ) ) );
+ connect( lvi, TQ_SIGNAL( compress( int ) ),
+ this, TQ_SLOT( compressAttach( int ) ) );
+ connect( lvi, TQ_SIGNAL( uncompress( int ) ),
+ this, TQ_SLOT( uncompressAttach( int ) ) );
slotUpdateAttachActions();
}
@@ -3019,10 +3019,10 @@ void KMComposeWin::slotInsertRecentFile(const KURL& u)
}
}
mMapAtmLoadData.insert(job, ld);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
- TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(TDEIO::Job *)));
- connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
- TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+ this, TQ_SLOT(slotAttachFileResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+ this, TQ_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &)));
}
@@ -3149,8 +3149,8 @@ void KMComposeWin::startPublicKeyExport() {
Kleo::ExportJob * job = Kleo::CryptoBackendFactory::instance()->openpgp()->publicKeyExportJob( true );
assert( job );
- connect( job, TQT_SIGNAL(result(const GpgME::Error&,const TQByteArray&)),
- this, TQT_SLOT(slotPublicKeyExportResult(const GpgME::Error&,const TQByteArray&)) );
+ connect( job, TQ_SIGNAL(result(const GpgME::Error&,const TQByteArray&)),
+ this, TQ_SLOT(slotPublicKeyExportResult(const GpgME::Error&,const TQByteArray&)) );
const GpgME::Error err = job->start( mFingerprint );
if ( err )
@@ -3206,21 +3206,21 @@ void KMComposeWin::slotAttachPopupMenu(TQListViewItem *, const TQPoint &, int)
mAttachMenu = new TQPopupMenu(this);
mOpenId = mAttachMenu->insertItem(i18n("to open", "Open"), this,
- TQT_SLOT(slotAttachOpen()));
+ TQ_SLOT(slotAttachOpen()));
mOpenWithId = mAttachMenu->insertItem(i18n("Open With..."), this,
- TQT_SLOT(slotAttachOpenWith()));
+ TQ_SLOT(slotAttachOpenWith()));
mViewId = mAttachMenu->insertItem(i18n("to view", "View"), this,
- TQT_SLOT(slotAttachView()));
- mEditId = mAttachMenu->insertItem( i18n("Edit"), this, TQT_SLOT(slotAttachEdit()) );
+ TQ_SLOT(slotAttachView()));
+ mEditId = mAttachMenu->insertItem( i18n("Edit"), this, TQ_SLOT(slotAttachEdit()) );
mEditWithId = mAttachMenu->insertItem( i18n("Edit With..."), this,
- TQT_SLOT(slotAttachEditWith()) );
- mRemoveId = mAttachMenu->insertItem(i18n("Remove"), this, TQT_SLOT(slotAttachRemove()));
+ TQ_SLOT(slotAttachEditWith()) );
+ mRemoveId = mAttachMenu->insertItem(i18n("Remove"), this, TQ_SLOT(slotAttachRemove()));
mSaveAsId = mAttachMenu->insertItem( SmallIconSet("document-save-as"), i18n("Save As..."), this,
- TQT_SLOT( slotAttachSave() ) );
+ TQ_SLOT( slotAttachSave() ) );
mPropertiesId = mAttachMenu->insertItem( i18n("Properties"), this,
- TQT_SLOT( slotAttachProperties() ) );
+ TQ_SLOT( slotAttachProperties() ) );
mAttachMenu->insertSeparator();
- mAttachMenu->insertItem(i18n("Add Attachment..."), this, TQT_SLOT(slotAttachFile()));
+ mAttachMenu->insertItem(i18n("Add Attachment..."), this, TQ_SLOT(slotAttachFile()));
}
int selectedCount = 0;
@@ -3304,7 +3304,7 @@ void KMComposeWin::compressAttach( int idx )
msgPart = mAtmList.at( i );
TQByteArray array;
TQBuffer dev( array );
- KZip zip( &TQT_TQIODEVICE_OBJECT(dev) );
+ KZip zip( &dev );
TQByteArray decoded = msgPart->bodyDecodedBinary();
if ( ! zip.open( IO_WriteOnly ) ) {
KMessageBox::sorry(0, i18n("KMail could not compress the file.") );
@@ -3383,7 +3383,7 @@ void KMComposeWin::uncompressAttach( int idx )
msgPart = mAtmList.at( i );
TQBuffer dev( msgPart->bodyDecodedBinary() );
- KZip zip( &TQT_TQIODEVICE_OBJECT(dev) );
+ KZip zip( &dev );
TQByteArray decoded;
decoded = msgPart->bodyDecodedBinary();
@@ -3575,8 +3575,8 @@ void KMComposeWin::editAttach(int index, bool openWith)
KMail::EditorWatcher *watcher =
new KMail::EditorWatcher( KURL( atmTempFile->name() ), contentTypeStr, openWith,
- TQT_TQOBJECT(this), this );
- connect( watcher, TQT_SIGNAL(editDone(KMail::EditorWatcher*)), TQT_SLOT(slotEditDone(KMail::EditorWatcher*)) );
+ this, this );
+ connect( watcher, TQ_SIGNAL(editDone(KMail::EditorWatcher*)), TQ_SLOT(slotEditDone(KMail::EditorWatcher*)) );
if ( watcher->start() ) {
mEditorMap.insert( watcher, msgPart );
mEditorTempFiles.insert( watcher, atmTempFile );
@@ -3789,9 +3789,9 @@ void KMComposeWin::slotUndo()
TQWidget* fw = focusWidget();
if (!fw) return;
- if ( ::tqqt_cast<KEdit*>(fw) )
+ if ( ::tqt_cast<KEdit*>(fw) )
static_cast<TQTextEdit*>(fw)->undo();
- else if (::tqqt_cast<TQLineEdit*>(fw))
+ else if (::tqt_cast<TQLineEdit*>(fw))
static_cast<TQLineEdit*>(fw)->undo();
}
@@ -3800,9 +3800,9 @@ void KMComposeWin::slotRedo()
TQWidget* fw = focusWidget();
if (!fw) return;
- if (::tqqt_cast<KEdit*>(fw))
+ if (::tqt_cast<KEdit*>(fw))
static_cast<KEdit*>(fw)->redo();
- else if (::tqqt_cast<TQLineEdit*>(fw))
+ else if (::tqt_cast<TQLineEdit*>(fw))
static_cast<TQLineEdit*>(fw)->redo();
}
@@ -3812,9 +3812,9 @@ void KMComposeWin::slotCut()
TQWidget* fw = focusWidget();
if (!fw) return;
- if (::tqqt_cast<KEdit*>(fw))
+ if (::tqt_cast<KEdit*>(fw))
static_cast<KEdit*>(fw)->cut();
- else if (::tqqt_cast<TQLineEdit*>(fw))
+ else if (::tqt_cast<TQLineEdit*>(fw))
static_cast<TQLineEdit*>(fw)->cut();
}
@@ -3830,7 +3830,7 @@ void KMComposeWin::slotCopy()
#endif
TQKeyEvent k(TQEvent::KeyPress, Key_C, 0, ControlButton);
- kapp->notify(TQT_TQOBJECT(fw), TQT_TQEVENT(&k));
+ kapp->notify(fw, &k);
}
@@ -3888,9 +3888,9 @@ void KMComposeWin::slotMarkAll()
TQWidget* fw = focusWidget();
if (!fw) return;
- if (::tqqt_cast<TQLineEdit*>(fw))
+ if (::tqt_cast<TQLineEdit*>(fw))
static_cast<TQLineEdit*>(fw)->selectAll();
- else if (::tqqt_cast<KEdit*>(fw))
+ else if (::tqt_cast<KEdit*>(fw))
static_cast<KEdit*>(fw)->selectAll();
}
@@ -4082,15 +4082,15 @@ void KMComposeWin::ignoreStickyFields()
void KMComposeWin::slotPrint()
{
mMessageWasModified = isModified();
- connect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotContinuePrint( bool ) ) );
+ connect( this, TQ_SIGNAL( applyChangesDone( bool ) ),
+ this, TQ_SLOT( slotContinuePrint( bool ) ) );
applyChanges( true );
}
void KMComposeWin::slotContinuePrint( bool rc )
{
- disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotContinuePrint( bool ) ) );
+ disconnect( this, TQ_SIGNAL( applyChangesDone( bool ) ),
+ this, TQ_SLOT( slotContinuePrint( bool ) ) );
if( rc ) {
if ( mComposedMessages.isEmpty() ) {
@@ -4220,8 +4220,8 @@ void KMComposeWin::doSend( KMail::MessageSender::SendMethod method,
const bool neverEncrypt = ( mDisableBreaking && GlobalSettings::self()->neverEncryptDrafts() )
|| mSigningAndEncryptionExplicitlyDisabled;
- connect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
- TQT_SLOT( slotContinueDoSend( bool ) ) );
+ connect( this, TQ_SIGNAL( applyChangesDone( bool ) ),
+ TQ_SLOT( slotContinueDoSend( bool ) ) );
if ( mEditor->textFormat() == TQt::RichText )
mMsg->setHeaderField( "X-KMail-Markup", "true" );
@@ -4333,8 +4333,8 @@ void KMComposeWin::slotContinueDoSend( bool sentOk )
{
kdDebug(5006) << "KMComposeWin::slotContinueDoSend( " << sentOk << " )"
<< endl;
- disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotContinueDoSend( bool ) ) );
+ disconnect( this, TQ_SIGNAL( applyChangesDone( bool ) ),
+ this, TQ_SLOT( slotContinueDoSend( bool ) ) );
if ( !sentOk ) {
mDisableBreaking = false;
@@ -4735,8 +4735,8 @@ void KMComposeWin::slotSpellcheck()
mSubjectTextWasSpellChecked = false;
mSpellCheckInProgress=true;
/*
- connect (mEditor, TQT_SIGNAL (spellcheck_progress (unsigned)),
- this, TQT_SLOT (spell_progress (unsigned)));
+ connect (mEditor, TQ_SIGNAL (spellcheck_progress (unsigned)),
+ this, TQ_SLOT (spell_progress (unsigned)));
*/
mEditor->spellcheck();
@@ -4791,7 +4791,7 @@ void KMComposeWin::slotSpellcheckDone(int result)
statusBar()->changeItem(i18n(" Spell check complete."),0);
break;
}
- TQTimer::singleShot( 2000, this, TQT_SLOT(slotSpellcheckDoneClearStatus()) );
+ TQTimer::singleShot( 2000, this, TQ_SLOT(slotSpellcheckDoneClearStatus()) );
}
void KMComposeWin::slotSpellcheckDoneClearStatus()
@@ -4989,7 +4989,7 @@ void KMComposeWin::slotSpellcheckConfig()
{
KDialogBase dlg(KDialogBase::Plain, i18n("Spellchecker"),
KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok,
- TQT_TQWIDGET(this), 0, true, true );
+ this, 0, true, true );
KWin twin;
TQTabDialog qtd (this, "tabdialog", true);
KSpellConfig mKSpellConfig (&qtd);
@@ -5017,8 +5017,8 @@ void KMComposeWin::slotEditToolbars()
saveMainWindowSettings(KMKernel::config(), "Composer");
KEditToolbar dlg(guiFactory(), this);
- connect( &dlg, TQT_SIGNAL(newToolbarConfig()),
- TQT_SLOT(slotUpdateToolbars()) );
+ connect( &dlg, TQ_SIGNAL(newToolbarConfig()),
+ TQ_SLOT(slotUpdateToolbars()) );
dlg.exec();
}
@@ -5078,8 +5078,8 @@ void KMComposeWin::updateAutoSave()
else {
if ( !mAutoSaveTimer ) {
mAutoSaveTimer = new TQTimer( this, "mAutoSaveTimer" );
- connect( mAutoSaveTimer, TQT_SIGNAL( timeout() ),
- TQT_TQOBJECT(this), TQT_SLOT( autoSaveMessage() ) );
+ connect( mAutoSaveTimer, TQ_SIGNAL( timeout() ),
+ this, TQ_SLOT( autoSaveMessage() ) );
}
mAutoSaveTimer->start( autoSaveInterval() );
}
@@ -5310,8 +5310,8 @@ void KMComposeWin::slotEncryptChiasmusToggled( bool on ) {
return;
}
- STD_NAMESPACE_PREFIX auto_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) );
- if ( !job.get() ) {
+ STD_NAMESPACE_PREFIX unique_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) );
+ if ( !job ) {
const TQString msg = i18n( "Chiasmus backend does not offer the "
"\"x-obtain-keys\" function. Please report this bug." );
KMessageBox::error( this, msg, i18n( "Chiasmus Backend Error" ) );
@@ -5410,7 +5410,7 @@ void KMComposeWin::slotAttachmentDragStarted()
void KMComposeWin::recipientEditorSizeHintChanged()
{
- TQTimer::singleShot( 1, this, TQT_SLOT(setMaximumHeaderSize()) );
+ TQTimer::singleShot( 1, this, TQ_SLOT(setMaximumHeaderSize()) );
}
void KMComposeWin::setMaximumHeaderSize()
diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h
index b9fbe1c7..942fc001 100644
--- a/kmail/kmcomposewin.h
+++ b/kmail/kmcomposewin.h
@@ -98,7 +98,7 @@ namespace GpgME {
//-----------------------------------------------------------------------------
class KMComposeWin : public KMail::Composer, public MailComposerIface
{
- Q_OBJECT
+ TQ_OBJECT
friend class ::KMEdit;
friend class ::MessageComposer;
diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp
index 1fe54648..b66e6ee6 100644
--- a/kmail/kmedit.cpp
+++ b/kmail/kmedit.cpp
@@ -226,21 +226,21 @@ KMEdit::KMEdit(TQWidget *parent, KMComposeWin* composer,
mSpellLineEdit( false ),
mPasteMode( TQClipboard::Clipboard )
{
- connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) );
+ connect( this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()) );
installEventFilter(this);
KCursor::setAutoHideCursor( this, true, true );
setOverwriteEnabled( true );
createSpellers();
- connect( mSpellConfig, TQT_SIGNAL( configChanged() ),
- this, TQT_SLOT( createSpellers() ) );
- connect( mSpeller, TQT_SIGNAL( death() ),
- this, TQT_SLOT( spellerDied() ) );
+ connect( mSpellConfig, TQ_SIGNAL( configChanged() ),
+ this, TQ_SLOT( createSpellers() ) );
+ connect( mSpeller, TQ_SIGNAL( death() ),
+ this, TQ_SLOT( spellerDied() ) );
}
void KMEdit::createSpellers()
{
delete mSpeller;
- mSpeller = new KMSpell( TQT_TQOBJECT(this), TQT_SLOT( spellerReady( KSpell * ) ), mSpellConfig );
+ mSpeller = new KMSpell( this, TQ_SLOT( spellerReady( KSpell * ) ), mSpellConfig );
}
void KMEdit::initializeAutoSpellChecking()
@@ -270,8 +270,8 @@ void KMEdit::initializeAutoSpellChecking()
col1, col2, col3, col4,
mSpellConfig );
- connect( mHighlighter, TQT_SIGNAL(newSuggestions(const TQString&, const TQStringList&, unsigned int)),
- this, TQT_SLOT(addSuggestion(const TQString&, const TQStringList&, unsigned int)) );
+ connect( mHighlighter, TQ_SIGNAL(newSuggestions(const TQString&, const TQStringList&, unsigned int)),
+ this, TQ_SLOT(addSuggestion(const TQString&, const TQStringList&, unsigned int)) );
}
@@ -412,7 +412,7 @@ void KMEdit::spellerReady( KSpell *spell )
bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
{
- if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this))
+ if (o == this)
KCursor::autoHideEventFilter(o, e);
if (e->type() == TQEvent::KeyPress)
@@ -449,17 +449,17 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
*mExtEditorProcess << sysLine.left(sysLine.find(" ")).local8Bit();
sysLine.remove(0, sysLine.find(" ") + 1);
}
- connect(mExtEditorProcess, TQT_SIGNAL(processExited(TDEProcess*)),
- TQT_SLOT(slotExternalEditorDone(TDEProcess*)));
+ connect(mExtEditorProcess, TQ_SIGNAL(processExited(TDEProcess*)),
+ TQ_SLOT(slotExternalEditorDone(TDEProcess*)));
if (!mExtEditorProcess->start())
{
KMessageBox::error( topLevelWidget(),
i18n("Unable to start external editor.") );
killExternalEditor();
} else {
- mExtEditorTempFileWatcher = new KDirWatch( TQT_TQOBJECT(this), "mExtEditorTempFileWatcher" );
- connect( mExtEditorTempFileWatcher, TQT_SIGNAL(dirty(const TQString&)),
- TQT_SLOT(slotExternalEditorTempFileChanged(const TQString&)) );
+ mExtEditorTempFileWatcher = new KDirWatch( this, "mExtEditorTempFileWatcher" );
+ connect( mExtEditorTempFileWatcher, TQ_SIGNAL(dirty(const TQString&)),
+ TQ_SLOT(slotExternalEditorTempFileChanged(const TQString&)) );
mExtEditorTempFileWatcher->addFile( mExtEditorTempFile->name() );
}
return true;
@@ -542,7 +542,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
if ( mHighlighter ) {
// Wait a bit until reloading the highlighter, the mSpeller first needs to finish saving
// the personal word list.
- TQTimer::singleShot( 200, mHighlighter, TQT_SLOT( slotLocalSpellConfigChanged() ) );
+ TQTimer::singleShot( 200, mHighlighter, TQ_SLOT( slotLocalSpellConfigChanged() ) );
}
}
else if( id > -1 )
@@ -569,7 +569,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
}
}
} else if ( e->type() == TQEvent::FocusIn || e->type() == TQEvent::FocusOut ) {
- TQFocusEvent *fe = TQT_TQFOCUSEVENT(e);
+ TQFocusEvent *fe = static_cast<TQFocusEvent*>(e);
if(! (fe->reason() == TQFocusEvent::ActiveWindow || fe->reason() == TQFocusEvent::Popup) )
emit focusChanged( fe->gotFocus() );
}
@@ -651,28 +651,28 @@ void KMEdit::spellcheck()
// if (textFormat() == TQt::RichText ) {
// kdDebug(5006) << "KMEdit::spellcheck, spellchecking for RichText" << endl;
// mKSpellForDialog = new KSpell(this, i18n("Spellcheck - KMail"), this,
-// TQT_SLOT(slotSpellcheck2(KSpell*)),0,true,false,KSpell::HTML);
+// TQ_SLOT(slotSpellcheck2(KSpell*)),0,true,false,KSpell::HTML);
// }
// else {
// Don't use mSpellConfig here. Reason is that the spell dialog, KSpellDlg, uses its own
// spell config, and therefore the two wouldn't be in sync.
- mKSpellForDialog = new KSpell( TQT_TQWIDGET(this), i18n("Spellcheck - KMail"), TQT_TQOBJECT(this),
- TQT_SLOT(slotSpellcheck2(KSpell*))/*, mSpellConfig*/ );
+ mKSpellForDialog = new KSpell( this, i18n("Spellcheck - KMail"), this,
+ TQ_SLOT(slotSpellcheck2(KSpell*))/*, mSpellConfig*/ );
// }
TQStringList l = KSpellingHighlighter::personalWords();
for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) {
mKSpellForDialog->addPersonal( *it );
}
- connect (mKSpellForDialog, TQT_SIGNAL( death()),
- this, TQT_SLOT (slotSpellDone()));
- connect (mKSpellForDialog, TQT_SIGNAL (misspelling (const TQString &, const TQStringList &, unsigned int)),
- this, TQT_SLOT (slotMisspelling (const TQString &, const TQStringList &, unsigned int)));
- connect (mKSpellForDialog, TQT_SIGNAL (corrected (const TQString &, const TQString &, unsigned int)),
- this, TQT_SLOT (slotCorrected (const TQString &, const TQString &, unsigned int)));
- connect (mKSpellForDialog, TQT_SIGNAL (done(const TQString &)),
- this, TQT_SLOT (slotSpellResult (const TQString&)));
+ connect (mKSpellForDialog, TQ_SIGNAL( death()),
+ this, TQ_SLOT (slotSpellDone()));
+ connect (mKSpellForDialog, TQ_SIGNAL (misspelling (const TQString &, const TQStringList &, unsigned int)),
+ this, TQ_SLOT (slotMisspelling (const TQString &, const TQStringList &, unsigned int)));
+ connect (mKSpellForDialog, TQ_SIGNAL (corrected (const TQString &, const TQString &, unsigned int)),
+ this, TQ_SLOT (slotCorrected (const TQString &, const TQString &, unsigned int)));
+ connect (mKSpellForDialog, TQ_SIGNAL (done(const TQString &)),
+ this, TQ_SLOT (slotSpellResult (const TQString&)));
}
void KMEdit::cut()
@@ -708,7 +708,7 @@ void KMEdit::paste()
// Roll our own internal flag.
void KMEdit::contentsMouseReleaseEvent( TQMouseEvent * e )
{
- if( e->button() != Qt::MidButton )
+ if( e->button() != TQt::MidButton )
return KEdit::contentsMouseReleaseEvent( e );
mPasteMode = TQClipboard::Selection;
KEdit::contentsMouseReleaseEvent( e );
@@ -718,7 +718,7 @@ void KMEdit::contentsMouseReleaseEvent( TQMouseEvent * e )
void KMEdit::contentsMouseDoubleClickEvent( TQMouseEvent *e )
{
bool handled = false;
- if ( e->button() == Qt::LeftButton ) {
+ if ( e->button() == TQt::LeftButton ) {
// Get the cursor position for the place where the user clicked to
int paragraphPos;
diff --git a/kmail/kmedit.h b/kmail/kmedit.h
index c42734dc..7327327e 100644
--- a/kmail/kmedit.h
+++ b/kmail/kmedit.h
@@ -64,7 +64,7 @@ class KMSyntaxHighter : public KDictSpellingHighlighter
};
class KMEdit : public KEdit {
- Q_OBJECT
+ TQ_OBJECT
public:
KMEdit(TQWidget *parent=0,KMComposeWin* composer=0,
diff --git a/kmail/kmfawidgets.cpp b/kmail/kmfawidgets.cpp
index fdd444b4..9aad593f 100644
--- a/kmail/kmfawidgets.cpp
+++ b/kmail/kmfawidgets.cpp
@@ -39,10 +39,10 @@ KMFilterActionWithAddressWidget::KMFilterActionWithAddressWidget( TQWidget* pare
TQToolTip::add( mBtn, i18n( "Open Address Book" ) );
hbl->addWidget( mBtn );
- connect( mBtn, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotAddrBook()) );
- connect( mLineEdit, TQT_SIGNAL( textChanged(const TQString&) ),
- this, TQT_SIGNAL( textChanged(const TQString&) ) );
+ connect( mBtn, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotAddrBook()) );
+ connect( mLineEdit, TQ_SIGNAL( textChanged(const TQString&) ),
+ this, TQ_SIGNAL( textChanged(const TQString&) ) );
}
void KMFilterActionWithAddressWidget::slotAddrBook()
@@ -75,14 +75,14 @@ KMSoundTestWidget::KMSoundTestWidget(TQWidget *parent, const char *name)
TQHBoxLayout *lay1 = new TQHBoxLayout( this );
m_playButton = new TQPushButton( this, "m_playButton" );
m_playButton->setPixmap( SmallIcon( "1rightarrow" ) );
- connect( m_playButton, TQT_SIGNAL( clicked() ), TQT_SLOT( playSound() ));
+ connect( m_playButton, TQ_SIGNAL( clicked() ), TQ_SLOT( playSound() ));
lay1->addWidget( m_playButton );
m_urlRequester = new KURLRequester( this );
lay1->addWidget( m_urlRequester );
- connect( m_urlRequester, TQT_SIGNAL( openFileDialog( KURLRequester * )),
- TQT_SLOT( openSoundDialog( KURLRequester * )));
- connect( m_urlRequester->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & )), TQT_SLOT( slotUrlChanged(const TQString & )));
+ connect( m_urlRequester, TQ_SIGNAL( openFileDialog( KURLRequester * )),
+ TQ_SLOT( openSoundDialog( KURLRequester * )));
+ connect( m_urlRequester->lineEdit(), TQ_SIGNAL( textChanged ( const TQString & )), TQ_SLOT( slotUrlChanged(const TQString & )));
slotUrlChanged(m_urlRequester->lineEdit()->text() );
}
diff --git a/kmail/kmfawidgets.h b/kmail/kmfawidgets.h
index f5602f5e..90f980e0 100644
--- a/kmail/kmfawidgets.h
+++ b/kmail/kmfawidgets.h
@@ -17,7 +17,7 @@ class KURLRequester;
class KMFilterActionWithAddressWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMFilterActionWithAddressWidget( TQWidget* parent=0, const char* name=0 );
@@ -40,7 +40,7 @@ private:
class KMSoundTestWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMSoundTestWidget( TQWidget * parent, const char * name=0 );
diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp
index d97e5fa7..b567446d 100644
--- a/kmail/kmfilteraction.cpp
+++ b/kmail/kmfilteraction.cpp
@@ -1423,8 +1423,8 @@ void KMFilterActionCopy::processAsync(KMMessage* msg) const
ActionScheduler *handler = MessageProperty::filterHandler( msg );
KMCommand *cmd = new KMCopyCommand( mFolder, msg );
- TQObject::connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ),
- handler, TQT_SLOT( copyMessageFinished( KMCommand * ) ) );
+ TQObject::connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ),
+ handler, TQ_SLOT( copyMessageFinished( KMCommand * ) ) );
cmd->start();
}
@@ -1816,7 +1816,7 @@ void KMFilterActionExtFilter::processAsync(KMMessage* aMsg) const
inFile->close();
PipeJob *job = new PipeJob(0, 0, aMsg, commandLine, tempFileName);
- TQObject::connect ( job, TQT_SIGNAL( done() ), handler, TQT_SLOT( actionMessage() ) );
+ TQObject::connect ( job, TQ_SIGNAL( done() ), handler, TQ_SLOT( actionMessage() ) );
kmkernel->weaver()->enqueue(job);
}
diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp
index b1bbb9ab..e6d1668f 100644
--- a/kmail/kmfilterdlg.cpp
+++ b/kmail/kmfilterdlg.cpp
@@ -138,10 +138,10 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo
setHelp( (bPopFilter)? KMPopFilterDlgHelpAnchor: KMFilterDlgHelpAnchor );
setButtonText( User1, i18n("Import") );
setButtonText( User2, i18n("Export") );
- connect( this, TQT_SIGNAL(user1Clicked()),
- this, TQT_SLOT( slotImportFilters()) );
- connect( this, TQT_SIGNAL(user2Clicked()),
- this, TQT_SLOT( slotExportFilters()) );
+ connect( this, TQ_SIGNAL(user1Clicked()),
+ this, TQ_SLOT( slotImportFilters()) );
+ connect( this, TQ_SIGNAL(user2Clicked()),
+ this, TQ_SLOT( slotExportFilters()) );
TQWidget *w = new TQWidget( this );
setMainWidget( w );
@@ -184,11 +184,11 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo
vbl->addWidget( mGlobalsBox, 0, TQt::AlignTop );
}
else {
- TQGroupBox *agb = new TQGroupBox( 1 /*column*/, Qt::Vertical, i18n("Filter Actions"), page1 );
+ TQGroupBox *agb = new TQGroupBox( 1 /*column*/, TQt::Vertical, i18n("Filter Actions"), page1 );
mActionLister = new KMFilterActionWidgetLister( agb );
vbl->addWidget( agb, 0, TQt::AlignTop );
- mAdvOptsGroup = new TQGroupBox ( 1 /*columns*/, Qt::Vertical,
+ mAdvOptsGroup = new TQGroupBox ( 1 /*columns*/, TQt::Vertical,
i18n("Advanced Options"), page2);
{
TQWidget *adv_w = new TQWidget( mAdvOptsGroup );
@@ -262,81 +262,81 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo
vbl->addStretch( 1 );
// load the filter parts into the edit widgets
- connect( mFilterList, TQT_SIGNAL(filterSelected(KMFilter*)),
- this, TQT_SLOT(slotFilterSelected(KMFilter*)) );
+ connect( mFilterList, TQ_SIGNAL(filterSelected(KMFilter*)),
+ this, TQ_SLOT(slotFilterSelected(KMFilter*)) );
if (bPopFilter){
// set the state of the global setting 'show later msgs'
- connect( mShowLaterBtn, TQT_SIGNAL(toggled(bool)),
- mFilterList, TQT_SLOT(slotShowLaterToggled(bool)));
+ connect( mShowLaterBtn, TQ_SIGNAL(toggled(bool)),
+ mFilterList, TQ_SLOT(slotShowLaterToggled(bool)));
// set the action in the filter when changed
- connect( mActionGroup, TQT_SIGNAL(actionChanged(const KMPopFilterAction)),
- this, TQT_SLOT(slotActionChanged(const KMPopFilterAction)) );
+ connect( mActionGroup, TQ_SIGNAL(actionChanged(const KMPopFilterAction)),
+ this, TQ_SLOT(slotActionChanged(const KMPopFilterAction)) );
} else {
// transfer changes from the 'Apply this filter on...'
// combo box to the filter
- connect( mApplyOnIn, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotApplicabilityChanged()) );
- connect( mApplyOnForAll, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotApplicabilityChanged()) );
- connect( mApplyOnForTraditional, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotApplicabilityChanged()) );
- connect( mApplyOnForChecked, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotApplicabilityChanged()) );
- connect( mApplyOnOut, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotApplicabilityChanged()) );
- connect( mApplyOnCtrlJ, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotApplicabilityChanged()) );
- connect( mAccountList, TQT_SIGNAL(clicked(TQListViewItem*)),
- this, TQT_SLOT(slotApplicableAccountsChanged()) );
- connect( mAccountList, TQT_SIGNAL(spacePressed(TQListViewItem*)),
- this, TQT_SLOT(slotApplicableAccountsChanged()) );
+ connect( mApplyOnIn, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotApplicabilityChanged()) );
+ connect( mApplyOnForAll, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotApplicabilityChanged()) );
+ connect( mApplyOnForTraditional, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotApplicabilityChanged()) );
+ connect( mApplyOnForChecked, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotApplicabilityChanged()) );
+ connect( mApplyOnOut, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotApplicabilityChanged()) );
+ connect( mApplyOnCtrlJ, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotApplicabilityChanged()) );
+ connect( mAccountList, TQ_SIGNAL(clicked(TQListViewItem*)),
+ this, TQ_SLOT(slotApplicableAccountsChanged()) );
+ connect( mAccountList, TQ_SIGNAL(spacePressed(TQListViewItem*)),
+ this, TQ_SLOT(slotApplicableAccountsChanged()) );
// transfer changes from the 'stop processing here'
// check box to the filter
- connect( mStopProcessingHere, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(slotStopProcessingButtonToggled(bool)) );
+ connect( mStopProcessingHere, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(slotStopProcessingButtonToggled(bool)) );
- connect( mConfigureShortcut, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(slotConfigureShortcutButtonToggled(bool)) );
+ connect( mConfigureShortcut, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(slotConfigureShortcutButtonToggled(bool)) );
- connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ),
- this, TQT_SLOT( slotCapturedShortcutChanged( const TDEShortcut& ) ) );
+ connect( mKeyButton, TQ_SIGNAL( capturedShortcut( const TDEShortcut& ) ),
+ this, TQ_SLOT( slotCapturedShortcutChanged( const TDEShortcut& ) ) );
- connect( mConfigureToolbar, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(slotConfigureToolbarButtonToggled(bool)) );
+ connect( mConfigureToolbar, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(slotConfigureToolbarButtonToggled(bool)) );
- connect( mFilterActionIconButton, TQT_SIGNAL( iconChanged( TQString ) ),
- this, TQT_SLOT( slotFilterActionIconChanged( TQString ) ) );
+ connect( mFilterActionIconButton, TQ_SIGNAL( iconChanged( TQString ) ),
+ this, TQ_SLOT( slotFilterActionIconChanged( TQString ) ) );
}
// reset all widgets here
- connect( mFilterList, TQT_SIGNAL(resetWidgets()),
- this, TQT_SLOT(slotReset()) );
+ connect( mFilterList, TQ_SIGNAL(resetWidgets()),
+ this, TQ_SLOT(slotReset()) );
- connect( mFilterList, TQT_SIGNAL( applyWidgets() ),
- this, TQT_SLOT( slotUpdateFilter() ) );
+ connect( mFilterList, TQ_SIGNAL( applyWidgets() ),
+ this, TQ_SLOT( slotUpdateFilter() ) );
// support auto-naming the filter
- connect( mPatternEdit, TQT_SIGNAL(maybeNameChanged()),
- mFilterList, TQT_SLOT(slotUpdateFilterName()) );
+ connect( mPatternEdit, TQ_SIGNAL(maybeNameChanged()),
+ mFilterList, TQ_SLOT(slotUpdateFilterName()) );
// apply changes on 'Apply'
- connect( this, TQT_SIGNAL(applyClicked()),
- mFilterList, TQT_SLOT(slotApplyFilterChanges()) );
+ connect( this, TQ_SIGNAL(applyClicked()),
+ mFilterList, TQ_SLOT(slotApplyFilterChanges()) );
// apply changes on 'OK'
- connect( this, TQT_SIGNAL(okClicked()),
- mFilterList, TQT_SLOT(slotApplyFilterChanges()) );
+ connect( this, TQ_SIGNAL(okClicked()),
+ mFilterList, TQ_SLOT(slotApplyFilterChanges()) );
// save dialog size on 'OK'
- connect( this, TQT_SIGNAL(okClicked()),
- this, TQT_SLOT(slotSaveSize()) );
+ connect( this, TQ_SIGNAL(okClicked()),
+ this, TQ_SLOT(slotSaveSize()) );
// destruct the dialog on OK, close and Cancel
- connect( this, TQT_SIGNAL(finished()),
- this, TQT_SLOT(slotFinished()) );
+ connect( this, TQ_SIGNAL(finished()),
+ this, TQ_SLOT(slotFinished()) );
TDEConfigGroup geometry( KMKernel::config(), "Geometry");
const char * configKey
@@ -577,7 +577,7 @@ void KMFilterDlg::slotUpdateAccountList()
//=============================================================================
KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, const char* name, bool popFilter )
- : TQGroupBox( 1, Qt::Horizontal, title, parent, name ),
+ : TQGroupBox( 1, TQt::Horizontal, title, parent, name ),
bPopFilter(popFilter)
{
mFilterList.setAutoDelete( true );
@@ -642,31 +642,31 @@ KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, cons
hb = new TQHBox( this );
hb->setSpacing( 4 );
TQPushButton *btn = new TQPushButton( i18n("Select Source Folders"), hb );
- connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectSourceFolders()) );
+ connect( btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectSourceFolders()) );
}
//----------- now connect everything
- connect( mListBox, TQT_SIGNAL(highlighted(int)),
- this, TQT_SLOT(slotSelected(int)) );
- connect( mListBox, TQT_SIGNAL( doubleClicked ( TQListBoxItem * )),
- this, TQT_SLOT( slotRename()) );
- connect( mBtnTop, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotTop()) );
- connect( mBtnUp, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotUp()) );
- connect( mBtnDown, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotDown()) );
- connect( mBtnBot, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotBottom()) );
- connect( mBtnNew, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotNew()) );
- connect( mBtnCopy, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotCopy()) );
- connect( mBtnDelete, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotDelete()) );
- connect( mBtnRename, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotRename()) );
+ connect( mListBox, TQ_SIGNAL(highlighted(int)),
+ this, TQ_SLOT(slotSelected(int)) );
+ connect( mListBox, TQ_SIGNAL( doubleClicked ( TQListBoxItem * )),
+ this, TQ_SLOT( slotRename()) );
+ connect( mBtnTop, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotTop()) );
+ connect( mBtnUp, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotUp()) );
+ connect( mBtnDown, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotDown()) );
+ connect( mBtnBot, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotBottom()) );
+ connect( mBtnNew, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotNew()) );
+ connect( mBtnCopy, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotCopy()) );
+ connect( mBtnDelete, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotDelete()) );
+ connect( mBtnRename, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotRename()) );
// the dialog should call loadFilterList()
// when all signals are connected.
@@ -1152,8 +1152,8 @@ KMFilterActionWidget::KMFilterActionWidget( TQWidget *parent, const char* name )
setFocusProxy( mComboBox );
// now connect the combo box and the widget stack
- connect( mComboBox, TQT_SIGNAL(activated(int)),
- mWidgetStack, TQT_SLOT(raiseWidget(int)) );
+ connect( mComboBox, TQ_SIGNAL(activated(int)),
+ mWidgetStack, TQ_SLOT(raiseWidget(int)) );
}
void KMFilterActionWidget::setAction( const KMFilterAction* aAction )
@@ -1306,8 +1306,8 @@ KMPopFilterActionWidget::KMPopFilterActionWidget( const TQString& title, TQWidge
mIdMap[id(mActionMap[Down])] = Down;
mIdMap[id(mActionMap[Delete])] = Delete;
- connect( this, TQT_SIGNAL(clicked(int)),
- this, TQT_SLOT( slotActionClicked(int)) );
+ connect( this, TQ_SIGNAL(clicked(int)),
+ this, TQ_SLOT( slotActionClicked(int)) );
}
void KMPopFilterActionWidget::setAction( KMPopFilterAction aAction )
diff --git a/kmail/kmfilterdlg.h b/kmail/kmfilterdlg.h
index e2d414b9..8e3b62f9 100644
--- a/kmail/kmfilterdlg.h
+++ b/kmail/kmfilterdlg.h
@@ -59,7 +59,7 @@ class TDEListView;
*/
class KMFilterListBox : public TQGroupBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Constuctor. */
@@ -195,7 +195,7 @@ private:
*/
class KMFilterActionWidget : public TQHBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Constructor. Creates a filter action widget with no type
@@ -229,7 +229,7 @@ private:
class KMPopFilterActionWidget : public TQVButtonGroup
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMPopFilterActionWidget( const TQString &title, TQWidget* parent=0, const char* name=0 );
@@ -254,7 +254,7 @@ signals: // Signals
class KMFilterActionWidgetLister : public KWidgetLister
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMFilterActionWidgetLister( TQWidget *parent=0, const char* name=0 );
@@ -338,7 +338,7 @@ private:
class KMFilterDlg: public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Create the filter dialog. The only class which should be able to
diff --git a/kmail/kmfiltermgr.cpp b/kmail/kmfiltermgr.cpp
index 8c47afc0..f98a78dd 100644
--- a/kmail/kmfiltermgr.cpp
+++ b/kmail/kmfiltermgr.cpp
@@ -41,8 +41,8 @@ KMFilterMgr::KMFilterMgr( bool popFilter )
mBufferedFolderTarget( true ),
mRefCount( 0 )
{
- connect( kmkernel, TQT_SIGNAL( folderRemoved( KMFolder* ) ),
- this, TQT_SLOT( slotFolderRemoved( KMFolder* ) ) );
+ connect( kmkernel, TQ_SIGNAL( folderRemoved( KMFolder* ) ),
+ this, TQ_SLOT( slotFolderRemoved( KMFolder* ) ) );
}
diff --git a/kmail/kmfiltermgr.h b/kmail/kmfiltermgr.h
index 45e77863..70288a3a 100644
--- a/kmail/kmfiltermgr.h
+++ b/kmail/kmfiltermgr.h
@@ -33,7 +33,7 @@ template <typename T> class TQValueList;
class KMFilterMgr: public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp
index b1b9c261..4bcd4992 100644
--- a/kmail/kmfolder.cpp
+++ b/kmail/kmfolder.cpp
@@ -87,53 +87,53 @@ KMFolder::KMFolder( KMFolderDir* aParent, const TQString& aFolderName,
}
if ( aParent ) {
- connect( mStorage, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ),
- aParent->manager(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) );
- connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ),
- parent()->manager(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) );
- connect( this, TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ),
- parent()->manager(), TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ) );
- connect( this, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ),
- parent()->manager(), TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) );
- connect( mStorage, TQT_SIGNAL( invalidated( KMFolder* ) ),
- parent()->manager(), TQT_SIGNAL( folderInvalidated( KMFolder* ) ) );
+ connect( mStorage, TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ),
+ aParent->manager(), TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) );
+ connect( mStorage, TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ),
+ parent()->manager(), TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) );
+ connect( this, TQ_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ),
+ parent()->manager(), TQ_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ) );
+ connect( this, TQ_SIGNAL( msgHeaderChanged( KMFolder*, int ) ),
+ parent()->manager(), TQ_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) );
+ connect( mStorage, TQ_SIGNAL( invalidated( KMFolder* ) ),
+ parent()->manager(), TQ_SIGNAL( folderInvalidated( KMFolder* ) ) );
}
// Resend all mStorage signals
- connect( mStorage, TQT_SIGNAL( changed() ), TQT_SIGNAL( changed() ) );
- connect( mStorage, TQT_SIGNAL( cleared() ), TQT_SIGNAL( cleared() ) );
- connect( mStorage, TQT_SIGNAL( expunged( KMFolder* ) ),
- TQT_SIGNAL( expunged( KMFolder* ) ) );
- connect( mStorage, TQT_SIGNAL( nameChanged() ), TQT_SIGNAL( nameChanged() ) );
- connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ),
- TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) );
- connect( mStorage, TQT_SIGNAL( msgRemoved( int, TQString ) ),
- TQT_SIGNAL( msgRemoved( int, TQString ) ) );
- connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder* ) ),
- TQT_SIGNAL( msgRemoved( KMFolder* ) ) );
- connect( mStorage, TQT_SIGNAL( msgAdded( int ) ), TQT_SIGNAL( msgAdded( int ) ) );
- connect( mStorage, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ),
- TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) );
- connect( mStorage, TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32 , int ) ),
- TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32 , int ) ) );
- connect( mStorage, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ),
- TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) );
- connect( mStorage, TQT_SIGNAL( statusMsg( const TQString& ) ),
- TQT_SIGNAL( statusMsg( const TQString& ) ) );
- connect( mStorage, TQT_SIGNAL( numUnreadMsgsChanged( KMFolder* ) ),
- TQT_SIGNAL( numUnreadMsgsChanged( KMFolder* ) ) );
- connect( mStorage, TQT_SIGNAL( removed( KMFolder*, bool ) ),
- TQT_SIGNAL( removed( KMFolder*, bool ) ) );
- connect( mStorage, TQT_SIGNAL(noContentChanged()),
- TQT_SIGNAL(noContentChanged()) );
- connect( mStorage, TQT_SIGNAL(syncStateChanged()),
- TQT_SIGNAL(syncStateChanged()) );
-
- connect( mStorage, TQT_SIGNAL( contentsTypeChanged( KMail::FolderContentsType ) ),
- this, TQT_SLOT( slotContentsTypeChanged( KMail::FolderContentsType ) ) );
-
- connect( mStorage, TQT_SIGNAL( folderSizeChanged() ),
- this, TQT_SLOT( slotFolderSizeChanged() ) );
+ connect( mStorage, TQ_SIGNAL( changed() ), TQ_SIGNAL( changed() ) );
+ connect( mStorage, TQ_SIGNAL( cleared() ), TQ_SIGNAL( cleared() ) );
+ connect( mStorage, TQ_SIGNAL( expunged( KMFolder* ) ),
+ TQ_SIGNAL( expunged( KMFolder* ) ) );
+ connect( mStorage, TQ_SIGNAL( nameChanged() ), TQ_SIGNAL( nameChanged() ) );
+ connect( mStorage, TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ),
+ TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) );
+ connect( mStorage, TQ_SIGNAL( msgRemoved( int, TQString ) ),
+ TQ_SIGNAL( msgRemoved( int, TQString ) ) );
+ connect( mStorage, TQ_SIGNAL( msgRemoved( KMFolder* ) ),
+ TQ_SIGNAL( msgRemoved( KMFolder* ) ) );
+ connect( mStorage, TQ_SIGNAL( msgAdded( int ) ), TQ_SIGNAL( msgAdded( int ) ) );
+ connect( mStorage, TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ),
+ TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) );
+ connect( mStorage, TQ_SIGNAL( msgChanged( KMFolder*, TQ_UINT32 , int ) ),
+ TQ_SIGNAL( msgChanged( KMFolder*, TQ_UINT32 , int ) ) );
+ connect( mStorage, TQ_SIGNAL( msgHeaderChanged( KMFolder*, int ) ),
+ TQ_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) );
+ connect( mStorage, TQ_SIGNAL( statusMsg( const TQString& ) ),
+ TQ_SIGNAL( statusMsg( const TQString& ) ) );
+ connect( mStorage, TQ_SIGNAL( numUnreadMsgsChanged( KMFolder* ) ),
+ TQ_SIGNAL( numUnreadMsgsChanged( KMFolder* ) ) );
+ connect( mStorage, TQ_SIGNAL( removed( KMFolder*, bool ) ),
+ TQ_SIGNAL( removed( KMFolder*, bool ) ) );
+ connect( mStorage, TQ_SIGNAL(noContentChanged()),
+ TQ_SIGNAL(noContentChanged()) );
+ connect( mStorage, TQ_SIGNAL(syncStateChanged()),
+ TQ_SIGNAL(syncStateChanged()) );
+
+ connect( mStorage, TQ_SIGNAL( contentsTypeChanged( KMail::FolderContentsType ) ),
+ this, TQ_SLOT( slotContentsTypeChanged( KMail::FolderContentsType ) ) );
+
+ connect( mStorage, TQ_SIGNAL( folderSizeChanged() ),
+ this, TQ_SLOT( slotFolderSizeChanged() ) );
//FIXME: Centralize all the readConfig calls somehow - Zack
// Meanwhile, readConfig must be done before registerWithMessageDict, since
diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h
index e8de8207..d6160880 100644
--- a/kmail/kmfolder.h
+++ b/kmail/kmfolder.h
@@ -67,7 +67,7 @@ typedef TQValueList<TQ_UINT32> SerNumList;
class KMFolder: public KMFolderNode
{
- Q_OBJECT
+ TQ_OBJECT
friend class ::KMFolderJob;
public:
diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
index dcfcbe7f..3b7bcc0a 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/kmail/kmfoldercachedimap.cpp
@@ -153,10 +153,10 @@ DImapTroubleShootDialog::DImapTroubleShootDialog( TQWidget* parent,
enableButtonSeparator( true );
- connect ( mIndexButton, TQT_SIGNAL(toggled(bool)), mIndexScope, TQT_SLOT(setEnabled(bool)) );
- connect ( mIndexButton, TQT_SIGNAL(toggled(bool)), scopeLabel, TQT_SLOT(setEnabled(bool)) );
- connect( mButtonGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotChanged() ) );
- connect( this, TQT_SIGNAL( okClicked () ), this, TQT_SLOT( slotDone() ) );
+ connect ( mIndexButton, TQ_SIGNAL(toggled(bool)), mIndexScope, TQ_SLOT(setEnabled(bool)) );
+ connect ( mIndexButton, TQ_SIGNAL(toggled(bool)), scopeLabel, TQ_SLOT(setEnabled(bool)) );
+ connect( mButtonGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotChanged() ) );
+ connect( this, TQ_SIGNAL( okClicked () ), this, TQ_SLOT( slotDone() ) );
enableButtonOK( false );
}
@@ -908,8 +908,8 @@ void KMFolderCachedImap::serverSyncInternal()
// kdDebug(5006) << "makeConnection said Connecting, waiting for signal." << endl;
newState( mProgress, i18n("Connecting to %1").arg( mAccount->host() ) );
// We'll wait for the connectionResult signal from the account.
- connect( mAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ),
- this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
+ connect( mAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ),
+ this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) );
break;
} else {
// Connected
@@ -932,8 +932,8 @@ void KMFolderCachedImap::serverSyncInternal()
// Check the user's own rights. We do this every time in case they changed.
mOldUserRights = mUserRights;
newState( mProgress, i18n("Checking permissions"));
- connect( mAccount, TQT_SIGNAL( receivedUserRights( KMFolder* ) ),
- this, TQT_SLOT( slotReceivedUserRights( KMFolder* ) ) );
+ connect( mAccount, TQ_SIGNAL( receivedUserRights( KMFolder* ) ),
+ this, TQ_SLOT( slotReceivedUserRights( KMFolder* ) ) );
mAccount->getUserRights( folder(), imapPath() ); // after connecting, due to the INBOX case
break;
}
@@ -955,8 +955,8 @@ void KMFolderCachedImap::serverSyncInternal()
if ( !newName.isEmpty() && !folder()->isSystemFolder() && !isResourceFolder ) {
newState( mProgress, i18n("Renaming folder") );
CachedImapJob *job = new CachedImapJob( newName, CachedImapJob::tRenameFolder, this );
- connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), this, TQT_SLOT( slotIncreaseProgress() ) );
- connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotRenameFolderFinished() ) );
+ connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), this, TQ_SLOT( slotIncreaseProgress() ) );
+ connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotRenameFolderFinished() ) );
job->start();
break;
}
@@ -1043,8 +1043,8 @@ void KMFolderCachedImap::serverSyncInternal()
newState( mProgress, i18n("Deleting folders from server"));
CachedImapJob* job = new CachedImapJob( foldersForDeletionOnServer,
CachedImapJob::tDeleteFolders, this );
- connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), this, TQT_SLOT( slotIncreaseProgress() ) );
- connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotFolderDeletionOnServerFinished() ) );
+ connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), this, TQ_SLOT( slotIncreaseProgress() ) );
+ connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotFolderDeletionOnServerFinished() ) );
job->start();
break;
}
@@ -1082,8 +1082,8 @@ void KMFolderCachedImap::serverSyncInternal()
newState( mProgress, i18n("Expunging deleted messages"));
CachedImapJob *job = new CachedImapJob( TQString(),
CachedImapJob::tExpungeFolder, this );
- connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), this, TQT_SLOT( slotIncreaseProgress() ) );
- connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( serverSyncInternal() ) );
+ connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), this, TQ_SLOT( slotIncreaseProgress() ) );
+ connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( serverSyncInternal() ) );
job->start();
break;
}
@@ -1097,10 +1097,10 @@ void KMFolderCachedImap::serverSyncInternal()
CachedImapJob *job = new CachedImapJob( mMsgsForDownload,
CachedImapJob::tGetMessage,
this );
- connect( job, TQT_SIGNAL( progress(unsigned long, unsigned long) ),
- this, TQT_SLOT( slotProgress(unsigned long, unsigned long) ) );
- connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotUpdateLastUid() ) );
- connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( serverSyncInternal() ) );
+ connect( job, TQ_SIGNAL( progress(unsigned long, unsigned long) ),
+ this, TQ_SLOT( slotProgress(unsigned long, unsigned long) ) );
+ connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotUpdateLastUid() ) );
+ connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( serverSyncInternal() ) );
job->start();
mMsgsForDownload.clear();
break;
@@ -1153,8 +1153,8 @@ void KMFolderCachedImap::serverSyncInternal()
ImapAccountBase::jobData jd( url.url(), folder() );
jd.cancellable = true; // we can always do so later
mAccount->insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
- TQT_SLOT(slotTestAnnotationResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+ TQ_SLOT(slotTestAnnotationResult(TDEIO::Job *)));
break;
}
@@ -1197,10 +1197,10 @@ void KMFolderCachedImap::serverSyncInternal()
jd.cancellable = true;
mAccount->insertJob(job, jd);
- connect( job, TQT_SIGNAL(annotationResult(const TQString&, const TQString&, bool)),
- TQT_SLOT(slotAnnotationResult(const TQString&, const TQString&, bool)) );
- connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
- TQT_SLOT(slotGetAnnotationResult(TDEIO::Job *)) );
+ connect( job, TQ_SIGNAL(annotationResult(const TQString&, const TQString&, bool)),
+ TQ_SLOT(slotAnnotationResult(const TQString&, const TQString&, bool)) );
+ connect( job, TQ_SIGNAL(result(TDEIO::Job *)),
+ TQ_SLOT(slotGetAnnotationResult(TDEIO::Job *)) );
break;
}
}
@@ -1238,10 +1238,10 @@ void KMFolderCachedImap::serverSyncInternal()
jd.cancellable = true; // we can always do so later
mAccount->insertJob(job, jd);
- connect(job, TQT_SIGNAL(annotationChanged( const TQString&, const TQString&, const TQString& ) ),
- TQT_SLOT( slotAnnotationChanged( const TQString&, const TQString&, const TQString& ) ));
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
- TQT_SLOT(slotSetAnnotationResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(annotationChanged( const TQString&, const TQString&, const TQString& ) ),
+ TQ_SLOT( slotAnnotationChanged( const TQString&, const TQString&, const TQString& ) ));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+ TQ_SLOT(slotSetAnnotationResult(TDEIO::Job *)));
break;
}
}
@@ -1264,10 +1264,10 @@ void KMFolderCachedImap::serverSyncInternal()
ImapAccountBase::jobData jd( url.url(), folder() );
mAccount->insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
- TQT_SLOT(slotMultiSetACLResult(TDEIO::Job *)));
- connect(job, TQT_SIGNAL(aclChanged( const TQString&, int )),
- TQT_SLOT(slotACLChanged( const TQString&, int )) );
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+ TQ_SLOT(slotMultiSetACLResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(aclChanged( const TQString&, int )),
+ TQ_SLOT(slotACLChanged( const TQString&, int )) );
break;
}
}
@@ -1278,8 +1278,8 @@ void KMFolderCachedImap::serverSyncInternal()
if( !mQuotaOnly && !noContent() && mAccount->hasACLSupport() ) {
newState( mProgress, i18n( "Retrieving permissions" ) );
mAccount->getACL( folder(), mImapPath );
- connect( mAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
- this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
+ connect( mAccount, TQ_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
+ this, TQ_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
break;
}
case SYNC_STATE_FIND_SUBFOLDERS:
@@ -1309,10 +1309,10 @@ void KMFolderCachedImap::serverSyncInternal()
TDEIO::Job* job = KMail::QuotaJobs::getStorageQuota( mAccount->slave(), url );
ImapAccountBase::jobData jd( url.url(), folder() );
mAccount->insertJob(job, jd);
- connect( job, TQT_SIGNAL( storageQuotaResult( const QuotaInfo& ) ),
- TQT_SLOT( slotStorageQuotaResult( const QuotaInfo& ) ) );
- connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
- TQT_SLOT(slotQuotaResult(TDEIO::Job *)) );
+ connect( job, TQ_SIGNAL( storageQuotaResult( const QuotaInfo& ) ),
+ TQ_SLOT( slotStorageQuotaResult( const QuotaInfo& ) ) );
+ connect( job, TQ_SIGNAL(result(TDEIO::Job *)),
+ TQ_SLOT(slotQuotaResult(TDEIO::Job *)) );
break;
}
case SYNC_STATE_CLOSE:
@@ -1365,10 +1365,10 @@ void KMFolderCachedImap::syncNextSubFolder( bool secondSync )
mCurrentSubfolder = mSubfoldersForSync.front();
mSubfoldersForSync.pop_front();
if ( mCurrentSubfolder ) {
- connect( mCurrentSubfolder, TQT_SIGNAL( folderComplete(KMFolderCachedImap*, bool) ),
- this, TQT_SLOT( slotSubFolderComplete(KMFolderCachedImap*, bool) ) );
- connect( mCurrentSubfolder, TQT_SIGNAL( closeToQuotaChanged() ),
- this, TQT_SLOT( slotSubFolderCloseToQuotaChanged() ) );
+ connect( mCurrentSubfolder, TQ_SIGNAL( folderComplete(KMFolderCachedImap*, bool) ),
+ this, TQ_SLOT( slotSubFolderComplete(KMFolderCachedImap*, bool) ) );
+ connect( mCurrentSubfolder, TQ_SIGNAL( closeToQuotaChanged() ),
+ this, TQ_SLOT( slotSubFolderCloseToQuotaChanged() ) );
//kdDebug(5006) << "Sync'ing subfolder " << mCurrentSubfolder->imapPath() << endl;
assert( !mCurrentSubfolder->imapPath().isEmpty() );
@@ -1416,10 +1416,10 @@ void KMFolderCachedImap::buildSubFolderList()
void KMFolderCachedImap::disconnectSubFolderSignals()
{
- disconnect( mCurrentSubfolder, TQT_SIGNAL( folderComplete(KMFolderCachedImap*, bool) ),
- this, TQT_SLOT( slotSubFolderComplete(KMFolderCachedImap*, bool) ) );
- disconnect( mCurrentSubfolder, TQT_SIGNAL( closeToQuotaChanged() ),
- this, TQT_SLOT( slotSubFolderCloseToQuotaChanged() ) );
+ disconnect( mCurrentSubfolder, TQ_SIGNAL( folderComplete(KMFolderCachedImap*, bool) ),
+ this, TQ_SLOT( slotSubFolderComplete(KMFolderCachedImap*, bool) ) );
+ disconnect( mCurrentSubfolder, TQ_SIGNAL( closeToQuotaChanged() ),
+ this, TQ_SLOT( slotSubFolderCloseToQuotaChanged() ) );
mCurrentSubfolder = 0;
}
@@ -1428,8 +1428,8 @@ void KMFolderCachedImap::disconnectSubFolderSignals()
*/
void KMFolderCachedImap::slotConnectionResult( int errorCode, const TQString& errorMsg )
{
- disconnect( mAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ),
- this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
+ disconnect( mAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ),
+ this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) );
if ( !errorCode ) {
// Success
mSyncState = SYNC_STATE_GET_USERRIGHTS;
@@ -1463,15 +1463,15 @@ void KMFolderCachedImap::uploadNewMessages()
if ( mUserRightsState != KMail::ACLJobs::Ok || ( mUserRights & ( KMail::ACLJobs::Insert ) ) ) {
newState( mProgress, i18n("Uploading messages to server"));
CachedImapJob *job = new CachedImapJob( newMsgs, CachedImapJob::tPutMessage, this );
- connect( job, TQT_SIGNAL( progress( unsigned long, unsigned long) ),
- this, TQT_SLOT( slotPutProgress(unsigned long, unsigned long) ) );
- connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( serverSyncInternal() ) );
+ connect( job, TQ_SIGNAL( progress( unsigned long, unsigned long) ),
+ this, TQ_SLOT( slotPutProgress(unsigned long, unsigned long) ) );
+ connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( serverSyncInternal() ) );
job->start();
return;
} else {
KMCommand *command = rescueUnsyncedMessages();
- connect( command, TQT_SIGNAL( completed( KMCommand * ) ),
- this, TQT_SLOT( serverSyncInternal() ) );
+ connect( command, TQ_SIGNAL( completed( KMCommand * ) ),
+ this, TQ_SLOT( serverSyncInternal() ) );
}
} else { // nothing to upload
if ( mUserRights != mOldUserRights && (mOldUserRights & KMail::ACLJobs::Insert)
@@ -1537,8 +1537,8 @@ void KMFolderCachedImap::uploadFlags()
// FIXME END DUPLICATED FROM KMFOLDERIMAP
if ( mStatusFlagsJobs ) {
- connect( mAccount, TQT_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ),
- this, TQT_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) );
+ connect( mAccount, TQ_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ),
+ this, TQ_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) );
return;
}
}
@@ -1588,8 +1588,8 @@ void KMFolderCachedImap::uploadSeenFlags()
}
if ( mStatusFlagsJobs ) {
- connect( mAccount, TQT_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ),
- this, TQT_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) );
+ connect( mAccount, TQ_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ),
+ this, TQ_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) );
return;
}
}
@@ -1607,8 +1607,8 @@ void KMFolderCachedImap::slotImapStatusChanged(KMFolder* folder, const TQString&
if ( folder->storage() == this ) {
--mStatusFlagsJobs;
if ( mStatusFlagsJobs == 0 || !cont ) // done or aborting
- disconnect( mAccount, TQT_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ),
- this, TQT_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) );
+ disconnect( mAccount, TQ_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ),
+ this, TQ_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) );
if ( mStatusFlagsJobs == 0 && cont ) {
mProgress += 5;
serverSyncInternal();
@@ -1646,8 +1646,8 @@ void KMFolderCachedImap::createNewFolders()
if( !newFolders.isEmpty() ) {
newState( mProgress, i18n("Creating subfolders on server"));
CachedImapJob *job = new CachedImapJob( newFolders, CachedImapJob::tAddSubfolders, this );
- connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), this, TQT_SLOT( slotIncreaseProgress() ) );
- connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( serverSyncInternal() ) );
+ connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), this, TQ_SLOT( slotIncreaseProgress() ) );
+ connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( serverSyncInternal() ) );
job->start();
} else {
serverSyncInternal();
@@ -1721,8 +1721,8 @@ bool KMFolderCachedImap::deleteMessages()
uidsForDeletionOnServer.clear();
kdDebug(5006) << "Deleting " << sets.count() << " sets of messages from server folder " << imapPath() << endl;
CachedImapJob *job = new CachedImapJob( sets, CachedImapJob::tDeleteMessage, this );
- connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ),
- this, TQT_SLOT( slotDeleteMessagesResult(KMail::FolderJob *) ) );
+ connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ),
+ this, TQ_SLOT( slotDeleteMessagesResult(KMail::FolderJob *) ) );
job->start();
return true;
} else {
@@ -1757,9 +1757,9 @@ void KMFolderCachedImap::checkUidValidity() {
else {
newState( mProgress, i18n("Checking folder validity"));
CachedImapJob *job = new CachedImapJob( FolderJob::tCheckUidValidity, this );
- connect( job, TQT_SIGNAL(permanentFlags(int)), TQT_SLOT(slotPermanentFlags(int)) );
- connect( job, TQT_SIGNAL( result( KMail::FolderJob* ) ),
- this, TQT_SLOT( slotCheckUidValidityResult( KMail::FolderJob* ) ) );
+ connect( job, TQ_SIGNAL(permanentFlags(int)), TQ_SLOT(slotPermanentFlags(int)) );
+ connect( job, TQ_SIGNAL( result( KMail::FolderJob* ) ),
+ this, TQ_SLOT( slotCheckUidValidityResult( KMail::FolderJob* ) ) );
job->start();
}
}
@@ -1808,8 +1808,8 @@ void KMFolderCachedImap::listMessages() {
mFoundAnIMAPDigest = false;
CachedImapJob* job = new CachedImapJob( FolderJob::tListMessages, this );
- connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ),
- this, TQT_SLOT( slotGetLastMessagesResult(KMail::FolderJob *) ) );
+ connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ),
+ this, TQ_SLOT( slotGetLastMessagesResult(KMail::FolderJob *) ) );
job->start();
}
@@ -2038,9 +2038,9 @@ void KMFolderCachedImap::listNamespaces()
}
KMail::ListJob* job = new KMail::ListJob( mAccount, type, this, mAccount->addPathToNamespace( *it ) );
job->setHonorLocalSubscription( true );
- connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&,
+ connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&,
const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)),
- this, TQT_SLOT(slotCheckNamespace(const TQStringList&, const TQStringList&,
+ this, TQ_SLOT(slotCheckNamespace(const TQStringList&, const TQStringList&,
const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)));
job->start();
}
@@ -2060,9 +2060,9 @@ void KMFolderCachedImap::listNamespaces()
mAccount->addPathToNamespace( ns ) );
job->setNamespace( ns );
job->setHonorLocalSubscription( true );
- connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&,
+ connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&,
const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)),
- this, TQT_SLOT(slotListResult(const TQStringList&, const TQStringList&,
+ this, TQ_SLOT(slotListResult(const TQStringList&, const TQStringList&,
const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)));
job->start();
}
@@ -2148,9 +2148,9 @@ bool KMFolderCachedImap::listDirectory()
type = ImapAccountBase::ListSubscribed;
KMail::ListJob* job = new KMail::ListJob( mAccount, type, this );
job->setHonorLocalSubscription( true );
- connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&,
+ connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&,
const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)),
- this, TQT_SLOT(slotListResult(const TQStringList&, const TQStringList&,
+ this, TQ_SLOT(slotListResult(const TQStringList&, const TQStringList&,
const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)));
job->start();
@@ -2347,8 +2347,8 @@ void KMFolderCachedImap::listDirectory2()
ImapAccountBase::jobData jd( TQString(), folder() );
jd.cancellable = true;
mAccount->insertJob(job, jd);
- connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
- TQT_SLOT(slotMultiUrlGetAnnotationResult(TDEIO::Job *)) );
+ connect( job, TQ_SIGNAL(result(TDEIO::Job *)),
+ TQ_SLOT(slotMultiUrlGetAnnotationResult(TDEIO::Job *)) );
} else {
createFoldersNewOnServerAndFinishListing( foldersNewOnServer );
@@ -2493,8 +2493,8 @@ void
KMFolderCachedImap::slotReceivedUserRights( KMFolder* folder )
{
if ( folder->storage() == this ) {
- disconnect( mAccount, TQT_SIGNAL( receivedUserRights( KMFolder* ) ),
- this, TQT_SLOT( slotReceivedUserRights( KMFolder* ) ) );
+ disconnect( mAccount, TQ_SIGNAL( receivedUserRights( KMFolder* ) ),
+ this, TQ_SLOT( slotReceivedUserRights( KMFolder* ) ) );
if ( mUserRightsState == KMail::ACLJobs::Ok ) {
setReadOnly( ( mUserRights & KMail::ACLJobs::Insert ) == 0 );
}
@@ -2516,8 +2516,8 @@ void
KMFolderCachedImap::slotReceivedACL( KMFolder* folder, TDEIO::Job* job, const KMail::ACLList& aclList )
{
if ( folder->storage() == this ) {
- disconnect( mAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
- this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
+ disconnect( mAccount, TQ_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
+ this, TQ_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
mACLListState = job->error() ? KMail::ACLJobs::FetchFailed : KMail::ACLJobs::Ok;
mACLList = aclList;
serverSyncInternal();
@@ -3166,8 +3166,8 @@ void KMFolderCachedImap::rescueUnsyncedMessagesAndDeleteFolder( KMFolder *folder
if ( storage ) {
KMCommand *command = storage->rescueUnsyncedMessages();
if ( command ) {
- connect( command, TQT_SIGNAL(completed(KMCommand*)),
- TQT_SLOT(slotRescueDone(KMCommand*)) );
+ connect( command, TQ_SIGNAL(completed(KMCommand*)),
+ TQ_SLOT(slotRescueDone(KMCommand*)) );
++mRescueCommandCount;
} else {
// nothing to rescue, close folder
diff --git a/kmail/kmfoldercachedimap.h b/kmail/kmfoldercachedimap.h
index e82da6c3..1e2af26e 100644
--- a/kmail/kmfoldercachedimap.h
+++ b/kmail/kmfoldercachedimap.h
@@ -65,7 +65,7 @@ using KMail::AttachmentStrategy;
class DImapTroubleShootDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
enum SelectedOperation {
@@ -92,7 +92,7 @@ private:
class KMFolderCachedImap : public KMFolderMaildir
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/kmfoldercombobox.cpp b/kmail/kmfoldercombobox.cpp
index 499d444f..4b722c75 100644
--- a/kmail/kmfoldercombobox.cpp
+++ b/kmail/kmfoldercombobox.cpp
@@ -32,15 +32,15 @@ void KMFolderComboBox::init()
mOutboxShown = true;
mImapShown = true;
refreshFolders();
- connect( this, TQT_SIGNAL( activated(int) ),
- this, TQT_SLOT( slotActivated(int) ) );
- connect( kmkernel->folderMgr(), TQT_SIGNAL(changed()),
- this, TQT_SLOT(refreshFolders()) );
- connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL(changed()),
- this, TQT_SLOT(refreshFolders()) );
+ connect( this, TQ_SIGNAL( activated(int) ),
+ this, TQ_SLOT( slotActivated(int) ) );
+ connect( kmkernel->folderMgr(), TQ_SIGNAL(changed()),
+ this, TQ_SLOT(refreshFolders()) );
+ connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL(changed()),
+ this, TQ_SLOT(refreshFolders()) );
if (mImapShown)
- connect( kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()),
- this, TQT_SLOT(refreshFolders()) );
+ connect( kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()),
+ this, TQ_SLOT(refreshFolders()) );
}
@@ -59,11 +59,11 @@ void KMFolderComboBox::showImapFolders(bool shown)
mImapShown = shown;
refreshFolders();
if (shown)
- connect( kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()),
- this, TQT_SLOT(refreshFolders()) );
+ connect( kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()),
+ this, TQ_SLOT(refreshFolders()) );
else
- disconnect( kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()),
- this, TQT_SLOT(refreshFolders()) );
+ disconnect( kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()),
+ this, TQ_SLOT(refreshFolders()) );
}
//-----------------------------------------------------------------------------
diff --git a/kmail/kmfoldercombobox.h b/kmail/kmfoldercombobox.h
index ae90497a..42461c0b 100644
--- a/kmail/kmfoldercombobox.h
+++ b/kmail/kmfoldercombobox.h
@@ -13,7 +13,7 @@
class KMFolderComboBox : public TQComboBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp
index d34c731b..0ddcc5a5 100644
--- a/kmail/kmfolderdia.cpp
+++ b/kmail/kmfolderdia.cpp
@@ -149,12 +149,12 @@ KMFolderDialog::KMFolderDialog(KMFolder *aFolder, KMFolderDir *aFolderDir,
void KMFolderDialog::addTab( FolderDiaTab* tab )
{
- connect( tab, TQT_SIGNAL( readyForAccept() ),
- this, TQT_SLOT( slotReadyForAccept() ) );
- connect( tab, TQT_SIGNAL( cancelAccept() ),
- this, TQT_SLOT( slotCancelAccept() ) );
- //connect( tab, TQT_SIGNAL(changed( bool )),
- // this, TQT_SLOT(slotChanged( bool )) );
+ connect( tab, TQ_SIGNAL( readyForAccept() ),
+ this, TQ_SLOT( slotReadyForAccept() ) );
+ connect( tab, TQ_SIGNAL( cancelAccept() ),
+ this, TQ_SLOT( slotCancelAccept() ) );
+ //connect( tab, TQ_SIGNAL(changed( bool )),
+ // this, TQ_SLOT(slotChanged( bool )) );
mTabs.append( tab );
}
@@ -343,8 +343,8 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg,
}
label->setBuddy( mNameEdit );
hl->addWidget( mNameEdit );
- connect( mNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SLOT( slotFolderNameChanged( const TQString & ) ) );
+ connect( mNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SLOT( slotFolderNameChanged( const TQString & ) ) );
//start icons group
@@ -388,17 +388,17 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg,
ihl->addWidget( mUnreadIconButton );
ihl->addStretch( 1 );
- connect( mIconsCheckBox, TQT_SIGNAL(toggled(bool)),
- mNormalIconButton, TQT_SLOT(setEnabled(bool)) );
- connect( mIconsCheckBox, TQT_SIGNAL(toggled(bool)),
- mUnreadIconButton, TQT_SLOT(setEnabled(bool)) );
- connect( mIconsCheckBox, TQT_SIGNAL(toggled(bool)),
- mNormalIconLabel, TQT_SLOT(setEnabled(bool)) );
- connect( mIconsCheckBox, TQT_SIGNAL(toggled(bool)),
- mUnreadIconLabel, TQT_SLOT(setEnabled(bool)) );
+ connect( mIconsCheckBox, TQ_SIGNAL(toggled(bool)),
+ mNormalIconButton, TQ_SLOT(setEnabled(bool)) );
+ connect( mIconsCheckBox, TQ_SIGNAL(toggled(bool)),
+ mUnreadIconButton, TQ_SLOT(setEnabled(bool)) );
+ connect( mIconsCheckBox, TQ_SIGNAL(toggled(bool)),
+ mNormalIconLabel, TQ_SLOT(setEnabled(bool)) );
+ connect( mIconsCheckBox, TQ_SIGNAL(toggled(bool)),
+ mUnreadIconLabel, TQ_SLOT(setEnabled(bool)) );
- connect( mNormalIconButton, TQT_SIGNAL(iconChanged(TQString)),
- this, TQT_SLOT(slotChangeIcon(TQString)) );
+ connect( mNormalIconButton, TQ_SIGNAL(iconChanged(TQString)),
+ this, TQ_SLOT(slotChangeIcon(TQString)) );
//end icons group
addLine( this, topLayout);
@@ -510,8 +510,8 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg,
mContentsComboBox->insertItem( i18n( "Journal" ) );
if ( mDlg->folder() )
mContentsComboBox->setCurrentItem( mDlg->folder()->storage()->contentsType() );
- connect ( mContentsComboBox, TQT_SIGNAL ( activated( int ) ),
- this, TQT_SLOT( slotFolderContentsSelectionChanged( int ) ) );
+ connect ( mContentsComboBox, TQ_SIGNAL ( activated( int ) ),
+ this, TQ_SLOT( slotFolderContentsSelectionChanged( int ) ) );
if ( mDlg->folder()->isReadOnly() || mIsResourceFolder )
mContentsComboBox->setEnabled( false );
} else {
@@ -816,18 +816,18 @@ KMail::FolderDiaTemplatesTab::FolderDiaTemplatesTab( KMFolderDialog* dlg,
mCopyGlobal->setEnabled( false );
btns->addWidget( mCopyGlobal );
- connect( mCustom, TQT_SIGNAL(toggled(bool)),
- mWidget, TQT_SLOT(setEnabled(bool)) );
- connect( mCustom, TQT_SIGNAL(toggled(bool)),
- mCopyGlobal, TQT_SLOT(setEnabled(bool)) );
+ connect( mCustom, TQ_SIGNAL(toggled(bool)),
+ mWidget, TQ_SLOT(setEnabled(bool)) );
+ connect( mCustom, TQ_SIGNAL(toggled(bool)),
+ mCopyGlobal, TQ_SLOT(setEnabled(bool)) );
- connect( mCopyGlobal, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotCopyGlobal()) );
+ connect( mCopyGlobal, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotCopyGlobal()) );
initializeWithValuesFromFolder( mDlg->folder() );
- connect( mWidget, TQT_SIGNAL( changed() ),
- this, TQT_SLOT( slotEmitChanged( void ) ) );
+ connect( mWidget, TQ_SIGNAL( changed() ),
+ this, TQ_SLOT( slotEmitChanged( void ) ) );
}
void FolderDiaTemplatesTab::load()
diff --git a/kmail/kmfolderdia.h b/kmail/kmfolderdia.h
index e7c6b1d1..b1f41862 100644
--- a/kmail/kmfolderdia.h
+++ b/kmail/kmfolderdia.h
@@ -68,7 +68,7 @@ namespace KMail {
*/
class FolderDiaTab : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
FolderDiaTab( TQWidget *parent=0, const char* name=0 )
@@ -110,7 +110,7 @@ signals:
*/
class FolderDiaGeneralTab : public FolderDiaTab
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -162,7 +162,7 @@ private:
*/
class FolderDiaTemplatesTab : public FolderDiaTab
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -197,7 +197,7 @@ private:
*/
class KMFolderDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/kmfolderdir.h b/kmail/kmfolderdir.h
index 7fe81689..30bd529c 100644
--- a/kmail/kmfolderdir.h
+++ b/kmail/kmfolderdir.h
@@ -14,7 +14,7 @@ class KMFolderMgr;
*/
class KMFolderDir: public KMFolderNode, public KMFolderNodeList
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -70,7 +70,7 @@ protected:
class KMFolderRootDir: public KMFolderDir
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp
index b0686dbb..ee573c17 100644
--- a/kmail/kmfolderimap.cpp
+++ b/kmail/kmfolderimap.cpp
@@ -82,8 +82,8 @@ KMFolderImap::KMFolderImap(KMFolder* folder, const char* aName)
mAddMessageProgressItem = 0;
mReadOnly = false;
- connect (this, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ),
- this, TQT_SLOT( slotCompleteMailCheckProgress()) );
+ connect (this, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ),
+ this, TQ_SLOT( slotCompleteMailCheckProgress()) );
}
KMFolderImap::~KMFolderImap()
@@ -249,8 +249,8 @@ void KMFolderImap::remove()
false,
account()->useSSL() || account()->useTLS() );
account()->insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
- this, TQT_SLOT(slotRemoveFolderResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+ this, TQ_SLOT(slotRemoveFolderResult(TDEIO::Job *)));
}
//-----------------------------------------------------------------------------
@@ -417,10 +417,10 @@ int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex
msg = msgParent->getMsg(idx);
}
imapJob = new ImapJob(msg, ImapJob::tPutMessage, this);
- connect(imapJob, TQT_SIGNAL(messageStored(KMMessage*)),
- TQT_SLOT(addMsgQuiet(KMMessage*)));
- connect(imapJob, TQT_SIGNAL(result(KMail::FolderJob*)),
- TQT_SLOT(slotCopyMsgResult(KMail::FolderJob*)));
+ connect(imapJob, TQ_SIGNAL(messageStored(KMMessage*)),
+ TQ_SLOT(addMsgQuiet(KMMessage*)));
+ connect(imapJob, TQ_SIGNAL(result(KMail::FolderJob*)),
+ TQ_SLOT(slotCopyMsgResult(KMail::FolderJob*)));
imapJob->start();
}
@@ -439,10 +439,10 @@ int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex
TQPtrList<KMMessage> temp_msgs = splitMessageList(*it, msgList);
if ( temp_msgs.isEmpty() ) kdDebug(5006) << "Wow! KMFolderImap::splitMessageList() returned an empty list!" << endl;
imapJob = new ImapJob(temp_msgs, *it, ImapJob::tMoveMessage, this);
- connect(imapJob, TQT_SIGNAL(messageCopied(TQPtrList<KMMessage>)),
- TQT_SLOT(addMsgQuiet(TQPtrList<KMMessage>)));
- connect(imapJob, TQT_SIGNAL(result(KMail::FolderJob*)),
- TQT_SLOT(slotCopyMsgResult(KMail::FolderJob*)));
+ connect(imapJob, TQ_SIGNAL(messageCopied(TQPtrList<KMMessage>)),
+ TQ_SLOT(addMsgQuiet(TQPtrList<KMMessage>)));
+ connect(imapJob, TQ_SIGNAL(result(KMail::FolderJob*)),
+ TQ_SLOT(slotCopyMsgResult(KMail::FolderJob*)));
imapJob->start();
}
}
@@ -492,14 +492,14 @@ int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex
true,
account()->useSSL() || account()->useTLS() );
mAddMessageProgressItem->setTotalItems( msgList.count() );
- connect ( mAddMessageProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)),
- account(), TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) );
+ connect ( mAddMessageProgressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)),
+ account(), TQ_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) );
imapJob->setParentProgressItem( mAddMessageProgressItem );
}
- connect( imapJob, TQT_SIGNAL( messageCopied(TQPtrList<KMMessage>) ),
- TQT_SLOT( addMsgQuiet(TQPtrList<KMMessage>) ) );
- connect( imapJob, TQT_SIGNAL(result(KMail::FolderJob*)),
- TQT_SLOT(slotCopyMsgResult(KMail::FolderJob*)) );
+ connect( imapJob, TQ_SIGNAL( messageCopied(TQPtrList<KMMessage>) ),
+ TQ_SLOT( addMsgQuiet(TQPtrList<KMMessage>) ) );
+ connect( imapJob, TQ_SIGNAL(result(KMail::FolderJob*)),
+ TQ_SLOT(slotCopyMsgResult(KMail::FolderJob*)) );
imapJob->start();
}
@@ -534,8 +534,8 @@ void KMFolderImap::copyMsg(TQPtrList<KMMessage>& msgList)
TQPtrList<KMMessage> temp_msgs = splitMessageList(*it, msgList);
ImapJob *job = new ImapJob(temp_msgs, *it, ImapJob::tCopyMessage, this);
- connect(job, TQT_SIGNAL(result(KMail::FolderJob*)),
- TQT_SLOT(slotCopyMsgResult(KMail::FolderJob*)));
+ connect(job, TQ_SIGNAL(result(KMail::FolderJob*)),
+ TQ_SLOT(slotCopyMsgResult(KMail::FolderJob*)));
job->start();
}
}
@@ -603,8 +603,8 @@ void KMFolderImap::take(TQPtrList<KMMessage> msgList)
//-----------------------------------------------------------------------------
void KMFolderImap::slotListNamespaces()
{
- disconnect( account(), TQT_SIGNAL( connectionResult(int, const TQString&) ),
- this, TQT_SLOT( slotListNamespaces() ) );
+ disconnect( account(), TQ_SIGNAL( connectionResult(int, const TQString&) ),
+ this, TQ_SLOT( slotListNamespaces() ) );
if ( account()->makeConnection() == ImapAccountBase::Error )
{
kdWarning(5006) << "slotListNamespaces - got no connection" << endl;
@@ -613,8 +613,8 @@ void KMFolderImap::slotListNamespaces()
{
// wait for the connectionResult
kdDebug(5006) << "slotListNamespaces - waiting for connection" << endl;
- connect( account(), TQT_SIGNAL( connectionResult(int, const TQString&) ),
- this, TQT_SLOT( slotListNamespaces() ) );
+ connect( account(), TQ_SIGNAL( connectionResult(int, const TQString&) ),
+ this, TQ_SLOT( slotListNamespaces() ) );
return;
}
kdDebug(5006) << "slotListNamespaces" << endl;
@@ -636,9 +636,9 @@ void KMFolderImap::slotListNamespaces()
account()->addPathToNamespace( *it ) );
job->setNamespace( *it );
job->setHonorLocalSubscription( true );
- connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&,
+ connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&,
const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)),
- this, TQT_SLOT(slotListResult(const TQStringList&, const TQStringList&,
+ this, TQ_SLOT(slotListResult(const TQStringList&, const TQStringList&,
const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)));
job->start();
}
@@ -650,9 +650,9 @@ void KMFolderImap::slotListNamespaces()
{
KMail::ListJob* job = new KMail::ListJob( account(), type, this, account()->addPathToNamespace( *it ) );
job->setHonorLocalSubscription( true );
- connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&,
+ connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&,
const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)),
- this, TQT_SLOT(slotCheckNamespace(const TQStringList&, const TQStringList&,
+ this, TQ_SLOT(slotCheckNamespace(const TQStringList&, const TQStringList&,
const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)));
job->start();
}
@@ -754,9 +754,9 @@ bool KMFolderImap::listDirectory()
KMail::ListJob* job = new KMail::ListJob( account(), type, this );
job->setParentProgressItem( account()->listDirProgressItem() );
job->setHonorLocalSubscription( true );
- connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&,
+ connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&,
const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)),
- this, TQT_SLOT(slotListResult(const TQStringList&, const TQStringList&,
+ this, TQ_SLOT(slotListResult(const TQStringList&, const TQStringList&,
const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)));
job->start();
@@ -1034,8 +1034,8 @@ void KMFolderImap::checkValidity()
kdDebug(5006) << "KMFolderImap::checkValidity of: " << imapPath() << endl;
// Start with a clean slate
- disconnect( account(), TQT_SIGNAL( connectionResult(int, const TQString&) ),
- this, TQT_SLOT( checkValidity() ) );
+ disconnect( account(), TQ_SIGNAL( connectionResult(int, const TQString&) ),
+ this, TQ_SLOT( checkValidity() ) );
KMAcctImap::ConnectionState connectionState = account()->makeConnection();
if ( connectionState == ImapAccountBase::Error ) {
@@ -1048,8 +1048,8 @@ void KMFolderImap::checkValidity()
// We'll wait for the connectionResult signal from the account. If it
// errors, the above will catch it.
kdDebug(5006) << "CheckValidity - waiting for connection" << endl;
- connect( account(), TQT_SIGNAL( connectionResult(int, const TQString&) ),
- this, TQT_SLOT( checkValidity() ) );
+ connect( account(), TQ_SIGNAL( connectionResult(int, const TQString&) ),
+ this, TQ_SLOT( checkValidity() ) );
return;
}
// Only check once at a time.
@@ -1079,10 +1079,10 @@ void KMFolderImap::checkValidity()
TDEIO::SimpleJob *job = TDEIO::get(url, false, false);
TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
account()->insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
- TQT_SLOT(slotCheckValidityResult(TDEIO::Job *)));
- connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
- TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+ TQ_SLOT(slotCheckValidityResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+ TQ_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)));
// Only check once at a time.
mCheckingValidity = true;
}
@@ -1238,10 +1238,10 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid)
ImapAccountBase::jobData jd( url.url(), folder() );
jd.cancellable = true;
account()->insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
- this, TQT_SLOT(slotListFolderResult(TDEIO::Job *)));
- connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)),
- this, TQT_SLOT(slotListFolderEntries(TDEIO::Job *,
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+ this, TQ_SLOT(slotListFolderResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)),
+ this, TQ_SLOT(slotListFolderEntries(TDEIO::Job *,
const TDEIO::UDSEntryList &)));
} else {
mContentState = imapDownloadInProgress;
@@ -1254,10 +1254,10 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid)
ImapAccountBase::jobData jd( url.url(), folder() );
jd.cancellable = true;
account()->insertJob(newJob, jd);
- connect(newJob, TQT_SIGNAL(result(TDEIO::Job *)),
- this, TQT_SLOT(slotGetLastMessagesResult(TDEIO::Job *)));
- connect(newJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
- this, TQT_SLOT(slotGetMessagesData(TDEIO::Job *, const TQByteArray &)));
+ connect(newJob, TQ_SIGNAL(result(TDEIO::Job *)),
+ this, TQ_SLOT(slotGetLastMessagesResult(TDEIO::Job *)));
+ connect(newJob, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+ this, TQ_SLOT(slotGetMessagesData(TDEIO::Job *, const TQByteArray &)));
}
}
@@ -1360,12 +1360,12 @@ void KMFolderImap::slotListFolderResult(TDEIO::Job * job)
jd.url = url.url();
TDEIO::Scheduler::assignJobToSlave(account()->slave(), newJob);
account()->insertJob(newJob, jd);
- connect(newJob, TQT_SIGNAL(result(TDEIO::Job *)),
+ connect(newJob, TQ_SIGNAL(result(TDEIO::Job *)),
this, (i == sets.at(sets.count() - 1))
- ? TQT_SLOT(slotGetLastMessagesResult(TDEIO::Job *))
- : TQT_SLOT(slotGetMessagesResult(TDEIO::Job *)));
- connect(newJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
- this, TQT_SLOT(slotGetMessagesData(TDEIO::Job *, const TQByteArray &)));
+ ? TQ_SLOT(slotGetLastMessagesResult(TDEIO::Job *))
+ : TQ_SLOT(slotGetMessagesResult(TDEIO::Job *)));
+ connect(newJob, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+ this, TQ_SLOT(slotGetMessagesData(TDEIO::Job *, const TQByteArray &)));
}
}
@@ -1740,8 +1740,8 @@ void KMFolderImap::createFolder(const TQString &name, const TQString& parentPath
ImapAccountBase::jobData jd( url.url(), folder() );
jd.items = name;
account()->insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
- this, TQT_SLOT(slotCreateFolderResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+ this, TQ_SLOT(slotCreateFolderResult(TDEIO::Job *)));
}
@@ -1841,8 +1841,8 @@ void KMFolderImap::deleteMessage(KMMessage * msg)
TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
ImapAccountBase::jobData jd( url.url(), 0 );
account()->insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
- account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+ account(), TQ_SLOT(slotSimpleResult(TDEIO::Job *)));
}
void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList)
@@ -1874,8 +1874,8 @@ void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList)
TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
ImapAccountBase::jobData jd( url.url(), 0 );
account()->insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
- account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+ account(), TQ_SLOT(slotSimpleResult(TDEIO::Job *)));
}
}
@@ -1968,7 +1968,7 @@ void KMFolderImap::setStatus(TQValueList<int>& _ids, KMMsgStatus status, bool to
// to make sure that we get the latest flags abort the current listing and
// create a new one
kdDebug(5006) << "Set status during folder listing, restarting listing." << endl;
- disconnect(this, TQT_SLOT(slotListFolderResult(TDEIO::Job *)));
+ disconnect(this, TQ_SLOT(slotListFolderResult(TDEIO::Job *)));
quiet( false );
reallyGetFolder( TQString() );
}
@@ -2075,16 +2075,16 @@ void KMFolderImap::expungeFolder(KMFolderImap * aFolder, bool quiet)
ImapAccountBase::jobData jd( url.url(), 0 );
jd.quiet = quiet;
account()->insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
- account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+ account(), TQ_SLOT(slotSimpleResult(TDEIO::Job *)));
}
//-----------------------------------------------------------------------------
void KMFolderImap::slotProcessNewMail( int errorCode, const TQString &errorMsg )
{
Q_UNUSED( errorMsg );
- disconnect( account(), TQT_SIGNAL( connectionResult(int, const TQString&) ),
- this, TQT_SLOT( slotProcessNewMail(int, const TQString&) ) );
+ disconnect( account(), TQ_SIGNAL( connectionResult(int, const TQString&) ),
+ this, TQ_SLOT( slotProcessNewMail(int, const TQString&) ) );
if ( !errorCode )
processNewMail( false );
else
@@ -2114,8 +2114,8 @@ bool KMFolderImap::processNewMail(bool)
{
// wait
kdDebug(5006) << "KMFolderImap::processNewMail - waiting for connection: " << label() << endl;
- connect( account(), TQT_SIGNAL( connectionResult(int, const TQString&) ),
- this, TQT_SLOT( slotProcessNewMail(int, const TQString&) ) );
+ connect( account(), TQ_SIGNAL( connectionResult(int, const TQString&) ),
+ this, TQ_SLOT( slotProcessNewMail(int, const TQString&) ) );
return true;
}
KURL url = account()->getUrl();
@@ -2137,8 +2137,8 @@ bool KMFolderImap::processNewMail(bool)
ImapAccountBase::jobData jd(url.url(), folder() );
jd.cancellable = true;
account()->insertJob(job, jd);
- 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 true;
}
@@ -2247,8 +2247,8 @@ int KMFolderImap::expungeContents()
ImapAccountBase::jobData jd( url.url(), 0 );
jd.quiet = true;
account()->insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
- account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+ account(), TQ_SLOT(slotSimpleResult(TDEIO::Job *)));
}
/* Is the below correct? If we are expunging (in the folder sense, not the imap sense),
why delete but not (imap-)expunge? Since the folder is not active there is no concept
@@ -2328,8 +2328,8 @@ void KMFolderImap::setAlreadyRemoved( bool removed )
void KMFolderImap::slotCreatePendingFolders( int errorCode, const TQString& errorMsg )
{
Q_UNUSED( errorMsg );
- disconnect( account(), TQT_SIGNAL( connectionResult( int, const TQString& ) ),
- this, TQT_SLOT( slotCreatePendingFolders( int, const TQString& ) ) );
+ disconnect( account(), TQ_SIGNAL( connectionResult( int, const TQString& ) ),
+ this, TQ_SLOT( slotCreatePendingFolders( int, const TQString& ) ) );
if ( !errorCode ) {
TQStringList::Iterator it = mFoldersPendingCreation.begin();
for ( ; it != mFoldersPendingCreation.end(); ++it ) {
@@ -2350,8 +2350,8 @@ void KMFolderImap::search( const KMSearchPattern* pattern )
return;
}
SearchJob* job = new SearchJob( this, account(), pattern );
- connect( job, TQT_SIGNAL( searchDone( TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ),
- this, TQT_SLOT( slotSearchDone( TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ) );
+ connect( job, TQ_SIGNAL( searchDone( TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ),
+ this, TQ_SLOT( slotSearchDone( TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ) );
job->start();
}
@@ -2373,8 +2373,8 @@ void KMFolderImap::search( const KMSearchPattern* pattern, TQ_UINT32 serNum )
return;
}
SearchJob* job = new SearchJob( this, account(), pattern, serNum );
- connect( job, TQT_SIGNAL( searchDone( TQ_UINT32, const KMSearchPattern*, bool ) ),
- this, TQT_SLOT( slotSearchDone( TQ_UINT32, const KMSearchPattern*, bool ) ) );
+ connect( job, TQ_SIGNAL( searchDone( TQ_UINT32, const KMSearchPattern*, bool ) ),
+ this, TQ_SLOT( slotSearchDone( TQ_UINT32, const KMSearchPattern*, bool ) ) );
job->start();
}
diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h
index 5f454c59..4113350a 100644
--- a/kmail/kmfolderimap.h
+++ b/kmail/kmfolderimap.h
@@ -77,7 +77,7 @@ private:
class KMFolderImap : public KMFolderMbox
{
- Q_OBJECT
+ TQ_OBJECT
friend class ::KMail::ImapJob;
public:
diff --git a/kmail/kmfolderindex.h b/kmail/kmfolderindex.h
index ae67d7db..194d5c97 100644
--- a/kmail/kmfolderindex.h
+++ b/kmail/kmfolderindex.h
@@ -36,7 +36,7 @@
class KMFolderIndex: public FolderStorage
{
- Q_OBJECT
+ TQ_OBJECT
//TODO:Have to get rid of this friend declaration and add necessary pure
//virtuals to kmfolder.h so that KMMsgBase::parent() can be a plain KMFolder
diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp
index 29f9aacc..62228190 100644
--- a/kmail/kmfoldermaildir.cpp
+++ b/kmail/kmfoldermaildir.cpp
@@ -1122,7 +1122,7 @@ TQ_INT64 KMFolderMaildir::doFolderSize() const
item = new KFileItem( S_IFDIR, -1, location() + "/tmp" );
list.append( item );
s_DirSizeJobQueue.append(
- tqMakePair( TQGuardedPtr<const KMFolderMaildir>( this ), list ) );
+ qMakePair( TQGuardedPtr<const KMFolderMaildir>( this ), list ) );
// if there's only one entry in the queue then we can start
// a dirSizeJob right away
@@ -1131,8 +1131,8 @@ TQ_INT64 KMFolderMaildir::doFolderSize() const
//kdDebug(5006) << k_funcinfo << "Starting dirSizeJob for folder "
// << location() << endl;
KDirSize* job = KDirSize::dirSizeJob( list );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
- this, TQT_SLOT( slotDirSizeJobResult( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQ_SLOT( slotDirSizeJobResult( TDEIO::Job* ) ) );
}
return -1;
@@ -1163,8 +1163,8 @@ void KMFolderMaildir::slotDirSizeJobResult( TDEIO::Job* job )
//kdDebug(5006) << k_funcinfo << "Starting dirSizeJob for folder "
// << entry.first->location() << endl;
KDirSize* job = KDirSize::dirSizeJob( entry.second );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
- entry.first, TQT_SLOT( slotDirSizeJobResult( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ entry.first, TQ_SLOT( slotDirSizeJobResult( TDEIO::Job* ) ) );
break;
}
else
diff --git a/kmail/kmfoldermaildir.h b/kmail/kmfoldermaildir.h
index b4bdb3c5..85109490 100644
--- a/kmail/kmfoldermaildir.h
+++ b/kmail/kmfoldermaildir.h
@@ -23,7 +23,7 @@ using KMail::AttachmentStrategy;
class KMFolderMaildir : public KMFolderIndex
{
- Q_OBJECT
+ TQ_OBJECT
friend class ::KMail::MaildirJob;
public:
diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp
index 43c9a913..e17f0966 100644
--- a/kmail/kmfoldermbox.cpp
+++ b/kmail/kmfoldermbox.cpp
@@ -46,9 +46,7 @@
#include <ctype.h>
#include <unistd.h>
-#ifdef HAVE_FCNTL_H
#include <fcntl.h>
-#endif
#include <stdlib.h>
#include <sys/types.h>
diff --git a/kmail/kmfoldermbox.h b/kmail/kmfoldermbox.h
index d1993b17..517d5f19 100644
--- a/kmail/kmfoldermbox.h
+++ b/kmail/kmfoldermbox.h
@@ -46,7 +46,7 @@ using KMail::AttachmentStrategy;
class KMFolderMbox : public KMFolderIndex
{
- Q_OBJECT
+ TQ_OBJECT
friend class ::KMail::MboxJob;
public:
diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp
index d270e710..94bbc2b9 100644
--- a/kmail/kmfoldermgr.cpp
+++ b/kmail/kmfoldermgr.cpp
@@ -361,8 +361,8 @@ void KMFolderMgr::remove(KMFolder* aFolder)
void KMFolderMgr::removeFolder(KMFolder* aFolder)
{
- connect(aFolder, TQT_SIGNAL(removed(KMFolder*, bool)),
- this, TQT_SLOT(removeFolderAux(KMFolder*, bool)));
+ connect(aFolder, TQ_SIGNAL(removed(KMFolder*, bool)),
+ this, TQ_SLOT(removeFolderAux(KMFolder*, bool)));
aFolder->remove();
}
@@ -578,10 +578,10 @@ void KMFolderMgr::renameFolder( KMFolder* folder, const TQString& newName,
KMFolderDir *newParent )
{
RenameJob* job = new RenameJob( folder->storage(), newName, newParent );
- connect( job, TQT_SIGNAL( renameDone( TQString, bool ) ),
- this, TQT_SLOT( slotRenameDone( TQString, bool ) ) );
- connect( job, TQT_SIGNAL( renameDone( TQString, bool ) ),
- this, TQT_SIGNAL( folderMoveOrCopyOperationFinished() ) );
+ connect( job, TQ_SIGNAL( renameDone( TQString, bool ) ),
+ this, TQ_SLOT( slotRenameDone( TQString, bool ) ) );
+ connect( job, TQ_SIGNAL( renameDone( TQString, bool ) ),
+ this, TQ_SIGNAL( folderMoveOrCopyOperationFinished() ) );
job->start();
}
@@ -590,8 +590,8 @@ void KMFolderMgr::copyFolder( KMFolder* folder, KMFolderDir *newParent )
{
kdDebug(5006) << "Copy folder: " << folder->prettyURL() << endl;
CopyFolderJob* job = new CopyFolderJob( folder->storage(), newParent );
- connect( job, TQT_SIGNAL( folderCopyComplete( bool ) ),
- this, TQT_SIGNAL( folderMoveOrCopyOperationFinished() ) );
+ connect( job, TQ_SIGNAL( folderCopyComplete( bool ) ),
+ this, TQ_SIGNAL( folderMoveOrCopyOperationFinished() ) );
job->start();
}
diff --git a/kmail/kmfoldermgr.h b/kmail/kmfoldermgr.h
index b6b80ad9..cfafc916 100644
--- a/kmail/kmfoldermgr.h
+++ b/kmail/kmfoldermgr.h
@@ -15,7 +15,7 @@ class KMFolder;
class KMFolderMgr: public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/kmfoldernode.h b/kmail/kmfoldernode.h
index b4542c96..925997b7 100644
--- a/kmail/kmfoldernode.h
+++ b/kmail/kmfoldernode.h
@@ -28,7 +28,7 @@ class KMFolderDir;
class KMFolderNode: public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/kmfoldersearch.cpp b/kmail/kmfoldersearch.cpp
index e2a72cb2..29c0c8ab 100644
--- a/kmail/kmfoldersearch.cpp
+++ b/kmail/kmfoldersearch.cpp
@@ -81,7 +81,7 @@ KMSearch::KMSearch(TQObject * parent, const char * name)
mSearchCount = 0;
mProcessNextBatchTimer = new TQTimer(0, "mProcessNextBatchTimer");
- connect(mProcessNextBatchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotProcessNextBatch()));
+ connect(mProcessNextBatchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotProcessNextBatch()));
}
KMSearch::~KMSearch()
@@ -262,9 +262,9 @@ void KMSearch::slotProcessNextBatch()
folder->open("kmsearch");
mOpenedFolders.append( folder );
connect( folder->storage(),
- TQT_SIGNAL( searchResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ),
+ TQ_SIGNAL( searchResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ),
this,
- TQT_SLOT( slotSearchFolderResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ) );
+ TQ_SLOT( slotSearchFolderResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ) );
folder->storage()->search( mSearchPattern );
} else
--mRemainingFolders;
@@ -291,10 +291,10 @@ void KMSearch::slotSearchFolderResult( KMFolder* folder,
if ( complete )
{
disconnect( folder->storage(),
- TQT_SIGNAL( searchResult( KMFolder*, TQValueList<TQ_UINT32>,
+ TQ_SIGNAL( searchResult( KMFolder*, TQValueList<TQ_UINT32>,
const KMSearchPattern*, bool ) ),
this,
- TQT_SLOT( slotSearchFolderResult( KMFolder*, TQValueList<TQ_UINT32>,
+ TQ_SLOT( slotSearchFolderResult( KMFolder*, TQValueList<TQ_UINT32>,
const KMSearchPattern*, bool ) ) );
--mRemainingFolders;
mSearchCount += folder->count();
@@ -325,54 +325,54 @@ KMFolderSearch::KMFolderSearch(KMFolder* folder, const char* name)
//Hook up some slots for live updating of search folders
//TODO: Optimize folderInvalidated, folderAdded, folderRemoved
- connect(kmkernel->folderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
- this, TQT_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32)));
- connect(kmkernel->folderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
- this, TQT_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32)));
- connect(kmkernel->folderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)),
- this, TQT_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int)));
- connect(kmkernel->folderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)),
- this, TQT_SLOT(examineInvalidatedFolder(KMFolder*)));
- connect(kmkernel->folderMgr(), TQT_SIGNAL(folderAdded(KMFolder*)),
- this, TQT_SLOT(examineInvalidatedFolder(KMFolder*)));
- connect(kmkernel->folderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)),
- this, TQT_SLOT(examineRemovedFolder(KMFolder*)));
- connect(kmkernel->folderMgr(), TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)),
- this, TQT_SLOT(propagateHeaderChanged(KMFolder*,int)));
-
- connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
- this, TQT_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32)));
- connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
- this, TQT_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32)));
- connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)),
- this, TQT_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int)));
- connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)),
- this, TQT_SLOT(examineInvalidatedFolder(KMFolder*)));
- connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderAdded(KMFolder*)),
- this, TQT_SLOT(examineInvalidatedFolder(KMFolder*)));
- connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)),
- this, TQT_SLOT(examineRemovedFolder(KMFolder*)));
- connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)),
- this, TQT_SLOT(propagateHeaderChanged(KMFolder*,int)));
-
- connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
- this, TQT_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32)));
- connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
- this, TQT_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32)));
- connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)),
- this, TQT_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int)));
- connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)),
- this, TQT_SLOT(examineInvalidatedFolder(KMFolder*)));
- connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderAdded(KMFolder*)),
- this, TQT_SLOT(examineInvalidatedFolder(KMFolder*)));
- connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)),
- this, TQT_SLOT(examineRemovedFolder(KMFolder*)));
- connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)),
- this, TQT_SLOT(propagateHeaderChanged(KMFolder*,int)));
+ connect(kmkernel->folderMgr(), TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+ this, TQ_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32)));
+ connect(kmkernel->folderMgr(), TQ_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
+ this, TQ_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32)));
+ connect(kmkernel->folderMgr(), TQ_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)),
+ this, TQ_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int)));
+ connect(kmkernel->folderMgr(), TQ_SIGNAL(folderInvalidated(KMFolder*)),
+ this, TQ_SLOT(examineInvalidatedFolder(KMFolder*)));
+ connect(kmkernel->folderMgr(), TQ_SIGNAL(folderAdded(KMFolder*)),
+ this, TQ_SLOT(examineInvalidatedFolder(KMFolder*)));
+ connect(kmkernel->folderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)),
+ this, TQ_SLOT(examineRemovedFolder(KMFolder*)));
+ connect(kmkernel->folderMgr(), TQ_SIGNAL(msgHeaderChanged(KMFolder*,int)),
+ this, TQ_SLOT(propagateHeaderChanged(KMFolder*,int)));
+
+ connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+ this, TQ_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32)));
+ connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
+ this, TQ_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32)));
+ connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)),
+ this, TQ_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int)));
+ connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(folderInvalidated(KMFolder*)),
+ this, TQ_SLOT(examineInvalidatedFolder(KMFolder*)));
+ connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(folderAdded(KMFolder*)),
+ this, TQ_SLOT(examineInvalidatedFolder(KMFolder*)));
+ connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)),
+ this, TQ_SLOT(examineRemovedFolder(KMFolder*)));
+ connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(msgHeaderChanged(KMFolder*,int)),
+ this, TQ_SLOT(propagateHeaderChanged(KMFolder*,int)));
+
+ connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+ this, TQ_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32)));
+ connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
+ this, TQ_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32)));
+ connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)),
+ this, TQ_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int)));
+ connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(folderInvalidated(KMFolder*)),
+ this, TQ_SLOT(examineInvalidatedFolder(KMFolder*)));
+ connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(folderAdded(KMFolder*)),
+ this, TQ_SLOT(examineInvalidatedFolder(KMFolder*)));
+ connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)),
+ this, TQ_SLOT(examineRemovedFolder(KMFolder*)));
+ connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(msgHeaderChanged(KMFolder*,int)),
+ this, TQ_SLOT(propagateHeaderChanged(KMFolder*,int)));
mExecuteSearchTimer = new TQTimer(0, "mExecuteSearchTimer");
- connect(mExecuteSearchTimer, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(executeSearch()));
+ connect(mExecuteSearchTimer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(executeSearch()));
}
KMFolderSearch::~KMFolderSearch()
@@ -399,10 +399,10 @@ void KMFolderSearch::setSearch(KMSearch *search)
delete mSearch;
mSearch = search; // take ownership
if (mSearch) {
- TQObject::connect(search, TQT_SIGNAL(found(TQ_UINT32)),
- TQT_SLOT(addSerNum(TQ_UINT32)));
- TQObject::connect(search, TQT_SIGNAL(finished(bool)),
- TQT_SLOT(searchFinished(bool)));
+ TQObject::connect(search, TQ_SIGNAL(found(TQ_UINT32)),
+ TQ_SLOT(addSerNum(TQ_UINT32)));
+ TQObject::connect(search, TQ_SIGNAL(finished(bool)),
+ TQ_SLOT(searchFinished(bool)));
}
}
if (mSearch)
@@ -502,8 +502,8 @@ int KMFolderSearch::addMsg(KMMessage*, int* index_return)
bool KMFolderSearch::readSearch()
{
mSearch = new KMSearch;
- TQObject::connect(mSearch, TQT_SIGNAL(found(TQ_UINT32)), TQT_SLOT(addSerNum(TQ_UINT32)));
- TQObject::connect(mSearch, TQT_SIGNAL(finished(bool)), TQT_SLOT(searchFinished(bool)));
+ TQObject::connect(mSearch, TQ_SIGNAL(found(TQ_UINT32)), TQ_SLOT(addSerNum(TQ_UINT32)));
+ TQObject::connect(mSearch, TQ_SIGNAL(finished(bool)), TQ_SLOT(searchFinished(bool)));
return mSearch->read(location());
}
@@ -603,8 +603,8 @@ int KMFolderSearch::create()
clearIndex();
if (!mSearch) {
mSearch = new KMSearch();
- TQObject::connect(mSearch, TQT_SIGNAL(found(TQ_UINT32)), TQT_SLOT(addSerNum(TQ_UINT32)));
- TQObject::connect(mSearch, TQT_SIGNAL(finished(bool)), TQT_SLOT(searchFinished(bool)));
+ TQObject::connect(mSearch, TQ_SIGNAL(found(TQ_UINT32)), TQ_SLOT(addSerNum(TQ_UINT32)));
+ TQObject::connect(mSearch, TQ_SIGNAL(finished(bool)), TQ_SLOT(searchFinished(bool)));
}
mSearch->write(location());
mOpenCount++;
@@ -959,9 +959,9 @@ void KMFolderSearch::examineAddedMessage(KMFolder *aFolder, TQ_UINT32 serNum)
mFoldersCurrentlyBeingSearched.replace( folder, count+1 );
} else {
connect( folder->storage(),
- TQT_SIGNAL( searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ),
+ TQ_SIGNAL( searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ),
this,
- TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32,
+ TQ_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32,
const KMSearchPattern*, bool ) ) );
mFoldersCurrentlyBeingSearched.insert( folder, 1 );
}
@@ -983,10 +983,10 @@ void KMFolderSearch::slotSearchExamineMsgDone( KMFolder* folder,
unsigned int count = mFoldersCurrentlyBeingSearched[folder];
if ( count == 1 ) {
disconnect( folder->storage(),
- TQT_SIGNAL( searchDone( KMFolder*, TQ_UINT32,
+ TQ_SIGNAL( searchDone( KMFolder*, TQ_UINT32,
const KMSearchPattern*, bool ) ),
this,
- TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32,
+ TQ_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32,
const KMSearchPattern*, bool ) ) );
mFoldersCurrentlyBeingSearched.remove( folder );
} else {
@@ -1120,9 +1120,9 @@ void KMFolderSearch::propagateHeaderChanged(KMFolder *aFolder, int idx)
mFoldersCurrentlyBeingSearched.replace( aFolder, count+1 );
} else {
connect( aFolder->storage(),
- TQT_SIGNAL( searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ),
+ TQ_SIGNAL( searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ),
this,
- TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32,
+ TQ_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32,
const KMSearchPattern*, bool ) ) );
mFoldersCurrentlyBeingSearched.insert( aFolder, 1 );
}
diff --git a/kmail/kmfoldersearch.h b/kmail/kmfoldersearch.h
index a3fb9706..67c228cf 100644
--- a/kmail/kmfoldersearch.h
+++ b/kmail/kmfoldersearch.h
@@ -51,7 +51,7 @@ using KMail::AttachmentStrategy;
class KMSearch: public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -109,7 +109,7 @@ private:
class KMFolderSearch: public FolderStorage
{
- Q_OBJECT
+ TQ_OBJECT
friend class ::KMFolderSearchJob;
public:
diff --git a/kmail/kmfolderseldlg.cpp b/kmail/kmfolderseldlg.cpp
index b4c9842b..496af0f8 100644
--- a/kmail/kmfolderseldlg.cpp
+++ b/kmail/kmfolderseldlg.cpp
@@ -62,10 +62,10 @@ KMFolderSelDlg::KMFolderSelDlg( TQWidget * parent, KMFolderTree * tree,
void KMFolderSelDlg::init()
{
mTreeView->setFocus();
- connect( mTreeView, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ),
- this, TQT_SLOT( slotSelect() ) );
- connect( mTreeView, TQT_SIGNAL( selectionChanged() ),
- this, TQT_SLOT( slotUpdateBtnStatus() ) );
+ connect( mTreeView, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ),
+ this, TQ_SLOT( slotSelect() ) );
+ connect( mTreeView, TQ_SIGNAL( selectionChanged() ),
+ this, TQ_SLOT( slotUpdateBtnStatus() ) );
readConfig();
}
diff --git a/kmail/kmfolderseldlg.h b/kmail/kmfolderseldlg.h
index 1a7f7508..b2b3502a 100644
--- a/kmail/kmfolderseldlg.h
+++ b/kmail/kmfolderseldlg.h
@@ -20,7 +20,7 @@ namespace KMail {
//-----------------------------------------------------------------------------
class KMFolderSelDlg: public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp
index e73b69a7..00fcf6d4 100644
--- a/kmail/kmfoldertree.cpp
+++ b/kmail/kmfoldertree.cpp
@@ -281,7 +281,7 @@ void KMFolderTreeItem::slotNoContentChanged()
{
// reload the folder tree if the no content state changed, needed because
// we hide no-content folders if their child nodes are hidden
- TQTimer::singleShot( 0, static_cast<KMFolderTree*>( listView() ), TQT_SLOT(reload()) );
+ TQTimer::singleShot( 0, static_cast<KMFolderTree*>( listView() ), TQ_SLOT(reload()) );
}
//-----------------------------------------------------------------------------
@@ -406,12 +406,12 @@ KMFolderTree::KMFolderTree( KMMainWidget *mainWidget, TQWidget *parent,
mPopup = new TDEPopupMenu(this);
mPopup->insertTitle(i18n("View Columns"));
mPopup->setCheckable(true);
- mUnreadPop = mPopup->insertItem(i18n("Unread Column"), this, TQT_SLOT(slotToggleUnreadColumn()));
- mTotalPop = mPopup->insertItem(i18n("Total Column"), this, TQT_SLOT(slotToggleTotalColumn()));
- mSizePop = mPopup->insertItem(i18n("Size Column"), this, TQT_SLOT(slotToggleSizeColumn()));
+ mUnreadPop = mPopup->insertItem(i18n("Unread Column"), this, TQ_SLOT(slotToggleUnreadColumn()));
+ mTotalPop = mPopup->insertItem(i18n("Total Column"), this, TQ_SLOT(slotToggleTotalColumn()));
+ mSizePop = mPopup->insertItem(i18n("Size Column"), this, TQ_SLOT(slotToggleSizeColumn()));
- connect( this, TQT_SIGNAL( triggerRefresh() ),
- this, TQT_SLOT( refresh() ) );
+ connect( this, TQ_SIGNAL( triggerRefresh() ),
+ this, TQ_SLOT( refresh() ) );
new FolderViewToolTip( this );
}
@@ -420,61 +420,61 @@ KMFolderTree::KMFolderTree( KMMainWidget *mainWidget, TQWidget *parent,
// connects all needed signals to their slots
void KMFolderTree::connectSignals()
{
- connect( mUpdateCountTimer, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(slotUpdateCountTimeout()) );
+ connect( mUpdateCountTimer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(slotUpdateCountTimeout()) );
- connect(&mUpdateTimer, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(delayedUpdate()));
+ connect(&mUpdateTimer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(delayedUpdate()));
- connect(kmkernel->folderMgr(), TQT_SIGNAL(changed()),
- this, TQT_SLOT(doFolderListChanged()));
+ connect(kmkernel->folderMgr(), TQ_SIGNAL(changed()),
+ this, TQ_SLOT(doFolderListChanged()));
- connect(kmkernel->folderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)),
- this, TQT_SLOT(slotFolderRemoved(KMFolder*)));
+ connect(kmkernel->folderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)),
+ this, TQ_SLOT(slotFolderRemoved(KMFolder*)));
- connect(kmkernel->folderMgr(), TQT_SIGNAL(folderMoveOrCopyOperationFinished()),
- this, TQT_SLOT(slotFolderMoveOrCopyOperationFinished()));
+ connect(kmkernel->folderMgr(), TQ_SIGNAL(folderMoveOrCopyOperationFinished()),
+ this, TQ_SLOT(slotFolderMoveOrCopyOperationFinished()));
- connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()),
- this, TQT_SLOT(doFolderListChanged()));
+ connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()),
+ this, TQ_SLOT(doFolderListChanged()));
- connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)),
- this, TQT_SLOT(slotFolderRemoved(KMFolder*)));
+ connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)),
+ this, TQ_SLOT(slotFolderRemoved(KMFolder*)));
- connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(changed()),
- this, TQT_SLOT(doFolderListChanged()));
+ connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(changed()),
+ this, TQ_SLOT(doFolderListChanged()));
- connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)),
- this, TQT_SLOT(slotFolderRemoved(KMFolder*)));
+ connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)),
+ this, TQ_SLOT(slotFolderRemoved(KMFolder*)));
- connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(changed()),
- this, TQT_SLOT(doFolderListChanged()));
+ connect(kmkernel->searchFolderMgr(), TQ_SIGNAL(changed()),
+ this, TQ_SLOT(doFolderListChanged()));
- connect(kmkernel->acctMgr(), TQT_SIGNAL(accountRemoved(KMAccount*)),
- this, TQT_SLOT(slotAccountRemoved(KMAccount*)));
+ connect(kmkernel->acctMgr(), TQ_SIGNAL(accountRemoved(KMAccount*)),
+ this, TQ_SLOT(slotAccountRemoved(KMAccount*)));
- connect(kmkernel->acctMgr(), TQT_SIGNAL(accountAdded(KMAccount*)),
- this, TQT_SLOT(slotUnhideLocalInbox()));
+ connect(kmkernel->acctMgr(), TQ_SIGNAL(accountAdded(KMAccount*)),
+ this, TQ_SLOT(slotUnhideLocalInbox()));
- connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)),
- this, TQT_SLOT(slotFolderRemoved(KMFolder*)));
+ connect(kmkernel->searchFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)),
+ this, TQ_SLOT(slotFolderRemoved(KMFolder*)));
- connect( &autoopen_timer, TQT_SIGNAL( timeout() ),
- this, TQT_SLOT( openFolder() ) );
+ connect( &autoopen_timer, TQ_SIGNAL( timeout() ),
+ this, TQ_SLOT( openFolder() ) );
- connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int ) ),
- this, TQT_SLOT( slotContextMenuRequested( TQListViewItem*, const TQPoint & ) ) );
+ connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int ) ),
+ this, TQ_SLOT( slotContextMenuRequested( TQListViewItem*, const TQPoint & ) ) );
- connect( this, TQT_SIGNAL( expanded( TQListViewItem* ) ),
- this, TQT_SLOT( slotFolderExpanded( TQListViewItem* ) ) );
+ connect( this, TQ_SIGNAL( expanded( TQListViewItem* ) ),
+ this, TQ_SLOT( slotFolderExpanded( TQListViewItem* ) ) );
- connect( this, TQT_SIGNAL( collapsed( TQListViewItem* ) ),
- this, TQT_SLOT( slotFolderCollapsed( TQListViewItem* ) ) );
+ connect( this, TQ_SIGNAL( collapsed( TQListViewItem* ) ),
+ this, TQ_SLOT( slotFolderCollapsed( TQListViewItem* ) ) );
- connect( this, TQT_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString &)),
- this, TQT_SLOT( slotRenameFolder( TQListViewItem*, int, const TQString &)));
+ connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString &)),
+ this, TQ_SLOT( slotRenameFolder( TQListViewItem*, int, const TQString &)));
- connect( this, TQT_SIGNAL(folderSelected(KMFolder*)), TQT_SLOT(updateCopyActions()) );
+ connect( this, TQ_SIGNAL(folderSelected(KMFolder*)), TQ_SLOT(updateCopyActions()) );
}
//-----------------------------------------------------------------------------
@@ -598,7 +598,7 @@ void KMFolderTree::reload(bool openFolders)
{
// we open all folders to update the count
mUpdateIterator = TQListViewItemIterator (this);
- TQTimer::singleShot( 0, this, TQT_SLOT(slotUpdateOneCount()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(slotUpdateOneCount()) );
}
for ( TQListViewItemIterator it( this ) ; it.current() ; ++it ) {
@@ -606,53 +606,53 @@ void KMFolderTree::reload(bool openFolders)
if ( !fti || !fti->folder() )
continue;
- disconnect(fti->folder(),TQT_SIGNAL(iconsChanged()),
- fti,TQT_SLOT(slotIconsChanged()));
- connect(fti->folder(),TQT_SIGNAL(iconsChanged()),
- fti,TQT_SLOT(slotIconsChanged()));
+ disconnect(fti->folder(),TQ_SIGNAL(iconsChanged()),
+ fti,TQ_SLOT(slotIconsChanged()));
+ connect(fti->folder(),TQ_SIGNAL(iconsChanged()),
+ fti,TQ_SLOT(slotIconsChanged()));
- disconnect(fti->folder(),TQT_SIGNAL(nameChanged()),
- fti,TQT_SLOT(slotNameChanged()));
- connect(fti->folder(),TQT_SIGNAL(nameChanged()),
- fti,TQT_SLOT(slotNameChanged()));
+ disconnect(fti->folder(),TQ_SIGNAL(nameChanged()),
+ fti,TQ_SLOT(slotNameChanged()));
+ connect(fti->folder(),TQ_SIGNAL(nameChanged()),
+ fti,TQ_SLOT(slotNameChanged()));
- disconnect( fti->folder(), TQT_SIGNAL(noContentChanged()),
- fti, TQT_SLOT(slotNoContentChanged()) );
- connect( fti->folder(), TQT_SIGNAL(noContentChanged()),
- fti, TQT_SLOT(slotNoContentChanged()) );
+ disconnect( fti->folder(), TQ_SIGNAL(noContentChanged()),
+ fti, TQ_SLOT(slotNoContentChanged()) );
+ connect( fti->folder(), TQ_SIGNAL(noContentChanged()),
+ fti, TQ_SLOT(slotNoContentChanged()) );
- disconnect( fti->folder(), TQT_SIGNAL(syncStateChanged()),
- this, TQT_SLOT(slotSyncStateChanged()) );
- connect( fti->folder(), TQT_SIGNAL(syncStateChanged()),
- this, TQT_SLOT(slotSyncStateChanged()) );
+ disconnect( fti->folder(), TQ_SIGNAL(syncStateChanged()),
+ this, TQ_SLOT(slotSyncStateChanged()) );
+ connect( fti->folder(), TQ_SIGNAL(syncStateChanged()),
+ this, TQ_SLOT(slotSyncStateChanged()) );
// we want to be noticed of changes to update the unread/total columns
- disconnect(fti->folder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)),
- this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*)));
- connect(fti->folder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)),
- this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*)));
+ disconnect(fti->folder(), TQ_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)),
+ this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*)));
+ connect(fti->folder(), TQ_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)),
+ this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*)));
//}
- disconnect(fti->folder(), TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
- this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*)));
- connect(fti->folder(), TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
- this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*)));
- disconnect(fti->folder(), TQT_SIGNAL(msgRemoved(KMFolder*)),
- this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*)));
- connect(fti->folder(), TQT_SIGNAL(msgRemoved(KMFolder*)),
- this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*)));
+ disconnect(fti->folder(), TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
+ this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*)));
+ connect(fti->folder(), TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
+ this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*)));
+ disconnect(fti->folder(), TQ_SIGNAL(msgRemoved(KMFolder*)),
+ this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*)));
+ connect(fti->folder(), TQ_SIGNAL(msgRemoved(KMFolder*)),
+ this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*)));
- disconnect(fti->folder(), TQT_SIGNAL(folderSizeChanged( KMFolder* )),
- this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*)));
- connect(fti->folder(), TQT_SIGNAL(folderSizeChanged( KMFolder* )),
- this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*)));
+ disconnect(fti->folder(), TQ_SIGNAL(folderSizeChanged( KMFolder* )),
+ this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*)));
+ connect(fti->folder(), TQ_SIGNAL(folderSizeChanged( KMFolder* )),
+ this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*)));
- disconnect(fti->folder(), TQT_SIGNAL(shortcutChanged(KMFolder*)),
- mMainWidget, TQT_SLOT( slotShortcutChanged(KMFolder*)));
- connect(fti->folder(), TQT_SIGNAL(shortcutChanged(KMFolder*)),
- mMainWidget, TQT_SLOT( slotShortcutChanged(KMFolder*)));
+ disconnect(fti->folder(), TQ_SIGNAL(shortcutChanged(KMFolder*)),
+ mMainWidget, TQ_SLOT( slotShortcutChanged(KMFolder*)));
+ connect(fti->folder(), TQ_SIGNAL(shortcutChanged(KMFolder*)),
+ mMainWidget, TQ_SLOT( slotShortcutChanged(KMFolder*)));
if (!openFolders)
@@ -696,7 +696,7 @@ void KMFolderTree::slotUpdateOneCount()
++mUpdateIterator;
if ( !fti->folder() ) {
// next one please
- TQTimer::singleShot( 0, this, TQT_SLOT(slotUpdateOneCount()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(slotUpdateOneCount()) );
return;
}
@@ -707,7 +707,7 @@ void KMFolderTree::slotUpdateOneCount()
// restore previous state
if (!open) fti->folder()->close("updatecount");
- TQTimer::singleShot( 0, this, TQT_SLOT(slotUpdateOneCount()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(slotUpdateOneCount()) );
}
//-----------------------------------------------------------------------------
@@ -737,7 +737,7 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent )
} else {
// hide local inbox if unused
if ( kmkernel->inboxFolder() == folder && hideLocalInbox() ) {
- connect( kmkernel->inboxFolder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), TQT_SLOT(slotUnhideLocalInbox()) );
+ connect( kmkernel->inboxFolder(), TQ_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), TQ_SLOT(slotUnhideLocalInbox()) );
continue;
}
@@ -765,14 +765,14 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent )
removeFromFolderToItemMap( folder );
delete fti;
// still, it might change in the future, so we better check the change signals
- connect ( folder, TQT_SIGNAL(noContentChanged()), TQT_SLOT(delayedReload()) );
+ connect ( folder, TQ_SIGNAL(noContentChanged()), TQ_SLOT(delayedReload()) );
continue;
}
- connect (fti, TQT_SIGNAL(iconChanged(KMFolderTreeItem*)),
- this, TQT_SIGNAL(iconChanged(KMFolderTreeItem*)));
- connect (fti, TQT_SIGNAL(nameChanged(KMFolderTreeItem*)),
- this, TQT_SIGNAL(nameChanged(KMFolderTreeItem*)));
+ connect (fti, TQ_SIGNAL(iconChanged(KMFolderTreeItem*)),
+ this, TQ_SIGNAL(iconChanged(KMFolderTreeItem*)));
+ connect (fti, TQ_SIGNAL(nameChanged(KMFolderTreeItem*)),
+ this, TQ_SIGNAL(nameChanged(KMFolderTreeItem*)));
}
// restore last open-state
fti->setOpen( readIsListViewItemOpen(fti) );
@@ -1094,7 +1094,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi,
if ( ( fti->folder() || (fti->text(0) != i18n("Searches")) ) && !multiFolder)
folderMenu->insertItem(SmallIconSet("folder-new"),
createChild, this,
- TQT_SLOT(addChildFolder()));
+ TQ_SLOT(addChildFolder()));
if (!fti->folder()) {
mMainWidget->action("compact_all_folders")->plug(folderMenu);
@@ -1102,7 +1102,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi,
} else if (fti->folder()->folderType() == KMFolderTypeImap) {
folderMenu->insertItem(SmallIconSet("mail_get"), i18n("Check &Mail"),
this,
- TQT_SLOT(slotCheckMail()));
+ TQ_SLOT(slotCheckMail()));
}
} else { // regular folders
@@ -1110,18 +1110,18 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi,
if ( !fti->folder()->noChildren() && !multiFolder ) {
folderMenu->insertItem(SmallIconSet("folder-new"),
i18n("&New Subfolder..."), this,
- TQT_SLOT(addChildFolder()));
+ TQ_SLOT(addChildFolder()));
}
// copy folder
TQPopupMenu *copyMenu = new TQPopupMenu( folderMenu );
- folderToPopupMenu( CopyFolder, TQT_TQOBJECT(this), &mMenuToFolder, copyMenu );
+ folderToPopupMenu( CopyFolder, this, &mMenuToFolder, copyMenu );
folderMenu->insertItem( i18n("&Copy Folder To"), copyMenu );
if ( fti->folder()->isMoveable() && fti->folder()->canDeleteMessages() )
{
TQPopupMenu *moveMenu = new TQPopupMenu( folderMenu );
- folderToPopupMenu( MoveFolder, TQT_TQOBJECT(this), &mMenuToFolder, moveMenu );
+ folderToPopupMenu( MoveFolder, this, &mMenuToFolder, moveMenu );
folderMenu->insertItem( i18n("&Move Folder To"), moveMenu );
}
@@ -1139,7 +1139,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi,
if ( GlobalSettings::self()->enableFavoriteFolderView() ) {
folderMenu->insertItem( SmallIconSet("bookmark_add"), i18n("Add to Favorite Folders"),
- this, TQT_SLOT(slotAddToFavorites()) );
+ this, TQ_SLOT(slotAddToFavorites()) );
}
folderMenu->insertSeparator();
@@ -1158,24 +1158,24 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi,
{
folderMenu->insertItem(SmallIconSet("bookmark_folder"),
i18n("Serverside Subscription..."), mMainWidget,
- TQT_SLOT(slotSubscriptionDialog()));
+ TQ_SLOT(slotSubscriptionDialog()));
folderMenu->insertItem(SmallIcon("bookmark_folder"),
i18n("Local Subscription..."), mMainWidget,
- TQT_SLOT(slotLocalSubscriptionDialog()));
+ TQ_SLOT(slotLocalSubscriptionDialog()));
if (!fti->folder()->noContent())
{
mMainWidget->action("refresh_folder")->plug(folderMenu);
if ( fti->folder()->folderType() == KMFolderTypeImap && !multiFolder ) {
folderMenu->insertItem(SmallIconSet("reload"), i18n("Refresh Folder List"), this,
- TQT_SLOT(slotResetFolderList()));
+ TQ_SLOT(slotResetFolderList()));
}
}
if ( fti->folder()->folderType() == KMFolderTypeCachedImap && !multiFolder ) {
KMFolderCachedImap * folder = static_cast<KMFolderCachedImap*>( fti->folder()->storage() );
folderMenu->insertItem( SmallIconSet("wizard"),
i18n("&Troubleshoot IMAP Cache..."),
- folder, TQT_SLOT(slotTroubleshoot()) );
+ folder, TQ_SLOT(slotTroubleshoot()) );
}
folderMenu->insertSeparator();
}
@@ -1189,11 +1189,11 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi,
folderMenu->insertItem(SmallIconSet("configure_shortcuts"),
i18n("&Assign Shortcut..."),
fti,
- TQT_SLOT(assignShortcut()));
+ TQ_SLOT(assignShortcut()));
if ( !fti->folder()->noContent() && fti->folder()->canDeleteMessages() ) {
folderMenu->insertItem( i18n("Expire..."), fti,
- TQT_SLOT( slotShowExpiryProperties() ) );
+ TQ_SLOT( slotShowExpiryProperties() ) );
}
mMainWidget->action("modify")->plug(folderMenu);
}
@@ -1230,7 +1230,7 @@ void KMFolderTree::contentsMouseReleaseEvent(TQMouseEvent* me)
}
// react on middle-button only
- if (btn != Qt::MidButton) {
+ if (btn != TQt::MidButton) {
KFolderTree::contentsMouseReleaseEvent(me);
return;
}
@@ -1753,10 +1753,10 @@ void KMFolderTree::slotToggleSizeColumn()
bool KMFolderTree::eventFilter( TQObject *o, TQEvent *e )
{
if ( e->type() == TQEvent::MouseButtonPress &&
- TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton &&
- o->isA(TQHEADER_OBJECT_NAME_STRING) )
+ static_cast<TQMouseEvent*>(e)->button() == TQt::RightButton &&
+ o->isA("TQHeader") )
{
- mPopup->popup( TQT_TQMOUSEEVENT(e)->globalPos() );
+ mPopup->popup( static_cast<TQMouseEvent*>(e)->globalPos() );
return true;
}
return KFolderTree::eventFilter(o, e);
@@ -1860,15 +1860,15 @@ void KMFolderTree::folderToPopupMenu( MenuAction action, TQObject *receiver,
// connect the signals
if ( action == MoveMessage || action == MoveFolder )
{
- disconnect( menu, TQT_SIGNAL(activated(int)), receiver,
- TQT_SLOT(moveSelectedToFolder(int)) );
- connect( menu, TQT_SIGNAL(activated(int)), receiver,
- TQT_SLOT(moveSelectedToFolder(int)) );
+ disconnect( menu, TQ_SIGNAL(activated(int)), receiver,
+ TQ_SLOT(moveSelectedToFolder(int)) );
+ connect( menu, TQ_SIGNAL(activated(int)), receiver,
+ TQ_SLOT(moveSelectedToFolder(int)) );
} else {
- disconnect( menu, TQT_SIGNAL(activated(int)), receiver,
- TQT_SLOT(copySelectedToFolder(int)) );
- connect( menu, TQT_SIGNAL(activated(int)), receiver,
- TQT_SLOT(copySelectedToFolder(int)) );
+ disconnect( menu, TQ_SIGNAL(activated(int)), receiver,
+ TQ_SLOT(copySelectedToFolder(int)) );
+ connect( menu, TQ_SIGNAL(activated(int)), receiver,
+ TQ_SLOT(copySelectedToFolder(int)) );
}
if ( !item ) {
item = firstChild();
@@ -2176,14 +2176,14 @@ void KMFolderTree::slotAddToFavorites()
void KMFolderTree::slotUnhideLocalInbox()
{
- disconnect( kmkernel->inboxFolder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)),
- this, TQT_SLOT(slotUnhideLocalInbox()) );
+ disconnect( kmkernel->inboxFolder(), TQ_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)),
+ this, TQ_SLOT(slotUnhideLocalInbox()) );
reload();
}
void KMFolderTree::delayedReload()
{
- TQTimer::singleShot( 0, this, TQT_SLOT(reload()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(reload()) );
}
#include "kmfoldertree.moc"
diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h
index d5780a89..8184c061 100644
--- a/kmail/kmfoldertree.h
+++ b/kmail/kmfoldertree.h
@@ -44,7 +44,7 @@ template <typename T> class TQGuardedPtr;
class KDE_EXPORT KMFolderTreeItem : public TQObject, public KFolderTreeItem
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Construct a root item _without_ folder */
@@ -108,7 +108,7 @@ private:
class KMFolderTree : public KMail::FolderTreeBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index 1b29fd29..fe5531be 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -140,10 +140,10 @@ KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *parent,
mPopup->insertItem(i18n("Size"), KPaintInfo::COL_SIZE);
mPopup->insertItem(i18n("Receiver"), KPaintInfo::COL_RECEIVER);
- connect(mPopup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotToggleColumn(int)));
+ connect(mPopup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotToggleColumn(int)));
setShowSortIndicator(true);
- setFocusPolicy( TQ_WheelFocus );
+ setFocusPolicy( TQWidget::WheelFocus );
if (!pixmapsLoaded)
{
@@ -203,18 +203,18 @@ KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *parent,
header()->setResizeEnabled( true, mPaintInfo.senderCol );
header()->setResizeEnabled( true, mPaintInfo.dateCol );
- connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int )),
- this, TQT_SLOT( rightButtonPressed( TQListViewItem*, const TQPoint &, int )));
- connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*)),
- this,TQT_SLOT(selectMessage(TQListViewItem*)));
- connect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)),
- this,TQT_SLOT(highlightMessage(TQListViewItem*)));
+ connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int )),
+ this, TQ_SLOT( rightButtonPressed( TQListViewItem*, const TQPoint &, int )));
+ connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+ this,TQ_SLOT(selectMessage(TQListViewItem*)));
+ connect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)),
+ this,TQ_SLOT(highlightMessage(TQListViewItem*)));
resetCurrentTime();
mSubjectLists.setAutoDelete( true );
mMoveMessages = false;
- connect( this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateActions()) );
+ connect( this, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateActions()) );
}
@@ -235,8 +235,8 @@ KMHeaders::~KMHeaders ()
bool KMHeaders::eventFilter ( TQObject *o, TQEvent *e )
{
if ( e->type() == TQEvent::MouseButtonPress &&
- TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton &&
- o->isA(TQHEADER_OBJECT_NAME_STRING) )
+ static_cast<TQMouseEvent*>(e)->button() == TQt::RightButton &&
+ o->isA("TQHeader") )
{
// if we currently only show one of either sender/receiver column
// modify the popup text in the way, that it displays the text of the other of the two
@@ -248,7 +248,7 @@ bool KMHeaders::eventFilter ( TQObject *o, TQEvent *e )
else
mPopup->changeItem(KPaintInfo::COL_RECEIVER, i18n("Receiver"));
- mPopup->popup( TQT_TQMOUSEEVENT(e)->globalPos() );
+ mPopup->popup( static_cast<TQMouseEvent*>(e)->globalPos() );
return true;
}
return TDEListView::eventFilter(o, e);
@@ -698,28 +698,28 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
// from this folder, since it's msg's are about to be deleted.
highlightMessage(0, false);
- disconnect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
- this, TQT_SLOT(setFolderInfoStatus()));
+ disconnect(mFolder, TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
+ this, TQ_SLOT(setFolderInfoStatus()));
mFolder->markNewAsUnread();
writeFolderConfig();
- disconnect(mFolder, TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)),
- this, TQT_SLOT(msgHeaderChanged(KMFolder*,int)));
- disconnect(mFolder, TQT_SIGNAL(msgAdded(int)),
- this, TQT_SLOT(msgAdded(int)));
- disconnect(mFolder, TQT_SIGNAL( msgRemoved( int, TQString ) ),
- this, TQT_SLOT( msgRemoved( int, TQString ) ) );
- disconnect(mFolder, TQT_SIGNAL(changed()),
- this, TQT_SLOT(msgChanged()));
- disconnect(mFolder, TQT_SIGNAL(cleared()),
- this, TQT_SLOT(folderCleared()));
- disconnect(mFolder, TQT_SIGNAL(expunged( KMFolder* )),
- this, TQT_SLOT(folderCleared()));
- disconnect(mFolder, TQT_SIGNAL(closed()),
- this, TQT_SLOT(folderClosed()));
- disconnect( mFolder, TQT_SIGNAL( statusMsg( const TQString& ) ),
- BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) );
- disconnect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset()));
+ disconnect(mFolder, TQ_SIGNAL(msgHeaderChanged(KMFolder*,int)),
+ this, TQ_SLOT(msgHeaderChanged(KMFolder*,int)));
+ disconnect(mFolder, TQ_SIGNAL(msgAdded(int)),
+ this, TQ_SLOT(msgAdded(int)));
+ disconnect(mFolder, TQ_SIGNAL( msgRemoved( int, TQString ) ),
+ this, TQ_SLOT( msgRemoved( int, TQString ) ) );
+ disconnect(mFolder, TQ_SIGNAL(changed()),
+ this, TQ_SLOT(msgChanged()));
+ disconnect(mFolder, TQ_SIGNAL(cleared()),
+ this, TQ_SLOT(folderCleared()));
+ disconnect(mFolder, TQ_SIGNAL(expunged( KMFolder* )),
+ this, TQ_SLOT(folderCleared()));
+ disconnect(mFolder, TQ_SIGNAL(closed()),
+ this, TQ_SLOT(folderClosed()));
+ disconnect( mFolder, TQ_SIGNAL( statusMsg( const TQString& ) ),
+ BroadcastStatus::instance(), TQ_SLOT( setStatusMsg( const TQString& ) ) );
+ disconnect(mFolder, TQ_SIGNAL(viewConfigChanged()), this, TQ_SLOT(reset()));
writeSortOrder();
mFolder->close("kmheaders");
// System folders remain open but we also should write the index from
@@ -736,25 +736,25 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
mOwner->messageActions()->replyListAction()->setEnabled( mFolder ?
mFolder->isMailingListEnabled() : false );
if ( mFolder ) {
- connect(mFolder, TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)),
- this, TQT_SLOT(msgHeaderChanged(KMFolder*,int)));
- connect(mFolder, TQT_SIGNAL(msgAdded(int)),
- this, TQT_SLOT(msgAdded(int)));
- connect(mFolder, TQT_SIGNAL(msgRemoved(int,TQString)),
- this, TQT_SLOT(msgRemoved(int,TQString)));
- connect(mFolder, TQT_SIGNAL(changed()),
- this, TQT_SLOT(msgChanged()));
- connect(mFolder, TQT_SIGNAL(cleared()),
- this, TQT_SLOT(folderCleared()));
- connect(mFolder, TQT_SIGNAL(expunged( KMFolder* )),
- this, TQT_SLOT(folderCleared()));
- connect(mFolder, TQT_SIGNAL(closed()),
- this, TQT_SLOT(folderClosed()));
- connect(mFolder, TQT_SIGNAL(statusMsg(const TQString&)),
- BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) );
- connect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
- this, TQT_SLOT(setFolderInfoStatus()));
- connect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset()));
+ connect(mFolder, TQ_SIGNAL(msgHeaderChanged(KMFolder*,int)),
+ this, TQ_SLOT(msgHeaderChanged(KMFolder*,int)));
+ connect(mFolder, TQ_SIGNAL(msgAdded(int)),
+ this, TQ_SLOT(msgAdded(int)));
+ connect(mFolder, TQ_SIGNAL(msgRemoved(int,TQString)),
+ this, TQ_SLOT(msgRemoved(int,TQString)));
+ connect(mFolder, TQ_SIGNAL(changed()),
+ this, TQ_SLOT(msgChanged()));
+ connect(mFolder, TQ_SIGNAL(cleared()),
+ this, TQ_SLOT(folderCleared()));
+ connect(mFolder, TQ_SIGNAL(expunged( KMFolder* )),
+ this, TQ_SLOT(folderCleared()));
+ connect(mFolder, TQ_SIGNAL(closed()),
+ this, TQ_SLOT(folderClosed()));
+ connect(mFolder, TQ_SIGNAL(statusMsg(const TQString&)),
+ BroadcastStatus::instance(), TQ_SLOT( setStatusMsg( const TQString& ) ) );
+ connect(mFolder, TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
+ this, TQ_SLOT(setFolderInfoStatus()));
+ connect(mFolder, TQ_SIGNAL(viewConfigChanged()), this, TQ_SLOT(reset()));
// Not very nice, but if we go from nested to non-nested
// in the folderConfig below then we need to do this otherwise
@@ -844,8 +844,8 @@ void KMHeaders::msgChanged()
}
// if (!isUpdatesEnabled()) return;
// prevent IMAP messages from scrolling to top
- disconnect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)),
- this,TQT_SLOT(highlightMessage(TQListViewItem*)));
+ disconnect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)),
+ this,TQ_SLOT(highlightMessage(TQListViewItem*)));
updateMessageList(); // do not change the selection
@@ -866,8 +866,8 @@ void KMHeaders::msgChanged()
}
}
- connect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)),
- this,TQT_SLOT(highlightMessage(TQListViewItem*)));
+ connect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)),
+ this,TQ_SLOT(highlightMessage(TQListViewItem*)));
// if the current message has changed then emit
// the selected signal to force an update
@@ -982,8 +982,8 @@ void KMHeaders::msgAdded(int id)
/* In case the current item is taken during reparenting, prevent qlistview
* from selecting some unrelated item as a result of take() emitting
* currentChanged. */
- disconnect( this, TQT_SIGNAL(currentChanged(TQListViewItem*)),
- this, TQT_SLOT(highlightMessage(TQListViewItem*)));
+ disconnect( this, TQ_SIGNAL(currentChanged(TQListViewItem*)),
+ this, TQ_SLOT(highlightMessage(TQListViewItem*)));
if ( !msgId.isEmpty() ) {
TQPtrListIterator<HeaderItem> it(mImperfectlyThreadedList);
@@ -1052,7 +1052,7 @@ void KMHeaders::msgAdded(int id)
sci->setItem(hi);
}
if (mSortInfo.fakeSort) {
- TQObject::disconnect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int)));
+ TQObject::disconnect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(dirtySortOrder(int)));
TDEListView::setSorting(mSortCol, !mSortDescending );
mSortInfo.fakeSort = 0;
}
@@ -1068,8 +1068,8 @@ void KMHeaders::msgAdded(int id)
}
/* restore signal */
- connect( this, TQT_SIGNAL(currentChanged(TQListViewItem*)),
- this, TQT_SLOT(highlightMessage(TQListViewItem*)));
+ connect( this, TQ_SIGNAL(currentChanged(TQListViewItem*)),
+ this, TQ_SLOT(highlightMessage(TQListViewItem*)));
emit msgAddedToListView( hi );
END_TIMER(msgAdded);
@@ -1089,8 +1089,8 @@ void KMHeaders::msgRemoved(int id, TQString msgId )
* item once this one is removed. Sine we have already selected
* something in prepare/finalizeMove that's counter productive
*/
- disconnect( this, TQT_SIGNAL(currentChanged(TQListViewItem*)),
- this, TQT_SLOT(highlightMessage(TQListViewItem*)));
+ disconnect( this, TQ_SIGNAL(currentChanged(TQListViewItem*)),
+ this, TQ_SLOT(highlightMessage(TQListViewItem*)));
HeaderItem *removedItem = mItems[id];
if (!removedItem) return;
@@ -1137,7 +1137,7 @@ void KMHeaders::msgRemoved(int id, TQString msgId )
}
item->setTempKey( key + item->key( mSortCol, !mSortDescending ));
if (mSortInfo.fakeSort) {
- TQObject::disconnect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int)));
+ TQObject::disconnect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(dirtySortOrder(int)));
TDEListView::setSorting(mSortCol, !mSortDescending );
mSortInfo.fakeSort = 0;
}
@@ -1201,8 +1201,8 @@ void KMHeaders::msgRemoved(int id, TQString msgId )
}
}
/* restore signal */
- connect( this, TQT_SIGNAL(currentChanged(TQListViewItem*)),
- this, TQT_SLOT(highlightMessage(TQListViewItem*)));
+ connect( this, TQ_SIGNAL(currentChanged(TQListViewItem*)),
+ this, TQ_SLOT(highlightMessage(TQListViewItem*)));
}
@@ -1467,8 +1467,8 @@ void KMHeaders::applyFiltersOnMsg()
msg->setTransferInProgress(true);
if (!msg->isComplete()) {
FolderJob *job = mFolder->createJob(msg);
- connect(job, TQT_SIGNAL(messageRetrieved(KMMessage*)),
- this, TQT_SLOT(slotFilterMsg(KMMessage*)));
+ connect(job, TQ_SIGNAL(messageRetrieved(KMMessage*)),
+ this, TQ_SLOT(slotFilterMsg(KMMessage*)));
job->start();
} else {
if (slotFilterMsg(msg) == 2)
@@ -1518,8 +1518,8 @@ void KMHeaders::deleteMsg ()
finalizeMove( nextItem, contentX, contentY );
KMCommand *command = new KMDeleteMsgCommand( mFolder, msgList );
- connect( command, TQT_SIGNAL( completed( KMCommand * ) ),
- this, TQT_SLOT( slotMoveCompleted( KMCommand * ) ) );
+ connect( command, TQ_SIGNAL( completed( KMCommand * ) ),
+ this, TQ_SLOT( slotMoveCompleted( KMCommand * ) ) );
command->start();
BroadcastStatus::instance()->setStatusMsg("");
@@ -1540,8 +1540,8 @@ HeaderItem* KMHeaders::prepareMove( int *contentX, int *contentY )
HeaderItem *ret = 0;
emit maybeDeleting();
- disconnect( this, TQT_SIGNAL(currentChanged(TQListViewItem*)),
- this, TQT_SLOT(highlightMessage(TQListViewItem*)));
+ disconnect( this, TQ_SIGNAL(currentChanged(TQListViewItem*)),
+ this, TQ_SLOT(highlightMessage(TQListViewItem*)));
TQListViewItem *curItem;
HeaderItem *item;
@@ -1577,8 +1577,8 @@ void KMHeaders::finalizeMove( HeaderItem *item, int contentX, int contentY )
setContentsPos( contentX, contentY );
makeHeaderVisible();
- connect( this, TQT_SIGNAL(currentChanged(TQListViewItem*)),
- this, TQT_SLOT(highlightMessage(TQListViewItem*)));
+ connect( this, TQ_SIGNAL(currentChanged(TQListViewItem*)),
+ this, TQ_SLOT(highlightMessage(TQListViewItem*)));
}
@@ -1607,8 +1607,8 @@ void KMHeaders::moveMsgToFolder ( KMFolder* destFolder, bool askForConfirmation
finalizeMove( nextItem, contentX, contentY );
KMCommand *command = new KMMoveCommand( destFolder, msgList );
- connect( command, TQT_SIGNAL( completed( KMCommand * ) ),
- this, TQT_SLOT( slotMoveCompleted( KMCommand * ) ) );
+ connect( command, TQ_SIGNAL( completed( KMCommand * ) ),
+ this, TQ_SLOT( slotMoveCompleted( KMCommand * ) ) );
command->start();
}
@@ -1884,13 +1884,13 @@ void KMHeaders::incCurrentMessage()
TQListViewItem *lvi = currentItem();
if ( lvi && lvi->itemBelow() ) {
- disconnect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)),
- this,TQT_SLOT(highlightMessage(TQListViewItem*)));
+ disconnect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)),
+ this,TQ_SLOT(highlightMessage(TQListViewItem*)));
setCurrentItem( lvi->itemBelow() );
ensureCurrentItemVisible();
setFocus();
- connect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)),
- this,TQT_SLOT(highlightMessage(TQListViewItem*)));
+ connect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)),
+ this,TQ_SLOT(highlightMessage(TQListViewItem*)));
}
}
@@ -1901,13 +1901,13 @@ void KMHeaders::decCurrentMessage()
return;
TQListViewItem *lvi = currentItem();
if ( lvi && lvi->itemAbove() ) {
- disconnect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)),
- this,TQT_SLOT(highlightMessage(TQListViewItem*)));
+ disconnect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)),
+ this,TQ_SLOT(highlightMessage(TQListViewItem*)));
setCurrentItem( lvi->itemAbove() );
ensureCurrentItemVisible();
setFocus();
- connect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)),
- this,TQT_SLOT(highlightMessage(TQListViewItem*)));
+ connect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)),
+ this,TQ_SLOT(highlightMessage(TQListViewItem*)));
}
}
@@ -2159,7 +2159,7 @@ void KMHeaders::resetCurrentTime()
mDate.reset();
// only reset exactly during minute switch
TQTimer::singleShot( ( 60-TQTime::currentTime().second() ) * 1000,
- this, TQT_SLOT( resetCurrentTime() ) );
+ this, TQ_SLOT( resetCurrentTime() ) );
}
//-----------------------------------------------------------------------------
@@ -2240,8 +2240,8 @@ void KMHeaders::keyPressEvent( TQKeyEvent * e )
if (cntrl) {
if (!shft)
- disconnect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)),
- this,TQT_SLOT(highlightMessage(TQListViewItem*)));
+ disconnect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)),
+ this,TQ_SLOT(highlightMessage(TQListViewItem*)));
switch (e->key()) {
case Key_Down:
case Key_Up:
@@ -2253,8 +2253,8 @@ void KMHeaders::keyPressEvent( TQKeyEvent * e )
TDEListView::keyPressEvent( e );
}
if (!shft)
- connect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)),
- this,TQT_SLOT(highlightMessage(TQListViewItem*)));
+ connect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)),
+ this,TQ_SLOT(highlightMessage(TQListViewItem*)));
}
}
@@ -2332,12 +2332,12 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e)
if ( e->state() & ControlButton )
setSelected( lvi, !wasSelected );
- if ((e->button() == Qt::LeftButton) )
+ if ((e->button() == TQt::LeftButton) )
mMousePressed = true;
}
// check if we are on a status column and toggle it
- if ( lvi && e->button() == Qt::LeftButton && !( e->state() & (ShiftButton | ControlButton | AltButton | MetaButton) ) ) {
+ if ( lvi && e->button() == TQt::LeftButton && !( e->state() & (ShiftButton | ControlButton | AltButton | MetaButton) ) ) {
bool flagsToggleable = GlobalSettings::self()->allowLocalFlags() || !(mFolder ? mFolder->isReadOnly() : true);
int section = header()->sectionAt( e->pos().x() );
HeaderItem *item = static_cast<HeaderItem*>( lvi );
@@ -2365,7 +2365,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e)
//-----------------------------------------------------------------------------
void KMHeaders::contentsMouseReleaseEvent(TQMouseEvent* e)
{
- if (e->button() != Qt::RightButton)
+ if (e->button() != TQt::RightButton)
TDEListView::contentsMouseReleaseEvent(e);
mMousePressed = false;
@@ -2464,7 +2464,7 @@ void KMHeaders::slotRMB()
menu->insertSeparator();
TQPopupMenu *msgCopyMenu = new TQPopupMenu(menu);
- mOwner->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, TQT_TQOBJECT(this),
+ mOwner->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, this,
&mMenuToFolder, msgCopyMenu );
menu->insertItem(i18n("&Copy To"), msgCopyMenu);
@@ -2473,7 +2473,7 @@ void KMHeaders::slotRMB()
menu->setItemEnabled( id, false );
} else {
TQPopupMenu *msgMoveMenu = new TQPopupMenu(menu);
- mOwner->folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, TQT_TQOBJECT(this),
+ mOwner->folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, this,
&mMenuToFolder, msgMoveMenu );
menu->insertItem(i18n("&Move To"), msgMoveMenu);
}
@@ -2623,7 +2623,7 @@ void KMHeaders::setSorting( int column, bool ascending )
// if (column != mSortCol)
// setColumnText( mSortCol, TQIconSet( TQPixmap()), columnText( mSortCol ));
if(mSortInfo.dirty || column != mSortInfo.column || ascending != mSortInfo.ascending) { //dirtied
- TQObject::disconnect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int)));
+ TQObject::disconnect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(dirtySortOrder(int)));
mSortInfo.dirty = true;
}
@@ -2865,7 +2865,7 @@ void KMHeaders::appendItemToSortFile(HeaderItem *khi)
void KMHeaders::dirtySortOrder(int column)
{
mSortInfo.dirty = true;
- TQObject::disconnect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int)));
+ TQObject::disconnect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(dirtySortOrder(int)));
setSorting(column, mSortInfo.column == column ? !mSortInfo.ascending : true);
}
@@ -3109,7 +3109,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
//Hackyness to work around qlistview problems
TDEListView::setSorting(-1);
header()->setSortIndicator(column, ascending);
- TQObject::connect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int)));
+ TQObject::connect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(dirtySortOrder(int)));
//setup mSortInfo here now, as above may change it
mSortInfo.dirty = false;
mSortInfo.column = (short)column;
@@ -3556,7 +3556,7 @@ void KMHeaders::cutMessages()
void KMHeaders::pasteMessages()
{
- new MessageCopyHelper( mCopiedMessages, folder(), mMoveMessages, TQT_TQOBJECT(this) );
+ new MessageCopyHelper( mCopiedMessages, folder(), mMoveMessages, this );
if ( mMoveMessages ) {
mCopiedMessages.clear();
updateActions();
diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h
index 112b1cde..ab3abf09 100644
--- a/kmail/kmheaders.h
+++ b/kmail/kmheaders.h
@@ -45,7 +45,7 @@ enum NestingPolicy { AlwaysOpen = 0, DefaultOpen, DefaultClosed, OpenUnread };
/** The widget that shows the contents of folders */
class KMHeaders : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
friend class ::KMail::HeaderItem; // For easy access to the pixmaps
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index cfb28ab2..0f1d34ed 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -173,8 +173,8 @@ KMKernel::KMKernel (TQObject *parent, const char *name) :
#ifdef __TDE_HAVE_TDEHWLIB
mNetworkManager = TDEGlobal::networkManager();
if (mNetworkManager) {
- connect( mNetworkManager, TQT_SIGNAL( networkDeviceStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ),
- this, TQT_SLOT( slotNetworkStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ) );
+ connect( mNetworkManager, TQ_SIGNAL( networkDeviceStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ),
+ this, TQ_SLOT( slotNetworkStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ) );
if (networkStateConnected()) {
resumeNetworkJobs();
}
@@ -1582,17 +1582,17 @@ void KMKernel::init()
the_weaverLogger->attach (the_weaver);
//#endif
- connect( the_folderMgr, TQT_SIGNAL( folderRemoved(KMFolder*) ),
- this, TQT_SIGNAL( folderRemoved(KMFolder*) ) );
- connect( the_dimapFolderMgr, TQT_SIGNAL( folderRemoved(KMFolder*) ),
- this, TQT_SIGNAL( folderRemoved(KMFolder*) ) );
- connect( the_imapFolderMgr, TQT_SIGNAL( folderRemoved(KMFolder*) ),
- this, TQT_SIGNAL( folderRemoved(KMFolder*) ) );
- connect( the_searchFolderMgr, TQT_SIGNAL( folderRemoved(KMFolder*) ),
- this, TQT_SIGNAL( folderRemoved(KMFolder*) ) );
+ connect( the_folderMgr, TQ_SIGNAL( folderRemoved(KMFolder*) ),
+ this, TQ_SIGNAL( folderRemoved(KMFolder*) ) );
+ connect( the_dimapFolderMgr, TQ_SIGNAL( folderRemoved(KMFolder*) ),
+ this, TQ_SIGNAL( folderRemoved(KMFolder*) ) );
+ connect( the_imapFolderMgr, TQ_SIGNAL( folderRemoved(KMFolder*) ),
+ this, TQ_SIGNAL( folderRemoved(KMFolder*) ) );
+ connect( the_searchFolderMgr, TQ_SIGNAL( folderRemoved(KMFolder*) ),
+ this, TQ_SIGNAL( folderRemoved(KMFolder*) ) );
mBackgroundTasksTimer = new TQTimer( this, "mBackgroundTasksTimer" );
- connect( mBackgroundTasksTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRunBackgroundTasks() ) );
+ connect( mBackgroundTasksTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotRunBackgroundTasks() ) );
#ifdef DEBUG_SCHEDULER // for debugging, see jobscheduler.h
mBackgroundTasksTimer->start( 10000, true ); // 10s, singleshot
#else
@@ -1982,7 +1982,7 @@ void KMKernel::dumpDeadLetters()
return;
for ( TQPtrListIterator<TDEMainWindow> it(*TDEMainWindow::memberList) ; it.current() != 0; ++it ) {
- if ( KMail::Composer * win = ::tqqt_cast<KMail::Composer*>( it.current() ) ) {
+ if ( KMail::Composer * win = ::tqt_cast<KMail::Composer*>( it.current() ) ) {
win->autoSaveMessage();
// saving the message has to be finished right here, we are called from a dtor,
// therefore we have no chance to finish this later
@@ -2020,10 +2020,10 @@ void KMKernel::byteArrayToRemoteFile(const TQByteArray &aData, const KURL &aURL,
TDEIO::Job *job = TDEIO::put(aURL, -1, overwrite, false);
putData pd; pd.url = aURL; pd.data = aData; pd.offset = 0;
mPutJobs.insert(job, pd);
- connect(job, TQT_SIGNAL(dataReq(TDEIO::Job*,TQByteArray&)),
- TQT_SLOT(slotDataReq(TDEIO::Job*,TQByteArray&)));
- connect(job, TQT_SIGNAL(result(TDEIO::Job*)),
- TQT_SLOT(slotResult(TDEIO::Job*)));
+ connect(job, TQ_SIGNAL(dataReq(TDEIO::Job*,TQByteArray&)),
+ TQ_SLOT(slotDataReq(TDEIO::Job*,TQByteArray&)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job*)),
+ TQ_SLOT(slotResult(TDEIO::Job*)));
}
void KMKernel::slotDataReq(TDEIO::Job *job, TQByteArray &data)
@@ -2079,8 +2079,8 @@ void KMKernel::slotShowConfigurationDialog()
{
if( !mConfigureDialog ) {
mConfigureDialog = new ConfigureDialog( 0, "configure", false );
- connect( mConfigureDialog, TQT_SIGNAL( configChanged() ),
- this, TQT_SLOT( slotConfigChanged() ) );
+ connect( mConfigureDialog, TQ_SIGNAL( configChanged() ),
+ this, TQ_SLOT( slotConfigChanged() ) );
}
if( KMKernel::getKMMainWidget() == 0 )
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index b8055340..20d3633b 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -90,7 +90,7 @@ class ConfigureDialog;
*/
class KDE_EXPORT KMKernel : public TQObject, virtual public KMailIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp
index 45585147..92cc4f7f 100644
--- a/kmail/kmlineeditspell.cpp
+++ b/kmail/kmlineeditspell.cpp
@@ -156,7 +156,7 @@ TQPopupMenu *KMLineEdit::createPopupMenu()
menu->insertSeparator();
menu->insertItem( i18n( "Edit Recent Addresses..." ),
- this, TQT_SLOT( editRecentAddresses() ) );
+ this, TQ_SLOT( editRecentAddresses() ) );
return menu;
}
diff --git a/kmail/kmlineeditspell.h b/kmail/kmlineeditspell.h
index 06bfce5e..98b8ba76 100644
--- a/kmail/kmlineeditspell.h
+++ b/kmail/kmlineeditspell.h
@@ -11,7 +11,7 @@ class TQPopupMenu;
class KMLineEdit : public KPIM::AddresseeLineEdit
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMLineEdit(bool useCompletion, TQWidget *parent = 0,
@@ -40,7 +40,7 @@ private:
class KMLineEditSpell : public KMLineEdit
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMLineEditSpell(bool useCompletion, TQWidget *parent = 0,
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index d5ba1f31..bdae84d2 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -203,41 +203,41 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name,
activatePanners();
- TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowStartupFolder() ));
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotShowStartupFolder() ));
- connect( kmkernel->acctMgr(), TQT_SIGNAL( checkedMail( bool, bool, const TQMap<TQString, int> & ) ),
- this, TQT_SLOT( slotMailChecked( bool, bool, const TQMap<TQString, int> & ) ) );
+ connect( kmkernel->acctMgr(), TQ_SIGNAL( checkedMail( bool, bool, const TQMap<TQString, int> & ) ),
+ this, TQ_SLOT( slotMailChecked( bool, bool, const TQMap<TQString, int> & ) ) );
- connect( kmkernel->acctMgr(), TQT_SIGNAL( accountAdded( KMAccount* ) ),
- this, TQT_SLOT( initializeIMAPActions() ) );
- connect( kmkernel->acctMgr(), TQT_SIGNAL( accountRemoved( KMAccount* ) ),
- this, TQT_SLOT( initializeIMAPActions() ) );
+ connect( kmkernel->acctMgr(), TQ_SIGNAL( accountAdded( KMAccount* ) ),
+ this, TQ_SLOT( initializeIMAPActions() ) );
+ connect( kmkernel->acctMgr(), TQ_SIGNAL( accountRemoved( KMAccount* ) ),
+ this, TQ_SLOT( initializeIMAPActions() ) );
- connect(kmkernel, TQT_SIGNAL( configChanged() ),
- this, TQT_SLOT( slotConfigChanged() ));
+ connect(kmkernel, TQ_SIGNAL( configChanged() ),
+ this, TQ_SLOT( slotConfigChanged() ));
// display the full path to the folder in the caption
- connect(mFolderTree, TQT_SIGNAL(currentChanged(TQListViewItem*)),
- this, TQT_SLOT(slotChangeCaption(TQListViewItem*)));
- connect(mFolderTree, TQT_SIGNAL(selectionChanged()),
- TQT_SLOT(updateFolderMenu()) );
- connect( mFolderTree, TQT_SIGNAL(syncStateChanged()),
- TQT_SLOT(updateFolderMenu()) );
+ connect(mFolderTree, TQ_SIGNAL(currentChanged(TQListViewItem*)),
+ this, TQ_SLOT(slotChangeCaption(TQListViewItem*)));
+ connect(mFolderTree, TQ_SIGNAL(selectionChanged()),
+ TQ_SLOT(updateFolderMenu()) );
+ connect( mFolderTree, TQ_SIGNAL(syncStateChanged()),
+ TQ_SLOT(updateFolderMenu()) );
- connect(kmkernel->folderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)),
- this, TQT_SLOT(slotFolderRemoved(KMFolder*)));
+ connect(kmkernel->folderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)),
+ this, TQ_SLOT(slotFolderRemoved(KMFolder*)));
- connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)),
- this, TQT_SLOT(slotFolderRemoved(KMFolder*)));
+ connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)),
+ this, TQ_SLOT(slotFolderRemoved(KMFolder*)));
- connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)),
- this, TQT_SLOT(slotFolderRemoved(KMFolder*)));
+ connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)),
+ this, TQ_SLOT(slotFolderRemoved(KMFolder*)));
- connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)),
- this, TQT_SLOT(slotFolderRemoved(KMFolder*)));
+ connect(kmkernel->searchFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)),
+ this, TQ_SLOT(slotFolderRemoved(KMFolder*)));
- connect( kmkernel, TQT_SIGNAL( onlineStatusChanged( GlobalSettings::EnumNetworkState::type ) ),
- this, TQT_SLOT( slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type ) ) );
+ connect( kmkernel, TQ_SIGNAL( onlineStatusChanged( GlobalSettings::EnumNetworkState::type ) ),
+ this, TQ_SLOT( slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type ) ) );
toggleSystemTray();
@@ -249,9 +249,9 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name,
KStatusBar *sb = mainWin ? mainWin->statusBar() : 0;
mVacationScriptIndicator = new KStatusBarLabel( TQString(), 0, sb );
mVacationScriptIndicator->hide();
- connect( mVacationScriptIndicator, TQT_SIGNAL(itemReleased(int)), TQT_SLOT(slotEditVacation()) );
+ connect( mVacationScriptIndicator, TQ_SIGNAL(itemReleased(int)), TQ_SLOT(slotEditVacation()) );
if ( GlobalSettings::checkOutOfOfficeOnStartup() )
- TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotCheckVacation()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(slotCheckVacation()) );
}
@@ -468,7 +468,7 @@ void KMMainWidget::readConfig(void)
bool check = config->readBoolEntry("checkmail-startup", false);
if (check)
// do it after building the kmmainwin, so that the progressdialog is available
- TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotCheckMail() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotCheckMail() ) );
}
}
@@ -558,9 +558,9 @@ void KMMainWidget::createWidgets(void)
if ( mLongFolderList ) {
// superior splitter: folder tree vs. rest
// inferior splitter: headers vs. message vs. mime tree
- mPanner1 = new TQSplitter( Qt::Horizontal, this, "panner 1" );
+ mPanner1 = new TQSplitter( TQt::Horizontal, this, "panner 1" );
mPanner1->setOpaqueResize( opaqueResize );
- Qt::Orientation orientation = mReaderWindowBelow ? Qt::Vertical : Qt::Horizontal;
+ TQt::Orientation orientation = mReaderWindowBelow ? TQt::Vertical : TQt::Horizontal;
mPanner2 = new TQSplitter( orientation, mPanner1, "panner 2" );
mPanner2->setOpaqueResize( opaqueResize );
mPanner2->setChildrenCollapsible( false );
@@ -569,10 +569,10 @@ void KMMainWidget::createWidgets(void)
} else /* !mLongFolderList */ {
// superior splitter: ( folder tree + headers ) vs. message vs. mime
// inferior splitter: folder tree vs. headers
- mPanner1 = new TQSplitter( Qt::Vertical, this, "panner 1" );
+ mPanner1 = new TQSplitter( TQt::Vertical, this, "panner 1" );
mPanner1->setOpaqueResize( opaqueResize );
mPanner1->setChildrenCollapsible( false );
- mPanner2 = new TQSplitter( Qt::Horizontal, mPanner1, "panner 2" );
+ mPanner2 = new TQSplitter( TQt::Horizontal, mPanner1, "panner 2" );
mPanner2->setOpaqueResize( opaqueResize );
headerParent = mFolderViewParent = mPanner2;
mimeParent = messageParent = mPanner1;
@@ -609,78 +609,78 @@ void KMMainWidget::createWidgets(void)
actionCollection(), "headers quick search line" );
#endif
label->setBuddy( mQuickSearchLine );
- connect( mQuickSearchLine, TQT_SIGNAL( requestFullSearch() ),
- this, TQT_SLOT( slotRequestFullSearchFromQuickSearch() ) );
+ connect( mQuickSearchLine, TQ_SIGNAL( requestFullSearch() ),
+ this, TQ_SLOT( slotRequestFullSearchFromQuickSearch() ) );
mSearchToolBar->setStretchableWidget( mQuickSearchLine );
- connect( mHeaders, TQT_SIGNAL( messageListUpdated() ),
- mQuickSearchLine, TQT_SLOT( updateSearch() ) );
+ connect( mHeaders, TQ_SIGNAL( messageListUpdated() ),
+ mQuickSearchLine, TQ_SLOT( updateSearch() ) );
if ( !GlobalSettings::self()->quickSearchActive() ) mSearchToolBar->hide();
if (mReaderWindowActive) {
- connect(mHeaders, TQT_SIGNAL(selected(KMMessage*)),
- this, TQT_SLOT(slotMsgSelected(KMMessage*)));
+ connect(mHeaders, TQ_SIGNAL(selected(KMMessage*)),
+ this, TQ_SLOT(slotMsgSelected(KMMessage*)));
}
- connect(mHeaders, TQT_SIGNAL(activated(KMMessage*)),
- this, TQT_SLOT(slotMsgActivated(KMMessage*)));
- connect( mHeaders, TQT_SIGNAL( selectionChanged() ),
- TQT_SLOT( startUpdateMessageActionsTimer() ) );
+ connect(mHeaders, TQ_SIGNAL(activated(KMMessage*)),
+ this, TQ_SLOT(slotMsgActivated(KMMessage*)));
+ connect( mHeaders, TQ_SIGNAL( selectionChanged() ),
+ TQ_SLOT( startUpdateMessageActionsTimer() ) );
TQAccel *accel = actionCollection()->tdeaccel();
accel->connectItem(accel->insertItem(SHIFT+Key_Left),
- mHeaders, TQT_SLOT(selectPrevMessage()));
+ mHeaders, TQ_SLOT(selectPrevMessage()));
accel->connectItem(accel->insertItem(SHIFT+Key_Right),
- mHeaders, TQT_SLOT(selectNextMessage()));
+ mHeaders, TQ_SLOT(selectNextMessage()));
if (mReaderWindowActive) {
- mMsgView = new KMReaderWin(messageParent, TQT_TQWIDGET(this), actionCollection(), 0 );
+ mMsgView = new KMReaderWin(messageParent, this, actionCollection(), 0 );
if ( mMsgActions ) {
mMsgActions->setMessageView( mMsgView );
}
- connect(mMsgView, TQT_SIGNAL(replaceMsgByUnencryptedVersion()),
- this, TQT_SLOT(slotReplaceMsgByUnencryptedVersion()));
- connect(mMsgView, TQT_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)),
- this, TQT_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&)));
- connect(mMsgView, TQT_SIGNAL(urlClicked(const KURL&,int)),
- mMsgView, TQT_SLOT(slotUrlClicked()));
- connect(mHeaders, TQT_SIGNAL(maybeDeleting()),
- mMsgView, TQT_SLOT(clearCache()));
- connect(mMsgView, TQT_SIGNAL(noDrag()),
- mHeaders, TQT_SLOT(slotNoDrag()));
+ connect(mMsgView, TQ_SIGNAL(replaceMsgByUnencryptedVersion()),
+ this, TQ_SLOT(slotReplaceMsgByUnencryptedVersion()));
+ connect(mMsgView, TQ_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)),
+ this, TQ_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&)));
+ connect(mMsgView, TQ_SIGNAL(urlClicked(const KURL&,int)),
+ mMsgView, TQ_SLOT(slotUrlClicked()));
+ connect(mHeaders, TQ_SIGNAL(maybeDeleting()),
+ mMsgView, TQ_SLOT(clearCache()));
+ connect(mMsgView, TQ_SIGNAL(noDrag()),
+ mHeaders, TQ_SLOT(slotNoDrag()));
accel->connectItem(accel->insertItem(Key_Up),
- mMsgView, TQT_SLOT(slotScrollUp()));
+ mMsgView, TQ_SLOT(slotScrollUp()));
accel->connectItem(accel->insertItem(Key_Down),
- mMsgView, TQT_SLOT(slotScrollDown()));
+ mMsgView, TQ_SLOT(slotScrollDown()));
accel->connectItem(accel->insertItem(Key_Prior),
- mMsgView, TQT_SLOT(slotScrollPrior()));
+ mMsgView, TQ_SLOT(slotScrollPrior()));
accel->connectItem(accel->insertItem(Key_Next),
- mMsgView, TQT_SLOT(slotScrollNext()));
+ mMsgView, TQ_SLOT(slotScrollNext()));
} else {
mMsgView = NULL;
}
TDEAction *action;
- mMoveMsgToFolderAction = new TDEAction( i18n("Move Message to Folder"), Key_M, TQT_TQOBJECT(this),
- TQT_SLOT(slotMoveMsg()), actionCollection(),
+ mMoveMsgToFolderAction = new TDEAction( i18n("Move Message to Folder"), Key_M, this,
+ TQ_SLOT(slotMoveMsg()), actionCollection(),
"move_message_to_folder" );
mMoveMsgToFolderAction->plugAccel( actionCollection()->tdeaccel() );
- action = new TDEAction( i18n("Copy Message to Folder"), Key_C, TQT_TQOBJECT(this),
- TQT_SLOT(slotCopyMsg()), actionCollection(),
+ action = new TDEAction( i18n("Copy Message to Folder"), Key_C, this,
+ TQ_SLOT(slotCopyMsg()), actionCollection(),
"copy_message_to_folder" );
action->plugAccel( actionCollection()->tdeaccel() );
- action = new TDEAction( i18n("Jump to Folder"), Key_J, TQT_TQOBJECT(this),
- TQT_SLOT(slotJumpToFolder()), actionCollection(),
+ action = new TDEAction( i18n("Jump to Folder"), Key_J, this,
+ TQ_SLOT(slotJumpToFolder()), actionCollection(),
"jump_to_folder" );
action->plugAccel( actionCollection()->tdeaccel() );
// create list of folders
- mFolderViewSplitter = new TQSplitter( Qt::Vertical, mFolderViewParent );
+ mFolderViewSplitter = new TQSplitter( TQt::Vertical, mFolderViewParent );
mFolderViewSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
mFavoriteFolderView = new KMail::FavoriteFolderView( this, mFolderViewSplitter );
if ( mFavoritesCheckMailAction )
- connect( mFavoritesCheckMailAction, TQT_SIGNAL(activated()), mFavoriteFolderView, TQT_SLOT(checkMail()) );
+ connect( mFavoritesCheckMailAction, TQ_SIGNAL(activated()), mFavoriteFolderView, TQ_SLOT(checkMail()) );
TQWidget *folderTreeParent = mFolderViewParent;
if ( GlobalSettings::enableFavoriteFolderView() ) {
folderTreeParent = mFolderViewSplitter;
@@ -690,72 +690,72 @@ void KMMainWidget::createWidgets(void)
if ( !GlobalSettings::enableFavoriteFolderView() ) {
mFolderView = mFolderTree;
}
- connect( mFolderTree, TQT_SIGNAL(folderSelected(KMFolder*)),
- mFavoriteFolderView, TQT_SLOT(folderTreeSelectionChanged(KMFolder*)) );
-
- connect(mFolderTree, TQT_SIGNAL(folderSelected(KMFolder*)),
- this, TQT_SLOT(folderSelected(KMFolder*)));
- connect( mFolderTree, TQT_SIGNAL( folderSelected( KMFolder* ) ),
- mQuickSearchLine, TQT_SLOT( reset() ) );
- connect(mFolderTree, TQT_SIGNAL(folderSelectedUnread(KMFolder*)),
- this, TQT_SLOT(folderSelectedUnread(KMFolder*)));
- connect(mFolderTree, TQT_SIGNAL(folderDrop(KMFolder*)),
- this, TQT_SLOT(slotMoveMsgToFolder(KMFolder*)));
- connect(mFolderTree, TQT_SIGNAL(folderDropCopy(KMFolder*)),
- this, TQT_SLOT(slotCopyMsgToFolder(KMFolder*)));
- connect(mFolderTree, TQT_SIGNAL(columnsChanged()),
- this, TQT_SLOT(slotFolderTreeColumnsChanged()));
+ connect( mFolderTree, TQ_SIGNAL(folderSelected(KMFolder*)),
+ mFavoriteFolderView, TQ_SLOT(folderTreeSelectionChanged(KMFolder*)) );
+
+ connect(mFolderTree, TQ_SIGNAL(folderSelected(KMFolder*)),
+ this, TQ_SLOT(folderSelected(KMFolder*)));
+ connect( mFolderTree, TQ_SIGNAL( folderSelected( KMFolder* ) ),
+ mQuickSearchLine, TQ_SLOT( reset() ) );
+ connect(mFolderTree, TQ_SIGNAL(folderSelectedUnread(KMFolder*)),
+ this, TQ_SLOT(folderSelectedUnread(KMFolder*)));
+ connect(mFolderTree, TQ_SIGNAL(folderDrop(KMFolder*)),
+ this, TQ_SLOT(slotMoveMsgToFolder(KMFolder*)));
+ connect(mFolderTree, TQ_SIGNAL(folderDropCopy(KMFolder*)),
+ this, TQ_SLOT(slotCopyMsgToFolder(KMFolder*)));
+ connect(mFolderTree, TQ_SIGNAL(columnsChanged()),
+ this, TQ_SLOT(slotFolderTreeColumnsChanged()));
if ( mFavoriteFolderView ) {
- connect( mFavoriteFolderView, TQT_SIGNAL(folderDrop(KMFolder*)), TQT_SLOT(slotMoveMsgToFolder(KMFolder*)) );
- connect( mFavoriteFolderView, TQT_SIGNAL(folderDropCopy(KMFolder*)), TQT_SLOT(slotCopyMsgToFolder(KMFolder*)) );
+ connect( mFavoriteFolderView, TQ_SIGNAL(folderDrop(KMFolder*)), TQ_SLOT(slotMoveMsgToFolder(KMFolder*)) );
+ connect( mFavoriteFolderView, TQ_SIGNAL(folderDropCopy(KMFolder*)), TQ_SLOT(slotCopyMsgToFolder(KMFolder*)) );
}
//Commands not worthy of menu items, but that deserve configurable keybindings
mRemoveDuplicatesAction = new TDEAction(
- i18n("Remove Duplicate Messages"), CTRL+Key_Asterisk, TQT_TQOBJECT(this),
- TQT_SLOT(removeDuplicates()), actionCollection(), "remove_duplicate_messages");
+ i18n("Remove Duplicate Messages"), CTRL+Key_Asterisk, this,
+ TQ_SLOT(removeDuplicates()), actionCollection(), "remove_duplicate_messages");
action->plugAccel( actionCollection()->tdeaccel() );
action = new TDEAction(
i18n("Abort Current Operation"), Key_Escape, ProgressManager::instance(),
- TQT_SLOT(slotAbortAll()), actionCollection(), "cancel" );
+ TQ_SLOT(slotAbortAll()), actionCollection(), "cancel" );
action->plugAccel( actionCollection()->tdeaccel() );
action = new TDEAction(
- i18n("Focus on Next Folder"), CTRL+Key_Right, TQT_TQOBJECT(mFolderTree),
- TQT_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder");
+ i18n("Focus on Next Folder"), CTRL+Key_Right, mFolderTree,
+ TQ_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder");
action->plugAccel( actionCollection()->tdeaccel() );
action = new TDEAction(
- i18n("Focus on Previous Folder"), CTRL+Key_Left, TQT_TQOBJECT(mFolderTree),
- TQT_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder");
+ i18n("Focus on Previous Folder"), CTRL+Key_Left, mFolderTree,
+ TQ_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder");
action->plugAccel( actionCollection()->tdeaccel() );
action = new TDEAction(
- i18n("Select Folder with Focus"), CTRL+Key_Space, TQT_TQOBJECT(mFolderTree),
- TQT_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder");
+ i18n("Select Folder with Focus"), CTRL+Key_Space, mFolderTree,
+ TQ_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder");
action->plugAccel( actionCollection()->tdeaccel() );
action = new TDEAction(
- i18n("Focus on Next Message"), ALT+Key_Right, TQT_TQOBJECT(mHeaders),
- TQT_SLOT(incCurrentMessage()), actionCollection(), "inc_current_message");
+ i18n("Focus on Next Message"), ALT+Key_Right, mHeaders,
+ TQ_SLOT(incCurrentMessage()), actionCollection(), "inc_current_message");
action->plugAccel( actionCollection()->tdeaccel() );
action = new TDEAction(
- i18n("Focus on Previous Message"), ALT+Key_Left, TQT_TQOBJECT(mHeaders),
- TQT_SLOT(decCurrentMessage()), actionCollection(), "dec_current_message");
+ i18n("Focus on Previous Message"), ALT+Key_Left, mHeaders,
+ TQ_SLOT(decCurrentMessage()), actionCollection(), "dec_current_message");
action->plugAccel( actionCollection()->tdeaccel() );
action = new TDEAction(
- i18n("Select Message with Focus"), ALT+Key_Space, TQT_TQOBJECT(mHeaders),
- TQT_SLOT( selectCurrentMessage() ), actionCollection(), "select_current_message");
+ i18n("Select Message with Focus"), ALT+Key_Space, mHeaders,
+ TQ_SLOT( selectCurrentMessage() ), actionCollection(), "select_current_message");
action->plugAccel( actionCollection()->tdeaccel() );
- connect( kmkernel->outboxFolder(), TQT_SIGNAL( msgRemoved(int, TQString) ),
- TQT_SLOT( startUpdateMessageActionsTimer() ) );
- connect( kmkernel->outboxFolder(), TQT_SIGNAL( msgAdded(int) ),
- TQT_SLOT( startUpdateMessageActionsTimer() ) );
+ connect( kmkernel->outboxFolder(), TQ_SIGNAL( msgRemoved(int, TQString) ),
+ TQ_SLOT( startUpdateMessageActionsTimer() ) );
+ connect( kmkernel->outboxFolder(), TQ_SIGNAL( msgAdded(int) ),
+ TQ_SLOT( startUpdateMessageActionsTimer() ) );
}
@@ -764,8 +764,8 @@ void KMMainWidget::activatePanners(void)
{
if (mMsgView) {
TQObject::disconnect( mMsgView->copyAction(),
- TQT_SIGNAL( activated() ),
- mMsgView, TQT_SLOT( slotCopySelectedText() ));
+ TQ_SIGNAL( activated() ),
+ mMsgView, TQ_SLOT( slotCopySelectedText() ));
}
setupFolderView();
@@ -800,8 +800,8 @@ void KMMainWidget::activatePanners(void)
if (mMsgView) {
TQObject::connect( mMsgView->copyAction(),
- TQT_SIGNAL( activated() ),
- mMsgView, TQT_SLOT( slotCopySelectedText() ));
+ TQ_SIGNAL( activated() ),
+ mMsgView, TQ_SLOT( slotCopySelectedText() ));
}
}
@@ -825,8 +825,8 @@ void KMMainWidget::slotSearch()
if(!mSearchWin)
{
mSearchWin = new SearchWindow(this, "Search", mFolder, false);
- connect(mSearchWin, TQT_SIGNAL(destroyed()),
- this, TQT_SLOT(slotSearchClosed()));
+ connect(mSearchWin, TQ_SIGNAL(destroyed()),
+ this, TQ_SLOT(slotSearchClosed()));
}
else
{
@@ -1386,7 +1386,7 @@ void KMMainWidget::slotOverrideHtmlLoadExt()
}
mFolderHtmlLoadExtPref = !mFolderHtmlLoadExtPref;
if (mMsgView) {
- mMsgView->setHtmlLoadExtOverride(mFolderHtmlLoadExtPref);
+ mMsgView->setHtmlLoadExtDefault(mFolderHtmlLoadExtPref);
mMsgView->update( true );
}
}
@@ -1716,8 +1716,8 @@ void KMMainWidget::slotCheckVacation()
if ( !kmkernel->askToGoOnline() )
return;
- Vacation *vac = new Vacation( TQT_TQOBJECT(this), true /* check only */ );
- connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) );
+ Vacation *vac = new Vacation( this, true /* check only */ );
+ connect( vac, TQ_SIGNAL(scriptActive(bool)), TQ_SLOT(updateVactionScripStatus(bool)) );
}
void KMMainWidget::slotEditVacation()
@@ -1729,10 +1729,10 @@ void KMMainWidget::slotEditVacation()
if ( mVacation )
return;
- mVacation = new Vacation( TQT_TQOBJECT(this) );
- connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) );
+ mVacation = new Vacation( this );
+ connect( mVacation, TQ_SIGNAL(scriptActive(bool)), TQ_SLOT(updateVactionScripStatus(bool)) );
if ( mVacation->isUsable() ) {
- connect( mVacation, TQT_SIGNAL(result(bool)), mVacation, TQT_SLOT(deleteLater()) );
+ connect( mVacation, TQ_SIGNAL(result(bool)), mVacation, TQ_SLOT(deleteLater()) );
} else {
TQString msg = i18n("KMail's Out of Office Reply functionality relies on "
"server-side filtering. You have not yet configured an "
@@ -1838,7 +1838,7 @@ void KMMainWidget::slotPrintMsg()
//-----------------------------------------------------------------------------
void KMMainWidget::setupForwardActions()
{
- disconnect( mForwardActionMenu, TQT_SIGNAL( activated() ), 0, 0 );
+ disconnect( mForwardActionMenu, TQ_SIGNAL( activated() ), 0, 0 );
mForwardActionMenu->remove( mForwardInlineAction );
mForwardActionMenu->remove( mForwardAttachedAction );
@@ -1847,16 +1847,16 @@ void KMMainWidget::setupForwardActions()
mForwardActionMenu->insert( mForwardAttachedAction, 1 );
mForwardInlineAction->setShortcut( Key_F );
mForwardAttachedAction->setShortcut( SHIFT+Key_F );
- connect( mForwardActionMenu, TQT_SIGNAL(activated()), TQT_TQOBJECT(this),
- TQT_SLOT(slotForwardInlineMsg()) );
+ connect( mForwardActionMenu, TQ_SIGNAL(activated()), this,
+ TQ_SLOT(slotForwardInlineMsg()) );
} else {
mForwardActionMenu->insert( mForwardAttachedAction, 0 );
mForwardActionMenu->insert( mForwardInlineAction, 1 );
mForwardInlineAction->setShortcut( SHIFT+Key_F );
mForwardAttachedAction->setShortcut( Key_F );
- connect( mForwardActionMenu, TQT_SIGNAL(activated()), TQT_TQOBJECT(this),
- TQT_SLOT(slotForwardAttachedMsg()) );
+ connect( mForwardActionMenu, TQ_SIGNAL(activated()), this,
+ TQ_SLOT(slotForwardAttachedMsg()) );
}
}
@@ -2025,14 +2025,14 @@ void KMMainWidget::folderSelected( KMFolder* aFolder, bool forceJumpToUnread )
if ( newFolder )
writeFolderConfig();
if ( mFolder ) {
- disconnect( mFolder, TQT_SIGNAL( changed() ),
- this, TQT_SLOT( updateMarkAsReadAction() ) );
- disconnect( mFolder, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ),
- this, TQT_SLOT( updateMarkAsReadAction() ) );
- disconnect( mFolder, TQT_SIGNAL( msgAdded( int ) ),
- this, TQT_SLOT( updateMarkAsReadAction() ) );
- disconnect( mFolder, TQT_SIGNAL( msgRemoved( KMFolder * ) ),
- this, TQT_SLOT( updateMarkAsReadAction() ) );
+ disconnect( mFolder, TQ_SIGNAL( changed() ),
+ this, TQ_SLOT( updateMarkAsReadAction() ) );
+ disconnect( mFolder, TQ_SIGNAL( msgHeaderChanged( KMFolder*, int ) ),
+ this, TQ_SLOT( updateMarkAsReadAction() ) );
+ disconnect( mFolder, TQ_SIGNAL( msgAdded( int ) ),
+ this, TQ_SLOT( updateMarkAsReadAction() ) );
+ disconnect( mFolder, TQ_SIGNAL( msgRemoved( KMFolder * ) ),
+ this, TQ_SLOT( updateMarkAsReadAction() ) );
}
mFolder = aFolder;
@@ -2049,8 +2049,8 @@ void KMMainWidget::folderSelected( KMFolder* aFolder, bool forceJumpToUnread )
imap->open("mainwidget"); // will be closed in the folderSelected slot
// first get new headers before we select the folder
imap->setSelected( true );
- connect( imap, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ),
- this, TQT_SLOT( folderSelected() ) );
+ connect( imap, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ),
+ this, TQ_SLOT( folderSelected() ) );
imap->getAndCheckFolder();
mHeaders->setFolder( 0 );
updateFolderMenu();
@@ -2059,32 +2059,32 @@ void KMMainWidget::folderSelected( KMFolder* aFolder, bool forceJumpToUnread )
// Set a timer to show a splash screen if fetching folder contents
// takes more than the amount of seconds configured in the kmailrc (default 1000 msec)
mShowBusySplashTimer = new TQTimer( this );
- connect( mShowBusySplashTimer, TQT_SIGNAL( timeout() ), TQT_TQOBJECT(this), TQT_SLOT( slotShowBusySplash() ) );
+ connect( mShowBusySplashTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotShowBusySplash() ) );
mShowBusySplashTimer->start( GlobalSettings::self()->folderLoadingTimeout(), true );
return;
} else {
// the folder is complete now - so go ahead
- disconnect( imap, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ),
- this, TQT_SLOT( folderSelected() ) );
+ disconnect( imap, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ),
+ this, TQ_SLOT( folderSelected() ) );
forceJumpToUnread = mForceJumpToUnread;
}
}
if ( mFolder ) { // == 0 -> pointing to toplevel ("Welcome to KMail") folder
- connect( mFolder, TQT_SIGNAL( changed() ),
- this, TQT_SLOT( updateMarkAsReadAction() ) );
- connect( mFolder, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ),
- this, TQT_SLOT( updateMarkAsReadAction() ) );
- connect( mFolder, TQT_SIGNAL( msgAdded( int ) ),
- this, TQT_SLOT( updateMarkAsReadAction() ) );
- connect( mFolder, TQT_SIGNAL( msgRemoved(KMFolder *) ),
- this, TQT_SLOT( updateMarkAsReadAction() ) );
+ connect( mFolder, TQ_SIGNAL( changed() ),
+ this, TQ_SLOT( updateMarkAsReadAction() ) );
+ connect( mFolder, TQ_SIGNAL( msgHeaderChanged( KMFolder*, int ) ),
+ this, TQ_SLOT( updateMarkAsReadAction() ) );
+ connect( mFolder, TQ_SIGNAL( msgAdded( int ) ),
+ this, TQ_SLOT( updateMarkAsReadAction() ) );
+ connect( mFolder, TQ_SIGNAL( msgRemoved(KMFolder *) ),
+ this, TQ_SLOT( updateMarkAsReadAction() ) );
}
readFolderConfig();
if (mMsgView)
{
mMsgView->setHtmlOverride(mFolderHtmlPref);
- mMsgView->setHtmlLoadExtOverride(mFolderHtmlLoadExtPref);
+ mMsgView->setHtmlLoadExtDefault(mFolderHtmlLoadExtPref);
}
mHeaders->setFolder( mFolder, forceJumpToUnread );
updateMessageActions();
@@ -2132,15 +2132,16 @@ void KMMainWidget::slotMsgSelected(KMMessage *msg)
}
mJob = msg->parent()->createJob( msg, FolderJob::tGetMessage, 0,
"STRUCTURE", mMsgView->attachmentStrategy() );
- connect(mJob, TQT_SIGNAL(messageRetrieved(KMMessage*)),
- mMsgView, TQT_SLOT(slotMessageArrived(KMMessage*)));
+ connect(mJob, TQ_SIGNAL(messageRetrieved(KMMessage*)),
+ mMsgView, TQ_SLOT(slotMessageArrived(KMMessage*)));
mJob->start();
} else {
mMsgView->setMsg(msg);
}
// reset HTML override to the folder setting
mMsgView->setHtmlOverride(mFolderHtmlPref);
- mMsgView->setHtmlLoadExtOverride(mFolderHtmlLoadExtPref);
+ mMsgView->setHtmlLoadExtDefault(mFolderHtmlLoadExtPref);
+ mMsgView->setHtmlLoadExtOverride(false);
mMsgView->setDecryptMessageOverwrite( false );
mMsgView->setShowSignatureDetails( false );
}
@@ -2317,8 +2318,8 @@ void KMMainWidget::slotMsgActivated(KMMessage *msg)
if ( !msg ) return;
if ( msg->parent() && !msg->isComplete() ) {
FolderJob *job = msg->parent()->createJob( msg );
- connect( job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ),
- TQT_SLOT( slotMsgActivated( KMMessage* ) ) );
+ connect( job, TQ_SIGNAL( messageRetrieved( KMMessage* ) ),
+ TQ_SLOT( slotMsgActivated( KMMessage* ) ) );
job->start();
return;
}
@@ -2508,26 +2509,26 @@ void KMMainWidget::updateCustomTemplateMenus()
new TDEActionMenu( i18n("Forward With Custom Template"),
"mail_custom_forward",
actionCollection(), "custom_forward" );
- TQSignalMapper *mCustomForwardMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
- connect( mCustomForwardMapper, TQT_SIGNAL( mapped( int ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotCustomForwardMsg( int ) ) );
+ TQSignalMapper *mCustomForwardMapper = new TQSignalMapper( this );
+ connect( mCustomForwardMapper, TQ_SIGNAL( mapped( int ) ),
+ this, TQ_SLOT( slotCustomForwardMsg( int ) ) );
mForwardActionMenu->insert( mCustomForwardActionMenu );
mCustomReplyActionMenu =
new TDEActionMenu( i18n("Reply With Custom Template"), "mail_custom_reply",
actionCollection(), "custom_reply" );
- TQSignalMapper *mCustomReplyMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
- connect( mCustomReplyMapper, TQT_SIGNAL( mapped( int ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotCustomReplyToMsg( int ) ) );
+ TQSignalMapper *mCustomReplyMapper = new TQSignalMapper( this );
+ connect( mCustomReplyMapper, TQ_SIGNAL( mapped( int ) ),
+ this, TQ_SLOT( slotCustomReplyToMsg( int ) ) );
mMsgActions->replyMenu()->insert( mCustomReplyActionMenu );
mCustomReplyAllActionMenu =
new TDEActionMenu( i18n("Reply to All With Custom Template"),
"mail_custom_reply_all",
actionCollection(), "custom_reply_all" );
- TQSignalMapper *mCustomReplyAllMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
- connect( mCustomReplyAllMapper, TQT_SIGNAL( mapped( int ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotCustomReplyAllToMsg( int ) ) );
+ TQSignalMapper *mCustomReplyAllMapper = new TQSignalMapper( this );
+ connect( mCustomReplyAllMapper, TQ_SIGNAL( mapped( int ) ),
+ this, TQ_SLOT( slotCustomReplyAllToMsg( int ) ) );
mMsgActions->replyMenu()->insert( mCustomReplyAllActionMenu );
mCustomTemplates.clear();
@@ -2548,7 +2549,7 @@ void KMMainWidget::updateCustomTemplateMenus()
action = new TDEAction( (*it).replace( "&", "&&" ),
TDEShortcut( t.shortcut() ),
mCustomReplyMapper,
- TQT_SLOT( map() ),
+ TQ_SLOT( map() ),
actionCollection(),
(*it).utf8() );
mCustomReplyMapper->setMapping( action, idx );
@@ -2560,7 +2561,7 @@ void KMMainWidget::updateCustomTemplateMenus()
action = new TDEAction( (*it).replace( "&", "&&" ),
TDEShortcut( t.shortcut() ),
mCustomReplyAllMapper,
- TQT_SLOT( map() ),
+ TQ_SLOT( map() ),
actionCollection(),
(*it).utf8() );
mCustomReplyAllMapper->setMapping( action, idx );
@@ -2572,7 +2573,7 @@ void KMMainWidget::updateCustomTemplateMenus()
action = new TDEAction( (*it).replace( "&", "&&" ),
TDEShortcut( t.shortcut() ),
mCustomForwardMapper,
- TQT_SLOT( map() ),
+ TQ_SLOT( map() ),
actionCollection(),
(*it).utf8() );
mCustomForwardMapper->setMapping( action, idx );
@@ -2584,7 +2585,7 @@ void KMMainWidget::updateCustomTemplateMenus()
action = new TDEAction( (*it).replace( "&", "&&" ),
TDEShortcut::null(),
mCustomReplyMapper,
- TQT_SLOT( map() ),
+ TQ_SLOT( map() ),
actionCollection(),
(*it).utf8() );
mCustomReplyMapper->setMapping( action, idx );
@@ -2594,7 +2595,7 @@ void KMMainWidget::updateCustomTemplateMenus()
action = new TDEAction( (*it).replace( "&", "&&" ),
TDEShortcut::null(),
mCustomReplyAllMapper,
- TQT_SLOT( map() ),
+ TQ_SLOT( map() ),
actionCollection(),
(*it).utf8() );
mCustomReplyAllMapper->setMapping( action, idx );
@@ -2604,7 +2605,7 @@ void KMMainWidget::updateCustomTemplateMenus()
action = new TDEAction( (*it).replace( "&", "&&" ),
TDEShortcut::null(),
mCustomForwardMapper,
- TQT_SLOT( map() ),
+ TQ_SLOT( map() ),
actionCollection(),
(*it).utf8() );
mCustomForwardMapper->setMapping( action, idx );
@@ -2644,53 +2645,53 @@ void KMMainWidget::setupActions()
//----- File Menu
mSaveAsAction = new TDEAction( i18n("Save &As..."), "document-save",
TDEStdAccel::shortcut(TDEStdAccel::Save),
- TQT_TQOBJECT(this), TQT_SLOT(slotSaveMsg()), actionCollection(), "file_save_as" );
+ this, TQ_SLOT(slotSaveMsg()), actionCollection(), "file_save_as" );
- mOpenAction = KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotOpenMsg() ),
+ mOpenAction = KStdAction::open( this, TQ_SLOT( slotOpenMsg() ),
actionCollection() );
(void) new TDEAction( i18n("&Compact All Folders"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotCompactAll()),
+ this, TQ_SLOT(slotCompactAll()),
actionCollection(), "compact_all_folders" );
(void) new TDEAction( i18n("&Expire All Folders"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotExpireAll()),
+ this, TQ_SLOT(slotExpireAll()),
actionCollection(), "expire_all_folders" );
(void) new TDEAction( i18n("&Refresh Local IMAP Cache"), "refresh",
- TQT_TQOBJECT(this), TQT_SLOT(slotInvalidateIMAPFolders()),
+ this, TQ_SLOT(slotInvalidateIMAPFolders()),
actionCollection(), "file_invalidate_imap_cache" );
(void) new TDEAction( i18n("Empty All &Trash Folders"), 0,
- KMKernel::self(), TQT_SLOT(slotEmptyTrash()),
+ KMKernel::self(), TQ_SLOT(slotEmptyTrash()),
actionCollection(), "empty_trash" );
(void) new TDEAction( i18n("Check &Mail"), "mail_get", CTRL+Key_L,
- TQT_TQOBJECT(this), TQT_SLOT(slotCheckMail()),
+ this, TQ_SLOT(slotCheckMail()),
actionCollection(), "check_mail" );
mFavoritesCheckMailAction = new TDEAction( i18n("Check Mail in Favorite Folders"),
"mail_get", CTRL+SHIFT+Key_L, 0, 0,
actionCollection(), "favorite_check_mail" );
if ( mFavoriteFolderView )
- connect( mFavoritesCheckMailAction, TQT_SIGNAL(activated()), mFavoriteFolderView, TQT_SLOT(checkMail()) );
+ connect( mFavoritesCheckMailAction, TQ_SIGNAL(activated()), mFavoriteFolderView, TQ_SLOT(checkMail()) );
TDEActionMenu *actActionMenu = new
TDEActionMenu( i18n("Check Mail &In"), "mail_get", actionCollection(),
"check_mail_in" );
actActionMenu->setDelayed(true); //needed for checking "all accounts"
- connect(actActionMenu,TQT_SIGNAL(activated()),this,TQT_SLOT(slotCheckMail()));
+ connect(actActionMenu,TQ_SIGNAL(activated()),this,TQ_SLOT(slotCheckMail()));
mActMenu = actActionMenu->popupMenu();
- connect(mActMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotCheckOneAccount(int)));
- connect(mActMenu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(getAccountMenu()));
+ connect(mActMenu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotCheckOneAccount(int)));
+ connect(mActMenu,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(getAccountMenu()));
- (void) new TDEAction( i18n("&Send Queued Messages"), "mail-send", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotSendQueued()), actionCollection(), "send_queued");
+ (void) new TDEAction( i18n("&Send Queued Messages"), "mail-send", 0, this,
+ TQ_SLOT(slotSendQueued()), actionCollection(), "send_queued");
- (void) new TDEAction( i18n("Online Status (unknown)"), "online_status", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotOnlineStatus()), actionCollection(), "online_status");
+ (void) new TDEAction( i18n("Online Status (unknown)"), "online_status", 0, this,
+ TQ_SLOT(slotOnlineStatus()), actionCollection(), "online_status");
TDEActionMenu *sendActionMenu = new
TDEActionMenu( i18n("Send Queued Messages Via"), "mail_send_via", actionCollection(),
@@ -2698,166 +2699,166 @@ void KMMainWidget::setupActions()
sendActionMenu->setDelayed(true);
mSendMenu = sendActionMenu->popupMenu();
- connect(mSendMenu,TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSendQueuedVia(int)));
- connect(mSendMenu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(getTransportMenu()));
+ connect(mSendMenu,TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSendQueuedVia(int)));
+ connect(mSendMenu,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(getTransportMenu()));
TDEAction *act;
//----- Tools menu
if (parent()->inherits("KMMainWin")) {
- act = new TDEAction( i18n("&Address Book..."), "contents", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotAddrBook()), actionCollection(), "addressbook" );
+ act = new TDEAction( i18n("&Address Book..."), "contents", 0, this,
+ TQ_SLOT(slotAddrBook()), actionCollection(), "addressbook" );
if (TDEStandardDirs::findExe("kaddressbook").isEmpty()) act->setEnabled(false);
}
- act = new TDEAction( i18n("Certificate Manager..."), "pgp-keys", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotStartCertManager()), actionCollection(), "tools_start_certman");
+ act = new TDEAction( i18n("Certificate Manager..."), "pgp-keys", 0, this,
+ TQ_SLOT(slotStartCertManager()), actionCollection(), "tools_start_certman");
// disable action if no certman binary is around
if (TDEStandardDirs::findExe("kleopatra").isEmpty()) act->setEnabled(false);
- act = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg");
+ act = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, this,
+ TQ_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg");
// disable action if no kwatchgnupg binary is around
if (TDEStandardDirs::findExe("kwatchgnupg").isEmpty()) act->setEnabled(false);
- act = new TDEAction( i18n("&Import Messages..."), "document-open", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotImport()), actionCollection(), "import" );
+ act = new TDEAction( i18n("&Import Messages..."), "document-open", 0, this,
+ TQ_SLOT(slotImport()), actionCollection(), "import" );
if (TDEStandardDirs::findExe("kmailcvt").isEmpty()) act->setEnabled(false);
#if !defined(NDEBUG)
(void) new TDEAction( i18n("&Debug Sieve..."),
- "idea", 0, TQT_TQOBJECT(this), TQT_SLOT(slotDebugSieve()),
+ "idea", 0, this, TQ_SLOT(slotDebugSieve()),
actionCollection(), "tools_debug_sieve" );
#endif
if ( GlobalSettings::allowOutOfOfficeSettings() ) {
(void) new TDEAction( i18n("Edit \"Out of Office\" Replies..."),
- "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditVacation()),
+ "configure", 0, this, TQ_SLOT(slotEditVacation()),
actionCollection(), "tools_edit_vacation" );
}
- (void) new TDEAction( i18n("Filter &Log Viewer..."), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotFilterLogViewer()), actionCollection(), "filter_log_viewer" );
+ (void) new TDEAction( i18n("Filter &Log Viewer..."), 0, this,
+ TQ_SLOT(slotFilterLogViewer()), actionCollection(), "filter_log_viewer" );
- (void) new TDEAction( i18n("&Anti-Spam Wizard..."), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotAntiSpamWizard()), actionCollection(), "antiSpamWizard" );
- (void) new TDEAction( i18n("&Anti-Virus Wizard..."), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotAntiVirusWizard()), actionCollection(), "antiVirusWizard" );
+ (void) new TDEAction( i18n("&Anti-Spam Wizard..."), 0, this,
+ TQ_SLOT(slotAntiSpamWizard()), actionCollection(), "antiSpamWizard" );
+ (void) new TDEAction( i18n("&Anti-Virus Wizard..."), 0, this,
+ TQ_SLOT(slotAntiVirusWizard()), actionCollection(), "antiVirusWizard" );
//----- Edit Menu
mTrashAction = new TDEAction( KGuiItem( i18n("&Move to Trash"), "edittrash",
i18n("Move message to trashcan") ),
- Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotTrashMsg()),
+ Key_Delete, this, TQ_SLOT(slotTrashMsg()),
actionCollection(), "move_to_trash" );
/* The delete action is nowhere in the gui, by default, so we need to make
* sure it is plugged into the TDEAccel now, since that won't happen on
* XMLGui construction or manual ->plug(). This is only a problem when run
* as a part, though. */
- mDeleteAction = new TDEAction( i18n("&Delete"), "edit-delete", SHIFT+Key_Delete, TQT_TQOBJECT(this),
- TQT_SLOT(slotDeleteMsg()), actionCollection(), "delete" );
+ mDeleteAction = new TDEAction( i18n("&Delete"), "edit-delete", SHIFT+Key_Delete, this,
+ TQ_SLOT(slotDeleteMsg()), actionCollection(), "delete" );
mDeleteAction->plugAccel( actionCollection()->tdeaccel() );
mTrashThreadAction = new TDEAction( KGuiItem( i18n("M&ove Thread to Trash"), "edittrash",
i18n("Move thread to trashcan") ),
- CTRL+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotTrashThread()),
+ CTRL+Key_Delete, this, TQ_SLOT(slotTrashThread()),
actionCollection(), "move_thread_to_trash" );
- mDeleteThreadAction = new TDEAction( i18n("Delete T&hread"), "edit-delete", CTRL+SHIFT+Key_Delete, TQT_TQOBJECT(this),
- TQT_SLOT(slotDeleteThread()), actionCollection(), "delete_thread" );
+ mDeleteThreadAction = new TDEAction( i18n("Delete T&hread"), "edit-delete", CTRL+SHIFT+Key_Delete, this,
+ TQ_SLOT(slotDeleteThread()), actionCollection(), "delete_thread" );
- (void) new TDEAction( i18n("&Find Messages..."), "mail_find", Key_S, TQT_TQOBJECT(this),
- TQT_SLOT(slotRequestFullSearchFromQuickSearch()), actionCollection(), "search_messages" );
+ (void) new TDEAction( i18n("&Find Messages..."), "mail_find", Key_S, this,
+ TQ_SLOT(slotRequestFullSearchFromQuickSearch()), actionCollection(), "search_messages" );
- mFindInMessageAction = new TDEAction( i18n("&Find in Message..."), "edit-find", TDEStdAccel::shortcut(TDEStdAccel::Find), TQT_TQOBJECT(this),
- TQT_SLOT(slotFind()), actionCollection(), "find_in_messages" );
+ mFindInMessageAction = new TDEAction( i18n("&Find in Message..."), "edit-find", TDEStdAccel::shortcut(TDEStdAccel::Find), this,
+ TQ_SLOT(slotFind()), actionCollection(), "find_in_messages" );
- (void) new TDEAction( i18n("Select &All Messages"), TDEStdAccel::selectAll(), TQT_TQOBJECT(this),
- TQT_SLOT(slotMarkAll()), actionCollection(), "mark_all_messages" );
+ (void) new TDEAction( i18n("Select &All Messages"), TDEStdAccel::selectAll(), this,
+ TQ_SLOT(slotMarkAll()), actionCollection(), "mark_all_messages" );
//----- Folder Menu
- mNewFolderAction = new TDEAction( i18n("&New Folder..."), "folder-new", 0, TQT_TQOBJECT(mFolderTree),
- TQT_SLOT(addChildFolder()), actionCollection(), "new_folder" );
+ mNewFolderAction = new TDEAction( i18n("&New Folder..."), "folder-new", 0, mFolderTree,
+ TQ_SLOT(addChildFolder()), actionCollection(), "new_folder" );
- mModifyFolderAction = new TDEAction( i18n("&Properties"), "configure", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotModifyFolder()), actionCollection(), "modify" );
+ mModifyFolderAction = new TDEAction( i18n("&Properties"), "configure", 0, this,
+ TQ_SLOT(slotModifyFolder()), actionCollection(), "modify" );
mFolderMailingListPropertiesAction = new TDEAction( i18n("&Mailing List Management..."),
- /*"folder_mailinglist_properties",*/ 0, TQT_TQOBJECT(this), TQT_SLOT( slotFolderMailingListProperties() ),
+ /*"folder_mailinglist_properties",*/ 0, this, TQ_SLOT( slotFolderMailingListProperties() ),
actionCollection(), "folder_mailinglist_properties" );
mFolderShortCutCommandAction = new TDEAction( i18n("&Assign Shortcut..."), "configure_shortcuts",
- 0, TQT_TQOBJECT(this), TQT_SLOT( slotFolderShortcutCommand() ), actionCollection(),
+ 0, this, TQ_SLOT( slotFolderShortcutCommand() ), actionCollection(),
"folder_shortcut_command" );
- mMarkAllAsReadAction = new TDEAction( i18n("Mark All Messages as &Read"), "goto", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotMarkAllAsRead()), actionCollection(), "mark_all_as_read" );
+ mMarkAllAsReadAction = new TDEAction( i18n("Mark All Messages as &Read"), "goto", 0, this,
+ TQ_SLOT(slotMarkAllAsRead()), actionCollection(), "mark_all_as_read" );
- mExpireFolderAction = new TDEAction(i18n("&Expiration Settings"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotExpireFolder()),
+ mExpireFolderAction = new TDEAction(i18n("&Expiration Settings"), 0, this, TQ_SLOT(slotExpireFolder()),
actionCollection(), "expire");
- mCompactFolderAction = new TDEAction( i18n("&Compact Folder"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotCompactFolder()), actionCollection(), "compact" );
+ mCompactFolderAction = new TDEAction( i18n("&Compact Folder"), 0, this,
+ TQ_SLOT(slotCompactFolder()), actionCollection(), "compact" );
mRefreshFolderAction = new TDEAction( i18n("Check Mail &in This Folder"), "reload",
- TDEStdAccel::shortcut( TDEStdAccel::Reload ), TQT_TQOBJECT(this),
- TQT_SLOT(slotRefreshFolder()),
+ TDEStdAccel::shortcut( TDEStdAccel::Reload ), this,
+ TQ_SLOT(slotRefreshFolder()),
actionCollection(), "refresh_folder" );
mTroubleshootFolderAction = 0; // set in initializeIMAPActions
- mEmptyFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edittrash", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotEmptyFolder()), actionCollection(), "empty" );
+ mEmptyFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edittrash", 0, this,
+ TQ_SLOT(slotEmptyFolder()), actionCollection(), "empty" );
- mRemoveFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edit-delete", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotRemoveFolder()), actionCollection(), "delete_folder" );
+ mRemoveFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edit-delete", 0, this,
+ TQ_SLOT(slotRemoveFolder()), actionCollection(), "delete_folder" );
- mArchiveFolderAction = new TDEAction( i18n( "&Archive Folder..." ), "document-save", 0, TQT_TQOBJECT(this),
- TQT_SLOT( slotArchiveFolder() ), actionCollection(),
+ mArchiveFolderAction = new TDEAction( i18n( "&Archive Folder..." ), "document-save", 0, this,
+ TQ_SLOT( slotArchiveFolder() ), actionCollection(),
"archive_folder" );
- mPreferHtmlAction = new TDEToggleAction( i18n("Prefer &HTML to Plain Text"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotOverrideHtml()), actionCollection(), "prefer_html" );
+ mPreferHtmlAction = new TDEToggleAction( i18n("Prefer &HTML to Plain Text"), 0, this,
+ TQ_SLOT(slotOverrideHtml()), actionCollection(), "prefer_html" );
- mPreferHtmlLoadExtAction = new TDEToggleAction( i18n("Load E&xternal References"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotOverrideHtmlLoadExt()), actionCollection(), "prefer_html_external_refs" );
+ mPreferHtmlLoadExtAction = new TDEToggleAction( i18n("Load E&xternal References"), 0, this,
+ TQ_SLOT(slotOverrideHtmlLoadExt()), actionCollection(), "prefer_html_external_refs" );
- mThreadMessagesAction = new TDEToggleAction( i18n("&Thread Messages"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotOverrideThread()), actionCollection(), "thread_messages" );
+ mThreadMessagesAction = new TDEToggleAction( i18n("&Thread Messages"), 0, this,
+ TQ_SLOT(slotOverrideThread()), actionCollection(), "thread_messages" );
- mThreadBySubjectAction = new TDEToggleAction( i18n("Thread Messages also by &Subject"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotToggleSubjectThreading()), actionCollection(), "thread_messages_by_subject" );
+ mThreadBySubjectAction = new TDEToggleAction( i18n("Thread Messages also by &Subject"), 0, this,
+ TQ_SLOT(slotToggleSubjectThreading()), actionCollection(), "thread_messages_by_subject" );
- new TDEAction( i18n("Copy Folder"), "edit-copy", SHIFT+CTRL+Key_C, TQT_TQOBJECT(folderTree()),
- TQT_SLOT(copyFolder()), actionCollection(), "copy_folder" );
- new TDEAction( i18n("Cut Folder"), "edit-cut", SHIFT+CTRL+Key_X, TQT_TQOBJECT(folderTree()),
- TQT_SLOT(cutFolder()), actionCollection(), "cut_folder" );
- new TDEAction( i18n("Paste Folder"), "edit-paste", SHIFT+CTRL+Key_V, TQT_TQOBJECT(folderTree()),
- TQT_SLOT(pasteFolder()), actionCollection(), "paste_folder" );
+ new TDEAction( i18n("Copy Folder"), "edit-copy", SHIFT+CTRL+Key_C, folderTree(),
+ TQ_SLOT(copyFolder()), actionCollection(), "copy_folder" );
+ new TDEAction( i18n("Cut Folder"), "edit-cut", SHIFT+CTRL+Key_X, folderTree(),
+ TQ_SLOT(cutFolder()), actionCollection(), "cut_folder" );
+ new TDEAction( i18n("Paste Folder"), "edit-paste", SHIFT+CTRL+Key_V, folderTree(),
+ TQ_SLOT(pasteFolder()), actionCollection(), "paste_folder" );
- new TDEAction( i18n("Copy Messages"), "edit-copy", ALT+CTRL+Key_C, TQT_TQOBJECT(headers()),
- TQT_SLOT(copyMessages()), actionCollection(), "copy_messages" );
- new TDEAction( i18n("Cut Messages"), "edit-cut", ALT+CTRL+Key_X, TQT_TQOBJECT(headers()),
- TQT_SLOT(cutMessages()), actionCollection(), "cut_messages" );
- new TDEAction( i18n("Paste Messages"), "edit-paste", ALT+CTRL+Key_V, TQT_TQOBJECT(headers()),
- TQT_SLOT(pasteMessages()), actionCollection(), "paste_messages" );
+ new TDEAction( i18n("Copy Messages"), "edit-copy", ALT+CTRL+Key_C, headers(),
+ TQ_SLOT(copyMessages()), actionCollection(), "copy_messages" );
+ new TDEAction( i18n("Cut Messages"), "edit-cut", ALT+CTRL+Key_X, headers(),
+ TQ_SLOT(cutMessages()), actionCollection(), "cut_messages" );
+ new TDEAction( i18n("Paste Messages"), "edit-paste", ALT+CTRL+Key_V, headers(),
+ TQ_SLOT(pasteMessages()), actionCollection(), "paste_messages" );
//----- Message Menu
- (void) new TDEAction( i18n("&New Message..."), "mail-message-new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this),
- TQT_SLOT(slotCompose()), actionCollection(), "new_message" );
+ (void) new TDEAction( i18n("&New Message..."), "mail-message-new", TDEStdAccel::shortcut(TDEStdAccel::New), this,
+ TQ_SLOT(slotCompose()), actionCollection(), "new_message" );
mTemplateMenu =
new TDEActionMenu( i18n("New Message From &Template"), "document-new",
actionCollection(), "new_from_template" );
mTemplateMenu->setDelayed( true );
- connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this),
- TQT_SLOT( slotShowNewFromTemplate() ) );
- connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( activated(int) ), TQT_TQOBJECT(this),
- TQT_SLOT( slotNewFromTemplate(int) ) );
+ connect( mTemplateMenu->popupMenu(), TQ_SIGNAL( aboutToShow() ), this,
+ TQ_SLOT( slotShowNewFromTemplate() ) );
+ connect( mTemplateMenu->popupMenu(), TQ_SIGNAL( activated(int) ), this,
+ TQ_SLOT( slotNewFromTemplate(int) ) );
TDEAction* newToML = new TDEAction( i18n("New Message t&o Mailing-List..."), "mail_post_to",
- CTRL+SHIFT+Key_N, TQT_TQOBJECT(this),
- TQT_SLOT(slotPostToML()), actionCollection(), "post_message" );
+ CTRL+SHIFT+Key_N, this,
+ TQ_SLOT(slotPostToML()), actionCollection(), "post_message" );
newToML->plugAccel( actionCollection()->tdeaccel() );
mForwardActionMenu = new TDEActionMenu( i18n("Message->","&Forward"),
@@ -2865,26 +2866,26 @@ void KMMainWidget::setupActions()
"message_forward" );
mForwardInlineAction = new TDEAction( i18n("&Inline..."),
- "mail-forward", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotForwardInlineMsg()),
+ "mail-forward", 0, this,
+ TQ_SLOT(slotForwardInlineMsg()),
actionCollection(),
"message_forward_inline" );
mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."),
- "mail-forward", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotForwardAttachedMsg()),
+ "mail-forward", 0, this,
+ TQ_SLOT(slotForwardAttachedMsg()),
actionCollection(),
"message_forward_as_attachment" );
mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."),
- "mail-forward", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotForwardDigestMsg()),
+ "mail-forward", 0, this,
+ TQ_SLOT(slotForwardDigestMsg()),
actionCollection(),
"message_forward_as_digest" );
mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."),
- "mail-forward", Key_E, TQT_TQOBJECT(this),
- TQT_SLOT(slotRedirectMsg()),
+ "mail-forward", Key_E, this,
+ TQ_SLOT(slotRedirectMsg()),
actionCollection(),
"message_forward_redirect" );
@@ -2894,38 +2895,38 @@ void KMMainWidget::setupActions()
mForwardActionMenu->insert( mForwardDigestAction );
mForwardActionMenu->insert( mRedirectAction );
- mSendAgainAction = new TDEAction( i18n("Send A&gain..."), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotResendMsg()), actionCollection(), "send_again" );
+ mSendAgainAction = new TDEAction( i18n("Send A&gain..."), 0, this,
+ TQ_SLOT(slotResendMsg()), actionCollection(), "send_again" );
//----- Create filter actions
mFilterMenu = new TDEActionMenu( i18n("&Create Filter"), "filter", actionCollection(), "create_filter" );
- connect( mFilterMenu, TQT_SIGNAL(activated()), TQT_TQOBJECT(this),
- TQT_SLOT(slotFilter()) );
- mSubjectFilterAction = new TDEAction( i18n("Filter on &Subject..."), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotSubjectFilter()),
+ connect( mFilterMenu, TQ_SIGNAL(activated()), this,
+ TQ_SLOT(slotFilter()) );
+ mSubjectFilterAction = new TDEAction( i18n("Filter on &Subject..."), 0, this,
+ TQ_SLOT(slotSubjectFilter()),
actionCollection(), "subject_filter");
mFilterMenu->insert( mSubjectFilterAction );
- mFromFilterAction = new TDEAction( i18n("Filter on &From..."), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotFromFilter()),
+ mFromFilterAction = new TDEAction( i18n("Filter on &From..."), 0, this,
+ TQ_SLOT(slotFromFilter()),
actionCollection(), "from_filter");
mFilterMenu->insert( mFromFilterAction );
- mToFilterAction = new TDEAction( i18n("Filter on &To..."), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotToFilter()),
+ mToFilterAction = new TDEAction( i18n("Filter on &To..."), 0, this,
+ TQ_SLOT(slotToFilter()),
actionCollection(), "to_filter");
mFilterMenu->insert( mToFilterAction );
- mListFilterAction = new TDEAction( i18n("Filter on Mailing-&List..."), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotMailingListFilter()), actionCollection(),
+ mListFilterAction = new TDEAction( i18n("Filter on Mailing-&List..."), 0, this,
+ TQ_SLOT(slotMailingListFilter()), actionCollection(),
"mlist_filter");
mFilterMenu->insert( mListFilterAction );
- mPrintAction = KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT(slotPrintMsg()), actionCollection());
+ mPrintAction = KStdAction::print (this, TQ_SLOT(slotPrintMsg()), actionCollection());
mUseAction = new TDEAction( i18n("New Message From &Template"), "document-new",
- Key_N, TQT_TQOBJECT(this), TQT_SLOT( slotUseTemplate() ),
+ Key_N, this, TQ_SLOT( slotUseTemplate() ),
actionCollection(), "use_template" );
mUseAction->plugAccel( actionCollection()->tdeaccel() );
@@ -2935,52 +2936,52 @@ void KMMainWidget::setupActions()
mMarkThreadAsReadAction = new TDEAction(KGuiItem(i18n("Mark Thread as &Read"), "kmmsgread",
i18n("Mark all messages in the selected thread as read")),
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusRead()),
+ 0, this, TQ_SLOT(slotSetThreadStatusRead()),
actionCollection(), "thread_read");
mThreadStatusMenu->insert( mMarkThreadAsReadAction );
mMarkThreadAsNewAction = new TDEAction(KGuiItem(i18n("Mark Thread as &New"), "kmmsgnew",
i18n("Mark all messages in the selected thread as new")),
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusNew()),
+ 0, this, TQ_SLOT(slotSetThreadStatusNew()),
actionCollection(), "thread_new");
mThreadStatusMenu->insert( mMarkThreadAsNewAction );
mMarkThreadAsUnreadAction = new TDEAction(KGuiItem(i18n("Mark Thread as &Unread"), "kmmsgunseen",
i18n("Mark all messages in the selected thread as unread")),
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusUnread()),
+ 0, this, TQ_SLOT(slotSetThreadStatusUnread()),
actionCollection(), "thread_unread");
mThreadStatusMenu->insert( mMarkThreadAsUnreadAction );
- mThreadStatusMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) );
+ mThreadStatusMenu->insert( new TDEActionSeparator( this ) );
//----- "Mark Thread" toggle actions
mToggleThreadFlagAction = new TDEToggleAction(i18n("Mark Thread as &Important"), "mail_flag",
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusFlag()),
+ 0, this, TQ_SLOT(slotSetThreadStatusFlag()),
actionCollection(), "thread_flag");
mToggleThreadFlagAction->setCheckedState( i18n("Remove &Important Thread Mark") );
mThreadStatusMenu->insert( mToggleThreadFlagAction );
mToggleThreadTodoAction = new TDEToggleAction(i18n("Mark Thread as &Action Item"), "mail_todo",
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusTodo()),
+ 0, this, TQ_SLOT(slotSetThreadStatusTodo()),
actionCollection(), "thread_todo");
mToggleThreadTodoAction->setCheckedState( i18n("Remove &Action Item Thread Mark") );
mThreadStatusMenu->insert( mToggleThreadTodoAction );
//------- "Watch and ignore thread" actions
mWatchThreadAction = new TDEToggleAction(i18n("&Watch Thread"), "kmmsgwatched",
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusWatched()),
+ 0, this, TQ_SLOT(slotSetThreadStatusWatched()),
actionCollection(), "thread_watched");
mIgnoreThreadAction = new TDEToggleAction(i18n("&Ignore Thread"), "mail_ignore",
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusIgnored()),
+ 0, this, TQ_SLOT(slotSetThreadStatusIgnored()),
actionCollection(), "thread_ignored");
- mThreadStatusMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) );
+ mThreadStatusMenu->insert( new TDEActionSeparator( this ) );
mThreadStatusMenu->insert( mWatchThreadAction );
mThreadStatusMenu->insert( mIgnoreThreadAction );
mSaveAttachmentsAction = new TDEAction( i18n("Save A&ttachments..."), "attach",
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachments()),
+ 0, this, TQ_SLOT(slotSaveAttachments()),
actionCollection(), "file_save_attachments" );
mMoveActionMenu = new TDEActionMenu( i18n("&Move To" ),
@@ -2990,8 +2991,8 @@ void KMMainWidget::setupActions()
actionCollection(), "copy_to" );
mApplyAllFiltersAction = new TDEAction( i18n("Appl&y All Filters"), "filter",
- CTRL+Key_J, TQT_TQOBJECT(this),
- TQT_SLOT(slotApplyFilters()),
+ CTRL+Key_J, this,
+ TQ_SLOT(slotApplyFilters()),
actionCollection(), "apply_filters" );
mApplyFilterActionsMenu = new TDEActionMenu( i18n("A&pply Filter" ),
@@ -3005,104 +3006,104 @@ void KMMainWidget::setupActions()
actionCollection(), "view_unread" );
unreadMenu->setToolTip( i18n("Choose how to display the count of unread messages") );
- mUnreadColumnToggle = new TDERadioAction( i18n("View->Unread Count", "View in &Separate Column"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotToggleUnread()),
+ mUnreadColumnToggle = new TDERadioAction( i18n("View->Unread Count", "View in &Separate Column"), 0, this,
+ TQ_SLOT(slotToggleUnread()),
actionCollection(), "view_unread_column" );
mUnreadColumnToggle->setExclusiveGroup( "view_unread_group" );
unreadMenu->insert( mUnreadColumnToggle );
- mUnreadTextToggle = new TDERadioAction( i18n("View->Unread Count", "View After &Folder Name"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotToggleUnread()),
+ mUnreadTextToggle = new TDERadioAction( i18n("View->Unread Count", "View After &Folder Name"), 0, this,
+ TQ_SLOT(slotToggleUnread()),
actionCollection(), "view_unread_text" );
mUnreadTextToggle->setExclusiveGroup( "view_unread_group" );
unreadMenu->insert( mUnreadTextToggle );
// toggle for total column
- mTotalColumnToggle = new TDEToggleAction( i18n("View->", "&Total Column"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotToggleTotalColumn()),
+ mTotalColumnToggle = new TDEToggleAction( i18n("View->", "&Total Column"), 0, this,
+ TQ_SLOT(slotToggleTotalColumn()),
actionCollection(), "view_columns_total" );
mTotalColumnToggle->setToolTip( i18n("Toggle display of column showing the "
"total number of messages in folders.") );
- mSizeColumnToggle = new TDEToggleAction( i18n("View->", "&Size Column"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotToggleSizeColumn()),
+ mSizeColumnToggle = new TDEToggleAction( i18n("View->", "&Size Column"), 0, this,
+ TQ_SLOT(slotToggleSizeColumn()),
actionCollection(), "view_columns_size" );
mSizeColumnToggle->setToolTip( i18n("Toggle display of column showing the "
"total size of messages in folders.") );
(void)new TDEAction( KGuiItem( i18n("View->","&Expand Thread"), TQString(),
i18n("Expand the current thread") ),
- Key_Period, TQT_TQOBJECT(this),
- TQT_SLOT(slotExpandThread()),
+ Key_Period, this,
+ TQ_SLOT(slotExpandThread()),
actionCollection(), "expand_thread" );
(void)new TDEAction( KGuiItem( i18n("View->","&Collapse Thread"), TQString(),
i18n("Collapse the current thread") ),
- Key_Comma, TQT_TQOBJECT(this),
- TQT_SLOT(slotCollapseThread()),
+ Key_Comma, this,
+ TQ_SLOT(slotCollapseThread()),
actionCollection(), "collapse_thread" );
(void)new TDEAction( KGuiItem( i18n("View->","Ex&pand All Threads"), TQString(),
i18n("Expand all threads in the current folder") ),
- CTRL+Key_Period, TQT_TQOBJECT(this),
- TQT_SLOT(slotExpandAllThreads()),
+ CTRL+Key_Period, this,
+ TQ_SLOT(slotExpandAllThreads()),
actionCollection(), "expand_all_threads" );
(void)new TDEAction( KGuiItem( i18n("View->","C&ollapse All Threads"), TQString(),
i18n("Collapse all threads in the current folder") ),
- CTRL+Key_Comma, TQT_TQOBJECT(this),
- TQT_SLOT(slotCollapseAllThreads()),
+ CTRL+Key_Comma, this,
+ TQ_SLOT(slotCollapseAllThreads()),
actionCollection(), "collapse_all_threads" );
- mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, TQT_TQOBJECT(this),
- TQT_SLOT(slotShowMsgSrc()), actionCollection(),
+ mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, this,
+ TQ_SLOT(slotShowMsgSrc()), actionCollection(),
"view_source" );
- TDEAction* dukeOfMonmoth = new TDEAction( i18n("&Display Message"), Key_Return, TQT_TQOBJECT(this),
- TQT_SLOT( slotDisplayCurrentMessage() ), actionCollection(),
+ TDEAction* dukeOfMonmoth = new TDEAction( i18n("&Display Message"), Key_Return, this,
+ TQ_SLOT( slotDisplayCurrentMessage() ), actionCollection(),
"display_message" );
dukeOfMonmoth->plugAccel( actionCollection()->tdeaccel() );
//----- Go Menu
new TDEAction( KGuiItem( i18n("&Next Message"), TQString(),
i18n("Go to the next message") ),
- "N;Right", TQT_TQOBJECT(this), TQT_SLOT(slotNextMessage()),
+ "N;Right", this, TQ_SLOT(slotNextMessage()),
actionCollection(), "go_next_message" );
new TDEAction( KGuiItem( i18n("Next &Unread Message"),
TQApplication::reverseLayout() ? "go-previous" : "go-next",
i18n("Go to the next unread message") ),
- Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotNextUnreadMessage()),
+ Key_Plus, this, TQ_SLOT(slotNextUnreadMessage()),
actionCollection(), "go_next_unread_message" );
/* ### needs better support from folders:
new TDEAction( KGuiItem( i18n("Next &Important Message"), TQString(),
i18n("Go to the next important message") ),
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotNextImportantMessage()),
+ 0, this, TQ_SLOT(slotNextImportantMessage()),
actionCollection(), "go_next_important_message" );
*/
new TDEAction( KGuiItem( i18n("&Previous Message"), TQString(),
i18n("Go to the previous message") ),
- "P;Left", TQT_TQOBJECT(this), TQT_SLOT(slotPrevMessage()),
+ "P;Left", this, TQ_SLOT(slotPrevMessage()),
actionCollection(), "go_prev_message" );
new TDEAction( KGuiItem( i18n("Previous Unread &Message"),
TQApplication::reverseLayout() ? "go-next" : "go-previous",
i18n("Go to the previous unread message") ),
- Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotPrevUnreadMessage()),
+ Key_Minus, this, TQ_SLOT(slotPrevUnreadMessage()),
actionCollection(), "go_prev_unread_message" );
/* needs better support from folders:
new TDEAction( KGuiItem( i18n("Previous I&mportant Message"), TQString(),
i18n("Go to the previous important message") ),
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotPrevImportantMessage()),
+ 0, this, TQ_SLOT(slotPrevImportantMessage()),
actionCollection(), "go_prev_important_message" );
*/
TDEAction *action =
new TDEAction( KGuiItem( i18n("Next Unread &Folder"), TQString(),
i18n("Go to the next folder with unread messages") ),
- ALT+Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotNextUnreadFolder()),
+ ALT+Key_Plus, this, TQ_SLOT(slotNextUnreadFolder()),
actionCollection(), "go_next_unread_folder" );
TDEShortcut shortcut = action->shortcut();
shortcut.append( KKey( CTRL+Key_Plus ) );
@@ -3111,7 +3112,7 @@ void KMMainWidget::setupActions()
action =
new TDEAction( KGuiItem( i18n("Previous Unread F&older"), TQString(),
i18n("Go to the previous folder with unread messages") ),
- ALT+Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotPrevUnreadFolder()),
+ ALT+Key_Minus, this, TQ_SLOT(slotPrevUnreadFolder()),
actionCollection(), "go_prev_unread_folder" );
shortcut = action->shortcut();
shortcut.append( KKey( CTRL+Key_Minus ) );
@@ -3122,49 +3123,49 @@ void KMMainWidget::setupActions()
i18n("Scroll down current message. "
"If at end of current message, "
"go to next unread message.") ),
- Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotReadOn()),
+ Key_Space, this, TQ_SLOT(slotReadOn()),
actionCollection(), "go_next_unread_text" );
//----- Settings Menu
mToggleShowQuickSearchAction = new TDEToggleAction(i18n("Show Quick Search"), TQString(),
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleShowQuickSearch()),
+ 0, this, TQ_SLOT(slotToggleShowQuickSearch()),
actionCollection(), "show_quick_search");
mToggleShowQuickSearchAction->setChecked( GlobalSettings::self()->quickSearchActive() );
mToggleShowQuickSearchAction->setWhatsThis(
i18n( GlobalSettings::self()->quickSearchActiveItem()->whatsThis().utf8() ) );
- (void) new TDEAction( i18n("Configure &Filters..."), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotFilter()), actionCollection(), "filter" );
- (void) new TDEAction( i18n("Configure &POP Filters..."), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotPopFilter()), actionCollection(), "popFilter" );
- (void) new TDEAction( i18n("Manage &Sieve Scripts..."), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotManageSieveScripts()), actionCollection(), "sieveFilters" );
+ (void) new TDEAction( i18n("Configure &Filters..."), 0, this,
+ TQ_SLOT(slotFilter()), actionCollection(), "filter" );
+ (void) new TDEAction( i18n("Configure &POP Filters..."), 0, this,
+ TQ_SLOT(slotPopFilter()), actionCollection(), "popFilter" );
+ (void) new TDEAction( i18n("Manage &Sieve Scripts..."), 0, this,
+ TQ_SLOT(slotManageSieveScripts()), actionCollection(), "sieveFilters" );
(void) new TDEAction( KGuiItem( i18n("KMail &Introduction"), 0,
i18n("Display KMail's Welcome Page") ),
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotIntro()),
+ 0, this, TQ_SLOT(slotIntro()),
actionCollection(), "help_kmail_welcomepage" );
// ----- Standard Actions
-// KStdAction::configureNotifications(this, TQT_SLOT(slotEditNotifications()), actionCollection());
+// KStdAction::configureNotifications(this, TQ_SLOT(slotEditNotifications()), actionCollection());
(void) new TDEAction( i18n("Configure &Notifications..."),
- "knotify", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotEditNotifications()), actionCollection(),
+ "knotify", 0, this,
+ TQ_SLOT(slotEditNotifications()), actionCollection(),
"kmail_configure_notifications" );
-// KStdAction::preferences(this, TQT_SLOT(slotSettings()), actionCollection());
+// KStdAction::preferences(this, TQ_SLOT(slotSettings()), actionCollection());
(void) new TDEAction( i18n("&Configure KMail..."),
"configure", 0, kmkernel,
- TQT_SLOT(slotShowConfigurationDialog()), actionCollection(),
+ TQ_SLOT(slotShowConfigurationDialog()), actionCollection(),
"kmail_configure_kmail" );
- KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actionCollection(), "kmail_undo");
+ KStdAction::undo(this, TQ_SLOT(slotUndo()), actionCollection(), "kmail_undo");
- KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( slotShowTip() ), actionCollection() );
+ KStdAction::tipOfDay( this, TQ_SLOT( slotShowTip() ), actionCollection() );
menutimer = new TQTimer( this, "menutimer" );
- connect( menutimer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateMessageActions() ) );
+ connect( menutimer, TQ_SIGNAL( timeout() ), TQ_SLOT( updateMessageActions() ) );
connect( kmkernel->undoStack(),
- TQT_SIGNAL( undoStackChanged() ), TQT_TQOBJECT(this), TQT_SLOT( slotUpdateUndo() ));
+ TQ_SIGNAL( undoStackChanged() ), this, TQ_SLOT( slotUpdateUndo() ));
initializeIMAPActions( false ); // don't set state, config not read yet
updateMessageActions();
@@ -3287,9 +3288,9 @@ void KMMainWidget::copySelectedToFolder(int menuId )
void KMMainWidget::updateMessageMenu()
{
mMenuToFolder.clear();
- folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, TQT_TQOBJECT(this),
+ folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, this,
&mMenuToFolder, mMoveActionMenu->popupMenu() );
- folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, TQT_TQOBJECT(this),
+ folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, this,
&mMenuToFolder, mCopyActionMenu->popupMenu() );
updateMessageActions();
}
@@ -3546,8 +3547,8 @@ void KMMainWidget::slotShowStartupFolder()
mFolderTree->cleanupConfigFile();
}
- connect( kmkernel->filterMgr(), TQT_SIGNAL( filterListUpdated() ),
- this, TQT_SLOT( initializeFilterActions() ));
+ connect( kmkernel->filterMgr(), TQ_SIGNAL( filterListUpdated() ),
+ this, TQ_SLOT( initializeFilterActions() ));
// plug shortcut filter actions now
initializeFilterActions();
@@ -3723,7 +3724,7 @@ void KMMainWidget::initializeFilterActions()
if ( icon.isEmpty() )
icon = "gear";
filterAction = new TDEAction(as, icon, (*it)->shortcut(), filterCommand,
- TQT_SLOT(start()), actionCollection(),
+ TQ_SLOT(start()), actionCollection(),
normalizedName.local8Bit());
if(!addedSeparator) {
mApplyFilterActionsMenu->popupMenu()->insertSeparator();
@@ -3769,7 +3770,7 @@ void KMMainWidget::initializeIMAPActions( bool setState /* false the first time,
if ( !mTroubleshootFolderAction ) {
mTroubleshootFolderAction = new TDEAction( i18n("&Troubleshoot IMAP Cache..."), "wizard", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotTroubleshootFolder()), actionCollection(), "troubleshoot_folder" );
+ this, TQ_SLOT(slotTroubleshootFolder()), actionCollection(), "troubleshoot_folder" );
if ( setState )
updateFolderMenu(); // set initial state of the action
} else {
@@ -3805,7 +3806,7 @@ void KMMainWidget::slotShortcutChanged( KMFolder *folder )
TQString actionname = TQString( "FolderShortcut %1").arg( folder->idString() );
TQString normalizedName = actionname.replace(" ", "_");
TDEAction* action =
- new TDEAction(actionlabel, folder->shortcut(), c, TQT_SLOT(start()),
+ new TDEAction(actionlabel, folder->shortcut(), c, TQ_SLOT(start()),
actionCollection(), normalizedName.local8Bit());
action->setIcon( folder->unreadIconPath() );
c->setAction( action ); // will be deleted along with the command
diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h
index d90dda24..06020b7b 100644
--- a/kmail/kmmainwidget.h
+++ b/kmail/kmmainwidget.h
@@ -81,7 +81,7 @@ typedef TQMap<int,KMFolder*> KMMenuToFolder;
class KDE_EXPORT KMMainWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp
index bfc0be0c..d1abdab6 100644
--- a/kmail/kmmainwin.cpp
+++ b/kmail/kmmainwin.cpp
@@ -36,10 +36,10 @@ KMMainWin::KMMainWin(TQWidget *)
kapp->ref();
(void) new TDEAction( i18n("New &Window"), "window-new", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotNewMailReader()),
+ this, TQ_SLOT(slotNewMailReader()),
actionCollection(), "new_mail_client" );
- mKMMainWidget = new KMMainWidget( TQT_TQWIDGET(this), "KMMainWidget", this, actionCollection() );
+ mKMMainWidget = new KMMainWidget( this, "KMMainWidget", this, actionCollection() );
mKMMainWidget->resize( 450, 600 );
setCentralWidget(mKMMainWidget);
setupStatusBar();
@@ -47,17 +47,17 @@ KMMainWin::KMMainWin(TQWidget *)
setInstance( kmkernel->xmlGuiInstance() );
if ( kmkernel->firstInstance() )
- TQTimer::singleShot( 200, this, TQT_SLOT(slotShowTipOnStart()) );
+ TQTimer::singleShot( 200, this, TQ_SLOT(slotShowTipOnStart()) );
setStandardToolBarMenuEnabled(true);
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()),
+ KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbars()),
actionCollection());
- KStdAction::keyBindings(TQT_TQOBJECT(mKMMainWidget), TQT_SLOT(slotEditKeys()),
+ KStdAction::keyBindings(mKMMainWidget, TQ_SLOT(slotEditKeys()),
actionCollection());
- KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection());
+ KStdAction::quit( this, TQ_SLOT(slotQuit()), actionCollection());
createGUI( "kmmainwin.rc", false );
// Don't use conserveMemory() because this renders dynamic plugging
// of actions unusable!
@@ -66,14 +66,14 @@ KMMainWin::KMMainWin(TQWidget *)
applyMainWindowSettings(KMKernel::config(), "Main Window");
- connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
- this, TQT_SLOT( displayStatusMsg(const TQString&) ) );
+ connect( KPIM::BroadcastStatus::instance(), TQ_SIGNAL( statusMsg( const TQString& ) ),
+ this, TQ_SLOT( displayStatusMsg(const TQString&) ) );
- connect(kmkernel, TQT_SIGNAL(configChanged()),
- this, TQT_SLOT(slotConfigChanged()));
+ connect(kmkernel, TQ_SIGNAL(configChanged()),
+ this, TQ_SLOT(slotConfigChanged()));
- connect(mKMMainWidget, TQT_SIGNAL(captionChangeRequest(const TQString&)),
- TQT_SLOT(setCaption(const TQString&)) );
+ connect(mKMMainWidget, TQ_SIGNAL(captionChangeRequest(const TQString&)),
+ TQ_SLOT(setCaption(const TQString&)) );
// Enable mail checks again (see destructor)
kmkernel->enableMailCheck();
@@ -96,7 +96,7 @@ KMMainWin::~KMMainWin()
if ( !it.current()->isHidden() &&
it.current()->isTopLevel() &&
it.current() != this &&
- ::tqqt_cast<KMMainWin *>( it.current() )
+ ::tqt_cast<KMMainWin *>( it.current() )
)
not_withdrawn++;
}
@@ -145,8 +145,8 @@ void KMMainWin::slotEditToolbars()
saveMainWindowSettings(KMKernel::config(), "Main Window");
KEditToolbar dlg(actionCollection(), "kmmainwin.rc");
- connect( &dlg, TQT_SIGNAL(newToolbarConfig()),
- TQT_SLOT(slotUpdateToolbars()) );
+ connect( &dlg, TQ_SIGNAL(newToolbarConfig()),
+ TQ_SLOT(slotUpdateToolbars()) );
dlg.exec();
}
diff --git a/kmail/kmmainwin.h b/kmail/kmmainwin.h
index 2de06c26..9e12e71c 100644
--- a/kmail/kmmainwin.h
+++ b/kmail/kmmainwin.h
@@ -34,7 +34,7 @@ using KPIM::ProgressDialog;
class KMMainWin : public TDEMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp
index 779fffd4..91d8592f 100644
--- a/kmail/kmmimeparttree.cpp
+++ b/kmail/kmmimeparttree.cpp
@@ -68,11 +68,11 @@ KMMimePartTree::KMMimePartTree( KMReaderWin* readerWin,
setColumnAlignment( 3, TQt::AlignRight );
restoreLayoutIfPresent();
- connect( this, TQT_SIGNAL( clicked( TQListViewItem* ) ),
- this, TQT_SLOT( itemClicked( TQListViewItem* ) ) );
- connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*,
+ connect( this, TQ_SIGNAL( clicked( TQListViewItem* ) ),
+ this, TQ_SLOT( itemClicked( TQListViewItem* ) ) );
+ connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem*,
const TQPoint&, int ) ),
- this, TQT_SLOT( itemRightClicked( TQListViewItem*, const TQPoint& ) ) );
+ this, TQ_SLOT( itemRightClicked( TQListViewItem*, const TQPoint& ) ) );
setSelectionMode( TQListView::Extended );
setRootIsDecorated( false );
setAllColumnsShowFocus( true );
@@ -132,31 +132,31 @@ void KMMimePartTree::itemRightClicked( TQListViewItem* item,
TQPopupMenu* popup = new TQPopupMenu;
if ( mCurrentContextMenuItem->node()->nodeId() > 2 &&
mCurrentContextMenuItem->node()->typeString() != "Multipart" ) {
- popup->insertItem( SmallIcon("document-open"), i18n("to open", "Open"), this, TQT_SLOT(slotOpen()) );
- popup->insertItem( i18n("Open With..."), this, TQT_SLOT(slotOpenWith()) );
- popup->insertItem( i18n("to view something", "View"), this, TQT_SLOT(slotView()) );
+ popup->insertItem( SmallIcon("document-open"), i18n("to open", "Open"), this, TQ_SLOT(slotOpen()) );
+ popup->insertItem( i18n("Open With..."), this, TQ_SLOT(slotOpenWith()) );
+ popup->insertItem( i18n("to view something", "View"), this, TQ_SLOT(slotView()) );
}
- popup->insertItem( SmallIcon("document-save-as"),i18n( "Save &As..." ), this, TQT_SLOT( slotSaveAs() ) );
+ popup->insertItem( SmallIcon("document-save-as"),i18n( "Save &As..." ), this, TQ_SLOT( slotSaveAs() ) );
/*
* FIXME mkae optional?
popup->insertItem( i18n( "Save as &Encoded..." ), this,
- TQT_SLOT( slotSaveAsEncoded() ) );
+ TQ_SLOT( slotSaveAsEncoded() ) );
*/
popup->insertItem( i18n( "Save All Attachments..." ), this,
- TQT_SLOT( slotSaveAll() ) );
+ TQ_SLOT( slotSaveAll() ) );
// edit + delete only for attachments
if ( mCurrentContextMenuItem->node()->nodeId() > 2 &&
mCurrentContextMenuItem->node()->typeString() != "Multipart" ) {
- popup->insertItem( SmallIcon("edit-copy"), i18n("Copy"), this, TQT_SLOT(slotCopy()) );
+ popup->insertItem( SmallIcon("edit-copy"), i18n("Copy"), this, TQ_SLOT(slotCopy()) );
if ( GlobalSettings::self()->allowAttachmentDeletion() )
popup->insertItem( SmallIcon("edit-delete"), i18n( "Delete Attachment" ),
- this, TQT_SLOT( slotDelete() ) );
+ this, TQ_SLOT( slotDelete() ) );
if ( GlobalSettings::self()->allowAttachmentEditing() )
popup->insertItem( SmallIcon( "edit" ), i18n( "Edit Attachment" ),
- this, TQT_SLOT( slotEdit() ) );
+ this, TQ_SLOT( slotEdit() ) );
}
if ( mCurrentContextMenuItem->node()->nodeId() > 0 )
- popup->insertItem( i18n("Properties"), this, TQT_SLOT(slotProperties()) );
+ popup->insertItem( i18n("Properties"), this, TQ_SLOT(slotProperties()) );
popup->exec( point );
delete popup;
mCurrentContextMenuItem = 0;
@@ -295,8 +295,8 @@ void KMMimePartTree::startHandleAttachmentCommand(int type)
KMHandleAttachmentCommand* command = new KMHandleAttachmentCommand(
node, mReaderWin->message(), node->nodeId(), name,
KMHandleAttachmentCommand::AttachmentAction( type ), 0, this );
- connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ),
- mReaderWin, TQT_SLOT( slotAtmView( int, const TQString& ) ) );
+ connect( command, TQ_SIGNAL( showAttachment( int, const TQString& ) ),
+ mReaderWin, TQ_SLOT( slotAtmView( int, const TQString& ) ) );
command->start();
}
diff --git a/kmail/kmmimeparttree.h b/kmail/kmmimeparttree.h
index 1b4fc4f5..84da01cf 100644
--- a/kmail/kmmimeparttree.h
+++ b/kmail/kmmimeparttree.h
@@ -42,7 +42,7 @@ class KMMimePartTreeItem;
class KMMimePartTree : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
friend class ::KMReaderWin;
diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp
index 869ee015..9cf26fbe 100644
--- a/kmail/kmmsgpartdlg.cpp
+++ b/kmail/kmmsgpartdlg.cpp
@@ -71,7 +71,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
// row 0: Type combobox:
mMimeType = new KComboBox( true, plainPage() );
mMimeType->setInsertionPolicy( TQComboBox::NoInsertion );
- mMimeType->setValidator( new KMimeTypeValidator( TQT_TQOBJECT(mMimeType) ) );
+ mMimeType->setValidator( new KMimeTypeValidator( mMimeType ) );
mMimeType->insertStringList( TQStringList()
<< TQString::fromLatin1("text/html")
<< TQString::fromLatin1("text/plain")
@@ -81,8 +81,8 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
<< TQString::fromLatin1("application/octet-stream")
<< TQString::fromLatin1("application/x-gunzip")
<< TQString::fromLatin1("application/zip") );
- connect( mMimeType, TQT_SIGNAL(textChanged(const TQString&)),
- this, TQT_SLOT(slotMimeTypeChanged(const TQString&)) );
+ connect( mMimeType, TQ_SIGNAL(textChanged(const TQString&)),
+ this, TQ_SLOT(slotMimeTypeChanged(const TQString&)) );
glay->addWidget( mMimeType, 0, 1 );
msg = i18n("<qt><p>The <em>MIME type</em> of the file:</p>"
diff --git a/kmail/kmmsgpartdlg.h b/kmail/kmmsgpartdlg.h
index 0132be01..2cb9b114 100644
--- a/kmail/kmmsgpartdlg.h
+++ b/kmail/kmmsgpartdlg.h
@@ -38,7 +38,7 @@ class TQLineEdit;
*/
class KMMsgPartDialog: public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -139,7 +139,7 @@ protected:
@author Marc Mutz <mutz@kde.org>
*/
class KMMsgPartDialogCompat : public KMMsgPartDialog {
- Q_OBJECT
+ TQ_OBJECT
public:
KMMsgPartDialogCompat( TQWidget * parent=0, const char * caption=0, bool=FALSE );
diff --git a/kmail/kmpopfiltercnfrmdlg.cpp b/kmail/kmpopfiltercnfrmdlg.cpp
index 3689e663..9e18532d 100644
--- a/kmail/kmpopfiltercnfrmdlg.cpp
+++ b/kmail/kmpopfiltercnfrmdlg.cpp
@@ -61,8 +61,8 @@ KMPopHeadersView::KMPopHeadersView(TQWidget *aParent, KMPopFilterCnfrmDlg *aDial
//we rely on fixed column order, so we forbid this
header()->setMovingEnabled(false);
- connect(this, TQT_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)),
- TQT_SLOT(slotPressed(TQListViewItem*, const TQPoint&, int)));
+ connect(this, TQ_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)),
+ TQ_SLOT(slotPressed(TQListViewItem*, const TQPoint&, int)));
}
KMPopHeadersView::~KMPopHeadersView()
@@ -363,15 +363,15 @@ KMPopFilterCnfrmDlg::KMPopFilterCnfrmDlg(TQPtrList<KMPopHeaders> *aHeaders, cons
lowerBox->setTitle(i18n("Ruleset Filtered Messages: %1").arg(rulesetCount));
// connect signals and slots
- connect(lv, TQT_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)),
- this, TQT_SLOT(slotPressed(TQListViewItem*, const TQPoint&, int)));
- connect(mFilteredHeaders, TQT_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)),
- this, TQT_SLOT(slotPressed(TQListViewItem*, const TQPoint&, int)));
- connect(cb, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(slotToggled(bool)));
+ connect(lv, TQ_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)),
+ this, TQ_SLOT(slotPressed(TQListViewItem*, const TQPoint&, int)));
+ connect(mFilteredHeaders, TQ_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)),
+ this, TQ_SLOT(slotPressed(TQListViewItem*, const TQPoint&, int)));
+ connect(cb, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(slotToggled(bool)));
adjustSize();
- TQTimer::singleShot(0, this, TQT_SLOT(slotUpdateMinimumSize()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotUpdateMinimumSize()));
}
KMPopFilterCnfrmDlg::~KMPopFilterCnfrmDlg()
@@ -459,7 +459,7 @@ void KMPopFilterCnfrmDlg::slotToggled(bool aOn)
mFilteredHeaders->hide();
}
}
- TQTimer::singleShot(0, this, TQT_SLOT(slotUpdateMinimumSize()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotUpdateMinimumSize()));
}
void KMPopFilterCnfrmDlg::slotUpdateMinimumSize()
diff --git a/kmail/kmpopfiltercnfrmdlg.h b/kmail/kmpopfiltercnfrmdlg.h
index bb545305..f2fc4f80 100644
--- a/kmail/kmpopfiltercnfrmdlg.h
+++ b/kmail/kmpopfiltercnfrmdlg.h
@@ -35,7 +35,7 @@ class KMPopFilterCnfrmDlg;
*/
class KMPopHeadersView : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -78,7 +78,7 @@ protected:
class KMPopFilterCnfrmDlg : public KDialogBase
{
friend class ::KMPopHeadersView;
- Q_OBJECT
+ TQ_OBJECT
protected:
KMPopFilterCnfrmDlg() { };
diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp
index 336d4c16..db42f3fa 100644
--- a/kmail/kmreadermainwin.cpp
+++ b/kmail/kmreadermainwin.cpp
@@ -50,7 +50,7 @@
#include "kmreadermainwin.h"
-KMReaderMainWin::KMReaderMainWin( bool htmlOverride, bool htmlLoadExtOverride,
+KMReaderMainWin::KMReaderMainWin( bool htmlOverride, bool htmlLoadExtDefault,
char *name )
: KMail::SecondaryWindow( name ? name : "readerwindow#" ),
mMsg( 0 )
@@ -59,7 +59,7 @@ KMReaderMainWin::KMReaderMainWin( bool htmlOverride, bool htmlLoadExtOverride,
//mReaderWin->setShowCompleteMessage( true );
mReaderWin->setAutoDelete( true );
mReaderWin->setHtmlOverride( htmlOverride );
- mReaderWin->setHtmlLoadExtOverride( htmlLoadExtOverride );
+ mReaderWin->setHtmlLoadExtDefault( htmlLoadExtDefault );
mReaderWin->setDecryptMessageOverwrite( true );
mReaderWin->setShowSignatureDetails( false );
initKMReaderMainWin();
@@ -103,8 +103,8 @@ void KMReaderMainWin::initKMReaderMainWin() {
toolBar( "mainToolBar" )->hide();
}
- connect( kmkernel, TQT_SIGNAL( configChanged() ),
- this, TQT_SLOT( slotConfigChanged() ) );
+ connect( kmkernel, TQ_SIGNAL( configChanged() ),
+ this, TQ_SLOT( slotConfigChanged() ) );
}
void KMReaderMainWin::setupForwardingActionsList()
@@ -156,7 +156,7 @@ void KMReaderMainWin::showMsg( const TQString & encoding, KMMessage *msg,
menuBar()->show();
toolBar( "mainToolBar" )->show();
- connect ( msg->parent(), TQT_SIGNAL( destroyed( TQObject* ) ), this, TQT_SLOT( slotFolderRemoved( TQObject* ) ) );
+ connect ( msg->parent(), TQ_SIGNAL( destroyed( TQObject* ) ), this, TQ_SLOT( slotFolderRemoved( TQObject* ) ) );
}
@@ -241,8 +241,8 @@ void KMReaderMainWin::slotForwardInlineMsg()
} else {
command = new KMForwardInlineCommand( this, mReaderWin->message() );
}
- connect( command, TQT_SIGNAL( completed( KMCommand * ) ),
- this, TQT_SLOT( slotReplyOrForwardFinished() ) );
+ connect( command, TQ_SIGNAL( completed( KMCommand * ) ),
+ this, TQ_SLOT( slotReplyOrForwardFinished() ) );
command->start();
}
@@ -256,8 +256,8 @@ void KMReaderMainWin::slotForwardAttachedMsg()
} else {
command = new KMForwardAttachedCommand( this, mReaderWin->message() );
}
- connect( command, TQT_SIGNAL( completed( KMCommand * ) ),
- this, TQT_SLOT( slotReplyOrForwardFinished() ) );
+ connect( command, TQ_SIGNAL( completed( KMCommand * ) ),
+ this, TQ_SLOT( slotReplyOrForwardFinished() ) );
command->start();
}
@@ -271,8 +271,8 @@ void KMReaderMainWin::slotForwardDigestMsg()
} else {
command = new KMForwardDigestCommand( this, mReaderWin->message() );
}
- connect( command, TQT_SIGNAL( completed( KMCommand * ) ),
- this, TQT_SLOT( slotReplyOrForwardFinished() ) );
+ connect( command, TQ_SIGNAL( completed( KMCommand * ) ),
+ this, TQ_SLOT( slotReplyOrForwardFinished() ) );
command->start();
}
@@ -280,8 +280,8 @@ void KMReaderMainWin::slotForwardDigestMsg()
void KMReaderMainWin::slotRedirectMsg()
{
KMCommand *command = new KMRedirectCommand( this, mReaderWin->message() );
- connect( command, TQT_SIGNAL( completed( KMCommand * ) ),
- this, TQT_SLOT( slotReplyOrForwardFinished() ) );
+ connect( command, TQ_SIGNAL( completed( KMCommand * ) ),
+ this, TQ_SLOT( slotReplyOrForwardFinished() ) );
command->start();
}
@@ -299,7 +299,7 @@ void KMReaderMainWin::slotShowMsgSrc()
//-----------------------------------------------------------------------------
void KMReaderMainWin::setupForwardActions()
{
- disconnect( mForwardActionMenu, TQT_SIGNAL( activated() ), 0, 0 );
+ disconnect( mForwardActionMenu, TQ_SIGNAL( activated() ), 0, 0 );
mForwardActionMenu->remove( mForwardInlineAction );
mForwardActionMenu->remove( mForwardAttachedAction );
@@ -308,16 +308,16 @@ void KMReaderMainWin::setupForwardActions()
mForwardActionMenu->insert( mForwardAttachedAction, 1 );
mForwardInlineAction->setShortcut( Key_F );
mForwardAttachedAction->setShortcut( SHIFT+Key_F );
- connect( mForwardActionMenu, TQT_SIGNAL(activated()), this,
- TQT_SLOT(slotForwardInlineMsg()) );
+ connect( mForwardActionMenu, TQ_SIGNAL(activated()), this,
+ TQ_SLOT(slotForwardInlineMsg()) );
} else {
mForwardActionMenu->insert( mForwardAttachedAction, 0 );
mForwardActionMenu->insert( mForwardInlineAction, 1 );
mForwardInlineAction->setShortcut( SHIFT+Key_F );
mForwardAttachedAction->setShortcut( Key_F );
- connect( mForwardActionMenu, TQT_SIGNAL(activated()), this,
- TQT_SLOT(slotForwardAttachedMsg()) );
+ connect( mForwardActionMenu, TQ_SIGNAL(activated()), this,
+ TQ_SLOT(slotForwardAttachedMsg()) );
}
}
@@ -336,42 +336,42 @@ void KMReaderMainWin::setupAccel()
mMsgActions = new KMail::MessageActions( actionCollection(), this );
mMsgActions->setMessageView( mReaderWin );
- connect( mMsgActions, TQT_SIGNAL( replyActionFinished() ),
- this, TQT_SLOT( slotReplyOrForwardFinished() ) );
+ connect( mMsgActions, TQ_SIGNAL( replyActionFinished() ),
+ this, TQ_SLOT( slotReplyOrForwardFinished() ) );
//----- File Menu
- //mOpenAction = KStdAction::open( this, TQT_SLOT( slotOpenMsg() ),
+ //mOpenAction = KStdAction::open( this, TQ_SLOT( slotOpenMsg() ),
// actionCollection() );
//mSaveAsAction = new TDEAction( i18n("Save &As..."), "document-save",
// TDEStdAccel::shortcut( TDEStdAccel::Save ),
- // this, TQT_SLOT( slotSaveMsg() ),
+ // this, TQ_SLOT( slotSaveMsg() ),
// actionCollection(), "file_save_as" );
- mSaveAsAction = KStdAction::saveAs( TQT_TQOBJECT(mReaderWin), TQT_SLOT( slotSaveMsg() ),
+ mSaveAsAction = KStdAction::saveAs( mReaderWin, TQ_SLOT( slotSaveMsg() ),
actionCollection() );
mSaveAsAction->setShortcut( TDEStdAccel::shortcut( TDEStdAccel::Save ) );
- mPrintAction = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( slotPrintMsg() ),
+ mPrintAction = KStdAction::print( this, TQ_SLOT( slotPrintMsg() ),
actionCollection() );
- TDEAction *closeAction = KStdAction::close( TQT_TQOBJECT(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);
//----- Edit Menu
- KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), actionCollection() );
- KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( slotMarkAll() ), actionCollection() );
- KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT(slotFind()), actionCollection() );
- KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( slotFindNext() ), actionCollection() );
+ KStdAction::copy( this, TQ_SLOT( slotCopy() ), actionCollection() );
+ KStdAction::selectAll( this, TQ_SLOT( slotMarkAll() ), actionCollection() );
+ KStdAction::find( this, TQ_SLOT(slotFind()), actionCollection() );
+ KStdAction::findNext( this, TQ_SLOT( slotFindNext() ), actionCollection() );
mTrashAction = new TDEAction( KGuiItem( i18n( "&Move to Trash" ), "edittrash",
i18n( "Move message to trashcan" ) ),
- Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotTrashMsg() ),
+ Key_Delete, this, TQ_SLOT( slotTrashMsg() ),
actionCollection(), "move_to_trash" );
//----- View Menu
- mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, TQT_TQOBJECT(this),
- TQT_SLOT(slotShowMsgSrc()), actionCollection(),
+ mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, this,
+ TQ_SLOT(slotShowMsgSrc()), actionCollection(),
"view_source" );
@@ -379,26 +379,26 @@ void KMReaderMainWin::setupAccel()
"mail-forward", actionCollection(),
"message_forward" );
mForwardInlineAction = new TDEAction( i18n("&Inline..."),
- "mail-forward", SHIFT+Key_F, TQT_TQOBJECT(this),
- TQT_SLOT(slotForwardInlineMsg()),
+ "mail-forward", SHIFT+Key_F, this,
+ TQ_SLOT(slotForwardInlineMsg()),
actionCollection(),
"message_forward_inline" );
mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."),
- "mail-forward", Key_F, TQT_TQOBJECT(this),
- TQT_SLOT(slotForwardAttachedMsg()),
+ "mail-forward", Key_F, this,
+ TQ_SLOT(slotForwardAttachedMsg()),
actionCollection(),
"message_forward_as_attachment" );
mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."),
- "mail-forward", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotForwardDigestMsg()),
+ "mail-forward", 0, this,
+ TQ_SLOT(slotForwardDigestMsg()),
actionCollection(),
"message_forward_as_digest" );
mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."),
- "mail-forward", Key_E, TQT_TQOBJECT(this),
- TQT_SLOT(slotRedirectMsg()),
+ "mail-forward", Key_E, this,
+ TQ_SLOT(slotRedirectMsg()),
actionCollection(),
"message_forward_redirect" );
@@ -410,32 +410,32 @@ void KMReaderMainWin::setupAccel()
fontAction = new TDEFontAction( "Select Font", 0, actionCollection(),
"text_font" );
fontAction->setFont( mReaderWin->cssHelper()->bodyFont().family() );
- connect( fontAction, TQT_SIGNAL( activated( const TQString& ) ),
- TQT_SLOT( slotFontAction( const TQString& ) ) );
+ connect( fontAction, TQ_SIGNAL( activated( const TQString& ) ),
+ TQ_SLOT( slotFontAction( const TQString& ) ) );
fontSizeAction = new TDEFontSizeAction( "Select Size", 0, actionCollection(),
"text_size" );
fontSizeAction->setFontSize( mReaderWin->cssHelper()->bodyFont().pointSize() );
- connect( fontSizeAction, TQT_SIGNAL( fontSizeChanged( int ) ),
- TQT_SLOT( slotSizeAction( int ) ) );
+ connect( fontSizeAction, TQ_SIGNAL( fontSizeChanged( int ) ),
+ TQ_SLOT( slotSizeAction( int ) ) );
TQAccel *accel = new TQAccel(mReaderWin, "showMsg()");
accel->connectItem(accel->insertItem(Key_Up),
- mReaderWin, TQT_SLOT(slotScrollUp()));
+ mReaderWin, TQ_SLOT(slotScrollUp()));
accel->connectItem(accel->insertItem(Key_Down),
- mReaderWin, TQT_SLOT(slotScrollDown()));
+ mReaderWin, TQ_SLOT(slotScrollDown()));
accel->connectItem(accel->insertItem(Key_Prior),
- mReaderWin, TQT_SLOT(slotScrollPrior()));
+ mReaderWin, TQ_SLOT(slotScrollPrior()));
accel->connectItem(accel->insertItem(Key_Next),
- mReaderWin, TQT_SLOT(slotScrollNext()));
+ mReaderWin, TQ_SLOT(slotScrollNext()));
accel->connectItem(accel->insertItem(TDEStdAccel::shortcut(TDEStdAccel::Copy)),
- mReaderWin, TQT_SLOT(slotCopySelectedText()));
- connect( mReaderWin, TQT_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)),
- this, TQT_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&)));
- connect(mReaderWin, TQT_SIGNAL(urlClicked(const KURL&,int)),
- mReaderWin, TQT_SLOT(slotUrlClicked()));
+ mReaderWin, TQ_SLOT(slotCopySelectedText()));
+ connect( mReaderWin, TQ_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)),
+ this, TQ_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&)));
+ connect(mReaderWin, TQ_SIGNAL(urlClicked(const KURL&,int)),
+ mReaderWin, TQ_SLOT(slotUrlClicked()));
setStandardToolBarMenuEnabled(true);
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection());
+ KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbars()), actionCollection());
}
@@ -503,7 +503,7 @@ void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KURL &aUrl, const TQPo
TQPopupMenu* copyMenu = new TQPopupMenu(menu);
KMMainWidget* mainwin = kmkernel->getKMMainWidget();
if ( mainwin )
- mainwin->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, TQT_TQOBJECT(this),
+ mainwin->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, this,
&mMenuToFolder, copyMenu );
menu->insertItem( i18n("&Copy To" ), copyMenu );
menu->insertSeparator();
@@ -513,7 +513,7 @@ void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KURL &aUrl, const TQPo
menu->insertSeparator();
mPrintAction->plug( menu );
mSaveAsAction->plug( menu );
- menu->insertItem( i18n("Save Attachments..."), mReaderWin, TQT_SLOT(slotSaveAttachments()) );
+ menu->insertItem( i18n("Save Attachments..."), mReaderWin, TQ_SLOT(slotSaveAttachments()) );
mMsgActions->createTodoAction()->plug( menu );
}
menu->exec(aPoint, 0);
@@ -561,7 +561,7 @@ void KMReaderMainWin::slotEditToolbars()
{
saveMainWindowSettings( KMKernel::config(), "ReaderWindow" );
KEditToolbar dlg( guiFactory(), this );
- connect( &dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(slotUpdateToolbars()) );
+ connect( &dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(slotUpdateToolbars()) );
dlg.exec();
}
diff --git a/kmail/kmreadermainwin.h b/kmail/kmreadermainwin.h
index 2101fcb5..2a753b95 100644
--- a/kmail/kmreadermainwin.h
+++ b/kmail/kmreadermainwin.h
@@ -22,11 +22,11 @@ class MessageActions;
class KMReaderMainWin : public KMail::SecondaryWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
- KMReaderMainWin( bool htmlOverride, bool htmlLoadExtOverride, char *name = 0 );
+ KMReaderMainWin( bool htmlOverride, bool htmlLoadExtDefault, char *name = 0 );
KMReaderMainWin( char *name = 0 );
KMReaderMainWin(KMMessagePart* aMsgPart,
bool aHTML, const TQString& aFileName, const TQString& pname,
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 184167b0..d0d78b72 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -385,7 +385,7 @@ kdDebug(5006) << " Root node will NOT be replaced." << endl
void KMReaderWin::createWidgets() {
TQVBoxLayout * vlay = new TQVBoxLayout( this );
- mSplitter = new TQSplitter( Qt::Vertical, this, "mSplitter" );
+ mSplitter = new TQSplitter( TQt::Vertical, this, "mSplitter" );
vlay->addWidget( mSplitter );
mMimePartTree = new KMMimePartTree( this, mSplitter, "mMimePartTree" );
mBox = new TQHBox( mSplitter, "mBox" );
@@ -464,18 +464,19 @@ KMReaderWin::KMReaderWin(TQWidget *aParent,
readConfig();
mHtmlOverride = false;
+ mHtmlLoadExtDefault = false;
mHtmlLoadExtOverride = false;
mLevelQuote = GlobalSettings::self()->collapseQuoteLevelSpin() - 1;
- connect( &mUpdateReaderWinTimer, TQT_SIGNAL(timeout()),
- TQT_TQOBJECT(this), TQT_SLOT(updateReaderWin()) );
- connect( &mResizeTimer, TQT_SIGNAL(timeout()),
- TQT_TQOBJECT(this), TQT_SLOT(slotDelayedResize()) );
- connect( &mDelayedMarkTimer, TQT_SIGNAL(timeout()),
- TQT_TQOBJECT(this), TQT_SLOT(slotTouchMessage()) );
- connect( &mHeaderRefreshTimer, TQT_SIGNAL(timeout()),
- TQT_TQOBJECT(this), TQT_SLOT(updateHeader()) );
+ connect( &mUpdateReaderWinTimer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(updateReaderWin()) );
+ connect( &mResizeTimer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(slotDelayedResize()) );
+ connect( &mDelayedMarkTimer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(slotTouchMessage()) );
+ connect( &mHeaderRefreshTimer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(updateHeader()) );
}
@@ -490,46 +491,46 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) {
new TDEActionMenu( i18n("View->", "&Headers"), ac, "view_headers" );
headerMenu->setToolTip( i18n("Choose display style of message headers") );
- connect( headerMenu, TQT_SIGNAL(activated()),
- TQT_TQOBJECT(this), TQT_SLOT(slotCycleHeaderStyles()) );
+ connect( headerMenu, TQ_SIGNAL(activated()),
+ this, TQ_SLOT(slotCycleHeaderStyles()) );
raction = new TDERadioAction( i18n("View->headers->", "&Enterprise Headers"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotEnterpriseHeaders()),
+ this, TQ_SLOT(slotEnterpriseHeaders()),
ac, "view_headers_enterprise" );
raction->setToolTip( i18n("Show the list of headers in Enterprise style") );
raction->setExclusiveGroup( "view_headers_group" );
headerMenu->insert(raction);
raction = new TDERadioAction( i18n("View->headers->", "&Fancy Headers"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotFancyHeaders()),
+ this, TQ_SLOT(slotFancyHeaders()),
ac, "view_headers_fancy" );
raction->setToolTip( i18n("Show the list of headers in a fancy format") );
raction->setExclusiveGroup( "view_headers_group" );
headerMenu->insert( raction );
raction = new TDERadioAction( i18n("View->headers->", "&Brief Headers"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotBriefHeaders()),
+ this, TQ_SLOT(slotBriefHeaders()),
ac, "view_headers_brief" );
raction->setToolTip( i18n("Show brief list of message headers") );
raction->setExclusiveGroup( "view_headers_group" );
headerMenu->insert( raction );
raction = new TDERadioAction( i18n("View->headers->", "&Standard Headers"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotStandardHeaders()),
+ this, TQ_SLOT(slotStandardHeaders()),
ac, "view_headers_standard" );
raction->setToolTip( i18n("Show standard list of message headers") );
raction->setExclusiveGroup( "view_headers_group" );
headerMenu->insert( raction );
raction = new TDERadioAction( i18n("View->headers->", "&Long Headers"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotLongHeaders()),
+ this, TQ_SLOT(slotLongHeaders()),
ac, "view_headers_long" );
raction->setToolTip( i18n("Show long list of message headers") );
raction->setExclusiveGroup( "view_headers_group" );
headerMenu->insert( raction );
raction = new TDERadioAction( i18n("View->headers->", "&All Headers"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotAllHeaders()),
+ this, TQ_SLOT(slotAllHeaders()),
ac, "view_headers_all" );
raction->setToolTip( i18n("Show all message headers") );
raction->setExclusiveGroup( "view_headers_group" );
@@ -539,39 +540,39 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) {
TDEActionMenu *attachmentMenu =
new TDEActionMenu( i18n("View->", "&Attachments"), ac, "view_attachments" );
attachmentMenu->setToolTip( i18n("Choose display style of attachments") );
- connect( attachmentMenu, TQT_SIGNAL(activated()),
- TQT_TQOBJECT(this), TQT_SLOT(slotCycleAttachmentStrategy()) );
+ connect( attachmentMenu, TQ_SIGNAL(activated()),
+ this, TQ_SLOT(slotCycleAttachmentStrategy()) );
raction = new TDERadioAction( i18n("View->attachments->", "&As Icons"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotIconicAttachments()),
+ this, TQ_SLOT(slotIconicAttachments()),
ac, "view_attachments_as_icons" );
raction->setToolTip( i18n("Show all attachments as icons. Click to see them.") );
raction->setExclusiveGroup( "view_attachments_group" );
attachmentMenu->insert( raction );
raction = new TDERadioAction( i18n("View->attachments->", "&Smart"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotSmartAttachments()),
+ this, TQ_SLOT(slotSmartAttachments()),
ac, "view_attachments_smart" );
raction->setToolTip( i18n("Show attachments as suggested by sender.") );
raction->setExclusiveGroup( "view_attachments_group" );
attachmentMenu->insert( raction );
raction = new TDERadioAction( i18n("View->attachments->", "&Inline"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotInlineAttachments()),
+ this, TQ_SLOT(slotInlineAttachments()),
ac, "view_attachments_inline" );
raction->setToolTip( i18n("Show all attachments inline (if possible)") );
raction->setExclusiveGroup( "view_attachments_group" );
attachmentMenu->insert( raction );
raction = new TDERadioAction( i18n("View->attachments->", "&Hide"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotHideAttachments()),
+ this, TQ_SLOT(slotHideAttachments()),
ac, "view_attachments_hide" );
raction->setToolTip( i18n("Do not show attachments in the message viewer") );
raction->setExclusiveGroup( "view_attachments_group" );
attachmentMenu->insert( raction );
mHeaderOnlyAttachmentsAction = new TDERadioAction( i18n( "View->attachments->", "In Header &Only" ), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotHeaderOnlyAttachments() ),
+ this, TQ_SLOT( slotHeaderOnlyAttachments() ),
ac, "view_attachments_headeronly" );
mHeaderOnlyAttachmentsAction->setToolTip( i18n( "Show Attachments only in the header of the mail" ) );
mHeaderOnlyAttachmentsAction->setExclusiveGroup( "view_attachments_group" );
@@ -579,7 +580,7 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) {
// Set Encoding submenu
mSelectEncodingAction = new TDESelectAction( i18n( "&Set Encoding" ), "charset", 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotSetEncoding() ),
+ this, TQ_SLOT( slotSetEncoding() ),
ac, "encoding" );
TQStringList encodings = KMMsgBase::supportedEncodings( false );
encodings.prepend( i18n( "Auto" ) );
@@ -587,45 +588,45 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) {
mSelectEncodingAction->setCurrentItem( 0 );
mMailToComposeAction = new TDEAction( i18n("New Message To..."), "mail-message-new",
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoCompose()), ac,
+ 0, this, TQ_SLOT(slotMailtoCompose()), ac,
"mailto_compose" );
mMailToReplyAction = new TDEAction( i18n("Reply To..."), "mail-reply-sender",
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoReply()), ac,
+ 0, this, TQ_SLOT(slotMailtoReply()), ac,
"mailto_reply" );
mMailToForwardAction = new TDEAction( i18n("Forward To..."), "mail-forward",
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoForward()), ac,
+ 0, this, TQ_SLOT(slotMailtoForward()), ac,
"mailto_forward" );
mAddAddrBookAction = new TDEAction( i18n("Add to Address Book"),
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoAddAddrBook()),
+ 0, this, TQ_SLOT(slotMailtoAddAddrBook()),
ac, "add_addr_book" );
mOpenAddrBookAction = new TDEAction( i18n("Open in Address Book"),
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoOpenAddrBook()),
+ 0, this, TQ_SLOT(slotMailtoOpenAddrBook()),
ac, "openin_addr_book" );
- mCopyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopySelectedText()), ac, "kmail_copy");
- mSelectAllAction = new TDEAction( i18n("Select All Text"), CTRL+SHIFT+Key_A, TQT_TQOBJECT(this),
- TQT_SLOT(selectAll()), ac, "mark_all_text" );
- mCopyURLAction = new TDEAction( i18n("Copy Link Address"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotUrlCopy()), ac, "copy_url" );
- mUrlOpenAction = new TDEAction( i18n("Open URL"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotUrlOpen()), ac, "open_url" );
+ mCopyAction = KStdAction::copy( this, TQ_SLOT(slotCopySelectedText()), ac, "kmail_copy");
+ mSelectAllAction = new TDEAction( i18n("Select All Text"), CTRL+SHIFT+Key_A, this,
+ TQ_SLOT(selectAll()), ac, "mark_all_text" );
+ mCopyURLAction = new TDEAction( i18n("Copy Link Address"), 0, this,
+ TQ_SLOT(slotUrlCopy()), ac, "copy_url" );
+ mUrlOpenAction = new TDEAction( i18n("Open URL"), 0, this,
+ TQ_SLOT(slotUrlOpen()), ac, "open_url" );
mAddBookmarksAction = new TDEAction( i18n("Bookmark This Link"),
"bookmark_add",
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddBookmarks()),
+ 0, this, TQ_SLOT(slotAddBookmarks()),
ac, "add_bookmarks" );
- mUrlSaveAsAction = new TDEAction( i18n("Save Link As..."), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotUrlSave()), ac, "saveas_url" );
+ mUrlSaveAsAction = new TDEAction( i18n("Save Link As..."), 0, this,
+ TQ_SLOT(slotUrlSave()), ac, "saveas_url" );
mToggleFixFontAction = new TDEToggleAction( i18n("Use Fi&xed Font"),
- Key_X, TQT_TQOBJECT(this), TQT_SLOT(slotToggleFixedFont()),
+ Key_X, this, TQ_SLOT(slotToggleFixedFont()),
ac, "toggle_fixedfont" );
mToggleMimePartTreeAction = new TDEToggleAction( i18n("Show Message Structure"),
0, ac, "toggle_mimeparttree" );
- connect(mToggleMimePartTreeAction, TQT_SIGNAL(toggled(bool)),
- TQT_TQOBJECT(this), TQT_SLOT(slotToggleMimePartTree()));
+ connect(mToggleMimePartTreeAction, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(slotToggleMimePartTree()));
- mStartIMChatAction = new TDEAction( i18n("Chat &With..."), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotIMChat()), ac, "start_im_chat" );
+ mStartIMChatAction = new TDEAction( i18n("Chat &With..."), 0, this,
+ TQ_SLOT(slotIMChat()), ac, "start_im_chat" );
}
// little helper function
@@ -902,7 +903,6 @@ void KMReaderWin::readConfig(void)
mToggleFixFontAction->setChecked( mUseFixedFont );
mHtmlMail = reader.readBoolEntry( "htmlMail", false );
- mHtmlLoadExternal = reader.readBoolEntry( "htmlLoadExternal", false );
setHeaderStyleAndStrategy( HeaderStyle::create( reader.readEntry( "header-style", "fancy" ) ),
HeaderStrategy::create( reader.readEntry( "header-set-displayed", "rich" ) ) );
@@ -1000,7 +1000,7 @@ void KMReaderWin::writeConfig( bool sync ) const {
//-----------------------------------------------------------------------------
void KMReaderWin::initHtmlWidget(void)
{
- mViewer->widget()->setFocusPolicy(TQ_WheelFocus);
+ mViewer->widget()->setFocusPolicy(TQWidget::WheelFocus);
// Let's better be paranoid and disable plugins (it defaults to enabled):
mViewer->setPluginsEnabled(false);
mViewer->setJScriptEnabled(false); // just make this explicit
@@ -1021,17 +1021,17 @@ void KMReaderWin::initHtmlWidget(void)
#endif
connect(mViewer->browserExtension(),
- TQT_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)),this,
- TQT_SLOT(slotUrlOpen(const KURL &)));
+ TQ_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)),this,
+ TQ_SLOT(slotUrlOpen(const KURL &)));
connect(mViewer->browserExtension(),
- TQT_SIGNAL(createNewWindow(const KURL &, const KParts::URLArgs &)),this,
- TQT_SLOT(slotUrlOpen(const KURL &)));
- connect(mViewer,TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)),
- TQT_SLOT(slotUrlPopup(const TQString &, const TQPoint &)));
- connect( kmkernel->imProxy(), TQT_SIGNAL( sigContactPresenceChanged( const TQString & ) ),
- TQT_TQOBJECT(this), TQT_SLOT( contactStatusChanged( const TQString & ) ) );
- connect( kmkernel->imProxy(), TQT_SIGNAL( sigPresenceInfoExpired() ),
- TQT_TQOBJECT(this), TQT_SLOT( updateReaderWin() ) );
+ TQ_SIGNAL(createNewWindow(const KURL &, const KParts::URLArgs &)),this,
+ TQ_SLOT(slotUrlOpen(const KURL &)));
+ connect(mViewer,TQ_SIGNAL(popupMenu(const TQString &, const TQPoint &)),
+ TQ_SLOT(slotUrlPopup(const TQString &, const TQPoint &)));
+ connect( kmkernel->imProxy(), TQ_SIGNAL( sigContactPresenceChanged( const TQString & ) ),
+ this, TQ_SLOT( contactStatusChanged( const TQString & ) ) );
+ connect( kmkernel->imProxy(), TQ_SIGNAL( sigPresenceInfoExpired() ),
+ this, TQ_SLOT( updateReaderWin() ) );
}
void KMReaderWin::contactStatusChanged( const TQString &uid)
@@ -1408,8 +1408,6 @@ void KMReaderWin::updateReaderWin()
{
if (!mMsgDisplay) return;
- mViewer->setOnlyLocalReferences(!htmlLoadExternal());
-
htmlWriter()->reset();
KMFolder* folder = 0;
@@ -1499,7 +1497,7 @@ void KMReaderWin::displayMessage() {
htmlWriter()->queue("</body></html>");
htmlWriter()->flush();
- TQTimer::singleShot( 1, TQT_TQOBJECT(this), TQT_SLOT(injectAttachments()) );
+ TQTimer::singleShot( 1, this, TQ_SLOT(injectAttachments()) );
}
static bool message_was_saved_decrypted_before( const KMMessage * msg ) {
@@ -1579,6 +1577,7 @@ void KMReaderWin::parseMsg(KMMessage* aMsg)
// - this can only be done *after* calling parseObjectTree()
KMMsgEncryptionState encryptionState = mRootNode->overallEncryptionState();
KMMsgSignatureState signatureState = mRootNode->overallSignatureState();
+ mViewer->setOnlyLocalReferences(!htmlLoadExternal());
// Don't crash when switching message while GPG passphrase entry dialog is shown #53185
if (aMsg != message()) {
displayMessage();
@@ -1776,8 +1775,12 @@ TQString KMReaderWin::writeMessagePartToTempFile( KMMessagePart* aMsgPart,
int slashPos = fileName.findRev( '/' );
if( -1 != slashPos )
fileName = fileName.mid( slashPos + 1 );
- if( fileName.isEmpty() )
+ if( fileName.isEmpty() ) {
fileName = "unnamed";
+ // Save html emails with extension
+ if ( aMsgPart->subtype() == DwMime::kSubtypeHtml )
+ fileName += ".html";
+ }
fname += "/" + fileName;
TQByteArray data = aMsgPart->bodyDecodedBinary();
@@ -1995,7 +1998,7 @@ void KMReaderWin::slotUrlOpen(const KURL &aUrl, const KParts::URLArgs &)
return;
kdWarning( 5006 ) << "KMReaderWin::slotOpenUrl(): Unhandled URL click!" << endl;
- emit urlClicked( aUrl, Qt::LeftButton );
+ emit urlClicked( aUrl, TQt::LeftButton );
}
//-----------------------------------------------------------------------------
@@ -2066,7 +2069,7 @@ void KMReaderWin::showAttachmentPopup( int id, const TQString & name, const TQPo
menu->insertItem( i18n("Scroll To"), 10 );
}
- connect(menu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHandleAttachment(int)));
+ connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHandleAttachment(int)));
menu->exec( p ,0 );
delete menu;
}
@@ -2106,8 +2109,8 @@ void KMReaderWin::slotHandleAttachment( int choice )
KMHandleAttachmentCommand* command = new KMHandleAttachmentCommand(
node, message(), mAtmCurrent, mAtmCurrentName,
KMHandleAttachmentCommand::AttachmentAction( choice ), 0, this );
- connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotAtmView( int, const TQString& ) ) );
+ connect( command, TQ_SIGNAL( showAttachment( int, const TQString& ) ),
+ this, TQ_SLOT( slotAtmView( int, const TQString& ) ) );
command->start();
} else if ( choice == 7 ) {
slotDeleteAttachment( node );
@@ -2394,8 +2397,8 @@ void KMReaderWin::openAttachment( int id, const TQString & name )
KMHandleAttachmentCommand* command = new KMHandleAttachmentCommand( node,
message(), mAtmCurrent, mAtmCurrentName, KMHandleAttachmentCommand::Save,
offer, this );
- connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotAtmView( int, const TQString& ) ) );
+ connect( command, TQ_SIGNAL( showAttachment( int, const TQString& ) ),
+ this, TQ_SLOT( slotAtmView( int, const TQString& ) ) );
command->start();
}
else if( choice == KMessageBox::No ) { // Open
@@ -2404,8 +2407,8 @@ void KMReaderWin::openAttachment( int id, const TQString & name )
mAtmUpdate = true;
KMHandleAttachmentCommand* command = new KMHandleAttachmentCommand( node,
message(), mAtmCurrent, mAtmCurrentName, action, offer, this );
- connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotAtmView( int, const TQString& ) ) );
+ connect( command, TQ_SIGNAL( showAttachment( int, const TQString& ) ),
+ this, TQ_SLOT( slotAtmView( int, const TQString& ) ) );
command->start();
} else { // Cancel
kdDebug(5006) << "Canceled opening attachment" << endl;
@@ -2497,11 +2500,14 @@ void KMReaderWin::setHtmlOverride(bool override)
//-----------------------------------------------------------------------------
-void KMReaderWin::setHtmlLoadExtOverride(bool override)
+void KMReaderWin::setHtmlLoadExtDefault(bool loadExtDefault)
+{
+ mHtmlLoadExtDefault = loadExtDefault;
+}
+
+void KMReaderWin::setHtmlLoadExtOverride(bool loadExtOverride)
{
- mHtmlLoadExtOverride = override;
- //if (message())
- // message()->setDecodeHTML(htmlMail());
+ mHtmlLoadExtOverride = loadExtOverride;
}
@@ -2515,8 +2521,19 @@ bool KMReaderWin::htmlMail()
//-----------------------------------------------------------------------------
bool KMReaderWin::htmlLoadExternal()
{
- return ((mHtmlLoadExternal && !mHtmlLoadExtOverride) ||
- (!mHtmlLoadExternal && mHtmlLoadExtOverride));
+ if (!mRootNode)
+ {
+ return mHtmlLoadExtOverride;
+ }
+
+ // when displaying an encrypted message, only load external resources on explicit request
+ if (mRootNode->overallEncryptionState() != KMMsgNotEncrypted)
+ {
+ return mHtmlLoadExtOverride;
+ }
+
+ return ((mHtmlLoadExtDefault && !mHtmlLoadExtOverride) ||
+ (!mHtmlLoadExtDefault && mHtmlLoadExtOverride));
}
@@ -2741,14 +2758,14 @@ static TQString linkForNode( const DOM::Node &node )
bool KMReaderWin::eventFilter( TQObject *, TQEvent *e )
{
if ( e->type() == TQEvent::MouseButtonPress ) {
- TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
- if ( me->button() == Qt::LeftButton && ( me->state() & ShiftButton ) ) {
+ TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
+ if ( me->button() == TQt::LeftButton && ( me->state() & ShiftButton ) ) {
// special processing for shift+click
URLHandlerManager::instance()->handleShiftClick( mHoveredUrl, this );
return true;
}
- if ( me->button() == Qt::LeftButton ) {
+ if ( me->button() == TQt::LeftButton ) {
TQString imagePath;
const DOM::Node nodeUnderMouse = mViewer->nodeUnderMouse();
@@ -2773,7 +2790,7 @@ bool KMReaderWin::eventFilter( TQObject *, TQEvent *e )
}
if ( e->type() == TQEvent::MouseMove ) {
- TQMouseEvent* me = TQT_TQMOUSEEVENT( e );
+ TQMouseEvent* me = static_cast<TQMouseEvent*>( e );
// Handle this ourselves instead of connecting to mViewer::onURL(), since TDEHTML misses some
// notifications in case we started a drag ourselves
@@ -2788,8 +2805,8 @@ bool KMReaderWin::eventFilter( TQObject *, TQEvent *e )
// HACK: Send a mouse release event to the TDEHTMLView, as otherwise that will be missed in
// case we started a drag. If the event is missed, the HTML view gets into a wrong
// state, in which funny things like unsolicited drags start to happen.
- TQMouseEvent mouseEvent( TQEvent::MouseButtonRelease, me->pos(), Qt::NoButton, Qt::NoButton );
- TQT_TQOBJECT( mViewer->view() )->eventFilter( mViewer->view()->viewport(),
+ TQMouseEvent mouseEvent( TQEvent::MouseButtonRelease, me->pos(), TQt::NoButton, TQt::NoButton );
+ static_cast<TQObject*>(mViewer->view())->eventFilter( mViewer->view()->viewport(),
&mouseEvent );
return true;
}
@@ -2840,10 +2857,10 @@ void KMReaderWin::slotDeleteAttachment(partNode * node)
if ( msg && nodeId != -1 ) {
KMDeleteAttachmentCommand* command = new KMDeleteAttachmentCommand( nodeId, msg, this );
command->start();
- connect( command, TQT_SIGNAL( completed( KMCommand * ) ),
- TQT_TQOBJECT(this), TQT_SLOT( updateReaderWin() ) );
- connect( command, TQT_SIGNAL( completed( KMCommand * ) ),
- TQT_TQOBJECT(this), TQT_SLOT( disconnectMsgAdded() ) );
+ connect( command, TQ_SIGNAL( completed( KMCommand * ) ),
+ this, TQ_SLOT( updateReaderWin() ) );
+ connect( command, TQ_SIGNAL( completed( KMCommand * ) ),
+ this, TQ_SLOT( disconnectMsgAdded() ) );
// ### HACK: Since the command will do delete + add, a new message will arrive. However, we don't
// want the selection to change. Therefore, as soon as a new message arrives, select it, and then
@@ -2851,8 +2868,8 @@ void KMReaderWin::slotDeleteAttachment(partNode * node)
// Of course the are races, another message can arrive before ours, but we take the risk.
// And it won't work properly with multiple main windows
const KMHeaders * const headers = KMKernel::self()->getKMMainWidget()->headers();
- connect( headers, TQT_SIGNAL( msgAddedToListView( TQListViewItem* ) ),
- TQT_TQOBJECT(this), TQT_SLOT( msgAdded( TQListViewItem* ) ) );
+ connect( headers, TQ_SIGNAL( msgAddedToListView( TQListViewItem* ) ),
+ this, TQ_SLOT( msgAdded( TQListViewItem* ) ) );
}
// If we are operating on a copy of parts of the message, make sure to update the copy as well.
@@ -2877,8 +2894,8 @@ void KMReaderWin::msgAdded( TQListViewItem *item )
void KMReaderWin::disconnectMsgAdded()
{
const KMHeaders *const headers = KMKernel::self()->getKMMainWidget()->headers();
- disconnect( headers, TQT_SIGNAL( msgAddedToListView( TQListViewItem* ) ),
- TQT_TQOBJECT(this), TQT_SLOT( msgAdded( TQListViewItem* ) ) );
+ disconnect( headers, TQ_SIGNAL( msgAddedToListView( TQListViewItem* ) ),
+ this, TQ_SLOT( msgAdded( TQListViewItem* ) ) );
}
void KMReaderWin::slotEditAttachment(partNode * node)
@@ -3029,10 +3046,15 @@ TQString KMReaderWin::renderAttachments(partNode * node, const TQColor &bgColor
}
} else {
partNode::AttachmentDisplayInfo info = node->attachmentDisplayInfo();
+
+ // Write HTML parts and attachments to disk to allow them to be opened
+ bool writePartToDisk = info.displayInHeader || node->msgPart().subtype() == DwMime::kSubtypeHtml;
+ if ( writePartToDisk )
+ TQString fileName = writeMessagePartToTempFile( &node->msgPart(), node->nodeId() );
+
if ( info.displayInHeader ) {
html += "<div style=\"float:left;\">";
html += TQString::fromLatin1( "<span style=\"white-space:nowrap; border-width: 0px; border-left-width: 5px; border-color: %1; 2px; border-left-style: solid;\">" ).arg( bgColor.name() );
- TQString fileName = writeMessagePartToTempFile( &node->msgPart(), node->nodeId() );
TQString href = node->asHREF( "header" );
html += TQString::fromLatin1( "<a href=\"" ) + href +
TQString::fromLatin1( "\">" );
diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h
index dfc4490c..fca9c3af 100644
--- a/kmail/kmreaderwin.h
+++ b/kmail/kmreaderwin.h
@@ -73,7 +73,7 @@ namespace KParts {
*/
class KMReaderWin: public TQWidget, public KMail::Interface::Observer {
- Q_OBJECT
+ TQ_OBJECT
friend void KMMimePartTree::itemClicked( TQListViewItem* item );
@@ -199,9 +199,22 @@ public:
bool htmlOverride() const { return mHtmlOverride; }
void setHtmlOverride( bool override );
- /** Override default load external references setting */
+ /** Get the load external references override setting */
bool htmlLoadExtOverride() const { return mHtmlLoadExtOverride; }
- void setHtmlLoadExtOverride( bool override );
+
+ /** Default behavior for loading external references.
+ * Use this for specifying the external reference loading behavior as
+ * specified in the user settings.
+ * @see setHtmlLoadExtOverride
+ */
+ void setHtmlLoadExtDefault(bool loadExtDefault);
+
+ /** Override default load external references setting
+ * @warning This must only be called when the user has explicitly
+ * been asked to retrieve external references!
+ * @see setHtmlLoadExtDefault
+ */
+ void setHtmlLoadExtOverride(bool loadExtOverride);
/** Is html mail to be supported? Takes into account override */
bool htmlMail();
@@ -544,7 +557,7 @@ private:
TQString renderAttachments( partNode *node, const TQColor &bgColor );
private:
- bool mHtmlMail, mHtmlLoadExternal, mHtmlOverride, mHtmlLoadExtOverride;
+ bool mHtmlMail, mHtmlLoadExtDefault, mHtmlOverride, mHtmlLoadExtOverride;
int mAtmCurrent;
TQString mAtmCurrentName;
KMMessage *mMessage;
diff --git a/kmail/kmsearchpatternedit.cpp b/kmail/kmsearchpatternedit.cpp
index 21ade7b2..43f56e95 100644
--- a/kmail/kmsearchpatternedit.cpp
+++ b/kmail/kmsearchpatternedit.cpp
@@ -116,17 +116,17 @@ void KMSearchRuleWidget::initWidget()
RuleWidgetHandlerManager::instance()->createWidgets( mFunctionStack,
mValueStack,
- TQT_TQOBJECT(this) );
+ this );
// redirect focus to the header field combo box
setFocusProxy( mRuleField );
- connect( mRuleField, TQT_SIGNAL( activated( const TQString & ) ),
- this, TQT_SLOT( slotRuleFieldChanged( const TQString & ) ) );
- connect( mRuleField, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SLOT( slotRuleFieldChanged( const TQString & ) ) );
- connect( mRuleField, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SIGNAL( fieldChanged( const TQString & ) ) );
+ connect( mRuleField, TQ_SIGNAL( activated( const TQString & ) ),
+ this, TQ_SLOT( slotRuleFieldChanged( const TQString & ) ) );
+ connect( mRuleField, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SLOT( slotRuleFieldChanged( const TQString & ) ) );
+ connect( mRuleField, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SIGNAL( fieldChanged( const TQString & ) ) );
}
void KMSearchRuleWidget::setRule( KMSearchRule *aRule )
@@ -391,14 +391,14 @@ void KMSearchRuleWidgetLister::regenerateRuleListFromWidgets()
//=============================================================================
KMSearchPatternEdit::KMSearchPatternEdit(TQWidget *parent, const char *name, bool headersOnly, bool absoluteDates )
- : TQGroupBox( 1/*columns*/, Qt::Horizontal, parent, name )
+ : TQGroupBox( 1/*columns*/, TQt::Horizontal, parent, name )
{
setTitle( i18n("Search Criteria") );
initLayout( headersOnly, absoluteDates );
}
KMSearchPatternEdit::KMSearchPatternEdit(const TQString & title, TQWidget *parent, const char *name, bool headersOnly, bool absoluteDates)
- : TQGroupBox( 1/*column*/, Qt::Horizontal, title, parent, name )
+ : TQGroupBox( 1/*column*/, TQt::Horizontal, title, parent, name )
{
initLayout( headersOnly, absoluteDates );
}
@@ -426,15 +426,15 @@ void KMSearchPatternEdit::initLayout(bool headersOnly, bool absoluteDates)
mRuleLister->slotClear();
//------------connect a few signals
- connect( bg, TQT_SIGNAL(clicked(int)),
- this, TQT_SLOT(slotRadioClicked(int)) );
+ connect( bg, TQ_SIGNAL(clicked(int)),
+ this, TQ_SLOT(slotRadioClicked(int)) );
KMSearchRuleWidget *srw = (KMSearchRuleWidget*)mRuleLister->mWidgetList.first();
if ( srw ) {
- connect( srw, TQT_SIGNAL(fieldChanged(const TQString &)),
- this, TQT_SLOT(slotAutoNameHack()) );
- connect( srw, TQT_SIGNAL(contentsChanged(const TQString &)),
- this, TQT_SLOT(slotAutoNameHack()) );
+ connect( srw, TQ_SIGNAL(fieldChanged(const TQString &)),
+ this, TQ_SLOT(slotAutoNameHack()) );
+ connect( srw, TQ_SIGNAL(contentsChanged(const TQString &)),
+ this, TQ_SLOT(slotAutoNameHack()) );
} else
kdDebug(5006) << "KMSearchPatternEdit: no first KMSearchRuleWidget, though slotClear() has been called!" << endl;
}
diff --git a/kmail/kmsearchpatternedit.h b/kmail/kmsearchpatternedit.h
index 86d890bb..ebb2498c 100644
--- a/kmail/kmsearchpatternedit.h
+++ b/kmail/kmsearchpatternedit.h
@@ -38,7 +38,7 @@ class KMSearchPatternEdit;
class KMSearchRuleWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Constructor. You can give a KMSearchRule as parameter, which will
@@ -104,7 +104,7 @@ private:
class KMSearchRuleWidgetLister : public KWidgetLister
{
- Q_OBJECT
+ TQ_OBJECT
friend class ::KMSearchPatternEdit;
@@ -165,7 +165,7 @@ private:
*/
class KMSearchPatternEdit : public TQGroupBox {
- Q_OBJECT
+ TQ_OBJECT
public:
/** Constructor. The parent and name parameters are passed to the underlying
diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp
index e63add04..5e8e4b41 100644
--- a/kmail/kmsender.cpp
+++ b/kmail/kmsender.cpp
@@ -231,8 +231,8 @@ bool KMSender::doSendQueued( const TQString &customTransport )
for( int i = 0 ; i<mTotalMessages ; ++i )
mTotalBytes += mOutboxFolder->getMsgBase(i)->msgSize();
- connect( mOutboxFolder, TQT_SIGNAL(msgAdded(int)),
- this, TQT_SLOT(outboxMsgAdded(int)) );
+ connect( mOutboxFolder, TQ_SIGNAL(msgAdded(int)),
+ this, TQ_SLOT(outboxMsgAdded(int)) );
mCurrentMsg = 0;
mSentFolder = kmkernel->sentFolder();
@@ -472,8 +472,8 @@ void KMSender::doSendMsg()
i18n( "Sending messages" ),
i18n("Initiating sender process..."),
true );
- connect( mProgressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)),
- this, TQT_SLOT( slotAbortSend() ) );
+ connect( mProgressItem, TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)),
+ this, TQ_SLOT( slotAbortSend() ) );
kapp->ref();
mSendInProgress = true;
}
@@ -520,8 +520,8 @@ void KMSender::doSendMsg()
if (!mSendProc)
sendProcStarted(false);
else {
- connect(mSendProc, TQT_SIGNAL(idle()), TQT_SLOT(slotIdle()));
- connect(mSendProc, TQT_SIGNAL(started(bool)), TQT_SLOT(sendProcStarted(bool)));
+ connect(mSendProc, TQ_SIGNAL(idle()), TQ_SLOT(slotIdle()));
+ connect(mSendProc, TQ_SIGNAL(started(bool)), TQ_SLOT(sendProcStarted(bool)));
// Run the precommand if there is one
if ( !mTransportInfo->precommand.isEmpty() ) {
@@ -541,8 +541,8 @@ void KMSender::doSendMsg()
bool KMSender::runPrecommand( const TQString & cmd ) {
setStatusMsg( i18n("Executing precommand %1").arg( cmd ) );
mPrecommand = new KMPrecommand( cmd );
- connect( mPrecommand, TQT_SIGNAL(finished(bool)),
- TQT_SLOT(slotPrecommandFinished(bool)) );
+ connect( mPrecommand, TQ_SIGNAL(finished(bool)),
+ TQ_SLOT(slotPrecommandFinished(bool)) );
if ( !mPrecommand->start() ) {
delete mPrecommand; mPrecommand = 0;
return false;
@@ -644,8 +644,8 @@ void KMSender::cleanup(void)
mSentFolder = 0;
}
if ( mOutboxFolder ) {
- disconnect( mOutboxFolder, TQT_SIGNAL(msgAdded(int)),
- this, TQT_SLOT(outboxMsgAdded(int)) );
+ disconnect( mOutboxFolder, TQ_SIGNAL(msgAdded(int)),
+ this, TQ_SLOT(outboxMsgAdded(int)) );
mOutboxFolder->close("dosendoutbox");
if ( mOutboxFolder->count( true ) == 0 ) {
mOutboxFolder->expunge();
@@ -947,12 +947,12 @@ bool KMSendSendmail::doStart() {
{
mMailerProc = new TDEProcess;
assert(mMailerProc != 0);
- connect(mMailerProc,TQT_SIGNAL(processExited(TDEProcess*)),
- this, TQT_SLOT(sendmailExited(TDEProcess*)));
- connect(mMailerProc,TQT_SIGNAL(wroteStdin(TDEProcess*)),
- this, TQT_SLOT(wroteStdin(TDEProcess*)));
- connect(mMailerProc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
- this, TQT_SLOT(receivedStderr(TDEProcess*, char*, int)));
+ connect(mMailerProc,TQ_SIGNAL(processExited(TDEProcess*)),
+ this, TQ_SLOT(sendmailExited(TDEProcess*)));
+ connect(mMailerProc,TQ_SIGNAL(wroteStdin(TDEProcess*)),
+ this, TQ_SLOT(wroteStdin(TDEProcess*)));
+ connect(mMailerProc,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+ this, TQ_SLOT(receivedStderr(TDEProcess*, char*, int)));
}
return true;
}
@@ -1046,8 +1046,8 @@ KMSendSMTP::KMSendSMTP(KMSender *sender)
mJob(0),
mSlave(0)
{
- TDEIO::Scheduler::connect(TQT_SIGNAL(slaveError(TDEIO::Slave *, int,
- const TQString &)), this, TQT_SLOT(slaveError(TDEIO::Slave *, int,
+ TDEIO::Scheduler::connect(TQ_SIGNAL(slaveError(TDEIO::Slave *, int,
+ const TQString &)), this, TQ_SLOT(slaveError(TDEIO::Slave *, int,
const TQString &)));
}
@@ -1154,9 +1154,9 @@ bool KMSendSMTP::doSend( const TQString & sender, const TQStringList & to, const
}
mJob->addMetaData( "lf2crlf+dotstuff", "slave" );
TDEIO::Scheduler::assignJobToSlave(mSlave, mJob);
- connect(mJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(result(TDEIO::Job *)));
- connect(mJob, TQT_SIGNAL(dataReq(TDEIO::Job *, TQByteArray &)),
- this, TQT_SLOT(dataReq(TDEIO::Job *, TQByteArray &)));
+ connect(mJob, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(result(TDEIO::Job *)));
+ connect(mJob, TQ_SIGNAL(dataReq(TDEIO::Job *, TQByteArray &)),
+ this, TQ_SLOT(dataReq(TDEIO::Job *, TQByteArray &)));
mSendOk = true;
mInProcess = true;
return true;
diff --git a/kmail/kmsender.h b/kmail/kmsender.h
index 8ae577b0..955bab91 100644
--- a/kmail/kmsender.h
+++ b/kmail/kmsender.h
@@ -52,7 +52,7 @@ namespace KPIM {
class KMSender: public TQObject, public KMail::MessageSender
{
- Q_OBJECT
+ TQ_OBJECT
friend class ::KMSendProc;
friend class ::KMSendSendmail;
diff --git a/kmail/kmsender_p.h b/kmail/kmsender_p.h
index d07dcf34..f3214eff 100644
--- a/kmail/kmsender_p.h
+++ b/kmail/kmsender_p.h
@@ -22,7 +22,7 @@ namespace TDEIO {
class KMSendProc: public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -86,7 +86,7 @@ protected:
//-----------------------------------------------------------------------------
class KMSendSendmail: public KMSendProc
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMSendSendmail(KMSender*);
@@ -117,7 +117,7 @@ private:
//-----------------------------------------------------------------------------
class KMSendSMTP : public KMSendProc
{
-Q_OBJECT
+TQ_OBJECT
public:
KMSendSMTP(KMSender *sender);
diff --git a/kmail/kmservertest.cpp b/kmail/kmservertest.cpp
index 5c11f075..7383060d 100644
--- a/kmail/kmservertest.cpp
+++ b/kmail/kmservertest.cpp
@@ -51,8 +51,8 @@ KMServerTest::KMServerTest( const TQString & protocol, const TQString & host, in
mSSL( false ), mJob( 0 ), mSlave( 0 ), mConnectionErrorCount( 0 )
{
TDEIO::Scheduler::connect(
- TQT_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)),
- this, TQT_SLOT(slotSlaveResult(TDEIO::Slave *, int, const TQString &)));
+ TQ_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)),
+ this, TQ_SLOT(slotSlaveResult(TDEIO::Slave *, int, const TQString &)));
if ( port == 993 || port == 995 || port == 465 )
port = 0;
@@ -85,8 +85,8 @@ void KMServerTest::startOffSlave( int port ) {
slotSlaveResult( 0, 1 );
return;
}
- connect( mSlave, TQT_SIGNAL(metaData(const TDEIO::MetaData&)),
- TQT_SLOT(slotMetaData(const TDEIO::MetaData&)) );
+ connect( mSlave, TQ_SIGNAL(metaData(const TDEIO::MetaData&)),
+ TQ_SLOT(slotMetaData(const TDEIO::MetaData&)) );
TQByteArray packedArgs;
TQDataStream stream( packedArgs, IO_WriteOnly );
@@ -95,9 +95,9 @@ void KMServerTest::startOffSlave( int port ) {
mJob = TDEIO::special( url, packedArgs, false );
TDEIO::Scheduler::assignJobToSlave( mSlave, mJob );
- connect( mJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)) );
- connect( mJob, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
- TQT_SLOT(slotData(TDEIO::Job*,const TQString&)) );
+ connect( mJob, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*)) );
+ connect( mJob, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
+ TQ_SLOT(slotData(TDEIO::Job*,const TQString&)) );
}
@@ -166,7 +166,7 @@ void KMServerTest::slotSlaveResult(TDEIO::Slave *aSlave, int error,
if ( error )
{
mJob = 0;
- KMessageBox::error( TQT_TQWIDGET(kapp->activeWindow()),
+ KMessageBox::error( kapp->activeWindow(),
TDEIO::buildErrorString( error, errorText ),
i18n("Error") );
emit capabilities( mListNormal, mListSSL );
diff --git a/kmail/kmservertest.h b/kmail/kmservertest.h
index db8535a0..0a32491a 100644
--- a/kmail/kmservertest.h
+++ b/kmail/kmservertest.h
@@ -46,7 +46,7 @@ namespace TDEIO {
class KMServerTest : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
index 1d1ce933..b6e1f969 100644
--- a/kmail/kmsystemtray.cpp
+++ b/kmail/kmsystemtray.cpp
@@ -71,7 +71,7 @@ KMSystemTray::KMSystemTray(TQWidget *parent, const char *name)
mLastUpdate = time( 0 );
mUpdateTimer = new TQTimer( this, "systraytimer" );
- connect( mUpdateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateNewMessages() ) );
+ connect( mUpdateTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( updateNewMessages() ) );
mDefaultIcon = loadIcon( "kmail" );
mLightIconImage = loadIcon( "kmaillight" ).convertToImage();
@@ -94,15 +94,15 @@ KMSystemTray::KMSystemTray(TQWidget *parent, const char *name)
/** Initiate connections between folders and this object */
foldersChanged();
- connect( kmkernel->folderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(foldersChanged()));
- connect( kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(foldersChanged()));
- connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(foldersChanged()));
- connect( kmkernel->searchFolderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(foldersChanged()));
+ connect( kmkernel->folderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(foldersChanged()));
+ connect( kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(foldersChanged()));
+ connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(foldersChanged()));
+ connect( kmkernel->searchFolderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(foldersChanged()));
- connect( kmkernel->acctMgr(), TQT_SIGNAL( checkedMail( bool, bool, const TQMap<TQString, int> & ) ),
- TQT_SLOT( updateNewMessages() ) );
+ connect( kmkernel->acctMgr(), TQ_SIGNAL( checkedMail( bool, bool, const TQMap<TQString, int> & ) ),
+ TQ_SLOT( updateNewMessages() ) );
- connect( this, TQT_SIGNAL( quitSelected() ), TQT_SLOT( tray_quit() ) );
+ connect( this, TQ_SIGNAL( quitSelected() ), TQ_SLOT( tray_quit() ) );
}
void KMSystemTray::buildPopupMenu()
@@ -132,7 +132,7 @@ void KMSystemTray::buildPopupMenu()
action->plug( mPopupMenu );
mPopupMenu->insertSeparator();
- mPopupMenu->insertItem( SmallIcon("system-log-out"), i18n("&Quit"), this, TQT_SLOT(maybeQuit()) );
+ mPopupMenu->insertItem( SmallIcon("system-log-out"), i18n("&Quit"), this, TQ_SLOT(maybeQuit()) );
}
void KMSystemTray::tray_quit()
@@ -275,7 +275,7 @@ void KMSystemTray::foldersChanged()
}
/** Disconnect all previous connections */
- disconnect(this, TQT_SLOT(updateNewMessageNotification(KMFolder *)));
+ disconnect(this, TQ_SLOT(updateNewMessageNotification(KMFolder *)));
TQStringList folderNames;
TQValueList<TQGuardedPtr<KMFolder> > folderList;
@@ -297,14 +297,14 @@ void KMSystemTray::foldersChanged()
!currentFolder->ignoreNewMail() )
{
/** If this is a new folder, start listening for messages */
- connect(currentFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder *)),
- this, TQT_SLOT(updateNewMessageNotification(KMFolder *)));
+ connect(currentFolder, TQ_SIGNAL(numUnreadMsgsChanged(KMFolder *)),
+ this, TQ_SLOT(updateNewMessageNotification(KMFolder *)));
/** Check all new folders to see if we started with any new messages */
updateNewMessageNotification(currentFolder);
}
else {
- disconnect(currentFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder *)), this, TQT_SLOT(updateNewMessageNotification(KMFolder *)) );
+ disconnect(currentFolder, TQ_SIGNAL(numUnreadMsgsChanged(KMFolder *)), this, TQ_SLOT(updateNewMessageNotification(KMFolder *)) );
}
}
}
@@ -316,7 +316,7 @@ void KMSystemTray::foldersChanged()
void KMSystemTray::mousePressEvent(TQMouseEvent *e)
{
// switch to kmail on left mouse button
- if( e->button() == Qt::LeftButton )
+ if( e->button() == TQt::LeftButton )
{
if( mParentVisible && mainWindowIsOnCurrentDesktop() )
hideKMail();
@@ -325,7 +325,7 @@ void KMSystemTray::mousePressEvent(TQMouseEvent *e)
}
// open popup menu on right mouse button
- if( e->button() == Qt::RightButton )
+ if( e->button() == TQt::RightButton )
{
mPopupFolders.clear();
mPopupFolders.reserve( mFoldersWithUnread.count() );
@@ -349,7 +349,7 @@ void KMSystemTray::mousePressEvent(TQMouseEvent *e)
kdDebug(5006) << "Adding folder" << endl;
mPopupFolders.append( it.key() );
TQString item = prettyName(it.key()) + " (" + TQString::number(it.data()) + ")";
- newMessagesPopup->insertItem(item, this, TQT_SLOT(selectedAccount(int)), 0, i);
+ newMessagesPopup->insertItem(item, this, TQ_SLOT(selectedAccount(int)), 0, i);
++it;
}
@@ -545,7 +545,7 @@ void KMSystemTray::updateNewMessages()
if(mFoldersWithUnread.count() == 0)
{
mPopupFolders.clear();
- disconnect(this, TQT_SLOT(selectedAccount(int)));
+ disconnect(this, TQ_SLOT(selectedAccount(int)));
mCount = 0;
diff --git a/kmail/kmsystemtray.h b/kmail/kmsystemtray.h
index b689def5..0472a98c 100644
--- a/kmail/kmsystemtray.h
+++ b/kmail/kmsystemtray.h
@@ -40,7 +40,7 @@ class TQPoint;
*/
class KMSystemTray : public KSystemTray
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** construtor */
diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp
index 4f991f94..764c1720 100644
--- a/kmail/kmtransport.cpp
+++ b/kmail/kmtransport.cpp
@@ -251,7 +251,7 @@ KMTransportSelDlg::KMTransportSelDlg( TQWidget *parent, const char *name,
TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
TQButtonGroup *group = new TQButtonGroup( i18n("Transport"), page );
- connect(group, TQT_SIGNAL(clicked(int)), TQT_SLOT(buttonClicked(int)) );
+ connect(group, TQ_SIGNAL(clicked(int)), TQ_SLOT(buttonClicked(int)) );
topLayout->addWidget( group, 10 );
TQVBoxLayout *vlay = new TQVBoxLayout( group, spacingHint()*2, spacingHint() );
@@ -339,11 +339,11 @@ void KMTransportDialog::makeSendmailPage()
grid->addWidget( mSendmail.locationEdit, 1, 1 );
mSendmail.chooseButton =
new TQPushButton( i18n("Choos&e..."), page );
- connect( mSendmail.chooseButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotSendmailChooser()) );
+ connect( mSendmail.chooseButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotSendmailChooser()) );
- connect( mSendmail.locationEdit, TQT_SIGNAL(textChanged ( const TQString & )),
- this, TQT_SLOT(slotSendmailEditPath(const TQString &)) );
+ connect( mSendmail.locationEdit, TQ_SIGNAL(textChanged ( const TQString & )),
+ this, TQ_SLOT(slotSendmailEditPath(const TQString &)) );
mSendmail.chooseButton->setAutoDefault( false );
grid->addWidget( mSendmail.chooseButton, 1, 2 );
@@ -401,7 +401,7 @@ void KMTransportDialog::makeSmtpPage()
label = new TQLabel( i18n("&Port:"), page1 );
grid->addWidget( label, 4, 0 );
mSmtp.portEdit = new KLineEdit( page1 );
- mSmtp.portEdit->setValidator( new TQIntValidator(TQT_TQOBJECT(this)) );
+ mSmtp.portEdit->setValidator( new TQIntValidator(this) );
TQWhatsThis::add(mSmtp.portEdit,
i18n("The port number that the SMTP server "
"is listening on. The default port is 25."));
@@ -430,8 +430,8 @@ void KMTransportDialog::makeSmtpPage()
"requires authentication before accepting "
"mail. This is known as "
"'Authenticated SMTP' or simply ASMTP."));
- connect(mSmtp.authCheck, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotRequiresAuthClicked()));
+ connect(mSmtp.authCheck, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotRequiresAuthClicked()));
grid->addMultiCellWidget( mSmtp.authCheck, 7, 7, 0, 1 );
mSmtp.loginLabel = new TQLabel( i18n("&Login:"), page1 );
@@ -490,15 +490,15 @@ void KMTransportDialog::makeSmtpPage()
"identifying itself to the server."));
mSmtp.localHostnameLabel->setBuddy( mSmtp.localHostnameEdit );
grid->addWidget( mSmtp.localHostnameEdit, 13, 1 );
- connect( mSmtp.specifyHostnameCheck, TQT_SIGNAL(toggled(bool)),
- mSmtp.localHostnameEdit, TQT_SLOT(setEnabled(bool)));
- connect( mSmtp.specifyHostnameCheck, TQT_SIGNAL(toggled(bool)),
- mSmtp.localHostnameLabel, TQT_SLOT(setEnabled(bool)));
+ connect( mSmtp.specifyHostnameCheck, TQ_SIGNAL(toggled(bool)),
+ mSmtp.localHostnameEdit, TQ_SLOT(setEnabled(bool)));
+ connect( mSmtp.specifyHostnameCheck, TQ_SIGNAL(toggled(bool)),
+ mSmtp.localHostnameLabel, TQ_SLOT(setEnabled(bool)));
TQWidget *page2 = new TQWidget( tabWidget );
tabWidget->addTab( page2, i18n("S&ecurity") );
TQVBoxLayout *vlay = new TQVBoxLayout( page2, spacingHint() );
- mSmtp.encryptionGroup = new TQButtonGroup( 1, Qt::Horizontal,
+ mSmtp.encryptionGroup = new TQButtonGroup( 1, TQt::Horizontal,
i18n("Encryption"), page2 );
mSmtp.encryptionNone =
new TQRadioButton( i18n("&None"), mSmtp.encryptionGroup );
@@ -506,11 +506,11 @@ void KMTransportDialog::makeSmtpPage()
new TQRadioButton( i18n("&SSL"), mSmtp.encryptionGroup );
mSmtp.encryptionTLS =
new TQRadioButton( i18n("&TLS"), mSmtp.encryptionGroup );
- connect(mSmtp.encryptionGroup, TQT_SIGNAL(clicked(int)),
- TQT_SLOT(slotSmtpEncryptionChanged(int)));
+ connect(mSmtp.encryptionGroup, TQ_SIGNAL(clicked(int)),
+ TQ_SLOT(slotSmtpEncryptionChanged(int)));
vlay->addWidget( mSmtp.encryptionGroup );
- mSmtp.authGroup = new TQButtonGroup( 1, Qt::Horizontal,
+ mSmtp.authGroup = new TQButtonGroup( 1, TQt::Horizontal,
i18n("Authentication Method"), page2 );
mSmtp.authLogin = new TQRadioButton( i18n("Please translate this "
"authentication method only if you have a good reason", "&LOGIN"),
@@ -533,8 +533,8 @@ void KMTransportDialog::makeSmtpPage()
TQHBoxLayout *buttonLay = new TQHBoxLayout( vlay );
mSmtp.checkCapabilities =
new TQPushButton( i18n("Check &What the Server Supports"), page2 );
- connect(mSmtp.checkCapabilities, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotCheckSmtpCapabilities()));
+ connect(mSmtp.checkCapabilities, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotCheckSmtpCapabilities()));
buttonLay->addStretch();
buttonLay->addWidget( mSmtp.checkCapabilities );
}
@@ -720,11 +720,11 @@ void KMTransportDialog::slotCheckSmtpCapabilities()
mServerTest = new KMServerTest(SMTP_PROTOCOL, mSmtp.hostEdit->text(),
mSmtp.portEdit->text().toInt());
connect( mServerTest,
- TQT_SIGNAL( capabilities( const TQStringList &, const TQStringList &,
+ TQ_SIGNAL( capabilities( const TQStringList &, const TQStringList &,
const TQString &, const TQString &,
const TQString & )),
this,
- TQT_SLOT( slotSmtpCapabilities( const TQStringList &,
+ TQ_SLOT( slotSmtpCapabilities( const TQStringList &,
const TQStringList &, const TQString &,
const TQString &, const TQString & ) ) );
mSmtp.checkCapabilities->setEnabled(false);
diff --git a/kmail/kmtransport.h b/kmail/kmtransport.h
index e4dd6f1e..7f0cd41b 100644
--- a/kmail/kmtransport.h
+++ b/kmail/kmtransport.h
@@ -63,7 +63,7 @@ public:
class KMTransportSelDlg : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -79,7 +79,7 @@ private:
class KMTransportDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/listjob.cpp b/kmail/listjob.cpp
index 75e4dee5..6c189293 100644
--- a/kmail/listjob.cpp
+++ b/kmail/listjob.cpp
@@ -76,8 +76,8 @@ void ListJob::execute()
{
// We'll wait for the connectionResult signal from the account.
kdDebug(5006) << "ListJob - waiting for connection" << endl;
- connect( mAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ),
- this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
+ connect( mAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ),
+ this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) );
return;
}
// this is needed until we have a common base class for d(imap)
@@ -145,10 +145,10 @@ void ListJob::execute()
TDEIO::SimpleJob *job = TDEIO::listDir( url, false );
TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
mAccount->insertJob( job, jd );
- connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
- this, TQT_SLOT(slotListResult(TDEIO::Job *)) );
- connect( job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)),
- this, TQT_SLOT(slotListEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)) );
+ connect( job, TQ_SIGNAL(result(TDEIO::Job *)),
+ this, TQ_SLOT(slotListResult(TDEIO::Job *)) );
+ connect( job, TQ_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)),
+ this, TQ_SLOT(slotListEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)) );
}
void ListJob::slotConnectionResult( int errorCode, const TQString& errorMsg )
diff --git a/kmail/listjob.h b/kmail/listjob.h
index 3b53ea61..54cb535d 100644
--- a/kmail/listjob.h
+++ b/kmail/listjob.h
@@ -53,7 +53,7 @@ namespace KMail {
*/
class ListJob : public FolderJob
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kmail/localsubscriptiondialog.cpp b/kmail/localsubscriptiondialog.cpp
index 2f6e839e..166cd406 100644
--- a/kmail/localsubscriptiondialog.cpp
+++ b/kmail/localsubscriptiondialog.cpp
@@ -76,7 +76,7 @@ void LocalSubscriptionDialog::processFolderListing()
if (done == 1000)
{
emit listChanged();
- TQTimer::singleShot(0, this, TQT_SLOT(processItems()));
+ TQTimer::singleShot(0, this, TQ_SLOT(processItems()));
return;
}
++mCount;
diff --git a/kmail/localsubscriptiondialog.h b/kmail/localsubscriptiondialog.h
index eb977908..f181ab7e 100644
--- a/kmail/localsubscriptiondialog.h
+++ b/kmail/localsubscriptiondialog.h
@@ -39,7 +39,7 @@ namespace KMail {
class LocalSubscriptionDialog: public SubscriptionDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/maildirjob.cpp b/kmail/maildirjob.cpp
index 4c3b520c..11f6edfb 100644
--- a/kmail/maildirjob.cpp
+++ b/kmail/maildirjob.cpp
@@ -74,7 +74,7 @@ void MaildirJob::setParentFolder( const KMFolderMaildir* parent )
//-----------------------------------------------------------------------------
void MaildirJob::execute()
{
- TQTimer::singleShot( 0, this, TQT_SLOT(startJob()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(startJob()) );
}
//-----------------------------------------------------------------------------
diff --git a/kmail/maildirjob.h b/kmail/maildirjob.h
index 878c5d78..1c21833b 100644
--- a/kmail/maildirjob.h
+++ b/kmail/maildirjob.h
@@ -40,7 +40,7 @@ namespace KMail {
class MaildirJob : public FolderJob
{
- Q_OBJECT
+ TQ_OBJECT
public:
MaildirJob( KMMessage *msg, JobType jt = tGetMessage, KMFolder *folder = 0 );
diff --git a/kmail/mailinglistpropertiesdialog.cpp b/kmail/mailinglistpropertiesdialog.cpp
index 0bfb2cc1..ab984161 100644
--- a/kmail/mailinglistpropertiesdialog.cpp
+++ b/kmail/mailinglistpropertiesdialog.cpp
@@ -59,29 +59,29 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget*
"topLayout" );
TQGroupBox *mlGroup = new TQGroupBox( i18n("Associated Mailing List" ), this );
- mlGroup->setColumnLayout( 0, Qt::Vertical );
+ mlGroup->setColumnLayout( 0, TQt::Vertical );
TQGridLayout *groupLayout = new TQGridLayout( mlGroup->layout(), 6, 3, spacingHint() );
topLayout->addWidget( mlGroup );
setMainWidget( mlGroup );
mHoldsMailingList = new TQCheckBox( i18n("&Folder holds a mailing list"), mlGroup );
- connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)),
- TQT_SLOT(slotHoldsML(bool)) );
+ connect( mHoldsMailingList, TQ_SIGNAL(toggled(bool)),
+ TQ_SLOT(slotHoldsML(bool)) );
groupLayout->addMultiCellWidget( mHoldsMailingList, 0, 0, 0, 2 );
groupLayout->addItem( new TQSpacerItem( 0, 10 ), 1, 0 );
mDetectButton = new TQPushButton( i18n("Detect Automatically"), mlGroup );
mDetectButton->setEnabled( false );
- connect( mDetectButton, TQT_SIGNAL(pressed()), TQT_SLOT(slotDetectMailingList()) );
+ connect( mDetectButton, TQ_SIGNAL(pressed()), TQ_SLOT(slotDetectMailingList()) );
groupLayout->addWidget( mDetectButton, 2, 1 );
groupLayout->addItem( new TQSpacerItem( 0, 10 ), 3, 0 );
label = new TQLabel( i18n("Mailing list description:"), mlGroup );
label->setEnabled( false );
- connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)),
- label, TQT_SLOT(setEnabled(bool)) );
+ connect( mHoldsMailingList, TQ_SIGNAL(toggled(bool)),
+ label, TQ_SLOT(setEnabled(bool)) );
groupLayout->addWidget( label, 4, 0 );
mMLId = new TQLabel( label, "", mlGroup );
groupLayout->addMultiCellWidget( mMLId, 4, 4, 1, 2 );
@@ -90,22 +90,22 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget*
//FIXME: add TQWhatsThis
label = new TQLabel( i18n("Preferred handler:"), mlGroup );
label->setEnabled(false);
- connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)),
- label, TQT_SLOT(setEnabled(bool)) );
+ connect( mHoldsMailingList, TQ_SIGNAL(toggled(bool)),
+ label, TQ_SLOT(setEnabled(bool)) );
groupLayout->addWidget( label, 5, 0 );
mMLHandlerCombo = new TQComboBox( mlGroup );
mMLHandlerCombo->insertItem( i18n("KMail"), MailingList::KMail );
mMLHandlerCombo->insertItem( i18n("Browser"), MailingList::Browser );
mMLHandlerCombo->setEnabled( false );
groupLayout->addMultiCellWidget( mMLHandlerCombo, 5, 5, 1, 2 );
- connect( mMLHandlerCombo, TQT_SIGNAL(activated(int)),
- TQT_SLOT(slotMLHandling(int)) );
+ connect( mMLHandlerCombo, TQ_SIGNAL(activated(int)),
+ TQ_SLOT(slotMLHandling(int)) );
label->setBuddy( mMLHandlerCombo );
label = new TQLabel( i18n("&Address type:"), mlGroup );
label->setEnabled(false);
- connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)),
- label, TQT_SLOT(setEnabled(bool)) );
+ connect( mHoldsMailingList, TQ_SIGNAL(toggled(bool)),
+ label, TQ_SLOT(setEnabled(bool)) );
groupLayout->addWidget( label, 6, 0 );
mAddressCombo = new TQComboBox( mlGroup );
label->setBuddy( mAddressCombo );
@@ -119,10 +119,10 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget*
handleButton->setEnabled( false );
if( mFolder)
{
- connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)),
- handleButton, TQT_SLOT(setEnabled(bool)) );
- connect( handleButton, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotInvokeHandler()) );
+ connect( mHoldsMailingList, TQ_SIGNAL(toggled(bool)),
+ handleButton, TQ_SLOT(setEnabled(bool)) );
+ connect( handleButton, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotInvokeHandler()) );
}
groupLayout->addWidget( handleButton, 6, 2 );
@@ -140,8 +140,8 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget*
<< i18n( "List Archives" )
<< i18n( "List Help" );
mAddressCombo->insertStringList( el );
- connect( mAddressCombo, TQT_SIGNAL(activated(int)),
- TQT_SLOT(slotAddressChanged(int)) );
+ connect( mAddressCombo, TQ_SIGNAL(activated(int)),
+ TQ_SLOT(slotAddressChanged(int)) );
load();
resize( TQSize(295, 204).expandedTo(minimumSizeHint()) );
diff --git a/kmail/mailinglistpropertiesdialog.h b/kmail/mailinglistpropertiesdialog.h
index e527a5ae..90d5f543 100644
--- a/kmail/mailinglistpropertiesdialog.h
+++ b/kmail/mailinglistpropertiesdialog.h
@@ -44,7 +44,7 @@ namespace KMail
class MailingListFolderPropertiesDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
MailingListFolderPropertiesDialog( TQWidget *parent, KMFolder *folder );
diff --git a/kmail/mailsourceviewer.cpp b/kmail/mailsourceviewer.cpp
index 7a06f970..d55fe0af 100644
--- a/kmail/mailsourceviewer.cpp
+++ b/kmail/mailsourceviewer.cpp
@@ -58,8 +58,8 @@ MailSourceViewer::MailSourceViewer( TQWidget *parent, const char *name )
{
setWFlags( WDestructiveClose );
TQAccel *accel = new TQAccel( this, "browser close-accel" );
- accel->connectItem( accel->insertItem( TQt::Key_Escape ), this , TQT_SLOT( close() ));
- accel->connectItem( accel->insertItem( TQt::Key_W+CTRL ), this , TQT_SLOT( close() ));
+ accel->connectItem( accel->insertItem( TQt::Key_Escape ), this , TQ_SLOT( close() ));
+ accel->connectItem( accel->insertItem( TQt::Key_W+CTRL ), this , TQ_SLOT( close() ));
setWordWrap( KTextBrowser::NoWrap );
KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
}
diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp
index 560fac90..bd8d9955 100644
--- a/kmail/managesievescriptsdialog.cpp
+++ b/kmail/managesievescriptsdialog.cpp
@@ -46,12 +46,12 @@ KMail::ManageSieveScriptsDialog::ManageSieveScriptsDialog( TQWidget * parent, co
mListView->setResizeMode( TQListView::LastColumn );
mListView->setRootIsDecorated( true );
mListView->setSelectionMode( TQListView::Single );
- connect( mListView, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)),
- this, TQT_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&)) );
- connect( mListView, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)),
- this, TQT_SLOT(slotDoubleClicked(TQListViewItem*)) );
- connect( mListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
- this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) );
+ connect( mListView, TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)),
+ this, TQ_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&)) );
+ connect( mListView, TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)),
+ this, TQ_SLOT(slotDoubleClicked(TQListViewItem*)) );
+ connect( mListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+ this, TQ_SLOT(slotSelectionChanged(TQListViewItem*)) );
vlay->addWidget( mListView );
resize( 2 * sizeHint().width(), sizeHint().height() );
@@ -111,10 +111,10 @@ void KMail::ManageSieveScriptsDialog::slotRefresh() {
if ( u.isEmpty() )
continue;
SieveJob * job = SieveJob::list( u );
- connect( job, TQT_SIGNAL(item(KMail::SieveJob*,const TQString&,bool)),
- this, TQT_SLOT(slotItem(KMail::SieveJob*,const TQString&,bool)) );
- connect( job, TQT_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)),
- this, TQT_SLOT(slotResult(KMail::SieveJob*,bool,const TQString&,bool)) );
+ connect( job, TQ_SIGNAL(item(KMail::SieveJob*,const TQString&,bool)),
+ this, TQ_SLOT(slotItem(KMail::SieveJob*,const TQString&,bool)) );
+ connect( job, TQ_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)),
+ this, TQ_SLOT(slotResult(KMail::SieveJob*,bool,const TQString&,bool)) );
mJobs.insert( job, last );
mUrls.insert( last, u );
} else {
@@ -162,12 +162,12 @@ void KMail::ManageSieveScriptsDialog::slotContextMenuRequested( TQListViewItem *
mContextMenuItem = item;
if ( item->depth() ) {
// script items:
- menu.insertItem( i18n( "Delete Script" ), this, TQT_SLOT(slotDeleteScript()) );
- menu.insertItem( i18n( "Edit Script..." ), this, TQT_SLOT(slotEditScript()) );
- menu.insertItem( i18n( "Deactivate Script" ), this, TQT_SLOT(slotDeactivateScript()) );
+ menu.insertItem( i18n( "Delete Script" ), this, TQ_SLOT(slotDeleteScript()) );
+ menu.insertItem( i18n( "Edit Script..." ), this, TQ_SLOT(slotEditScript()) );
+ menu.insertItem( i18n( "Deactivate Script" ), this, TQ_SLOT(slotDeactivateScript()) );
} else {
// top-levels:
- menu.insertItem( i18n( "New Script..." ), this, TQT_SLOT(slotNewScript()) );
+ menu.insertItem( i18n( "New Script..." ), this, TQ_SLOT(slotNewScript()) );
}
menu.exec( p );
mContextMenuItem = 0;
@@ -219,8 +219,8 @@ void KMail::ManageSieveScriptsDialog::changeActiveScript( TQCheckListItem * item
job = SieveJob::activate( u );
else
job = SieveJob::desactivate( u );
- connect( job, TQT_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)),
- this, TQT_SLOT(slotRefresh()) );
+ connect( job, TQ_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)),
+ this, TQ_SLOT(slotRefresh()) );
}
void KMail::ManageSieveScriptsDialog::slotDoubleClicked( TQListViewItem * i ) {
@@ -259,8 +259,8 @@ void KMail::ManageSieveScriptsDialog::slotDeleteScript() {
!= KMessageBox::Continue )
return;
SieveJob * job = SieveJob::del( u );
- connect( job, TQT_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)),
- this, TQT_SLOT(slotRefresh()) );
+ connect( job, TQ_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)),
+ this, TQ_SLOT(slotRefresh()) );
}
void KMail::ManageSieveScriptsDialog::slotEditScript() {
@@ -277,8 +277,8 @@ void KMail::ManageSieveScriptsDialog::slotEditScript() {
url.setFileName( mContextMenuItem->text( 0 ) );
mCurrentURL = url;
SieveJob * job = SieveJob::get( url );
- connect( job, TQT_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)),
- this, TQT_SLOT(slotGetResult(KMail::SieveJob*,bool,const TQString&,bool)) );
+ connect( job, TQ_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)),
+ this, TQ_SLOT(slotGetResult(KMail::SieveJob*,bool,const TQString&,bool)) );
}
void KMail::ManageSieveScriptsDialog::slotNewScript() {
@@ -321,7 +321,7 @@ KMail::SieveEditor::SieveEditor( TQWidget * parent, const char * name )
mTextEdit->setTextFormat( TQTextEdit::PlainText );
mTextEdit->setWordWrap( TQTextEdit::NoWrap );
mTextEdit->setFont( TDEGlobalSettings::fixedFont() );
- connect( mTextEdit, TQT_SIGNAL( textChanged () ), TQT_SLOT( slotTextChanged() ) );
+ connect( mTextEdit, TQ_SIGNAL( textChanged () ), TQ_SLOT( slotTextChanged() ) );
resize( 3 * sizeHint() );
}
@@ -342,8 +342,8 @@ void KMail::ManageSieveScriptsDialog::slotGetResult( KMail::SieveJob *, bool suc
mSieveEditor = new SieveEditor( this );
mSieveEditor->setScript( script );
- connect( mSieveEditor, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotSieveEditorOkClicked()) );
- connect( mSieveEditor, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotSieveEditorCancelClicked()) );
+ connect( mSieveEditor, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotSieveEditorOkClicked()) );
+ connect( mSieveEditor, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotSieveEditorCancelClicked()) );
mSieveEditor->show();
mWasActive = isActive;
}
@@ -352,8 +352,8 @@ void KMail::ManageSieveScriptsDialog::slotSieveEditorOkClicked() {
if ( !mSieveEditor )
return;
SieveJob * job = SieveJob::put( mCurrentURL,mSieveEditor->script(), mWasActive, mWasActive );
- connect( job, TQT_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)),
- this, TQT_SLOT(slotPutResult(KMail::SieveJob*,bool)) );
+ connect( job, TQ_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)),
+ this, TQ_SLOT(slotPutResult(KMail::SieveJob*,bool)) );
}
void KMail::ManageSieveScriptsDialog::slotSieveEditorCancelClicked() {
diff --git a/kmail/managesievescriptsdialog.h b/kmail/managesievescriptsdialog.h
index 25a53dad..b3a6848c 100644
--- a/kmail/managesievescriptsdialog.h
+++ b/kmail/managesievescriptsdialog.h
@@ -14,7 +14,7 @@ class SieveJob;
class SieveEditor;
class ManageSieveScriptsDialog : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
ManageSieveScriptsDialog( TQWidget * parent=0, const char * name=0 );
diff --git a/kmail/managesievescriptsdialog_p.h b/kmail/managesievescriptsdialog_p.h
index 584d011b..d3b84e69 100644
--- a/kmail/managesievescriptsdialog_p.h
+++ b/kmail/managesievescriptsdialog_p.h
@@ -8,7 +8,7 @@
namespace KMail {
class SieveEditor : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
TQ_PROPERTY( TQString script READ script WRITE setScript )
public:
diff --git a/kmail/mboxjob.cpp b/kmail/mboxjob.cpp
index df25a8ad..b591108f 100644
--- a/kmail/mboxjob.cpp
+++ b/kmail/mboxjob.cpp
@@ -67,7 +67,7 @@ MboxJob::~MboxJob()
void
MboxJob::execute()
{
- TQTimer::singleShot( 0, this, TQT_SLOT(startJob()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(startJob()) );
}
//-----------------------------------------------------------------------------
diff --git a/kmail/mboxjob.h b/kmail/mboxjob.h
index c9b1e37c..8c65e181 100644
--- a/kmail/mboxjob.h
+++ b/kmail/mboxjob.h
@@ -40,7 +40,7 @@ namespace KMail {
class MboxJob : public FolderJob
{
- Q_OBJECT
+ TQ_OBJECT
friend class ::KMFolderMbox;
public:
diff --git a/kmail/messageactions.cpp b/kmail/messageactions.cpp
index be2d4c9d..e7233d3e 100644
--- a/kmail/messageactions.cpp
+++ b/kmail/messageactions.cpp
@@ -42,36 +42,36 @@ MessageActions::MessageActions( TDEActionCollection *ac, TQWidget * parent ) :
mReplyActionMenu = new TDEActionMenu( i18n("Message->","&Reply"),
"mail-reply-sender", mActionCollection,
"message_reply_menu" );
- connect( mReplyActionMenu, TQT_SIGNAL(activated()), this,
- TQT_SLOT(slotReplyToMsg()) );
+ connect( mReplyActionMenu, TQ_SIGNAL(activated()), this,
+ TQ_SLOT(slotReplyToMsg()) );
mReplyAction = new TDEAction( i18n("&Reply..."), "mail-reply-sender", Key_R, this,
- TQT_SLOT(slotReplyToMsg()), mActionCollection, "reply" );
+ TQ_SLOT(slotReplyToMsg()), mActionCollection, "reply" );
mReplyActionMenu->insert( mReplyAction );
mReplyAuthorAction = new TDEAction( i18n("Reply to A&uthor..."), "mail-reply-sender",
SHIFT+Key_A, this,
- TQT_SLOT(slotReplyAuthorToMsg()),
+ TQ_SLOT(slotReplyAuthorToMsg()),
mActionCollection, "reply_author" );
mReplyActionMenu->insert( mReplyAuthorAction );
mReplyAllAction = new TDEAction( i18n("Reply to &All..."), "mail-reply-all",
- Key_A, this, TQT_SLOT(slotReplyAllToMsg()),
+ Key_A, this, TQ_SLOT(slotReplyAllToMsg()),
mActionCollection, "reply_all" );
mReplyActionMenu->insert( mReplyAllAction );
mReplyListAction = new TDEAction( i18n("Reply to Mailing-&List..."),
"mail_replylist", Key_L, this,
- TQT_SLOT(slotReplyListToMsg()), mActionCollection,
+ TQ_SLOT(slotReplyListToMsg()), mActionCollection,
"reply_list" );
mReplyActionMenu->insert( mReplyListAction );
mNoQuoteReplyAction = new TDEAction( i18n("Reply Without &Quote..."), SHIFT+Key_R,
- this, TQT_SLOT(slotNoQuoteReplyToMsg()), mActionCollection, "noquotereply" );
+ this, TQ_SLOT(slotNoQuoteReplyToMsg()), mActionCollection, "noquotereply" );
mCreateTodoAction = new TDEAction( i18n("Create Task/Reminder..."), "mail_todo",
- 0, this, TQT_SLOT(slotCreateTodo()), mActionCollection,
+ 0, this, TQ_SLOT(slotCreateTodo()), mActionCollection,
"create_todo" );
@@ -80,35 +80,35 @@ MessageActions::MessageActions( TDEActionCollection *ac, TQWidget * parent ) :
mStatusMenu->insert(new TDEAction(KGuiItem(i18n("Mark Message as &Read"), "kmmsgread",
i18n("Mark selected messages as read")),
- 0, this, TQT_SLOT(slotSetMsgStatusRead()),
+ 0, this, TQ_SLOT(slotSetMsgStatusRead()),
mActionCollection, "status_read"));
mStatusMenu->insert(new TDEAction(KGuiItem(i18n("Mark Message as &New"), "kmmsgnew",
i18n("Mark selected messages as new")),
- 0, this, TQT_SLOT(slotSetMsgStatusNew()),
+ 0, this, TQ_SLOT(slotSetMsgStatusNew()),
mActionCollection, "status_new" ));
mStatusMenu->insert(new TDEAction(KGuiItem(i18n("Mark Message as &Unread"), "kmmsgunseen",
i18n("Mark selected messages as unread")),
- 0, this, TQT_SLOT(slotSetMsgStatusUnread()),
+ 0, this, TQ_SLOT(slotSetMsgStatusUnread()),
mActionCollection, "status_unread"));
mStatusMenu->insert( new TDEActionSeparator( this ) );
mToggleFlagAction = new TDEToggleAction(i18n("Mark Message as &Important"), "mail_flag",
- 0, this, TQT_SLOT(slotSetMsgStatusFlag()),
+ 0, this, TQ_SLOT(slotSetMsgStatusFlag()),
mActionCollection, "status_flag");
mToggleFlagAction->setCheckedState( i18n("Remove &Important Message Mark") );
mStatusMenu->insert( mToggleFlagAction );
mToggleTodoAction = new TDEToggleAction(i18n("Mark Message as &Action Item"), "mail_todo",
- 0, this, TQT_SLOT(slotSetMsgStatusTodo()),
+ 0, this, TQ_SLOT(slotSetMsgStatusTodo()),
mActionCollection, "status_todo");
mToggleTodoAction->setCheckedState( i18n("Remove &Action Item Message Mark") );
mStatusMenu->insert( mToggleTodoAction );
mEditAction = new TDEAction( i18n("&Edit Message"), "edit", Key_T, this,
- TQT_SLOT(editCurrentMessage()), mActionCollection, "edit" );
+ TQ_SLOT(editCurrentMessage()), mActionCollection, "edit" );
mEditAction->plugAccel( mActionCollection->tdeaccel() );
updateActions();
@@ -174,8 +174,8 @@ template<typename T> void MessageActions::replyCommand()
return;
const TQString text = mMessageView ? mMessageView->copyText() : "";
KMCommand *command = new T( mParent, mCurrentMessage, text );
- connect( command, TQT_SIGNAL( completed( KMCommand * ) ),
- this, TQT_SIGNAL( replyActionFinished() ) );
+ connect( command, TQ_SIGNAL( completed( KMCommand * ) ),
+ this, TQ_SIGNAL( replyActionFinished() ) );
command->start();
}
diff --git a/kmail/messageactions.h b/kmail/messageactions.h
index 5e46489b..4c81a798 100644
--- a/kmail/messageactions.h
+++ b/kmail/messageactions.h
@@ -38,7 +38,7 @@ namespace KMail {
*/
class MessageActions : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
MessageActions( TDEActionCollection* ac, TQWidget *parent );
diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp
index 60ceed94..1cc0cd33 100644
--- a/kmail/messagecomposer.cpp
+++ b/kmail/messagecomposer.cpp
@@ -373,7 +373,7 @@ void MessageComposer::doNextJob()
}
// We have more jobs to do, but allow others to come first
- TQTimer::singleShot( 0, this, TQT_SLOT( slotDoNextJob() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotDoNextJob() ) );
}
void MessageComposer::emitDone( bool b )
@@ -552,8 +552,8 @@ bool MessageComposer::encryptWithChiasmus( const Kleo::CryptoBackend::Protocol *
const TQByteArray& body,
TQByteArray& resultData )
{
- std::auto_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-encrypt", TQStringVariantMap() ) );
- if ( !job.get() ) {
+ std::unique_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-encrypt", TQStringVariantMap() ) );
+ if ( !job ) {
const TQString msg = i18n( "Chiasmus backend does not offer the "
"\"x-encrypt\" function. Please report this bug." );
KMessageBox::error( mComposeWin, msg, i18n( "Chiasmus Backend Error" ) );
@@ -2162,10 +2162,10 @@ void MessageComposer::pgpSignedMsg( const TQByteArray& cText, Kleo::CryptoMessag
= isSMIME( format ) ? cpf->smime() : cpf->openpgp() ;
assert( proto ); /// hmmm.....?
- std::auto_ptr<Kleo::SignJob> job( proto->signJob( armor( format ),
+ std::unique_ptr<Kleo::SignJob> job( proto->signJob( armor( format ),
textMode( format ) ) );
- if ( !job.get() ) {
+ if ( !job ) {
KMessageBox::sorry( mComposeWin,
i18n("This message could not be signed, "
"since the chosen backend does not seem to support "
@@ -2218,9 +2218,9 @@ Kpgp::Result MessageComposer::pgpEncryptedMsg( TQByteArray & encryptedBody,
= isSMIME( format ) ? cpf->smime() : cpf->openpgp() ;
assert( proto ); // hmmmm....?
- std::auto_ptr<Kleo::EncryptJob> job( proto->encryptJob( armor( format ),
+ std::unique_ptr<Kleo::EncryptJob> job( proto->encryptJob( armor( format ),
textMode( format ) ) );
- if ( !job.get() ) {
+ if ( !job ) {
KMessageBox::sorry( mComposeWin,
i18n("This message could not be encrypted, "
"since the chosen backend does not seem to support "
@@ -2266,9 +2266,9 @@ Kpgp::Result MessageComposer::pgpSignedAndEncryptedMsg( TQByteArray & encryptedB
= isSMIME( format ) ? cpf->smime() : cpf->openpgp() ;
assert( proto ); // hmmmm....?
- std::auto_ptr<Kleo::SignEncryptJob> job( proto->signEncryptJob( armor( format ),
+ std::unique_ptr<Kleo::SignEncryptJob> job( proto->signEncryptJob( armor( format ),
textMode( format ) ) );
- if ( !job.get() ) {
+ if ( !job ) {
KMessageBox::sorry( mComposeWin,
i18n("This message could not be signed and encrypted, "
"since the chosen backend does not seem to support "
diff --git a/kmail/messagecomposer.h b/kmail/messagecomposer.h
index 11290cc2..924b5bf4 100644
--- a/kmail/messagecomposer.h
+++ b/kmail/messagecomposer.h
@@ -63,7 +63,7 @@ namespace KPIM {
}
class MessageComposer : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
friend class ::MessageComposerJob;
friend class ::EncryptMessageJob;
diff --git a/kmail/messagecopyhelper.cpp b/kmail/messagecopyhelper.cpp
index 0257aa0b..4b46141f 100644
--- a/kmail/messagecopyhelper.cpp
+++ b/kmail/messagecopyhelper.cpp
@@ -62,7 +62,7 @@ MessageCopyHelper::MessageCopyHelper( const TQValueList< TQ_UINT32 > & msgs,
command = new KMCopyCommand( dest, list );
}
- connect( command, TQT_SIGNAL(completed(KMCommand*)), TQT_SLOT(copyCompleted(KMCommand*)) );
+ connect( command, TQ_SIGNAL(completed(KMCommand*)), TQ_SLOT(copyCompleted(KMCommand*)) );
command->start();
}
diff --git a/kmail/messagecopyhelper.h b/kmail/messagecopyhelper.h
index 6d38d7b5..a097d4b8 100644
--- a/kmail/messagecopyhelper.h
+++ b/kmail/messagecopyhelper.h
@@ -38,7 +38,7 @@ namespace KMail {
*/
class MessageCopyHelper : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/messageproperty.h b/kmail/messageproperty.h
index fdd3f35d..00da0655 100644
--- a/kmail/messageproperty.h
+++ b/kmail/messageproperty.h
@@ -56,7 +56,7 @@ class ActionScheduler;
*/
class MessageProperty : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/networkaccount.h b/kmail/networkaccount.h
index 2ed8e452..832f6805 100644
--- a/kmail/networkaccount.h
+++ b/kmail/networkaccount.h
@@ -46,7 +46,7 @@ namespace TDEIO {
namespace KMail {
class NetworkAccount : public KMAccount {
- Q_OBJECT
+ TQ_OBJECT
protected:
NetworkAccount( AccountManager * parent, const TQString & name, uint id );
diff --git a/kmail/newfolderdialog.cpp b/kmail/newfolderdialog.cpp
index 0643cbbc..862833f0 100644
--- a/kmail/newfolderdialog.cpp
+++ b/kmail/newfolderdialog.cpp
@@ -86,7 +86,7 @@ NewFolderDialog::NewFolderDialog( TQWidget* parent, KMFolder *folder )
mNameLineEdit->setFocus();
mNameHBox->addWidget( mNameLineEdit );
mTopLevelLayout->addLayout( mNameHBox );
- connect( mNameLineEdit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotFolderNameChanged( const TQString & ) ) );
+ connect( mNameLineEdit, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotFolderNameChanged( const TQString & ) ) );
if ( !mFolder ||
( mFolder->folderType() != KMFolderTypeImap &&
diff --git a/kmail/newfolderdialog.h b/kmail/newfolderdialog.h
index 96cfc277..b6d0f929 100644
--- a/kmail/newfolderdialog.h
+++ b/kmail/newfolderdialog.h
@@ -46,7 +46,7 @@ namespace KMail {
class NewFolderDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp
index 39b7ac00..3d0593cc 100644
--- a/kmail/objecttreeparser.cpp
+++ b/kmail/objecttreeparser.cpp
@@ -1652,7 +1652,7 @@ namespace KMail {
const TQByteArray certData = node->msgPart().bodyDecodedBinary();
- const STD_NAMESPACE_PREFIX auto_ptr<Kleo::ImportJob> import( smimeCrypto->importJob() );
+ const STD_NAMESPACE_PREFIX unique_ptr<Kleo::ImportJob> import( smimeCrypto->importJob() );
const GpgME::ImportResult res = import->exec( certData );
if ( res.error() ) {
htmlWriter()->queue( i18n( "Sorry, certificate could not be imported.<br>"
@@ -1853,8 +1853,8 @@ bool ObjectTreeParser::decryptChiasmus( const TQByteArray& data, TQByteArray& bo
if ( !chiasmus )
return false;
- const STD_NAMESPACE_PREFIX auto_ptr<Kleo::SpecialJob> listjob( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) );
- if ( !listjob.get() ) {
+ const STD_NAMESPACE_PREFIX unique_ptr<Kleo::SpecialJob> listjob( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) );
+ if ( !listjob ) {
errorText = i18n( "Chiasmus backend does not offer the "
"\"x-obtain-keys\" function. Please report this bug." );
return false;
@@ -1892,8 +1892,8 @@ bool ObjectTreeParser::decryptChiasmus( const TQByteArray& data, TQByteArray& bo
GlobalSettings::setChiasmusDecryptionKey( selectorDlg.key() );
assert( !GlobalSettings::chiasmusDecryptionKey().isEmpty() );
- const STD_NAMESPACE_PREFIX auto_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-decrypt", TQStringVariantMap() ) );
- if ( !job.get() ) {
+ const STD_NAMESPACE_PREFIX unique_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-decrypt", TQStringVariantMap() ) );
+ if ( !job ) {
errorText = i18n( "Chiasmus backend does not offer the "
"\"x-decrypt\" function. Please report this bug." );
return false;
diff --git a/kmail/objecttreeparser_p.cpp b/kmail/objecttreeparser_p.cpp
index 683d3c4c..fbd2b4df 100644
--- a/kmail/objecttreeparser_p.cpp
+++ b/kmail/objecttreeparser_p.cpp
@@ -89,8 +89,8 @@ bool DecryptVerifyBodyPartMemento::start() {
m_dr = DecryptionResult( err );
return false;
}
- connect( m_job, TQT_SIGNAL(result(const GpgME::DecryptionResult&,const GpgME::VerificationResult&,const TQByteArray&)),
- this, TQT_SLOT(slotResult(const GpgME::DecryptionResult&,const GpgME::VerificationResult&,const TQByteArray&)) );
+ connect( m_job, TQ_SIGNAL(result(const GpgME::DecryptionResult&,const GpgME::VerificationResult&,const TQByteArray&)),
+ this, TQ_SLOT(slotResult(const GpgME::DecryptionResult&,const GpgME::VerificationResult&,const TQByteArray&)) );
setRunning( true );
return true;
}
@@ -155,8 +155,8 @@ bool VerifyDetachedBodyPartMemento::start() {
m_vr = VerificationResult( err );
return false;
}
- connect( m_job, TQT_SIGNAL(result(const GpgME::VerificationResult&)),
- this, TQT_SLOT(slotResult(const GpgME::VerificationResult&)) );
+ connect( m_job, TQ_SIGNAL(result(const GpgME::VerificationResult&)),
+ this, TQ_SLOT(slotResult(const GpgME::VerificationResult&)) );
setRunning( true );
return true;
}
@@ -218,9 +218,9 @@ bool VerifyDetachedBodyPartMemento::startKeyListJob()
assert( canStartKeyListJob() );
if ( const GpgME::Error err = m_keylistjob->start( keyListPattern() ) )
return false;
- connect( m_keylistjob, TQT_SIGNAL(done()), this, TQT_SLOT(slotKeyListJobDone()) );
- connect( m_keylistjob, TQT_SIGNAL(nextKey(const GpgME::Key&)),
- this, TQT_SLOT(slotNextKey(const GpgME::Key&)) );
+ connect( m_keylistjob, TQ_SIGNAL(done()), this, TQ_SLOT(slotKeyListJobDone()) );
+ connect( m_keylistjob, TQ_SIGNAL(nextKey(const GpgME::Key&)),
+ this, TQ_SLOT(slotNextKey(const GpgME::Key&)) );
return true;
}
@@ -261,8 +261,8 @@ bool VerifyOpaqueBodyPartMemento::start() {
m_vr = VerificationResult( err );
return false;
}
- connect( m_job, TQT_SIGNAL(result(const GpgME::VerificationResult&,const TQByteArray&)),
- this, TQT_SLOT(slotResult(const GpgME::VerificationResult&,const TQByteArray&)) );
+ connect( m_job, TQ_SIGNAL(result(const GpgME::VerificationResult&,const TQByteArray&)),
+ this, TQ_SLOT(slotResult(const GpgME::VerificationResult&,const TQByteArray&)) );
setRunning( true );
return true;
}
@@ -328,9 +328,9 @@ bool VerifyOpaqueBodyPartMemento::startKeyListJob()
assert( canStartKeyListJob() );
if ( const GpgME::Error err = m_keylistjob->start( keyListPattern() ) )
return false;
- connect( m_keylistjob, TQT_SIGNAL(done()), this, TQT_SLOT(slotKeyListJobDone()) );
- connect( m_keylistjob, TQT_SIGNAL(nextKey(const GpgME::Key&)),
- this, TQT_SLOT(slotNextKey(const GpgME::Key&)) );
+ connect( m_keylistjob, TQ_SIGNAL(done()), this, TQ_SLOT(slotKeyListJobDone()) );
+ connect( m_keylistjob, TQ_SIGNAL(nextKey(const GpgME::Key&)),
+ this, TQ_SLOT(slotNextKey(const GpgME::Key&)) );
return true;
}
diff --git a/kmail/objecttreeparser_p.h b/kmail/objecttreeparser_p.h
index 04e1c2c3..961fbfdf 100644
--- a/kmail/objecttreeparser_p.h
+++ b/kmail/objecttreeparser_p.h
@@ -60,7 +60,7 @@ namespace KMail {
public KMail::Interface::BodyPartMemento,
public KMail::ISubject
{
- Q_OBJECT
+ TQ_OBJECT
public:
CryptoBodyPartMemento();
@@ -87,7 +87,7 @@ namespace KMail {
class DecryptVerifyBodyPartMemento
: public CryptoBodyPartMemento
{
- Q_OBJECT
+ TQ_OBJECT
public:
DecryptVerifyBodyPartMemento( Kleo::DecryptVerifyJob * job, const TQByteArray & cipherText );
@@ -123,7 +123,7 @@ namespace KMail {
class VerifyDetachedBodyPartMemento
: public CryptoBodyPartMemento
{
- Q_OBJECT
+ TQ_OBJECT
public:
VerifyDetachedBodyPartMemento( Kleo::VerifyDetachedJob * job,
@@ -163,7 +163,7 @@ namespace KMail {
class VerifyOpaqueBodyPartMemento
: public CryptoBodyPartMemento
{
- Q_OBJECT
+ TQ_OBJECT
public:
VerifyOpaqueBodyPartMemento( Kleo::VerifyOpaqueJob * job,
diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp
index b455cc54..97ec2b6c 100644
--- a/kmail/popaccount.cpp
+++ b/kmail/popaccount.cpp
@@ -72,10 +72,10 @@ PopAccount::PopAccount(AccountManager* aOwner, const TQString& aAccountName, uin
mUidsOfNextSeenMsgsDict.setAutoDelete( false );
headersOnServer.setAutoDelete(true);
- connect(&processMsgsTimer,TQT_SIGNAL(timeout()),TQT_SLOT(slotProcessPendingMsgs()));
+ connect(&processMsgsTimer,TQ_SIGNAL(timeout()),TQ_SLOT(slotProcessPendingMsgs()));
TDEIO::Scheduler::connect(
- TQT_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)),
- this, TQT_SLOT(slotSlaveError(TDEIO::Slave *, int, const TQString &)));
+ TQ_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)),
+ this, TQ_SLOT(slotSlaveError(TDEIO::Slave *, int, const TQString &)));
mHeaderDeleteUids.clear();
mHeaderDownUids.clear();
@@ -286,12 +286,12 @@ void PopAccount::setFilterOnServerCheckSize(unsigned int aSize)
//-----------------------------------------------------------------------------
void PopAccount::connectJob() {
TDEIO::Scheduler::assignJobToSlave(mSlave, job);
- connect(job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray &)),
- TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray &)));
- connect(job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotResult( TDEIO::Job * ) ) );
- connect(job, TQT_SIGNAL(infoMessage( TDEIO::Job*, const TQString & )),
- TQT_SLOT( slotMsgRetrieved(TDEIO::Job*, const TQString &)));
+ connect(job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray &)),
+ TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray &)));
+ connect(job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotResult( TDEIO::Job * ) ) );
+ connect(job, TQ_SIGNAL(infoMessage( TDEIO::Job*, const TQString & )),
+ TQ_SLOT( slotMsgRetrieved(TDEIO::Job*, const TQString &)));
}
@@ -353,8 +353,8 @@ void PopAccount::slotAbortRequested()
{
if (stage == Idle) return;
if ( mMailCheckProgressItem )
- disconnect( mMailCheckProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
- this, TQT_SLOT( slotAbortRequested() ) );
+ disconnect( mMailCheckProgressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
+ this, TQ_SLOT( slotAbortRequested() ) );
stage = Quit;
if (job) job->kill();
job = 0;
@@ -404,8 +404,8 @@ void PopAccount::startJob()
i18n("Preparing transmission from \"%1\"...").arg( escapedName ),
true, // can be canceled
useSSL() || useTLS() );
- connect( mMailCheckProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
- this, TQT_SLOT( slotAbortRequested() ) );
+ connect( mMailCheckProgressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
+ this, TQ_SLOT( slotAbortRequested() ) );
numBytes = 0;
numBytesRead = 0;
@@ -1064,7 +1064,7 @@ void PopAccount::slotSlaveError(TDEIO::Slave *aSlave, int error,
/* We need a timer, otherwise slotSlaveError of the next account is also
executed, if it reuses the slave, because the slave member variable
is changed too early */
- TQTimer::singleShot(0, this, TQT_SLOT(slotCancel()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotCancel()));
}
//-----------------------------------------------------------------------------
diff --git a/kmail/popaccount.h b/kmail/popaccount.h
index f6acfee7..ef329982 100644
--- a/kmail/popaccount.h
+++ b/kmail/popaccount.h
@@ -25,7 +25,7 @@ namespace KMail {
* KMail account for pop mail account
*/
class PopAccount: public NetworkAccount {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/quotajobs.cpp b/kmail/quotajobs.cpp
index f8272cac..215a657c 100644
--- a/kmail/quotajobs.cpp
+++ b/kmail/quotajobs.cpp
@@ -51,8 +51,8 @@ QuotaJobs::GetQuotarootJob::GetQuotarootJob( const KURL& url,
bool showProgressInfo )
: TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
{
- connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
- TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) );
+ connect( this, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
+ TQ_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) );
}
void QuotaJobs::GetQuotarootJob::slotInfoMessage( TDEIO::Job*, const TQString& str )
@@ -106,10 +106,10 @@ QuotaJobs::GetStorageQuotaJob::GetStorageQuotaJob( TDEIO::Slave* slave, const KU
QuotaJobs::GetQuotarootJob *job =
new QuotaJobs::GetQuotarootJob( url, packedArgs, false );
- connect(job, TQT_SIGNAL(quotaInfoReceived(const QuotaInfoList&)),
- TQT_SLOT(slotQuotaInfoReceived(const QuotaInfoList&)));
- connect(job, TQT_SIGNAL(quotaRootResult(const TQStringList&)),
- TQT_SLOT(slotQuotarootResult(const TQStringList&)));
+ connect(job, TQ_SIGNAL(quotaInfoReceived(const QuotaInfoList&)),
+ TQ_SLOT(slotQuotaInfoReceived(const QuotaInfoList&)));
+ connect(job, TQ_SIGNAL(quotaRootResult(const TQStringList&)),
+ TQ_SLOT(slotQuotarootResult(const TQStringList&)));
TDEIO::Scheduler::assignJobToSlave( slave, job );
addSubjob( job );
}
diff --git a/kmail/quotajobs.h b/kmail/quotajobs.h
index 4eb7ea0e..9681fb76 100644
--- a/kmail/quotajobs.h
+++ b/kmail/quotajobs.h
@@ -136,7 +136,7 @@ GetStorageQuotaJob* getStorageQuota( TDEIO::Slave* slave, const KURL& url );
/// for getQuotaroot()
class GetQuotarootJob : public TDEIO::SimpleJob
{
- Q_OBJECT
+ TQ_OBJECT
public:
GetQuotarootJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
@@ -163,7 +163,7 @@ protected slots:
/// for getStorageQuota()
class GetStorageQuotaJob : public TDEIO::Job
{
- Q_OBJECT
+ TQ_OBJECT
public:
GetStorageQuotaJob( TDEIO::Slave* slave, const KURL& url );
diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp
index 7497a460..4525bb97 100644
--- a/kmail/recipientseditor.cpp
+++ b/kmail/recipientseditor.cpp
@@ -162,24 +162,24 @@ RecipientLine::RecipientLine( TQWidget *parent )
TQToolTip::add( mEdit,
i18n( "Set the list of email addresses to receive this message" ) );
topLayout->addWidget( mEdit );
- connect( mEdit, TQT_SIGNAL( returnPressed() ), TQT_SLOT( slotReturnPressed() ) );
- connect( mEdit, TQT_SIGNAL( deleteMe() ), TQT_SLOT( slotPropagateDeletion() ) );
- connect( mEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- TQT_SLOT( analyzeLine( const TQString & ) ) );
- connect( mEdit, TQT_SIGNAL( focusUp() ), TQT_SLOT( slotFocusUp() ) );
- connect( mEdit, TQT_SIGNAL( focusDown() ), TQT_SLOT( slotFocusDown() ) );
- connect( mEdit, TQT_SIGNAL( rightPressed() ), TQT_SIGNAL( rightPressed() ) );
+ connect( mEdit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( slotReturnPressed() ) );
+ connect( mEdit, TQ_SIGNAL( deleteMe() ), TQ_SLOT( slotPropagateDeletion() ) );
+ connect( mEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ TQ_SLOT( analyzeLine( const TQString & ) ) );
+ connect( mEdit, TQ_SIGNAL( focusUp() ), TQ_SLOT( slotFocusUp() ) );
+ connect( mEdit, TQ_SIGNAL( focusDown() ), TQ_SLOT( slotFocusDown() ) );
+ connect( mEdit, TQ_SIGNAL( rightPressed() ), TQ_SIGNAL( rightPressed() ) );
- connect( mEdit, TQT_SIGNAL( leftPressed() ), mCombo, TQT_SLOT( setFocus() ) );
- connect( mCombo, TQT_SIGNAL( rightPressed() ), mEdit, TQT_SLOT( setFocus() ) );
+ connect( mEdit, TQ_SIGNAL( leftPressed() ), mCombo, TQ_SLOT( setFocus() ) );
+ connect( mCombo, TQ_SIGNAL( rightPressed() ), mEdit, TQ_SLOT( setFocus() ) );
- connect( mCombo, TQT_SIGNAL( activated ( int ) ),
- this, TQT_SLOT( slotTypeModified() ) );
+ connect( mCombo, TQ_SIGNAL( activated ( int ) ),
+ this, TQ_SLOT( slotTypeModified() ) );
mRemoveButton = new TQPushButton( this );
mRemoveButton->setIconSet( TDEApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) );
topLayout->addWidget( mRemoveButton );
- connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotPropagateDeletion() ) );
+ connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotPropagateDeletion() ) );
TQToolTip::add( mRemoveButton, i18n("Remove recipient line") );
}
@@ -357,20 +357,20 @@ RecipientLine *RecipientsView::addLine()
addChild( line, 0, mLines.count() * mLineHeight );
line->mEdit->setCompletionMode( mCompletionMode );
line->show();
- connect( line, TQT_SIGNAL( returnPressed( RecipientLine * ) ),
- TQT_SLOT( slotReturnPressed( RecipientLine * ) ) );
- connect( line, TQT_SIGNAL( upPressed( RecipientLine * ) ),
- TQT_SLOT( slotUpPressed( RecipientLine * ) ) );
- connect( line, TQT_SIGNAL( downPressed( RecipientLine * ) ),
- TQT_SLOT( slotDownPressed( RecipientLine * ) ) );
- connect( line, TQT_SIGNAL( rightPressed() ), TQT_SIGNAL( focusRight() ) );
- connect( line, TQT_SIGNAL( deleteLine( RecipientLine * ) ),
- TQT_SLOT( slotDecideLineDeletion( RecipientLine * ) ) );
- connect( line, TQT_SIGNAL( countChanged() ), TQT_SLOT( calculateTotal() ) );
- connect( line, TQT_SIGNAL( typeModified( RecipientLine * ) ),
- TQT_SLOT( slotTypeModified( RecipientLine * ) ) );
- connect( line->mEdit, TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ),
- TQT_SLOT( setCompletionMode( TDEGlobalSettings::Completion ) ) );
+ connect( line, TQ_SIGNAL( returnPressed( RecipientLine * ) ),
+ TQ_SLOT( slotReturnPressed( RecipientLine * ) ) );
+ connect( line, TQ_SIGNAL( upPressed( RecipientLine * ) ),
+ TQ_SLOT( slotUpPressed( RecipientLine * ) ) );
+ connect( line, TQ_SIGNAL( downPressed( RecipientLine * ) ),
+ TQ_SLOT( slotDownPressed( RecipientLine * ) ) );
+ connect( line, TQ_SIGNAL( rightPressed() ), TQ_SIGNAL( focusRight() ) );
+ connect( line, TQ_SIGNAL( deleteLine( RecipientLine * ) ),
+ TQ_SLOT( slotDecideLineDeletion( RecipientLine * ) ) );
+ connect( line, TQ_SIGNAL( countChanged() ), TQ_SLOT( calculateTotal() ) );
+ connect( line, TQ_SIGNAL( typeModified( RecipientLine * ) ),
+ TQ_SLOT( slotTypeModified( RecipientLine * ) ) );
+ connect( line->mEdit, TQ_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ),
+ TQ_SLOT( setCompletionMode( TDEGlobalSettings::Completion ) ) );
if ( mLines.last() ) {
if ( mLines.count() == 1 ) {
@@ -482,7 +482,7 @@ void RecipientsView::slotDecideLineDeletion( RecipientLine *line )
line->clear();
} else {
mCurDelLine = line;
- TQTimer::singleShot( 0, this, TQT_SLOT( slotDeleteLine( ) ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotDeleteLine( ) ) );
}
}
@@ -538,7 +538,7 @@ void RecipientsView::resizeView()
parentWidget()->layout()->activate();
emit sizeHintChanged();
- TQTimer::singleShot( 0, this, TQT_SLOT(moveCompletionPopup()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(moveCompletionPopup()) );
}
void RecipientsView::activateLine( RecipientLine *line )
@@ -768,14 +768,14 @@ SideWidget::SideWidget( RecipientsView *view, TQWidget *parent )
mDistributionListButton = new TQPushButton( i18n("Save List..."), this );
topLayout->addWidget( mDistributionListButton );
mDistributionListButton->hide();
- connect( mDistributionListButton, TQT_SIGNAL( clicked() ),
- TQT_SIGNAL( saveDistributionList() ) );
+ connect( mDistributionListButton, TQ_SIGNAL( clicked() ),
+ TQ_SIGNAL( saveDistributionList() ) );
TQToolTip::add( mDistributionListButton,
i18n("Save recipients as distribution list") );
mSelectButton = new TQPushButton( i18n("Se&lect..."), this );
topLayout->addWidget( mSelectButton );
- connect( mSelectButton, TQT_SIGNAL( clicked() ), TQT_SLOT( pickRecipient() ) );
+ connect( mSelectButton, TQ_SIGNAL( clicked() ), TQ_SLOT( pickRecipient() ) );
TQToolTip::add( mSelectButton, i18n("Select recipients from address book") );
}
@@ -789,8 +789,8 @@ RecipientsPicker* SideWidget::picker() const
// hacks to allow picker() to be const in the presence of lazy loading
SideWidget *non_const_this = const_cast<SideWidget*>( this );
mRecipientPicker = new RecipientsPicker( non_const_this );
- connect( mRecipientPicker, TQT_SIGNAL( pickedRecipient( const Recipient & ) ),
- non_const_this, TQT_SIGNAL( pickedRecipient( const Recipient & ) ) );
+ connect( mRecipientPicker, TQ_SIGNAL( pickedRecipient( const Recipient & ) ),
+ non_const_this, TQ_SIGNAL( pickedRecipient( const Recipient & ) ) );
mPickerPositioner = new KWindowPositioner( non_const_this, mRecipientPicker );
}
return mRecipientPicker;
@@ -845,25 +845,25 @@ RecipientsEditor::RecipientsEditor( TQWidget *parent )
mRecipientsView = new RecipientsView( this );
topLayout->addWidget( mRecipientsView );
- connect( mRecipientsView, TQT_SIGNAL( focusUp() ), TQT_SIGNAL( focusUp() ) );
- connect( mRecipientsView, TQT_SIGNAL( focusDown() ), TQT_SIGNAL( focusDown() ) );
- connect( mRecipientsView, TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ),
- TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ) );
+ connect( mRecipientsView, TQ_SIGNAL( focusUp() ), TQ_SIGNAL( focusUp() ) );
+ connect( mRecipientsView, TQ_SIGNAL( focusDown() ), TQ_SIGNAL( focusDown() ) );
+ connect( mRecipientsView, TQ_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ),
+ TQ_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ) );
mSideWidget = new SideWidget( mRecipientsView, this );
topLayout->addWidget( mSideWidget );
- connect( mSideWidget, TQT_SIGNAL( pickedRecipient( const Recipient & ) ),
- TQT_SLOT( slotPickedRecipient( const Recipient & ) ) );
- connect( mSideWidget, TQT_SIGNAL( saveDistributionList() ),
- TQT_SLOT( saveDistributionList() ) );
-
- connect( mRecipientsView, TQT_SIGNAL( totalChanged( int, int ) ),
- mSideWidget, TQT_SLOT( setTotal( int, int ) ) );
- connect( mRecipientsView, TQT_SIGNAL( focusRight() ),
- mSideWidget, TQT_SLOT( setFocus() ) );
-
- connect( mRecipientsView, TQT_SIGNAL(sizeHintChanged()),
- TQT_SIGNAL(sizeHintChanged()) );
+ connect( mSideWidget, TQ_SIGNAL( pickedRecipient( const Recipient & ) ),
+ TQ_SLOT( slotPickedRecipient( const Recipient & ) ) );
+ connect( mSideWidget, TQ_SIGNAL( saveDistributionList() ),
+ TQ_SLOT( saveDistributionList() ) );
+
+ connect( mRecipientsView, TQ_SIGNAL( totalChanged( int, int ) ),
+ mSideWidget, TQ_SLOT( setTotal( int, int ) ) );
+ connect( mRecipientsView, TQ_SIGNAL( focusRight() ),
+ mSideWidget, TQ_SLOT( setFocus() ) );
+
+ connect( mRecipientsView, TQ_SIGNAL(sizeHintChanged()),
+ TQ_SIGNAL(sizeHintChanged()) );
}
RecipientsEditor::~RecipientsEditor()
diff --git a/kmail/recipientseditor.h b/kmail/recipientseditor.h
index d02a1be5..f53ef48c 100644
--- a/kmail/recipientseditor.h
+++ b/kmail/recipientseditor.h
@@ -71,7 +71,7 @@ class Recipient
class RecipientComboBox : public TQComboBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
RecipientComboBox( TQWidget *parent );
@@ -85,7 +85,7 @@ class RecipientComboBox : public TQComboBox
class RecipientLineEdit : public KMLineEdit
{
- Q_OBJECT
+ TQ_OBJECT
public:
RecipientLineEdit( TQWidget * parent ) :
@@ -102,7 +102,7 @@ class RecipientLineEdit : public KMLineEdit
class RecipientLine : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
RecipientLine( TQWidget *parent );
@@ -172,7 +172,7 @@ class RecipientLine : public TQWidget
class RecipientsView : public TQScrollView
{
- Q_OBJECT
+ TQ_OBJECT
public:
RecipientsView( TQWidget *parent );
@@ -266,7 +266,7 @@ class RecipientsToolTip : public TQToolTip
class SideWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
SideWidget( RecipientsView *view, TQWidget *parent );
@@ -298,7 +298,7 @@ class SideWidget : public TQWidget
class RecipientsEditor : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
RecipientsEditor( TQWidget *parent );
diff --git a/kmail/recipientseditortest.cpp b/kmail/recipientseditortest.cpp
index 50ea58a2..8c3a4d64 100644
--- a/kmail/recipientseditortest.cpp
+++ b/kmail/recipientseditortest.cpp
@@ -64,7 +64,7 @@ Composer::Composer( TQWidget *parent )
TQPushButton *button = new TQPushButton( "&Close", this );
topLayout->addMultiCellWidget( button, 3, 3, 0, 1 );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotClose() ) );
+ connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotClose() ) );
}
void Composer::slotClose()
@@ -96,7 +96,7 @@ int main( int argc, char **argv )
TDEApplication app;
- TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) );
+ TQObject::connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) );
TQWidget *wid = new Composer( 0 );
diff --git a/kmail/recipientseditortest.h b/kmail/recipientseditortest.h
index 12d0c2fc..68a050bb 100644
--- a/kmail/recipientseditortest.h
+++ b/kmail/recipientseditortest.h
@@ -30,7 +30,7 @@ class RecipientsEditor;
class Composer : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
Composer( TQWidget *parent );
diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp
index be47b022..24679d8e 100644
--- a/kmail/recipientspicker.cpp
+++ b/kmail/recipientspicker.cpp
@@ -103,7 +103,7 @@ void RecipientItem::setAddressee( const TDEABC::Addressee &a,
TQImage img = a.photo().data();
if ( !img.isNull() )
- mIcon = img.smoothScale( 20, 20, TQ_ScaleMin );
+ mIcon = img.smoothScale( 20, 20, TQImage::ScaleMin );
else
mIcon = TDEGlobal::iconLoader()->loadIcon( "preferences-desktop-personal", TDEIcon::Small );
@@ -364,10 +364,10 @@ RecipientsPicker::RecipientsPicker( TQWidget *parent )
resLayout->addWidget( mCollectionCombo );
resLayout->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Expanding));
-// connect( mCollectionCombo, TQT_SIGNAL( highlighted( int ) ),
-// TQT_SLOT( updateList() ) );
- connect( mCollectionCombo, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( updateList() ) );
+// connect( mCollectionCombo, TQ_SIGNAL( highlighted( int ) ),
+// TQ_SLOT( updateList() ) );
+ connect( mCollectionCombo, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( updateList() ) );
TQBoxLayout *searchLayout = new TQHBoxLayout( topLayout );
@@ -375,7 +375,7 @@ RecipientsPicker::RecipientsPicker( TQWidget *parent )
button->setIconSet( TDEGlobal::iconLoader()->loadIconSet(
TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", TDEIcon::Small, 0 ) );
searchLayout->addWidget( button );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( resetSearch() ) );
+ connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( resetSearch() ) );
label = new TQLabel( i18n("&Search:"), this );
searchLayout->addWidget( label );
@@ -388,21 +388,21 @@ RecipientsPicker::RecipientsPicker( TQWidget *parent )
mRecipientList->addColumn( i18n("->") );
mRecipientList->addColumn( i18n("Name") );
mRecipientList->addColumn( i18n("Email") );
- connect( mRecipientList, TQT_SIGNAL( doubleClicked( TQListViewItem *,
- const TQPoint &, int ) ), TQT_SLOT( slotPicked() ) );
- connect( mRecipientList, TQT_SIGNAL( returnPressed( TQListViewItem * ) ),
- TQT_SLOT( slotPicked() ) );
+ connect( mRecipientList, TQ_SIGNAL( doubleClicked( TQListViewItem *,
+ const TQPoint &, int ) ), TQ_SLOT( slotPicked() ) );
+ connect( mRecipientList, TQ_SIGNAL( returnPressed( TQListViewItem * ) ),
+ TQ_SLOT( slotPicked() ) );
new RecipientsListToolTip( mRecipientList->viewport(), mRecipientList );
mSearchLine = new SearchLine( this, mRecipientList );
searchLayout->addWidget( mSearchLine );
label->setBuddy( label );
- connect( mSearchLine, TQT_SIGNAL( downPressed() ), TQT_SLOT( setFocusList() ) );
+ connect( mSearchLine, TQ_SIGNAL( downPressed() ), TQ_SLOT( setFocusList() ) );
mSearchLDAPButton = new TQPushButton( i18n("Search &Directory Service"), this );
searchLayout->addWidget( mSearchLDAPButton );
- connect( mSearchLDAPButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSearchLDAP() ) );
+ connect( mSearchLDAPButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSearchLDAP() ) );
TQBoxLayout *buttonLayout = new TQHBoxLayout( topLayout );
@@ -410,27 +410,27 @@ RecipientsPicker::RecipientsPicker( TQWidget *parent )
mToButton = new TQPushButton( i18n("Add as To"), this );
buttonLayout->addWidget( mToButton );
- connect( mToButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotToClicked() ) );
+ connect( mToButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotToClicked() ) );
mCcButton = new TQPushButton( i18n("Add as CC"), this );
buttonLayout->addWidget( mCcButton );
- connect( mCcButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCcClicked() ) );
+ connect( mCcButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotCcClicked() ) );
mBccButton = new TQPushButton( i18n("Add as BCC"), this );
buttonLayout->addWidget( mBccButton );
- connect( mBccButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotBccClicked() ) );
+ connect( mBccButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotBccClicked() ) );
// BCC isn't commonly used, so hide it for now
//mBccButton->hide();
TQPushButton *closeButton = new TQPushButton( i18n("&Cancel"), this );
buttonLayout->addWidget( closeButton );
- connect( closeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( close() ) );
+ connect( closeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( close() ) );
{
using namespace TDEABC;
mAddressBook = TDEABC::StdAddressBook::self( true );
- connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook * ) ),
- this, TQT_SLOT( insertAddressBook( AddressBook * ) ) );
+ connect( mAddressBook, TQ_SIGNAL( addressBookChanged( AddressBook * ) ),
+ this, TQ_SLOT( insertAddressBook( AddressBook * ) ) );
}
initCollections();
@@ -845,8 +845,8 @@ void RecipientsPicker::slotSearchLDAP()
{
if ( !mLdapSearchDialog ) {
mLdapSearchDialog = new KPIM::LDAPSearchDialog( this );
- connect( mLdapSearchDialog, TQT_SIGNAL( addresseesAdded() ),
- TQT_SLOT(ldapSearchResult() ) );
+ connect( mLdapSearchDialog, TQ_SIGNAL( addresseesAdded() ),
+ TQ_SLOT(ldapSearchResult() ) );
}
mLdapSearchDialog->setSearchText( mSearchLine->text() );
mLdapSearchDialog->show();
diff --git a/kmail/recipientspicker.h b/kmail/recipientspicker.h
index d9dc2293..3de8eb6d 100644
--- a/kmail/recipientspicker.h
+++ b/kmail/recipientspicker.h
@@ -162,7 +162,7 @@ class RecipientsCollection
class SearchLine : public TDEListViewSearchLine
{
- Q_OBJECT
+ TQ_OBJECT
public:
SearchLine( TQWidget *parent, TDEListView *listView );
@@ -178,7 +178,7 @@ using namespace TDEABC;
class RecipientsPicker : public TQDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
RecipientsPicker( TQWidget *parent );
diff --git a/kmail/redirectdialog.cpp b/kmail/redirectdialog.cpp
index 0426bf15..371f8b76 100644
--- a/kmail/redirectdialog.cpp
+++ b/kmail/redirectdialog.cpp
@@ -74,9 +74,9 @@ RedirectDialog::RedirectDialog( TQWidget *parent, const char *name,
"where you can select recipients out "
"of all available addresses." ) );
- connect( mBtnTo, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddrBook()) );
+ connect( mBtnTo, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddrBook()) );
- connect( mEditTo, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotEmailChanged( const TQString & ) ) );
+ connect( mEditTo, TQ_SIGNAL( textChanged ( const TQString & ) ), TQ_SLOT( slotEmailChanged( const TQString & ) ) );
mLabelTo->setBuddy( mBtnTo );
mEditTo->setFocus();
diff --git a/kmail/redirectdialog.h b/kmail/redirectdialog.h
index b4893298..7b0b2601 100644
--- a/kmail/redirectdialog.h
+++ b/kmail/redirectdialog.h
@@ -49,7 +49,7 @@ namespace KMail {
*/
class RedirectDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/regexplineedit.cpp b/kmail/regexplineedit.cpp
index 1ce0237b..e99528a9 100644
--- a/kmail/regexplineedit.cpp
+++ b/kmail/regexplineedit.cpp
@@ -76,8 +76,8 @@ namespace KMail {
setFocusProxy( mLineEdit );
hlay->addWidget( mLineEdit );
- connect( mLineEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SIGNAL( textChanged( const TQString & ) ) );
+ connect( mLineEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SIGNAL( textChanged( const TQString & ) ) );
if( !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) {
mRegExpEditButton = new TQPushButton( i18n("Edit..."), this,
@@ -86,8 +86,8 @@ namespace KMail {
TQSizePolicy::Fixed );
hlay->addWidget( mRegExpEditButton );
- connect( mRegExpEditButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotEditRegExp() ) );
+ connect( mRegExpEditButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotEditRegExp() ) );
}
}
@@ -120,7 +120,7 @@ namespace KMail {
void RegExpLineEdit::slotEditRegExp()
{
if ( !mRegExpEditDialog )
- mRegExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );
+ mRegExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this );
KRegExpEditorInterface *iface =
static_cast<KRegExpEditorInterface *>( mRegExpEditDialog->tqt_cast( "KRegExpEditorInterface" ) );
diff --git a/kmail/regexplineedit.h b/kmail/regexplineedit.h
index 732f5449..22dd69ff 100644
--- a/kmail/regexplineedit.h
+++ b/kmail/regexplineedit.h
@@ -46,7 +46,7 @@ namespace KMail {
class RegExpLineEdit : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/renamejob.cpp b/kmail/renamejob.cpp
index 15c2778f..1c3cbef0 100644
--- a/kmail/renamejob.cpp
+++ b/kmail/renamejob.cpp
@@ -110,7 +110,7 @@ void RenameJob::execute()
}
// copy to the new folder
mCopyFolderJob = new CopyFolderJob( mStorage, mNewParent );
- connect( mCopyFolderJob, TQT_SIGNAL(folderCopyComplete(bool)), TQT_SLOT(folderCopyComplete(bool)) );
+ connect( mCopyFolderJob, TQ_SIGNAL(folderCopyComplete(bool)), TQ_SLOT(folderCopyComplete(bool)) );
mCopyFolderJob->execute();
} else
@@ -149,8 +149,8 @@ void RenameJob::execute()
ImapAccountBase::jobData jd( src.url() );
account->insertJob( job, jd );
TDEIO::Scheduler::assignJobToSlave( account->slave(), job );
- connect( job, TQT_SIGNAL(result(TDEIO::Job*)),
- TQT_SLOT(slotRenameResult(TDEIO::Job*)) );
+ connect( job, TQ_SIGNAL(result(TDEIO::Job*)),
+ TQ_SLOT(slotRenameResult(TDEIO::Job*)) );
}
}
diff --git a/kmail/renamejob.h b/kmail/renamejob.h
index 9e3cea43..f0a54db6 100644
--- a/kmail/renamejob.h
+++ b/kmail/renamejob.h
@@ -50,7 +50,7 @@ class CopyFolderJob;
*/
class RenameJob : public FolderJob
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp
index ae04af88..27aa68bc 100644
--- a/kmail/rulewidgethandlermanager.cpp
+++ b/kmail/rulewidgethandlermanager.cpp
@@ -251,7 +251,7 @@ void KMail::RuleWidgetHandlerManager::createWidgets( TQWidgetStack *functionStac
for ( int i = 0;
( w = (*it)->createFunctionWidget( i, functionStack, receiver ) );
++i ) {
- if ( childCount( TQT_TQOBJECT(functionStack), w->name() ) < 2 ) {
+ if ( childCount( functionStack, w->name() ) < 2 ) {
// there wasn't already a widget with this name, so add this widget
functionStack->addWidget( w );
}
@@ -266,7 +266,7 @@ void KMail::RuleWidgetHandlerManager::createWidgets( TQWidgetStack *functionStac
for ( int i = 0;
( w = (*it)->createValueWidget( i, valueStack, receiver ) );
++i ) {
- if ( childCount( TQT_TQOBJECT(valueStack), w->name() ) < 2 ) {
+ if ( childCount( valueStack, w->name() ) < 2 ) {
// there wasn't already a widget with this name, so add this widget
valueStack->addWidget( w );
}
@@ -368,7 +368,7 @@ namespace {
TQObject *obj;
while ( ( obj = it.current() ) ) {
++it;
- if ( !objName || tqstrcmp( objName, obj->name() ) == 0 )
+ if ( !objName || qstrcmp( objName, obj->name() ) == 0 )
break;
}
return obj;
@@ -431,8 +431,8 @@ namespace {
funcCombo->insertItem( i18n( TextFunctions[i].displayName ) );
}
funcCombo->adjustSize();
- TQObject::connect( funcCombo, TQT_SIGNAL( activated( int ) ),
- receiver, TQT_SLOT( slotFunctionChanged() ) );
+ TQObject::connect( funcCombo, TQ_SIGNAL( activated( int ) ),
+ receiver, TQ_SLOT( slotFunctionChanged() ) );
return funcCombo;
}
@@ -445,8 +445,8 @@ namespace {
if ( number == 0 ) {
RegExpLineEdit *lineEdit =
new RegExpLineEdit( valueStack, "regExpLineEdit" );
- TQObject::connect( lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- receiver, TQT_SLOT( slotValueChanged() ) );
+ TQObject::connect( lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ receiver, TQ_SLOT( slotValueChanged() ) );
return lineEdit;
}
@@ -459,8 +459,8 @@ namespace {
TQComboBox *combo = new TQComboBox( valueStack, "categoryCombo" );
TQStringList categories = KabcBridge::categories();
combo->insertStringList( categories );
- TQObject::connect( combo, TQT_SIGNAL( activated( int ) ),
- receiver, TQT_SLOT( slotValueChanged() ) );
+ TQObject::connect( combo, TQ_SIGNAL( activated( int ) ),
+ receiver, TQ_SLOT( slotValueChanged() ) );
return combo;
}
@@ -472,7 +472,7 @@ namespace {
KMSearchRule::Function TextRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const
{
const TQComboBox *funcCombo =
- dynamic_cast<TQComboBox*>( TQObject_child_const( TQT_TQOBJECT_CONST(functionStack),
+ dynamic_cast<TQComboBox*>( TQObject_child_const( functionStack,
"textRuleFuncCombo" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<TQComboBox*>( functionStack->child( "textRuleFuncCombo",
@@ -503,7 +503,7 @@ namespace {
if ( func == KMSearchRule::FuncIsInCategory ||
func == KMSearchRule::FuncIsNotInCategory ) {
const TQComboBox *combo=
- dynamic_cast<TQComboBox*>( TQObject_child_const( TQT_TQOBJECT_CONST(valueStack),
+ dynamic_cast<TQComboBox*>( TQObject_child_const( valueStack,
"categoryCombo" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<TQComboBox*>( valueStack->child( "categoryCombo",
@@ -520,7 +520,7 @@ namespace {
//in other cases of func it is a lineedit
const RegExpLineEdit *lineEdit =
- dynamic_cast<RegExpLineEdit*>( TQObject_child_const( TQT_TQOBJECT_CONST(valueStack),
+ dynamic_cast<RegExpLineEdit*>( TQObject_child_const( valueStack,
"regExpLineEdit" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<RegExpLineEdit*>( valueStack->child( "regExpLineEdit",
@@ -646,14 +646,14 @@ namespace {
if ( func == KMSearchRule::FuncIsInAddressbook ||
func == KMSearchRule::FuncIsNotInAddressbook ) {
TQWidget *w =
- TQT_TQWIDGET( valueStack->child( "textRuleValueHider",
+ static_cast<TQWidget*>( valueStack->child( "textRuleValueHider",
0, false ) );
valueStack->raiseWidget( w );
}
else if ( func == KMSearchRule::FuncIsInCategory ||
func == KMSearchRule::FuncIsNotInCategory) {
TQComboBox *combo =
- static_cast<TQComboBox*>( TQT_TQWIDGET(valueStack->child( "categoryCombo",
+ static_cast<TQComboBox*>( static_cast<TQWidget*>(valueStack->child( "categoryCombo",
0, false )) );
combo->blockSignals( true );
for ( i = 0; i < combo->count(); ++i )
@@ -692,7 +692,7 @@ namespace {
{
// raise the correct function widget
functionStack->raiseWidget(
- TQT_TQWIDGET( functionStack->child( "textRuleFuncCombo",
+ static_cast<TQWidget*>( functionStack->child( "textRuleFuncCombo",
0, false ) ) );
// raise the correct value widget
@@ -700,13 +700,13 @@ namespace {
if ( func == KMSearchRule::FuncIsInAddressbook ||
func == KMSearchRule::FuncIsNotInAddressbook ) {
valueStack->raiseWidget(
- TQT_TQWIDGET( valueStack->child( "textRuleValueHider",
+ static_cast<TQWidget*>( valueStack->child( "textRuleValueHider",
0, false ) ) );
}
else if ( func == KMSearchRule::FuncIsInCategory ||
func == KMSearchRule::FuncIsNotInCategory) {
valueStack->raiseWidget(
- TQT_TQWIDGET( valueStack->child( "categoryCombo",
+ static_cast<TQWidget*>( valueStack->child( "categoryCombo",
0, false ) ) );
}
else {
@@ -762,8 +762,8 @@ namespace {
funcCombo->insertItem( i18n( MessageFunctions[i].displayName ) );
}
funcCombo->adjustSize();
- TQObject::connect( funcCombo, TQT_SIGNAL( activated( int ) ),
- receiver, TQT_SLOT( slotFunctionChanged() ) );
+ TQObject::connect( funcCombo, TQ_SIGNAL( activated( int ) ),
+ receiver, TQ_SLOT( slotFunctionChanged() ) );
return funcCombo;
}
@@ -776,8 +776,8 @@ namespace {
if ( number == 0 ) {
RegExpLineEdit *lineEdit =
new RegExpLineEdit( valueStack, "regExpLineEdit" );
- TQObject::connect( lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- receiver, TQT_SLOT( slotValueChanged() ) );
+ TQObject::connect( lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ receiver, TQ_SLOT( slotValueChanged() ) );
return lineEdit;
}
@@ -794,7 +794,7 @@ namespace {
KMSearchRule::Function MessageRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const
{
const TQComboBox *funcCombo =
- dynamic_cast<TQComboBox*>( TQObject_child_const( TQT_TQOBJECT_CONST(functionStack),
+ dynamic_cast<TQComboBox*>( TQObject_child_const( functionStack,
"messageRuleFuncCombo" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<TQComboBox*>( functionStack->child( "messageRuleFuncCombo",
@@ -825,7 +825,7 @@ namespace {
KMSearchRule::Function ) const
{
const RegExpLineEdit *lineEdit =
- dynamic_cast<RegExpLineEdit*>( TQObject_child_const( TQT_TQOBJECT_CONST(valueStack),
+ dynamic_cast<RegExpLineEdit*>( TQObject_child_const( valueStack,
"regExpLineEdit" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<RegExpLineEdit*>( valueStack->child( "regExpLineEdit",
@@ -947,7 +947,7 @@ namespace {
if ( func == KMSearchRule::FuncHasAttachment ||
func == KMSearchRule::FuncHasNoAttachment ) {
TQWidget *w =
- TQT_TQWIDGET( valueStack->child( "textRuleValueHider",
+ static_cast<TQWidget*>( valueStack->child( "textRuleValueHider",
0, false ) );
valueStack->raiseWidget( w );
}
@@ -978,7 +978,7 @@ namespace {
return false;
// raise the correct function widget
functionStack->raiseWidget(
- TQT_TQWIDGET( functionStack->child( "messageRuleFuncCombo",
+ static_cast<TQWidget*>( functionStack->child( "messageRuleFuncCombo",
0, false ) ) );
// raise the correct value widget
@@ -986,7 +986,7 @@ namespace {
if ( func == KMSearchRule::FuncHasAttachment ||
func == KMSearchRule::FuncHasNoAttachment ) {
TQWidget *w =
- TQT_TQWIDGET( valueStack->child( "textRuleValueHider",
+ static_cast<TQWidget*>( valueStack->child( "textRuleValueHider",
0, false ) );
valueStack->raiseWidget( w );
}
@@ -1038,8 +1038,8 @@ namespace {
funcCombo->insertItem( i18n( StatusFunctions[i].displayName ) );
}
funcCombo->adjustSize();
- TQObject::connect( funcCombo, TQT_SIGNAL( activated( int ) ),
- receiver, TQT_SLOT( slotFunctionChanged() ) );
+ TQObject::connect( funcCombo, TQ_SIGNAL( activated( int ) ),
+ receiver, TQ_SLOT( slotFunctionChanged() ) );
return funcCombo;
}
@@ -1058,8 +1058,8 @@ namespace {
statusCombo->insertItem( UserIcon( KMail::StatusValues[ i ].icon ), i18n( KMail::StatusValues[ i ].text ) );
}
statusCombo->adjustSize();
- TQObject::connect( statusCombo, TQT_SIGNAL( activated( int ) ),
- receiver, TQT_SLOT( slotValueChanged() ) );
+ TQObject::connect( statusCombo, TQ_SIGNAL( activated( int ) ),
+ receiver, TQ_SLOT( slotValueChanged() ) );
return statusCombo;
}
@@ -1068,7 +1068,7 @@ namespace {
KMSearchRule::Function StatusRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const
{
const TQComboBox *funcCombo =
- dynamic_cast<TQComboBox*>( TQObject_child_const( TQT_TQOBJECT_CONST(functionStack),
+ dynamic_cast<TQComboBox*>( TQObject_child_const( functionStack,
"statusRuleFuncCombo" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<TQComboBox*>( functionStack->child( "statusRuleFuncCombo",
@@ -1098,7 +1098,7 @@ namespace {
int StatusRuleWidgetHandler::currenStatusValue( const TQWidgetStack *valueStack ) const
{
const TQComboBox *statusCombo =
- dynamic_cast<TQComboBox*>( TQObject_child_const( TQT_TQOBJECT_CONST(valueStack),
+ dynamic_cast<TQComboBox*>( TQObject_child_const( valueStack,
"statusRuleValueCombo" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<TQComboBox*>( valueStack->child( "statusRuleValueCombo",
@@ -1249,12 +1249,12 @@ namespace {
// raise the correct function widget
functionStack->raiseWidget(
- TQT_TQWIDGET( functionStack->child( "statusRuleFuncCombo",
+ static_cast<TQWidget*>( functionStack->child( "statusRuleFuncCombo",
0, false ) ) );
// raise the correct value widget
valueStack->raiseWidget(
- TQT_TQWIDGET( valueStack->child( "statusRuleValueCombo",
+ static_cast<TQWidget*>( valueStack->child( "statusRuleValueCombo",
0, false ) ) );
return true;
}
@@ -1298,8 +1298,8 @@ namespace {
funcCombo->insertItem( i18n( NumericFunctions[i].displayName ) );
}
funcCombo->adjustSize();
- TQObject::connect( funcCombo, TQT_SIGNAL( activated( int ) ),
- receiver, TQT_SLOT( slotFunctionChanged() ) );
+ TQObject::connect( funcCombo, TQ_SIGNAL( activated( int ) ),
+ receiver, TQ_SLOT( slotFunctionChanged() ) );
return funcCombo;
}
@@ -1313,8 +1313,8 @@ namespace {
return 0;
KIntNumInput *numInput = new KIntNumInput( valueStack, "KIntNumInput" );
- TQObject::connect( numInput, TQT_SIGNAL( valueChanged( int ) ),
- receiver, TQT_SLOT( slotValueChanged() ) );
+ TQObject::connect( numInput, TQ_SIGNAL( valueChanged( int ) ),
+ receiver, TQ_SLOT( slotValueChanged() ) );
return numInput;
}
@@ -1323,7 +1323,7 @@ namespace {
KMSearchRule::Function NumericRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const
{
const TQComboBox *funcCombo =
- dynamic_cast<TQComboBox*>( TQObject_child_const( TQT_TQOBJECT_CONST(functionStack),
+ dynamic_cast<TQComboBox*>( TQObject_child_const( functionStack,
"numericRuleFuncCombo" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<TQComboBox*>( functionStack->child( "numericRuleFuncCombo",
@@ -1353,7 +1353,7 @@ namespace {
TQString NumericRuleWidgetHandler::currentValue( const TQWidgetStack *valueStack ) const
{
const KIntNumInput *numInput =
- dynamic_cast<KIntNumInput*>( TQObject_child_const( TQT_TQOBJECT_CONST(valueStack),
+ dynamic_cast<KIntNumInput*>( TQObject_child_const( valueStack,
"KIntNumInput" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<KIntNumInput*>( valueStack->child( "KIntNumInput",
@@ -1502,7 +1502,7 @@ namespace {
// raise the correct function widget
functionStack->raiseWidget(
- TQT_TQWIDGET( functionStack->child( "numericRuleFuncCombo",
+ static_cast<TQWidget*>( functionStack->child( "numericRuleFuncCombo",
0, false ) ) );
// raise the correct value widget
diff --git a/kmail/searchjob.cpp b/kmail/searchjob.cpp
index b0b1d9de..7b0b5558 100644
--- a/kmail/searchjob.cpp
+++ b/kmail/searchjob.cpp
@@ -92,10 +92,10 @@ void SearchJob::searchCompleteFolder()
if ( mFolder->imapPath() != TQString( "/" ) )
{
TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
- connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
- TQT_SLOT( slotSearchData( TDEIO::Job*, const TQString& ) ) );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotSearchResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+ TQ_SLOT( slotSearchData( TDEIO::Job*, const TQString& ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotSearchResult( TDEIO::Job * ) ) );
}
else
{ // for the "/ folder" of an imap account, searching blocks the tdeioslave
@@ -199,8 +199,8 @@ void SearchJob::slotSearchData( TDEIO::Job* job, const TQString& data )
} else
{
// get the folder to make sure we have all messages
- connect ( mFolder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ),
- this, TQT_SLOT( slotSearchFolder()) );
+ connect ( mFolder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ),
+ this, TQ_SLOT( slotSearchFolder()) );
mFolder->getFolder();
}
}
@@ -221,8 +221,8 @@ bool SearchJob::canMapAllUIDs()
//-----------------------------------------------------------------------------
void SearchJob::slotSearchFolder()
{
- disconnect ( mFolder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ),
- this, TQT_SLOT( slotSearchFolder()) );
+ disconnect ( mFolder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ),
+ this, TQ_SLOT( slotSearchFolder()) );
if ( mLocalSearchPattern->isEmpty() ) {
// pure imap search - now get the serial number for the UIDs
@@ -271,8 +271,8 @@ void SearchJob::slotSearchFolder()
true,
mAccount->useSSL() || mAccount->useTLS() );
mProgress->setTotalItems( numMsgs );
- connect ( mProgress, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)),
- this, TQT_SLOT( slotAbortSearch( KPIM::ProgressItem* ) ) );
+ connect ( mProgress, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)),
+ this, TQ_SLOT( slotAbortSearch( KPIM::ProgressItem* ) ) );
for ( unsigned int i = 0; i < numMsgs ; ++i ) {
KMMessage * msg = mFolder->getMsg( i );
@@ -280,8 +280,8 @@ void SearchJob::slotSearchFolder()
ImapJob *job = new ImapJob( msg );
job->setParentFolder( mFolder );
job->setParentProgressItem( mProgress );
- connect( job, TQT_SIGNAL(messageRetrieved(KMMessage*)),
- this, TQT_SLOT(slotSearchMessageArrived(KMMessage*)) );
+ connect( job, TQ_SIGNAL(messageRetrieved(KMMessage*)),
+ this, TQ_SLOT(slotSearchMessageArrived(KMMessage*)) );
job->start();
} else {
slotSearchMessageArrived( msg );
@@ -387,10 +387,10 @@ void SearchJob::searchSingleMessage()
stream << (int) 'E' << url;
TDEIO::SimpleJob *job = TDEIO::special( url, packedArgs, false );
TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), job);
- connect( job, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
- TQT_SLOT(slotSearchDataSingleMessage(TDEIO::Job*,const TQString&)) );
- connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
- TQT_SLOT(slotSearchResult(TDEIO::Job *)) );
+ connect( job, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
+ TQ_SLOT(slotSearchDataSingleMessage(TDEIO::Job*,const TQString&)) );
+ connect( job, TQ_SIGNAL(result(TDEIO::Job *)),
+ TQ_SLOT(slotSearchResult(TDEIO::Job *)) );
}
}
@@ -420,8 +420,8 @@ void SearchJob::slotSearchDataSingleMessage( TDEIO::Job* job, const TQString& da
if ( needsDownload() ) {
ImapJob *job = new ImapJob( msg );
job->setParentFolder( mFolder );
- connect( job, TQT_SIGNAL(messageRetrieved(KMMessage*)),
- this, TQT_SLOT(slotSearchMessageArrived(KMMessage*)) );
+ connect( job, TQ_SIGNAL(messageRetrieved(KMMessage*)),
+ this, TQ_SLOT(slotSearchMessageArrived(KMMessage*)) );
job->start();
} else {
slotSearchMessageArrived( msg );
diff --git a/kmail/searchjob.h b/kmail/searchjob.h
index 85fd5c2a..2408669c 100644
--- a/kmail/searchjob.h
+++ b/kmail/searchjob.h
@@ -52,7 +52,7 @@ class ImapAccountBase;
*/
class SearchJob : public FolderJob
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index 68d64a82..97f1e4b6 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -188,18 +188,18 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
if ( list )
object = list->first();
delete list;
- if (!searchFolder && object && ::tqqt_cast<TQComboBox*>(object))
- static_cast<TQComboBox*>(TQT_TQWIDGET(object))->setCurrentText(i18n("Subject"));
+ if (!searchFolder && object && ::tqt_cast<TQComboBox*>(object))
+ static_cast<TQComboBox*>(object)->setCurrentText(i18n("Subject"));
vbl->addWidget( mPatternEdit );
// enable/disable widgets depending on radio buttons:
- connect( mChkbxSpecificFolders, TQT_SIGNAL(toggled(bool)),
- mCbxFolders, TQT_SLOT(setEnabled(bool)) );
- connect( mChkbxSpecificFolders, TQT_SIGNAL(toggled(bool)),
- mChkSubFolders, TQT_SLOT(setEnabled(bool)) );
- connect( mChkbxAllFolders, TQT_SIGNAL(toggled(bool)),
- TQT_TQOBJECT(this), TQT_SLOT(setEnabledSearchButton(bool)) );
+ connect( mChkbxSpecificFolders, TQ_SIGNAL(toggled(bool)),
+ mCbxFolders, TQ_SLOT(setEnabled(bool)) );
+ connect( mChkbxSpecificFolders, TQ_SIGNAL(toggled(bool)),
+ mChkSubFolders, TQ_SLOT(setEnabled(bool)) );
+ connect( mChkbxAllFolders, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(setEnabledSearchButton(bool)) );
mLbxMatches = new MatchListView(searchWidget, this, "Find Messages");
@@ -236,14 +236,14 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
mLbxMatches->setDragEnabled( true );
- connect( mLbxMatches, TQT_SIGNAL(clicked(TQListViewItem *)),
- TQT_TQOBJECT(this), TQT_SLOT(slotShowMsg(TQListViewItem *)) );
- connect( mLbxMatches, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
- TQT_TQOBJECT(this), TQT_SLOT(slotViewMsg(TQListViewItem *)) );
- connect( mLbxMatches, TQT_SIGNAL(currentChanged(TQListViewItem *)),
- TQT_TQOBJECT(this), TQT_SLOT(slotCurrentChanged(TQListViewItem *)) );
- connect( mLbxMatches, TQT_SIGNAL(contextMenuRequested(TQListViewItem *,const TQPoint &,int)),
- TQT_TQOBJECT(this), TQT_SLOT(slotContextMenuRequested(TQListViewItem *,const TQPoint &,int)) );
+ connect( mLbxMatches, TQ_SIGNAL(clicked(TQListViewItem *)),
+ this, TQ_SLOT(slotShowMsg(TQListViewItem *)) );
+ connect( mLbxMatches, TQ_SIGNAL(doubleClicked(TQListViewItem *)),
+ this, TQ_SLOT(slotViewMsg(TQListViewItem *)) );
+ connect( mLbxMatches, TQ_SIGNAL(currentChanged(TQListViewItem *)),
+ this, TQ_SLOT(slotCurrentChanged(TQListViewItem *)) );
+ connect( mLbxMatches, TQ_SIGNAL(contextMenuRequested(TQListViewItem *,const TQPoint &,int)),
+ this, TQ_SLOT(slotContextMenuRequested(TQListViewItem *,const TQPoint &,int)) );
vbl->addWidget( mLbxMatches );
TQHBoxLayout *hbl2 = new TQHBoxLayout( vbl, spacingHint(), "kmfs_hbl2" );
@@ -260,17 +260,17 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
mSearchFolderOpenBtn = new TQPushButton(i18n("Op&en Search Folder"), searchWidget);
mSearchFolderOpenBtn->setEnabled(false);
hbl2->addWidget(mSearchFolderOpenBtn);
- connect( mSearchFolderEdt, TQT_SIGNAL( textChanged( const TQString &)),
- TQT_TQOBJECT(this), TQT_SLOT( scheduleRename( const TQString & )));
- connect( &mRenameTimer, TQT_SIGNAL( timeout() ),
- TQT_TQOBJECT(this), TQT_SLOT( renameSearchFolder() ));
- connect( mSearchFolderOpenBtn, TQT_SIGNAL( clicked() ),
- TQT_TQOBJECT(this), TQT_SLOT( openSearchFolder() ));
+ connect( mSearchFolderEdt, TQ_SIGNAL( textChanged( const TQString &)),
+ this, TQ_SLOT( scheduleRename( const TQString & )));
+ connect( &mRenameTimer, TQ_SIGNAL( timeout() ),
+ this, TQ_SLOT( renameSearchFolder() ));
+ connect( mSearchFolderOpenBtn, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( openSearchFolder() ));
mSearchResultOpenBtn = new TQPushButton(i18n("Open &Message"), searchWidget);
mSearchResultOpenBtn->setEnabled(false);
hbl2->addWidget(mSearchResultOpenBtn);
- connect( mSearchResultOpenBtn, TQT_SIGNAL( clicked() ),
- TQT_TQOBJECT(this), TQT_SLOT( slotViewSelectedMsg() ));
+ connect( mSearchResultOpenBtn, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotViewSelectedMsg() ));
mStatusBar = new KStatusBar(searchWidget);
mStatusBar->insertFixedItem(i18n("AMiddleLengthText..."), 0, true);
mStatusBar->changeItem(i18n("Ready."), 0);
@@ -286,20 +286,20 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
resize(mainWidth, mainHeight);
setMainWidget(searchWidget);
- setButtonBoxOrientation(Qt::Vertical);
+ setButtonBoxOrientation(TQt::Vertical);
mBtnSearch = actionButton(KDialogBase::User1);
mBtnStop = actionButton(KDialogBase::User2);
mBtnStop->setEnabled(false);
- connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotSearch()));
- connect(this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(slotStop()));
- connect(this, TQT_SIGNAL(finished()), TQT_TQOBJECT(this), TQT_SLOT(deleteLater()));
+ connect(this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotSearch()));
+ connect(this, TQ_SIGNAL(user2Clicked()), TQ_SLOT(slotStop()));
+ connect(this, TQ_SIGNAL(finished()), this, TQ_SLOT(deleteLater()));
// give focus to the value field of the first search rule
object = mPatternEdit->child( "regExpLineEdit" );
if ( object && object->isWidgetType() ) {
- TQT_TQWIDGET(object)->setFocus();
+ static_cast<TQWidget*>(object)->setFocus();
//kdDebug(5006) << "SearchWindow: focus has been given to widget "
// << object->name() << endl;
}
@@ -309,27 +309,27 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
//set up actions
TDEActionCollection *ac = actionCollection();
ac->setWidget( this );
- mReplyAction = new TDEAction( i18n("&Reply..."), "mail-reply-sender", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotReplyToMsg()), ac, "search_reply" );
+ mReplyAction = new TDEAction( i18n("&Reply..."), "mail-reply-sender", 0, this,
+ TQ_SLOT(slotReplyToMsg()), ac, "search_reply" );
mReplyAllAction = new TDEAction( i18n("Reply to &All..."), "mail-reply-all",
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplyAllToMsg()),
+ 0, this, TQ_SLOT(slotReplyAllToMsg()),
ac, "search_reply_all" );
mReplyListAction = new TDEAction( i18n("Reply to Mailing-&List..."),
- "mail_replylist", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotReplyListToMsg()), ac,
+ "mail_replylist", 0, this,
+ TQ_SLOT(slotReplyListToMsg()), ac,
"search_reply_list" );
mForwardActionMenu = new TDEActionMenu( i18n("Message->","&Forward"),
"mail-forward", ac,
"search_message_forward" );
- connect( mForwardActionMenu, TQT_SIGNAL(activated()), this,
- TQT_SLOT(slotForwardInlineMsg()) );
+ connect( mForwardActionMenu, TQ_SIGNAL(activated()), this,
+ TQ_SLOT(slotForwardInlineMsg()) );
mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."),
- "mail-forward", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotForwardAttachedMsg()), ac,
+ "mail-forward", 0, this,
+ TQ_SLOT(slotForwardAttachedMsg()), ac,
"search_message_forward_as_attachment" );
mForwardInlineAction = new TDEAction( i18n("&Inline..."),
- "mail-forward", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotForwardInlineMsg()), ac,
+ "mail-forward", 0, this,
+ TQ_SLOT(slotForwardInlineMsg()), ac,
"search_message_forward_inline" );
if ( GlobalSettings::self()->forwardingInlineByDefault() ) {
mForwardActionMenu->insert( mForwardInlineAction );
@@ -340,32 +340,32 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
}
mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."),
- "mail-forward", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotForwardDigestMsg()), ac,
+ "mail-forward", 0, this,
+ TQ_SLOT(slotForwardDigestMsg()), ac,
"search_message_forward_as_digest" );
mForwardActionMenu->insert( mForwardDigestAction );
mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."),
- "mail-forward", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotRedirectMsg()), ac,
+ "mail-forward", 0, this,
+ TQ_SLOT(slotRedirectMsg()), ac,
"search_message_forward_redirect" );
mForwardActionMenu->insert( mRedirectAction );
- mSaveAsAction = KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT(slotSaveMsg()), ac, "search_file_save_as" );
+ mSaveAsAction = KStdAction::saveAs( this, TQ_SLOT(slotSaveMsg()), ac, "search_file_save_as" );
mSaveAtchAction = new TDEAction( i18n("Save Attachments..."), "attach", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachments()), ac, "search_save_attachments" );
+ this, TQ_SLOT(slotSaveAttachments()), ac, "search_save_attachments" );
- mPrintAction = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT(slotPrintMsg()), ac, "search_print" );
- mClearAction = new TDEAction( i18n("Clear Selection"), 0, 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotClearSelection()), ac, "search_clear_selection" );
+ mPrintAction = KStdAction::print( this, TQ_SLOT(slotPrintMsg()), ac, "search_print" );
+ mClearAction = new TDEAction( i18n("Clear Selection"), 0, 0, this,
+ TQ_SLOT(slotClearSelection()), ac, "search_clear_selection" );
- mCopyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopyMsgs()), ac, "search_copy_messages" );
- mCutAction = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(slotCutMsgs()), ac, "search_cut_messages" );
+ mCopyAction = KStdAction::copy( this, TQ_SLOT(slotCopyMsgs()), ac, "search_copy_messages" );
+ mCutAction = KStdAction::cut( this, TQ_SLOT(slotCutMsgs()), ac, "search_cut_messages" );
- connect(mTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(updStatus()));
- connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)),
- TQT_TQOBJECT(this), TQT_SLOT(folderInvalidated(KMFolder*)));
+ connect(mTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updStatus()));
+ connect(kmkernel->searchFolderMgr(), TQ_SIGNAL(folderInvalidated(KMFolder*)),
+ this, TQ_SLOT(folderInvalidated(KMFolder*)));
- connect(mCbxFolders, TQT_SIGNAL(folderChanged(KMFolder*)),
- TQT_TQOBJECT(this), TQT_SLOT(slotFolderActivated()));
+ connect(mCbxFolders, TQ_SIGNAL(folderChanged(KMFolder*)),
+ this, TQ_SLOT(slotFolderActivated()));
}
@@ -507,18 +507,18 @@ void SearchWindow::slotSearch()
mFolder = dynamic_cast<KMFolderSearch*>( folder->storage() );
}
mFolder->stopSearch();
- disconnect(mFolder, TQT_SIGNAL(msgAdded(int)),
- TQT_TQOBJECT(this), TQT_SLOT(slotAddMsg(int)));
- disconnect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
- TQT_TQOBJECT(this), TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32)));
- connect(mFolder, TQT_SIGNAL(msgAdded(int)),
- TQT_TQOBJECT(this), TQT_SLOT(slotAddMsg(int)));
- connect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
- TQT_TQOBJECT(this), TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32)));
+ disconnect(mFolder, TQ_SIGNAL(msgAdded(int)),
+ this, TQ_SLOT(slotAddMsg(int)));
+ disconnect(mFolder, TQ_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
+ this, TQ_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32)));
+ connect(mFolder, TQ_SIGNAL(msgAdded(int)),
+ this, TQ_SLOT(slotAddMsg(int)));
+ connect(mFolder, TQ_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
+ this, TQ_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32)));
mSearchFolderEdt->setEnabled(false);
KMSearch *search = new KMSearch();
- connect(search, TQT_SIGNAL(finished(bool)),
- TQT_TQOBJECT(this), TQT_SLOT(searchDone()));
+ connect(search, TQ_SIGNAL(finished(bool)),
+ this, TQ_SLOT(searchDone()));
if (mChkbxAllFolders->isChecked()) {
search->setRecursive(true);
} else {
@@ -543,7 +543,7 @@ void SearchWindow::searchDone()
mTimer->stop();
updStatus();
- TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(enableGUI()));
+ TQTimer::singleShot(0, this, TQ_SLOT(enableGUI()));
if(mLastFocus)
mLastFocus->setFocus();
if (mCloseRequested)
@@ -623,7 +623,7 @@ void SearchWindow::closeEvent(TQCloseEvent *e)
//Cancel search in progress by setting the search folder search to
//the null search
mFolder->setSearch(new KMSearch());
- TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotClose()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotClose()));
} else {
KDialogBase::closeEvent(e);
}
@@ -676,8 +676,8 @@ void SearchWindow::folderInvalidated(KMFolder *folder)
if (folder->storage() == mFolder) {
mLbxMatches->clear();
if (mFolder->search())
- connect(mFolder->search(), TQT_SIGNAL(finished(bool)),
- TQT_TQOBJECT(this), TQT_SLOT(searchDone()));
+ connect(mFolder->search(), TQ_SIGNAL(finished(bool)),
+ this, TQ_SLOT(searchDone()));
mTimer->start(200);
enableGUI();
}
@@ -840,10 +840,10 @@ void SearchWindow::slotContextMenuRequested( TQListViewItem *lvi, const TQPoint
mMenuToFolder.clear();
TQPopupMenu *msgMoveMenu = new TQPopupMenu(menu);
mKMMainWidget->folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage,
- TQT_TQOBJECT(this), &mMenuToFolder, msgMoveMenu );
+ this, &mMenuToFolder, msgMoveMenu );
TQPopupMenu *msgCopyMenu = new TQPopupMenu(menu);
mKMMainWidget->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage,
- TQT_TQOBJECT(this), &mMenuToFolder, msgCopyMenu );
+ this, &mMenuToFolder, msgCopyMenu );
// show most used actions
mReplyAction->plug(menu);
diff --git a/kmail/searchwindow.h b/kmail/searchwindow.h
index 84684c84..2bc71593 100644
--- a/kmail/searchwindow.h
+++ b/kmail/searchwindow.h
@@ -67,7 +67,7 @@ namespace KMail {
*/
class SearchWindow: public KDialogBase, virtual public KXMLGUIClient
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/secondarywindow.h b/kmail/secondarywindow.h
index cd7e6f45..335524dd 100644
--- a/kmail/secondarywindow.h
+++ b/kmail/secondarywindow.h
@@ -43,7 +43,7 @@ namespace KMail {
*/
class SecondaryWindow : public TDEMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/sieveconfig.cpp b/kmail/sieveconfig.cpp
index a787e06a..9bd137bb 100644
--- a/kmail/sieveconfig.cpp
+++ b/kmail/sieveconfig.cpp
@@ -70,7 +70,7 @@ namespace KMail {
mManagesieveCheck = new TQCheckBox( i18n("&Server supports Sieve"), this );
glay->addMultiCellWidget( mManagesieveCheck, row, row, 0, 1 );
- connect( mManagesieveCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEnableWidgets()) );
+ connect( mManagesieveCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEnableWidgets()) );
// "reuse host and login config" checkbox:
++row;
@@ -79,7 +79,7 @@ namespace KMail {
mSameConfigCheck->setEnabled( false );
glay->addMultiCellWidget( mSameConfigCheck, row, row, 0, 1 );
- connect( mSameConfigCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEnableWidgets()) );
+ connect( mSameConfigCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEnableWidgets()) );
// "Managesieve port" spinbox and label:
++row;
diff --git a/kmail/sieveconfig.h b/kmail/sieveconfig.h
index d7b9b8dc..41c1beac 100644
--- a/kmail/sieveconfig.h
+++ b/kmail/sieveconfig.h
@@ -86,7 +86,7 @@ namespace KMail {
};
class SieveConfigEditor : public TQWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
SieveConfigEditor( TQWidget * parent=0, const char * name=0 );
diff --git a/kmail/sievedebugdialog.cpp b/kmail/sievedebugdialog.cpp
index cd3ebdfc..09d7d3fa 100644
--- a/kmail/sievedebugdialog.cpp
+++ b/kmail/sievedebugdialog.cpp
@@ -206,7 +206,7 @@ SieveDebugDialog::SieveDebugDialog( TQWidget *parent, const char *name )
setInitialSize( TQSize( 640, 480 ) );
if ( !mAccountList.isEmpty() )
- TQTimer::singleShot( 0, this, TQT_SLOT( slotDiagNextAccount() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotDiagNextAccount() ) );
}
SieveDebugDialog::~SieveDebugDialog()
@@ -268,8 +268,8 @@ void SieveDebugDialog::slotDiagNextAccount()
mSieveJob = SieveJob::list( mUrl );
- connect( mSieveJob, TQT_SIGNAL( gotList( KMail::SieveJob *, bool, const TQStringList &, const TQString & ) ),
- TQT_SLOT( slotGetScriptList( KMail::SieveJob *, bool, const TQStringList &, const TQString & ) ) );
+ connect( mSieveJob, TQ_SIGNAL( gotList( KMail::SieveJob *, bool, const TQStringList &, const TQString & ) ),
+ TQ_SLOT( slotGetScriptList( KMail::SieveJob *, bool, const TQStringList &, const TQString & ) ) );
// Bypass the singleShot timer -- it's fired when we get our data
return;
@@ -279,7 +279,7 @@ void SieveDebugDialog::slotDiagNextAccount()
}
// Handle next account async
- TQTimer::singleShot( 0, this, TQT_SLOT( slotDiagNextAccount() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotDiagNextAccount() ) );
}
void SieveDebugDialog::slotDiagNextScript()
@@ -288,7 +288,7 @@ void SieveDebugDialog::slotDiagNextScript()
{
// Continue handling accounts instead
mScriptList.clear();
- TQTimer::singleShot( 0, this, TQT_SLOT( slotDiagNextAccount() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotDiagNextAccount() ) );
return;
}
@@ -302,8 +302,8 @@ void SieveDebugDialog::slotDiagNextScript()
mSieveJob = SieveJob::get( mUrl );
- connect( mSieveJob, TQT_SIGNAL( gotScript( KMail::SieveJob *, bool, const TQString &, bool ) ),
- TQT_SLOT( slotGetScript( KMail::SieveJob *, bool, const TQString &, bool ) ) );
+ connect( mSieveJob, TQ_SIGNAL( gotScript( KMail::SieveJob *, bool, const TQString &, bool ) ),
+ TQ_SLOT( slotGetScript( KMail::SieveJob *, bool, const TQString &, bool ) ) );
}
void SieveDebugDialog::slotGetScript( SieveJob * /* job */, bool success,
@@ -328,7 +328,7 @@ void SieveDebugDialog::slotGetScript( SieveJob * /* job */, bool success,
}
// Fetch next script
- TQTimer::singleShot( 0, this, TQT_SLOT( slotDiagNextScript() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotDiagNextScript() ) );
}
void SieveDebugDialog::slotGetScriptList( SieveJob *job, bool success,
@@ -367,7 +367,7 @@ void SieveDebugDialog::slotGetScriptList( SieveJob *job, bool success,
}
// Handle next job: dump scripts for this server
- TQTimer::singleShot( 0, this, TQT_SLOT( slotDiagNextScript() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotDiagNextScript() ) );
}
void SieveDebugDialog::slotDialogOk()
diff --git a/kmail/sievedebugdialog.h b/kmail/sievedebugdialog.h
index 7eacab62..e565cd6e 100644
--- a/kmail/sievedebugdialog.h
+++ b/kmail/sievedebugdialog.h
@@ -49,7 +49,7 @@ class SieveJob;
*/
class SieveDebugDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/sievejob.cpp b/kmail/sievejob.cpp
index 290e2d71..fc7b92cf 100644
--- a/kmail/sievejob.cpp
+++ b/kmail/sievejob.cpp
@@ -72,14 +72,14 @@ namespace KMail {
case Get:
kdDebug(5006) << "SieveJob::schedule: get( " << mUrl.prettyURL() << " )" << endl;
mJob = TDEIO::get( mUrl, false /*reload*/, showProgressInfo );
- connect( mJob, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)),
- TQT_SLOT(slotData(TDEIO::Job*,const TQByteArray&)) );
+ connect( mJob, TQ_SIGNAL(data(TDEIO::Job*,const TQByteArray&)),
+ TQ_SLOT(slotData(TDEIO::Job*,const TQByteArray&)) );
break;
case Put:
kdDebug(5006) << "SieveJob::schedule: put( " << mUrl.prettyURL() << " )" << endl;
mJob = TDEIO::put( mUrl, 0600, true /*overwrite*/, false /*resume*/, showProgressInfo );
- connect( mJob, TQT_SIGNAL(dataReq(TDEIO::Job*,TQByteArray&)),
- TQT_SLOT(slotDataReq(TDEIO::Job*,TQByteArray&)) );
+ connect( mJob, TQ_SIGNAL(dataReq(TDEIO::Job*,TQByteArray&)),
+ TQ_SLOT(slotDataReq(TDEIO::Job*,TQByteArray&)) );
break;
case Activate:
kdDebug(5006) << "SieveJob::schedule: chmod( " << mUrl.prettyURL() << ", 0700 )"
@@ -102,16 +102,16 @@ namespace KMail {
kdDebug(5006) << "SieveJob::schedule: listDir's real URL: " << url.prettyURL()
<< endl;
mJob = TDEIO::listDir( url, showProgressInfo );
- connect( mJob, TQT_SIGNAL(entries(TDEIO::Job*,const TDEIO::UDSEntryList&)),
- TQT_SLOT(slotEntries(TDEIO::Job*,const TDEIO::UDSEntryList&)) );
+ connect( mJob, TQ_SIGNAL(entries(TDEIO::Job*,const TDEIO::UDSEntryList&)),
+ TQ_SLOT(slotEntries(TDEIO::Job*,const TDEIO::UDSEntryList&)) );
break;
}
case List:
kdDebug(5006) << "SieveJob::schedule: listDir( " << mUrl.prettyURL() << " )" << endl;
{
mJob = TDEIO::listDir( mUrl, showProgressInfo );
- connect( mJob, TQT_SIGNAL( entries(TDEIO::Job *, const TDEIO::UDSEntryList & ) ),
- TQT_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ) );
+ connect( mJob, TQ_SIGNAL( entries(TDEIO::Job *, const TDEIO::UDSEntryList & ) ),
+ TQ_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ) );
break;
}
case Delete:
@@ -123,7 +123,7 @@ namespace KMail {
}
mJob->setInteractive(showProgressInfo);
// common to all jobs:
- connect( mJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)) );
+ connect( mJob, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*)) );
}
void SieveJob::slotData( Job *, const TQByteArray & data ) {
diff --git a/kmail/sievejob.h b/kmail/sievejob.h
index d57e7176..8a9a2bff 100644
--- a/kmail/sievejob.h
+++ b/kmail/sievejob.h
@@ -32,7 +32,7 @@ namespace TDEIO {
namespace KMail {
class SieveJob : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
protected:
enum Command { Get, Put, Activate, Deactivate, SearchActive, List, Delete };
diff --git a/kmail/signatureconfigurator.cpp b/kmail/signatureconfigurator.cpp
index 209e18c1..4b7faca3 100644
--- a/kmail/signatureconfigurator.cpp
+++ b/kmail/signatureconfigurator.cpp
@@ -85,19 +85,19 @@ namespace KMail {
TQWidgetStack * widgetStack = new TQWidgetStack( this );
widgetStack->setEnabled( false ); // since !mEnableCheck->isChecked()
vlay->addWidget( widgetStack, 1 );
- connect( mSourceCombo, TQT_SIGNAL(highlighted(int)),
- widgetStack, TQT_SLOT(raiseWidget(int)) );
+ connect( mSourceCombo, TQ_SIGNAL(highlighted(int)),
+ widgetStack, TQ_SLOT(raiseWidget(int)) );
// connects for the enabling of the widgets depending on
// signatureEnabled:
- connect( mEnableCheck, TQT_SIGNAL(toggled(bool)),
- mSourceCombo, TQT_SLOT(setEnabled(bool)) );
- connect( mEnableCheck, TQT_SIGNAL(toggled(bool)),
- widgetStack, TQT_SLOT(setEnabled(bool)) );
- connect( mEnableCheck, TQT_SIGNAL(toggled(bool)),
- label, TQT_SLOT(setEnabled(bool)) );
+ connect( mEnableCheck, TQ_SIGNAL(toggled(bool)),
+ mSourceCombo, TQ_SLOT(setEnabled(bool)) );
+ connect( mEnableCheck, TQ_SIGNAL(toggled(bool)),
+ widgetStack, TQ_SLOT(setEnabled(bool)) );
+ connect( mEnableCheck, TQ_SIGNAL(toggled(bool)),
+ label, TQ_SLOT(setEnabled(bool)) );
// The focus might be still in the widget that is disabled
- connect( mEnableCheck, TQT_SIGNAL(clicked()),
- mEnableCheck, TQT_SLOT(setFocus()) );
+ connect( mEnableCheck, TQ_SIGNAL(clicked()),
+ mEnableCheck, TQ_SLOT(setFocus()) );
int pageno = 0;
// page 0: input field for direct entering:
@@ -126,11 +126,11 @@ namespace KMail {
i18n("S&pecify file:"), page ) );
hlay->addWidget( mFileRequester, 1 );
mFileRequester->button()->setAutoDefault( false );
- connect( mFileRequester, TQT_SIGNAL(textChanged(const TQString &)),
- this, TQT_SLOT(slotEnableEditButton(const TQString &)) );
+ connect( mFileRequester, TQ_SIGNAL(textChanged(const TQString &)),
+ this, TQ_SLOT(slotEnableEditButton(const TQString &)) );
mEditButton = new TQPushButton( i18n("Edit &File"), page );
TQWhatsThis::add(mEditButton, i18n("Opens the specified file in a text editor."));
- connect( mEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit()) );
+ connect( mEditButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEdit()) );
mEditButton->setAutoDefault( false );
mEditButton->setEnabled( false ); // initially nothing to edit
hlay->addWidget( mEditButton );
diff --git a/kmail/signatureconfigurator.h b/kmail/signatureconfigurator.h
index 222a2a98..2027110a 100644
--- a/kmail/signatureconfigurator.h
+++ b/kmail/signatureconfigurator.h
@@ -32,7 +32,7 @@ class TQTextEdit;
namespace KMail {
class SignatureConfigurator : public TQWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
SignatureConfigurator( TQWidget * parent=0, const char * name=0 );
diff --git a/kmail/simplestringlisteditor.cpp b/kmail/simplestringlisteditor.cpp
index c37ea13f..c62b73ae 100644
--- a/kmail/simplestringlisteditor.cpp
+++ b/kmail/simplestringlisteditor.cpp
@@ -87,8 +87,8 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent,
mAddButton = new TQPushButton( addLabel, this );
mAddButton->setAutoDefault( false );
vlay->addWidget( mAddButton );
- connect( mAddButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotAdd()) );
+ connect( mAddButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotAdd()) );
}
if ( buttons & Remove ) {
@@ -99,8 +99,8 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent,
mRemoveButton->setAutoDefault( false );
mRemoveButton->setEnabled( false ); // no selection yet
vlay->addWidget( mRemoveButton );
- connect( mRemoveButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotRemove()) );
+ connect( mRemoveButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotRemove()) );
}
if ( buttons & Modify ) {
@@ -111,10 +111,10 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent,
mModifyButton->setAutoDefault( false );
mModifyButton->setEnabled( false ); // no selection yet
vlay->addWidget( mModifyButton );
- connect( mModifyButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotModify()) );
- connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem* ) ),
- this, TQT_SLOT( slotModify() ) );
+ connect( mModifyButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotModify()) );
+ connect( mListBox, TQ_SIGNAL( doubleClicked( TQListBoxItem* ) ),
+ this, TQ_SLOT( slotModify() ) );
}
if ( buttons & Up ) {
@@ -126,8 +126,8 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent,
mUpButton->setAutoDefault( false );
mUpButton->setEnabled( false ); // no selection yet
vlay->addWidget( mUpButton );
- connect( mUpButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotUp()) );
+ connect( mUpButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotUp()) );
}
if ( buttons & Down ) {
@@ -139,14 +139,14 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent,
mDownButton->setAutoDefault( false );
mDownButton->setEnabled( false ); // no selection yet
vlay->addWidget( mDownButton );
- connect( mDownButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotDown()) );
+ connect( mDownButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotDown()) );
}
vlay->addStretch( 1 ); // spacer
- connect( mListBox, TQT_SIGNAL(selectionChanged()),
- this, TQT_SLOT(slotSelectionChanged()) );
+ connect( mListBox, TQ_SIGNAL(selectionChanged()),
+ this, TQ_SLOT(slotSelectionChanged()) );
}
void SimpleStringListEditor::setStringList( const TQStringList & strings ) {
diff --git a/kmail/simplestringlisteditor.h b/kmail/simplestringlisteditor.h
index a2361c32..a86afeff 100644
--- a/kmail/simplestringlisteditor.h
+++ b/kmail/simplestringlisteditor.h
@@ -46,7 +46,7 @@ class TQPushButton;
//
class SimpleStringListEditor : public TQWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
enum ButtonCode {
diff --git a/kmail/snippetdlg.cpp b/kmail/snippetdlg.cpp
index 60bf689e..088b39c8 100644
--- a/kmail/snippetdlg.cpp
+++ b/kmail/snippetdlg.cpp
@@ -40,14 +40,14 @@ SnippetDlg::SnippetDlg( TDEActionCollection* ac, TQWidget* parent, const char* n
textLabel3 = new TQLabel( this, "textLabel3" );
keyButton = new KKeyButton( this );
- connect( keyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ),
- this, TQT_SLOT( slotCapturedShortcut( const TDEShortcut& ) ) );
+ connect( keyButton, TQ_SIGNAL( capturedShortcut( const TDEShortcut& ) ),
+ this, TQ_SLOT( slotCapturedShortcut( const TDEShortcut& ) ) );
btnAdd->setEnabled( false );
- connect( snippetName, TQT_SIGNAL(textChanged(const TQString &)),
- this, TQT_SLOT(slotTextChanged(const TQString &)) );
- connect( snippetName, TQT_SIGNAL(returnPressed()),
- this, TQT_SLOT(slotReturnPressed()) );
+ connect( snippetName, TQ_SIGNAL(textChanged(const TQString &)),
+ this, TQ_SLOT(slotTextChanged(const TQString &)) );
+ connect( snippetName, TQ_SIGNAL(returnPressed()),
+ this, TQ_SLOT(slotReturnPressed()) );
layout3->addWidget( textLabel3, 7, 0 );
layout3->addWidget( keyButton, 7, 1 );
diff --git a/kmail/snippetdlg.h b/kmail/snippetdlg.h
index c46e2399..3717cc86 100644
--- a/kmail/snippetdlg.h
+++ b/kmail/snippetdlg.h
@@ -18,7 +18,7 @@ class TDEShortcut;
class SnippetDlg : public SnippetDlgBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/snippetitem.h b/kmail/snippetitem.h
index cbc3c4eb..927d817c 100644
--- a/kmail/snippetitem.h
+++ b/kmail/snippetitem.h
@@ -32,7 +32,7 @@ It also holds the needed data for one snippet.
class SnippetItem : public TQObject, public TQListViewItem {
friend class SnippetGroup;
- Q_OBJECT
+ TQ_OBJECT
public:
SnippetItem(TQListViewItem * parent, TQString name, TQString text);
diff --git a/kmail/snippetsettings.h b/kmail/snippetsettings.h
index 706de5af..23f628ed 100644
--- a/kmail/snippetsettings.h
+++ b/kmail/snippetsettings.h
@@ -28,7 +28,7 @@ same named .ui file
*/
class SnippetSettings : public SnippetSettingsBase
{
-Q_OBJECT
+TQ_OBJECT
public:
SnippetSettings(TQWidget *parent = 0, const char *name = 0);
diff --git a/kmail/snippetsettingsbase.ui b/kmail/snippetsettingsbase.ui
index 14be08e9..2034ebe4 100644
--- a/kmail/snippetsettingsbase.ui
+++ b/kmail/snippetsettingsbase.ui
@@ -92,9 +92,6 @@
<property name="text">
<string>Single dialog for each variable within a snippet</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="checked">
<bool>true</bool>
</property>
@@ -109,9 +106,6 @@
<property name="text">
<string>One dialog for all variables within a snippet</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="checked">
<bool>false</bool>
</property>
diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp
index e16b4884..c0851121 100644
--- a/kmail/snippetwidget.cpp
+++ b/kmail/snippetwidget.cpp
@@ -62,22 +62,22 @@ SnippetWidget::SnippetWidget(KMEdit* editor, TDEActionCollection* actionCollecti
setRootIsDecorated(true);
//connect the signals
- connect( this, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ),
- this, TQT_SLOT( showPopupMenu(TQListViewItem *, const TQPoint & , int ) ) );
+ connect( this, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ),
+ this, TQ_SLOT( showPopupMenu(TQListViewItem *, const TQPoint & , int ) ) );
- connect( this, TQT_SIGNAL( doubleClicked (TQListViewItem *) ),
- this, TQT_SLOT( slotEdit( TQListViewItem *) ) );
- connect( this, TQT_SIGNAL( returnPressed (TQListViewItem *) ),
- this, TQT_SLOT( slotExecuted( TQListViewItem *) ) );
+ connect( this, TQ_SIGNAL( doubleClicked (TQListViewItem *) ),
+ this, TQ_SLOT( slotEdit( TQListViewItem *) ) );
+ connect( this, TQ_SIGNAL( returnPressed (TQListViewItem *) ),
+ this, TQ_SLOT( slotExecuted( TQListViewItem *) ) );
- connect( this, TQT_SIGNAL( dropped(TQDropEvent *, TQListViewItem *) ),
- this, TQT_SLOT( slotDropped(TQDropEvent *, TQListViewItem *) ) );
+ connect( this, TQ_SIGNAL( dropped(TQDropEvent *, TQListViewItem *) ),
+ this, TQ_SLOT( slotDropped(TQDropEvent *, TQListViewItem *) ) );
- connect( editor, TQT_SIGNAL( insertSnippet() ), this, TQT_SLOT( slotExecute() ));
+ connect( editor, TQ_SIGNAL( insertSnippet() ), this, TQ_SLOT( slotExecute() ));
_cfg = 0;
- TQTimer::singleShot(0, this, TQT_SLOT(initConfig()));
+ TQTimer::singleShot(0, this, TQ_SLOT(initConfig()));
}
SnippetWidget::~SnippetWidget()
@@ -149,11 +149,11 @@ SnippetItem* SnippetWidget::makeItem( SnippetItem* parent, const TQString& name,
const TQString normalizedName = TQString(actionName).replace(" ", "_");
if ( !mActionCollection->action(normalizedName.utf8().data() ) ) {
TDEAction * action = new TDEAction( actionName, shortcut, item,
- TQT_SLOT( slotExecute() ), mActionCollection,
+ TQ_SLOT( slotExecute() ), mActionCollection,
normalizedName.utf8() );
item->setAction(action);
- connect( item, TQT_SIGNAL( execute( TQListViewItem* ) ),
- this, TQT_SLOT( slotExecuted( TQListViewItem* ) ) );
+ connect( item, TQ_SIGNAL( execute( TQListViewItem* ) ),
+ this, TQ_SLOT( slotExecuted( TQListViewItem* ) ) );
}
return item;
}
@@ -542,18 +542,18 @@ void SnippetWidget::showPopupMenu( TQListViewItem * item, const TQPoint & p, int
if ( item ) {
popup.insertTitle( selectedItem->getName() );
if (dynamic_cast<SnippetGroup*>(item)) {
- popup.insertItem( i18n("Edit &group..."), this, TQT_SLOT( slotEditGroup() ) );
+ popup.insertItem( i18n("Edit &group..."), this, TQ_SLOT( slotEditGroup() ) );
} else {
- popup.insertItem( SmallIconSet("edit-paste"), i18n("&Paste"), this, TQT_SLOT( slotExecuted() ) );
- popup.insertItem( SmallIconSet("edit"), i18n("&Edit..."), this, TQT_SLOT( slotEdit() ) );
+ popup.insertItem( SmallIconSet("edit-paste"), i18n("&Paste"), this, TQ_SLOT( slotExecuted() ) );
+ popup.insertItem( SmallIconSet("edit"), i18n("&Edit..."), this, TQ_SLOT( slotEdit() ) );
}
- popup.insertItem( SmallIconSet("edit-delete"), i18n("&Remove"), this, TQT_SLOT( slotRemove() ) );
+ popup.insertItem( SmallIconSet("edit-delete"), i18n("&Remove"), this, TQ_SLOT( slotRemove() ) );
popup.insertSeparator();
} else {
popup.insertTitle(i18n("Text Snippets"));
}
- popup.insertItem( i18n("&Add Snippet..."), this, TQT_SLOT( slotAdd() ) );
- popup.insertItem( i18n("Add G&roup..."), this, TQT_SLOT( slotAddGroup() ) );
+ popup.insertItem( i18n("&Add Snippet..."), this, TQ_SLOT( slotAdd() ) );
+ popup.insertItem( i18n("Add G&roup..."), this, TQ_SLOT( slotAddGroup() ) );
popup.exec(p);
}
@@ -722,8 +722,8 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
// --END-- building a dynamic dialog
//connect the buttons to the TQDialog default slots
- connect(btn1, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(reject()) );
- connect(btn2, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(accept()) );
+ connect(btn1, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(reject()) );
+ connect(btn2, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(accept()) );
//prepare to execute the dialog
bool bReturn = false;
@@ -834,8 +834,8 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
// --END-- building a dynamic dialog
//connect the buttons to the TQDialog default slots
- connect(btn1, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(reject()) );
- connect(btn2, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(accept()) );
+ connect(btn1, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(reject()) );
+ connect(btn2, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(accept()) );
//execute the dialog
TQString strReturn = "";
diff --git a/kmail/snippetwidget.h b/kmail/snippetwidget.h
index 90ee8895..ea9f5d24 100644
--- a/kmail/snippetwidget.h
+++ b/kmail/snippetwidget.h
@@ -44,7 +44,7 @@ tooltips which contains the text of the snippet
*/
class SnippetWidget : public TDEListView, public TQToolTip
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/subscriptiondialog.cpp b/kmail/subscriptiondialog.cpp
index 93f92a79..8687096c 100644
--- a/kmail/subscriptiondialog.cpp
+++ b/kmail/subscriptiondialog.cpp
@@ -55,14 +55,14 @@ SubscriptionDialogBase::SubscriptionDialogBase( TQWidget *parent, const TQString
hideNewOnlyCheckbox();
// ok-button
- connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(slotSave()));
+ connect(this, TQ_SIGNAL(okClicked()), TQ_SLOT(slotSave()));
// reload-list button
- connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotLoadFolders()));
+ connect(this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotLoadFolders()));
// get the folders, delayed execution style, otherwise there's bother
// with virtuals from ctors and whatnot
- TQTimer::singleShot(0, this, TQT_SLOT(slotLoadFolders()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotLoadFolders()));
}
//------------------------------------------------------------------------------
@@ -234,8 +234,8 @@ void SubscriptionDialogBase::slotLoadFolders()
{
// We'll wait for the connectionResult signal from the account.
kdDebug(5006) << "SubscriptionDialog - waiting for connection" << endl;
- connect( ai, TQT_SIGNAL( connectionResult(int, const TQString&) ),
- this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
+ connect( ai, TQ_SIGNAL( connectionResult(int, const TQString&) ),
+ this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) );
return;
}
// clear the views
@@ -286,9 +286,9 @@ void SubscriptionDialogBase::processNext()
// kdDebug(5006) << "process " << mCurrentNamespace << ",subscribed=" << mSubscribed << endl;
ListJob* job = new ListJob( ai, type, 0, ai->addPathToNamespace( mCurrentNamespace ), completeListing );
- connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&,
+ connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&,
const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)),
- this, TQT_SLOT(slotListDirectory(const TQStringList&, const TQStringList&,
+ this, TQ_SLOT(slotListDirectory(const TQStringList&, const TQStringList&,
const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)));
job->start();
}
@@ -418,7 +418,7 @@ void SubscriptionDialog::processItems()
if (done == 1000)
{
emit listChanged();
- TQTimer::singleShot(0, this, TQT_SLOT(processItems()));
+ TQTimer::singleShot(0, this, TQ_SLOT(processItems()));
return;
}
++mCount;
diff --git a/kmail/subscriptiondialog.h b/kmail/subscriptiondialog.h
index bfae617c..dd84faec 100644
--- a/kmail/subscriptiondialog.h
+++ b/kmail/subscriptiondialog.h
@@ -46,7 +46,7 @@ namespace KMail {
// (More Effective C++, Item 33)
class SubscriptionDialogBase : public KSubscription
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -127,7 +127,7 @@ namespace KMail {
class SubscriptionDialog : public SubscriptionDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/tdehtmlparthtmlwriter.cpp b/kmail/tdehtmlparthtmlwriter.cpp
index 2fcf29ba..f75e17bf 100644
--- a/kmail/tdehtmlparthtmlwriter.cpp
+++ b/kmail/tdehtmlparthtmlwriter.cpp
@@ -52,7 +52,7 @@ namespace KMail {
mHtmlPart( part ), mHtmlTimer( 0, "mHtmlTimer" ), mState( Ended )
{
assert( part );
- connect( &mHtmlTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotWriteNextHtmlChunk()) );
+ connect( &mHtmlTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotWriteNextHtmlChunk()) );
}
KHtmlPartHtmlWriter::~KHtmlPartHtmlWriter() {
diff --git a/kmail/tdehtmlparthtmlwriter.h b/kmail/tdehtmlparthtmlwriter.h
index dc07b578..dfbddea2 100644
--- a/kmail/tdehtmlparthtmlwriter.h
+++ b/kmail/tdehtmlparthtmlwriter.h
@@ -44,7 +44,7 @@ class TDEHTMLPart;
namespace KMail {
class KHtmlPartHtmlWriter : public TQObject, public HtmlWriter {
- Q_OBJECT
+ TQ_OBJECT
public:
// Key is Content-Id, value is URL
diff --git a/kmail/tdelistboxdialog.cpp b/kmail/tdelistboxdialog.cpp
index 89fd0093..d6aabce7 100644
--- a/kmail/tdelistboxdialog.cpp
+++ b/kmail/tdelistboxdialog.cpp
@@ -39,10 +39,10 @@ TDEListBoxDialog::TDEListBoxDialog( TQString& _selectedString,
commentBelowLA->hide();
// signals and slots connections
- connect( entriesLB, TQT_SIGNAL( highlighted( const TQString& ) ),
- this, TQT_SLOT( highlighted( const TQString& ) ) );
- connect( entriesLB, TQT_SIGNAL( selected(int) ),
- TQT_SLOT( slotOk() ) );
+ connect( entriesLB, TQ_SIGNAL( highlighted( const TQString& ) ),
+ this, TQ_SLOT( highlighted( const TQString& ) ) );
+ connect( entriesLB, TQ_SIGNAL( selected(int) ),
+ TQ_SLOT( slotOk() ) );
// buddies
labelAboveLA->setBuddy( entriesLB );
}
diff --git a/kmail/tdelistboxdialog.h b/kmail/tdelistboxdialog.h
index a9e949ac..5a7e47f9 100644
--- a/kmail/tdelistboxdialog.h
+++ b/kmail/tdelistboxdialog.h
@@ -8,7 +8,7 @@ class TQListBox;
class TDEListBoxDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/tdelistviewindexedsearchline.h b/kmail/tdelistviewindexedsearchline.h
index 73d5d6f3..b1d49457 100644
--- a/kmail/tdelistviewindexedsearchline.h
+++ b/kmail/tdelistviewindexedsearchline.h
@@ -48,7 +48,7 @@ class TDEListViewSearchLine;
class TDEUI_EXPORT TDEListViewIndexedSearchLine: public KMail::HeaderListQuickSearch
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp
index d2dbd318..9c615791 100644
--- a/kmail/templateparser.cpp
+++ b/kmail/templateparser.cpp
@@ -1125,12 +1125,12 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf )
proc << KShell::splitArgs( cmd, KShell::TildeExpand );
proc.setUseShell( true );
- connect( &proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
- this, TQT_SLOT( onReceivedStdout( TDEProcess *, char *, int ) ) );
- connect( &proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
- this, TQT_SLOT( onReceivedStderr( TDEProcess *, char *, int ) ) );
- connect( &proc, TQT_SIGNAL( wroteStdin( TDEProcess * ) ),
- this, TQT_SLOT( onWroteStdin( TDEProcess * ) ) );
+ connect( &proc, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+ this, TQ_SLOT( onReceivedStdout( TDEProcess *, char *, int ) ) );
+ connect( &proc, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
+ this, TQ_SLOT( onReceivedStderr( TDEProcess *, char *, int ) ) );
+ connect( &proc, TQ_SIGNAL( wroteStdin( TDEProcess * ) ),
+ this, TQ_SLOT( onWroteStdin( TDEProcess * ) ) );
if ( proc.start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) {
diff --git a/kmail/templateparser.h b/kmail/templateparser.h
index ae0f9f84..ae5560ec 100644
--- a/kmail/templateparser.h
+++ b/kmail/templateparser.h
@@ -53,7 +53,7 @@ class TDEProcess;
*/
class TemplateParser : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp
index 1b79c521..3dc2d189 100644
--- a/kmail/templatesconfiguration.cpp
+++ b/kmail/templatesconfiguration.cpp
@@ -50,19 +50,19 @@ TemplatesConfiguration::TemplatesConfiguration( TQWidget *parent, const char *na
setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
sizeHint();
- connect( textEdit_new, TQT_SIGNAL( textChanged() ),
- this, TQT_SLOT( slotTextChanged( void ) ) );
- connect( textEdit_reply, TQT_SIGNAL( textChanged() ),
- this, TQT_SLOT( slotTextChanged( void ) ) );
- connect( textEdit_reply_all, TQT_SIGNAL( textChanged() ),
- this, TQT_SLOT( slotTextChanged( void ) ) );
- connect( textEdit_forward, TQT_SIGNAL( textChanged() ),
- this, TQT_SLOT( slotTextChanged( void ) ) );
- connect( lineEdit_quote, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SLOT( slotTextChanged( void ) ) );
-
- connect( mInsertCommand, TQT_SIGNAL( insertCommand(TQString, int) ),
- this, TQT_SLOT( slotInsertCommand(TQString, int) ) );
+ connect( textEdit_new, TQ_SIGNAL( textChanged() ),
+ this, TQ_SLOT( slotTextChanged( void ) ) );
+ connect( textEdit_reply, TQ_SIGNAL( textChanged() ),
+ this, TQ_SLOT( slotTextChanged( void ) ) );
+ connect( textEdit_reply_all, TQ_SIGNAL( textChanged() ),
+ this, TQ_SLOT( slotTextChanged( void ) ) );
+ connect( textEdit_forward, TQ_SIGNAL( textChanged() ),
+ this, TQ_SLOT( slotTextChanged( void ) ) );
+ connect( lineEdit_quote, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SLOT( slotTextChanged( void ) ) );
+
+ connect( mInsertCommand, TQ_SIGNAL( insertCommand(TQString, int) ),
+ this, TQ_SLOT( slotInsertCommand(TQString, int) ) );
TQString help;
if ( TQString( name ) == "folder-templates" ) {
diff --git a/kmail/templatesconfiguration.h b/kmail/templatesconfiguration.h
index 6a268c60..0fd8c6ef 100644
--- a/kmail/templatesconfiguration.h
+++ b/kmail/templatesconfiguration.h
@@ -28,7 +28,7 @@
class TemplatesConfiguration : public TemplatesConfigurationBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp
index 2b195c6d..8817711c 100644
--- a/kmail/templatesinsertcommand.cpp
+++ b/kmail/templatesinsertcommand.cpp
@@ -35,127 +35,127 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent,
: TQPushButton( parent, name )
{
setText( i18n( "&Insert Command..." ) );
- connect( this, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotClicked() ) );
+ connect( this, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotClicked() ) );
TDEAction *action;
TDEActionMenu *menu;
- TQSignalMapper *mapper = new TQSignalMapper( TQT_TQOBJECT(this) );
- connect( mapper, TQT_SIGNAL( mapped(int) ),
- this, TQT_SLOT( slotMapped(int) ) );
+ TQSignalMapper *mapper = new TQSignalMapper( this );
+ connect( mapper, TQ_SIGNAL( mapped(int) ),
+ this, TQ_SLOT( slotMapped(int) ) );
- mMenu = new TDEActionMenu( i18n( "Insert Command..." ), TQT_TQOBJECT(this) );
+ mMenu = new TDEActionMenu( i18n( "Insert Command..." ), this );
// ******************************************************
menu = new TDEActionMenu( i18n( "Original Message" ), mMenu );
mMenu->insert( menu );
action = new TDEAction( i18n("Quoted Message"),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CQuote );
menu->insert( action );
action = new TDEAction( i18n("Message Text as Is"),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CText );
menu->insert( action );
action = new TDEAction( i18n("Message Id"),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, COMsgId );
menu->insert( action );
action = new TDEAction( i18n("Date"),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CODate );
menu->insert( action );
action = new TDEAction( i18n("Date in Short Format"),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CODateShort );
menu->insert( action );
action = new TDEAction( i18n("Date in C Locale"),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CODateEn );
menu->insert( action );
action = new TDEAction( i18n("Day of Week"),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CODow );
menu->insert( action );
action = new TDEAction( i18n("Time"),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, COTime );
menu->insert( action );
action = new TDEAction( i18n("Time in Long Format"),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, COTimeLong );
menu->insert( action );
action = new TDEAction( i18n("Time in C Locale"),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, COTimeLongEn );
menu->insert( action );
action = new TDEAction( i18n("To Field Address"),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, COToAddr );
menu->insert( action );
action = new TDEAction( i18n("To Field Name"),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, COToName );
menu->insert( action );
action = new TDEAction( i18n("To Field First Name"),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, COToFName );
menu->insert( action );
action = new TDEAction( i18n("To Field Last Name"),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, COToLName );
menu->insert( action );
action = new TDEAction( i18n( "CC Field Address" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, COCCAddr );
menu->insert( action );
action = new TDEAction( i18n( "CC Field Name" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, COCCName );
menu->insert( action );
action = new TDEAction( i18n( "CC Field First Name" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, COCCFName );
menu->insert( action );
action = new TDEAction( i18n( "CC Field Last Name" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, COCCLName );
menu->insert( action );
action = new TDEAction( i18n( "From Field Address" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, COFromAddr );
menu->insert( action );
action = new TDEAction( i18n( "From Field Name" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, COFromName );
menu->insert( action );
action = new TDEAction( i18n( "From Field First Name" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, COFromFName );
menu->insert( action );
action = new TDEAction( i18n( "From Field Last Name" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, COFromLName );
menu->insert( action );
action = new TDEAction( i18n( "Addresses of all original recipients" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, COAddresseesAddr );
action = new TDEAction( i18n( "Subject" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, COFullSubject );
menu->insert( action );
action = new TDEAction( i18n( "Quoted Headers" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CTQHeaders );
menu->insert( action );
action = new TDEAction( i18n( "Headers as Is" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CHeaders );
menu->insert( action );
action = new TDEAction( i18n( "Header Content" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, COHeader );
menu->insert( action );
@@ -164,91 +164,91 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent,
mMenu->insert( menu );
action = new TDEAction( i18n( "Message Id" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CMsgId );
menu->insert( action );
action = new TDEAction( i18n( "Date" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CDate );
menu->insert( action );
action = new TDEAction( i18n( "Date in Short Format" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CDateShort );
menu->insert( action );
action = new TDEAction( i18n( "Date in C Locale" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CDateEn );
menu->insert( action );
action = new TDEAction( i18n( "Day of Week" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CDow );
menu->insert( action );
action = new TDEAction( i18n( "Time" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CTime );
menu->insert( action );
action = new TDEAction( i18n( "Time in Long Format" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CTimeLong );
menu->insert( action );
action = new TDEAction( i18n( "Time in C Locale" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CTimeLongEn );
menu->insert( action );
action = new TDEAction( i18n( "To Field Address" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CToAddr );
menu->insert( action );
action = new TDEAction( i18n( "To Field Name" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CToName );
menu->insert( action );
action = new TDEAction( i18n( "To Field First Name" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CToFName );
menu->insert( action );
action = new TDEAction( i18n( "To Field Last Name" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CToLName );
menu->insert( action );
action = new TDEAction( i18n( "CC Field Address" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CCCAddr );
menu->insert( action );
action = new TDEAction( i18n( "CC Field Name" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CCCName );
menu->insert( action );
action = new TDEAction( i18n( "CC Field First Name" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CCCFName );
menu->insert( action );
action = new TDEAction( i18n( "CC Field Last Name" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CCCLName );
menu->insert( action );
action = new TDEAction( i18n( "From Field Address" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CFromAddr );
menu->insert( action );
action = new TDEAction( i18n( "From Field Name" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CFromName );
menu->insert( action );
action = new TDEAction( i18n( "From Field First Name" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CFromFName );
menu->insert( action );
action = new TDEAction( i18n( "From Field Last Name" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CFromLName );
menu->insert( action );
action = new TDEAction( i18n( "Subject" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CFullSubject );
menu->insert( action );
action = new TDEAction( i18n( "Header Content" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CHeader );
menu->insert( action );
@@ -257,27 +257,27 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent,
mMenu->insert( menu );
action = new TDEAction( i18n( "Insert Result of Command" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CSystem );
menu->insert( action );
action = new TDEAction( i18n( "Pipe Original Message Body and Insert Result as Quoted Text" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CQuotePipe );
menu->insert( action );
action = new TDEAction( i18n( "Pipe Original Message Body and Insert Result as Is" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CTextPipe );
menu->insert( action );
action = new TDEAction( i18n( "Pipe Original Message with Headers and Insert Result as Is" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CMsgPipe );
menu->insert( action );
action = new TDEAction( i18n( "Pipe Current Message Body and Insert Result as Is" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CBodyPipe );
menu->insert( action );
action = new TDEAction( i18n( "Pipe Current Message Body and Replace with Result" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CClearPipe );
menu->insert( action );
@@ -286,35 +286,35 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent,
mMenu->insert( menu );
action = new TDEAction( i18n( "Set Cursor Position" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CCursor );
menu->insert( action );
action = new TDEAction( i18n( "Insert File Content" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CInsert );
menu->insert( action );
action = new TDEAction( i18n( "DNL" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CDnl );
menu->insert( action );
action = new TDEAction( i18n( "Template Comment" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CRem );
menu->insert( action );
action = new TDEAction( i18n( "No Operation" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CNop );
menu->insert( action );
action = new TDEAction( i18n( "Clear Generated Message" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CClear );
menu->insert( action );
action = new TDEAction( i18n( "Turn Debug On" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CDebug );
menu->insert( action );
action = new TDEAction( i18n( "Turn Debug Off" ),
- 0, mapper, TQT_SLOT( map() ), menu );
+ 0, mapper, TQ_SLOT( map() ), menu );
mapper->setMapping( action, CDebugOff );
menu->insert( action );
}
diff --git a/kmail/templatesinsertcommand.h b/kmail/templatesinsertcommand.h
index c928dd67..257064b8 100644
--- a/kmail/templatesinsertcommand.h
+++ b/kmail/templatesinsertcommand.h
@@ -29,7 +29,7 @@ class TDEActionMenu;
class TemplatesInsertCommand : public TQPushButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/tests/messagedicttests.h b/kmail/tests/messagedicttests.h
index f60a3b2f..42bed1ab 100644
--- a/kmail/tests/messagedicttests.h
+++ b/kmail/tests/messagedicttests.h
@@ -13,7 +13,7 @@ class KMDict;
class MessageDictTester : public KUnitTest::SlotTester
{
- Q_OBJECT
+ TQ_OBJECT
public slots:
diff --git a/kmail/tests/mimelibtests.h b/kmail/tests/mimelibtests.h
index 8fd06124..0d66b967 100644
--- a/kmail/tests/mimelibtests.h
+++ b/kmail/tests/mimelibtests.h
@@ -25,7 +25,7 @@ class DwString;
class MimeLibTester : public KUnitTest::SlotTester
{
- Q_OBJECT
+ TQ_OBJECT
public slots:
diff --git a/kmail/tests/utiltests.h b/kmail/tests/utiltests.h
index 0bcbcdf1..a88a01e9 100644
--- a/kmail/tests/utiltests.h
+++ b/kmail/tests/utiltests.h
@@ -11,7 +11,7 @@
class UtilTester : public KUnitTest::SlotTester
{
- Q_OBJECT
+ TQ_OBJECT
public slots:
diff --git a/kmail/treebase.cpp b/kmail/treebase.cpp
index 1e23a007..97d43b5d 100644
--- a/kmail/treebase.cpp
+++ b/kmail/treebase.cpp
@@ -35,10 +35,10 @@ TreeBase::TreeBase( TQWidget *parent, KMFolderTree *folderTree,
Q_UNUSED( mustBeReadWrite );
kdDebug(5006) << k_funcinfo << endl;
- connect(this, TQT_SIGNAL(collapsed(TQListViewItem*)), TQT_SLOT(recolorRows()));
- connect(this, TQT_SIGNAL(expanded(TQListViewItem*)), TQT_SLOT(recolorRows()));
- connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int ) ),
- this, TQT_SLOT( slotContextMenuRequested( TQListViewItem*, const TQPoint & ) ) );
+ connect(this, TQ_SIGNAL(collapsed(TQListViewItem*)), TQ_SLOT(recolorRows()));
+ connect(this, TQ_SIGNAL(expanded(TQListViewItem*)), TQ_SLOT(recolorRows()));
+ connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int ) ),
+ this, TQ_SLOT( slotContextMenuRequested( TQListViewItem*, const TQPoint & ) ) );
}
@@ -97,7 +97,7 @@ void TreeBase::slotContextMenuRequested( TQListViewItem *lvi, const TQPoint &p
folderMenu->insertSeparator();
folderMenu->insertItem(SmallIconSet("folder-new"),
i18n("&New Subfolder..."), this,
- TQT_SLOT(addChildFolder()));
+ TQ_SLOT(addChildFolder()));
kmkernel->setContextMenuShown( true );
folderMenu->exec (p, 0);
kmkernel->setContextMenuShown( false );
diff --git a/kmail/treebase.h b/kmail/treebase.h
index 23b2bd3d..48a614df 100644
--- a/kmail/treebase.h
+++ b/kmail/treebase.h
@@ -32,7 +32,7 @@ class TreeItemBase;
class TreeBase : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
TreeBase( TQWidget * parent, KMFolderTree *folderTree,
diff --git a/kmail/twindowpositioner.h b/kmail/twindowpositioner.h
index 88fab3f8..6825ad38 100644
--- a/kmail/twindowpositioner.h
+++ b/kmail/twindowpositioner.h
@@ -27,7 +27,7 @@ class TQWindow;
class KWindowPositioner : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
enum Mode { Right, Bottom };
diff --git a/kmail/undostack.h b/kmail/undostack.h
index 1debbf10..6bb6c29a 100644
--- a/kmail/undostack.h
+++ b/kmail/undostack.h
@@ -43,7 +43,7 @@ public:
class UndoStack : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp
index 32469118..dde2944e 100644
--- a/kmail/urlhandlermanager.cpp
+++ b/kmail/urlhandlermanager.cpp
@@ -752,7 +752,7 @@ namespace {
namespace {
bool FallBackURLHandler::handleClick( const KURL & url, KMReaderWin * w ) const {
if ( w )
- w->emitUrlClicked( url, Qt::LeftButton );
+ w->emitUrlClicked( url, TQt::LeftButton );
return true;
}
diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp
index 383daa94..7ad0728c 100644
--- a/kmail/vacation.cpp
+++ b/kmail/vacation.cpp
@@ -436,8 +436,8 @@ namespace KMail {
if ( mUrl.isEmpty() ) // nothing to do...
return;
mSieveJob = SieveJob::get( mUrl, !checkOnly );
- connect( mSieveJob, TQT_SIGNAL(gotScript(KMail::SieveJob*,bool,const TQString&,bool)),
- TQT_SLOT(slotGetResult(KMail::SieveJob*,bool,const TQString&,bool)) );
+ connect( mSieveJob, TQ_SIGNAL(gotScript(KMail::SieveJob*,bool,const TQString&,bool)),
+ TQ_SLOT(slotGetResult(KMail::SieveJob*,bool,const TQString&,bool)) );
}
Vacation::~Vacation() {
@@ -645,9 +645,9 @@ namespace KMail {
mDialog->setDomainName( domainName );
mDialog->enableDomainAndSendForSpam( !GlobalSettings::allowOutOfOfficeUploadButNoSettings() );
- connect( mDialog, TQT_SIGNAL(okClicked()), TQT_SLOT(slotDialogOk()) );
- connect( mDialog, TQT_SIGNAL(cancelClicked()), TQT_SLOT(slotDialogCancel()) );
- connect( mDialog, TQT_SIGNAL(defaultClicked()), TQT_SLOT(slotDialogDefaults()) );
+ connect( mDialog, TQ_SIGNAL(okClicked()), TQ_SLOT(slotDialogOk()) );
+ connect( mDialog, TQ_SIGNAL(cancelClicked()), TQ_SLOT(slotDialogCancel()) );
+ connect( mDialog, TQ_SIGNAL(defaultClicked()), TQ_SLOT(slotDialogDefaults()) );
mDialog->show();
}
@@ -690,10 +690,10 @@ namespace KMail {
// and commit the dialog's settings to the server:
mSieveJob = SieveJob::put( mUrl, script, active, mWasActive );
- connect( mSieveJob, TQT_SIGNAL(gotScript(KMail::SieveJob*,bool,const TQString&,bool)),
+ connect( mSieveJob, TQ_SIGNAL(gotScript(KMail::SieveJob*,bool,const TQString&,bool)),
active
- ? TQT_SLOT(slotPutActiveResult(KMail::SieveJob*,bool))
- : TQT_SLOT(slotPutInactiveResult(KMail::SieveJob*,bool)) );
+ ? TQ_SLOT(slotPutActiveResult(KMail::SieveJob*,bool))
+ : TQ_SLOT(slotPutInactiveResult(KMail::SieveJob*,bool)) );
// destroy the dialog:
mDialog->delayedDestruct();
diff --git a/kmail/vacation.h b/kmail/vacation.h
index 2bf55d3e..3581eff3 100644
--- a/kmail/vacation.h
+++ b/kmail/vacation.h
@@ -36,7 +36,7 @@ namespace KMime {
namespace KMail {
class Vacation : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
Vacation( TQObject * parent=0, bool checkOnly = false, const char * name=0 );
diff --git a/kmail/vacationdialog.cpp b/kmail/vacationdialog.cpp
index 6e74ab5b..f02d4236 100644
--- a/kmail/vacationdialog.cpp
+++ b/kmail/vacationdialog.cpp
@@ -74,7 +74,7 @@ namespace KMail {
int defDayInterval = 7; //default day interval
mIntervalSpin = new KIntSpinBox( 1, 356, 1, defDayInterval, 10, plainPage(), "mIntervalSpin" );
mIntervalSpin->setSuffix( i18n(" day", " days", defDayInterval) );
- connect(mIntervalSpin, TQT_SIGNAL( valueChanged( int )), TQT_SLOT( slotIntervalSpinChanged( int ) ) );
+ connect(mIntervalSpin, TQ_SIGNAL( valueChanged( int )), TQ_SLOT( slotIntervalSpinChanged( int ) ) );
glay->addWidget( new TQLabel( mIntervalSpin, i18n("&Resend notification only after:"), plainPage() ), row, 0 );
glay->addWidget( mIntervalSpin, row, 1 );
@@ -96,11 +96,11 @@ namespace KMail {
mDomainCheck->setChecked( false );
mDomainEdit = new TQLineEdit( plainPage(), "mDomainEdit" );
mDomainEdit->setEnabled( false );
- mDomainEdit->setValidator( new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), TQT_TQOBJECT(mDomainEdit) ) );
+ mDomainEdit->setValidator( new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), mDomainEdit ) );
glay->addWidget( mDomainCheck, row, 0 );
glay->addWidget( mDomainEdit, row, 1 );
- connect( mDomainCheck, TQT_SIGNAL(toggled(bool)),
- mDomainEdit, TQT_SLOT(setEnabled(bool)) );
+ connect( mDomainCheck, TQ_SIGNAL(toggled(bool)),
+ mDomainEdit, TQ_SLOT(setEnabled(bool)) );
Q_ASSERT( row == rows - 1 );
}
diff --git a/kmail/vacationdialog.h b/kmail/vacationdialog.h
index 9d80e5f7..c97e164f 100644
--- a/kmail/vacationdialog.h
+++ b/kmail/vacationdialog.h
@@ -35,7 +35,7 @@ namespace KMime {
namespace KMail {
class VacationDialog : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
VacationDialog( const TQString & caption, TQWidget * parent=0,
diff --git a/kmail/vcardviewer.h b/kmail/vcardviewer.h
index abd88820..904bd479 100644
--- a/kmail/vcardviewer.h
+++ b/kmail/vcardviewer.h
@@ -36,7 +36,7 @@ namespace KMail {
class VCardViewer : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
#if defined(KABC_VCARD_ENCODING_FIX)
diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp
index 593e86ed..bc77041a 100644
--- a/kmail/xfaceconfigurator.cpp
+++ b/kmail/xfaceconfigurator.cpp
@@ -126,17 +126,17 @@ namespace KMail {
TQWidgetStack * widgetStack = new TQWidgetStack( this );
widgetStack->setEnabled( false ); // since !mEnableCheck->isChecked()
vlay->addWidget( widgetStack, 1 );
- connect( mSourceCombo, TQT_SIGNAL(highlighted(int)),
- widgetStack, TQT_SLOT(raiseWidget(int)) );
- connect( mEnableCheck, TQT_SIGNAL(toggled(bool)),
- mSourceCombo, TQT_SLOT(setEnabled(bool)) );
- connect( mEnableCheck, TQT_SIGNAL(toggled(bool)),
- widgetStack, TQT_SLOT(setEnabled(bool)) );
- connect( mEnableCheck, TQT_SIGNAL(toggled(bool)),
- label, TQT_SLOT(setEnabled(bool)) );
+ connect( mSourceCombo, TQ_SIGNAL(highlighted(int)),
+ widgetStack, TQ_SLOT(raiseWidget(int)) );
+ connect( mEnableCheck, TQ_SIGNAL(toggled(bool)),
+ mSourceCombo, TQ_SLOT(setEnabled(bool)) );
+ connect( mEnableCheck, TQ_SIGNAL(toggled(bool)),
+ widgetStack, TQ_SLOT(setEnabled(bool)) );
+ connect( mEnableCheck, TQ_SIGNAL(toggled(bool)),
+ label, TQ_SLOT(setEnabled(bool)) );
// The focus might be still in the widget that is disabled
- connect( mEnableCheck, TQT_SIGNAL(clicked()),
- mEnableCheck, TQT_SLOT(setFocus()) );
+ connect( mEnableCheck, TQ_SIGNAL(clicked()),
+ mEnableCheck, TQ_SLOT(setFocus()) );
int pageno = 0;
// page 0: create X-Face from image file or address book entry
@@ -151,16 +151,16 @@ namespace KMail {
"A light background helps improve the result." ) );
mFromFileBtn->setAutoDefault( false );
page_vlay->addWidget( mFromFileBtn, 1 );
- connect( mFromFileBtn, TQT_SIGNAL(released()),
- this, TQT_SLOT(slotSelectFile()) );
+ connect( mFromFileBtn, TQ_SIGNAL(released()),
+ this, TQ_SLOT(slotSelectFile()) );
mFromAddrbkBtn = new TQPushButton( i18n("Set From Address Book"), page );
TQWhatsThis::add( mFromAddrbkBtn,
i18n( "You can use a scaled-down version of the picture "
"you have set in your address book entry." ) );
mFromAddrbkBtn->setAutoDefault( false );
page_vlay->addWidget( mFromAddrbkBtn, 1 );
- connect( mFromAddrbkBtn, TQT_SIGNAL(released()),
- this, TQT_SLOT(slotSelectFromAddressbook()) );
+ connect( mFromAddrbkBtn, TQ_SIGNAL(released()),
+ this, TQ_SLOT(slotSelectFromAddressbook()) );
label1 = new TQLabel( i18n("<qt>KMail can send a small (48x48 pixels), low-quality, "
"monochrome picture with every message. "
"For example, this could be a picture of you or a glyph. "
@@ -185,7 +185,7 @@ namespace KMail {
page_vlay->addWidget( label2 );
- connect(mTextEdit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotUpdateXFace()));
+ connect(mTextEdit, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotUpdateXFace()));
}
XFaceConfigurator::~XFaceConfigurator() {
diff --git a/kmail/xfaceconfigurator.h b/kmail/xfaceconfigurator.h
index c107299f..2589400d 100644
--- a/kmail/xfaceconfigurator.h
+++ b/kmail/xfaceconfigurator.h
@@ -30,7 +30,7 @@ class TQComboBox;
namespace KMail {
class XFaceConfigurator : public TQWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
XFaceConfigurator( TQWidget * parent=0, const char * name=0 );
diff --git a/kmailcvt/README b/kmailcvt/README
index d1105fe4..1f778afe 100644
--- a/kmailcvt/README
+++ b/kmailcvt/README
@@ -16,14 +16,14 @@ your tdepim source directory.
In the import method of your filter you are passed a FilterInfo object. This has
the following methods that you may want to use:
- void setFrom( const QString& from ); // Set to file importing from
- void setTo( const QString& to ); // Set to folder importing into
- void setCurrent( const QString& current ); // What we are doing
+ void setFrom( const TQString& from ); // Set to file importing from
+ void setTo( const TQString& to ); // Set to folder importing into
+ void setCurrent( const TQString& current ); // What we are doing
void setCurrent( int percent = 0 ); // Set percentage of current file
void setOverall( int percent = 0 ); // Set overall percentage
- void addLog( const QString& log ); // Add a message for the user to see
- void alert( const QString& message ); // Tell user something has gone wrong
- QWidget *parent(); // The parent widget
+ void addLog( const TQString& log ); // Add a message for the user to see
+ void alert( const TQString& message ); // Tell user something has gone wrong
+ TQWidget *parent(); // The parent widget
bool removeDupMsg; // true, if user selected 'remove duplicated messages'
diff --git a/kmailcvt/filter_sylpheed.cpp b/kmailcvt/filter_sylpheed.cpp
index e8f4a66a..bf8427c2 100644
--- a/kmailcvt/filter_sylpheed.cpp
+++ b/kmailcvt/filter_sylpheed.cpp
@@ -187,7 +187,7 @@ void FilterSylpheed::readMarkFile( FilterInfo *info, const TQString &path, TQDic
TQDataStream stream(&file);
- if (Q_BYTE_ORDER == Q_LITTLE_ENDIAN)
+ if (TQ_BYTE_ORDER == TQ_LITTLE_ENDIAN)
stream.setByteOrder(TQDataStream::LittleEndian);
diff --git a/kmailcvt/kimportpage.h b/kmailcvt/kimportpage.h
index 9541b5d4..1b9fcdc5 100644
--- a/kmailcvt/kimportpage.h
+++ b/kmailcvt/kimportpage.h
@@ -21,7 +21,7 @@
#include "kimportpagedlg.h"
class KImportPage : public KImportPageDlg {
- Q_OBJECT
+ TQ_OBJECT
public:
KImportPage(TQWidget *parent=0, const char *name=0);
diff --git a/kmailcvt/kmailcvt.h b/kmailcvt/kmailcvt.h
index 7253d5ac..0f6704b0 100644
--- a/kmailcvt/kmailcvt.h
+++ b/kmailcvt/kmailcvt.h
@@ -26,7 +26,7 @@
/** KMailCVT is the base class of the project */
class KMailCVT : public KWizard {
- Q_OBJECT
+ TQ_OBJECT
public:
KMailCVT(TQWidget* parent=0, const char *name=0);
diff --git a/kmailcvt/kselfilterpage.cpp b/kmailcvt/kselfilterpage.cpp
index 118124f7..ef3d9577 100644
--- a/kmailcvt/kselfilterpage.cpp
+++ b/kmailcvt/kselfilterpage.cpp
@@ -43,7 +43,7 @@ KSelFilterPage::KSelFilterPage(TQWidget *parent, const char *name ) : KSelFilter
mIntroSidebar->setPixmap(locate("data", "kmailcvt/pics/step1.png"));
mFilterList.setAutoDelete( TRUE );
- connect(mFilterCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(filterSelected(int)));
+ connect(mFilterCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(filterSelected(int)));
// Add new filters below. If this annoys you, please rewrite the stuff to use a factory.
// The former approach was overengineered and only worked around problems in the design
diff --git a/kmailcvt/kselfilterpage.h b/kmailcvt/kselfilterpage.h
index 127dc816..1dc208e6 100644
--- a/kmailcvt/kselfilterpage.h
+++ b/kmailcvt/kselfilterpage.h
@@ -24,7 +24,7 @@ class Filter;
template <class T> class TQPtrList;
class KSelFilterPage : public KSelFilterPageDlg {
- Q_OBJECT
+ TQ_OBJECT
public:
KSelFilterPage(TQWidget *parent=0, const char *name=0);
diff --git a/kmobile/TODO b/kmobile/TODO
index 33b60b83..e3822225 100644
--- a/kmobile/TODO
+++ b/kmobile/TODO
@@ -12,7 +12,6 @@ TODO:
- fix doubled loading of plugins
- where do I get the device name from the kmobile unique process?
- finish the functions which are available to client apps.
-- kitchensync driver/plugin (starting...)
- a plugin for the left side of the "Open File Dialog". ->
makes direct access to mobile devices really easy
- make the daemon a KDED (KDE Meta Daemon) module (tdelibs/kded/HOWTO, README.kded)
@@ -22,10 +21,3 @@ General Interface TODO:
-----------------------
- automatic logoff timers
- Authentication
-
-
-TODO (lower priority):
-----------------------
-- a kmobile-driver, which can connect to another KDE-computer
- to be able to access Calendar-Entries, ToDo's, ... from there
- and to be able to syncronize them via kitchensync (maybe?)
diff --git a/kmobile/devices/gnokii/gnokii_mobile.h b/kmobile/devices/gnokii/gnokii_mobile.h
index cc55911c..461c6d3f 100644
--- a/kmobile/devices/gnokii/gnokii_mobile.h
+++ b/kmobile/devices/gnokii/gnokii_mobile.h
@@ -29,7 +29,7 @@
class KMobileGnokii : public KMobileDevice
{
-Q_OBJECT
+TQ_OBJECT
public:
KMobileGnokii( TQObject *obj=0, const char *name=0, const TQStringList &args=TQStringList() );
@@ -37,7 +37,7 @@ public:
// createObject needs to be reimplemented by every KMobileDevice driver
TQObject *createObject( TQObject *parent=0, const char *name=0,
- const char *classname=TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args=TQStringList() );
+ const char *classname="TQObject", const TQStringList &args=TQStringList() );
// connect, disconnect and current status
bool connectDevice(TQWidget *parent);
diff --git a/kmobile/devices/gnokii/gnokiiconfig.cpp b/kmobile/devices/gnokii/gnokiiconfig.cpp
index 07bc46f4..4be8fb36 100644
--- a/kmobile/devices/gnokii/gnokiiconfig.cpp
+++ b/kmobile/devices/gnokii/gnokiiconfig.cpp
@@ -72,7 +72,7 @@ void GnokiiConfig::setValues(const TQString &model, const TQString &connection,
slotCheckValues();
- connect( cb_Connection, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckValues(const TQString &)) );
+ connect( cb_Connection, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotCheckValues(const TQString &)) );
}
void GnokiiConfig::getValues(TQString &model, TQString &connection, TQString &port, TQString &baud) const
diff --git a/kmobile/devices/gnokii/gnokiiconfig.h b/kmobile/devices/gnokii/gnokiiconfig.h
index 530bb4e4..a3f3b04b 100644
--- a/kmobile/devices/gnokii/gnokiiconfig.h
+++ b/kmobile/devices/gnokii/gnokiiconfig.h
@@ -25,7 +25,7 @@
class GnokiiConfig : public GnokiiConfigUI
{
-Q_OBJECT
+TQ_OBJECT
public:
GnokiiConfig( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
diff --git a/kmobile/devices/skeleton/skeleton.h b/kmobile/devices/skeleton/skeleton.h
index abd1e8bc..b96af359 100644
--- a/kmobile/devices/skeleton/skeleton.h
+++ b/kmobile/devices/skeleton/skeleton.h
@@ -28,7 +28,7 @@
class KMobileSkeleton : public KMobileDevice
{
-Q_OBJECT
+TQ_OBJECT
public:
KMobileSkeleton( TQObject *obj=0, const char *name=0, const TQStringList &args=TQStringList() );
@@ -36,7 +36,7 @@ public:
// createObject needs to be reimplemented by every KMobileDevice driver
TQObject *createObject( TQObject *parent=0, const char *name=0,
- const char *classname=TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args=TQStringList() );
+ const char *classname="TQObject", const TQStringList &args=TQStringList() );
// connect, disconnect and current status
bool connectDevice(TQWidget *parent);
diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp
index 379a17cd..6febb6aa 100644
--- a/kmobile/kmobile.cpp
+++ b/kmobile/kmobile.cpp
@@ -74,8 +74,8 @@ KMobile::KMobile()
setAutoSaveSettings();
// allow the view to change the statusbar and caption
- connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)),
- this, TQT_SLOT(changeStatusbar(const TQString&)));
+ connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)),
+ this, TQ_SLOT(changeStatusbar(const TQString&)));
// restore all configured devices
restoreAll();
@@ -83,7 +83,7 @@ KMobile::KMobile()
// setup the system tray
m_systemTray = new SystemTray(this, "systemTray");
m_systemTray->show();
- connect(m_systemTray, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(slotQuit()));
+ connect(m_systemTray, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(slotQuit()));
}
KMobile::~KMobile()
@@ -93,29 +93,29 @@ KMobile::~KMobile()
void KMobile::setupActions()
{
- KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(dockApplication()), actionCollection());
- KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
+ KStdAction::close(this, TQ_SLOT(dockApplication()), actionCollection());
+ KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
- m_toolbarAction = KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowToolbar()), actionCollection());
+ m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection());
optionsShowToolbar();
- m_statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowStatusbar()), actionCollection());
+ m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection());
- KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
- KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection());
+ KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection());
+ KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection());
+ KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection());
new TDEAction(i18n("&Add Device..."), "folder-new", 0,
- TQT_TQOBJECT(this), TQT_SLOT(addDevice()), actionCollection(), "device_add");
+ this, TQ_SLOT(addDevice()), actionCollection(), "device_add");
new TDEAction( KGuiItem( i18n("&Remove Device"), "edittrash", i18n("Remove this device") ),
- "Delete", TQT_TQOBJECT(this), TQT_SLOT(removeDevice()), actionCollection(), "device_remove");
+ "Delete", this, TQ_SLOT(removeDevice()), actionCollection(), "device_remove");
new TDEAction(i18n("Re&name Device..."), 0, Key_F2,
- TQT_TQOBJECT(this), TQT_SLOT(renameDevice()), actionCollection(), "device_rename");
+ this, TQ_SLOT(renameDevice()), actionCollection(), "device_rename");
new TDEAction(i18n("&Configure Device..."), "configure", 0,
- TQT_TQOBJECT(this), TQT_SLOT(configDevice()), actionCollection(), "device_configure");
+ this, TQ_SLOT(configDevice()), actionCollection(), "device_configure");
createGUI();
- connect( kapp, TQT_SIGNAL(aboutToQuit()), TQT_TQOBJECT(this), TQT_SLOT(saveAll()) );
+ connect( kapp, TQ_SIGNAL(aboutToQuit()), this, TQ_SLOT(saveAll()) );
}
@@ -261,11 +261,11 @@ void KMobile::addDevice()
dialog->helpText->setText( i18n("Please select the category to which your new device belongs:") );
dialog->addButton->setText( i18n("&Scan for New Devices...") );
dialog->addButton->setDisabled(true);
- dialog->iconView->connect( dialog->iconView, TQT_SIGNAL(doubleClicked(TQIconViewItem*)),
- dialog, TQT_SLOT(accept()) );
+ dialog->iconView->connect( dialog->iconView, TQ_SIGNAL(doubleClicked(TQIconViewItem*)),
+ dialog, TQ_SLOT(accept()) );
dialog->selectButton->setText( i18n("&Add") );
- dialog->selectButton->connect( dialog->selectButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(accept()) );
- dialog->cancelButton->connect( dialog->cancelButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(reject()) );
+ dialog->selectButton->connect( dialog->selectButton, TQ_SIGNAL(clicked()), dialog, TQ_SLOT(accept()) );
+ dialog->cancelButton->connect( dialog->cancelButton, TQ_SIGNAL(clicked()), dialog, TQ_SLOT(reject()) );
TDETrader::OfferList list = KMobileItem::getMobileDevicesList();
TDETrader::OfferListIterator it;
@@ -344,11 +344,11 @@ KMobileDevice * KMobileFactory::chooseDeviceDialog( TQWidget *parent,
if (!dialog)
return 0L;
- dialog->addButton->connect( dialog->addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddDevice()) );
- dialog->iconView->connect( dialog->iconView, TQT_SIGNAL(doubleClicked(TQIconViewItem*)),
- dialog, TQT_SLOT(accept()) );
- dialog->selectButton->connect( dialog->selectButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(accept()) );
- dialog->cancelButton->connect( dialog->cancelButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(reject()) );
+ dialog->addButton->connect( dialog->addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddDevice()) );
+ dialog->iconView->connect( dialog->iconView, TQ_SIGNAL(doubleClicked(TQIconViewItem*)),
+ dialog, TQ_SLOT(accept()) );
+ dialog->selectButton->connect( dialog->selectButton, TQ_SIGNAL(clicked()), dialog, TQ_SLOT(accept()) );
+ dialog->cancelButton->connect( dialog->cancelButton, TQ_SIGNAL(clicked()), dialog, TQ_SLOT(reject()) );
for (int i=0; i<countDevices(); i++) {
KService::Ptr ptr;
diff --git a/kmobile/kmobile.h b/kmobile/kmobile.h
index f2e110ac..b3223232 100644
--- a/kmobile/kmobile.h
+++ b/kmobile/kmobile.h
@@ -22,7 +22,7 @@ class SystemTray;
*/
class KMobile : public TDEMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kmobile/kmobileclient.h b/kmobile/kmobileclient.h
index df46600a..bdb5b19a 100644
--- a/kmobile/kmobileclient.h
+++ b/kmobile/kmobileclient.h
@@ -10,7 +10,7 @@
class KDE_EXPORT KMobileClient : public DCOPClient
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMobileClient();
diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h
index 546a6a11..6647ab73 100644
--- a/kmobile/kmobiledevice.h
+++ b/kmobile/kmobiledevice.h
@@ -64,7 +64,7 @@ class TDEConfig;
class KDE_EXPORT KMobileDevice : public KLibFactory
{
- Q_OBJECT
+ TQ_OBJECT
friend class KMobileView;
diff --git a/kmobile/kmobileitem.h b/kmobile/kmobileitem.h
index 02ee75cb..d4ae627d 100644
--- a/kmobile/kmobileitem.h
+++ b/kmobile/kmobileitem.h
@@ -12,7 +12,7 @@
class KMobileItem : public TQObject, public TQIconViewItem
{
- Q_OBJECT
+ TQ_OBJECT
friend class KMobileView;
public:
diff --git a/kmobile/kmobileview.cpp b/kmobile/kmobileview.cpp
index 87f691d9..49d69105 100644
--- a/kmobile/kmobileview.cpp
+++ b/kmobile/kmobileview.cpp
@@ -39,8 +39,8 @@ KMobileView::KMobileView(TQWidget *parent, TDEConfig *_config)
setSelectionMode(TQIconView::Single);
setResizeMode(TQIconView::Adjust);
setAutoArrange(true);
- connect(this, TQT_SIGNAL(doubleClicked(TQIconViewItem *)),
- TQT_SLOT(slotDoubleClicked(TQIconViewItem *)));
+ connect(this, TQ_SIGNAL(doubleClicked(TQIconViewItem *)),
+ TQ_SLOT(slotDoubleClicked(TQIconViewItem *)));
}
KMobileView::~KMobileView()
diff --git a/kmobile/kmobileview.h b/kmobile/kmobileview.h
index fb50ce5c..d8862b85 100644
--- a/kmobile/kmobileview.h
+++ b/kmobile/kmobileview.h
@@ -22,7 +22,7 @@ class KMobileItem;
*/
class KDE_EXPORT KMobileView : public TQIconView, public kmobileIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMobileView(TQWidget *parent, TDEConfig *_config);
diff --git a/kmobile/pref.h b/kmobile/pref.h
index 81430335..787cc581 100644
--- a/kmobile/pref.h
+++ b/kmobile/pref.h
@@ -13,7 +13,7 @@ class KMobilePrefPageTwo;
class KMobilePreferences : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMobilePreferences();
@@ -25,7 +25,7 @@ private:
class KMobilePrefPageOne : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMobilePrefPageOne(TQWidget *parent = 0);
@@ -33,7 +33,7 @@ public:
class KMobilePrefPageTwo : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMobilePrefPageTwo(TQWidget *parent = 0);
diff --git a/kmobile/systemtray.cpp b/kmobile/systemtray.cpp
index f3e8b8a2..020aec1c 100644
--- a/kmobile/systemtray.cpp
+++ b/kmobile/systemtray.cpp
@@ -60,7 +60,7 @@ SystemTray::~SystemTray()
void SystemTray::contextMenuAboutToShow(TDEPopupMenu *menu)
{
- KMobile *main = static_cast<KMobile *>(TQT_TQWIDGET(parent()));
+ KMobile *main = static_cast<KMobile *>(parent());
const int pos = 3;
while (menu->idAt(pos)>=SYSTEMTRAY_STARTID &&
@@ -74,9 +74,9 @@ void SystemTray::contextMenuAboutToShow(TDEPopupMenu *menu)
TQString iconName = main->mainView()->iconFileName(devName);
TQPixmap pm = TDEGlobal::instance()->iconLoader()->loadIcon(iconName, TDEIcon::Small);
menu->insertItem(pm, devName, SYSTEMTRAY_STARTID+no, 3+no);
- menu->connectItem(SYSTEMTRAY_STARTID+no, this, TQT_SLOT(menuItemSelected()));
+ menu->connectItem(SYSTEMTRAY_STARTID+no, this, TQ_SLOT(menuItemSelected()));
}
- connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuItemActivated(int)));
+ connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuItemActivated(int)));
}
void SystemTray::menuItemSelected()
@@ -84,7 +84,7 @@ void SystemTray::menuItemSelected()
if (m_menuID<SYSTEMTRAY_STARTID || m_menuID>SYSTEMTRAY_STARTID+1000)
return;
TQString devName = contextMenu()->text(m_menuID);
- KMobile *main = static_cast<KMobile *>(TQT_TQWIDGET(parent()));
+ KMobile *main = static_cast<KMobile *>(parent());
main->mainView()->startKonqueror(devName);
}
diff --git a/kmobile/systemtray.h b/kmobile/systemtray.h
index a64cabad..88219269 100644
--- a/kmobile/systemtray.h
+++ b/kmobile/systemtray.h
@@ -27,7 +27,7 @@ class TDEAction;
class SystemTray : public KSystemTray
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp
index 1b5b3b9a..faf4b4e8 100644
--- a/knode/articlewidget.cpp
+++ b/knode/articlewidget.cpp
@@ -98,20 +98,20 @@ ArticleWidget::ArticleWidget( TQWidget *parent,
TQHBoxLayout *box = new TQHBoxLayout( this );
mViewer = new TDEHTMLPart( this, "mViewer" );
box->addWidget( mViewer->widget() );
- mViewer->widget()->setFocusPolicy( TQ_WheelFocus );
+ mViewer->widget()->setFocusPolicy( TQWidget::WheelFocus );
mViewer->setPluginsEnabled( false );
mViewer->setJScriptEnabled( false );
mViewer->setJavaEnabled( false );
mViewer->setMetaRefreshEnabled( false );
mViewer->setOnlyLocalReferences( true );
- mViewer->view()->setFocusPolicy( TQ_WheelFocus );
- connect( mViewer->browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL&, const KParts::URLArgs&)),
- TQT_SLOT(slotURLClicked(const KURL&)) );
- connect( mViewer, TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)),
- TQT_SLOT(slotURLPopup(const TQString&, const TQPoint&)) );
+ mViewer->view()->setFocusPolicy( TQWidget::WheelFocus );
+ connect( mViewer->browserExtension(), TQ_SIGNAL(openURLRequestDelayed(const KURL&, const KParts::URLArgs&)),
+ TQ_SLOT(slotURLClicked(const KURL&)) );
+ connect( mViewer, TQ_SIGNAL(popupMenu(const TQString&, const TQPoint&)),
+ TQ_SLOT(slotURLPopup(const TQString&, const TQPoint&)) );
mTimer = new TQTimer( this );
- connect( mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) );
+ connect( mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) );
initActions();
readConfig();
@@ -134,58 +134,58 @@ ArticleWidget::~ArticleWidget()
void ArticleWidget::initActions()
{
- mSaveAction = KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT(slotSave()), mActionCollection );
+ mSaveAction = KStdAction::save( this, TQ_SLOT(slotSave()), mActionCollection );
mSaveAction->setText( KStdGuiItem::saveAs().text() );
- mPrintAction = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), mActionCollection );
- mCopySelectionAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopySelection()), mActionCollection );
- mSelectAllAction = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), mActionCollection );
- mFindAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT(slotFind()), mActionCollection, "find_in_article" );
+ mPrintAction = KStdAction::print( this, TQ_SLOT(slotPrint()), mActionCollection );
+ mCopySelectionAction = KStdAction::copy( this, TQ_SLOT(slotCopySelection()), mActionCollection );
+ mSelectAllAction = KStdAction::selectAll( this, TQ_SLOT(slotSelectAll()), mActionCollection );
+ mFindAction = KStdAction::find( this, TQ_SLOT(slotFind()), mActionCollection, "find_in_article" );
mFindAction->setText( i18n("F&ind in Article...") );
- mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V , TQT_TQOBJECT(this),
- TQT_SLOT(slotViewSource()), mActionCollection, "article_viewSource" );
+ mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V , this,
+ TQ_SLOT(slotViewSource()), mActionCollection, "article_viewSource" );
mReplyAction = new TDEAction( i18n("&Followup to Newsgroup..."), "message_reply",
- Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotReply()), mActionCollection, "article_postReply" );
+ Key_R, this, TQ_SLOT(slotReply()), mActionCollection, "article_postReply" );
mRemailAction = new TDEAction( i18n("Reply by E&mail..."), "mail-reply-sender",
- Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotRemail()), mActionCollection, "article_mailReply" );
+ Key_A, this, TQ_SLOT(slotRemail()), mActionCollection, "article_mailReply" );
mForwardAction = new TDEAction( i18n("Forw&ard by Email..."), "mail-forward",
- Key_F, TQT_TQOBJECT(this), TQT_SLOT(slotForward()), mActionCollection, "article_forward" );
+ Key_F, this, TQ_SLOT(slotForward()), mActionCollection, "article_forward" );
mCancelAction = new TDEAction( i18n("article","&Cancel Article"),
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotCancel()), mActionCollection, "article_cancel" );
+ 0, this, TQ_SLOT(slotCancel()), mActionCollection, "article_cancel" );
mSupersedeAction = new TDEAction(i18n("S&upersede Article"),
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotSupersede()), mActionCollection, "article_supersede" );
+ 0, this, TQ_SLOT(slotSupersede()), mActionCollection, "article_supersede" );
mFixedFontToggle = new TDEToggleAction( i18n("U&se Fixed Font"),
- Key_X ,TQT_TQOBJECT(this), TQT_SLOT(slotToggleFixedFont()), mActionCollection, "view_useFixedFont" );
+ Key_X ,this, TQ_SLOT(slotToggleFixedFont()), mActionCollection, "view_useFixedFont" );
mFancyToggle = new TDEToggleAction( i18n("Fancy Formating"),
- Key_Y, TQT_TQOBJECT(this), TQT_SLOT(slotToggleFancyFormating()), mActionCollection, "view_fancyFormating" );
- mRot13Toggle = new TDEToggleAction( i18n("&Unscramble (Rot 13)"), "decrypted", 0 , TQT_TQOBJECT(this),
- TQT_SLOT(slotToggleRot13()), mActionCollection, "view_rot13" );
+ Key_Y, this, TQ_SLOT(slotToggleFancyFormating()), mActionCollection, "view_fancyFormating" );
+ mRot13Toggle = new TDEToggleAction( i18n("&Unscramble (Rot 13)"), "decrypted", 0 , this,
+ TQ_SLOT(slotToggleRot13()), mActionCollection, "view_rot13" );
mRot13Toggle->setChecked( false );
TDERadioAction *ra;
mHeaderStyleMenu = new TDEActionMenu( i18n("&Headers"), mActionCollection, "view_headers" );
- ra = new TDERadioAction( i18n("&Fancy Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFancyHeaders()),
+ ra = new TDERadioAction( i18n("&Fancy Headers"), 0, this, TQ_SLOT(slotFancyHeaders()),
mActionCollection, "view_headers_fancy" );
ra->setExclusiveGroup( "view_headers" );
mHeaderStyleMenu->insert( ra );
- ra = new TDERadioAction( i18n("&Standard Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotStandardHeaders()),
+ ra = new TDERadioAction( i18n("&Standard Headers"), 0, this, TQ_SLOT(slotStandardHeaders()),
mActionCollection, "view_headers_standard" );
ra->setExclusiveGroup( "view_headers" );
mHeaderStyleMenu->insert( ra );
- ra = new TDERadioAction( i18n("&All Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAllHeaders()),
+ ra = new TDERadioAction( i18n("&All Headers"), 0, this, TQ_SLOT(slotAllHeaders()),
mActionCollection, "view_headers_all" );
ra->setExclusiveGroup( "view_headers" );
mHeaderStyleMenu->insert( ra );
mAttachmentStyleMenu = new TDEActionMenu( i18n("&Attachments"), mActionCollection, "view_attachments" );
- ra = new TDERadioAction( i18n("&As Icon"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotIconAttachments()),
+ ra = new TDERadioAction( i18n("&As Icon"), 0, this, TQ_SLOT(slotIconAttachments()),
mActionCollection, "view_attachments_icon" );
ra->setExclusiveGroup( "view_attachments" );
mAttachmentStyleMenu->insert( ra );
- ra = new TDERadioAction( i18n("&Inline"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInlineAttachments()),
+ ra = new TDERadioAction( i18n("&Inline"), 0, this, TQ_SLOT(slotInlineAttachments()),
mActionCollection, "view_attachments_inline" );
ra->setExclusiveGroup( "view_attachments" );
mAttachmentStyleMenu->insert( ra );
- ra = new TDERadioAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotHideAttachments()),
+ ra = new TDERadioAction( i18n("&Hide"), 0, this, TQ_SLOT(slotHideAttachments()),
mActionCollection, "view_attachments_hide" );
ra->setExclusiveGroup( "view_attachments" );
mAttachmentStyleMenu->insert( ra );
@@ -196,23 +196,23 @@ void ArticleWidget::initActions()
cs.prepend( i18n("Automatic") );
mCharsetSelect->setItems( cs );
mCharsetSelect->setCurrentItem( 0 );
- connect( mCharsetSelect, TQT_SIGNAL(activated(const TQString&)),TQT_SLOT(slotSetCharset(const TQString&)) );
- mCharsetSelectKeyb = new TDEAction( i18n("Charset"), Key_C, TQT_TQOBJECT(this),
- TQT_SLOT(slotSetCharsetKeyboard()), mActionCollection, "set_charset_keyboard" );
+ connect( mCharsetSelect, TQ_SIGNAL(activated(const TQString&)),TQ_SLOT(slotSetCharset(const TQString&)) );
+ mCharsetSelectKeyb = new TDEAction( i18n("Charset"), Key_C, this,
+ TQ_SLOT(slotSetCharsetKeyboard()), mActionCollection, "set_charset_keyboard" );
- new TDEAction( i18n("&Open URL"), "document-open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenURL()),
+ new TDEAction( i18n("&Open URL"), "document-open", 0, this, TQ_SLOT(slotOpenURL()),
mActionCollection, "open_url" );
- new TDEAction( i18n("&Copy Link Address"), "edit-copy", 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL()),
+ new TDEAction( i18n("&Copy Link Address"), "edit-copy", 0, this, TQ_SLOT( slotCopyURL()),
mActionCollection, "copy_url" );
- new TDEAction( i18n("&Bookmark This Link"), "bookmark_add", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddBookmark()),
+ new TDEAction( i18n("&Bookmark This Link"), "bookmark_add", 0, this, TQ_SLOT(slotAddBookmark()),
mActionCollection, "add_bookmark" );
- new TDEAction( i18n("&Add to Address Book"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddToAddressBook()),
+ new TDEAction( i18n("&Add to Address Book"), 0, this, TQ_SLOT(slotAddToAddressBook()),
mActionCollection, "add_addr_book" );
- new TDEAction( i18n("&Open in Address Book"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenInAddressBook()),
+ new TDEAction( i18n("&Open in Address Book"), 0, this, TQ_SLOT(slotOpenInAddressBook()),
mActionCollection, "openin_addr_book" );
- new TDEAction( i18n("&Open Attachment"), "document-open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenAttachment()),
+ new TDEAction( i18n("&Open Attachment"), "document-open", 0, this, TQ_SLOT(slotOpenAttachment()),
mActionCollection, "open_attachment" );
- new TDEAction( i18n("&Save Attachment As..."), "document-save-as", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachment()),
+ new TDEAction( i18n("&Save Attachment As..."), "document-save-as", 0, this, TQ_SLOT(slotSaveAttachment()),
mActionCollection, "save_attachment" );
}
@@ -1472,7 +1472,7 @@ void ArticleWidget::focusOutEvent( TQFocusEvent *e )
bool ArticleWidget::eventFilter( TQObject *o, TQEvent *e )
{
- if ( e->type() == TQEvent::KeyPress && (TQT_TQKEYEVENT(e)->key() == Key_Tab) ) {
+ if ( e->type() == TQEvent::KeyPress && (static_cast<TQKeyEvent*>(e)->key() == Key_Tab) ) {
emit focusChangeRequest( this );
if ( !hasFocus() ) // focusChangeRequest was successful
return true;
diff --git a/knode/articlewidget.h b/knode/articlewidget.h
index cc1cac20..8a00e33f 100644
--- a/knode/articlewidget.h
+++ b/knode/articlewidget.h
@@ -52,7 +52,7 @@ class CSSHelper;
*/
class ArticleWidget : public TQWidget, public KNJobConsumer {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/headerview.cpp b/knode/headerview.cpp
index 06210b2a..cae8da28 100644
--- a/knode/headerview.cpp
+++ b/knode/headerview.cpp
@@ -65,9 +65,9 @@ KNHeaderView::KNHeaderView(TQWidget *parent, const char *name) :
setColumnAlignment( mPaintInfo.scoreCol, TQt::AlignRight );
// due to our own column text squeezing we need to repaint on column resizing
- disconnect( header(), TQT_SIGNAL(sizeChange(int, int, int)) );
- connect( header(), TQT_SIGNAL(sizeChange(int, int, int)),
- TQT_SLOT(slotSizeChanged(int, int, int)) );
+ disconnect( header(), TQ_SIGNAL(sizeChange(int, int, int)) );
+ connect( header(), TQ_SIGNAL(sizeChange(int, int, int)),
+ TQ_SLOT(slotSizeChanged(int, int, int)) );
// column selection RMB menu
mPopup = new TDEPopupMenu( this );
@@ -76,11 +76,11 @@ KNHeaderView::KNHeaderView(TQWidget *parent, const char *name) :
mPopup->insertItem( i18n("Line Count"), KPaintInfo::COL_SIZE );
mPopup->insertItem( i18n("Score"), KPaintInfo::COL_SCORE );
- connect( mPopup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(toggleColumn(int)) );
+ connect( mPopup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(toggleColumn(int)) );
// connect to the article manager
- connect( knGlobals.articleManager(), TQT_SIGNAL(aboutToShowGroup()), TQT_SLOT(prepareForGroup()) );
- connect( knGlobals.articleManager(), TQT_SIGNAL(aboutToShowFolder()), TQT_SLOT(prepareForFolder()) );
+ connect( knGlobals.articleManager(), TQ_SIGNAL(aboutToShowGroup()), TQ_SLOT(prepareForGroup()) );
+ connect( knGlobals.articleManager(), TQ_SIGNAL(aboutToShowFolder()), TQ_SLOT(prepareForFolder()) );
new KNHeaderViewToolTip( this );
@@ -188,7 +188,7 @@ void KNHeaderView::ensureItemVisibleWithMargin( const TQListViewItem *i )
{
ensureVisible( contentsX(), y + h/2, 0, h/2 );
mDelayedCenter = y + h/2;
- TQTimer::singleShot( 300, this, TQT_SLOT(slotCenterDelayed()) );
+ TQTimer::singleShot( 300, this, TQ_SLOT(slotCenterDelayed()) );
} else {
ensureVisible( contentsX(), y + h/2, 0, h/2 );
}
@@ -540,7 +540,7 @@ void KNHeaderView::slotSizeChanged( int section, int, int newSize )
bool KNHeaderView::eventFilter(TQObject *o, TQEvent *e)
{
- if ((e->type() == TQEvent::KeyPress) && (TQT_TQKEYEVENT(e)->key() == Key_Tab)) {
+ if ((e->type() == TQEvent::KeyPress) && (static_cast<TQKeyEvent*>(e)->key() == Key_Tab)) {
emit(focusChangeRequest(this));
if (!hasFocus()) // focusChangeRequest was successful
return true;
@@ -548,10 +548,10 @@ bool KNHeaderView::eventFilter(TQObject *o, TQEvent *e)
// right click on header
if ( e->type() == TQEvent::MouseButtonPress &&
- TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton &&
- o->isA(TQHEADER_OBJECT_NAME_STRING) )
+ static_cast<TQMouseEvent*>(e)->button() == TQt::RightButton &&
+ o->isA("TQHeader") )
{
- mPopup->popup( TQT_TQMOUSEEVENT(e)->globalPos() );
+ mPopup->popup( static_cast<TQMouseEvent*>(e)->globalPos() );
return true;
}
@@ -576,7 +576,7 @@ void KNHeaderView::focusOutEvent(TQFocusEvent *e)
void KNHeaderView::resetCurrentTime()
{
mDateFormatter.reset();
- TQTimer::singleShot( 1000, this, TQT_SLOT(resetCurrentTime()) );
+ TQTimer::singleShot( 1000, this, TQ_SLOT(resetCurrentTime()) );
}
diff --git a/knode/headerview.h b/knode/headerview.h
index 1b74d363..3da99acb 100644
--- a/knode/headerview.h
+++ b/knode/headerview.h
@@ -26,7 +26,7 @@ class KNHdrViewItem;
class KNHeaderView : public TDEListView {
- Q_OBJECT
+ TQ_OBJECT
friend class KNHdrViewItem;
diff --git a/knode/knaccountmanager.cpp b/knode/knaccountmanager.cpp
index 77b97288..45c21936 100644
--- a/knode/knaccountmanager.cpp
+++ b/knode/knaccountmanager.cpp
@@ -228,7 +228,7 @@ void KNAccountManager::loadPasswordsAsync()
else
mWallet = Wallet::openWallet( Wallet::NetworkWallet(), 0, Wallet::Asynchronous );
if ( mWallet ) {
- connect( mWallet, TQT_SIGNAL(walletOpened(bool)), TQT_SLOT(slotWalletOpened(bool)) );
+ connect( mWallet, TQ_SIGNAL(walletOpened(bool)), TQ_SLOT(slotWalletOpened(bool)) );
mAsyncOpening = true;
}
else {
diff --git a/knode/knaccountmanager.h b/knode/knaccountmanager.h
index 56e994c6..8a8b5f61 100644
--- a/knode/knaccountmanager.h
+++ b/knode/knaccountmanager.h
@@ -29,7 +29,7 @@ class KNServerInfo;
class KNAccountManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/knapplication.h b/knode/knapplication.h
index 4536c119..c65c010d 100644
--- a/knode/knapplication.h
+++ b/knode/knapplication.h
@@ -21,7 +21,7 @@
class KNApplication : public KUniqueApplication
{
- Q_OBJECT
+ TQ_OBJECT
public:
KNApplication(): KUniqueApplication() { };
diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp
index 78d39149..c01e58f8 100644
--- a/knode/knarticlefactory.cpp
+++ b/knode/knarticlefactory.cpp
@@ -65,7 +65,7 @@ void KNArticleFactory::createPosting(KNNntpAccount *a)
KNComposer *c = new KNComposer( art, TQString(), sig, TQString(), true );
mCompList.append( c );
- connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*)));
+ connect(c, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*)));
c->show();
}
@@ -94,7 +94,7 @@ void KNArticleFactory::createPosting(KNGroup *g)
KNComposer *c=new KNComposer(art, TQString(), sig, TQString(), true);
mCompList.append( c );
- connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*)));
+ connect(c, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*)));
c->show();
}
@@ -264,7 +264,7 @@ void KNArticleFactory::createReply(KNRemoteArticle *a, TQString selectedText, bo
//open composer
KNComposer *c=new KNComposer(art, quoted, sig, notRewraped, true, authorDislikesMailCopies, authorWantsMailCopies);
mCompList.append( c );
- connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*)));
+ connect(c, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*)));
c->show();
}
@@ -349,7 +349,7 @@ void KNArticleFactory::createForward(KNArticle *a)
//open composer
KNComposer *c=new KNComposer(art, fwd, sig, TQString(), true);
mCompList.append( c );
- connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*)));
+ connect(c, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*)));
c->show();
}
@@ -500,7 +500,7 @@ void KNArticleFactory::createSupersede(KNArticle *a)
//open composer
KNComposer *c=new KNComposer(art, text, sig);
mCompList.append( c );
- connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*)));
+ connect(c, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*)));
c->show();
}
@@ -525,7 +525,7 @@ void KNArticleFactory::createMail(KMime::Headers::AddressField *address)
//open composer
KNComposer *c=new KNComposer(art, TQString(), sig, TQString(), true);
mCompList.append( c );
- connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*)));
+ connect(c, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*)));
c->show();
}
@@ -604,7 +604,7 @@ void KNArticleFactory::edit(KNLocalArticle *a)
.arg(id->getSigGeneratorStdErr()));
mCompList.append( com );
- connect(com, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*)));
+ connect(com, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*)));
com->show();
}
@@ -990,7 +990,7 @@ void KNArticleFactory::showSendErrorDialog()
{
if(!s_endErrDlg) {
s_endErrDlg=new KNSendErrorDialog();
- connect(s_endErrDlg, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(slotSendErrorDialogDone()));
+ connect(s_endErrDlg, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(slotSendErrorDialogDone()));
}
s_endErrDlg->show();
}
@@ -1075,7 +1075,7 @@ KNSendErrorDialog::KNSendErrorDialog()
j_obs=new KNDialogListBox(true, page);
e_rror=new TQLabel(TQString(), page);
- connect(j_obs, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHighlighted(int)));
+ connect(j_obs, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHighlighted(int)));
KNHelper::restoreWindowSize("sendDlg", this, TQSize(320,250));
}
diff --git a/knode/knarticlefactory.h b/knode/knarticlefactory.h
index 1e13ddc1..c01ac3da 100644
--- a/knode/knarticlefactory.h
+++ b/knode/knarticlefactory.h
@@ -38,7 +38,7 @@ namespace KNConfig {
class KNArticleFactory : public TQObject , public KNJobConsumer {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -96,7 +96,7 @@ class KNArticleFactory : public TQObject , public KNJobConsumer {
class KNSendErrorDialog : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/knarticlemanager.cpp b/knode/knarticlemanager.cpp
index 86c58cc6..332690c2 100644
--- a/knode/knarticlemanager.cpp
+++ b/knode/knarticlemanager.cpp
@@ -53,8 +53,8 @@ KNArticleManager::KNArticleManager() : TQObject(0,0)
s_earchDlg=0;
d_isableExpander=false;
- connect(f_ilterMgr, TQT_SIGNAL(filterChanged(KNArticleFilter*)), this,
- TQT_SLOT(slotFilterChanged(KNArticleFilter*)));
+ connect(f_ilterMgr, TQ_SIGNAL(filterChanged(KNArticleFilter*)), this,
+ TQ_SLOT(slotFilterChanged(KNArticleFilter*)));
}
@@ -390,10 +390,10 @@ void KNArticleManager::search()
KWin::activateWindow(s_earchDlg->winId());
} else {
s_earchDlg=new KNSearchDialog(KNSearchDialog::STgroupSearch, 0);
- connect(s_earchDlg, TQT_SIGNAL(doSearch(KNArticleFilter*)), this,
- TQT_SLOT(slotFilterChanged(KNArticleFilter*)));
- connect(s_earchDlg, TQT_SIGNAL(dialogDone()), this,
- TQT_SLOT(slotSearchDialogDone()));
+ connect(s_earchDlg, TQ_SIGNAL(doSearch(KNArticleFilter*)), this,
+ TQ_SLOT(slotFilterChanged(KNArticleFilter*)));
+ connect(s_earchDlg, TQ_SIGNAL(dialogDone()), this,
+ TQ_SLOT(slotSearchDialogDone()));
s_earchDlg->show();
}
}
@@ -1081,8 +1081,8 @@ void KNArticleManager::slotItemExpanded(TQListViewItem *p)
void KNArticleManager::setView(KNHeaderView* v) {
v_iew = v;
if(v) {
- connect(v, TQT_SIGNAL(expanded(TQListViewItem*)), this,
- TQT_SLOT(slotItemExpanded(TQListViewItem*)));
+ connect(v, TQ_SIGNAL(expanded(TQListViewItem*)), this,
+ TQ_SLOT(slotItemExpanded(TQListViewItem*)));
}
}
diff --git a/knode/knarticlemanager.h b/knode/knarticlemanager.h
index ee62c8d0..73fe07d9 100644
--- a/knode/knarticlemanager.h
+++ b/knode/knarticlemanager.h
@@ -38,7 +38,7 @@ class KNJobData;
class KNArticleManager : public TQObject, public KNJobConsumer {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/knarticlewindow.cpp b/knode/knarticlewindow.cpp
index 53b81089..4a4235e8 100644
--- a/knode/knarticlewindow.cpp
+++ b/knode/knarticlewindow.cpp
@@ -100,10 +100,10 @@ KNArticleWindow::KNArticleWindow(KNArticle *art)
mInstances.append( this );
// file menu
- KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() );
+ KStdAction::close( this, TQ_SLOT(close()), actionCollection() );
// settings menu
- KStdAction::preferences(TQT_TQOBJECT(knGlobals.top), TQT_SLOT(slotSettings()), actionCollection());
+ KStdAction::preferences(knGlobals.top, TQ_SLOT(slotSettings()), actionCollection());
TDEAccel *accel = new TDEAccel( this );
artW->setCharsetKeyboardAction()->plugAccel( accel );
diff --git a/knode/knarticlewindow.h b/knode/knarticlewindow.h
index b8171da5..e452720a 100644
--- a/knode/knarticlewindow.h
+++ b/knode/knarticlewindow.h
@@ -26,7 +26,7 @@ namespace KNode {
class KNArticleWindow : public TDEMainWindow {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/kncleanup.h b/knode/kncleanup.h
index d765dc15..5019b207 100644
--- a/knode/kncleanup.h
+++ b/knode/kncleanup.h
@@ -15,8 +15,6 @@
#ifndef KNCLEANUP_H
#define KNCLEANUP_H
-#include <tqsemimodal.h>
-
class TQProgressBar;
class TQLabel;
diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp
index 8a02fed2..e7f9aa87 100644
--- a/knode/kncollectionview.cpp
+++ b/knode/kncollectionview.cpp
@@ -49,8 +49,8 @@ KNCollectionView::KNCollectionView(TQWidget *parent, const char* name) :
mPopup = new TDEPopupMenu( this );
mPopup->insertTitle( i18n("View Columns") );
mPopup->setCheckable( true );
- mUnreadPop = mPopup->insertItem( i18n("Unread Column"), this, TQT_SLOT(toggleUnreadColumn()) );
- mTotalPop = mPopup->insertItem( i18n("Total Column"), this, TQT_SLOT(toggleTotalColumn()) );
+ mUnreadPop = mPopup->insertItem( i18n("Unread Column"), this, TQ_SLOT(toggleUnreadColumn()) );
+ mTotalPop = mPopup->insertItem( i18n("Total Column"), this, TQ_SLOT(toggleTotalColumn()) );
// add unread and total columns if necessary
readConfig();
@@ -61,21 +61,21 @@ KNCollectionView::KNCollectionView(TQWidget *parent, const char* name) :
// connect to the account manager
KNAccountManager* am = knGlobals.accountManager();
- connect(am, TQT_SIGNAL(accountAdded(KNNntpAccount*)), TQT_SLOT(addAccount(KNNntpAccount*)));
- connect(am, TQT_SIGNAL(accountRemoved(KNNntpAccount*)), TQT_SLOT(removeAccount(KNNntpAccount*)));
- connect(am, TQT_SIGNAL(accountModified(KNNntpAccount*)), TQT_SLOT(updateAccount(KNNntpAccount*)));
+ connect(am, TQ_SIGNAL(accountAdded(KNNntpAccount*)), TQ_SLOT(addAccount(KNNntpAccount*)));
+ connect(am, TQ_SIGNAL(accountRemoved(KNNntpAccount*)), TQ_SLOT(removeAccount(KNNntpAccount*)));
+ connect(am, TQ_SIGNAL(accountModified(KNNntpAccount*)), TQ_SLOT(updateAccount(KNNntpAccount*)));
// connect to the group manager
KNGroupManager* gm = knGlobals.groupManager();
- connect(gm, TQT_SIGNAL(groupAdded(KNGroup*)), TQT_SLOT(addGroup(KNGroup*)));
- connect(gm, TQT_SIGNAL(groupRemoved(KNGroup*)), TQT_SLOT(removeGroup(KNGroup*)));
- connect(gm, TQT_SIGNAL(groupUpdated(KNGroup*)), TQT_SLOT(updateGroup(KNGroup*)));
+ connect(gm, TQ_SIGNAL(groupAdded(KNGroup*)), TQ_SLOT(addGroup(KNGroup*)));
+ connect(gm, TQ_SIGNAL(groupRemoved(KNGroup*)), TQ_SLOT(removeGroup(KNGroup*)));
+ connect(gm, TQ_SIGNAL(groupUpdated(KNGroup*)), TQ_SLOT(updateGroup(KNGroup*)));
// connect to the folder manager
KNFolderManager* fm = knGlobals.folderManager();
- connect(fm, TQT_SIGNAL(folderAdded(KNFolder*)), TQT_SLOT(addPendingFolders()));
- connect(fm, TQT_SIGNAL(folderRemoved(KNFolder*)), TQT_SLOT(removeFolder(KNFolder*)));
- connect(fm, TQT_SIGNAL(folderActivated(KNFolder*)), TQT_SLOT(activateFolder(KNFolder*)));
+ connect(fm, TQ_SIGNAL(folderAdded(KNFolder*)), TQ_SLOT(addPendingFolders()));
+ connect(fm, TQ_SIGNAL(folderRemoved(KNFolder*)), TQ_SLOT(removeFolder(KNFolder*)));
+ connect(fm, TQ_SIGNAL(folderActivated(KNFolder*)), TQ_SLOT(activateFolder(KNFolder*)));
installEventFilter(this);
}
@@ -421,7 +421,7 @@ void KNCollectionView::updatePopup() const
bool KNCollectionView::eventFilter(TQObject *o, TQEvent *e)
{
- if ((e->type() == TQEvent::KeyPress) && (TQT_TQKEYEVENT(e)->key() == Key_Tab)) {
+ if ((e->type() == TQEvent::KeyPress) && (static_cast<TQKeyEvent*>(e)->key() == Key_Tab)) {
emit(focusChangeRequest(this));
if (!hasFocus()) // focusChangeRequest was successful
return true;
@@ -429,10 +429,10 @@ bool KNCollectionView::eventFilter(TQObject *o, TQEvent *e)
// header popup menu
if ( e->type() == TQEvent::MouseButtonPress &&
- TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton &&
- o->isA(TQHEADER_OBJECT_NAME_STRING) )
+ static_cast<TQMouseEvent*>(e)->button() == TQt::RightButton &&
+ o->isA("TQHeader") )
{
- mPopup->popup( TQT_TQMOUSEEVENT(e)->globalPos() );
+ mPopup->popup( static_cast<TQMouseEvent*>(e)->globalPos() );
return true;
}
diff --git a/knode/kncollectionview.h b/knode/kncollectionview.h
index 74a6e25e..957aa207 100644
--- a/knode/kncollectionview.h
+++ b/knode/kncollectionview.h
@@ -26,7 +26,7 @@ class KNCollectionViewItem;
class KNCollectionView : public KFolderTree {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp
index 8695048e..5b4f8603 100644
--- a/knode/kncomposer.cpp
+++ b/knode/kncomposer.cpp
@@ -78,7 +78,7 @@ TQPopupMenu *KNLineEdit::createPopupMenu()
menu->insertSeparator();
menu->insertItem( i18n( "Edit Recent Addresses..." ),
- this, TQT_SLOT( editRecentAddresses() ) );
+ this, TQ_SLOT( editRecentAddresses() ) );
return menu;
}
@@ -183,9 +183,9 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString &
v_iew=new ComposerView(this);
setCentralWidget(v_iew);
- connect(v_iew->c_ancelEditorBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotCancelEditor()));
- connect(v_iew->e_dit, TQT_SIGNAL(sigDragEnterEvent(TQDragEnterEvent *)), TQT_SLOT(slotDragEnterEvent(TQDragEnterEvent *)));
- connect(v_iew->e_dit, TQT_SIGNAL(sigDropEvent(TQDropEvent *)), TQT_SLOT(slotDropEvent(TQDropEvent *)));
+ connect(v_iew->c_ancelEditorBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotCancelEditor()));
+ connect(v_iew->e_dit, TQ_SIGNAL(sigDragEnterEvent(TQDragEnterEvent *)), TQ_SLOT(slotDragEnterEvent(TQDragEnterEvent *)));
+ connect(v_iew->e_dit, TQ_SIGNAL(sigDropEvent(TQDropEvent *)), TQ_SLOT(slotDropEvent(TQDropEvent *)));
//statusbar
KStatusBar *sb=statusBar();
@@ -199,128 +199,128 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString &
sb->setItemAlignment (4,AlignCenter | AlignVCenter);
sb->insertItem(TQString(), 5,0); // line
sb->setItemAlignment (5,AlignCenter | AlignVCenter);
- connect(v_iew->e_dit, TQT_SIGNAL(CursorPositionChanged()), TQT_SLOT(slotUpdateCursorPos()));
- connect(v_iew->e_dit, TQT_SIGNAL(toggle_overwrite_signal()), TQT_SLOT(slotUpdateStatusBar()));
+ connect(v_iew->e_dit, TQ_SIGNAL(CursorPositionChanged()), TQ_SLOT(slotUpdateCursorPos()));
+ connect(v_iew->e_dit, TQ_SIGNAL(toggle_overwrite_signal()), TQ_SLOT(slotUpdateStatusBar()));
//------------------------------- <Actions> --------------------------------------
//file menu
- new TDEAction(i18n("&Send Now"),"mail-send", CTRL + Key_Return , TQT_TQOBJECT(this),
- TQT_SLOT(slotSendNow()), actionCollection(), "send_now");
+ new TDEAction(i18n("&Send Now"),"mail-send", CTRL + Key_Return , this,
+ TQ_SLOT(slotSendNow()), actionCollection(), "send_now");
- new TDEAction(i18n("Send &Later"), "queue", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotSendLater()), actionCollection(), "send_later");
+ new TDEAction(i18n("Send &Later"), "queue", 0, this,
+ TQ_SLOT(slotSendLater()), actionCollection(), "send_later");
- new TDEAction(i18n("Save as &Draft"),"document-save", 0 , TQT_TQOBJECT(this),
- TQT_SLOT(slotSaveAsDraft()), actionCollection(), "save_as_draft");
+ new TDEAction(i18n("Save as &Draft"),"document-save", 0 , this,
+ TQ_SLOT(slotSaveAsDraft()), actionCollection(), "save_as_draft");
- new TDEAction(i18n("D&elete"),"edit-delete", 0 , TQT_TQOBJECT(this),
- TQT_SLOT(slotArtDelete()), actionCollection(), "art_delete");
+ new TDEAction(i18n("D&elete"),"edit-delete", 0 , this,
+ TQ_SLOT(slotArtDelete()), actionCollection(), "art_delete");
- KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()),actionCollection());
+ KStdAction::close(this, TQ_SLOT(close()),actionCollection());
//edit menu
- KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actionCollection());
- KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(slotRedo()), actionCollection());
+ KStdAction::undo(this, TQ_SLOT(slotUndo()), actionCollection());
+ KStdAction::redo(this, TQ_SLOT(slotRedo()), actionCollection());
- KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotCut()), actionCollection());
+ KStdAction::cut(this, TQ_SLOT(slotCut()), actionCollection());
- KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actionCollection());
+ KStdAction::copy(this, TQ_SLOT(slotCopy()), actionCollection());
- KStdAction::pasteText(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), actionCollection());
+ KStdAction::pasteText(this, TQ_SLOT(slotPaste()), actionCollection());
- new TDEAction(i18n("Paste as &Quotation"), 0, TQT_TQOBJECT(v_iew->e_dit),
- TQT_SLOT(slotPasteAsQuotation()), actionCollection(), "paste_quoted");
+ new TDEAction(i18n("Paste as &Quotation"), 0, v_iew->e_dit,
+ TQ_SLOT(slotPasteAsQuotation()), actionCollection(), "paste_quoted");
- KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), actionCollection());
+ KStdAction::selectAll(this, TQ_SLOT(slotSelectAll()), actionCollection());
- KStdAction::find(TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotFind()), actionCollection());
- KStdAction::findNext(TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotSearchAgain()), actionCollection());
+ KStdAction::find(v_iew->e_dit, TQ_SLOT(slotFind()), actionCollection());
+ KStdAction::findNext(v_iew->e_dit, TQ_SLOT(slotSearchAgain()), actionCollection());
- KStdAction::replace(TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotReplace()), actionCollection());
+ KStdAction::replace(v_iew->e_dit, TQ_SLOT(slotReplace()), actionCollection());
//attach menu
- new TDEAction(i18n("Append &Signature"), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotAppendSig()),
+ new TDEAction(i18n("Append &Signature"), 0 , this, TQ_SLOT(slotAppendSig()),
actionCollection(), "append_signature");
- new TDEAction(i18n("&Insert File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertFile()),
+ new TDEAction(i18n("&Insert File..."), 0, this, TQ_SLOT(slotInsertFile()),
actionCollection(), "insert_file");
- new TDEAction(i18n("Insert File (in a &box)..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertFileBoxed()),
+ new TDEAction(i18n("Insert File (in a &box)..."), 0, this, TQ_SLOT(slotInsertFileBoxed()),
actionCollection(), "insert_file_boxed");
- new TDEAction(i18n("Attach &File..."), "attach", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachFile()),
+ new TDEAction(i18n("Attach &File..."), "attach", 0, this, TQ_SLOT(slotAttachFile()),
actionCollection(), "attach_file");
a_ctPGPsign = new TDEToggleAction(i18n("Sign Article with &PGP"),
"signature", 0,
actionCollection(), "sign_article");
- a_ctRemoveAttachment = new TDEAction(i18n("&Remove"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotRemoveAttachment()), actionCollection(), "remove_attachment");
+ a_ctRemoveAttachment = new TDEAction(i18n("&Remove"), 0, this,
+ TQ_SLOT(slotRemoveAttachment()), actionCollection(), "remove_attachment");
- a_ctAttachmentProperties = new TDEAction(i18n("&Properties"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotAttachmentProperties()), actionCollection(), "attachment_properties");
+ a_ctAttachmentProperties = new TDEAction(i18n("&Properties"), 0, this,
+ TQ_SLOT(slotAttachmentProperties()), actionCollection(), "attachment_properties");
//options menu
- a_ctDoPost = new TDEToggleAction(i18n("Send &News Article"), "document-new", 0 , TQT_TQOBJECT(this),
- TQT_SLOT(slotToggleDoPost()), actionCollection(), "send_news");
+ a_ctDoPost = new TDEToggleAction(i18n("Send &News Article"), "document-new", 0 , this,
+ TQ_SLOT(slotToggleDoPost()), actionCollection(), "send_news");
- a_ctDoMail = new TDEToggleAction(i18n("Send E&mail"), "mail_generic" , 0 , TQT_TQOBJECT(this),
- TQT_SLOT(slotToggleDoMail()), actionCollection(), "send_mail");
+ a_ctDoMail = new TDEToggleAction(i18n("Send E&mail"), "mail_generic" , 0 , this,
+ TQ_SLOT(slotToggleDoMail()), actionCollection(), "send_mail");
a_ctSetCharset = new TDESelectAction(i18n("Set &Charset"), 0, actionCollection(), "set_charset");
a_ctSetCharset->setItems(knGlobals.configManager()->postNewsTechnical()->composerCharsets());
a_ctSetCharset->setShortcutConfigurable(false);
- connect(a_ctSetCharset, TQT_SIGNAL(activated(const TQString&)),
- this, TQT_SLOT(slotSetCharset(const TQString&)));
+ connect(a_ctSetCharset, TQ_SIGNAL(activated(const TQString&)),
+ this, TQ_SLOT(slotSetCharset(const TQString&)));
- a_ctSetCharsetKeyb = new TDEAction(i18n("Set Charset"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotSetCharsetKeyboard()), actionCollection(), "set_charset_keyboard");
+ a_ctSetCharsetKeyb = new TDEAction(i18n("Set Charset"), 0, this,
+ TQ_SLOT(slotSetCharsetKeyboard()), actionCollection(), "set_charset_keyboard");
- a_ctWordWrap = new TDEToggleAction(i18n("&Word Wrap"), 0 , TQT_TQOBJECT(this),
- TQT_SLOT(slotToggleWordWrap()), actionCollection(), "toggle_wordwrap");
+ a_ctWordWrap = new TDEToggleAction(i18n("&Word Wrap"), 0 , this,
+ TQ_SLOT(slotToggleWordWrap()), actionCollection(), "toggle_wordwrap");
//tools menu
- new TDEAction(i18n("Add &Quote Characters"), 0, TQT_TQOBJECT(v_iew->e_dit),
- TQT_SLOT(slotAddQuotes()), actionCollection(), "tools_quote");
+ new TDEAction(i18n("Add &Quote Characters"), 0, v_iew->e_dit,
+ TQ_SLOT(slotAddQuotes()), actionCollection(), "tools_quote");
- new TDEAction(i18n("&Remove Quote Characters"), 0, TQT_TQOBJECT(v_iew->e_dit),
- TQT_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote");
+ new TDEAction(i18n("&Remove Quote Characters"), 0, v_iew->e_dit,
+ TQ_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote");
- new TDEAction(i18n("Add &Box"), 0, TQT_TQOBJECT(v_iew->e_dit),
- TQT_SLOT(slotAddBox()), actionCollection(), "tools_box");
+ new TDEAction(i18n("Add &Box"), 0, v_iew->e_dit,
+ TQ_SLOT(slotAddBox()), actionCollection(), "tools_box");
- new TDEAction(i18n("Re&move Box"), 0, TQT_TQOBJECT(v_iew->e_dit),
- TQT_SLOT(slotRemoveBox()), actionCollection(), "tools_unbox");
+ new TDEAction(i18n("Re&move Box"), 0, v_iew->e_dit,
+ TQ_SLOT(slotRemoveBox()), actionCollection(), "tools_unbox");
- TDEAction *undoRewrap = new TDEAction(i18n("Get &Original Text (not re-wrapped)"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotUndoRewrap()), actionCollection(), "tools_undoRewrap");
+ TDEAction *undoRewrap = new TDEAction(i18n("Get &Original Text (not re-wrapped)"), 0, this,
+ TQ_SLOT(slotUndoRewrap()), actionCollection(), "tools_undoRewrap");
undoRewrap->setEnabled(!u_nwraped.isNull());
- TDEAction *rot13 = new TDEAction(i18n("S&cramble (Rot 13)"), "encrypted", 0, TQT_TQOBJECT(v_iew->e_dit),
- TQT_SLOT(slotRot13()), actionCollection(), "tools_rot13");
+ TDEAction *rot13 = new TDEAction(i18n("S&cramble (Rot 13)"), "encrypted", 0, v_iew->e_dit,
+ TQ_SLOT(slotRot13()), actionCollection(), "tools_rot13");
rot13->setEnabled(false);
- connect(v_iew->e_dit, TQT_SIGNAL(copyAvailable(bool)), rot13, TQT_SLOT(setEnabled(bool)));
+ connect(v_iew->e_dit, TQ_SIGNAL(copyAvailable(bool)), rot13, TQ_SLOT(setEnabled(bool)));
- a_ctExternalEditor = new TDEAction(i18n("Start &External Editor"), "system-run", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotExternalEditor()), actionCollection(), "external_editor");
+ a_ctExternalEditor = new TDEAction(i18n("Start &External Editor"), "system-run", 0, this,
+ TQ_SLOT(slotExternalEditor()), actionCollection(), "external_editor");
- a_ctSpellCheck = KStdAction::spelling (TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheck()), actionCollection());
+ a_ctSpellCheck = KStdAction::spelling (this, TQ_SLOT(slotSpellcheck()), actionCollection());
//settings menu
createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true);
- KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfKeys()), actionCollection());
+ KStdAction::keyBindings(this, TQ_SLOT(slotConfKeys()), actionCollection());
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbar()), actionCollection());
+ KStdAction::configureToolbars(this, TQ_SLOT(slotConfToolbar()), actionCollection());
- KStdAction::preferences(TQT_TQOBJECT(knGlobals.top), TQT_SLOT(slotSettings()), actionCollection());
+ KStdAction::preferences(knGlobals.top, TQ_SLOT(slotSettings()), actionCollection());
a_ccel=new TDEAccel(this);
a_ctSetCharsetKeyb->plugAccel(a_ccel);
@@ -420,7 +420,7 @@ int KNComposer::listOfResultOfCheckWord( const TQStringList & lst , const TQStri
{
TDEAction * act = new TDEAction( *it );
- connect( act, TQT_SIGNAL(activated()), v_iew->e_dit, TQT_SLOT(slotCorrectWord()) );
+ connect( act, TQ_SIGNAL(activated()), v_iew->e_dit, TQ_SLOT(slotCorrectWord()) );
m_listAction.append( act );
}
}
@@ -437,7 +437,7 @@ void KNComposer::slotUndo()
if (fw->inherits("KEdit"))
((TQMultiLineEdit*)fw)->undo();
- else if (fw->inherits(TQLINEEDIT_OBJECT_NAME_STRING))
+ else if (fw->inherits("TQLineEdit"))
((TQLineEdit*)fw)->undo();
}
@@ -448,7 +448,7 @@ void KNComposer::slotRedo()
if (fw->inherits("KEdit"))
((TQMultiLineEdit*)fw)->redo();
- else if (fw->inherits(TQLINEEDIT_OBJECT_NAME_STRING))
+ else if (fw->inherits("TQLineEdit"))
((TQLineEdit*)fw)->redo();
}
@@ -459,7 +459,7 @@ void KNComposer::slotCut()
if (fw->inherits("KEdit"))
((TQMultiLineEdit*)fw)->cut();
- else if (fw->inherits(TQLINEEDIT_OBJECT_NAME_STRING))
+ else if (fw->inherits("TQLineEdit"))
((TQLineEdit*)fw)->cut();
else kdDebug(5003) << "wrong focus widget" << endl;
}
@@ -471,7 +471,7 @@ void KNComposer::slotCopy()
if (fw->inherits("KEdit"))
((TQMultiLineEdit*)fw)->copy();
- else if (fw->inherits(TQLINEEDIT_OBJECT_NAME_STRING))
+ else if (fw->inherits("TQLineEdit"))
((TQLineEdit*)fw)->copy();
else kdDebug(5003) << "wrong focus widget" << endl;
@@ -485,7 +485,7 @@ void KNComposer::slotPaste()
if (fw->inherits("KEdit"))
((TQMultiLineEdit*)fw)->paste();
- else if (fw->inherits(TQLINEEDIT_OBJECT_NAME_STRING))
+ else if (fw->inherits("TQLineEdit"))
((TQLineEdit*)fw)->paste();
else kdDebug(5003) << "wrong focus widget" << endl;
}
@@ -495,9 +495,9 @@ void KNComposer::slotSelectAll()
TQWidget* fw = focusWidget();
if (!fw) return;
- if (fw->inherits(TQLINEEDIT_OBJECT_NAME_STRING))
+ if (fw->inherits("TQLineEdit"))
((TQLineEdit*)fw)->selectAll();
- else if (fw->inherits(TQMULTILINEEDIT_OBJECT_NAME_STRING))
+ else if (fw->inherits("TQMultiLineEdit"))
((TQMultiLineEdit*)fw)->selectAll();
}
@@ -1302,7 +1302,7 @@ void KNComposer::slotExternalEditor()
if(!filenameAdded) // no %f in the editor command
(*e_xternalEditor) << e_ditorTempfile->name();
- connect(e_xternalEditor, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotEditorFinished(TDEProcess *)));
+ connect(e_xternalEditor, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotEditorFinished(TDEProcess *)));
if(!e_xternalEditor->start()) {
KMessageBox::error(this, i18n("Unable to start external editor.\nPlease check your configuration in the settings dialog."));
delete e_xternalEditor;
@@ -1327,17 +1327,17 @@ void KNComposer::slotSpellcheck()
a_ctExternalEditor->setEnabled(false);
a_ctSpellCheck->setEnabled(false);
- s_pellChecker = new KSpell(TQT_TQWIDGET(this), i18n("Spellcheck"), TQT_TQOBJECT(this), TQT_SLOT(slotSpellStarted(KSpell *)));
+ s_pellChecker = new KSpell(this, i18n("Spellcheck"), this, TQ_SLOT(slotSpellStarted(KSpell *)));
TQStringList l = KSpellingHighlighter::personalWords();
for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) {
s_pellChecker->addPersonal( *it );
}
- connect(s_pellChecker, TQT_SIGNAL(death()), this, TQT_SLOT(slotSpellFinished()));
- connect(s_pellChecker, TQT_SIGNAL(done(const TQString&)), this, TQT_SLOT(slotSpellDone(const TQString&)));
- connect(s_pellChecker, TQT_SIGNAL(misspelling (const TQString &, const TQStringList &, unsigned int)),
- this, TQT_SLOT(slotMisspelling (const TQString &, const TQStringList &, unsigned int)));
- connect(s_pellChecker, TQT_SIGNAL(corrected (const TQString &, const TQString &, unsigned int)),
- this, TQT_SLOT(slotCorrected (const TQString &, const TQString &, unsigned int)));
+ connect(s_pellChecker, TQ_SIGNAL(death()), this, TQ_SLOT(slotSpellFinished()));
+ connect(s_pellChecker, TQ_SIGNAL(done(const TQString&)), this, TQ_SLOT(slotSpellDone(const TQString&)));
+ connect(s_pellChecker, TQ_SIGNAL(misspelling (const TQString &, const TQStringList &, unsigned int)),
+ this, TQ_SLOT(slotMisspelling (const TQString &, const TQStringList &, unsigned int)));
+ connect(s_pellChecker, TQ_SIGNAL(corrected (const TQString &, const TQString &, unsigned int)),
+ this, TQ_SLOT(slotCorrected (const TQString &, const TQString &, unsigned int)));
}
@@ -1401,7 +1401,7 @@ void KNComposer::slotConfToolbar()
conf->setGroup("composerWindow_options");
saveMainWindowSettings(conf);
KEditToolbar dlg(guiFactory(),this);
- connect(&dlg,TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() ));
+ connect(&dlg,TQ_SIGNAL( newToolbarConfig() ), this, TQ_SLOT( slotNewToolbarConfig() ));
dlg.exec();
}
@@ -1508,10 +1508,10 @@ void KNComposer::slotGroupsBtnClicked()
KNGroupSelectDialog *dlg=new KNGroupSelectDialog(this, nntp, v_iew->g_roups->text().remove(TQRegExp("\\s")));
- connect(dlg, TQT_SIGNAL(loadList(KNNntpAccount*)),
- knGlobals.groupManager(), TQT_SLOT(slotLoadGroupList(KNNntpAccount*)));
- connect(knGlobals.groupManager(), TQT_SIGNAL(newListReady(KNGroupListData*)),
- dlg, TQT_SLOT(slotReceiveList(KNGroupListData*)));
+ connect(dlg, TQ_SIGNAL(loadList(KNNntpAccount*)),
+ knGlobals.groupManager(), TQ_SLOT(slotLoadGroupList(KNNntpAccount*)));
+ connect(knGlobals.groupManager(), TQ_SIGNAL(newListReady(KNGroupListData*)),
+ dlg, TQ_SLOT(slotReceiveList(KNGroupListData*)));
if(dlg->exec())
v_iew->g_roups->setText(dlg->selectedGroups());
@@ -1725,7 +1725,7 @@ TQPopupMenu * KNComposer::popupMenu( const TQString& name )
KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n)
- : TQSplitter(Qt::Vertical, composer, n), a_ttWidget(0), a_ttView(0), v_iewOpen(false)
+ : TQSplitter(TQt::Vertical, composer, n), a_ttWidget(0), a_ttView(0), v_iewOpen(false)
{
TQWidget *main=new TQWidget(this);
@@ -1744,7 +1744,7 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n)
hdrL->addWidget(l_to, 0,0);
hdrL->addWidget(t_o, 0,1);
hdrL->addWidget(t_oBtn, 0,2);
- connect(t_oBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotToBtnClicked()));
+ connect(t_oBtn, TQ_SIGNAL(clicked()), parent(), TQ_SLOT(slotToBtnClicked()));
//Newsgroups
g_roups=new KNLineEdit(this, false, hdrFrame);
@@ -1755,9 +1755,9 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n)
hdrL->addWidget(l_groups, 1,0);
hdrL->addWidget(g_roups, 1,1);
hdrL->addWidget(g_roupsBtn, 1,2);
- connect(g_roups, TQT_SIGNAL(textChanged(const TQString&)),
- parent(), TQT_SLOT(slotGroupsChanged(const TQString&)));
- connect(g_roupsBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotGroupsBtnClicked()));
+ connect(g_roups, TQ_SIGNAL(textChanged(const TQString&)),
+ parent(), TQ_SLOT(slotGroupsChanged(const TQString&)));
+ connect(g_roupsBtn, TQ_SIGNAL(clicked()), parent(), TQ_SLOT(slotGroupsBtnClicked()));
//Followup-To
f_up2=new KComboBox(true, hdrFrame);
@@ -1772,8 +1772,8 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n)
TQLabel *l=new TQLabel(s_ubject, i18n("S&ubject:"), hdrFrame);
hdrL->addWidget(l, 3,0);
hdrL->addMultiCellWidget(s_ubject, 3,3, 1,2);
- connect(s_ubject, TQT_SIGNAL(textChanged(const TQString&)),
- parent(), TQT_SLOT(slotSubjectChanged(const TQString&)));
+ connect(s_ubject, TQ_SIGNAL(textChanged(const TQString&)),
+ parent(), TQ_SLOT(slotSubjectChanged(const TQString&)));
//Editor
e_dit=new Editor(this, composer, main);
@@ -1793,12 +1793,12 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n)
mSpellChecker = new KDictSpellingHighlighter(e_dit, /*active*/ true, /*autoEnabled*/ true,
/*spellColor*/ config->readColorEntry("NewMessage", &c),
/*colorQuoting*/ true, col1, col2, col3, col4);
- connect( mSpellChecker, TQT_SIGNAL(newSuggestions(const TQString&, const TQStringList&, unsigned int)), e_dit,
- TQT_SLOT(slotAddSuggestion(const TQString&, const TQStringList&, unsigned int)) );
+ connect( mSpellChecker, TQ_SIGNAL(newSuggestions(const TQString&, const TQStringList&, unsigned int)), e_dit,
+ TQ_SLOT(slotAddSuggestion(const TQString&, const TQStringList&, unsigned int)) );
TQVBoxLayout *notL=new TQVBoxLayout(e_dit);
notL->addStretch(1);
- n_otification=new TQGroupBox(2, Qt::Horizontal, e_dit);
+ n_otification=new TQGroupBox(2, TQt::Horizontal, e_dit);
l=new TQLabel(i18n("You are currently editing the article body\nin an external editor. To continue, you have\nto close the external editor."), n_otification);
c_ancelEditorBtn=new TQPushButton(i18n("&Kill External Editor"), n_otification);
n_otification->setFrameStyle(TQFrame::Panel | TQFrame::Raised);
@@ -1906,33 +1906,33 @@ void KNComposer::ComposerView::showAttachmentView()
topL->addMultiCellWidget(a_ttView, 0,2, 0,0);
//connections
- connect(a_ttView, TQT_SIGNAL(currentChanged(TQListViewItem*)),
- parent(), TQT_SLOT(slotAttachmentSelected(TQListViewItem*)));
- connect(a_ttView, TQT_SIGNAL(clicked ( TQListViewItem * )),
- parent(), TQT_SLOT(slotAttachmentSelected(TQListViewItem*)));
-
- connect(a_ttView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
- parent(), TQT_SLOT(slotAttachmentPopup(TDEListView*, TQListViewItem*, const TQPoint&)));
- connect(a_ttView, TQT_SIGNAL(delPressed(TQListViewItem*)),
- parent(), TQT_SLOT(slotAttachmentRemove(TQListViewItem*)));
- connect(a_ttView, TQT_SIGNAL(doubleClicked(TQListViewItem*)),
- parent(), TQT_SLOT(slotAttachmentEdit(TQListViewItem*)));
- connect(a_ttView, TQT_SIGNAL(returnPressed(TQListViewItem*)),
- parent(), TQT_SLOT(slotAttachmentEdit(TQListViewItem*)));
+ connect(a_ttView, TQ_SIGNAL(currentChanged(TQListViewItem*)),
+ parent(), TQ_SLOT(slotAttachmentSelected(TQListViewItem*)));
+ connect(a_ttView, TQ_SIGNAL(clicked ( TQListViewItem * )),
+ parent(), TQ_SLOT(slotAttachmentSelected(TQListViewItem*)));
+
+ connect(a_ttView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+ parent(), TQ_SLOT(slotAttachmentPopup(TDEListView*, TQListViewItem*, const TQPoint&)));
+ connect(a_ttView, TQ_SIGNAL(delPressed(TQListViewItem*)),
+ parent(), TQ_SLOT(slotAttachmentRemove(TQListViewItem*)));
+ connect(a_ttView, TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+ parent(), TQ_SLOT(slotAttachmentEdit(TQListViewItem*)));
+ connect(a_ttView, TQ_SIGNAL(returnPressed(TQListViewItem*)),
+ parent(), TQ_SLOT(slotAttachmentEdit(TQListViewItem*)));
//buttons
a_ttAddBtn=new TQPushButton(i18n("A&dd..."),a_ttWidget);
- connect(a_ttAddBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotAttachFile()));
+ connect(a_ttAddBtn, TQ_SIGNAL(clicked()), parent(), TQ_SLOT(slotAttachFile()));
topL->addWidget(a_ttAddBtn, 0,1);
a_ttRemoveBtn=new TQPushButton(i18n("&Remove"), a_ttWidget);
a_ttRemoveBtn->setEnabled(false);
- connect(a_ttRemoveBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotRemoveAttachment()));
+ connect(a_ttRemoveBtn, TQ_SIGNAL(clicked()), parent(), TQ_SLOT(slotRemoveAttachment()));
topL->addWidget(a_ttRemoveBtn, 1,1);
a_ttEditBtn=new TQPushButton(i18n("&Properties"), a_ttWidget);
a_ttEditBtn->setEnabled(false);
- connect(a_ttEditBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotAttachmentProperties()));
+ connect(a_ttEditBtn, TQ_SIGNAL(clicked()), parent(), TQ_SLOT(slotAttachmentProperties()));
topL->addWidget(a_ttEditBtn, 2,1, TQt::AlignTop);
topL->setRowStretch(2,1);
@@ -2011,7 +2011,7 @@ KNComposer::Editor::~Editor()
//-----------------------------------------------------------------------------
bool KNComposer::Editor::eventFilter(TQObject*o, TQEvent* e)
{
- if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this))
+ if (o == this)
KCursor::autoHideEventFilter(o, e);
if (e->type() == TQEvent::KeyPress)
@@ -2398,15 +2398,15 @@ void KNComposer::Editor::contentsContextMenuEvent( TQContextMenuEvent */*e*/ )
}
else
{
- spell = new KSpell(this, i18n("Spellcheck"), TQT_TQOBJECT(this), TQT_SLOT(slotSpellStarted(KSpell *)));
+ spell = new KSpell(this, i18n("Spellcheck"), this, TQ_SLOT(slotSpellStarted(KSpell *)));
TQStringList l = KSpellingHighlighter::personalWords();
for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) {
spell->addPersonal( *it );
}
- connect(spell, TQT_SIGNAL(death()), this, TQT_SLOT(slotSpellFinished()));
- connect(spell, TQT_SIGNAL(done(const TQString&)), this, TQT_SLOT(slotSpellDone(const TQString&)));
- connect(spell, TQT_SIGNAL(misspelling (const TQString &, const TQStringList &, unsigned int)),
- this, TQT_SLOT(slotMisspelling (const TQString &, const TQStringList &, unsigned int)));
+ connect(spell, TQ_SIGNAL(death()), this, TQ_SLOT(slotSpellFinished()));
+ connect(spell, TQ_SIGNAL(done(const TQString&)), this, TQ_SLOT(slotSpellDone(const TQString&)));
+ connect(spell, TQ_SIGNAL(misspelling (const TQString &, const TQStringList &, unsigned int)),
+ this, TQ_SLOT(slotMisspelling (const TQString &, const TQStringList &, unsigned int)));
}
}
@@ -2600,8 +2600,8 @@ KNComposer::AttachmentPropertiesDlg::AttachmentPropertiesDlg(KNAttachment *a, TQ
topL->addWidget(mimeGB);
//connections
- connect(m_imeType, TQT_SIGNAL(textChanged(const TQString&)),
- this, TQT_SLOT(slotMimeTypeTextChanged(const TQString&)));
+ connect(m_imeType, TQ_SIGNAL(textChanged(const TQString&)),
+ this, TQ_SLOT(slotMimeTypeTextChanged(const TQString&)));
//finish GUI
setFixedHeight(sizeHint().height());
diff --git a/knode/kncomposer.h b/knode/kncomposer.h
index c966209f..00dc1551 100644
--- a/knode/kncomposer.h
+++ b/knode/kncomposer.h
@@ -43,7 +43,7 @@ class SpellingFilter;
class KNComposer : public TDEMainWindow , virtual public KNodeComposerIface {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -251,7 +251,7 @@ class KNComposer::ComposerView : public TQSplitter {
//internal class : handle Tabs... (expanding them in textLine(), etc.)
class KNComposer::Editor : public KEdit {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -304,7 +304,7 @@ private:
class KNComposer::AttachmentView : public TDEListView {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -332,7 +332,7 @@ class KNComposer::AttachmentViewItem : public TDEListViewItem {
class KNComposer::AttachmentPropertiesDlg : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -357,7 +357,7 @@ class KNComposer::AttachmentPropertiesDlg : public KDialogBase {
//-----------------------------------------------------------------------------
class KNLineEdit : public TDEABC::AddressLineEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef TDEABC::AddressLineEdit KNLineEditInherited;
public:
@@ -377,7 +377,7 @@ private:
class KNLineEditSpell : public KNLineEdit
{
- Q_OBJECT
+ TQ_OBJECT
public:
KNLineEditSpell(KNComposer::ComposerView *_composerView, bool useCompletion,TQWidget * parent, const char * name = 0);
diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp
index 7c0ef435..9be34f00 100644
--- a/knode/knconfig.cpp
+++ b/knode/knconfig.cpp
@@ -138,8 +138,8 @@ TQString KNConfig::Identity::getSignature()
for ( TQStringList::Iterator it = command.begin(); it != command.end(); ++it )
process << (*it);
- connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(slotReceiveStdout(TDEProcess *, char *, int)));
- connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(slotReceiveStderr(TDEProcess *, char *, int)));
+ connect(&process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQ_SLOT(slotReceiveStdout(TDEProcess *, char *, int)));
+ connect(&process, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQ_SLOT(slotReceiveStderr(TDEProcess *, char *, int)));
if (!process.start(TDEProcess::Block,TDEProcess::AllOutput))
KMessageBox::error(knGlobals.topWidget, i18n("Cannot run the signature generator."));
diff --git a/knode/knconfig.h b/knode/knconfig.h
index c8605049..f3dff7cd 100644
--- a/knode/knconfig.h
+++ b/knode/knconfig.h
@@ -65,7 +65,7 @@ class Base {
class KDE_EXPORT Identity : public TQObject, public Base {
-Q_OBJECT
+TQ_OBJECT
friend class IdentityWidget;
diff --git a/knode/knconfigmanager.cpp b/knode/knconfigmanager.cpp
index a07a9c5e..f7d26506 100644
--- a/knode/knconfigmanager.cpp
+++ b/knode/knconfigmanager.cpp
@@ -67,7 +67,7 @@ void KNConfigManager::configure()
{
if(!d_ialog) {
d_ialog=new KNConfigDialog(knGlobals.topWidget, "Preferences_Dlg");
- connect(d_ialog, TQT_SIGNAL(finished()), this, TQT_SLOT(slotDialogDone()));
+ connect(d_ialog, TQ_SIGNAL(finished()), this, TQ_SLOT(slotDialogDone()));
d_ialog->show();
}
else
@@ -113,7 +113,7 @@ KNConfigDialog::KNConfigDialog(TQWidget *p, const char *n)
setHelp("anc-setting-your-identity");
- connect(this, TQT_SIGNAL(configCommitted()), this, TQT_SLOT(slotConfigCommitted()));
+ connect(this, TQ_SIGNAL(configCommitted()), this, TQ_SLOT(slotConfigCommitted()));
}
diff --git a/knode/knconfigmanager.h b/knode/knconfigmanager.h
index c0c6a49e..25cbd211 100644
--- a/knode/knconfigmanager.h
+++ b/knode/knconfigmanager.h
@@ -26,7 +26,7 @@ class KNConfigDialog;
class KNConfigManager : TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -71,7 +71,7 @@ class KNConfigManager : TQObject {
class KNConfigDialog : public KCMultiDialog {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/knconfigpages.cpp b/knode/knconfigpages.cpp
index d9f21878..91d7666c 100644
--- a/knode/knconfigpages.cpp
+++ b/knode/knconfigpages.cpp
@@ -38,7 +38,7 @@ KNConfig::BasePageWithTabs::BasePageWithTabs( TQWidget * parent, const char * na
void KNConfig::BasePageWithTabs::addTab( TDECModule* tab, const TQString & title ) {
mTabWidget->addTab( tab, title );
- connect( tab, TQT_SIGNAL(changed( bool )), this, TQT_SIGNAL(changed( bool )) );
+ connect( tab, TQ_SIGNAL(changed( bool )), this, TQ_SIGNAL(changed( bool )) );
}
void KNConfig::BasePageWithTabs::load() {
diff --git a/knode/knconfigpages.h b/knode/knconfigpages.h
index 9bcaf1d4..80d3a6cf 100644
--- a/knode/knconfigpages.h
+++ b/knode/knconfigpages.h
@@ -30,7 +30,7 @@ namespace KNConfig {
* Code mostly taken from kmail.
*/
class KDE_EXPORT BasePageWithTabs : public TDECModule {
- Q_OBJECT
+ TQ_OBJECT
public:
BasePageWithTabs( TQWidget * parent=0, const char * name=0 );
@@ -51,7 +51,7 @@ class KDE_EXPORT BasePageWithTabs : public TDECModule {
// accounts page
class AccountsPage : public BasePageWithTabs {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -61,7 +61,7 @@ class AccountsPage : public BasePageWithTabs {
// read news page
class KDE_EXPORT ReadNewsPage : public BasePageWithTabs {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -70,7 +70,7 @@ class KDE_EXPORT ReadNewsPage : public BasePageWithTabs {
// post news page
class KDE_EXPORT PostNewsPage : public BasePageWithTabs {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp
index 68b474a1..27c81824 100644
--- a/knode/knconfigwidgets.cpp
+++ b/knode/knconfigwidgets.cpp
@@ -66,7 +66,7 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char *
"<p>Ex: <b>John Stuart Masterson III</b>.</p></qt>");
TQWhatsThis::add( n_ame, msg );
TQWhatsThis::add( l, msg );
- connect( n_ame, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()) );
+ connect( n_ame, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()) );
o_rga=new KLineEdit(this);
l=new TQLabel(o_rga, i18n("Organi&zation:"), this);
@@ -76,7 +76,7 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char *
"<p>Ex: <b>KNode, Inc</b>.</p></qt>" );
TQWhatsThis::add( o_rga, msg );
TQWhatsThis::add( l, msg );
- connect( o_rga, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()) );
+ connect( o_rga, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()) );
e_mail=new KLineEdit(this);
l=new TQLabel(e_mail, i18n("Email a&ddress:"), this);
@@ -86,7 +86,7 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char *
"reading your articles</p><p>Ex: <b>nospam@please.com</b>.</qt>" );
TQWhatsThis::add( l, msg );
TQWhatsThis::add( e_mail, msg );
- connect( e_mail, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()) );
+ connect( e_mail, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()) );
r_eplyTo=new KLineEdit(this);
l=new TQLabel(r_eplyTo, i18n("&Reply-to address:"), this);
@@ -97,13 +97,13 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char *
"email address.</p><p>Ex: <b>john@example.com</b>.</p></qt>" );
TQWhatsThis::add( l, msg );
TQWhatsThis::add( r_eplyTo, msg );
- connect( r_eplyTo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()) );
+ connect( r_eplyTo, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()) );
m_ailCopiesTo=new KLineEdit(this);
l=new TQLabel(m_ailCopiesTo, i18n("&Mail-copies-to:"), this);
topL->addWidget(l, 4,0);
topL->addMultiCellWidget(m_ailCopiesTo, 4,4, 1,2);
- connect( m_ailCopiesTo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()) );
+ connect( m_ailCopiesTo, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()) );
s_igningKey = new Kpgp::SecretKeyRequester(this);
s_igningKey->dialogButton()->setText(i18n("Chan&ge..."));
@@ -117,11 +117,11 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char *
"used to sign your articles.</p></qt>");
TQWhatsThis::add( l, msg );
TQWhatsThis::add( s_igningKey, msg );
- connect( s_igningKey, TQT_SIGNAL(changed()), TQT_SLOT(changed()) );
+ connect( s_igningKey, TQ_SIGNAL(changed()), TQ_SLOT(changed()) );
b_uttonGroup = new TQButtonGroup(this);
- connect( b_uttonGroup, TQT_SIGNAL(clicked(int)),
- this, TQT_SLOT(slotSignatureType(int)) );
+ connect( b_uttonGroup, TQ_SIGNAL(clicked(int)),
+ this, TQ_SLOT(slotSignatureType(int)) );
b_uttonGroup->setExclusive(true);
b_uttonGroup->hide();
@@ -143,12 +143,12 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char *
TQWhatsThis::add( s_ig, msg );
c_hooseBtn = new TQPushButton( i18n("Choo&se..."), this);
- connect(c_hooseBtn, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotSignatureChoose()));
+ connect(c_hooseBtn, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotSignatureChoose()));
topL->addWidget(c_hooseBtn, 7, 2 );
e_ditBtn = new TQPushButton( i18n("&Edit File"), this);
- connect(e_ditBtn, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotSignatureEdit()));
+ connect(e_ditBtn, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotSignatureEdit()));
topL->addWidget(e_ditBtn, 8, 2);
s_igGenerator = new TQCheckBox(i18n("&The file is a program"), this);
@@ -156,7 +156,7 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char *
msg = i18n( "<qt><p>Mark this option if the signature will be generated by a program</p>"
"<p>Ex: <b>/home/robt/gensig.sh</b>.</p></qt>" );
TQWhatsThis::add( s_igGenerator, msg );
- connect( s_igGenerator, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) );
+ connect( s_igGenerator, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) );
s_igEdit = new TQRadioButton( i18n("Specify signature &below"), this);
b_uttonGroup->insert(s_igEdit, 1);
@@ -165,13 +165,13 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char *
s_igEditor = new TQTextEdit(this);
s_igEditor->setTextFormat(TQt::PlainText);
topL->addMultiCellWidget(s_igEditor, 10, 10, 0, 2);
- connect( s_igEditor, TQT_SIGNAL(textChanged()), TQT_SLOT(changed()) );
+ connect( s_igEditor, TQ_SIGNAL(textChanged()), TQ_SLOT(changed()) );
topL->setColStretch(1,1);
topL->setRowStretch(7,1);
topL->setResizeMode(TQLayout::Minimum);
- connect(s_ig,TQT_SIGNAL(textChanged ( const TQString & )),
- this,TQT_SLOT(textFileNameChanged(const TQString &)));
+ connect(s_ig,TQ_SIGNAL(textChanged ( const TQString & )),
+ this,TQ_SLOT(textFileNameChanged(const TQString &)));
load();
}
@@ -289,12 +289,12 @@ KNConfig::NntpAccountListWidget::NntpAccountListWidget(TQWidget *p, const char *
// account listbox
l_box=new KNDialogListBox(false, this);
- connect(l_box, TQT_SIGNAL(selected(int)), this, TQT_SLOT(slotItemSelected(int)));
- connect(l_box, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
+ connect(l_box, TQ_SIGNAL(selected(int)), this, TQ_SLOT(slotItemSelected(int)));
+ connect(l_box, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()));
topL->addMultiCellWidget(l_box, 0,4, 0,0);
// info box
- TQGroupBox *gb = new TQGroupBox(2,Qt::Vertical,TQString(),this);
+ TQGroupBox *gb = new TQGroupBox(2,TQt::Vertical,TQString(),this);
topL->addWidget(gb,5,0);
s_erverInfo = new TQLabel(gb);
@@ -302,19 +302,19 @@ KNConfig::NntpAccountListWidget::NntpAccountListWidget(TQWidget *p, const char *
// buttons
a_ddBtn=new TQPushButton(i18n("&Add..."), this);
- connect(a_ddBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddBtnClicked()));
+ connect(a_ddBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddBtnClicked()));
topL->addWidget(a_ddBtn, 0,1);
e_ditBtn=new TQPushButton(i18n("modify something","&Edit..."), this);
- connect(e_ditBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditBtnClicked()));
+ connect(e_ditBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditBtnClicked()));
topL->addWidget(e_ditBtn, 1,1);
d_elBtn=new TQPushButton(i18n("&Delete"), this);
- connect(d_elBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelBtnClicked()));
+ connect(d_elBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelBtnClicked()));
topL->addWidget(d_elBtn, 2,1);
s_ubBtn=new TQPushButton(i18n("&Subscribe..."), this);
- connect(s_ubBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSubBtnClicked()));
+ connect(s_ubBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSubBtnClicked()));
topL->addWidget(s_ubBtn, 3,1);
topL->setRowStretch(4,1); // stretch the server listbox
@@ -323,9 +323,9 @@ KNConfig::NntpAccountListWidget::NntpAccountListWidget(TQWidget *p, const char *
// the settings dialog is non-modal, so we have to react to changes
// made outside of the dialog
- connect(a_ccManager, TQT_SIGNAL(accountAdded(KNNntpAccount*)), this, TQT_SLOT(slotAddItem(KNNntpAccount*)));
- connect(a_ccManager, TQT_SIGNAL(accountRemoved(KNNntpAccount*)), this, TQT_SLOT(slotRemoveItem(KNNntpAccount*)));
- connect(a_ccManager, TQT_SIGNAL(accountModified(KNNntpAccount*)), this, TQT_SLOT(slotUpdateItem(KNNntpAccount*)));
+ connect(a_ccManager, TQ_SIGNAL(accountAdded(KNNntpAccount*)), this, TQ_SLOT(slotAddItem(KNNntpAccount*)));
+ connect(a_ccManager, TQ_SIGNAL(accountRemoved(KNNntpAccount*)), this, TQ_SLOT(slotRemoveItem(KNNntpAccount*)));
+ connect(a_ccManager, TQ_SIGNAL(accountModified(KNNntpAccount*)), this, TQ_SLOT(slotUpdateItem(KNNntpAccount*)));
slotSelectionChanged(); // disable Delete & Edit initially
}
@@ -510,7 +510,7 @@ KNConfig::NntpAccountConfDialog::NntpAccountConfDialog(KNNntpAccount *a, TQWidge
topL->addMultiCellWidget(u_seDiskCache, 6,6, 0,3);*/
a_uth=new TQCheckBox(i18n("Server requires &authentication"), page);
- connect(a_uth, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotAuthChecked(bool)));
+ connect(a_uth, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotAuthChecked(bool)));
topL->addMultiCellWidget(a_uth, 6,6, 0,3);
u_ser=new KLineEdit(page);
@@ -531,7 +531,7 @@ KNConfig::NntpAccountConfDialog::NntpAccountConfDialog(KNNntpAccount *a, TQWidge
topL->addMultiCellWidget(p_ass, 8,8, 1,2);
i_nterval=new TQCheckBox(i18n("Enable &interval news checking"), page);
- connect(i_nterval, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotIntervalChecked(bool)));
+ connect(i_nterval, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotIntervalChecked(bool)));
topL->addMultiCellWidget(i_nterval, 9,9, 0,3);
c_heckInterval=new KIntSpinBox(1,10000,1,1,10,page);
@@ -559,7 +559,7 @@ KNConfig::NntpAccountConfDialog::NntpAccountConfDialog(KNNntpAccount *a, TQWidge
cleanupLayout->addWidget( mCleanupWidget );
cleanupLayout->addStretch( 1 );
- connect( knGlobals.accountManager(), TQT_SIGNAL(passwordsChanged()), TQT_SLOT(slotPasswordChanged()) );
+ connect( knGlobals.accountManager(), TQ_SIGNAL(passwordsChanged()), TQ_SLOT(slotPasswordChanged()) );
KNHelper::restoreWindowSize("accNewsPropDLG", this, sizeHint());
@@ -633,7 +633,7 @@ KNConfig::SmtpAccountWidget::SmtpAccountWidget( TQWidget *p, const char *n ) :
SmtpAccountWidgetBase( p, n )
{
mAccount = knGlobals.accountManager()->smtp();
- connect( knGlobals.accountManager(), TQT_SIGNAL(passwordsChanged()), TQT_SLOT(slotPasswordChanged()) );
+ connect( knGlobals.accountManager(), TQ_SIGNAL(passwordsChanged()), TQ_SLOT(slotPasswordChanged()) );
load();
}
@@ -821,29 +821,29 @@ KNConfig::AppearanceWidget::AppearanceWidget( TQWidget *p, const char *n ) :
//color-list
c_List = new KNDialogListBox(false, this);
topL->addMultiCellWidget(c_List,1,3,0,0);
- connect(c_List, TQT_SIGNAL(selected(TQListBoxItem*)),TQT_SLOT(slotColItemSelected(TQListBoxItem*)));
- connect(c_List, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotColSelectionChanged()));
+ connect(c_List, TQ_SIGNAL(selected(TQListBoxItem*)),TQ_SLOT(slotColItemSelected(TQListBoxItem*)));
+ connect(c_List, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotColSelectionChanged()));
c_olorCB = new TQCheckBox(i18n("&Use custom colors"),this);
topL->addWidget(c_olorCB,0,0);
- connect(c_olorCB, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotColCheckBoxToggled(bool)));
+ connect(c_olorCB, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotColCheckBoxToggled(bool)));
c_olChngBtn=new TQPushButton(i18n("Cha&nge..."), this);
- connect(c_olChngBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotColChangeBtnClicked()));
+ connect(c_olChngBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotColChangeBtnClicked()));
topL->addWidget(c_olChngBtn,1,1);
//font-list
f_List = new KNDialogListBox(false, this);
topL->addMultiCellWidget(f_List,5,7,0,0);
- connect(f_List, TQT_SIGNAL(selected(TQListBoxItem*)),TQT_SLOT(slotFontItemSelected(TQListBoxItem*)));
- connect(f_List, TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotFontSelectionChanged()));
+ connect(f_List, TQ_SIGNAL(selected(TQListBoxItem*)),TQ_SLOT(slotFontItemSelected(TQListBoxItem*)));
+ connect(f_List, TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotFontSelectionChanged()));
f_ontCB = new TQCheckBox(i18n("Use custom &fonts"),this);
topL->addWidget(f_ontCB,4,0);
- connect(f_ontCB, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotFontCheckBoxToggled(bool)));
+ connect(f_ontCB, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotFontCheckBoxToggled(bool)));
f_ntChngBtn=new TQPushButton(i18n("Chang&e..."), this);
- connect(f_ntChngBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFontChangeBtnClicked()));
+ connect(f_ntChngBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFontChangeBtnClicked()));
topL->addWidget(f_ntChngBtn,5,1);
load();
@@ -1005,7 +1005,7 @@ KNConfig::ReadNewsGeneralWidget::ReadNewsGeneralWidget( ReadNewsGeneral *d, TQWi
l1=new TQLabel(m_axFetch, i18n("&Maximum number of articles to fetch:"), hgb);
m_arkCB=new TQCheckBox(i18n("Mar&k article as read after:"), hgb);
m_arkSecs=new KIntSpinBox(0, 9999, 1, 0, 10, hgb);
- connect(m_arkCB, TQT_SIGNAL(toggled(bool)), m_arkSecs, TQT_SLOT(setEnabled(bool)));
+ connect(m_arkCB, TQ_SIGNAL(toggled(bool)), m_arkSecs, TQ_SLOT(setEnabled(bool)));
m_arkSecs->setSuffix(i18n(" sec"));
m_arkCrossCB=new TQCheckBox(i18n("Mark c&rossposted articles as read"), hgb);
@@ -1059,19 +1059,19 @@ KNConfig::ReadNewsGeneralWidget::ReadNewsGeneralWidget( ReadNewsGeneral *d, TQWi
topL->setResizeMode(TQLayout::Minimum);
- connect(a_utoCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
- connect(m_axFetch, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
- connect(m_arkCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
- connect(m_arkSecs, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
- connect(m_arkCrossCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
- connect(s_martScrollingCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
- connect(e_xpThrCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
- connect(d_efaultExpandCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
- connect(l_inesCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
- connect(s_coreCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
- connect(u_nreadCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
- connect(c_ollCacheSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
- connect(a_rtCacheSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+ connect(a_utoCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+ connect(m_axFetch, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+ connect(m_arkCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+ connect(m_arkSecs, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+ connect(m_arkCrossCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+ connect(s_martScrollingCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+ connect(e_xpThrCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+ connect(d_efaultExpandCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+ connect(l_inesCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+ connect(s_coreCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+ connect(u_nreadCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+ connect(c_ollCacheSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+ connect(a_rtCacheSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
load();
}
@@ -1138,7 +1138,7 @@ KNConfig::ReadNewsNavigationWidget::ReadNewsNavigationWidget( ReadNewsNavigation
m_arkAllReadGoNextCB=new TQCheckBox(i18n("&Switch to the next group"), gb);
gbL->addWidget(m_arkAllReadGoNextCB);
- connect(m_arkAllReadGoNextCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(m_arkAllReadGoNextCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
// ==== Mark Thread as Read =================================================
@@ -1152,8 +1152,8 @@ KNConfig::ReadNewsNavigationWidget::ReadNewsNavigationWidget( ReadNewsNavigation
m_arkThreadReadGoNextCB=new TQCheckBox(i18n("Go &to the next unread thread"), gb);
gbL->addWidget(m_arkThreadReadGoNextCB);
- connect(m_arkThreadReadCloseThreadCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
- connect(m_arkThreadReadGoNextCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(m_arkThreadReadCloseThreadCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+ connect(m_arkThreadReadGoNextCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
// ==== Ignore Thread =======================================================
@@ -1167,8 +1167,8 @@ KNConfig::ReadNewsNavigationWidget::ReadNewsNavigationWidget( ReadNewsNavigation
i_gnoreThreadGoNextCB=new TQCheckBox(i18n("Go to the next &unread thread"), gb);
gbL->addWidget(i_gnoreThreadGoNextCB);
- connect(i_gnoreThreadCloseThreadCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
- connect(i_gnoreThreadGoNextCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(i_gnoreThreadCloseThreadCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+ connect(i_gnoreThreadGoNextCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
topL->addStretch(1);
topL->setResizeMode(TQLayout::Minimum);
@@ -1253,14 +1253,14 @@ KNConfig::ReadNewsViewerWidget::ReadNewsViewerWidget( ReadNewsViewer *d, TQWidge
topL->setResizeMode(TQLayout::Minimum);
- connect(r_ewrapCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
- connect(r_emoveTrailingCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
- connect(s_igCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
- connect(q_uoteCharacters, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
- connect(o_penAttCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
- connect(a_ltAttCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
- connect( mShowRefBar, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) );
- connect( mAlwaysShowHTML, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) );
+ connect(r_ewrapCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+ connect(r_emoveTrailingCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+ connect(s_igCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+ connect(q_uoteCharacters, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()));
+ connect(o_penAttCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+ connect(a_ltAttCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+ connect( mShowRefBar, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) );
+ connect( mAlwaysShowHTML, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) );
load();
}
@@ -1311,29 +1311,29 @@ KNConfig::DisplayedHeadersWidget::DisplayedHeadersWidget( DisplayedHeaders *d, T
//listbox
l_box=new KNDialogListBox(false, this);
- connect(l_box, TQT_SIGNAL(selected(int)), this, TQT_SLOT(slotItemSelected(int)));
- connect(l_box, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
+ connect(l_box, TQ_SIGNAL(selected(int)), this, TQ_SLOT(slotItemSelected(int)));
+ connect(l_box, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()));
topL->addMultiCellWidget(l_box, 0,6, 0,0);
// buttons
a_ddBtn=new TQPushButton(i18n("&Add..."), this);
- connect(a_ddBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddBtnClicked()));
+ connect(a_ddBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddBtnClicked()));
topL->addWidget(a_ddBtn, 0,1);
d_elBtn=new TQPushButton(i18n("&Delete"), this);
- connect(d_elBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelBtnClicked()));
+ connect(d_elBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelBtnClicked()));
topL->addWidget(d_elBtn, 1,1);
e_ditBtn=new TQPushButton(i18n("modify something","&Edit..."), this);
- connect(e_ditBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditBtnClicked()));
+ connect(e_ditBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditBtnClicked()));
topL->addWidget(e_ditBtn, 2,1);
u_pBtn=new TQPushButton(i18n("&Up"), this);
- connect(u_pBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpBtnClicked()));
+ connect(u_pBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUpBtnClicked()));
topL->addWidget(u_pBtn, 4,1);
d_ownBtn=new TQPushButton(i18n("Do&wn"), this);
- connect(d_ownBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDownBtnClicked()));
+ connect(d_ownBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDownBtnClicked()));
topL->addWidget(d_ownBtn, 5,1);
topL->addRowSpacing(3,20); // separate up/down buttons
@@ -1499,7 +1499,7 @@ KNConfig::DisplayedHeaderConfDialog::DisplayedHeaderConfDialog(KNDisplayedHeader
h_drC=new KComboBox(true, nameW);
h_drC->lineEdit()->setMaxLength(64);
- connect(h_drC, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)));
+ connect(h_drC, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)));
nameL->addWidget(new TQLabel(h_drC, i18n("H&eader:"),nameW),0,0);
nameL->addWidget(h_drC,0,1);
@@ -1551,7 +1551,7 @@ KNConfig::DisplayedHeaderConfDialog::DisplayedHeaderConfDialog(KNDisplayedHeader
setFixedHeight(sizeHint().height());
KNHelper::restoreWindowSize("accReadHdrPropDLG", this, sizeHint());
- connect(n_ameE, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotNameChanged(const TQString&)));
+ connect(n_ameE, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotNameChanged(const TQString&)));
setHelp("anc-knode-headers");
slotNameChanged( n_ameE->text() );
@@ -1610,13 +1610,13 @@ KNConfig::ScoringWidget::ScoringWidget( Scoring *d, TQWidget *p, const char *n )
TQLabel *l=new TQLabel(i_gnored, i18n("Default score for &ignored threads:"), this);
topL->addWidget(l, 2, 0);
topL->addWidget(i_gnored, 2, 1);
- connect(i_gnored, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+ connect(i_gnored, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
w_atched=new KIntSpinBox(-100000, 100000, 1, 0, 10, this);
l=new TQLabel(w_atched, i18n("Default score for &watched threads:"), this);
topL->addWidget(l, 3, 0);
topL->addWidget(w_atched, 3, 1);
- connect(w_atched, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+ connect(w_atched, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
topL->setColStretch(0, 1);
@@ -1658,24 +1658,24 @@ KNConfig::FilterListWidget::FilterListWidget( TQWidget *p, const char *n ) :
f_lb=new KNDialogListBox(false, this);
topL->addWidget(new TQLabel(f_lb, i18n("&Filters:"),this),0,0);
- connect(f_lb, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChangedFilter()));
- connect(f_lb, TQT_SIGNAL(selected(int)), TQT_SLOT(slotItemSelectedFilter(int)));
+ connect(f_lb, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChangedFilter()));
+ connect(f_lb, TQ_SIGNAL(selected(int)), TQ_SLOT(slotItemSelectedFilter(int)));
topL->addMultiCellWidget(f_lb,1,5,0,0);
a_ddBtn=new TQPushButton(i18n("&Add..."), this);
- connect(a_ddBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddBtnClicked()));
+ connect(a_ddBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddBtnClicked()));
topL->addWidget(a_ddBtn,1,1);
e_ditBtn=new TQPushButton(i18n("modify something","&Edit..."), this);
- connect(e_ditBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditBtnClicked()));
+ connect(e_ditBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditBtnClicked()));
topL->addWidget(e_ditBtn,2,1);
c_opyBtn=new TQPushButton(i18n("Co&py..."), this);
- connect(c_opyBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCopyBtnClicked()));
+ connect(c_opyBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCopyBtnClicked()));
topL->addWidget(c_opyBtn,3,1);
d_elBtn=new TQPushButton(i18n("&Delete"), this);
- connect(d_elBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelBtnClicked()));
+ connect(d_elBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelBtnClicked()));
topL->addWidget(d_elBtn,4,1);
// == Menu ====================================================
@@ -1683,23 +1683,23 @@ KNConfig::FilterListWidget::FilterListWidget( TQWidget *p, const char *n ) :
m_lb=new KNDialogListBox(false, this);
topL->addWidget(new TQLabel(m_lb, i18n("&Menu:"),this),6,0);
- connect(m_lb, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChangedMenu()));
+ connect(m_lb, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChangedMenu()));
topL->addMultiCellWidget(m_lb,7,11,0,0);
u_pBtn=new TQPushButton(i18n("&Up"), this);
- connect(u_pBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpBtnClicked()));
+ connect(u_pBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUpBtnClicked()));
topL->addWidget(u_pBtn,7,1);
d_ownBtn=new TQPushButton(i18n("Do&wn"), this);
- connect(d_ownBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDownBtnClicked()));
+ connect(d_ownBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDownBtnClicked()));
topL->addWidget(d_ownBtn,8,1);
s_epAddBtn=new TQPushButton(i18n("Add\n&Separator"), this);
- connect(s_epAddBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSepAddBtnClicked()));
+ connect(s_epAddBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSepAddBtnClicked()));
topL->addWidget(s_epAddBtn,9,1);
s_epRemBtn=new TQPushButton(i18n("&Remove\nSeparator"), this);
- connect(s_epRemBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSepRemBtnClicked()));
+ connect(s_epRemBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSepRemBtnClicked()));
topL->addWidget(s_epRemBtn,10,1);
topL->setRowStretch(5,1);
@@ -1946,21 +1946,21 @@ KNConfig::PostNewsTechnicalWidget::PostNewsTechnicalWidget( PostNewsTechnical *d
c_harset->insertStringList(d->composerCharsets());
ggbL->addWidget(new TQLabel(c_harset, i18n("Cha&rset:"), ggb), 1,0);
ggbL->addWidget(c_harset, 1,1);
- connect(c_harset, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+ connect(c_harset, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
e_ncoding=new TQComboBox(ggb);
e_ncoding->insertItem(i18n("Allow 8-bit"));
e_ncoding->insertItem(i18n("7-bit (Quoted-Printable)"));
ggbL->addWidget(new TQLabel(e_ncoding, i18n("Enco&ding:"), ggb), 2,0);
ggbL->addWidget(e_ncoding, 2,1);
- connect(e_ncoding, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+ connect(e_ncoding, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
u_seOwnCSCB=new TQCheckBox(i18n("Use o&wn default charset when replying"), ggb);
ggbL->addMultiCellWidget(u_seOwnCSCB, 3,3, 0,1);
- connect(u_seOwnCSCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(u_seOwnCSCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
g_enMIdCB=new TQCheckBox(i18n("&Generate message-id"), ggb);
- connect(g_enMIdCB, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotGenMIdCBToggled(bool)));
+ connect(g_enMIdCB, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotGenMIdCBToggled(bool)));
ggbL->addMultiCellWidget(g_enMIdCB, 4,4, 0,1);
h_ost=new KLineEdit(ggb);
h_ost->setEnabled(false);
@@ -1969,7 +1969,7 @@ KNConfig::PostNewsTechnicalWidget::PostNewsTechnicalWidget( PostNewsTechnical *d
ggbL->addWidget(h_ostL, 5,0);
ggbL->addWidget(h_ost, 5,1);
ggbL->setColStretch(1,1);
- connect(h_ost, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
+ connect(h_ost, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()));
// ==== X-Headers =============================================================
@@ -1980,20 +1980,20 @@ KNConfig::PostNewsTechnicalWidget::PostNewsTechnicalWidget( PostNewsTechnical *d
xgbL->addRowSpacing(0, fontMetrics().lineSpacing()-4);
l_box=new KNDialogListBox(false, xgb);
- connect(l_box, TQT_SIGNAL(selected(int)), TQT_SLOT(slotItemSelected(int)));
- connect(l_box, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged()));
+ connect(l_box, TQ_SIGNAL(selected(int)), TQ_SLOT(slotItemSelected(int)));
+ connect(l_box, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged()));
xgbL->addMultiCellWidget(l_box, 1,4, 0,0);
a_ddBtn=new TQPushButton(i18n("&Add..."), xgb);
- connect(a_ddBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddBtnClicked()));
+ connect(a_ddBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddBtnClicked()));
xgbL->addWidget(a_ddBtn, 1,1);
d_elBtn=new TQPushButton(i18n("Dele&te"), xgb);
- connect(d_elBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelBtnClicked()));
+ connect(d_elBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotDelBtnClicked()));
xgbL->addWidget(d_elBtn, 2,1);
e_ditBtn=new TQPushButton(i18n("modify something","&Edit..."), xgb);
- connect(e_ditBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditBtnClicked()));
+ connect(e_ditBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditBtnClicked()));
xgbL->addWidget(e_ditBtn, 3,1);
TQLabel *placeHolders = new TQLabel(i18n("<qt>Placeholders for replies: <b>%NAME</b>=sender's name, <b>%EMAIL</b>=sender's address</qt>"), xgb);
@@ -2001,7 +2001,7 @@ KNConfig::PostNewsTechnicalWidget::PostNewsTechnicalWidget( PostNewsTechnical *d
i_ncUaCB=new TQCheckBox(i18n("Do not add the \"&User-Agent\" identification header"), xgb);
xgbL->addMultiCellWidget(i_ncUaCB, 6,6, 0,1);
- connect(i_ncUaCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(i_ncUaCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
xgbL->setRowStretch(4,1);
xgbL->setColStretch(0,1);
@@ -2183,13 +2183,13 @@ KNConfig::PostNewsComposerWidget::PostNewsComposerWidget( PostNewsComposer *d, T
generalL->addWidget(w_ordWrapCB,1,0);
m_axLen=new KIntSpinBox(20, 200, 1, 20, 10, generalB);
generalL->addWidget(m_axLen,1,2);
- connect(w_ordWrapCB, TQT_SIGNAL(toggled(bool)), m_axLen, TQT_SLOT(setEnabled(bool)));
- connect(w_ordWrapCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
- connect(m_axLen, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+ connect(w_ordWrapCB, TQ_SIGNAL(toggled(bool)), m_axLen, TQ_SLOT(setEnabled(bool)));
+ connect(w_ordWrapCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+ connect(m_axLen, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
o_wnSigCB=new TQCheckBox(i18n("Appe&nd signature automatically"), generalB);
generalL->addMultiCellWidget(o_wnSigCB,2,2,0,1);
- connect(o_wnSigCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(o_wnSigCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
generalL->setColStretch(1,1);
@@ -2205,19 +2205,19 @@ KNConfig::PostNewsComposerWidget::PostNewsComposerWidget( PostNewsComposer *d, T
replyL->addMultiCellWidget(new TQLabel(i_ntro,i18n("&Introduction phrase:"), replyB),1,1,0,1);
replyL->addMultiCellWidget(i_ntro, 2,2,0,1);
replyL->addMultiCellWidget(new TQLabel(i18n("<qt>Placeholders: <b>%NAME</b>=sender's name, <b>%EMAIL</b>=sender's address,<br><b>%DATE</b>=date, <b>%MSID</b>=message-id, <b>%GROUP</b>=group name, <b>%L</b>=line break</qt>"), replyB),3,3,0,1);
- connect(i_ntro, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
+ connect(i_ntro, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()));
r_ewrapCB=new TQCheckBox(i18n("Rewrap quoted te&xt automatically"), replyB);
replyL->addMultiCellWidget(r_ewrapCB, 4,4,0,1);
- connect(r_ewrapCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(r_ewrapCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
a_uthSigCB=new TQCheckBox(i18n("Include the a&uthor's signature"), replyB);
replyL->addMultiCellWidget(a_uthSigCB, 5,5,0,1);
- connect(a_uthSigCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(a_uthSigCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
c_ursorOnTopCB=new TQCheckBox(i18n("Put the cursor &below the introduction phrase"), replyB);
replyL->addMultiCellWidget(c_ursorOnTopCB, 6,6,0,1);
- connect(c_ursorOnTopCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(c_ursorOnTopCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
replyL->setColStretch(1,1);
@@ -2233,15 +2233,15 @@ KNConfig::PostNewsComposerWidget::PostNewsComposerWidget( PostNewsComposer *d, T
editorL->addWidget(new TQLabel(e_ditor, i18n("Specify edi&tor:"), editorB),1,0);
editorL->addWidget(e_ditor,1,1);
TQPushButton *btn = new TQPushButton(i18n("Choo&se..."),editorB);
- connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotChooseEditor()));
- connect(e_ditor, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
+ connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotChooseEditor()));
+ connect(e_ditor, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()));
editorL->addWidget(btn,1,2);
editorL->addMultiCellWidget(new TQLabel(i18n("%f will be replaced with the filename to edit."), editorB),2,2,0,2);
e_xternCB=new TQCheckBox(i18n("Start exte&rnal editor automatically"), editorB);
editorL->addMultiCellWidget(e_xternCB, 3,3,0,2);
- connect(e_xternCB, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
+ connect(e_xternCB, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
editorL->setColStretch(1,1);
@@ -2310,7 +2310,7 @@ KNConfig::PostNewsSpellingWidget::PostNewsSpellingWidget( TQWidget *p, const cha
c_onf = new KSpellConfig( this, "spell", 0, false );
topL->addWidget(c_onf);
- connect(c_onf, TQT_SIGNAL(configChanged()), TQT_SLOT(changed()));
+ connect(c_onf, TQ_SIGNAL(configChanged()), TQ_SLOT(changed()));
topL->addStretch(1);
}
@@ -2335,7 +2335,7 @@ KNConfig::PrivacyWidget::PrivacyWidget(TQWidget *p, const char *n) :
TQBoxLayout *topLayout = new TQVBoxLayout(this, 5);
c_onf = new Kpgp::Config(this,"knode pgp config",false);
topLayout->addWidget(c_onf);
- connect(c_onf, TQT_SIGNAL(changed()), TQT_SLOT(changed()));
+ connect(c_onf, TQ_SIGNAL(changed()), TQ_SLOT(changed()));
topLayout->addStretch(1);
@@ -2367,12 +2367,12 @@ KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *paren
if (!mData->isGlobal()) {
mDefault = new TQCheckBox( i18n("&Use global cleanup configuration"), this );
- connect( mDefault, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDefaultToggled(bool)) );
+ connect( mDefault, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotDefaultToggled(bool)) );
top->addWidget( mDefault );
}
mExpGroup = new TQGroupBox( i18n("Newsgroup Cleanup Settings"), this );
- mExpGroup->setColumnLayout(0, Qt::Vertical );
+ mExpGroup->setColumnLayout(0, TQt::Vertical );
mExpGroup->layout()->setSpacing( KDialog::spacingHint() );
mExpGroup->layout()->setMargin( KDialog::marginHint() );
top->addWidget( mExpGroup );
@@ -2382,38 +2382,38 @@ KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *paren
mExpEnabled = new TQCheckBox( i18n("&Expire old articles automatically"), mExpGroup );
grid->addMultiCellWidget( mExpEnabled, 1, 1, 0, 1 );
- connect( mExpEnabled, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()) );
+ connect( mExpEnabled, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()) );
mExpDays = new KIntSpinBox( 0, 99999, 1, 0, 10, mExpGroup );
TQLabel *label = new TQLabel( mExpDays, i18n("&Purge groups every:"), mExpGroup );
grid->addWidget( label, 2, 0 );
grid->addWidget( mExpDays, 2, 1, TQt::AlignRight );
- connect( mExpDays, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()) );
- connect( mExpDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(expDaysChanged(int)) );
- connect( mExpEnabled, TQT_SIGNAL(toggled(bool)), label, TQT_SLOT(setEnabled(bool)) );
- connect( mExpEnabled, TQT_SIGNAL(toggled(bool)), mExpDays, TQT_SLOT(setEnabled(bool)) );
+ connect( mExpDays, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()) );
+ connect( mExpDays, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(expDaysChanged(int)) );
+ connect( mExpEnabled, TQ_SIGNAL(toggled(bool)), label, TQ_SLOT(setEnabled(bool)) );
+ connect( mExpEnabled, TQ_SIGNAL(toggled(bool)), mExpDays, TQ_SLOT(setEnabled(bool)) );
mExpReadDays = new KIntSpinBox( 0, 99999, 1, 0, 10, mExpGroup );
label = new TQLabel( mExpReadDays, i18n("&Keep read articles:"), mExpGroup );
grid->addWidget( label, 3, 0 );
grid->addWidget( mExpReadDays, 3, 1, TQt::AlignRight );
- connect( mExpReadDays, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()) );
- connect( mExpReadDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(expReadDaysChanged(int)) );
+ connect( mExpReadDays, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()) );
+ connect( mExpReadDays, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(expReadDaysChanged(int)) );
mExpUnreadDays = new KIntSpinBox( 0, 99999, 1, 0, 10, mExpGroup );
label = new TQLabel( mExpUnreadDays, i18n("Keep u&nread articles:"), mExpGroup );
grid->addWidget( label, 4, 0 );
grid->addWidget( mExpUnreadDays, 4, 1, TQt::AlignRight );
- connect( mExpUnreadDays, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()) );
- connect( mExpUnreadDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(expUnreadDaysChanged(int)) );
+ connect( mExpUnreadDays, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()) );
+ connect( mExpUnreadDays, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(expUnreadDaysChanged(int)) );
mExpUnavailable = new TQCheckBox( i18n("&Remove articles that are not available on the server"), mExpGroup );
grid->addMultiCellWidget( mExpUnavailable, 5, 5, 0, 1 );
- connect( mExpUnavailable, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()) );
+ connect( mExpUnavailable, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()) );
mPreserveThreads = new TQCheckBox( i18n("Preser&ve threads"), mExpGroup );
grid->addMultiCellWidget( mPreserveThreads, 6, 6, 0, 1 );
- connect( mPreserveThreads, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()) );
+ connect( mPreserveThreads, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()) );
grid->setColStretch(1,1);
}
@@ -2476,12 +2476,12 @@ KNConfig::CleanupWidget::CleanupWidget( TQWidget *p, const char *n ) :
mGroupCleanup = new GroupCleanupWidget( d_ata, this );
topL->addWidget( mGroupCleanup );
- connect( mGroupCleanup, TQT_SIGNAL(changed()), TQT_SLOT(changed()) );
+ connect( mGroupCleanup, TQ_SIGNAL(changed()), TQ_SLOT(changed()) );
// === folders =========================================================
TQGroupBox *foldersB=new TQGroupBox(i18n("Folders"), this);
- foldersB->setColumnLayout(0, Qt::Vertical );
+ foldersB->setColumnLayout(0, TQt::Vertical );
foldersB->layout()->setSpacing( KDialog::spacingHint() );
foldersB->layout()->setMargin( KDialog::marginHint() );
@@ -2491,15 +2491,15 @@ KNConfig::CleanupWidget::CleanupWidget( TQWidget *p, const char *n ) :
foldersL->setRowSpacing( 0, KDialog::spacingHint() );
f_olderCB=new TQCheckBox(i18n("Co&mpact folders automatically"), foldersB);
- connect(f_olderCB, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotFolderCBtoggled(bool)));
+ connect(f_olderCB, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotFolderCBtoggled(bool)));
foldersL->addMultiCellWidget(f_olderCB,1,1,0,1);
f_olderDays=new KIntSpinBox(0, 99999, 1, 0, 10, foldersB);
f_olderDaysL=new TQLabel(f_olderDays,i18n("P&urge folders every:"), foldersB);
foldersL->addWidget(f_olderDaysL,2,0);
foldersL->addWidget(f_olderDays,2,1,TQt::AlignRight);
- connect(f_olderDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
- connect(f_olderDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotFolderDaysChanged(int)));
+ connect(f_olderDays, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+ connect(f_olderDays, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotFolderDaysChanged(int)));
foldersL->setColStretch(1,1);
diff --git a/knode/knconfigwidgets.h b/knode/knconfigwidgets.h
index 1c9fbeab..85c2ecd7 100644
--- a/knode/knconfigwidgets.h
+++ b/knode/knconfigwidgets.h
@@ -65,7 +65,7 @@ namespace KNConfig {
class KDE_EXPORT IdentityWidget : public TDECModule {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -107,7 +107,7 @@ class KDE_EXPORT IdentityWidget : public TDECModule {
class KDE_EXPORT NntpAccountListWidget : public TDECModule {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -155,7 +155,7 @@ class KDE_EXPORT NntpAccountListWidget : public TDECModule {
class KDE_EXPORT NntpAccountConfDialog : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -197,7 +197,7 @@ class KDE_EXPORT NntpAccountConfDialog : public KDialogBase {
class KDE_EXPORT SmtpAccountWidget : public SmtpAccountWidgetBase {
-Q_OBJECT
+TQ_OBJECT
public:
@@ -219,7 +219,7 @@ Q_OBJECT
class KDE_EXPORT AppearanceWidget : public TDECModule {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -348,7 +348,7 @@ class KDE_EXPORT ReadNewsNavigationWidget : public TDECModule {
class KDE_EXPORT ReadNewsViewerWidget : public TDECModule {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -375,7 +375,7 @@ class KDE_EXPORT ReadNewsViewerWidget : public TDECModule {
class KDE_EXPORT DisplayedHeadersWidget : public TDECModule {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -422,7 +422,7 @@ class KDE_EXPORT DisplayedHeadersWidget : public TDECModule {
class KDE_EXPORT DisplayedHeaderConfDialog : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -447,7 +447,7 @@ class KDE_EXPORT DisplayedHeaderConfDialog : public KDialogBase {
class KDE_EXPORT ScoringWidget : public TDECModule {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -468,7 +468,7 @@ class KDE_EXPORT ScoringWidget : public TDECModule {
class KDE_EXPORT FilterListWidget : public TDECModule {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -534,7 +534,7 @@ class KDE_EXPORT FilterListWidget : public TDECModule {
class KDE_EXPORT PostNewsTechnicalWidget : public TDECModule {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -588,7 +588,7 @@ class KDE_EXPORT XHeaderConfDialog : public KDialogBase {
class KDE_EXPORT PostNewsComposerWidget : public TDECModule {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -634,7 +634,7 @@ class KDE_EXPORT PostNewsSpellingWidget : public TDECModule {
class KDE_EXPORT PrivacyWidget : public TDECModule {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -654,7 +654,7 @@ class KDE_EXPORT PrivacyWidget : public TDECModule {
/** Configuration widget for group expireration */
class KDE_EXPORT GroupCleanupWidget : public TQWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -683,7 +683,7 @@ class KDE_EXPORT GroupCleanupWidget : public TQWidget {
/** Global cleanup configuration widget */
class KDE_EXPORT CleanupWidget : public TDECModule {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -716,7 +716,7 @@ class KDE_EXPORT CleanupWidget : public TDECModule {
/*class CacheWidget : public TDECModule {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/knconvert.cpp b/knode/knconvert.cpp
index 20a63ffa..c8325f64 100644
--- a/knode/knconvert.cpp
+++ b/knode/knconvert.cpp
@@ -61,8 +61,8 @@ KNConvert::KNConvert(const TQString &version)
c_ancelBtn=new KPushButton(KStdGuiItem::cancel(), this);
btnL->addWidget(c_ancelBtn);
- connect(s_tartBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStart()));
- connect(c_ancelBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()));
+ connect(s_tartBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStart()));
+ connect(c_ancelBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()));
w_1=new TQWidget(s_tack);
s_tack->addWidget(w_1, 1);
@@ -78,7 +78,7 @@ will be created before the conversion starts.").arg(KNODE_VERSION), w_1);
c_reateBkup=new TQCheckBox(i18n("Create backup of old data"), w_1);
w1L->addMultiCellWidget(c_reateBkup, 2,2, 0,2);
- connect(c_reateBkup, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotCreateBkupToggled(bool)));
+ connect(c_reateBkup, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotCreateBkupToggled(bool)));
b_ackupPathLabel=new TQLabel(i18n("Save backup in:"), w_1);
w1L->addWidget(b_ackupPathLabel, 3,0);
@@ -87,7 +87,7 @@ will be created before the conversion starts.").arg(KNODE_VERSION), w_1);
w1L->addWidget(b_ackupPath, 3,1);
b_rowseBtn= new TQPushButton(i18n("Browse..."), w_1);
- connect(b_rowseBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBrowse()));
+ connect(b_rowseBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBrowse()));
w1L->addWidget(b_rowseBtn, 3,2);
w1L->setColStretch(1,1);
w1L->addRowSpacing(1,15);
@@ -177,7 +177,7 @@ void KNConvert::slotStart()
*t_ar << "tar";
*t_ar << "-cz" << dataDir
<< "-f" << b_ackupPath->text();
- connect(t_ar, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotTarExited(TDEProcess*)));
+ connect(t_ar, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotTarExited(TDEProcess*)));
if(!t_ar->start()) {
delete t_ar;
t_ar = 0;
diff --git a/knode/knconvert.h b/knode/knconvert.h
index 3f87a25e..56d2f13b 100644
--- a/knode/knconvert.h
+++ b/knode/knconvert.h
@@ -34,7 +34,7 @@ class TDEProcess;
class KDE_EXPORT KNConvert : public TQDialog {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/knfilterconfigwidget.h b/knode/knfilterconfigwidget.h
index 680231b5..634a679a 100644
--- a/knode/knfilterconfigwidget.h
+++ b/knode/knfilterconfigwidget.h
@@ -26,7 +26,7 @@ class KNRangeFilterWidget;
class KNFilterConfigWidget : public TQTabWidget {
- Q_OBJECT
+ TQ_OBJECT
friend class KNFilterDialog;
diff --git a/knode/knfilterdialog.cpp b/knode/knfilterdialog.cpp
index 6a0e972a..b8471e6b 100644
--- a/knode/knfilterdialog.cpp
+++ b/knode/knfilterdialog.cpp
@@ -78,7 +78,7 @@ KNFilterDialog::KNFilterDialog(KNArticleFilter *f, TQWidget *parent, const char
KNHelper::restoreWindowSize("filterDLG", this, sizeHint());
setHelp("anc-using-filters");
- connect( fname, TQT_SIGNAL( textChanged ( const TQString & )), this, TQT_SLOT( slotTextChanged( const TQString & )));
+ connect( fname, TQ_SIGNAL( textChanged ( const TQString & )), this, TQ_SLOT( slotTextChanged( const TQString & )));
slotTextChanged( fname->text() );
}
diff --git a/knode/knfilterdialog.h b/knode/knfilterdialog.h
index b17eaed6..96935639 100644
--- a/knode/knfilterdialog.h
+++ b/knode/knfilterdialog.h
@@ -28,7 +28,7 @@ class TQCheckBox;
class KNFilterDialog : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
friend class KNFilterManager;
diff --git a/knode/knfiltermanager.cpp b/knode/knfiltermanager.cpp
index eee045c2..a80853ea 100644
--- a/knode/knfiltermanager.cpp
+++ b/knode/knfiltermanager.cpp
@@ -34,7 +34,7 @@ KNFilterSelectAction::KNFilterSelectAction( const TQString& text, const TQString
: TDEActionMenu(text,pix,parent,name), currentItem(-42)
{
popupMenu()->setCheckable(true);
- connect(popupMenu(),TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotMenuActivated(int)));
+ connect(popupMenu(),TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotMenuActivated(int)));
setDelayed(false);
}
@@ -383,10 +383,10 @@ void KNFilterManager::setMenuAction(KNFilterSelectAction *a, TDEAction *keybA)
{
if(a) {
a_ctFilter = a;
- connect(a_ctFilter, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuActivated(int)));
+ connect(a_ctFilter, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuActivated(int)));
}
if(keybA)
- connect(keybA, TQT_SIGNAL(activated()), this, TQT_SLOT(slotShowFilterChooser()));
+ connect(keybA, TQ_SIGNAL(activated()), this, TQ_SLOT(slotShowFilterChooser()));
updateMenu();
}
diff --git a/knode/knfiltermanager.h b/knode/knfiltermanager.h
index fec9a9f7..b6df5280 100644
--- a/knode/knfiltermanager.h
+++ b/knode/knfiltermanager.h
@@ -30,7 +30,7 @@ class KNFilterDialog;
class KNFilterSelectAction : public TDEActionMenu
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -53,7 +53,7 @@ class KNFilterSelectAction : public TDEActionMenu
class KNFilterManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/knfoldermanager.h b/knode/knfoldermanager.h
index 9e817c23..daf3e0ad 100644
--- a/knode/knfoldermanager.h
+++ b/knode/knfoldermanager.h
@@ -25,7 +25,7 @@ class KNCleanUp;
class KNFolderManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/kngroupbrowser.cpp b/knode/kngroupbrowser.cpp
index f2379f51..865dbd20 100644
--- a/knode/kngroupbrowser.cpp
+++ b/knode/kngroupbrowser.cpp
@@ -41,10 +41,8 @@ KNGroupBrowser::KNGroupBrowser(TQWidget *parent, const TQString &caption, KNNntp
{
refilterTimer = new TQTimer();
- allList=new TQSortedList<KNGroupInfo>;
- allList->setAutoDelete(true);
- matchList=new TQSortedList<KNGroupInfo>;
- matchList->setAutoDelete(false);
+ allList = new std::list<KNGroupInfo*>();
+ matchList = new std::list<KNGroupInfo*>();
//create Widgets
page=new TQWidget(this);
@@ -89,8 +87,8 @@ KNGroupBrowser::KNGroupBrowser(TQWidget *parent, const TQString &caption, KNNntp
groupView->addColumn(i18n("Description"));
groupView->setTreeStepSize(15);
- connect(groupView, TQT_SIGNAL(doubleClicked(TQListViewItem*)),
- this, TQT_SLOT(slotItemDoubleClicked(TQListViewItem*)));
+ connect(groupView, TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+ this, TQ_SLOT(slotItemDoubleClicked(TQListViewItem*)));
//layout
TQGridLayout *topL=new TQGridLayout(page,3,1,0,5);
@@ -121,22 +119,22 @@ KNGroupBrowser::KNGroupBrowser(TQWidget *parent, const TQString &caption, KNNntp
arrL->addWidget(arrowBtn2, AlignCenter);
//connect
- connect(filterEdit, TQT_SIGNAL(textChanged(const TQString&)),
- TQT_SLOT(slotFilterTextChanged(const TQString&)));
- connect(groupView, TQT_SIGNAL(expanded(TQListViewItem*)),
- TQT_SLOT(slotItemExpand(TQListViewItem*)));
+ connect(filterEdit, TQ_SIGNAL(textChanged(const TQString&)),
+ TQ_SLOT(slotFilterTextChanged(const TQString&)));
+ connect(groupView, TQ_SIGNAL(expanded(TQListViewItem*)),
+ TQ_SLOT(slotItemExpand(TQListViewItem*)));
- connect(refilterTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotRefilter()));
- connect(noTreeCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotTreeCBToggled()));
- connect(subCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotSubCBToggled()));
- connect(newCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewCBToggled()));
+ connect(refilterTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotRefilter()));
+ connect(noTreeCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotTreeCBToggled()));
+ connect(subCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotSubCBToggled()));
+ connect(newCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotNewCBToggled()));
enableButton(User1,false);
enableButton(User2,false);
filterEdit->setFocus();
- TQTimer::singleShot(2, this, TQT_SLOT(slotLoadList()));
+ TQTimer::singleShot(2, this, TQ_SLOT(slotLoadList()));
}
@@ -148,7 +146,16 @@ KNGroupBrowser::~KNGroupBrowser()
knGlobals.netAccess()->stopJobsNntp(KNJobData::JTCheckNewGroups);
delete matchList;
+
+ for (KNGroupInfo *g : *allList)
+ {
+ if (g)
+ {
+ delete g;
+ }
+ }
delete allList;
+
delete refilterTimer;
}
@@ -159,6 +166,13 @@ void KNGroupBrowser::slotReceiveList(KNGroupListData* d)
enableButton(User2,true);
if (d) { // d==0 if something has gone wrong...
+ for (KNGroupInfo *g : *allList)
+ {
+ if (g)
+ {
+ delete g;
+ }
+ }
delete allList;
allList = d->extractList();
incrementalFilter=false;
@@ -206,8 +220,8 @@ void KNGroupBrowser::createListItems(TQListViewItem *parent)
}
}
- for(KNGroupInfo *gn=matchList->first(); gn; gn=matchList->next()) {
-
+ for (KNGroupInfo *gn : *matchList)
+ {
if(!prefix.isEmpty() && !gn->name.startsWith(prefix))
if(!compare.isNull())
break;
@@ -287,7 +301,7 @@ void KNGroupBrowser::slotItemExpand(TQListViewItem *it)
{
groupView->ensureVisible(groupView->contentsX(), y+h/2, 0, h/2);
delayedCenter = y+h/2;
- TQTimer::singleShot(300, this, TQT_SLOT(slotCenterDelayed()));
+ TQTimer::singleShot(300, this, TQ_SLOT(slotCenterDelayed()));
}
}
@@ -321,14 +335,14 @@ void KNGroupBrowser::slotFilter(const TQString &txt)
bool doIncrementalUpdate = (!isRegexp && incrementalFilter && (filtertxt.left(lastFilter.length())==lastFilter));
if (doIncrementalUpdate) {
- TQSortedList<KNGroupInfo> *tempList = new TQSortedList<KNGroupInfo>();
- tempList->setAutoDelete(false);
+ std::list<KNGroupInfo*> *tempList = new std::list<KNGroupInfo*>();
- for(KNGroupInfo *g=matchList->first(); g; g=matchList->next()) {
+ for (KNGroupInfo *g : *matchList)
+ {
if ((notCheckSub||g->subscribed)&&
(notCheckNew||g->newGroup)&&
(notCheckStr||(g->name.find(filtertxt)!=-1)))
- tempList->append(g);
+ tempList->push_back(g);
}
delete matchList;
@@ -336,18 +350,20 @@ void KNGroupBrowser::slotFilter(const TQString &txt)
} else {
matchList->clear();
- for(KNGroupInfo *g=allList->first(); g; g=allList->next()) {
+ for (KNGroupInfo *g : *allList)
+ {
if ((notCheckSub||g->subscribed)&&
(notCheckNew||g->newGroup)&&
(notCheckStr||(isRegexp? (reg.search(g->name,0) != -1):(g->name.find(filtertxt)!=-1))))
- matchList->append(g);
+ matchList->push_back(g);
}
}
groupView->clear();
- if((matchList->count() < MIN_FOR_TREE) || noTreeCB->isChecked()) {
- for(KNGroupInfo *g=matchList->first(); g; g=matchList->next()) {
+ if((matchList->size() < MIN_FOR_TREE) || noTreeCB->isChecked()) {
+ for (KNGroupInfo *g : *matchList)
+ {
cit=new CheckItem(groupView, *g, this);
updateItemState(cit);
}
@@ -358,7 +374,7 @@ void KNGroupBrowser::slotFilter(const TQString &txt)
lastFilter = filtertxt;
incrementalFilter = !isRegexp;
- leftLabel->setText(i18n("Groups on %1: (%2 displayed)").arg(a_ccount->name()).arg(matchList->count()));
+ leftLabel->setText(i18n("Groups on %1: (%2 displayed)").arg(a_ccount->name()).arg(matchList->size()));
arrowBtn1->setEnabled(false);
arrowBtn2->setEnabled(false);
diff --git a/knode/kngroupbrowser.h b/knode/kngroupbrowser.h
index a3df9a76..7470486e 100644
--- a/knode/kngroupbrowser.h
+++ b/knode/kngroupbrowser.h
@@ -34,7 +34,7 @@ class KNNntpAccount;
class KNGroupBrowser : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -98,7 +98,7 @@ class KNGroupBrowser : public KDialogBase {
bool incrementalFilter;
KNNntpAccount *a_ccount;
- TQSortedList<KNGroupInfo> *allList, *matchList;
+ std::list<KNGroupInfo*> *allList, *matchList;
protected slots:
void slotLoadList();
diff --git a/knode/kngroupdialog.cpp b/knode/kngroupdialog.cpp
index 8c9a1746..0fe1e7db 100644
--- a/knode/kngroupdialog.cpp
+++ b/knode/kngroupdialog.cpp
@@ -51,17 +51,17 @@ KNGroupDialog::KNGroupDialog(TQWidget *parent, KNNntpAccount *a) :
dir1=right;
dir2=left;
- connect(groupView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
- this, TQT_SLOT(slotItemSelected(TQListViewItem*)));
- connect(groupView, TQT_SIGNAL(selectionChanged()),
- this, TQT_SLOT(slotSelectionChanged()));
- connect(subView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
- this, TQT_SLOT(slotItemSelected(TQListViewItem*)));
- connect(unsubView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
- this, TQT_SLOT(slotItemSelected(TQListViewItem*)));
-
- connect(arrowBtn1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotArrowBtn1()));
- connect(arrowBtn2, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotArrowBtn2()));
+ connect(groupView, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+ this, TQ_SLOT(slotItemSelected(TQListViewItem*)));
+ connect(groupView, TQ_SIGNAL(selectionChanged()),
+ this, TQ_SLOT(slotSelectionChanged()));
+ connect(subView, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+ this, TQ_SLOT(slotItemSelected(TQListViewItem*)));
+ connect(unsubView, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+ this, TQ_SLOT(slotItemSelected(TQListViewItem*)));
+
+ connect(arrowBtn1, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotArrowBtn1()));
+ connect(arrowBtn2, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotArrowBtn2()));
KNHelper::restoreWindowSize("groupDlg", this, TQSize(662,393)); // optimized for 800x600
@@ -121,18 +121,17 @@ void KNGroupDialog::updateItemState(CheckItem *it)
-void KNGroupDialog::toSubscribe(TQSortedList<KNGroupInfo> *l)
+void KNGroupDialog::toSubscribe(std::list<KNGroupInfo*> *l)
{
KNGroupInfo *info;
l->clear();
- l->setAutoDelete(true);
bool moderated=false;
TQListViewItemIterator it(subView);
for(; it.current(); ++it) {
info = new KNGroupInfo();
*info = ((static_cast<GroupItem*>(it.current()))->info);
- l->append(info);
+ l->push_back(info);
if (info->status==KNGroup::moderated)
moderated=true;
}
@@ -177,17 +176,17 @@ void KNGroupDialog::setButtonDirection(arrowButton b, arrowDirection d)
void KNGroupDialog::slotItemSelected(TQListViewItem *it)
{
- const TQObject *s=TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()));
+ const TQObject *s=sender();
- if(TQT_BASE_OBJECT_CONST(s)==TQT_BASE_OBJECT(subView)) {
+ if(s==subView) {
unsubView->clearSelection();
groupView->clearSelection();
arrowBtn2->setEnabled(false);
arrowBtn1->setEnabled(true);
setButtonDirection(btn1, left);
}
- else if(TQT_BASE_OBJECT_CONST(s)==TQT_BASE_OBJECT(unsubView)) {
+ else if(s==unsubView) {
subView->clearSelection();
groupView->clearSelection();
arrowBtn1->setEnabled(false);
@@ -294,7 +293,7 @@ void KNGroupDialog::slotUser2()
TQLabel *l = new TQLabel(TDEGlobal::locale()->formatDate(lastDate, false),btnGrp);
topL->addWidget(l, 1, 1, TQt::AlignLeft);
- connect(takeLast, TQT_SIGNAL(toggled(bool)), l, TQT_SLOT(setEnabled(bool)));
+ connect(takeLast, TQ_SIGNAL(toggled(bool)), l, TQ_SLOT(setEnabled(bool)));
TQRadioButton *takeCustom = new TQRadioButton( i18n("Created since this date:"), btnGrp );
topL->addMultiCellWidget(takeCustom, 2, 2, 0, 1);
@@ -303,7 +302,7 @@ void KNGroupDialog::slotUser2()
dateSel->setMinimumSize(dateSel->sizeHint());
topL->addWidget(dateSel, 3, 1, TQt::AlignLeft);
- connect(takeCustom, TQT_SIGNAL(toggled(bool)), dateSel, TQT_SLOT(setEnabled(bool)));
+ connect(takeCustom, TQ_SIGNAL(toggled(bool)), dateSel, TQ_SLOT(setEnabled(bool)));
takeLast->setChecked(true);
dateSel->setEnabled(false);
diff --git a/knode/kngroupdialog.h b/knode/kngroupdialog.h
index f9b5a523..55398b70 100644
--- a/knode/kngroupdialog.h
+++ b/knode/kngroupdialog.h
@@ -22,14 +22,14 @@
class KNGroupDialog : public KNGroupBrowser {
- Q_OBJECT
+ TQ_OBJECT
public:
KNGroupDialog(TQWidget *parent, KNNntpAccount *a);
~KNGroupDialog();
- void toSubscribe(TQSortedList<KNGroupInfo> *l);
+ void toSubscribe(std::list<KNGroupInfo*> *l);
void toUnsubscribe(TQStringList *l);
protected:
diff --git a/knode/kngroupmanager.cpp b/knode/kngroupmanager.cpp
index b429bd6c..e4c7aed6 100644
--- a/knode/kngroupmanager.cpp
+++ b/knode/kngroupmanager.cpp
@@ -12,6 +12,7 @@
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US
*/
+#include <algorithm>
#include <stdio.h>
#include <stdlib.h>
#include <tqdir.h>
@@ -74,6 +75,10 @@ bool KNGroupInfo::operator< (const KNGroupInfo &gi2)
return (name < gi2.name);
}
+bool KNGroupInfo::PtrCompFn(KNGroupInfo *a, KNGroupInfo *b)
+{
+ return *a < *b;
+}
//===============================================================================
@@ -81,15 +86,24 @@ bool KNGroupInfo::operator< (const KNGroupInfo &gi2)
KNGroupListData::KNGroupListData()
: codecForDescriptions(0)
{
- groups = new TQSortedList<KNGroupInfo>;
- groups->setAutoDelete(true);
+ groups = new std::list<KNGroupInfo*>();
}
KNGroupListData::~KNGroupListData()
{
- delete groups;
+ if (groups)
+ {
+ for (KNGroupInfo *g : *groups)
+ {
+ if (g)
+ {
+ delete g;
+ }
+ }
+ delete groups;
+ }
}
@@ -145,7 +159,7 @@ bool KNGroupListData::readIn(KNProtocolClient *client)
} else
sub = false;
- groups->append(new KNGroupInfo(name,description,false,sub,status));
+ groups->push_back(new KNGroupInfo(name,description,false,sub,status));
if (timer.elapsed() > 200) { // don't flicker
timer.restart();
@@ -169,7 +183,8 @@ bool KNGroupListData::writeOut()
TQCString temp;
if(f.open(IO_WriteOnly)) {
- for (KNGroupInfo *i=groups->first(); i; i=groups->next()) {
+ for (KNGroupInfo *i : *groups)
+ {
temp = i->name.utf8();
switch (i->status) {
case KNGroup::unknown: temp += " u ";
@@ -196,27 +211,33 @@ bool KNGroupListData::writeOut()
// merge in new groups, we want to preserve the "subscribed"-flag
// of the loaded groups and the "new"-flag of the new groups.
-void KNGroupListData::merge(TQSortedList<KNGroupInfo>* newGroups)
+void KNGroupListData::merge(std::list<KNGroupInfo*> *newGroups)
{
bool subscribed;
- for (KNGroupInfo *i=newGroups->first(); i; i=newGroups->next()) {
- if (groups->find(i)>=0) {
- subscribed = groups->current()->subscribed;
- groups->remove(); // avoid duplicates
+ for (KNGroupInfo *i : *newGroups)
+ {
+ std::list<KNGroupInfo*>::iterator ngIt = std::find(groups->begin(), groups->end(), i);
+
+ if (ngIt != std::end(*groups))
+ {
+ KNGroupInfo *newGr = *ngIt;
+ subscribed = newGr->subscribed;
+ groups->erase(ngIt); // avoid duplicates
+ delete newGr;
} else
subscribed = false;
- groups->append(new KNGroupInfo(i->name,i->description,true,subscribed,i->status));
+ groups->push_back(new KNGroupInfo(i->name,i->description,true,subscribed,i->status));
}
- groups->sort();
+ groups->sort(KNGroupInfo::PtrCompFn);
}
-TQSortedList<KNGroupInfo>* KNGroupListData::extractList()
+std::list<KNGroupInfo*>* KNGroupListData::extractList()
{
- TQSortedList<KNGroupInfo>* temp = groups;
- groups = 0;
+ std::list<KNGroupInfo*>* temp = groups;
+ groups = nullptr;
return temp;
}
@@ -397,10 +418,10 @@ void KNGroupManager::showGroupDialog(KNNntpAccount *a, TQWidget *parent)
{
KNGroupDialog* gDialog=new KNGroupDialog((parent!=0)? parent:knGlobals.topWidget, a);
- connect(gDialog, TQT_SIGNAL(loadList(KNNntpAccount*)), this, TQT_SLOT(slotLoadGroupList(KNNntpAccount*)));
- connect(gDialog, TQT_SIGNAL(fetchList(KNNntpAccount*)), this, TQT_SLOT(slotFetchGroupList(KNNntpAccount*)));
- connect(gDialog, TQT_SIGNAL(checkNew(KNNntpAccount*,TQDate)), this, TQT_SLOT(slotCheckForNewGroups(KNNntpAccount*,TQDate)));
- connect(this, TQT_SIGNAL(newListReady(KNGroupListData*)), gDialog, TQT_SLOT(slotReceiveList(KNGroupListData*)));
+ connect(gDialog, TQ_SIGNAL(loadList(KNNntpAccount*)), this, TQ_SLOT(slotLoadGroupList(KNNntpAccount*)));
+ connect(gDialog, TQ_SIGNAL(fetchList(KNNntpAccount*)), this, TQ_SLOT(slotFetchGroupList(KNNntpAccount*)));
+ connect(gDialog, TQ_SIGNAL(checkNew(KNNntpAccount*,TQDate)), this, TQ_SLOT(slotCheckForNewGroups(KNNntpAccount*,TQDate)));
+ connect(this, TQ_SIGNAL(newListReady(KNGroupListData*)), gDialog, TQ_SLOT(slotReceiveList(KNGroupListData*)));
if(gDialog->exec()) {
KNGroup *g=0;
@@ -417,10 +438,12 @@ void KNGroupManager::showGroupDialog(KNNntpAccount *a, TQWidget *parent)
}
}
- TQSortedList<KNGroupInfo> lst2;
+ std::list<KNGroupInfo*> lst2;
gDialog->toSubscribe(&lst2);
- for(KNGroupInfo *var=lst2.first(); var; var=lst2.next()) {
+ for (KNGroupInfo *var : lst2)
+ {
subscribeGroup(var, a);
+ delete var;
}
}
@@ -593,12 +616,14 @@ void KNGroupManager::processJob(KNJobData *j)
// update the descriptions of the subscribed groups
for ( TQValueList<KNGroup*>::Iterator it = mGroupList.begin(); it != mGroupList.end(); ++it ) {
if ( (*it)->account() == j->account() ) {
- for ( KNGroupInfo* inf = d->groups->first(); inf; inf = d->groups->next() )
+ for (KNGroupInfo *inf : *d->groups)
+ {
if ( inf->name == (*it)->groupname() ) {
(*it)->setDescription( inf->description );
(*it)->setStatus( inf->status );
break;
}
+ }
}
}
}
diff --git a/knode/kngroupmanager.h b/knode/kngroupmanager.h
index e3573830..06aa0b11 100644
--- a/knode/kngroupmanager.h
+++ b/knode/kngroupmanager.h
@@ -15,8 +15,9 @@
#ifndef KNGROUPMANAGER_H
#define KNGROUPMANAGER_H
+#include <list>
+
#include <tqobject.h>
-#include <tqsortedlist.h>
#include "knjobdata.h"
#include "kngroup.h"
@@ -48,6 +49,8 @@ class KNGroupInfo {
bool operator== (const KNGroupInfo &gi2);
bool operator< (const KNGroupInfo &gi2);
+
+ static bool PtrCompFn(KNGroupInfo *a, KNGroupInfo *b);
};
@@ -59,13 +62,13 @@ class KNGroupListData : public KNJobItem {
bool readIn(KNProtocolClient *client=0);
bool writeOut();
- void merge(TQSortedList<KNGroupInfo>* newGroups);
+ void merge(std::list<KNGroupInfo*> *newGroups);
- TQSortedList<KNGroupInfo>* extractList();
+ std::list<KNGroupInfo*>* extractList();
TQStringList subscribed;
TQString path;
- TQSortedList<KNGroupInfo> *groups;
+ std::list<KNGroupInfo*> *groups;
TQDate fetchSince;
bool getDescriptions;
TQTextCodec *codecForDescriptions;
@@ -77,7 +80,7 @@ class KNGroupListData : public KNJobItem {
class KNGroupManager : public TQObject , public KNJobConsumer {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/kngrouppropdlg.cpp b/knode/kngrouppropdlg.cpp
index a6a90578..5a7f5200 100644
--- a/knode/kngrouppropdlg.cpp
+++ b/knode/kngrouppropdlg.cpp
@@ -62,7 +62,7 @@ KNGroupPropDlg::KNGroupPropDlg(KNGroup *group, TQWidget *parent, const char *nam
c_harset->insertStringList(knGlobals.configManager()->postNewsTechnical()->composerCharsets());
c_harset->setCurrentItem(knGlobals.configManager()->postNewsTechnical()->indexForCharset(g_rp->defaultCharset()));
c_harset->setEnabled(g_rp->useCharset());
- connect(u_seCharset, TQT_SIGNAL(toggled(bool)), c_harset, TQT_SLOT(setEnabled(bool)));
+ connect(u_seCharset, TQ_SIGNAL(toggled(bool)), c_harset, TQ_SLOT(setEnabled(bool)));
grpL->addWidget(c_harset, 2,2);
grpL->setColStretch(1,1);
diff --git a/knode/kngroupselectdialog.cpp b/knode/kngroupselectdialog.cpp
index 3d137b8a..10374d6d 100644
--- a/knode/kngroupselectdialog.cpp
+++ b/knode/kngroupselectdialog.cpp
@@ -44,14 +44,14 @@ KNGroupSelectDialog::KNGroupSelectDialog(TQWidget *parent, KNNntpAccount *a, con
new GroupItem(selView, info);
}
- connect(selView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
- this, TQT_SLOT(slotItemSelected(TQListViewItem*)));
- connect(groupView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
- this, TQT_SLOT(slotItemSelected(TQListViewItem*)));
- connect(groupView, TQT_SIGNAL(selectionChanged()),
- this, TQT_SLOT(slotSelectionChanged()));
- connect(arrowBtn1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotArrowBtn1()));
- connect(arrowBtn2, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotArrowBtn2()));
+ connect(selView, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+ this, TQ_SLOT(slotItemSelected(TQListViewItem*)));
+ connect(groupView, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+ this, TQ_SLOT(slotItemSelected(TQListViewItem*)));
+ connect(groupView, TQ_SIGNAL(selectionChanged()),
+ this, TQ_SLOT(slotSelectionChanged()));
+ connect(arrowBtn1, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotArrowBtn1()));
+ connect(arrowBtn2, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotArrowBtn2()));
KNHelper::restoreWindowSize("groupSelDlg", this, TQSize(659,364)); // optimized for 800x600
}
@@ -114,9 +114,9 @@ TQString KNGroupSelectDialog::selectedGroups()const
void KNGroupSelectDialog::slotItemSelected(TQListViewItem *it)
{
- const TQObject *s=TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()));
+ const TQObject *s=sender();
- if(TQT_BASE_OBJECT_CONST(s)==TQT_BASE_OBJECT(groupView)) {
+ if(s==groupView) {
selView->clearSelection();
arrowBtn2->setEnabled(false);
if(it)
diff --git a/knode/kngroupselectdialog.h b/knode/kngroupselectdialog.h
index 177765bf..ce00191c 100644
--- a/knode/kngroupselectdialog.h
+++ b/knode/kngroupselectdialog.h
@@ -22,7 +22,7 @@
class KNGroupSelectDialog : public KNGroupBrowser {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/knjobdata.cpp b/knode/knjobdata.cpp
index 7d4ac912..74d98a85 100644
--- a/knode/knjobdata.cpp
+++ b/knode/knjobdata.cpp
@@ -105,10 +105,10 @@ void KNJobData::setJob( TDEIO::Job *job )
{
mJob = job;
if ( job ) {
- connect( job, TQT_SIGNAL( percent(TDEIO::Job*, unsigned long) ),
- TQT_SLOT( slotJobPercent(TDEIO::Job*, unsigned long) ) );
- connect( job, TQT_SIGNAL( infoMessage(TDEIO::Job*, const TQString&) ),
- TQT_SLOT( slotJobInfoMessage(TDEIO::Job*, const TQString&) ) );
+ connect( job, TQ_SIGNAL( percent(TDEIO::Job*, unsigned long) ),
+ TQ_SLOT( slotJobPercent(TDEIO::Job*, unsigned long) ) );
+ connect( job, TQ_SIGNAL( infoMessage(TDEIO::Job*, const TQString&) ),
+ TQ_SLOT( slotJobInfoMessage(TDEIO::Job*, const TQString&) ) );
}
}
diff --git a/knode/knjobdata.h b/knode/knjobdata.h
index 70a78872..57106744 100644
--- a/knode/knjobdata.h
+++ b/knode/knjobdata.h
@@ -70,7 +70,7 @@ class KNJobItem {
class KNJobData : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp
index 948ce37e..35f976c4 100644
--- a/knode/knmainwidget.cpp
+++ b/knode/knmainwidget.cpp
@@ -106,9 +106,9 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa
//setView(a_rtDock);
setMainDockWidget(a_rtDock);
- connect(a_rtDock, TQT_SIGNAL(iMBeingClosed()), TQT_SLOT(slotArticleDockHidden()));
- connect(a_rtDock, TQT_SIGNAL(hasUndocked()), TQT_SLOT(slotArticleDockHidden()));
- connect( mArticleViewer, TQT_SIGNAL(focusChangeRequest(TQWidget*)), TQT_SLOT(slotDockWidgetFocusChangeRequest(TQWidget*)) );
+ connect(a_rtDock, TQ_SIGNAL(iMBeingClosed()), TQ_SLOT(slotArticleDockHidden()));
+ connect(a_rtDock, TQ_SIGNAL(hasUndocked()), TQ_SLOT(slotArticleDockHidden()));
+ connect( mArticleViewer, TQ_SIGNAL(focusChangeRequest(TQWidget*)), TQ_SLOT(slotDockWidgetFocusChangeRequest(TQWidget*)) );
//collection view
c_olDock = createDockWidget("group_view", UserIcon("group"), 0,
@@ -123,22 +123,22 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa
c_olDock->setWidget(c_olView);
c_olDock->manualDock(a_rtDock, KDockWidget::DockLeft, 3000);
- connect(c_olDock, TQT_SIGNAL(iMBeingClosed()), TQT_SLOT(slotGroupDockHidden()));
- connect(c_olDock, TQT_SIGNAL(hasUndocked()), TQT_SLOT(slotGroupDockHidden()));
- connect(c_olView, TQT_SIGNAL(focusChangeRequest(TQWidget *)), TQT_SLOT(slotDockWidgetFocusChangeRequest(TQWidget *)));
- connect(c_olView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
- TQT_SLOT(slotCollectionSelected(TQListViewItem*)));
- connect(c_olView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
- TQT_SLOT(slotCollectionRMB(TDEListView*, TQListViewItem*, const TQPoint&)));
- connect(c_olView, TQT_SIGNAL(folderDrop(TQDropEvent*, KNCollectionViewItem*)),
- TQT_SLOT(slotCollectionViewDrop(TQDropEvent*, KNCollectionViewItem*)));
- connect(c_olView, TQT_SIGNAL(itemRenamed(TQListViewItem*)),
- TQT_SLOT(slotCollectionRenamed(TQListViewItem*)));
-
- accel->connectItem( accel->insertItem(Key_Up), mArticleViewer, TQT_SLOT(scrollUp()) );
- accel->connectItem( accel->insertItem(Key_Down), mArticleViewer, TQT_SLOT(scrollDown()) );
- accel->connectItem( accel->insertItem(Key_Prior), mArticleViewer, TQT_SLOT(scrollPrior()) );
- accel->connectItem( accel->insertItem(Key_Next), mArticleViewer, TQT_SLOT(scrollNext()) );
+ connect(c_olDock, TQ_SIGNAL(iMBeingClosed()), TQ_SLOT(slotGroupDockHidden()));
+ connect(c_olDock, TQ_SIGNAL(hasUndocked()), TQ_SLOT(slotGroupDockHidden()));
+ connect(c_olView, TQ_SIGNAL(focusChangeRequest(TQWidget *)), TQ_SLOT(slotDockWidgetFocusChangeRequest(TQWidget *)));
+ connect(c_olView, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+ TQ_SLOT(slotCollectionSelected(TQListViewItem*)));
+ connect(c_olView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+ TQ_SLOT(slotCollectionRMB(TDEListView*, TQListViewItem*, const TQPoint&)));
+ connect(c_olView, TQ_SIGNAL(folderDrop(TQDropEvent*, KNCollectionViewItem*)),
+ TQ_SLOT(slotCollectionViewDrop(TQDropEvent*, KNCollectionViewItem*)));
+ connect(c_olView, TQ_SIGNAL(itemRenamed(TQListViewItem*)),
+ TQ_SLOT(slotCollectionRenamed(TQListViewItem*)));
+
+ accel->connectItem( accel->insertItem(Key_Up), mArticleViewer, TQ_SLOT(scrollUp()) );
+ accel->connectItem( accel->insertItem(Key_Down), mArticleViewer, TQ_SLOT(scrollDown()) );
+ accel->connectItem( accel->insertItem(Key_Prior), mArticleViewer, TQ_SLOT(scrollPrior()) );
+ accel->connectItem( accel->insertItem(Key_Next), mArticleViewer, TQ_SLOT(scrollNext()) );
//header view
h_drDock = createDockWidget("header_view", SmallIcon("text_block"), 0,
@@ -171,25 +171,25 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa
s_earchLineEdit = new TDEListViewSearchLine(q_uicksearch, h_drView, "TDEListViewSearchLine");
q_uicksearch->setStretchableWidget(s_earchLineEdit);
lbl->setBuddy(s_earchLineEdit);
- connect( resetQuickSearch, TQT_SIGNAL( activated() ), s_earchLineEdit, TQT_SLOT( clear() ));
+ connect( resetQuickSearch, TQ_SIGNAL( activated() ), s_earchLineEdit, TQ_SLOT( clear() ));
vlay->addWidget(q_uicksearch);
vlay->addWidget(h_drView);
- connect(h_drDock, TQT_SIGNAL(iMBeingClosed()), TQT_SLOT(slotHeaderDockHidden()));
- connect(h_drDock, TQT_SIGNAL(hasUndocked()), TQT_SLOT(slotHeaderDockHidden()));
- connect(h_drView, TQT_SIGNAL(focusChangeRequest(TQWidget *)),
- TQT_SLOT(slotDockWidgetFocusChangeRequest(TQWidget *)));
- connect(h_drView, TQT_SIGNAL(itemSelected(TQListViewItem*)),
- TQT_SLOT(slotArticleSelected(TQListViewItem*)));
- connect(h_drView, TQT_SIGNAL(selectionChanged()),
- TQT_SLOT(slotArticleSelectionChanged()));
- connect(h_drView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
- TQT_SLOT(slotArticleRMB(TDEListView*, TQListViewItem*, const TQPoint&)));
- connect(h_drView, TQT_SIGNAL(doubleClick(TQListViewItem *)),
- TQT_SLOT(slotOpenArticle(TQListViewItem *)));
- connect(h_drView, TQT_SIGNAL(sortingChanged(int)),
- TQT_SLOT(slotHdrViewSortingChanged(int)));
+ connect(h_drDock, TQ_SIGNAL(iMBeingClosed()), TQ_SLOT(slotHeaderDockHidden()));
+ connect(h_drDock, TQ_SIGNAL(hasUndocked()), TQ_SLOT(slotHeaderDockHidden()));
+ connect(h_drView, TQ_SIGNAL(focusChangeRequest(TQWidget *)),
+ TQ_SLOT(slotDockWidgetFocusChangeRequest(TQWidget *)));
+ connect(h_drView, TQ_SIGNAL(itemSelected(TQListViewItem*)),
+ TQ_SLOT(slotArticleSelected(TQListViewItem*)));
+ connect(h_drView, TQ_SIGNAL(selectionChanged()),
+ TQ_SLOT(slotArticleSelectionChanged()));
+ connect(h_drView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+ TQ_SLOT(slotArticleRMB(TDEListView*, TQListViewItem*, const TQPoint&)));
+ connect(h_drView, TQ_SIGNAL(doubleClick(TQListViewItem *)),
+ TQ_SLOT(slotOpenArticle(TQListViewItem *)));
+ connect(h_drView, TQ_SIGNAL(sortingChanged(int)),
+ TQ_SLOT(slotHdrViewSortingChanged(int)));
//actions
initActions();
@@ -200,7 +200,7 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa
//Network
n_etAccess = knGlobals.netAccess();
- connect(n_etAccess, TQT_SIGNAL(netActive(bool)), this, TQT_SLOT(slotNetworkActive(bool)));
+ connect(n_etAccess, TQ_SIGNAL(netActive(bool)), this, TQ_SLOT(slotNetworkActive(bool)));
//Filter Manager
f_ilManager = knGlobals.filterManager();
@@ -225,8 +225,8 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa
// Score Manager
s_coreManager = knGlobals.scoringManager();
- //connect(s_coreManager, TQT_SIGNAL(changedRules()), TQT_SLOT(slotReScore()));
- connect(s_coreManager, TQT_SIGNAL(finishedEditing()), TQT_SLOT(slotReScore()));
+ //connect(s_coreManager, TQ_SIGNAL(changedRules()), TQ_SLOT(slotReScore()));
+ connect(s_coreManager, TQ_SIGNAL(finishedEditing()), TQ_SLOT(slotReScore()));
// Memory Manager
m_emManager = knGlobals.memoryManager();
@@ -550,114 +550,114 @@ void KNMainWidget::initActions()
//navigation
a_ctNavNextArt = new TDEAction( KGuiItem(i18n("&Next Article"), "go-next",
- i18n("Go to next article")), "N;Right", TQT_TQOBJECT(h_drView),
- TQT_SLOT(nextArticle()), actionCollection(), "go_nextArticle" );
+ i18n("Go to next article")), "N;Right", h_drView,
+ TQ_SLOT(nextArticle()), actionCollection(), "go_nextArticle" );
a_ctNavPrevArt = new TDEAction( KGuiItem(i18n("&Previous Article"), "go-previous",
- i18n("Go to previous article")), "P;Left" , TQT_TQOBJECT(h_drView),
- TQT_SLOT(prevArticle()), actionCollection(), "go_prevArticle" );
- a_ctNavNextUnreadArt = new TDEAction(i18n("Next Unread &Article"), "1rightarrow", ALT+SHIFT+Key_Space , TQT_TQOBJECT(this),
- TQT_SLOT(slotNavNextUnreadArt()), actionCollection(), "go_nextUnreadArticle");
- a_ctNavNextUnreadThread = new TDEAction(i18n("Next Unread &Thread"),"2rightarrow", SHIFT+Key_Space , TQT_TQOBJECT(this),
- TQT_SLOT(slotNavNextUnreadThread()), actionCollection(), "go_nextUnreadThread");
- a_ctNavNextGroup = new TDEAction(i18n("Ne&xt Group"), "go-down", Key_Plus , TQT_TQOBJECT(c_olView),
- TQT_SLOT(nextGroup()), actionCollection(), "go_nextGroup");
- a_ctNavPrevGroup = new TDEAction(i18n("Pre&vious Group"), "go-up", Key_Minus , TQT_TQOBJECT(c_olView),
- TQT_SLOT(prevGroup()), actionCollection(), "go_prevGroup");
- a_ctNavReadThrough = new TDEAction(i18n("Read &Through Articles"), Key_Space , TQT_TQOBJECT(this),
- TQT_SLOT(slotNavReadThrough()), actionCollection(), "go_readThrough");
+ i18n("Go to previous article")), "P;Left" , h_drView,
+ TQ_SLOT(prevArticle()), actionCollection(), "go_prevArticle" );
+ a_ctNavNextUnreadArt = new TDEAction(i18n("Next Unread &Article"), "1rightarrow", ALT+SHIFT+Key_Space , this,
+ TQ_SLOT(slotNavNextUnreadArt()), actionCollection(), "go_nextUnreadArticle");
+ a_ctNavNextUnreadThread = new TDEAction(i18n("Next Unread &Thread"),"2rightarrow", SHIFT+Key_Space , this,
+ TQ_SLOT(slotNavNextUnreadThread()), actionCollection(), "go_nextUnreadThread");
+ a_ctNavNextGroup = new TDEAction(i18n("Ne&xt Group"), "go-down", Key_Plus , c_olView,
+ TQ_SLOT(nextGroup()), actionCollection(), "go_nextGroup");
+ a_ctNavPrevGroup = new TDEAction(i18n("Pre&vious Group"), "go-up", Key_Minus , c_olView,
+ TQ_SLOT(prevGroup()), actionCollection(), "go_prevGroup");
+ a_ctNavReadThrough = new TDEAction(i18n("Read &Through Articles"), Key_Space , this,
+ TQ_SLOT(slotNavReadThrough()), actionCollection(), "go_readThrough");
a_ctNavReadThrough->plugAccel(a_ccel);
TQAccel *accel = new TQAccel( this );
- new TDEAction( i18n("Focus on Next Folder"), CTRL+Key_Right, TQT_TQOBJECT(c_olView),
- TQT_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder" );
+ new TDEAction( i18n("Focus on Next Folder"), CTRL+Key_Right, c_olView,
+ TQ_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder" );
accel->connectItem(accel->insertItem(CTRL+Key_Right),
- c_olView, TQT_SLOT(incCurrentFolder()));
- new TDEAction( i18n("Focus on Previous Folder"), CTRL+Key_Left, TQT_TQOBJECT(c_olView),
- TQT_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder" );
+ c_olView, TQ_SLOT(incCurrentFolder()));
+ new TDEAction( i18n("Focus on Previous Folder"), CTRL+Key_Left, c_olView,
+ TQ_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder" );
accel->connectItem(accel->insertItem(CTRL+Key_Left),
- c_olView, TQT_SLOT(decCurrentFolder()));
- new TDEAction( i18n("Select Folder with Focus"), CTRL+Key_Space, TQT_TQOBJECT(c_olView),
- TQT_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder" );
+ c_olView, TQ_SLOT(decCurrentFolder()));
+ new TDEAction( i18n("Select Folder with Focus"), CTRL+Key_Space, c_olView,
+ TQ_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder" );
accel->connectItem(accel->insertItem(CTRL+Key_Space),
- c_olView, TQT_SLOT(selectCurrentFolder()));
+ c_olView, TQ_SLOT(selectCurrentFolder()));
- new TDEAction( i18n("Focus on Next Article"), ALT+Key_Right, TQT_TQOBJECT(h_drView),
- TQT_SLOT(incCurrentArticle()), actionCollection(), "inc_current_article" );
+ new TDEAction( i18n("Focus on Next Article"), ALT+Key_Right, h_drView,
+ TQ_SLOT(incCurrentArticle()), actionCollection(), "inc_current_article" );
accel->connectItem( accel->insertItem(ALT+Key_Right),
- TQT_TQOBJECT(h_drView), TQT_SLOT(incCurrentArticle()) );
- new TDEAction( i18n("Focus on Previous Article"), ALT+Key_Left, TQT_TQOBJECT(h_drView),
- TQT_SLOT(decCurrentArticle()), actionCollection(), "dec_current_article" );
+ h_drView, TQ_SLOT(incCurrentArticle()) );
+ new TDEAction( i18n("Focus on Previous Article"), ALT+Key_Left, h_drView,
+ TQ_SLOT(decCurrentArticle()), actionCollection(), "dec_current_article" );
accel->connectItem( accel->insertItem(ALT+Key_Left),
- TQT_TQOBJECT(h_drView), TQT_SLOT(decCurrentArticle()) );
- new TDEAction( i18n("Select Article with Focus"), ALT+Key_Space, TQT_TQOBJECT(h_drView),
- TQT_SLOT(selectCurrentArticle()), actionCollection(), "select_current_article" );
+ h_drView, TQ_SLOT(decCurrentArticle()) );
+ new TDEAction( i18n("Select Article with Focus"), ALT+Key_Space, h_drView,
+ TQ_SLOT(selectCurrentArticle()), actionCollection(), "select_current_article" );
accel->connectItem( accel->insertItem(ALT+Key_Space),
- TQT_TQOBJECT(h_drView), TQT_SLOT(selectCurrentArticle()) );
+ h_drView, TQ_SLOT(selectCurrentArticle()) );
//collection-view - accounts
- a_ctAccProperties = new TDEAction(i18n("Account &Properties"), "configure", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotAccProperties()), actionCollection(), "account_properties");
- a_ctAccRename = new TDEAction(i18n("&Rename Account"), "text", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotAccRename()), actionCollection(), "account_rename");
- a_ctAccSubscribe = new TDEAction(i18n("&Subscribe to Newsgroups..."), "news_subscribe", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotAccSubscribe()), actionCollection(), "account_subscribe");
- a_ctAccExpireAll = new TDEAction(i18n("&Expire All Groups"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotAccExpireAll()), actionCollection(), "account_expire_all");
- a_ctAccGetNewHdrs = new TDEAction(i18n("&Get New Articles in All Groups"), "mail_get", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotAccGetNewHdrs()), actionCollection(), "account_dnlHeaders");
- a_ctAccGetNewHdrsAll = new TDEAction(i18n("&Get New Articles in All Accounts"), "mail_get_all", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotAccGetNewHdrsAll()), actionCollection(), "account_dnlAllHeaders");
- a_ctAccDelete = new TDEAction(i18n("&Delete Account"), "edit-delete", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotAccDelete()), actionCollection(), "account_delete");
- a_ctAccPostNewArticle = new TDEAction(i18n("&Post to Newsgroup..."), "mail-message-new", CTRL+Key_N, TQT_TQOBJECT(this),
- TQT_SLOT(slotAccPostNewArticle()), actionCollection(), "article_postNew");
+ a_ctAccProperties = new TDEAction(i18n("Account &Properties"), "configure", 0, this,
+ TQ_SLOT(slotAccProperties()), actionCollection(), "account_properties");
+ a_ctAccRename = new TDEAction(i18n("&Rename Account"), "text", 0, this,
+ TQ_SLOT(slotAccRename()), actionCollection(), "account_rename");
+ a_ctAccSubscribe = new TDEAction(i18n("&Subscribe to Newsgroups..."), "news_subscribe", 0, this,
+ TQ_SLOT(slotAccSubscribe()), actionCollection(), "account_subscribe");
+ a_ctAccExpireAll = new TDEAction(i18n("&Expire All Groups"), 0, this,
+ TQ_SLOT(slotAccExpireAll()), actionCollection(), "account_expire_all");
+ a_ctAccGetNewHdrs = new TDEAction(i18n("&Get New Articles in All Groups"), "mail_get", 0, this,
+ TQ_SLOT(slotAccGetNewHdrs()), actionCollection(), "account_dnlHeaders");
+ a_ctAccGetNewHdrsAll = new TDEAction(i18n("&Get New Articles in All Accounts"), "mail_get_all", 0, this,
+ TQ_SLOT(slotAccGetNewHdrsAll()), actionCollection(), "account_dnlAllHeaders");
+ a_ctAccDelete = new TDEAction(i18n("&Delete Account"), "edit-delete", 0, this,
+ TQ_SLOT(slotAccDelete()), actionCollection(), "account_delete");
+ a_ctAccPostNewArticle = new TDEAction(i18n("&Post to Newsgroup..."), "mail-message-new", CTRL+Key_N, this,
+ TQ_SLOT(slotAccPostNewArticle()), actionCollection(), "article_postNew");
//collection-view - groups
- a_ctGrpProperties = new TDEAction(i18n("Group &Properties"), "configure", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotGrpProperties()), actionCollection(), "group_properties");
- a_ctGrpRename = new TDEAction(i18n("Rename &Group"), "text", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotGrpRename()), actionCollection(), "group_rename");
- a_ctGrpGetNewHdrs = new TDEAction(i18n("&Get New Articles"), "mail_get" , 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotGrpGetNewHdrs()), actionCollection(), "group_dnlHeaders");
- a_ctGrpExpire = new TDEAction(i18n("E&xpire Group"), "wizard", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotGrpExpire()), actionCollection(), "group_expire");
- a_ctGrpReorganize = new TDEAction(i18n("Re&organize Group"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotGrpReorganize()), actionCollection(), "group_reorg");
- a_ctGrpUnsubscribe = new TDEAction(i18n("&Unsubscribe From Group"), "news_unsubscribe", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotGrpUnsubscribe()), actionCollection(), "group_unsubscribe");
- a_ctGrpSetAllRead = new TDEAction(i18n("Mark All as &Read"), "goto", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotGrpSetAllRead()), actionCollection(), "group_allRead");
- a_ctGrpSetAllUnread = new TDEAction(i18n("Mark All as U&nread"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotGrpSetAllUnread()), actionCollection(), "group_allUnread");
- a_ctGrpSetUnread = new TDEAction(i18n("Mark Last as Unr&ead..."), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotGrpSetUnread()), actionCollection(), "group_unread");
+ a_ctGrpProperties = new TDEAction(i18n("Group &Properties"), "configure", 0, this,
+ TQ_SLOT(slotGrpProperties()), actionCollection(), "group_properties");
+ a_ctGrpRename = new TDEAction(i18n("Rename &Group"), "text", 0, this,
+ TQ_SLOT(slotGrpRename()), actionCollection(), "group_rename");
+ a_ctGrpGetNewHdrs = new TDEAction(i18n("&Get New Articles"), "mail_get" , 0, this,
+ TQ_SLOT(slotGrpGetNewHdrs()), actionCollection(), "group_dnlHeaders");
+ a_ctGrpExpire = new TDEAction(i18n("E&xpire Group"), "wizard", 0, this,
+ TQ_SLOT(slotGrpExpire()), actionCollection(), "group_expire");
+ a_ctGrpReorganize = new TDEAction(i18n("Re&organize Group"), 0, this,
+ TQ_SLOT(slotGrpReorganize()), actionCollection(), "group_reorg");
+ a_ctGrpUnsubscribe = new TDEAction(i18n("&Unsubscribe From Group"), "news_unsubscribe", 0, this,
+ TQ_SLOT(slotGrpUnsubscribe()), actionCollection(), "group_unsubscribe");
+ a_ctGrpSetAllRead = new TDEAction(i18n("Mark All as &Read"), "goto", 0, this,
+ TQ_SLOT(slotGrpSetAllRead()), actionCollection(), "group_allRead");
+ a_ctGrpSetAllUnread = new TDEAction(i18n("Mark All as U&nread"), 0, this,
+ TQ_SLOT(slotGrpSetAllUnread()), actionCollection(), "group_allUnread");
+ a_ctGrpSetUnread = new TDEAction(i18n("Mark Last as Unr&ead..."), 0, this,
+ TQ_SLOT(slotGrpSetUnread()), actionCollection(), "group_unread");
(void) new TDEAction( i18n("&Configure KNode..."),
- "configure", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotSettings()), actionCollection(),
+ "configure", 0, this,
+ TQ_SLOT(slotSettings()), actionCollection(),
"knode_configure_knode" );
//collection-view - folder
- a_ctFolNew = new TDEAction(i18n("&New Folder"), "folder-new", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotFolNew()), actionCollection(), "folder-new");
- a_ctFolNewChild = new TDEAction(i18n("New &Subfolder"), "folder-new", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotFolNewChild()), actionCollection(), "folder_newChild");
- a_ctFolDelete = new TDEAction(i18n("&Delete Folder"), "edit-delete", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotFolDelete()), actionCollection(), "folder_delete");
- a_ctFolRename = new TDEAction(i18n("&Rename Folder"), "text", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotFolRename()), actionCollection(), "folder_rename");
- a_ctFolCompact = new TDEAction(i18n("C&ompact Folder"), "wizard", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotFolCompact()), actionCollection(), "folder_compact");
- a_ctFolCompactAll = new TDEAction(i18n("Co&mpact All Folders"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotFolCompactAll()), actionCollection(), "folder_compact_all");
- a_ctFolEmpty = new TDEAction(i18n("&Empty Folder"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotFolEmpty()), actionCollection(), "folder_empty");
- a_ctFolMboxImport = new TDEAction(i18n("&Import MBox Folder..."), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotFolMBoxImport()), actionCollection(), "folder_MboxImport");
- a_ctFolMboxExport = new TDEAction(i18n("E&xport as MBox Folder..."), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotFolMBoxExport()), actionCollection(), "folder_MboxExport");
+ a_ctFolNew = new TDEAction(i18n("&New Folder"), "folder-new", 0, this,
+ TQ_SLOT(slotFolNew()), actionCollection(), "folder-new");
+ a_ctFolNewChild = new TDEAction(i18n("New &Subfolder"), "folder-new", 0, this,
+ TQ_SLOT(slotFolNewChild()), actionCollection(), "folder_newChild");
+ a_ctFolDelete = new TDEAction(i18n("&Delete Folder"), "edit-delete", 0, this,
+ TQ_SLOT(slotFolDelete()), actionCollection(), "folder_delete");
+ a_ctFolRename = new TDEAction(i18n("&Rename Folder"), "text", 0, this,
+ TQ_SLOT(slotFolRename()), actionCollection(), "folder_rename");
+ a_ctFolCompact = new TDEAction(i18n("C&ompact Folder"), "wizard", 0, this,
+ TQ_SLOT(slotFolCompact()), actionCollection(), "folder_compact");
+ a_ctFolCompactAll = new TDEAction(i18n("Co&mpact All Folders"), 0, this,
+ TQ_SLOT(slotFolCompactAll()), actionCollection(), "folder_compact_all");
+ a_ctFolEmpty = new TDEAction(i18n("&Empty Folder"), 0, this,
+ TQ_SLOT(slotFolEmpty()), actionCollection(), "folder_empty");
+ a_ctFolMboxImport = new TDEAction(i18n("&Import MBox Folder..."), 0, this,
+ TQ_SLOT(slotFolMBoxImport()), actionCollection(), "folder_MboxImport");
+ a_ctFolMboxExport = new TDEAction(i18n("E&xport as MBox Folder..."), 0, this,
+ TQ_SLOT(slotFolMBoxExport()), actionCollection(), "folder_MboxExport");
//header-view - list-handling
a_ctArtSortHeaders = new TDESelectAction(i18n("S&ort"), 0, actionCollection(), "view_Sort");
@@ -669,96 +669,96 @@ void KNMainWidget::initActions()
items += i18n("By &Date");
a_ctArtSortHeaders->setItems(items);
a_ctArtSortHeaders->setShortcutConfigurable(false);
- connect(a_ctArtSortHeaders, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotArtSortHeaders(int)));
- a_ctArtSortHeadersKeyb = new TDEAction(i18n("Sort"), TQString(), Key_F7 , TQT_TQOBJECT(this),
- TQT_SLOT(slotArtSortHeadersKeyb()), actionCollection(), "view_Sort_Keyb");
+ connect(a_ctArtSortHeaders, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotArtSortHeaders(int)));
+ a_ctArtSortHeadersKeyb = new TDEAction(i18n("Sort"), TQString(), Key_F7 , this,
+ TQ_SLOT(slotArtSortHeadersKeyb()), actionCollection(), "view_Sort_Keyb");
a_ctArtSortHeadersKeyb->plugAccel(a_ccel);
a_ctArtFilter = new KNFilterSelectAction(i18n("&Filter"), "filter",
actionCollection(), "view_Filter");
a_ctArtFilter->setShortcutConfigurable(false);
a_ctArtFilterKeyb = new TDEAction(i18n("Filter"), Key_F6, actionCollection(), "view_Filter_Keyb");
a_ctArtFilterKeyb->plugAccel(a_ccel);
- a_ctArtSearch = new TDEAction(i18n("&Search Articles..."),"mail_find" , Key_F4 , TQT_TQOBJECT(this),
- TQT_SLOT(slotArtSearch()), actionCollection(), "article_search");
- a_ctArtRefreshList = new TDEAction(i18n("&Refresh List"),"reload", TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(this),
- TQT_SLOT(slotArtRefreshList()), actionCollection(), "view_Refresh");
- a_ctArtCollapseAll = new TDEAction(i18n("&Collapse All Threads"), 0 , TQT_TQOBJECT(this),
- TQT_SLOT(slotArtCollapseAll()), actionCollection(), "view_CollapseAll");
- a_ctArtExpandAll = new TDEAction(i18n("E&xpand All Threads"), 0 , TQT_TQOBJECT(this),
- TQT_SLOT(slotArtExpandAll()), actionCollection(), "view_ExpandAll");
- a_ctArtToggleThread = new TDEAction(i18n("&Toggle Subthread"), Key_T, TQT_TQOBJECT(this),
- TQT_SLOT(slotArtToggleThread()), actionCollection(), "thread_toggle");
- a_ctArtToggleShowThreads = new TDEToggleAction(i18n("Show T&hreads"), 0 , TQT_TQOBJECT(this),
- TQT_SLOT(slotArtToggleShowThreads()), actionCollection(), "view_showThreads");
+ a_ctArtSearch = new TDEAction(i18n("&Search Articles..."),"mail_find" , Key_F4 , this,
+ TQ_SLOT(slotArtSearch()), actionCollection(), "article_search");
+ a_ctArtRefreshList = new TDEAction(i18n("&Refresh List"),"reload", TDEStdAccel::shortcut(TDEStdAccel::Reload), this,
+ TQ_SLOT(slotArtRefreshList()), actionCollection(), "view_Refresh");
+ a_ctArtCollapseAll = new TDEAction(i18n("&Collapse All Threads"), 0 , this,
+ TQ_SLOT(slotArtCollapseAll()), actionCollection(), "view_CollapseAll");
+ a_ctArtExpandAll = new TDEAction(i18n("E&xpand All Threads"), 0 , this,
+ TQ_SLOT(slotArtExpandAll()), actionCollection(), "view_ExpandAll");
+ a_ctArtToggleThread = new TDEAction(i18n("&Toggle Subthread"), Key_T, this,
+ TQ_SLOT(slotArtToggleThread()), actionCollection(), "thread_toggle");
+ a_ctArtToggleShowThreads = new TDEToggleAction(i18n("Show T&hreads"), 0 , this,
+ TQ_SLOT(slotArtToggleShowThreads()), actionCollection(), "view_showThreads");
a_ctArtToggleShowThreads->setCheckedState(i18n("Hide T&hreads"));
a_ctArtToggleShowThreads->setChecked(c_fgManager->readNewsGeneral()->showThreads());
//header-view - remote articles
- a_ctArtSetArtRead = new TDEAction(i18n("Mark as &Read"), Key_D , TQT_TQOBJECT(this),
- TQT_SLOT(slotArtSetArtRead()), actionCollection(), "article_read");
- a_ctArtSetArtUnread = new TDEAction(i18n("Mar&k as Unread"), Key_U , TQT_TQOBJECT(this),
- TQT_SLOT(slotArtSetArtUnread()), actionCollection(), "article_unread");
- a_ctArtSetThreadRead = new TDEAction(i18n("Mark &Thread as Read"), CTRL+Key_D , TQT_TQOBJECT(this),
- TQT_SLOT(slotArtSetThreadRead()), actionCollection(), "thread_read");
- a_ctArtSetThreadUnread = new TDEAction(i18n("Mark T&hread as Unread"), CTRL+Key_U , TQT_TQOBJECT(this),
- TQT_SLOT(slotArtSetThreadUnread()), actionCollection(), "thread_unread");
- a_ctArtOpenNewWindow = new TDEAction(i18n("Open in Own &Window"), "window-new", Key_O , TQT_TQOBJECT(this),
- TQT_SLOT(slotArtOpenNewWindow()), actionCollection(), "article_ownWindow");
+ a_ctArtSetArtRead = new TDEAction(i18n("Mark as &Read"), Key_D , this,
+ TQ_SLOT(slotArtSetArtRead()), actionCollection(), "article_read");
+ a_ctArtSetArtUnread = new TDEAction(i18n("Mar&k as Unread"), Key_U , this,
+ TQ_SLOT(slotArtSetArtUnread()), actionCollection(), "article_unread");
+ a_ctArtSetThreadRead = new TDEAction(i18n("Mark &Thread as Read"), CTRL+Key_D , this,
+ TQ_SLOT(slotArtSetThreadRead()), actionCollection(), "thread_read");
+ a_ctArtSetThreadUnread = new TDEAction(i18n("Mark T&hread as Unread"), CTRL+Key_U , this,
+ TQ_SLOT(slotArtSetThreadUnread()), actionCollection(), "thread_unread");
+ a_ctArtOpenNewWindow = new TDEAction(i18n("Open in Own &Window"), "window-new", Key_O , this,
+ TQ_SLOT(slotArtOpenNewWindow()), actionCollection(), "article_ownWindow");
// scoring
- a_ctScoresEdit = new TDEAction(i18n("&Edit Scoring Rules..."), "edit", CTRL+Key_E, TQT_TQOBJECT(this),
- TQT_SLOT(slotScoreEdit()), actionCollection(), "scoreedit");
- a_ctReScore = new TDEAction(i18n("Recalculate &Scores"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotReScore()),actionCollection(),"rescore");
- a_ctScoreLower = new TDEAction(i18n("&Lower Score for Author..."), CTRL+Key_L, TQT_TQOBJECT(this),
- TQT_SLOT(slotScoreLower()), actionCollection(), "scorelower");
- a_ctScoreRaise = new TDEAction(i18n("&Raise Score for Author..."), CTRL+Key_I, TQT_TQOBJECT(this),
- TQT_SLOT(slotScoreRaise()),actionCollection(),"scoreraise");
- a_ctArtToggleIgnored = new TDEAction(i18n("&Ignore Thread"), "go-bottom", Key_I , TQT_TQOBJECT(this),
- TQT_SLOT(slotArtToggleIgnored()), actionCollection(), "thread_ignore");
- a_ctArtToggleWatched = new TDEAction(i18n("&Watch Thread"), "go-top", Key_W , TQT_TQOBJECT(this),
- TQT_SLOT(slotArtToggleWatched()), actionCollection(), "thread_watch");
+ a_ctScoresEdit = new TDEAction(i18n("&Edit Scoring Rules..."), "edit", CTRL+Key_E, this,
+ TQ_SLOT(slotScoreEdit()), actionCollection(), "scoreedit");
+ a_ctReScore = new TDEAction(i18n("Recalculate &Scores"), 0, this,
+ TQ_SLOT(slotReScore()),actionCollection(),"rescore");
+ a_ctScoreLower = new TDEAction(i18n("&Lower Score for Author..."), CTRL+Key_L, this,
+ TQ_SLOT(slotScoreLower()), actionCollection(), "scorelower");
+ a_ctScoreRaise = new TDEAction(i18n("&Raise Score for Author..."), CTRL+Key_I, this,
+ TQ_SLOT(slotScoreRaise()),actionCollection(),"scoreraise");
+ a_ctArtToggleIgnored = new TDEAction(i18n("&Ignore Thread"), "go-bottom", Key_I , this,
+ TQ_SLOT(slotArtToggleIgnored()), actionCollection(), "thread_ignore");
+ a_ctArtToggleWatched = new TDEAction(i18n("&Watch Thread"), "go-top", Key_W , this,
+ TQ_SLOT(slotArtToggleWatched()), actionCollection(), "thread_watch");
//header-view local articles
- a_ctArtSendOutbox = new TDEAction(i18n("Sen&d Pending Messages"), "mail-send", 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotArtSendOutbox()), actionCollection(), "net_sendPending");
- a_ctArtDelete = new TDEAction(i18n("&Delete Article"), "edit-delete", Key_Delete, TQT_TQOBJECT(this),
- TQT_SLOT(slotArtDelete()), actionCollection(), "article_delete");
- a_ctArtSendNow = new TDEAction(i18n("Send &Now"),"mail-send", 0 , TQT_TQOBJECT(this),
- TQT_SLOT(slotArtSendNow()), actionCollection(), "article_sendNow");
- a_ctArtEdit = new TDEAction(i18n("edit article","&Edit Article..."), "edit", Key_E , TQT_TQOBJECT(this),
- TQT_SLOT(slotArtEdit()), actionCollection(), "article_edit");
+ a_ctArtSendOutbox = new TDEAction(i18n("Sen&d Pending Messages"), "mail-send", 0, this,
+ TQ_SLOT(slotArtSendOutbox()), actionCollection(), "net_sendPending");
+ a_ctArtDelete = new TDEAction(i18n("&Delete Article"), "edit-delete", Key_Delete, this,
+ TQ_SLOT(slotArtDelete()), actionCollection(), "article_delete");
+ a_ctArtSendNow = new TDEAction(i18n("Send &Now"),"mail-send", 0 , this,
+ TQ_SLOT(slotArtSendNow()), actionCollection(), "article_sendNow");
+ a_ctArtEdit = new TDEAction(i18n("edit article","&Edit Article..."), "edit", Key_E , this,
+ TQ_SLOT(slotArtEdit()), actionCollection(), "article_edit");
//network
- a_ctNetCancel = new TDEAction(i18n("Stop &Network"),"process-stop",0, TQT_TQOBJECT(this),
- TQT_SLOT(slotNetCancel()), actionCollection(), "net_stop");
+ a_ctNetCancel = new TDEAction(i18n("Stop &Network"),"process-stop",0, this,
+ TQ_SLOT(slotNetCancel()), actionCollection(), "net_stop");
a_ctNetCancel->setEnabled(false);
- a_ctFetchArticleWithID = new TDEAction(i18n("&Fetch Article with ID..."), 0, TQT_TQOBJECT(this),
- TQT_SLOT(slotFetchArticleWithID()), actionCollection(), "fetch_article_with_id");
+ a_ctFetchArticleWithID = new TDEAction(i18n("&Fetch Article with ID..."), 0, this,
+ TQ_SLOT(slotFetchArticleWithID()), actionCollection(), "fetch_article_with_id");
a_ctFetchArticleWithID->setEnabled(false);
- a_ctToggleGroupView = new TDEToggleAction(i18n("Show &Group View"), CTRL+Key_G, TQT_TQOBJECT(this),
- TQT_SLOT(slotToggleGroupView()), actionCollection(), "settings_show_groupView");
+ a_ctToggleGroupView = new TDEToggleAction(i18n("Show &Group View"), CTRL+Key_G, this,
+ TQ_SLOT(slotToggleGroupView()), actionCollection(), "settings_show_groupView");
a_ctToggleGroupView->setCheckedState(i18n("Hide &Group View"));
- a_ctToggleHeaderView = new TDEToggleAction(i18n("Show &Header View"), CTRL+Key_H, TQT_TQOBJECT(this),
- TQT_SLOT(slotToggleHeaderView()), actionCollection(), "settings_show_headerView");
+ a_ctToggleHeaderView = new TDEToggleAction(i18n("Show &Header View"), CTRL+Key_H, this,
+ TQ_SLOT(slotToggleHeaderView()), actionCollection(), "settings_show_headerView");
a_ctToggleHeaderView->setCheckedState(i18n("Hide &Header View"));
- a_ctToggleArticleViewer = new TDEToggleAction(i18n("Show &Article Viewer"), CTRL+Key_J, TQT_TQOBJECT(this),
- TQT_SLOT(slotToggleArticleViewer()), actionCollection(), "settings_show_articleViewer");
+ a_ctToggleArticleViewer = new TDEToggleAction(i18n("Show &Article Viewer"), CTRL+Key_J, this,
+ TQ_SLOT(slotToggleArticleViewer()), actionCollection(), "settings_show_articleViewer");
a_ctToggleArticleViewer->setCheckedState(i18n("Hide &Article Viewer"));
- a_ctToggleQuickSearch = new TDEToggleAction(i18n("Show Quick Search"), TQString(), TQT_TQOBJECT(this),
- TQT_SLOT(slotToggleQuickSearch()), actionCollection(), "settings_show_quickSearch");
+ a_ctToggleQuickSearch = new TDEToggleAction(i18n("Show Quick Search"), TQString(), this,
+ TQ_SLOT(slotToggleQuickSearch()), actionCollection(), "settings_show_quickSearch");
a_ctToggleQuickSearch->setCheckedState(i18n("Hide Quick Search"));
- a_ctSwitchToGroupView = new TDEAction(i18n("Switch to Group View"), Key_G , TQT_TQOBJECT(this),
- TQT_SLOT(slotSwitchToGroupView()), actionCollection(), "switch_to_group_view");
+ a_ctSwitchToGroupView = new TDEAction(i18n("Switch to Group View"), Key_G , this,
+ TQ_SLOT(slotSwitchToGroupView()), actionCollection(), "switch_to_group_view");
a_ctSwitchToGroupView->plugAccel(a_ccel);
- a_ctSwitchToHeaderView = new TDEAction(i18n("Switch to Header View"), Key_H , TQT_TQOBJECT(this),
- TQT_SLOT(slotSwitchToHeaderView()), actionCollection(), "switch_to_header_view");
+ a_ctSwitchToHeaderView = new TDEAction(i18n("Switch to Header View"), Key_H , this,
+ TQ_SLOT(slotSwitchToHeaderView()), actionCollection(), "switch_to_header_view");
a_ctSwitchToHeaderView->plugAccel(a_ccel);
- a_ctSwitchToArticleViewer = new TDEAction(i18n("Switch to Article Viewer"), Key_J , TQT_TQOBJECT(this),
- TQT_SLOT(slotSwitchToArticleViewer()), actionCollection(), "switch_to_article_viewer");
+ a_ctSwitchToArticleViewer = new TDEAction(i18n("Switch to Article Viewer"), Key_J , this,
+ TQ_SLOT(slotSwitchToArticleViewer()), actionCollection(), "switch_to_article_viewer");
a_ctSwitchToArticleViewer->plugAccel(a_ccel);
}
@@ -2054,7 +2054,7 @@ FetchArticleIdDlg::FetchArticleIdDlg(TQWidget *parent, const char */*name*/ )
edit->setFocus();
enableButtonOK( false );
setButtonOK( i18n("&Fetch") );
- connect( edit, TQT_SIGNAL(textChanged( const TQString & )), this, TQT_SLOT(slotTextChanged(const TQString & )));
+ connect( edit, TQ_SIGNAL(textChanged( const TQString & )), this, TQ_SLOT(slotTextChanged(const TQString & )));
KNHelper::restoreWindowSize("fetchArticleWithID", this, TQSize(325,66));
}
diff --git a/knode/knmainwidget.h b/knode/knmainwidget.h
index 418e0d3e..7dabe226 100644
--- a/knode/knmainwidget.h
+++ b/knode/knmainwidget.h
@@ -62,7 +62,7 @@ class TDEActionCollection;
class KDE_EXPORT KNMainWidget : public KDockArea, virtual public KNodeIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
KNMainWidget( KXMLGUIClient *client, bool detachable, TQWidget* parent, const char* name );
@@ -413,7 +413,7 @@ private:
class FetchArticleIdDlg : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
FetchArticleIdDlg(TQWidget *parent, const char */*name*/ );
diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp
index 57488f71..b63ba859 100644
--- a/knode/knnetaccess.cpp
+++ b/knode/knnetaccess.cpp
@@ -51,7 +51,7 @@ KNNetAccess::KNNetAccess(TQObject *parent, const char *name )
}
nntpNotifier=new TQSocketNotifier(nntpInPipe[0], TQSocketNotifier::Read);
- connect(nntpNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotThreadSignal(int)));
+ connect(nntpNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotThreadSignal(int)));
// initialize the KSocks stuff in the main thread, otherwise we get
// strange effects on FreeBSD
@@ -60,14 +60,14 @@ KNNetAccess::KNNetAccess(TQObject *parent, const char *name )
nntpClient=new KNNntpClient(nntpOutPipe[0],nntpInPipe[1],nntp_Mutex);
nntpClient->start();
- connect( knGlobals.accountManager(), TQT_SIGNAL(passwordsChanged()), TQT_SLOT(slotPasswordsChanged()) );
+ connect( knGlobals.accountManager(), TQ_SIGNAL(passwordsChanged()), TQ_SLOT(slotPasswordsChanged()) );
}
KNNetAccess::~KNNetAccess()
{
- disconnect(nntpNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotThreadSignal(int)));
+ disconnect(nntpNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotThreadSignal(int)));
nntpClient->terminateClient();
triggerAsyncThread(nntpOutPipe[1]);
@@ -95,7 +95,7 @@ void KNNetAccess::addJob(KNJobData *job)
}
job->createProgressItem();
- connect( job->progressItem(), TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQT_SLOT(slotCancelJob(KPIM::ProgressItem*)) );
+ connect( job->progressItem(), TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQ_SLOT(slotCancelJob(KPIM::ProgressItem*)) );
emit netActive( true );
// put jobs which are waiting for the wallet into an extra queue
@@ -275,8 +275,8 @@ void KNNetAccess::startJobSmtp()
destination.setPass( account->pass() );
}
TDEIO::Job* job = TDEIO::storedPut( art->encodedContent(true), destination, -1, false, false, false );
- connect( job, TQT_SIGNAL( result(TDEIO::Job*) ),
- TQT_SLOT( slotJobResult(TDEIO::Job*) ) );
+ connect( job, TQ_SIGNAL( result(TDEIO::Job*) ),
+ TQ_SLOT( slotJobResult(TDEIO::Job*) ) );
if ( account->encryption() == KNServerInfo::TLS )
job->addMetaData( "tls", "on" );
else
diff --git a/knode/knnetaccess.h b/knode/knnetaccess.h
index e59d5e51..fb12949e 100644
--- a/knode/knnetaccess.h
+++ b/knode/knnetaccess.h
@@ -36,7 +36,7 @@ class KNNntpClient;
class KNNetAccess : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/knnntpaccount.cpp b/knode/knnntpaccount.cpp
index ba1657c0..c5536c96 100644
--- a/knode/knnntpaccount.cpp
+++ b/knode/knnntpaccount.cpp
@@ -46,7 +46,7 @@ void KNNntpAccountIntervalChecking::installTimer()
if(!t_imer)
{
t_imer = new TQTimer();
- connect(t_imer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotCheckNews()));
+ connect(t_imer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotCheckNews()));
}
else
{
diff --git a/knode/knnntpaccount.h b/knode/knnntpaccount.h
index 852fa9ab..fd946438 100644
--- a/knode/knnntpaccount.h
+++ b/knode/knnntpaccount.h
@@ -34,7 +34,7 @@ namespace KNConfig {
class KNNntpAccountIntervalChecking : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/knnntpclient.cpp b/knode/knnntpclient.cpp
index 2ba465be..0755dc96 100644
--- a/knode/knnntpclient.cpp
+++ b/knode/knnntpclient.cpp
@@ -15,6 +15,9 @@
*/
#include <stdlib.h>
+#include <algorithm>
+#include <vector>
+
#include <tdelocale.h>
#include <tqtextcodec.h>
#include <tqmutex.h>
@@ -132,7 +135,7 @@ void KNNntpClient::doFetchGroups()
default : status = KNGroup::unknown;
}
- target->groups->append(new KNGroupInfo(name,TQString(),false,subscribed,status));
+ target->groups->push_back(new KNGroupInfo(name,TQString(),false,subscribed,status));
}
doneLines++;
}
@@ -140,15 +143,18 @@ void KNNntpClient::doFetchGroups()
if (!job->success() || job->canceled())
return; // stopped...
- TQSortedVector<KNGroupInfo> tempVector;
- target->groups->toVector(&tempVector);
- tempVector.sort();
+ std::vector<KNGroupInfo*> tempVector;
+ for (KNGroupInfo *g : *target->groups)
+ {
+ tempVector.push_back(g);
+ }
+ std::sort(tempVector.begin(), tempVector.end(), KNGroupInfo::PtrCompFn);
if (target->getDescriptions) {
errorPrefix = i18n("The group descriptions could not be retrieved.\nThe following error occurred:\n");
progressValue = 100;
doneLines = 0;
- predictedLines = target->groups->count();
+ predictedLines = target->groups->size();
sendSignal(TSdownloadDesc);
sendSignal(TSprogressUpdate);
@@ -189,8 +195,11 @@ void KNNntpClient::doFetchGroups()
description = TQString::fromLocal8Bit(s);
info.name = name;
- if ((pos=tempVector.bsearch(&info))!=-1)
- tempVector[pos]->description = description;
+ if (std::binary_search(tempVector.begin(), tempVector.end(), &info, KNGroupInfo::PtrCompFn))
+ {
+ KNGroupInfo *posGroup = *std::lower_bound(tempVector.begin(), tempVector.end(), &info, KNGroupInfo::PtrCompFn);
+ posGroup->description = description;
+ }
}
doneLines++;
}
@@ -200,9 +209,11 @@ void KNNntpClient::doFetchGroups()
return; // stopped...
}
- target->groups->setAutoDelete(false);
- tempVector.toList(target->groups);
- target->groups->setAutoDelete(true);
+ target->groups->clear();
+ for (KNGroupInfo *g : tempVector)
+ {
+ target->groups->push_back(g);
+ }
sendSignal(TSwriteGrouplist);
if (!target->writeOut())
@@ -229,8 +240,7 @@ void KNNntpClient::doCheckNewGroups()
char *s, *line;
TQString name;
KNGroup::Status status;
- TQSortedList<KNGroupInfo> tmpList;
- tmpList.setAutoDelete(true);
+ std::list<KNGroupInfo*> tmpList;
while (getNextLine()) {
line = getCurrentLine();
@@ -261,19 +271,23 @@ void KNNntpClient::doCheckNewGroups()
default : status = KNGroup::unknown;
}
- tmpList.append(new KNGroupInfo(name,TQString(),true,false,status));
+ tmpList.push_back(new KNGroupInfo(name,TQString(),true,false,status));
}
doneLines++;
}
+ bool statusOk = true;
+
if (!job->success() || job->canceled())
- return; // stopped...
+ {
+ statusOk = false; // stopped...
+ }
- if (target->getDescriptions) {
+ if (statusOk && target->getDescriptions) {
errorPrefix = i18n("The group descriptions could not be retrieved.\nThe following error occurred:\n");
progressValue = 100;
doneLines = 0;
- predictedLines = tmpList.count()*3;
+ predictedLines = tmpList.size()*3;
sendSignal(TSdownloadDesc);
sendSignal(TSprogressUpdate);
@@ -283,14 +297,21 @@ void KNNntpClient::doCheckNewGroups()
char *s;
int rep;
- for (KNGroupInfo *group=tmpList.first(); group; group=tmpList.next()) {
+ for (KNGroupInfo *group : tmpList)
+ {
if (!sendCommand(cmd+group->name.utf8(),rep))
- return;
+ {
+ statusOk = false;
+ break;
+ }
if (rep != 215) // 215 informations follows
break;
desList.clear();
if (!getMsg(desList))
- return;
+ {
+ statusOk = false;
+ break;
+ }
if (desList.count()>0) { // group has a description
s = desList.first();
@@ -310,17 +331,26 @@ void KNNntpClient::doCheckNewGroups()
}
}
- sendSignal(TSloadGrouplist);
+ if (statusOk)
+ {
+ sendSignal(TSloadGrouplist);
- if (!target->readIn()) {
- job->setErrorString(i18n("Unable to read the group list file"));
- return;
+ if (!target->readIn()) {
+ job->setErrorString(i18n("Unable to read the group list file"));
+ }
+ else
+ {
+ target->merge(&tmpList);
+ sendSignal(TSwriteGrouplist);
+ if (!target->writeOut()) {
+ job->setErrorString(i18n("Unable to write the group list file"));
+ }
+ }
}
- target->merge(&tmpList);
- sendSignal(TSwriteGrouplist);
- if (!target->writeOut()) {
- job->setErrorString(i18n("Unable to write the group list file"));
- return;
+
+ for (KNGroupInfo *group : tmpList)
+ {
+ delete group;
}
}
diff --git a/knode/knode.cpp b/knode/knode.cpp
index 175d1845..51f4f127 100644
--- a/knode/knode.cpp
+++ b/knode/knode.cpp
@@ -46,17 +46,17 @@ KNMainWindow::KNMainWindow( TQWidget* pWidget )
setStandardToolBarMenuEnabled(true);
//config stuff
- KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(closeAllWindows()), actionCollection());
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbar()), actionCollection());
- KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfKeys()), actionCollection());
+ KStdAction::quit(kapp, TQ_SLOT(closeAllWindows()), actionCollection());
+ KStdAction::configureToolbars(this, TQ_SLOT(slotConfToolbar()), actionCollection());
+ KStdAction::keyBindings(this, TQ_SLOT(slotConfKeys()), actionCollection());
m_mainWidget = new KNMainWidget( this, true, this, 0 );
- connect( m_mainWidget, TQT_SIGNAL(signalCaptionChangeRequest(const TQString&)),
- TQT_SLOT( setCaption(const TQString&)) );
+ connect( m_mainWidget, TQ_SIGNAL(signalCaptionChangeRequest(const TQString&)),
+ TQ_SLOT( setCaption(const TQString&)) );
setCentralWidget( m_mainWidget );
setupStatusBar();
- connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL(statusMsg(const TQString&)),
- this, TQT_SLOT(slotShowStatusMsg(const TQString& )) );
+ connect( KPIM::BroadcastStatus::instance(), TQ_SIGNAL(statusMsg(const TQString&)),
+ this, TQ_SLOT(slotShowStatusMsg(const TQString& )) );
createGUI( "knodeui.rc" );
knGlobals.instance = 0;
@@ -77,7 +77,7 @@ void KNMainWindow::slotConfToolbar()
{
saveMainWindowSettings(knGlobals.config(),"mainWindow_options");
KEditToolbar dlg(actionCollection(), "knodeui.rc");
- connect(&dlg,TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() ));
+ connect(&dlg,TQ_SIGNAL( newToolbarConfig() ), this, TQ_SLOT( slotNewToolbarConfig() ));
dlg.exec();
}
diff --git a/knode/knode.h b/knode/knode.h
index f4bbf19f..3d1c7993 100644
--- a/knode/knode.h
+++ b/knode/knode.h
@@ -43,7 +43,7 @@ class KNHeaderView;
class KNMainWindow : public TDEMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/knode_part.cpp b/knode/knode_part.cpp
index c5169a5b..028a267d 100644
--- a/knode/knode_part.cpp
+++ b/knode/knode_part.cpp
@@ -68,13 +68,13 @@ KNodePart::KNodePart(TQWidget *parentWidget, const char *widgetName,
// create a canvas to insert our widget
TQWidget *canvas = new TQWidget(parentWidget, widgetName);
- canvas->setFocusPolicy(TQ_ClickFocus);
+ canvas->setFocusPolicy(TQWidget::ClickFocus);
setWidget(canvas);
mainWidget = new KNMainWidget( this, false, canvas, "knode_widget" );
TQVBoxLayout *topLayout = new TQVBoxLayout(canvas);
topLayout->addWidget(mainWidget);
- mainWidget->setFocusPolicy(TQ_ClickFocus);
+ mainWidget->setFocusPolicy(TQWidget::ClickFocus);
kapp->dcopClient()->resume(); // Ok. We are ready for DCOP requests.
diff --git a/knode/knode_part.h b/knode/knode_part.h
index b1136db4..99f810c5 100644
--- a/knode/knode_part.h
+++ b/knode/knode_part.h
@@ -41,7 +41,7 @@ class KNMainWidget;
class KNodePart: public KParts::ReadOnlyPart
{
- Q_OBJECT
+ TQ_OBJECT
public:
KNodePart(TQWidget *parentWidget, const char *widgetName,
diff --git a/knode/knrangefilter.cpp b/knode/knrangefilter.cpp
index f5aa5593..a74a48df 100644
--- a/knode/knrangefilter.cpp
+++ b/knode/knrangefilter.cpp
@@ -134,9 +134,9 @@ KNRangeFilterWidget::KNRangeFilterWidget(const TQString& value, int min, int max
topL->setColStretch(1,1);
topL->setColStretch(5,1);
- connect(op1, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOp1Changed(int)));
- connect(op2, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOp2Changed(int)));
- connect(enabled, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEnabled(bool)));
+ connect(op1, TQ_SIGNAL(activated(int)), TQ_SLOT(slotOp1Changed(int)));
+ connect(op2, TQ_SIGNAL(activated(int)), TQ_SLOT(slotOp2Changed(int)));
+ connect(enabled, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEnabled(bool)));
slotEnabled(false);
}
diff --git a/knode/knrangefilter.h b/knode/knrangefilter.h
index 1a1f4ebc..f5c429f3 100644
--- a/knode/knrangefilter.h
+++ b/knode/knrangefilter.h
@@ -62,7 +62,7 @@ class KNRangeFilter {
class KNRangeFilterWidget : public TQGroupBox {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/knscoring.h b/knode/knscoring.h
index 1e0c8c37..83d332fe 100644
--- a/knode/knscoring.h
+++ b/knode/knscoring.h
@@ -60,7 +60,7 @@ public:
class KNScoringManager : public KScoringManager
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/knsearchdialog.cpp b/knode/knsearchdialog.cpp
index b38e0650..646969ee 100644
--- a/knode/knsearchdialog.cpp
+++ b/knode/knsearchdialog.cpp
@@ -60,9 +60,9 @@ KNSearchDialog::KNSearchDialog(searchType /*t*/, TQWidget *parent)
topL->addLayout(filterL, 1);
topL->addWidget(bg);
- connect(startBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStartClicked()));
- connect(newBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewClicked()));
- connect(closeBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCloseClicked()));
+ connect(startBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStartClicked()));
+ connect(newBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewClicked()));
+ connect(closeBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCloseClicked()));
f_ilter=new KNArticleFilter();
f_ilter->setLoaded(true);
diff --git a/knode/knsearchdialog.h b/knode/knsearchdialog.h
index 37b12eb3..fac2f1be 100644
--- a/knode/knsearchdialog.h
+++ b/knode/knsearchdialog.h
@@ -27,7 +27,7 @@ class KNArticleFilter;
class KNSearchDialog : public TQDialog {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/knsourceviewwindow.cpp b/knode/knsourceviewwindow.cpp
index 71af3c18..651bc1e8 100644
--- a/knode/knsourceviewwindow.cpp
+++ b/knode/knsourceviewwindow.cpp
@@ -27,7 +27,7 @@ KNSourceViewWindow::KNSourceViewWindow( const TQString &text )
{
setWFlags(WType_TopLevel | WDestructiveClose);
TQAccel *accel = new TQAccel( this, "browser close-accel" );
- accel->connectItem( accel->insertItem( TQt::Key_Escape ), this , TQT_SLOT( close() ));
+ accel->connectItem( accel->insertItem( TQt::Key_Escape ), this , TQ_SLOT( close() ));
KNConfig::Appearance *app=knGlobals.configManager()->appearance();
setTextFormat( PlainText );
diff --git a/knode/knsourceviewwindow.h b/knode/knsourceviewwindow.h
index 595a1a99..2007a1a3 100644
--- a/knode/knsourceviewwindow.h
+++ b/knode/knsourceviewwindow.h
@@ -20,7 +20,7 @@
class KNSourceViewWindow : public KTextBrowser {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/knstatusfilter.cpp b/knode/knstatusfilter.cpp
index ec098d9c..d770ae22 100644
--- a/knode/knstatusfilter.cpp
+++ b/knode/knstatusfilter.cpp
@@ -116,7 +116,7 @@ KNStatusFilterWidget::KNStatusFilterWidget(TQWidget *parent) :
topL->setColStretch(2,1);
topL->setRowStretch(4,1);
- connect(this, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotEnabled(int)));
+ connect(this, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotEnabled(int)));
}
diff --git a/knode/knstatusfilter.h b/knode/knstatusfilter.h
index cb949fb7..39ad9d91 100644
--- a/knode/knstatusfilter.h
+++ b/knode/knstatusfilter.h
@@ -53,7 +53,7 @@ class KNStatusFilter {
class KNStatusFilterWidget : public TQButtonGroup {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/knstringfilter.h b/knode/knstringfilter.h
index 8552d087..64df0340 100644
--- a/knode/knstringfilter.h
+++ b/knode/knstringfilter.h
@@ -57,7 +57,7 @@ class KNStringFilter {
class KNStringFilterWidget : public TQGroupBox {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/knwidgets.cpp b/knode/knwidgets.cpp
index b4c9a160..3e1d8dec 100644
--- a/knode/knwidgets.cpp
+++ b/knode/knwidgets.cpp
@@ -110,7 +110,7 @@ void KNDialogListBox::keyPressEvent(TQKeyEvent *e)
KNDockWidgetHeaderDrag::KNDockWidgetHeaderDrag(TQWidget *focusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name )
: KDockWidgetHeaderDrag(parent, dock, name), f_ocus(false)
{
- connect(focusWidget, TQT_SIGNAL(focusChanged(TQFocusEvent*)), TQT_SLOT(slotFocusChanged(TQFocusEvent*)));
+ connect(focusWidget, TQ_SIGNAL(focusChanged(TQFocusEvent*)), TQ_SLOT(slotFocusChanged(TQFocusEvent*)));
}
diff --git a/knode/knwidgets.h b/knode/knwidgets.h
index dcdfe35b..53b4b853 100644
--- a/knode/knwidgets.h
+++ b/knode/knwidgets.h
@@ -68,7 +68,7 @@ class KNDialogListBox : public TQListBox
class KNDockWidgetHeaderDrag : public KDockWidgetHeaderDrag
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/knode/smtpaccountwidget_base.ui b/knode/smtpaccountwidget_base.ui
index 702ce90d..8913c509 100644
--- a/knode/smtpaccountwidget_base.ui
+++ b/knode/smtpaccountwidget_base.ui
@@ -143,9 +143,6 @@
<property name="text">
<string>None</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="TQRadioButton">
<property name="name">
@@ -154,9 +151,6 @@
<property name="text">
<string>SSL</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="TQRadioButton">
<property name="name">
@@ -165,9 +159,6 @@
<property name="text">
<string>TLS</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
</vbox>
</widget>
@@ -219,10 +210,10 @@
<slot>changed()</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot access="protected">useExternalMailerToggled(bool)</slot>
<slot access="protected">loginToggled(bool)</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in declaration">tdecmodule.h</include>
diff --git a/knode/utilities.h b/knode/utilities.h
index e88ca695..f20d99e1 100644
--- a/knode/utilities.h
+++ b/knode/utilities.h
@@ -20,8 +20,6 @@
#include <tqfile.h>
#include <tqglobal.h>
-#include <tqptrvector.h>
-#include <tqptrlist.h>
class TQWidget;
class TQString;
@@ -36,25 +34,6 @@ class KTempFile;
// utility classes
//*****************************************************************************
-/** clone of TQSortedList... */
-template<class type> class TQ_EXPORT TQSortedVector : public TQPtrVector<type>
-{
-public:
- TQSortedVector() {}
- TQSortedVector ( uint size ) : TQPtrVector<type>(size) {}
- TQSortedVector( const TQSortedVector<type> &l ) : TQPtrVector<type>(l) {}
- ~TQSortedVector() { TQPtrVector<type>::clear(); }
- TQSortedVector<type> &operator=(const TQSortedVector<type> &l)
- { return (TQSortedVector<type>&)TQPtrList<type>::operator=(l); }
-
- virtual int compareItems( TQPtrCollection::Item s1, TQPtrCollection::Item s2 )
- { if ( *((type*)s1) == *((type*)s2) ) return 0; return ( *((type*)s1) < *((type*)s2) ? -1 : 1 ); }
-};
-
-
-//==============================================================================
-
-
class KNFile : public TQFile {
public:
@@ -63,7 +42,7 @@ class KNFile : public TQFile {
const TQCString& readLine();
const TQCString& readLineWnewLine();
/** searches for the string from the current file position
- returns -1 when the string wasn't found. */
+ returns -1 when the string wasn't found. */
int findString(const char *s);
protected:
diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index 2a78d718..69fb1d43 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -105,47 +105,47 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
// create the menu items for the note - not the editor...
// rename, mail, print, save as, insert date, alarm, close, delete, new note
new TDEAction( i18n("New"), "document-new", 0,
- TQT_TQOBJECT(this),TQT_SLOT(slotRequestNewNote()) , actionCollection(), "new_note" );
+ this,TQ_SLOT(slotRequestNewNote()) , actionCollection(), "new_note" );
new TDEAction( i18n("Rename..."), "text", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotRename()), actionCollection(), "rename_note" );
+ this, TQ_SLOT(slotRename()), actionCollection(), "rename_note" );
m_readOnly = new TDEToggleAction( i18n("Lock"), "system-lock-screen" , 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotUpdateReadOnly()), actionCollection(), "lock_note" );
+ this, TQ_SLOT(slotUpdateReadOnly()), actionCollection(), "lock_note" );
m_readOnly->setCheckedState( KGuiItem( i18n("Unlock"), "unlock" ) );
new TDEAction( i18n("Hide"), "window-close" , Key_Escape,
- TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection(), "hide_note" );
+ this, TQ_SLOT(slotClose()), actionCollection(), "hide_note" );
new TDEAction( i18n("Delete"), "knotes_delete", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotKill()), actionCollection(), "delete_note" );
+ this, TQ_SLOT(slotKill()), actionCollection(), "delete_note" );
new TDEAction( i18n("Insert Date"), "knotes_date", 0 ,
- TQT_TQOBJECT(this), TQT_SLOT(slotInsDate()), actionCollection(), "insert_date" );
+ this, TQ_SLOT(slotInsDate()), actionCollection(), "insert_date" );
new TDEAction( i18n("Set Alarm..."), "knotes_alarm", 0 ,
- TQT_TQOBJECT(this), TQT_SLOT(slotSetAlarm()), actionCollection(), "set_alarm" );
+ this, TQ_SLOT(slotSetAlarm()), actionCollection(), "set_alarm" );
new TDEAction( i18n("Send..."), "network", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotSend()), actionCollection(), "send_note" );
+ this, TQ_SLOT(slotSend()), actionCollection(), "send_note" );
new TDEAction( i18n("Mail..."), "mail-send", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotMail()), actionCollection(), "mail_note" );
+ this, TQ_SLOT(slotMail()), actionCollection(), "mail_note" );
new TDEAction( i18n("Save As..."), "document-save-as", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection(), "save_note" );
- KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), actionCollection(), "print_note" );
+ this, TQ_SLOT(slotSaveAs()), actionCollection(), "save_note" );
+ KStdAction::print( this, TQ_SLOT(slotPrint()), actionCollection(), "print_note" );
new TDEAction( i18n("Preferences..."), "configure", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actionCollection(), "configure_note" );
+ this, TQ_SLOT(slotPreferences()), actionCollection(), "configure_note" );
m_keepAbove = new TDEToggleAction( i18n("Keep Above Others"), "go-up", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_above" );
+ this, TQ_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_above" );
m_keepAbove->setExclusiveGroup( "keepAB" );
m_keepBelow = new TDEToggleAction( i18n("Keep Below Others"), "go-down", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_below" );
+ this, TQ_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_below" );
m_keepBelow->setExclusiveGroup( "keepAB" );
m_toDesktop = new TDEListAction( i18n("To Desktop"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotPopupActionToDesktop(int)), actionCollection(), "to_desktop" );
- connect( m_toDesktop->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateDesktopActions()) );
+ this, TQ_SLOT(slotPopupActionToDesktop(int)), actionCollection(), "to_desktop" );
+ connect( m_toDesktop->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotUpdateDesktopActions()) );
// invisible action to walk through the notes to make this configurable
new TDEAction( i18n("Walk Through Notes"), 0, SHIFT+Key_BackTab,
- TQT_TQOBJECT(this), TQT_SIGNAL(sigShowNextNote()), actionCollection(), "walk_notes" );
+ this, TQ_SIGNAL(sigShowNextNote()), actionCollection(), "walk_notes" );
// create the note header, button and label...
m_label = new TQLabel( this );
@@ -155,17 +155,17 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
setName( m_journal->summary() ); // don't worry, no signals are connected at this stage yet
m_button = new KNoteButton( "knotes_close", this );
- connect( m_button, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotClose()) );
+ connect( m_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClose()) );
// create the note editor
m_editor = new KNoteEdit( actionCollection(), this );
m_editor->setNote( this );
m_editor->installEventFilter( this ); // receive events (for modified)
m_editor->viewport()->installEventFilter( this );
- connect( m_editor, TQT_SIGNAL(contentsMoving( int, int )), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateViewport( int, int )));
+ connect( m_editor, TQ_SIGNAL(contentsMoving( int, int )), this, TQ_SLOT(slotUpdateViewport( int, int )));
KXMLGUIBuilder builder( this );
- KXMLGUIFactory factory( &builder, TQT_TQOBJECT(this) );
+ KXMLGUIFactory factory( &builder, this );
factory.addClient( this );
m_menu = dynamic_cast<TDEPopupMenu*>(factory.container( "note_context", this ));
@@ -600,9 +600,9 @@ void KNote::find( const TQString& pattern, long options )
delete m_find;
m_find = new KFind( pattern, options, this );
- connect( m_find, TQT_SIGNAL(highlight( const TQString &, int, int )),
- TQT_TQOBJECT(this), TQT_SLOT(slotHighlight( const TQString &, int, int )) );
- connect( m_find, TQT_SIGNAL(findNext()), TQT_TQOBJECT(this), TQT_SLOT(slotFindNext()) );
+ connect( m_find, TQ_SIGNAL(highlight( const TQString &, int, int )),
+ this, TQ_SLOT(slotHighlight( const TQString &, int, int )) );
+ connect( m_find, TQ_SIGNAL(findNext()), this, TQ_SLOT(slotFindNext()) );
m_find->setData( plainText() );
slotFindNext();
@@ -816,8 +816,8 @@ void KNote::slotPreferences()
// create a new preferences dialog...
KNoteConfigDlg *dialog = new KNoteConfigDlg( m_config, name(), this, noteId().utf8() );
- connect( dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotApplyConfig()) );
- connect( this, TQT_SIGNAL(sigNameChanged()), dialog, TQT_SLOT(slotUpdateCaption()) );
+ connect( dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotApplyConfig()) );
+ connect( this, TQ_SIGNAL(sigNameChanged()), dialog, TQ_SLOT(slotUpdateCaption()) );
dialog->show();
}
@@ -1339,7 +1339,7 @@ bool KNote::eventFilter( TQObject *o, TQEvent *ev )
return true;
}
- if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_label) )
+ if ( o == m_label )
{
TQMouseEvent *e = (TQMouseEvent *)ev;
@@ -1349,12 +1349,12 @@ bool KNote::eventFilter( TQObject *o, TQEvent *ev )
slotRename();
}
if ( ev->type() == TQEvent::MouseButtonPress &&
- (e->button() == Qt::LeftButton || e->button() == Qt::MidButton))
+ (e->button() == TQt::LeftButton || e->button() == TQt::MidButton))
{
- e->button() == Qt::LeftButton ? KWin::raiseWindow( winId() )
+ e->button() == TQt::LeftButton ? KWin::raiseWindow( winId() )
: KWin::lowerWindow( winId() );
- XUngrabPointer( tqt_xdisplay(), GET_QT_X_TIME() );
+ XUngrabPointer( tqt_xdisplay(), get_tqt_x_time() );
NETRootInfo wm_root( tqt_xdisplay(), NET::WMMoveResize );
wm_root.moveResizeRequest( winId(), e->globalX(), e->globalY(), NET::Move );
return true;
@@ -1370,7 +1370,7 @@ bool KNote::eventFilter( TQObject *o, TQEvent *ev )
#endif
if ( m_menu && ( ev->type() == TQEvent::MouseButtonPress )
- && ( e->button() == Qt::RightButton ) )
+ && ( e->button() == TQt::RightButton ) )
{
m_menu->popup( TQCursor::pos() );
return true;
@@ -1379,9 +1379,9 @@ bool KNote::eventFilter( TQObject *o, TQEvent *ev )
return false;
}
- if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editor) ) {
+ if ( o == m_editor ) {
if ( ev->type() == TQEvent::FocusOut ) {
- TQFocusEvent *fe = TQT_TQFOCUSEVENT(ev);
+ TQFocusEvent *fe = static_cast<TQFocusEvent*>(ev);
if ( fe->reason() != TQFocusEvent::Popup &&
fe->reason() != TQFocusEvent::Mouse ) {
updateFocus();
@@ -1398,11 +1398,11 @@ bool KNote::eventFilter( TQObject *o, TQEvent *ev )
return false;
}
- if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editor->viewport()) )
+ if ( o == m_editor->viewport() )
{
if ( m_edit_menu &&
ev->type() == TQEvent::MouseButtonPress &&
- ((TQMouseEvent *)ev)->button() == Qt::RightButton )
+ ((TQMouseEvent *)ev)->button() == TQt::RightButton )
{
m_edit_menu->popup( TQCursor::pos() );
return true;
diff --git a/knotes/knote.h b/knotes/knote.h
index 201c7f79..73ca8f4a 100644
--- a/knotes/knote.h
+++ b/knotes/knote.h
@@ -50,7 +50,7 @@ namespace KCal {
class KNote : public TQFrame, virtual public KXMLGUIClient
{
- Q_OBJECT
+ TQ_OBJECT
public:
KNote( TQDomDocument buildDoc, KCal::Journal *journal, TQWidget *parent = 0,
diff --git a/knotes/knotealarmdlg.cpp b/knotes/knotealarmdlg.cpp
index 4496da26..5e43a86a 100644
--- a/knotes/knotealarmdlg.cpp
+++ b/knotes/knotealarmdlg.cpp
@@ -49,7 +49,7 @@ KNoteAlarmDlg::KNoteAlarmDlg( const TQString& caption, TQWidget *parent, const c
: KDialogBase( parent, name, true, caption, Ok|Cancel, Ok )
{
TQVBox *page = makeVBoxMainWidget();
- TQGroupBox *group = new TQGroupBox( 3, Qt::Vertical, i18n("Scheduled Alarm"), page );
+ TQGroupBox *group = new TQGroupBox( 3, TQt::Vertical, i18n("Scheduled Alarm"), page );
m_buttons = new TQButtonGroup( page );
m_buttons->hide();
@@ -72,7 +72,7 @@ KNoteAlarmDlg::KNoteAlarmDlg( const TQString& caption, TQWidget *parent, const c
label_in->setEnabled( false ); // TODO
in->hide(); //show it and enable it when feature will implement
- connect( m_buttons, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotButtonChanged( int )) );
+ connect( m_buttons, TQ_SIGNAL(clicked( int )), TQ_SLOT(slotButtonChanged( int )) );
}
diff --git a/knotes/knotealarmdlg.h b/knotes/knotealarmdlg.h
index b018418a..a64f2daa 100644
--- a/knotes/knotealarmdlg.h
+++ b/knotes/knotealarmdlg.h
@@ -45,7 +45,7 @@ namespace KCal {
class KNoteAlarmDlg : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KNoteAlarmDlg( const TQString& caption, TQWidget *parent=0, const char *name=0 );
diff --git a/knotes/knotebutton.cpp b/knotes/knotebutton.cpp
index ff89b2de..47d64a3e 100644
--- a/knotes/knotebutton.cpp
+++ b/knotes/knotebutton.cpp
@@ -33,7 +33,7 @@
KNoteButton::KNoteButton( const TQString& icon, TQWidget *parent, const char *name )
: TQPushButton( parent, name )
{
- setFocusPolicy( TQ_NoFocus );
+ setFocusPolicy( TQWidget::NoFocus );
setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
m_flat = true;
@@ -78,7 +78,7 @@ void KNoteButton::drawButton( TQPainter* p )
if ( !m_flat )
flags |= TQStyle::Style_MouseOver;
- style().tqdrawPrimitive( TQStyle::PE_ButtonTool, p, rect(), colorGroup(), flags );
+ style().drawPrimitive( TQStyle::PE_ButtonTool, p, rect(), colorGroup(), flags );
drawButtonLabel( p );
}
diff --git a/knotes/knotebutton.h b/knotes/knotebutton.h
index 5d1739ae..1b5d4960 100644
--- a/knotes/knotebutton.h
+++ b/knotes/knotebutton.h
@@ -30,7 +30,7 @@ class TQResizeEvent;
class KNoteButton: public TQPushButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
KNoteButton( const TQString& icon, TQWidget *parent=0, const char *name=0 );
diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp
index bd388c38..60f7a539 100644
--- a/knotes/knoteconfigdlg.cpp
+++ b/knotes/knoteconfigdlg.cpp
@@ -81,7 +81,7 @@ KNoteConfigDlg::~KNoteConfigDlg()
void KNoteConfigDlg::slotUpdateCaption()
{
- KNote *note = ::tqqt_cast<KNote *>(sender());
+ KNote *note = ::tqt_cast<KNote *>(sender());
if ( note )
setCaption( note->name() );
}
diff --git a/knotes/knoteconfigdlg.h b/knotes/knoteconfigdlg.h
index a72859a1..97c4ae9e 100644
--- a/knotes/knoteconfigdlg.h
+++ b/knotes/knoteconfigdlg.h
@@ -29,7 +29,7 @@ class KNoteConfig;
class KNoteConfigDlg : public TDEConfigDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
KNoteConfigDlg( KNoteConfig *config, const TQString &title,
diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp
index 1316bc3a..4ef1274d 100644
--- a/knotes/knoteedit.cpp
+++ b/knotes/knoteedit.cpp
@@ -45,27 +45,27 @@ KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char
setLinkUnderline( true );
setCheckSpellingEnabled(false);
// create the actions for the RMB menu
- undo = KStdAction::undo( TQT_TQOBJECT(this), TQT_SLOT(undo()), actions );
- redo = KStdAction::redo( TQT_TQOBJECT(this), TQT_SLOT(redo()), actions );
+ undo = KStdAction::undo( this, TQ_SLOT(undo()), actions );
+ redo = KStdAction::redo( this, TQ_SLOT(redo()), actions );
undo->setEnabled( isUndoAvailable() );
redo->setEnabled( isRedoAvailable() );
- m_cut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(cut()), actions );
- m_copy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(copy()), actions );
- m_paste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(paste()), actions );
+ m_cut = KStdAction::cut( this, TQ_SLOT(cut()), actions );
+ m_copy = KStdAction::copy( this, TQ_SLOT(copy()), actions );
+ m_paste = KStdAction::paste( this, TQ_SLOT(paste()), actions );
m_cut->setEnabled( false );
m_copy->setEnabled( false );
m_paste->setEnabled( true );
- connect( this, TQT_SIGNAL(undoAvailable(bool)), TQT_TQOBJECT(this), TQT_SLOT(setEnabledUndo(bool)) );
- connect( this, TQT_SIGNAL(redoAvailable(bool)), TQT_TQOBJECT(this), TQT_SLOT(setEnabledRedo(bool)) );
+ connect( this, TQ_SIGNAL(undoAvailable(bool)), this, TQ_SLOT(setEnabledUndo(bool)) );
+ connect( this, TQ_SIGNAL(redoAvailable(bool)), this, TQ_SLOT(setEnabledRedo(bool)) );
- connect( this, TQT_SIGNAL(copyAvailable(bool)), TQT_TQOBJECT(this), TQT_SLOT( slotCutEnabled( bool ) ) );
- connect( this, TQT_SIGNAL(copyAvailable(bool)), m_copy, TQT_SLOT(setEnabled(bool)) );
+ connect( this, TQ_SIGNAL(copyAvailable(bool)), this, TQ_SLOT( slotCutEnabled( bool ) ) );
+ connect( this, TQ_SIGNAL(copyAvailable(bool)), m_copy, TQ_SLOT(setEnabled(bool)) );
- new TDEAction( KStdGuiItem::clear(), 0, TQT_TQOBJECT(this), TQT_SLOT(clear()), actions, "edit_clear" );
- KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT(selectAll()), actions );
+ new TDEAction( KStdGuiItem::clear(), 0, this, TQ_SLOT(clear()), actions, "edit_clear" );
+ KStdAction::selectAll( this, TQ_SLOT(selectAll()), actions );
// create the actions modifying the text format
m_textBold = new TDEToggleAction( i18n("Bold"), "format-text-bold", CTRL + Key_B, 0, 0,
@@ -77,23 +77,23 @@ KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char
m_textStrikeOut = new TDEToggleAction( i18n("Strike Out"), "format-text-strikethrough", CTRL + Key_S, 0, 0,
actions, "format_strikeout" );
- connect( m_textBold, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setBold(bool)) );
- connect( m_textItalic, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setItalic(bool)) );
- connect( m_textUnderline, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setUnderline(bool)) );
- connect( m_textStrikeOut, TQT_SIGNAL(toggled(bool)), TQT_SLOT(textStrikeOut(bool)) );
+ connect( m_textBold, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setBold(bool)) );
+ connect( m_textItalic, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setItalic(bool)) );
+ connect( m_textUnderline, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setUnderline(bool)) );
+ connect( m_textStrikeOut, TQ_SIGNAL(toggled(bool)), TQ_SLOT(textStrikeOut(bool)) );
m_textAlignLeft = new TDEToggleAction( i18n("Align Left"), "format-text-direction-ltr", ALT + Key_L,
- TQT_TQOBJECT(this), TQT_SLOT(textAlignLeft()),
+ this, TQ_SLOT(textAlignLeft()),
actions, "format_alignleft" );
m_textAlignLeft->setChecked( true ); // just a dummy, will be updated later
m_textAlignCenter = new TDEToggleAction( i18n("Align Center"), "text_center", ALT + Key_C,
- TQT_TQOBJECT(this), TQT_SLOT(textAlignCenter()),
+ this, TQ_SLOT(textAlignCenter()),
actions, "format_aligncenter" );
m_textAlignRight = new TDEToggleAction( i18n("Align Right"), "format-text-direction-rtl", ALT + Key_R,
- TQT_TQOBJECT(this), TQT_SLOT(textAlignRight()),
+ this, TQ_SLOT(textAlignRight()),
actions, "format_alignright" );
m_textAlignBlock = new TDEToggleAction( i18n("Align Block"), "text_block", ALT + Key_B,
- TQT_TQOBJECT(this), TQT_SLOT(textAlignBlock()),
+ this, TQ_SLOT(textAlignBlock()),
actions, "format_alignblock" );
m_textAlignLeft->setExclusiveGroup( "align" );
@@ -102,16 +102,16 @@ KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char
m_textAlignBlock->setExclusiveGroup( "align" );
m_textList = new TDEToggleAction( i18n("List"), "enum_list", 0,
- TQT_TQOBJECT(this), TQT_SLOT(textList()),
+ this, TQ_SLOT(textList()),
actions, "format_list" );
m_textList->setExclusiveGroup( "style" );
m_textSuper = new TDEToggleAction( i18n("Superscript"), "text_super", 0,
- TQT_TQOBJECT(this), TQT_SLOT(textSuperScript()),
+ this, TQ_SLOT(textSuperScript()),
actions, "format_super" );
m_textSub = new TDEToggleAction( i18n("Subscript"), "text_sub", 0,
- TQT_TQOBJECT(this), TQT_SLOT(textSubScript()),
+ this, TQ_SLOT(textSubScript()),
actions, "format_sub" );
m_textSuper->setExclusiveGroup( "valign" );
@@ -120,38 +120,38 @@ KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char
// There is no easy possibility to implement text indenting with TQTextEdit
//
// m_textIncreaseIndent = new TDEAction( i18n("Increase Indent"), "format_increaseindent", 0,
-// TQT_TQOBJECT(this), TQT_SLOT(textIncreaseIndent()),
+// this, TQ_SLOT(textIncreaseIndent()),
// actions, "format_increaseindent" );
//
// m_textDecreaseIndent = new TDEAction( i18n("Decrease Indent"), "format_decreaseindent", 0,
-// TQT_TQOBJECT(this), TQT_SLOT(textDecreaseIndent()),
+// this, TQ_SLOT(textDecreaseIndent()),
// actions, "format_decreaseindent" );
TQPixmap pix( ICON_SIZE, ICON_SIZE );
pix.fill( black ); // just a dummy, gets updated before widget is shown
- m_textColor = new TDEAction( i18n("Text Color..."), pix, 0, TQT_TQOBJECT(this),
- TQT_SLOT(textColor()), actions, "format_color" );
+ m_textColor = new TDEAction( i18n("Text Color..."), pix, 0, this,
+ TQ_SLOT(textColor()), actions, "format_color" );
m_textFont = new TDEFontAction( i18n("Text Font"), "text", KKey(),
actions, "format_font" );
- connect( m_textFont, TQT_SIGNAL(activated( const TQString & )),
- TQT_TQOBJECT(this), TQT_SLOT(setFamily( const TQString & )) );
+ connect( m_textFont, TQ_SIGNAL(activated( const TQString & )),
+ this, TQ_SLOT(setFamily( const TQString & )) );
m_textSize = new TDEFontSizeAction( i18n("Text Size"), KKey(),
actions, "format_size" );
- connect( m_textSize, TQT_SIGNAL(fontSizeChanged( int )),
- TQT_TQOBJECT(this), TQT_SLOT(setPointSize( int )) );
+ connect( m_textSize, TQ_SIGNAL(fontSizeChanged( int )),
+ this, TQ_SLOT(setPointSize( int )) );
// TQTextEdit connections
- connect( this, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) );
- connect( this, TQT_SIGNAL(currentFontChanged( const TQFont & )),
- TQT_TQOBJECT(this), TQT_SLOT(fontChanged( const TQFont & )) );
- connect( this, TQT_SIGNAL(currentColorChanged( const TQColor & )),
- TQT_TQOBJECT(this), TQT_SLOT(colorChanged( const TQColor & )) );
- connect( this, TQT_SIGNAL(currentAlignmentChanged( int )),
- TQT_TQOBJECT(this), TQT_SLOT(alignmentChanged( int )) );
- connect( this, TQT_SIGNAL(currentVerticalAlignmentChanged( VerticalAlignment )),
- TQT_TQOBJECT(this), TQT_SLOT(verticalAlignmentChanged( VerticalAlignment )) );
+ connect( this, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) );
+ connect( this, TQ_SIGNAL(currentFontChanged( const TQFont & )),
+ this, TQ_SLOT(fontChanged( const TQFont & )) );
+ connect( this, TQ_SIGNAL(currentColorChanged( const TQColor & )),
+ this, TQ_SLOT(colorChanged( const TQColor & )) );
+ connect( this, TQ_SIGNAL(currentAlignmentChanged( int )),
+ this, TQ_SLOT(alignmentChanged( int )) );
+ connect( this, TQ_SIGNAL(currentVerticalAlignmentChanged( VerticalAlignment )),
+ this, TQ_SLOT(verticalAlignmentChanged( VerticalAlignment )) );
}
KNoteEdit::~KNoteEdit()
@@ -541,13 +541,13 @@ TQPopupMenu *KNoteEdit::createPopupMenu( const TQPoint &pos )
menu->insertSeparator();
id = menu->insertItem( SmallIconSet( "tools-check-spelling" ), i18n( "Check Spelling..." ),
- TQT_TQOBJECT(this), TQT_SLOT( checkSpelling() ) );
+ this, TQ_SLOT( checkSpelling() ) );
if( text().isEmpty() )
menu->setItemEnabled( id, false );
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());
}
diff --git a/knotes/knoteedit.h b/knotes/knoteedit.h
index caa2c51a..259cba82 100644
--- a/knotes/knoteedit.h
+++ b/knotes/knoteedit.h
@@ -37,7 +37,7 @@ class TDEFontSizeAction;
class KNoteEdit : public KTextEdit
{
- Q_OBJECT
+ TQ_OBJECT
public:
KNoteEdit( TDEActionCollection *actions, TQWidget *parent=0, const char *name=0 );
diff --git a/knotes/knotehostdlg.cpp b/knotes/knotehostdlg.cpp
index 9d8fff97..15a32c66 100644
--- a/knotes/knotehostdlg.cpp
+++ b/knotes/knotehostdlg.cpp
@@ -60,8 +60,8 @@ KNoteHostDlg::KNoteHostDlg( const TQString &caption, TQWidget *parent, const cha
m_hostCombo->setHistoryItems( KNotesGlobalConfig::knownHosts(), true );
m_hostCombo->setFocus();
//m_hostCombo->completionObject()->setItems( KNotesGlobalConfig::hostCompletions() );
- connect( m_hostCombo->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & ) ),
- this, TQT_SLOT( slotTextChanged( const TQString & ) ) );
+ connect( m_hostCombo->lineEdit(), TQ_SIGNAL( textChanged ( const TQString & ) ),
+ this, TQ_SLOT( slotTextChanged( const TQString & ) ) );
slotTextChanged( m_hostCombo->lineEdit()->text() );
}
diff --git a/knotes/knotehostdlg.h b/knotes/knotehostdlg.h
index 03a83dcb..81afc6c5 100644
--- a/knotes/knotehostdlg.h
+++ b/knotes/knotehostdlg.h
@@ -43,7 +43,7 @@ class KHistoryCombo;
*/
class KNoteHostDlg : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KNoteHostDlg( const TQString& caption, TQWidget *parent=0, const char *name=0 );
diff --git a/knotes/knotesalarm.cpp b/knotes/knotesalarm.cpp
index c2d1bd1c..99f05cd9 100644
--- a/knotes/knotesalarm.cpp
+++ b/knotes/knotesalarm.cpp
@@ -49,7 +49,7 @@ KNotesAlarm::KNotesAlarm( KNotesResourceManager *manager, TQObject *parent, cons
{
// TODO: fix timezone stuff?
- connect( &m_checkTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAlarms()) );
+ connect( &m_checkTimer, TQ_SIGNAL(timeout()), TQ_SLOT(checkAlarms()) );
m_checkTimer.start( 1000 * KNotesGlobalConfig::self()->checkInterval() ); // interval in seconds
}
diff --git a/knotes/knotesalarm.h b/knotes/knotesalarm.h
index 84bfff50..c173f880 100644
--- a/knotes/knotesalarm.h
+++ b/knotes/knotesalarm.h
@@ -44,7 +44,7 @@ namespace KCal {
class KNotesAlarm : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
KNotesAlarm( KNotesResourceManager *manager, TQObject *parent = 0, const char *name = 0 );
diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp
index 4590e704..1f7e9b99 100644
--- a/knotes/knotesapp.cpp
+++ b/knotes/knotesapp.cpp
@@ -65,7 +65,7 @@ public:
{
m_keyChooser = new KKeyChooser( globals, this );
setMainWidget( m_keyChooser );
- connect( this, TQT_SIGNAL(defaultClicked()), m_keyChooser, TQT_SLOT(allDefault()) );
+ connect( this, TQ_SIGNAL(defaultClicked()), m_keyChooser, TQ_SLOT(allDefault()) );
}
void insert( TDEActionCollection *actions )
@@ -96,7 +96,7 @@ KNotesApp::KNotesApp()
: DCOPObject("KNotesIface"), TQLabel( 0, 0, WType_TopLevel ),
m_alarm( 0 ), m_listener( 0 ), m_find( 0 ), m_findPos( 0 )
{
- connect( kapp, TQT_SIGNAL(lastWindowClosed()), kapp, TQT_SLOT(quit()) );
+ connect( kapp, TQ_SIGNAL(lastWindowClosed()), kapp, TQ_SLOT(quit()) );
m_noteList.setAutoDelete( true );
m_noteActions.setAutoDelete( true );
@@ -112,25 +112,25 @@ KNotesApp::KNotesApp()
// create the GUI...
new TDEAction( i18n("New Note"), "document-new", 0,
- TQT_TQOBJECT(this), TQT_SLOT(newNote()), actionCollection(), "new_note" );
+ this, TQ_SLOT(newNote()), actionCollection(), "new_note" );
new TDEAction( i18n("New Note From Clipboard"), "edit-paste", 0,
- TQT_TQOBJECT(this), TQT_SLOT(newNoteFromClipboard()), actionCollection(), "new_note_clipboard" );
+ this, TQ_SLOT(newNoteFromClipboard()), actionCollection(), "new_note_clipboard" );
new TDEAction( i18n("Show All Notes"), "knotes", 0,
- TQT_TQOBJECT(this), TQT_SLOT(showAllNotes()), actionCollection(), "show_all_notes" );
+ this, TQ_SLOT(showAllNotes()), actionCollection(), "show_all_notes" );
new TDEAction( i18n("Hide All Notes"), "window-close", 0,
- TQT_TQOBJECT(this), TQT_SLOT(hideAllNotes()), actionCollection(), "hide_all_notes" );
+ this, TQ_SLOT(hideAllNotes()), actionCollection(), "hide_all_notes" );
new KHelpMenu( this, kapp->aboutData(), false, actionCollection() );
- m_findAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT(slotOpenFindDialog()), actionCollection() );
- KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actionCollection() );
- KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotConfigureAccels()), actionCollection() );
+ m_findAction = KStdAction::find( this, TQ_SLOT(slotOpenFindDialog()), actionCollection() );
+ KStdAction::preferences( this, TQ_SLOT(slotPreferences()), actionCollection() );
+ KStdAction::keyBindings( this, TQ_SLOT(slotConfigureAccels()), actionCollection() );
//FIXME: no shortcut removing!?
- KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection() )->setShortcut( 0 );
+ KStdAction::quit( this, TQ_SLOT(slotQuit()), actionCollection() )->setShortcut( 0 );
setXMLFile( instance()->instanceName() + "appui.rc" );
m_guiBuilder = new KXMLGUIBuilder( this );
- m_guiFactory = new KXMLGUIFactory( m_guiBuilder, TQT_TQOBJECT(this) );
+ m_guiFactory = new KXMLGUIFactory( m_guiBuilder, this );
m_guiFactory->addClient( this );
m_context_menu = static_cast<TDEPopupMenu*>(m_guiFactory->container( "knotes_context", this ));
@@ -147,19 +147,19 @@ KNotesApp::KNotesApp()
m_noteGUI.setContent( doc );
// create accels for global shortcuts
- m_globalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this), "global accel" );
+ m_globalAccel = new TDEGlobalAccel( this, "global accel" );
m_globalAccel->insert( "global_new_note", i18n("New Note"), "",
TDEShortcut(), TDEShortcut(),
- TQT_TQOBJECT(this), TQT_SLOT(newNote()), true, true );
+ this, TQ_SLOT(newNote()), true, true );
m_globalAccel->insert( "global_new_note_clipboard", i18n("New Note From Clipboard"), "",
TDEShortcut(), TDEShortcut(),
- TQT_TQOBJECT(this), TQT_SLOT(newNoteFromClipboard()), true, true );
+ this, TQ_SLOT(newNoteFromClipboard()), true, true );
m_globalAccel->insert( "global_hide_all_notes", i18n("Hide All Notes"), "",
TDEShortcut(), TDEShortcut(),
- TQT_TQOBJECT(this), TQT_SLOT(hideAllNotes()), true, true );
+ this, TQ_SLOT(hideAllNotes()), true, true );
m_globalAccel->insert( "global_show_all_notes", i18n("Show All Notes"), "",
TDEShortcut(), TDEShortcut(),
- TQT_TQOBJECT(this), TQT_SLOT(showAllNotes()), true, true );
+ this, TQ_SLOT(showAllNotes()), true, true );
m_globalAccel->readSettings();
@@ -174,10 +174,10 @@ KNotesApp::KNotesApp()
// create the resource manager
m_manager = new KNotesResourceManager();
- connect( m_manager, TQT_SIGNAL(sigRegisteredNote( KCal::Journal * )),
- this, TQT_SLOT(createNote( KCal::Journal * )) );
- connect( m_manager, TQT_SIGNAL(sigDeregisteredNote( KCal::Journal * )),
- this, TQT_SLOT(killNote( KCal::Journal * )) );
+ connect( m_manager, TQ_SIGNAL(sigRegisteredNote( KCal::Journal * )),
+ this, TQ_SLOT(createNote( KCal::Journal * )) );
+ connect( m_manager, TQ_SIGNAL(sigDeregisteredNote( KCal::Journal * )),
+ this, TQ_SLOT(killNote( KCal::Journal * )) );
// read the notes
m_manager->load();
@@ -196,12 +196,12 @@ KNotesApp::KNotesApp()
// set up the alarm reminder - do it after loading the notes because this
// is used as a check if updateNoteActions has to be called for a new note
- m_alarm = new KNotesAlarm( m_manager, TQT_TQOBJECT(this) );
+ m_alarm = new KNotesAlarm( m_manager, this );
// create the socket and possibly start listening for connections
m_listener = new TDEServerSocket();
m_listener->setResolutionEnabled( true );
- connect( m_listener, TQT_SIGNAL(readyAccept()), TQT_SLOT(acceptConnection()) );
+ connect( m_listener, TQ_SIGNAL(readyAccept()), TQ_SLOT(acceptConnection()) );
updateNetworkListener();
if ( m_noteList.count() == 0 && !kapp->isRestored() )
@@ -486,7 +486,7 @@ void KNotesApp::mousePressEvent( TQMouseEvent* e )
switch ( e->button() )
{
- case Qt::LeftButton:
+ case TQt::LeftButton:
if ( m_noteList.count() == 1 )
{
TQDictIterator<KNote> it( m_noteList );
@@ -495,10 +495,10 @@ void KNotesApp::mousePressEvent( TQMouseEvent* e )
else if ( m_note_menu->count() > 0 )
m_note_menu->popup( e->globalPos() );
break;
- case Qt::MidButton:
+ case TQt::MidButton:
newNote();
break;
- case Qt::RightButton:
+ case TQt::RightButton:
m_context_menu->popup( e->globalPos() );
default: break;
}
@@ -509,7 +509,7 @@ void KNotesApp::mousePressEvent( TQMouseEvent* e )
void KNotesApp::slotShowNote()
{
// tell the WM to give this note focus
- showNote( TQString::fromUtf8( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() ) );
+ showNote( TQString::fromUtf8( sender()->name() ) );
}
void KNotesApp::slotWalkThroughNotes()
@@ -575,8 +575,8 @@ void KNotesApp::slotPreferences()
// create a new preferences dialog...
KNoteConfigDlg *dialog = new KNoteConfigDlg( 0, i18n("Settings"), this,
"KNotes Settings" );
- connect( dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateNetworkListener()) );
- connect( dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateStyle()) );
+ connect( dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(updateNetworkListener()) );
+ connect( dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(updateStyle()) );
dialog->show();
}
@@ -657,14 +657,14 @@ void KNotesApp::createNote( KCal::Journal *journal )
KNote *newNote = new KNote( m_noteGUI, journal, 0, journal->uid().utf8() );
m_noteList.insert( newNote->noteId(), newNote );
- connect( newNote, TQT_SIGNAL(sigRequestNewNote()), TQT_SLOT(newNote()) );
- connect( newNote, TQT_SIGNAL(sigShowNextNote()), TQT_SLOT(slotWalkThroughNotes()) );
- connect( newNote, TQT_SIGNAL(sigKillNote( KCal::Journal* )),
- TQT_SLOT(slotNoteKilled( KCal::Journal* )) );
- connect( newNote, TQT_SIGNAL(sigNameChanged()), TQT_SLOT(updateNoteActions()) );
- connect( newNote, TQT_SIGNAL(sigDataChanged(const TQString &)), TQT_SLOT(saveNotes(const TQString &)) );
- connect( newNote, TQT_SIGNAL(sigColorChanged()), TQT_SLOT(updateNoteActions()) );
- connect( newNote, TQT_SIGNAL(sigFindFinished()), TQT_SLOT(slotFindNext()) );
+ connect( newNote, TQ_SIGNAL(sigRequestNewNote()), TQ_SLOT(newNote()) );
+ connect( newNote, TQ_SIGNAL(sigShowNextNote()), TQ_SLOT(slotWalkThroughNotes()) );
+ connect( newNote, TQ_SIGNAL(sigKillNote( KCal::Journal* )),
+ TQ_SLOT(slotNoteKilled( KCal::Journal* )) );
+ connect( newNote, TQ_SIGNAL(sigNameChanged()), TQ_SLOT(updateNoteActions()) );
+ connect( newNote, TQ_SIGNAL(sigDataChanged(const TQString &)), TQ_SLOT(saveNotes(const TQString &)) );
+ connect( newNote, TQ_SIGNAL(sigColorChanged()), TQ_SLOT(updateNoteActions()) );
+ connect( newNote, TQ_SIGNAL(sigFindFinished()), TQ_SLOT(slotFindNext()) );
// don't call this during startup for each and every loaded note
if ( m_alarm )
@@ -693,8 +693,8 @@ void KNotesApp::acceptConnection()
if ( s )
{
KNotesNetworkReceiver *recv = new KNotesNetworkReceiver( s );
- connect( recv, TQT_SIGNAL(sigNoteReceived( const TQString &, const TQString & )),
- TQT_TQOBJECT(this), TQT_SLOT(newNote( const TQString &, const TQString & )) );
+ connect( recv, TQ_SIGNAL(sigNoteReceived( const TQString &, const TQString & )),
+ this, TQ_SLOT(newNote( const TQString &, const TQString & )) );
}
}
@@ -725,7 +725,7 @@ void KNotesApp::updateNoteActions()
for ( TQDictIterator<KNote> it( m_noteList ); it.current(); ++it )
{
TDEAction *action = new TDEAction( it.current()->name().replace("&", "&&"),
- TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowNote()),
+ TDEShortcut(), this, TQ_SLOT(slotShowNote()),
(TQObject *)0,
it.current()->noteId().utf8() );
TDEIconEffect effect;
diff --git a/knotes/knotesapp.h b/knotes/knotesapp.h
index 649b4b0b..a6acb034 100644
--- a/knotes/knotesapp.h
+++ b/knotes/knotesapp.h
@@ -55,7 +55,7 @@ namespace KNetwork {
class KNotesApp : public TQLabel, public KSessionManaged, virtual public KXMLGUIClient,
virtual public KNotesAppIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
KNotesApp();
diff --git a/knotes/knotesnetrecv.cpp b/knotes/knotesnetrecv.cpp
index 48bb791f..d1ae1237 100644
--- a/knotes/knotesnetrecv.cpp
+++ b/knotes/knotesnetrecv.cpp
@@ -70,15 +70,15 @@ KNotesNetworkReceiver::KNotesNetworkReceiver( TDEBufferedSocket *s )
.arg( date );
// Setup the communications
- connect( m_sock, TQT_SIGNAL(readyRead()), TQT_SLOT(slotDataAvailable()) );
- connect( m_sock, TQT_SIGNAL(closed()), TQT_SLOT(slotConnectionClosed()) );
- connect( m_sock, TQT_SIGNAL(gotError( int )), TQT_SLOT(slotError( int )) );
+ connect( m_sock, TQ_SIGNAL(readyRead()), TQ_SLOT(slotDataAvailable()) );
+ connect( m_sock, TQ_SIGNAL(closed()), TQ_SLOT(slotConnectionClosed()) );
+ connect( m_sock, TQ_SIGNAL(gotError( int )), TQ_SLOT(slotError( int )) );
m_sock->enableRead( true );
// Setup the timer
m_timer = new TQTimer( this, "m_timer" );
- connect( m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotReceptionTimeout()) );
+ connect( m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotReceptionTimeout()) );
m_timer->start( MAXTIME, true );
}
diff --git a/knotes/knotesnetrecv.h b/knotes/knotesnetrecv.h
index 927abac8..85647fe2 100644
--- a/knotes/knotesnetrecv.h
+++ b/knotes/knotesnetrecv.h
@@ -43,7 +43,7 @@ namespace KNetwork {
class KNotesNetworkReceiver : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
KNotesNetworkReceiver( KNetwork::TDEBufferedSocket * );
diff --git a/knotes/knotesnetsend.cpp b/knotes/knotesnetsend.cpp
index 26d2b8f7..55dc75c3 100644
--- a/knotes/knotesnetsend.cpp
+++ b/knotes/knotesnetsend.cpp
@@ -48,11 +48,11 @@ KNotesNetworkSender::KNotesNetworkSender( const TQString& hostname, int port )
// TQObject:: prefix needed, otherwise the KStreamSocket::connect()
// mehtod is called!!!
- QObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(connected( const KResolverEntry& )),
- TQT_SLOT(slotConnected( const KResolverEntry& )) );
- QObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(gotError( int )), TQT_SLOT(slotError( int )) );
- QObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(closed()), TQT_SLOT(slotClosed()) );
- QObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(readyWrite()), TQT_SLOT(slotReadyWrite()) );
+ TQObject::connect( this, TQ_SIGNAL(connected( const KResolverEntry& )),
+ TQ_SLOT(slotConnected( const KResolverEntry& )) );
+ TQObject::connect( this, TQ_SIGNAL(gotError( int )), TQ_SLOT(slotError( int )) );
+ TQObject::connect( this, TQ_SIGNAL(closed()), TQ_SLOT(slotClosed()) );
+ TQObject::connect( this, TQ_SIGNAL(readyWrite()), TQ_SLOT(slotReadyWrite()) );
}
void KNotesNetworkSender::setSenderId( const TQString& sender )
diff --git a/knotes/knotesnetsend.h b/knotes/knotesnetsend.h
index ba867911..7d7c6dad 100644
--- a/knotes/knotesnetsend.h
+++ b/knotes/knotesnetsend.h
@@ -42,7 +42,7 @@ using namespace KNetwork;
class KNotesNetworkSender : public KNetwork::TDEBufferedSocket
{
- Q_OBJECT
+ TQ_OBJECT
public:
KNotesNetworkSender( const TQString& host, int port );
diff --git a/knotes/main.cpp b/knotes/main.cpp
index e809a8f7..8b85abe3 100644
--- a/knotes/main.cpp
+++ b/knotes/main.cpp
@@ -122,7 +122,7 @@ int main( int argc, char* argv[] )
KUniqueApplication::addCmdLineOptions();
Application app;
- app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) );
+ app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) );
remove_sm_from_client_leader();
diff --git a/knotes/resourcelocalconfig.h b/knotes/resourcelocalconfig.h
index ab78cd68..680f5146 100644
--- a/knotes/resourcelocalconfig.h
+++ b/knotes/resourcelocalconfig.h
@@ -27,7 +27,7 @@ class KURLRequester;
class ResourceLocalConfig : public KRES::ConfigWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceLocalConfig( TQWidget *parent = 0, const char *name = 0 );
diff --git a/knotes/resourcemanager.h b/knotes/resourcemanager.h
index 423ee7a9..fc82b9a0 100644
--- a/knotes/resourcemanager.h
+++ b/knotes/resourcemanager.h
@@ -49,7 +49,7 @@ namespace KCal {
class KNotesResourceManager : public TQObject, public KRES::ManagerObserver<ResourceNotes>
{
- Q_OBJECT
+ TQ_OBJECT
public:
KNotesResourceManager();
diff --git a/kode/kwsdl/compiler.h b/kode/kwsdl/compiler.h
index f7ab693d..1d1781ab 100644
--- a/kode/kwsdl/compiler.h
+++ b/kode/kwsdl/compiler.h
@@ -31,7 +31,7 @@ namespace KWSDL {
class Compiler : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kode/kwsdl/converter.cpp b/kode/kwsdl/converter.cpp
index 2117c59c..41e7e0a9 100644
--- a/kode/kwsdl/converter.cpp
+++ b/kode/kwsdl/converter.cpp
@@ -37,7 +37,7 @@ static TQString escapeEnum( const TQString &str )
Converter::Converter()
{
- mTQObject = KODE::Class( TQOBJECT_OBJECT_NAME_STRING );
+ mTQObject = KODE::Class( "TQObject" );
}
void Converter::setWSDL( const WSDL &wsdl )
@@ -249,7 +249,7 @@ void Converter::createSimpleTypeSerializer( const Schema::SimpleType *type )
escapedEnums.append( escapeEnum( enums[ i ] ) );
// marshal value
- KODE::Function marshalValue( "marshalValue", TQSTRING_OBJECT_NAME_STRING );
+ KODE::Function marshalValue( "marshalValue", "TQString" );
marshalValue.setStatic( true );
marshalValue.addArgument( "const " + typeName + "* value" );
code += "switch ( value->type() ) {";
@@ -315,7 +315,7 @@ void Converter::createSimpleTypeSerializer( const Schema::SimpleType *type )
demarshalCode.unindent();
demarshalCode += "}";
- KODE::Function marshalValue( "marshalValue", TQSTRING_OBJECT_NAME_STRING );
+ KODE::Function marshalValue( "marshalValue", "TQString" );
marshalValue.setStatic( true );
marshalValue.addArgument( "const " + typeName + "* value" );
marshalValue.setBody( "return Serializer::marshalValue( value->value() );" );
@@ -689,9 +689,9 @@ void Converter::convertService( const Service &service )
KODE::MemberVariable transport( inputMessage.name() + "Transport", "Transport" );
ctorCode += transport.name() + " = new Transport( \"" + (*it).mLocation + "\" );";
- ctorCode += "connect( " + transport.name() + ", TQT_SIGNAL( result( const TQString& ) ),";
+ ctorCode += "connect( " + transport.name() + ", TQ_SIGNAL( result( const TQString& ) ),";
ctorCode.indent();
- ctorCode += "this, TQT_SLOT( " + outputMessage.name() + "Slot( const TQString& ) ) );";
+ ctorCode += "this, TQ_SLOT( " + outputMessage.name() + "Slot( const TQString& ) ) );";
ctorCode.unindent();
dtorCode += "delete " + transport.name() + ";";
@@ -839,7 +839,7 @@ void Converter::createUtilClasses()
of typing and is easier to maintain at the end ;)
*/
TypeEntry types[] = {
- { TQSTRING_OBJECT_NAME_STRING, "xsd:string", "*value", "str" },
+ { "TQString", "xsd:string", "*value", "str" },
{ "bool", "xsd:boolean", "(*value ? \"true\" : \"false\")", "(str.lower() == \"true\" ? true : false)" },
{ "float", "xsd:TODO", "TQString::number( *value )", "str.toFloat()" },
{ "int", "xsd:int", "TQString::number( *value )", "str.toInt()" },
@@ -848,7 +848,7 @@ void Converter::createUtilClasses()
{ "char", "xsd:byte", "TQString( TQChar( *value ) )", "str[ 0 ].latin1()" },
{ "unsigned char", "xsd:unsignedByte", "TQString( TQChar( *value ) )", "str[ 0 ].latin1()" },
{ "short", "xsd:short", "TQString::number( *value )", "str.toShort()" },
- { TQBYTEARRAY_OBJECT_NAME_STRING, "xsd:base64Binary", "TQString::fromUtf8( KCodecs::base64Encode( *value ) )", "KCodecs::base64Decode( str.utf8() )" },
+ { "TQByteArray", "xsd:base64Binary", "TQString::fromUtf8( KCodecs::base64Encode( *value ) )", "KCodecs::base64Decode( str.utf8() )" },
{ "TQDateTime", "xsd:dateTime", "value->toString( TQt::ISODate )", "TQDateTime::fromString( str, TQt::ISODate )" },
{ "TQDate", "xsd:date", "value->toString( TQt::ISODate )", "TQDate::fromString( str, TQt::ISODate )" }
};
@@ -859,7 +859,7 @@ void Converter::createUtilClasses()
TypeEntry entry = types[ i ];
- marshal = KODE::Function( "marshalValue", TQSTRING_OBJECT_NAME_STRING );
+ marshal = KODE::Function( "marshalValue", "TQString" );
marshal.setStatic( true );
marshal.addArgument( "const " + entry.type + "* value" );
@@ -911,10 +911,10 @@ void Converter::createTransportClass()
transport.addInclude( "kdebug.h" );
- KODE::MemberVariable url( "url", TQSTRING_OBJECT_NAME_STRING );
+ KODE::MemberVariable url( "url", "TQString" );
transport.addMemberVariable( url );
- KODE::MemberVariable slotDataVar( "data", TQBYTEARRAY_OBJECT_NAME_STRING );
+ KODE::MemberVariable slotDataVar( "data", "TQByteArray" );
transport.addMemberVariable( slotDataVar );
// ctor
@@ -946,8 +946,8 @@ void Converter::createTransportClass()
queryCode += "job->addMetaData( \"UserAgent\", \"KWSDL\" );";
queryCode += "job->addMetaData( \"content-type\", \"Content-Type: text/xml; charset=utf-8\" );";
queryCode.newLine();
- queryCode += "connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );";
- queryCode += "connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );";
+ queryCode += "connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );";
+ queryCode += "connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) );";
query.setBody( queryCode );
diff --git a/kode/kwsdl/kung/binaryinputfield.cpp b/kode/kwsdl/kung/binaryinputfield.cpp
index b0fb78b0..9a31b31a 100644
--- a/kode/kwsdl/kung/binaryinputfield.cpp
+++ b/kode/kwsdl/kung/binaryinputfield.cpp
@@ -107,8 +107,8 @@ BinaryWidget::BinaryWidget( TQWidget *parent )
mLayout->addWidget( mLoadButton, 0, 1 );
mLayout->addWidget( mSaveButton, 1, 1 );
- connect( mLoadButton, TQT_SIGNAL( clicked() ), TQT_SLOT( load() ) );
- connect( mSaveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( save() ) );
+ connect( mLoadButton, TQ_SIGNAL( clicked() ), TQ_SLOT( load() ) );
+ connect( mSaveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( save() ) );
}
void BinaryWidget::setData( const TQByteArray &data )
diff --git a/kode/kwsdl/kung/binaryinputfield.h b/kode/kwsdl/kung/binaryinputfield.h
index 3695654c..f5c2c67b 100644
--- a/kode/kwsdl/kung/binaryinputfield.h
+++ b/kode/kwsdl/kung/binaryinputfield.h
@@ -32,7 +32,7 @@ class TQPushButton;
class BinaryInputField : public SimpleInputField
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -58,7 +58,7 @@ class BinaryInputField : public SimpleInputField
class BinaryWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kode/kwsdl/kung/boolinputfield.cpp b/kode/kwsdl/kung/boolinputfield.cpp
index 88311266..12def657 100644
--- a/kode/kwsdl/kung/boolinputfield.cpp
+++ b/kode/kwsdl/kung/boolinputfield.cpp
@@ -65,8 +65,8 @@ TQWidget *BoolInputField::createWidget( TQWidget *parent )
mInputWidget->setChecked( mValue );
- connect( mInputWidget, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( inputChanged( bool ) ) );
+ connect( mInputWidget, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( inputChanged( bool ) ) );
return mInputWidget;
}
diff --git a/kode/kwsdl/kung/boolinputfield.h b/kode/kwsdl/kung/boolinputfield.h
index e99a3d50..0f40c60e 100644
--- a/kode/kwsdl/kung/boolinputfield.h
+++ b/kode/kwsdl/kung/boolinputfield.h
@@ -30,7 +30,7 @@ class TQCheckBox;
class BoolInputField : public SimpleInputField
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kode/kwsdl/kung/dateinputfield.cpp b/kode/kwsdl/kung/dateinputfield.cpp
index cb24670f..b7d6f8f0 100644
--- a/kode/kwsdl/kung/dateinputfield.cpp
+++ b/kode/kwsdl/kung/dateinputfield.cpp
@@ -65,8 +65,8 @@ TQWidget *DateInputField::createWidget( TQWidget *parent )
mInputWidget->setDate( mValue );
- connect( mInputWidget, TQT_SIGNAL( dateChanged( TQDate ) ),
- this, TQT_SLOT( inputChanged( TQDate ) ) );
+ connect( mInputWidget, TQ_SIGNAL( dateChanged( TQDate ) ),
+ this, TQ_SLOT( inputChanged( TQDate ) ) );
return mInputWidget;
}
diff --git a/kode/kwsdl/kung/dateinputfield.h b/kode/kwsdl/kung/dateinputfield.h
index 6a5d29ae..54cd3deb 100644
--- a/kode/kwsdl/kung/dateinputfield.h
+++ b/kode/kwsdl/kung/dateinputfield.h
@@ -31,7 +31,7 @@ class KDatePicker;
class DateInputField : public SimpleInputField
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kode/kwsdl/kung/dispatcher.cpp b/kode/kwsdl/kung/dispatcher.cpp
index 5c65d0c4..7b2ad477 100644
--- a/kode/kwsdl/kung/dispatcher.cpp
+++ b/kode/kwsdl/kung/dispatcher.cpp
@@ -57,10 +57,10 @@ void Dispatcher::setWSDL( const KWSDL::WSDL &wsdl )
mConversationManager = new GeneralConversationManager( mWSDL );
mTransport = new Transport( mWSDL.service().ports().first().mLocation );
- connect( mTransport, TQT_SIGNAL( result( const TQString& ) ),
- this, TQT_SLOT( result( const TQString& ) ) );
- connect( mTransport, TQT_SIGNAL( error( const TQString& ) ),
- this, TQT_SLOT( error( const TQString& ) ) );
+ connect( mTransport, TQ_SIGNAL( result( const TQString& ) ),
+ this, TQ_SLOT( result( const TQString& ) ) );
+ connect( mTransport, TQ_SIGNAL( error( const TQString& ) ),
+ this, TQ_SLOT( error( const TQString& ) ) );
}
void Dispatcher::run()
@@ -140,14 +140,14 @@ void Dispatcher::result( const TQString &xml )
mLastMessage = mCurrentMessage;
- TQTimer::singleShot( 0, this, TQT_SLOT( nextMessage() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( nextMessage() ) );
}
void Dispatcher::error( const TQString &errorMsg )
{
KMessageBox::error( 0, errorMsg );
- TQTimer::singleShot( 0, this, TQT_SLOT( nextMessage() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( nextMessage() ) );
}
#include "dispatcher.moc"
diff --git a/kode/kwsdl/kung/dispatcher.h b/kode/kwsdl/kung/dispatcher.h
index c5e0744d..cba421cf 100644
--- a/kode/kwsdl/kung/dispatcher.h
+++ b/kode/kwsdl/kung/dispatcher.h
@@ -31,7 +31,7 @@ class Transport;
class Dispatcher : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kode/kwsdl/kung/doubleinputfield.cpp b/kode/kwsdl/kung/doubleinputfield.cpp
index 39f22774..1df00f03 100644
--- a/kode/kwsdl/kung/doubleinputfield.cpp
+++ b/kode/kwsdl/kung/doubleinputfield.cpp
@@ -78,8 +78,8 @@ TQWidget *DoubleInputField::createWidget( TQWidget *parent )
mInputWidget->setValue( mValue );
- connect( mInputWidget, TQT_SIGNAL( valueChanged( double ) ),
- this, TQT_SLOT( inputChanged( double ) ) );
+ connect( mInputWidget, TQ_SIGNAL( valueChanged( double ) ),
+ this, TQ_SLOT( inputChanged( double ) ) );
return mInputWidget;
}
diff --git a/kode/kwsdl/kung/doubleinputfield.h b/kode/kwsdl/kung/doubleinputfield.h
index 1368a6cd..df3eaa83 100644
--- a/kode/kwsdl/kung/doubleinputfield.h
+++ b/kode/kwsdl/kung/doubleinputfield.h
@@ -30,7 +30,7 @@ class KDoubleSpinBox;
class DoubleInputField : public SimpleInputField
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kode/kwsdl/kung/enuminputfield.cpp b/kode/kwsdl/kung/enuminputfield.cpp
index 30c11670..f49ab4be 100644
--- a/kode/kwsdl/kung/enuminputfield.cpp
+++ b/kode/kwsdl/kung/enuminputfield.cpp
@@ -70,8 +70,8 @@ TQWidget *EnumInputField::createWidget( TQWidget *parent )
mInputWidget->insertStringList( mEnums );
mInputWidget->setCurrentItem( mEnums.findIndex( mValue ) );
- connect( mInputWidget, TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( inputChanged( int ) ) );
+ connect( mInputWidget, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( inputChanged( int ) ) );
return mInputWidget;
}
diff --git a/kode/kwsdl/kung/enuminputfield.h b/kode/kwsdl/kung/enuminputfield.h
index 13615b1e..bb5b6990 100644
--- a/kode/kwsdl/kung/enuminputfield.h
+++ b/kode/kwsdl/kung/enuminputfield.h
@@ -30,7 +30,7 @@ class KComboBox;
class EnumInputField : public SimpleInputField
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kode/kwsdl/kung/inputfield.h b/kode/kwsdl/kung/inputfield.h
index 4a68e161..69692c48 100644
--- a/kode/kwsdl/kung/inputfield.h
+++ b/kode/kwsdl/kung/inputfield.h
@@ -39,7 +39,7 @@ class ComplexType;
*/
class InputField : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kode/kwsdl/kung/integerinputfield.cpp b/kode/kwsdl/kung/integerinputfield.cpp
index 76d48cd5..38c08222 100644
--- a/kode/kwsdl/kung/integerinputfield.cpp
+++ b/kode/kwsdl/kung/integerinputfield.cpp
@@ -116,8 +116,8 @@ TQWidget *IntegerInputField::createWidget( TQWidget *parent )
mInputWidget->setValue( mValue );
- connect( mInputWidget, TQT_SIGNAL( valueChanged( int ) ),
- this, TQT_SLOT( inputChanged( int ) ) );
+ connect( mInputWidget, TQ_SIGNAL( valueChanged( int ) ),
+ this, TQ_SLOT( inputChanged( int ) ) );
return mInputWidget;
}
diff --git a/kode/kwsdl/kung/integerinputfield.h b/kode/kwsdl/kung/integerinputfield.h
index 91294308..dbb8cc27 100644
--- a/kode/kwsdl/kung/integerinputfield.h
+++ b/kode/kwsdl/kung/integerinputfield.h
@@ -30,7 +30,7 @@ class KIntSpinBox;
class IntegerInputField : public SimpleInputField
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kode/kwsdl/kung/listinputfield.cpp b/kode/kwsdl/kung/listinputfield.cpp
index 539e3de2..147c83fd 100644
--- a/kode/kwsdl/kung/listinputfield.cpp
+++ b/kode/kwsdl/kung/listinputfield.cpp
@@ -105,9 +105,9 @@ ListWidget::ListWidget( InputField *parentField, const TQString &name, const TQS
mRemoveButton = new TQPushButton( i18n( "Remove" ), this );
layout->addWidget( mRemoveButton, 2, 1 );
- connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) );
- connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) );
- connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( remove() ) );
+ connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( add() ) );
+ connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( edit() ) );
+ connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( remove() ) );
update();
}
diff --git a/kode/kwsdl/kung/listinputfield.h b/kode/kwsdl/kung/listinputfield.h
index c7105bbb..ed49e815 100644
--- a/kode/kwsdl/kung/listinputfield.h
+++ b/kode/kwsdl/kung/listinputfield.h
@@ -32,7 +32,7 @@ class TQPushButton;
class ListInputField : public SimpleInputField
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -53,7 +53,7 @@ class ListInputField : public SimpleInputField
class ListWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kode/kwsdl/kung/loader.h b/kode/kwsdl/kung/loader.h
index 2839780c..d3ff45d5 100644
--- a/kode/kwsdl/kung/loader.h
+++ b/kode/kwsdl/kung/loader.h
@@ -28,7 +28,7 @@ class Dispatcher;
class Loader : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kode/kwsdl/kung/main.cpp b/kode/kwsdl/kung/main.cpp
index 2dadbe9d..3036eeae 100644
--- a/kode/kwsdl/kung/main.cpp
+++ b/kode/kwsdl/kung/main.cpp
@@ -58,7 +58,7 @@ int main( int argc, char **argv )
Loader loader;
loader.setWSDLUrl( args->url( 0 ).path() );
- TQTimer::singleShot( 0, &loader, TQT_SLOT( run() ) );
+ TQTimer::singleShot( 0, &loader, TQ_SLOT( run() ) );
return app.exec();
}
diff --git a/kode/kwsdl/kung/pageinputfield.h b/kode/kwsdl/kung/pageinputfield.h
index f70ba98e..f0f9411b 100644
--- a/kode/kwsdl/kung/pageinputfield.h
+++ b/kode/kwsdl/kung/pageinputfield.h
@@ -30,7 +30,7 @@
class PageInputField : public InputField
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kode/kwsdl/kung/stringinputfield.cpp b/kode/kwsdl/kung/stringinputfield.cpp
index 9ea45029..ee90eeec 100644
--- a/kode/kwsdl/kung/stringinputfield.cpp
+++ b/kode/kwsdl/kung/stringinputfield.cpp
@@ -84,8 +84,8 @@ TQWidget *StringInputField::createWidget( TQWidget *parent )
mInputWidget->setText( mValue );
- connect( mInputWidget, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( inputChanged( const TQString& ) ) );
+ connect( mInputWidget, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( inputChanged( const TQString& ) ) );
return mInputWidget;
}
diff --git a/kode/kwsdl/kung/stringinputfield.h b/kode/kwsdl/kung/stringinputfield.h
index b6c8f172..d237aae5 100644
--- a/kode/kwsdl/kung/stringinputfield.h
+++ b/kode/kwsdl/kung/stringinputfield.h
@@ -30,7 +30,7 @@ class TQLineEdit;
class StringInputField : public SimpleInputField
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kode/kwsdl/kung/timeinputfield.cpp b/kode/kwsdl/kung/timeinputfield.cpp
index 38e1a264..024e2671 100644
--- a/kode/kwsdl/kung/timeinputfield.cpp
+++ b/kode/kwsdl/kung/timeinputfield.cpp
@@ -65,8 +65,8 @@ TQWidget *TimeInputField::createWidget( TQWidget *parent )
mInputWidget->setTime( mValue );
- connect( mInputWidget, TQT_SIGNAL( valueChanged( const TQTime& ) ),
- this, TQT_SLOT( inputChanged( const TQTime& ) ) );
+ connect( mInputWidget, TQ_SIGNAL( valueChanged( const TQTime& ) ),
+ this, TQ_SLOT( inputChanged( const TQTime& ) ) );
return mInputWidget;
}
diff --git a/kode/kwsdl/kung/timeinputfield.h b/kode/kwsdl/kung/timeinputfield.h
index 2b351652..f586d190 100644
--- a/kode/kwsdl/kung/timeinputfield.h
+++ b/kode/kwsdl/kung/timeinputfield.h
@@ -31,7 +31,7 @@ class KTimeWidget;
class TimeInputField : public SimpleInputField
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kode/kwsdl/kung/transport.cpp b/kode/kwsdl/kung/transport.cpp
index e9dabf3c..4961ad2f 100644
--- a/kode/kwsdl/kung/transport.cpp
+++ b/kode/kwsdl/kung/transport.cpp
@@ -45,8 +45,8 @@ void Transport::query( const TQString &xml )
job->addMetaData( "UserAgent", "KDE Kung" );
job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" );
- connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) );
}
void Transport::slotData( TDEIO::Job*, const TQByteArray &data )
diff --git a/kode/kwsdl/kung/transport.h b/kode/kwsdl/kung/transport.h
index 46355525..384d14a9 100644
--- a/kode/kwsdl/kung/transport.h
+++ b/kode/kwsdl/kung/transport.h
@@ -25,7 +25,7 @@
class Transport : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kode/kwsdl/main.cpp b/kode/kwsdl/main.cpp
index 5ba4f533..900f6ee4 100644
--- a/kode/kwsdl/main.cpp
+++ b/kode/kwsdl/main.cpp
@@ -71,7 +71,7 @@ int main( int argc, char **argv )
if ( args->isSet( "namespace" ) )
compiler.setNameSpace( args->getOption( "namespace" ) );
- TQTimer::singleShot( 0, &compiler, TQT_SLOT( run() ) );
+ TQTimer::singleShot( 0, &compiler, TQ_SLOT( run() ) );
return app.exec();
}
diff --git a/kode/kwsdl/schema/fileprovider.cpp b/kode/kwsdl/schema/fileprovider.cpp
index ed5606fd..8d435274 100644
--- a/kode/kwsdl/schema/fileprovider.cpp
+++ b/kode/kwsdl/schema/fileprovider.cpp
@@ -53,10 +53,10 @@ bool FileProvider::get( const TQString &url, TQString &target )
tqDebug( "Downloading external schema '%s'", url.latin1() );
TDEIO::TransferJob* job = TDEIO::get( KURL( url ), false, false );
- connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
- this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
- this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+ this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQ_SLOT( slotResult( TDEIO::Job* ) ) );
mBlocked = true;
while ( mBlocked ) {
diff --git a/kode/kwsdl/schema/fileprovider.h b/kode/kwsdl/schema/fileprovider.h
index c855416d..817c55ad 100644
--- a/kode/kwsdl/schema/fileprovider.h
+++ b/kode/kwsdl/schema/fileprovider.h
@@ -32,7 +32,7 @@ namespace Schema {
class FileProvider : TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kode/kwsdl/tests/google/googlesearch.cpp b/kode/kwsdl/tests/google/googlesearch.cpp
index fcea9d75..aa282a06 100644
--- a/kode/kwsdl/tests/google/googlesearch.cpp
+++ b/kode/kwsdl/tests/google/googlesearch.cpp
@@ -29,12 +29,12 @@
GoogleSearch::GoogleSearch()
: TQObject( 0, "" )
{
- connect( &mService, TQT_SIGNAL( doGetCachedPageResponse( TQByteArray* ) ),
- this, TQT_SLOT( cachedPageResult( TQByteArray* ) ) );
- connect( &mService, TQT_SIGNAL( doSpellingSuggestionResponse( TQString* ) ),
- this, TQT_SLOT( spellingSuggestionResult( TQString* ) ) );
- connect( &mService, TQT_SIGNAL( doGoogleSearchResponse( GoogleSearchResult* ) ),
- this, TQT_SLOT( googleSearchResult( GoogleSearchResult* ) ) );
+ connect( &mService, TQ_SIGNAL( doGetCachedPageResponse( TQByteArray* ) ),
+ this, TQ_SLOT( cachedPageResult( TQByteArray* ) ) );
+ connect( &mService, TQ_SIGNAL( doSpellingSuggestionResponse( TQString* ) ),
+ this, TQ_SLOT( spellingSuggestionResult( TQString* ) ) );
+ connect( &mService, TQ_SIGNAL( doGoogleSearchResponse( GoogleSearchResult* ) ),
+ this, TQ_SLOT( googleSearchResult( GoogleSearchResult* ) ) );
mKey = "";
}
diff --git a/kode/kwsdl/tests/google/googlesearch.h b/kode/kwsdl/tests/google/googlesearch.h
index b6400616..9551fc5d 100644
--- a/kode/kwsdl/tests/google/googlesearch.h
+++ b/kode/kwsdl/tests/google/googlesearch.h
@@ -30,7 +30,6 @@
class GoogleSearch : public TQObject
{
- Q_OBJECT
TQ_OBJECT
public:
diff --git a/kode/kwsdl/tests/google/googlesearchservice.cpp b/kode/kwsdl/tests/google/googlesearchservice.cpp
index d2e7c97e..095fe115 100644
--- a/kode/kwsdl/tests/google/googlesearchservice.cpp
+++ b/kode/kwsdl/tests/google/googlesearchservice.cpp
@@ -183,14 +183,14 @@ void GoogleSearchService::doGoogleSearchResponseSlot( const TQString &xml )
GoogleSearchService::GoogleSearchService()
{
mDoGetCachedPageTransport = new Transport( "http://api.google.com/search/beta2" );
- connect( mDoGetCachedPageTransport, TQT_SIGNAL( result( const TQString& ) ),
- this, TQT_SLOT( doGetCachedPageResponseSlot( const TQString& ) ) );
+ connect( mDoGetCachedPageTransport, TQ_SIGNAL( result( const TQString& ) ),
+ this, TQ_SLOT( doGetCachedPageResponseSlot( const TQString& ) ) );
mDoSpellingSuggestionTransport = new Transport( "http://api.google.com/search/beta2" );
- connect( mDoSpellingSuggestionTransport, TQT_SIGNAL( result( const TQString& ) ),
- this, TQT_SLOT( doSpellingSuggestionResponseSlot( const TQString& ) ) );
+ connect( mDoSpellingSuggestionTransport, TQ_SIGNAL( result( const TQString& ) ),
+ this, TQ_SLOT( doSpellingSuggestionResponseSlot( const TQString& ) ) );
mDoGoogleSearchTransport = new Transport( "http://api.google.com/search/beta2" );
- connect( mDoGoogleSearchTransport, TQT_SIGNAL( result( const TQString& ) ),
- this, TQT_SLOT( doGoogleSearchResponseSlot( const TQString& ) ) );
+ connect( mDoGoogleSearchTransport, TQ_SIGNAL( result( const TQString& ) ),
+ this, TQ_SLOT( doGoogleSearchResponseSlot( const TQString& ) ) );
}
GoogleSearchService::~GoogleSearchService()
diff --git a/kode/kwsdl/tests/google/googlesearchservice.h b/kode/kwsdl/tests/google/googlesearchservice.h
index e61cd446..0d2d8e79 100644
--- a/kode/kwsdl/tests/google/googlesearchservice.h
+++ b/kode/kwsdl/tests/google/googlesearchservice.h
@@ -32,7 +32,7 @@
class GoogleSearchService : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kode/kwsdl/tests/google/transport.cpp b/kode/kwsdl/tests/google/transport.cpp
index 30b9645e..c7a390e8 100644
--- a/kode/kwsdl/tests/google/transport.cpp
+++ b/kode/kwsdl/tests/google/transport.cpp
@@ -48,8 +48,8 @@ void Transport::query( const TQString &xml )
job->addMetaData( "UserAgent", "KWSDL" );
job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" );
- connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) );
}
void Transport::slotData( TDEIO::Job*, const TQByteArray &data )
diff --git a/kode/kwsdl/tests/google/transport.h b/kode/kwsdl/tests/google/transport.h
index a0873e26..cfb8a6c1 100644
--- a/kode/kwsdl/tests/google/transport.h
+++ b/kode/kwsdl/tests/google/transport.h
@@ -29,7 +29,7 @@
class Transport : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kode/kwsdl/typemapper.cpp b/kode/kwsdl/typemapper.cpp
index 3ec0a20a..88842ece 100644
--- a/kode/kwsdl/typemapper.cpp
+++ b/kode/kwsdl/typemapper.cpp
@@ -33,21 +33,21 @@ using namespace KWSDL;
TypeMapper::TypeMapper()
{
- mMap.insert( "any", TypeInfo( "any", TQSTRING_OBJECT_NAME_STRING, "tqstring.h" ) );
- mMap.insert( "anyURI", TypeInfo( "anyUri", TQSTRING_OBJECT_NAME_STRING, "tqstring.h" ) );
- mMap.insert( "base64Binary", TypeInfo( "base64Binary", TQBYTEARRAY_OBJECT_NAME_STRING, "tqcstring.h" ) );
- mMap.insert( "binary", TypeInfo( "binary", TQBYTEARRAY_OBJECT_NAME_STRING, "tqcstring.h" ) );
+ mMap.insert( "any", TypeInfo( "any", "TQString", "tqstring.h" ) );
+ mMap.insert( "anyURI", TypeInfo( "anyUri", "TQString", "tqstring.h" ) );
+ mMap.insert( "base64Binary", TypeInfo( "base64Binary", "TQByteArray", "tqcstring.h" ) );
+ mMap.insert( "binary", TypeInfo( "binary", "TQByteArray", "tqcstring.h" ) );
mMap.insert( "boolean", TypeInfo( "boolean", "bool", "" ) );
mMap.insert( "byte", TypeInfo( "byte", "char", "" ) );
mMap.insert( "date", TypeInfo( "date", "TQDate", "tqdatetime.h" ) );
mMap.insert( "dateTime", TypeInfo( "dateTime", "TQDateTime", "tqdatetime.h" ) );
mMap.insert( "decimal", TypeInfo( "decimal", "float", "" ) );
mMap.insert( "double", TypeInfo( "double", "double", "" ) );
- mMap.insert( "duration", TypeInfo( "duration", TQSTRING_OBJECT_NAME_STRING, "tqstring.h" ) ); // TODO: add duration class
+ mMap.insert( "duration", TypeInfo( "duration", "TQString", "tqstring.h" ) ); // TODO: add duration class
mMap.insert( "int", TypeInfo( "int", "int", "" ) );
- mMap.insert( "language", TypeInfo( "language", TQSTRING_OBJECT_NAME_STRING, "tqstring.h" ) );
+ mMap.insert( "language", TypeInfo( "language", "TQString", "tqstring.h" ) );
mMap.insert( "short", TypeInfo( "short", "short", "" ) );
- mMap.insert( "string", TypeInfo( "string", TQSTRING_OBJECT_NAME_STRING, "tqstring.h" ) );
+ mMap.insert( "string", TypeInfo( "string", "TQString", "tqstring.h" ) );
mMap.insert( "unsignedByte", TypeInfo( "unsignedByte", "unsigned char", "" ) );
mMap.insert( "unsignedInt", TypeInfo( "unsignedInt", "unsigned int", "" ) );
}
@@ -170,7 +170,7 @@ TQMap<TQString, TQString> TypeMapper::headerDec( const Schema::Element *element
TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName );
if ( it != mMap.end() ) {
if ( !it.data().header.isEmpty() ) {
- if ( it.data().type == TQBYTEARRAY_OBJECT_NAME_STRING )
+ if ( it.data().type == "TQByteArray" )
headers.insert( it.data().header, TQString() );
else
headers.insert( it.data().header, it.data().type );
@@ -213,7 +213,7 @@ TQMap<TQString, TQString> TypeMapper::headerDec( const Schema::Attribute *attrib
TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName );
if ( it != mMap.end() ) {
if ( !it.data().header.isEmpty() ) {
- if ( it.data().type == TQBYTEARRAY_OBJECT_NAME_STRING )
+ if ( it.data().type == "TQByteArray" )
headers.insert( it.data().header, TQString() );
else
headers.insert( it.data().header, it.data().type );
@@ -252,7 +252,7 @@ TQMap<TQString, TQString> TypeMapper::headerDec( const TQString &typeName ) cons
TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName );
if ( it != mMap.end() ) {
if ( !it.data().header.isEmpty() ) {
- if ( it.data().type == TQBYTEARRAY_OBJECT_NAME_STRING )
+ if ( it.data().type == "TQByteArray" )
headers.insert( it.data().header, TQString() );
else
headers.insert( it.data().header, it.data().type );
diff --git a/kode/kxml_compiler/creator.cpp b/kode/kxml_compiler/creator.cpp
index bc330eaf..26eb2e22 100644
--- a/kode/kxml_compiler/creator.cpp
+++ b/kode/kxml_compiler/creator.cpp
@@ -95,7 +95,7 @@ void Creator::createProperty( KODE::Class &c, const TQString &type,
void Creator::createElementFunctions( KODE::Class &c, Element *e )
{
if ( e->hasText ) {
- createProperty( c, TQSTRING_OBJECT_NAME_STRING, e->name );
+ createProperty( c, "TQString", e->name );
if ( mXmlParserType == XmlParserCustomExternal ) {
createTextElementParserCustom( c, e );
}
@@ -150,7 +150,7 @@ void Creator::createClass( Element *element )
itA != element->attributes.end(); ++itA ) {
Attribute *a = *itA;
- createProperty( c, TQSTRING_OBJECT_NAME_STRING, a->name );
+ createProperty( c, "TQString", a->name );
}
TQValueList<Element *>::ConstIterator itE;
@@ -176,7 +176,7 @@ void Creator::createClass( Element *element )
void Creator::createElementWriter( KODE::Class &c, Element *element )
{
- KODE::Function writer( "writeElement", TQSTRING_OBJECT_NAME_STRING );
+ KODE::Function writer( "writeElement", "TQString" );
KODE::Code code;
@@ -268,7 +268,7 @@ void Creator::createElementParser( KODE::Class &c, Element *e )
void Creator::createTextElementParserCustom( KODE::Class &, Element *e )
{
- KODE::Function parser( "parseElement" + upperFirst( e->name ), TQSTRING_OBJECT_NAME_STRING );
+ KODE::Function parser( "parseElement" + upperFirst( e->name ), "TQString" );
KODE::Code code;
@@ -637,7 +637,7 @@ void Creator::createListTypedefs()
void Creator::createIndenter( KODE::File &file )
{
- KODE::Function indenter( "indent", TQSTRING_OBJECT_NAME_STRING );
+ KODE::Function indenter( "indent", "TQString" );
indenter.addArgument( "int n = 0" );
KODE::Code code;
@@ -724,7 +724,7 @@ void Creator::createFileParserCustom( Element *element )
mParserClass.addInclude( "kdebug.h" );
mParserClass.addMemberVariable( KODE::MemberVariable( "mBuffer",
- TQSTRING_OBJECT_NAME_STRING ) );
+ "TQString" ) );
mParserClass.addMemberVariable( KODE::MemberVariable( "mRunning",
"unsigned int" ) );
diff --git a/kode/printer.cpp b/kode/printer.cpp
index 7808f290..7052382f 100644
--- a/kode/printer.cpp
+++ b/kode/printer.cpp
@@ -200,7 +200,7 @@ TQString Printer::classHeader( const Class &c )
code.indent();
if ( c.isTQObject() ) {
- code += "Q_OBJECT";
+ code += "TQ_OBJECT";
code.newLine();
code += "";
code.newLine();
diff --git a/konsolekalendar/konsolekalendar.cpp b/konsolekalendar/konsolekalendar.cpp
index 535478cf..775f7b2d 100644
--- a/konsolekalendar/konsolekalendar.cpp
+++ b/konsolekalendar/konsolekalendar.cpp
@@ -272,11 +272,11 @@ bool KonsoleKalendar::showInstance()
} else {
if ( firstdate == lastdate ) {
title = i18n( "Events: %1" )
- .arg( firstdate.toString( Qt::TextDate ) );
+ .arg( firstdate.toString( TQt::TextDate ) );
} else {
title = i18n( "Events: %1 - %2" )
- .arg( firstdate.toString( Qt::TextDate ) )
- .arg( lastdate.toString( Qt::TextDate ) );
+ .arg( firstdate.toString( TQt::TextDate ) )
+ .arg( lastdate.toString( TQt::TextDate ) );
}
htmlSettings.setEventView( true );
}
@@ -439,11 +439,11 @@ void KonsoleKalendar::printSpecs()
<< endl;
cout << i18n( " Begin: %1" ).
- arg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data()
+ arg( m_variables->getStartDateTime().toString( TQt::TextDate ) ).local8Bit().data()
<< endl;
cout << i18n( " End: %1" ).
- arg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data()
+ arg( m_variables->getEndDateTime().toString( TQt::TextDate ) ).local8Bit().data()
<< endl;
if ( m_variables->getFloating() == true ) {
diff --git a/konsolekalendar/konsolekalendaradd.cpp b/konsolekalendar/konsolekalendaradd.cpp
index d7b2774b..75828ed3 100644
--- a/konsolekalendar/konsolekalendaradd.cpp
+++ b/konsolekalendar/konsolekalendaradd.cpp
@@ -146,11 +146,11 @@ void KonsoleKalendarAdd::printSpecs()
<< endl;
cout << i18n( " Begin: %1" ).
- arg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data()
+ arg( m_variables->getStartDateTime().toString( TQt::TextDate ) ).local8Bit().data()
<< endl;
cout << i18n( " End: %1" ).
- arg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data()
+ arg( m_variables->getEndDateTime().toString( TQt::TextDate ) ).local8Bit().data()
<< endl;
if ( m_variables->getFloating() == true ) {
diff --git a/konsolekalendar/konsolekalendarchange.cpp b/konsolekalendar/konsolekalendarchange.cpp
index 7c9e3b5e..820f11b4 100644
--- a/konsolekalendar/konsolekalendarchange.cpp
+++ b/konsolekalendar/konsolekalendarchange.cpp
@@ -136,11 +136,11 @@ void KonsoleKalendarChange::printSpecs( Event *event )
<< endl;
cout << i18n( " Begin: %1" ).
- arg( event->dtStart().toString( Qt::TextDate ) ).local8Bit().data()
+ arg( event->dtStart().toString( TQt::TextDate ) ).local8Bit().data()
<< endl;
cout << i18n( " End: %1" ).
- arg( event->dtEnd().toString( Qt::TextDate ) ).local8Bit().data()
+ arg( event->dtEnd().toString( TQt::TextDate ) ).local8Bit().data()
<< endl;
cout << i18n( " Desc: %1" ).
@@ -163,11 +163,11 @@ void KonsoleKalendarChange::printSpecs()
<< endl;
cout << i18n( " Begin: %1" ).
- arg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data()
+ arg( m_variables->getStartDateTime().toString( TQt::TextDate ) ).local8Bit().data()
<< endl;
cout << i18n( " End: %1" ).
- arg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data()
+ arg( m_variables->getEndDateTime().toString( TQt::TextDate ) ).local8Bit().data()
<< endl;
cout << i18n( " Desc: %1" ).
diff --git a/konsolekalendar/konsolekalendardelete.cpp b/konsolekalendar/konsolekalendardelete.cpp
index 4da76100..1a274d36 100644
--- a/konsolekalendar/konsolekalendardelete.cpp
+++ b/konsolekalendar/konsolekalendardelete.cpp
@@ -101,11 +101,11 @@ void KonsoleKalendarDelete::printSpecs( Event *event )
<< endl;
cout << i18n( " Begin: %1" ).
- arg( event->dtStart().toString( Qt::TextDate ) ).local8Bit().data()
+ arg( event->dtStart().toString( TQt::TextDate ) ).local8Bit().data()
<< endl;
cout << i18n( " End: %1" ).
- arg( event->dtEnd().toString( Qt::TextDate ) ).local8Bit().data()
+ arg( event->dtEnd().toString( TQt::TextDate ) ).local8Bit().data()
<< endl;
cout << i18n( " Desc: %1" ).
diff --git a/konsolekalendar/konsolekalendarepoch.cpp b/konsolekalendar/konsolekalendarepoch.cpp
index 6aebd9a9..a58ad3a5 100644
--- a/konsolekalendar/konsolekalendarepoch.cpp
+++ b/konsolekalendar/konsolekalendarepoch.cpp
@@ -53,7 +53,7 @@ KonsoleKalendarEpoch::~KonsoleKalendarEpoch()
TQDateTime KonsoleKalendarEpoch::epoch2TQDateTime( uint epoch )
{
TQDateTime dt;
- dt.setTime_t( epoch, Qt::UTC );
+ dt.setTime_t( epoch, TQt::UTC );
return( dt );
}
@@ -64,8 +64,8 @@ uint KonsoleKalendarEpoch::TQDateTime2epoch( TQDateTime dt )
// SORRY QT DOESN'T HANDLE DAYLIGHT SAVINGS TIME.
// Compute #seconds to subtract for local timezone difference from UTC.
- int offset = TQDateTime::currentDateTime( Qt::UTC ).toTime_t()
- - TQDateTime::currentDateTime( Qt::LocalTime ).toTime_t();
+ int offset = TQDateTime::currentDateTime( TQt::UTC ).toTime_t()
+ - TQDateTime::currentDateTime( TQt::LocalTime ).toTime_t();
return( dt.toTime_t() - offset );
}
diff --git a/konsolekalendar/main.cpp b/konsolekalendar/main.cpp
index fc805764..a68af033 100644
--- a/konsolekalendar/main.cpp
+++ b/konsolekalendar/main.cpp
@@ -472,7 +472,7 @@ int main( int argc, char *argv[] )
<< "(" << option << ")"
<< endl;
- startdate = TQDate::fromString( option, Qt::ISODate );
+ startdate = TQDate::fromString( option, TQt::ISODate );
if ( !startdate.isValid() ) {
cout << i18n( "Invalid Start Date Specified: %1" ).
arg( option ).local8Bit().data()
@@ -497,7 +497,7 @@ int main( int argc, char *argv[] )
<< endl;
if ( option.upper() != "FLOAT" ) {
- starttime = TQTime::fromString( option, Qt::ISODate );
+ starttime = TQTime::fromString( option, TQt::ISODate );
if ( !starttime.isValid() ) {
cout << i18n( "Invalid Start Time Specified: %1" ).
arg( option ).local8Bit().data()
@@ -527,7 +527,7 @@ int main( int argc, char *argv[] )
<< "(" << option << ")"
<< endl;
- enddate = TQDate::fromString( option, Qt::ISODate );
+ enddate = TQDate::fromString( option, TQt::ISODate );
if ( !enddate.isValid() ) {
cout << i18n( "Invalid End Date Specified: %1" ).
arg( option ).local8Bit().data()
@@ -579,7 +579,7 @@ int main( int argc, char *argv[] )
<< endl;
if ( option.upper() != "FLOAT" ) {
- endtime = TQTime::fromString( option, Qt::ISODate );
+ endtime = TQTime::fromString( option, TQt::ISODate );
if ( !endtime.isValid() ) {
cout << i18n( "Invalid End Time Specified: %1" ).
arg( option ).local8Bit().data()
@@ -854,10 +854,10 @@ int main( int argc, char *argv[] )
// Some more debug prints
kdDebug() << "main | datetimestamp | StartDate="
- << startdatetime.toString( Qt::TextDate )
+ << startdatetime.toString( TQt::TextDate )
<< endl;
kdDebug() << "main | datetimestamp | EndDate="
- << enddatetime.toString( Qt::TextDate )
+ << enddatetime.toString( TQt::TextDate )
<< endl;
/***************************************************************************
diff --git a/kontact/DESIGN.dcopinteraction b/kontact/DESIGN.dcopinteraction
index 950b9eea..f0350627 100644
--- a/kontact/DESIGN.dcopinteraction
+++ b/kontact/DESIGN.dcopinteraction
@@ -21,8 +21,8 @@ Here are some code snippets that must go into the part (A) that wants to use "Fo
* Constructor:
m_foo_stub = 0L;
kapp->dcopClient()->setNotifications( true );
- connect( kapp->dcopClient(), SIGNAL( applicationRemoved( const QCString&)),
- this, SLOT( unregisteredFromDCOP( const QCString& )) );
+ connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const QCString&)),
+ this, TQ_SLOT( unregisteredFromDCOP( const QCString& )) );
* Destructor:
kapp->dcopClient()->setNotifications( false );
@@ -57,7 +57,7 @@ In the kontact plugin
* Don't use dcopClient() until the part is loaded
* After loading the part, you might want to create a DCOP stub to use some
of its methods (do both in a loadPart() method, e.g.).
-* Implement createDCOPInterface( const QString& serviceType ), to
+* Implement createDCOPInterface( const TQString& serviceType ), to
load the part if the serviceType is one provided by it.
See KAddressbookPlugin (plugins/kaddressbook/*) for a working example.
@@ -74,7 +74,7 @@ See e.g. tdepim/kaddressbook/kaddressbook.desktop
Designing DCOP interfaces
=========================
-Porting the kroupware Q_SIGNALS/Q_SLOTS to DCOP requires some changes.
+Porting the kroupware signals/slots to DCOP requires some changes.
For instance any non-const reference (such as those used for returning
values to the caller) has to be changed. If there is more than one
value to be returned, you need to
diff --git a/kontact/Thoughts b/kontact/Thoughts
index c4332425..a7601453 100644
--- a/kontact/Thoughts
+++ b/kontact/Thoughts
@@ -367,7 +367,7 @@ h: there is something else broken IMHO
Summary View
------------
h: How would one best integrate a summary view into kontact?
-h: a) add a virtual QWidget *summary(const QDateTime&, QWidget* parent );
+h: a) add a virtual TQWidget *summary(const QDateTime&, TQWidget* parent );
h: to get a summary widget for a day?
h: b) use some sort of XML to UI to represent the summary informations
h: c) have a stand a lone part which opens the PIM data seperately? ( How
diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp
index 3c270aa8..859e76fa 100644
--- a/kontact/interfaces/core.cpp
+++ b/kontact/interfaces/core.cpp
@@ -43,7 +43,7 @@ Core::Core( TQWidget *parent, const char *name )
d = new Private;
TQTimer* timer = new TQTimer( this );
mLastDate = TQDate::currentDate();
- connect(timer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkNewDay() ) );
+ connect(timer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkNewDay() ) );
timer->start( 1000*60 );
}
@@ -66,13 +66,13 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname )
KParts::ReadOnlyPart *part =
KParts::ComponentFactory::
createPartInstanceFromLibrary<KParts::ReadOnlyPart>
- ( libname, this, 0, TQT_TQOBJECT(this), "kontact", TQStringList(), &error );
+ ( libname, this, 0, this, "kontact", TQStringList(), &error );
KParts::ReadOnlyPart *pimPart = dynamic_cast<KParts::ReadOnlyPart*>( part );
if ( pimPart ) {
mParts.insert( libname, pimPart );
- QObject::connect( pimPart, TQT_SIGNAL( destroyed( TQObject * ) ),
- TQT_SLOT( slotPartDestroyed( TQObject * ) ) );
+ TQObject::connect( pimPart, TQ_SIGNAL( destroyed( TQObject * ) ),
+ TQ_SLOT( slotPartDestroyed( TQObject * ) ) );
} else {
// TODO move to KParts::ComponentFactory
switch( error ) {
diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h
index c76406d5..7317febc 100644
--- a/kontact/interfaces/core.h
+++ b/kontact/interfaces/core.h
@@ -40,7 +40,7 @@ class Plugin;
*/
class KDE_EXPORT Core : public KParts::MainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
virtual ~Core();
diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp
index 3b63466c..71364b6a 100644
--- a/kontact/interfaces/plugin.cpp
+++ b/kontact/interfaces/plugin.cpp
@@ -147,7 +147,7 @@ KParts::ReadOnlyPart *Plugin::part()
if ( !d->part ) {
d->part = createPart();
if ( d->part ) {
- connect( d->part, TQT_SIGNAL( destroyed() ), TQT_SLOT( partDestroyed() ) );
+ connect( d->part, TQ_SIGNAL( destroyed() ), TQ_SLOT( partDestroyed() ) );
core()->partLoaded( this, d->part );
}
}
diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h
index 70c8a7e2..af7cbfa7 100644
--- a/kontact/interfaces/plugin.h
+++ b/kontact/interfaces/plugin.h
@@ -57,7 +57,7 @@ class Summary;
*/
class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kontact/interfaces/summary.cpp b/kontact/interfaces/summary.cpp
index 6192dd4c..c48e7889 100644
--- a/kontact/interfaces/summary.cpp
+++ b/kontact/interfaces/summary.cpp
@@ -82,14 +82,14 @@ void Summary::mousePressEvent( TQMouseEvent *event )
void Summary::mouseMoveEvent( TQMouseEvent *event )
{
- if ( (event->state() & Qt::LeftButton) &&
+ if ( (event->state() & TQt::LeftButton) &&
(event->pos() - mDragStartPoint).manhattanLength() > 4 ) {
TQDragObject *drag = new TQTextDrag( "", this, "SummaryWidgetDrag" );
TQPixmap pm = TQPixmap::grabWidget( this );
if ( pm.width() > 300 )
- pm = pm.convertToImage().smoothScale( 300, 300, TQ_ScaleMin );
+ pm = pm.convertToImage().smoothScale( 300, 300, TQImage::ScaleMin );
TQPainter painter;
painter.begin( &pm );
diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h
index dba346e2..945395c8 100644
--- a/kontact/interfaces/summary.h
+++ b/kontact/interfaces/summary.h
@@ -35,7 +35,7 @@ namespace Kontact
*/
class KDE_EXPORT Summary : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp
index 98a5d45b..2ad0f638 100644
--- a/kontact/interfaces/uniqueapphandler.cpp
+++ b/kontact/interfaces/uniqueapphandler.cpp
@@ -156,8 +156,8 @@ UniqueAppWatcher::UniqueAppWatcher( UniqueAppHandlerFactoryBase* factory, Plugin
if ( mRunningStandalone ) {
kapp->dcopClient()->setNotifications( true );
- connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ),
- this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
+ connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
+ this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
} else {
mFactory->createHandler( mPlugin );
}
@@ -174,8 +174,8 @@ UniqueAppWatcher::~UniqueAppWatcher()
void UniqueAppWatcher::unregisteredFromDCOP( const TQCString& appId )
{
if ( appId == mPlugin->name() && mRunningStandalone ) {
- disconnect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ),
- this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
+ disconnect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
+ this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
kdDebug(5601) << k_funcinfo << appId << endl;
mFactory->createHandler( mPlugin );
kapp->dcopClient()->setNotifications( false );
diff --git a/kontact/interfaces/uniqueapphandler.h b/kontact/interfaces/uniqueapphandler.h
index 025bb8b8..bef34d47 100644
--- a/kontact/interfaces/uniqueapphandler.h
+++ b/kontact/interfaces/uniqueapphandler.h
@@ -93,7 +93,7 @@ template <class T> class UniqueAppHandlerFactory : public UniqueAppHandlerFactor
*/
class KDE_EXPORT UniqueAppWatcher : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp
index a7a7fa7a..17cd5862 100644
--- a/kontact/plugins/akregator/akregator_plugin.cpp
+++ b/kontact/plugins/akregator/akregator_plugin.cpp
@@ -49,11 +49,11 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_akregator,
PluginFactory( "kontact_akregator" ) )
AkregatorPlugin::AkregatorPlugin( Kontact::Core *core, const char *, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), "akregator" ), m_stub(0)
+ : Kontact::Plugin( core, core, "akregator" ), m_stub(0)
{
setInstance( PluginFactory::instance() );
- insertNewAction( new TDEAction( i18n( "New Feed..." ), "bookmark_add", CTRL+SHIFT+Key_F, this, TQT_SLOT( addFeed() ), actionCollection(), "feed_new" ) );
+ insertNewAction( new TDEAction( i18n( "New Feed..." ), "bookmark_add", CTRL+SHIFT+Key_F, this, TQ_SLOT( addFeed() ), actionCollection(), "feed_new" ) );
m_uniqueAppWatcher = new Kontact::UniqueAppWatcher(
new Kontact::UniqueAppHandlerFactory<Akregator::UniqueAppHandler>(), this );
@@ -89,7 +89,7 @@ MyBasePart* AkregatorPlugin::createPart()
{
MyBasePart* p = loadPart();
- connect(p, TQT_SIGNAL(showPart()), this, TQT_SLOT(showPart()));
+ connect(p, TQ_SIGNAL(showPart()), this, TQ_SLOT(showPart()));
m_stub = new Akregator::AkregatorPartIface_stub( dcopClient(), "akregator",
"AkregatorIface" );
m_stub->openStandardFeedList();
diff --git a/kontact/plugins/akregator/akregator_plugin.h b/kontact/plugins/akregator/akregator_plugin.h
index 041d7a97..324d8ca8 100644
--- a/kontact/plugins/akregator/akregator_plugin.h
+++ b/kontact/plugins/akregator/akregator_plugin.h
@@ -50,7 +50,7 @@ class UniqueAppHandler : public Kontact::UniqueAppHandler
class AkregatorPlugin : public Kontact::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
AkregatorPlugin( Kontact::Core *core, const char *name,
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
index d6db8112..8cdef758 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
@@ -52,20 +52,20 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_kaddressbookplugin,
KAddressbookPluginFactory( "kontact_kaddressbookplugin" ) )
KAddressbookPlugin::KAddressbookPlugin( Kontact::Core *core, const char *, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), "kaddressbook" ),
+ : Kontact::Plugin( core, core, "kaddressbook" ),
mStub( 0 )
{
setInstance( KAddressbookPluginFactory::instance() );
insertNewAction( new TDEAction( i18n( "New Contact..." ), "identity",
- CTRL+SHIFT+Key_C, this, TQT_SLOT( slotNewContact() ), actionCollection(),
+ CTRL+SHIFT+Key_C, this, TQ_SLOT( slotNewContact() ), actionCollection(),
"new_contact" ) );
insertNewAction( new TDEAction( i18n( "&New Distribution List..." ), "kontact_contacts", 0, this,
- TQT_SLOT( slotNewDistributionList() ), actionCollection(), "new_distributionlist" ) );
+ TQ_SLOT( slotNewDistributionList() ), actionCollection(), "new_distributionlist" ) );
insertSyncAction( new TDEAction( i18n( "Synchronize Contacts" ), "reload",
- 0, this, TQT_SLOT( slotSyncContacts() ), actionCollection(),
+ 0, this, TQ_SLOT( slotSyncContacts() ), actionCollection(),
"kaddressbook_sync" ) );
mUniqueAppWatcher = new Kontact::UniqueAppWatcher(
new Kontact::UniqueAppHandlerFactory<KABUniqueAppHandler>(), this );
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.h b/kontact/plugins/kaddressbook/kaddressbook_plugin.h
index 3db624ce..6e073b19 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.h
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.h
@@ -44,7 +44,7 @@ public:
class KAddressbookPlugin : public Kontact::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
KAddressbookPlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/karm/karm_plugin.cpp b/kontact/plugins/karm/karm_plugin.cpp
index 8db54bc9..a84dd63b 100644
--- a/kontact/plugins/karm/karm_plugin.cpp
+++ b/kontact/plugins/karm/karm_plugin.cpp
@@ -37,12 +37,12 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_karm,
KarmPluginFactory( "kontact_karm" ) )
KarmPlugin::KarmPlugin( Kontact::Core *core, const char *, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), "KArm" )
+ : Kontact::Plugin( core, core, "KArm" )
{
setInstance( KarmPluginFactory::instance() );
(void)dcopClient();
insertNewAction( new TDEAction( i18n( "New Task" ), "karm",
- CTRL+SHIFT+Key_W, this, TQT_SLOT( newTask() ), actionCollection(),
+ CTRL+SHIFT+Key_W, this, TQ_SLOT( newTask() ), actionCollection(),
"new_task" ) );
}
diff --git a/kontact/plugins/karm/karm_plugin.h b/kontact/plugins/karm/karm_plugin.h
index f2f6259b..adf32b50 100644
--- a/kontact/plugins/karm/karm_plugin.h
+++ b/kontact/plugins/karm/karm_plugin.h
@@ -36,7 +36,7 @@ class TDEAboutData;
class KarmPlugin : public Kontact::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
KarmPlugin( Kontact::Core *core, const char *name,
diff --git a/kontact/plugins/kitchensync/Makefile.am b/kontact/plugins/kitchensync/Makefile.am
deleted file mode 100644
index c6df9113..00000000
--- a/kontact/plugins/kitchensync/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-INCLUDES = -I$(top_srcdir)/kontact/interfaces $(all_includes)
-
-kde_module_LTLIBRARIES = libkontact_kitchensync.la
-libkontact_kitchensync_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkontact_kitchensync_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la
-
-libkontact_kitchensync_la_SOURCES = kitchensync_plugin.cpp
-
-METASOURCES = AUTO
-
-servicedir = $(kde_servicesdir)/kontact
-service_DATA = kitchensync.desktop
-
-kitchensynciface_DIR = $(top_srcdir)/kitchensync
diff --git a/kontact/plugins/kitchensync/kitchensync.desktop b/kontact/plugins/kitchensync/kitchensync.desktop
deleted file mode 100644
index 6a8153ed..00000000
--- a/kontact/plugins/kitchensync/kitchensync.desktop
+++ /dev/null
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Type=Service
-Icon=kitchensync
-X-TDE-ServiceTypes=Kontact/Plugin,KPluginInfo
-
-X-TDE-Library=libkontact_kitchensync
-X-TDE-KontactPluginVersion=6
-X-TDE-KontactPartLibraryName=libkitchensyncpart
-
-X-TDE-PluginInfo-Name=kontact_kitchensync
-X-TDE-PluginInfo-Version=0.1
-X-TDE-PluginInfo-License=GPL
-X-TDE-PluginInfo-EnabledByDefault=false
-
-Name=Sync
-
-Comment=Synchronization Component (Kitchensynk Plugin)
diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.cpp b/kontact/plugins/kitchensync/kitchensync_plugin.cpp
deleted file mode 100644
index 48e33627..00000000
--- a/kontact/plugins/kitchensync/kitchensync_plugin.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- This file is part of Kontact.
-
- Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- As a special exception, permission is given to link this program
- with any edition of TQt, and distribute the resulting executable,
- without including the source code for TQt in the source distribution.
-*/
-
-#include <tqwidget.h>
-
-#include <tdeaboutdata.h>
-#include <tdeaction.h>
-#include <tdeapplication.h>
-#include <kdebug.h>
-#include <kgenericfactory.h>
-#include <kiconloader.h>
-#include <tdemessagebox.h>
-#include <tdeparts/componentfactory.h>
-
-#include "core.h"
-#include "plugin.h"
-
-#include "kitchensync_plugin.h"
-
-typedef KGenericFactory< KitchenSyncPlugin, Kontact::Core > KitchenSyncPluginFactory;
-K_EXPORT_COMPONENT_FACTORY( libkontact_kitchensync,
- KitchenSyncPluginFactory( "kontact_kitchensync" ) )
-
-KitchenSyncPlugin::KitchenSyncPlugin( Kontact::Core *core, const char *, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), "KitchenSync" )
-{
- setInstance( KitchenSyncPluginFactory::instance() );
-}
-
-KitchenSyncPlugin::~KitchenSyncPlugin()
-{
-}
-
-KParts::ReadOnlyPart* KitchenSyncPlugin::createPart()
-{
- return loadPart();
-}
-
-TQStringList KitchenSyncPlugin::configModules() const
-{
- TQStringList modules;
- modules << "PIM/kitchensync.desktop";
- return modules;
-}
-
-#include "kitchensync_plugin.moc"
diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.h b/kontact/plugins/kitchensync/kitchensync_plugin.h
deleted file mode 100644
index b484e32e..00000000
--- a/kontact/plugins/kitchensync/kitchensync_plugin.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- This file is part of Kontact.
-
- Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- As a special exception, permission is given to link this program
- with any edition of TQt, and distribute the resulting executable,
- without including the source code for TQt in the source distribution.
-*/
-
-#ifndef KITCHENSYNC_PLUGIN_H
-#define KITCHENSYNC_PLUGIN_H
-
-#include <tdelocale.h>
-#include <tdeparts/part.h>
-
-#include "plugin.h"
-
-class TDEAboutData;
-
-class KitchenSyncPlugin : public Kontact::Plugin
-{
- Q_OBJECT
-
- public:
- KitchenSyncPlugin( Kontact::Core *core, const char *name,
- const TQStringList & );
- virtual ~KitchenSyncPlugin();
-
- int weight() const { return 800; }
-
- virtual TQStringList configModules() const;
- protected:
- KParts::ReadOnlyPart *createPart();
-};
-
-#endif
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp
index e2f9126f..690cbc50 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@@ -52,8 +52,8 @@ KCMKMailSummary::KCMKMailSummary( TQWidget *parent, const char *name )
{
initGUI();
- connect( mFolderView, TQT_SIGNAL( clicked( TQListViewItem* ) ), TQT_SLOT( modified() ) );
- connect( mFullPath, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );
+ connect( mFolderView, TQ_SIGNAL( clicked( TQListViewItem* ) ), TQ_SLOT( modified() ) );
+ connect( mFullPath, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) );
TDEAcceleratorManager::manage( this );
diff --git a/kontact/plugins/kmail/kcmkmailsummary.h b/kontact/plugins/kmail/kcmkmailsummary.h
index 7cc4763e..e6681153 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.h
+++ b/kontact/plugins/kmail/kcmkmailsummary.h
@@ -35,7 +35,7 @@ class TQCheckListItem;
class KCMKMailSummary : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp
index 09c2fd05..1a818694 100644
--- a/kontact/plugins/kmail/kmail_plugin.cpp
+++ b/kontact/plugins/kmail/kmail_plugin.cpp
@@ -56,17 +56,17 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_kmailplugin,
KMailPluginFactory( "kontact_kmailplugin" ) )
KMailPlugin::KMailPlugin(Kontact::Core *core, const char *, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), "kmail" ),
+ : Kontact::Plugin( core, core, "kmail" ),
mStub( 0 )
{
setInstance( KMailPluginFactory::instance() );
insertNewAction( new TDEAction( i18n( "New Message..." ), "mail-message-new",
- CTRL+SHIFT+Key_M, this, TQT_SLOT( slotNewMail() ), actionCollection(),
+ CTRL+SHIFT+Key_M, this, TQ_SLOT( slotNewMail() ), actionCollection(),
"new_mail" ) );
insertSyncAction( new TDEAction( i18n( "Synchronize Mail" ), "reload",
- 0, this, TQT_SLOT( slotSyncFolders() ), actionCollection(),
+ 0, this, TQ_SLOT( slotSyncFolders() ), actionCollection(),
"sync_mail" ) );
mUniqueAppWatcher = new Kontact::UniqueAppWatcher(
diff --git a/kontact/plugins/kmail/kmail_plugin.h b/kontact/plugins/kmail/kmail_plugin.h
index 923fd3a8..ff8c532e 100644
--- a/kontact/plugins/kmail/kmail_plugin.h
+++ b/kontact/plugins/kmail/kmail_plugin.h
@@ -45,7 +45,7 @@ public:
class KMailPlugin : public Kontact::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMailPlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp
index 924938a0..31e22992 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.cpp
@@ -133,8 +133,8 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
urlLabel->installEventFilter( this );
urlLabel->setAlignment( AlignLeft );
urlLabel->show();
- connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
- TQT_SLOT( selectFolder( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+ TQ_SLOT( selectFolder( const TQString& ) ) );
mLayout->addWidget( urlLabel, counter, 0 );
mLabels.append( urlLabel );
@@ -163,7 +163,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
{
if ( obj->inherits( "KURLLabel" ) ) {
- KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
+ KURLLabel* label = static_cast<KURLLabel*>( obj );
if ( e->type() == TQEvent::Enter )
emit message( i18n( "Open Folder: \"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave )
diff --git a/kontact/plugins/kmail/summarywidget.h b/kontact/plugins/kmail/summarywidget.h
index 3813ee03..d5fb299c 100644
--- a/kontact/plugins/kmail/summarywidget.h
+++ b/kontact/plugins/kmail/summarywidget.h
@@ -40,7 +40,7 @@ class TQString;
class SummaryWidget : public Kontact::Summary, public DCOPObject
{
- Q_OBJECT
+ TQ_OBJECT
//
K_DCOP
diff --git a/kontact/plugins/knode/knode_plugin.cpp b/kontact/plugins/knode/knode_plugin.cpp
index 758572bb..8a6fb54f 100644
--- a/kontact/plugins/knode/knode_plugin.cpp
+++ b/kontact/plugins/knode/knode_plugin.cpp
@@ -45,12 +45,12 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_knodeplugin,
KNodePlugin::KNodePlugin( Kontact::Core *core, const char *, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), "knode" ), mStub(0)
+ : Kontact::Plugin( core, core, "knode" ), mStub(0)
{
setInstance( KNodePluginFactory::instance() );
insertNewAction( new TDEAction( i18n( "New Article..." ), "mail-message-new", CTRL+SHIFT+Key_A,
- this, TQT_SLOT( slotPostArticle() ), actionCollection(), "post_article" ) );
+ this, TQ_SLOT( slotPostArticle() ), actionCollection(), "post_article" ) );
mUniqueAppWatcher = new Kontact::UniqueAppWatcher(
new Kontact::UniqueAppHandlerFactory<KNodeUniqueAppHandler>(), this );
diff --git a/kontact/plugins/knode/knode_plugin.h b/kontact/plugins/knode/knode_plugin.h
index 4b1cb21e..c74878c9 100644
--- a/kontact/plugins/knode/knode_plugin.h
+++ b/kontact/plugins/knode/knode_plugin.h
@@ -42,7 +42,7 @@ public:
class KNodePlugin : public Kontact::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
KNodePlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp
index 20e8d6c9..7ec3df6c 100644
--- a/kontact/plugins/knotes/knotes_part.cpp
+++ b/kontact/plugins/knotes/knotes_part.cpp
@@ -50,13 +50,13 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name )
setInstance( new TDEInstance( "knotes" ) );
// create the actions
- new TDEAction( i18n( "&New" ), "knotes", CTRL+Key_N, this, TQT_SLOT( newNote() ),
+ new TDEAction( i18n( "&New" ), "knotes", CTRL+Key_N, this, TQ_SLOT( newNote() ),
actionCollection(), "file_new" );
- new TDEAction( i18n( "Rename..." ), "text", this, TQT_SLOT( renameNote() ),
+ new TDEAction( i18n( "Rename..." ), "text", this, TQ_SLOT( renameNote() ),
actionCollection(), "edit_rename" );
- new TDEAction( i18n( "Delete" ), "edit-delete", Key_Delete, this, TQT_SLOT( killSelectedNotes() ),
+ new TDEAction( i18n( "Delete" ), "edit-delete", Key_Delete, this, TQ_SLOT( killSelectedNotes() ),
actionCollection(), "edit_delete" );
- new TDEAction( i18n( "Print Selected Notes..." ), "print", CTRL+Key_P, this, TQT_SLOT( printSelectedNotes() ),
+ new TDEAction( i18n( "Print Selected Notes..." ), "print", CTRL+Key_P, this, TQ_SLOT( printSelectedNotes() ),
actionCollection(), "print_note" );
// TODO icons: s/editdelete/knotes_delete/ or the other way round in knotes
@@ -68,20 +68,20 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name )
mNotesView->setAutoArrange( true );
mNotesView->setSorting( true );
- connect( mNotesView, TQT_SIGNAL( executed( TQIconViewItem* ) ),
- this, TQT_SLOT( editNote( TQIconViewItem* ) ) );
- connect( mNotesView, TQT_SIGNAL( returnPressed( TQIconViewItem* ) ),
- this, TQT_SLOT( editNote( TQIconViewItem* ) ) );
- connect( mNotesView, TQT_SIGNAL( itemRenamed( TQIconViewItem* ) ),
- this, TQT_SLOT( renamedNote( TQIconViewItem* ) ) );
- connect( mNotesView, TQT_SIGNAL( contextMenuRequested( TQIconViewItem*, const TQPoint& ) ),
- this, TQT_SLOT( popupRMB( TQIconViewItem*, const TQPoint& ) ) );
- connect( mNotesView, TQT_SIGNAL( onItem( TQIconViewItem* ) ),
- this, TQT_SLOT( slotOnItem( TQIconViewItem* ) ) );
- connect( mNotesView, TQT_SIGNAL( onViewport() ),
- this, TQT_SLOT( slotOnViewport() ) );
- connect( mNotesView, TQT_SIGNAL( currentChanged( TQIconViewItem* ) ),
- this, TQT_SLOT( slotOnCurrentChanged( TQIconViewItem* ) ) );
+ connect( mNotesView, TQ_SIGNAL( executed( TQIconViewItem* ) ),
+ this, TQ_SLOT( editNote( TQIconViewItem* ) ) );
+ connect( mNotesView, TQ_SIGNAL( returnPressed( TQIconViewItem* ) ),
+ this, TQ_SLOT( editNote( TQIconViewItem* ) ) );
+ connect( mNotesView, TQ_SIGNAL( itemRenamed( TQIconViewItem* ) ),
+ this, TQ_SLOT( renamedNote( TQIconViewItem* ) ) );
+ connect( mNotesView, TQ_SIGNAL( contextMenuRequested( TQIconViewItem*, const TQPoint& ) ),
+ this, TQ_SLOT( popupRMB( TQIconViewItem*, const TQPoint& ) ) );
+ connect( mNotesView, TQ_SIGNAL( onItem( TQIconViewItem* ) ),
+ this, TQ_SLOT( slotOnItem( TQIconViewItem* ) ) );
+ connect( mNotesView, TQ_SIGNAL( onViewport() ),
+ this, TQ_SLOT( slotOnViewport() ) );
+ connect( mNotesView, TQ_SIGNAL( currentChanged( TQIconViewItem* ) ),
+ this, TQ_SLOT( slotOnCurrentChanged( TQIconViewItem* ) ) );
slotOnCurrentChanged( 0 );
@@ -91,10 +91,10 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name )
setXMLFile( "knotes_part.rc" );
// connect the resource manager
- connect( mManager, TQT_SIGNAL( sigRegisteredNote( KCal::Journal* ) ),
- this, TQT_SLOT( createNote( KCal::Journal* ) ) );
- connect( mManager, TQT_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ),
- this, TQT_SLOT( killNote( KCal::Journal* ) ) );
+ connect( mManager, TQ_SIGNAL( sigRegisteredNote( KCal::Journal* ) ),
+ this, TQ_SLOT( createNote( KCal::Journal* ) ) );
+ connect( mManager, TQ_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ),
+ this, TQ_SLOT( killNote( KCal::Journal* ) ) );
// read the notes
mManager->load();
diff --git a/kontact/plugins/knotes/knotes_part.h b/kontact/plugins/knotes/knotes_part.h
index 67808bae..62766b1f 100644
--- a/kontact/plugins/knotes/knotes_part.h
+++ b/kontact/plugins/knotes/knotes_part.h
@@ -46,7 +46,7 @@ class Journal;
class KNotesPart : public KParts::ReadOnlyPart, virtual public KNotesIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h
index 9a30d715..735f492e 100644
--- a/kontact/plugins/knotes/knotes_part_p.h
+++ b/kontact/plugins/knotes/knotes_part_p.h
@@ -114,7 +114,7 @@ class KNotesIconView : public TDEIconView
class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -144,7 +144,7 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient
mNoteEdit->setFocus();
KXMLGUIBuilder builder( page );
- KXMLGUIFactory factory( &builder, TQT_TQOBJECT(this) );
+ KXMLGUIFactory factory( &builder, this );
factory.addClient( this );
mTool = static_cast<TDEToolBar *>(factory.container( "note_tool", this ));
diff --git a/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp
index bec6fb5c..1b66eea1 100644
--- a/kontact/plugins/knotes/knotes_plugin.cpp
+++ b/kontact/plugins/knotes/knotes_plugin.cpp
@@ -39,15 +39,15 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_knotesplugin,
KNotesPlugin::KNotesPlugin( Kontact::Core *core, const char *, const TQStringList & )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), "knotes" ),
+ : Kontact::Plugin( core, core, "knotes" ),
mAboutData( 0 )
{
setInstance( KNotesPluginFactory::instance() );
insertNewAction( new TDEAction( i18n( "New Note..." ), "knotes", CTRL+SHIFT+Key_N,
- this, TQT_SLOT( slotNewNote() ), actionCollection(), "new_note" ) );
+ this, TQ_SLOT( slotNewNote() ), actionCollection(), "new_note" ) );
insertSyncAction( new TDEAction( i18n( "Synchronize Notes" ), "reload", 0,
- this, TQT_SLOT( slotSyncNotes() ), actionCollection(), "knotes_sync" ) );
+ this, TQ_SLOT( slotSyncNotes() ), actionCollection(), "knotes_sync" ) );
}
KNotesPlugin::~KNotesPlugin()
diff --git a/kontact/plugins/knotes/knotes_plugin.h b/kontact/plugins/knotes/knotes_plugin.h
index 069f10fb..1bde9e63 100644
--- a/kontact/plugins/knotes/knotes_plugin.h
+++ b/kontact/plugins/knotes/knotes_plugin.h
@@ -31,7 +31,7 @@ class SummaryWidget;
class KNotesPlugin : public Kontact::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
KNotesPlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp
index 97bd771f..dfa469bc 100644
--- a/kontact/plugins/knotes/knotetip.cpp
+++ b/kontact/plugins/knotes/knotetip.cpp
@@ -75,7 +75,7 @@ void KNoteTip::setNote( KNotesIconViewItem *item )
mNoteIVI = item;
if ( !mNoteIVI ) {
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
if ( isVisible() ) {
setFilter( false );
hide();
@@ -104,7 +104,7 @@ void KNoteTip::setNote( KNotesIconViewItem *item )
resize( w, TQMIN( h, desk.height() / 2 - 20 ) );
hide();
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
setFilter( true );
startTimer( 600 ); // delay showing the tooltip for 0.7 sec
}
@@ -121,7 +121,7 @@ void KNoteTip::resizeEvent( TQResizeEvent *ev )
void KNoteTip::timerEvent( TQTimerEvent * )
{
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
if ( !isVisible() ) {
startTimer( 15000 ); // show the tooltip for 15 sec
@@ -144,7 +144,7 @@ bool KNoteTip::eventFilter( TQObject *, TQEvent *e )
case TQEvent::FocusIn:
case TQEvent::FocusOut:
case TQEvent::Wheel:
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
setFilter( false );
hide();
default:
diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp
index ca0f6ae5..89ae1ec1 100644
--- a/kontact/plugins/knotes/summarywidget.cpp
+++ b/kontact/plugins/knotes/summarywidget.cpp
@@ -61,10 +61,10 @@ KNotesSummaryWidget::KNotesSummaryWidget( Kontact::Plugin *plugin,
mCalendar = new KCal::CalendarLocal( TQString::fromLatin1("UTC") );
KNotesResourceManager *manager = new KNotesResourceManager();
- TQObject::connect( manager, TQT_SIGNAL( sigRegisteredNote( KCal::Journal* ) ),
- this, TQT_SLOT( addNote( KCal::Journal* ) ) );
- TQObject::connect( manager, TQT_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ),
- this, TQT_SLOT( removeNote( KCal::Journal* ) ) );
+ TQObject::connect( manager, TQ_SIGNAL( sigRegisteredNote( KCal::Journal* ) ),
+ this, TQ_SLOT( addNote( KCal::Journal* ) ) );
+ TQObject::connect( manager, TQ_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ),
+ this, TQ_SLOT( removeNote( KCal::Journal* ) ) );
manager->load();
@@ -111,8 +111,8 @@ void KNotesSummaryWidget::updateView()
TQToolTip::add( urlLabel, (*it)->description().left( 80 ) );
}
- connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
- this, TQT_SLOT( urlClicked( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+ this, TQ_SLOT( urlClicked( const TQString& ) ) );
counter++;
}
@@ -138,7 +138,7 @@ void KNotesSummaryWidget::urlClicked( const TQString &/*uid*/ )
bool KNotesSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
{
if ( obj->inherits( "KURLLabel" ) ) {
- KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
+ KURLLabel* label = static_cast<KURLLabel*>( obj );
if ( e->type() == TQEvent::Enter )
emit message( i18n( "Read Note: \"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave )
diff --git a/kontact/plugins/knotes/summarywidget.h b/kontact/plugins/knotes/summarywidget.h
index 305873d7..1ac015f4 100644
--- a/kontact/plugins/knotes/summarywidget.h
+++ b/kontact/plugins/knotes/summarywidget.h
@@ -42,7 +42,7 @@ namespace Kontact {
class KNotesSummaryWidget : public Kontact::Summary
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/korganizer/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp
index ac3b7735..a028d937 100644
--- a/kontact/plugins/korganizer/journalplugin.cpp
+++ b/kontact/plugins/korganizer/journalplugin.cpp
@@ -43,17 +43,17 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_journalplugin,
JournalPluginFactory( "kontact_journalplugin" ) )
JournalPlugin::JournalPlugin( Kontact::Core *core, const char *, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), "korganizer" ),
+ : Kontact::Plugin( core, core, "korganizer" ),
mIface( 0 )
{
setInstance( JournalPluginFactory::instance() );
instance()->iconLoader()->addAppDir("tdepim");
insertNewAction( new TDEAction( i18n( "New Journal..." ), "newjournal",
- CTRL+SHIFT+Key_J, this, TQT_SLOT( slotNewJournal() ), actionCollection(),
+ CTRL+SHIFT+Key_J, this, TQ_SLOT( slotNewJournal() ), actionCollection(),
"new_journal" ) );
insertSyncAction( new TDEAction( i18n( "Synchronize Journal" ), "reload",
- 0, this, TQT_SLOT( slotSyncJournal() ), actionCollection(),
+ 0, this, TQ_SLOT( slotSyncJournal() ), actionCollection(),
"journal_sync" ) );
diff --git a/kontact/plugins/korganizer/journalplugin.h b/kontact/plugins/korganizer/journalplugin.h
index f7d0a465..25106164 100644
--- a/kontact/plugins/korganizer/journalplugin.h
+++ b/kontact/plugins/korganizer/journalplugin.h
@@ -33,7 +33,7 @@
class JournalPlugin : public Kontact::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
JournalPlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp
index b8c7a0cd..4c0945e7 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.cpp
+++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp
@@ -54,11 +54,11 @@ KCMKOrgSummary::KCMKOrgSummary( TQWidget *parent, const char *name )
customDaysChanged( 1 );
- connect( mCalendarGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) );
- connect( mCalendarGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( buttonClicked( int ) ) );
- connect( mTodoGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) );
- connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) );
- connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( customDaysChanged( int ) ) );
+ connect( mCalendarGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( modified() ) );
+ connect( mCalendarGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( buttonClicked( int ) ) );
+ connect( mTodoGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( modified() ) );
+ connect( mCustomDays, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( modified() ) );
+ connect( mCustomDays, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( customDaysChanged( int ) ) );
TDEAcceleratorManager::manage( this );
@@ -92,7 +92,7 @@ void KCMKOrgSummary::initGUI()
{
TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
- mCalendarGroup = new TQButtonGroup( 0, Qt::Vertical, i18n( "Appointments" ), this );
+ mCalendarGroup = new TQButtonGroup( 0, TQt::Vertical, i18n( "Appointments" ), this );
TQVBoxLayout *boxLayout = new TQVBoxLayout( mCalendarGroup->layout(),
KDialog::spacingHint() );
@@ -124,7 +124,7 @@ void KCMKOrgSummary::initGUI()
layout->addWidget( mCalendarGroup );
- mTodoGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "To-dos" ), this );
+ mTodoGroup = new TQButtonGroup( 2, TQt::Horizontal, i18n( "To-dos" ), this );
new TQRadioButton( i18n( "Show all to-dos" ), mTodoGroup );
new TQRadioButton( i18n( "Show today's to-dos only" ), mTodoGroup );
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.h b/kontact/plugins/korganizer/kcmkorgsummary.h
index 18db1df7..ce451f4e 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.h
+++ b/kontact/plugins/korganizer/kcmkorgsummary.h
@@ -31,7 +31,7 @@ class TQButtonGroup;
class KCMKOrgSummary : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index b25016aa..475c64a9 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@@ -57,7 +57,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_korganizerplugin,
KOrganizerPluginFactory( "kontact_korganizerplugin" ) )
KOrganizerPlugin::KOrganizerPlugin( Kontact::Core *core, const char *, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), "korganizer" ),
+ : Kontact::Plugin( core, core, "korganizer" ),
mIface( 0 )
{
@@ -65,11 +65,11 @@ KOrganizerPlugin::KOrganizerPlugin( Kontact::Core *core, const char *, const TQS
instance()->iconLoader()->addAppDir("tdepim");
insertNewAction( new TDEAction( i18n( "New Event..." ), "newappointment",
- CTRL+SHIFT+Key_E, this, TQT_SLOT( slotNewEvent() ), actionCollection(),
+ CTRL+SHIFT+Key_E, this, TQ_SLOT( slotNewEvent() ), actionCollection(),
"new_event" ) );
insertSyncAction( new TDEAction( i18n( "Synchronize Calendar" ), "reload",
- 0, this, TQT_SLOT( slotSyncEvents() ), actionCollection(),
+ 0, this, TQ_SLOT( slotSyncEvents() ), actionCollection(),
"korganizer_sync" ) );
mUniqueAppWatcher = new Kontact::UniqueAppWatcher(
diff --git a/kontact/plugins/korganizer/korganizerplugin.h b/kontact/plugins/korganizer/korganizerplugin.h
index 3aaa4083..d955b3dc 100644
--- a/kontact/plugins/korganizer/korganizerplugin.h
+++ b/kontact/plugins/korganizer/korganizerplugin.h
@@ -35,7 +35,7 @@
class KOrganizerPlugin : public Kontact::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOrganizerPlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index 93b2c2dd..6a3c0432 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -66,9 +66,9 @@ SummaryWidget::SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent,
mCalendar = KOrg::StdCalendar::self();
- connect( mCalendar, TQT_SIGNAL( calendarChanged() ), TQT_SLOT( updateView() ) );
- connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ),
- TQT_SLOT( updateView() ) );
+ connect( mCalendar, TQ_SIGNAL( calendarChanged() ), TQ_SLOT( updateView() ) );
+ connect( mPlugin->core(), TQ_SIGNAL( dayChanged( const TQDate& ) ),
+ TQ_SLOT( updateView() ) );
updateView();
}
@@ -202,10 +202,10 @@ void SummaryWidget::updateView()
mLayout->addWidget( urlLabel, counter, 2 );
mLabels.append( urlLabel );
- connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
- this, TQT_SLOT( viewEvent( const TQString& ) ) );
- connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ),
- this, TQT_SLOT( popupMenu( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+ this, TQ_SLOT( viewEvent( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ),
+ this, TQ_SLOT( popupMenu( const TQString& ) ) );
TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, ev, dt, true ) );
if ( !tipText.isEmpty() ) {
@@ -286,7 +286,7 @@ void SummaryWidget::popupMenu( const TQString &uid )
bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
{
if ( obj->inherits( "KURLLabel" ) ) {
- KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
+ KURLLabel* label = static_cast<KURLLabel*>( obj );
if ( e->type() == TQEvent::Enter )
emit message( i18n( "Edit Appointment: \"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave )
diff --git a/kontact/plugins/korganizer/summarywidget.h b/kontact/plugins/korganizer/summarywidget.h
index 02fc11c4..d0c9353e 100644
--- a/kontact/plugins/korganizer/summarywidget.h
+++ b/kontact/plugins/korganizer/summarywidget.h
@@ -38,7 +38,7 @@ class KOrganizerPlugin;
class SummaryWidget : public Kontact::Summary
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp
index 885c835a..bcb2c566 100644
--- a/kontact/plugins/korganizer/todoplugin.cpp
+++ b/kontact/plugins/korganizer/todoplugin.cpp
@@ -55,18 +55,18 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_todoplugin,
TodoPluginFactory( "kontact_todoplugin" ) )
TodoPlugin::TodoPlugin( Kontact::Core *core, const char *, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), "korganizer" ),
+ : Kontact::Plugin( core, core, "korganizer" ),
mIface( 0 )
{
setInstance( TodoPluginFactory::instance() );
instance()->iconLoader()->addAppDir("tdepim");
insertNewAction( new TDEAction( i18n( "New To-do..." ), "newtodo",
- CTRL+SHIFT+Key_T, this, TQT_SLOT( slotNewTodo() ), actionCollection(),
+ CTRL+SHIFT+Key_T, this, TQ_SLOT( slotNewTodo() ), actionCollection(),
"new_todo" ) );
insertSyncAction( new TDEAction( i18n( "Synchronize To-do List" ), "reload",
- 0, this, TQT_SLOT( slotSyncTodos() ), actionCollection(),
+ 0, this, TQ_SLOT( slotSyncTodos() ), actionCollection(),
"todo_sync" ) );
mUniqueAppWatcher = new Kontact::UniqueAppWatcher(
diff --git a/kontact/plugins/korganizer/todoplugin.h b/kontact/plugins/korganizer/todoplugin.h
index 4d62a72d..767d0de3 100644
--- a/kontact/plugins/korganizer/todoplugin.h
+++ b/kontact/plugins/korganizer/todoplugin.h
@@ -33,7 +33,7 @@
class TodoPlugin : public Kontact::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
TodoPlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index 255ee2ef..bdab72a9 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -68,9 +68,9 @@ TodoSummaryWidget::TodoSummaryWidget( TodoPlugin *plugin,
mCalendar = KOrg::StdCalendar::self();
- connect( mCalendar, TQT_SIGNAL( calendarChanged() ), TQT_SLOT( updateView() ) );
- connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ),
- TQT_SLOT( updateView() ) );
+ connect( mCalendar, TQ_SIGNAL( calendarChanged() ), TQ_SLOT( updateView() ) );
+ connect( mPlugin->core(), TQ_SIGNAL( dayChanged( const TQDate& ) ),
+ TQ_SLOT( updateView() ) );
updateView();
}
@@ -163,10 +163,10 @@ void TodoSummaryWidget::updateView()
mLayout->addWidget( urlLabel, counter, 2 );
mLabels.append( urlLabel );
- connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
- this, TQT_SLOT( viewTodo( const TQString& ) ) );
- connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ),
- this, TQT_SLOT( popupMenu( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+ this, TQ_SLOT( viewTodo( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ),
+ this, TQ_SLOT( popupMenu( const TQString& ) ) );
TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, todo, currentDate, true ) );
if ( !tipText.isEmpty() ) {
@@ -211,7 +211,7 @@ void TodoSummaryWidget::removeTodo( const TQString &uid )
void TodoSummaryWidget::completeTodo( const TQString &uid )
{
KCal::Todo *todo = mCalendar->todo( uid );
- IncidenceChanger *changer = new IncidenceChanger( mCalendar, TQT_TQOBJECT(this) );
+ IncidenceChanger *changer = new IncidenceChanger( mCalendar, this );
if ( !todo->isReadOnly() && changer->beginChange( todo, 0, TQString() ) ) {
KCal::Todo *oldTodo = todo->clone();
todo->setCompleted( TQDateTime::currentDateTime() );
@@ -251,7 +251,7 @@ void TodoSummaryWidget::popupMenu( const TQString &uid )
bool TodoSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
{
if ( obj->inherits( "KURLLabel" ) ) {
- KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
+ KURLLabel* label = static_cast<KURLLabel*>( obj );
if ( e->type() == TQEvent::Enter )
emit message( i18n( "Edit To-do: \"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave )
diff --git a/kontact/plugins/korganizer/todosummarywidget.h b/kontact/plugins/korganizer/todosummarywidget.h
index 292444cd..6aa1bc4d 100644
--- a/kontact/plugins/korganizer/todosummarywidget.h
+++ b/kontact/plugins/korganizer/todosummarywidget.h
@@ -38,7 +38,7 @@ class TodoPlugin;
class TodoSummaryWidget : public Kontact::Summary
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/kpilot/kpilot_plugin.cpp b/kontact/plugins/kpilot/kpilot_plugin.cpp
index 81053917..9239db85 100644
--- a/kontact/plugins/kpilot/kpilot_plugin.cpp
+++ b/kontact/plugins/kpilot/kpilot_plugin.cpp
@@ -35,7 +35,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_kpilotplugin,
KPilotPluginFactory( "kontact_kpilotplugin" ) )
KPilotPlugin::KPilotPlugin( Kontact::Core *core, const char *name, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), "kpilot" ), mAboutData( 0 )
+ : Kontact::Plugin( core, core, "kpilot" ), mAboutData( 0 )
{
setInstance( KPilotPluginFactory::instance() );
// TODO: Make sure kpilotDaemon is running!
diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp
index 9ab256d2..cc91632f 100644
--- a/kontact/plugins/kpilot/summarywidget.cpp
+++ b/kontact/plugins/kpilot/summarywidget.cpp
@@ -71,8 +71,8 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
mLayout->addWidget( mSyncTimeLabel, row, 1 );
mShowSyncLogLabel = new KURLLabel( "", i18n( "[View Sync Log]" ), this );
mLayout->addWidget( mShowSyncLogLabel, row, 3 );
- connect( mShowSyncLogLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
- this, TQT_SLOT( showSyncLog( const TQString& ) ) );
+ connect( mShowSyncLogLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+ this, TQ_SLOT( showSyncLog( const TQString& ) ) );
// User
row++;
@@ -110,8 +110,8 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
mLayout->addMultiCellWidget( mNoConnectionLabel, row, row, 1, 2 );
mNoConnectionStartLabel = new KURLLabel( "", i18n( "[Start KPilot]" ), this );
mLayout->addWidget( mNoConnectionStartLabel, row, 3 );
- connect( mNoConnectionStartLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
- this, TQT_SLOT( startKPilot() ) );
+ connect( mNoConnectionStartLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+ this, TQ_SLOT( startKPilot() ) );
if ( !kapp->dcopClient()->isApplicationRegistered( "kpilotDaemon" ) ) {
startKPilot();
@@ -119,7 +119,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
connectDCOPSignal( 0, 0, "kpilotDaemonStatusDetails(TQDateTime,TQString,TQStringList,TQString,TQString,TQString,bool)",
"receiveDaemonStatusDetails(TQDateTime,TQString,TQStringList,TQString,TQString,TQString,bool)", false );
- connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString & ) ), TQT_SLOT( slotAppRemoved( const TQCString& ) ) );
+ connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString & ) ), TQ_SLOT( slotAppRemoved( const TQCString& ) ) );
}
SummaryWidget::~SummaryWidget()
diff --git a/kontact/plugins/kpilot/summarywidget.h b/kontact/plugins/kpilot/summarywidget.h
index 209934fd..086fbd64 100644
--- a/kontact/plugins/kpilot/summarywidget.h
+++ b/kontact/plugins/kpilot/summarywidget.h
@@ -44,7 +44,7 @@ class KURLLabel;
class SummaryWidget : public Kontact::Summary, public DCOPObject
{
- Q_OBJECT
+ TQ_OBJECT
K_DCOP
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 179baed3..4a698ff8 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -80,10 +80,10 @@ NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWi
mTitle->setText( title );
mURL->setText( url );
mTitle->setFocus();
- connect( mTitle, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( modified() ) );
- connect( mURL, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( modified() ) );
+ connect( mTitle, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( modified() ) );
+ connect( mURL, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( modified() ) );
modified();
}
@@ -133,18 +133,18 @@ KCMKontactKNT::KCMKontactKNT( TQWidget *parent, const char *name )
{
initGUI();
- connect( mAllNews, TQT_SIGNAL( currentChanged( TQListViewItem* ) ),
- this, TQT_SLOT( allCurrentChanged( TQListViewItem* ) ) );
- connect( mSelectedNews, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ),
- this, TQT_SLOT( selectedChanged( TQListViewItem* ) ) );
+ connect( mAllNews, TQ_SIGNAL( currentChanged( TQListViewItem* ) ),
+ this, TQ_SLOT( allCurrentChanged( TQListViewItem* ) ) );
+ connect( mSelectedNews, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ),
+ this, TQ_SLOT( selectedChanged( TQListViewItem* ) ) );
- connect( mUpdateInterval, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) );
- connect( mArticleCount, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) );
+ connect( mUpdateInterval, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( modified() ) );
+ connect( mArticleCount, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( modified() ) );
- connect( mAddButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addNews() ) );
- connect( mRemoveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeNews() ) );
- connect( mNewButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( newFeed() ) );
- connect( mDeleteButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteFeed() ) );
+ connect( mAddButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addNews() ) );
+ connect( mRemoveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeNews() ) );
+ connect( mNewButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( newFeed() ) );
+ connect( mDeleteButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( deleteFeed() ) );
TDEAcceleratorManager::manage( this );
@@ -356,7 +356,7 @@ void KCMKontactKNT::initGUI()
mSelectedNews->setFullWidth( true );
layout->addWidget( mSelectedNews, 0, 2 );
- TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical,
+ TQGroupBox *box = new TQGroupBox( 0, TQt::Vertical,
i18n( "News Feed Settings" ), this );
TQGridLayout *boxLayout = new TQGridLayout( box->layout(), 2, 3,
diff --git a/kontact/plugins/newsticker/kcmkontactknt.h b/kontact/plugins/newsticker/kcmkontactknt.h
index a44cae7f..9227cb54 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.h
+++ b/kontact/plugins/newsticker/kcmkontactknt.h
@@ -37,7 +37,7 @@ class NewsItem;
class KCMKontactKNT : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -85,7 +85,7 @@ class KCMKontactKNT : public TDECModule
class NewsEditDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/newsticker/newsticker_plugin.cpp b/kontact/plugins/newsticker/newsticker_plugin.cpp
index 04d46883..62d27fc8 100644
--- a/kontact/plugins/newsticker/newsticker_plugin.cpp
+++ b/kontact/plugins/newsticker/newsticker_plugin.cpp
@@ -32,7 +32,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_newstickerplugin,
NewsTickerPluginFactory( "kontact_newstickerplugin" ) )
NewsTickerPlugin::NewsTickerPlugin( Kontact::Core *core, const char *name, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), name )
+ : Kontact::Plugin( core, core, name )
{
setInstance( NewsTickerPluginFactory::instance() );
}
diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp
index f385b269..b7b3f866 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -68,7 +68,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
mBaseWidget = new TQWidget( this, "baseWidget" );
vlay->addWidget( mBaseWidget );
- connect( &mTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateDocuments() ) );
+ connect( &mTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( updateDocuments() ) );
readConfig();
@@ -223,10 +223,10 @@ void SummaryWidget::updateView()
urlLabel->setMaximumSize( urlLabel->minimumSizeHint() );
mLabels.append( urlLabel );
- connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
- kapp, TQT_SLOT( invokeBrowser( const TQString& ) ) );
- connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ),
- this, TQT_SLOT( rmbMenu( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+ kapp, TQ_SLOT( invokeBrowser( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ),
+ this, TQ_SLOT( rmbMenu( const TQString& ) ) );
// header
TQLabel *label = new TQLabel( hbox );
@@ -252,10 +252,10 @@ void SummaryWidget::updateView()
mLabels.append( urlLabel );
mLayout->addWidget( urlLabel );
- connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
- kapp, TQT_SLOT( invokeBrowser( const TQString& ) ) );
- connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ),
- this, TQT_SLOT( rmbMenu( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+ kapp, TQ_SLOT( invokeBrowser( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ),
+ this, TQ_SLOT( rmbMenu( const TQString& ) ) );
numArticles++;
@@ -306,7 +306,7 @@ void SummaryWidget::rmbMenu( const TQString& url )
bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
{
if ( obj->inherits( "KURLLabel" ) ) {
- KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
+ KURLLabel* label = static_cast<KURLLabel*>( obj );
if ( e->type() == TQEvent::Enter )
emit message( label->url() );
if ( e->type() == TQEvent::Leave )
diff --git a/kontact/plugins/newsticker/summarywidget.h b/kontact/plugins/newsticker/summarywidget.h
index c5122fb8..2363dcc4 100644
--- a/kontact/plugins/newsticker/summarywidget.h
+++ b/kontact/plugins/newsticker/summarywidget.h
@@ -55,7 +55,7 @@ typedef TQValueList<Feed> FeedList;
class SummaryWidget : public Kontact::Summary, public DCOPObject
{
- Q_OBJECT
+ TQ_OBJECT
//
K_DCOP
diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp
index b2d1a45d..f35cc2b4 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.cpp
+++ b/kontact/plugins/specialdates/kcmsdsummary.cpp
@@ -56,12 +56,12 @@ KCMSDSummary::KCMSDSummary( TQWidget *parent, const char *name )
customDaysChanged( 1 );
- connect( mDaysGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) );
- connect( mDaysGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( buttonClicked( int ) ) );
- connect( mCalendarGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) );
- connect( mContactGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) );
- connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) );
- connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( customDaysChanged( int ) ) );
+ connect( mDaysGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( modified() ) );
+ connect( mDaysGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( buttonClicked( int ) ) );
+ connect( mCalendarGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( modified() ) );
+ connect( mContactGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( modified() ) );
+ connect( mCustomDays, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( modified() ) );
+ connect( mCustomDays, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( customDaysChanged( int ) ) );
TDEAcceleratorManager::manage( this );
@@ -87,7 +87,7 @@ void KCMSDSummary::initGUI()
{
TQGridLayout *layout = new TQGridLayout( this, 3, 2, KDialog::spacingHint() );
- mDaysGroup = new TQButtonGroup( 0, Qt::Vertical, i18n( "Special Dates Summary" ), this );
+ mDaysGroup = new TQButtonGroup( 0, TQt::Vertical, i18n( "Special Dates Summary" ), this );
TQVBoxLayout *boxLayout = new TQVBoxLayout( mDaysGroup->layout(),
KDialog::spacingHint() );
@@ -119,7 +119,7 @@ void KCMSDSummary::initGUI()
layout->addMultiCellWidget( mDaysGroup, 0, 0, 0, 1 );
- mCalendarGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Special Dates From Calendar" ), this );
+ mCalendarGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Special Dates From Calendar" ), this );
mShowBirthdaysFromCal = new TQCheckBox( i18n( "Show birthdays" ), mCalendarGroup );
mShowAnniversariesFromCal = new TQCheckBox( i18n( "Show anniversaries" ), mCalendarGroup );
@@ -127,7 +127,7 @@ void KCMSDSummary::initGUI()
mShowSpecialsFromCal = new TQCheckBox( i18n( "Show special occasions" ), mCalendarGroup );
- mContactGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Special Dates From Contact List" ), this );
+ mContactGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Special Dates From Contact List" ), this );
mShowBirthdaysFromKAB = new TQCheckBox( i18n( "Show birthdays" ), mContactGroup );
mShowAnniversariesFromKAB = new TQCheckBox( i18n( "Show anniversaries" ), mContactGroup );
diff --git a/kontact/plugins/specialdates/kcmsdsummary.h b/kontact/plugins/specialdates/kcmsdsummary.h
index c0095dfa..e3189656 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.h
+++ b/kontact/plugins/specialdates/kcmsdsummary.h
@@ -35,7 +35,7 @@ class TDEAboutData;
class KCMSDSummary : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index 376389f9..fb9167c6 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -95,10 +95,10 @@ SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent,
// Setup the Addressbook
TDEABC::StdAddressBook *ab = TDEABC::StdAddressBook::self( true );
- connect( ab, TQT_SIGNAL( addressBookChanged( AddressBook* ) ),
- this, TQT_SLOT( updateView() ) );
- connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ),
- this, TQT_SLOT( updateView() ) );
+ connect( ab, TQ_SIGNAL( addressBookChanged( AddressBook* ) ),
+ this, TQ_SLOT( updateView() ) );
+ connect( mPlugin->core(), TQ_SIGNAL( dayChanged( const TQDate& ) ),
+ this, TQ_SLOT( updateView() ) );
// Setup the Calendar
mCalendar = new KCal::CalendarResources( KPimPrefs::timezone() );
@@ -128,10 +128,10 @@ SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent,
}
mCalendar = KOrg::StdCalendar::self();
- connect( mCalendar, TQT_SIGNAL( calendarChanged() ),
- this, TQT_SLOT( updateView() ) );
- connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ),
- this, TQT_SLOT( updateView() ) );
+ connect( mCalendar, TQ_SIGNAL( calendarChanged() ),
+ this, TQ_SLOT( updateView() ) );
+ connect( mPlugin->core(), TQ_SIGNAL( dayChanged( const TQDate& ) ),
+ this, TQ_SLOT( updateView() ) );
// Update Configuration
configUpdated();
@@ -250,7 +250,7 @@ void SDSummaryWidget::updateView()
TQString anniversaryAsString =
(*it).custom( "KADDRESSBOOK" , "X-Anniversary" );
if ( !anniversaryAsString.isEmpty() ) {
- TQDate anniversary = TQDate::fromString( anniversaryAsString, Qt::ISODate );
+ TQDate anniversary = TQDate::fromString( anniversaryAsString, TQt::ISODate );
if ( anniversary.isValid() && mShowAnniversariesFromKAB ) {
SDEntry entry;
entry.type = IncidenceTypeContact;
@@ -506,10 +506,10 @@ void SDSummaryWidget::updateView()
mLayout->addWidget( urlLabel, counter, 4 );
mLabels.append( urlLabel );
- connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
- this, TQT_SLOT( mailContact( const TQString& ) ) );
- connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ),
- this, TQT_SLOT( popupMenu( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+ this, TQ_SLOT( mailContact( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ),
+ this, TQ_SLOT( popupMenu( const TQString& ) ) );
} else {
label = new TQLabel( this );
label->setText( (*addrIt).summary );
@@ -593,7 +593,7 @@ void SDSummaryWidget::popupMenu( const TQString &uid )
bool SDSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
{
if ( obj->inherits( "KURLLabel" ) ) {
- KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
+ KURLLabel* label = static_cast<KURLLabel*>( obj );
if ( e->type() == TQEvent::Enter )
emit message( i18n( "Mail to:\"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave )
diff --git a/kontact/plugins/specialdates/sdsummarywidget.h b/kontact/plugins/specialdates/sdsummarywidget.h
index ff9fb70a..2c63b259 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.h
+++ b/kontact/plugins/specialdates/sdsummarywidget.h
@@ -42,7 +42,7 @@ class TQLabel;
class SDSummaryWidget : public Kontact::Summary
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp
index 58c830c8..a1893aef 100644
--- a/kontact/plugins/specialdates/specialdates_plugin.cpp
+++ b/kontact/plugins/specialdates/specialdates_plugin.cpp
@@ -38,7 +38,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_specialdatesplugin,
SpecialdatesPluginFactory( "kontact_specialdatesplugin" ) )
SpecialdatesPlugin::SpecialdatesPlugin( Kontact::Core *core, const char *name, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), name ),
+ : Kontact::Plugin( core, core, name ),
mAboutData( 0 )
{
setInstance( SpecialdatesPluginFactory::instance() );
diff --git a/kontact/plugins/summary/dropwidget.h b/kontact/plugins/summary/dropwidget.h
index d406f441..fe92825a 100644
--- a/kontact/plugins/summary/dropwidget.h
+++ b/kontact/plugins/summary/dropwidget.h
@@ -26,7 +26,7 @@
class DropWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index 65bd13e5..591cb033 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -103,8 +103,8 @@ KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name )
layout->setStretchFactor( mPluginView, 1 );
- connect( mPluginView, TQT_SIGNAL( clicked( TQListViewItem* ) ),
- this, TQT_SLOT( itemClicked( TQListViewItem* ) ) );
+ connect( mPluginView, TQ_SIGNAL( clicked( TQListViewItem* ) ),
+ this, TQ_SLOT( itemClicked( TQListViewItem* ) ) );
load();
TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kontactsummary" ),
diff --git a/kontact/plugins/summary/kcmkontactsummary.h b/kontact/plugins/summary/kcmkontactsummary.h
index 3f1cdd69..bfc72d40 100644
--- a/kontact/plugins/summary/kcmkontactsummary.h
+++ b/kontact/plugins/summary/kcmkontactsummary.h
@@ -32,7 +32,7 @@ class KPluginInfo;
class PluginView : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -42,7 +42,7 @@ class PluginView : public TDEListView
class KCMKontactSummary : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index 94474c55..5c64d934 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -77,25 +77,25 @@ SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*,
initGUI( core );
- connect( kapp, TQT_SIGNAL( tdedisplayPaletteChanged() ), TQT_SLOT( slotAdjustPalette() ) );
+ connect( kapp, TQ_SIGNAL( tdedisplayPaletteChanged() ), TQ_SLOT( slotAdjustPalette() ) );
slotAdjustPalette();
setDate( TQDate::currentDate() );
- connect( mCore, TQT_SIGNAL( dayChanged( const TQDate& ) ),
- TQT_SLOT( setDate( const TQDate& ) ) );
+ connect( mCore, TQ_SIGNAL( dayChanged( const TQDate& ) ),
+ TQ_SLOT( setDate( const TQDate& ) ) );
KParts::InfoExtension *info = new KParts::InfoExtension( this, "Summary" );
- connect( this, TQT_SIGNAL( textChanged( const TQString& ) ),
- info, TQT_SIGNAL( textChanged( const TQString& ) ) );
+ connect( this, TQ_SIGNAL( textChanged( const TQString& ) ),
+ info, TQ_SIGNAL( textChanged( const TQString& ) ) );
mConfigAction = new TDEAction( i18n( "&Configure Summary View..." ),
"configure", 0, this,
- TQT_SLOT( slotConfigure() ), actionCollection(),
+ TQ_SLOT( slotConfigure() ), actionCollection(),
"summaryview_configure" );
setXMLFile( "kontactsummary_part.rc" );
- TQTimer::singleShot( 0, this, TQT_SLOT( slotTextChanged() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotTextChanged() ) );
}
SummaryViewPart::~SummaryViewPart()
@@ -142,8 +142,8 @@ void SummaryViewPart::updateWidgets()
mSummaries.clear();
mFrame = new DropWidget( mMainWidget );
- connect( mFrame, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
- this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
+ connect( mFrame, TQ_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
+ this, TQ_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
mMainLayout->insertWidget( 2, mFrame );
@@ -176,10 +176,10 @@ void SummaryViewPart::updateWidgets()
if ( summary->summaryHeight() > 0 ) {
mSummaries.insert( plugin->identifier(), summary );
- connect( summary, TQT_SIGNAL( message( const TQString& ) ),
- BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) );
- connect( summary, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
- this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
+ connect( summary, TQ_SIGNAL( message( const TQString& ) ),
+ BroadcastStatus::instance(), TQ_SLOT( setStatusMsg( const TQString& ) ) );
+ connect( summary, TQ_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
+ this, TQ_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
if ( !mLeftColumnSummaries.contains( plugin->identifier() ) &&
!mRightColumnSummaries.contains( plugin->identifier() ) ) {
@@ -327,8 +327,8 @@ void SummaryViewPart::slotConfigure()
TQStringList modules = configModules();
modules.prepend( "kcmkontactsummary.desktop" );
- connect( &dlg, TQT_SIGNAL( configCommitted() ),
- this, TQT_SLOT( updateWidgets() ) );
+ connect( &dlg, TQ_SIGNAL( configCommitted() ),
+ this, TQ_SLOT( updateWidgets() ) );
TQStringList::ConstIterator strIt;
for ( strIt = modules.begin(); strIt != modules.end(); ++strIt )
@@ -364,7 +364,7 @@ void SummaryViewPart::initGUI( Kontact::Core *core )
mMainWidget = new TQFrame( sv->viewport() );
sv->addChild( mMainWidget );
mMainWidget->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
- sv->setFocusPolicy( TQ_StrongFocus );
+ sv->setFocusPolicy( TQWidget::StrongFocus );
setWidget( sv );
mMainLayout = new TQVBoxLayout( mMainWidget,KDialog::marginHint(),
@@ -384,8 +384,8 @@ void SummaryViewPart::initGUI( Kontact::Core *core )
mFrame = new DropWidget( mMainWidget );
mMainLayout->insertWidget( 2, mFrame );
- connect( mFrame, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
- this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
+ connect( mFrame, TQ_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
+ this, TQ_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
updateWidgets();
}
diff --git a/kontact/plugins/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h
index 4b6b3126..c7c55e14 100644
--- a/kontact/plugins/summary/summaryview_part.h
+++ b/kontact/plugins/summary/summaryview_part.h
@@ -51,7 +51,7 @@ class KCMultiDialog;
class SummaryViewPart : public KParts::ReadOnlyPart
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp
index 81e46a8e..711c2b39 100644
--- a/kontact/plugins/summary/summaryview_plugin.cpp
+++ b/kontact/plugins/summary/summaryview_plugin.cpp
@@ -34,7 +34,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_summaryplugin,
SummaryViewFactory( "kontact_summaryplugin" ) )
SummaryView::SummaryView( Kontact::Core *core, const char *name, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), name),
+ : Kontact::Plugin( core, core, name),
mAboutData( 0 ), mPart( 0 )
{
setInstance( SummaryViewFactory::instance() );
@@ -42,8 +42,8 @@ SummaryView::SummaryView( Kontact::Core *core, const char *name, const TQStringL
mSyncAction = new TDESelectAction( i18n( "Synchronize All" ), "reload", 0, 0,
0, actionCollection(),
"kontact_summary_sync" );
- connect( mSyncAction, TQT_SIGNAL( activated( const TQString& ) ), this, TQT_SLOT( syncAccount( const TQString& ) ) );
- connect( mSyncAction->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( fillSyncActionSubEntries() ) );
+ connect( mSyncAction, TQ_SIGNAL( activated( const TQString& ) ), this, TQ_SLOT( syncAccount( const TQString& ) ) );
+ connect( mSyncAction->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( fillSyncActionSubEntries() ) );
insertSyncAction( mSyncAction );
fillSyncActionSubEntries();
diff --git a/kontact/plugins/summary/summaryview_plugin.h b/kontact/plugins/summary/summaryview_plugin.h
index 5ea25786..cef65f5d 100644
--- a/kontact/plugins/summary/summaryview_plugin.h
+++ b/kontact/plugins/summary/summaryview_plugin.h
@@ -34,7 +34,7 @@ class SummaryViewPart;
class SummaryView : public Kontact::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp
index 2e712ae8..12a7b483 100644
--- a/kontact/plugins/test/test_part.cpp
+++ b/kontact/plugins/test/test_part.cpp
@@ -48,14 +48,14 @@ TestPart::TestPart(TQObject *parent, const char *name) // ## parentWidget
m_edit = new TQTextEdit;
setWidget(m_edit);
setXMLFile("testpartui.rc");
- new TDEAction( "new contact (test)", 0, this, TQT_SLOT( newContact() ), actionCollection(), "test_deleteevent" );
+ new TDEAction( "new contact (test)", 0, this, TQ_SLOT( newContact() ), actionCollection(), "test_deleteevent" );
m_kab_stub = 0L;
new KParts::SideBarExtension(new TQComboBox(this), this, "sbe");
kapp->dcopClient()->setNotifications( true );
- connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString&)),
- this, TQT_SLOT( unregisteredFromDCOP( const TQCString& )) );
+ connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString&)),
+ this, TQ_SLOT( unregisteredFromDCOP( const TQCString& )) );
}
TestPart::~TestPart()
diff --git a/kontact/plugins/test/test_part.h b/kontact/plugins/test/test_part.h
index af7da8f8..10f9ced9 100644
--- a/kontact/plugins/test/test_part.h
+++ b/kontact/plugins/test/test_part.h
@@ -33,7 +33,7 @@ class KAddressBookIface_stub;
class TestPart : public KParts::ReadOnlyPart
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/test/test_plugin.cpp b/kontact/plugins/test/test_plugin.cpp
index 631d91cb..e98cd4f2 100644
--- a/kontact/plugins/test/test_plugin.cpp
+++ b/kontact/plugins/test/test_plugin.cpp
@@ -35,11 +35,11 @@ typedef KGenericFactory< TestPlugin, Kontact::Core > TestPluginFactory;
K_EXPORT_COMPONENT_FACTORY( libkptestplugin, TestPluginFactory( "kptestplugin" ) )
TestPlugin::TestPlugin(Kontact::Core *_core, const char *name, const TQStringList &)
- : Kontact::Plugin(_core, TQT_TQOBJECT(_core), name)
+ : Kontact::Plugin(_core, _core, name)
{
setInstance(TestPluginFactory::instance());
- insertNewAction(new TDEAction("Test", 0, this, TQT_SLOT(slotTestMenu()), actionCollection(), "edit_test"));
+ insertNewAction(new TDEAction("Test", 0, this, TQ_SLOT(slotTestMenu()), actionCollection(), "edit_test"));
setXMLFile("kptestplugin.rc");
}
diff --git a/kontact/plugins/test/test_plugin.h b/kontact/plugins/test/test_plugin.h
index 2a541c84..ad9f081d 100644
--- a/kontact/plugins/test/test_plugin.h
+++ b/kontact/plugins/test/test_plugin.h
@@ -33,7 +33,7 @@ class TestPart;
class TestPlugin : public Kontact::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp
index 37fbe74d..323ad8de 100644
--- a/kontact/plugins/weather/summarywidget.cpp
+++ b/kontact/plugins/weather/summarywidget.cpp
@@ -69,7 +69,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
if ( reply.isValid() ) {
mStations = reply;
- connect( &mTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( timeout() ) );
+ connect( &mTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( timeout() ) );
mTimer.start( 0 );
} else {
kdDebug(5602) << "ERROR: dcop reply not valid..." << endl;
@@ -117,8 +117,8 @@ void SummaryWidget::updateView()
urlLabel->setAlignment( AlignTop );
layout->addMultiCellWidget( urlLabel, 0, 1, 0, 0 );
mLabels.append( urlLabel );
- connect ( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
- this, TQT_SLOT( showReport( const TQString& ) ) );
+ connect ( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+ this, TQ_SLOT( showReport( const TQString& ) ) );
TQLabel* label = new TQLabel( this );
label->setText( TQString( "%1 (%2)" ).arg( (*it).name() ).arg( (*it).temperature() ) );
@@ -210,8 +210,8 @@ void SummaryWidget::updateSummary( bool )
void SummaryWidget::showReport( const TQString &stationID )
{
mProc = new TDEProcess;
- TQApplication::connect( mProc, TQT_SIGNAL( processExited( TDEProcess* ) ),
- this, TQT_SLOT( reportFinished( TDEProcess* ) ) );
+ TQApplication::connect( mProc, TQ_SIGNAL( processExited( TDEProcess* ) ),
+ this, TQ_SLOT( reportFinished( TDEProcess* ) ) );
*mProc << "kweatherreport";
*mProc << stationID;
diff --git a/kontact/plugins/weather/summarywidget.h b/kontact/plugins/weather/summarywidget.h
index 96361526..196269fd 100644
--- a/kontact/plugins/weather/summarywidget.h
+++ b/kontact/plugins/weather/summarywidget.h
@@ -86,7 +86,7 @@ class WeatherData
class SummaryWidget : public Kontact::Summary, public DCOPObject
{
- Q_OBJECT
+ TQ_OBJECT
//
K_DCOP
public:
diff --git a/kontact/plugins/weather/weather_plugin.cpp b/kontact/plugins/weather/weather_plugin.cpp
index 93a97bfc..506b16fd 100644
--- a/kontact/plugins/weather/weather_plugin.cpp
+++ b/kontact/plugins/weather/weather_plugin.cpp
@@ -32,7 +32,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_weatherplugin,
WeatherPluginFactory( "kontact_weatherplugin" ) )
WeatherPlugin::WeatherPlugin( Kontact::Core *core, const char *name, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), name ), mAboutData( 0 )
+ : Kontact::Plugin( core, core, name ), mAboutData( 0 )
{
setInstance( WeatherPluginFactory::instance() );
}
diff --git a/kontact/src/aboutdialog.h b/kontact/src/aboutdialog.h
index f407f46a..de20c1ee 100644
--- a/kontact/src/aboutdialog.h
+++ b/kontact/src/aboutdialog.h
@@ -33,7 +33,7 @@ class Plugin;
class AboutDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp
index 338aeb8d..f9a261a9 100644
--- a/kontact/src/iconsidepane.cpp
+++ b/kontact/src/iconsidepane.cpp
@@ -265,18 +265,18 @@ Navigator::Navigator( IconSidePane *parent, const char *name )
setHScrollBarMode( TQScrollView::AlwaysOff );
setAcceptDrops( true );
- setFocusPolicy( TQ_NoFocus );
+ setFocusPolicy( TQWidget::NoFocus );
- connect( this, TQT_SIGNAL( selectionChanged( TQListBoxItem* ) ),
- TQT_SLOT( slotExecuted( TQListBoxItem* ) ) );
- connect( this, TQT_SIGNAL( rightButtonPressed( TQListBoxItem*, const TQPoint& ) ),
- TQT_SLOT( slotShowRMBMenu( TQListBoxItem*, const TQPoint& ) ) );
- connect( this, TQT_SIGNAL( onItem( TQListBoxItem * ) ),
- TQT_SLOT( slotMouseOn( TQListBoxItem * ) ) );
- connect( this, TQT_SIGNAL( onViewport() ), TQT_SLOT( slotMouseOff() ) );
+ connect( this, TQ_SIGNAL( selectionChanged( TQListBoxItem* ) ),
+ TQ_SLOT( slotExecuted( TQListBoxItem* ) ) );
+ connect( this, TQ_SIGNAL( rightButtonPressed( TQListBoxItem*, const TQPoint& ) ),
+ TQ_SLOT( slotShowRMBMenu( TQListBoxItem*, const TQPoint& ) ) );
+ connect( this, TQ_SIGNAL( onItem( TQListBoxItem * ) ),
+ TQ_SLOT( slotMouseOn( TQListBoxItem * ) ) );
+ connect( this, TQ_SIGNAL( onViewport() ), TQ_SLOT( slotMouseOff() ) );
- mMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
- connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( shortCutSelected( int ) ) );
+ mMapper = new TQSignalMapper( this );
+ connect( mMapper, TQ_SIGNAL( mapped( int ) ), TQ_SLOT( shortCutSelected( int ) ) );
TQToolTip::remove( this );
if ( !mShowText )
@@ -295,7 +295,7 @@ void Navigator::highlightItem( EntryItem * item )
setPaintActiveItem( mHighlightItem, true );
- TQTimer::singleShot( 2000, this, TQT_SLOT( slotStopHighlight() ) );
+ TQTimer::singleShot( 2000, this, TQ_SLOT( slotStopHighlight() ) );
}
void Navigator::slotStopHighlight()
@@ -539,8 +539,8 @@ IconSidePane::IconSidePane( Core *core, TQWidget *parent, const char *name )
: SidePaneBase( core, parent, name )
{
mNavigator = new Navigator( this );
- connect( mNavigator, TQT_SIGNAL( pluginActivated( Kontact::Plugin* ) ),
- TQT_SIGNAL( pluginSelected( Kontact::Plugin* ) ) );
+ connect( mNavigator, TQ_SIGNAL( pluginActivated( Kontact::Plugin* ) ),
+ TQ_SIGNAL( pluginSelected( Kontact::Plugin* ) ) );
setAcceptDrops( true );
}
diff --git a/kontact/src/iconsidepane.h b/kontact/src/iconsidepane.h
index 4cfbd555..bb91997b 100644
--- a/kontact/src/iconsidepane.h
+++ b/kontact/src/iconsidepane.h
@@ -117,7 +117,7 @@ class EntryItemToolTip : public TQToolTip
*/
class Navigator : public TDEListBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
Navigator( IconSidePane *parent = 0, const char *name = 0 );
@@ -173,7 +173,7 @@ class Navigator : public TDEListBox
class IconSidePane : public SidePaneBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
IconSidePane( Core *core, TQWidget *parent, const char *name = 0 );
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index 4e6e4407..b1d0b039 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -81,8 +81,8 @@ KcmKontact::KcmKontact( TQWidget *parent, const char *name )
pluginStartupLayout->addWidget( selection->comboBox() );
selection->comboBox()->setEnabled( false );
- connect( forceStartupPlugin->checkBox(), TQT_SIGNAL( toggled( bool ) ),
- selection->comboBox(), TQT_SLOT( setEnabled( bool ) ) );
+ connect( forceStartupPlugin->checkBox(), TQ_SIGNAL( toggled( bool ) ),
+ selection->comboBox(), TQ_SLOT( setEnabled( bool ) ) );
load();
}
@@ -104,7 +104,7 @@ PluginSelection::PluginSelection( TDEConfigSkeleton::ItemString *item, TQWidget
{
mItem = item;
mPluginCombo = new TQComboBox( parent );
- connect( mPluginCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) );
+ connect( mPluginCombo, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( changed() ) );
}
PluginSelection::~PluginSelection()
diff --git a/kontact/src/kcmkontact.h b/kontact/src/kcmkontact.h
index f19980e2..5dcb714c 100644
--- a/kontact/src/kcmkontact.h
+++ b/kontact/src/kcmkontact.h
@@ -38,7 +38,7 @@ class TDEListView;
class KcmKontact : public KPrefsModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -49,7 +49,7 @@ class KcmKontact : public KPrefsModule
class PluginSelection : public KPrefsWid
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 1fd7ab88..a354fa41 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -96,7 +96,7 @@ class SettingsDialogWrapper : public KSettings::Dialog
void fixButtonLabel( TQWidget *widget )
{
TQObject *object = widget->child( "KJanusWidget::buttonBelowList" );
- TQPushButton *button = static_cast<TQPushButton*>( TQT_TQWIDGET(object) );
+ TQPushButton *button = static_cast<TQPushButton*>( object );
if ( button )
button->setText( i18n( "Select Components ..." ) );
}
@@ -120,8 +120,8 @@ void MainWindow::initGUI()
setupActions();
setHelpMenuEnabled( false );
KHelpMenu *helpMenu = new KHelpMenu( this, 0, true, actionCollection() );
- connect( helpMenu, TQT_SIGNAL( showAboutApplication() ),
- TQT_SLOT( showAboutDialog() ) );
+ connect( helpMenu, TQ_SIGNAL( showAboutApplication() ),
+ TQ_SLOT( showAboutDialog() ) );
TDETrader::OfferList offers = TDETrader::self()->query(
TQString::fromLatin1( "Kontact/Plugin" ),
@@ -133,7 +133,7 @@ void MainWindow::initGUI()
(*it)->load();
TDEAction *action = new TDEAction( (*it)->name(), (*it)->icon(), TDEShortcut(),
- TQT_TQOBJECT(this), TQT_SLOT(slotActionTriggered()),
+ this, TQ_SLOT(slotActionTriggered()),
actionCollection(), (*it)->pluginName().latin1() );
action->setName( (*it)->pluginName().latin1() );
action->setWhatsThis( i18n( "Switch to plugin %1" ).arg( (*it)->name() ) );
@@ -144,8 +144,8 @@ void MainWindow::initGUI()
}
}
- KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( configureShortcuts() ), actionCollection() );
- KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( configureToolbars() ), actionCollection() );
+ KStdAction::keyBindings( this, TQ_SLOT( configureShortcuts() ), actionCollection() );
+ KStdAction::configureToolbars( this, TQ_SLOT( configureToolbars() ), actionCollection() );
setXMLFile( "kontactui.rc" );
setStandardToolBarMenuEnabled( true );
@@ -157,10 +157,10 @@ void MainWindow::initGUI()
resize( 700, 520 ); // initial size to prevent a scrollbar in sidepane
setAutoSaveSettings();
- connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileLoaded( const TQString& ) ),
- this, TQT_SLOT( slotLoadProfile( const TQString& ) ) );
- connect( Kontact::ProfileManager::self(), TQT_SIGNAL( saveToProfileRequested( const TQString& ) ),
- this, TQT_SLOT( slotSaveToProfile( const TQString& ) ) );
+ connect( Kontact::ProfileManager::self(), TQ_SIGNAL( profileLoaded( const TQString& ) ),
+ this, TQ_SLOT( slotLoadProfile( const TQString& ) ) );
+ connect( Kontact::ProfileManager::self(), TQ_SIGNAL( saveToProfileRequested( const TQString& ) ),
+ this, TQ_SLOT( slotSaveToProfile( const TQString& ) ) );
}
@@ -168,15 +168,15 @@ void MainWindow::initObject()
{
// prepare the part manager
mPartManager = new KParts::PartManager( this );
- connect( mPartManager, TQT_SIGNAL( activePartChanged( KParts::Part* ) ),
- this, TQT_SLOT( slotActivePartChanged( KParts::Part* ) ) );
+ connect( mPartManager, TQ_SIGNAL( activePartChanged( KParts::Part* ) ),
+ this, TQ_SLOT( slotActivePartChanged( KParts::Part* ) ) );
if ( mSidePane ) {
mSidePane->updatePlugins();
}
- KSettings::Dispatcher::self()->registerInstance( instance(), TQT_TQOBJECT(this),
- TQT_SLOT( updateConfig() ) );
+ KSettings::Dispatcher::self()->registerInstance( instance(), this,
+ TQ_SLOT( updateConfig() ) );
loadSettings();
@@ -187,8 +187,8 @@ void MainWindow::initObject()
// done initializing
slotShowStatusMsg( TQString() );
- connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
- this, TQT_SLOT( slotShowStatusMsg( const TQString& ) ) );
+ connect( KPIM::BroadcastStatus::instance(), TQ_SIGNAL( statusMsg( const TQString& ) ),
+ this, TQ_SLOT( slotShowStatusMsg( const TQString& ) ) );
// launch commandline specified module if any
activatePluginModule();
@@ -251,8 +251,8 @@ void MainWindow::initWidgets()
sizes << 0;
mSplitter->setSizes(sizes);
- connect( mSidePane, TQT_SIGNAL( pluginSelected( Kontact::Plugin * ) ),
- TQT_SLOT( selectPlugin( Kontact::Plugin * ) ) );
+ connect( mSidePane, TQ_SIGNAL( pluginSelected( Kontact::Plugin * ) ),
+ TQ_SLOT( selectPlugin( Kontact::Plugin * ) ) );
TQVBox *vBox;
if ( mSplitter ) {
@@ -313,7 +313,7 @@ void MainWindow::initAboutScreen()
mPartsStack->addWidget( introbox );
mPartsStack->raiseWidget( introbox );
mIntroPart = new TDEHTMLPart( introbox );
- mIntroPart->widget()->setFocusPolicy( TQ_WheelFocus );
+ mIntroPart->widget()->setFocusPolicy( TQWidget::WheelFocus );
// Let's better be paranoid and disable plugins (it defaults to enabled):
mIntroPart->setPluginsEnabled( false );
mIntroPart->setJScriptEnabled( false ); // just make this explicit
@@ -323,19 +323,19 @@ void MainWindow::initAboutScreen()
mIntroPart->view()->setLineWidth( 0 );
connect( mIntroPart->browserExtension(),
- TQT_SIGNAL( openURLRequest( const KURL&, const KParts::URLArgs& ) ),
- TQT_SLOT( slotOpenUrl( const KURL& ) ) );
+ TQ_SIGNAL( openURLRequest( const KURL&, const KParts::URLArgs& ) ),
+ TQ_SLOT( slotOpenUrl( const KURL& ) ) );
connect( mIntroPart->browserExtension(),
- TQT_SIGNAL( createNewWindow( const KURL&, const KParts::URLArgs& ) ),
- TQT_SLOT( slotOpenUrl( const KURL& ) ) );
+ TQ_SIGNAL( createNewWindow( const KURL&, const KParts::URLArgs& ) ),
+ TQ_SLOT( slotOpenUrl( const KURL& ) ) );
}
void MainWindow::setupActions()
{
- KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotQuit() ), actionCollection() );
+ KStdAction::quit( this, TQ_SLOT( slotQuit() ), actionCollection() );
mNewActions = new TDEToolBarPopupAction( KGuiItem( i18n( "New" ), "" ),
- TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewClicked() ),
+ TDEStdAccel::shortcut(TDEStdAccel::New), this, TQ_SLOT( slotNewClicked() ),
actionCollection(), "action_new" );
TDEConfig* const cfg = Prefs::self()->config();
@@ -343,19 +343,19 @@ void MainWindow::setupActions()
mSyncActionsEnabled = cfg->readBoolEntry( "GroupwareMailFoldersEnabled", true );
if ( mSyncActionsEnabled ) {
- mSyncActions = new TDEToolBarPopupAction( KGuiItem( i18n( "Synchronize" ), "kitchensync" ),
- TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(this), TQT_SLOT( slotSyncClicked() ),
+ mSyncActions = new TDEToolBarPopupAction( KGuiItem( i18n( "Synchronize" ) ),
+ TDEStdAccel::shortcut(TDEStdAccel::Reload), this, TQ_SLOT( slotSyncClicked() ),
actionCollection(), "action_sync" );
}
- new TDEAction( i18n( "Configure Kontact..." ), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPreferences() ),
+ new TDEAction( i18n( "Configure Kontact..." ), "configure", 0, this, TQ_SLOT( slotPreferences() ),
actionCollection(), "settings_configure_kontact" );
- new TDEAction( i18n( "Configure &Profiles..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigureProfiles() ),
+ new TDEAction( i18n( "Configure &Profiles..." ), 0, this, TQ_SLOT( slotConfigureProfiles() ),
actionCollection(), "settings_configure_kontact_profiles" );
- new TDEAction( i18n( "&Kontact Introduction" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowIntroduction() ),
+ new TDEAction( i18n( "&Kontact Introduction" ), 0, this, TQ_SLOT( slotShowIntroduction() ),
actionCollection(), "help_introduction" );
- new TDEAction( i18n( "&Tip of the Day" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowTip() ),
+ new TDEAction( i18n( "&Tip of the Day" ), 0, this, TQ_SLOT( slotShowTip() ),
actionCollection(), "help_tipofday" );
KWidgetAction* spacerAction = new KWidgetAction( new TQWidget( this ), "SpacerAction", "", 0, 0, actionCollection(), "navigator_spacer_item" );
@@ -543,7 +543,7 @@ void MainWindow::loadPlugins()
kdDebug(5600) << "Loading Plugin: " << (*it)->name() << endl;
Kontact::Plugin *plugin =
KParts::ComponentFactory::createInstanceFromService<Kontact::Plugin>(
- (*it)->service(), TQT_TQOBJECT(this) );
+ (*it)->service(), this );
if ( !plugin )
continue;
@@ -763,7 +763,7 @@ void MainWindow::slotSyncClicked()
TDEToolBar* Kontact::MainWindow::findToolBar(const char* name)
{
// like TDEMainWindow::toolBar, but which doesn't create the toolbar if not found
- return static_cast<TDEToolBar *>(TQT_TQWIDGET(child(name, "TDEToolBar")));
+ return static_cast<TDEToolBar *>(child(name, "TDEToolBar"));
}
void MainWindow::slotActionTriggered()
@@ -977,8 +977,8 @@ void MainWindow::slotPreferences()
}
dlg = new SettingsDialogWrapper( KSettings::Dialog::Configurable, this );
dlg->addPluginInfos( filteredPlugins );
- connect( dlg, TQT_SIGNAL( pluginSelectionChanged() ),
- TQT_SLOT( pluginsChanged() ) );
+ connect( dlg, TQ_SIGNAL( pluginSelectionChanged() ),
+ TQ_SLOT( pluginsChanged() ) );
}
dlg->show();
@@ -1053,8 +1053,8 @@ void MainWindow::configureToolbars()
saveMainWindowSettings( TDEGlobal::config(), "MainWindow" );
KEditToolbar edit( factory() );
- connect( &edit, TQT_SIGNAL( newToolbarConfig() ),
- this, TQT_SLOT( slotNewToolbarConfig() ) );
+ connect( &edit, TQ_SIGNAL( newToolbarConfig() ),
+ this, TQ_SLOT( slotNewToolbarConfig() ) );
edit.exec();
}
diff --git a/kontact/src/mainwindow.h b/kontact/src/mainwindow.h
index e5d66378..da7e23ca 100644
--- a/kontact/src/mainwindow.h
+++ b/kontact/src/mainwindow.h
@@ -66,7 +66,7 @@ typedef TQPtrList<TDEAction> ActionPluginList;
class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public KontactIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp
index e85d90c5..0c9c2a49 100644
--- a/kontact/src/profiledialog.cpp
+++ b/kontact/src/profiledialog.cpp
@@ -53,10 +53,10 @@ Kontact::ProfileDialog::ProfileDialog( TQWidget* parent, WFlags flags ) : KDialo
m_list->setRenameable( NameColumn, true );
m_list->setRenameable( DescriptionColumn, true );
- connect( m_list, TQT_SIGNAL( selectionChanged() ),
- this, TQT_SLOT( listSelectionChanged() ) );
- connect( m_list, TQT_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ),
- this, TQT_SLOT( listItemRenamed( TQListViewItem*, const TQString&, int ) ) );
+ connect( m_list, TQ_SIGNAL( selectionChanged() ),
+ this, TQ_SLOT( listSelectionChanged() ) );
+ connect( m_list, TQ_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ),
+ this, TQ_SLOT( listItemRenamed( TQListViewItem*, const TQString&, int ) ) );
horizontalLayout->addWidget( m_list );
TQVBoxLayout* buttonLayout = new TQVBoxLayout( horizontalLayout );
@@ -64,49 +64,49 @@ Kontact::ProfileDialog::ProfileDialog( TQWidget* parent, WFlags flags ) : KDialo
m_newProfileButton = new TQPushButton( mainWidget );
m_newProfileButton->setText( i18n("New Profile") );
- connect( m_newProfileButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( addNewProfile() ) );
+ connect( m_newProfileButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( addNewProfile() ) );
buttonLayout->addWidget( m_newProfileButton );
m_deleteProfileButton = new TQPushButton( mainWidget );
m_deleteProfileButton->setText( i18n("Delete Profile") );
m_deleteProfileButton->setEnabled( false );
- connect( m_deleteProfileButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( deleteSelectedProfile() ) );
+ connect( m_deleteProfileButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( deleteSelectedProfile() ) );
buttonLayout->addWidget( m_deleteProfileButton );
m_saveProfileButton = new TQPushButton( mainWidget );
m_saveProfileButton->setText( i18n("Save Profile") );
m_saveProfileButton->setEnabled( false );
- connect( m_saveProfileButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( saveToSelectedProfile() ) );
+ connect( m_saveProfileButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( saveToSelectedProfile() ) );
buttonLayout->addWidget( m_saveProfileButton );
buttonLayout->addStretch();
m_importProfileButton = new TQPushButton( mainWidget );
m_importProfileButton->setText( i18n("Import Profile") );
- connect( m_importProfileButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( importProfile() ) );
+ connect( m_importProfileButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( importProfile() ) );
buttonLayout->addWidget( m_importProfileButton );
m_exportProfileButton = new TQPushButton( mainWidget );
m_exportProfileButton->setText( i18n("Export Profile") );
m_exportProfileButton->setEnabled( false );
- connect( m_exportProfileButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( exportSelectedProfile() ) );
+ connect( m_exportProfileButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( exportSelectedProfile() ) );
buttonLayout->addWidget( m_exportProfileButton );
setMainWidget( mainWidget );
- connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileAdded( const TQString& ) ),
- this, TQT_SLOT( profileAdded( const TQString& ) ) );
- connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileRemoved( const TQString& ) ),
- this, TQT_SLOT( profileRemoved( const TQString& ) ) );
- connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileLoaded( const TQString& ) ),
- this, TQT_SLOT( profileLoaded( const TQString& ) ) );
- connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileUpdated( const TQString& ) ),
- this, TQT_SLOT( profileUpdated( const TQString& ) ) );
+ connect( Kontact::ProfileManager::self(), TQ_SIGNAL( profileAdded( const TQString& ) ),
+ this, TQ_SLOT( profileAdded( const TQString& ) ) );
+ connect( Kontact::ProfileManager::self(), TQ_SIGNAL( profileRemoved( const TQString& ) ),
+ this, TQ_SLOT( profileRemoved( const TQString& ) ) );
+ connect( Kontact::ProfileManager::self(), TQ_SIGNAL( profileLoaded( const TQString& ) ),
+ this, TQ_SLOT( profileLoaded( const TQString& ) ) );
+ connect( Kontact::ProfileManager::self(), TQ_SIGNAL( profileUpdated( const TQString& ) ),
+ this, TQ_SLOT( profileUpdated( const TQString& ) ) );
const TQValueList<Kontact::Profile> profiles = Kontact::ProfileManager::self()->profiles();
for ( TQValueList<Kontact::Profile>::ConstIterator it = profiles.begin(), end = profiles.end(); it != end; ++it )
diff --git a/kontact/src/profiledialog.h b/kontact/src/profiledialog.h
index 73a44ae5..7661cb5b 100644
--- a/kontact/src/profiledialog.h
+++ b/kontact/src/profiledialog.h
@@ -39,7 +39,7 @@ namespace Kontact {
class ProfileDialog : public KDialogBase
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/kontact/src/profilemanager.h b/kontact/src/profilemanager.h
index b72511f5..bd05d49d 100644
--- a/kontact/src/profilemanager.h
+++ b/kontact/src/profilemanager.h
@@ -88,7 +88,7 @@ private:
class ProfileManager : public TQObject
{
-Q_OBJECT
+TQ_OBJECT
public:
enum ImportError {
diff --git a/kontact/src/sidepanebase.h b/kontact/src/sidepanebase.h
index c8e83442..5a92a0a1 100644
--- a/kontact/src/sidepanebase.h
+++ b/kontact/src/sidepanebase.h
@@ -33,7 +33,7 @@ class Plugin;
class SidePaneBase : public TQVBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
SidePaneBase( Core *core, TQWidget *parent, const char *name = 0 );
diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index f8a4e4ad..abde9092 100644
--- a/korganizer/actionmanager.cpp
+++ b/korganizer/actionmanager.cpp
@@ -127,7 +127,7 @@ void ActionManager::init()
mWindowList = new KOWindowList;
// Show tip of the day, when the first calendar is shown.
if ( !mIsPart )
- TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( showTipOnStart() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( showTipOnStart() ) );
}
// Note: We need this ActionManager to be fully constructed, and
// parent() to have a valid reference to it before the following
@@ -138,27 +138,27 @@ void ActionManager::init()
// set up autoSaving stuff
mAutoSaveTimer = new TQTimer( this );
- connect( mAutoSaveTimer,TQT_SIGNAL( timeout() ), TQT_SLOT( checkAutoSave() ) );
+ connect( mAutoSaveTimer,TQ_SIGNAL( timeout() ), TQ_SLOT( checkAutoSave() ) );
if ( KOPrefs::instance()->mAutoSave &&
KOPrefs::instance()->mAutoSaveInterval > 0 ) {
mAutoSaveTimer->start( 1000 * 60 * KOPrefs::instance()->mAutoSaveInterval );
}
mAutoArchiveTimer = new TQTimer( this );
- connect( mAutoArchiveTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotAutoArchive() ) );
+ connect( mAutoArchiveTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotAutoArchive() ) );
// First auto-archive should be in 5 minutes (like in kmail).
if ( KOPrefs::instance()->mAutoArchive )
mAutoArchiveTimer->start( 5 * 60 * 1000, true ); // singleshot
setTitle();
- connect( mCalendarView, TQT_SIGNAL( modifiedChanged( bool ) ), TQT_SLOT( setTitle() ) );
- connect( mCalendarView, TQT_SIGNAL( configChanged() ), TQT_SLOT( updateConfig() ) );
+ connect( mCalendarView, TQ_SIGNAL( modifiedChanged( bool ) ), TQ_SLOT( setTitle() ) );
+ connect( mCalendarView, TQ_SIGNAL( configChanged() ), TQ_SLOT( updateConfig() ) );
- connect( mCalendarView, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ),
- TQT_TQOBJECT(this), TQT_SLOT( processIncidenceSelection( Incidence *,const TQDate & ) ) );
- connect( mCalendarView, TQT_SIGNAL( exportHTML( HTMLExportSettings * ) ),
- TQT_TQOBJECT(this), TQT_SLOT( exportHTML( HTMLExportSettings * ) ) );
+ connect( mCalendarView, TQ_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ),
+ this, TQ_SLOT( processIncidenceSelection( Incidence *,const TQDate & ) ) );
+ connect( mCalendarView, TQ_SIGNAL( exportHTML( HTMLExportSettings * ) ),
+ this, TQ_SLOT( exportHTML( HTMLExportSettings * ) ) );
processIncidenceSelection( 0, TQDate() );
@@ -198,13 +198,13 @@ void ActionManager::createCalendarResources()
mCalendarView->addExtension( &factory );
mResourceView = factory.resourceView();
- connect( mCalendarResources, TQT_SIGNAL( calendarChanged() ),
- mCalendarView, TQT_SLOT( resourcesChanged() ) );
- connect( mCalendarResources, TQT_SIGNAL( signalErrorMessage( const TQString & ) ),
- mCalendarView, TQT_SLOT( showErrorMessage( const TQString & ) ) );
+ connect( mCalendarResources, TQ_SIGNAL( calendarChanged() ),
+ mCalendarView, TQ_SLOT( resourcesChanged() ) );
+ connect( mCalendarResources, TQ_SIGNAL( signalErrorMessage( const TQString & ) ),
+ mCalendarView, TQ_SLOT( showErrorMessage( const TQString & ) ) );
- connect( mCalendarView, TQT_SIGNAL( configChanged() ),
- TQT_SLOT( updateConfig() ) );
+ connect( mCalendarView, TQ_SIGNAL( configChanged() ),
+ TQ_SLOT( updateConfig() ) );
initCalendar( mCalendarResources );
}
@@ -227,58 +227,58 @@ void ActionManager::initActions()
//~~~~~~~~~~~~~~~~~~~~~~~ LOADING / SAVING ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
if ( mIsPart ) {
if ( mMainWindow->hasDocument() ) {
- KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT(file_new()), mACollection, "korganizer_openNew" );
- KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( file_open() ), mACollection, "korganizer_open" );
- mRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( file_open( const KURL& ) ),
+ KStdAction::openNew( this, TQ_SLOT(file_new()), mACollection, "korganizer_openNew" );
+ KStdAction::open( this, TQ_SLOT( file_open() ), mACollection, "korganizer_open" );
+ mRecent = KStdAction::openRecent( this, TQ_SLOT( file_open( const KURL& ) ),
mACollection, "korganizer_openRecent" );
- KStdAction::revert( this,TQT_SLOT( file_revert() ), mACollection, "korganizer_revert" );
- KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( file_saveas() ), mACollection,
+ KStdAction::revert( this,TQ_SLOT( file_revert() ), mACollection, "korganizer_revert" );
+ KStdAction::saveAs( this, TQ_SLOT( file_saveas() ), mACollection,
"korganizer_saveAs" );
- KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( file_save() ), mACollection, "korganizer_save" );
+ KStdAction::save( this, TQ_SLOT( file_save() ), mACollection, "korganizer_save" );
}
- KStdAction::print( TQT_TQOBJECT(mCalendarView), TQT_SLOT( print() ), mACollection, "korganizer_print" );
+ KStdAction::print( mCalendarView, TQ_SLOT( print() ), mACollection, "korganizer_print" );
} else {
- KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT( file_new() ), mACollection );
- KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( file_open() ), mACollection );
- mRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( file_open( const KURL& ) ),
+ KStdAction::openNew( this, TQ_SLOT( file_new() ), mACollection );
+ KStdAction::open( this, TQ_SLOT( file_open() ), mACollection );
+ mRecent = KStdAction::openRecent( this, TQ_SLOT( file_open( const KURL& ) ),
mACollection );
if ( mMainWindow->hasDocument() ) {
- KStdAction::revert( this,TQT_SLOT( file_revert() ), mACollection );
- KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( file_save() ), mACollection );
- KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( file_saveas() ), mACollection );
+ KStdAction::revert( this,TQ_SLOT( file_revert() ), mACollection );
+ KStdAction::save( this, TQ_SLOT( file_save() ), mACollection );
+ KStdAction::saveAs( this, TQ_SLOT( file_saveas() ), mACollection );
}
- KStdAction::print( TQT_TQOBJECT(mCalendarView), TQT_SLOT( print() ), mACollection );
+ KStdAction::print( mCalendarView, TQ_SLOT( print() ), mACollection );
}
//~~~~~~~~~~~~~~~~~~~~~~~~ IMPORT / EXPORT ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- new TDEAction( i18n("Import &Event/Calendar (ICS-/VCS-File)..."), 0, TQT_TQOBJECT(this), TQT_SLOT( file_merge() ),
+ new TDEAction( i18n("Import &Event/Calendar (ICS-/VCS-File)..."), 0, this, TQ_SLOT( file_merge() ),
mACollection, "import_icalendar" );
- new TDEAction( i18n("&Import From UNIX Ical tool (.calendar-File)"), 0, TQT_TQOBJECT(this), TQT_SLOT( file_icalimport() ),
+ new TDEAction( i18n("&Import From UNIX Ical tool (.calendar-File)"), 0, this, TQ_SLOT( file_icalimport() ),
mACollection, "import_ical" );
new TDEAction( i18n("Get &Hot New Stuff..."), 0, this,
- TQT_SLOT( downloadNewStuff() ), mACollection,
+ TQ_SLOT( downloadNewStuff() ), mACollection,
"downloadnewstuff" );
new TDEAction( i18n("Export &Web Page..."), "webexport", 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT( exportWeb() ),
+ mCalendarView, TQ_SLOT( exportWeb() ),
mACollection, "export_web" );
new TDEAction( i18n("&iCalendar..."), 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT( exportICalendar() ),
+ mCalendarView, TQ_SLOT( exportICalendar() ),
mACollection, "export_icalendar" );
new TDEAction( i18n("&vCalendar..."), 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT( exportVCalendar() ),
+ mCalendarView, TQ_SLOT( exportVCalendar() ),
mACollection, "export_vcalendar" );
- new TDEAction( i18n("Upload &Hot New Stuff..."), 0, TQT_TQOBJECT(this),
- TQT_SLOT( uploadNewStuff() ), mACollection,
+ new TDEAction( i18n("Upload &Hot New Stuff..."), 0, this,
+ TQ_SLOT( uploadNewStuff() ), mACollection,
"uploadnewstuff" );
- new TDEAction( i18n("Archive O&ld Entries..."), 0, TQT_TQOBJECT(this), TQT_SLOT( file_archive() ),
+ new TDEAction( i18n("Archive O&ld Entries..."), 0, this, TQ_SLOT( file_archive() ),
mACollection, "file_archive" );
new TDEAction( i18n("delete completed to-dos", "Pur&ge Completed To-dos"), 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT( purgeCompleted() ), mACollection,
+ mCalendarView, TQ_SLOT( purgeCompleted() ), mACollection,
"purge_completed" );
@@ -289,45 +289,45 @@ void ActionManager::initActions()
KOrg::History *h = mCalendarView->history();
if ( mIsPart ) {
// edit menu
- mCutAction = KStdAction::cut( TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_cut() ),
+ mCutAction = KStdAction::cut( mCalendarView, TQ_SLOT( edit_cut() ),
mACollection, "korganizer_cut" );
- mCopyAction = KStdAction::copy( TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_copy() ),
+ mCopyAction = KStdAction::copy( mCalendarView, TQ_SLOT( edit_copy() ),
mACollection, "korganizer_copy" );
- pasteAction = KStdAction::paste( TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_paste() ),
+ pasteAction = KStdAction::paste( mCalendarView, TQ_SLOT( edit_paste() ),
mACollection, "korganizer_paste" );
- mUndoAction = KStdAction::undo( h, TQT_SLOT( undo() ),
+ mUndoAction = KStdAction::undo( h, TQ_SLOT( undo() ),
mACollection, "korganizer_undo" );
- mRedoAction = KStdAction::redo( h, TQT_SLOT( redo() ),
+ mRedoAction = KStdAction::redo( h, TQ_SLOT( redo() ),
mACollection, "korganizer_redo" );
} else {
- mCutAction = KStdAction::cut( TQT_TQOBJECT(mCalendarView),TQT_SLOT( edit_cut() ),
+ mCutAction = KStdAction::cut( mCalendarView,TQ_SLOT( edit_cut() ),
mACollection );
- mCopyAction = KStdAction::copy( TQT_TQOBJECT(mCalendarView),TQT_SLOT( edit_copy() ),
+ mCopyAction = KStdAction::copy( mCalendarView,TQ_SLOT( edit_copy() ),
mACollection );
- pasteAction = KStdAction::paste( TQT_TQOBJECT(mCalendarView),TQT_SLOT( edit_paste() ),
+ pasteAction = KStdAction::paste( mCalendarView,TQ_SLOT( edit_paste() ),
mACollection );
- mUndoAction = KStdAction::undo( TQT_TQOBJECT(h), TQT_SLOT( undo() ), mACollection );
- mRedoAction = KStdAction::redo( TQT_TQOBJECT(h), TQT_SLOT( redo() ), mACollection );
+ mUndoAction = KStdAction::undo( h, TQ_SLOT( undo() ), mACollection );
+ mRedoAction = KStdAction::redo( h, TQ_SLOT( redo() ), mACollection );
}
mDeleteAction = new TDEAction( i18n("&Delete"), "edit-delete", 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT( appointment_delete() ),
+ mCalendarView, TQ_SLOT( appointment_delete() ),
mACollection, "edit_delete" );
if ( mIsPart ) {
- KStdAction::find( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ),
+ KStdAction::find( mCalendarView->dialogManager(), TQ_SLOT( showSearchDialog() ),
mACollection, "korganizer_find" );
} else {
- KStdAction::find( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ),
+ KStdAction::find( mCalendarView->dialogManager(), TQ_SLOT( showSearchDialog() ),
mACollection );
}
pasteAction->setEnabled( false );
mUndoAction->setEnabled( false );
mRedoAction->setEnabled( false );
- connect( mCalendarView, TQT_SIGNAL( pasteEnabled( bool ) ),
- pasteAction, TQT_SLOT( setEnabled( bool ) ) );
- connect( h, TQT_SIGNAL( undoAvailable( const TQString & ) ),
- TQT_SLOT( updateUndoAction( const TQString & ) ) );
- connect( h, TQT_SIGNAL( redoAvailable( const TQString & ) ),
- TQT_SLOT( updateRedoAction( const TQString & ) ) );
+ connect( mCalendarView, TQ_SIGNAL( pasteEnabled( bool ) ),
+ pasteAction, TQ_SLOT( setEnabled( bool ) ) );
+ connect( h, TQ_SIGNAL( undoAvailable( const TQString & ) ),
+ TQ_SLOT( updateUndoAction( const TQString & ) ) );
+ connect( h, TQ_SIGNAL( redoAvailable( const TQString & ) ),
+ TQ_SLOT( updateRedoAction( const TQString & ) ) );
@@ -337,83 +337,83 @@ void ActionManager::initActions()
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~ VIEWS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
new TDEAction( i18n("What's &Next"),
KOGlobals::self()->smallIcon( "whatsnext" ), 0,
- mCalendarView->viewManager(), TQT_SLOT( showWhatsNextView() ),
+ mCalendarView->viewManager(), TQ_SLOT( showWhatsNextView() ),
mACollection, "view_whatsnext" );
new TDEAction( i18n("&Day"),
KOGlobals::self()->smallIcon( "1day" ), 0,
- mCalendarView->viewManager(), TQT_SLOT( showDayView() ),
+ mCalendarView->viewManager(), TQ_SLOT( showDayView() ),
mACollection, "view_day" );
mNextXDays = new TDEAction( "",
KOGlobals::self()->smallIcon( "xdays" ), 0,
mCalendarView->viewManager(),
- TQT_SLOT( showNextXView() ),
+ TQ_SLOT( showNextXView() ),
mACollection, "view_nextx" );
mNextXDays->setText( i18n( "&Next Day", "Ne&xt %n Days",
KOPrefs::instance()->mNextXDays ) );
new TDEAction( i18n("W&ork Week"),
KOGlobals::self()->smallIcon( "5days" ), 0,
- mCalendarView->viewManager(), TQT_SLOT( showWorkWeekView() ),
+ mCalendarView->viewManager(), TQ_SLOT( showWorkWeekView() ),
mACollection, "view_workweek" );
new TDEAction( i18n("&Week"),
KOGlobals::self()->smallIcon( "7days" ), 0,
- mCalendarView->viewManager(), TQT_SLOT( showWeekView() ),
+ mCalendarView->viewManager(), TQ_SLOT( showWeekView() ),
mACollection, "view_week" );
new TDEAction( i18n("&Month"),
KOGlobals::self()->smallIcon( "month" ), 0,
- mCalendarView->viewManager(), TQT_SLOT( showMonthView() ),
+ mCalendarView->viewManager(), TQ_SLOT( showMonthView() ),
mACollection, "view_month" );
new TDEAction( i18n("&List"),
KOGlobals::self()->smallIcon( "list" ), 0,
- mCalendarView->viewManager(), TQT_SLOT( showListView() ),
+ mCalendarView->viewManager(), TQ_SLOT( showListView() ),
mACollection, "view_list" );
new TDEAction( i18n("&To-do List"),
KOGlobals::self()->smallIcon( "todo" ), 0,
- mCalendarView->viewManager(), TQT_SLOT( showTodoView() ),
+ mCalendarView->viewManager(), TQ_SLOT( showTodoView() ),
mACollection, "view_todo" );
new TDEAction( i18n("&Journal"),
KOGlobals::self()->smallIcon( "journal" ), 0,
- mCalendarView->viewManager(), TQT_SLOT( showJournalView() ),
+ mCalendarView->viewManager(), TQ_SLOT( showJournalView() ),
mACollection, "view_journal" );
new TDEAction( i18n("&Timeline View"),
KOGlobals::self()->smallIcon( "timeline" ), 0,
- mCalendarView->viewManager(), TQT_SLOT( showTimelineView() ),
+ mCalendarView->viewManager(), TQ_SLOT( showTimelineView() ),
mACollection, "view_timeline" );
//~~~~~~~~~~~~~~~~~~~~~~~~~~~ FILTERS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
new TDEAction( i18n("&Refresh"), 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT( updateView() ),
+ mCalendarView, TQ_SLOT( updateView() ),
mACollection, "update" );
// TODO:
// new TDEAction( i18n("Hide &Completed To-dos"), 0,
-// mCalendarView, TQT_SLOT( toggleHideCompleted() ),
+// mCalendarView, TQ_SLOT( toggleHideCompleted() ),
// mACollection, "hide_completed_todos" );
mFilterAction = new TDESelectAction( i18n("F&ilter"), 0,
mACollection, "filter_select" );
mFilterAction->setEditable( false );
- connect( mFilterAction, TQT_SIGNAL( activated(int) ),
- mCalendarView, TQT_SLOT( filterActivated( int ) ) );
- connect( mCalendarView, TQT_SIGNAL( newFilterListSignal( const TQStringList & ) ),
- mFilterAction, TQT_SLOT( setItems( const TQStringList & ) ) );
- connect( mCalendarView, TQT_SIGNAL( selectFilterSignal( int ) ),
- mFilterAction, TQT_SLOT( setCurrentItem( int ) ) );
- connect( mCalendarView, TQT_SIGNAL( filterChanged() ),
- TQT_TQOBJECT(this), TQT_SLOT( setTitle() ) );
+ connect( mFilterAction, TQ_SIGNAL( activated(int) ),
+ mCalendarView, TQ_SLOT( filterActivated( int ) ) );
+ connect( mCalendarView, TQ_SIGNAL( newFilterListSignal( const TQStringList & ) ),
+ mFilterAction, TQ_SLOT( setItems( const TQStringList & ) ) );
+ connect( mCalendarView, TQ_SIGNAL( selectFilterSignal( int ) ),
+ mFilterAction, TQ_SLOT( setCurrentItem( int ) ) );
+ connect( mCalendarView, TQ_SIGNAL( filterChanged() ),
+ this, TQ_SLOT( setTitle() ) );
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ZOOM ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// TODO: try to find / create better icons for the following 4 actions
new TDEAction( i18n( "Zoom In Horizontally" ), "zoom-in", 0,
- mCalendarView->viewManager(), TQT_SLOT( zoomInHorizontally() ),
+ mCalendarView->viewManager(), TQ_SLOT( zoomInHorizontally() ),
mACollection, "zoom_in_horizontally" );
new TDEAction( i18n( "Zoom Out Horizontally" ), "zoom-out", 0,
- mCalendarView->viewManager(), TQT_SLOT( zoomOutHorizontally() ),
+ mCalendarView->viewManager(), TQ_SLOT( zoomOutHorizontally() ),
mACollection, "zoom_out_horizontally" );
new TDEAction( i18n( "Zoom In Vertically" ), "zoom-in", 0,
- mCalendarView->viewManager(), TQT_SLOT( zoomInVertically() ),
+ mCalendarView->viewManager(), TQ_SLOT( zoomInVertically() ),
mACollection, "zoom_in_vertically" );
new TDEAction( i18n( "Zoom Out Vertically" ), "zoom-out", 0,
- mCalendarView->viewManager(), TQT_SLOT( zoomOutVertically() ),
+ mCalendarView->viewManager(), TQ_SLOT( zoomOutVertically() ),
mACollection, "zoom_out_vertically" );
@@ -422,73 +422,73 @@ void ActionManager::initActions()
//************************** Actions MENU *********************************
new TDEAction( i18n("Go to &Today"), "today", 0,
- TQT_TQOBJECT(mCalendarView),TQT_SLOT( goToday() ),
+ mCalendarView,TQ_SLOT( goToday() ),
mACollection, "go_today" );
bool isRTL = TQApplication::reverseLayout();
action = new TDEAction( i18n("Go &Backward"), isRTL ? "forward" : "back", 0,
- TQT_TQOBJECT(mCalendarView),TQT_SLOT( goPrevious() ),
+ mCalendarView,TQ_SLOT( goPrevious() ),
mACollection, "go_previous" );
// Changing the action text by setText makes the toolbar button disappear.
// This has to be fixed first, before the connects below can be reenabled.
/*
- connect( mCalendarView, TQT_SIGNAL( changeNavStringPrev( const TQString & ) ),
- action, TQT_SLOT( setText( const TQString & ) ) );
- connect( mCalendarView, TQT_SIGNAL( changeNavStringPrev( const TQString & ) ),
- TQT_TQOBJECT(this), TQT_SLOT( dumpText( const TQString & ) ) );*/
+ connect( mCalendarView, TQ_SIGNAL( changeNavStringPrev( const TQString & ) ),
+ action, TQ_SLOT( setText( const TQString & ) ) );
+ connect( mCalendarView, TQ_SIGNAL( changeNavStringPrev( const TQString & ) ),
+ this, TQ_SLOT( dumpText( const TQString & ) ) );*/
action = new TDEAction( i18n("Go &Forward"), isRTL ? "back" : "forward", 0,
- TQT_TQOBJECT(mCalendarView),TQT_SLOT( goNext() ),
+ mCalendarView,TQ_SLOT( goNext() ),
mACollection, "go_next" );
/*
- connect( mCalendarView,TQT_SIGNAL( changeNavStringNext( const TQString & ) ),
- action,TQT_SLOT( setText( const TQString & ) ) );
+ connect( mCalendarView,TQ_SIGNAL( changeNavStringNext( const TQString & ) ),
+ action,TQ_SLOT( setText( const TQString & ) ) );
*/
//************************** Actions MENU *********************************
new TDEAction( i18n("New E&vent..."),
KOGlobals::self()->smallIcon( "newappointment" ), 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT(newEvent()),
+ mCalendarView, TQ_SLOT(newEvent()),
mACollection, "new_event" );
new TDEAction( i18n("New &To-do..."),
KOGlobals::self()->smallIcon( "newtodo" ), 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT(newTodo()),
+ mCalendarView, TQ_SLOT(newTodo()),
mACollection, "new_todo" );
action = new TDEAction( i18n("New Su&b-to-do..."), 0,
- TQT_TQOBJECT(mCalendarView),TQT_SLOT( newSubTodo() ),
+ mCalendarView,TQ_SLOT( newSubTodo() ),
mACollection, "new_subtodo" );
action->setEnabled( false );
- connect( mCalendarView,TQT_SIGNAL( todoSelected( bool ) ),
- action,TQT_SLOT( setEnabled( bool ) ) );
+ connect( mCalendarView,TQ_SIGNAL( todoSelected( bool ) ),
+ action,TQ_SLOT( setEnabled( bool ) ) );
new TDEAction( i18n("New &Journal..."),
KOGlobals::self()->smallIcon( "newjournal" ), 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT(newJournal()),
+ mCalendarView, TQ_SLOT(newJournal()),
mACollection, "new_journal" );
mShowIncidenceAction = new TDEAction( i18n("&Show"), 0,
- TQT_TQOBJECT(mCalendarView),TQT_SLOT( showIncidence() ),
+ mCalendarView,TQ_SLOT( showIncidence() ),
mACollection, "show_incidence" );
mEditIncidenceAction = new TDEAction( i18n("&Edit..."), 0,
- TQT_TQOBJECT(mCalendarView),TQT_SLOT( editIncidence() ),
+ mCalendarView,TQ_SLOT( editIncidence() ),
mACollection, "edit_incidence" );
mDeleteIncidenceAction = new TDEAction( i18n("&Delete"), Key_Delete,
- TQT_TQOBJECT(mCalendarView),TQT_SLOT( deleteIncidence()),
+ mCalendarView,TQ_SLOT( deleteIncidence()),
mACollection, "delete_incidence" );
action = new TDEAction( i18n("&Make Sub-to-do Independent"), 0,
- TQT_TQOBJECT(mCalendarView),TQT_SLOT( todo_unsub() ),
+ mCalendarView,TQ_SLOT( todo_unsub() ),
mACollection, "unsub_todo" );
action->setEnabled( false );
- connect( mCalendarView,TQT_SIGNAL( subtodoSelected( bool ) ),
- action,TQT_SLOT( setEnabled( bool ) ) );
+ connect( mCalendarView,TQ_SIGNAL( subtodoSelected( bool ) ),
+ action,TQ_SLOT( setEnabled( bool ) ) );
// TODO: Add item to move the incidence to different resource
// mAssignResourceAction = new TDEAction( i18n("Assign &Resource..."), 0,
-// mCalendarView, TQT_SLOT( assignResource()),
+// mCalendarView, TQ_SLOT( assignResource()),
// mACollection, "assign_resource" );
// TODO: Add item to quickly toggle the reminder of a given incidence
// mToggleAlarmAction = new TDEToggleAction( i18n("&Activate Reminder"), 0,
-// mCalendarView, TQT_SLOT( toggleAlarm()),
+// mCalendarView, TQ_SLOT( toggleAlarm()),
// mACollection, "activate_alarm" );
@@ -496,65 +496,65 @@ void ActionManager::initActions()
//************************** SCHEDULE MENU ********************************
mPublishEvent = new TDEAction( i18n("&Publish Item Information..."), "mail-send", 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT( schedule_publish() ),
+ mCalendarView, TQ_SLOT( schedule_publish() ),
mACollection, "schedule_publish" );
mPublishEvent->setEnabled( false );
mSendInvitation = new TDEAction( i18n( "Send &Invitation to Attendees" ),
"mail_generic", 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_request()),
+ mCalendarView, TQ_SLOT(schedule_request()),
mACollection, "schedule_request" );
mSendInvitation->setEnabled( false );
- connect( mCalendarView, TQT_SIGNAL(organizerEventsSelected(bool)),
- mSendInvitation, TQT_SLOT(setEnabled(bool)) );
+ connect( mCalendarView, TQ_SIGNAL(organizerEventsSelected(bool)),
+ mSendInvitation, TQ_SLOT(setEnabled(bool)) );
mRequestUpdate = new TDEAction( i18n( "Re&quest Update" ), 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_refresh()),
+ mCalendarView, TQ_SLOT(schedule_refresh()),
mACollection, "schedule_refresh" );
mRequestUpdate->setEnabled( false );
- connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)),
- mRequestUpdate, TQT_SLOT(setEnabled(bool)) );
+ connect( mCalendarView, TQ_SIGNAL(groupEventsSelected(bool)),
+ mRequestUpdate, TQ_SLOT(setEnabled(bool)) );
mSendCancel = new TDEAction( i18n( "Send &Cancelation to Attendees" ), 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_cancel()),
+ mCalendarView, TQ_SLOT(schedule_cancel()),
mACollection, "schedule_cancel" );
mSendCancel->setEnabled( false );
- connect( mCalendarView, TQT_SIGNAL(organizerEventsSelected(bool)),
- mSendCancel, TQT_SLOT(setEnabled(bool)) );
+ connect( mCalendarView, TQ_SIGNAL(organizerEventsSelected(bool)),
+ mSendCancel, TQ_SLOT(setEnabled(bool)) );
mSendStatusUpdate = new TDEAction( i18n( "Send Status &Update" ),
"mail-reply-sender", 0,
- TQT_TQOBJECT(mCalendarView),TQT_SLOT(schedule_reply()),
+ mCalendarView,TQ_SLOT(schedule_reply()),
mACollection, "schedule_reply" );
mSendStatusUpdate->setEnabled( false );
- connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)),
- mSendStatusUpdate, TQT_SLOT(setEnabled(bool)) );
+ connect( mCalendarView, TQ_SIGNAL(groupEventsSelected(bool)),
+ mSendStatusUpdate, TQ_SLOT(setEnabled(bool)) );
mRequestChange = new TDEAction( i18n( "counter proposal", "Request Chan&ge" ), 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_counter()),
+ mCalendarView, TQ_SLOT(schedule_counter()),
mACollection, "schedule_counter" );
mRequestChange->setEnabled( false );
- connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)),
- mRequestChange, TQT_SLOT(setEnabled(bool)) );
+ connect( mCalendarView, TQ_SIGNAL(groupEventsSelected(bool)),
+ mRequestChange, TQ_SLOT(setEnabled(bool)) );
mForwardEvent = new TDEAction( i18n("&Send as iCalendar..."), "mail-forward", 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_forward()),
+ mCalendarView, TQ_SLOT(schedule_forward()),
mACollection, "schedule_forward" );
mForwardEvent->setEnabled( false );
action = new TDEAction( i18n("&Mail Free Busy Information..."), 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT( mailFreeBusy() ),
+ mCalendarView, TQ_SLOT( mailFreeBusy() ),
mACollection, "mail_freebusy" );
action->setEnabled( true );
action = new TDEAction( i18n("&Upload Free Busy Information"), 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT( uploadFreeBusy() ),
+ mCalendarView, TQ_SLOT( uploadFreeBusy() ),
mACollection, "upload_freebusy" );
action->setEnabled( true );
if ( !mIsPart ) {
action = new TDEAction( i18n("&Addressbook"),"contents",0,
- TQT_TQOBJECT(mCalendarView),TQT_SLOT( openAddressbook() ),
+ mCalendarView,TQ_SLOT( openAddressbook() ),
mACollection,"addressbook" );
}
@@ -565,13 +565,13 @@ void ActionManager::initActions()
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SIDEBAR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
mDateNavigatorShowAction = new TDEToggleAction( i18n("Show Date Navigator"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( toggleDateNavigator() ),
+ this, TQ_SLOT( toggleDateNavigator() ),
mACollection, "show_datenavigator" );
mTodoViewShowAction = new TDEToggleAction ( i18n("Show To-do View"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( toggleTodoView() ),
+ this, TQ_SLOT( toggleTodoView() ),
mACollection, "show_todoview" );
mEventViewerShowAction = new TDEToggleAction ( i18n("Show Item Viewer"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( toggleEventViewer() ),
+ this, TQ_SLOT( toggleEventViewer() ),
mACollection, "show_eventviewer" );
TDEConfig *config = KOGlobals::self()->config();
config->setGroup( "Settings" );
@@ -590,10 +590,10 @@ void ActionManager::initActions()
if ( !mMainWindow->hasDocument() ) {
mResourceViewShowAction = new TDEToggleAction ( i18n("Show Resource View"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( toggleResourceView() ),
+ this, TQ_SLOT( toggleResourceView() ),
mACollection, "show_resourceview" );
mResourceButtonsAction = new TDEToggleAction( i18n("Show &Resource Buttons"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( toggleResourceButtons() ),
+ this, TQ_SLOT( toggleResourceButtons() ),
mACollection, "show_resourcebuttons" );
mResourceViewShowAction->setChecked(
config->readBoolEntry( "ResourceViewVisible", true ) );
@@ -608,38 +608,38 @@ void ActionManager::initActions()
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SIDEBAR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
new TDEAction( i18n("Configure &Date && Time..."), 0,
- TQT_TQOBJECT(this), TQT_SLOT( configureDateTime() ),
+ this, TQ_SLOT( configureDateTime() ),
mACollection, "conf_datetime" );
// TODO: Add an item to show the resource management dlg
// new TDEAction( i18n("Manage &Resources..."), 0,
-// TQT_TQOBJECT(this), TQT_SLOT( manageResources() ),
+// this, TQ_SLOT( manageResources() ),
// mACollection, "conf_resources" );
new TDEAction( i18n("Manage View &Filters..."), "configure", 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT( editFilters() ),
+ mCalendarView, TQ_SLOT( editFilters() ),
mACollection, "edit_filters" );
new TDEAction( i18n("Manage C&ategories..."), 0,
- TQT_TQOBJECT(mCalendarView->dialogManager()), TQT_SLOT( showCategoryEditDialog() ),
+ mCalendarView->dialogManager(), TQ_SLOT( showCategoryEditDialog() ),
mACollection, "edit_categories" );
if ( mIsPart ) {
new TDEAction( i18n("&Configure Calendar..."), "configure", 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_options() ),
+ mCalendarView, TQ_SLOT( edit_options() ),
mACollection, "korganizer_configure" );
- KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( keyBindings() ),
+ KStdAction::keyBindings( this, TQ_SLOT( keyBindings() ),
mACollection, "korganizer_configure_shortcuts" );
} else {
- KStdAction::preferences( TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_options() ),
+ KStdAction::preferences( mCalendarView, TQ_SLOT( edit_options() ),
mACollection );
- KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( keyBindings() ), mACollection );
+ KStdAction::keyBindings( this, TQ_SLOT( keyBindings() ), mACollection );
}
//**************************** HELP MENU **********************************
- KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( showTip() ), mACollection,
+ KStdAction::tipOfDay( this, TQ_SLOT( showTip() ), mACollection,
"help_tipofday" );
// new TDEAction( i18n("Show Intro Page"), 0,
-// mCalendarView,TQT_SLOT( showIntro() ),
+// mCalendarView,TQ_SLOT( showIntro() ),
// mACollection,"show_intro" );
@@ -1293,8 +1293,8 @@ void ActionManager::configureDateTime()
TDEProcess *proc = new TDEProcess;
*proc << "tdecmshell" << "language";
- connect( proc,TQT_SIGNAL( processExited( TDEProcess * ) ),
- TQT_SLOT( configureDateTimeFinished( TDEProcess * ) ) );
+ connect( proc,TQ_SIGNAL( processExited( TDEProcess * ) ),
+ TQ_SLOT( configureDateTimeFinished( TDEProcess * ) ) );
if ( !proc->start() ) {
KMessageBox::sorry( dialogParent(),
@@ -1558,7 +1558,7 @@ TQPair<ResourceCalendar *, TQString> ActionManager::viewSubResourceCalendar()
cV = mCalendarView->viewManager()->multiAgendaView()->selectedAgendaView();
}
if ( cV ) {
- p = tqMakePair( cV->resourceCalendar(), cV->subResourceCalendar() );
+ p = qMakePair( cV->resourceCalendar(), cV->subResourceCalendar() );
}
return p;
}
@@ -1935,8 +1935,8 @@ bool ActionManager::queryClose()
// FIXME: Put main window into a state indicating final saving.
mIsClosing = true;
// FIXME: Close main window when save is finished
-// connect( mCalendarResources, TQT_SIGNAL( calendarSaved() ),
-// mMainWindow, TQT_SLOT( close() ) );
+// connect( mCalendarResources, TQ_SIGNAL( calendarSaved() ),
+// mMainWindow, TQ_SLOT( close() ) );
}
if ( mCalendarResources->isSaving() ) {
kdDebug(5850) << "ActionManager::queryClose(): isSaving" << endl;
@@ -2012,12 +2012,12 @@ void ActionManager::importCalendar( const KURL &url )
PreviewDialog *dialog;
dialog = new PreviewDialog( url, mMainWindow->topLevelWidget() );
- connect( dialog, TQT_SIGNAL( dialogFinished( PreviewDialog * ) ),
- TQT_SLOT( slotPreviewDialogFinished( PreviewDialog * ) ) );
- connect( dialog, TQT_SIGNAL( openURL( const KURL &, bool ) ),
- TQT_SLOT( openURL( const KURL &, bool ) ) );
- connect( dialog, TQT_SIGNAL( addResource( const KURL & ) ),
- TQT_SLOT( addResource( const KURL & ) ) );
+ connect( dialog, TQ_SIGNAL( dialogFinished( PreviewDialog * ) ),
+ TQ_SLOT( slotPreviewDialogFinished( PreviewDialog * ) ) );
+ connect( dialog, TQ_SIGNAL( openURL( const KURL &, bool ) ),
+ TQ_SLOT( openURL( const KURL &, bool ) ) );
+ connect( dialog, TQ_SIGNAL( addResource( const KURL & ) ),
+ TQ_SLOT( addResource( const KURL & ) ) );
if ( dialog->loadCalendar() ) {
dialog->show();
@@ -2046,7 +2046,7 @@ void ActionManager::slotAutoArchive()
return;
mAutoArchiveTimer->stop();
EventArchiver archiver;
- connect( &archiver, TQT_SIGNAL( eventsDeleted() ), mCalendarView, TQT_SLOT( updateView() ) );
+ connect( &archiver, TQ_SIGNAL( eventsDeleted() ), mCalendarView, TQ_SLOT( updateView() ) );
archiver.runAuto( mCalendarView->calendar(), mCalendarView, false /*no gui*/ );
// restart timer with the correct delay ( especially useful for the first time )
slotAutoArchivingSettingsModified();
diff --git a/korganizer/actionmanager.h b/korganizer/actionmanager.h
index ebfed515..d7b8c417 100644
--- a/korganizer/actionmanager.h
+++ b/korganizer/actionmanager.h
@@ -72,7 +72,7 @@ using namespace KCal;
*/
class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
ActionManager( KXMLGUIClient *client, CalendarView *widget,
diff --git a/korganizer/agendaview.cpp b/korganizer/agendaview.cpp
index df141789..e0519ba4 100644
--- a/korganizer/agendaview.cpp
+++ b/korganizer/agendaview.cpp
@@ -27,9 +27,9 @@ AgendaView::AgendaView(Calendar * cal, TQWidget * parent, const char * name) :
{
KCal::CalendarResources *calres = dynamic_cast<KCal::CalendarResources*>( cal );
if ( calres ) {
- connect( calres, TQT_SIGNAL(signalResourceAdded(ResourceCalendar *)), TQT_SLOT(resourcesChanged()) );
- connect( calres, TQT_SIGNAL(signalResourceModified( ResourceCalendar *)), TQT_SLOT(resourcesChanged()) );
- connect( calres, TQT_SIGNAL(signalResourceDeleted(ResourceCalendar *)), TQT_SLOT(resourcesChanged()) );
+ connect( calres, TQ_SIGNAL(signalResourceAdded(ResourceCalendar *)), TQ_SLOT(resourcesChanged()) );
+ connect( calres, TQ_SIGNAL(signalResourceModified( ResourceCalendar *)), TQ_SLOT(resourcesChanged()) );
+ connect( calres, TQ_SIGNAL(signalResourceDeleted(ResourceCalendar *)), TQ_SLOT(resourcesChanged()) );
}
}
diff --git a/korganizer/agendaview.h b/korganizer/agendaview.h
index 32b58d3c..6e48f699 100644
--- a/korganizer/agendaview.h
+++ b/korganizer/agendaview.h
@@ -26,7 +26,7 @@ namespace KOrg {
/** Base class for single/multi agenda views. */
class AgendaView : public KOEventView
{
- Q_OBJECT
+ TQ_OBJECT
public:
AgendaView( Calendar *cal,TQWidget *parent=0,const char *name=0 );
diff --git a/korganizer/archivedialog.cpp b/korganizer/archivedialog.cpp
index 989be261..7b8eae46 100644
--- a/korganizer/archivedialog.cpp
+++ b/korganizer/archivedialog.cpp
@@ -76,7 +76,7 @@ ArchiveDialog::ArchiveDialog(Calendar *cal,TQWidget *parent, const char *name)
TQButtonGroup* radioBG = new TQButtonGroup( this );
radioBG->hide(); // just for the exclusive behavior
- connect( radioBG, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotActionChanged() ) );
+ connect( radioBG, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotActionChanged() ) );
TQHBoxLayout *dateLayout = new TQHBoxLayout(0);
mArchiveOnceRB = new TQRadioButton(i18n("Archive now items older than:"),topFrame);
@@ -147,10 +147,10 @@ ArchiveDialog::ArchiveDialog(Calendar *cal,TQWidget *parent, const char *name)
i18n("Select this option to delete old events and to-dos without saving them. "
"It is not possible to recover the events later."));
topLayout->addWidget(mDeleteCb);
- connect(mDeleteCb, TQT_SIGNAL(toggled(bool)), mArchiveFile, TQT_SLOT(setDisabled(bool)));
- connect(mDeleteCb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableUser1()));
- connect(mArchiveFile->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )),
- this,TQT_SLOT(slotEnableUser1()));
+ connect(mDeleteCb, TQ_SIGNAL(toggled(bool)), mArchiveFile, TQ_SLOT(setDisabled(bool)));
+ connect(mDeleteCb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableUser1()));
+ connect(mArchiveFile->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )),
+ this,TQ_SLOT(slotEnableUser1()));
// Load settings from KOPrefs
mExpiryTimeNumInput->setValue( KOPrefs::instance()->mExpiryTime );
@@ -194,7 +194,7 @@ void ArchiveDialog::slotActionChanged()
void ArchiveDialog::slotUser1()
{
EventArchiver archiver;
- connect( &archiver, TQT_SIGNAL( eventsDeleted() ), this, TQT_SLOT( slotEventsDeleted() ) );
+ connect( &archiver, TQ_SIGNAL( eventsDeleted() ), this, TQ_SLOT( slotEventsDeleted() ) );
KOPrefs::instance()->mAutoArchive = mAutoArchiveRB->isChecked();
KOPrefs::instance()->mExpiryTime = mExpiryTimeNumInput->value();
diff --git a/korganizer/archivedialog.h b/korganizer/archivedialog.h
index 4d43f5da..2b22fe4f 100644
--- a/korganizer/archivedialog.h
+++ b/korganizer/archivedialog.h
@@ -40,7 +40,7 @@ using namespace KCal;
class ArchiveDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
ArchiveDialog(Calendar *calendar,TQWidget *parent=0, const char *name=0);
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 907603a9..dbee755f 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -131,18 +131,18 @@ CalendarView::CalendarView( TQWidget *parent, const char *name )
mExtensions.setAutoDelete( true );
- mDateNavigator = new DateNavigator( TQT_TQOBJECT(this) );
- mDateChecker = new DateChecker( TQT_TQOBJECT(this) );
+ mDateNavigator = new DateNavigator( this );
+ mDateChecker = new DateChecker( this );
TQBoxLayout *topLayout = new TQVBoxLayout( this );
#ifndef KORG_NOSPLITTER
// create the main layout frames.
- mPanner = new TQSplitter( Qt::Horizontal, this,
+ mPanner = new TQSplitter( TQt::Horizontal, this,
"CalendarView::Panner" );
topLayout->addWidget( mPanner );
- mLeftSplitter = new TQSplitter( Qt::Vertical, mPanner,
+ mLeftSplitter = new TQSplitter( TQt::Vertical, mPanner,
"CalendarView::LeftFrame" );
// mPanner->setResizeMode( mLeftSplitter, TQSplitter::Stretch );
@@ -200,64 +200,64 @@ CalendarView::CalendarView( TQWidget *parent, const char *name )
#endif
// Signals emited by mDateNavigator
- connect( mDateNavigator, TQT_SIGNAL( datesSelected( const KCal::DateList &, const TQDate & ) ),
- TQT_SLOT( showDates( const KCal::DateList &, const TQDate & ) ) );
+ connect( mDateNavigator, TQ_SIGNAL( datesSelected( const KCal::DateList &, const TQDate & ) ),
+ TQ_SLOT( showDates( const KCal::DateList &, const TQDate & ) ) );
// Signals emited by mNavigatorBar
- connect( mNavigatorBar, TQT_SIGNAL( prevYearClicked() ),
- mDateNavigator, TQT_SLOT( selectPreviousYear() ) );
- connect( mNavigatorBar, TQT_SIGNAL( nextYearClicked() ),
- mDateNavigator, TQT_SLOT( selectNextYear() ) );
- connect( mNavigatorBar, TQT_SIGNAL( prevMonthClicked() ),
- mDateNavigator, TQT_SLOT( selectPreviousMonth() ) );
- connect( mNavigatorBar, TQT_SIGNAL( nextMonthClicked() ),
- mDateNavigator, TQT_SLOT( selectNextMonth() ) );
- connect( mNavigatorBar, TQT_SIGNAL( monthSelected(int) ),
- mDateNavigator, TQT_SLOT( selectMonth(int) ) );
- connect( mNavigatorBar, TQT_SIGNAL( yearSelected(int)),
- mDateNavigator, TQT_SLOT(selectYear(int)) );
+ connect( mNavigatorBar, TQ_SIGNAL( prevYearClicked() ),
+ mDateNavigator, TQ_SLOT( selectPreviousYear() ) );
+ connect( mNavigatorBar, TQ_SIGNAL( nextYearClicked() ),
+ mDateNavigator, TQ_SLOT( selectNextYear() ) );
+ connect( mNavigatorBar, TQ_SIGNAL( prevMonthClicked() ),
+ mDateNavigator, TQ_SLOT( selectPreviousMonth() ) );
+ connect( mNavigatorBar, TQ_SIGNAL( nextMonthClicked() ),
+ mDateNavigator, TQ_SLOT( selectNextMonth() ) );
+ connect( mNavigatorBar, TQ_SIGNAL( monthSelected(int) ),
+ mDateNavigator, TQ_SLOT( selectMonth(int) ) );
+ connect( mNavigatorBar, TQ_SIGNAL( yearSelected(int)),
+ mDateNavigator, TQ_SLOT(selectYear(int)) );
// Signals emited by mDateNavigatorContainer
- connect( mDateNavigatorContainer, TQT_SIGNAL( weekClicked( const TQDate & ) ),
- this, TQT_SLOT( selectWeek( const TQDate & ) ) );
- connect( mDateNavigatorContainer, TQT_SIGNAL( prevMonthClicked(const TQDate &, const TQDate &, const TQDate &) ),
- mDateNavigator, TQT_SLOT( selectPreviousMonth(const TQDate &, const TQDate &, const TQDate &) ) );
- connect( mDateNavigatorContainer, TQT_SIGNAL( nextMonthClicked(const TQDate &, const TQDate &, const TQDate &) ),
- mDateNavigator, TQT_SLOT( selectNextMonth(const TQDate &, const TQDate &, const TQDate &) ) );
- connect( mDateNavigatorContainer, TQT_SIGNAL( prevYearClicked() ),
- mDateNavigator, TQT_SLOT( selectPreviousYear() ) );
- connect( mDateNavigatorContainer, TQT_SIGNAL( nextYearClicked() ),
- mDateNavigator, TQT_SLOT( selectNextYear() ) );
- connect( mDateNavigatorContainer, TQT_SIGNAL( monthSelected(int) ),
- mDateNavigator, TQT_SLOT( selectMonth(int) ) );
- connect( mDateNavigatorContainer, TQT_SIGNAL(yearSelected(int)),
- mDateNavigator, TQT_SLOT(selectYear(int)) );
- connect( mDateNavigatorContainer, TQT_SIGNAL( goPrevious() ),
- mDateNavigator, TQT_SLOT( selectPrevious() ) );
- connect( mDateNavigatorContainer, TQT_SIGNAL( goNext() ),
- mDateNavigator, TQT_SLOT( selectNext() ) );
-
- connect( mDateNavigatorContainer, TQT_SIGNAL( datesSelected( const KCal::DateList & ) ),
- mDateNavigator, TQT_SLOT( selectDates( const KCal::DateList & ) ) );
-
- connect( mDateNavigatorContainer, TQT_SIGNAL(incidenceDropped(Incidence*, const TQDate&)),
- TQT_SLOT( addIncidenceOn( Incidence *, const TQDate & ) ) );
- connect( mDateNavigatorContainer, TQT_SIGNAL(incidenceDroppedMove(Incidence*,const TQDate&)),
- TQT_SLOT( moveIncidenceTo( Incidence *, const TQDate & ) ) );
-
- connect( mDateChecker, TQT_SIGNAL( dayPassed( const TQDate & ) ),
- mTodoList, TQT_SLOT( dayPassed( const TQDate & ) ) );
- connect( mDateChecker, TQT_SIGNAL( dayPassed( const TQDate & ) ),
- TQT_SIGNAL( dayPassed( const TQDate & ) ) );
- connect( mDateChecker, TQT_SIGNAL( dayPassed( const TQDate & ) ),
- mDateNavigatorContainer, TQT_SLOT( updateToday() ) );
-
- connect( this, TQT_SIGNAL( configChanged() ),
- mDateNavigatorContainer, TQT_SLOT( updateConfig() ) );
-
- connect( this, TQT_SIGNAL( incidenceSelected(Incidence *, const TQDate &) ),
- mEventViewer, TQT_SLOT ( setIncidence (Incidence *, const TQDate &) ) );
+ connect( mDateNavigatorContainer, TQ_SIGNAL( weekClicked( const TQDate & ) ),
+ this, TQ_SLOT( selectWeek( const TQDate & ) ) );
+ connect( mDateNavigatorContainer, TQ_SIGNAL( prevMonthClicked(const TQDate &, const TQDate &, const TQDate &) ),
+ mDateNavigator, TQ_SLOT( selectPreviousMonth(const TQDate &, const TQDate &, const TQDate &) ) );
+ connect( mDateNavigatorContainer, TQ_SIGNAL( nextMonthClicked(const TQDate &, const TQDate &, const TQDate &) ),
+ mDateNavigator, TQ_SLOT( selectNextMonth(const TQDate &, const TQDate &, const TQDate &) ) );
+ connect( mDateNavigatorContainer, TQ_SIGNAL( prevYearClicked() ),
+ mDateNavigator, TQ_SLOT( selectPreviousYear() ) );
+ connect( mDateNavigatorContainer, TQ_SIGNAL( nextYearClicked() ),
+ mDateNavigator, TQ_SLOT( selectNextYear() ) );
+ connect( mDateNavigatorContainer, TQ_SIGNAL( monthSelected(int) ),
+ mDateNavigator, TQ_SLOT( selectMonth(int) ) );
+ connect( mDateNavigatorContainer, TQ_SIGNAL(yearSelected(int)),
+ mDateNavigator, TQ_SLOT(selectYear(int)) );
+ connect( mDateNavigatorContainer, TQ_SIGNAL( goPrevious() ),
+ mDateNavigator, TQ_SLOT( selectPrevious() ) );
+ connect( mDateNavigatorContainer, TQ_SIGNAL( goNext() ),
+ mDateNavigator, TQ_SLOT( selectNext() ) );
+
+ connect( mDateNavigatorContainer, TQ_SIGNAL( datesSelected( const KCal::DateList & ) ),
+ mDateNavigator, TQ_SLOT( selectDates( const KCal::DateList & ) ) );
+
+ connect( mDateNavigatorContainer, TQ_SIGNAL(incidenceDropped(Incidence*, const TQDate&)),
+ TQ_SLOT( addIncidenceOn( Incidence *, const TQDate & ) ) );
+ connect( mDateNavigatorContainer, TQ_SIGNAL(incidenceDroppedMove(Incidence*,const TQDate&)),
+ TQ_SLOT( moveIncidenceTo( Incidence *, const TQDate & ) ) );
+
+ connect( mDateChecker, TQ_SIGNAL( dayPassed( const TQDate & ) ),
+ mTodoList, TQ_SLOT( dayPassed( const TQDate & ) ) );
+ connect( mDateChecker, TQ_SIGNAL( dayPassed( const TQDate & ) ),
+ TQ_SIGNAL( dayPassed( const TQDate & ) ) );
+ connect( mDateChecker, TQ_SIGNAL( dayPassed( const TQDate & ) ),
+ mDateNavigatorContainer, TQ_SLOT( updateToday() ) );
+
+ connect( this, TQ_SIGNAL( configChanged() ),
+ mDateNavigatorContainer, TQ_SLOT( updateConfig() ) );
+
+ connect( this, TQ_SIGNAL( incidenceSelected(Incidence *, const TQDate &) ),
+ mEventViewer, TQ_SLOT ( setIncidence (Incidence *, const TQDate &) ) );
//TODO: do a pretty Summary,
TQString s;
@@ -277,13 +277,13 @@ CalendarView::CalendarView( TQWidget *parent, const char *name )
KOGlobals::self()->
setHolidays( new KHolidays( KOPrefs::instance()->mHolidays ) );
- connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
- TQT_SLOT( checkClipboard() ) );
+ connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ),
+ TQ_SLOT( checkClipboard() ) );
- connect( mTodoList, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ),
- TQT_SLOT( processTodoListSelection( Incidence *,const TQDate & ) ) );
- disconnect( mTodoList, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ),
- this, TQT_SLOT( processMainViewSelection( Incidence *,const TQDate & ) ) );
+ connect( mTodoList, TQ_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ),
+ TQ_SLOT( processTodoListSelection( Incidence *,const TQDate & ) ) );
+ disconnect( mTodoList, TQ_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ),
+ this, TQ_SLOT( processMainViewSelection( Incidence *,const TQDate & ) ) );
kdDebug(5850) << "CalendarView::CalendarView() done" << endl;
}
@@ -307,11 +307,11 @@ void CalendarView::setCalendar( Calendar *cal )
delete mHistory;
mHistory = new History( mCalendar );
- connect( mHistory, TQT_SIGNAL( undone() ), TQT_SLOT( updateView() ) );
- connect( mHistory, TQT_SIGNAL( redone() ), TQT_SLOT( updateView() ) );
+ connect( mHistory, TQ_SIGNAL( undone() ), TQ_SLOT( updateView() ) );
+ connect( mHistory, TQ_SIGNAL( redone() ), TQ_SLOT( updateView() ) );
if ( mChanger ) delete mChanger;
- setIncidenceChanger( new IncidenceChanger( mCalendar, TQT_TQOBJECT(this) ) );
+ setIncidenceChanger( new IncidenceChanger( mCalendar, this ) );
mCalendar->registerObserver( this );
@@ -326,21 +326,21 @@ void CalendarView::setIncidenceChanger( IncidenceChangerBase *changer )
{
mChanger = changer;
emit newIncidenceChanger( mChanger );
- connect( mChanger, TQT_SIGNAL( incidenceAdded( Incidence* ) ),
- this, TQT_SLOT( incidenceAdded( Incidence* ) ) );
- connect( mChanger, TQT_SIGNAL( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ),
- this, TQT_SLOT( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ) );
- connect( mChanger, TQT_SIGNAL( incidenceToBeDeleted( Incidence * ) ),
- this, TQT_SLOT( incidenceToBeDeleted( Incidence * ) ) );
- connect( mChanger, TQT_SIGNAL( incidenceDeleted( Incidence * ) ),
- this, TQT_SLOT( incidenceDeleted( Incidence * ) ) );
+ connect( mChanger, TQ_SIGNAL( incidenceAdded( Incidence* ) ),
+ this, TQ_SLOT( incidenceAdded( Incidence* ) ) );
+ connect( mChanger, TQ_SIGNAL( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ),
+ this, TQ_SLOT( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ) );
+ connect( mChanger, TQ_SIGNAL( incidenceToBeDeleted( Incidence * ) ),
+ this, TQ_SLOT( incidenceToBeDeleted( Incidence * ) ) );
+ connect( mChanger, TQ_SIGNAL( incidenceDeleted( Incidence * ) ),
+ this, TQ_SLOT( incidenceDeleted( Incidence * ) ) );
- connect( mChanger, TQT_SIGNAL( schedule( Scheduler::Method, Incidence*) ),
- this, TQT_SLOT( schedule( Scheduler::Method, Incidence*) ) );
+ connect( mChanger, TQ_SIGNAL( schedule( Scheduler::Method, Incidence*) ),
+ this, TQ_SLOT( schedule( Scheduler::Method, Incidence*) ) );
- connect( this, TQT_SIGNAL( cancelAttendees( Incidence * ) ),
- mChanger, TQT_SLOT( cancelAttendees( Incidence * ) ) );
+ connect( this, TQ_SIGNAL( cancelAttendees( Incidence * ) ),
+ mChanger, TQ_SLOT( cancelAttendees( Incidence * ) ) );
}
Calendar *CalendarView::calendar()
@@ -357,7 +357,7 @@ TQPair<ResourceCalendar *, TQString> CalendarView::viewSubResourceCalendar()
cV = mViewManager->multiAgendaView()->selectedAgendaView();
}
if ( cV ) {
- p = tqMakePair( cV->resourceCalendar(), cV->subResourceCalendar() );
+ p = qMakePair( cV->resourceCalendar(), cV->subResourceCalendar() );
}
return p;
}
@@ -1776,7 +1776,7 @@ void CalendarView::print()
#ifndef KORG_NOPRINTER
KOCoreHelper helper;
CalPrinter printer( this, mCalendar, &helper );
- connect( this, TQT_SIGNAL(configChanged()), &printer, TQT_SLOT(updateConfig()) );
+ connect( this, TQ_SIGNAL(configChanged()), &printer, TQ_SLOT(updateConfig()) );
KOrg::BaseView *currentView = mViewManager->currentView();
@@ -1802,8 +1802,8 @@ void CalendarView::exportWeb()
// seem to load the config theirselves
if ( settings ) settings->readConfig();
ExportWebDialog *dlg = new ExportWebDialog( settings, this );
- connect( dlg, TQT_SIGNAL( exportHTML( HTMLExportSettings* ) ),
- this, TQT_SIGNAL( exportHTML( HTMLExportSettings* ) ) );
+ connect( dlg, TQ_SIGNAL( exportHTML( HTMLExportSettings* ) ),
+ this, TQ_SIGNAL( exportHTML( HTMLExportSettings* ) ) );
dlg->show();
}
@@ -2472,8 +2472,8 @@ void CalendarView::deleteIncidence(Incidence *incidence, bool force)
void CalendarView::connectIncidenceEditor( KOIncidenceEditor *editor )
{
- connect( this, TQT_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ),
- editor, TQT_SLOT( setIncidenceChanger( IncidenceChangerBase* ) ) );
+ connect( this, TQ_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ),
+ editor, TQ_SLOT( setIncidenceChanger( IncidenceChangerBase* ) ) );
editor->setIncidenceChanger( mChanger );
}
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index e9b3d672..3d1d7623 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -80,7 +80,7 @@ class CalendarViewExtension : public TQWidget
*/
class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::Observer
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/korganizer/datechecker.cpp b/korganizer/datechecker.cpp
index 2be3d060..ebe73465 100644
--- a/korganizer/datechecker.cpp
+++ b/korganizer/datechecker.cpp
@@ -55,8 +55,8 @@ void DateChecker::enableRollover( RolloverType r )
case FollowMonth:
if ( !mUpdateTimer ) {
mUpdateTimer = new TQTimer( this, "mUpdateTimer" );
- connect( mUpdateTimer, TQT_SIGNAL( timeout() ),
- TQT_SLOT( possiblyPastMidnight() ) );
+ connect( mUpdateTimer, TQ_SIGNAL( timeout() ),
+ TQ_SLOT( possiblyPastMidnight() ) );
}
mUpdateTimer->start( 0, true );
mLastDayChecked = TQDate::currentDate();
diff --git a/korganizer/datechecker.h b/korganizer/datechecker.h
index a2d191a3..5665f26d 100644
--- a/korganizer/datechecker.h
+++ b/korganizer/datechecker.h
@@ -36,7 +36,7 @@ class NavigatorBar;
class DateChecker: public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
DateChecker( TQObject *parent = 0, const char *name = 0 );
diff --git a/korganizer/datenavigator.h b/korganizer/datenavigator.h
index 4418745d..f34c1b28 100644
--- a/korganizer/datenavigator.h
+++ b/korganizer/datenavigator.h
@@ -35,7 +35,7 @@
*/
class DateNavigator : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
DateNavigator( TQObject *parent = 0, const char *name = 0 );
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index bb965ba2..3ff76fec 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -68,26 +68,26 @@ DateNavigatorContainer::~DateNavigatorContainer()
void DateNavigatorContainer::connectNavigatorView( KDateNavigator *v )
{
- connect( v, TQT_SIGNAL( datesSelected( const KCal::DateList & ) ),
- TQT_SIGNAL( datesSelected( const KCal::DateList & ) ) );
- connect( v, TQT_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ),
- TQT_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ) );
- connect( v, TQT_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ),
- TQT_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ) );
- connect( v, TQT_SIGNAL( weekClicked( const TQDate & ) ),
- TQT_SIGNAL( weekClicked( const TQDate & ) ) );
-
- connect( v, TQT_SIGNAL( goPrevious() ), TQT_SIGNAL( goPrevious() ) );
- connect( v, TQT_SIGNAL( goNext() ), TQT_SIGNAL( goNext() ) );
-
- connect( v, TQT_SIGNAL( nextYearClicked() ), TQT_SIGNAL( nextYearClicked() ) );
- connect( v, TQT_SIGNAL( prevYearClicked() ), TQT_SIGNAL( prevYearClicked() ) );
-
- connect( v, TQT_SIGNAL( prevMonthClicked() ), this, TQT_SLOT( goPrevMonth() ) );
- connect( v, TQT_SIGNAL( nextMonthClicked() ), this, TQT_SLOT( goNextMonth() ) );
-
- connect( v, TQT_SIGNAL( monthSelected( int ) ), TQT_SIGNAL( monthSelected( int ) ) );
- connect( v, TQT_SIGNAL( yearSelected( int ) ), TQT_SIGNAL( yearSelected( int ) ) );
+ connect( v, TQ_SIGNAL( datesSelected( const KCal::DateList & ) ),
+ TQ_SIGNAL( datesSelected( const KCal::DateList & ) ) );
+ connect( v, TQ_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ),
+ TQ_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ) );
+ connect( v, TQ_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ),
+ TQ_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ) );
+ connect( v, TQ_SIGNAL( weekClicked( const TQDate & ) ),
+ TQ_SIGNAL( weekClicked( const TQDate & ) ) );
+
+ connect( v, TQ_SIGNAL( goPrevious() ), TQ_SIGNAL( goPrevious() ) );
+ connect( v, TQ_SIGNAL( goNext() ), TQ_SIGNAL( goNext() ) );
+
+ connect( v, TQ_SIGNAL( nextYearClicked() ), TQ_SIGNAL( nextYearClicked() ) );
+ connect( v, TQ_SIGNAL( prevYearClicked() ), TQ_SIGNAL( prevYearClicked() ) );
+
+ connect( v, TQ_SIGNAL( prevMonthClicked() ), this, TQ_SLOT( goPrevMonth() ) );
+ connect( v, TQ_SIGNAL( nextMonthClicked() ), this, TQ_SLOT( goNextMonth() ) );
+
+ connect( v, TQ_SIGNAL( monthSelected( int ) ), TQ_SIGNAL( monthSelected( int ) ) );
+ connect( v, TQ_SIGNAL( yearSelected( int ) ), TQ_SIGNAL( yearSelected( int ) ) );
}
void DateNavigatorContainer::setCalendar( Calendar *cal )
@@ -211,7 +211,7 @@ void DateNavigatorContainer::resizeEvent( TQResizeEvent * )
kdDebug(5850) << " SIZEHINT: " << sizeHint() << endl;
kdDebug(5850) << " MINIMUM SIZE: " << minimumSize() << endl;
#endif
- TQTimer::singleShot( 0, this, TQT_SLOT( resizeAllContents() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( resizeAllContents() ) );
}
void DateNavigatorContainer::resizeAllContents()
@@ -332,7 +332,7 @@ TQPair<TQDate,TQDate> DateNavigatorContainer::dateLimits( int offset )
TQPair<TQDate,TQDate> firstMonthBoundary = KODayMatrix::matrixLimits( firstMonth );
TQPair<TQDate,TQDate> lastMonthBoundary = KODayMatrix::matrixLimits( lastMonth );
- return tqMakePair( firstMonthBoundary.first, lastMonthBoundary.second );
+ return qMakePair( firstMonthBoundary.first, lastMonthBoundary.second );
}
#include "datenavigatorcontainer.moc"
diff --git a/korganizer/datenavigatorcontainer.h b/korganizer/datenavigatorcontainer.h
index 17c983e7..6a4d97ec 100644
--- a/korganizer/datenavigatorcontainer.h
+++ b/korganizer/datenavigatorcontainer.h
@@ -31,7 +31,7 @@ class KDateNavigator;
class DateNavigatorContainer: public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
DateNavigatorContainer( TQWidget *parent = 0, const char *name = 0 );
diff --git a/korganizer/eventarchiver.h b/korganizer/eventarchiver.h
index 8fb99ab9..f6b02477 100644
--- a/korganizer/eventarchiver.h
+++ b/korganizer/eventarchiver.h
@@ -46,7 +46,7 @@ using namespace KCal;
*/
class EventArchiver : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/korganizer/exportwebdialog.cpp b/korganizer/exportwebdialog.cpp
index 156ed702..a6b09b78 100644
--- a/korganizer/exportwebdialog.cpp
+++ b/korganizer/exportwebdialog.cpp
@@ -81,8 +81,8 @@ ExportWebDialog::ExportWebDialog( HTMLExportSettings *settings, TQWidget *parent
// setupFreeBusyPage();
// setupAdvancedPage();
- connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotOk() ) );
- connect( this, TQT_SIGNAL( cancelClicked() ), TQT_SLOT( reject() ) );
+ connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotOk() ) );
+ connect( this, TQ_SIGNAL( cancelClicked() ), TQ_SLOT( reject() ) );
readConfig();
updateState();
@@ -149,9 +149,9 @@ void ExportWebDialog::setupGeneralPage()
topLayout->addWidget( typeGroup );
// addWidBool( mSettings->weekViewItem(), typeGroup );
mMonthViewCheckBox = addWidBool( mSettings->monthViewItem(), typeGroup )->checkBox();
- connect( mMonthViewCheckBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateState()) );
+ connect( mMonthViewCheckBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateState()) );
mEventListCheckBox = addWidBool( mSettings->eventViewItem(), typeGroup )->checkBox();
- connect( mEventListCheckBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateState()) );
+ connect( mEventListCheckBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateState()) );
addWidBool( mSettings->todoViewItem(), typeGroup );
// addWidBool( mSettings->journalViewItem(), typeGroup );
// addWidBool( mSettings->freeBusyViewItem(), typeGroup );
@@ -162,8 +162,8 @@ void ExportWebDialog::setupGeneralPage()
topLayout->addWidget(destGroup);
KPrefsWidPath *pathWid = addWidPath( mSettings->outputFileItem(),
destGroup, "text/html", KFile::File );
- connect( pathWid->urlRequester(), TQT_SIGNAL( textChanged( const TQString & ) ),
- TQT_SLOT( slotTextChanged( const TQString & ) ) );
+ connect( pathWid->urlRequester(), TQ_SIGNAL( textChanged( const TQString & ) ),
+ TQ_SLOT( slotTextChanged( const TQString & ) ) );
topLayout->addStretch( 1 );
}
diff --git a/korganizer/exportwebdialog.h b/korganizer/exportwebdialog.h
index d3f77ff8..79ca87c1 100644
--- a/korganizer/exportwebdialog.h
+++ b/korganizer/exportwebdialog.h
@@ -37,7 +37,7 @@ using namespace KCal;
*/
class ExportWebDialog : public KDialogBase, public KPrefsWidManager
{
- Q_OBJECT
+ TQ_OBJECT
public:
ExportWebDialog( HTMLExportSettings *settings, TQWidget *parent = 0,
diff --git a/korganizer/filteredit_base.ui b/korganizer/filteredit_base.ui
index d0f43c94..131b6536 100644
--- a/korganizer/filteredit_base.ui
+++ b/korganizer/filteredit_base.ui
@@ -234,9 +234,6 @@
<property name="text">
<string>Show all except selected</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="buttonGroupId">
<number>1</number>
</property>
@@ -251,9 +248,6 @@
<property name="text">
<string>Show only selected</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="buttonGroupId">
<number>0</number>
</property>
@@ -268,9 +262,6 @@
<property name="text">
<string>Change...</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
</grid>
</widget>
@@ -281,9 +272,6 @@
<property name="text">
<string>Hide to-dos not assigned to me</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="whatsThis" stdset="0">
<string>This option hides all to-dos from your list which are assigned to someone else.&lt;br&gt;
Only to-dos which have least one attendee will be checked. If you are not in the list of attendees the to-do will be hidden.</string>
@@ -309,9 +297,9 @@ Only to-dos which have least one attendee will be checked. If you are not in th
<slot>setEnabled(bool)</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot>updateFilter()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">knuminput.h</include>
diff --git a/korganizer/filtereditdialog.cpp b/korganizer/filtereditdialog.cpp
index 74f5a48c..6a2ef703 100644
--- a/korganizer/filtereditdialog.cpp
+++ b/korganizer/filtereditdialog.cpp
@@ -53,11 +53,11 @@ FilterEditDialog::FilterEditDialog( TQPtrList<CalFilter> *filters,
{
setMainWidget( mFilterEdit = new FilterEdit(filters, this));
- connect(mFilterEdit, TQT_SIGNAL(dataConsistent(bool)),
- TQT_SLOT(setDialogConsistent(bool)));
+ connect(mFilterEdit, TQ_SIGNAL(dataConsistent(bool)),
+ TQ_SLOT(setDialogConsistent(bool)));
updateFilterList();
- connect( mFilterEdit, TQT_SIGNAL( editCategories() ), TQT_SIGNAL( editCategories() ) );
- connect( mFilterEdit, TQT_SIGNAL( filterChanged() ), TQT_SIGNAL( filterChanged() ) );
+ connect( mFilterEdit, TQ_SIGNAL( editCategories() ), TQ_SIGNAL( editCategories() ) );
+ connect( mFilterEdit, TQ_SIGNAL( filterChanged() ), TQ_SIGNAL( filterChanged() ) );
}
FilterEditDialog::~FilterEditDialog()
@@ -99,11 +99,11 @@ FilterEdit::FilterEdit(TQPtrList<CalFilter> *filters, TQWidget *parent)
TQWhatsThis::add( mNewButton, i18n( "Press this button to define a new filter." ) );
TQWhatsThis::add( mDeleteButton, i18n( "Press this button to remove the currently active filter." ) );
- connect( mRulesList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(filterSelected()) );
- connect( mNewButton, TQT_SIGNAL( clicked() ), TQT_SLOT( bNewPressed() ) );
- connect( mDeleteButton, TQT_SIGNAL( clicked() ), TQT_SLOT( bDeletePressed() ) );
- connect( mNameLineEdit, TQT_SIGNAL( textChanged(const TQString &) ), TQT_SLOT( updateSelectedName(const TQString &) ) );
- connect( mCatEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editCategorySelection() ) );
+ connect( mRulesList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(filterSelected()) );
+ connect( mNewButton, TQ_SIGNAL( clicked() ), TQ_SLOT( bNewPressed() ) );
+ connect( mDeleteButton, TQ_SIGNAL( clicked() ), TQ_SLOT( bDeletePressed() ) );
+ connect( mNameLineEdit, TQ_SIGNAL( textChanged(const TQString &) ), TQ_SLOT( updateSelectedName(const TQString &) ) );
+ connect( mCatEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editCategorySelection() ) );
}
FilterEdit::~FilterEdit() {
@@ -231,10 +231,10 @@ void FilterEdit::editCategorySelection()
if ( !mCategorySelectDialog ) {
mCategorySelectDialog = new KPIM::CategorySelectDialog( KOPrefs::instance(), this, "filterCatSelect" );
connect( mCategorySelectDialog,
- TQT_SIGNAL( categoriesSelected( const TQStringList & ) ),
- TQT_SLOT( updateCategorySelection( const TQStringList & ) ) );
- connect( mCategorySelectDialog, TQT_SIGNAL( editCategories() ),
- TQT_SIGNAL( editCategories() ) );
+ TQ_SIGNAL( categoriesSelected( const TQStringList & ) ),
+ TQ_SLOT( updateCategorySelection( const TQStringList & ) ) );
+ connect( mCategorySelectDialog, TQ_SIGNAL( editCategories() ),
+ TQ_SIGNAL( editCategories() ) );
}
mCategorySelectDialog->setSelected( current->categoryList() );
diff --git a/korganizer/filtereditdialog.h b/korganizer/filtereditdialog.h
index 73a0df8e..3c19d613 100644
--- a/korganizer/filtereditdialog.h
+++ b/korganizer/filtereditdialog.h
@@ -44,7 +44,7 @@ using namespace KCal;
*/
class FilterEditDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
FilterEditDialog(TQPtrList<CalFilter> *,TQWidget *parent=0, const char *name=0);
@@ -69,7 +69,7 @@ class FilterEditDialog : public KDialogBase
class FilterEdit : public FilterEdit_base
{
- Q_OBJECT
+ TQ_OBJECT
public:
FilterEdit(TQPtrList<CalFilter> *filters, TQWidget *parent);
diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp
index 9aa7ed82..8f41a837 100644
--- a/korganizer/freebusymanager.cpp
+++ b/korganizer/freebusymanager.cpp
@@ -82,10 +82,10 @@ FreeBusyDownloadJob::FreeBusyDownloadJob( const TQString &email, const KURL &url
KOrg::MainWindow *korg = ActionManager::findInstance( KURL() );
job->setWindow( korg->topLevelWidget() );
- 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 & ) ) );
TDEIO::Scheduler::scheduleJob( job );
}
@@ -339,8 +339,8 @@ void FreeBusyManager::publishFreeBusy()
KOrg::MainWindow *korg = ActionManager::findInstance( KURL() );
job->setWindow( korg->topLevelWidget() );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotUploadFreeBusyResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotUploadFreeBusyResult( TDEIO::Job * ) ) );
}
}
@@ -406,15 +406,15 @@ bool FreeBusyManager::processRetrieveQueue()
FreeBusyDownloadJob *job = new FreeBusyDownloadJob( email, sourceURL, this,
"freebusy_download_job" );
- connect( job, TQT_SIGNAL( freeBusyDownloaded( KCal::FreeBusy *,
+ connect( job, TQ_SIGNAL( freeBusyDownloaded( KCal::FreeBusy *,
const TQString & ) ),
- TQT_SIGNAL( freeBusyRetrieved( KCal::FreeBusy *, const TQString & ) ) );
- connect( job, TQT_SIGNAL( freeBusyDownloaded( KCal::FreeBusy *,
+ TQ_SIGNAL( freeBusyRetrieved( KCal::FreeBusy *, const TQString & ) ) );
+ connect( job, TQ_SIGNAL( freeBusyDownloaded( KCal::FreeBusy *,
const TQString & ) ),
- TQT_SLOT( processRetrieveQueue() ) );
+ TQ_SLOT( processRetrieveQueue() ) );
- connect( job, TQT_SIGNAL( freeBusyDownloadError( const TQString& ) ),
- this, TQT_SLOT( slotFreeBusyDownloadError( const TQString& ) ) );
+ connect( job, TQ_SIGNAL( freeBusyDownloadError( const TQString& ) ),
+ this, TQ_SLOT( slotFreeBusyDownloadError( const TQString& ) ) );
return true;
}
diff --git a/korganizer/freebusymanager.h b/korganizer/freebusymanager.h
index 124dbdb3..6650dc4d 100644
--- a/korganizer/freebusymanager.h
+++ b/korganizer/freebusymanager.h
@@ -54,7 +54,7 @@ class FreeBusyManager;
*/
class FreeBusyDownloadJob : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
FreeBusyDownloadJob( const TQString &email, const KURL &url,
@@ -79,7 +79,7 @@ class FreeBusyDownloadJob : public TQObject
class FreeBusyManager : public TQObject, public KCal::FreeBusyCache
{
- Q_OBJECT
+ TQ_OBJECT
public:
FreeBusyManager( TQObject *parent, const char *name );
diff --git a/korganizer/freebusyurldialog.h b/korganizer/freebusyurldialog.h
index 9447a7f1..a0363ce8 100644
--- a/korganizer/freebusyurldialog.h
+++ b/korganizer/freebusyurldialog.h
@@ -35,7 +35,7 @@ class Attendee;
class FreeBusyUrlDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
FreeBusyUrlDialog( KCal::Attendee *, TQWidget *parent = 0,
@@ -50,7 +50,7 @@ class FreeBusyUrlDialog : public KDialogBase
class FreeBusyUrlWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
FreeBusyUrlWidget( KCal::Attendee *, TQWidget *parent = 0,
diff --git a/korganizer/history.h b/korganizer/history.h
index d0b7e575..db6c5f21 100644
--- a/korganizer/history.h
+++ b/korganizer/history.h
@@ -38,7 +38,7 @@ namespace KOrg {
class History : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
History( KCal::Calendar * );
diff --git a/korganizer/importdialog.cpp b/korganizer/importdialog.cpp
index 4272f5da..6edc9f71 100644
--- a/korganizer/importdialog.cpp
+++ b/korganizer/importdialog.cpp
@@ -50,7 +50,7 @@ ImportDialog::ImportDialog( const KURL &url, TQWidget *parent, bool isPart )
topLayout->addWidget( new TQLabel( txt, topFrame ) );
- TQButtonGroup *radioBox = new TQButtonGroup( 1, Qt::Horizontal, topFrame );
+ TQButtonGroup *radioBox = new TQButtonGroup( 1, TQt::Horizontal, topFrame );
radioBox->setFlat( true );
topLayout->addWidget( radioBox );
diff --git a/korganizer/importdialog.h b/korganizer/importdialog.h
index f6161ea5..c70633b8 100644
--- a/korganizer/importdialog.h
+++ b/korganizer/importdialog.h
@@ -34,7 +34,7 @@ class TQRadioButton;
class ImportDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
ImportDialog( const KURL &url, TQWidget *parent, bool isPart );
diff --git a/korganizer/incidencechanger.h b/korganizer/incidencechanger.h
index ee684e7c..2a5235bf 100644
--- a/korganizer/incidencechanger.h
+++ b/korganizer/incidencechanger.h
@@ -32,7 +32,7 @@ namespace KCal {
class IncidenceChanger : public KOrg::IncidenceChangerBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
IncidenceChanger( Calendar *cal, TQObject *parent )
diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h
index fa47ab7a..ce3e2145 100644
--- a/korganizer/interfaces/korganizer/baseview.h
+++ b/korganizer/interfaces/korganizer/baseview.h
@@ -58,7 +58,7 @@ namespace KOrg {
*/
class KDE_EXPORT BaseView : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/korganizer/interfaces/korganizer/incidencechangerbase.h b/korganizer/interfaces/korganizer/incidencechangerbase.h
index ba26ce02..730e2936 100644
--- a/korganizer/interfaces/korganizer/incidencechangerbase.h
+++ b/korganizer/interfaces/korganizer/incidencechangerbase.h
@@ -38,7 +38,7 @@ namespace KOrg {
class IncidenceChangerBase : public TQObject
{
-Q_OBJECT
+TQ_OBJECT
public:
IncidenceChangerBase( Calendar*cal, TQObject *parent = 0 ) :
diff --git a/korganizer/interfaces/korganizer/part.h b/korganizer/interfaces/korganizer/part.h
index 0e723048..cb0b6884 100644
--- a/korganizer/interfaces/korganizer/part.h
+++ b/korganizer/interfaces/korganizer/part.h
@@ -39,7 +39,7 @@ class Part : public KParts::Part
typedef TQPtrList<Part> List;
Part( MainWindow *parent, const char *name )
- : KParts::Part( parent?(TQT_TQOBJECT(parent->topLevelWidget())):0, name ), mMainWindow( parent ) {}
+ : KParts::Part( parent?(parent->topLevelWidget()):0, name ), mMainWindow( parent ) {}
virtual ~Part() {}
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 0ceec954..08d57be5 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -75,8 +75,8 @@ JournalDateEntry::JournalDateEntry( Calendar *calendar, TQWidget *parent ) :
mTitle = new JournalTitleLable( this );
mTitle->setMargin(2);
mTitle->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
- connect( mTitle, TQT_SIGNAL( linkClicked( const TQString & ) ),
- this, TQT_SLOT( emitNewJournal() ) );
+ connect( mTitle, TQ_SIGNAL( linkClicked( const TQString & ) ),
+ this, TQ_SLOT( emitNewJournal() ) );
}
JournalDateEntry::~JournalDateEntry()
@@ -120,16 +120,16 @@ void JournalDateEntry::addJournal( Journal *j )
entry->setIncidenceChanger( mChanger );
mEntries.insert( j, entry );
- connect( this, TQT_SIGNAL( setIncidenceChangerSignal( IncidenceChangerBase * ) ),
- entry, TQT_SLOT( setIncidenceChanger( IncidenceChangerBase * ) ) );
- connect( this, TQT_SIGNAL( setDateSignal( const TQDate & ) ),
- entry, TQT_SLOT( setDate( const TQDate & ) ) );
- connect( this, TQT_SIGNAL( flushEntries() ),
- entry, TQT_SLOT( flushEntry() ) );
- connect( entry, TQT_SIGNAL( deleteIncidence( Incidence* ) ),
- this, TQT_SIGNAL( deleteIncidence( Incidence* ) ) );
- connect( entry, TQT_SIGNAL( editIncidence( Incidence*, const TQDate& ) ),
- this, TQT_SIGNAL( editIncidence( Incidence*, const TQDate& ) ) );
+ connect( this, TQ_SIGNAL( setIncidenceChangerSignal( IncidenceChangerBase * ) ),
+ entry, TQ_SLOT( setIncidenceChanger( IncidenceChangerBase * ) ) );
+ connect( this, TQ_SIGNAL( setDateSignal( const TQDate & ) ),
+ entry, TQ_SLOT( setDate( const TQDate & ) ) );
+ connect( this, TQ_SIGNAL( flushEntries() ),
+ entry, TQ_SLOT( flushEntry() ) );
+ connect( entry, TQ_SIGNAL( deleteIncidence( Incidence* ) ),
+ this, TQ_SIGNAL( deleteIncidence( Incidence* ) ) );
+ connect( entry, TQ_SIGNAL( editIncidence( Incidence*, const TQDate& ) ),
+ this, TQ_SIGNAL( editIncidence( Incidence*, const TQDate& ) ) );
}
Journal::List JournalDateEntry::journals() const
@@ -203,8 +203,8 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) :
mLayout->addWidget( mTimeCheck, 0, 2 );
mTimeEdit = new KTimeEdit( this );
mLayout->addWidget( mTimeEdit, 0, 3 );
- connect( mTimeCheck, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(timeCheckBoxToggled(bool)) );
+ connect( mTimeCheck, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(timeCheckBoxToggled(bool)) );
TQWhatsThis::add( mTimeCheck, i18n("Determines whether this journal entry has "
"a time associated with it") );
TQWhatsThis::add( mTimeEdit, i18n( "Sets the time associated with this journal "
@@ -217,7 +217,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) :
TQToolTip::add( mDeleteButton, i18n("Delete this journal entry") );
TQWhatsThis::add( mDeleteButton, i18n("Delete this journal entry") );
mLayout->addWidget( mDeleteButton, 0, 4 );
- connect( mDeleteButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(deleteItem()) );
+ connect( mDeleteButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(deleteItem()) );
mEditButton = new TQToolButton( this, "editButton" );
mEditButton->setPixmap( KOGlobals::self()->smallIcon( "edit" ) );
@@ -225,7 +225,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) :
TQToolTip::add( mEditButton, i18n("Edit this journal entry") );
TQWhatsThis::add( mEditButton, i18n("Opens an editor dialog for this journal entry") );
mLayout->addWidget( mEditButton, 0, 5 );
- connect( mEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( editItem() ) );
+ connect( mEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT( editItem() ) );
#ifndef KORG_NOPRINTER
mPrintButton = new TQToolButton( this, "printButton" );
@@ -234,15 +234,15 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) :
TQToolTip::add( mPrintButton, i18n("Print this journal entry") );
TQWhatsThis::add( mPrintButton, i18n("Opens the print dialog for this journal entry") );
mLayout->addWidget( mPrintButton, 0, 6 );
- connect( mPrintButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( printItem() ) );
+ connect( mPrintButton, TQ_SIGNAL(clicked()), this, TQ_SLOT( printItem() ) );
#endif
mEditor = new KTextEdit(this);
mLayout->addMultiCellWidget( mEditor, 1, 2, 0, 6 );
- connect( mTitleEdit, TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(setDirty()) );
- connect( mTimeCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setDirty()) );
- connect( mTimeEdit, TQT_SIGNAL(timeChanged(TQTime)), TQT_SLOT(setDirty()) );
- connect( mEditor, TQT_SIGNAL(textChanged()), TQT_SLOT(setDirty()) );
+ connect( mTitleEdit, TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(setDirty()) );
+ connect( mTimeCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setDirty()) );
+ connect( mTimeEdit, TQ_SIGNAL(timeChanged(TQTime)), TQ_SLOT(setDirty()) );
+ connect( mEditor, TQ_SIGNAL(textChanged()), TQ_SLOT(setDirty()) );
mEditor->installEventFilter(this);
@@ -283,7 +283,7 @@ void JournalEntry::printItem()
if ( mJournal ) {
KOCoreHelper helper;
CalPrinter printer( this, 0, &helper );
- connect( this, TQT_SIGNAL(configChanged()), &printer, TQT_SLOT(updateConfig()) );
+ connect( this, TQ_SIGNAL(configChanged()), &printer, TQ_SLOT(updateConfig()) );
Incidence::List selectedIncidences;
selectedIncidences.append( mJournal );
diff --git a/korganizer/journalentry.h b/korganizer/journalentry.h
index f74ab848..9988dbaf 100644
--- a/korganizer/journalentry.h
+++ b/korganizer/journalentry.h
@@ -48,7 +48,7 @@ namespace KCal {
using namespace KCal;
class JournalEntry : public TQWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
typedef ListBase<JournalEntry> List;
@@ -113,7 +113,7 @@ class JournalEntry : public TQWidget {
class JournalDateEntry : public TQVBox {
- Q_OBJECT
+ TQ_OBJECT
public:
typedef ListBase<JournalDateEntry> List;
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index 230c992d..94f74a66 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -53,12 +53,12 @@ KDateNavigator::KDateNavigator( TQWidget *parent, const char *name )
mNavigatorBar = new NavigatorBar( this );
topLayout->addMultiCellWidget( mNavigatorBar, 0, 0, 0, 7 );
- connect( mNavigatorBar, TQT_SIGNAL( prevYearClicked() ), TQT_SIGNAL( prevYearClicked() ) );
- connect( mNavigatorBar, TQT_SIGNAL( prevMonthClicked() ), TQT_SIGNAL( prevMonthClicked() ) );
- connect( mNavigatorBar, TQT_SIGNAL( nextMonthClicked() ), TQT_SIGNAL( nextMonthClicked() ) );
- connect( mNavigatorBar, TQT_SIGNAL( nextYearClicked() ), TQT_SIGNAL( nextYearClicked() ) );
- connect( mNavigatorBar, TQT_SIGNAL( monthSelected( int ) ), TQT_SIGNAL( monthSelected( int ) ) );
- connect( mNavigatorBar, TQT_SIGNAL( yearSelected( int ) ), TQT_SIGNAL( yearSelected( int ) ) );
+ connect( mNavigatorBar, TQ_SIGNAL( prevYearClicked() ), TQ_SIGNAL( prevYearClicked() ) );
+ connect( mNavigatorBar, TQ_SIGNAL( prevMonthClicked() ), TQ_SIGNAL( prevMonthClicked() ) );
+ connect( mNavigatorBar, TQ_SIGNAL( nextMonthClicked() ), TQ_SIGNAL( nextMonthClicked() ) );
+ connect( mNavigatorBar, TQ_SIGNAL( nextYearClicked() ), TQ_SIGNAL( nextYearClicked() ) );
+ connect( mNavigatorBar, TQ_SIGNAL( monthSelected( int ) ), TQ_SIGNAL( monthSelected( int ) ) );
+ connect( mNavigatorBar, TQ_SIGNAL( yearSelected( int ) ), TQ_SIGNAL( yearSelected( int ) ) );
int i;
TQString generalFont = TDEGlobalSettings::generalFont().family();
@@ -84,13 +84,13 @@ KDateNavigator::KDateNavigator( TQWidget *parent, const char *name )
mDayMatrix = new KODayMatrix( this, "KDateNavigator::dayMatrix" );
- connect( mDayMatrix, TQT_SIGNAL( selected( const KCal::DateList & ) ),
- TQT_SIGNAL( datesSelected( const KCal::DateList & ) ) );
+ connect( mDayMatrix, TQ_SIGNAL( selected( const KCal::DateList & ) ),
+ TQ_SIGNAL( datesSelected( const KCal::DateList & ) ) );
- connect( mDayMatrix, TQT_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ),
- TQT_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ) );
- connect( mDayMatrix, TQT_SIGNAL( incidenceDroppedMove( Incidence * , const TQDate & ) ),
- TQT_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ) );
+ connect( mDayMatrix, TQ_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ),
+ TQ_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ) );
+ connect( mDayMatrix, TQ_SIGNAL( incidenceDroppedMove( Incidence * , const TQDate & ) ),
+ TQ_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ) );
topLayout->addMultiCellWidget( mDayMatrix, 2, 7, 1, 7 );
@@ -288,7 +288,7 @@ bool KDateNavigator::eventFilter( TQObject *o, TQEvent *e )
if ( e->type() == TQEvent::MouseButtonPress ) {
int i;
for( i = 0; i < 6; ++i ) {
- if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(mWeeknos[ i ]) ) {
+ if ( o == mWeeknos[ i ] ) {
TQDate weekstart = mDayMatrix->getDate( i * 7 );
emit weekClicked( weekstart );
break;
diff --git a/korganizer/kdatenavigator.h b/korganizer/kdatenavigator.h
index 11395138..8da31b02 100644
--- a/korganizer/kdatenavigator.h
+++ b/korganizer/kdatenavigator.h
@@ -44,7 +44,7 @@ class KODayMatrix;
class KDateNavigator: public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
KDateNavigator( TQWidget *parent = 0, const char *name = 0 );
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index b242c306..b7a0e1de 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -69,7 +69,7 @@ MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name )
setMargin(0);
setBackgroundColor(TQt::red);
minutes = new TQTimer(this);
- connect(minutes, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateLocation()));
+ connect(minutes, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateLocation()));
minutes->start(0, true);
mTimeBox = new TQLabel(this);
@@ -255,10 +255,10 @@ void KOAgenda::init()
// Grab key strokes for keyboard navigation of agenda. Seems to have no
// effect. Has to be fixed.
- setFocusPolicy( TQ_WheelFocus );
+ setFocusPolicy( TQWidget::WheelFocus );
- connect( &mScrollUpTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( scrollUp() ) );
- connect( &mScrollDownTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( scrollDown() ) );
+ connect( &mScrollUpTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( scrollUp() ) );
+ connect( &mScrollDownTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( scrollDown() ) );
mStartCell = TQPoint( 0, 0 );
mEndCell = TQPoint( 0, 0 );
@@ -274,7 +274,7 @@ void KOAgenda::init()
mClickedItem = 0;
mActionItem = 0;
- mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+ mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
mActionType = NOP;
mItemMoved = false;
@@ -291,7 +291,7 @@ void KOAgenda::init()
viewport()->update();
viewport()->setBackgroundMode( NoBackground );
- viewport()->setFocusPolicy( TQ_WheelFocus );
+ viewport()->setFocusPolicy( TQWidget::WheelFocus );
setMinimumSize( 30, int( mGridSpacingY + 1 ) );
// setMaximumHeight(mGridSpacingY * mRows + 5);
@@ -305,8 +305,8 @@ void KOAgenda::init()
calculateWorkingHours();
- connect( verticalScrollBar(), TQT_SIGNAL( valueChanged( int ) ),
- TQT_SLOT( checkScrollBoundaries( int ) ) );
+ connect( verticalScrollBar(), TQ_SIGNAL( valueChanged( int ) ),
+ TQ_SLOT( checkScrollBoundaries( int ) ) );
// Create the Marcus Bains line.
if( mAllDayMode ) {
@@ -384,19 +384,19 @@ bool KOAgenda::eventFilter ( TQObject *object, TQEvent *event )
case TQEvent::MouseButtonDblClick:
case TQEvent::MouseButtonRelease:
case TQEvent::MouseMove:
- return eventFilter_mouse( object, TQT_TQMOUSEEVENT( event ) );
+ return eventFilter_mouse( object, static_cast<TQMouseEvent*>( event ) );
#ifndef TQT_NO_WHEELEVENT
case TQEvent::Wheel:
- return eventFilter_wheel( object, TQT_TQWHEELEVENT( event ) );
+ return eventFilter_wheel( object, static_cast<TQWheelEvent*>( event ) );
#endif
case TQEvent::KeyPress:
case TQEvent::KeyRelease:
- return eventFilter_key( object, TQT_TQKEYEVENT( event ) );
+ return eventFilter_key( object, static_cast<TQKeyEvent*>( event ) );
case ( TQEvent::Leave ):
if ( !mActionItem )
setCursor( arrowCursor );
- if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(viewport()) )
+ if ( object == viewport() )
emit leaveAgenda();
return true;
@@ -422,8 +422,8 @@ bool KOAgenda::eventFilter_drag( TQObject *object, TQDropEvent *de )
{
#ifndef KORG_NODND
TQPoint viewportPos;
- if ( TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport()) && TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(this) ) {
- viewportPos = TQT_TQWIDGET( object )->mapToParent( de->pos() );
+ if ( object != viewport() && object != this ) {
+ viewportPos = static_cast<TQWidget*>( object )->mapToParent( de->pos() );
} else {
viewportPos = de->pos();
}
@@ -462,7 +462,7 @@ bool KOAgenda::eventFilter_drag( TQObject *object, TQDropEvent *de )
// FIXME: This is a bad hack, as the viewportToContents seems to be off by
// 2000 (which is the left upper corner of the viewport). It works correctly
// for agendaItems.
- if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(this) ) {
+ if ( object == this ) {
pos = viewportPos + TQPoint( contentsX(), contentsY() );
} else {
pos = viewportToContents( viewportPos );
@@ -526,10 +526,10 @@ bool KOAgenda::eventFilter_key( TQObject *, TQKeyEvent *ke )
case Key_Alt:
break;
default:
- mTypeAheadEvents.append( TQT_TQEVENT( new TQKeyEvent( ke->type(), ke->key(),
+ mTypeAheadEvents.append( new TQKeyEvent( ke->type(), ke->key(),
ke->ascii(), ke->state(),
ke->text(), ke->isAutoRepeat(),
- ke->count() ) ) );
+ ke->count() ) );
if ( !mTypeAhead ) {
mTypeAhead = true;
emitNewEventForSelection();
@@ -565,7 +565,7 @@ bool KOAgenda::eventFilter_wheel ( TQObject *object, TQWheelEvent *e )
TQPoint viewportPos;
bool accepted=false;
if ( ( e->state() & ShiftButton) == ShiftButton ) {
- if ( TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport()) ) {
+ if ( object != viewport() ) {
viewportPos = ( (TQWidget *) object )->mapToParent( e->pos() );
} else {
viewportPos = e->pos();
@@ -574,19 +574,19 @@ bool KOAgenda::eventFilter_wheel ( TQObject *object, TQWheelEvent *e )
// e->type()<<" delta: "<< e->delta()<< endl;
emit zoomView( -e->delta() ,
contentsToGrid( viewportToContents( viewportPos ) ),
- Qt::Horizontal );
+ TQt::Horizontal );
accepted=true;
}
if ( ( e->state() & ControlButton ) == ControlButton ){
- if ( TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport()) ) {
+ if ( object != viewport() ) {
viewportPos = ( (TQWidget *)object )->mapToParent( e->pos() );
} else {
viewportPos = e->pos();
}
emit zoomView( -e->delta() ,
contentsToGrid( viewportToContents( viewportPos ) ),
- Qt::Vertical );
+ TQt::Vertical );
emit mousePosSignal(gridToContents(contentsToGrid(viewportToContents( viewportPos ))));
accepted=true;
}
@@ -597,7 +597,7 @@ bool KOAgenda::eventFilter_wheel ( TQObject *object, TQWheelEvent *e )
bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
{
TQPoint viewportPos;
- if (TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport())) {
+ if (object != viewport()) {
viewportPos = ((TQWidget *)object)->mapToParent(me->pos());
} else {
viewportPos = me->pos();
@@ -606,8 +606,8 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
switch (me->type()) {
case TQEvent::MouseButtonPress:
// kdDebug(5850) << "koagenda: filtered button press" << endl;
- if (TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport())) {
- if (me->button() == Qt::RightButton) {
+ if (object != viewport()) {
+ if (me->button() == TQt::RightButton) {
mClickedItem = dynamic_cast<KOAgendaItem *>(object);
if (mClickedItem) {
selectItem(mClickedItem);
@@ -615,7 +615,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
mClickedItem->incidence(),
mClickedItem->itemDate() );
} else {
- return TQScrollView::eventFilter( TQT_TQOBJECT(object), TQT_TQEVENT(me) ); // pass through for use by multiagenda
+ return TQScrollView::eventFilter( object, me ); // pass through for use by multiagenda
}
} else {
KOAgendaItem* item = dynamic_cast<KOAgendaItem *>(object);
@@ -623,7 +623,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
Incidence *incidence = item->incidence();
if ( incidence->isReadOnly() ) {
mActionItem = 0;
- mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+ mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
} else {
mActionItem = item;
mResPair = CalHelper::incSubResourceCalendar( mCalendar, incidence );
@@ -635,11 +635,11 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
// null.
selectItem( item );
} else {
- return TQScrollView::eventFilter( TQT_TQOBJECT(object), TQT_TQEVENT(me) ); // pass through for use by multiagenda
+ return TQScrollView::eventFilter( object, me ); // pass through for use by multiagenda
}
}
} else {
- if ( me->button() == Qt::RightButton ) {
+ if ( me->button() == TQt::RightButton ) {
// if mouse pointer is not in selection, select the cell below the cursor
TQPoint gpos = contentsToGrid( viewportToContents( viewportPos ) );
if ( !ptInSelection( gpos ) ) {
@@ -657,12 +657,12 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
if ( !ptInSelection( gpos ) ) {
selectItem(0);
mActionItem = 0;
- mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+ mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
setCursor(arrowCursor);
startSelectAction(viewportPos);
}
}
- return TQScrollView::eventFilter( TQT_TQOBJECT(object), TQT_TQEVENT(me) ); // pass through for use by multiagenda
+ return TQScrollView::eventFilter( object, me ); // pass through for use by multiagenda
}
break;
@@ -683,7 +683,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
// avoid an offset of a few pixels. Don't ask me why...
TQPoint indicatorPos = gridToContents(contentsToGrid(
viewportToContents( viewportPos )));
- if (TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport())) {
+ if (object != viewport()) {
KOAgendaItem *moveItem = dynamic_cast<KOAgendaItem *>(object);
if (moveItem && !moveItem->incidence()->isReadOnly() ) {
if (!mActionItem)
@@ -722,7 +722,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
break; }
case TQEvent::MouseButtonDblClick:
- if (TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(viewport())) {
+ if (object == viewport()) {
selectItem(0);
TQPair<ResourceCalendar *, TQString>p = mCalendarView->viewSubResourceCalendar();
emit newEventSignal( p.first, p.second );
@@ -918,7 +918,7 @@ void KOAgenda::performItemAction(const TQPoint& viewportPos)
emit startDragSignal( mActionItem->incidence() );
setCursor( arrowCursor );
mActionItem = 0;
- mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+ mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
mActionType = NOP;
mItemMoved = false;
return;
@@ -952,7 +952,7 @@ void KOAgenda::performItemAction(const TQPoint& viewportPos)
placeSubCells( mActionItem );
setCursor( arrowCursor );
mActionItem = 0;
- mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+ mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
mActionType = NOP;
mItemMoved = false;
return;
@@ -1192,7 +1192,7 @@ void KOAgenda::endItemAction()
}
mActionItem = 0;
- mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+ mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
mItemMoved = false;
if ( multiModify ) {
@@ -1604,10 +1604,10 @@ KOAgendaItem *KOAgenda::insertItem( Incidence *incidence, const TQDate &qd, int
mActionType = NOP;
KOAgendaItem *agendaItem = new KOAgendaItem( mCalendar, incidence, qd, viewport(), itemPos, itemCount );
- connect( agendaItem, TQT_SIGNAL( removeAgendaItem( KOAgendaItem * ) ),
- TQT_SLOT( removeAgendaItem( KOAgendaItem * ) ) );
- connect( agendaItem, TQT_SIGNAL( showAgendaItem( KOAgendaItem * ) ),
- TQT_SLOT( showAgendaItem( KOAgendaItem * ) ) );
+ connect( agendaItem, TQ_SIGNAL( removeAgendaItem( KOAgendaItem * ) ),
+ TQ_SLOT( removeAgendaItem( KOAgendaItem * ) ) );
+ connect( agendaItem, TQ_SIGNAL( showAgendaItem( KOAgendaItem * ) ),
+ TQ_SLOT( showAgendaItem( KOAgendaItem * ) ) );
if ( YBottom <= YTop ) {
kdDebug(5850) << "KOAgenda::insertItem(): Text: " << agendaItem->text() << " YSize<0" << endl;
@@ -1649,10 +1649,10 @@ KOAgendaItem *KOAgenda::insertAllDayItem( Incidence *event, const TQDate &qd,
mActionType = NOP;
KOAgendaItem *agendaItem = new KOAgendaItem( mCalendar, event, qd, viewport(), 1, 1 );
- connect( agendaItem, TQT_SIGNAL( removeAgendaItem( KOAgendaItem* ) ),
- TQT_SLOT( removeAgendaItem( KOAgendaItem* ) ) );
- connect( agendaItem, TQT_SIGNAL( showAgendaItem( KOAgendaItem* ) ),
- TQT_SLOT( showAgendaItem( KOAgendaItem* ) ) );
+ connect( agendaItem, TQ_SIGNAL( removeAgendaItem( KOAgendaItem* ) ),
+ TQ_SLOT( removeAgendaItem( KOAgendaItem* ) ) );
+ connect( agendaItem, TQ_SIGNAL( showAgendaItem( KOAgendaItem* ) ),
+ TQ_SLOT( showAgendaItem( KOAgendaItem* ) ) );
agendaItem->setCellXY( XBegin, 0, 0 );
agendaItem->setCellXRight( XEnd );
@@ -1799,7 +1799,7 @@ bool KOAgenda::removeAgendaItem( KOAgendaItem *item )
}
mItemsToDelete.append( thisItem );
- TQTimer::singleShot( 0, this, TQT_SLOT( deleteItemsToDelete() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( deleteItemsToDelete() ) );
return taken;
}
@@ -1843,7 +1843,7 @@ void KOAgenda::resizeEvent ( TQResizeEvent *ev )
mGridSpacingY = mDesiredGridSpacingY;
}
calculateWorkingHours();
- TQTimer::singleShot( 0, this, TQT_SLOT( resizeAllContents() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( resizeAllContents() ) );
emit gridSpacingYChanged( mGridSpacingY * 4 );
TQScrollView::resizeEvent(ev);
}
diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h
index 05a0af9d..d123f463 100644
--- a/korganizer/koagenda.h
+++ b/korganizer/koagenda.h
@@ -52,7 +52,7 @@ using namespace KCal;
class MarcusBains : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
MarcusBains( KOAgenda *agenda = 0, const char *name = 0 );
@@ -73,7 +73,7 @@ class MarcusBains : public TQFrame
class KOAgenda : public TQScrollView
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOAgenda ( int columns, int rows, int columnSize, CalendarView *calendarView,
@@ -198,7 +198,7 @@ class KOAgenda : public TQScrollView
void droppedToDo( Todo*todo, const TQPoint &gpos, bool allDay );
void enableAgendaUpdate( bool enable );
- void zoomView( const int delta, const TQPoint &pos, const Qt::Orientation );
+ void zoomView( const int delta, const TQPoint &pos, const TQt::Orientation );
void mousePosSignal(const TQPoint &pos);
void enterAgenda();
diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h
index 9ab341ed..eea5f68f 100644
--- a/korganizer/koagendaitem.h
+++ b/korganizer/koagendaitem.h
@@ -74,7 +74,7 @@ struct MultiItemInfo
*/
class KOAgendaItem : public TQWidget, public KOrg::CellItem
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOAgendaItem( Calendar *calendar, Incidence *incidence, const TQDate &qd,
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 7e68deeb..1bde3dbe 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -284,7 +284,7 @@ KOAgendaView::KOAgendaView( Calendar *cal,
// Create agenda splitter
#ifndef KORG_NOSPLITTER
- mSplitterAgenda = new TQSplitter(Qt::Vertical,this);
+ mSplitterAgenda = new TQSplitter(TQt::Vertical,this);
topLayout->addWidget(mSplitterAgenda);
#if KDE_IS_VERSION( 3, 1, 93 )
@@ -315,7 +315,7 @@ KOAgendaView::KOAgendaView( Calendar *cal,
mExpandButton->setPixmap( mNotExpandedPixmap );
mExpandButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed,
TQSizePolicy::Fixed ) );
- connect( mExpandButton, TQT_SIGNAL( clicked() ), TQT_SIGNAL( toggleExpand() ) );
+ connect( mExpandButton, TQ_SIGNAL( clicked() ), TQ_SIGNAL( toggleExpand() ) );
} else {
TQLabel *label = new TQLabel( i18n("All Day"), mDummyAllDayLeft );
label->setAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak );
@@ -373,27 +373,27 @@ KOAgendaView::KOAgendaView( Calendar *cal,
updateTimeBarWidth();
// Scrolling
- connect(mAgenda->verticalScrollBar(),TQT_SIGNAL(valueChanged(int)),
- mTimeLabels, TQT_SLOT(positionChanged()));
+ connect(mAgenda->verticalScrollBar(),TQ_SIGNAL(valueChanged(int)),
+ mTimeLabels, TQ_SLOT(positionChanged()));
connect( mAgenda,
- TQT_SIGNAL( zoomView( const int, const TQPoint & ,const Qt::Orientation ) ),
- TQT_SLOT( zoomView( const int, const TQPoint &, const Qt::Orientation ) ) );
+ TQ_SIGNAL( zoomView( const int, const TQPoint & ,const TQt::Orientation ) ),
+ TQ_SLOT( zoomView( const int, const TQPoint &, const TQt::Orientation ) ) );
- connect(mTimeLabels->verticalScrollBar(),TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(setContentsPos(int)));
+ connect(mTimeLabels->verticalScrollBar(),TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(setContentsPos(int)));
// Create Events, depends on type of agenda
- connect( mAgenda, TQT_SIGNAL(newTimeSpanSignal(const TQPoint &, const TQPoint &)),
- TQT_SLOT(newTimeSpanSelected(const TQPoint &, const TQPoint &)));
- connect( mAllDayAgenda, TQT_SIGNAL(newTimeSpanSignal(const TQPoint &, const TQPoint &)),
- TQT_SLOT(newTimeSpanSelectedAllDay(const TQPoint &, const TQPoint &)));
+ connect( mAgenda, TQ_SIGNAL(newTimeSpanSignal(const TQPoint &, const TQPoint &)),
+ TQ_SLOT(newTimeSpanSelected(const TQPoint &, const TQPoint &)));
+ connect( mAllDayAgenda, TQ_SIGNAL(newTimeSpanSignal(const TQPoint &, const TQPoint &)),
+ TQ_SLOT(newTimeSpanSelectedAllDay(const TQPoint &, const TQPoint &)));
// event indicator update
- connect( mAgenda, TQT_SIGNAL(lowerYChanged(int)),
- TQT_SLOT(updateEventIndicatorTop(int)));
- connect( mAgenda, TQT_SIGNAL(upperYChanged(int)),
- TQT_SLOT(updateEventIndicatorBottom(int)));
+ connect( mAgenda, TQ_SIGNAL(lowerYChanged(int)),
+ TQ_SLOT(updateEventIndicatorTop(int)));
+ connect( mAgenda, TQ_SIGNAL(upperYChanged(int)),
+ TQ_SLOT(updateEventIndicatorBottom(int)));
if ( !readOnly() ) {
connectAgenda( mAgenda, mAgendaPopup, mAllDayAgenda );
@@ -417,53 +417,53 @@ KOAgendaView::~KOAgendaView()
void KOAgendaView::connectAgenda( KOAgenda *agenda, TQPopupMenu *popup,
KOAgenda *otherAgenda )
{
- connect( agenda, TQT_SIGNAL(showIncidencePopupSignal(Calendar *,Incidence *,const TQDate &)),
- popup, TQT_SLOT(showIncidencePopup(Calendar *,Incidence *,const TQDate &)) );
+ connect( agenda, TQ_SIGNAL(showIncidencePopupSignal(Calendar *,Incidence *,const TQDate &)),
+ popup, TQ_SLOT(showIncidencePopup(Calendar *,Incidence *,const TQDate &)) );
- connect( agenda, TQT_SIGNAL(showNewEventPopupSignal()),
- TQT_SLOT(showNewEventPopup()) );
+ connect( agenda, TQ_SIGNAL(showNewEventPopupSignal()),
+ TQ_SLOT(showNewEventPopup()) );
// Create/Show/Edit/Delete Event
- connect( agenda, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)),
- TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)) );
+ connect( agenda, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)),
+ TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)) );
- connect( agenda, TQT_SIGNAL(newStartSelectSignal()),
- otherAgenda, TQT_SLOT(clearSelection()) );
- connect( agenda, TQT_SIGNAL(newStartSelectSignal()),
- TQT_SIGNAL(timeSpanSelectionChanged()) );
+ connect( agenda, TQ_SIGNAL(newStartSelectSignal()),
+ otherAgenda, TQ_SLOT(clearSelection()) );
+ connect( agenda, TQ_SIGNAL(newStartSelectSignal()),
+ TQ_SIGNAL(timeSpanSelectionChanged()) );
- connect( agenda, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)),
- TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) );
- connect( agenda, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)),
- TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) );
- connect( agenda, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)),
- TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) );
+ connect( agenda, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)),
+ TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) );
+ connect( agenda, TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)),
+ TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) );
+ connect( agenda, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)),
+ TQ_SIGNAL(deleteIncidenceSignal(Incidence *)) );
- connect( agenda, TQT_SIGNAL(startMultiModify(const TQString &)),
- TQT_SIGNAL(startMultiModify(const TQString &)) );
- connect( agenda, TQT_SIGNAL(endMultiModify()),
- TQT_SIGNAL(endMultiModify()) );
+ connect( agenda, TQ_SIGNAL(startMultiModify(const TQString &)),
+ TQ_SIGNAL(startMultiModify(const TQString &)) );
+ connect( agenda, TQ_SIGNAL(endMultiModify()),
+ TQ_SIGNAL(endMultiModify()) );
- connect( agenda, TQT_SIGNAL(itemModified(KOAgendaItem *)),
- TQT_SLOT(updateEventDates(KOAgendaItem *)) );
+ connect( agenda, TQ_SIGNAL(itemModified(KOAgendaItem *)),
+ TQ_SLOT(updateEventDates(KOAgendaItem *)) );
- connect( agenda, TQT_SIGNAL(enableAgendaUpdate(bool)),
- TQT_SLOT(enableAgendaUpdate(bool)) );
+ connect( agenda, TQ_SIGNAL(enableAgendaUpdate(bool)),
+ TQ_SLOT(enableAgendaUpdate(bool)) );
// drag signals
- connect( agenda, TQT_SIGNAL(startDragSignal(Incidence *)),
- TQT_SLOT(startDrag(Incidence *)) );
+ connect( agenda, TQ_SIGNAL(startDragSignal(Incidence *)),
+ TQ_SLOT(startDrag(Incidence *)) );
// synchronize selections
- connect( agenda, TQT_SIGNAL(incidenceSelected(Incidence *,const TQDate &)),
- otherAgenda, TQT_SLOT(deselectItem()) );
- connect( agenda, TQT_SIGNAL(incidenceSelected(Incidence *,const TQDate &)),
- TQT_SIGNAL(incidenceSelected(Incidence *,const TQDate &)) );
+ connect( agenda, TQ_SIGNAL(incidenceSelected(Incidence *,const TQDate &)),
+ otherAgenda, TQ_SLOT(deselectItem()) );
+ connect( agenda, TQ_SIGNAL(incidenceSelected(Incidence *,const TQDate &)),
+ TQ_SIGNAL(incidenceSelected(Incidence *,const TQDate &)) );
// rescheduling of todos by d'n'd
- connect( agenda, TQT_SIGNAL(droppedToDo(Todo *,const TQPoint &,bool)),
- TQT_SLOT(slotTodoDropped(Todo *,const TQPoint &,bool)) );
+ connect( agenda, TQ_SIGNAL(droppedToDo(Todo *,const TQPoint &,bool)),
+ TQ_SLOT(slotTodoDropped(Todo *,const TQPoint &,bool)) );
}
@@ -561,7 +561,7 @@ void KOAgendaView::zoomOutHorizontally( const TQDate &date )
}
void KOAgendaView::zoomView( const int delta, const TQPoint &pos,
- const Qt::Orientation orient )
+ const TQt::Orientation orient )
{
static TQDate zoomDate;
static TQTimer *t = new TQTimer( this );
@@ -569,7 +569,7 @@ void KOAgendaView::zoomView( const int delta, const TQPoint &pos,
//Zoom to the selected incidence, on the other way
// zoom to the date on screen after the first mousewheel move.
- if ( orient == Qt::Horizontal ) {
+ if ( orient == TQt::Horizontal ) {
TQDate date=mAgenda->selectedIncidenceDate();
if ( date.isValid() )
zoomDate=date;
@@ -584,7 +584,7 @@ void KOAgendaView::zoomView( const int delta, const TQPoint &pos,
else
zoomInHorizontally( zoomDate );
} else {
- // Qt::Vertical zoom
+ // Vertical zoom
TQPoint posConstentsOld = mAgenda->gridToContents(pos);
if ( delta > 0 ) {
zoomOutVertically();
@@ -682,7 +682,7 @@ void KOAgendaView::createDayLabels( bool force )
if ( !mIsSideBySide )
mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width());
mDayLabels->show();
- TQTimer::singleShot( 0, this, TQT_SLOT( updateDayLabelSizes() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( updateDayLabelSizes() ) );
}
void KOAgendaView::enableAgendaUpdate( bool enable )
@@ -1117,7 +1117,7 @@ void KOAgendaView::updateEventDates( KOAgendaItem *item )
if ( !result ) {
mPendingChanges = true;
- TQTimer::singleShot( 0, this, TQT_SLOT(updateView()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(updateView()) );
return;
}
@@ -1131,7 +1131,7 @@ void KOAgendaView::updateEventDates( KOAgendaItem *item )
// recreated. All others have to!!!
if ( incidence->doesRecur() ) {
mUpdateItem = incidence;
- TQTimer::singleShot( 0, this, TQT_SLOT( doUpdateItem() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( doUpdateItem() ) );
}
enableAgendaUpdate( true );
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index 887cc957..bbc9c235 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -50,7 +50,7 @@ namespace KOrg {
class EventIndicator : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
enum Location { Top, Bottom };
@@ -74,7 +74,7 @@ class EventIndicator : public TQFrame
class KOAlternateLabel : public TQLabel
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOAlternateLabel( const TQString &shortlabel, const TQString &longlabel,
@@ -107,7 +107,7 @@ class KOAlternateLabel : public TQLabel
*/
class KOAgendaView : public KOrg::AgendaView, public KCal::Calendar::Observer
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOAgendaView( Calendar *cal,
@@ -197,7 +197,7 @@ class KOAgendaView : public KOrg::AgendaView, public KCal::Calendar::Observer
void zoomView( const int delta, const TQPoint &pos,
- const Qt::Orientation orient=Qt::Horizontal );
+ const TQt::Orientation orient=TQt::Horizontal );
void clearTimeSpanSelection();
diff --git a/korganizer/koapp.h b/korganizer/koapp.h
index 782e6994..59ead1a0 100644
--- a/korganizer/koapp.h
+++ b/korganizer/koapp.h
@@ -29,7 +29,7 @@
class KOrganizerApp : public KUniqueApplication
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOrganizerApp();
diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp
index d95618c8..5c8ddc39 100644
--- a/korganizer/koattendeeeditor.cpp
+++ b/korganizer/koattendeeeditor.cpp
@@ -109,9 +109,9 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout)
mNameEdit->setClickMessage( i18n("Click to add a new attendee") );
attendeeLabel->setBuddy( mNameEdit );
mNameEdit->installEventFilter( this );
- connect( mNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- TQT_SLOT( updateAttendee() ) );
- connect( mNameEdit, TQT_SIGNAL(returnPressed()), TQT_SLOT(expandAttendee()) );
+ connect( mNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ TQ_SLOT( updateAttendee() ) );
+ connect( mNameEdit, TQ_SIGNAL(returnPressed()), TQ_SLOT(expandAttendee()) );
topLayout->addMultiCellWidget( mNameEdit, 0, 0, 1, 2 );
whatsThis = i18n("Edits the role of the attendee selected "
@@ -125,8 +125,8 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout)
TQWhatsThis::add( mRoleCombo, whatsThis );
mRoleCombo->insertStringList( Attendee::roleList() );
attendeeRoleLabel->setBuddy( mRoleCombo );
- connect( mRoleCombo, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( updateAttendee() ) );
+ connect( mRoleCombo, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( updateAttendee() ) );
topLayout->addWidget( mRoleCombo, 1, 1 );
mDelegateLabel = new TQLabel( parent );
@@ -151,8 +151,8 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout)
mStatusCombo->insertItem( KOGlobals::self()->smallIcon( "help" ), Attendee::statusName( Attendee::InProcess ) );
statusLabel->setBuddy( mStatusCombo );
- connect( mStatusCombo, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( updateAttendee() ) );
+ connect( mStatusCombo, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( updateAttendee() ) );
topLayout->addWidget( mStatusCombo, 2, 1 );
topLayout->setColStretch( 2, 1 );
@@ -163,7 +163,7 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout)
"selected in the list above to request "
"a response concerning attendance.") );
mRsvpButton->setText( i18n("Re&quest response") );
- connect( mRsvpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateAttendee() ) );
+ connect( mRsvpButton, TQ_SIGNAL( clicked() ), TQ_SLOT( updateAttendee() ) );
topLayout->addWidget( mRsvpButton, 2, 2 );
TQWidget *buttonBox = new TQWidget( parent );
@@ -179,7 +179,7 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout)
"from your addressbook, click the 'Select Addressee' "
"button instead.") );
buttonLayout->addWidget( mAddButton );
- connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addNewAttendee() ) );
+ connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addNewAttendee() ) );
mRemoveButton = new TQPushButton( i18n("&Remove"), buttonBox );
TQWhatsThis::add( mRemoveButton,
@@ -193,7 +193,7 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout)
i18n("Opens your address book, allowing you to select "
"new attendees from it.") );
buttonLayout->addWidget( mAddressBookButton );
- connect( mAddressBookButton, TQT_SIGNAL( clicked() ), TQT_SLOT( openAddressBook() ) );
+ connect( mAddressBookButton, TQ_SIGNAL( clicked() ), TQ_SLOT( openAddressBook() ) );
topLayout->addMultiCellWidget( buttonBox, 0, 3, 3, 3 );
@@ -277,7 +277,7 @@ void KOAttendeeEditor::addNewAttendee()
// We don't want the hint again
mNameEdit->setClickMessage( "" );
mNameEdit->setFocus();
- TQTimer::singleShot( 0, mNameEdit, TQT_SLOT( selectAll() ) );
+ TQTimer::singleShot( 0, mNameEdit, TQ_SLOT( selectAll() ) );
}
void KOAttendeeEditor::readEvent(KCal::Incidence * incidence)
@@ -537,7 +537,7 @@ void KOAttendeeEditor::declineForMe()
bool KOAttendeeEditor::eventFilter(TQObject *watched, TQEvent *ev)
{
- if ( watched && TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(mNameEdit) && ev->type() == TQEvent::FocusIn &&
+ if ( watched && watched == mNameEdit && ev->type() == TQEvent::FocusIn &&
currentAttendee() == 0 ) {
addNewAttendee();
}
diff --git a/korganizer/koattendeeeditor.h b/korganizer/koattendeeeditor.h
index 3454f81d..042419fd 100644
--- a/korganizer/koattendeeeditor.h
+++ b/korganizer/koattendeeeditor.h
@@ -46,7 +46,7 @@ namespace KCal {
*/
class KOAttendeeEditor : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOAttendeeEditor( TQWidget *parent, const char *name = 0 );
diff --git a/korganizer/kocounterdialog.cpp b/korganizer/kocounterdialog.cpp
index 5341e1d0..dc6a76ea 100644
--- a/korganizer/kocounterdialog.cpp
+++ b/korganizer/kocounterdialog.cpp
@@ -39,8 +39,8 @@ KOCounterDialog::KOCounterDialog( Calendar *calendar, TQWidget *parent, const ch
mEventViewer = new KOEventViewer( calendar, this );
setMainWidget( mEventViewer );
- connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotCancel() ) );
- connect( this, TQT_SIGNAL( user2Clicked() ), TQT_SLOT( slotOk( ) ) );
+ connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotCancel() ) );
+ connect( this, TQ_SIGNAL( user2Clicked() ), TQ_SLOT( slotOk( ) ) );
// FIXME: Set a sensible size (based on the content?).
setMinimumSize( 300, 200 );
diff --git a/korganizer/kocounterdialog.h b/korganizer/kocounterdialog.h
index 1af7c47c..5be67874 100644
--- a/korganizer/kocounterdialog.h
+++ b/korganizer/kocounterdialog.h
@@ -38,7 +38,7 @@ class KOEventViewer;
*/
class KOCounterDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOCounterDialog(Calendar *calendar, TQWidget *parent = 0, const char *name = 0 );
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 5d95b81e..0a575a77 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -125,9 +125,9 @@ void KODayMatrix::setCalendar( Calendar *cal )
mCalendar->registerObserver( this );
CalendarResources *calres = dynamic_cast<CalendarResources*>( cal );
if ( calres ) {
- connect( calres, TQT_SIGNAL(signalResourceAdded(ResourceCalendar *)), TQT_SLOT(resourcesChanged()) );
- connect( calres, TQT_SIGNAL(signalResourceModified( ResourceCalendar *)), TQT_SLOT(resourcesChanged()) );
- connect( calres, TQT_SIGNAL(signalResourceDeleted(ResourceCalendar *)), TQT_SLOT(resourcesChanged()) );
+ connect( calres, TQ_SIGNAL(signalResourceAdded(ResourceCalendar *)), TQ_SLOT(resourcesChanged()) );
+ connect( calres, TQ_SIGNAL(signalResourceModified( ResourceCalendar *)), TQ_SLOT(resourcesChanged()) );
+ connect( calres, TQ_SIGNAL(signalResourceDeleted(ResourceCalendar *)), TQ_SLOT(resourcesChanged()) );
}
setAcceptDrops( mCalendar );
@@ -725,5 +725,5 @@ TQPair<TQDate,TQDate> KODayMatrix::matrixLimits( const TQDate &month )
d = d.addDays( -7 ); // Start on the second line
}
- return tqMakePair( d, d.addDays( NUMDAYS-1 ) );
+ return qMakePair( d, d.addDays( NUMDAYS-1 ) );
}
diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h
index 79231b46..9b3db818 100644
--- a/korganizer/kodaymatrix.h
+++ b/korganizer/kodaymatrix.h
@@ -104,7 +104,7 @@ class DynamicTip : public TQToolTip
*/
class KODayMatrix: public TQFrame, public KCal::Calendar::Observer
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** constructor to create a day matrix widget.
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index 20ed0259..17bb056c 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -93,8 +93,8 @@ KODialogManager::KODialogManager( CalendarView *mainView ) :
// don't set any specific parent for the dialog, as its kept around and reused
// in different cases where it should have different parents
KWin::setMainWindow( mCategoryEditDialog, 0 );
- connect( mainView, TQT_SIGNAL( categoriesChanged() ),
- mCategoryEditDialog, TQT_SLOT( reload() ) );
+ connect( mainView, TQ_SIGNAL( categoriesChanged() ),
+ mCategoryEditDialog, TQ_SLOT( reload() ) );
KOGlobals::fitDialogToScreen( mCategoryEditDialog );
}
@@ -123,20 +123,20 @@ void KODialogManager::showOptionsDialog()
// mOptionsDialog = new TDEConfigureDialog( TDEConfigureDialog::Configurable );
// mOptionsDialog = new TDEConfigureDialog( mMainView );
connect( mOptionsDialog->dialog(),
- TQT_SIGNAL( configCommitted( const TQCString & ) ),
- mMainView, TQT_SLOT( updateConfig() ) );
+ TQ_SIGNAL( configCommitted( const TQCString & ) ),
+ mMainView, TQ_SLOT( updateConfig() ) );
#else
mOptionsDialog = new KCMultiDialog( mMainView, "KorganizerPreferences" );
- connect( mOptionsDialog, TQT_SIGNAL( configCommitted( const TQCString & ) ),
- mMainView, TQT_SLOT( updateConfig( const TQCString& ) ) );
+ connect( mOptionsDialog, TQ_SIGNAL( configCommitted( const TQCString & ) ),
+ mMainView, TQ_SLOT( updateConfig( const TQCString& ) ) );
#if 0
- connect( mOptionsDialog, TQT_SIGNAL( applyClicked() ),
- mMainView, TQT_SLOT( updateConfig() ) );
- connect( mOptionsDialog, TQT_SIGNAL( okClicked() ),
- mMainView, TQT_SLOT( updateConfig() ) );
+ connect( mOptionsDialog, TQ_SIGNAL( applyClicked() ),
+ mMainView, TQ_SLOT( updateConfig() ) );
+ connect( mOptionsDialog, TQ_SIGNAL( okClicked() ),
+ mMainView, TQ_SLOT( updateConfig() ) );
// @TODO Find a way to do this with KCMultiDialog
- connect(mCategoryEditDialog,TQT_SIGNAL(categoryConfigChanged()),
- mOptionsDialog,TQT_SLOT(updateCategories()));
+ connect(mCategoryEditDialog,TQ_SIGNAL(categoryConfigChanged()),
+ mOptionsDialog,TQ_SLOT(updateCategories()));
#endif
TQStringList modules;
@@ -172,13 +172,13 @@ void KODialogManager::showSearchDialog()
{
if ( !mSearchDialog ) {
mSearchDialog = new SearchDialog( mMainView->calendar(), mMainView );
- connect( mSearchDialog, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)),
- mMainView, TQT_SLOT(showIncidence(Incidence *,const TQDate &)) );
- connect( mSearchDialog, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)),
- mMainView, TQT_SLOT(editIncidence(Incidence *,const TQDate &)) );
- connect( mSearchDialog, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)),
- mMainView, TQT_SLOT(deleteIncidence(Incidence *)) );
- connect( mMainView, TQT_SIGNAL(closingDown()),mSearchDialog,TQT_SLOT(reject()) );
+ connect( mSearchDialog, TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)),
+ mMainView, TQ_SLOT(showIncidence(Incidence *,const TQDate &)) );
+ connect( mSearchDialog, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)),
+ mMainView, TQ_SLOT(editIncidence(Incidence *,const TQDate &)) );
+ connect( mSearchDialog, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)),
+ mMainView, TQ_SLOT(deleteIncidence(Incidence *)) );
+ connect( mMainView, TQ_SIGNAL(closingDown()),mSearchDialog,TQ_SLOT(reject()) );
}
// make sure the widget is on top again
mSearchDialog->show();
@@ -190,10 +190,10 @@ void KODialogManager::showArchiveDialog()
#ifndef KORG_NOARCHIVE
if (!mArchiveDialog) {
mArchiveDialog = new ArchiveDialog(mMainView->calendar(),mMainView);
- connect(mArchiveDialog,TQT_SIGNAL(eventsDeleted()),
- mMainView,TQT_SLOT(updateView()));
- connect(mArchiveDialog,TQT_SIGNAL(autoArchivingSettingsModified()),
- mMainView,TQT_SLOT(slotAutoArchivingSettingsModified()));
+ connect(mArchiveDialog,TQ_SIGNAL(eventsDeleted()),
+ mMainView,TQ_SLOT(updateView()));
+ connect(mArchiveDialog,TQ_SIGNAL(autoArchivingSettingsModified()),
+ mMainView,TQ_SLOT(slotAutoArchivingSettingsModified()));
}
mArchiveDialog->show();
mArchiveDialog->raise();
@@ -207,12 +207,12 @@ void KODialogManager::showFilterEditDialog( TQPtrList<CalFilter> *filters )
{
if ( !mFilterEditDialog ) {
mFilterEditDialog = new FilterEditDialog( filters, mMainView );
- connect( mFilterEditDialog, TQT_SIGNAL( filterChanged() ),
- mMainView, TQT_SLOT( updateFilter() ) );
- connect( mFilterEditDialog, TQT_SIGNAL( editCategories() ),
- mCategoryEditDialog, TQT_SLOT( show() ) );
- connect( mCategoryEditDialog, TQT_SIGNAL( categoryConfigChanged() ),
- mFilterEditDialog, TQT_SLOT( updateCategoryConfig() ) );
+ connect( mFilterEditDialog, TQ_SIGNAL( filterChanged() ),
+ mMainView, TQ_SLOT( updateFilter() ) );
+ connect( mFilterEditDialog, TQ_SIGNAL( editCategories() ),
+ mCategoryEditDialog, TQ_SLOT( show() ) );
+ connect( mCategoryEditDialog, TQ_SIGNAL( categoryConfigChanged() ),
+ mFilterEditDialog, TQ_SLOT( updateCategoryConfig() ) );
}
mFilterEditDialog->show();
mFilterEditDialog->raise();
@@ -241,29 +241,29 @@ void KODialogManager::connectTypeAhead( KOEventEditor *editor,
{
if ( editor && agenda ) {
agenda->setTypeAheadReceiver( editor->typeAheadReceiver() );
- connect( editor, TQT_SIGNAL( focusReceivedSignal() ),
- agenda, TQT_SLOT( finishTypeAhead() ) );
+ connect( editor, TQ_SIGNAL( focusReceivedSignal() ),
+ agenda, TQ_SLOT( finishTypeAhead() ) );
}
}
void KODialogManager::connectEditor( KOIncidenceEditor*editor )
{
- connect( editor, TQT_SIGNAL( deleteIncidenceSignal( Incidence * ) ),
- mMainView, TQT_SLOT( deleteIncidence( Incidence * ) ) );
-
- connect( mCategoryEditDialog, TQT_SIGNAL( categoryConfigChanged() ),
- editor, TQT_SIGNAL( updateCategoryConfig() ) );
- connect( editor, TQT_SIGNAL( editCategories() ),
- mCategoryEditDialog, TQT_SLOT( show() ) );
-
- connect( editor, TQT_SIGNAL( dialogClose( Incidence * ) ),
- mMainView, TQT_SLOT( dialogClosing( Incidence * ) ) );
- connect( editor, TQT_SIGNAL( editCanceled( Incidence * ) ),
- mMainView, TQT_SLOT( editCanceled( Incidence * ) ) );
- connect( mMainView, TQT_SIGNAL( closingDown() ), editor, TQT_SLOT( reject() ) );
-
- connect( editor, TQT_SIGNAL( deleteAttendee( Incidence * ) ),
- mMainView, TQT_SIGNAL( cancelAttendees( Incidence * ) ) );
+ connect( editor, TQ_SIGNAL( deleteIncidenceSignal( Incidence * ) ),
+ mMainView, TQ_SLOT( deleteIncidence( Incidence * ) ) );
+
+ connect( mCategoryEditDialog, TQ_SIGNAL( categoryConfigChanged() ),
+ editor, TQ_SIGNAL( updateCategoryConfig() ) );
+ connect( editor, TQ_SIGNAL( editCategories() ),
+ mCategoryEditDialog, TQ_SLOT( show() ) );
+
+ connect( editor, TQ_SIGNAL( dialogClose( Incidence * ) ),
+ mMainView, TQ_SLOT( dialogClosing( Incidence * ) ) );
+ connect( editor, TQ_SIGNAL( editCanceled( Incidence * ) ),
+ mMainView, TQ_SLOT( editCanceled( Incidence * ) ) );
+ connect( mMainView, TQ_SIGNAL( closingDown() ), editor, TQ_SLOT( reject() ) );
+
+ connect( editor, TQ_SIGNAL( deleteAttendee( Incidence * ) ),
+ mMainView, TQ_SIGNAL( cancelAttendees( Incidence * ) ) );
}
KOTodoEditor *KODialogManager::getTodoEditor()
diff --git a/korganizer/kodialogmanager.h b/korganizer/kodialogmanager.h
index 4fbb7056..64f1b405 100644
--- a/korganizer/kodialogmanager.h
+++ b/korganizer/kodialogmanager.h
@@ -50,7 +50,7 @@ using namespace KCal;
*/
class KODialogManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
KODialogManager( CalendarView * );
diff --git a/korganizer/koeditoralarms.cpp b/korganizer/koeditoralarms.cpp
index 1415eef5..e7d1beb9 100644
--- a/korganizer/koeditoralarms.cpp
+++ b/korganizer/koeditoralarms.cpp
@@ -206,25 +206,25 @@ KOEditorAlarms::KOEditorAlarms( const TQCString &type,
mWidget->mAlarmList->setResizeMode( TQListView::LastColumn );
mWidget->mAlarmList->setColumnWidthMode( 0, TQListView::Maximum );
mWidget->mAlarmList->setColumnWidthMode( 1, TQListView::Maximum );
- connect( mWidget->mAlarmList, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ),
- TQT_SLOT( selectionChanged( TQListViewItem * ) ) );
- connect( mWidget->mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdd() ) );
- connect( mWidget->mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemove() ) );
- connect( mWidget->mDuplicateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDuplicate() ) );
-
- connect( mWidget->mAlarmOffset, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( changed() ) );
- connect( mWidget->mOffsetUnit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( changed() ) );
- connect( mWidget->mBeforeAfter, TQT_SIGNAL( activated( int ) ), TQT_SLOT( changed() ) );
- connect( mWidget->mRepeats, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( changed() ) );
- connect( mWidget->mRepeatCount, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( changed() ) );
- connect( mWidget->mRepeatInterval, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( changed() ) );
- connect( mWidget->mAlarmType, TQT_SIGNAL(clicked(int)), TQT_SLOT( changed() ) );
- connect( mWidget->mDisplayText, TQT_SIGNAL( textChanged() ), TQT_SLOT( changed() ) );
- connect( mWidget->mSoundFile, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( changed() ) );
- connect( mWidget->mApplication, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( changed() ) );
- connect( mWidget->mAppArguments, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( changed() ) );
- connect( mWidget->mEmailAddress, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( changed() ) );
- connect( mWidget->mEmailText, TQT_SIGNAL( textChanged() ), TQT_SLOT( changed() ) );
+ connect( mWidget->mAlarmList, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ),
+ TQ_SLOT( selectionChanged( TQListViewItem * ) ) );
+ connect( mWidget->mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAdd() ) );
+ connect( mWidget->mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemove() ) );
+ connect( mWidget->mDuplicateButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotDuplicate() ) );
+
+ connect( mWidget->mAlarmOffset, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( changed() ) );
+ connect( mWidget->mOffsetUnit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( changed() ) );
+ connect( mWidget->mBeforeAfter, TQ_SIGNAL( activated( int ) ), TQ_SLOT( changed() ) );
+ connect( mWidget->mRepeats, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( changed() ) );
+ connect( mWidget->mRepeatCount, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( changed() ) );
+ connect( mWidget->mRepeatInterval, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( changed() ) );
+ connect( mWidget->mAlarmType, TQ_SIGNAL(clicked(int)), TQ_SLOT( changed() ) );
+ connect( mWidget->mDisplayText, TQ_SIGNAL( textChanged() ), TQ_SLOT( changed() ) );
+ connect( mWidget->mSoundFile, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( changed() ) );
+ connect( mWidget->mApplication, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( changed() ) );
+ connect( mWidget->mAppArguments, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( changed() ) );
+ connect( mWidget->mEmailAddress, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( changed() ) );
+ connect( mWidget->mEmailText, TQ_SIGNAL( textChanged() ), TQ_SLOT( changed() ) );
init();
diff --git a/korganizer/koeditoralarms.h b/korganizer/koeditoralarms.h
index f713fcf9..18855733 100644
--- a/korganizer/koeditoralarms.h
+++ b/korganizer/koeditoralarms.h
@@ -33,7 +33,7 @@ class AlarmListViewItem;
class KOEditorAlarms : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOEditorAlarms( const TQCString &type,
diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp
index 48b9acdd..669fd636 100644
--- a/korganizer/koeditorattachments.cpp
+++ b/korganizer/koeditorattachments.cpp
@@ -189,7 +189,7 @@ AttachmentEditDialog::AttachmentEditDialog( AttachmentListItem *item,
i18n( "Type any string you desire here for the name of the attachment" ) );
grid->addMultiCellWidget( mLabelEdit, 0, 0, 1, 2 );
- KSeparator *sep = new KSeparator( Qt::Horizontal, topFrame );
+ KSeparator *sep = new KSeparator( TQt::Horizontal, topFrame );
grid->addMultiCellWidget( sep, 1, 1, 0, 2 );
TQLabel *label = new TQLabel( i18n( "Type:" ), topFrame );
@@ -224,10 +224,10 @@ AttachmentEditDialog::AttachmentEditDialog( AttachmentListItem *item,
i18n( "Enter the path to the attachment file or use the "
"file browser by pressing the adjacent button" ) );
grid->addMultiCellWidget( mURLRequester, 4, 4, 1, 2 );
- connect( mURLRequester, TQT_SIGNAL(urlSelected(const TQString &)),
- TQT_SLOT(urlSelected(const TQString &)) );
- connect( mURLRequester, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( urlChanged( const TQString& ) ) );
+ connect( mURLRequester, TQ_SIGNAL(urlSelected(const TQString &)),
+ TQ_SLOT(urlSelected(const TQString &)) );
+ connect( mURLRequester, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( urlChanged( const TQString& ) ) );
urlChanged( item->uri() );
} else {
uint size = item->attachment()->size();
@@ -324,8 +324,8 @@ AttachmentIconView::AttachmentIconView( KOEditorAttachments* parent )
setMaxItemWidth( TQMAX(maxItemWidth(), 250) );
setMinimumHeight( TQMAX(fontMetrics().height(), 16) + 12 );
- connect( this, TQT_SIGNAL( dropped ( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ),
- this, TQT_SLOT( handleDrop( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ) );
+ connect( this, TQ_SIGNAL( dropped ( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ),
+ this, TQ_SLOT( handleDrop( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ) );
}
KURL AttachmentIconView::tempFileForAttachment( KCal::Attachment *attachment )
@@ -462,12 +462,12 @@ KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *parent,
i18n("Displays a list of current items (files, mail, etc.) "
"that have been associated with this event or to-do. ") );
topLayout->addWidget( mAttachments );
- connect( mAttachments, TQT_SIGNAL( doubleClicked( TQIconViewItem * ) ),
- TQT_SLOT( showAttachment( TQIconViewItem * ) ) );
- connect( mAttachments, TQT_SIGNAL(selectionChanged()),
- TQT_SLOT(selectionChanged()) );
- connect( mAttachments, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)),
- TQT_SLOT(contextMenu(TQIconViewItem*,const TQPoint&)) );
+ connect( mAttachments, TQ_SIGNAL( doubleClicked( TQIconViewItem * ) ),
+ TQ_SLOT( showAttachment( TQIconViewItem * ) ) );
+ connect( mAttachments, TQ_SIGNAL(selectionChanged()),
+ TQ_SLOT(selectionChanged()) );
+ connect( mAttachments, TQ_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)),
+ TQ_SLOT(contextMenu(TQIconViewItem*,const TQPoint&)) );
TQPushButton *addButton = new TQPushButton( this );
addButton->setIconSet( SmallIconSet( "add" ) );
@@ -477,7 +477,7 @@ KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *parent,
"to add to this event or to-do as link or as "
"inline data." ) );
topLayout->addWidget( addButton );
- connect( addButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd()) );
+ connect( addButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd()) );
mRemoveBtn = new TQPushButton( this );
mRemoveBtn->setIconSet( SmallIconSet( "remove" ) );
@@ -486,33 +486,33 @@ KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *parent,
i18n("Removes the attachment selected in the list above "
"from this event or to-do.") );
topLayout->addWidget( mRemoveBtn );
- connect( mRemoveBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove()) );
+ connect( mRemoveBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove()) );
mContextMenu = new TDEPopupMenu( this );
- TDEActionCollection* ac = new TDEActionCollection( TQT_TQWIDGET(this), TQT_TQOBJECT(this) );
+ TDEActionCollection* ac = new TDEActionCollection( this, this );
- mOpenAction = new TDEAction( i18n("Open"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShow()), ac );
+ mOpenAction = new TDEAction( i18n("Open"), 0, this, TQ_SLOT(slotShow()), ac );
mOpenAction->plug( mContextMenu );
- mSaveAsAction = new TDEAction( i18n( "Save As..." ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), ac );
+ mSaveAsAction = new TDEAction( i18n( "Save As..." ), 0, this, TQ_SLOT(slotSaveAs()), ac );
mSaveAsAction->plug( mContextMenu );
mContextMenu->insertSeparator();
- mCopyAction = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), ac );
+ mCopyAction = KStdAction::copy(this, TQ_SLOT(slotCopy()), ac );
mCopyAction->plug( mContextMenu );
- mCutAction = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotCut()), ac );
+ mCutAction = KStdAction::cut(this, TQ_SLOT(slotCut()), ac );
mCutAction->plug( mContextMenu );
- TDEAction *action = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), ac );
+ TDEAction *action = KStdAction::paste(this, TQ_SLOT(slotPaste()), ac );
action->plug( mContextMenu );
mContextMenu->insertSeparator();
- mDeleteAction = new TDEAction( i18n( "&Remove" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), ac );
+ mDeleteAction = new TDEAction( i18n( "&Remove" ), 0, this, TQ_SLOT(slotRemove()), ac );
mDeleteAction->plug( mContextMenu );
mDeleteAction->setShortcut( Key_Delete );
mContextMenu->insertSeparator();
- mEditAction = new TDEAction( i18n( "&Properties..." ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEdit()), ac );
+ mEditAction = new TDEAction( i18n( "&Properties..." ), 0, this, TQ_SLOT(slotEdit()), ac );
mEditAction->plug( mContextMenu );
selectionChanged();
@@ -691,7 +691,7 @@ void KOEditorAttachments::slotEdit()
AttachmentEditDialog *dialog = new AttachmentEditDialog( attitem, mAttachments );
dialog->mInline->setEnabled( false );
dialog->setModal( false );
- connect( dialog, TQT_SIGNAL(hidden()), dialog, TQT_SLOT(delayedDestruct()) );
+ connect( dialog, TQ_SIGNAL(hidden()), dialog, TQ_SLOT(delayedDestruct()) );
dialog->show();
}
}
@@ -854,7 +854,7 @@ void KOEditorAttachments::readIncidence( KCal::Incidence *i )
addAttachment( (*it) );
}
if ( mAttachments->count() > 0 ) {
- TQTimer::singleShot( 0, mAttachments, TQT_SLOT(arrangeItemsInGrid()) );
+ TQTimer::singleShot( 0, mAttachments, TQ_SLOT(arrangeItemsInGrid()) );
}
}
diff --git a/korganizer/koeditorattachments.h b/korganizer/koeditorattachments.h
index b89dd0b3..adeded3a 100644
--- a/korganizer/koeditorattachments.h
+++ b/korganizer/koeditorattachments.h
@@ -56,7 +56,7 @@ class KTempDir;
class AttachmentEditDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
AttachmentEditDialog( AttachmentListItem *item, TQWidget *parent=0 );
@@ -80,7 +80,7 @@ class AttachmentEditDialog : public KDialogBase
class KOEditorAttachments : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOEditorAttachments( int spacing = 8, TQWidget *parent = 0,
@@ -151,7 +151,7 @@ class KOEditorAttachments : public TQWidget
class AttachmentIconView : public TDEIconView
{
- Q_OBJECT
+ TQ_OBJECT
friend class KOEditorAttachments;
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index 95d21176..9d570f16 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -208,17 +208,17 @@ KOEditorDetails::KOEditorDetails( int spacing, TQWidget *parent,
mListView->setFixedHeight( 78 );
}
- connect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ),
- TQT_SLOT( updateAttendeeInput() ) );
+ connect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ),
+ TQ_SLOT( updateAttendeeInput() ) );
#ifndef KORG_NODND
- connect( mListView, TQT_SIGNAL( dropped( Attendee * ) ),
- TQT_SLOT( slotInsertAttendee( Attendee * ) ) );
+ connect( mListView, TQ_SIGNAL( dropped( Attendee * ) ),
+ TQ_SLOT( slotInsertAttendee( Attendee * ) ) );
#endif
topLayout->addWidget( mListView );
initEditWidgets( this, topLayout );
- connect( mRemoveButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeAttendee()) );
+ connect( mRemoveButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeAttendee()) );
updateAttendeeInput();
}
diff --git a/korganizer/koeditordetails.h b/korganizer/koeditordetails.h
index 97fac51c..418c8edb 100644
--- a/korganizer/koeditordetails.h
+++ b/korganizer/koeditordetails.h
@@ -59,7 +59,7 @@ typedef CustomListViewItem<KCal::Attendee *> AttendeeListItem;
*/
class KOAttendeeListView : public TDEListView
{
-Q_OBJECT
+TQ_OBJECT
public:
KOAttendeeListView (TQWidget *parent=0, const char *name=0);
@@ -78,7 +78,7 @@ signals:
class KOEditorDetails : public KOAttendeeEditor
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOEditorDetails (int spacing = 8,TQWidget* parent = 0, const char* name = 0);
diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp
index 88c5414b..05db9b5d 100644
--- a/korganizer/koeditorfreebusy.cpp
+++ b/korganizer/koeditorfreebusy.cpp
@@ -263,15 +263,15 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent,
scaleCombo->insertItem( i18n( "Month" ) );
scaleCombo->insertItem( i18n( "Automatic" ) );
scaleCombo->setCurrentItem( 0 ); // start with "hour"
- connect( scaleCombo, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( slotScaleChanged( int ) ) );
+ connect( scaleCombo, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( slotScaleChanged( int ) ) );
controlLayout->addWidget( scaleCombo );
TQPushButton *button = new TQPushButton( i18n( "Center on Start" ), this );
TQWhatsThis::add( button,
i18n("Centers the Gantt chart on the start time "
"and day of this event.") );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCenterOnStart() ) );
+ connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotCenterOnStart() ) );
controlLayout->addWidget( button );
controlLayout->addStretch( 1 );
@@ -280,7 +280,7 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent,
TQWhatsThis::add( button,
i18n("Moves the event to a date and time when all the "
"attendees are free.") );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotPickDate() ) );
+ connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotPickDate() ) );
controlLayout->addWidget( button );
controlLayout->addStretch( 1 );
@@ -290,7 +290,7 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent,
i18n("Reloads Free/Busy data for all attendees from "
"the corresponding servers.") );
controlLayout->addWidget( button );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( manualReload() ) );
+ connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( manualReload() ) );
mGanttView = new KDGanttView( this, "mGanttView" );
TQWhatsThis::add( mGanttView,
@@ -330,37 +330,37 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent,
mEventRectangle->setColor( TQt::magenta );
mGanttView->addIntervalBackgroundColor( mEventRectangle );
- connect( mGanttView, TQT_SIGNAL ( timeIntervalSelected( const TQDateTime &,
+ connect( mGanttView, TQ_SIGNAL ( timeIntervalSelected( const TQDateTime &,
const TQDateTime & ) ),
- mGanttView, TQT_SLOT( zoomToSelection( const TQDateTime &,
+ mGanttView, TQ_SLOT( zoomToSelection( const TQDateTime &,
const TQDateTime & ) ) );
- connect( mGanttView, TQT_SIGNAL( lvItemDoubleClicked( KDGanttViewItem * ) ),
- TQT_SLOT( editFreeBusyUrl( KDGanttViewItem * ) ) );
- connect( mGanttView, TQT_SIGNAL( intervalColorRectangleMoved( const TQDateTime&, const TQDateTime& ) ),
- this, TQT_SLOT( slotIntervalColorRectangleMoved( const TQDateTime&, const TQDateTime& ) ) );
-
- connect( mGanttView, TQT_SIGNAL(lvSelectionChanged(KDGanttViewItem*)),
- this, TQT_SLOT(updateAttendeeInput()) );
- connect( mGanttView, TQT_SIGNAL(lvItemLeftClicked(KDGanttViewItem*)),
- this, TQT_SLOT(showAttendeeStatusMenu()) );
- connect( mGanttView, TQT_SIGNAL(lvItemRightClicked(KDGanttViewItem*)),
- this, TQT_SLOT(showAttendeeStatusMenu()) );
- connect( mGanttView, TQT_SIGNAL(lvMouseButtonClicked(int, KDGanttViewItem*, const TQPoint&, int)),
- this, TQT_SLOT(listViewClicked(int, KDGanttViewItem*)) );
+ connect( mGanttView, TQ_SIGNAL( lvItemDoubleClicked( KDGanttViewItem * ) ),
+ TQ_SLOT( editFreeBusyUrl( KDGanttViewItem * ) ) );
+ connect( mGanttView, TQ_SIGNAL( intervalColorRectangleMoved( const TQDateTime&, const TQDateTime& ) ),
+ this, TQ_SLOT( slotIntervalColorRectangleMoved( const TQDateTime&, const TQDateTime& ) ) );
+
+ connect( mGanttView, TQ_SIGNAL(lvSelectionChanged(KDGanttViewItem*)),
+ this, TQ_SLOT(updateAttendeeInput()) );
+ connect( mGanttView, TQ_SIGNAL(lvItemLeftClicked(KDGanttViewItem*)),
+ this, TQ_SLOT(showAttendeeStatusMenu()) );
+ connect( mGanttView, TQ_SIGNAL(lvItemRightClicked(KDGanttViewItem*)),
+ this, TQ_SLOT(showAttendeeStatusMenu()) );
+ connect( mGanttView, TQ_SIGNAL(lvMouseButtonClicked(int, KDGanttViewItem*, const TQPoint&, int)),
+ this, TQ_SLOT(listViewClicked(int, KDGanttViewItem*)) );
FreeBusyManager *m = KOGroupware::instance()->freeBusyManager();
- connect( m, TQT_SIGNAL( freeBusyRetrieved( KCal::FreeBusy *, const TQString & ) ),
- TQT_SLOT( slotInsertFreeBusy( KCal::FreeBusy *, const TQString & ) ) );
+ connect( m, TQ_SIGNAL( freeBusyRetrieved( KCal::FreeBusy *, const TQString & ) ),
+ TQ_SLOT( slotInsertFreeBusy( KCal::FreeBusy *, const TQString & ) ) );
- connect( &mReloadTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( autoReload() ) );
+ connect( &mReloadTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( autoReload() ) );
initEditWidgets( this, topLayout );
- connect( mRemoveButton, TQT_SIGNAL(clicked()),
- TQT_SLOT(removeAttendee()) );
+ connect( mRemoveButton, TQ_SIGNAL(clicked()),
+ TQ_SLOT(removeAttendee()) );
slotOrganizerChanged( mOrganizerCombo->currentText() );
- connect( mOrganizerCombo, TQT_SIGNAL( activated(const TQString&) ),
- this, TQT_SLOT( slotOrganizerChanged(const TQString&) ) );
+ connect( mOrganizerCombo, TQ_SIGNAL( activated(const TQString&) ),
+ this, TQ_SLOT( slotOrganizerChanged(const TQString&) ) );
//suppress the buggy consequences of clicks on the time header widget
mGanttView->timeHeaderWidget()->installEventFilter( this );
@@ -923,7 +923,7 @@ void KOEditorFreeBusy::showAttendeeStatusMenu()
void KOEditorFreeBusy::listViewClicked(int button, KDGanttViewItem * item)
{
- if ( button == Qt::LeftButton && item == 0 )
+ if ( button == TQt::LeftButton && item == 0 )
addNewAttendee();
}
@@ -983,7 +983,7 @@ void KOEditorFreeBusy::slotOrganizerChanged(const TQString & newOrganizer)
bool KOEditorFreeBusy::eventFilter( TQObject *watched, TQEvent *event )
{
- if ( TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(mGanttView->timeHeaderWidget()) &&
+ if ( watched == mGanttView->timeHeaderWidget() &&
event->type() >= TQEvent::MouseButtonPress && event->type() <= TQEvent::MouseMove ) {
return true;
} else {
diff --git a/korganizer/koeditorfreebusy.h b/korganizer/koeditorfreebusy.h
index c5201fc2..2af15f44 100644
--- a/korganizer/koeditorfreebusy.h
+++ b/korganizer/koeditorfreebusy.h
@@ -44,7 +44,7 @@ namespace KCal {
class KOEditorFreeBusy : public KOAttendeeEditor
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOEditorFreeBusy( int spacing = 8, TQWidget *parent = 0,
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index 304fea93..c8c70277 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -114,8 +114,8 @@ void KOEditorGeneral::initHeader( TQWidget *parent,TQBoxLayout *topLayout)
mSummaryEdit = new FocusLineEdit( parent );
TQWhatsThis::add( mSummaryEdit, whatsThis );
- connect( mSummaryEdit, TQT_SIGNAL( focusReceivedSignal() ),
- TQT_SIGNAL( focusReceivedSignal() ) );
+ connect( mSummaryEdit, TQ_SIGNAL( focusReceivedSignal() ),
+ TQ_SIGNAL( focusReceivedSignal() ) );
headerLayout->addWidget(mSummaryEdit,1,1);
summaryLabel->setBuddy( mSummaryEdit );
@@ -152,7 +152,7 @@ void KOEditorGeneral::initHeader( TQWidget *parent,TQBoxLayout *topLayout)
mCategoriesButton = new TQPushButton( parent );
mCategoriesButton->setText(i18n("Select..."));
TQWhatsThis::add( mCategoriesButton, whatsThis );
- connect(mCategoriesButton,TQT_SIGNAL(clicked()),TQT_SLOT(selectCategories()));
+ connect(mCategoriesButton,TQ_SIGNAL(clicked()),TQ_SLOT(selectCategories()));
thirdLineLayout->addWidget( mCategoriesButton );
}
@@ -209,7 +209,7 @@ void KOEditorGeneral::initAlarm( TQWidget *parent, TQBoxLayout *topLayout )
i18n( "Push this button to create an advanced set of reminders "
"for this event or to-do." ) );
TQToolTip::add( mAlarmAdvancedButton, i18n( "Set an advanced reminder" ) );
- connect( mAlarmAdvancedButton, TQT_SIGNAL(clicked()), TQT_SLOT(editAlarms()) );
+ connect( mAlarmAdvancedButton, TQ_SIGNAL(clicked()), TQ_SLOT(editAlarms()) );
alarmLayout->addWidget( mAlarmAdvancedButton );
mSimpleAlarmBox = new TQHBox( parent );
@@ -247,17 +247,17 @@ void KOEditorGeneral::initAlarm( TQWidget *parent, TQBoxLayout *topLayout )
mAlarmTimeEdit->setEnabled( false );
mAlarmIncrCombo->setEnabled( false );
mAlarmInfoLabel->setEnabled( false );
- connect( mAlarmButton, TQT_SIGNAL(toggled(bool)), mAlarmAdvancedButton, TQT_SLOT(setEnabled(bool)) );
- connect( mAlarmButton, TQT_SIGNAL(toggled(bool)), mAlarmTimeEdit, TQT_SLOT(setEnabled(bool)) );
- connect( mAlarmButton, TQT_SIGNAL(toggled(bool)), mAlarmIncrCombo, TQT_SLOT(setEnabled(bool)) );
- connect( mAlarmButton, TQT_SIGNAL(toggled(bool)), mAlarmInfoLabel, TQT_SLOT(setEnabled(bool)) );
+ connect( mAlarmButton, TQ_SIGNAL(toggled(bool)), mAlarmAdvancedButton, TQ_SLOT(setEnabled(bool)) );
+ connect( mAlarmButton, TQ_SIGNAL(toggled(bool)), mAlarmTimeEdit, TQ_SLOT(setEnabled(bool)) );
+ connect( mAlarmButton, TQ_SIGNAL(toggled(bool)), mAlarmIncrCombo, TQ_SLOT(setEnabled(bool)) );
+ connect( mAlarmButton, TQ_SIGNAL(toggled(bool)), mAlarmInfoLabel, TQ_SLOT(setEnabled(bool)) );
}
void KOEditorGeneral::initAttachments(TQWidget *parent,TQBoxLayout *topLayout)
{
mAttachments = new KOEditorAttachments( KDialog::spacingHint(), parent );
- connect( mAttachments, TQT_SIGNAL( openURL( const KURL & ) ) ,
- this, TQT_SIGNAL( openURL( const KURL & ) ) );
+ connect( mAttachments, TQ_SIGNAL( openURL( const KURL & ) ) ,
+ this, TQ_SIGNAL( openURL( const KURL & ) ) );
topLayout->addWidget( mAttachments, 1 );
}
@@ -290,8 +290,8 @@ void KOEditorGeneral::selectCategories()
KOGlobals::fitDialogToScreen( categoryDialog );
categoryDialog->setSelected( mCategories );
- connect(categoryDialog, TQT_SIGNAL(editCategories()), this, TQT_SIGNAL(openCategoryDialog()));
- connect(this, TQT_SIGNAL(updateCategoryConfig()), categoryDialog, TQT_SLOT(updateCategoryConfig()));
+ connect(categoryDialog, TQ_SIGNAL(editCategories()), this, TQ_SIGNAL(openCategoryDialog()));
+ connect(this, TQ_SIGNAL(updateCategoryConfig()), categoryDialog, TQ_SLOT(updateCategoryConfig()));
if ( categoryDialog->exec() ) {
setCategories( categoryDialog->selectedCategories() );
@@ -573,7 +573,7 @@ void KOEditorGeneral::setDescription( const TQString &text )
TQObject *KOEditorGeneral::typeAheadReceiver() const
{
- return TQT_TQOBJECT(mSummaryEdit);
+ return mSummaryEdit;
}
void KOEditorGeneral::updateAttendeeSummary(int count)
diff --git a/korganizer/koeditorgeneral.h b/korganizer/koeditorgeneral.h
index c387792a..b005d608 100644
--- a/korganizer/koeditorgeneral.h
+++ b/korganizer/koeditorgeneral.h
@@ -48,7 +48,7 @@ using namespace KCal;
class FocusLineEdit : public TQLineEdit
{
- Q_OBJECT
+ TQ_OBJECT
public:
FocusLineEdit( TQWidget *parent );
@@ -65,7 +65,7 @@ class FocusLineEdit : public TQLineEdit
class KOEditorGeneral : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOEditorGeneral (TQObject* parent=0,const char* name=0);
diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp
index 49b4d969..2772fbee 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -60,10 +60,10 @@ KOEditorGeneralEvent::KOEditorGeneralEvent(TQObject* parent,
const char* name) :
KOEditorGeneral( parent, name)
{
- connect( this, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & )),
- TQT_SLOT( setDuration() ) );
- connect( this, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & )),
- TQT_SLOT( emitDateTimeStr() ));
+ connect( this, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & )),
+ TQ_SLOT( setDuration() ) );
+ connect( this, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & )),
+ TQ_SLOT( emitDateTimeStr() ));
}
KOEditorGeneralEvent::~KOEditorGeneralEvent()
@@ -95,7 +95,7 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout)
{
TQBoxLayout *timeLayout = new TQVBoxLayout(topLayout);
- TQGroupBox *timeGroupBox = new TQGroupBox(1,Qt::Horizontal,
+ TQGroupBox *timeGroupBox = new TQGroupBox(1,TQt::Horizontal,
i18n("Date && Time"),parent);
TQWhatsThis::add( timeGroupBox,
i18n("Sets options related to the date and time of the "
@@ -130,22 +130,22 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout)
mAlldayEventCheckbox = new TQCheckBox(i18n("All-&day"),timeBoxFrame);
layoutTimeBox->addWidget( mAlldayEventCheckbox, 0, 3 );
- connect(mAlldayEventCheckbox, TQT_SIGNAL(toggled(bool)),TQT_SLOT(associateTime(bool)));
+ connect(mAlldayEventCheckbox, TQ_SIGNAL(toggled(bool)),TQ_SLOT(associateTime(bool)));
mDurationLabel = new TQLabel( timeBoxFrame );
layoutTimeBox->addWidget( mDurationLabel, 1, 3 );
// time widgets are checked if they contain a valid time
- connect(mStartTimeEdit, TQT_SIGNAL(timeChanged(TQTime)),
- this, TQT_SLOT(startTimeChanged(TQTime)));
- connect(mEndTimeEdit, TQT_SIGNAL(timeChanged(TQTime)),
- this, TQT_SLOT(endTimeChanged(TQTime)));
+ connect(mStartTimeEdit, TQ_SIGNAL(timeChanged(TQTime)),
+ this, TQ_SLOT(startTimeChanged(TQTime)));
+ connect(mEndTimeEdit, TQ_SIGNAL(timeChanged(TQTime)),
+ this, TQ_SLOT(endTimeChanged(TQTime)));
// date widgets are checked if they contain a valid date
- connect(mStartDateEdit, TQT_SIGNAL(dateChanged(const TQDate&)),
- this, TQT_SLOT(startDateChanged(const TQDate&)));
- connect(mEndDateEdit, TQT_SIGNAL(dateChanged(const TQDate&)),
- this, TQT_SLOT(endDateChanged(const TQDate&)));
+ connect(mStartDateEdit, TQ_SIGNAL(dateChanged(const TQDate&)),
+ this, TQ_SLOT(startDateChanged(const TQDate&)));
+ connect(mEndDateEdit, TQ_SIGNAL(dateChanged(const TQDate&)),
+ this, TQ_SLOT(endDateChanged(const TQDate&)));
TQLabel *label = new TQLabel( i18n( "Recurrence:" ), timeBoxFrame );
layoutTimeBox->addWidget( label, 2, 0 );
@@ -154,7 +154,7 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout)
mRecEditButton = new TQPushButton( timeBoxFrame );
mRecEditButton->setIconSet( KOGlobals::self()->smallIconSet( "recur", 16 ) );
recLayout->addWidget( mRecEditButton );
- connect( mRecEditButton, TQT_SIGNAL(clicked()), TQT_SIGNAL(editRecurrence()) );
+ connect( mRecEditButton, TQ_SIGNAL(clicked()), TQ_SIGNAL(editRecurrence()) );
mRecEditLabel = new TQLabel( TQString(), timeBoxFrame );
recLayout->addWidget( mRecEditLabel );
recLayout->addStretch( 1 );
@@ -206,12 +206,12 @@ void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * la
barLayout->addWidget( label );
barLayout->addStretch( 1 );
TQPushButton *button = new TQPushButton( i18n("Accept"), mInvitationBar );
- connect( button, TQT_SIGNAL(clicked()), TQT_SIGNAL(acceptInvitation()) );
- connect( button, TQT_SIGNAL(clicked()), mInvitationBar, TQT_SLOT(hide()) );
+ connect( button, TQ_SIGNAL(clicked()), TQ_SIGNAL(acceptInvitation()) );
+ connect( button, TQ_SIGNAL(clicked()), mInvitationBar, TQ_SLOT(hide()) );
barLayout->addWidget( button );
button = new TQPushButton( i18n("Decline"), mInvitationBar );
- connect( button, TQT_SIGNAL(clicked()), TQT_SIGNAL(declineInvitation()) );
- connect( button, TQT_SIGNAL(clicked()), mInvitationBar, TQT_SLOT(hide()) );
+ connect( button, TQ_SIGNAL(clicked()), TQ_SIGNAL(declineInvitation()) );
+ connect( button, TQ_SIGNAL(clicked()), mInvitationBar, TQ_SLOT(hide()) );
barLayout->addWidget( button );
mInvitationBar->hide();
diff --git a/korganizer/koeditorgeneralevent.h b/korganizer/koeditorgeneralevent.h
index c6ace2b1..0483d400 100644
--- a/korganizer/koeditorgeneralevent.h
+++ b/korganizer/koeditorgeneralevent.h
@@ -41,7 +41,7 @@ using namespace KCal;
class KOEditorGeneralEvent : public KOEditorGeneral
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOEditorGeneralEvent (TQObject* parent=0,const char* name=0);
diff --git a/korganizer/koeditorgeneraljournal.cpp b/korganizer/koeditorgeneraljournal.cpp
index 9b27c063..34191bed 100644
--- a/korganizer/koeditorgeneraljournal.cpp
+++ b/korganizer/koeditorgeneraljournal.cpp
@@ -47,7 +47,7 @@
KOEditorGeneralJournal::KOEditorGeneralJournal( TQWidget *parent,
const char *name )
- : KOEditorGeneral( TQT_TQOBJECT(parent), name )
+ : KOEditorGeneral( parent, name )
{
setType( "Journal" );
}
@@ -94,8 +94,8 @@ void KOEditorGeneralJournal::initDate( TQWidget *parent, TQBoxLayout *topLayout
mTimeEdit = new KTimeEdit( parent );
dateLayout->addWidget( mTimeEdit );
- connect( mTimeCheckBox, TQT_SIGNAL(toggled(bool)),
- mTimeEdit, TQT_SLOT(setEnabled(bool)) );
+ connect( mTimeCheckBox, TQ_SIGNAL(toggled(bool)),
+ mTimeEdit, TQ_SLOT(setEnabled(bool)) );
dateLayout->addStretch();
setTime( TQTime( -1, -1, -1 ) );
diff --git a/korganizer/koeditorgeneraljournal.h b/korganizer/koeditorgeneraljournal.h
index 0a2eef18..0de0be42 100644
--- a/korganizer/koeditorgeneraljournal.h
+++ b/korganizer/koeditorgeneraljournal.h
@@ -47,7 +47,7 @@ using namespace KCal;
class KOEditorGeneralJournal : public KOEditorGeneral
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOEditorGeneralJournal ( TQWidget *parent=0, const char* name=0 );
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index 5af7fd60..b871575b 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -96,7 +96,7 @@ void KOEditorGeneralTodo::initTime(TQWidget *parent,TQBoxLayout *topLayout)
kdDebug(5850) << k_funcinfo << endl;
TQBoxLayout *timeLayout = new TQVBoxLayout(topLayout);
- TQGroupBox *timeGroupBox = new TQGroupBox(1,Qt::Horizontal,
+ TQGroupBox *timeGroupBox = new TQGroupBox(1,TQt::Horizontal,
i18n("Date && Time"),parent);
timeLayout->addWidget(timeGroupBox);
@@ -113,46 +113,46 @@ void KOEditorGeneralTodo::initTime(TQWidget *parent,TQBoxLayout *topLayout)
mStartCheck = new TQCheckBox(i18n("Sta&rt:"),timeBoxFrame);
TQWhatsThis::add( mStartCheck, whatsThis );
layoutTimeBox->addWidget(mStartCheck,0,0);
- connect(mStartCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableStartEdit(bool)));
- connect(mStartCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(startDateModified()));
+ connect(mStartCheck,TQ_SIGNAL(toggled(bool)),TQ_SLOT(enableStartEdit(bool)));
+ connect(mStartCheck,TQ_SIGNAL(toggled(bool)),TQ_SLOT(startDateModified()));
mStartDateEdit = new KDateEdit(timeBoxFrame);
TQWhatsThis::add( mStartDateEdit, whatsThis );
layoutTimeBox->addWidget(mStartDateEdit,0,1);
- connect(mStartDateEdit,TQT_SIGNAL(dateChanged(const TQDate&)),TQT_SLOT(startDateModified()));
+ connect(mStartDateEdit,TQ_SIGNAL(dateChanged(const TQDate&)),TQ_SLOT(startDateModified()));
mStartTimeEdit = new KTimeEdit(timeBoxFrame);
TQWhatsThis::add( mStartTimeEdit,
i18n("Sets the start time for this to-do.") );
layoutTimeBox->addWidget(mStartTimeEdit,0,2);
- connect(mStartTimeEdit,TQT_SIGNAL(timeChanged(TQTime)),TQT_SLOT(startDateModified()));
+ connect(mStartTimeEdit,TQ_SIGNAL(timeChanged(TQTime)),TQ_SLOT(startDateModified()));
whatsThis = i18n("Sets the due date for this to-do.");
mDueCheck = new TQCheckBox(i18n("&Due:"),timeBoxFrame);
TQWhatsThis::add( mDueCheck, whatsThis );
layoutTimeBox->addWidget(mDueCheck,1,0);
- connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableDueEdit(bool)));
- connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SIGNAL(dueDateEditToggle(bool)));
- connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(dateChanged()));
+ connect(mDueCheck,TQ_SIGNAL(toggled(bool)),TQ_SLOT(enableDueEdit(bool)));
+ connect(mDueCheck,TQ_SIGNAL(toggled(bool)),TQ_SIGNAL(dueDateEditToggle(bool)));
+ connect(mDueCheck,TQ_SIGNAL(toggled(bool)),TQ_SLOT(dateChanged()));
mDueDateEdit = new KDateEdit(timeBoxFrame);
TQWhatsThis::add( mDueDateEdit, whatsThis );
layoutTimeBox->addWidget(mDueDateEdit,1,1);
- connect(mDueDateEdit,TQT_SIGNAL(dateChanged(const TQDate&)),TQT_SLOT(dateChanged()));
+ connect(mDueDateEdit,TQ_SIGNAL(dateChanged(const TQDate&)),TQ_SLOT(dateChanged()));
mDueTimeEdit = new KTimeEdit(timeBoxFrame);
TQWhatsThis::add( mDueTimeEdit,
i18n("Sets the due time for this to-do.") );
layoutTimeBox->addWidget(mDueTimeEdit,1,2);
- connect(mDueTimeEdit,TQT_SIGNAL(timeChanged( TQTime )),TQT_SLOT(dateChanged()));
+ connect(mDueTimeEdit,TQ_SIGNAL(timeChanged( TQTime )),TQ_SLOT(dateChanged()));
mTimeButton = new TQCheckBox(i18n("Ti&me associated"),timeBoxFrame);
TQWhatsThis::add( mTimeButton,
i18n("Sets whether or not this to-do's start and due dates "
"have times associated with them.") );
layoutTimeBox->addWidget( mTimeButton, 0, 3 );
- connect(mTimeButton,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableTimeEdits(bool)));
- connect(mTimeButton,TQT_SIGNAL(toggled(bool)),TQT_SLOT(dateChanged()));
+ connect(mTimeButton,TQ_SIGNAL(toggled(bool)),TQ_SLOT(enableTimeEdits(bool)));
+ connect(mTimeButton,TQ_SIGNAL(toggled(bool)),TQ_SLOT(dateChanged()));
TQLabel *label = new TQLabel( i18n( "Recurrence:" ), timeBoxFrame );
layoutTimeBox->addWidget( label, 3, 0 );
@@ -161,7 +161,7 @@ void KOEditorGeneralTodo::initTime(TQWidget *parent,TQBoxLayout *topLayout)
mRecEditButton = new TQPushButton( timeBoxFrame );
mRecEditButton->setIconSet( KOGlobals::self()->smallIconSet( "recur", 16 ) );
recLayout->addWidget( mRecEditButton );
- connect( mRecEditButton, TQT_SIGNAL(clicked()), TQT_SIGNAL(editRecurrence()) );
+ connect( mRecEditButton, TQ_SIGNAL(clicked()), TQ_SIGNAL(editRecurrence()) );
mRecEditLabel = new TQLabel( TQString(), timeBoxFrame );
recLayout->addWidget( mRecEditLabel );
recLayout->addStretch( 1 );
@@ -195,7 +195,7 @@ void KOEditorGeneralTodo::initCompletion( TQWidget *parent, TQBoxLayout *topLayo
TQWhatsThis::add( mCompletedToggle,
i18n( "Click this checkbox to toggle the completed percentage of the to-do "
"between 0% or 100%" ) );
- connect( mCompletedToggle, TQT_SIGNAL(clicked()), TQT_SLOT(completedChanged()) );
+ connect( mCompletedToggle, TQ_SIGNAL(clicked()), TQ_SLOT(completedChanged()) );
completionLayout->addWidget( mCompletedToggle );
label->setBuddy( mCompletedToggle );
@@ -209,7 +209,7 @@ void KOEditorGeneralTodo::initCompletion( TQWidget *parent, TQBoxLayout *topLayo
TQString label = i18n( "Percent complete", "%1 %" ).arg( i );
mCompletedCombo->insertItem( label );
}
- connect( mCompletedCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(completedChanged(int)) );
+ connect( mCompletedCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(completedChanged(int)) );
completionLayout->addWidget( mCompletedCombo );
mCompletedLabel = new TQLabel( i18n( "completed on", "on" ), parent );
diff --git a/korganizer/koeditorgeneraltodo.h b/korganizer/koeditorgeneraltodo.h
index 3ccf9c81..07395f1e 100644
--- a/korganizer/koeditorgeneraltodo.h
+++ b/korganizer/koeditorgeneraltodo.h
@@ -41,7 +41,7 @@ using namespace KCal;
class KOEditorGeneralTodo : public KOEditorGeneral
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOEditorGeneralTodo (TQObject* parent=0,const char* name=0);
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index ac372db7..5a5beae6 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -578,7 +578,7 @@ ExceptionsWidget::ExceptionsWidget( TQWidget *parent, const char *name ) :
{
TQBoxLayout *topLayout = new TQVBoxLayout( this );
- TQGroupBox *groupBox = new TQGroupBox( 1, Qt::Horizontal, i18n("E&xceptions"),
+ TQGroupBox *groupBox = new TQGroupBox( 1, TQt::Horizontal, i18n("E&xceptions"),
this );
topLayout->addWidget( groupBox );
@@ -620,12 +620,12 @@ ExceptionsWidget::ExceptionsWidget( TQWidget *parent, const char *name ) :
boxLayout->setRowStretch( 4, 1 );
boxLayout->setColStretch( 1, 3 );
- connect( addExceptionButton, TQT_SIGNAL( clicked() ),
- TQT_SLOT( addException() ) );
- connect( changeExceptionButton, TQT_SIGNAL( clicked() ),
- TQT_SLOT( changeException() ) );
- connect( deleteExceptionButton, TQT_SIGNAL( clicked() ),
- TQT_SLOT( deleteException() ) );
+ connect( addExceptionButton, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( addException() ) );
+ connect( changeExceptionButton, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( changeException() ) );
+ connect( deleteExceptionButton, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( deleteException() ) );
}
void ExceptionsWidget::addException()
@@ -700,7 +700,7 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( TQWidget *parent,
{
TQBoxLayout *topLayout = new TQVBoxLayout( this );
- mRangeGroupBox = new TQGroupBox( 1, Qt::Horizontal, i18n("Recurrence Range"),
+ mRangeGroupBox = new TQGroupBox( 1, TQt::Horizontal, i18n("Recurrence Range"),
this );
TQWhatsThis::add( mRangeGroupBox,
i18n("Sets a range for which these recurrence rules will "
@@ -765,12 +765,12 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( TQWidget *parent,
endDateLayout->addStretch( 1 );
- connect( mNoEndDateButton, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( showCurrentRange() ) );
- connect( mEndDurationButton, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( showCurrentRange() ) );
- connect( mEndDateButton, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( showCurrentRange() ) );
+ connect( mNoEndDateButton, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( showCurrentRange() ) );
+ connect( mEndDurationButton, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( showCurrentRange() ) );
+ connect( mEndDateButton, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( showCurrentRange() ) );
}
void RecurrenceRangeWidget::setDefaults( const TQDateTime &from )
@@ -887,11 +887,11 @@ RecurrenceChooser::RecurrenceChooser( TQWidget *parent, const char *name ) :
topLayout->addWidget( mTypeCombo );
- connect( mTypeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( emitChoice() ) );
+ connect( mTypeCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( emitChoice() ) );
} else {
mTypeCombo = 0;
- TQButtonGroup *ruleButtonGroup = new TQButtonGroup( 1, Qt::Horizontal, this );
+ TQButtonGroup *ruleButtonGroup = new TQButtonGroup( 1, TQt::Horizontal, this );
ruleButtonGroup->setFrameStyle( TQFrame::NoFrame );
topLayout->addWidget( ruleButtonGroup );
@@ -912,14 +912,14 @@ RecurrenceChooser::RecurrenceChooser( TQWidget *parent, const char *name ) :
i18n("Sets the event or to-do to recur yearly according "
"to the specified rules.") );
- connect( mDailyButton, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( emitChoice() ) );
- connect( mWeeklyButton, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( emitChoice() ) );
- connect( mMonthlyButton, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( emitChoice() ) );
- connect( mYearlyButton, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( emitChoice() ) );
+ connect( mDailyButton, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( emitChoice() ) );
+ connect( mWeeklyButton, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( emitChoice() ) );
+ connect( mMonthlyButton, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( emitChoice() ) );
+ connect( mYearlyButton, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( emitChoice() ) );
}
}
@@ -975,12 +975,12 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) :
TQWhatsThis::add( mEnabledCheck,
i18n("Enables recurrence for this event or to-do according "
"to the specified rules.") );
- connect( mEnabledCheck, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( setRecurrenceEnabled( bool ) ) );
+ connect( mEnabledCheck, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( setRecurrenceEnabled( bool ) ) );
topLayout->addMultiCellWidget( mEnabledCheck, 0, 0, 0, 1 );
- mTimeGroupBox = new TQGroupBox( 1, Qt::Horizontal, i18n("Appointment Time "),
+ mTimeGroupBox = new TQGroupBox( 1, TQt::Horizontal, i18n("Appointment Time "),
this );
TQWhatsThis::add( mTimeGroupBox,
i18n("Displays appointment time information.") );
@@ -998,9 +998,9 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) :
// mDateTimeLabel = new TQLabel( timeFrame );
// layoutTimeFrame->addWidget( mDateTimeLabel );
- Qt::Orientation orientation;
- if ( KOPrefs::instance()->mCompactDialogs ) orientation = Qt::Horizontal;
- else orientation = Qt::Vertical;
+ TQt::Orientation orientation;
+ if ( KOPrefs::instance()->mCompactDialogs ) orientation = TQt::Horizontal;
+ else orientation = TQt::Vertical;
mRuleBox = new TQGroupBox( 1, orientation, i18n("Recurrence Rule"), this );
TQWhatsThis::add( mRuleBox,
@@ -1013,8 +1013,8 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) :
}
mRecurrenceChooser = new RecurrenceChooser( mRuleBox );
- connect( mRecurrenceChooser, TQT_SIGNAL( chosen( int ) ),
- TQT_SLOT( showCurrentRule( int ) ) );
+ connect( mRecurrenceChooser, TQ_SIGNAL( chosen( int ) ),
+ TQ_SLOT( showCurrentRule( int ) ) );
if ( !KOPrefs::instance()->mCompactDialogs ) {
TQFrame *ruleSepFrame = new TQFrame( mRuleBox );
@@ -1047,16 +1047,16 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) :
i18n("Options concerning the time range during which "
"this event or to-do should recur.") );
topLayout->addWidget( mRecurrenceRangeButton, 3, 0 );
- connect( mRecurrenceRangeButton, TQT_SIGNAL( clicked() ),
- TQT_SLOT( showRecurrenceRangeDialog() ) );
+ connect( mRecurrenceRangeButton, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( showRecurrenceRangeDialog() ) );
mExceptionsWidget = 0;
mExceptionsDialog = new ExceptionsDialog( this );
mExceptions = mExceptionsDialog;
mExceptionsButton = new TQPushButton( i18n("Exceptions..."), this );
topLayout->addWidget( mExceptionsButton, 4, 0 );
- connect( mExceptionsButton, TQT_SIGNAL( clicked() ),
- TQT_SLOT( showExceptionsDialog() ) );
+ connect( mExceptionsButton, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( showExceptionsDialog() ) );
} else {
mRecurrenceRangeWidget = new RecurrenceRangeWidget( this );
diff --git a/korganizer/koeditorrecurrence.h b/korganizer/koeditorrecurrence.h
index 00224b0c..04f979c9 100644
--- a/korganizer/koeditorrecurrence.h
+++ b/korganizer/koeditorrecurrence.h
@@ -148,7 +148,7 @@ class RecurYearly : public RecurBase
class RecurrenceChooser : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
RecurrenceChooser( TQWidget *parent = 0, const char *name = 0 );
@@ -182,7 +182,7 @@ class ExceptionsBase
class ExceptionsWidget : public TQWidget, public ExceptionsBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
ExceptionsWidget( TQWidget *parent = 0, const char *name = 0 );
@@ -230,7 +230,7 @@ class RecurrenceRangeBase
class RecurrenceRangeWidget : public TQWidget, public RecurrenceRangeBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
RecurrenceRangeWidget( TQWidget *parent = 0, const char *name = 0 );
@@ -281,7 +281,7 @@ class RecurrenceRangeDialog : public KDialogBase, public RecurrenceRangeBase
class KOEditorRecurrence : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOEditorRecurrence ( TQWidget *parent = 0, const char *name = 0 );
@@ -348,7 +348,7 @@ class KOEditorRecurrence : public TQWidget
class KOEditorRecurrenceDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOEditorRecurrenceDialog( TQWidget *parent );
diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp
index ef2dc5df..6bc3c0be 100644
--- a/korganizer/koeventeditor.cpp
+++ b/korganizer/koeventeditor.cpp
@@ -70,39 +70,39 @@ void KOEventEditor::init()
setupDesignerTabs( "event" );
// Propagate date time settings to recurrence tab
- connect( mGeneral, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ),
- mRecurrence, TQT_SLOT( setDateTimes( const TQDateTime &, const TQDateTime &) ) );
- connect( mGeneral, TQT_SIGNAL( dateTimeStrChanged( const TQString & ) ),
- mRecurrence, TQT_SLOT( setDateTimeStr( const TQString & ) ) );
- connect( mFreeBusy, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ),
- mRecurrence, TQT_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) );
+ connect( mGeneral, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ),
+ mRecurrence, TQ_SLOT( setDateTimes( const TQDateTime &, const TQDateTime &) ) );
+ connect( mGeneral, TQ_SIGNAL( dateTimeStrChanged( const TQString & ) ),
+ mRecurrence, TQ_SLOT( setDateTimeStr( const TQString & ) ) );
+ connect( mFreeBusy, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ),
+ mRecurrence, TQ_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) );
// Propagate date time settings to gantt tab and back
- connect( mGeneral, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ),
- mFreeBusy, TQT_SLOT( slotUpdateGanttView( const TQDateTime &, const TQDateTime & ) ) );
- connect( mFreeBusy, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ),
- mGeneral, TQT_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) );
-
- connect( mGeneral, TQT_SIGNAL( focusReceivedSignal() ),
- TQT_SIGNAL( focusReceivedSignal() ) );
-
- connect( mGeneral, TQT_SIGNAL( openCategoryDialog() ),
- TQT_SIGNAL( editCategories() ) );
- connect( this, TQT_SIGNAL( updateCategoryConfig() ),
- mGeneral, TQT_SIGNAL( updateCategoryConfig() ) );
-
- connect( mFreeBusy, TQT_SIGNAL(updateAttendeeSummary(int)),
- mGeneral, TQT_SLOT(updateAttendeeSummary(int)) );
-
- connect( mGeneral, TQT_SIGNAL(editRecurrence()),
- mRecurrenceDialog, TQT_SLOT(show()) );
- connect( mRecurrenceDialog, TQT_SIGNAL(okClicked()),
- TQT_SLOT(updateRecurrenceSummary()) );
-
- connect( mGeneral, TQT_SIGNAL(acceptInvitation()),
- mFreeBusy, TQT_SLOT(acceptForMe()) );
- connect( mGeneral, TQT_SIGNAL(declineInvitation()),
- mFreeBusy, TQT_SLOT(declineForMe()) );
+ connect( mGeneral, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ),
+ mFreeBusy, TQ_SLOT( slotUpdateGanttView( const TQDateTime &, const TQDateTime & ) ) );
+ connect( mFreeBusy, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ),
+ mGeneral, TQ_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) );
+
+ connect( mGeneral, TQ_SIGNAL( focusReceivedSignal() ),
+ TQ_SIGNAL( focusReceivedSignal() ) );
+
+ connect( mGeneral, TQ_SIGNAL( openCategoryDialog() ),
+ TQ_SIGNAL( editCategories() ) );
+ connect( this, TQ_SIGNAL( updateCategoryConfig() ),
+ mGeneral, TQ_SIGNAL( updateCategoryConfig() ) );
+
+ connect( mFreeBusy, TQ_SIGNAL(updateAttendeeSummary(int)),
+ mGeneral, TQ_SLOT(updateAttendeeSummary(int)) );
+
+ connect( mGeneral, TQ_SIGNAL(editRecurrence()),
+ mRecurrenceDialog, TQ_SLOT(show()) );
+ connect( mRecurrenceDialog, TQ_SIGNAL(okClicked()),
+ TQ_SLOT(updateRecurrenceSummary()) );
+
+ connect( mGeneral, TQ_SIGNAL(acceptInvitation()),
+ mFreeBusy, TQ_SLOT(acceptForMe()) );
+ connect( mGeneral, TQ_SIGNAL(declineInvitation()),
+ mFreeBusy, TQ_SLOT(declineForMe()) );
}
void KOEventEditor::reload()
@@ -116,7 +116,7 @@ void KOEventEditor::reload()
void KOEventEditor::setupGeneral()
{
- mGeneral = new KOEditorGeneralEvent( TQT_TQOBJECT(this) );
+ mGeneral = new KOEditorGeneralEvent( this );
if( KOPrefs::instance()->mCompactDialogs ) {
TQFrame *topFrame = addPage(i18n("General"));
@@ -154,10 +154,10 @@ void KOEventEditor::setupGeneral()
mGeneral->initTime(topFrame,topLayout);
mGeneral->initDescription(topFrame,topLayout);
mGeneral->initAttachments(topFrame,topLayout);
- connect( mGeneral, TQT_SIGNAL( openURL( const KURL& ) ),
- this, TQT_SLOT( openURL( const KURL& ) ) );
- connect( this, TQT_SIGNAL( signalAddAttachments( const TQStringList&, const TQStringList&, bool ) ),
- mGeneral, TQT_SLOT( addAttachments( const TQStringList&, const TQStringList&, bool ) ) );
+ connect( mGeneral, TQ_SIGNAL( openURL( const KURL& ) ),
+ this, TQ_SLOT( openURL( const KURL& ) ) );
+ connect( this, TQ_SIGNAL( signalAddAttachments( const TQStringList&, const TQStringList&, bool ) ),
+ mGeneral, TQ_SLOT( addAttachments( const TQStringList&, const TQStringList&, bool ) ) );
}
mGeneral->finishSetup();
diff --git a/korganizer/koeventeditor.h b/korganizer/koeventeditor.h
index bb2405eb..4b3c99ea 100644
--- a/korganizer/koeventeditor.h
+++ b/korganizer/koeventeditor.h
@@ -47,7 +47,7 @@ using namespace KCal;
*/
class KOEventEditor : public KOIncidenceEditor
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp
index 73a0942e..1ab4b89e 100644
--- a/korganizer/koeventpopupmenu.cpp
+++ b/korganizer/koeventpopupmenu.cpp
@@ -50,44 +50,44 @@ KOEventPopupMenu::KOEventPopupMenu()
mCurrentDate = TQDate();
mHasAdditionalItems = false;
- insertItem( i18n("&Show"), this, TQT_SLOT( popupShow() ) );
+ insertItem( i18n("&Show"), this, TQ_SLOT( popupShow() ) );
mEditOnlyItems.append(
- insertItem(i18n("&Edit..."), this, TQT_SLOT( popupEdit() ) ) );
+ insertItem(i18n("&Edit..."), this, TQ_SLOT( popupEdit() ) ) );
#ifndef KORG_NOPRINTER
insertItem( KOGlobals::self()->smallIcon("printer"), i18n("&Print..."),
- this, TQT_SLOT( print() ) );
+ this, TQ_SLOT( print() ) );
#endif
//------------------------------------------------------------------------
mEditOnlyItems.append( insertSeparator() );
mEditOnlyItems.append(
insertItem( KOGlobals::self()->smallIcon("edit-cut"), i18n("&Cut"),
- this, TQT_SLOT( popupCut() ) ) );
+ this, TQ_SLOT( popupCut() ) ) );
mEditOnlyItems.append(
insertItem( KOGlobals::self()->smallIcon("edit-copy"), i18n("&Copy"),
- this, TQT_SLOT( popupCopy() ) ) );
+ this, TQ_SLOT( popupCopy() ) ) );
// paste is always possible
insertItem( KOGlobals::self()->smallIcon("edit-paste"), i18n("&Paste"),
- this, TQT_SLOT( popupPaste() ) );
+ this, TQ_SLOT( popupPaste() ) );
mEditOnlyItems.append(
insertItem( KOGlobals::self()->smallIcon("edit-delete"), i18n("&Delete"),
- this, TQT_SLOT( popupDelete() ) ) );
+ this, TQ_SLOT( popupDelete() ) ) );
//------------------------------------------------------------------------
mEditOnlyItems.append( insertSeparator() );
mEditOnlyItems.append(
insertItem( KOGlobals::self()->smallIcon("bell"), i18n("&Toggle Reminder"),
- this, TQT_SLOT( popupAlarm() ) ) );
+ this, TQ_SLOT( popupAlarm() ) ) );
//------------------------------------------------------------------------
mRecurrenceItems.append( insertSeparator() );
mRecurrenceItems.append(
insertItem( i18n("&Dissociate This Occurrence"),
- this, TQT_SLOT( dissociateOccurrence() ) ) );
+ this, TQ_SLOT( dissociateOccurrence() ) ) );
mRecurrenceItems.append(
insertItem( i18n("&Dissociate Future Occurrences"),
- this, TQT_SLOT( dissociateFutureOccurrence() ) ) );
+ this, TQ_SLOT( dissociateFutureOccurrence() ) ) );
insertSeparator();
insertItem( KOGlobals::self()->smallIcon("mail-forward"), i18n( "Send as iCalendar..."),
- this, TQT_SLOT(forward()) );
+ this, TQ_SLOT(forward()) );
}
void KOEventPopupMenu::showIncidencePopup( Calendar *cal, Incidence *incidence, const TQDate &qd )
@@ -142,7 +142,7 @@ void KOEventPopupMenu::print()
#ifndef KORG_NOPRINTER
KOCoreHelper helper;
CalPrinter printer( this, mCalendar, &helper );
- connect( this, TQT_SIGNAL(configChanged()), &printer, TQT_SLOT(updateConfig()) );
+ connect( this, TQ_SIGNAL(configChanged()), &printer, TQ_SLOT(updateConfig()) );
Incidence::List selectedIncidences;
selectedIncidences.append( mCurrentIncidence );
diff --git a/korganizer/koeventpopupmenu.h b/korganizer/koeventpopupmenu.h
index cc846885..21c7b6aa 100644
--- a/korganizer/koeventpopupmenu.h
+++ b/korganizer/koeventpopupmenu.h
@@ -37,7 +37,7 @@ class Incidence;
using namespace KCal;
class KOEventPopupMenu : public TQPopupMenu {
- Q_OBJECT
+ TQ_OBJECT
public:
KOEventPopupMenu();
diff --git a/korganizer/koeventview.cpp b/korganizer/koeventview.cpp
index 9bd038d2..7ac37573 100644
--- a/korganizer/koeventview.cpp
+++ b/korganizer/koeventview.cpp
@@ -61,24 +61,24 @@ KOEventPopupMenu *KOEventView::eventPopup()
{
KOEventPopupMenu *eventPopup = new KOEventPopupMenu;
- connect( eventPopup, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)),
- TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) );
- connect( eventPopup, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)),
- TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) );
- connect( eventPopup, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)),
- TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) );
- connect( eventPopup, TQT_SIGNAL(cutIncidenceSignal(Incidence *)),
- TQT_SIGNAL(cutIncidenceSignal(Incidence *)) );
- connect( eventPopup, TQT_SIGNAL(copyIncidenceSignal(Incidence *)),
- TQT_SIGNAL(copyIncidenceSignal(Incidence *)) );
- connect( eventPopup, TQT_SIGNAL(pasteIncidenceSignal()),
- TQT_SIGNAL(pasteIncidenceSignal()) );
- connect( eventPopup, TQT_SIGNAL(toggleAlarmSignal(Incidence *)),
- TQT_SIGNAL(toggleAlarmSignal(Incidence*)) );
- connect( eventPopup, TQT_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)),
- TQT_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)) );
- connect( eventPopup, TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)),
- TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)) );
+ connect( eventPopup, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)),
+ TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) );
+ connect( eventPopup, TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)),
+ TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) );
+ connect( eventPopup, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)),
+ TQ_SIGNAL(deleteIncidenceSignal(Incidence *)) );
+ connect( eventPopup, TQ_SIGNAL(cutIncidenceSignal(Incidence *)),
+ TQ_SIGNAL(cutIncidenceSignal(Incidence *)) );
+ connect( eventPopup, TQ_SIGNAL(copyIncidenceSignal(Incidence *)),
+ TQ_SIGNAL(copyIncidenceSignal(Incidence *)) );
+ connect( eventPopup, TQ_SIGNAL(pasteIncidenceSignal()),
+ TQ_SIGNAL(pasteIncidenceSignal()) );
+ connect( eventPopup, TQ_SIGNAL(toggleAlarmSignal(Incidence *)),
+ TQ_SIGNAL(toggleAlarmSignal(Incidence*)) );
+ connect( eventPopup, TQ_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)),
+ TQ_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)) );
+ connect( eventPopup, TQ_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)),
+ TQ_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)) );
return eventPopup;
}
diff --git a/korganizer/koeventview.h b/korganizer/koeventview.h
index a5441a83..d8b2a67a 100644
--- a/korganizer/koeventview.h
+++ b/korganizer/koeventview.h
@@ -54,7 +54,7 @@ class TQPopupMenu;
*/
class KOEventView : public KOrg::BaseView
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index ddd4fcde..7d36b4aa 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -43,7 +43,7 @@ KOEventViewer::KOEventViewer( Calendar *calendar, TQWidget *parent, const char *
: TQTextBrowser( parent, name ), mCalendar( calendar ), mDefaultText("")
{
mIncidence = 0;
- connect( this, TQT_SIGNAL(highlighted(const TQString &)), TQT_SLOT(message(const TQString &)) );
+ connect( this, TQ_SIGNAL(highlighted(const TQString &)), TQ_SLOT(message(const TQString &)) );
}
KOEventViewer::~KOEventViewer()
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h
index 5aa897ac..7758cfdc 100644
--- a/korganizer/koeventviewer.h
+++ b/korganizer/koeventviewer.h
@@ -39,7 +39,7 @@ using namespace KCal;
*/
class KDE_EXPORT KOEventViewer : public TQTextBrowser
{
- Q_OBJECT
+ TQ_OBJECT
public:
explicit KOEventViewer( Calendar *calendar, TQWidget *parent = 0, const char *name = 0 );
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index 7e783695..12a2f79d 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -43,7 +43,7 @@ KOEventViewerDialog::KOEventViewerDialog( Calendar *calendar, TQWidget *parent,
setMinimumSize( 500, 500 );
resize( 520, 500 );
}
- connect( this, TQT_SIGNAL(finished()), this, TQT_SLOT(delayedDestruct()) );
+ connect( this, TQ_SIGNAL(finished()), this, TQ_SLOT(delayedDestruct()) );
}
KOEventViewerDialog::~KOEventViewerDialog()
diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h
index 4c6a8f37..48c02c8a 100644
--- a/korganizer/koeventviewerdialog.h
+++ b/korganizer/koeventviewerdialog.h
@@ -40,7 +40,7 @@ class KOEventViewer;
*/
class KDE_EXPORT KOEventViewerDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
explicit KOEventViewerDialog( Calendar *calendar, TQWidget *parent = 0,
diff --git a/korganizer/kogroupware.cpp b/korganizer/kogroupware.cpp
index 6e86c857..5c8342ac 100644
--- a/korganizer/kogroupware.cpp
+++ b/korganizer/kogroupware.cpp
@@ -84,10 +84,10 @@ KOGroupware::KOGroupware( CalendarView* view, KCal::CalendarResources* cal )
watcher->addDir( locateLocal( "data", "korganizer/income.cancel/" ) );
watcher->addDir( locateLocal( "data", "korganizer/income.reply/" ) );
watcher->addDir( locateLocal( "data", "korganizer/income.delegated/" ) );
- connect( watcher, TQT_SIGNAL( dirty( const TQString& ) ),
- this, TQT_SLOT( incomingDirChanged( const TQString& ) ) );
+ connect( watcher, TQ_SIGNAL( dirty( const TQString& ) ),
+ this, TQ_SLOT( incomingDirChanged( const TQString& ) ) );
// Now set the ball rolling
- TQTimer::singleShot( 0, this, TQT_SLOT(initialCheckForChanges()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(initialCheckForChanges()) );
}
void KOGroupware::initialCheckForChanges()
@@ -103,12 +103,12 @@ void KOGroupware::initialCheckForChanges()
void KOGroupware::slotViewNewIncidenceChanger( IncidenceChangerBase* changer )
{
// Call slot perhapsUploadFB if an incidence was added, changed or removed
- connect( changer, TQT_SIGNAL( incidenceAdded( Incidence* ) ),
- mFreeBusyManager, TQT_SLOT( slotPerhapsUploadFB() ) );
- connect( changer, TQT_SIGNAL( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ),
- mFreeBusyManager, TQT_SLOT( slotPerhapsUploadFB() ) );
- connect( changer, TQT_SIGNAL( incidenceDeleted( Incidence * ) ),
- mFreeBusyManager, TQT_SLOT( slotPerhapsUploadFB() ) );
+ connect( changer, TQ_SIGNAL( incidenceAdded( Incidence* ) ),
+ mFreeBusyManager, TQ_SLOT( slotPerhapsUploadFB() ) );
+ connect( changer, TQ_SIGNAL( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ),
+ mFreeBusyManager, TQ_SLOT( slotPerhapsUploadFB() ) );
+ connect( changer, TQ_SIGNAL( incidenceDeleted( Incidence * ) ),
+ mFreeBusyManager, TQ_SLOT( slotPerhapsUploadFB() ) );
}
FreeBusyManager *KOGroupware::freeBusyManager()
@@ -116,10 +116,10 @@ FreeBusyManager *KOGroupware::freeBusyManager()
if ( !mFreeBusyManager ) {
mFreeBusyManager = new FreeBusyManager( this, "freebusymanager" );
mFreeBusyManager->setCalendar( mCalendar );
- connect( mCalendar, TQT_SIGNAL( calendarChanged() ),
- mFreeBusyManager, TQT_SLOT( slotPerhapsUploadFB() ) );
- connect( mView, TQT_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ),
- this, TQT_SLOT( slotViewNewIncidenceChanger( IncidenceChangerBase* ) ) );
+ connect( mCalendar, TQ_SIGNAL( calendarChanged() ),
+ mFreeBusyManager, TQ_SLOT( slotPerhapsUploadFB() ) );
+ connect( mView, TQ_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ),
+ this, TQ_SLOT( slotViewNewIncidenceChanger( IncidenceChangerBase* ) ) );
slotViewNewIncidenceChanger( mView->incidenceChanger() );
}
diff --git a/korganizer/kogroupware.h b/korganizer/kogroupware.h
index ce253dfc..c4205637 100644
--- a/korganizer/kogroupware.h
+++ b/korganizer/kogroupware.h
@@ -64,7 +64,7 @@ using namespace KOrg;
class KOGroupware : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
static KOGroupware* create( CalendarView*, KCal::CalendarResources* );
diff --git a/korganizer/kogroupwareprefspage.ui b/korganizer/kogroupwareprefspage.ui
index 83c5799f..13626feb 100644
--- a/korganizer/kogroupwareprefspage.ui
+++ b/korganizer/kogroupwareprefspage.ui
@@ -620,12 +620,12 @@ For security reasons, it is not recommended to store your password in the config
<include location="global" impldecl="in declaration">kdemacros.h</include>
<include location="local" impldecl="in implementation">kogroupwareprefspage.ui.h</include>
</includes>
-<Q_SIGNALS>
+<signals>
<signal>changed()</signal>
-</Q_SIGNALS>
-<Q_SLOTS>
+</signals>
+<slots>
<slot>slotChanged()</slot>
-</Q_SLOTS>
+</slots>
<exportmacro>KDE_EXPORT</exportmacro>
<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp
index 40851e99..499a4580 100644
--- a/korganizer/koincidenceeditor.cpp
+++ b/korganizer/koincidenceeditor.cpp
@@ -75,8 +75,8 @@ KOIncidenceEditor::KOIncidenceEditor( const TQString &caption,
setButtonText( Default, i18n("&Templates...") );
}
- connect( this, TQT_SIGNAL( defaultClicked() ), TQT_SLOT( slotManageTemplates() ) );
- connect( this, TQT_SIGNAL( finished() ), TQT_SLOT( delayedDestruct() ) );
+ connect( this, TQ_SIGNAL( defaultClicked() ), TQ_SLOT( slotManageTemplates() ) );
+ connect( this, TQ_SIGNAL( finished() ), TQ_SLOT( delayedDestruct() ) );
}
KOIncidenceEditor::~KOIncidenceEditor()
@@ -139,12 +139,12 @@ void KOIncidenceEditor::slotManageTemplates()
kdDebug(5850) << "KOIncidenceEditor::manageTemplates()" << endl;
TemplateManagementDialog * const d = new TemplateManagementDialog( this, templates() );
- connect( d, TQT_SIGNAL( loadTemplate( const TQString& ) ),
- this, TQT_SLOT( slotLoadTemplate( const TQString& ) ) );
- connect( d, TQT_SIGNAL( templatesChanged( const TQStringList& ) ),
- this, TQT_SLOT( slotTemplatesChanged( const TQStringList& ) ) );
- connect( d, TQT_SIGNAL( saveTemplate( const TQString& ) ),
- this, TQT_SLOT( slotSaveTemplate( const TQString& ) ) );
+ connect( d, TQ_SIGNAL( loadTemplate( const TQString& ) ),
+ this, TQ_SLOT( slotLoadTemplate( const TQString& ) ) );
+ connect( d, TQ_SIGNAL( templatesChanged( const TQStringList& ) ),
+ this, TQ_SLOT( slotTemplatesChanged( const TQStringList& ) ) );
+ connect( d, TQ_SIGNAL( saveTemplate( const TQString& ) ),
+ this, TQ_SLOT( slotSaveTemplate( const TQString& ) ) );
d->exec();
return;
}
@@ -296,8 +296,8 @@ void KOIncidenceEditor::setupEmbeddedURLPage( const TQString &label,
topFrame );
topLayout->addWidget( wid );
mEmbeddedURLPages.append( topFrame );
- connect( wid, TQT_SIGNAL( openURL( const KURL & ) ) ,
- this, TQT_SLOT( openURL( const KURL & ) ) );
+ connect( wid, TQ_SIGNAL( openURL( const KURL & ) ) ,
+ this, TQ_SLOT( openURL( const KURL & ) ) );
// TODO: Call this method only when the tab is actually activated!
wid->loadContents();
}
diff --git a/korganizer/koincidenceeditor.h b/korganizer/koincidenceeditor.h
index 8c397d7c..99104929 100644
--- a/korganizer/koincidenceeditor.h
+++ b/korganizer/koincidenceeditor.h
@@ -56,7 +56,7 @@ using namespace KOrg;
*/
class KOIncidenceEditor : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/korganizer/kojournaleditor.h b/korganizer/kojournaleditor.h
index 14433c21..2dd2ae3a 100644
--- a/korganizer/kojournaleditor.h
+++ b/korganizer/kojournaleditor.h
@@ -45,7 +45,7 @@ class KOEditorGeneralJournal;
*/
class KOJournalEditor : public KOIncidenceEditor
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp
index 3bc78156..252bbc53 100644
--- a/korganizer/kojournalview.cpp
+++ b/korganizer/kojournalview.cpp
@@ -71,24 +71,24 @@ void KOJournalView::appendJournal( Journal*journal, const TQDate &dt)
entry->setDate( dt );
entry->setIncidenceChanger( mChanger );
entry->show();
- connect( this, TQT_SIGNAL(flushEntries()),
- entry, TQT_SIGNAL(flushEntries()) );
+ connect( this, TQ_SIGNAL(flushEntries()),
+ entry, TQ_SIGNAL(flushEntries()) );
- connect( this, TQT_SIGNAL(setIncidenceChangerSignal(IncidenceChangerBase *)),
- entry, TQT_SLOT(setIncidenceChanger( IncidenceChangerBase *)) );
+ connect( this, TQ_SIGNAL(setIncidenceChangerSignal(IncidenceChangerBase *)),
+ entry, TQ_SLOT(setIncidenceChanger( IncidenceChangerBase *)) );
- connect( this, TQT_SIGNAL(journalEdited(Journal *)),
- entry, TQT_SLOT(journalEdited(Journal *)) );
- connect( this, TQT_SIGNAL(journalDeleted(Journal *)),
- entry, TQT_SLOT(journalDeleted(Journal *)) );
+ connect( this, TQ_SIGNAL(journalEdited(Journal *)),
+ entry, TQ_SLOT(journalEdited(Journal *)) );
+ connect( this, TQ_SIGNAL(journalDeleted(Journal *)),
+ entry, TQ_SLOT(journalDeleted(Journal *)) );
- connect( entry, TQT_SIGNAL(editIncidence(Incidence *,const TQDate &)),
- this, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) );
- connect( entry, TQT_SIGNAL(deleteIncidence(Incidence *)),
- this, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) );
+ connect( entry, TQ_SIGNAL(editIncidence(Incidence *,const TQDate &)),
+ this, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) );
+ connect( entry, TQ_SIGNAL(deleteIncidence(Incidence *)),
+ this, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)) );
- connect( entry, TQT_SIGNAL(newJournal(ResourceCalendar *,const TQString &,const TQDate &)),
- this, TQT_SIGNAL(newJournalSignal(ResourceCalendar *,const TQString &,const TQDate &)) );
+ connect( entry, TQ_SIGNAL(newJournal(ResourceCalendar *,const TQString &,const TQDate &)),
+ this, TQ_SIGNAL(newJournalSignal(ResourceCalendar *,const TQString &,const TQDate &)) );
mEntries.insert( dt, entry );
}
diff --git a/korganizer/kojournalview.h b/korganizer/kojournalview.h
index e229a99f..f2ff84a2 100644
--- a/korganizer/kojournalview.h
+++ b/korganizer/kojournalview.h
@@ -40,7 +40,7 @@ class TQVBox;
*/
class KOJournalView : public KOrg::BaseView
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOJournalView( Calendar *calendar, TQWidget *parent = 0,
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index aa97348c..df52e88a 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -135,9 +135,9 @@ bool KOListView::ListItemVisitor::visit( Event *e )
TQString endDateTime;
mItem->setText( StartDateTime_Column, IncidenceFormatter::dateTimeToString( e->dtStart(), e->doesFloat() ) );
- mItem->setSortKey( StartDateTime_Column, e->dtStart().toString( Qt::ISODate ) );
+ mItem->setSortKey( StartDateTime_Column, e->dtStart().toString( TQt::ISODate ) );
mItem->setText( EndDateTime_Column, IncidenceFormatter::dateTimeToString( e->dtEnd(), e->doesFloat() ) );
- mItem->setSortKey( EndDateTime_Column, e->dtEnd().toString( Qt::ISODate ) );
+ mItem->setSortKey( EndDateTime_Column, e->dtEnd().toString( TQt::ISODate ) );
mItem->setText( Categories_Column, e->categoriesStr() );
return true;
@@ -167,14 +167,14 @@ bool KOListView::ListItemVisitor::visit( Todo *t )
if ( t->hasStartDate() ) {
mItem->setText( StartDateTime_Column, IncidenceFormatter::dateTimeToString( t->dtStart(), t->doesFloat() ) );
- mItem->setSortKey( StartDateTime_Column, t->dtStart().toString( Qt::ISODate ) );
+ mItem->setSortKey( StartDateTime_Column, t->dtStart().toString( TQt::ISODate ) );
} else {
mItem->setText( StartDateTime_Column, "---" );
}
if ( t->hasDueDate() ) {
mItem->setText( EndDateTime_Column, IncidenceFormatter::dateTimeToString( t->dtDue(), t->doesFloat() ) );
- mItem->setSortKey( EndDateTime_Column, t->dtDue().toString( Qt::ISODate ) );
+ mItem->setSortKey( EndDateTime_Column, t->dtDue().toString( TQt::ISODate ) );
} else {
mItem->setText( EndDateTime_Column, "---" );
}
@@ -190,7 +190,7 @@ bool KOListView::ListItemVisitor::visit( Journal *j )
// Just use the first line
mItem->setText( Summary_Column, j->description().section( "\n", 0, 0 ) );
mItem->setText( StartDateTime_Column, IncidenceFormatter::dateTimeToString( j->dtStart(), j->doesFloat() ) );
- mItem->setSortKey( StartDateTime_Column, j->dtStart().toString( Qt::ISODate ) );
+ mItem->setSortKey( StartDateTime_Column, j->dtStart().toString( TQt::ISODate ) );
return true;
}
@@ -227,21 +227,21 @@ KOListView::KOListView( Calendar *calendar,
/*
mPopupMenu->insertSeparator();
mPopupMenu->insertItem(i18n("Show Dates"), this,
- TQT_SLOT(showDates()));
+ TQ_SLOT(showDates()));
mPopupMenu->insertItem(i18n("Hide Dates"), this,
- TQT_SLOT(hideDates()));
+ TQ_SLOT(hideDates()));
*/
- connect( mListView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
- TQT_SLOT( defaultItemAction( TQListViewItem * ) ) );
- connect( mListView, TQT_SIGNAL( returnPressed( TQListViewItem * ) ),
- TQT_SLOT( defaultItemAction( TQListViewItem * ) ) );
- connect( mListView, TQT_SIGNAL( rightButtonClicked ( TQListViewItem *,
+ connect( mListView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ),
+ TQ_SLOT( defaultItemAction( TQListViewItem * ) ) );
+ connect( mListView, TQ_SIGNAL( returnPressed( TQListViewItem * ) ),
+ TQ_SLOT( defaultItemAction( TQListViewItem * ) ) );
+ connect( mListView, TQ_SIGNAL( rightButtonClicked ( TQListViewItem *,
const TQPoint &,
int ) ),
- TQT_SLOT( popupMenu( TQListViewItem *, const TQPoint &, int ) ) );
- connect( mListView, TQT_SIGNAL( selectionChanged() ),
- TQT_SLOT( processSelectionChange() ) );
+ TQ_SLOT( popupMenu( TQListViewItem *, const TQPoint &, int ) ) );
+ connect( mListView, TQ_SIGNAL( selectionChanged() ),
+ TQ_SLOT( processSelectionChange() ) );
// setMinimumSize(100,100);
mListView->restoreLayout( KOGlobals::self()->config(), "KOListView Layout" );
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h
index 70ba080c..71f304af 100644
--- a/korganizer/kolistview.h
+++ b/korganizer/kolistview.h
@@ -67,7 +67,7 @@ class KOListViewToolTip : public TQToolTip
*/
class KOListView : public KOEventView
{
- Q_OBJECT
+ TQ_OBJECT
public:
explicit KOListView( Calendar *calendar,
diff --git a/korganizer/komessagebox.cpp b/korganizer/komessagebox.cpp
index 9c843b59..641d5106 100644
--- a/korganizer/komessagebox.cpp
+++ b/korganizer/komessagebox.cpp
@@ -41,9 +41,9 @@ int KOMessageBox::fourBtnMsgBox( TQWidget *parent, TQMessageBox::Icon type,
dialog->setButtonOK( button3 );
dialog->setButtonText( KDialogBase::Yes, button1.text() );
dialog->setButtonText( KDialogBase::No, button2.text() );
- TQObject::connect( dialog->actionButton( KDialogBase::Yes ), TQT_SIGNAL( clicked() ), dialog, TQT_SLOT(slotYes()));
- TQObject::connect( dialog->actionButton( KDialogBase::No ), TQT_SIGNAL( clicked() ), dialog, TQT_SLOT(slotNo()));
-// TQObject::connect( dialog, TQT_SIGNAL( noClicked() ), dialog, TQT_SLOT(slotNo()));
+ TQObject::connect( dialog->actionButton( KDialogBase::Yes ), TQ_SIGNAL( clicked() ), dialog, TQ_SLOT(slotYes()));
+ TQObject::connect( dialog->actionButton( KDialogBase::No ), TQ_SIGNAL( clicked() ), dialog, TQ_SLOT(slotNo()));
+// TQObject::connect( dialog, TQ_SIGNAL( noClicked() ), dialog, TQ_SLOT(slotNo()));
bool checkboxResult = false;
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index ab61181c..23b477e1 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -168,7 +168,7 @@ void KNoScrollListBox::mousePressEvent( TQMouseEvent *e )
{
TQListBox::mousePressEvent( e );
- if ( e->button() == Qt::RightButton ) {
+ if ( e->button() == TQt::RightButton ) {
emit rightClick();
}
}
@@ -259,7 +259,7 @@ void MonthViewItem::paint( TQPainter *p )
}
if ( !bgColor.isValid() ) {
- bgColor = palette().color( TQPalette::Normal,
+ bgColor = palette().color( TQPalette::Active,
sel ? TQColorGroup::Highlight :
TQColorGroup::Background );
}
@@ -286,7 +286,7 @@ void MonthViewItem::paint( TQPainter *p )
}
if ( !frameColor.isValid() ) {
- frameColor = palette().color( TQPalette::Normal,
+ frameColor = palette().color( TQPalette::Active,
sel ? TQColorGroup::Highlight :
TQColorGroup::Foreground );
} else {
@@ -405,13 +405,13 @@ MonthViewCell::MonthViewCell( KOMonthView *parent)
updateConfig();
- connect( mItemList, TQT_SIGNAL( doubleClicked( TQListBoxItem *) ),
- TQT_SLOT( defaultAction( TQListBoxItem * ) ) );
- connect( mItemList, TQT_SIGNAL( rightButtonPressed( TQListBoxItem *,
+ connect( mItemList, TQ_SIGNAL( doubleClicked( TQListBoxItem *) ),
+ TQ_SLOT( defaultAction( TQListBoxItem * ) ) );
+ connect( mItemList, TQ_SIGNAL( rightButtonPressed( TQListBoxItem *,
const TQPoint &) ),
- TQT_SLOT( contextMenu( TQListBoxItem * ) ) );
- connect( mItemList, TQT_SIGNAL( clicked( TQListBoxItem * ) ),
- TQT_SLOT( select() ) );
+ TQ_SLOT( contextMenu( TQListBoxItem * ) ) );
+ connect( mItemList, TQ_SIGNAL( clicked( TQListBoxItem * ) ),
+ TQ_SLOT( select() ) );
}
void MonthViewCell::setDate( const TQDate &date )
@@ -861,10 +861,10 @@ KOMonthView::KOMonthView( Calendar *calendar, TQWidget *parent, const char *name
mCells.insert( row * mDaysPerWeek + col, cell );
dayLayout->addWidget( cell, row + 2, col );
- connect( cell, TQT_SIGNAL(defaultAction(Incidence *)),
- TQT_SLOT(defaultAction(Incidence *)) );
- connect( cell, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)),
- TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)) );
+ connect( cell, TQ_SIGNAL(defaultAction(Incidence *)),
+ TQ_SLOT(defaultAction(Incidence *)) );
+ connect( cell, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)),
+ TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)) );
}
dayLayout->setRowStretch( row + 2, 1 );
}
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index d9b63bd9..706a2e9f 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -50,7 +50,7 @@ class KOMonthCellToolTip : public TQToolTip
class KNoScrollListBox: public TQListBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
KNoScrollListBox(TQWidget *parent=0, const char *name=0);
@@ -134,7 +134,7 @@ class KOMonthView;
*/
class MonthViewCell : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
class CreateItemVisitor;
@@ -244,7 +244,7 @@ class MonthViewCell : public TQWidget
*/
class KOMonthView: public KOEventView
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOMonthView(Calendar *cal, TQWidget *parent = 0, const char *name = 0 );
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 3e4f98bf..60fd3e45 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -92,15 +92,15 @@ KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *parent, const char *name )
KPrefsWidBool *emailControlCenter =
addWidBool( KOPrefs::instance()->emailControlCenterItem(), topFrame );
- connect(emailControlCenter->checkBox(),TQT_SIGNAL(toggled(bool)),
- TQT_SLOT(toggleEmailSettings(bool)));
+ connect(emailControlCenter->checkBox(),TQ_SIGNAL(toggled(bool)),
+ TQ_SLOT(toggleEmailSettings(bool)));
mUserEmailSettings = new TQGrid( 2, topFrame );
addWidString( KOPrefs::instance()->userNameItem(), mUserEmailSettings );
addWidString( KOPrefs::instance()->userEmailItem(), mUserEmailSettings );
- TQGroupBox *saveGroup = new TQGroupBox(1,Qt::Horizontal,i18n("Saving Calendar"),
+ TQGroupBox *saveGroup = new TQGroupBox(1,TQt::Horizontal,i18n("Saving Calendar"),
topFrame);
addWidBool( KOPrefs::instance()->htmlWithSaveItem(), saveGroup );
@@ -109,8 +109,8 @@ KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *parent, const char *name )
TQHBox *intervalBox = new TQHBox( saveGroup );
addWidInt( KOPrefs::instance()->autoSaveIntervalItem(), intervalBox );
- connect( autoSave->checkBox(), TQT_SIGNAL( toggled( bool ) ),
- intervalBox, TQT_SLOT( setEnabled( bool ) ) );
+ connect( autoSave->checkBox(), TQ_SIGNAL( toggled( bool ) ),
+ intervalBox, TQ_SLOT( setEnabled( bool ) ) );
intervalBox->setSpacing( KDialog::spacingHint() );
new TQWidget( intervalBox );
@@ -171,8 +171,8 @@ class KOPrefsDialogTime : public KPrefsModule
TQWhatsThis::add( timeZoneLabel, whatsThis );
mTimeZoneCombo = new TQComboBox( timeZoneBox );
- connect( mTimeZoneCombo, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( slotWidChanged() ) );
+ connect( mTimeZoneCombo, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( slotWidChanged() ) );
FILE *f;
char tempstring[101] = "Unknown";
@@ -264,8 +264,8 @@ class KOPrefsDialogTime : public KPrefsModule
TQWhatsThis::add( holidayLabel, whatsThis );
mHolidayCombo = new TQComboBox( holidayRegBox );
- connect( mHolidayCombo, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( slotWidChanged() ) );
+ connect( mHolidayCombo, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( slotWidChanged() ) );
TQWhatsThis::add( mHolidayCombo, whatsThis );
@@ -319,7 +319,7 @@ class KOPrefsDialogTime : public KPrefsModule
topLayout->addWidget( defaultDuration->label(), 4, 0 );
topLayout->addWidget( defaultDuration->timeEdit(), 4, 1 );
- TQGroupBox *remindersGroupBox = new TQGroupBox( 1, Qt::Horizontal,
+ TQGroupBox *remindersGroupBox = new TQGroupBox( 1, TQt::Horizontal,
i18n( "Reminders" ),
topFrame );
topLayout->addMultiCellWidget( remindersGroupBox, 5, 5, 0, 1 );
@@ -328,10 +328,10 @@ class KOPrefsDialogTime : public KPrefsModule
new TQLabel( i18n( "Default reminder time:" ), remindersBox );
mReminderTimeSpin = new KIntSpinBox( remindersBox );
- connect( mReminderTimeSpin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotWidChanged()) );
+ connect( mReminderTimeSpin, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotWidChanged()) );
mReminderUnitsCombo = new KComboBox( remindersBox );
- connect( mReminderUnitsCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotWidChanged()) );
+ connect( mReminderUnitsCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotWidChanged()) );
mReminderUnitsCombo->insertItem( i18n( "minute(s)" ) );
mReminderUnitsCombo->insertItem( i18n( "hour(s)" ) );
mReminderUnitsCombo->insertItem( i18n( "day(s)" ) );
@@ -351,8 +351,8 @@ class KOPrefsDialogTime : public KPrefsModule
KURLRequester *rq = addWidPath( KOPrefs::instance()->audioFilePathItem(),
audioFileRemindersBox, filter )->urlRequester();
rq->setEnabled( cb->isChecked() );
- connect( cb, TQT_SIGNAL(toggled(bool)),
- rq, TQT_SLOT(setEnabled( bool)) );
+ connect( cb, TQ_SIGNAL(toggled(bool)),
+ rq, TQ_SLOT(setEnabled( bool)) );
TQHBox *eventRemindersBox = new TQHBox( remindersGroupBox );
addWidBool( KOPrefs::instance()->defaultEventRemindersItem(), eventRemindersBox )->checkBox();
@@ -364,10 +364,10 @@ class KOPrefsDialogTime : public KPrefsModule
topLayout->addWidget( alarmDefaultLabel, 6, 0 );
mAlarmTimeDefaultCheckBox = new TQCheckBox( topFrame );
topLayout->addWidget( mAlarmTimeDefaultCheckBox, 6, 1 );
- connect( mAlarmTimeDefaultCheckBox, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( slotWidChanged() ) );
+ connect( mAlarmTimeDefaultCheckBox, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( slotWidChanged() ) );
- TQGroupBox *workingHoursGroup = new TQGroupBox(1,Qt::Horizontal,
+ TQGroupBox *workingHoursGroup = new TQGroupBox(1,TQt::Horizontal,
i18n("Working Hours"),
topFrame);
topLayout->addMultiCellWidget( workingHoursGroup, 7, 7, 0, 1 );
@@ -390,8 +390,8 @@ class KOPrefsDialogTime : public KPrefsModule
"this box, or the working hours will not be "
"marked with color." ) );
- connect( mWorkDays[ index ], TQT_SIGNAL( stateChanged( int ) ),
- TQT_SLOT( slotWidChanged() ) );
+ connect( mWorkDays[ index ], TQ_SIGNAL( stateChanged( int ) ),
+ TQ_SLOT( slotWidChanged() ) );
}
TQHBox *workStartBox = new TQHBox(workingHoursGroup);
@@ -510,7 +510,7 @@ class KOPrefsDialogViews : public KPrefsModule
topLayout->addWidget( showTodosAgenda->checkBox() );
/*** Date Navigator Group ***/
- TQGroupBox *dateNavGroup = new TQGroupBox( 1, Qt::Horizontal,
+ TQGroupBox *dateNavGroup = new TQGroupBox( 1, TQt::Horizontal,
i18n("Date Navigator"),
topFrame );
addWidBool( KOPrefs::instance()->dailyRecurItem(), dateNavGroup );
@@ -520,7 +520,7 @@ class KOPrefsDialogViews : public KPrefsModule
/*** Agenda View Group ***/
- TQGroupBox *agendaGroup = new TQGroupBox( 1, Qt::Horizontal,
+ TQGroupBox *agendaGroup = new TQGroupBox( 1, TQt::Horizontal,
i18n("Agenda View"),
topFrame );
@@ -542,8 +542,8 @@ class KOPrefsDialogViews : public KPrefsModule
KPrefsWidBool *marcusBainsShowSeconds =
addWidBool( KOPrefs::instance()->marcusBainsShowSecondsItem(), agendaGroup );
- connect( marcusBainsEnabled->checkBox(), TQT_SIGNAL( toggled( bool ) ),
- marcusBainsShowSeconds->checkBox(), TQT_SLOT( setEnabled( bool ) ) );
+ connect( marcusBainsEnabled->checkBox(), TQ_SIGNAL( toggled( bool ) ),
+ marcusBainsShowSeconds->checkBox(), TQ_SLOT( setEnabled( bool ) ) );
addWidBool( KOPrefs::instance()->selectionStartsEditorItem(), agendaGroup );
@@ -554,7 +554,7 @@ class KOPrefsDialogViews : public KPrefsModule
topLayout->addWidget( agendaGroup );
/*** Month View Group ***/
- TQGroupBox *monthGroup = new TQGroupBox( 1, Qt::Horizontal,
+ TQGroupBox *monthGroup = new TQGroupBox( 1, TQt::Horizontal,
i18n("Month View"),
topFrame );
addWidBool( KOPrefs::instance()->enableMonthScrollItem(), monthGroup );
@@ -564,7 +564,7 @@ class KOPrefsDialogViews : public KPrefsModule
/*** Todo View Group ***/
- TQGroupBox *todoGroup = new TQGroupBox( 1, Qt::Horizontal,
+ TQGroupBox *todoGroup = new TQGroupBox( 1, TQt::Horizontal,
i18n("To-do View"),
topFrame );
addWidBool( KOPrefs::instance()->fullViewTodoItem(), todoGroup );
@@ -700,7 +700,7 @@ KOPrefsDialogColors::KOPrefsDialogColors( TQWidget *parent, const char *name )
topLayout->addWidget( unsetCategoryColor->button(), 6, 1 );
// categories colors
- TQGroupBox *categoryGroup = new TQGroupBox(1,Qt::Horizontal,i18n("Categories"),
+ TQGroupBox *categoryGroup = new TQGroupBox(1,TQt::Horizontal,i18n("Categories"),
topFrame);
topLayout->addMultiCellWidget(categoryGroup,7,7,0,1);
@@ -711,17 +711,17 @@ KOPrefsDialogColors::KOPrefsDialogColors( TQWidget *parent, const char *name )
i18n( "Select here the event category you want to modify. "
"You can change the selected category color using "
"the button below." ) );
- connect(mCategoryCombo,TQT_SIGNAL(activated(int)),TQT_SLOT(updateCategoryColor()));
+ connect(mCategoryCombo,TQ_SIGNAL(activated(int)),TQ_SLOT(updateCategoryColor()));
mCategoryButton = new KColorButton(categoryGroup);
TQWhatsThis::add( mCategoryButton,
i18n( "Choose here the color of the event category selected "
"using the combo box above." ) );
- connect(mCategoryButton,TQT_SIGNAL(changed(const TQColor &)),TQT_SLOT(setCategoryColor()));
+ connect(mCategoryButton,TQ_SIGNAL(changed(const TQColor &)),TQ_SLOT(setCategoryColor()));
updateCategoryColor();
// resources colors
- TQGroupBox *resourceGroup = new TQGroupBox(1,Qt::Horizontal,i18n("Resources"),
+ TQGroupBox *resourceGroup = new TQGroupBox(1,TQt::Horizontal,i18n("Resources"),
topFrame);
topLayout->addMultiCellWidget(resourceGroup,8,8,0,1);
@@ -730,13 +730,13 @@ KOPrefsDialogColors::KOPrefsDialogColors( TQWidget *parent, const char *name )
i18n( "Select here resource you want to modify. "
"You can change the selected resource color using "
"the button below." ) );
- connect(mResourceCombo,TQT_SIGNAL(activated(int)),TQT_SLOT(updateResourceColor()));
+ connect(mResourceCombo,TQ_SIGNAL(activated(int)),TQ_SLOT(updateResourceColor()));
mResourceButton = new KColorButton(resourceGroup);
TQWhatsThis::add( mResourceButton,
i18n( "Choose here the color of the resource selected "
"using the combo box above." ) );
- connect(mResourceButton,TQT_SIGNAL(changed(const TQColor &)),TQT_SLOT(setResourceColor()));
+ connect(mResourceButton,TQ_SIGNAL(changed(const TQColor &)),TQ_SLOT(setResourceColor()));
updateResources();
topLayout->setRowStretch(9,1);
@@ -865,8 +865,8 @@ KOPrefsDialogGroupScheduling::KOPrefsDialogGroupScheduling( TQWidget *parent, co
topFrame );
topLayout->addMultiCellWidget(useGroupwareBool->checkBox(),0,0,0,1);
// FIXME: This radio button should only be available when KMail is chosen
-// connect(thekmailradiobuttonupthere,TQT_SIGNAL(toggled(bool)),
-// useGroupwareBool->checkBox(), TQT_SLOT(enabled(bool)));
+// connect(thekmailradiobuttonupthere,TQ_SIGNAL(toggled(bool)),
+// useGroupwareBool->checkBox(), TQ_SLOT(enabled(bool)));
KPrefsWidBool *bcc =
addWidBool( KOPrefs::instance()->bccItem(), topFrame );
@@ -927,10 +927,10 @@ KOPrefsDialogGroupScheduling::KOPrefsDialogGroupScheduling( TQWidget *parent, co
topLayout->addWidget(del,6,1);
//topLayout->setRowStretch(2,1);
- connect(add, TQT_SIGNAL( clicked() ), this, TQT_SLOT(addItem()) );
- connect(del, TQT_SIGNAL( clicked() ), this, TQT_SLOT(removeItem()) );
- connect(aEmailsEdit,TQT_SIGNAL( textChanged(const TQString&) ), this,TQT_SLOT(updateItem()));
- connect(mAMails,TQT_SIGNAL(selectionChanged(TQListViewItem *)),TQT_SLOT(updateInput()));
+ connect(add, TQ_SIGNAL( clicked() ), this, TQ_SLOT(addItem()) );
+ connect(del, TQ_SIGNAL( clicked() ), this, TQ_SLOT(removeItem()) );
+ connect(aEmailsEdit,TQ_SIGNAL( textChanged(const TQString&) ), this,TQ_SLOT(updateItem()));
+ connect(mAMails,TQ_SIGNAL(selectionChanged(TQListViewItem *)),TQ_SLOT(updateInput()));
load();
}
@@ -1018,7 +1018,7 @@ KOPrefsDialogGroupwareScheduling::KOPrefsDialogGroupwareScheduling( TQWidget *pa
: KPrefsModule( KOPrefs::instance(), parent, name )
{
mGroupwarePage = new KOGroupwarePrefsPage( this );
- connect( mGroupwarePage, TQT_SIGNAL( changed() ), TQT_SLOT( slotWidChanged() ) );
+ connect( mGroupwarePage, TQ_SIGNAL( changed() ), TQ_SLOT( slotWidChanged() ) );
( new TQVBoxLayout( this ) )->addWidget( mGroupwarePage );
load();
@@ -1127,12 +1127,12 @@ KOPrefsDialogPlugins::KOPrefsDialogPlugins( TQWidget *parent, const char* name )
buttonRowLayout->addWidget( mConfigureButton );
buttonRowLayout->addItem( new TQSpacerItem(1, 1, TQSizePolicy::Expanding) );
topLayout->addWidget( buttonRow );
- connect( mConfigureButton, TQT_SIGNAL( clicked() ), TQT_SLOT( configure() ) );
+ connect( mConfigureButton, TQ_SIGNAL( clicked() ), TQ_SLOT( configure() ) );
- connect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ),
- TQT_SLOT( selectionChanged( TQListViewItem* ) ) );
- connect( mListView, TQT_SIGNAL( clicked( TQListViewItem* ) ),
- TQT_SLOT( slotWidChanged() ) );
+ connect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ),
+ TQ_SLOT( selectionChanged( TQListViewItem* ) ) );
+ connect( mListView, TQ_SIGNAL( clicked( TQListViewItem* ) ),
+ TQ_SLOT( slotWidChanged() ) );
load();
// usrReadConfig();
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h
index 28fc3ba7..e6fec99c 100644
--- a/korganizer/koprefsdialog.h
+++ b/korganizer/koprefsdialog.h
@@ -40,7 +40,7 @@ class TQListView;
class KDE_EXPORT KOPrefsDialogMain : public KPrefsModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOPrefsDialogMain( TQWidget *parent, const char *name );
@@ -53,7 +53,7 @@ class KDE_EXPORT KOPrefsDialogMain : public KPrefsModule
class KDE_EXPORT KOPrefsDialogColors : public KPrefsModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOPrefsDialogColors( TQWidget *parent, const char *name );
@@ -84,7 +84,7 @@ class KDE_EXPORT KOPrefsDialogColors : public KPrefsModule
class KDE_EXPORT KOPrefsDialogGroupScheduling : public KPrefsModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOPrefsDialogGroupScheduling( TQWidget *parent, const char *name );
@@ -108,7 +108,7 @@ class KOGroupwarePrefsPage;
class KDE_EXPORT KOPrefsDialogGroupwareScheduling : public KPrefsModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOPrefsDialogGroupwareScheduling( TQWidget *parent, const char *name );
@@ -123,7 +123,7 @@ class KDE_EXPORT KOPrefsDialogGroupwareScheduling : public KPrefsModule
class KDE_EXPORT KOPrefsDialogPlugins : public KPrefsModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOPrefsDialogPlugins( TQWidget *parent, const char *name );
diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp
index b38e6a79..80610483 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -109,8 +109,8 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c
// User3 => Dismiss Selected
// Ok => Suspend
- connect( calendar, TQT_SIGNAL(calendarChanged()),
- this, TQT_SLOT(slotCalendarChanged()) );
+ connect( calendar, TQ_SIGNAL(calendarChanged()),
+ this, TQ_SLOT(slotCalendarChanged()) );
TDEGlobal::iconLoader()->addAppDir( "tdepim" );
setButtonOK( i18n( "Suspend" ) );
@@ -122,7 +122,7 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c
TQLabel *label = new TQLabel( i18n("The following items triggered reminders:"), topBox );
topLayout->addWidget( label );
- mSplitter = new TQSplitter( Qt::Vertical, topBox );
+ mSplitter = new TQSplitter( TQt::Vertical, topBox );
mSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
topLayout->addWidget( mSplitter );
@@ -135,10 +135,10 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c
mIncidenceListView->setShowSortIndicator( true );
mIncidenceListView->setAllColumnsShowFocus( true );
mIncidenceListView->setSelectionMode( TQListView::Extended );
- connect( mIncidenceListView, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateButtons()) );
- connect( mIncidenceListView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_SLOT(edit()) );
- connect( mIncidenceListView, TQT_SIGNAL(currentChanged(TQListViewItem*)), TQT_SLOT(showDetails()) );
- connect( mIncidenceListView, TQT_SIGNAL(selectionChanged()), TQT_SLOT(showDetails()) );
+ connect( mIncidenceListView, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateButtons()) );
+ connect( mIncidenceListView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), TQ_SLOT(edit()) );
+ connect( mIncidenceListView, TQ_SIGNAL(currentChanged(TQListViewItem*)), TQ_SLOT(showDetails()) );
+ connect( mIncidenceListView, TQ_SIGNAL(selectionChanged()), TQ_SLOT(showDetails()) );
mDetailView = new KOEventViewer( mCalendar, mSplitter );
mDetailView->setFocus(); // set focus here to start with to make it harder
@@ -160,7 +160,7 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c
mSuspendUnit->insertItem( i18n("week(s)") );
mSuspendUnit->setCurrentItem( defSuspendUnit );
- connect( &mSuspendTimer, TQT_SIGNAL(timeout()), TQT_SLOT(wakeUp()) );
+ connect( &mSuspendTimer, TQ_SIGNAL(timeout()), TQ_SLOT(wakeUp()) );
setMainWidget( mIncidenceListView );
mIncidenceListView->setMinimumSize( 500, 50 );
diff --git a/korganizer/korgac/alarmdialog.h b/korganizer/korgac/alarmdialog.h
index 949c17f7..d11dc591 100644
--- a/korganizer/korgac/alarmdialog.h
+++ b/korganizer/korgac/alarmdialog.h
@@ -43,7 +43,7 @@ class TQSpinBox;
class TQSplitter;
class AlarmDialog : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
explicit AlarmDialog( CalendarResources *calendar, TQWidget *parent = 0, const char *name = 0 );
diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp
index 081d91ca..a5cb277e 100644
--- a/korganizer/korgac/alarmdockwindow.cpp
+++ b/korganizer/korgac/alarmdockwindow.cpp
@@ -64,16 +64,16 @@ AlarmDockWindow::AlarmDockWindow( const char *name )
setPixmap( alarmsEnabled ? mPixmapEnabled : mPixmapDisabled );
// Set up the context menu
- mSuspendAll = contextMenu()->insertItem( i18n("Suspend All"), this, TQT_SLOT( slotSuspendAll() ) );
- mDismissAll = contextMenu()->insertItem( i18n("Dismiss All"), this, TQT_SLOT( slotDismissAll() ) );
+ mSuspendAll = contextMenu()->insertItem( i18n("Suspend All"), this, TQ_SLOT( slotSuspendAll() ) );
+ mDismissAll = contextMenu()->insertItem( i18n("Dismiss All"), this, TQ_SLOT( slotDismissAll() ) );
contextMenu()->setItemEnabled( mSuspendAll, false );
contextMenu()->setItemEnabled( mDismissAll, false );
contextMenu()->insertSeparator();
mAlarmsEnabledId = contextMenu()->insertItem( i18n("Reminders Enabled"), this,
- TQT_SLOT( toggleAlarmsEnabled() ) );
+ TQ_SLOT( toggleAlarmsEnabled() ) );
mAutostartId = contextMenu()->insertItem( i18n("Start Reminder Daemon at Login"), this,
- TQT_SLOT( toggleAutostart() ) );
+ TQ_SLOT( toggleAutostart() ) );
contextMenu()->setItemChecked( mAutostartId, autostart );
contextMenu()->setItemChecked( mAlarmsEnabledId, alarmsEnabled );
@@ -86,15 +86,15 @@ AlarmDockWindow::AlarmDockWindow( const char *name )
kdDebug(5890) << "No Quit standard action." << endl;
} else {
#if KDE_IS_VERSION(3,3,90)
- quit->disconnect( TQT_SIGNAL( activated() ), this,
- TQT_SLOT( maybeQuit() ) );
- connect( quit, TQT_SIGNAL( activated() ), TQT_SLOT( slotQuit() ) );
+ quit->disconnect( TQ_SIGNAL( activated() ), this,
+ TQ_SLOT( maybeQuit() ) );
+ connect( quit, TQ_SIGNAL( activated() ), TQ_SLOT( slotQuit() ) );
}
#else //FIXME: remove for KDE 4.0
- quit->disconnect( TQT_SIGNAL( activated() ), tqApp,
- TQT_SLOT( closeAllWindows() ) );
+ quit->disconnect( TQ_SIGNAL( activated() ), tqApp,
+ TQ_SLOT( closeAllWindows() ) );
}
- connect( this, TQT_SIGNAL( quitSelected() ), TQT_SLOT( slotQuit() ) );
+ connect( this, TQ_SIGNAL( quitSelected() ), TQ_SLOT( slotQuit() ) );
#endif
TQToolTip::add(this, mName );
@@ -188,7 +188,7 @@ void AlarmDockWindow::enableAutostart( bool enable )
void AlarmDockWindow::mousePressEvent( TQMouseEvent *e )
{
- if ( e->button() == Qt::LeftButton ) {
+ if ( e->button() == TQt::LeftButton ) {
kapp->startServiceByDesktopName( "korganizer", TQString() );
} else {
KSystemTray::mousePressEvent( e );
diff --git a/korganizer/korgac/alarmdockwindow.h b/korganizer/korgac/alarmdockwindow.h
index 6f6cd7bd..81c00a8c 100644
--- a/korganizer/korgac/alarmdockwindow.h
+++ b/korganizer/korgac/alarmdockwindow.h
@@ -30,7 +30,7 @@
class AlarmDockWindow : public KSystemTray
{
- Q_OBJECT
+ TQ_OBJECT
public:
AlarmDockWindow( const char *name = 0 );
diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp
index 2a87c7fd..37478ca0 100644
--- a/korganizer/korgac/koalarmclient.cpp
+++ b/korganizer/korgac/koalarmclient.cpp
@@ -46,8 +46,8 @@ KOAlarmClient::KOAlarmClient( TQObject *parent, const char *name )
mDocker = new AlarmDockWindow;
mDocker->show();
- connect( this, TQT_SIGNAL( reminderCount( int ) ), mDocker, TQT_SLOT( slotUpdate( int ) ) );
- connect( mDocker, TQT_SIGNAL( quitSignal() ), TQT_SLOT( slotQuit() ) );
+ connect( this, TQ_SIGNAL( reminderCount( int ) ), mDocker, TQ_SLOT( slotUpdate( int ) ) );
+ connect( mDocker, TQ_SIGNAL( quitSignal() ), TQ_SLOT( slotQuit() ) );
TDEConfig c( locate( "config", "korganizerrc" ) );
c.setGroup( "Time & Date" );
@@ -58,7 +58,7 @@ KOAlarmClient::KOAlarmClient( TQObject *parent, const char *name )
mCalendar->readConfig();
mCalendar->load();
- connect( &mCheckTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkAlarms() ) );
+ connect( &mCheckTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkAlarms() ) );
TDEConfig *config = kapp->config();
config->setGroup( "Alarms" );
@@ -132,10 +132,10 @@ void KOAlarmClient::createReminder( KCal::CalendarResources *calendar,
if ( !mDialog ) {
mDialog = new AlarmDialog( calendar );
- connect( mDialog, TQT_SIGNAL(reminderCount(int)), mDocker, TQT_SLOT(slotUpdate(int)) );
- connect( mDocker, TQT_SIGNAL(suspendAllSignal()), mDialog, TQT_SLOT(suspendAll()) );
- connect( mDocker, TQT_SIGNAL(dismissAllSignal()), mDialog, TQT_SLOT(dismissAll()) );
- connect( this, TQT_SIGNAL( saveAllSignal() ), mDialog, TQT_SLOT( slotSave() ) );
+ connect( mDialog, TQ_SIGNAL(reminderCount(int)), mDocker, TQ_SLOT(slotUpdate(int)) );
+ connect( mDocker, TQ_SIGNAL(suspendAllSignal()), mDialog, TQ_SLOT(suspendAll()) );
+ connect( mDocker, TQ_SIGNAL(dismissAllSignal()), mDialog, TQ_SLOT(dismissAll()) );
+ connect( this, TQ_SIGNAL( saveAllSignal() ), mDialog, TQ_SLOT( slotSave() ) );
}
mDialog->addIncidence( incidence, dt, displayText );
diff --git a/korganizer/korgac/koalarmclient.h b/korganizer/korgac/koalarmclient.h
index a8628848..ef6e5d27 100644
--- a/korganizer/korgac/koalarmclient.h
+++ b/korganizer/korgac/koalarmclient.h
@@ -43,7 +43,7 @@ class Incidence;
class KOAlarmClient : public TQObject, virtual public AlarmClientIface, public KSessionManaged
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOAlarmClient( TQObject *parent = 0, const char *name = 0 );
diff --git a/korganizer/korganizer.cpp b/korganizer/korganizer.cpp
index 5646d709..16bf76bc 100644
--- a/korganizer/korganizer.cpp
+++ b/korganizer/korganizer.cpp
@@ -101,8 +101,8 @@ KOrganizer::KOrganizer( const char *name )
mCalendarView = new CalendarView( this, "KOrganizer::CalendarView" );
setCentralWidget(mCalendarView);
- mActionManager = new ActionManager( this, mCalendarView, TQT_TQOBJECT(this), this, false );
- (void)new KOrganizerIfaceImpl( mActionManager, TQT_TQOBJECT(this), "IfaceImpl" );
+ mActionManager = new ActionManager( this, mCalendarView, this, this, false );
+ (void)new KOrganizerIfaceImpl( mActionManager, this, "IfaceImpl" );
}
KOrganizer::~KOrganizer()
@@ -128,8 +128,8 @@ void KOrganizer::init( bool document )
}
mActionManager->init();
- connect( mActionManager, TQT_SIGNAL( actionNew( const KURL & ) ),
- TQT_SLOT( newMainWindow( const KURL & ) ) );
+ connect( mActionManager, TQ_SIGNAL( actionNew( const KURL & ) ),
+ TQ_SLOT( newMainWindow( const KURL & ) ) );
mActionManager->loadParts();
@@ -139,7 +139,7 @@ void KOrganizer::init( bool document )
KStatusBar *bar = statusBar();
bar->insertItem( "", ID_GENERAL, 10 );
- connect( bar, TQT_SIGNAL( pressed( int ) ), TQT_SLOT( statusBarPressed( int ) ) );
+ connect( bar, TQ_SIGNAL( pressed( int ) ), TQ_SLOT( statusBarPressed( int ) ) );
KPIM::ProgressDialog *progressDialog = new KPIM::ProgressDialog( bar, this );
progressDialog->hide();
@@ -150,8 +150,8 @@ void KOrganizer::init( bool document )
bar->addWidget( progressWidget, 0, true );
- connect( mActionManager->view(), TQT_SIGNAL( statusMessage( const TQString & ) ),
- TQT_SLOT( showStatusMessage( const TQString & ) ) );
+ connect( mActionManager->view(), TQ_SIGNAL( statusMessage( const TQString & ) ),
+ TQ_SLOT( showStatusMessage( const TQString & ) ) );
setStandardToolBarMenuEnabled( true );
setTitle();
@@ -208,9 +208,9 @@ void KOrganizer::initActions()
setStandardToolBarMenuEnabled( true );
createStandardStatusBarAction();
- KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolbars() ), actionCollection());
- KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
+ KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection());
+ KStdAction::configureToolbars(this, TQ_SLOT(configureToolbars() ), actionCollection());
+ KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() );
setAutoSaveSettings();
createGUI( 0 );
diff --git a/korganizer/korganizer.h b/korganizer/korganizer.h
index 76505f7f..56614604 100644
--- a/korganizer/korganizer.h
+++ b/korganizer/korganizer.h
@@ -64,7 +64,7 @@ typedef KParts::MainWindow KPartsMainWindow;
*/
class KOrganizer : public KPartsMainWindow, public KOrgMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp
index 1b607169..ab1b3c12 100644
--- a/korganizer/korganizer_part.cpp
+++ b/korganizer/korganizer_part.cpp
@@ -81,7 +81,7 @@ KOrganizerPart::KOrganizerPart( TQWidget *parentWidget, const char *widgetName,
// create a canvas to insert our widget
TQWidget *canvas = new TQWidget( parentWidget, widgetName );
- canvas->setFocusPolicy( TQ_ClickFocus );
+ canvas->setFocusPolicy( TQWidget::ClickFocus );
setWidget( canvas );
mView = new CalendarView( canvas );
@@ -109,10 +109,10 @@ KOrganizerPart::KOrganizerPart( TQWidget *parentWidget, const char *widgetName,
KParts::InfoExtension *ie = new KParts::InfoExtension( this,
"KOrganizerInfo" );
- connect( mView, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ),
- TQT_SLOT( slotChangeInfo( Incidence *,const TQDate & ) ) );
- connect( this, TQT_SIGNAL( textChanged( const TQString & ) ),
- ie, TQT_SIGNAL( textChanged( const TQString & ) ) );
+ connect( mView, TQ_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ),
+ TQ_SLOT( slotChangeInfo( Incidence *,const TQDate & ) ) );
+ connect( this, TQ_SIGNAL( textChanged( const TQString & ) ),
+ ie, TQ_SIGNAL( textChanged( const TQString & ) ) );
mActionManager->init();
mActionManager->readSettings();
diff --git a/korganizer/korganizer_part.h b/korganizer/korganizer_part.h
index 21e96462..e4d33902 100644
--- a/korganizer/korganizer_part.h
+++ b/korganizer/korganizer_part.h
@@ -56,7 +56,7 @@ class TQDate;
class KOrganizerPart: public KParts::ReadOnlyPart,
public KOrg::MainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOrganizerPart( TQWidget *parentWidget, const char *widgetName,
diff --git a/korganizer/kotimelineview.cpp b/korganizer/kotimelineview.cpp
index a93c6d68..fc2bf0cf 100644
--- a/korganizer/kotimelineview.cpp
+++ b/korganizer/kotimelineview.cpp
@@ -62,18 +62,18 @@ KOTimelineView::KOTimelineView(Calendar *calendar, TQWidget *parent,
vbox->addWidget( mGantt );
- connect( mGantt, TQT_SIGNAL(gvCurrentChanged(KDGanttViewItem*)),
- TQT_SLOT(itemSelected(KDGanttViewItem*)) );
- connect( mGantt, TQT_SIGNAL(itemDoubleClicked(KDGanttViewItem*)),
- TQT_SLOT(itemDoubleClicked(KDGanttViewItem*)) );
- connect( mGantt, TQT_SIGNAL(itemRightClicked(KDGanttViewItem*)),
- TQT_SLOT(itemRightClicked(KDGanttViewItem*)) );
- connect( mGantt, TQT_SIGNAL(gvItemMoved(KDGanttViewItem*)),
- TQT_SLOT(itemMoved(KDGanttViewItem*)) );
- connect( mGantt, TQT_SIGNAL(rescaling(KDGanttView::Scale)),
- TQT_SLOT(overscale(KDGanttView::Scale)) );
- connect( mGantt, TQT_SIGNAL( dateTimeDoubleClicked( const TQDateTime& ) ),
- TQT_SLOT( newEventWithHint( const TQDateTime& ) ) );
+ connect( mGantt, TQ_SIGNAL(gvCurrentChanged(KDGanttViewItem*)),
+ TQ_SLOT(itemSelected(KDGanttViewItem*)) );
+ connect( mGantt, TQ_SIGNAL(itemDoubleClicked(KDGanttViewItem*)),
+ TQ_SLOT(itemDoubleClicked(KDGanttViewItem*)) );
+ connect( mGantt, TQ_SIGNAL(itemRightClicked(KDGanttViewItem*)),
+ TQ_SLOT(itemRightClicked(KDGanttViewItem*)) );
+ connect( mGantt, TQ_SIGNAL(gvItemMoved(KDGanttViewItem*)),
+ TQ_SLOT(itemMoved(KDGanttViewItem*)) );
+ connect( mGantt, TQ_SIGNAL(rescaling(KDGanttView::Scale)),
+ TQ_SLOT(overscale(KDGanttView::Scale)) );
+ connect( mGantt, TQ_SIGNAL( dateTimeDoubleClicked( const TQDateTime& ) ),
+ TQ_SLOT( newEventWithHint( const TQDateTime& ) ) );
}
KOTimelineView::~KOTimelineView()
diff --git a/korganizer/kotimelineview.h b/korganizer/kotimelineview.h
index 2d0e7c0d..0e131897 100644
--- a/korganizer/kotimelineview.h
+++ b/korganizer/kotimelineview.h
@@ -43,7 +43,7 @@ namespace KOrg {
*/
class KOTimelineView : public KOEventView
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOTimelineView(Calendar *calendar, TQWidget *parent = 0,
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index 9da33659..3a41d1ff 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -68,21 +68,21 @@ void KOTodoEditor::init()
setupRecurrence();
setupAttendeesTab();
- connect( mGeneral, TQT_SIGNAL( dateTimeStrChanged( const TQString & ) ),
- mRecurrence, TQT_SLOT( setDateTimeStr( const TQString & ) ) );
- connect( mGeneral, TQT_SIGNAL( signalDateTimeChanged( const TQDateTime &, const TQDateTime & ) ),
- mRecurrence, TQT_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) );
+ connect( mGeneral, TQ_SIGNAL( dateTimeStrChanged( const TQString & ) ),
+ mRecurrence, TQ_SLOT( setDateTimeStr( const TQString & ) ) );
+ connect( mGeneral, TQ_SIGNAL( signalDateTimeChanged( const TQDateTime &, const TQDateTime & ) ),
+ mRecurrence, TQ_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) );
- connect( mGeneral, TQT_SIGNAL( openCategoryDialog() ),
- TQT_SIGNAL( editCategories() ) );
+ connect( mGeneral, TQ_SIGNAL( openCategoryDialog() ),
+ TQ_SIGNAL( editCategories() ) );
- connect( mDetails, TQT_SIGNAL(updateAttendeeSummary(int)),
- mGeneral, TQT_SLOT(updateAttendeeSummary(int)) );
+ connect( mDetails, TQ_SIGNAL(updateAttendeeSummary(int)),
+ mGeneral, TQ_SLOT(updateAttendeeSummary(int)) );
- connect( mGeneral, TQT_SIGNAL(editRecurrence()),
- mRecurrenceDialog, TQT_SLOT(show()) );
- connect( mRecurrenceDialog, TQT_SIGNAL(okClicked()),
- TQT_SLOT(updateRecurrenceSummary()) );
+ connect( mGeneral, TQ_SIGNAL(editRecurrence()),
+ mRecurrenceDialog, TQ_SLOT(show()) );
+ connect( mRecurrenceDialog, TQ_SIGNAL(okClicked()),
+ TQ_SLOT(updateRecurrenceSummary()) );
}
void KOTodoEditor::reload()
@@ -94,7 +94,7 @@ void KOTodoEditor::reload()
void KOTodoEditor::setupGeneral()
{
- mGeneral = new KOEditorGeneralTodo(TQT_TQOBJECT(this));
+ mGeneral = new KOEditorGeneralTodo(this);
if (KOPrefs::instance()->mCompactDialogs) {
TQFrame *topFrame = addPage(i18n("General"));
@@ -131,10 +131,10 @@ void KOTodoEditor::setupGeneral()
mGeneral->iniStatus(topFrame,topLayout);
mGeneral->initDescription(topFrame,topLayout);
mGeneral->initAttachments(topFrame,topLayout);
- connect( mGeneral, TQT_SIGNAL( openURL( const KURL& ) ),
- this, TQT_SLOT( openURL( const KURL& ) ) );
- connect( this, TQT_SIGNAL( signalAddAttachments( const TQStringList&, const TQStringList&, bool ) ),
- mGeneral, TQT_SLOT( addAttachments( const TQStringList&, const TQStringList&, bool ) ) );
+ connect( mGeneral, TQ_SIGNAL( openURL( const KURL& ) ),
+ this, TQ_SLOT( openURL( const KURL& ) ) );
+ connect( this, TQ_SIGNAL( signalAddAttachments( const TQStringList&, const TQStringList&, bool ) ),
+ mGeneral, TQ_SLOT( addAttachments( const TQStringList&, const TQStringList&, bool ) ) );
}
mGeneral->finishSetup();
}
diff --git a/korganizer/kotodoeditor.h b/korganizer/kotodoeditor.h
index a571d88b..ebccd4d2 100644
--- a/korganizer/kotodoeditor.h
+++ b/korganizer/kotodoeditor.h
@@ -36,7 +36,7 @@ class KOEditorRecurrence;
*/
class KOTodoEditor : public KOIncidenceEditor
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 8ae2703f..bbbb71db 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -299,7 +299,7 @@ void KOTodoListView::contentsMousePressEvent(TQMouseEvent* e)
treeStepSize() * (i->depth() + (rootIsDecorated() ? 1 : 0)) +
itemMargin() ||
p.x() < header()->sectionPos(header()->mapToIndex(0))) {
- if (e->button()==Qt::LeftButton) {
+ if (e->button()==TQt::LeftButton) {
mPressPos = e->pos();
mMousePressed = true;
}
@@ -424,16 +424,16 @@ KOTodoView::KOTodoView( Calendar *calendar, TQWidget *parent, const char* name)
mPriority[ mPriorityPopupMenu->insertItem( i18n( "7" ) ) ] = 7;
mPriority[ mPriorityPopupMenu->insertItem( i18n( "8" ) ) ] = 8;
mPriority[ mPriorityPopupMenu->insertItem( i18n( "9 (lowest)" ) ) ] = 9;
- connect( mPriorityPopupMenu, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( setNewPriority( int ) ));
+ connect( mPriorityPopupMenu, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( setNewPriority( int ) ));
mPercentageCompletedPopupMenu = new TQPopupMenu(this);
for (int i = 0; i <= 100; i+=10) {
TQString label = TQString ("%1 %").arg (i);
mPercentage[mPercentageCompletedPopupMenu->insertItem (label)] = i;
}
- connect( mPercentageCompletedPopupMenu, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( setNewPercentage( int ) ) );
+ connect( mPercentageCompletedPopupMenu, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( setNewPercentage( int ) ) );
mMovePopupMenu = new KDatePickerPopup(
KDatePickerPopup::NoDate |
@@ -445,76 +445,76 @@ KOTodoView::KOTodoView( Calendar *calendar, TQWidget *parent, const char* name)
KDatePickerPopup::Words );
- connect( mMovePopupMenu, TQT_SIGNAL( dateChanged( TQDate )),
- TQT_SLOT( setNewDate( TQDate ) ) );
- connect( mCopyPopupMenu, TQT_SIGNAL( dateChanged( TQDate )),
- TQT_SLOT( copyTodoToDate( TQDate ) ) );
+ connect( mMovePopupMenu, TQ_SIGNAL( dateChanged( TQDate )),
+ TQ_SLOT( setNewDate( TQDate ) ) );
+ connect( mCopyPopupMenu, TQ_SIGNAL( dateChanged( TQDate )),
+ TQ_SLOT( copyTodoToDate( TQDate ) ) );
mItemPopupMenu = new TQPopupMenu(this);
mItemPopupMenu->insertItem(i18n("&Show"), this,
- TQT_SLOT (showTodo()));
+ TQ_SLOT (showTodo()));
mItemPopupMenu->insertItem(i18n("&Edit..."), this,
- TQT_SLOT (editTodo()), 0, ePopupEdit );
+ TQ_SLOT (editTodo()), 0, ePopupEdit );
#ifndef KORG_NOPRINTER
- mItemPopupMenu->insertItem(KOGlobals::self()->smallIcon("printer"), i18n("&Print..."), this, TQT_SLOT( printTodo() ) );
+ mItemPopupMenu->insertItem(KOGlobals::self()->smallIcon("printer"), i18n("&Print..."), this, TQ_SLOT( printTodo() ) );
#endif
mItemPopupMenu->insertItem(KOGlobals::self()->smallIconSet("edit-delete"), i18n("&Delete"), this,
- TQT_SLOT (deleteTodo()), 0, ePopupDelete );
+ TQ_SLOT (deleteTodo()), 0, ePopupDelete );
mItemPopupMenu->insertSeparator();
mItemPopupMenu->insertItem(KOGlobals::self()->smallIconSet("todo"), i18n("New &To-do..."), this,
- TQT_SLOT (newTodo()) );
+ TQ_SLOT (newTodo()) );
mItemPopupMenu->insertItem(i18n("New Su&b-to-do..."), this,
- TQT_SLOT (newSubTodo()));
+ TQ_SLOT (newSubTodo()));
mItemPopupMenu->insertItem( i18n("&Make this To-do Independent"), this,
- TQT_SIGNAL( unSubTodoSignal() ), 0, ePopupUnSubTodo );
+ TQ_SIGNAL( unSubTodoSignal() ), 0, ePopupUnSubTodo );
mItemPopupMenu->insertItem( i18n("Make all Sub-to-dos &Independent"), this,
- TQT_SIGNAL( unAllSubTodoSignal() ), 0, ePopupUnAllSubTodo );
+ TQ_SIGNAL( unAllSubTodoSignal() ), 0, ePopupUnAllSubTodo );
mItemPopupMenu->insertSeparator();
mItemPopupMenu->insertItem( i18n("&Copy To"), mCopyPopupMenu, ePopupCopyTo );
mItemPopupMenu->insertItem(i18n("&Move To"), mMovePopupMenu, ePopupMoveTo );
mItemPopupMenu->insertSeparator();
mItemPopupMenu->insertItem(i18n("delete completed to-dos","Pur&ge Completed"),
- this, TQT_SLOT( purgeCompleted() ) );
+ this, TQ_SLOT( purgeCompleted() ) );
- connect( mMovePopupMenu, TQT_SIGNAL( dateChanged( TQDate ) ),
- mItemPopupMenu, TQT_SLOT( hide() ) );
- connect( mCopyPopupMenu, TQT_SIGNAL( dateChanged( TQDate ) ),
- mItemPopupMenu, TQT_SLOT( hide() ) );
+ connect( mMovePopupMenu, TQ_SIGNAL( dateChanged( TQDate ) ),
+ mItemPopupMenu, TQ_SLOT( hide() ) );
+ connect( mCopyPopupMenu, TQ_SIGNAL( dateChanged( TQDate ) ),
+ mItemPopupMenu, TQ_SLOT( hide() ) );
mPopupMenu = new TQPopupMenu(this);
mPopupMenu->insertItem(KOGlobals::self()->smallIconSet("todo"), i18n("&New To-do..."), this,
- TQT_SLOT(newTodo()) );
+ TQ_SLOT(newTodo()) );
mPopupMenu->insertItem(i18n("delete completed to-dos","&Purge Completed"),
- this, TQT_SLOT(purgeCompleted()));
+ this, TQ_SLOT(purgeCompleted()));
mDocPrefs = new DocPrefs( name );
// Double clicking conflicts with opening/closing the subtree
- connect( mTodoListView, TQT_SIGNAL( doubleClicked( TQListViewItem *,
+ connect( mTodoListView, TQ_SIGNAL( doubleClicked( TQListViewItem *,
const TQPoint &, int ) ),
- TQT_SLOT( editItem( TQListViewItem *, const TQPoint &, int ) ) );
- connect( mTodoListView, TQT_SIGNAL( returnPressed( TQListViewItem * ) ),
- TQT_SLOT( editItem( TQListViewItem * ) ) );
- connect( mTodoListView, TQT_SIGNAL( contextMenuRequested( TQListViewItem *,
+ TQ_SLOT( editItem( TQListViewItem *, const TQPoint &, int ) ) );
+ connect( mTodoListView, TQ_SIGNAL( returnPressed( TQListViewItem * ) ),
+ TQ_SLOT( editItem( TQListViewItem * ) ) );
+ connect( mTodoListView, TQ_SIGNAL( contextMenuRequested( TQListViewItem *,
const TQPoint &, int ) ),
- TQT_SLOT( popupMenu( TQListViewItem *, const TQPoint &, int ) ) );
- connect( mTodoListView, TQT_SIGNAL( expanded( TQListViewItem * ) ),
- TQT_SLOT( itemStateChanged( TQListViewItem * ) ) );
- connect( mTodoListView, TQT_SIGNAL( collapsed( TQListViewItem * ) ),
- TQT_SLOT( itemStateChanged( TQListViewItem * ) ) );
+ TQ_SLOT( popupMenu( TQListViewItem *, const TQPoint &, int ) ) );
+ connect( mTodoListView, TQ_SIGNAL( expanded( TQListViewItem * ) ),
+ TQ_SLOT( itemStateChanged( TQListViewItem * ) ) );
+ connect( mTodoListView, TQ_SIGNAL( collapsed( TQListViewItem * ) ),
+ TQ_SLOT( itemStateChanged( TQListViewItem * ) ) );
#if 0
- connect(mTodoListView,TQT_SIGNAL(selectionChanged(TQListViewItem *)),
- TQT_SLOT(selectionChanged(TQListViewItem *)));
- connect(mTodoListView,TQT_SIGNAL(clicked(TQListViewItem *)),
- TQT_SLOT(selectionChanged(TQListViewItem *)));
- connect(mTodoListView,TQT_SIGNAL(pressed(TQListViewItem *)),
- TQT_SLOT(selectionChanged(TQListViewItem *)));
+ connect(mTodoListView,TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+ TQ_SLOT(selectionChanged(TQListViewItem *)));
+ connect(mTodoListView,TQ_SIGNAL(clicked(TQListViewItem *)),
+ TQ_SLOT(selectionChanged(TQListViewItem *)));
+ connect(mTodoListView,TQ_SIGNAL(pressed(TQListViewItem *)),
+ TQ_SLOT(selectionChanged(TQListViewItem *)));
#endif
- connect( mTodoListView, TQT_SIGNAL(selectionChanged() ),
- TQT_SLOT( processSelectionChange() ) );
- connect( mQuickAdd, TQT_SIGNAL( returnPressed () ),
- TQT_SLOT( addQuickTodo() ) );
+ connect( mTodoListView, TQ_SIGNAL(selectionChanged() ),
+ TQ_SLOT( processSelectionChange() ) );
+ connect( mQuickAdd, TQ_SIGNAL( returnPressed () ),
+ TQ_SLOT( addQuickTodo() ) );
new KOTodoListViewToolTip( mTodoListView->viewport(), calendar, mTodoListView );
}
@@ -648,7 +648,7 @@ bool KOTodoView::scheduleRemoveTodoItem( KOTodoViewItem *todoItem )
{
if ( todoItem ) {
mItemsToDelete.append( todoItem );
- TQTimer::singleShot( 0, this, TQT_SLOT( removeTodoItems() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( removeTodoItems() ) );
return true;
} else
return false;
@@ -731,13 +731,13 @@ void KOTodoView::changeIncidenceDisplay(Incidence *incidence, int action)
}
break;
default:
- TQTimer::singleShot( 0, this, TQT_SLOT( updateView() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( updateView() ) );
}
} else {
// use a TQTimer here, because when marking todos finished using
// the checkbox, this slot gets called, but we cannot update the views
// because we're still inside KOTodoViewItem::stateChange
- TQTimer::singleShot(0,this,TQT_SLOT(updateView()));
+ TQTimer::singleShot(0,this,TQ_SLOT(updateView()));
}
}
@@ -857,7 +857,7 @@ void KOTodoView::printTodo()
#ifndef KORG_NOPRINTER
KOCoreHelper helper;
CalPrinter printer( this, BaseView::calendar(), &helper );
- connect( this, TQT_SIGNAL(configChanged()), &printer, TQT_SLOT(updateConfig()) );
+ connect( this, TQ_SIGNAL(configChanged()), &printer, TQ_SLOT(updateConfig()) );
Incidence::List selectedIncidences;
selectedIncidences.append( mActiveItem->todo() );
@@ -1015,8 +1015,8 @@ TQPopupMenu *KOTodoView::getCategoryPopupMenu( KOTodoViewItem *todoItem )
tempMenu->setItemChecked( index, true );
}
- connect ( tempMenu, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( changedCategories( int ) ) );
+ connect ( tempMenu, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( changedCategories( int ) ) );
return tempMenu;
}
@@ -1065,9 +1065,9 @@ void KOTodoView::itemStateChanged( TQListViewItem *item )
void KOTodoView::setNewPercentageDelayed( KOTodoViewItem *item, int percentage )
{
- mPercentChangedMap.append( tqMakePair( item, percentage ) );
+ mPercentChangedMap.append( qMakePair( item, percentage ) );
- TQTimer::singleShot( 0, this, TQT_SLOT( processDelayedNewPercentage() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( processDelayedNewPercentage() ) );
}
void KOTodoView::processDelayedNewPercentage()
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index 662f6b13..e8204c74 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -71,7 +71,7 @@ class KOTodoListViewToolTip : public TQToolTip
class KOTodoListView : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOTodoListView( TQWidget *parent = 0, const char *name = 0 );
@@ -112,7 +112,7 @@ class KOTodoListView : public TDEListView
*/
class KOTodoView : public KOrg::BaseView
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOTodoView( Calendar *cal, TQWidget *parent = 0, const char *name = 0 );
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 2ee92b12..b983d953 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -225,60 +225,60 @@ void KOViewManager::connectView(KOrg::BaseView *view)
if (!view) return;
// selecting an incidence
- connect( view, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ),
- mMainView, TQT_SLOT( processMainViewSelection( Incidence *,const TQDate & ) ) );
+ connect( view, TQ_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ),
+ mMainView, TQ_SLOT( processMainViewSelection( Incidence *,const TQDate & ) ) );
// showing/editing/deleting an incidence. The calendar view takes care of the action.
- connect( view, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)),
- mMainView, TQT_SLOT(showIncidence(Incidence *,const TQDate &)) );
- connect( view, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)),
- mMainView, TQT_SLOT(editIncidence(Incidence *,const TQDate &)) );
- connect( view, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)),
- mMainView, TQT_SLOT(deleteIncidence(Incidence *)) );
- connect( view, TQT_SIGNAL(copyIncidenceSignal(Incidence *)),
- mMainView, TQT_SLOT(copyIncidence(Incidence *)) );
- connect( view, TQT_SIGNAL(cutIncidenceSignal(Incidence *)),
- mMainView, TQT_SLOT(cutIncidence(Incidence *)) );
- connect( view, TQT_SIGNAL(pasteIncidenceSignal()),
- mMainView, TQT_SLOT(pasteIncidence()));
- connect( view, TQT_SIGNAL(toggleAlarmSignal(Incidence *)),
- mMainView, TQT_SLOT(toggleAlarm(Incidence *)) );
- connect( view,TQT_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)),
- mMainView, TQT_SLOT(dissociateOccurrence(Incidence *,const TQDate &)) );
- connect( view,TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)),
- mMainView, TQT_SLOT(dissociateFutureOccurrence(Incidence *,const TQDate &)) );
+ connect( view, TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)),
+ mMainView, TQ_SLOT(showIncidence(Incidence *,const TQDate &)) );
+ connect( view, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)),
+ mMainView, TQ_SLOT(editIncidence(Incidence *,const TQDate &)) );
+ connect( view, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)),
+ mMainView, TQ_SLOT(deleteIncidence(Incidence *)) );
+ connect( view, TQ_SIGNAL(copyIncidenceSignal(Incidence *)),
+ mMainView, TQ_SLOT(copyIncidence(Incidence *)) );
+ connect( view, TQ_SIGNAL(cutIncidenceSignal(Incidence *)),
+ mMainView, TQ_SLOT(cutIncidence(Incidence *)) );
+ connect( view, TQ_SIGNAL(pasteIncidenceSignal()),
+ mMainView, TQ_SLOT(pasteIncidence()));
+ connect( view, TQ_SIGNAL(toggleAlarmSignal(Incidence *)),
+ mMainView, TQ_SLOT(toggleAlarm(Incidence *)) );
+ connect( view,TQ_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)),
+ mMainView, TQ_SLOT(dissociateOccurrence(Incidence *,const TQDate &)) );
+ connect( view,TQ_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)),
+ mMainView, TQ_SLOT(dissociateFutureOccurrence(Incidence *,const TQDate &)) );
// signals to create new incidences
- connect( view, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)),
- mMainView, TQT_SLOT(newEvent(ResourceCalendar *,const TQString &)) );
- connect( view, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)),
- mMainView, TQT_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDate &)) );
- connect( view, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)),
- mMainView, TQT_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDateTime &)) );
- connect( view, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)),
- mMainView, TQT_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)) );
-
- connect( view, TQT_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)),
- mMainView, TQT_SLOT(newTodo(ResourceCalendar *,const TQString &,const TQDate &)) );
- connect( view, TQT_SIGNAL(newSubTodoSignal(Todo *)),
- mMainView, TQT_SLOT(newSubTodo(Todo *)) );
-
- connect( view, TQT_SIGNAL(newJournalSignal(ResourceCalendar *,const TQString &,const TQDate &)),
- mMainView, TQT_SLOT(newJournal(ResourceCalendar *,const TQString &,const TQDate &)) );
+ connect( view, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)),
+ mMainView, TQ_SLOT(newEvent(ResourceCalendar *,const TQString &)) );
+ connect( view, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)),
+ mMainView, TQ_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDate &)) );
+ connect( view, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)),
+ mMainView, TQ_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDateTime &)) );
+ connect( view, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)),
+ mMainView, TQ_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)) );
+
+ connect( view, TQ_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)),
+ mMainView, TQ_SLOT(newTodo(ResourceCalendar *,const TQString &,const TQDate &)) );
+ connect( view, TQ_SIGNAL(newSubTodoSignal(Todo *)),
+ mMainView, TQ_SLOT(newSubTodo(Todo *)) );
+
+ connect( view, TQ_SIGNAL(newJournalSignal(ResourceCalendar *,const TQString &,const TQDate &)),
+ mMainView, TQ_SLOT(newJournal(ResourceCalendar *,const TQString &,const TQDate &)) );
// reload settings
- connect(mMainView, TQT_SIGNAL(configChanged()), view, TQT_SLOT(updateConfig()));
+ connect(mMainView, TQ_SIGNAL(configChanged()), view, TQ_SLOT(updateConfig()));
// Notifications about added, changed and deleted incidences
- connect( mMainView, TQT_SIGNAL( dayPassed( const TQDate & ) ),
- view, TQT_SLOT( dayPassed( const TQDate & ) ) );
- connect( view, TQT_SIGNAL( startMultiModify( const TQString & ) ),
- mMainView, TQT_SLOT( startMultiModify( const TQString & ) ) );
- connect( view, TQT_SIGNAL( endMultiModify() ),
- mMainView, TQT_SLOT( endMultiModify() ) );
-
- connect( mMainView, TQT_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ),
- view, TQT_SLOT( setIncidenceChanger( IncidenceChangerBase * ) ) );
+ connect( mMainView, TQ_SIGNAL( dayPassed( const TQDate & ) ),
+ view, TQ_SLOT( dayPassed( const TQDate & ) ) );
+ connect( view, TQ_SIGNAL( startMultiModify( const TQString & ) ),
+ mMainView, TQ_SLOT( startMultiModify( const TQString & ) ) );
+ connect( view, TQ_SIGNAL( endMultiModify() ),
+ mMainView, TQ_SLOT( endMultiModify() ) );
+
+ connect( mMainView, TQ_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ),
+ view, TQ_SLOT( setIncidenceChanger( IncidenceChangerBase * ) ) );
view->setIncidenceChanger( mMainView->incidenceChanger() );
}
@@ -287,12 +287,12 @@ void KOViewManager::connectTodoView( KOTodoView* todoView )
if (!todoView) return;
// SIGNALS/SLOTS FOR TODO VIEW
- connect( todoView, TQT_SIGNAL( purgeCompletedSignal() ),
- mMainView, TQT_SLOT( purgeCompleted() ) );
- connect( todoView, TQT_SIGNAL( unSubTodoSignal() ),
- mMainView, TQT_SLOT( todo_unsub() ) );
- connect( todoView, TQT_SIGNAL( unAllSubTodoSignal() ),
- mMainView, TQT_SLOT( makeSubTodosIndependent() ) );
+ connect( todoView, TQ_SIGNAL( purgeCompletedSignal() ),
+ mMainView, TQ_SLOT( purgeCompleted() ) );
+ connect( todoView, TQ_SIGNAL( unSubTodoSignal() ),
+ mMainView, TQ_SLOT( todo_unsub() ) );
+ connect( todoView, TQ_SIGNAL( unAllSubTodoSignal() ),
+ mMainView, TQ_SLOT( makeSubTodosIndependent() ) );
}
void KOViewManager::zoomInHorizontally()
@@ -357,8 +357,8 @@ void KOViewManager::showAgendaView()
TQWidget *parent = mMainView->viewStack();
if ( !mAgendaViewTabs && showBoth ) {
mAgendaViewTabs = new TQTabWidget( mMainView->viewStack() );
- connect( mAgendaViewTabs, TQT_SIGNAL( currentChanged( TQWidget* ) ),
- this, TQT_SLOT( currentAgendaViewTabChanged( TQWidget* ) ) );
+ connect( mAgendaViewTabs, TQ_SIGNAL( currentChanged( TQWidget* ) ),
+ this, TQ_SLOT( currentAgendaViewTabChanged( TQWidget* ) ) );
parent = mAgendaViewTabs;
TDEConfig *config = KOGlobals::self()->config();
@@ -374,13 +374,13 @@ void KOViewManager::showAgendaView()
addView(mAgendaView);
- connect(mAgendaView, TQT_SIGNAL( toggleExpand() ),
- mMainView, TQT_SLOT( toggleExpand() ) );
- connect(mMainView, TQT_SIGNAL( calendarViewExpanded( bool ) ),
- mAgendaView, TQT_SLOT( setExpandedButton( bool ) ) );
+ connect(mAgendaView, TQ_SIGNAL( toggleExpand() ),
+ mMainView, TQ_SLOT( toggleExpand() ) );
+ connect(mMainView, TQ_SIGNAL( calendarViewExpanded( bool ) ),
+ mAgendaView, TQ_SLOT( setExpandedButton( bool ) ) );
- connect( mAgendaView,TQT_SIGNAL( zoomViewHorizontally(const TQDate &, int )),
- mMainView->dateNavigator(),TQT_SLOT( selectDates( const TQDate &, int ) ) );
+ connect( mAgendaView,TQ_SIGNAL( zoomViewHorizontally(const TQDate &, int )),
+ mMainView->dateNavigator(),TQ_SLOT( selectDates( const TQDate &, int ) ) );
mAgendaView->readSettings();
}
@@ -391,13 +391,13 @@ void KOViewManager::showAgendaView()
addView(mAgendaSideBySideView);
-/* connect(mAgendaSideBySideView, TQT_SIGNAL( toggleExpand() ),
- mMainView, TQT_SLOT( toggleExpand() ) );
- connect(mMainView, TQT_SIGNAL( calendarViewExpanded( bool ) ),
- mAgendaSideBySideView, TQT_SLOT( setExpandedButton( bool ) ) );
+/* connect(mAgendaSideBySideView, TQ_SIGNAL( toggleExpand() ),
+ mMainView, TQ_SLOT( toggleExpand() ) );
+ connect(mMainView, TQ_SIGNAL( calendarViewExpanded( bool ) ),
+ mAgendaSideBySideView, TQ_SLOT( setExpandedButton( bool ) ) );
- connect( mAgendaSideBySideView,TQT_SIGNAL( zoomViewHorizontally(const TQDate &, int )),
- mMainView->dateNavigator(),TQT_SLOT( selectDates( const TQDate &, int ) ) );*/
+ connect( mAgendaSideBySideView,TQ_SIGNAL( zoomViewHorizontally(const TQDate &, int )),
+ mMainView->dateNavigator(),TQ_SLOT( selectDates( const TQDate &, int ) ) );*/
}
if ( showBoth && mAgendaViewTabs ) {
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h
index fe41d5bb..93858fae 100644
--- a/korganizer/koviewmanager.h
+++ b/korganizer/koviewmanager.h
@@ -51,7 +51,7 @@ using namespace KCal;
*/
class KOViewManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 7b8ab992..7c8ce447 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -70,7 +70,7 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, TQWidget *parent,
// dateLabel->setAlignment(AlignCenter);
mView = new WhatsNextTextBrowser(this);
- connect(mView,TQT_SIGNAL(showIncidence(const TQString &)),TQT_SLOT(showIncidence(const TQString &)));
+ connect(mView,TQ_SIGNAL(showIncidence(const TQString &)),TQ_SLOT(showIncidence(const TQString &)));
TQBoxLayout *topLayout = new TQVBoxLayout(this);
// topLayout->addWidget(dateLabel);
diff --git a/korganizer/kowhatsnextview.h b/korganizer/kowhatsnextview.h
index 22c55f5d..126a7055 100644
--- a/korganizer/kowhatsnextview.h
+++ b/korganizer/kowhatsnextview.h
@@ -33,7 +33,7 @@ class TQListView;
class KOEventViewerDialog;
class WhatsNextTextBrowser : public TQTextBrowser {
- Q_OBJECT
+ TQ_OBJECT
public:
WhatsNextTextBrowser(TQWidget *parent) : TQTextBrowser(parent) {}
@@ -50,7 +50,7 @@ class WhatsNextTextBrowser : public TQTextBrowser {
*/
class KOWhatsNextView : public KOrg::BaseView
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOWhatsNextView(Calendar *calendar, TQWidget *parent = 0,
diff --git a/korganizer/kowindowlist.h b/korganizer/kowindowlist.h
index 69523160..fa307b8b 100644
--- a/korganizer/kowindowlist.h
+++ b/korganizer/kowindowlist.h
@@ -42,7 +42,7 @@ class KURL;
*/
class KOWindowList : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp
index 7cbd42eb..e900fa48 100644
--- a/korganizer/multiagendaview.cpp
+++ b/korganizer/multiagendaview.cpp
@@ -57,7 +57,7 @@ MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView,
TQVBox *topSideBox = new TQVBox( this );
mLeftTopSpacer = new TQWidget( topSideBox );
mLeftTopSpacer->setFixedHeight( topLabelHeight );
- mLeftSplitter = new TQSplitter( Qt::Vertical, topSideBox );
+ mLeftSplitter = new TQSplitter( TQt::Vertical, topSideBox );
mLeftSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
TQLabel *label = new TQLabel( i18n("All Day"), mLeftSplitter );
label->setAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak );
@@ -81,14 +81,14 @@ MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView,
topSideBox = new TQVBox( this );
mRightTopSpacer = new TQWidget( topSideBox );
mRightTopSpacer->setFixedHeight( topLabelHeight );
- mRightSplitter = new TQSplitter( Qt::Vertical, topSideBox );
+ mRightSplitter = new TQSplitter( TQt::Vertical, topSideBox );
mRightSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
new TQWidget( mRightSplitter );
sideBox = new TQVBox( mRightSplitter );
eiSpacer = new EventIndicator( EventIndicator::Top, sideBox );
eiSpacer->setFixedHeight( eiSpacer->minimumHeight() );
eiSpacer->changeColumns( 0 );
- mScrollBar = new TQScrollBar( Qt::Vertical, sideBox );
+ mScrollBar = new TQScrollBar( TQt::Vertical, sideBox );
eiSpacer = new EventIndicator( EventIndicator::Bottom, sideBox );
eiSpacer->setFixedHeight( eiSpacer->minimumHeight() );
eiSpacer->changeColumns( 0 );
@@ -142,13 +142,13 @@ void MultiAgendaView::recreateViews()
}
setupViews();
- TQTimer::singleShot( 0, this, TQT_SLOT(slotResizeScrollView()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(slotResizeScrollView()) );
mTimeLabels->updateConfig();
- connect( mTimeLabels->verticalScrollBar(), TQT_SIGNAL(valueChanged(int)),
- mScrollBar, TQT_SLOT(setValue(int)) );
- connect( mScrollBar, TQT_SIGNAL(valueChanged(int)),
- mTimeLabels, TQT_SLOT(positionChanged(int)) );
+ connect( mTimeLabels->verticalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+ mScrollBar, TQ_SLOT(setValue(int)) );
+ connect( mScrollBar, TQ_SIGNAL(valueChanged(int)),
+ mTimeLabels, TQ_SLOT(positionChanged(int)) );
installSplitterEventFilter( mLeftSplitter );
installSplitterEventFilter( mRightSplitter );
@@ -163,7 +163,7 @@ void MultiAgendaView::recreateViews()
mLeftSplitter->setSizes( sizes );
mRightSplitter->setSizes( sizes );
- TQTimer::singleShot( 0, this, TQT_SLOT(setupScrollBar()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(setupScrollBar()) );
mTimeLabels->positionChanged();
}
@@ -185,79 +185,79 @@ void MultiAgendaView::setupViews()
FOREACH_VIEW( agenda ) {
if ( !agenda->readOnly() ) {
connect( agenda,
- TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)),
- TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)) );
+ TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)),
+ TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)) );
connect( agenda,
- TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)),
- TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)) );
+ TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)),
+ TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)) );
connect( agenda,
- TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)),
- TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)) );
+ TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)),
+ TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)) );
connect( agenda,
- TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)),
- TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime&)) );
+ TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)),
+ TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime&)) );
connect( agenda,
- TQT_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)),
- TQT_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)) );
+ TQ_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)),
+ TQ_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)) );
connect( agenda,
- TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)),
- TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) );
+ TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)),
+ TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) );
connect( agenda,
- TQT_SIGNAL(deleteIncidenceSignal(Incidence *)),
- TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) );
+ TQ_SIGNAL(deleteIncidenceSignal(Incidence *)),
+ TQ_SIGNAL(deleteIncidenceSignal(Incidence *)) );
connect( agenda,
- TQT_SIGNAL(startMultiModify(const TQString &)),
- TQT_SIGNAL(startMultiModify(const TQString &)) );
+ TQ_SIGNAL(startMultiModify(const TQString &)),
+ TQ_SIGNAL(startMultiModify(const TQString &)) );
connect( agenda,
- TQT_SIGNAL(endMultiModify()),
- TQT_SIGNAL(endMultiModify()) );
+ TQ_SIGNAL(endMultiModify()),
+ TQ_SIGNAL(endMultiModify()) );
connect( agenda,
- TQT_SIGNAL(cutIncidenceSignal(Incidence*)),
- TQT_SIGNAL(cutIncidenceSignal(Incidence*)) );
+ TQ_SIGNAL(cutIncidenceSignal(Incidence*)),
+ TQ_SIGNAL(cutIncidenceSignal(Incidence*)) );
connect( agenda,
- TQT_SIGNAL(pasteIncidenceSignal()),
- TQT_SIGNAL(pasteIncidenceSignal()) );
+ TQ_SIGNAL(pasteIncidenceSignal()),
+ TQ_SIGNAL(pasteIncidenceSignal()) );
connect( agenda,
- TQT_SIGNAL(toggleAlarmSignal(Incidence*)),
- TQT_SIGNAL(toggleAlarmSignal(Incidence*)) );
+ TQ_SIGNAL(toggleAlarmSignal(Incidence*)),
+ TQ_SIGNAL(toggleAlarmSignal(Incidence*)) );
connect( agenda,
- TQT_SIGNAL(dissociateOccurrenceSignal(Incidence*, const TQDate&)),
- TQT_SIGNAL(dissociateOccurrenceSignal(Incidence*, const TQDate&)) );
+ TQ_SIGNAL(dissociateOccurrenceSignal(Incidence*, const TQDate&)),
+ TQ_SIGNAL(dissociateOccurrenceSignal(Incidence*, const TQDate&)) );
connect( agenda,
- TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence*, const TQDate&)),
- TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence*, const TQDate&)) );
+ TQ_SIGNAL(dissociateFutureOccurrenceSignal(Incidence*, const TQDate&)),
+ TQ_SIGNAL(dissociateFutureOccurrenceSignal(Incidence*, const TQDate&)) );
}
connect( agenda,
- TQT_SIGNAL(copyIncidenceSignal(Incidence*)),
- TQT_SIGNAL(copyIncidenceSignal(Incidence*)) );
+ TQ_SIGNAL(copyIncidenceSignal(Incidence*)),
+ TQ_SIGNAL(copyIncidenceSignal(Incidence*)) );
connect( agenda,
- TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)),
- TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) );
+ TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)),
+ TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) );
connect( agenda,
- TQT_SIGNAL(incidenceSelected(Incidence *,const TQDate &)),
- TQT_SIGNAL(incidenceSelected(Incidence *,const TQDate &)) );
+ TQ_SIGNAL(incidenceSelected(Incidence *,const TQDate &)),
+ TQ_SIGNAL(incidenceSelected(Incidence *,const TQDate &)) );
connect( agenda,
- TQT_SIGNAL(incidenceSelected(Incidence*,const TQDate &)),
- TQT_SLOT(slotSelectionChanged()) );
+ TQ_SIGNAL(incidenceSelected(Incidence*,const TQDate &)),
+ TQ_SLOT(slotSelectionChanged()) );
connect( agenda,
- TQT_SIGNAL(timeSpanSelectionChanged()),
- TQT_SLOT(slotClearTimeSpanSelection()) );
+ TQ_SIGNAL(timeSpanSelectionChanged()),
+ TQ_SLOT(slotClearTimeSpanSelection()) );
disconnect( agenda->agenda(),
- TQT_SIGNAL(zoomView(const int,const TQPoint&,const Qt::Orientation)),
+ TQ_SIGNAL(zoomView(const int,const TQPoint&,const TQt::Orientation)),
agenda, 0 );
connect( agenda->agenda(),
- TQT_SIGNAL(zoomView(const int,const TQPoint&,const Qt::Orientation)),
- TQT_SLOT(zoomView(const int,const TQPoint&,const Qt::Orientation)) );
+ TQ_SIGNAL(zoomView(const int,const TQPoint&,const TQt::Orientation)),
+ TQ_SLOT(zoomView(const int,const TQPoint&,const TQt::Orientation)) );
}
KOAgenda *anAgenda = mAgendaViews.first()->agenda();
- connect( anAgenda, TQT_SIGNAL(lowerYChanged(int) ), TQT_SLOT(resizeSpacers(int)) );
+ connect( anAgenda, TQ_SIGNAL(lowerYChanged(int) ), TQ_SLOT(resizeSpacers(int)) );
FOREACH_VIEW( agenda ) {
agenda->readSettings();
@@ -409,10 +409,10 @@ void MultiAgendaView::addView( const TQString &label, ResourceCalendar *res, con
box->show();
mTimeLabels->setAgenda( av->agenda() );
- connect( av->agenda()->verticalScrollBar(), TQT_SIGNAL(valueChanged(int)),
- mTimeLabels, TQT_SLOT(positionChanged(int)) );
- connect( mTimeLabels->verticalScrollBar(), TQT_SIGNAL(valueChanged(int)),
- av, TQT_SLOT(setContentsPos(int)) );
+ connect( av->agenda()->verticalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+ mTimeLabels, TQ_SLOT(positionChanged(int)) );
+ connect( mTimeLabels->verticalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+ av, TQ_SLOT(setContentsPos(int)) );
av->installEventFilter( this );
installSplitterEventFilter( av->splitter() );
@@ -459,19 +459,19 @@ void MultiAgendaView::updateConfig()
bool MultiAgendaView::eventFilter(TQObject * obj, TQEvent * event)
{
- if ( obj->className() == TQCString(TQSPLITTERHANDLE_OBJECT_NAME_STRING) ) {
+ if ( obj->className() == TQCString("TQSplitterHandle") ) {
// KDE4: not needed anymore, TQSplitter has a moved signal there
if ( (event->type() == TQEvent::MouseMove && TDEGlobalSettings::opaqueResize())
|| event->type() == TQEvent::MouseButtonRelease ) {
FOREACH_VIEW( agenda ) {
- if ( TQT_BASE_OBJECT(agenda->splitter()) == TQT_BASE_OBJECT(obj->parent()) )
+ if ( agenda->splitter() == obj->parent() )
mLastMovedSplitter = agenda->splitter();
}
- if ( TQT_BASE_OBJECT(mLeftSplitter )== TQT_BASE_OBJECT(obj->parent()) )
+ if ( mLeftSplitter == obj->parent() )
mLastMovedSplitter = mLeftSplitter;
- else if ( TQT_BASE_OBJECT(mRightSplitter) == TQT_BASE_OBJECT(obj->parent()) )
+ else if ( mRightSplitter == obj->parent() )
mLastMovedSplitter = mRightSplitter;
- TQTimer::singleShot( 0, this, TQT_SLOT(resizeSplitters()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(resizeSplitters()) );
}
}
@@ -520,9 +520,9 @@ void MultiAgendaView::resizeSpacers( int newY )
mRightTopSpacer->setFixedHeight( topLabelHeight );
}
-void MultiAgendaView::zoomView( const int delta, const TQPoint & pos, const Qt::Orientation ori )
+void MultiAgendaView::zoomView( const int delta, const TQPoint & pos, const TQt::Orientation ori )
{
- if ( ori == Qt::Vertical ) {
+ if ( ori == TQt::Vertical ) {
if ( delta > 0 ) {
if ( KOPrefs::instance()->mHourSize > 4 )
KOPrefs::instance()->mHourSize--;
@@ -542,7 +542,7 @@ void MultiAgendaView::zoomView( const int delta, const TQPoint & pos, const Qt::
// KDE4: not needed, use existing TQSplitter signals instead
void MultiAgendaView::installSplitterEventFilter(TQSplitter * splitter)
{
- TQObjectList *objlist = splitter->queryList( TQSPLITTERHANDLE_OBJECT_NAME_STRING );
+ TQObjectList *objlist = splitter->queryList( "TQSplitterHandle" );
// HACK: when not being visible, the splitter handle is sometimes not found
// for unknown reasons, so trigger an update when we are shown again
if ( objlist->count() == 0 && !isVisible() )
diff --git a/korganizer/multiagendaview.h b/korganizer/multiagendaview.h
index f3e22754..a3dba886 100644
--- a/korganizer/multiagendaview.h
+++ b/korganizer/multiagendaview.h
@@ -40,7 +40,7 @@ namespace KOrg {
*/
class MultiAgendaView : public AgendaView
{
- Q_OBJECT
+ TQ_OBJECT
public:
explicit MultiAgendaView( Calendar* cal, CalendarView *calendarView,
@@ -91,7 +91,7 @@ class MultiAgendaView : public AgendaView
void resizeSplitters();
void resizeSpacers( int );
void setupScrollBar();
- void zoomView( const int delta, const TQPoint &pos, const Qt::Orientation ori );
+ void zoomView( const int delta, const TQPoint &pos, const TQt::Orientation ori );
void slotResizeScrollView();
private:
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index 223cbb98..23581036 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -118,12 +118,12 @@ NavigatorBar::NavigatorBar( TQWidget *parent, const char *name )
ctrlLayout->addWidget( mNextMonth );
ctrlLayout->addWidget( mNextYear );
- connect( mPrevYear, TQT_SIGNAL( clicked() ), TQT_SIGNAL( prevYearClicked() ) );
- connect( mPrevMonth, TQT_SIGNAL( clicked() ), TQT_SIGNAL( prevMonthClicked() ) );
- connect( mNextMonth, TQT_SIGNAL( clicked() ), TQT_SIGNAL( nextMonthClicked() ) );
- connect( mNextYear, TQT_SIGNAL( clicked() ), TQT_SIGNAL( nextYearClicked() ) );
- connect( mMonth, TQT_SIGNAL( clicked() ), TQT_SLOT( selectMonthFromMenu() ) );
- connect( mYear, TQT_SIGNAL( clicked() ), TQT_SLOT( selectYearFromMenu() ) );
+ connect( mPrevYear, TQ_SIGNAL( clicked() ), TQ_SIGNAL( prevYearClicked() ) );
+ connect( mPrevMonth, TQ_SIGNAL( clicked() ), TQ_SIGNAL( prevMonthClicked() ) );
+ connect( mNextMonth, TQ_SIGNAL( clicked() ), TQ_SIGNAL( nextMonthClicked() ) );
+ connect( mNextYear, TQ_SIGNAL( clicked() ), TQ_SIGNAL( nextYearClicked() ) );
+ connect( mMonth, TQ_SIGNAL( clicked() ), TQ_SLOT( selectMonthFromMenu() ) );
+ connect( mYear, TQ_SIGNAL( clicked() ), TQ_SLOT( selectYearFromMenu() ) );
}
NavigatorBar::~NavigatorBar()
diff --git a/korganizer/navigatorbar.h b/korganizer/navigatorbar.h
index 13d39716..fcff809f 100644
--- a/korganizer/navigatorbar.h
+++ b/korganizer/navigatorbar.h
@@ -33,7 +33,7 @@ class TQFrame;
class ActiveLabel : public TQLabel
{
- Q_OBJECT
+ TQ_OBJECT
public:
ActiveLabel( TQWidget *parent, const char *name = 0 );
@@ -48,7 +48,7 @@ class ActiveLabel : public TQLabel
class NavigatorBar: public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
NavigatorBar( TQWidget *parent = 0, const char *name = 0 );
diff --git a/korganizer/plugins/datenums/configdialog.h b/korganizer/plugins/datenums/configdialog.h
index d5e6a52c..9bc2bc87 100644
--- a/korganizer/plugins/datenums/configdialog.h
+++ b/korganizer/plugins/datenums/configdialog.h
@@ -25,7 +25,7 @@ class TQButtonGroup;
class ConfigDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
ConfigDialog(TQWidget *parent=0);
diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp
index e0bc1ab7..3a55cba9 100644
--- a/korganizer/plugins/exchange/exchange.cpp
+++ b/korganizer/plugins/exchange/exchange.cpp
@@ -69,29 +69,29 @@ Exchange::Exchange(KOrg::MainWindow *parent, const char *name) :
setXMLFile("plugins/exchangeui.rc");
- new TDEAction(i18n("&Download..."), 0, this, TQT_SLOT(download()),
+ new TDEAction(i18n("&Download..."), 0, this, TQ_SLOT(download()),
actionCollection(), "exchange_download");
- TDEAction *action = new TDEAction(i18n("&Upload Event..."), 0, this, TQT_SLOT(upload()),
+ TDEAction *action = new TDEAction(i18n("&Upload Event..."), 0, this, TQ_SLOT(upload()),
actionCollection(), "exchange_upload");
- TQObject::connect(mainWindow()->view(),TQT_SIGNAL(incidenceSelected(Incidence *)),
- this, TQT_SLOT(slotIncidenceSelected(Incidence *)));
+ TQObject::connect(mainWindow()->view(),TQ_SIGNAL(incidenceSelected(Incidence *)),
+ this, TQ_SLOT(slotIncidenceSelected(Incidence *)));
action->setEnabled( false );
- TQObject::connect(this,TQT_SIGNAL(enableIncidenceActions(bool)),
- action,TQT_SLOT(setEnabled(bool)));
+ TQObject::connect(this,TQ_SIGNAL(enableIncidenceActions(bool)),
+ action,TQ_SLOT(setEnabled(bool)));
- action = new TDEAction(i18n("De&lete Event"), 0, this, TQT_SLOT(remove()),
+ action = new TDEAction(i18n("De&lete Event"), 0, this, TQ_SLOT(remove()),
actionCollection(), "exchange_delete");
- TQObject::connect(this,TQT_SIGNAL(enableIncidenceActions(bool)),
- action,TQT_SLOT(setEnabled(bool)));
+ TQObject::connect(this,TQ_SIGNAL(enableIncidenceActions(bool)),
+ action,TQ_SLOT(setEnabled(bool)));
action->setEnabled( false );
- new TDEAction(i18n("&Configure..."), 0, this, TQT_SLOT(configure()),
+ new TDEAction(i18n("&Configure..."), 0, this, TQ_SLOT(configure()),
actionCollection(), "exchange_configure");
- connect( this, TQT_SIGNAL( calendarChanged() ), mainWindow()->view(), TQT_SLOT( updateView() ) );
- connect( this, TQT_SIGNAL( calendarChanged(const TQDate &, const TQDate &)),
- mainWindow()->view(), TQT_SLOT(updateView(const TQDate &, const TQDate &)) );
+ connect( this, TQ_SIGNAL( calendarChanged() ), mainWindow()->view(), TQ_SLOT( updateView() ) );
+ connect( this, TQ_SIGNAL( calendarChanged(const TQDate &, const TQDate &)),
+ mainWindow()->view(), TQ_SLOT(updateView(const TQDate &, const TQDate &)) );
}
Exchange::~Exchange()
diff --git a/korganizer/plugins/exchange/exchange.h b/korganizer/plugins/exchange/exchange.h
index 8de777fe..26c5e8de 100644
--- a/korganizer/plugins/exchange/exchange.h
+++ b/korganizer/plugins/exchange/exchange.h
@@ -34,7 +34,7 @@
using namespace KCal;
class Exchange : public KOrg::Part {
- Q_OBJECT
+ TQ_OBJECT
public:
Exchange( KOrg::MainWindow *, const char *name );
diff --git a/korganizer/plugins/exchange/exchangeconfig.cpp b/korganizer/plugins/exchange/exchangeconfig.cpp
index 106fc867..913482f3 100644
--- a/korganizer/plugins/exchange/exchangeconfig.cpp
+++ b/korganizer/plugins/exchange/exchangeconfig.cpp
@@ -53,7 +53,7 @@ ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* parent
m_user = new KLineEdit( mAccount->account(), topFrame );
topLayout->addWidget( new TQLabel( i18n( "User:" ), topFrame ), 2, 0 );
topLayout->addWidget( m_user, 2, 1 );
- connect( m_user, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUserChanged(const TQString&)) );
+ connect( m_user, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotUserChanged(const TQString&)) );
m_password = new KLineEdit( mAccount->password(), topFrame );
topLayout->addWidget( new TQLabel( i18n( "Password:" ), topFrame ), 3, 0 );
@@ -62,7 +62,7 @@ ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* parent
m_autoMailbox = new TQCheckBox( i18n( "Determine mailbox automatically" ), topFrame );
topLayout->addMultiCellWidget( m_autoMailbox, 4, 4, 0, 1 );
- connect( m_autoMailbox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAuto(bool)) );
+ connect( m_autoMailbox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAuto(bool)) );
m_mailbox= new KLineEdit( mAccount->mailbox(), topFrame );
topLayout->addWidget( new TQLabel( i18n( "Mailbox URL:" ), topFrame ), 5, 0 );
@@ -70,7 +70,7 @@ ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* parent
m_tryFindMailbox = new TQPushButton( "&Find", topFrame );
topLayout->addWidget( m_tryFindMailbox, 5, 2 );
- connect( m_tryFindMailbox, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFindClicked()) );
+ connect( m_tryFindMailbox, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFindClicked()) );
kapp->config()->setGroup( "Calendar/Exchange Plugin" );
bool autoChecked = kapp->config()->readBoolEntry( "auto-mailbox", true );
diff --git a/korganizer/plugins/exchange/exchangeconfig.h b/korganizer/plugins/exchange/exchangeconfig.h
index a7aa3285..dc46da9b 100644
--- a/korganizer/plugins/exchange/exchangeconfig.h
+++ b/korganizer/plugins/exchange/exchangeconfig.h
@@ -29,7 +29,7 @@
class ExchangeConfig : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
ExchangeConfig(KPIM::ExchangeAccount* account, TQWidget *parent=0);
diff --git a/korganizer/plugins/exchange/exchangedialog.h b/korganizer/plugins/exchange/exchangedialog.h
index 8c525f2b..fc102072 100644
--- a/korganizer/plugins/exchange/exchangedialog.h
+++ b/korganizer/plugins/exchange/exchangedialog.h
@@ -26,7 +26,7 @@ class TQComboBox;
class ExchangeDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
ExchangeDialog( const TQDate &start, const TQDate &end, TQWidget *parent=0);
diff --git a/korganizer/plugins/hebrew/configdialog.h b/korganizer/plugins/hebrew/configdialog.h
index 805ba970..9a9f0b45 100644
--- a/korganizer/plugins/hebrew/configdialog.h
+++ b/korganizer/plugins/hebrew/configdialog.h
@@ -27,7 +27,7 @@
*/
class ConfigDialog:public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp
index 033b6ba6..8b0e5cbf 100644
--- a/korganizer/plugins/projectview/koprojectview.cpp
+++ b/korganizer/plugins/projectview/koprojectview.cpp
@@ -79,15 +79,15 @@ KOProjectView::KOProjectView(Calendar *calendar,TQWidget* parent,
TQPushButton *zoomIn = new TQPushButton(i18n("Zoom In"),this);
topBar->addWidget(zoomIn,0);
- connect(zoomIn,TQT_SIGNAL(clicked()),TQT_SLOT(zoomIn()));
+ connect(zoomIn,TQ_SIGNAL(clicked()),TQ_SLOT(zoomIn()));
TQPushButton *zoomOut = new TQPushButton(i18n("Zoom Out"),this);
topBar->addWidget(zoomOut,0);
- connect(zoomOut,TQT_SIGNAL(clicked()),TQT_SLOT(zoomOut()));
+ connect(zoomOut,TQ_SIGNAL(clicked()),TQ_SLOT(zoomOut()));
TQPushButton *menuButton = new TQPushButton(i18n("Select Mode"),this);
topBar->addWidget(menuButton,0);
- connect(menuButton,TQT_SIGNAL(clicked()),TQT_SLOT(showModeMenu()));
+ connect(menuButton,TQ_SIGNAL(clicked()),TQ_SLOT(showModeMenu()));
createMainTask();
@@ -239,8 +239,8 @@ KGanttItem *KOProjectView::createTask(KGanttItem *parent,Todo *todo)
KGanttItem *task = new KOProjectViewItem(todo,parent,todo->summary(),startDt,
endDt);
- connect(task,TQT_SIGNAL(changed(KGanttItem*, KGanttItem::Change)),
- TQT_SLOT(taskChanged(KGanttItem*,KGanttItem::Change)));
+ connect(task,TQ_SIGNAL(changed(KGanttItem*, KGanttItem::Change)),
+ TQ_SLOT(taskChanged(KGanttItem*,KGanttItem::Change)));
if (todo->relations().count() > 0) {
task->setBrush(TQBrush(TQColor(240,240,240), TQBrush::Dense4Pattern));
}
diff --git a/korganizer/plugins/projectview/koprojectview.h b/korganizer/plugins/projectview/koprojectview.h
index 5415d381..fada01d5 100644
--- a/korganizer/plugins/projectview/koprojectview.h
+++ b/korganizer/plugins/projectview/koprojectview.h
@@ -65,7 +65,7 @@ class KOProjectViewItem : public KGanttItem {
*/
class KOProjectView : public KOrg::BaseView
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOProjectView(Calendar *, TQWidget* parent=0, const char* name=0 );
diff --git a/korganizer/plugins/projectview/projectview.cpp b/korganizer/plugins/projectview/projectview.cpp
index 60257623..db354184 100644
--- a/korganizer/plugins/projectview/projectview.cpp
+++ b/korganizer/plugins/projectview/projectview.cpp
@@ -52,7 +52,7 @@ ProjectView::ProjectView(KOrg::MainWindow *parent, const char *name) :
setXMLFile("plugins/projectviewui.rc");
- new TDEAction(i18n("&Project"), "project", 0, this, TQT_SLOT(showView()),
+ new TDEAction(i18n("&Project"), "project", 0, this, TQ_SLOT(showView()),
actionCollection(), "view_project");
}
diff --git a/korganizer/plugins/projectview/projectview.h b/korganizer/plugins/projectview/projectview.h
index 1c78ad84..cbb0e8f0 100644
--- a/korganizer/plugins/projectview/projectview.h
+++ b/korganizer/plugins/projectview/projectview.h
@@ -24,7 +24,7 @@
#include <korganizer/calendarviewbase.h>
class ProjectView : public KOrg::Part {
- Q_OBJECT
+ TQ_OBJECT
public:
ProjectView(KOrg::MainWindow *, const char *);
diff --git a/korganizer/plugins/timespanview/kotimespanview.cpp b/korganizer/plugins/timespanview/kotimespanview.cpp
index 8445edf4..00910bfe 100644
--- a/korganizer/plugins/timespanview/kotimespanview.cpp
+++ b/korganizer/plugins/timespanview/kotimespanview.cpp
@@ -44,7 +44,7 @@ KOTimeSpanView::KOTimeSpanView(Calendar *calendar, TQWidget *parent,
mTimeSpanWidget = new TimeSpanWidget( this );
topLayout->addWidget( mTimeSpanWidget );
- connect( mTimeSpanWidget, TQT_SIGNAL( dateRangeChanged() ), TQT_SLOT( updateView() ) );
+ connect( mTimeSpanWidget, TQ_SIGNAL( dateRangeChanged() ), TQ_SLOT( updateView() ) );
}
KOTimeSpanView::~KOTimeSpanView()
diff --git a/korganizer/plugins/timespanview/kotimespanview.h b/korganizer/plugins/timespanview/kotimespanview.h
index b9dec86a..2e487880 100644
--- a/korganizer/plugins/timespanview/kotimespanview.h
+++ b/korganizer/plugins/timespanview/kotimespanview.h
@@ -31,7 +31,7 @@ class TimeSpanWidget;
class KOTimeSpanView : public KOEventView
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOTimeSpanView( Calendar *calendar, TQWidget *parent = 0,
diff --git a/korganizer/plugins/timespanview/lineview.h b/korganizer/plugins/timespanview/lineview.h
index 5db02c09..26944153 100644
--- a/korganizer/plugins/timespanview/lineview.h
+++ b/korganizer/plugins/timespanview/lineview.h
@@ -29,7 +29,7 @@
class LineView : public TQScrollView
{
- Q_OBJECT
+ TQ_OBJECT
public:
LineView( TQWidget *parent = 0, const char *name = 0 );
diff --git a/korganizer/plugins/timespanview/timeline.h b/korganizer/plugins/timespanview/timeline.h
index 0cb9ad5b..47d3a5d9 100644
--- a/korganizer/plugins/timespanview/timeline.h
+++ b/korganizer/plugins/timespanview/timeline.h
@@ -29,7 +29,7 @@
class TimeLine : public TQScrollView
{
- Q_OBJECT
+ TQ_OBJECT
public:
TimeLine( TQWidget *parent = 0, const char *name = 0 );
diff --git a/korganizer/plugins/timespanview/timespanview.cpp b/korganizer/plugins/timespanview/timespanview.cpp
index 4b3df7ef..5ff4cf0a 100644
--- a/korganizer/plugins/timespanview/timespanview.cpp
+++ b/korganizer/plugins/timespanview/timespanview.cpp
@@ -51,7 +51,7 @@ TimespanView::TimespanView(KOrg::MainWindow *parent, const char *name) :
setXMLFile( "plugins/timespanviewui.rc" );
- new TDEAction( i18n("&Timespan"), "timespan", 0, this, TQT_SLOT( showView() ),
+ new TDEAction( i18n("&Timespan"), "timespan", 0, this, TQ_SLOT( showView() ),
actionCollection(), "view_timespan" );
}
diff --git a/korganizer/plugins/timespanview/timespanview.h b/korganizer/plugins/timespanview/timespanview.h
index ee20bb13..dab3ac48 100644
--- a/korganizer/plugins/timespanview/timespanview.h
+++ b/korganizer/plugins/timespanview/timespanview.h
@@ -24,7 +24,7 @@
#include <korganizer/calendarviewbase.h>
class TimespanView : public KOrg::Part {
- Q_OBJECT
+ TQ_OBJECT
public:
TimespanView(KOrg::MainWindow *, const char *);
diff --git a/korganizer/plugins/timespanview/timespanwidget.cpp b/korganizer/plugins/timespanview/timespanwidget.cpp
index 8b0ff4b3..99f529b3 100644
--- a/korganizer/plugins/timespanview/timespanwidget.cpp
+++ b/korganizer/plugins/timespanview/timespanwidget.cpp
@@ -63,19 +63,19 @@ TimeSpanWidget::TimeSpanWidget( TQWidget *parent, const char *name ) :
TQBoxLayout *buttonLayout = new TQHBoxLayout( rightPaneLayout );
TQPushButton *zoomInButton = new TQPushButton( i18n("Zoom In"), rightPane );
- connect( zoomInButton, TQT_SIGNAL( clicked() ), TQT_SLOT( zoomIn() ) );
+ connect( zoomInButton, TQ_SIGNAL( clicked() ), TQ_SLOT( zoomIn() ) );
buttonLayout->addWidget( zoomInButton );
TQPushButton *zoomOutButton = new TQPushButton( i18n("Zoom Out"), rightPane );
- connect( zoomOutButton, TQT_SIGNAL( clicked() ), TQT_SLOT( zoomOut() ) );
+ connect( zoomOutButton, TQ_SIGNAL( clicked() ), TQ_SLOT( zoomOut() ) );
buttonLayout->addWidget( zoomOutButton );
TQPushButton *centerButton = new TQPushButton( i18n("Center View"), rightPane );
- connect( centerButton, TQT_SIGNAL( clicked() ), TQT_SLOT( centerView() ) );
+ connect( centerButton, TQ_SIGNAL( clicked() ), TQ_SLOT( centerView() ) );
buttonLayout->addWidget( centerButton );
- connect(mLineView->horizontalScrollBar(),TQT_SIGNAL(valueChanged(int)),
- mTimeLine,TQT_SLOT(setContentsPos(int)));
+ connect(mLineView->horizontalScrollBar(),TQ_SIGNAL(valueChanged(int)),
+ mTimeLine,TQ_SLOT(setContentsPos(int)));
}
TimeSpanWidget::~TimeSpanWidget()
diff --git a/korganizer/plugins/timespanview/timespanwidget.h b/korganizer/plugins/timespanview/timespanwidget.h
index cf2991df..187786ad 100644
--- a/korganizer/plugins/timespanview/timespanwidget.h
+++ b/korganizer/plugins/timespanview/timespanwidget.h
@@ -37,7 +37,7 @@ class TimeLine;
class TimeSpanWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
TimeSpanWidget( TQWidget *parent=0, const char *name=0 );
diff --git a/korganizer/previewdialog.cpp b/korganizer/previewdialog.cpp
index dade7791..8e77504a 100644
--- a/korganizer/previewdialog.cpp
+++ b/korganizer/previewdialog.cpp
@@ -64,8 +64,8 @@ PreviewDialog::PreviewDialog( const KURL &url, TQWidget *parent )
topLayout->setSpacing( spacingHint() );
topLayout->setMargin( marginHint() );
- connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotMerge()) );
- connect( this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(slotAdd()) );
+ connect( this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotMerge()) );
+ connect( this, TQ_SIGNAL(user2Clicked()), TQ_SLOT(slotAdd()) );
// when someone edits a kmail attachment he's editing a tmp file, check for that
// and if it's a tmp file then open a save dialog
diff --git a/korganizer/previewdialog.h b/korganizer/previewdialog.h
index 243be11d..73540d47 100644
--- a/korganizer/previewdialog.h
+++ b/korganizer/previewdialog.h
@@ -40,7 +40,7 @@ namespace KCal {
class PreviewDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
PreviewDialog( const KURL &url, TQWidget *parent );
diff --git a/korganizer/printing/calprinter.cpp b/korganizer/printing/calprinter.cpp
index 65d1bc08..8a9a6cb2 100644
--- a/korganizer/printing/calprinter.cpp
+++ b/korganizer/printing/calprinter.cpp
@@ -174,7 +174,7 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins,
TQVBox *page = makeVBoxMainWidget();
TQSplitter *splitter = new TQSplitter( page );
- splitter->setOrientation( Qt::Horizontal );
+ splitter->setOrientation( TQt::Horizontal );
mTypeGroup = new TQVButtonGroup( i18n("Print Style"), splitter, "buttonGroup" );
// use the minimal width possible = max width of the radio buttons, not extensible
@@ -202,7 +202,7 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins,
splitterRightLayout->addWidget( mOrientationSelection, 1, 1 );
// signals and slots connections
- connect( mTypeGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( setPrintType( int ) ) );
+ connect( mTypeGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( setPrintType( int ) ) );
orientationLabel->setBuddy( mOrientationSelection );
// First insert the config widgets into the widget stack. This possibly assigns
diff --git a/korganizer/printing/calprinter.h b/korganizer/printing/calprinter.h
index ae62d75a..5d5035f4 100644
--- a/korganizer/printing/calprinter.h
+++ b/korganizer/printing/calprinter.h
@@ -52,7 +52,7 @@ class TQLabel;
*/
class KDE_EXPORT CalPrinter : public TQObject, public KOrg::CalPrinterBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -106,7 +106,7 @@ class KDE_EXPORT CalPrinter : public TQObject, public KOrg::CalPrinterBase
class CalPrintDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
CalPrintDialog( KOrg::PrintPlugin::List plugins,
diff --git a/korganizer/printing/calprinttodoconfig_base.ui b/korganizer/printing/calprinttodoconfig_base.ui
index 58a269a6..031c45dd 100644
--- a/korganizer/printing/calprinttodoconfig_base.ui
+++ b/korganizer/printing/calprinttodoconfig_base.ui
@@ -245,9 +245,6 @@
<property name="text">
<string>Due date</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="checked">
<bool>true</bool>
</property>
diff --git a/korganizer/publishdialog.cpp b/korganizer/publishdialog.cpp
index c8366add..5e597524 100644
--- a/korganizer/publishdialog.cpp
+++ b/korganizer/publishdialog.cpp
@@ -46,18 +46,18 @@ PublishDialog::PublishDialog( TQWidget* parent, const char* name,
setMainWidget( mWidget );
mWidget->mNameLineEdit->setEnabled( false );
mWidget->mEmailLineEdit->setEnabled( false );
- connect( mWidget->mAddressListView, TQT_SIGNAL( selectionChanged(TQListViewItem *) ),
- TQT_SLOT(updateInput()));
- connect( mWidget->mNew, TQT_SIGNAL( clicked() ),
- TQT_SLOT( addItem() ) );
- connect( mWidget->mRemove, TQT_SIGNAL( clicked() ),
- TQT_SLOT( removeItem() ) );
- connect( mWidget->mSelectAddressee, TQT_SIGNAL( clicked() ),
- TQT_SLOT( openAddressbook() ) );
- connect( mWidget->mNameLineEdit, TQT_SIGNAL( textChanged(const TQString&) ),
- TQT_SLOT( updateItem() ) );
- connect( mWidget->mEmailLineEdit, TQT_SIGNAL( textChanged(const TQString&) ),
- TQT_SLOT( updateItem() ) );
+ connect( mWidget->mAddressListView, TQ_SIGNAL( selectionChanged(TQListViewItem *) ),
+ TQ_SLOT(updateInput()));
+ connect( mWidget->mNew, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( addItem() ) );
+ connect( mWidget->mRemove, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( removeItem() ) );
+ connect( mWidget->mSelectAddressee, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( openAddressbook() ) );
+ connect( mWidget->mNameLineEdit, TQ_SIGNAL( textChanged(const TQString&) ),
+ TQ_SLOT( updateItem() ) );
+ connect( mWidget->mEmailLineEdit, TQ_SIGNAL( textChanged(const TQString&) ),
+ TQ_SLOT( updateItem() ) );
}
PublishDialog::~PublishDialog()
diff --git a/korganizer/publishdialog.h b/korganizer/publishdialog.h
index dd1b5372..e4ede200 100644
--- a/korganizer/publishdialog.h
+++ b/korganizer/publishdialog.h
@@ -33,7 +33,7 @@ class PublishDialog_base;
class PublishDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
PublishDialog(TQWidget* parent=0,const char* name=0,
diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp
index ea640bb9..d8d1b637 100644
--- a/korganizer/resourceview.cpp
+++ b/korganizer/resourceview.cpp
@@ -100,23 +100,23 @@ CalendarViewExtension *ResourceViewFactory::create( TQWidget *parent )
{
mResourceView = new ResourceView( mCalendar, mCalendarView, parent );
- TQObject::connect( mResourceView, TQT_SIGNAL( resourcesChanged() ),
- mCalendarView, TQT_SLOT( resourcesChanged() ) );
- TQObject::connect( mResourceView, TQT_SIGNAL( resourcesChanged() ),
- mCalendarView, TQT_SLOT( updateCategories() ) );
+ TQObject::connect( mResourceView, TQ_SIGNAL( resourcesChanged() ),
+ mCalendarView, TQ_SLOT( resourcesChanged() ) );
+ TQObject::connect( mResourceView, TQ_SIGNAL( resourcesChanged() ),
+ mCalendarView, TQ_SLOT( updateCategories() ) );
TQObject::connect( mCalendar,
- TQT_SIGNAL( signalResourceAdded( ResourceCalendar * ) ),
+ TQ_SIGNAL( signalResourceAdded( ResourceCalendar * ) ),
mResourceView,
- TQT_SLOT( addResourceItem( ResourceCalendar * ) ) );
+ TQ_SLOT( addResourceItem( ResourceCalendar * ) ) );
TQObject::connect( mCalendar,
- TQT_SIGNAL( signalResourceModified( ResourceCalendar * ) ),
+ TQ_SIGNAL( signalResourceModified( ResourceCalendar * ) ),
mResourceView,
- TQT_SLOT( updateResourceItem( ResourceCalendar * ) ) );
- TQObject::connect( mCalendar, TQT_SIGNAL( signalResourceAdded( ResourceCalendar * ) ),
- mCalendarView, TQT_SLOT( updateCategories() ) );
- TQObject::connect( mCalendar, TQT_SIGNAL( signalResourceModified( ResourceCalendar * ) ),
- mCalendarView, TQT_SLOT( updateCategories() ) );
+ TQ_SLOT( updateResourceItem( ResourceCalendar * ) ) );
+ TQObject::connect( mCalendar, TQ_SIGNAL( signalResourceAdded( ResourceCalendar * ) ),
+ mCalendarView, TQ_SLOT( updateCategories() ) );
+ TQObject::connect( mCalendar, TQ_SIGNAL( signalResourceModified( ResourceCalendar * ) ),
+ mCalendarView, TQ_SLOT( updateCategories() ) );
return mResourceView;
}
@@ -322,17 +322,17 @@ ResourceView::ResourceView( CalendarResources *calendar,
mListView->setResizeMode( TQListView::LastColumn );
topLayout->addWidget( mListView );
- connect( mListView, TQT_SIGNAL( clicked( TQListViewItem * ) ),
- TQT_SLOT( currentChanged( TQListViewItem * ) ) );
- connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addResource() ) );
- connect( mDeleteButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeResource() ) );
- connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editResource() ) );
- connect( mListView, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &,
+ connect( mListView, TQ_SIGNAL( clicked( TQListViewItem * ) ),
+ TQ_SLOT( currentChanged( TQListViewItem * ) ) );
+ connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addResource() ) );
+ connect( mDeleteButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeResource() ) );
+ connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editResource() ) );
+ connect( mListView, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &,
int ) ),
- TQT_SLOT( editResource() ) );
- connect( mListView, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *,
+ TQ_SLOT( editResource() ) );
+ connect( mListView, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *,
const TQPoint &, int ) ),
- TQT_SLOT( contextMenuRequested( TQListViewItem *, const TQPoint &,
+ TQ_SLOT( contextMenuRequested( TQListViewItem *, const TQPoint &,
int ) ) );
updateView();
@@ -449,21 +449,21 @@ void ResourceView::addResourceItem( ResourceCalendar *resource )
item->update();
}
- connect( resource, TQT_SIGNAL( signalSubresourceAdded( ResourceCalendar *,
+ connect( resource, TQ_SIGNAL( signalSubresourceAdded( ResourceCalendar *,
const TQString &,
const TQString &,
const TQString & ) ),
- TQT_SLOT( slotSubresourceAdded( ResourceCalendar *, const TQString &,
+ TQ_SLOT( slotSubresourceAdded( ResourceCalendar *, const TQString &,
const TQString &, const TQString & ) ) );
- connect( resource, TQT_SIGNAL( signalSubresourceRemoved( ResourceCalendar *,
+ connect( resource, TQ_SIGNAL( signalSubresourceRemoved( ResourceCalendar *,
const TQString &,
const TQString & ) ),
- TQT_SLOT( slotSubresourceRemoved( ResourceCalendar *, const TQString &,
+ TQ_SLOT( slotSubresourceRemoved( ResourceCalendar *, const TQString &,
const TQString & ) ) );
- connect( resource, TQT_SIGNAL( resourceSaved( ResourceCalendar * ) ),
- TQT_SLOT( closeResource( ResourceCalendar * ) ) );
+ connect( resource, TQ_SIGNAL( resourceSaved( ResourceCalendar * ) ),
+ TQ_SLOT( closeResource( ResourceCalendar * ) ) );
updateResourceList();
emit resourcesChanged();
@@ -686,44 +686,44 @@ void ResourceView::contextMenuRequested ( TQListViewItem *lvitem, const TQPoint
ResourceItem *item = static_cast<ResourceItem *>( lvitem );
TQPopupMenu *menu = new TQPopupMenu( this );
- connect( menu, TQT_SIGNAL( aboutToHide() ), menu, TQT_SLOT( deleteLater() ) );
+ connect( menu, TQ_SIGNAL( aboutToHide() ), menu, TQ_SLOT( deleteLater() ) );
if ( item ) {
int reloadId = menu->insertItem( i18n("Re&load"), this,
- TQT_SLOT( reloadResource() ) );
+ TQ_SLOT( reloadResource() ) );
menu->setItemEnabled( reloadId, item->resource()->isActive() );
int saveId = menu->insertItem( i18n("&Save"), this,
- TQT_SLOT( saveResource() ) );
+ TQ_SLOT( saveResource() ) );
menu->setItemEnabled( saveId, item->resource()->isActive() );
menu->insertSeparator();
- menu->insertItem( i18n("Show &Info"), this, TQT_SLOT( showInfo() ) );
+ menu->insertItem( i18n("Show &Info"), this, TQ_SLOT( showInfo() ) );
//FIXME: This is better on the resource dialog
if ( KOPrefs::instance()->agendaViewColors() != KOPrefs::CategoryOnly ) {
TQPopupMenu *assignMenu= new TQPopupMenu( menu );
- assignMenu->insertItem( i18n( "&Assign Color" ), this, TQT_SLOT( assignColor() ) );
+ assignMenu->insertItem( i18n( "&Assign Color" ), this, TQ_SLOT( assignColor() ) );
if ( item->resourceColor().isValid() )
- assignMenu->insertItem( i18n( "&Disable Color" ), this, TQT_SLOT( disableColor() ) );
+ assignMenu->insertItem( i18n( "&Disable Color" ), this, TQ_SLOT( disableColor() ) );
menu->insertItem( i18n( "Resources Colors" ), assignMenu );
}
if ( item->isSubresource() &&
( item->resource()->type() == "imap" || item->resource()->type() == "scalix" ) ) {
if ( item->resourceIdentifier().contains( "/.INBOX.directory/" ) ) {
- menu->insertItem( i18n("&Rename..."), this, TQT_SLOT( editResource() ) );
+ menu->insertItem( i18n("&Rename..."), this, TQ_SLOT( editResource() ) );
}
} else {
- menu->insertItem( i18n("&Edit..."), this, TQT_SLOT( editResource() ) );
+ menu->insertItem( i18n("&Edit..."), this, TQ_SLOT( editResource() ) );
}
- menu->insertItem( i18n("&Remove"), this, TQT_SLOT( removeResource() ) );
+ menu->insertItem( i18n("&Remove"), this, TQ_SLOT( removeResource() ) );
if ( item->resource() != manager->standardResource() ) {
menu->insertSeparator();
menu->insertItem( i18n("Use as &Default Calendar"), this,
- TQT_SLOT( setStandard() ) );
+ TQ_SLOT( setStandard() ) );
}
menu->insertSeparator();
}
- menu->insertItem( i18n("&Add..."), this, TQT_SLOT( addResource() ) );
+ menu->insertItem( i18n("&Add..."), this, TQ_SLOT( addResource() ) );
menu->popup( pos );
}
diff --git a/korganizer/resourceview.h b/korganizer/resourceview.h
index 1a073c2b..4c7ad289 100644
--- a/korganizer/resourceview.h
+++ b/korganizer/resourceview.h
@@ -94,7 +94,7 @@ class ResourceItem : public TQCheckListItem
*/
class ResourceView : public CalendarViewExtension
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceView( CalendarResources *calendar, CalendarView *view,
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index c9e5f886..4087a810 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -63,8 +63,8 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
subLayout->addWidget( searchLabel );
subLayout->addWidget( searchEdit );
searchEdit->setFocus();
- connect( searchEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SLOT( searchTextChanged( const TQString & ) ) );
+ connect( searchEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SLOT( searchTextChanged( const TQString & ) ) );
TQHButtonGroup *itemsGroup = new TQHButtonGroup( i18n("Search For"), topFrame );
@@ -76,7 +76,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
mTodosCheck->setChecked( true );
// Date range
- TQGroupBox *rangeGroup = new TQGroupBox( 1, Qt::Horizontal, i18n( "Date Range" ),
+ TQGroupBox *rangeGroup = new TQGroupBox( 1, TQt::Horizontal, i18n( "Date Range" ),
topFrame );
layout->addWidget( rangeGroup );
@@ -117,15 +117,15 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
KOGlobals::fitDialogToScreen( this, true );
}
- connect( this,TQT_SIGNAL(user1Clicked()),TQT_SLOT(doSearch()));
+ connect( this,TQ_SIGNAL(user1Clicked()),TQ_SLOT(doSearch()));
// Propagate edit and delete event signals from event list view
- connect( listView, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)),
- TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) );
- connect( listView, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)),
- TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) );
- connect( listView, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)),
- TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) );
+ connect( listView, TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)),
+ TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) );
+ connect( listView, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)),
+ TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) );
+ connect( listView, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)),
+ TQ_SIGNAL(deleteIncidenceSignal(Incidence *)) );
}
SearchDialog::~SearchDialog()
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h
index c1beef80..5cb22dc7 100644
--- a/korganizer/searchdialog.h
+++ b/korganizer/searchdialog.h
@@ -45,7 +45,7 @@ using namespace KCal;
class SearchDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
SearchDialog(Calendar *calendar,TQWidget *parent=0);
diff --git a/korganizer/statusdialog.cpp b/korganizer/statusdialog.cpp
index 1d406447..d46f018c 100644
--- a/korganizer/statusdialog.cpp
+++ b/korganizer/statusdialog.cpp
@@ -56,11 +56,11 @@ StatusDialog::StatusDialog(TQWidget* parent, const char* name) :
TQBoxLayout *buttonLayout = new TQHBoxLayout( topLayout );
TQPushButton *ok = new KPushButton(KStdGuiItem::ok(), this);
- connect ( ok,TQT_SIGNAL(clicked()), this,TQT_SLOT(accept()) );
+ connect ( ok,TQ_SIGNAL(clicked()), this,TQ_SLOT(accept()) );
buttonLayout->addWidget( ok );
TQPushButton *cancel = new KPushButton(KStdGuiItem::cancel(), this);
- connect ( cancel,TQT_SIGNAL(clicked()), this,TQT_SLOT(reject()) );
+ connect ( cancel,TQ_SIGNAL(clicked()), this,TQ_SLOT(reject()) );
buttonLayout->addWidget( cancel );
}
diff --git a/korganizer/statusdialog.h b/korganizer/statusdialog.h
index 4aa00d3e..144b7d87 100644
--- a/korganizer/statusdialog.h
+++ b/korganizer/statusdialog.h
@@ -28,7 +28,7 @@ class TQComboBox;
class StatusDialog : public KDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
StatusDialog(TQWidget* parent=0,const char* name=0);
diff --git a/korganizer/templatemanagementdialog.cpp b/korganizer/templatemanagementdialog.cpp
index 57209cd0..3d673c37 100644
--- a/korganizer/templatemanagementdialog.cpp
+++ b/korganizer/templatemanagementdialog.cpp
@@ -52,15 +52,15 @@ TemplateManagementDialog::TemplateManagementDialog(TQWidget *parent, const TQStr
{
m_base = new TemplateManagementDialog_base( this, "template_management_dialog_base" );
setMainWidget( m_base );
- connect( m_base->m_buttonAdd, TQT_SIGNAL( clicked() ),
- TQT_SLOT( slotAddTemplate() ) );
- connect( m_base->m_buttonDelete, TQT_SIGNAL( clicked() ),
- TQT_SLOT( slotDeleteTemplate() ) );
+ connect( m_base->m_buttonAdd, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( slotAddTemplate() ) );
+ connect( m_base->m_buttonDelete, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( slotDeleteTemplate() ) );
m_base->m_listBox->insertStringList( m_templates );
- connect( m_base->m_listBox, TQT_SIGNAL( selectionChanged( TQListBoxItem * ) ),
- TQT_SLOT( slotUpdateDeleteButton( TQListBoxItem * ) ) );
- connect( m_base->m_buttonApply, TQT_SIGNAL( clicked() ),
- TQT_SLOT( slotApplyTemplate() ) );
+ connect( m_base->m_listBox, TQ_SIGNAL( selectionChanged( TQListBoxItem * ) ),
+ TQ_SLOT( slotUpdateDeleteButton( TQListBoxItem * ) ) );
+ connect( m_base->m_buttonApply, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( slotApplyTemplate() ) );
}
@@ -75,7 +75,7 @@ void TemplateManagementDialog::slotAddTemplate()
if ( m_templates.find( newTemplate) != m_templates.end() ) {
int rc = KMessageBox::warningContinueCancel( this, i18n("A template with that name already exists, do you want to overwrite it?."), i18n("Duplicate Template Name"), i18n("Overwrite"));
if ( rc == KMessageBox::Cancel ) {
- TQTimer::singleShot(0, this, TQT_SLOT( slotAddTemplate() ) );
+ TQTimer::singleShot(0, this, TQ_SLOT( slotAddTemplate() ) );
return;
}
duplicate = true;
diff --git a/korganizer/templatemanagementdialog.h b/korganizer/templatemanagementdialog.h
index d3e5995c..e22e41b2 100644
--- a/korganizer/templatemanagementdialog.h
+++ b/korganizer/templatemanagementdialog.h
@@ -45,7 +45,7 @@
#include <kdialogbase.h>
class TemplateManagementDialog: public KDialogBase {
-Q_OBJECT
+TQ_OBJECT
public:
TemplateManagementDialog( TQWidget *parent, const TQStringList& templates );
diff --git a/korganizer/timelabels.cpp b/korganizer/timelabels.cpp
index 27a253c0..19ae5721 100644
--- a/korganizer/timelabels.cpp
+++ b/korganizer/timelabels.cpp
@@ -230,10 +230,10 @@ void TimeLabels::setAgenda( KOAgenda* agenda )
{
mAgenda = agenda;
- connect(mAgenda, TQT_SIGNAL(mousePosSignal(const TQPoint &)), this, TQT_SLOT(mousePosChanged(const TQPoint &)));
- connect(mAgenda, TQT_SIGNAL(enterAgenda()), this, TQT_SLOT(showMousePos()));
- connect(mAgenda, TQT_SIGNAL(leaveAgenda()), this, TQT_SLOT(hideMousePos()));
- connect(mAgenda, TQT_SIGNAL(gridSpacingYChanged( double ) ), this, TQT_SLOT( setCellHeight( double ) ) );
+ connect(mAgenda, TQ_SIGNAL(mousePosSignal(const TQPoint &)), this, TQ_SLOT(mousePosChanged(const TQPoint &)));
+ connect(mAgenda, TQ_SIGNAL(enterAgenda()), this, TQ_SLOT(showMousePos()));
+ connect(mAgenda, TQ_SIGNAL(leaveAgenda()), this, TQ_SLOT(hideMousePos()));
+ connect(mAgenda, TQ_SIGNAL(gridSpacingYChanged( double ) ), this, TQ_SLOT( setCellHeight( double ) ) );
}
diff --git a/korganizer/timelabels.h b/korganizer/timelabels.h
index 8153742f..77d565b4 100644
--- a/korganizer/timelabels.h
+++ b/korganizer/timelabels.h
@@ -38,7 +38,7 @@ class TDEConfig;
class TimeLabels : public TQScrollView
{
- Q_OBJECT
+ TQ_OBJECT
public:
TimeLabels( int rows, TQWidget *parent = 0, const char *name = 0,
diff --git a/korn/account_input.cpp b/korn/account_input.cpp
index 7603e56b..d7584805 100644
--- a/korn/account_input.cpp
+++ b/korn/account_input.cpp
@@ -65,7 +65,7 @@ TextInput::TextInput( TQWidget *parent, const TQString& title, int min, int max,
{
_left = new TQLabel( title, parent, "label" );
_right = new KLineEdit( "", parent, "edit" );
- _right->setValidator( new TQIntValidator( min, max, TQT_TQOBJECT(_right), "validator" ) );
+ _right->setValidator( new TQIntValidator( min, max, _right, "validator" ) );
setValue( defaul );
}
diff --git a/korn/accountmanager.cpp b/korn/accountmanager.cpp
index 187f79bd..5a30e56a 100644
--- a/korn/accountmanager.cpp
+++ b/korn/accountmanager.cpp
@@ -84,12 +84,12 @@ void AccountManager::readConfig( TDEConfig* config, const int index )
}
//TODO: connect some stuff
- connect( kiodrop, TQT_SIGNAL( changed( int, KMailDrop* ) ), this, TQT_SLOT( slotChanged( int, KMailDrop* ) ) );
- connect( kiodrop, TQT_SIGNAL( showPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ),
- this, TQT_SLOT( slotShowPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ) );
- connect( kiodrop, TQT_SIGNAL( showPassivePopup( const TQString&, const TQString& ) ),
- this, TQT_SLOT( slotShowPassivePopup( const TQString&, const TQString& ) ) );
- connect( kiodrop, TQT_SIGNAL( validChanged( bool ) ), this, TQT_SLOT( slotValidChanged( bool ) ) );
+ connect( kiodrop, TQ_SIGNAL( changed( int, KMailDrop* ) ), this, TQ_SLOT( slotChanged( int, KMailDrop* ) ) );
+ connect( kiodrop, TQ_SIGNAL( showPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ),
+ this, TQ_SLOT( slotShowPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ) );
+ connect( kiodrop, TQ_SIGNAL( showPassivePopup( const TQString&, const TQString& ) ),
+ this, TQ_SLOT( slotShowPassivePopup( const TQString&, const TQString& ) ) );
+ connect( kiodrop, TQ_SIGNAL( validChanged( bool ) ), this, TQ_SLOT( slotValidChanged( bool ) ) );
kiodrop->readGeneralConfigGroup( *masterGroup );
if( !kiodrop->readConfigGroup( *accountGroup ) || !kiodrop->readConfigGroup( *configmap, nproto ) )
@@ -119,9 +119,9 @@ void AccountManager::readConfig( TDEConfig* config, const int index )
DCOPDrop *dcopdrop = new DCOPDrop;
Dropinfo *info = new Dropinfo;
- connect( dcopdrop, TQT_SIGNAL( changed( int, KMailDrop* ) ), this, TQT_SLOT( slotChanged( int, KMailDrop* ) ) );
- connect( dcopdrop, TQT_SIGNAL( showPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ),
- this, TQT_SLOT( slotShowPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ) );
+ connect( dcopdrop, TQ_SIGNAL( changed( int, KMailDrop* ) ), this, TQ_SLOT( slotChanged( int, KMailDrop* ) ) );
+ connect( dcopdrop, TQ_SIGNAL( showPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ),
+ this, TQ_SLOT( slotShowPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ) );
dcopdrop->readConfigGroup( *masterGroup );
dcopdrop->setDCOPName( *it );
diff --git a/korn/accountmanager.h b/korn/accountmanager.h
index e28a8525..38b5069c 100644
--- a/korn/accountmanager.h
+++ b/korn/accountmanager.h
@@ -39,7 +39,7 @@ template< class T, class W > class TQMap;
* and it communicate with the boxes.
*/
class AccountManager : public TQObject
-{ Q_OBJECT
+{ TQ_OBJECT
public:
/**
diff --git a/korn/boxcontainer.cpp b/korn/boxcontainer.cpp
index d881b6c8..44e1e8ab 100644
--- a/korn/boxcontainer.cpp
+++ b/korn/boxcontainer.cpp
@@ -76,7 +76,7 @@ void BoxContainer::slotShowConfiguration()
void BoxContainer::addItem( BoxContainerItem* item )
{
- connect( item, TQT_SIGNAL( showConfiguration() ), this, TQT_SLOT( slotShowConfiguration() ) );
+ connect( item, TQ_SIGNAL( showConfiguration() ), this, TQ_SLOT( slotShowConfiguration() ) );
_items->append( item );
}
diff --git a/korn/boxcontainer.h b/korn/boxcontainer.h
index e5f5a8f4..bd489ed6 100644
--- a/korn/boxcontainer.h
+++ b/korn/boxcontainer.h
@@ -32,7 +32,7 @@ class TDEConfig;
* where BoxContainerItems can be placed. BoxContainerItems are the boxes you see.
*/
class BoxContainer : public TQObject
-{ Q_OBJECT
+{ TQ_OBJECT
public:
/**
diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp
index e67296d5..7575ba7c 100644
--- a/korn/boxcontaineritem.cpp
+++ b/korn/boxcontaineritem.cpp
@@ -164,18 +164,18 @@ void BoxContainerItem::runCommand( const TQString& cmd )
TDEProcess *process = new TDEProcess;
process->setUseShell( true );
*process << cmd;
- connect( process, TQT_SIGNAL( processExited (TDEProcess *) ), this, TQT_SLOT( processExited( TDEProcess * ) ) );
+ connect( process, TQ_SIGNAL( processExited (TDEProcess *) ), this, TQ_SLOT( processExited( TDEProcess * ) ) );
process->start();
}
void BoxContainerItem::mouseButtonPressed( TQt::ButtonState state )
{
int button;
- if( state & Qt::LeftButton )
+ if( state & TQt::LeftButton )
button = 0;
- else if( state & Qt::RightButton )
+ else if( state & TQt::RightButton )
button = 2;
- else if( state & Qt::MidButton )
+ else if( state & TQt::MidButton )
button = 1;
else
return; //Invalid mouse button
@@ -194,21 +194,21 @@ void BoxContainerItem::mouseButtonPressed( TQt::ButtonState state )
void BoxContainerItem::fillTDEPopupMenu( TDEPopupMenu* popupMenu, TDEActionCollection* actions ) const
{
- /*popupMenu->insertItem( i18n( "&Configure" ), this, TQT_SLOT( slotConfigure() ) );
- popupMenu->insertItem( i18n( "&Recheck" ), this, TQT_SLOT( slotRecheck() ) );
- popupMenu->insertItem( i18n( "R&eset Counter" ), this, TQT_SLOT( slotReset() ) );
- popupMenu->insertItem( i18n( "&View Emails" ), this, TQT_SLOT( slotView() ) );
- popupMenu->insertItem( i18n( "R&un Command" ), this, TQT_SLOT( slotRunCommand() ) );*/
-
- (new TDEAction( i18n("&Configure"), TDEShortcut(), this, TQT_SLOT( slotConfigure() ), actions ))->plug( popupMenu );
- (new TDEAction( i18n("&Recheck"), TDEShortcut(), this, TQT_SLOT( slotRecheck() ), actions ))->plug( popupMenu );
- (new TDEAction( i18n("R&eset Counter"), TDEShortcut(), this, TQT_SLOT( slotReset() ), actions ))->plug( popupMenu );
- (new TDEAction( i18n("&View Emails"), TDEShortcut(), this, TQT_SLOT( slotView() ), actions ))->plug( popupMenu );
- (new TDEAction( i18n("R&un Command"), TDEShortcut(), this, TQT_SLOT( slotRunCommand() ), actions ))->plug( popupMenu );
+ /*popupMenu->insertItem( i18n( "&Configure" ), this, TQ_SLOT( slotConfigure() ) );
+ popupMenu->insertItem( i18n( "&Recheck" ), this, TQ_SLOT( slotRecheck() ) );
+ popupMenu->insertItem( i18n( "R&eset Counter" ), this, TQ_SLOT( slotReset() ) );
+ popupMenu->insertItem( i18n( "&View Emails" ), this, TQ_SLOT( slotView() ) );
+ popupMenu->insertItem( i18n( "R&un Command" ), this, TQ_SLOT( slotRunCommand() ) );*/
+
+ (new TDEAction( i18n("&Configure"), TDEShortcut(), this, TQ_SLOT( slotConfigure() ), actions ))->plug( popupMenu );
+ (new TDEAction( i18n("&Recheck"), TDEShortcut(), this, TQ_SLOT( slotRecheck() ), actions ))->plug( popupMenu );
+ (new TDEAction( i18n("R&eset Counter"), TDEShortcut(), this, TQ_SLOT( slotReset() ), actions ))->plug( popupMenu );
+ (new TDEAction( i18n("&View Emails"), TDEShortcut(), this, TQ_SLOT( slotView() ), actions ))->plug( popupMenu );
+ (new TDEAction( i18n("R&un Command"), TDEShortcut(), this, TQ_SLOT( slotRunCommand() ), actions ))->plug( popupMenu );
popupMenu->insertSeparator();
- KStdAction::help( this, TQT_SLOT( help() ), actions )->plug( popupMenu );
- KStdAction::reportBug( this, TQT_SLOT( reportBug() ), actions )->plug( popupMenu );
- KStdAction::aboutApp( this, TQT_SLOT( about() ), actions )->plug( popupMenu );
+ KStdAction::help( this, TQ_SLOT( help() ), actions )->plug( popupMenu );
+ KStdAction::reportBug( this, TQ_SLOT( reportBug() ), actions )->plug( popupMenu );
+ KStdAction::aboutApp( this, TQ_SLOT( about() ), actions )->plug( popupMenu );
}
void BoxContainerItem::showPassivePopup( TQWidget* parent, TQPtrList< KornMailSubject >* list, int total,
diff --git a/korn/boxcontaineritem.h b/korn/boxcontaineritem.h
index a132c59e..575e9835 100644
--- a/korn/boxcontaineritem.h
+++ b/korn/boxcontaineritem.h
@@ -42,7 +42,7 @@ class TQString;
*/
class BoxContainerItem : public AccountManager, public DCOPObject
{
- Q_OBJECT
+ TQ_OBJECT
//
K_DCOP
public:
diff --git a/korn/dcopdrop.cpp b/korn/dcopdrop.cpp
index 660bc849..55edda74 100644
--- a/korn/dcopdrop.cpp
+++ b/korn/dcopdrop.cpp
@@ -106,7 +106,7 @@ TQValueVector< KornMailSubject >* DCOPDrop::doReadSubjects( bool * )
* This way, the function is really asynchrone.
* So, the return value arraves before any data arrives.
*/
- TQTimer::singleShot( 1, this, TQT_SLOT( doReadSubjectsASync( void ) ) );
+ TQTimer::singleShot( 1, this, TQ_SLOT( doReadSubjectsASync( void ) ) );
/*
* A empty TQValueVector is made here.
diff --git a/korn/dcopdrop.h b/korn/dcopdrop.h
index cd3cd790..825f44e0 100644
--- a/korn/dcopdrop.h
+++ b/korn/dcopdrop.h
@@ -38,7 +38,7 @@ class TQString;
* This class handles all new messages which are comming in through DCOP.
*/
class DCOPDrop : public KMailDrop
-{ Q_OBJECT
+{ TQ_OBJECT
public:
/**
diff --git a/korn/dockedcontainer.h b/korn/dockedcontainer.h
index 11ea6ccf..af79349e 100644
--- a/korn/dockedcontainer.h
+++ b/korn/dockedcontainer.h
@@ -28,7 +28,7 @@ class BoxContainerItem;
* The only thing it does is creating TQt::DocketItems.
*/
class DockedContainer : public BoxContainer
-{ Q_OBJECT
+{ TQ_OBJECT
public:
DockedContainer( TQObject * parent = 0, const char * name = 0 );
diff --git a/korn/dockeditem.cpp b/korn/dockeditem.cpp
index 40274474..34b483cc 100644
--- a/korn/dockeditem.cpp
+++ b/korn/dockeditem.cpp
@@ -37,14 +37,14 @@
#include <tqmovie.h>
DockedItem::DockedItem( TQWidget * parent, const char * name )
- : BoxContainerItem( TQT_TQOBJECT(parent), name ),
+ : BoxContainerItem( parent, name ),
_systemtray( new SystemTray( parent, "System tray" ) )
{
this->fillTDEPopupMenu( _systemtray->contextMenu(), _systemtray->actionCollection() );
- connect( _systemtray, TQT_SIGNAL( quitSelected() ), kapp, TQT_SLOT( quit() ) );
- connect( _systemtray, TQT_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ),
- this, TQT_SLOT( mouseButtonPressed( TQt::ButtonState ) ) );
+ connect( _systemtray, TQ_SIGNAL( quitSelected() ), kapp, TQ_SLOT( quit() ) );
+ connect( _systemtray, TQ_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ),
+ this, TQ_SLOT( mouseButtonPressed( TQt::ButtonState ) ) );
}
DockedItem::~DockedItem()
diff --git a/korn/dockeditem.h b/korn/dockeditem.h
index 46513c9c..d0ad6a23 100644
--- a/korn/dockeditem.h
+++ b/korn/dockeditem.h
@@ -35,7 +35,7 @@ class TQPixmap;
* @author Mart Kelder <mart.kde@hccnet.nl>
*/
class DockedItem : public BoxContainerItem
-{ Q_OBJECT
+{ TQ_OBJECT
public:
/**
diff --git a/korn/hvcontainer.cpp b/korn/hvcontainer.cpp
index fa815179..cb2aef72 100644
--- a/korn/hvcontainer.cpp
+++ b/korn/hvcontainer.cpp
@@ -24,11 +24,11 @@
#include <tqvbox.h>
-HVContainer::HVContainer( Qt::Orientation orientation, TQObject * parent, const char * name )
+HVContainer::HVContainer( TQt::Orientation orientation, TQObject * parent, const char * name )
: BoxContainer( parent, name ),
box( 0 )
{
- if( orientation == Qt::Horizontal )
+ if( orientation == TQt::Horizontal )
box = new TQHBox( 0, "hbox" );
else
box = new TQVBox( 0, "vbox" );
diff --git a/korn/hvcontainer.h b/korn/hvcontainer.h
index 1485209f..ccb469fb 100644
--- a/korn/hvcontainer.h
+++ b/korn/hvcontainer.h
@@ -30,7 +30,7 @@ class TQHBox;
*/
class HVContainer : public BoxContainer
-{ Q_OBJECT
+{ TQ_OBJECT
public:
/**
@@ -38,7 +38,7 @@ public:
*
* @param orientation The orientation of the box: it is a vertical or horizontal box?
*/
- HVContainer( Qt::Orientation orientation, TQObject * parent = 0 , const char * name = 0 );
+ HVContainer( TQt::Orientation orientation, TQObject * parent = 0 , const char * name = 0 );
~HVContainer();
/**
diff --git a/korn/hvitem.cpp b/korn/hvitem.cpp
index cede9c47..12954379 100644
--- a/korn/hvitem.cpp
+++ b/korn/hvitem.cpp
@@ -39,9 +39,9 @@ HVItem::HVItem( TQWidget *parent, const char *name )
_popup->insertTitle( kapp->miniIcon(), kapp->caption() );
this->fillTDEPopupMenu( _popup, _actions );
_popup->insertSeparator();
- KStdAction::quit( TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), _actions )->plug( _popup );
+ KStdAction::quit( kapp, TQ_SLOT( quit() ), _actions )->plug( _popup );
- connect( _label, TQT_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ), this, TQT_SLOT( mouseButtonPressed( TQt::ButtonState ) ) );
+ connect( _label, TQ_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ), this, TQ_SLOT( mouseButtonPressed( TQt::ButtonState ) ) );
}
HVItem::~HVItem()
diff --git a/korn/hvitem.h b/korn/hvitem.h
index 9e2045b1..19b583a5 100644
--- a/korn/hvitem.h
+++ b/korn/hvitem.h
@@ -30,7 +30,7 @@ class Label;
* Item for a horizontal or vertical displayed window.
*/
class HVItem : public BoxContainerItem
-{ Q_OBJECT
+{ TQ_OBJECT
public:
HVItem( TQWidget *parent = 0, const char *name = 0 );
diff --git a/korn/imap_proto.cpp b/korn/imap_proto.cpp
index caedb459..aae646d9 100644
--- a/korn/imap_proto.cpp
+++ b/korn/imap_proto.cpp
@@ -50,15 +50,15 @@ void Imap_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObjec
result->append( new TextInput( (TQWidget*)vector->at( 0 ), i18n( "Server" ), TextInput::text, "", "server" ) );
result->append( new TextInput( (TQWidget*)vector->at( 0 ), i18n( "Port" ), 0, 65535, "143", "port" ) );
result->append( new ComboInput( (TQWidget*)vector->at( 0 ), i18n( "Encryption" ), encrList, "tls=auto", "encryption" ) );
- TQObject::connect( (TQObject*)result->last()->rightWidget(), TQT_SIGNAL( activated( int) ),
- configDialog, TQT_SLOT( slotSSLChanged() ) );
+ TQObject::connect( (TQObject*)result->last()->rightWidget(), TQ_SIGNAL( activated( int) ),
+ configDialog, TQ_SLOT( slotSSLChanged() ) );
result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Username" ), TextInput::text, "", "username" ) );
result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Mailbox" ), TextInput::text, "INBOX", "mailbox" ) );
result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Password" ), TextInput::password, "", "password" ) );
result->append( new CheckboxInput( (TQWidget*)vector->at( 1 ), i18n( "Save password" ), "true", "savepassword" ) );
- TQObject::connect( (TQObject*)result->last()->rightWidget(), TQT_SIGNAL( toggled( bool ) ),
- (TQObject*)result->prev()->rightWidget(), TQT_SLOT( setEnabled( bool ) ) );
+ TQObject::connect( (TQObject*)result->last()->rightWidget(), TQ_SIGNAL( toggled( bool ) ),
+ (TQObject*)result->prev()->rightWidget(), TQ_SLOT( setEnabled( bool ) ) );
result->last()->setValue( "false" );
result->append( new ComboInput( (TQWidget*)vector->at( 1 ), i18n( "Authentication" ), authList, "auth=*", "auth" ) );
}
diff --git a/korn/keditlistboxman.cpp b/korn/keditlistboxman.cpp
index 440b2c83..a3e8b4d4 100644
--- a/korn/keditlistboxman.cpp
+++ b/korn/keditlistboxman.cpp
@@ -96,12 +96,12 @@ void KEditListBoxManager::setSubGroupName( const TQString& name )
void KEditListBoxManager::init()
{
- connect( this, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
- connect( this, TQT_SIGNAL( added( const TQString& ) ), this, TQT_SLOT( slotAdded( const TQString& ) ) );
- connect( this, TQT_SIGNAL( removed( const TQString& ) ), this, TQT_SLOT( slotRemoved( const TQString& ) ) );
+ connect( this, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) );
+ connect( this, TQ_SIGNAL( added( const TQString& ) ), this, TQ_SLOT( slotAdded( const TQString& ) ) );
+ connect( this, TQ_SIGNAL( removed( const TQString& ) ), this, TQ_SLOT( slotRemoved( const TQString& ) ) );
- connect( this->listBox(), TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQT_SLOT( slotActivated( TQListBoxItem * ) ) );
- connect( this->listBox(), TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), this, TQT_SLOT( slotActivated( TQListBoxItem * ) ) );
+ connect( this->listBox(), TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQ_SLOT( slotActivated( TQListBoxItem * ) ) );
+ connect( this->listBox(), TQ_SIGNAL( returnPressed( TQListBoxItem * ) ), this, TQ_SLOT( slotActivated( TQListBoxItem * ) ) );
}
void KEditListBoxManager::readNames()
diff --git a/korn/keditlistboxman.h b/korn/keditlistboxman.h
index 81acca89..235b9679 100644
--- a/korn/keditlistboxman.h
+++ b/korn/keditlistboxman.h
@@ -32,7 +32,7 @@ class TQWidget;
* @author Mart Kelder (mart.kde@hccnet.nl)
*/
class KEditListBoxManager : public KEditListBox
-{ Q_OBJECT
+{ TQ_OBJECT
public:
/**
diff --git a/korn/kornaccountcfg.ui b/korn/kornaccountcfg.ui
index be877365..5a46dc39 100644
--- a/korn/kornaccountcfg.ui
+++ b/korn/kornaccountcfg.ui
@@ -234,9 +234,9 @@
<tabstop>chPassivePopup</tabstop>
<tabstop>chPassiveDate</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot access="protected">slotProtocolChanged( const TQString&amp; )</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/korn/kornaccountcfgimpl.cpp b/korn/kornaccountcfgimpl.cpp
index 7b57d1f6..bf1e614c 100644
--- a/korn/kornaccountcfgimpl.cpp
+++ b/korn/kornaccountcfgimpl.cpp
@@ -49,8 +49,8 @@ KornAccountCfgImpl::KornAccountCfgImpl( TQWidget * parent, const char * name )
_groupBoxes( 0 ),
_accountinput( new TQPtrList< AccountInput >() )
{
- connect( parent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) );
- connect( parent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) );
+ connect( parent, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOK() ) );
+ connect( parent, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( slotCancel() ) );
this->cbProtocol->insertStringList( Protocols::getProtocols() );
@@ -195,7 +195,7 @@ void KornAccountCfgImpl::slotProtocolChanged( const TQString& proto )
delete groupBoxes;
AccountInput *input;
- protocol->configFields( _groupBoxes, TQT_TQOBJECT(this), _accountinput );
+ protocol->configFields( _groupBoxes, this, _accountinput );
for( unsigned int groupCounter = 0; groupCounter < _groupBoxes->count(); ++groupCounter )
{
@@ -205,14 +205,14 @@ void KornAccountCfgImpl::slotProtocolChanged( const TQString& proto )
grid->setMargin( 15 );
for( input = _accountinput->first(); input; input = _accountinput->next() )
{
- if( input->leftWidget() && TQT_BASE_OBJECT(_groupBoxes->at( groupCounter )) == TQT_BASE_OBJECT(input->leftWidget()->parent()) )
+ if( input->leftWidget() && _groupBoxes->at( groupCounter ) == input->leftWidget()->parent() )
{
grid->addWidget( input->leftWidget(), counter, 0 );
- if( input->rightWidget() && TQT_BASE_OBJECT(_groupBoxes->at( groupCounter )) == TQT_BASE_OBJECT(input->rightWidget()->parent()) )
+ if( input->rightWidget() && _groupBoxes->at( groupCounter ) == input->rightWidget()->parent() )
grid->addWidget( input->rightWidget(), counter, 1 );
++counter;
} else {
- if( input->rightWidget() && TQT_BASE_OBJECT(_groupBoxes->at( groupCounter )) == TQT_BASE_OBJECT(input->rightWidget()->parent()) )
+ if( input->rightWidget() && _groupBoxes->at( groupCounter ) == input->rightWidget()->parent() )
{
grid->addWidget( input->rightWidget(), counter, 1 );
++counter;
diff --git a/korn/kornaccountcfgimpl.h b/korn/kornaccountcfgimpl.h
index 0a765dcb..20fe6372 100644
--- a/korn/kornaccountcfgimpl.h
+++ b/korn/kornaccountcfgimpl.h
@@ -36,7 +36,7 @@ template< class T > class TQPtrList;
template< class T > class TQPtrVector;
class KornAccountCfgImpl : public KornAccountCfg
-{ Q_OBJECT
+{ TQ_OBJECT
public:
KornAccountCfgImpl( TQWidget * parent = 0, const char * name = 0 );
diff --git a/korn/kornapp.h b/korn/kornapp.h
index 41348cc2..9ef87f2f 100644
--- a/korn/kornapp.h
+++ b/korn/kornapp.h
@@ -16,7 +16,7 @@ class KornShell;
*/
class KornApp : public KUniqueApplication
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/korn/kornboxcfg.ui b/korn/kornboxcfg.ui
index 1ae40345..88d04d67 100644
--- a/korn/kornboxcfg.ui
+++ b/korn/kornboxcfg.ui
@@ -1665,7 +1665,7 @@
<tabstop>chPassiveDate</tabstop>
<tabstop>pbEdit</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot access="protected">slotEditBox()</slot>
<slot access="protected">slotActivated( const TQString&amp; )</slot>
<slot access="protected">slotActivated( const int )</slot>
@@ -1676,7 +1676,7 @@
<slot access="protected">slotChangeNewAnim()</slot>
<slot access="protected">slotNormalAnimToggled( bool )</slot>
<slot access="protected">slotNewAnimToggled( bool )</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">kcolorbutton.h</include>
diff --git a/korn/kornboxcfgimpl.cpp b/korn/kornboxcfgimpl.cpp
index 7d29e1f5..cd9cbdf3 100644
--- a/korn/kornboxcfgimpl.cpp
+++ b/korn/kornboxcfgimpl.cpp
@@ -56,13 +56,13 @@ KornBoxCfgImpl::KornBoxCfgImpl( TQWidget * parent, const char * name )
if( lbRight->text() == "Right" )
lbRight->setText( i18n( "Right" ) );
- connect( parent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) );
- connect( parent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) );
+ connect( parent, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOK() ) );
+ connect( parent, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( slotCancel() ) );
elbAccounts->setTitle( i18n( "Accounts" ) );
- connect( elbAccounts, TQT_SIGNAL( elementsSwapped( int, int ) ), this, TQT_SLOT( slotAccountsSwapped( int, int ) ) );
- connect( elbAccounts, TQT_SIGNAL( elementDeleted( int ) ), this, TQT_SLOT( slotAccountDeleted( int ) ) );
+ connect( elbAccounts, TQ_SIGNAL( elementsSwapped( int, int ) ), this, TQ_SLOT( slotAccountsSwapped( int, int ) ) );
+ connect( elbAccounts, TQ_SIGNAL( elementDeleted( int ) ), this, TQ_SLOT( slotAccountDeleted( int ) ) );
}
KornBoxCfgImpl::~KornBoxCfgImpl()
@@ -247,7 +247,7 @@ void KornBoxCfgImpl::slotEditBox()
_base->setMainWidget( widget );
- connect( _base, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogDestroyed() ) );
+ connect( _base, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDialogDestroyed() ) );
_group = new TDEConfigGroup( _config, TQString( "korn-%1-%2" ).
arg( _index ).arg(elbAccounts->listBox()->currentItem() ) );
diff --git a/korn/kornboxcfgimpl.h b/korn/kornboxcfgimpl.h
index 5bc82c44..c0a9f044 100644
--- a/korn/kornboxcfgimpl.h
+++ b/korn/kornboxcfgimpl.h
@@ -30,7 +30,7 @@ class TQString;
class TQWidget;
class KornBoxCfgImpl : public KornBoxCfg
-{ Q_OBJECT
+{ TQ_OBJECT
public:
KornBoxCfgImpl( TQWidget *parent, const char * name );
diff --git a/korn/korncfg.ui b/korn/korncfg.ui
index e3bed083..5179b93c 100644
--- a/korn/korncfg.ui
+++ b/korn/korncfg.ui
@@ -163,7 +163,7 @@
<slot>slotEditBox()</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot access="protected">slotActivated( const TQString&amp; )</slot>
<slot access="protected">slotActivated( const int )</slot>
<slot>slotOK()</slot>
@@ -171,6 +171,6 @@
<slot>slotCancel()</slot>
<slot access="protected">slotSetDefaults( const TQString&amp;, const int, TDEConfig* )</slot>
<slot access="protected">slotEditBox()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/korn/korncfgimpl.cpp b/korn/korncfgimpl.cpp
index c4fa1359..f0e4f983 100644
--- a/korn/korncfgimpl.cpp
+++ b/korn/korncfgimpl.cpp
@@ -47,12 +47,12 @@ KornCfgImpl::KornCfgImpl( TQWidget * parent, const char * name )
elbBoxes->setConfig( _config );
elbBoxes->setTitle( i18n( "Boxes" ) );
- connect( parent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) );
- connect( parent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) );
- connect( parent, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( slotApply() ) );
+ connect( parent, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOK() ) );
+ connect( parent, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( slotCancel() ) );
+ connect( parent, TQ_SIGNAL( applyClicked() ), this, TQ_SLOT( slotApply() ) );
- connect( elbBoxes, TQT_SIGNAL( elementsSwapped( int, int ) ), this, TQT_SLOT( slotElementsSwapped( int, int ) ) );
- connect( elbBoxes, TQT_SIGNAL( elementDeleted( int ) ), this, TQT_SLOT( slotElementDeleted( int ) ) );
+ connect( elbBoxes, TQ_SIGNAL( elementsSwapped( int, int ) ), this, TQ_SLOT( slotElementsSwapped( int, int ) ) );
+ connect( elbBoxes, TQ_SIGNAL( elementDeleted( int ) ), this, TQ_SLOT( slotElementDeleted( int ) ) );
readConfig();
}
@@ -74,7 +74,7 @@ void KornCfgImpl::slotEditBox()
KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true );
KornBoxCfgImpl *widget = new KornBoxCfgImpl( _base, "Box Widget" );
- connect( _base, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogDestroyed() ) );
+ connect( _base, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDialogDestroyed() ) );
_base->setMainWidget( widget );
widget->readConfig( _config, elbBoxes->listBox()->currentItem() );
diff --git a/korn/korncfgimpl.h b/korn/korncfgimpl.h
index e1289cd8..a0007327 100644
--- a/korn/korncfgimpl.h
+++ b/korn/korncfgimpl.h
@@ -28,7 +28,7 @@ class TQObject;
class TQString;
class KornCfgImpl : public KornCfgWidget
-{ Q_OBJECT
+{ TQ_OBJECT
public:
KornCfgImpl( TQWidget * parent = 0, const char * name = 0 );
diff --git a/korn/kornshell.cpp b/korn/kornshell.cpp
index 7f5587bc..ec3c7caf 100644
--- a/korn/kornshell.cpp
+++ b/korn/kornshell.cpp
@@ -43,7 +43,7 @@ KornShell::KornShell( TQWidget * parent, const char * name )
if( kapp->isRestored() )
{
_config->setGroup( "korn" );
- TQTimer::singleShot( _config->readNumEntry( "session_startup_delay", 2000 ), this, TQT_SLOT(readConfig()) );
+ TQTimer::singleShot( _config->readNumEntry( "session_startup_delay", 2000 ), this, TQ_SLOT(readConfig()) );
kdDebug() << "startup delayed" << endl;
}
else
@@ -84,8 +84,8 @@ void KornShell::optionDlg()
KornCfgImpl *widget = new KornCfgImpl( _configDialog, "Configuration widget" );
_configDialog->setMainWidget( widget );
- connect( _configDialog, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogClosed() ) );
- connect( _configDialog, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( slotApply() ) );
+ connect( _configDialog, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDialogClosed() ) );
+ connect( _configDialog, TQ_SIGNAL( applyClicked() ), this, TQ_SLOT( slotApply() ) );
_configDialog->show();
}
@@ -99,13 +99,13 @@ void KornShell::readConfig()
KOrnPassword::setUseWallet( _config->readBoolEntry( "usewallet", false ) );
if( layout == 'H' )
- _box = new HVContainer( Qt::Horizontal, TQT_TQOBJECT(this), "horizontal container" );
+ _box = new HVContainer( TQt::Horizontal, this, "horizontal container" );
else if( layout == 'V' )
- _box = new HVContainer( Qt::Vertical, TQT_TQOBJECT(this), "vertical container" );
+ _box = new HVContainer( TQt::Vertical, this, "vertical container" );
else
- _box = new DockedContainer( TQT_TQOBJECT(this), "docked container" );
+ _box = new DockedContainer( this, "docked container" );
- connect( _box, TQT_SIGNAL( showConfiguration() ), this, TQT_SLOT( optionDlg() ) );
+ connect( _box, TQ_SIGNAL( showConfiguration() ), this, TQ_SLOT( optionDlg() ) );
_box->readConfig( _config );
diff --git a/korn/kornshell.h b/korn/kornshell.h
index 57d631d7..3de3e485 100644
--- a/korn/kornshell.h
+++ b/korn/kornshell.h
@@ -30,7 +30,7 @@ class TDEConfig;
* This is a rewritten KornShell class. It is rewritten because the depending classes changed.
*/
class KornShell : public TQWidget
-{ Q_OBJECT
+{ TQ_OBJECT
public:
KornShell( TQWidget * parent = 0, const char * name = 0 );
diff --git a/korn/label.h b/korn/label.h
index d6cd31b0..7f68e9c4 100644
--- a/korn/label.h
+++ b/korn/label.h
@@ -26,7 +26,7 @@
* A simple overriding of the TQLabel class to get a mouseButtonPressed() signal
*/
class Label : public TQLabel
-{ Q_OBJECT
+{ TQ_OBJECT
public:
Label( TQWidget * parent = 0, const char * name = 0 ) : TQLabel( parent, name ) {}
diff --git a/korn/maildlg.cpp b/korn/maildlg.cpp
index d912c447..71db3da3 100644
--- a/korn/maildlg.cpp
+++ b/korn/maildlg.cpp
@@ -17,7 +17,7 @@ KornMailDlg::KornMailDlg( TQWidget *parent )
_editCtrl = new KEdit(page);
topLayout->addWidget(_editCtrl, 10);
_editCtrl->setReadOnly(true);
- connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(showFullMessage()));
+ connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(showFullMessage()));
setInitialSize(TQSize(TQApplication::desktop()->width()*9/10, TQApplication::desktop()->height()/2));
}
@@ -46,14 +46,14 @@ void KornMailDlg::showFullMessage()
tqApp->processEvents();
// connect the mailbox with the progress dialog in case it supports progress bars
- connect(_mailDrop, TQT_SIGNAL(readMailTotalSteps(int)), _progress, TQT_SLOT(setTotalSteps(int)));
- connect(_mailDrop, TQT_SIGNAL(readMailProgress(int)), _progress, TQT_SLOT(setProgress(int)));
+ connect(_mailDrop, TQ_SIGNAL(readMailTotalSteps(int)), _progress, TQ_SLOT(setTotalSteps(int)));
+ connect(_mailDrop, TQ_SIGNAL(readMailProgress(int)), _progress, TQ_SLOT(setProgress(int)));
tqApp->processEvents();
// connect the mailbox's cancel button
- connect(_progress, TQT_SIGNAL(canceled()), this, TQT_SLOT(loadMailCanceled()));
+ connect(_progress, TQ_SIGNAL(canceled()), this, TQ_SLOT(loadMailCanceled()));
- connect(_mailDrop, TQT_SIGNAL(readMailReady(TQString*)), this, TQT_SLOT(readMailReady(TQString*)));
+ connect(_mailDrop, TQ_SIGNAL(readMailReady(TQString*)), this, TQ_SLOT(readMailReady(TQString*)));
// now load the mail fully
if( _mailDrop->synchrone() )
@@ -100,7 +100,7 @@ void KornMailDlg::deleteProgress()
_progress->setProgress(_progress->totalSteps());
_progress->hide();
- disconnect( _mailDrop, TQT_SIGNAL(readMailReady(TQString*)), this, TQT_SLOT(readMailReady(TQString*)));
+ disconnect( _mailDrop, TQ_SIGNAL(readMailReady(TQString*)), this, TQ_SLOT(readMailReady(TQString*)));
delete _progress;
_progress = 0;
diff --git a/korn/maildlg.h b/korn/maildlg.h
index 7d76d488..df0b02e0 100644
--- a/korn/maildlg.h
+++ b/korn/maildlg.h
@@ -16,7 +16,7 @@ class TQString;
*/
class KornMailDlg : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
/**
diff --git a/korn/maildrop.cpp b/korn/maildrop.cpp
index 2224c74e..b9747906 100644
--- a/korn/maildrop.cpp
+++ b/korn/maildrop.cpp
@@ -37,7 +37,7 @@ KMailDrop::KMailDrop()
: _style(Plain),
_lastCount(0)
{
- connect(this, TQT_SIGNAL(changed( int, KMailDrop* )), TQT_SLOT(setCount( int, KMailDrop* )));
+ connect(this, TQ_SIGNAL(changed( int, KMailDrop* )), TQ_SLOT(setCount( int, KMailDrop* )));
//Set default colours; this prevents black (TQColor::invalid) boxes after creating a new box.
_bgColour = TQApplication::palette().active().background();
diff --git a/korn/maildrop.h b/korn/maildrop.h
index 9b755d4a..3a885e6c 100644
--- a/korn/maildrop.h
+++ b/korn/maildrop.h
@@ -29,7 +29,7 @@ template< class T, class R > class TQMap;
*/
class KMailDrop : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/korn/mailsubject.cpp b/korn/mailsubject.cpp
index 0b7a2e3a..841e183b 100644
--- a/korn/mailsubject.cpp
+++ b/korn/mailsubject.cpp
@@ -54,7 +54,7 @@ TQString KornMailSubject::toString() const
date.setTime_t(_date);
return TQString("KornMailSubject, Id: ") + (_id?_id->toString():TQString("NULL")) + ", " + i18n("Subject:") + " " + _subject
+ ", " + i18n("Sender:") + " " + _sender + ", " + i18n("Size:") + " " + TQString::number(_size)
- + ", " + i18n("Date:") + " " + date.toString(Qt::ISODate);
+ + ", " + i18n("Date:") + " " + date.toString(TQt::ISODate);
}
TQString KornMailSubject::decodeRFC2047String(const TQCString& aStr)
diff --git a/korn/nntp_proto.cpp b/korn/nntp_proto.cpp
index f5c59a77..645f73bc 100644
--- a/korn/nntp_proto.cpp
+++ b/korn/nntp_proto.cpp
@@ -41,8 +41,8 @@ void Nntp_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObjec
result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Username" ), TextInput::text, "", "username" ) );
result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Password" ), TextInput::password, "", "password" ) );
result->append( new CheckboxInput( (TQWidget*)vector->at( 1 ), i18n( "Save password" ), "true", "savepassword" ) );
- TQObject::connect( (TQObject*)result->last()->rightWidget(), TQT_SIGNAL( toggled( bool ) ),
- (TQObject*)result->prev()->rightWidget(), TQT_SLOT( setEnabled( bool ) ) );
+ TQObject::connect( (TQObject*)result->last()->rightWidget(), TQ_SIGNAL( toggled( bool ) ),
+ (TQObject*)result->prev()->rightWidget(), TQ_SLOT( setEnabled( bool ) ) );
result->last()->setValue( "false" );
}
diff --git a/korn/polldrop.h b/korn/polldrop.h
index a1a3bc89..78b3226f 100644
--- a/korn/polldrop.h
+++ b/korn/polldrop.h
@@ -20,7 +20,7 @@ class TQTimerEvent;
*/
class KPollableDrop : public KMailDrop
{
- Q_OBJECT
+ TQ_OBJECT
public:
static const char *PollConfigKey;
diff --git a/korn/pop3_proto.cpp b/korn/pop3_proto.cpp
index 732f85cf..37b44dc3 100644
--- a/korn/pop3_proto.cpp
+++ b/korn/pop3_proto.cpp
@@ -50,14 +50,14 @@ void Pop3_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObjec
result->append( new TextInput( (TQWidget*)vector->at( 0 ), i18n( "Server" ), TextInput::text, "", "server" ) );
result->append( new TextInput( (TQWidget*)vector->at( 0 ), i18n( "Port" ), 0, 65535, "110", "port" ) );
result->append( new ComboInput( (TQWidget*)vector->at( 0 ), i18n( "Encryption" ), encrList, "tls=auto", "encryption" ) );
- TQObject::connect( (TQObject*)result->last()->rightWidget(), TQT_SIGNAL( activated( int) ),
- configDialog, TQT_SLOT( slotSSLChanged() ) );
+ TQObject::connect( (TQObject*)result->last()->rightWidget(), TQ_SIGNAL( activated( int) ),
+ configDialog, TQ_SLOT( slotSSLChanged() ) );
result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Username" ), TextInput::text, "", "username" ) );
result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Password" ), TextInput::password, "", "password" ) );
result->append( new CheckboxInput( (TQWidget*)vector->at( 1 ), i18n( "Save password" ), "true", "savepassword" ) );
- TQObject::connect( (TQObject*)result->last()->rightWidget(), TQT_SIGNAL( toggled( bool ) ),
- (TQObject*)result->prev()->rightWidget(), TQT_SLOT( setEnabled( bool ) ) );
+ TQObject::connect( (TQObject*)result->last()->rightWidget(), TQ_SIGNAL( toggled( bool ) ),
+ (TQObject*)result->prev()->rightWidget(), TQ_SLOT( setEnabled( bool ) ) );
result->last()->setValue( "false" );
result->append( new ComboInput( (TQWidget*)vector->at( 1 ), i18n( "Authentication" ), authList, "", "auth" ) );
}
diff --git a/korn/progress_dialog.ui b/korn/progress_dialog.ui
index 9c891028..a5d5dc2f 100644
--- a/korn/progress_dialog.ui
+++ b/korn/progress_dialog.ui
@@ -105,16 +105,16 @@
<includes>
<include location="local" impldecl="in implementation">progress_dialog.ui.h</include>
</includes>
-<Q_SIGNALS>
+<signals>
<signal>cancelPressed()</signal>
-</Q_SIGNALS>
-<Q_SLOTS>
+</signals>
+<slots>
<slot>setText( const TQString &amp; str )</slot>
<slot>setNumberOfBoxes( int number )</slot>
<slot>setProgressOfBoxes( int number )</slot>
<slot>setNumberOfSteps( int number )</slot>
<slot>setProgress( int number )</slot>
<slot access="private" specifier="non virtual">cancelbutton()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/korn/subjectsdlg.cpp b/korn/subjectsdlg.cpp
index f3e4b3f4..4b10691d 100644
--- a/korn/subjectsdlg.cpp
+++ b/korn/subjectsdlg.cpp
@@ -93,14 +93,14 @@ KornSubjectsDlg::KornSubjectsDlg( TQWidget *parent )
_list->setItemMargin(3);
// connect the selection changed and double click events of the list view
- connect(_list, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(listSelectionChanged()));
- connect(_list, TQT_SIGNAL(executed(TQListViewItem *)), this, TQT_SLOT(doubleClicked(TQListViewItem *)));
+ connect(_list, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(listSelectionChanged()));
+ connect(_list, TQ_SIGNAL(executed(TQListViewItem *)), this, TQ_SLOT(doubleClicked(TQListViewItem *)));
// connect the buttons
- connect(invertSelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(invertSelection()));
- connect(clearSelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeSelection()));
- connect(showButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMessage()));
- connect(deleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteMessage()));
+ connect(invertSelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(invertSelection()));
+ connect(clearSelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeSelection()));
+ connect(showButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMessage()));
+ connect(deleteButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteMessage()));
setInitialSize(TQSize(TQApplication::desktop()->width(), TQApplication::desktop()->height()));
}
@@ -215,7 +215,7 @@ void KornSubjectsDlg::showSubjectsDlg( const TQString& name )
void KornSubjectsDlg::closeDialog( )
{
- disconnect( this, TQT_SIGNAL( finished() ), this, TQT_SLOT( closeDialog() ) );
+ disconnect( this, TQ_SIGNAL( finished() ), this, TQ_SLOT( closeDialog() ) );
}
//----------------------------
@@ -253,13 +253,13 @@ void KornSubjectsDlg::prepareStep1Subjects( KMailDrop *drop )
_subjects->progress->setProgress( 0 );
_subjects->atRechecking = true;
- connect( drop, TQT_SIGNAL( rechecked() ), this, TQT_SLOT( slotReloadRechecked() ) );
+ connect( drop, TQ_SIGNAL( rechecked() ), this, TQ_SLOT( slotReloadRechecked() ) );
drop->recheck();
}
void KornSubjectsDlg::removeStep1Subjects( KMailDrop *drop )
{
- disconnect( drop, TQT_SIGNAL( rechecked() ), this, TQT_SLOT( slotReloadRechecked() ) );
+ disconnect( drop, TQ_SIGNAL( rechecked() ), this, TQ_SLOT( slotReloadRechecked() ) );
}
void KornSubjectsDlg::prepareStep2Subjects( KMailDrop *drop )
@@ -267,11 +267,11 @@ void KornSubjectsDlg::prepareStep2Subjects( KMailDrop *drop )
_subjects->progress->setText( i18n( "Fetching messages..." ) );
_subjects->atRechecking = false;
- connect( drop, TQT_SIGNAL( readSubject( KornMailSubject* ) ), this, TQT_SLOT( subjectAvailable( KornMailSubject* ) ) );
- connect( drop, TQT_SIGNAL( readSubjectsReady( bool ) ), this, TQT_SLOT( subjectsReady( bool ) ) );
- connect( drop, TQT_SIGNAL( readSubjectsTotalSteps( int ) ), _subjects->progress, TQT_SLOT( setNumberOfSteps( int ) ) );
- connect( drop, TQT_SIGNAL( readSubjectsProgress( int ) ), _subjects->progress, TQT_SLOT( setProgress( int ) ) );
- connect( _subjects->progress, TQT_SIGNAL( cancelPressed() ), drop, TQT_SLOT( readSubjectsCanceled() ) );
+ connect( drop, TQ_SIGNAL( readSubject( KornMailSubject* ) ), this, TQ_SLOT( subjectAvailable( KornMailSubject* ) ) );
+ connect( drop, TQ_SIGNAL( readSubjectsReady( bool ) ), this, TQ_SLOT( subjectsReady( bool ) ) );
+ connect( drop, TQ_SIGNAL( readSubjectsTotalSteps( int ) ), _subjects->progress, TQ_SLOT( setNumberOfSteps( int ) ) );
+ connect( drop, TQ_SIGNAL( readSubjectsProgress( int ) ), _subjects->progress, TQ_SLOT( setProgress( int ) ) );
+ connect( _subjects->progress, TQ_SIGNAL( cancelPressed() ), drop, TQ_SLOT( readSubjectsCanceled() ) );
if( _subjects->it->current()->canReadSubjects() )
_subjects->it->current()->readSubjects( 0 );
@@ -281,11 +281,11 @@ void KornSubjectsDlg::prepareStep2Subjects( KMailDrop *drop )
void KornSubjectsDlg::removeStep2Subjects( KMailDrop *drop )
{
- disconnect( drop, TQT_SIGNAL( readSubject( KornMailSubject* ) ), this, TQT_SLOT( subjectAvailable( KornMailSubject* ) ) );
- disconnect( drop, TQT_SIGNAL( readSubjectsReady( bool ) ), this, TQT_SLOT( subjectsReady( bool ) ) );
- disconnect( drop, TQT_SIGNAL( readSubjectsTotalSteps( int ) ), _subjects->progress, TQT_SLOT( setNumberOfSteps( int ) ) );
- disconnect( drop, TQT_SIGNAL( readSubjectsProgress( int ) ), _subjects->progress, TQT_SLOT( setProgress( int ) ) );
- disconnect( _subjects->progress, TQT_SIGNAL( cancelPressed() ), drop, TQT_SLOT( readSubjectsCanceled() ) );
+ disconnect( drop, TQ_SIGNAL( readSubject( KornMailSubject* ) ), this, TQ_SLOT( subjectAvailable( KornMailSubject* ) ) );
+ disconnect( drop, TQ_SIGNAL( readSubjectsReady( bool ) ), this, TQ_SLOT( subjectsReady( bool ) ) );
+ disconnect( drop, TQ_SIGNAL( readSubjectsTotalSteps( int ) ), _subjects->progress, TQ_SLOT( setNumberOfSteps( int ) ) );
+ disconnect( drop, TQ_SIGNAL( readSubjectsProgress( int ) ), _subjects->progress, TQ_SLOT( setProgress( int ) ) );
+ disconnect( _subjects->progress, TQ_SIGNAL( cancelPressed() ), drop, TQ_SLOT( readSubjectsCanceled() ) );
}
bool KornSubjectsDlg::makeSubjectsStruct()
@@ -299,7 +299,7 @@ bool KornSubjectsDlg::makeSubjectsStruct()
_subjects->progress = new DoubleProgressDialog( this, "progress" );
_subjects->atRechecking = true;
- connect( _subjects->progress, TQT_SIGNAL( cancelPressed() ), this, TQT_SLOT( slotSubjectsCanceled() ) );
+ connect( _subjects->progress, TQ_SIGNAL( cancelPressed() ), this, TQ_SLOT( slotSubjectsCanceled() ) );
return true;
}
@@ -309,7 +309,7 @@ void KornSubjectsDlg::deleteSubjectsStruct()
if( !_subjects )
return;
- disconnect( _subjects->progress, TQT_SIGNAL( cancelPressed() ), this, TQT_SLOT( slotSubjectsCanceled() ) );
+ disconnect( _subjects->progress, TQ_SIGNAL( cancelPressed() ), this, TQ_SLOT( slotSubjectsCanceled() ) );
this->unsetCursor();
@@ -441,12 +441,12 @@ void KornSubjectsDlg::makeDeleteStruct()
_delete->progress = new TQProgressDialog( this, "progress" );
_delete->totalNumberOfMessages = 0;
- connect( _delete->progress, TQT_SIGNAL( canceled() ), this, TQT_SLOT( slotDeleteCanceled() ) );
+ connect( _delete->progress, TQ_SIGNAL( canceled() ), this, TQ_SLOT( slotDeleteCanceled() ) );
}
void KornSubjectsDlg::deleteDeleteStruct()
{
- disconnect( _delete->progress, TQT_SIGNAL( canceled() ), this, TQT_SLOT( slotDeleteCanceled() ) );
+ disconnect( _delete->progress, TQ_SIGNAL( canceled() ), this, TQ_SLOT( slotDeleteCanceled() ) );
delete _delete->messages;
delete _delete->ids;
@@ -487,7 +487,7 @@ void KornSubjectsDlg::deleteNextMessage()
{
if( _delete->messages->count() == 0 ) //No more messages to delete
{
- TQTimer::singleShot( 100, this, TQT_SLOT( reloadSubjects() ) );
+ TQTimer::singleShot( 100, this, TQ_SLOT( reloadSubjects() ) );
deleteDeleteStruct();
//reloadSubjects(); //Reload all subjects again
return;
@@ -499,12 +499,12 @@ void KornSubjectsDlg::deleteNextMessage()
fillDeleteIdList( _delete->drop );
// Connect the progress bar signals of the mail box
- connect( _delete->drop, TQT_SIGNAL( deleteMailsTotalSteps( int ) ), _delete->progress, TQT_SLOT( setTotalSteps( int ) ) );
- connect( _delete->drop, TQT_SIGNAL( deleteMailsProgress( int ) ), _delete->progress, TQT_SLOT( setProgress( int ) ) );
- connect( _delete->drop, TQT_SIGNAL( deleteMailsReady( bool ) ), this, TQT_SLOT( deleteMailsReady( bool ) ) );
+ connect( _delete->drop, TQ_SIGNAL( deleteMailsTotalSteps( int ) ), _delete->progress, TQ_SLOT( setTotalSteps( int ) ) );
+ connect( _delete->drop, TQ_SIGNAL( deleteMailsProgress( int ) ), _delete->progress, TQ_SLOT( setProgress( int ) ) );
+ connect( _delete->drop, TQ_SIGNAL( deleteMailsReady( bool ) ), this, TQ_SLOT( deleteMailsReady( bool ) ) );
// connect the cancel button of the progress bar
- connect( _delete->progress, TQT_SIGNAL( canceled() ), _delete->drop, TQT_SLOT( deleteMailsCanceled() ) );
+ connect( _delete->progress, TQ_SIGNAL( canceled() ), _delete->drop, TQ_SLOT( deleteMailsCanceled() ) );
// delete the mails
_delete->drop->deleteMails( _delete->ids, 0 );
@@ -515,12 +515,12 @@ void KornSubjectsDlg::deleteMailsReady( bool /*success*/ )
if( !_delete )
return;
- disconnect( _delete->drop, TQT_SIGNAL( deleteMailsTotalSteps( int ) ), _delete->progress, TQT_SLOT( setTotalSteps( int ) ) );
- disconnect( _delete->drop, TQT_SIGNAL( deleteMailsProgress( int ) ), _delete->progress, TQT_SLOT( setProgress( int ) ) );
- disconnect( _delete->drop, TQT_SIGNAL( deleteMailsReady( bool ) ), this, TQT_SLOT( deleteMailsReady( bool ) ) );
+ disconnect( _delete->drop, TQ_SIGNAL( deleteMailsTotalSteps( int ) ), _delete->progress, TQ_SLOT( setTotalSteps( int ) ) );
+ disconnect( _delete->drop, TQ_SIGNAL( deleteMailsProgress( int ) ), _delete->progress, TQ_SLOT( setProgress( int ) ) );
+ disconnect( _delete->drop, TQ_SIGNAL( deleteMailsReady( bool ) ), this, TQ_SLOT( deleteMailsReady( bool ) ) );
// disconnect the cancel button of the progress bar
- disconnect( _delete->progress, TQT_SIGNAL( canceled() ), _delete->drop, TQT_SLOT( deleteMailsCanceled() ) );
+ disconnect( _delete->progress, TQ_SIGNAL( canceled() ), _delete->drop, TQ_SLOT( deleteMailsCanceled() ) );
deleteNextMessage();
}
diff --git a/korn/subjectsdlg.h b/korn/subjectsdlg.h
index cdf7bccf..7c9efa88 100644
--- a/korn/subjectsdlg.h
+++ b/korn/subjectsdlg.h
@@ -23,7 +23,7 @@ template< class T > class TQPtrList;
*/
class KornSubjectsDlg: public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
/**
diff --git a/korn/systemtray.h b/korn/systemtray.h
index 01a4f683..f3d5b4f8 100644
--- a/korn/systemtray.h
+++ b/korn/systemtray.h
@@ -30,7 +30,7 @@ class TQWidget;
* @author Mart Kelder <mart.kde@hccnet.nl>
*/
class SystemTray : public KSystemTray
-{ Q_OBJECT
+{ TQ_OBJECT
public:
/**
diff --git a/korn/tdeio.cpp b/korn/tdeio.cpp
index faf05214..afabf5a3 100644
--- a/korn/tdeio.cpp
+++ b/korn/tdeio.cpp
@@ -466,10 +466,10 @@ bool KKioDrop::startProcess()
// only reading stdin yet
- connect( _process,TQT_SIGNAL(receivedStdout( TDEProcess *, char *, int)),
- this, TQT_SLOT(receivedStdout( TDEProcess *,char *,int)) );
- connect( _process, TQT_SIGNAL(processExited(TDEProcess*)),
- this, TQT_SLOT(processExit(TDEProcess*)) );
+ connect( _process,TQ_SIGNAL(receivedStdout( TDEProcess *, char *, int)),
+ this, TQ_SLOT(receivedStdout( TDEProcess *,char *,int)) );
+ connect( _process, TQ_SIGNAL(processExited(TDEProcess*)),
+ this, TQ_SLOT(processExit(TDEProcess*)) );
*_process << _kurl->path();
_process->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout );
diff --git a/korn/tdeio.h b/korn/tdeio.h
index 2f8f2d8e..5a97bb6b 100644
--- a/korn/tdeio.h
+++ b/korn/tdeio.h
@@ -49,7 +49,7 @@ namespace TDEIO { class Job; class MetaData; class Slave; class TransferJob; }
*/
class KKioDrop : public KPollableDrop
{
- Q_OBJECT
+ TQ_OBJECT
private:
KURL *_kurl;
diff --git a/korn/tdeio_count.cpp b/korn/tdeio_count.cpp
index 515e322b..3c35a6a4 100644
--- a/korn/tdeio_count.cpp
+++ b/korn/tdeio_count.cpp
@@ -95,9 +95,9 @@ void TDEIO_Count::count( KKioDrop *drop )
return;
}
- connect( _slave, TQT_SIGNAL( error( int, const TQString& ) ), _tdeio, TQT_SLOT( slotConnectionError( int, const TQString& ) ) );
- connect( _slave, TQT_SIGNAL( warning( const TQString& ) ), _tdeio, TQT_SLOT( slotConnectionWarning( const TQString& ) ) );
- connect( _slave, TQT_SIGNAL( infoMessage( const TQString& ) ), _tdeio, TQT_SLOT( slotConnectionInfoMessage( const TQString& ) ) );
+ connect( _slave, TQ_SIGNAL( error( int, const TQString& ) ), _tdeio, TQ_SLOT( slotConnectionError( int, const TQString& ) ) );
+ connect( _slave, TQ_SIGNAL( warning( const TQString& ) ), _tdeio, TQ_SLOT( slotConnectionWarning( const TQString& ) ) );
+ connect( _slave, TQ_SIGNAL( infoMessage( const TQString& ) ), _tdeio, TQ_SLOT( slotConnectionInfoMessage( const TQString& ) ) );
/*
* _protocol->recheckConnectKURL could have change kurl and metadata in order to have the right
@@ -125,9 +125,9 @@ void TDEIO_Count::count( KKioDrop *drop )
_job = TDEIO::listDir( kurl, false );
_job->addMetaData( metadata );
- connect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( result( TDEIO::Job* ) ) );
- connect( _job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
- this, TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
+ connect( _job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( result( TDEIO::Job* ) ) );
+ connect( _job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
+ this, TQ_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
if( _protocol->connectionBased() )
TDEIO::Scheduler::assignJobToSlave( _slave, _job );
@@ -140,9 +140,9 @@ void TDEIO_Count::stopActiveCount()
if( !_new_mailurls )
return;
- disconnect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( result( TDEIO::Job* ) ) );
- disconnect( _job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
- this, TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
+ disconnect( _job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( result( TDEIO::Job* ) ) );
+ disconnect( _job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
+ this, TQ_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
TDEIO::Scheduler::cancelJob( _job );
@@ -175,8 +175,8 @@ void TDEIO_Count::showPassive( const TQString& id )
_subjects_pending++;
- connect( subject, TQT_SIGNAL( readSubject( KornMailSubject* ) ), this, TQT_SLOT( addtoPassivePopup( KornMailSubject* ) ) );
- connect( subject, TQT_SIGNAL( finished( TDEIO_Single_Subject* ) ), this, TQT_SLOT( deleteSingleSubject( TDEIO_Single_Subject* ) ) );
+ connect( subject, TQ_SIGNAL( readSubject( KornMailSubject* ) ), this, TQ_SLOT( addtoPassivePopup( KornMailSubject* ) ) );
+ connect( subject, TQ_SIGNAL( finished( TDEIO_Single_Subject* ) ), this, TQ_SLOT( deleteSingleSubject( TDEIO_Single_Subject* ) ) );
}
void TDEIO_Count::disconnectSlave()
@@ -213,9 +213,9 @@ void TDEIO_Count::result( TDEIO::Job* job )
_tdeio->emitValidChanged();
}
- disconnect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( result( TDEIO::Job* ) ) );
- disconnect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
- this, TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
+ disconnect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( result( TDEIO::Job* ) ) );
+ disconnect( job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
+ this, TQ_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
disconnectSlave();
diff --git a/korn/tdeio_count.h b/korn/tdeio_count.h
index 51258694..fd22d5ab 100644
--- a/korn/tdeio_count.h
+++ b/korn/tdeio_count.h
@@ -42,7 +42,7 @@ class KURL;
class TQString;
class TDEIO_Count : public TQObject
-{ Q_OBJECT
+{ TQ_OBJECT
public:
TDEIO_Count( TQObject * parent = 0, const char * name = 0 );
diff --git a/korn/tdeio_delete.cpp b/korn/tdeio_delete.cpp
index f26b5fe3..6b8b06fe 100644
--- a/korn/tdeio_delete.cpp
+++ b/korn/tdeio_delete.cpp
@@ -142,7 +142,7 @@ void TDEIO_Delete::deleteItem( const KornMailId *item, KURL kurl, TDEIO::MetaDat
else
return; //Unknown deleteFunction
- 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* ) ) );
job->addMetaData( metadata );
@@ -161,7 +161,7 @@ void TDEIO_Delete::commitDelete( KURL kurl, TDEIO::MetaData metadata, const TDEI
TDEIO::TransferJob *job = TDEIO::get( kurl, true, false );
job->addMetaData( metadata );
- 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* ) ) );
_jobs->append( dynamic_cast< TDEIO::Job* >( job ) );
diff --git a/korn/tdeio_delete.h b/korn/tdeio_delete.h
index 3a23f447..f55500fa 100644
--- a/korn/tdeio_delete.h
+++ b/korn/tdeio_delete.h
@@ -35,7 +35,7 @@ namespace TDEIO { class MetaData; class Job; class Slave; }
template<class T> class TQPtrList;
class TDEIO_Delete : public TQObject
-{ Q_OBJECT
+{ TQ_OBJECT
public:
//constructors
diff --git a/korn/tdeio_read.cpp b/korn/tdeio_read.cpp
index c34e7429..ee61243d 100644
--- a/korn/tdeio_read.cpp
+++ b/korn/tdeio_read.cpp
@@ -60,8 +60,8 @@ void TDEIO_Read::readMail( const KornMailId *& mailid, KKioDrop* drop )
_job = TDEIO::get( kurl, false, false );
_job->addMetaData( metadata );
- connect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );
- connect( _job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) );
+ connect( _job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) );
+ connect( _job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) );
}
void TDEIO_Read::canceled( )
diff --git a/korn/tdeio_read.h b/korn/tdeio_read.h
index fc5f9e99..9c284132 100644
--- a/korn/tdeio_read.h
+++ b/korn/tdeio_read.h
@@ -33,7 +33,7 @@ class TDEIO_Protocol;
class TQString;
class TDEIO_Read : public TQObject
-{ Q_OBJECT
+{ TQ_OBJECT
public:
TDEIO_Read( TQObject * parent = 0, const char * name = 0 );
diff --git a/korn/tdeio_single_subject.cpp b/korn/tdeio_single_subject.cpp
index 3ac765de..9e3975cc 100644
--- a/korn/tdeio_single_subject.cpp
+++ b/korn/tdeio_single_subject.cpp
@@ -65,9 +65,9 @@ void TDEIO_Single_Subject::init( TDEIO::Slave *& slave)
_job = TDEIO::get( *_kurl, false, false );
_job->addMetaData( *_metadata );
- connect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );
- connect( _job, TQT_SIGNAL( data (TDEIO::Job *, const TQByteArray &) ),
- this, TQT_SLOT( slotData(TDEIO::Job *, const TQByteArray &) ) );
+ connect( _job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) );
+ connect( _job, TQ_SIGNAL( data (TDEIO::Job *, const TQByteArray &) ),
+ this, TQ_SLOT( slotData(TDEIO::Job *, const TQByteArray &) ) );
if( _protocol->connectionBased( ) && slave )
TDEIO::Scheduler::assignJobToSlave( slave , _job );
diff --git a/korn/tdeio_single_subject.h b/korn/tdeio_single_subject.h
index 61641536..8e5b983c 100644
--- a/korn/tdeio_single_subject.h
+++ b/korn/tdeio_single_subject.h
@@ -33,7 +33,7 @@ class TDEIO_Protocol;
class TQString;
class TDEIO_Single_Subject : public TQObject
-{ Q_OBJECT
+{ TQ_OBJECT
public:
TDEIO_Single_Subject( TQObject * parent, const char * name, KURL &, TDEIO::MetaData &, const TDEIO_Protocol *,
diff --git a/korn/tdeio_subjects.cpp b/korn/tdeio_subjects.cpp
index 985a89e5..47b51458 100644
--- a/korn/tdeio_subjects.cpp
+++ b/korn/tdeio_subjects.cpp
@@ -127,8 +127,8 @@ void TDEIO_Subjects::startJob( const TQString &name, const long size )
subject = new TDEIO_Single_Subject( this, name.latin1(), kurl, metadata, _protocol, _slave, name, size );
- connect( subject, TQT_SIGNAL( readSubject( KornMailSubject* ) ), this, TQT_SLOT( slotReadSubject( KornMailSubject* ) ) );
- connect( subject, TQT_SIGNAL( finished( TDEIO_Single_Subject* ) ), this, TQT_SLOT( slotFinished( TDEIO_Single_Subject* ) ) );
+ connect( subject, TQ_SIGNAL( readSubject( KornMailSubject* ) ), this, TQ_SLOT( slotReadSubject( KornMailSubject* ) ) );
+ connect( subject, TQ_SIGNAL( finished( TDEIO_Single_Subject* ) ), this, TQ_SLOT( slotFinished( TDEIO_Single_Subject* ) ) );
_jobs->append( subject );
}
diff --git a/korn/tdeio_subjects.h b/korn/tdeio_subjects.h
index bb1f50e0..5040a1eb 100644
--- a/korn/tdeio_subjects.h
+++ b/korn/tdeio_subjects.h
@@ -35,7 +35,7 @@ class TQString;
template<class T> class TQValueList;
class TDEIO_Subjects : public TQObject
-{ Q_OBJECT
+{ TQ_OBJECT
public:
TDEIO_Subjects( TQObject * parent, const char * name );
diff --git a/ktnef/gui/attachpropertydialog.cpp b/ktnef/gui/attachpropertydialog.cpp
index 73b20871..f8d8ce12 100644
--- a/ktnef/gui/attachpropertydialog.cpp
+++ b/ktnef/gui/attachpropertydialog.cpp
@@ -178,7 +178,7 @@ TQPixmap loadRenderingPixmap( KTNEFPropertySet *pSet, const TQColor& bgColor )
{
pix.resize( w, h );
pix.fill( bgColor );
- wmfLoader.paint( &TQT_TQPAINTDEVICE_OBJECT(pix) );
+ wmfLoader.paint( &pix );
}
wmfBuffer.close();
}
diff --git a/ktnef/gui/attachpropertydialogbase.ui b/ktnef/gui/attachpropertydialogbase.ui
index ca34103a..afc6e500 100644
--- a/ktnef/gui/attachpropertydialogbase.ui
+++ b/ktnef/gui/attachpropertydialogbase.ui
@@ -271,9 +271,9 @@
<slot>saveClicked()</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot access="protected">saveClicked()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">tdelistview.h</include>
diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp
index 35e6607d..3755fed0 100644
--- a/ktnef/gui/ktnefmain.cpp
+++ b/ktnef/gui/ktnefmain.cpp
@@ -85,19 +85,19 @@ KTNEFMain::~KTNEFMain()
void KTNEFMain::setupActions()
{
// File menu
- KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(openFile()), actionCollection());
- KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
+ KStdAction::open(this, TQ_SLOT(openFile()), actionCollection());
+ KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
// Action menu
- new TDEAction(i18n("View"), TQString("viewmag"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewFile()), actionCollection(), "view_file");
- new TDEAction(i18n("View With..."), TQString("package_applications"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewFileAs()), actionCollection(), "view_file_as");
- new TDEAction(i18n("Extract"), 0, TQT_TQOBJECT(this), TQT_SLOT(extractFile()), actionCollection(), "extract_file");
- new TDEAction(i18n("Extract To..."), TQString("ktnef_extract_to"), 0, TQT_TQOBJECT(this), TQT_SLOT(extractFileTo()), actionCollection(), "extract_file_to");
- new TDEAction(i18n("Extract All To..."), TQString("ktnef_extract_all_to"), 0, TQT_TQOBJECT(this), TQT_SLOT(extractAllFiles()), actionCollection(), "extract_all_files");
- new TDEAction( i18n( "Message Properties" ), "help", 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowMessageProperties() ), actionCollection(), "msg_properties" );
- new TDEAction(i18n("Properties"), TQString("contents"), 0, TQT_TQOBJECT(this), TQT_SLOT(propertiesFile()), actionCollection(), "properties_file");
- new TDEAction( i18n( "Show Message Text" ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowMessageText() ), actionCollection(), "msg_text" );
- new TDEAction( i18n( "Save Message Text As..." ), "document-save", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveMessageText() ), actionCollection(), "msg_save" );
+ new TDEAction(i18n("View"), TQString("viewmag"), 0, this, TQ_SLOT(viewFile()), actionCollection(), "view_file");
+ new TDEAction(i18n("View With..."), TQString("package_applications"), 0, this, TQ_SLOT(viewFileAs()), actionCollection(), "view_file_as");
+ new TDEAction(i18n("Extract"), 0, this, TQ_SLOT(extractFile()), actionCollection(), "extract_file");
+ new TDEAction(i18n("Extract To..."), TQString("ktnef_extract_to"), 0, this, TQ_SLOT(extractFileTo()), actionCollection(), "extract_file_to");
+ new TDEAction(i18n("Extract All To..."), TQString("ktnef_extract_all_to"), 0, this, TQ_SLOT(extractAllFiles()), actionCollection(), "extract_all_files");
+ new TDEAction( i18n( "Message Properties" ), "help", 0, this, TQ_SLOT( slotShowMessageProperties() ), actionCollection(), "msg_properties" );
+ new TDEAction(i18n("Properties"), TQString("contents"), 0, this, TQ_SLOT(propertiesFile()), actionCollection(), "properties_file");
+ new TDEAction( i18n( "Show Message Text" ), "mail_generic", 0, this, TQ_SLOT( slotShowMessageText() ), actionCollection(), "msg_text" );
+ new TDEAction( i18n( "Save Message Text As..." ), "document-save", 0, this, TQ_SLOT( slotSaveMessageText() ), actionCollection(), "msg_save" );
actionCollection()->action("view_file")->setEnabled(false);
actionCollection()->action("view_file_as")->setEnabled(false);
actionCollection()->action("extract_file")->setEnabled(false);
@@ -106,12 +106,12 @@ void KTNEFMain::setupActions()
actionCollection()->action("properties_file")->setEnabled(false);
// Option menu
- new TDEAction(i18n("Default Folder..."), TQString("folder_open"), 0, TQT_TQOBJECT(this), TQT_SLOT(optionDefaultDir()), actionCollection(), "options_default_dir");
+ new TDEAction(i18n("Default Folder..."), TQString("folder_open"), 0, this, TQ_SLOT(optionDefaultDir()), actionCollection(), "options_default_dir");
createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true);
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection());
- KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeys() ), actionCollection() );
+ KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbars()), actionCollection());
+ KStdAction::keyBindings( this, TQ_SLOT( slotConfigureKeys() ), actionCollection() );
createGUI();
}
@@ -135,10 +135,10 @@ void KTNEFMain::setupTNEF()
parser_ = new KTNEFParser;
setCentralWidget(view_);
- connect(view_, TQT_SIGNAL(selectionChanged()), TQT_SLOT(viewSelectionChanged()));
- connect(view_, TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)), TQT_SLOT(viewRightButtonPressed(TQListViewItem*,const TQPoint&,int)));
- connect(view_, TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_SLOT(viewDoubleClicked(TQListViewItem*)));
- connect(view_, TQT_SIGNAL(dragRequested(const TQValueList<KTNEFAttach*>&)), TQT_SLOT(viewDragRequested(const TQValueList<KTNEFAttach*>&)));
+ connect(view_, TQ_SIGNAL(selectionChanged()), TQ_SLOT(viewSelectionChanged()));
+ connect(view_, TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)), TQ_SLOT(viewRightButtonPressed(TQListViewItem*,const TQPoint&,int)));
+ connect(view_, TQ_SIGNAL(doubleClicked(TQListViewItem*)), TQ_SLOT(viewDoubleClicked(TQListViewItem*)));
+ connect(view_, TQ_SIGNAL(dragRequested(const TQValueList<KTNEFAttach*>&)), TQ_SLOT(viewDragRequested(const TQValueList<KTNEFAttach*>&)));
}
void KTNEFMain::loadFile(const TQString& filename)
@@ -321,16 +321,16 @@ void KTNEFMain::viewRightButtonPressed(TQListViewItem*, const TQPoint& p, int)
{
if (list->count() == 1u)
{
- m.insertItem(SmallIcon("viewmag"), i18n("View"), this, TQT_SLOT(viewFile()));
- m.insertItem(SmallIcon("package_applications"), i18n("View With..."), this, TQT_SLOT(viewFileAs()));
+ m.insertItem(SmallIcon("viewmag"), i18n("View"), this, TQ_SLOT(viewFile()));
+ m.insertItem(SmallIcon("package_applications"), i18n("View With..."), this, TQ_SLOT(viewFileAs()));
m.insertSeparator();
}
- m.insertItem(i18n("Extract"), this, TQT_SLOT(extractFile()));
- m.insertItem(SmallIcon("ktnef_extract_to"), i18n("Extract To..."), this, TQT_SLOT(extractFileTo()));
+ m.insertItem(i18n("Extract"), this, TQ_SLOT(extractFile()));
+ m.insertItem(SmallIcon("ktnef_extract_to"), i18n("Extract To..."), this, TQ_SLOT(extractFileTo()));
if (list->count() == 1u)
{
m.insertSeparator();
- m.insertItem(SmallIcon("contents"), i18n("Properties"), this, TQT_SLOT(propertiesFile()));
+ m.insertItem(SmallIcon("contents"), i18n("Properties"), this, TQ_SLOT(propertiesFile()));
}
}
else if ( list->count() == 0 )
@@ -360,7 +360,7 @@ void KTNEFMain::slotEditToolbars()
{
saveMainWindowSettings( TDEGlobal::config(), TQString::fromLatin1("MainWindow") );
KEditToolbar dlg(actionCollection());
- connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() ));
+ connect(&dlg, TQ_SIGNAL( newToolbarConfig() ), this, TQ_SLOT( slotNewToolbarConfig() ));
dlg.exec();
}
diff --git a/ktnef/gui/ktnefmain.h b/ktnef/gui/ktnefmain.h
index 491d6aa7..7d6a984a 100644
--- a/ktnef/gui/ktnefmain.h
+++ b/ktnef/gui/ktnefmain.h
@@ -28,7 +28,7 @@ class KTNEFAttach;
class KTNEFMain : public TDEMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/ktnef/gui/ktnefview.cpp b/ktnef/gui/ktnefview.cpp
index a28a7d51..058a11c2 100644
--- a/ktnef/gui/ktnefview.cpp
+++ b/ktnef/gui/ktnefview.cpp
@@ -75,7 +75,7 @@ KTNEFView::KTNEFView(TQWidget *parent, const char *name)
setSelectionMode(TQListView::Extended);
setHScrollBarMode(TQScrollView::AlwaysOff);
setVScrollBarMode(TQScrollView::AlwaysOn);
- TQTimer::singleShot( 0, this, TQT_SLOT(adjustColumnWidth()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(adjustColumnWidth()) );
}
KTNEFView::~KTNEFView()
diff --git a/ktnef/gui/ktnefview.h b/ktnef/gui/ktnefview.h
index 34b84867..60321bf4 100644
--- a/ktnef/gui/ktnefview.h
+++ b/ktnef/gui/ktnefview.h
@@ -26,7 +26,7 @@ class KTNEFAttach;
class KDE_EXPORT KTNEFView : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/ktnef/gui/messagepropertydialog.h b/ktnef/gui/messagepropertydialog.h
index 98ddb374..44ee6c64 100644
--- a/ktnef/gui/messagepropertydialog.h
+++ b/ktnef/gui/messagepropertydialog.h
@@ -25,7 +25,7 @@ class KTNEFMessage;
class MessagePropertyDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
MessagePropertyDialog( TQWidget *parent, KTNEFMessage *msg );
diff --git a/ktnef/gui/qwmf.cpp b/ktnef/gui/qwmf.cpp
index e4baf41d..325cccc7 100644
--- a/ktnef/gui/qwmf.cpp
+++ b/ktnef/gui/qwmf.cpp
@@ -352,7 +352,7 @@ bool TQWinMetaFile::paint( const TQPaintDevice* aTarget, bool absolute )
mWinding = false;
mAbsoluteCoord = absolute;
- mPainter.begin( TQT_TQPAINTDEVICE(const_cast<TQPaintDevice*>(aTarget)) );
+ mPainter.begin( const_cast<TQPaintDevice*>(aTarget) );
if ( TQWMF_DEBUG ) {
kdDebug() << "Bounding box : " << mBBox.left()
<< " " << mBBox.top() << " " << mBBox.right() << " " << mBBox.bottom() << endl;
@@ -624,8 +624,8 @@ void TQWinMetaFile::setBkColor( long, short* parm )
//-----------------------------------------------------------------------------
void TQWinMetaFile::setBkMode( long, short* parm )
{
- if ( parm[ 0 ]==1 ) mPainter.setBackgroundMode( Qt::TransparentMode );
- else mPainter.setBackgroundMode( Qt::OpaqueMode );
+ if ( parm[ 0 ]==1 ) mPainter.setBackgroundMode( TQt::TransparentMode );
+ else mPainter.setBackgroundMode( TQt::OpaqueMode );
}
@@ -929,26 +929,26 @@ void TQWinMetaFile::createEmptyObject( long, short* )
//-----------------------------------------------------------------------------
void TQWinMetaFile::createBrushIndirect( long, short* parm )
{
- static Qt::BrushStyle hatchedStyleTab[] =
+ static TQt::BrushStyle hatchedStyleTab[] =
{
- Qt::HorPattern,
- Qt::FDiagPattern,
- Qt::BDiagPattern,
- Qt::CrossPattern,
- Qt::DiagCrossPattern
+ TQt::HorPattern,
+ TQt::FDiagPattern,
+ TQt::BDiagPattern,
+ TQt::CrossPattern,
+ TQt::DiagCrossPattern
};
- static Qt::BrushStyle styleTab[] =
- { Qt::SolidPattern,
- Qt::NoBrush,
- Qt::FDiagPattern, /* hatched */
- Qt::Dense4Pattern, /* should be custom bitmap pattern */
- Qt::HorPattern, /* should be BS_INDEXED (?) */
- Qt::VerPattern, /* should be device-independent bitmap */
- Qt::Dense6Pattern, /* should be device-independent packed-bitmap */
- Qt::Dense2Pattern, /* should be BS_PATTERN8x8 */
- Qt::Dense3Pattern /* should be device-independent BS_DIBPATTERN8x8 */
+ static TQt::BrushStyle styleTab[] =
+ { TQt::SolidPattern,
+ TQt::NoBrush,
+ TQt::FDiagPattern, /* hatched */
+ TQt::Dense4Pattern, /* should be custom bitmap pattern */
+ TQt::HorPattern, /* should be BS_INDEXED (?) */
+ TQt::VerPattern, /* should be device-independent bitmap */
+ TQt::Dense6Pattern, /* should be device-independent packed-bitmap */
+ TQt::Dense2Pattern, /* should be BS_PATTERN8x8 */
+ TQt::Dense3Pattern /* should be device-independent BS_DIBPATTERN8x8 */
};
- Qt::BrushStyle style;
+ TQt::BrushStyle style;
short arg;
WinObjBrushHandle* handle = new WinObjBrushHandle;
addHandle( handle );
@@ -961,7 +961,7 @@ void TQWinMetaFile::createBrushIndirect( long, short* parm )
else
{
kdDebug() << "TQWinMetaFile::createBrushIndirect: invalid hatched brush " << arg << endl;
- style = Qt::SolidPattern;
+ style = TQt::SolidPattern;
}
}
else if ( arg>=0 && arg<9 )
@@ -969,7 +969,7 @@ void TQWinMetaFile::createBrushIndirect( long, short* parm )
else
{
kdDebug() << "TQWinMetaFile::createBrushIndirect: invalid brush " << arg << endl;
- style = Qt::SolidPattern;
+ style = TQt::SolidPattern;
}
handle->brush.setStyle( style );
handle->brush.setColor( color( parm+1 ) );
@@ -979,10 +979,10 @@ void TQWinMetaFile::createBrushIndirect( long, short* parm )
//-----------------------------------------------------------------------------
void TQWinMetaFile::createPenIndirect( long, short* parm )
{
- static Qt::PenStyle styleTab[] =
- { Qt::SolidLine, Qt::DashLine, Qt::DotLine, Qt::DashDotLine, Qt::DashDotDotLine,
- Qt::NoPen, Qt::SolidLine };
- Qt::PenStyle style;
+ static TQt::PenStyle styleTab[] =
+ { TQt::SolidLine, TQt::DashLine, TQt::DotLine, TQt::DashDotLine, TQt::DashDotDotLine,
+ TQt::NoPen, TQt::SolidLine };
+ TQt::PenStyle style;
WinObjPenHandle* handle = new WinObjPenHandle;
addHandle( handle );
@@ -990,12 +990,12 @@ void TQWinMetaFile::createPenIndirect( long, short* parm )
else
{
kdDebug() << "TQWinMetaFile::createPenIndirect: invalid pen " << parm[ 0 ] << endl;
- style = Qt::SolidLine;
+ style = TQt::SolidLine;
}
handle->pen.setStyle( style );
handle->pen.setColor( color( parm+3 ) );
- handle->pen.setCapStyle( Qt::RoundCap );
+ handle->pen.setCapStyle( TQt::RoundCap );
//int width = 0;
// TODO : width of pen proportional to device context width
diff --git a/ktnef/lib/ktnefmessage.cpp b/ktnef/lib/ktnefmessage.cpp
index 27f98606..320ce411 100644
--- a/ktnef/lib/ktnefmessage.cpp
+++ b/ktnef/lib/ktnefmessage.cpp
@@ -76,7 +76,7 @@ TQString KTNEFMessage::rtfString()
TQByteArray rtf;
TQBuffer input( prop.asByteArray() ), output( rtf );
if ( input.open( IO_ReadOnly ) && output.open( IO_WriteOnly ) )
- lzfu_decompress( &TQT_TQIODEVICE_OBJECT(input), &TQT_TQIODEVICE_OBJECT(output) );
+ lzfu_decompress( &input, &output );
return TQString( rtf );
}
}
diff --git a/ktnef/lib/ktnefparser.cpp b/ktnef/lib/ktnefparser.cpp
index 749cb948..26bc157f 100644
--- a/ktnef/lib/ktnefparser.cpp
+++ b/ktnef/lib/ktnefparser.cpp
@@ -447,7 +447,7 @@ bool KTNEFParser::openFile(const TQString& filename)
deleteDevice();
delete d->message_;
d->message_ = new KTNEFMessage();
- d->device_ = TQT_TQIODEVICE(new TQFile( filename ));
+ d->device_ = new TQFile( filename );
d->deleteDevice_ = true;
return parseDevice();
}
diff --git a/libemailfunctions/networkstatus.h b/libemailfunctions/networkstatus.h
index 0aee114e..d05adcef 100644
--- a/libemailfunctions/networkstatus.h
+++ b/libemailfunctions/networkstatus.h
@@ -34,7 +34,7 @@ namespace KPIM {
*/
class NetworkStatus : public TQObject, public DCOPObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index eeccff92..2c76832e 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -169,7 +169,7 @@ enum JournalSortField
class LIBKCAL_EXPORT Calendar : public TQObject, public CustomProperties,
public IncidenceBase::Observer
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libkcal/calendarresources.cpp b/libkcal/calendarresources.cpp
index bfc493ba..2787a89c 100644
--- a/libkcal/calendarresources.cpp
+++ b/libkcal/calendarresources.cpp
@@ -131,8 +131,8 @@ void CalendarResources::init( const TQString &family )
mDestinationPolicy = mStandardPolicy;
mPendingDeleteFromResourceMap = false;
- connect( this, TQT_SIGNAL(batchAddingBegins()), this, TQT_SLOT(beginAddingIncidences()) );
- connect( this, TQT_SIGNAL(batchAddingEnds()), this, TQT_SLOT(endAddingIncidences()) );
+ connect( this, TQ_SIGNAL(batchAddingBegins()), this, TQ_SLOT(beginAddingIncidences()) );
+ connect( this, TQ_SIGNAL(batchAddingEnds()), this, TQ_SLOT(endAddingIncidences()) );
}
CalendarResources::~CalendarResources()
@@ -756,17 +756,17 @@ Journal::List CalendarResources::rawJournalsForDate( const TQDate &date )
void CalendarResources::connectResource( ResourceCalendar *resource )
{
- connect( resource, TQT_SIGNAL( resourceChanged( ResourceCalendar * ) ),
- TQT_SIGNAL( calendarChanged() ) );
- connect( resource, TQT_SIGNAL( resourceSaved( ResourceCalendar * ) ),
- TQT_SIGNAL( calendarSaved() ) );
+ connect( resource, TQ_SIGNAL( resourceChanged( ResourceCalendar * ) ),
+ TQ_SIGNAL( calendarChanged() ) );
+ connect( resource, TQ_SIGNAL( resourceSaved( ResourceCalendar * ) ),
+ TQ_SIGNAL( calendarSaved() ) );
- connect( resource, TQT_SIGNAL( resourceLoadError( ResourceCalendar *,
+ connect( resource, TQ_SIGNAL( resourceLoadError( ResourceCalendar *,
const TQString & ) ),
- TQT_SLOT( slotLoadError( ResourceCalendar *, const TQString & ) ) );
- connect( resource, TQT_SIGNAL( resourceSaveError( ResourceCalendar *,
+ TQ_SLOT( slotLoadError( ResourceCalendar *, const TQString & ) ) );
+ connect( resource, TQ_SIGNAL( resourceSaveError( ResourceCalendar *,
const TQString & ) ),
- TQT_SLOT( slotSaveError( ResourceCalendar *, const TQString & ) ) );
+ TQ_SLOT( slotSaveError( ResourceCalendar *, const TQString & ) ) );
}
ResourceCalendar *CalendarResources::resource( Incidence *incidence )
diff --git a/libkcal/calendarresources.h b/libkcal/calendarresources.h
index bb756f85..20d5850c 100644
--- a/libkcal/calendarresources.h
+++ b/libkcal/calendarresources.h
@@ -65,7 +65,7 @@ class LIBKCAL_EXPORT CalendarResources :
public Calendar,
public KRES::ManagerObserver<ResourceCalendar>
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/libkcal/calhelper.cpp b/libkcal/calhelper.cpp
index 89a67fb3..b7816675 100644
--- a/libkcal/calhelper.cpp
+++ b/libkcal/calhelper.cpp
@@ -162,6 +162,6 @@ TQPair<ResourceCalendar *, TQString> CalHelper::incSubResourceCalendar( Calendar
if ( res && res->canHaveSubresources() ) {
subRes = res->subresourceIdentifier( incidence );
}
- p = tqMakePair( res, subRes );
+ p = qMakePair( res, subRes );
return p;
}
diff --git a/libkcal/calselectdialog.cpp b/libkcal/calselectdialog.cpp
index b72a1627..c2a7f897 100644
--- a/libkcal/calselectdialog.cpp
+++ b/libkcal/calselectdialog.cpp
@@ -65,10 +65,10 @@ CalSelectDialog::CalSelectDialog( const TQString &caption, const TQString &label
mListBox->ensureCurrentVisible();
layout->addWidget( mListBox, 10 );
- connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem *)),
- TQT_SLOT(slotOk()) );
- connect( mListBox, TQT_SIGNAL(returnPressed(TQListBoxItem *)),
- TQT_SLOT(slotOk()) );
+ connect( mListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem *)),
+ TQ_SLOT(slotOk()) );
+ connect( mListBox, TQ_SIGNAL(returnPressed(TQListBoxItem *)),
+ TQ_SLOT(slotOk()) );
mListBox->setFocus();
diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index e4296bce..d8fe62df 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -69,15 +69,6 @@ static void _dumpIcaltime( const icaltimetype& t)
}
*/
-static TQString quoteForParam( const TQString &text )
-{
- TQString tmp = text;
- tmp.remove( '"' );
- if ( tmp.contains( ';' ) || tmp.contains( ':' ) || tmp.contains( ',' ) )
- return tmp; // libical quotes in this case already, see icalparameter_as_ical_string()
- return TQString::fromLatin1( "\"" ) + tmp + TQString::fromLatin1( "\"" );
-}
-
const int gSecondsPerMinute = 60;
const int gSecondsPerHour = gSecondsPerMinute * 60;
const int gSecondsPerDay = gSecondsPerHour * 24;
@@ -576,7 +567,7 @@ icalproperty *ICalFormatImpl::writeOrganizer( const Person &organizer )
icalproperty *p = icalproperty_new_organizer("MAILTO:" + organizer.email().utf8());
if (!organizer.name().isEmpty()) {
- icalproperty_add_parameter( p, icalparameter_new_cn(quoteForParam(organizer.name()).utf8()) );
+ icalproperty_add_parameter( p, icalparameter_new_cn(organizer.name().utf8()) );
}
// TODO: Write dir, sent-by and language
@@ -589,7 +580,7 @@ icalproperty *ICalFormatImpl::writeAttendee(Attendee *attendee)
icalproperty *p = icalproperty_new_attendee("mailto:" + attendee->email().utf8());
if (!attendee->name().isEmpty()) {
- icalproperty_add_parameter(p,icalparameter_new_cn(quoteForParam(attendee->name()).utf8()));
+ icalproperty_add_parameter(p,icalparameter_new_cn(attendee->name().utf8()));
}
@@ -869,7 +860,7 @@ icalcomponent *ICalFormatImpl::writeAlarm(Alarm *alarm)
for (TQValueList<Person>::Iterator ad = addresses.begin(); ad != addresses.end(); ++ad) {
icalproperty *p = icalproperty_new_attendee("MAILTO:" + (*ad).email().utf8());
if (!(*ad).name().isEmpty()) {
- icalproperty_add_parameter(p,icalparameter_new_cn(quoteForParam((*ad).name()).utf8()));
+ icalproperty_add_parameter(p,icalparameter_new_cn((*ad).name().utf8()));
}
icalcomponent_add_property(a,p);
}
diff --git a/libkcal/incidenceformatter.cpp b/libkcal/incidenceformatter.cpp
index da3a7aae..785a681b 100644
--- a/libkcal/incidenceformatter.cpp
+++ b/libkcal/incidenceformatter.cpp
@@ -2837,7 +2837,7 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
ICalFormat calFormat;
Event* event = new Event();
- if( parser.openDevice( &TQT_TQIODEVICE_OBJECT(buf) ) ) {
+ if( parser.openDevice( &buf ) ) {
KTNEFMessage* tnefMsg = parser.message();
//TQMap<int,KTNEFProperty*> props = parser.message()->properties();
diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp
index 38110431..dcd161ce 100644
--- a/libkcal/resourcecached.cpp
+++ b/libkcal/resourcecached.cpp
@@ -55,8 +55,8 @@ ResourceCached::ResourceCached( const TDEConfig* config )
mSavePolicy( SaveNever ), mSaveInterval( 10 ),
mSaveTimer( 0, "mSaveTimer" ), mIdMapper( "kcal/uidmaps/" )
{
- connect( &mReloadTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotReload() ) );
- connect( &mSaveTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotSave() ) );
+ connect( &mReloadTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotReload() ) );
+ connect( &mSaveTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotSave() ) );
}
ResourceCached::~ResourceCached()
diff --git a/libkcal/resourcecached.h b/libkcal/resourcecached.h
index f890d265..6fc30a1c 100644
--- a/libkcal/resourcecached.h
+++ b/libkcal/resourcecached.h
@@ -45,7 +45,7 @@ namespace KCal {
class KDE_EXPORT ResourceCached : public ResourceCalendar,
public KCal::Calendar::Observer
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/libkcal/resourcecachedconfig.cpp b/libkcal/resourcecachedconfig.cpp
index ee43f711..6d6ada34 100644
--- a/libkcal/resourcecachedconfig.cpp
+++ b/libkcal/resourcecachedconfig.cpp
@@ -41,15 +41,15 @@ ResourceCachedReloadConfig::ResourceCachedReloadConfig( TQWidget *parent,
{
TQBoxLayout *topLayout = new TQVBoxLayout( this );
- mGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Automatic Reload"), this );
+ mGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Automatic Reload"), this );
topLayout->addWidget( mGroup );
new TQRadioButton( i18n("Never"), mGroup );
new TQRadioButton( i18n("On startup"), mGroup );
TQRadioButton *intervalRadio = new TQRadioButton( i18n("Regular interval"),
mGroup );
- connect( intervalRadio, TQT_SIGNAL( stateChanged( int ) ),
- TQT_SLOT( slotIntervalStateChanged( int ) ) );
+ connect( intervalRadio, TQ_SIGNAL( stateChanged( int ) ),
+ TQ_SLOT( slotIntervalStateChanged( int ) ) );
TQHBox *intervalBox = new TQHBox( mGroup );
new TQLabel( i18n("Interval in minutes"), intervalBox );
mIntervalSpin = new TQSpinBox( 1,900, 1,intervalBox );
@@ -81,15 +81,15 @@ ResourceCachedSaveConfig::ResourceCachedSaveConfig( TQWidget *parent,
{
TQBoxLayout *topLayout = new TQVBoxLayout( this );
- mGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Automatic Save"), this );
+ mGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Automatic Save"), this );
topLayout->addWidget( mGroup );
new TQRadioButton( i18n("Never"), mGroup );
new TQRadioButton( i18n("On exit"), mGroup );
TQRadioButton *intervalRadio = new TQRadioButton( i18n("Regular interval"),
mGroup );
- connect( intervalRadio, TQT_SIGNAL( stateChanged( int ) ),
- TQT_SLOT( slotIntervalStateChanged( int ) ) );
+ connect( intervalRadio, TQ_SIGNAL( stateChanged( int ) ),
+ TQ_SLOT( slotIntervalStateChanged( int ) ) );
TQHBox *intervalBox = new TQHBox( mGroup );
new TQLabel( i18n("Interval in minutes"), intervalBox );
mIntervalSpin = new TQSpinBox( 1,900, 1,intervalBox );
diff --git a/libkcal/resourcecachedconfig.h b/libkcal/resourcecachedconfig.h
index de63c2b6..81e4ee8e 100644
--- a/libkcal/resourcecachedconfig.h
+++ b/libkcal/resourcecachedconfig.h
@@ -38,7 +38,7 @@ class ResourceCached;
*/
class KDE_EXPORT ResourceCachedReloadConfig : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceCachedReloadConfig( TQWidget *parent = 0, const char *name = 0 );
@@ -65,7 +65,7 @@ class KDE_EXPORT ResourceCachedReloadConfig : public TQWidget
*/
class KDE_EXPORT ResourceCachedSaveConfig : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceCachedSaveConfig( TQWidget *parent = 0, const char *name = 0 );
diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h
index ebb6a8b9..e4c97b5c 100644
--- a/libkcal/resourcecalendar.h
+++ b/libkcal/resourcecalendar.h
@@ -56,7 +56,7 @@ class CalFormat;
*/
class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceCalendar( const TDEConfig * );
diff --git a/libkcal/resourcelocal.cpp b/libkcal/resourcelocal.cpp
index a193b0b7..7651daf5 100644
--- a/libkcal/resourcelocal.cpp
+++ b/libkcal/resourcelocal.cpp
@@ -111,12 +111,12 @@ void ResourceLocal::init()
setSavePolicy( SaveDelayed );
- connect( &mDirWatch, TQT_SIGNAL( dirty( const TQString & ) ),
- TQT_SLOT( reload() ) );
- connect( &mDirWatch, TQT_SIGNAL( created( const TQString & ) ),
- TQT_SLOT( reload() ) );
- connect( &mDirWatch, TQT_SIGNAL( deleted( const TQString & ) ),
- TQT_SLOT( reload() ) );
+ connect( &mDirWatch, TQ_SIGNAL( dirty( const TQString & ) ),
+ TQ_SLOT( reload() ) );
+ connect( &mDirWatch, TQ_SIGNAL( created( const TQString & ) ),
+ TQ_SLOT( reload() ) );
+ connect( &mDirWatch, TQ_SIGNAL( deleted( const TQString & ) ),
+ TQ_SLOT( reload() ) );
mLock = new TDEABC::Lock( mURL.path() );
diff --git a/libkcal/resourcelocal.h b/libkcal/resourcelocal.h
index 5b47d5ea..1ef4cf01 100644
--- a/libkcal/resourcelocal.h
+++ b/libkcal/resourcelocal.h
@@ -44,7 +44,7 @@ class CalFormat;
*/
class LIBKCAL_EXPORT ResourceLocal : public ResourceCached
{
- Q_OBJECT
+ TQ_OBJECT
friend class ResourceLocalConfig;
diff --git a/libkcal/resourcelocalconfig.cpp b/libkcal/resourcelocalconfig.cpp
index ccba0328..0999aaae 100644
--- a/libkcal/resourcelocalconfig.cpp
+++ b/libkcal/resourcelocalconfig.cpp
@@ -51,7 +51,7 @@ ResourceLocalConfig::ResourceLocalConfig( TQWidget* parent, const char* name )
mainLayout->addWidget( label, 1, 0 );
mainLayout->addWidget( mURL, 1, 1 );
- formatGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Calendar Format" ), this );
+ formatGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Calendar Format" ), this );
icalButton = new TQRadioButton( i18n("iCalendar"), formatGroup );
vcalButton = new TQRadioButton( i18n("vCalendar"), formatGroup );
diff --git a/libkcal/resourcelocalconfig.h b/libkcal/resourcelocalconfig.h
index d8b0c6c1..2bb732ee 100644
--- a/libkcal/resourcelocalconfig.h
+++ b/libkcal/resourcelocalconfig.h
@@ -41,7 +41,7 @@ namespace KCal {
*/
class LIBKCAL_EXPORT ResourceLocalConfig : public KRES::ConfigWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceLocalConfig( TQWidget* parent = 0, const char* name = 0 );
diff --git a/libkcal/resourcelocaldir.cpp b/libkcal/resourcelocaldir.cpp
index 33fa42f7..0c22cae5 100644
--- a/libkcal/resourcelocaldir.cpp
+++ b/libkcal/resourcelocaldir.cpp
@@ -92,12 +92,12 @@ void ResourceLocalDir::init()
setSavePolicy( SaveDelayed );
- connect( &mDirWatch, TQT_SIGNAL( dirty( const TQString & ) ),
- TQT_SLOT( reload( const TQString & ) ) );
- connect( &mDirWatch, TQT_SIGNAL( created( const TQString & ) ),
- TQT_SLOT( reload( const TQString & ) ) );
- connect( &mDirWatch, TQT_SIGNAL( deleted( const TQString & ) ),
- TQT_SLOT( reload( const TQString & ) ) );
+ connect( &mDirWatch, TQ_SIGNAL( dirty( const TQString & ) ),
+ TQ_SLOT( reload( const TQString & ) ) );
+ connect( &mDirWatch, TQ_SIGNAL( created( const TQString & ) ),
+ TQ_SLOT( reload( const TQString & ) ) );
+ connect( &mDirWatch, TQ_SIGNAL( deleted( const TQString & ) ),
+ TQ_SLOT( reload( const TQString & ) ) );
mLock = new TDEABC::Lock( mURL.path() );
diff --git a/libkcal/resourcelocaldir.h b/libkcal/resourcelocaldir.h
index 2f1bbec3..de7d35b2 100644
--- a/libkcal/resourcelocaldir.h
+++ b/libkcal/resourcelocaldir.h
@@ -44,7 +44,7 @@ class Incidence;
*/
class LIBKCAL_EXPORT ResourceLocalDir : public ResourceCached
{
- Q_OBJECT
+ TQ_OBJECT
friend class ResourceLocalDirConfig;
diff --git a/libkcal/resourcelocaldirconfig.h b/libkcal/resourcelocaldirconfig.h
index 46994ef4..a6538acd 100644
--- a/libkcal/resourcelocaldirconfig.h
+++ b/libkcal/resourcelocaldirconfig.h
@@ -43,7 +43,7 @@ namespace KCal {
*/
class LIBKCAL_EXPORT ResourceLocalDirConfig : public KRES::ConfigWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceLocalDirConfig( TQWidget *parent = 0, const char *name = 0 );
diff --git a/libkcal/tests/testresource.h b/libkcal/tests/testresource.h
index 4d17c7b4..8e5cb04c 100644
--- a/libkcal/tests/testresource.h
+++ b/libkcal/tests/testresource.h
@@ -28,7 +28,7 @@ namespace KCal {
class TestResource : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libkholidays/holidays/holiday_ua b/libkholidays/holidays/holiday_ua
index 6e836107..145464c4 100644
--- a/libkholidays/holidays/holiday_ua
+++ b/libkholidays/holidays/holiday_ua
@@ -1,118 +1,126 @@
:
: Ukrainian holiday file. Copy to ~/.holiday
:
-: Authors: Andriy Gapon <avg@icyb.net.ua>, April 2007.
+: Authors: Roman Savochenko <roman@oscada.org>, April 2022.
+: Andriy Gapon <avg@icyb.net.ua>, April 2007.
: Oleg Ivashchenko <ol_iva@i.ua>, October 2006.
:
: Official holidays
-small "Новий Рік" weekend on 1.1
-small "Різдво Христове" weekend on 7.1
-small "8 Березня - Міжнародний Жіночий День" weekend on 8.3
-small "Великдень" weekend on pascha
-small "1 Травня - День Праці" weekend on 1.5 length 2 days
-small "День Перемоги" weekend on 9.5
-small "Трійця" weekend on pascha plus 49 days
-small "День Конституції України" weekend on 28.6
-small "День Незалежності України" weekend on 24.8
+small "Новий Рік" weekend on 1.3
+small "День Пам'яті жертв геноциду PERuSSIAN — Пурім" weekend on 8.3
+small "Великдень" weekend on 21.3
+small "День Пам'яті жертв геноциду 'хрещення русі'" weekend on pascha
+small "День Пам'яті жертв війн дЖИДаІВ" weekend on 8.5
+small "Купайла" weekend on 21.6
+:small "День Конституції України" weekend on 28.6
+:small "День Незалежності України" weekend on 24.8
+small "Весілля Свічки" weekend on 21.9
+small "День Пам'яті жертв геноциду юдокомуни — колективізація-голод, репресії, індустріалізація-голод, лендліз-голод" weekend on 7.11
+:small "Різдво" weekend on 25.12
+small "Рідздво" weekend on 21.12
: Other holidays
-blue "Хрещення" on 19.1
blue "День соборності України" on 22.1
-blue "День пам’яті Крутів" on 29.1
-blue "День працівників пожежної охорони" on 29.1
-blue "День вшанування учасників бойових дій на території інших держав" on 15.2
-blue "День захисника Вітчизни" on 23.2
-blue "День землевпорядника" on second saturday in march
-blue "День працівників житлово-комунального господарства і побутового обслуговування населення" on third sunday in march
-blue "Всеукраїнський день працівників культури та аматорів народного мистецтва" on 23.3
-blue "Всеукраїнський день боротьби із захворюванням на туберкульоз" on 24.3
-blue "День Служби безпеки України" on 25.3
-blue "День внутрішніх військ Міністерства внутрішніх справ України" on 26.3
-blue "День геолога" on first sunday in april
-blue "День працівників ракетно-космічної галузі України" on 12.4
-blue "День пам'яток історії та культури" on 18.4
-blue "День довкілля" on third saturday in april
-blue "День охорони праці" on 28.4
-blue "День матері" on second sunday in may
-blue "День банківських працівників" on 20.5
-blue "День науки" on third saturday in may
-blue "День Європи" on third saturday in may
-blue "День працівників видавництв, поліграфії і книгорозповсюдження" on last saturday in may
-blue "День хіміка" on last sunday in may
-blue "Міжнародний день миротворців Організації Об'єднаних Націй" on 29.5
-blue "День слов'янської писемності і культури" 24.5
-blue "День прикордонника" on 28.5
-blue "День захисту дітей" on 1.6
-blue "День журналіста" on 6.6
-blue "День працівників місцевої промисловості" on first sunday in june
-blue "День працівників водного господарства" on first sunday in june
-blue "День працівників легкої промисловості" on second sunday in june
-blue "День медичного працівника" on third sunday in june
-blue "День скорботи і вшанування пам'яті жертв війни в Україні" on 22.6
-blue "День державної служби" on 23.6
-blue "День митної служби України" on 25.6
-blue "День молоді" on last sunday in june
-blue "День архітектури України" on 1.7
-blue "День працівника державної податкової служби України" on 2.7
-blue "День Військ Протиповітряної оборони" on first sunday in july
-blue "День Військово-Морських Сил" on first sunday in july
-blue "День працівників морського та річкового флоту" on first sunday in july
-blue "День рибалки" on second sunday in july
-blue "День бухгалтера" on 16.7
-blue "День працівників металургійної та гірничодобувної промисловості" on third sunday in july
-blue "День працівників торгівлі" on last sunday in july
-blue "День аеромобільних військ" on 2.8
-blue "День військ зв'язку" on 8.8
-blue "День будівельника" on second sunday in august
-blue "День працівників ветеринарної медицини" on second sunday in august
-blue "День пасічника" on 19.8
-blue "День Державного Прапора України" on 23.8
-blue "День авіації" on last saturday in august
-blue "День шахтаря" on last sunday in august
-blue "День підприємця" on first sunday in september
-blue "День фізичної культури і спорту" on second saturday in september
-blue "День танкістів" on second sunday in september
-blue "День працівників нафтової, газової та нафтопереробної промисловості" on second sunday in september
-blue "День українського кіно" on second saturday in september
-blue "День працівників цивільного захисту" on 17.9
+blue "День Пам’яті жертв Крутів" on 29.1
+:blue "День працівників пожежної охорони" on 29.1
+blue "Колодій" on 14.2
+blue "День Пам’яті жертв Революції Гідності" on 20.2
+:blue "День Рідної Мови" on 21.2
+:blue "День землевпорядника" on second saturday in march
+:blue "День працівників житлово-комунального господарства і побутового обслуговування населення" on third sunday in march
+blue "День народження Шевченка Тараса Григоровича" on 10.3
+blue "День добровольної жертви окупації" on 14.3
+:blue "Всеукраїнський день працівників культури та аматорів народного мистецтва" on 23.3
+:blue "Всеукраїнський день боротьби із захворюванням на туберкульоз" on 24.3
+:blue "День Служби безпеки України" on 25.3
+:blue "День внутрішніх військ Міністерства внутрішніх справ України" on 26.3
+:blue "День геолога" on first sunday in april
+:blue "День працівників ракетно-космічної галузі України" on 12.4
+:blue "День пам'яток історії та культури" on 18.4
+:blue "День довкілля" on third saturday in april
+:blue "День охорони праці" on 28.4
+:blue "День матері" on second sunday in may
+blue "Русалій" on 15.5
+:blue "День банківських працівників" on 20.5
+:blue "День науки" on third saturday in may
+:blue "День Європи" on third saturday in may
+:blue "День працівників видавництв, поліграфії і книгорозповсюдження" on last saturday in may
+:blue "День хіміка" on last sunday in may
+blue "День ХЕРоїв 1000-річної окупації" on 23.5
+:blue "День слов'янської писемності і культури" 24.5
+:blue "День прикордонника" on 28.5
+:blue "Міжнародний день миротворців Організації Об'єднаних Націй" on 29.5
+:blue "День захисту дітей" on 1.6
+:blue "День журналіста" on 6.6
+:blue "День працівників місцевої промисловості" on first sunday in june
+:blue "День працівників водного господарства" on first sunday in june
+:blue "День працівників легкої промисловості" on second sunday in june
+:blue "День медичного працівника" on third sunday in june
+:blue "День скорботи і вшанування пам'яті жертв війни в Україні" on 22.6
+:blue "День державної служби" on 23.6
+:blue "День митної служби України" on 25.6
+:blue "День молоді" on last sunday in june
+:blue "День архітектури України" on 1.7
+:blue "День працівника державної податкової служби України" on 2.7
+:blue "День Військ Протиповітряної оборони" on first sunday in july
+:blue "День Військово-Морських Сил" on first sunday in july
+:blue "День працівників морського та річкового флоту" on first sunday in july
+:blue "День рибалки" on second sunday in july
+:blue "День бухгалтера" on 16.7
+:blue "День працівників металургійної та гірничодобувної промисловості" on third sunday in july
+:blue "День працівників торгівлі" on last sunday in july
+:blue "День аеромобільних військ" on 2.8
+:blue "День військ зв'язку" on 8.8
+:blue "День будівельника" on second sunday in august
+:blue "День працівників ветеринарної медицини" on second sunday in august
+blue "Спаса" on 14.8
+:blue "День пасічника" on 19.8
+:blue "День Державного Прапора України" on 23.8
+:blue "День авіації" on last saturday in august
+:blue "День шахтаря" on last sunday in august
+:blue "День підприємця" on first sunday in september
+:blue "День фізичної культури і спорту" on second saturday in september
+:blue "День танкістів" on second sunday in september
+:blue "День працівників нафтової, газової та нафтопереробної промисловості" on second sunday in september
+:blue "День українського кіно" on second saturday in september
+:blue "День працівників цивільного захисту" on 17.9
blue "День миру" on 21.9
-blue "День партизанської слави" on 22.9
-blue "День фармацевтичного працівника" on third saturday in september
-blue "День винахідника і раціоналізатора" on third saturday in september
-blue "День працівника лісу" on third sunday in september
-blue "День машинобудівника" on fourth sunday in september
-blue "День туризму" on 27.9
-blue "Всеукраїнський день бібліотек" on 30.9
-blue "День працівників освіти" on first sunday in october
-blue "День юриста" on 8.10
-blue "День працівників стандартизації та метрології" on 10.10
-blue "День працівників державної санітарно-епідеміологічної служби" on second sunday in october
-blue "День художника" on second sunday in october
-blue "День Українського козацтва" on 14.10
-blue "День працівників харчової промисловості" on third sunday in october
-blue "День автомобіліста і дорожника" on last sunday in october
-blue "День інженерних військ" on 3.11
-blue "День ракетних військ і артилерії" on 3.11
-blue "День залізничника" on 4.11
-blue "День працівника соціальної сфери" on first sunday in november
-blue "День української писемності та мови" on 9.11
-blue "День працівників радіо, телебачення та зв'язку" on 16.11
-blue "День студента" on 17.11
-blue "День працівників гідрометеорологічної служби" on 19.11
-blue "День скловиробника" on 19.11
-blue "День Свободи" on 22.11
-blue "День працівників сільського господарства" on third sunday in november
+:blue "День фармацевтичного працівника" on third saturday in september
+:blue "День винахідника і раціоналізатора" on third saturday in september
+:blue "День працівника лісу" on third sunday in september
+:blue "День машинобудівника" on fourth sunday in september
+:blue "День туризму" on 27.9
+:blue "Всеукраїнський день бібліотек" on 30.9
+:blue "День працівників освіти" on first sunday in october
+:blue "День юриста" on 8.10
+:blue "День працівників стандартизації та метрології" on 10.10
+:blue "День працівників державної санітарно-епідеміологічної служби" on second sunday in october
+:blue "День художника" on second sunday in october
+blue "День ХОСеАРА-козака — 'Велікаго' СеАРського ХЕРоїчно SLAVEного бика-головоріза та покрови юдобогородиці" on 14.10
+:blue "День працівників харчової промисловості" on third sunday in october
+:blue "День автомобіліста і дорожника" on last sunday in october
+:blue "День інженерних військ" on 3.11
+:blue "День ракетних військ і артилерії" on 3.11
+:blue "День залізничника" on 4.11
+:blue "День працівника соціальної сфери" on first sunday in november
+:blue "День української писемності та мови" on 9.11
+blue "Доля (Діди)" on 15.11
+:blue "День працівників радіо, телебачення та зв'язку" on 16.11
+:blue "День студента" on 17.11
+:blue "День працівників гідрометеорологічної служби" on 19.11
+:blue "День скловиробника" on 19.11
+:blue "День Свободи" on 22.11
+:blue "День працівників сільського господарства" on third sunday in november
blue "День пам'яті жертв голодоморів та політичних репресій" on fourth saturday in november
-blue "День працівників прокуратури" on 1.12
-blue "День працівників статистики" on 5.12
-blue "День Збройних Сил України" on 6.12
-blue "День місцевого самоврядування" on 7.12
-blue "День Сухопутних військ України" on 12.12
-blue "День вшанування учасників ліквідації наслідків аварії на Чорнобильській АЕС" on 14.12
-blue "День працівників суду" on 15.12
-blue "День адвокатури" on 19.12
-blue "День міліції" on 20.12
-blue "День працівників дипломатичної служби" on 22.12
-blue "День енергетика" on 22.12
-blue "День працівників архівних установ" on 24.12
+:blue "День працівників прокуратури" on 1.12
+:blue "День працівників статистики" on 5.12
+:blue "День Збройних Сил України" on 6.12
+:blue "День місцевого самоврядування" on 7.12
+:blue "День Сухопутних військ України" on 12.12
+:blue "День вшанування учасників ліквідації наслідків аварії на Чорнобильській АЕС" on 14.12
+:blue "День працівників суду" on 15.12
+:blue "День адвокатури" on 19.12
+:blue "День працівників дипломатичної служби" on 22.12
+:blue "День енергетика" on 22.12
+:blue "День працівників архівних установ" on 24.12
diff --git a/libkmime/kmime_header_parsing.cpp b/libkmime/kmime_header_parsing.cpp
index 1e900702..aa3d29b7 100644
--- a/libkmime/kmime_header_parsing.cpp
+++ b/libkmime/kmime_header_parsing.cpp
@@ -1104,7 +1104,7 @@ bool parseParameter( const char* & scursor, const char * const send,
"Chopping away \"*\"." << endl;
maybeAttribute.truncate( maybeAttribute.length() - 1 );
}
- result = tqMakePair( maybeAttribute.lower(), TQStringOrTQPair() );
+ result = qMakePair( maybeAttribute.lower(), TQStringOrTQPair() );
return true;
}
@@ -1128,19 +1128,19 @@ bool parseParameter( const char* & scursor, const char * const send,
if ( !parseGenericQuotedString( scursor, send, maybeValue.qstring, isCRLF ) ) {
scursor = oldscursor;
- result = tqMakePair( maybeAttribute.lower(), TQStringOrTQPair() );
+ result = qMakePair( maybeAttribute.lower(), TQStringOrTQPair() );
return false; // this case needs further processing by upper layers!!
}
} else {
// value is a token:
if ( !parseToken( scursor, send, maybeValue.qpair, false /* no 8bit */ ) ) {
scursor = oldscursor;
- result = tqMakePair( maybeAttribute.lower(), TQStringOrTQPair() );
+ result = qMakePair( maybeAttribute.lower(), TQStringOrTQPair() );
return false; // this case needs further processing by upper layers!!
}
}
- result = tqMakePair( maybeAttribute.lower(), maybeValue );
+ result = qMakePair( maybeAttribute.lower(), maybeValue );
return true;
}
diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp
index 3ad786ab..cb870d73 100644
--- a/libkpgp/kpgpui.cpp
+++ b/libkpgp/kpgpui.cpp
@@ -82,7 +82,7 @@ PassphraseDialog::PassphraseDialog( TQWidget *parent,
lineedit->setEchoMode(TQLineEdit::Password);
lineedit->setMinimumWidth( fontMetrics().maxWidth()*20 );
lineedit->setFocus();
- connect( lineedit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotOk()) );
+ connect( lineedit, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotOk()) );
vlay->addWidget( label );
vlay->addWidget( lineedit );
@@ -146,8 +146,8 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt )
<< i18n("Do not use any encryption tool") );
label->setBuddy( toolCombo );
hbox->setStretchFactor( toolCombo, 1 );
- connect( toolCombo, TQT_SIGNAL( activated( int ) ),
- this, TQT_SIGNAL( changed( void ) ) );
+ connect( toolCombo, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SIGNAL( changed( void ) ) );
// This is the place to add a KURLRequester to be used for asking
// the user for the path to the executable...
topLayout->addWidget( group );
@@ -156,8 +156,8 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt )
mpOptionsGroupBox->layout()->setSpacing( KDialog::spacingHint() );
storePass = new TQCheckBox( i18n("&Keep passphrase in memory"),
mpOptionsGroupBox );
- connect( storePass, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SIGNAL( changed( void ) ) );
+ connect( storePass, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SIGNAL( changed( void ) ) );
msg = i18n( "<qt><p>When this option is enabled, the passphrase of your "
"private key will be remembered by the application as long "
"as the application is running. Thus you will only have to "
@@ -173,8 +173,8 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt )
if( encrypt ) {
encToSelf = new TQCheckBox( i18n("Always encr&ypt to self"),
mpOptionsGroupBox );
- connect( encToSelf, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SIGNAL( changed( void ) ) );
+ connect( encToSelf, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SIGNAL( changed( void ) ) );
msg = i18n( "<qt><p>When this option is enabled, the message/file "
"will not only be encrypted with the receiver's public key, "
@@ -188,8 +188,8 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt )
showCipherText = new TQCheckBox( i18n("&Show signed/encrypted text after "
"composing"),
mpOptionsGroupBox );
- connect( showCipherText, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SIGNAL( changed( void ) ) );
+ connect( showCipherText, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SIGNAL( changed( void ) ) );
msg = i18n( "<qt><p>When this option is enabled, the signed/encrypted text "
"will be shown in a separate window, enabling you to know how "
@@ -200,8 +200,8 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt )
showKeyApprovalDlg = new TQCheckBox( i18n("Always show the encryption "
"keys &for approval"),
mpOptionsGroupBox );
- connect( showKeyApprovalDlg, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SIGNAL( changed( void ) ) );
+ connect( showKeyApprovalDlg, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SIGNAL( changed( void ) ) );
msg = i18n( "<qt><p>When this option is enabled, the application will "
"always show you a list of public keys from which you can "
"choose the one it will use for encryption. If it is off, "
@@ -328,9 +328,9 @@ KeySelectionDialog::KeySelectionDialog( const KeyList& keyList,
hlay->addWidget( le, 1 );
le->setFocus();
- connect( le, TQT_SIGNAL(textChanged(const TQString&)),
- this, TQT_SLOT(slotSearch(const TQString&)) );
- connect( mStartSearchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotFilter()) );
+ connect( le, TQ_SIGNAL(textChanged(const TQString&)),
+ this, TQ_SLOT(slotSearch(const TQString&)) );
+ connect( mStartSearchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotFilter()) );
mListView = new TDEListView( page );
mListView->addColumn( i18n("Key ID") );
@@ -373,24 +373,24 @@ KeySelectionDialog::KeySelectionDialog( const KeyList& keyList,
mListView->center( mListView->contentsX(), mListView->itemPos( lvi ) );
if( extendedSelection ) {
- connect( mCheckSelectionTimer, TQT_SIGNAL( timeout() ),
- this, TQT_SLOT( slotCheckSelection() ) );
- connect( mListView, TQT_SIGNAL( selectionChanged() ),
- this, TQT_SLOT( slotSelectionChanged() ) );
+ connect( mCheckSelectionTimer, TQ_SIGNAL( timeout() ),
+ this, TQ_SLOT( slotCheckSelection() ) );
+ connect( mListView, TQ_SIGNAL( selectionChanged() ),
+ this, TQ_SLOT( slotSelectionChanged() ) );
}
else {
- connect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ),
- this, TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) );
+ connect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ),
+ this, TQ_SLOT( slotSelectionChanged( TQListViewItem* ) ) );
}
- connect( mListView, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( accept() ) );
+ connect( mListView, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), this, TQ_SLOT( accept() ) );
- connect( mListView, TQT_SIGNAL( contextMenuRequested( TQListViewItem*,
+ connect( mListView, TQ_SIGNAL( contextMenuRequested( TQListViewItem*,
const TQPoint&, int ) ),
- this, TQT_SLOT( slotRMB( TQListViewItem*, const TQPoint&, int ) ) );
+ this, TQ_SLOT( slotRMB( TQListViewItem*, const TQPoint&, int ) ) );
setButtonText( KDialogBase::Default, i18n("&Reread Keys") );
- connect( this, TQT_SIGNAL( defaultClicked() ),
- this, TQT_SLOT( slotRereadKeys() ) );
+ connect( this, TQ_SIGNAL( defaultClicked() ),
+ this, TQ_SLOT( slotRereadKeys() ) );
}
@@ -823,25 +823,25 @@ void KeySelectionDialog::slotRereadKeys()
int offsetY = mListView->contentsY();
if( mListView->isMultiSelection() ) {
- disconnect( mListView, TQT_SIGNAL( selectionChanged() ),
- this, TQT_SLOT( slotSelectionChanged() ) );
+ disconnect( mListView, TQ_SIGNAL( selectionChanged() ),
+ this, TQ_SLOT( slotSelectionChanged() ) );
}
else {
- disconnect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ),
- this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) );
+ disconnect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ),
+ this, TQ_SLOT( slotSelectionChanged( TQListViewItem * ) ) );
}
initKeylist( keys, KeyIDList( mKeyIds ) );
slotFilter();
if( mListView->isMultiSelection() ) {
- connect( mListView, TQT_SIGNAL( selectionChanged() ),
- this, TQT_SLOT( slotSelectionChanged() ) );
+ connect( mListView, TQ_SIGNAL( selectionChanged() ),
+ this, TQ_SLOT( slotSelectionChanged() ) );
slotSelectionChanged();
}
else {
- connect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ),
- this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) );
+ connect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ),
+ this, TQ_SLOT( slotSelectionChanged( TQListViewItem * ) ) );
}
// restore the saved position of the contents
@@ -886,8 +886,8 @@ void KeySelectionDialog::slotCheckSelection( TQListViewItem* plvi /* = 0 */ )
// As we might change the selection, we have to disconnect the slot
// to prevent recursion
- disconnect( mListView, TQT_SIGNAL( selectionChanged() ),
- this, TQT_SLOT( slotSelectionChanged() ) );
+ disconnect( mListView, TQ_SIGNAL( selectionChanged() ),
+ this, TQ_SLOT( slotSelectionChanged() ) );
KeyIDList newKeyIdList;
TQValueList<TQListViewItem*> keysToBeChecked;
@@ -989,8 +989,8 @@ void KeySelectionDialog::slotCheckSelection( TQListViewItem* plvi /* = 0 */ )
}
enableButtonOK( keysAllowed );
- connect( mListView, TQT_SIGNAL( selectionChanged() ),
- this, TQT_SLOT( slotSelectionChanged() ) );
+ connect( mListView, TQ_SIGNAL( selectionChanged() ),
+ this, TQ_SLOT( slotSelectionChanged() ) );
}
}
@@ -1037,7 +1037,7 @@ void KeySelectionDialog::slotRMB( TQListViewItem* lvi, const TQPoint& pos, int )
mCurrentContextMenuItem = lvi;
TQPopupMenu menu(this);
- menu.insertItem( i18n( "Recheck Key" ), this, TQT_SLOT( slotRecheckKey() ) );
+ menu.insertItem( i18n( "Recheck Key" ), this, TQ_SLOT( slotRecheckKey() ) );
menu.exec( pos );
}
@@ -1189,8 +1189,8 @@ KeyRequester::KeyRequester( TQWidget * parent, bool multipleKeys,
hlay->addWidget( mEraseButton );
hlay->addWidget( mDialogButton );
- connect( mEraseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEraseButtonClicked()) );
- connect( mDialogButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDialogButtonClicked()) );
+ connect( mEraseButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEraseButtonClicked()) );
+ connect( mDialogButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotDialogButtonClicked()) );
setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
TQSizePolicy::Fixed ) );
@@ -1383,7 +1383,7 @@ KeyApprovalDialog::KeyApprovalDialog( const TQStringList& addresses,
//hbox->setStretchFactor( keyidLB, 10 );
//mKeyIdListBoxes.insert( 0, keyidLB );
- new KSeparator( Qt::Horizontal, bigvbox );
+ new KSeparator( TQt::Horizontal, bigvbox );
}
else {
mEncryptToSelf = 0;
@@ -1402,7 +1402,7 @@ KeyApprovalDialog::KeyApprovalDialog( const TQStringList& addresses,
++kit; // skip the sender's key id
}
else {
- new KSeparator( Qt::Horizontal, bigvbox );
+ new KSeparator( TQt::Horizontal, bigvbox );
}
TQHBox *hbox = new TQHBox( bigvbox );
@@ -1470,12 +1470,12 @@ KeyApprovalDialog::KeyApprovalDialog( const TQStringList& addresses,
default:
encrPrefCombo->setCurrentItem( 0 );
}
- connect( encrPrefCombo, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotPrefsChanged(int)) );
+ connect( encrPrefCombo, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotPrefsChanged(int)) );
mEncrPrefCombos.insert( i, encrPrefCombo );
}
- connect( mChangeButtonGroup, TQT_SIGNAL(clicked(int)),
- this, TQT_SLOT(slotChangeEncryptionKey(int)) );
+ connect( mChangeButtonGroup, TQ_SIGNAL(clicked(int)),
+ this, TQ_SLOT(slotChangeEncryptionKey(int)) );
// calculate the optimal width for the dialog
int dialogWidth = marginHint()
diff --git a/libkpgp/kpgpui.h b/libkpgp/kpgpui.h
index 2b05911e..dacfe41b 100644
--- a/libkpgp/kpgpui.h
+++ b/libkpgp/kpgpui.h
@@ -54,7 +54,7 @@ class KeyIDList; // needed by KeySelectionDialog
/** the passphrase dialog */
class KDE_EXPORT PassphraseDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -75,7 +75,7 @@ class KDE_EXPORT PassphraseDialog : public KDialogBase
button mechanism. */
class KDE_EXPORT Config : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -103,7 +103,7 @@ class KDE_EXPORT Config : public TQWidget
#define KeySelectionDialogSuper KDialogBase
class KDE_EXPORT KeySelectionDialog: public KeySelectionDialogSuper
{
- Q_OBJECT
+ TQ_OBJECT
enum TrustCheckMode { NoExpensiveTrustCheck,
@@ -203,7 +203,7 @@ class KDE_EXPORT KeySelectionDialog: public KeySelectionDialogSuper
class KDE_EXPORT KeyRequester: public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -255,7 +255,7 @@ protected:
class KDE_EXPORT PublicKeyRequester : public KeyRequester {
- Q_OBJECT
+ TQ_OBJECT
public:
PublicKeyRequester( TQWidget * parent=0, bool multipleKeys=false,
@@ -275,7 +275,7 @@ protected:
class KDE_EXPORT SecretKeyRequester : public KeyRequester {
- Q_OBJECT
+ TQ_OBJECT
public:
SecretKeyRequester( TQWidget * parent=0, bool multipleKeys=false,
@@ -297,7 +297,7 @@ protected:
// -------------------------------------------------------------------------
class KDE_EXPORT KeyApprovalDialog: public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -333,7 +333,7 @@ class KDE_EXPORT KeyApprovalDialog: public KDialogBase
// -------------------------------------------------------------------------
class KDE_EXPORT CipherTextDialog: public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libkpimexchange/core/README.download b/libkpimexchange/core/README.download
index 07540db8..34f3c528 100644
--- a/libkpimexchange/core/README.download
+++ b/libkpimexchange/core/README.download
@@ -10,12 +10,12 @@ NOTES:
It uses internal state member variables and such.
DATA STRUCTURES:
-QMap<QString,int> m_uids is in fact a set of known uids telling us
+QMap<TQString,int> m_uids is in fact a set of known uids telling us
whether we're already busy or finished reading the Master event
for this UID. The map contains the UID as key, with a value of 1,
if UID is either being or finished downloading.
-QMap<QString,DwString *> m_transferJobs maps URLs being downloaded
+QMap<TQString,DwString *> m_transferJobs maps URLs being downloaded
to strings of data already received. A URL is removed from the map
if all data has been received
diff --git a/libkpimexchange/core/exchangeaccount.cpp b/libkpimexchange/core/exchangeaccount.cpp
index a033b6b0..9c801328 100644
--- a/libkpimexchange/core/exchangeaccount.cpp
+++ b/libkpimexchange/core/exchangeaccount.cpp
@@ -239,8 +239,8 @@ void ExchangeAccount::calcFolderURLs()
TDEIO::DavJob* job = TDEIO::davPropFind( baseURL(), doc, "1", false );
job->addMetaData( "errorPage", "false" );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotFolderResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotFolderResult( TDEIO::Job * ) ) );
}
void ExchangeAccount::slotFolderResult( TDEIO::Job *job )
diff --git a/libkpimexchange/core/exchangeaccount.h b/libkpimexchange/core/exchangeaccount.h
index 9cd0f576..032594be 100644
--- a/libkpimexchange/core/exchangeaccount.h
+++ b/libkpimexchange/core/exchangeaccount.h
@@ -34,7 +34,7 @@ namespace KPIM {
class KDE_EXPORT ExchangeAccount : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
ExchangeAccount( const TQString &host, const TQString &port,
diff --git a/libkpimexchange/core/exchangeclient.cpp b/libkpimexchange/core/exchangeclient.cpp
index 5658c707..c3fdd380 100644
--- a/libkpimexchange/core/exchangeclient.cpp
+++ b/libkpimexchange/core/exchangeclient.cpp
@@ -131,8 +131,8 @@ void ExchangeClient::download( KCal::Calendar *calendar, const TQDate &start,
ExchangeDownload *worker = new ExchangeDownload( mAccount, mWindow );
worker->download( calendar, start, end, showProgress );
connect( worker,
- TQT_SIGNAL( finished( ExchangeDownload *, int, const TQString & ) ),
- TQT_SLOT( slotDownloadFinished( ExchangeDownload *, int,
+ TQ_SIGNAL( finished( ExchangeDownload *, int, const TQString & ) ),
+ TQ_SLOT( slotDownloadFinished( ExchangeDownload *, int,
const TQString & ) ) );
}
@@ -149,11 +149,11 @@ void ExchangeClient::download( const TQDate &start, const TQDate &end,
ExchangeDownload *worker = new ExchangeDownload( mAccount, mWindow );
worker->download( start, end, showProgress );
connect( worker,
- TQT_SIGNAL( finished( ExchangeDownload *, int, const TQString & ) ),
- TQT_SLOT( slotDownloadFinished( ExchangeDownload *, int,
+ TQ_SIGNAL( finished( ExchangeDownload *, int, const TQString & ) ),
+ TQ_SLOT( slotDownloadFinished( ExchangeDownload *, int,
const TQString & ) ) );
- connect( worker, TQT_SIGNAL( gotEvent( KCal::Event *, const KURL & ) ),
- TQT_SIGNAL( event( KCal::Event *, const KURL & ) ) );
+ connect( worker, TQ_SIGNAL( gotEvent( KCal::Event *, const KURL & ) ),
+ TQ_SIGNAL( event( KCal::Event *, const KURL & ) ) );
}
void ExchangeClient::upload( KCal::Event *event )
@@ -167,8 +167,8 @@ void ExchangeClient::upload( KCal::Event *event )
ExchangeUpload *worker = new ExchangeUpload( event, mAccount, mTimeZoneId,
mWindow );
- connect( worker, TQT_SIGNAL( finished( ExchangeUpload *, int, const TQString & ) ),
- TQT_SLOT( slotUploadFinished( ExchangeUpload *, int, const TQString & ) ) );
+ connect( worker, TQ_SIGNAL( finished( ExchangeUpload *, int, const TQString & ) ),
+ TQ_SLOT( slotUploadFinished( ExchangeUpload *, int, const TQString & ) ) );
}
void ExchangeClient::remove( KCal::Event *event )
@@ -179,8 +179,8 @@ void ExchangeClient::remove( KCal::Event *event )
}
ExchangeDelete *worker = new ExchangeDelete( event, mAccount, mWindow );
- connect( worker, TQT_SIGNAL( finished( ExchangeDelete *, int, const TQString & ) ),
- TQT_SLOT( slotRemoveFinished( ExchangeDelete *, int, const TQString & ) ) );
+ connect( worker, TQ_SIGNAL( finished( ExchangeDelete *, int, const TQString & ) ),
+ TQ_SLOT( slotRemoveFinished( ExchangeDelete *, int, const TQString & ) ) );
}
void ExchangeClient::slotDownloadFinished( ExchangeDownload *worker,
@@ -217,8 +217,8 @@ int ExchangeClient::downloadSynchronous( KCal::Calendar *calendar,
kdDebug() << "ExchangeClient::downloadSynchronous()" << endl;
mClientState = WaitingForResult;
- connect( this, TQT_SIGNAL( downloadFinished( int, const TQString & ) ),
- TQT_SLOT( slotSyncFinished( int, const TQString & ) ) );
+ connect( this, TQ_SIGNAL( downloadFinished( int, const TQString & ) ),
+ TQ_SLOT( slotSyncFinished( int, const TQString & ) ) );
download( calendar, start, end, showProgress );
@@ -230,8 +230,8 @@ int ExchangeClient::downloadSynchronous( KCal::Calendar *calendar,
} while ( mClientState == WaitingForResult );
TQApplication::restoreOverrideCursor();
- disconnect( this, TQT_SIGNAL( downloadFinished( int, const TQString & ) ),
- this, TQT_SLOT( slotSyncFinished( int, const TQString & ) ) );
+ disconnect( this, TQ_SIGNAL( downloadFinished( int, const TQString & ) ),
+ this, TQ_SLOT( slotSyncFinished( int, const TQString & ) ) );
return mSyncResult;
}
@@ -239,8 +239,8 @@ int ExchangeClient::downloadSynchronous( KCal::Calendar *calendar,
int ExchangeClient::uploadSynchronous( KCal::Event* event )
{
mClientState = WaitingForResult;
- connect( this, TQT_SIGNAL( uploadFinished( int, const TQString & ) ),
- TQT_SLOT( slotSyncFinished( int, const TQString & ) ) );
+ connect( this, TQ_SIGNAL( uploadFinished( int, const TQString & ) ),
+ TQ_SLOT( slotSyncFinished( int, const TQString & ) ) );
upload( event );
@@ -250,16 +250,16 @@ int ExchangeClient::uploadSynchronous( KCal::Event* event )
tqApp->processEvents();
} while ( mClientState == WaitingForResult );
TQApplication::restoreOverrideCursor();
- disconnect( this, TQT_SIGNAL( uploadFinished( int, const TQString & ) ),
- this, TQT_SLOT( slotSyncFinished( int, const TQString & ) ) );
+ disconnect( this, TQ_SIGNAL( uploadFinished( int, const TQString & ) ),
+ this, TQ_SLOT( slotSyncFinished( int, const TQString & ) ) );
return mSyncResult;
}
int ExchangeClient::removeSynchronous( KCal::Event* event )
{
mClientState = WaitingForResult;
- connect( this, TQT_SIGNAL( removeFinished( int, const TQString & ) ),
- TQT_SLOT( slotSyncFinished( int, const TQString & ) ) );
+ connect( this, TQ_SIGNAL( removeFinished( int, const TQString & ) ),
+ TQ_SLOT( slotSyncFinished( int, const TQString & ) ) );
remove( event );
@@ -269,8 +269,8 @@ int ExchangeClient::removeSynchronous( KCal::Event* event )
tqApp->processEvents();
} while ( mClientState == WaitingForResult );
TQApplication::restoreOverrideCursor();
- disconnect( this, TQT_SIGNAL( removeFinished( int, const TQString & ) ),
- this, TQT_SLOT( slotSyncFinished( int, const TQString & ) ) );
+ disconnect( this, TQ_SIGNAL( removeFinished( int, const TQString & ) ),
+ this, TQ_SLOT( slotSyncFinished( int, const TQString & ) ) );
return mSyncResult;
}
diff --git a/libkpimexchange/core/exchangeclient.h b/libkpimexchange/core/exchangeclient.h
index 0feab87e..b1a2cbc7 100644
--- a/libkpimexchange/core/exchangeclient.h
+++ b/libkpimexchange/core/exchangeclient.h
@@ -46,7 +46,7 @@ class ExchangeDelete;
//class ExchangeMonitor;
class KDE_EXPORT ExchangeClient : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
ExchangeClient( ExchangeAccount* account, const TQString& mTimeZoneId=TQString() );
diff --git a/libkpimexchange/core/exchangedelete.cpp b/libkpimexchange/core/exchangedelete.cpp
index 094b3b5c..d9e8c177 100644
--- a/libkpimexchange/core/exchangedelete.cpp
+++ b/libkpimexchange/core/exchangedelete.cpp
@@ -74,7 +74,7 @@ void ExchangeDelete::findUidSingleMaster( TQString const& uid )
TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", query, false );
job->setWindow( mWindow );
- connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFindUidResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotFindUidResult(TDEIO::Job *)));
}
void ExchangeDelete::slotFindUidResult( TDEIO::Job * job )
@@ -104,7 +104,7 @@ void ExchangeDelete::startDelete( const KURL& url )
{
TDEIO::SimpleJob* job = TDEIO::file_delete( url, false ); // no GUI
job->setWindow( mWindow );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotDeleteResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotDeleteResult( TDEIO::Job * ) ) );
}
void ExchangeDelete::slotDeleteResult( TDEIO::Job* job )
diff --git a/libkpimexchange/core/exchangedelete.h b/libkpimexchange/core/exchangedelete.h
index f8d8d102..eb832892 100644
--- a/libkpimexchange/core/exchangedelete.h
+++ b/libkpimexchange/core/exchangedelete.h
@@ -34,7 +34,7 @@ namespace KPIM {
class ExchangeAccount;
class KDE_EXPORT ExchangeDelete : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
ExchangeDelete( KCal::Event* event, ExchangeAccount* account, TQWidget* window=0 );
diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp
index de7da39b..55cecd1f 100644
--- a/libkpimexchange/core/exchangedownload.cpp
+++ b/libkpimexchange/core/exchangedownload.cpp
@@ -92,10 +92,10 @@ void ExchangeDownload::download( KCal::Calendar *calendar, const TQDate &start,
mProgress = new ExchangeProgress();
mProgress->show();
- connect( this, TQT_SIGNAL( startDownload() ), mProgress,
- TQT_SLOT( slotTransferStarted() ) );
- connect( this, TQT_SIGNAL(finishDownload() ), mProgress,
- TQT_SLOT( slotTransferFinished() ) );
+ connect( this, TQ_SIGNAL( startDownload() ), mProgress,
+ TQ_SLOT( slotTransferStarted() ) );
+ connect( this, TQ_SIGNAL(finishDownload() ), mProgress,
+ TQ_SLOT( slotTransferFinished() ) );
#endif
}
@@ -112,8 +112,8 @@ void ExchangeDownload::download( KCal::Calendar *calendar, const TQDate &start,
sql, false );
TDEIO::Scheduler::scheduleJob( job );
job->setWindow( mWindow );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotSearchResult( TDEIO::Job *) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotSearchResult( TDEIO::Job *) ) );
}
void ExchangeDownload::download( const TQDate& start, const TQDate& end, bool showProgress )
@@ -126,8 +126,8 @@ void ExchangeDownload::download( const TQDate& start, const TQDate& end, bool sh
mProgress = new ExchangeProgress();
mProgress->show();
- connect( this, TQT_SIGNAL(startDownload()), mProgress, TQT_SLOT(slotTransferStarted()) );
- connect( this, TQT_SIGNAL(finishDownload()), mProgress, TQT_SLOT(slotTransferFinished()) );
+ connect( this, TQ_SIGNAL(startDownload()), mProgress, TQ_SLOT(slotTransferStarted()) );
+ connect( this, TQ_SIGNAL(finishDownload()), mProgress, TQ_SLOT(slotTransferFinished()) );
}
TQString sql = dateSelectQuery( start, end.addDays( 1 ) );
@@ -137,8 +137,8 @@ void ExchangeDownload::download( const TQDate& start, const TQDate& end, bool sh
TDEIO::DavJob *job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", sql, false );
TDEIO::Scheduler::scheduleJob(job);
job->setWindow( mWindow );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotSearchResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotSearchResult( TDEIO::Job * ) ) );
}
// Original query TODO: make query configurable
@@ -301,8 +301,8 @@ void ExchangeDownload::handleRecurrence( TQString uid )
query, false );
TDEIO::Scheduler::scheduleJob( job );
job->setWindow( mWindow );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotMasterResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotMasterResult( TDEIO::Job * ) ) );
}
void ExchangeDownload::readAppointment( const KURL& url )
@@ -349,8 +349,8 @@ void ExchangeDownload::readAppointment( const KURL& url )
TDEIO::Scheduler::scheduleJob( job );
job->setWindow( mWindow );
job->addMetaData( "errorPage", "false" );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotPropFindResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotPropFindResult( TDEIO::Job * ) ) );
}
void ExchangeDownload::slotPropFindResult( TDEIO::Job *job )
@@ -401,7 +401,7 @@ void ExchangeDownload::slotPropFindResult( TDEIO::Job *job )
TQString lastModified = prop.namedItem( "lastmodified" ).toElement().text();
if ( !lastModified.isEmpty() ) {
- TQDateTime dt = utcAsZone( TQDateTime::fromString( lastModified, Qt::ISODate ), localTimeZoneId );
+ TQDateTime dt = utcAsZone( TQDateTime::fromString( lastModified, TQt::ISODate ), localTimeZoneId );
event->setLastModified( dt );
kdDebug() << "Got lastModified:" << lastModified << ", " << dt.toString() << endl;
}
@@ -436,7 +436,7 @@ void ExchangeDownload::slotPropFindResult( TDEIO::Job *job )
TQString created = prop.namedItem( "created" ).toElement().text();
if ( !created.isEmpty() ) {
- TQDateTime dt = utcAsZone( TQDateTime::fromString( created, Qt::ISODate ),
+ TQDateTime dt = utcAsZone( TQDateTime::fromString( created, TQt::ISODate ),
localTimeZoneId );
event->setCreated( dt );
kdDebug() << "got created: " << dt.toString() << endl;
@@ -444,7 +444,7 @@ void ExchangeDownload::slotPropFindResult( TDEIO::Job *job )
TQString dtstart = prop.namedItem( "dtstart" ).toElement().text();
if ( !dtstart.isEmpty() ) {
- TQDateTime dt = utcAsZone( TQDateTime::fromString( dtstart, Qt::ISODate ),
+ TQDateTime dt = utcAsZone( TQDateTime::fromString( dtstart, TQt::ISODate ),
localTimeZoneId );
event->setDtStart( dt );
kdDebug() << "got dtstart: " << dtstart << " becomes in timezone " << dt.toString() << endl;
@@ -457,7 +457,7 @@ void ExchangeDownload::slotPropFindResult( TDEIO::Job *job )
TQString dtend = prop.namedItem( "dtend" ).toElement().text();
if ( !dtend.isEmpty() ) {
- TQDateTime dt = utcAsZone( TQDateTime::fromString( dtend, Qt::ISODate ),
+ TQDateTime dt = utcAsZone( TQDateTime::fromString( dtend, TQt::ISODate ),
localTimeZoneId );
// Outlook thinks differently about floating event timing than libkcal
if ( floats ) dt = dt.addDays( -1 );
@@ -510,7 +510,7 @@ void ExchangeDownload::slotPropFindResult( TDEIO::Job *job )
list = exdate.elementsByTagNameNS( "xml:", "v" );
for( uint i=0; i < list.count(); i++ ) {
TQDomElement item = list.item(i).toElement();
- TQDate date = utcAsZone( TQDateTime::fromString( item.text(), Qt::ISODate ), localTimeZoneId ).date();
+ TQDate date = utcAsZone( TQDateTime::fromString( item.text(), TQt::ISODate ), localTimeZoneId ).date();
exdates.append( date );
// kdDebug() << "Got exdate: " << date.toString() << endl;
}
diff --git a/libkpimexchange/core/exchangedownload.h b/libkpimexchange/core/exchangedownload.h
index 931d53bf..f0b1dcdd 100644
--- a/libkpimexchange/core/exchangedownload.h
+++ b/libkpimexchange/core/exchangedownload.h
@@ -36,7 +36,7 @@ class ExchangeProgress;
class ExchangeAccount;
class ExchangeDownload : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
ExchangeDownload( ExchangeAccount* account, TQWidget* window=0 );
diff --git a/libkpimexchange/core/exchangemonitor.cpp b/libkpimexchange/core/exchangemonitor.cpp
index df52fdab..aadfb7c8 100644
--- a/libkpimexchange/core/exchangemonitor.cpp
+++ b/libkpimexchange/core/exchangemonitor.cpp
@@ -94,7 +94,7 @@ ExchangeMonitor::ExchangeMonitor( ExchangeAccount* account, int pollMode, const
kdDebug() << "bind() returned false" << endl;
mSocket->setBlocking( false );
mNotifier = new TQSocketNotifier( mSocket->socket(), TQSocketNotifier::Read );
- connect( mNotifier, TQT_SIGNAL(activated( int )), this, TQT_SLOT( slotActivated(int)));
+ connect( mNotifier, TQ_SIGNAL(activated( int )), this, TQ_SLOT( slotActivated(int)));
//mSocket.setSocketFlags( KExtendedSocket::inetSocket | KExtendedSocket::passiveSocket | KExtendedSocket::datagramSocket | KExtendedSocket::bufferedSocket );
//mSocket.setHost( "jupiter.tbm.tudelft.nl" ); // Does this work?
@@ -110,12 +110,12 @@ ExchangeMonitor::ExchangeMonitor( ExchangeAccount* account, int pollMode, const
if ( mPollMode == Poll ) {
mPollTimer = new TQTimer( this, "mPollTimer" );
- connect( mPollTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotPollTimer()) );
+ connect( mPollTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotPollTimer()) );
mPollTimer->start( 60000 ); // 1 minute timer
}
mRenewTimer = new TQTimer( this, "mRenewTimer" );
- connect( mRenewTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRenewTimer()) );
+ connect( mRenewTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRenewTimer()) );
mRenewTimer->start( mSubscriptionLifetime * 900 ); // 10% early so as to be in time
}
@@ -133,7 +133,7 @@ ExchangeMonitor::~ExchangeMonitor()
job->addMetaData( "customHTTPHeader", headers );
// Can't do, this is a destructor!
// job->addMetaData( "PropagateHttpHeader", "true" );
- // connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotUnsubscribeResult(TDEIO::Job *)));
+ // connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotUnsubscribeResult(TDEIO::Job *)));
}
kdDebug() << "Finished ExchangeMonitor destructor" << endl;
@@ -161,7 +161,7 @@ void ExchangeMonitor::addWatch( const KURL &url, int mode, int depth )
TDEIO::DavJob *job = new TDEIO::DavJob( myURL, (int) TDEIO::DAV_SUBSCRIBE, TQString(), false );
job->addMetaData( "customHTTPHeader", headers );
job->addMetaData( "PropagateHttpHeader", "true" );
- connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotSubscribeResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotSubscribeResult(TDEIO::Job *)));
}
void ExchangeMonitor::removeWatch( const KURL &url )
@@ -182,7 +182,7 @@ void ExchangeMonitor::removeWatch( ID id )
TDEIO::DavJob *job = new TDEIO::DavJob( mAccount->calendarURL(), (int) TDEIO::DAV_UNSUBSCRIBE, TQString(), false );
job->addMetaData( "customHTTPHeader", "Subscription-id: " + TQString::number( id ));
job->addMetaData( "PropagateHttpHeader", "true" );
- connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotUnsubscribeResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotUnsubscribeResult(TDEIO::Job *)));
}
void ExchangeMonitor::slotSubscribeResult( TDEIO::Job * job )
@@ -323,7 +323,7 @@ void ExchangeMonitor::poll( const IDList& IDs ) {
// confirm it
TDEIO::DavJob *job = new TDEIO::DavJob( mAccount->calendarURL(), (int) TDEIO::DAV_POLL, TQString(), false );
job->addMetaData( "customHTTPHeader", "Subscription-ID: " + makeIDString( IDs ) );
- connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotPollResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotPollResult(TDEIO::Job *)));
}
void ExchangeMonitor::slotPollResult( TDEIO::Job * job )
@@ -368,7 +368,7 @@ void ExchangeMonitor::slotRenewTimer()
TDEIO::DavJob *job = new TDEIO::DavJob( mAccount->calendarURL(), (int) TDEIO::DAV_SUBSCRIBE, TQString(), false );
job->addMetaData( "customHTTPHeader", "Subscription-id: " + makeIDString( mSubscriptionMap.keys() ) );
- connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotRenewResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotRenewResult(TDEIO::Job *)));
}
void ExchangeMonitor::slotRenewResult( TDEIO::Job* job )
diff --git a/libkpimexchange/core/exchangemonitor.h b/libkpimexchange/core/exchangemonitor.h
index 3ba96a39..d32b595c 100644
--- a/libkpimexchange/core/exchangemonitor.h
+++ b/libkpimexchange/core/exchangemonitor.h
@@ -40,7 +40,7 @@ namespace KPIM {
class ExchangeAccount;
class ExchangeMonitor : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
typedef long ID;
diff --git a/libkpimexchange/core/exchangeprogress.h b/libkpimexchange/core/exchangeprogress.h
index 4d29c24c..07872449 100644
--- a/libkpimexchange/core/exchangeprogress.h
+++ b/libkpimexchange/core/exchangeprogress.h
@@ -28,7 +28,7 @@ namespace KPIM {
class ExchangeProgress : public KProgressDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libkpimexchange/core/exchangeupload.cpp b/libkpimexchange/core/exchangeupload.cpp
index f134868f..8e49e0aa 100644
--- a/libkpimexchange/core/exchangeupload.cpp
+++ b/libkpimexchange/core/exchangeupload.cpp
@@ -88,8 +88,8 @@ void ExchangeUpload::findUid( TQString const &uid )
TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql",
query, false );
job->setWindow( mWindow );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotFindUidResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotFindUidResult( TDEIO::Job * ) ) );
}
void ExchangeUpload::slotFindUidResult( TDEIO::Job * job )
@@ -147,8 +147,8 @@ void ExchangeUpload::tryExist()
TDEIO::DavJob *job = TDEIO::davPropFind( url, doc, "0", false );
job->setWindow( mWindow );
job->addMetaData( "errorPage", "false" );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotPropFindResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotPropFindResult( TDEIO::Job * ) ) );
}
void ExchangeUpload::slotPropFindResult( TDEIO::Job *job )
@@ -262,11 +262,11 @@ void ExchangeUpload::startUpload( const KURL &url )
kdDebug() << "ExchangeUpload::mTimeZoneId=" << mTimeZoneId << endl;
addElement( doc, prop, "urn:schemas:calendar:", "dtstart",
- zoneAsUtc( event->dtStart(), mTimeZoneId ).toString( Qt::ISODate ) + "Z" );
+ zoneAsUtc( event->dtStart(), mTimeZoneId ).toString( TQt::ISODate ) + "Z" );
// event->dtStart().toString( "yyyy-MM-ddThh:mm:ss.zzzZ" ) );
// 2002-06-04T08:00:00.000Z" );
addElement( doc, prop, "urn:schemas:calendar:", "dtend",
- zoneAsUtc( event->dtEnd(), mTimeZoneId ).toString( Qt::ISODate ) + "Z" );
+ zoneAsUtc( event->dtEnd(), mTimeZoneId ).toString( TQt::ISODate ) + "Z" );
#if 0
addElement( doc, prop, "urn:schemas:calendar:", "dtstart",
event->dtStart().toString( "yyyy-MM-ddThh:mm:ss.zzz" )+ offsetString );
@@ -275,7 +275,7 @@ void ExchangeUpload::startUpload( const KURL &url )
addElement( doc, prop, "urn:schemas:calendar:", "dtend",
event->dtEnd().toString( "yyyy-MM-ddThh:mm:ss.zzz" ) + offsetString );
#endif
- addElement( doc, prop, "urn:schemas:calendar:", "lastmodified", zoneAsUtc( event->lastModified(), mTimeZoneId ).toString( Qt::ISODate )+"Z" );
+ addElement( doc, prop, "urn:schemas:calendar:", "lastmodified", zoneAsUtc( event->lastModified(), mTimeZoneId ).toString( TQt::ISODate )+"Z" );
// addElement( doc, prop, "urn:schemas:calendar:", "meetingstatus", "confirmed" );
addElement( doc, prop, "urn:schemas:httpmail:", "textdescription", event->description() );
@@ -308,7 +308,7 @@ void ExchangeUpload::startUpload( const KURL &url )
KCal::DateList::iterator it;
for ( it = exdates.begin(); it != exdates.end(); ++it ) {
TQString date = (*it).toString( "yyyy-MM-ddT00:00:00.000" )+ offsetString;
-// TQString date = zoneAsUtc( (*it), mTimeZoneId ).toString( Qt::ISODate );
+// TQString date = zoneAsUtc( (*it), mTimeZoneId ).toString( TQt::ISODate );
addElement( doc, exdate, "xml:", "v", date );
}
}
@@ -332,8 +332,8 @@ void ExchangeUpload::startUpload( const KURL &url )
TDEIO::DavJob *job = TDEIO::davPropPatch( url, doc, false );
job->setWindow( mWindow );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotPatchResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotPatchResult( TDEIO::Job * ) ) );
}
void ExchangeUpload::slotPatchResult( TDEIO::Job *job )
diff --git a/libkpimexchange/core/exchangeupload.h b/libkpimexchange/core/exchangeupload.h
index bbc5b8cf..255d9c03 100644
--- a/libkpimexchange/core/exchangeupload.h
+++ b/libkpimexchange/core/exchangeupload.h
@@ -34,7 +34,7 @@ namespace KPIM {
class ExchangeAccount;
class KDE_EXPORT ExchangeUpload : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
ExchangeUpload( KCal::Event* event, ExchangeAccount* account, const TQString& timeZoneId, TQWidget* window=0 );
diff --git a/libkpimidentities/identitycombo.cpp b/libkpimidentities/identitycombo.cpp
index 8644cb5a..200f93ac 100644
--- a/libkpimidentities/identitycombo.cpp
+++ b/libkpimidentities/identitycombo.cpp
@@ -48,9 +48,9 @@ IdentityCombo::IdentityCombo( IdentityManager* manager, TQWidget * parent, const
{
reloadCombo();
reloadUoidList();
- connect( this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotEmitChanged(int)) );
- connect( manager, TQT_SIGNAL(changed()),
- TQT_SLOT(slotIdentityManagerChanged()) );
+ connect( this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotEmitChanged(int)) );
+ connect( manager, TQ_SIGNAL(changed()),
+ TQ_SLOT(slotIdentityManagerChanged()) );
}
TQString IdentityCombo::currentIdentityName() const {
diff --git a/libkpimidentities/identitycombo.h b/libkpimidentities/identitycombo.h
index e6304607..119983ed 100644
--- a/libkpimidentities/identitycombo.h
+++ b/libkpimidentities/identitycombo.h
@@ -49,7 +49,7 @@ class Identity;
**/
class KDE_EXPORT IdentityCombo : public TQComboBox {
- Q_OBJECT
+ TQ_OBJECT
public:
IdentityCombo( IdentityManager* manager, TQWidget * parent=0, const char * name=0 );
diff --git a/libkpimidentities/identitymanager.h b/libkpimidentities/identitymanager.h
index 0162df4c..76b2a290 100644
--- a/libkpimidentities/identitymanager.h
+++ b/libkpimidentities/identitymanager.h
@@ -54,7 +54,7 @@ class Identity;
class IdentityManager : public ConfigManager, public DCOPObject
#undef IdentityManager
{
- Q_OBJECT
+ TQ_OBJECT
//
K_DCOP
diff --git a/libksieve/parser/lexer.cpp b/libksieve/parser/lexer.cpp
index 4b0ebf4f..0213f7d7 100644
--- a/libksieve/parser/lexer.cpp
+++ b/libksieve/parser/lexer.cpp
@@ -42,7 +42,7 @@
#include <tqstringlist.h>
#include <tqtextcodec.h>
-#include <memory> // std::auto_ptr
+#include <memory>
#include <assert.h>
#include <ctype.h> // isdigit
@@ -618,8 +618,8 @@ namespace KSieve {
const TQTextCodec * const codec = TQTextCodec::codecForMib( 106 ); // UTF-8
assert( codec );
- const std::auto_ptr<TQTextDecoder> dec( codec->makeDecoder() );
- assert( dec.get() );
+ const std::unique_ptr<TQTextDecoder> dec( codec->makeDecoder() );
+ assert( dec );
while ( !atEnd() )
switch ( *mState.cursor ) {
diff --git a/libtdenetwork/qgpgme/eventloopinteractor.cpp b/libtdenetwork/qgpgme/eventloopinteractor.cpp
index 3e75bf89..34cc51f4 100644
--- a/libtdenetwork/qgpgme/eventloopinteractor.cpp
+++ b/libtdenetwork/qgpgme/eventloopinteractor.cpp
@@ -39,8 +39,8 @@ QGpgME::EventLoopInteractor::EventLoopInteractor( TQObject * parent, const char
{
if ( !parent )
if ( tqApp ) {
- connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) );
- connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SIGNAL(aboutToDestroy()) );
+ connect( tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(deleteLater()) );
+ connect( tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SIGNAL(aboutToDestroy()) );
}
mSelf = this;
}
@@ -67,9 +67,9 @@ void * QGpgME::EventLoopInteractor::registerWatcher( int fd, Direction dir, bool
TQSocketNotifier * sn = new TQSocketNotifier( fd,
dir == Read ? TQSocketNotifier::Read : TQSocketNotifier::Write );
if ( dir == Read )
- connect( sn, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReadActivity(int)) );
+ connect( sn, TQ_SIGNAL(activated(int)), TQ_SLOT(slotReadActivity(int)) );
else
- connect( sn, TQT_SIGNAL(activated(int)), TQT_SLOT(slotWriteActivity(int)) );
+ connect( sn, TQ_SIGNAL(activated(int)), TQ_SLOT(slotWriteActivity(int)) );
ok = true; // Can above operations fails?
return sn;
}
diff --git a/libtdenetwork/qgpgme/eventloopinteractor.h b/libtdenetwork/qgpgme/eventloopinteractor.h
index 9c75fcb0..10f24031 100644
--- a/libtdenetwork/qgpgme/eventloopinteractor.h
+++ b/libtdenetwork/qgpgme/eventloopinteractor.h
@@ -34,7 +34,7 @@ namespace GpgME {
namespace QGpgME {
class KDE_EXPORT EventLoopInteractor : public TQObject, public GpgME::EventLoopInteractor {
- Q_OBJECT
+ TQ_OBJECT
protected:
EventLoopInteractor( TQObject * parent, const char * name=0 );
diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp
index 1af06c84..77128b7a 100644
--- a/libtdepim/addresseelineedit.cpp
+++ b/libtdepim/addresseelineedit.cpp
@@ -151,8 +151,8 @@ void AddresseeLineEdit::init()
completionSourceWeightsDeleter.setObject( s_completionSourceWeights, new TQMap<TQString,int> );
ldapClientToCompletionSourceMapDeleter.setObject( s_ldapClientToCompletionSourceMap, new TQMap<int,int> );
}
-// connect( s_completion, TQT_SIGNAL( match( const TQString& ) ),
-// this, TQT_SLOT( slotMatched( const TQString& ) ) );
+// connect( s_completion, TQ_SIGNAL( match( const TQString& ) ),
+// this, TQ_SLOT( slotMatched( const TQString& ) ) );
if ( m_useCompletion ) {
if ( !s_LDAPTimer ) {
@@ -165,25 +165,25 @@ void AddresseeLineEdit::init()
if ( !m_completionInitialized ) {
setCompletionObject( s_completion, false );
- connect( this, TQT_SIGNAL( completion( const TQString& ) ),
- this, TQT_SLOT( slotCompletion() ) );
- connect( this, TQT_SIGNAL( returnPressed( const TQString& ) ),
- this, TQT_SLOT( slotReturnPressed( const TQString& ) ) );
+ connect( this, TQ_SIGNAL( completion( const TQString& ) ),
+ this, TQ_SLOT( slotCompletion() ) );
+ connect( this, TQ_SIGNAL( returnPressed( const TQString& ) ),
+ this, TQ_SLOT( slotReturnPressed( const TQString& ) ) );
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( slotUserCancelled( const TQString& ) ) );
+ connect( box, TQ_SIGNAL( highlighted( const TQString& ) ),
+ this, TQ_SLOT( slotPopupCompletion( const TQString& ) ) );
+ connect( box, TQ_SIGNAL( userCancelled( const TQString& ) ),
+ TQ_SLOT( slotUserCancelled( const TQString& ) ) );
// The emitter is always called KPIM::IMAPCompletionOrder by contract
if ( !connectDCOPSignal( 0, "KPIM::IMAPCompletionOrder", "orderChanged()",
"slotIMAPCompletionOrderChanged()", false ) )
kdError() << "AddresseeLineEdit: connection to orderChanged() failed" << endl;
- connect( s_LDAPTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotStartLDAPLookup() ) );
- connect( s_LDAPSearch, TQT_SIGNAL( searchData( const KPIM::LdapResultList& ) ),
- TQT_SLOT( slotLDAPSearchData( const KPIM::LdapResultList& ) ) );
+ connect( s_LDAPTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotStartLDAPLookup() ) );
+ connect( s_LDAPSearch, TQ_SIGNAL( searchData( const KPIM::LdapResultList& ) ),
+ TQ_SLOT( slotLDAPSearchData( const KPIM::LdapResultList& ) ) );
m_completionInitialized = true;
}
@@ -346,7 +346,7 @@ void AddresseeLineEdit::mouseReleaseEvent( TQMouseEvent *e )
if ( m_useCompletion
&& TQApplication::clipboard()->supportsSelection()
&& !isReadOnly()
- && e->button() == Qt::MidButton ) {
+ && e->button() == TQt::MidButton ) {
m_smartPaste = true;
}
@@ -607,7 +607,7 @@ void AddresseeLineEdit::loadContacts()
TQApplication::restoreOverrideCursor();
if ( !m_addressBookConnected ) {
- connect( addressBook, TQT_SIGNAL( addressBookChanged( AddressBook* ) ), TQT_SLOT( loadContacts() ) );
+ connect( addressBook, TQ_SIGNAL( addressBookChanged( AddressBook* ) ), TQ_SLOT( loadContacts() ) );
m_addressBookConnected = true;
}
}
@@ -763,7 +763,7 @@ void AddresseeLineEdit::addCompletionItem( const TQString& string, int weight, i
weight = TQMAX( ( *it ).first, weight );
( *it ).first = weight;
} else {
- s_completionItemMap->insert( string, tqMakePair( weight, completionItemSource ) );
+ s_completionItemMap->insert( string, qMakePair( weight, completionItemSource ) );
}
if ( keyWords == 0 )
s_completion->addItem( string, weight );
@@ -925,7 +925,7 @@ TQPopupMenu* AddresseeLineEdit::createPopupMenu()
menu->setItemVisible( ShortAutoCompletion, false );
menu->setItemVisible( PopupAutoCompletion, false );
menu->insertItem( i18n( "Configure Completion Order..." ),
- this, TQT_SLOT( slotEditCompletionOrder() ) );
+ this, TQ_SLOT( slotEditCompletionOrder() ) );
}
return menu;
}
@@ -1037,12 +1037,12 @@ int KPIM::AddresseeLineEdit::addCompletionSource( const TQString &source, int we
bool KPIM::AddresseeLineEdit::eventFilter(TQObject *obj, TQEvent *e)
{
- if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(completionBox()) ) {
+ if ( obj == completionBox() ) {
if ( e->type() == TQEvent::MouseButtonPress ||
e->type() == TQEvent::MouseMove ||
e->type() == TQEvent::MouseButtonRelease ||
e->type() == TQEvent::MouseButtonDblClick ) {
- TQMouseEvent* me = TQT_TQMOUSEEVENT( e );
+ TQMouseEvent* me = static_cast<TQMouseEvent*>( e );
// find list box item at the event position
TQListBoxItem *item = completionBox()->itemAt( me->pos() );
if ( !item ) {
@@ -1054,8 +1054,8 @@ bool KPIM::AddresseeLineEdit::eventFilter(TQObject *obj, TQEvent *e)
// avoid selection of headers on button press, or move or release while
// a button is pressed
if ( e->type() == TQEvent::MouseButtonPress
- || me->state() & Qt::LeftButton || me->state() & Qt::MidButton
- || me->state() & Qt::RightButton ) {
+ || me->state() & TQt::LeftButton || me->state() & TQt::MidButton
+ || me->state() & TQt::RightButton ) {
if ( itemIsHeader(item) ) {
return true; // eat the event, we don't want anything to happen
} else {
@@ -1070,18 +1070,18 @@ bool KPIM::AddresseeLineEdit::eventFilter(TQObject *obj, TQEvent *e)
}
}
}
- if ( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(this) ) &&
+ if ( ( obj == this ) &&
( e->type() == TQEvent::AccelOverride ) ) {
- TQKeyEvent *ke = TQT_TQKEYEVENT( e );
+ TQKeyEvent *ke = static_cast<TQKeyEvent*>( e );
if ( ke->key() == Key_Up || ke->key() == Key_Down || ke->key() == Key_Tab ) {
ke->accept();
return true;
}
}
- if ( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(this) ) &&
+ if ( ( obj == this ) &&
( e->type() == TQEvent::KeyPress || e->type() == TQEvent::KeyRelease ) &&
completionBox()->isVisible() ) {
- TQKeyEvent *ke = TQT_TQKEYEVENT( e );
+ TQKeyEvent *ke = static_cast<TQKeyEvent*>( e );
int currentIndex = completionBox()->currentItem();
if ( currentIndex < 0 ) {
return true;
diff --git a/libtdepim/addresseelineedit.h b/libtdepim/addresseelineedit.h
index 34439202..95457fd1 100644
--- a/libtdepim/addresseelineedit.h
+++ b/libtdepim/addresseelineedit.h
@@ -53,7 +53,7 @@ namespace KPIM {
class KDE_EXPORT AddresseeLineEdit : public ClickLineEdit, public DCOPObject
{
K_DCOP
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/addresseeselector.cpp b/libtdepim/addresseeselector.cpp
index 77f2be02..b89184e6 100644
--- a/libtdepim/addresseeselector.cpp
+++ b/libtdepim/addresseeselector.cpp
@@ -227,8 +227,8 @@ class SelectionViewItem : public TQListViewItem
AddresseeSelector::AddresseeSelector( Selection *selection, TQWidget *parent, const char *name )
: TQWidget( parent, name ), mSelection( selection ), mManager( 0 )
{
- mMoveMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
- mRemoveMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
+ mMoveMapper = new TQSignalMapper( this );
+ mRemoveMapper = new TQSignalMapper( this );
mAddressBookManager = new AddressBookManager();
@@ -250,17 +250,17 @@ AddresseeSelector::~AddresseeSelector()
void AddresseeSelector::init()
{
- connect( TDEABC::StdAddressBook::self( true ), TQT_SIGNAL( addressBookChanged( AddressBook* ) ),
- this, TQT_SLOT( reloadAddressBook() ) );
- connect( mAddresseeFilter, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( updateAddresseeView() ) );
- connect( mAddressBookCombo, TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( updateAddresseeView() ) );
-
- connect( mMoveMapper, TQT_SIGNAL( mapped( int ) ),
- this, TQT_SLOT( move( int ) ) );
- connect( mRemoveMapper, TQT_SIGNAL( mapped( int ) ),
- this, TQT_SLOT( remove( int ) ) );
+ connect( TDEABC::StdAddressBook::self( true ), TQ_SIGNAL( addressBookChanged( AddressBook* ) ),
+ this, TQ_SLOT( reloadAddressBook() ) );
+ connect( mAddresseeFilter, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( updateAddresseeView() ) );
+ connect( mAddressBookCombo, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( updateAddresseeView() ) );
+
+ connect( mMoveMapper, TQ_SIGNAL( mapped( int ) ),
+ this, TQ_SLOT( move( int ) ) );
+ connect( mRemoveMapper, TQ_SIGNAL( mapped( int ) ),
+ this, TQ_SLOT( remove( int ) ) );
reloadAddressBook();
}
@@ -298,9 +298,9 @@ void AddresseeSelector::initGUI()
listView->setFullWidth( true );
mSelectionViews.append( listView );
- connect( listView, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ),
- mRemoveMapper, TQT_SLOT( map() ) );
- mRemoveMapper->setMapping( TQT_TQOBJECT(listView), i );
+ connect( listView, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ),
+ mRemoveMapper, TQ_SLOT( map() ) );
+ mRemoveMapper->setMapping( listView, i );
TQVBoxLayout *buttonLayout = new TQVBoxLayout( this );
buttonLayout->setAlignment( TQt::AlignBottom );
@@ -311,18 +311,18 @@ void AddresseeSelector::initGUI()
moveButton->setIconSet( moveSet );
moveButton->setFixedSize( 30, 30 );
- connect( moveButton, TQT_SIGNAL( clicked() ),
- mMoveMapper, TQT_SLOT( map() ) );
- mMoveMapper->setMapping( TQT_TQOBJECT(moveButton), i );
+ connect( moveButton, TQ_SIGNAL( clicked() ),
+ mMoveMapper, TQ_SLOT( map() ) );
+ mMoveMapper->setMapping( moveButton, i );
// remove button
TQToolButton *removeButton = new TQToolButton( this );
removeButton->setIconSet( removeSet );
removeButton->setFixedSize( 30, 30 );
- connect( removeButton, TQT_SIGNAL( clicked() ),
- mRemoveMapper, TQT_SLOT( map() ) );
- mRemoveMapper->setMapping( TQT_TQOBJECT(removeButton), i );
+ connect( removeButton, TQ_SIGNAL( clicked() ),
+ mRemoveMapper, TQ_SLOT( map() ) );
+ mRemoveMapper->setMapping( removeButton, i );
buttonLayout->addWidget( moveButton );
buttonLayout->addWidget( removeButton );
diff --git a/libtdepim/addresseeselector.h b/libtdepim/addresseeselector.h
index 101cc6e6..fa4a3c76 100644
--- a/libtdepim/addresseeselector.h
+++ b/libtdepim/addresseeselector.h
@@ -165,7 +165,7 @@ class SelectionItem
class KDE_EXPORT AddresseeSelector : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -215,7 +215,7 @@ class KDE_EXPORT AddresseeSelector : public TQWidget
class KDE_EXPORT AddresseeSelectorDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp
index 16c9bbf2..defdecfa 100644
--- a/libtdepim/addresseeview.cpp
+++ b/libtdepim/addresseeview.cpp
@@ -64,12 +64,12 @@ AddresseeView::AddresseeView( TQWidget *parent, const char *name,
TQStyleSheetItem *link = sheet->item( "a" );
link->setColor( TDEGlobalSettings::linkColor() );
- connect( this, TQT_SIGNAL( mailClick( const TQString&, const TQString& ) ),
- this, TQT_SLOT( slotMailClicked( const TQString&, const TQString& ) ) );
- connect( this, TQT_SIGNAL( urlClick( const TQString& ) ),
- this, TQT_SLOT( slotUrlClicked( const TQString& ) ) );
- connect( this, TQT_SIGNAL( highlighted( const TQString& ) ),
- this, TQT_SLOT( slotHighlighted( const TQString& ) ) );
+ connect( this, TQ_SIGNAL( mailClick( const TQString&, const TQString& ) ),
+ this, TQ_SLOT( slotMailClicked( const TQString&, const TQString& ) ) );
+ connect( this, TQ_SIGNAL( urlClick( const TQString& ) ),
+ this, TQ_SLOT( slotUrlClicked( const TQString& ) ) );
+ connect( this, TQ_SIGNAL( highlighted( const TQString& ) ),
+ this, TQ_SLOT( slotHighlighted( const TQString& ) ) );
setNotifyClick( true );
@@ -88,13 +88,13 @@ AddresseeView::AddresseeView( TQWidget *parent, const char *name,
mActionShowCustomFields = new TDEToggleAction( i18n( "Show Custom Fields" ) );
mActionShowCustomFields->setCheckedState( i18n( "Hide Custom Fields" ) );
- connect( mActionShowBirthday, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) );
- connect( mActionShowAddresses, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) );
- connect( mActionShowEmails, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) );
- connect( mActionShowPhones, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) );
- connect( mActionShowURLs, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) );
- connect( mActionShowIMAddresses, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) );
- connect( mActionShowCustomFields, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) );
+ connect( mActionShowBirthday, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) );
+ connect( mActionShowAddresses, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) );
+ connect( mActionShowEmails, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) );
+ connect( mActionShowPhones, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) );
+ connect( mActionShowURLs, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) );
+ connect( mActionShowIMAddresses, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) );
+ connect( mActionShowCustomFields, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) );
if ( !config ) {
mConfig = new TDEConfig( "kaddressbookrc" );
@@ -106,10 +106,10 @@ AddresseeView::AddresseeView( TQWidget *parent, const char *name,
// set up IMProxy to display contacts' IM presence and make connections to keep the display live
mKIMProxy = ::KIMProxy::instance( kapp->dcopClient() );
- connect( mKIMProxy, TQT_SIGNAL( sigContactPresenceChanged( const TQString& ) ),
- this, TQT_SLOT( slotPresenceChanged( const TQString& ) ) );
- connect( mKIMProxy, TQT_SIGNAL( sigPresenceInfoExpired() ),
- this, TQT_SLOT( slotPresenceInfoExpired() ) );
+ connect( mKIMProxy, TQ_SIGNAL( sigContactPresenceChanged( const TQString& ) ),
+ this, TQ_SLOT( slotPresenceChanged( const TQString& ) ) );
+ connect( mKIMProxy, TQ_SIGNAL( sigPresenceInfoExpired() ),
+ this, TQ_SLOT( slotPresenceInfoExpired() ) );
}
AddresseeView::~AddresseeView()
@@ -547,10 +547,10 @@ void AddresseeView::updateView()
TQMimeSourceFactory::defaultFactory()->setImage( imageURL, TQImage(mImageData) );
else {
mImageJob = TDEIO::get( KURL( picture.url() ), false, false );
- connect( mImageJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
- this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
- connect( mImageJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
- this, TQT_SLOT( result( TDEIO::Job* ) ) );
+ connect( mImageJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+ this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
+ connect( mImageJob, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQ_SLOT( result( TDEIO::Job* ) ) );
}
} else {
TQMimeSourceFactory::defaultFactory()->setPixmap( imageURL,
diff --git a/libtdepim/addresseeview.h b/libtdepim/addresseeview.h
index 6ee83268..59a02124 100644
--- a/libtdepim/addresseeview.h
+++ b/libtdepim/addresseeview.h
@@ -42,7 +42,7 @@ namespace KPIM {
class KDE_EXPORT AddresseeView : public KTextBrowser
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp
index e0071ef0..deb9d1f2 100644
--- a/libtdepim/addressesdialog.cpp
+++ b/libtdepim/addressesdialog.cpp
@@ -241,8 +241,8 @@ AddresseeViewItem* AddressesDialog::selectedToItem()
if ( !d->toItem )
{
d->toItem = new AddresseeViewItem( d->ui->mSelectedView, i18n("To"), AddresseeViewItem::To );
- connect(d->toItem, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)),
- this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool)));
+ connect(d->toItem, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)),
+ this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool)));
}
return d->toItem;
}
@@ -252,8 +252,8 @@ AddresseeViewItem* AddressesDialog::selectedCcItem()
if ( !d->ccItem )
{
d->ccItem = new AddresseeViewItem( d->ui->mSelectedView, i18n("CC"), AddresseeViewItem::CC );
- connect(d->ccItem, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)),
- this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool)));
+ connect(d->ccItem, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)),
+ this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool)));
}
return d->ccItem;
}
@@ -263,8 +263,8 @@ AddresseeViewItem* AddressesDialog::selectedBccItem()
if ( !d->bccItem )
{
d->bccItem = new AddresseeViewItem( d->ui->mSelectedView, i18n("BCC"), AddresseeViewItem::BCC );
- connect(d->bccItem, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)),
- this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool)));
+ connect(d->bccItem, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)),
+ this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool)));
}
return d->bccItem;
}
@@ -325,8 +325,8 @@ AddressesDialog::updateRecentAddresses()
if ( !d->recent ) {
d->recent = new AddresseeViewItem( d->ui->mAvailableView, recentGroup );
- connect(d->recent, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)),
- this, TQT_SLOT(availableAddressSelected(AddresseeViewItem*, bool)));
+ connect(d->recent, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)),
+ this, TQ_SLOT(availableAddressSelected(AddresseeViewItem*, bool)));
d->recent->setVisible( false );
d->groupDict.insert( recentGroup, d->recent );
}
@@ -464,8 +464,8 @@ AddressesDialog::updateAvailableAddressees()
static const TQString &personalGroup = TDEGlobal::staticQString( i18n( "Other Addresses" ) );
d->ui->mAvailableView->setRootIsDecorated( true );
d->personal = new AddresseeViewItem( d->ui->mAvailableView, personalGroup );
- //connect(d->personal, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)),
- // this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool)));
+ //connect(d->personal, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)),
+ // this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool)));
d->personal->setVisible( false );
d->groupDict.insert( personalGroup, d->personal );
@@ -570,36 +570,36 @@ AddressesDialog::selectedAddressSelected( AddresseeViewItem* item, bool selected
void
AddressesDialog::initConnections()
{
- connect( d->ui->mFilterEdit, TQT_SIGNAL(textChanged(const TQString &)),
- TQT_SLOT(filterChanged(const TQString &)) );
- connect( d->ui->mToButton, TQT_SIGNAL(clicked()),
- TQT_SLOT(addSelectedTo()) );
- connect( d->ui->mCCButton, TQT_SIGNAL(clicked()),
- TQT_SLOT(addSelectedCC()) );
- connect( d->ui->mBCCButton, TQT_SIGNAL(clicked()),
- TQT_SLOT(addSelectedBCC()) );
- connect( d->ui->mSaveAs, TQT_SIGNAL(clicked()),
- TQT_SLOT(saveAs()) );
- connect( d->ui->mLdapSearch, TQT_SIGNAL(clicked()),
- TQT_SLOT(searchLdap()) );
- connect( d->ui->mRemoveButton, TQT_SIGNAL(clicked()),
- TQT_SLOT(removeEntry()) );
- connect( d->ui->mAvailableView, TQT_SIGNAL(selectionChanged()),
- TQT_SLOT(availableSelectionChanged()) );
- connect( d->ui->mAvailableView, TQT_SIGNAL(doubleClicked(TQListViewItem*)),
- TQT_SLOT(addSelectedTo()) );
- connect( d->ui->mSelectedView, TQT_SIGNAL(selectionChanged()),
- TQT_SLOT(selectedSelectionChanged()) );
- connect( d->ui->mSelectedView, TQT_SIGNAL(doubleClicked(TQListViewItem*)),
- TQT_SLOT(removeEntry()) );
+ connect( d->ui->mFilterEdit, TQ_SIGNAL(textChanged(const TQString &)),
+ TQ_SLOT(filterChanged(const TQString &)) );
+ connect( d->ui->mToButton, TQ_SIGNAL(clicked()),
+ TQ_SLOT(addSelectedTo()) );
+ connect( d->ui->mCCButton, TQ_SIGNAL(clicked()),
+ TQ_SLOT(addSelectedCC()) );
+ connect( d->ui->mBCCButton, TQ_SIGNAL(clicked()),
+ TQ_SLOT(addSelectedBCC()) );
+ connect( d->ui->mSaveAs, TQ_SIGNAL(clicked()),
+ TQ_SLOT(saveAs()) );
+ connect( d->ui->mLdapSearch, TQ_SIGNAL(clicked()),
+ TQ_SLOT(searchLdap()) );
+ connect( d->ui->mRemoveButton, TQ_SIGNAL(clicked()),
+ TQ_SLOT(removeEntry()) );
+ connect( d->ui->mAvailableView, TQ_SIGNAL(selectionChanged()),
+ TQ_SLOT(availableSelectionChanged()) );
+ connect( d->ui->mAvailableView, TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+ TQ_SLOT(addSelectedTo()) );
+ connect( d->ui->mSelectedView, TQ_SIGNAL(selectionChanged()),
+ TQ_SLOT(selectedSelectionChanged()) );
+ connect( d->ui->mSelectedView, TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+ TQ_SLOT(removeEntry()) );
#ifndef TDEPIM_NEW_DISTRLISTS
- connect( TDEABC::DistributionListWatcher::self(), TQT_SIGNAL( changed() ),
- this, TQT_SLOT( updateAvailableAddressees() ) );
+ connect( TDEABC::DistributionListWatcher::self(), TQ_SIGNAL( changed() ),
+ this, TQ_SLOT( updateAvailableAddressees() ) );
#endif
- connect( TDEABC::StdAddressBook::self( true ), TQT_SIGNAL( addressBookChanged(AddressBook*) ),
- this, TQT_SLOT( updateAvailableAddressees() ) );
+ connect( TDEABC::StdAddressBook::self( true ), TQ_SIGNAL( addressBookChanged(AddressBook*) ),
+ this, TQ_SLOT( updateAvailableAddressees() ) );
}
void
@@ -619,8 +619,8 @@ AddressesDialog::addAddresseeToAvailable( const TDEABC::Addressee& addr, Address
for ( uint i = 0; i < addr.emails().count(); ++i ) {
AddresseeViewItem* addressee = new AddresseeViewItem( d->groupDict[ *it ], addr, i );
- connect(addressee, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)),
- this, TQT_SLOT(availableAddressSelected(AddresseeViewItem*, bool)));
+ connect(addressee, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)),
+ this, TQ_SLOT(availableAddressSelected(AddresseeViewItem*, bool)));
}
}
}
@@ -634,8 +634,8 @@ AddressesDialog::addAddresseeToAvailable( const TDEABC::Addressee& addr, Address
if ( defaultParent && noCategory ) { // only non-categorized items here
AddresseeViewItem* addressee = new AddresseeViewItem( defaultParent, addr );
- connect(addressee, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)),
- this, TQT_SLOT(availableAddressSelected(AddresseeViewItem*, bool)));
+ connect(addressee, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)),
+ this, TQ_SLOT(availableAddressSelected(AddresseeViewItem*, bool)));
}
}
@@ -653,8 +653,8 @@ AddressesDialog::addAddresseeToSelected( const TDEABC::Addressee& addr, Addresse
myChild = static_cast<AddresseeViewItem*>( myChild->nextSibling() );
}
AddresseeViewItem* addressee = new AddresseeViewItem( defaultParent, addr );
- connect(addressee, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)),
- this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool)));
+ connect(addressee, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)),
+ this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool)));
defaultParent->setOpen( true );
}
@@ -701,8 +701,8 @@ AddressesDialog::addAddresseesToSelected( AddresseeViewItem *parent,
address->setVisible( false );
selectedToAvailableMapping.insert(address, newItem);
selectedToAvailableMapping.insert(newItem, address);
- connect(newItem, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)),
- this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool)));
+ connect(newItem, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)),
+ this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool)));
}
parent->setOpen( true );
@@ -725,8 +725,8 @@ AddressesDialog::addSelectedTo()
if ( !d->toItem )
{
d->toItem = new AddresseeViewItem( d->ui->mSelectedView, i18n("To"), AddresseeViewItem::To );
- connect(d->toItem, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)),
- this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool)));
+ connect(d->toItem, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)),
+ this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool)));
}
addAddresseesToSelected( d->toItem, selectedAvailableAddresses );
@@ -746,8 +746,8 @@ AddressesDialog::addSelectedCC()
if ( !d->ccItem )
{
d->ccItem = new AddresseeViewItem( d->ui->mSelectedView, i18n("CC"), AddresseeViewItem::CC );
- connect(d->ccItem , TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)),
- this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool)));
+ connect(d->ccItem , TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)),
+ this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool)));
}
addAddresseesToSelected( d->ccItem, selectedAvailableAddresses );
@@ -767,8 +767,8 @@ AddressesDialog::addSelectedBCC()
if ( !d->bccItem )
{
d->bccItem = new AddresseeViewItem( d->ui->mSelectedView, i18n("BCC"), AddresseeViewItem::BCC );
- connect(d->bccItem , TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)),
- this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool)));
+ connect(d->bccItem , TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)),
+ this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool)));
}
addAddresseesToSelected( d->bccItem, selectedAvailableAddresses );
@@ -946,8 +946,8 @@ AddressesDialog::searchLdap()
{
if ( !d->ldapSearchDialog ) {
d->ldapSearchDialog = new LDAPSearchDialog( this );
- connect( d->ldapSearchDialog, TQT_SIGNAL( addresseesAdded() ),
- TQT_SLOT(ldapSearchResult() ) );
+ connect( d->ldapSearchDialog, TQ_SIGNAL( addresseesAdded() ),
+ TQ_SLOT(ldapSearchResult() ) );
}
d->ldapSearchDialog->show();
}
@@ -1169,8 +1169,8 @@ AddressesDialog::addDistributionLists()
AddresseeViewItem *item = new AddresseeViewItem( d->topdist, dlist.name() );
d->dists.append( item );
- connect( item, TQT_SIGNAL( addressSelected( AddresseeViewItem*, bool ) ),
- this, TQT_SLOT( availableAddressSelected( AddresseeViewItem*, bool ) ) );
+ connect( item, TQ_SIGNAL( addressSelected( AddresseeViewItem*, bool ) ),
+ this, TQ_SLOT( availableAddressSelected( AddresseeViewItem*, bool ) ) );
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList::Entry::List::Iterator itemIt;
diff --git a/libtdepim/addressesdialog.h b/libtdepim/addressesdialog.h
index 55b29231..da56b31f 100644
--- a/libtdepim/addressesdialog.h
+++ b/libtdepim/addressesdialog.h
@@ -37,7 +37,7 @@ namespace KPIM {
class AddresseeViewItem : public TQObject, public TDEListViewItem
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -78,7 +78,7 @@ namespace KPIM {
class KDE_EXPORT AddressesDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
AddressesDialog( TQWidget *widget=0, const char *name=0 );
diff --git a/libtdepim/addresspicker.ui b/libtdepim/addresspicker.ui
index 704b3d58..a37369aa 100644
--- a/libtdepim/addresspicker.ui
+++ b/libtdepim/addresspicker.ui
@@ -299,9 +299,6 @@
<property name="text">
<string>Save as &amp;Distribution List...</string>
</property>
- <property name="accel">
- <string>Alt+D</string>
- </property>
</widget>
<widget class="TQPushButton" row="3" column="0">
<property name="name">
diff --git a/libtdepim/broadcaststatus.h b/libtdepim/broadcaststatus.h
index af8b383c..37da6f95 100644
--- a/libtdepim/broadcaststatus.h
+++ b/libtdepim/broadcaststatus.h
@@ -32,7 +32,7 @@ class ProgressItem;
class KDE_EXPORT BroadcastStatus : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/categoryeditdialog.cpp b/libtdepim/categoryeditdialog.cpp
index 26abbc07..d282596d 100644
--- a/libtdepim/categoryeditdialog.cpp
+++ b/libtdepim/categoryeditdialog.cpp
@@ -87,9 +87,9 @@ CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, TQWidget* parent,
fillList();
- connect( d->mAddButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( add() ) );
- connect( d->mEditButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( edit() ) );
- connect( d->mDeleteButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( remove() ) );
+ connect( d->mAddButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( add() ) );
+ connect( d->mEditButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( edit() ) );
+ connect( d->mDeleteButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( remove() ) );
}
/*
diff --git a/libtdepim/categoryeditdialog.h b/libtdepim/categoryeditdialog.h
index 67d8aa15..32d2c26c 100644
--- a/libtdepim/categoryeditdialog.h
+++ b/libtdepim/categoryeditdialog.h
@@ -31,7 +31,7 @@ namespace KPIM {
class KDE_EXPORT CategoryEditDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
CategoryEditDialog( KPimPrefs *prefs, TQWidget* parent = 0,
diff --git a/libtdepim/categoryselectdialog.cpp b/libtdepim/categoryselectdialog.cpp
index cf1b2ac6..d75948ad 100644
--- a/libtdepim/categoryselectdialog.cpp
+++ b/libtdepim/categoryselectdialog.cpp
@@ -44,10 +44,10 @@ CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, TQWidget* parent,
setCategories();
- connect( mWidget->mButtonEdit, TQT_SIGNAL(clicked()),
- TQT_SIGNAL(editCategories()) );
- connect( mWidget->mButtonClear, TQT_SIGNAL(clicked()),
- TQT_SLOT(clear()) );
+ connect( mWidget->mButtonEdit, TQ_SIGNAL(clicked()),
+ TQ_SIGNAL(editCategories()) );
+ connect( mWidget->mButtonClear, TQ_SIGNAL(clicked()),
+ TQ_SLOT(clear()) );
}
void CategorySelectDialog::setCategories( const TQStringList &categoryList )
diff --git a/libtdepim/categoryselectdialog.h b/libtdepim/categoryselectdialog.h
index 6a4bfb40..9c4f4149 100644
--- a/libtdepim/categoryselectdialog.h
+++ b/libtdepim/categoryselectdialog.h
@@ -32,7 +32,7 @@ namespace KPIM {
class KDE_EXPORT CategorySelectDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
CategorySelectDialog( KPimPrefs *prefs, TQWidget *parent = 0,
diff --git a/libtdepim/cfgc/example.cfg b/libtdepim/cfgc/example.cfg
index 18c7b8b1..6b07152a 100644
--- a/libtdepim/cfgc/example.cfg
+++ b/libtdepim/cfgc/example.cfg
@@ -27,12 +27,12 @@
</entry>
</group>
<group name="MyOptions">
- <entry type=TQSTRING_OBJECT_NAME_STRING>
+ <entry type="TQString">
<name>MyString</name>
<label>This is a string</label>
<default>Default String</default>
</entry>
- <entry type=TQSTRINGLIST_OBJECT_NAME_STRING>
+ <entry type="TQStringList">
<name>MyStringList</name>
<default>up,down</default>
</entry>
diff --git a/libtdepim/clicklineedit.h b/libtdepim/clicklineedit.h
index e8c181ce..1d6ad5c2 100644
--- a/libtdepim/clicklineedit.h
+++ b/libtdepim/clicklineedit.h
@@ -35,7 +35,7 @@ namespace KPIM {
*/
class KDE_EXPORT ClickLineEdit : public KLineEdit
{
- Q_OBJECT
+ TQ_OBJECT
TQ_PROPERTY( TQString clickMessage READ clickMessage WRITE setClickMessage )
public:
diff --git a/libtdepim/collectingprocess.cpp b/libtdepim/collectingprocess.cpp
index e9d640ce..da665464 100644
--- a/libtdepim/collectingprocess.cpp
+++ b/libtdepim/collectingprocess.cpp
@@ -61,18 +61,18 @@ CollectingProcess::~CollectingProcess() {
bool CollectingProcess::start( RunMode runmode, Communication comm ) {
// prevent duplicate connection
- disconnect( this, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
- this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );
+ disconnect( this, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+ this, TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );
if ( comm & Stdout ) {
- connect( this, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
- this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );
+ connect( this, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+ this, TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );
}
// prevent duplicate connection
- disconnect( this, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
- this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
+ disconnect( this, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
+ this, TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
if ( comm & Stderr ) {
- connect( this, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
- this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
+ connect( this, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
+ this, TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
}
return TDEProcess::start( runmode, comm );
}
diff --git a/libtdepim/collectingprocess.h b/libtdepim/collectingprocess.h
index 5aad3f07..f0128a0c 100644
--- a/libtdepim/collectingprocess.h
+++ b/libtdepim/collectingprocess.h
@@ -47,7 +47,7 @@ namespace KPIM {
* @author Ingo Kloecker <kloecker@kde.org>
*/
class KDE_EXPORT CollectingProcess : public TDEProcess {
- Q_OBJECT
+ TQ_OBJECT
public:
CollectingProcess( TQObject * parent = 0, const char * name = 0 );
diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp
index bc6f8839..8a3a25eb 100644
--- a/libtdepim/completionordereditor.cpp
+++ b/libtdepim/completionordereditor.cpp
@@ -225,20 +225,20 @@ CompletionOrderEditor::CompletionOrderEditor( KPIM::LdapSearch* ldapSearch,
mUpButton = new KPushButton( upDownBox, "mUpButton" );
mUpButton->setIconSet( BarIconSet( "go-up", TDEIcon::SizeSmall ) );
mUpButton->setEnabled( false ); // b/c no item is selected yet
- mUpButton->setFocusPolicy( TQ_StrongFocus );
+ mUpButton->setFocusPolicy( TQWidget::StrongFocus );
mDownButton = new KPushButton( upDownBox, "mDownButton" );
mDownButton->setIconSet( BarIconSet( "go-down", TDEIcon::SizeSmall ) );
mDownButton->setEnabled( false ); // b/c no item is selected yet
- mDownButton->setFocusPolicy( TQ_StrongFocus );
+ mDownButton->setFocusPolicy( TQWidget::StrongFocus );
TQWidget* spacer = new TQWidget( upDownBox );
upDownBox->setStretchFactor( spacer, 100 );
- connect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ),
- TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) );
- connect( mUpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveUp() ) );
- connect( mDownButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveDown() ) );
+ connect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ),
+ TQ_SLOT( slotSelectionChanged( TQListViewItem* ) ) );
+ connect( mUpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveUp() ) );
+ connect( mDownButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveDown() ) );
}
CompletionOrderEditor::~CompletionOrderEditor()
diff --git a/libtdepim/completionordereditor.h b/libtdepim/completionordereditor.h
index f7ac8044..e4485a81 100644
--- a/libtdepim/completionordereditor.h
+++ b/libtdepim/completionordereditor.h
@@ -62,7 +62,7 @@ public:
};
class CompletionOrderEditor : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/configmanager.h b/libtdepim/configmanager.h
index b00fb7e5..213524c4 100644
--- a/libtdepim/configmanager.h
+++ b/libtdepim/configmanager.h
@@ -30,7 +30,7 @@ namespace KPIM {
* @author Marc Mutz <mutz@kde.org>
**/
class KDE_EXPORT ConfigManager : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
/** Commit changes to disk and emit changed() if necessary. */
diff --git a/libtdepim/designerfields.cpp b/libtdepim/designerfields.cpp
index c30d1986..c93ae6f3 100644
--- a/libtdepim/designerfields.cpp
+++ b/libtdepim/designerfields.cpp
@@ -63,16 +63,16 @@ void DesignerFields::initGUI( const TQString &uiFile )
layout->addWidget( wdg );
- TQObjectList *list = wdg->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList *list = wdg->queryList( "TQWidget" );
TQObjectListIt it( *list );
TQStringList allowedTypes;
- allowedTypes << TQLINEEDIT_OBJECT_NAME_STRING
- << TQTEXTEDIT_OBJECT_NAME_STRING
- << TQSPINBOX_OBJECT_NAME_STRING
- << TQCHECKBOX_OBJECT_NAME_STRING
- << TQCOMBOBOX_OBJECT_NAME_STRING
- << TQDATETIMEEDIT_OBJECT_NAME_STRING
+ allowedTypes << "TQLineEdit"
+ << "TQTextEdit"
+ << "TQSpinBox"
+ << "TQCheckBox"
+ << "TQComboBox"
+ << "TQDateTimeEdit"
<< "KLineEdit"
<< "KDateTimeWidget"
<< "KDatePicker";
@@ -83,34 +83,34 @@ void DesignerFields::initGUI( const TQString &uiFile )
if ( name.startsWith( "X_" ) ) {
name = name.mid( 2 );
- TQWidget *widget = TQT_TQWIDGET( it.current() );
+ TQWidget *widget = static_cast<TQWidget*>( it.current() );
if ( !name.isEmpty() )
mWidgets.insert( name, widget );
- if ( it.current()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) )
- connect( it.current(), TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SIGNAL( modified() ) );
- else if ( it.current()->inherits( TQSPINBOX_OBJECT_NAME_STRING ) )
- connect( it.current(), TQT_SIGNAL( valueChanged( int ) ),
- TQT_SIGNAL( modified() ) );
- else if ( it.current()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) )
- connect( it.current(), TQT_SIGNAL( toggled( bool ) ),
- TQT_SIGNAL( modified() ) );
- else if ( it.current()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) )
- connect( it.current(), TQT_SIGNAL( activated( const TQString& ) ),
- TQT_SIGNAL( modified() ) );
- else if ( it.current()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) )
- connect( it.current(), TQT_SIGNAL( valueChanged( const TQDateTime& ) ),
- TQT_SIGNAL( modified() ) );
+ if ( it.current()->inherits( "TQLineEdit" ) )
+ connect( it.current(), TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SIGNAL( modified() ) );
+ else if ( it.current()->inherits( "TQSpinBox" ) )
+ connect( it.current(), TQ_SIGNAL( valueChanged( int ) ),
+ TQ_SIGNAL( modified() ) );
+ else if ( it.current()->inherits( "TQCheckBox" ) )
+ connect( it.current(), TQ_SIGNAL( toggled( bool ) ),
+ TQ_SIGNAL( modified() ) );
+ else if ( it.current()->inherits( "TQComboBox" ) )
+ connect( it.current(), TQ_SIGNAL( activated( const TQString& ) ),
+ TQ_SIGNAL( modified() ) );
+ else if ( it.current()->inherits( "TQDateTimeEdit" ) )
+ connect( it.current(), TQ_SIGNAL( valueChanged( const TQDateTime& ) ),
+ TQ_SIGNAL( modified() ) );
else if ( it.current()->inherits( "KDateTimeWidget" ) )
- connect( it.current(), TQT_SIGNAL( valueChanged( const TQDateTime& ) ),
- TQT_SIGNAL( modified() ) );
+ connect( it.current(), TQ_SIGNAL( valueChanged( const TQDateTime& ) ),
+ TQ_SIGNAL( modified() ) );
else if ( it.current()->inherits( "KDatePicker" ) )
- connect( it.current(), TQT_SIGNAL( dateChanged( TQDate ) ),
- TQT_SIGNAL( modified() ) );
- else if ( it.current()->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) )
- connect( it.current(), TQT_SIGNAL( textChanged() ),
- TQT_SIGNAL( modified() ) );
+ connect( it.current(), TQ_SIGNAL( dateChanged( TQDate ) ),
+ TQ_SIGNAL( modified() ) );
+ else if ( it.current()->inherits( "TQTextEdit" ) )
+ connect( it.current(), TQ_SIGNAL( textChanged() ),
+ TQ_SIGNAL( modified() ) );
if ( !widget->isEnabled() )
mDisabledWidgets.append( widget );
@@ -143,16 +143,16 @@ void DesignerFields::load( DesignerFields::Storage *storage )
TQMap<TQString, TQWidget *>::ConstIterator widIt;
for ( widIt = mWidgets.begin(); widIt != mWidgets.end(); ++widIt ) {
TQString value;
- if ( widIt.data()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) {
+ if ( widIt.data()->inherits( "TQLineEdit" ) ) {
TQLineEdit *wdg = static_cast<TQLineEdit*>( widIt.data() );
wdg->setText( TQString() );
- } else if ( widIt.data()->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ) {
+ } else if ( widIt.data()->inherits( "TQSpinBox" ) ) {
TQSpinBox *wdg = static_cast<TQSpinBox*>( widIt.data() );
wdg->setValue( wdg->minValue() );
- } else if ( widIt.data()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) ) {
+ } else if ( widIt.data()->inherits( "TQCheckBox" ) ) {
TQCheckBox *wdg = static_cast<TQCheckBox*>( widIt.data() );
wdg->setChecked( false );
- } else if ( widIt.data()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
+ } else if ( widIt.data()->inherits( "TQDateTimeEdit" ) ) {
TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( widIt.data() );
wdg->setDateTime( TQDateTime::currentDateTime() );
} else if ( widIt.data()->inherits( "KDateTimeWidget" ) ) {
@@ -161,10 +161,10 @@ void DesignerFields::load( DesignerFields::Storage *storage )
} else if ( widIt.data()->inherits( "KDatePicker" ) ) {
KDatePicker *wdg = static_cast<KDatePicker*>( widIt.data() );
wdg->setDate( TQDate::currentDate() );
- } else if ( widIt.data()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) {
+ } else if ( widIt.data()->inherits( "TQComboBox" ) ) {
TQComboBox *wdg = static_cast<TQComboBox*>( widIt.data() );
wdg->setCurrentItem( 0 );
- } else if ( widIt.data()->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) {
+ } else if ( widIt.data()->inherits( "TQTextEdit" ) ) {
TQTextEdit *wdg = static_cast<TQTextEdit*>( widIt.data() );
wdg->setText( TQString() );
}
@@ -176,28 +176,28 @@ void DesignerFields::load( DesignerFields::Storage *storage )
TQMap<TQString, TQWidget *>::ConstIterator it = mWidgets.find( *it2 );
if ( it != mWidgets.end() ) {
- if ( it.data()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) {
+ if ( it.data()->inherits( "TQLineEdit" ) ) {
TQLineEdit *wdg = static_cast<TQLineEdit*>( it.data() );
wdg->setText( value );
- } else if ( it.data()->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ) {
+ } else if ( it.data()->inherits( "TQSpinBox" ) ) {
TQSpinBox *wdg = static_cast<TQSpinBox*>( it.data() );
wdg->setValue( value.toInt() );
- } else if ( it.data()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) ) {
+ } else if ( it.data()->inherits( "TQCheckBox" ) ) {
TQCheckBox *wdg = static_cast<TQCheckBox*>( it.data() );
wdg->setChecked( value == "true" || value == "1" );
- } else if ( it.data()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
+ } else if ( it.data()->inherits( "TQDateTimeEdit" ) ) {
TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( it.data() );
- wdg->setDateTime( TQDateTime::fromString( value, Qt::ISODate ) );
+ wdg->setDateTime( TQDateTime::fromString( value, TQt::ISODate ) );
} else if ( it.data()->inherits( "KDateTimeWidget" ) ) {
KDateTimeWidget *wdg = static_cast<KDateTimeWidget*>( it.data() );
- wdg->setDateTime( TQDateTime::fromString( value, Qt::ISODate ) );
+ wdg->setDateTime( TQDateTime::fromString( value, TQt::ISODate ) );
} else if ( it.data()->inherits( "KDatePicker" ) ) {
KDatePicker *wdg = static_cast<KDatePicker*>( it.data() );
- wdg->setDate( TQDate::fromString( value, Qt::ISODate ) );
- } else if ( it.data()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) {
+ wdg->setDate( TQDate::fromString( value, TQt::ISODate ) );
+ } else if ( it.data()->inherits( "TQComboBox" ) ) {
TQComboBox *wdg = static_cast<TQComboBox*>( it.data() );
wdg->setCurrentText( value );
- } else if ( it.data()->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) {
+ } else if ( it.data()->inherits( "TQTextEdit" ) ) {
TQTextEdit *wdg = static_cast<TQTextEdit*>( it.data() );
wdg->setText( value );
}
@@ -210,28 +210,28 @@ void DesignerFields::save( DesignerFields::Storage *storage )
TQMap<TQString, TQWidget*>::Iterator it;
for ( it = mWidgets.begin(); it != mWidgets.end(); ++it ) {
TQString value;
- if ( it.data()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) {
+ if ( it.data()->inherits( "TQLineEdit" ) ) {
TQLineEdit *wdg = static_cast<TQLineEdit*>( it.data() );
value = wdg->text();
- } else if ( it.data()->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ) {
+ } else if ( it.data()->inherits( "TQSpinBox" ) ) {
TQSpinBox *wdg = static_cast<TQSpinBox*>( it.data() );
value = TQString::number( wdg->value() );
- } else if ( it.data()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) ) {
+ } else if ( it.data()->inherits( "TQCheckBox" ) ) {
TQCheckBox *wdg = static_cast<TQCheckBox*>( it.data() );
value = ( wdg->isChecked() ? "true" : "false" );
- } else if ( it.data()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
+ } else if ( it.data()->inherits( "TQDateTimeEdit" ) ) {
TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( it.data() );
- value = wdg->dateTime().toString( Qt::ISODate );
+ value = wdg->dateTime().toString( TQt::ISODate );
} else if ( it.data()->inherits( "KDateTimeWidget" ) ) {
KDateTimeWidget *wdg = static_cast<KDateTimeWidget*>( it.data() );
- value = wdg->dateTime().toString( Qt::ISODate );
+ value = wdg->dateTime().toString( TQt::ISODate );
} else if ( it.data()->inherits( "KDatePicker" ) ) {
KDatePicker *wdg = static_cast<KDatePicker*>( it.data() );
- value = wdg->date().toString( Qt::ISODate );
- } else if ( it.data()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) {
+ value = wdg->date().toString( TQt::ISODate );
+ } else if ( it.data()->inherits( "TQComboBox" ) ) {
TQComboBox *wdg = static_cast<TQComboBox*>( it.data() );
value = wdg->currentText();
- } else if ( it.data()->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) {
+ } else if ( it.data()->inherits( "TQTextEdit" ) ) {
TQTextEdit *wdg = static_cast<TQTextEdit*>( it.data() );
value = wdg->text();
}
diff --git a/libtdepim/designerfields.h b/libtdepim/designerfields.h
index ab709621..b243e48c 100644
--- a/libtdepim/designerfields.h
+++ b/libtdepim/designerfields.h
@@ -34,7 +34,7 @@ namespace KPIM {
class KDE_EXPORT DesignerFields : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
DesignerFields( const TQString &uiFile, TQWidget *parent,
diff --git a/libtdepim/distributionlist.cpp b/libtdepim/distributionlist.cpp
index 2fd50f5a..74cb99ca 100644
--- a/libtdepim/distributionlist.cpp
+++ b/libtdepim/distributionlist.cpp
@@ -44,7 +44,7 @@ static ParseList parseCustom( const TQString& str )
Q_ASSERT( helpList.count() < 3 ); // 1 or 2 items, but not more
const TQString uid = helpList.first();
const TQString email = helpList.last();
- res.append( tqMakePair( uid, email ) );
+ res.append( qMakePair( uid, email ) );
}
return res;
}
diff --git a/libtdepim/embeddedurlpage.cpp b/libtdepim/embeddedurlpage.cpp
index 79bf5863..4a3aed79 100644
--- a/libtdepim/embeddedurlpage.cpp
+++ b/libtdepim/embeddedurlpage.cpp
@@ -55,16 +55,16 @@ void EmbeddedURLPage::loadContents()
if ( mimetype == "auto" )
mimetype == KMimeType::findByURL( mUri )->name();
// "this" is both the parent widget and the parent object
- mPart = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), TQT_TQWIDGET(this), 0, TQT_TQOBJECT(this), 0 );
+ mPart = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), this, 0, this, 0 );
if ( mPart ) {
mPart->openURL( mUri );
mPart->widget()->show();
}
//void KParts::BrowserExtension::openURLRequestDelayed( const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() )
KParts::BrowserExtension* be = KParts::BrowserExtension::childObject( mPart );
- connect( be, TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ),
-// mPart, TQT_SLOT( openURL( const KURL & ) ) );
- this, TQT_SIGNAL( openURL( const KURL & ) ) );
+ connect( be, TQ_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ),
+// mPart, TQ_SLOT( openURL( const KURL & ) ) );
+ this, TQ_SIGNAL( openURL( const KURL & ) ) );
}
}
diff --git a/libtdepim/embeddedurlpage.h b/libtdepim/embeddedurlpage.h
index bb302d9e..d644ce6f 100644
--- a/libtdepim/embeddedurlpage.h
+++ b/libtdepim/embeddedurlpage.h
@@ -31,7 +31,7 @@ namespace KPIM {
class KDE_EXPORT EmbeddedURLPage : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
EmbeddedURLPage( const TQString &url, const TQString &mimetype,
diff --git a/libtdepim/infoextension.h b/libtdepim/infoextension.h
index 6ee5efe4..737cbf8e 100644
--- a/libtdepim/infoextension.h
+++ b/libtdepim/infoextension.h
@@ -37,7 +37,7 @@ namespace KParts
**/
class KDE_EXPORT InfoExtension : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp
index 9156452c..dd5ab8bf 100644
--- a/libtdepim/kcmdesignerfields.cpp
+++ b/libtdepim/kcmdesignerfields.cpp
@@ -67,19 +67,19 @@ class PageItem : public TQCheckListItem
setText( 0, wdg->caption() );
TQPixmap pm = TQPixmap::grabWidget( wdg );
- TQImage img = pm.convertToImage().smoothScale( 300, 300, TQ_ScaleMin );
+ TQImage img = pm.convertToImage().smoothScale( 300, 300, TQImage::ScaleMin );
mPreview = img;
- TQObjectList *list = wdg->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList *list = wdg->queryList( "TQWidget" );
TQObjectListIt it( *list );
TQMap<TQString, TQString> allowedTypes;
- allowedTypes.insert( TQLINEEDIT_OBJECT_NAME_STRING, i18n( "Text" ) );
- allowedTypes.insert( TQTEXTEDIT_OBJECT_NAME_STRING, i18n( "Text" ) );
- allowedTypes.insert( TQSPINBOX_OBJECT_NAME_STRING, i18n( "Numeric Value" ) );
- allowedTypes.insert( TQCHECKBOX_OBJECT_NAME_STRING, i18n( "Boolean" ) );
- allowedTypes.insert( TQCOMBOBOX_OBJECT_NAME_STRING, i18n( "Selection" ) );
- allowedTypes.insert( TQDATETIMEEDIT_OBJECT_NAME_STRING, i18n( "Date & Time" ) );
+ allowedTypes.insert( "TQLineEdit", i18n( "Text" ) );
+ allowedTypes.insert( "TQTextEdit", i18n( "Text" ) );
+ allowedTypes.insert( "TQSpinBox", i18n( "Numeric Value" ) );
+ allowedTypes.insert( "TQCheckBox", i18n( "Boolean" ) );
+ allowedTypes.insert( "TQComboBox", i18n( "Selection" ) );
+ allowedTypes.insert( "TQDateTimeEdit", i18n( "Date & Time" ) );
allowedTypes.insert( "KLineEdit", i18n( "Text" ) );
allowedTypes.insert( "KDateTimeWidget", i18n( "Date & Time" ) );
allowedTypes.insert( "KDatePicker", i18n( "Date" ) );
@@ -91,7 +91,7 @@ class PageItem : public TQCheckListItem
new TQListViewItem( this, name,
allowedTypes[ it.current()->className() ],
it.current()->className(),
- TQWhatsThis::textFor( TQT_TQWIDGET( it.current() ) ) );
+ TQWhatsThis::textFor( static_cast<TQWidget*>( it.current() ) ) );
}
}
@@ -129,7 +129,7 @@ class PageItem : public TQCheckListItem
KCMDesignerFields::KCMDesignerFields( TQWidget *parent, const char *name )
: TDECModule( parent, name )
{
- TQTimer::singleShot( 0, this, TQT_SLOT( delayedInit() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( delayedInit() ) );
TDEAboutData *about = new TDEAboutData( I18N_NOOP( "KCMDesignerfields" ),
I18N_NOOP( "TQt Designer Fields Dialog" ),
@@ -147,27 +147,27 @@ void KCMDesignerFields::delayedInit()
initGUI();
- connect( mPageView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ),
- this, TQT_SLOT( updatePreview( TQListViewItem* ) ) );
- connect( mPageView, TQT_SIGNAL( clicked( TQListViewItem* ) ),
- this, TQT_SLOT( itemClicked( TQListViewItem* ) ) );
+ connect( mPageView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ),
+ this, TQ_SLOT( updatePreview( TQListViewItem* ) ) );
+ connect( mPageView, TQ_SIGNAL( clicked( TQListViewItem* ) ),
+ this, TQ_SLOT( itemClicked( TQListViewItem* ) ) );
- connect( mDeleteButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( deleteFile() ) );
- connect( mImportButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( importFile() ) );
- connect( mDesignerButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( startDesigner() ) );
+ connect( mDeleteButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( deleteFile() ) );
+ connect( mImportButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( importFile() ) );
+ connect( mDesignerButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( startDesigner() ) );
load();
// Install a dirwatcher that will detect newly created or removed designer files
- KDirWatch *dw = new KDirWatch( TQT_TQOBJECT(this) );
+ KDirWatch *dw = new KDirWatch( this );
TDEStandardDirs::makeDir(localUiDir());
dw->addDir( localUiDir(), true );
- connect( dw, TQT_SIGNAL( created(const TQString&) ), TQT_SLOT( rebuildList() ) );
- connect( dw, TQT_SIGNAL( deleted(const TQString&) ), TQT_SLOT( rebuildList() ) );
- connect( dw, TQT_SIGNAL( dirty(const TQString&) ), TQT_SLOT( rebuildList() ) );
+ connect( dw, TQ_SIGNAL( created(const TQString&) ), TQ_SLOT( rebuildList() ) );
+ connect( dw, TQ_SIGNAL( deleted(const TQString&) ), TQ_SLOT( rebuildList() ) );
+ connect( dw, TQ_SIGNAL( dirty(const TQString&) ), TQ_SLOT( rebuildList() ) );
}
void KCMDesignerFields::deleteFile()
@@ -284,7 +284,7 @@ void KCMDesignerFields::initGUI()
mPageView->setFullWidth( true );
hbox->addWidget( mPageView );
- TQGroupBox *box = new TQGroupBox(1, Qt::Horizontal, i18n("Preview of Selected Page"), this );
+ TQGroupBox *box = new TQGroupBox(1, TQt::Horizontal, i18n("Preview of Selected Page"), this );
mPagePreview = new TQLabel( box );
mPagePreview->setMinimumWidth( 300 );
diff --git a/libtdepim/kcmdesignerfields.h b/libtdepim/kcmdesignerfields.h
index abf3c183..c90eff48 100644
--- a/libtdepim/kcmdesignerfields.h
+++ b/libtdepim/kcmdesignerfields.h
@@ -35,7 +35,7 @@ namespace KPIM {
class KDE_EXPORT KCMDesignerFields : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/kdateedit.cpp b/libtdepim/kdateedit.cpp
index dd6b4e48..0f50f75b 100644
--- a/libtdepim/kdateedit.cpp
+++ b/libtdepim/kdateedit.cpp
@@ -38,7 +38,7 @@ class DateValidator : public TQValidator
{
public:
DateValidator( const TQStringList &keywords, TQWidget* parent, const char* name = 0 )
- : TQValidator( TQT_TQOBJECT(parent), name ), mKeywords( keywords )
+ : TQValidator( parent, name ), mKeywords( keywords )
{}
virtual State validate( TQString &str, int& ) const
@@ -80,17 +80,17 @@ KDateEdit::KDateEdit( TQWidget *parent, const char *name )
changeItem( today, 0 );
setMinimumSize( sizeHint() );
- connect( lineEdit(), TQT_SIGNAL( returnPressed() ),
- this, TQT_SLOT( lineEnterPressed() ) );
- connect( this, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( slotTextChanged( const TQString& ) ) );
+ connect( lineEdit(), TQ_SIGNAL( returnPressed() ),
+ this, TQ_SLOT( lineEnterPressed() ) );
+ connect( this, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( slotTextChanged( const TQString& ) ) );
mPopup = new KDatePickerPopup( KDatePickerPopup::DatePicker | KDatePickerPopup::Words );
mPopup->hide();
mPopup->installEventFilter( this );
- connect( mPopup, TQT_SIGNAL( dateChanged( TQDate ) ),
- TQT_SLOT( dateSelected( TQDate ) ) );
+ connect( mPopup, TQ_SIGNAL( dateChanged( TQDate ) ),
+ TQ_SLOT( dateSelected( TQDate ) ) );
// handle keyword entry
setupKeywords();
@@ -246,7 +246,7 @@ TQDate KDateEdit::parseDate( bool *replaced ) const
bool KDateEdit::eventFilter( TQObject *object, TQEvent *event )
{
- if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(lineEdit()) ) {
+ if ( object == lineEdit() ) {
// We only process the focus out event if the text has changed
// since we got focus
if ( (event->type() == TQEvent::FocusOut) && mTextChanged ) {
@@ -286,7 +286,7 @@ bool KDateEdit::eventFilter( TQObject *object, TQEvent *event )
case TQEvent::MouseButtonDblClick:
case TQEvent::MouseButtonPress: {
TQMouseEvent *mouseEvent = (TQMouseEvent*)event;
- if ( !TQT_TQRECT_OBJECT(mPopup->rect()).contains( mouseEvent->pos() ) ) {
+ if ( !mPopup->rect().contains( mouseEvent->pos() ) ) {
TQPoint globalPos = mPopup->mapToGlobal( mouseEvent->pos() );
if ( TQApplication::widgetAt( globalPos, true ) == this ) {
// The date picker is being closed by a click on the
@@ -307,7 +307,7 @@ bool KDateEdit::eventFilter( TQObject *object, TQEvent *event )
void KDateEdit::mousePressEvent( TQMouseEvent *event )
{
- if ( event->button() == Qt::LeftButton && mDiscardNextMousePress ) {
+ if ( event->button() == TQt::LeftButton && mDiscardNextMousePress ) {
mDiscardNextMousePress = false;
return;
}
diff --git a/libtdepim/kdateedit.h b/libtdepim/kdateedit.h
index 3cab1fe4..9475f752 100644
--- a/libtdepim/kdateedit.h
+++ b/libtdepim/kdateedit.h
@@ -53,7 +53,7 @@ class TQEvent;
*/
class KDE_EXPORT KDateEdit : public TQComboBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/kdatepickerpopup.cpp b/libtdepim/kdatepickerpopup.cpp
index d9ffe8c3..4b544b6f 100644
--- a/libtdepim/kdatepickerpopup.cpp
+++ b/libtdepim/kdatepickerpopup.cpp
@@ -35,10 +35,10 @@ KDatePickerPopup::KDatePickerPopup( int items, const TQDate &date, TQWidget *par
mDatePicker = new KDatePicker( this );
mDatePicker->setCloseButton( false );
- connect( mDatePicker, TQT_SIGNAL( dateEntered( TQDate ) ),
- TQT_SLOT( slotDateChanged( TQDate ) ) );
- connect( mDatePicker, TQT_SIGNAL( dateSelected( TQDate ) ),
- TQT_SLOT( slotDateChanged( TQDate ) ) );
+ connect( mDatePicker, TQ_SIGNAL( dateEntered( TQDate ) ),
+ TQ_SLOT( slotDateChanged( TQDate ) ) );
+ connect( mDatePicker, TQ_SIGNAL( dateSelected( TQDate ) ),
+ TQ_SLOT( slotDateChanged( TQDate ) ) );
mDatePicker->setDate( date );
@@ -58,17 +58,17 @@ void KDatePickerPopup::buildMenu()
}
if ( mItems & Words ) {
- insertItem( i18n("&Today"), this, TQT_SLOT( slotToday() ) );
- insertItem( i18n("To&morrow"), this, TQT_SLOT( slotTomorrow() ) );
- insertItem( i18n("Next &Week"), this, TQT_SLOT( slotNextWeek() ) );
- insertItem( i18n("Next M&onth"), this, TQT_SLOT( slotNextMonth() ) );
+ insertItem( i18n("&Today"), this, TQ_SLOT( slotToday() ) );
+ insertItem( i18n("To&morrow"), this, TQ_SLOT( slotTomorrow() ) );
+ insertItem( i18n("Next &Week"), this, TQ_SLOT( slotNextWeek() ) );
+ insertItem( i18n("Next M&onth"), this, TQ_SLOT( slotNextMonth() ) );
if ( mItems & NoDate )
insertSeparator();
}
if ( mItems & NoDate )
- insertItem( i18n("No Date"), this, TQT_SLOT( slotNoDate() ) );
+ insertItem( i18n("No Date"), this, TQ_SLOT( slotNoDate() ) );
}
KDatePicker *KDatePickerPopup::datePicker() const
diff --git a/libtdepim/kdatepickerpopup.h b/libtdepim/kdatepickerpopup.h
index ba9d551f..9156fddc 100644
--- a/libtdepim/kdatepickerpopup.h
+++ b/libtdepim/kdatepickerpopup.h
@@ -44,7 +44,7 @@
*/
class KDE_EXPORT KDatePickerPopup: public TQPopupMenu
{
- Q_OBJECT
+ TQ_OBJECT
public:
enum { NoDate = 1, DatePicker = 2, Words = 4 };
diff --git a/libtdepim/kfoldertree.cpp b/libtdepim/kfoldertree.cpp
index 58e35858..bccbc8aa 100644
--- a/libtdepim/kfoldertree.cpp
+++ b/libtdepim/kfoldertree.cpp
@@ -379,9 +379,9 @@ KFolderTree::KFolderTree( TQWidget *parent, const char* name )
disableAutoSelection();
setColumnWidth( 0, 120 ); //reasonable default size
- disconnect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ) );
- connect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ),
- TQT_SLOT( slotSizeChanged( int, int, int ) ) );
+ disconnect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ) );
+ connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ),
+ TQ_SLOT( slotSizeChanged( int, int, int ) ) );
}
//-----------------------------------------------------------------------------
diff --git a/libtdepim/kfoldertree.h b/libtdepim/kfoldertree.h
index a69e80d5..d881976d 100644
--- a/libtdepim/kfoldertree.h
+++ b/libtdepim/kfoldertree.h
@@ -240,7 +240,7 @@ class KDE_EXPORT KFolderTreeItem : public TDEListViewItem
class KDE_EXPORT KFolderTree : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/kimportdialog.cpp b/libtdepim/kimportdialog.cpp
index 879b6156..44e7eddd 100644
--- a/libtdepim/kimportdialog.cpp
+++ b/libtdepim/kimportdialog.cpp
@@ -164,15 +164,15 @@ KImportDialog::KImportDialog(TQWidget* parent)
new TQLabel(i18n("File to import:"),fileBox);
KURLRequester *urlRequester = new KURLRequester(fileBox);
urlRequester->setFilter( "*.csv" );
- connect(urlRequester,TQT_SIGNAL(returnPressed(const TQString &)),
- TQT_SLOT(setFile(const TQString &)));
- connect(urlRequester,TQT_SIGNAL(urlSelected(const TQString &)),
- TQT_SLOT(setFile(const TQString &)));
- connect(urlRequester->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )),
- TQT_SLOT(slotUrlChanged(const TQString & )));
+ connect(urlRequester,TQ_SIGNAL(returnPressed(const TQString &)),
+ TQ_SLOT(setFile(const TQString &)));
+ connect(urlRequester,TQ_SIGNAL(urlSelected(const TQString &)),
+ TQ_SLOT(setFile(const TQString &)));
+ connect(urlRequester->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )),
+ TQ_SLOT(slotUrlChanged(const TQString & )));
mTable = new TQTable(5,5,topBox);
mTable->setMinimumHeight( 150 );
- connect(mTable,TQT_SIGNAL(selectionChanged()),TQT_SLOT(tableSelected()));
+ connect(mTable,TQ_SIGNAL(selectionChanged()),TQ_SLOT(tableSelected()));
TQHBox *separatorBox = new TQHBox( topBox );
separatorBox->setSpacing( spacingHint() );
@@ -185,8 +185,8 @@ KImportDialog::KImportDialog(TQWidget* parent)
mSeparatorCombo->insertItem( i18n( "Space" ) );
mSeparatorCombo->insertItem( "=" );
mSeparatorCombo->insertItem( ";" );
- connect(mSeparatorCombo, TQT_SIGNAL( activated(int) ),
- this, TQT_SLOT( separatorClicked(int) ) );
+ connect(mSeparatorCombo, TQ_SIGNAL( activated(int) ),
+ this, TQ_SLOT( separatorClicked(int) ) );
mSeparatorCombo->setCurrentItem( 0 );
TQHBox *rowsBox = new TQHBox( topBox );
@@ -208,34 +208,34 @@ KImportDialog::KImportDialog(TQWidget* parent)
mHeaderList = new TQListView(listsBox);
mHeaderList->addColumn(i18n("Header"));
- connect(mHeaderList, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
- this, TQT_SLOT(headerSelected(TQListViewItem*)));
- connect(mHeaderList,TQT_SIGNAL(doubleClicked(TQListViewItem*)),
- TQT_SLOT(assignColumn(TQListViewItem *)));
+ connect(mHeaderList, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+ this, TQ_SLOT(headerSelected(TQListViewItem*)));
+ connect(mHeaderList,TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+ TQ_SLOT(assignColumn(TQListViewItem *)));
mFormatCombo = new KComboBox( listsBox );
mFormatCombo->setDuplicatesEnabled( false );
TQPushButton *assignButton = new TQPushButton(i18n("Assign to Selected Column"),
assignBox);
- connect(assignButton,TQT_SIGNAL(clicked()),TQT_SLOT(assignColumn()));
+ connect(assignButton,TQ_SIGNAL(clicked()),TQ_SLOT(assignColumn()));
TQPushButton *removeButton = new TQPushButton(i18n("Remove Assignment From Selected Column"),
assignBox);
- connect(removeButton,TQT_SIGNAL(clicked()),TQT_SLOT(removeColumn()));
+ connect(removeButton,TQ_SIGNAL(clicked()),TQ_SLOT(removeColumn()));
TQPushButton *assignTemplateButton = new TQPushButton(i18n("Assign with Template..."),
assignBox);
- connect(assignTemplateButton,TQT_SIGNAL(clicked()),TQT_SLOT(assignTemplate()));
+ connect(assignTemplateButton,TQ_SIGNAL(clicked()),TQ_SLOT(assignTemplate()));
TQPushButton *saveTemplateButton = new TQPushButton(i18n("Save Current Template"),
assignBox);
- connect(saveTemplateButton,TQT_SIGNAL(clicked()),TQT_SLOT(saveTemplate()));
+ connect(saveTemplateButton,TQ_SIGNAL(clicked()),TQ_SLOT(saveTemplate()));
resize(500,300);
- connect(this,TQT_SIGNAL(okClicked()),TQT_SLOT(applyConverter()));
- connect(this,TQT_SIGNAL(applyClicked()),TQT_SLOT(applyConverter()));
+ connect(this,TQ_SIGNAL(okClicked()),TQ_SLOT(applyConverter()));
+ connect(this,TQ_SIGNAL(applyClicked()),TQ_SLOT(applyConverter()));
enableButtonOK(!urlRequester->lineEdit()->text().isEmpty());
}
diff --git a/libtdepim/kimportdialog.h b/libtdepim/kimportdialog.h
index b21cbc83..0828a782 100644
--- a/libtdepim/kimportdialog.h
+++ b/libtdepim/kimportdialog.h
@@ -75,7 +75,7 @@ class KImportColumn
class KImportDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KImportDialog(TQWidget* parent);
diff --git a/libtdepim/kincidencechooser.cpp b/libtdepim/kincidencechooser.cpp
index 8bb72d5c..f11b0360 100644
--- a/libtdepim/kincidencechooser.cpp
+++ b/libtdepim/kincidencechooser.cpp
@@ -61,11 +61,11 @@ KIncidenceChooser::KIncidenceChooser(TQWidget *parent, char *name) :
topLayout->addMultiCellWidget(b_box, iii,iii,0,2);
++iii;
TQPushButton* button = new TQPushButton( i18n("Take Local"), b_box );
- connect ( button, TQT_SIGNAL( clicked()), this, TQT_SLOT (takeIncidence1() ) );
+ connect ( button, TQ_SIGNAL( clicked()), this, TQ_SLOT (takeIncidence1() ) );
button = new TQPushButton( i18n("Take New"), b_box );
- connect ( button, TQT_SIGNAL( clicked()), this, TQT_SLOT (takeIncidence2() ) );
+ connect ( button, TQ_SIGNAL( clicked()), this, TQ_SLOT (takeIncidence2() ) );
button = new TQPushButton( i18n("Take Both"), b_box );
- connect ( button, TQT_SIGNAL( clicked()), this, TQT_SLOT (takeBoth() ) );
+ connect ( button, TQ_SIGNAL( clicked()), this, TQ_SLOT (takeBoth() ) );
topLayout->setSpacing(spacingHint());
topLayout->setMargin(marginHint());
// text is not translated, because text has to be set later
@@ -78,7 +78,7 @@ KIncidenceChooser::KIncidenceChooser(TQWidget *parent, char *name) :
mMod1lab = new TQLabel ( "Set Last modified", topFrame);
topLayout->addWidget(mMod1lab,iii,1);
mShowDetails1 = new TQPushButton( i18n("Show Details"),topFrame );
- connect ( mShowDetails1, TQT_SIGNAL( clicked()), this, TQT_SLOT (showIncidence1() ) );
+ connect ( mShowDetails1, TQ_SIGNAL( clicked()), this, TQ_SLOT (showIncidence1() ) );
topLayout->addWidget(mShowDetails1,iii,2);
++iii;
@@ -91,20 +91,20 @@ KIncidenceChooser::KIncidenceChooser(TQWidget *parent, char *name) :
mMod2lab = new TQLabel ( "Set Last modified", topFrame);
topLayout->addWidget(mMod2lab,iii,1);
mShowDetails2 = new TQPushButton( i18n("Show Details"), topFrame);
- connect ( mShowDetails2, TQT_SIGNAL( clicked()), this, TQT_SLOT (showIncidence2() ) );
+ connect ( mShowDetails2, TQ_SIGNAL( clicked()), this, TQ_SLOT (showIncidence2() ) );
topLayout->addWidget(mShowDetails2,iii,2);
++iii;
//
#if 0
// commented out for now, because the diff code has too many bugs
mDiffBut = new TQPushButton( i18n("Show Differences"), topFrame );
- connect ( mDiffBut, TQT_SIGNAL( clicked()), this, TQT_SLOT ( showDiff() ) );
+ connect ( mDiffBut, TQ_SIGNAL( clicked()), this, TQ_SLOT ( showDiff() ) );
topLayout->addMultiCellWidget(mDiffBut, iii,iii,0,2);
++iii;
#else
mDiffBut = 0;
#endif
- mBg = new TQButtonGroup ( 1, Qt::Horizontal, i18n("Sync Preferences"), topFrame);
+ mBg = new TQButtonGroup ( 1, TQt::Horizontal, i18n("Sync Preferences"), topFrame);
topLayout->addMultiCellWidget(mBg, iii,iii,0,2);
++iii;
mBg->insert( new TQRadioButton ( i18n("Take local entry on conflict"), mBg ), KIncidenceChooser::local);
@@ -118,7 +118,7 @@ KIncidenceChooser::KIncidenceChooser(TQWidget *parent, char *name) :
mDisplayDiff = 0;
mSelIncidence = 0;
button = new TQPushButton( i18n("Apply This to All Conflicts of This Sync"), topFrame );
- connect ( button, TQT_SIGNAL( clicked()), this, TQT_SLOT ( setSyncMode() ) );
+ connect ( button, TQ_SIGNAL( clicked()), this, TQ_SLOT ( setSyncMode() ) );
topLayout->addMultiCellWidget(button, iii,iii,0,2);
}
@@ -237,7 +237,7 @@ void KIncidenceChooser::showIncidence1()
}
mTbL = new KDialogBase( this, "", false /*not modal*/, mInc1lab->text(), KDialogBase::Ok );
mTbL->setEscapeButton( KDialogBase::Ok );
- connect( mTbL, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( detailsDialogClosed() ) );
+ connect( mTbL, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( detailsDialogClosed() ) );
TQTextBrowser* textBrowser = new TQTextBrowser( mTbL );
mTbL->setMainWidget( textBrowser );
textBrowser->setText( KCal::IncidenceFormatter::extensiveDisplayString( mInc1 ) );
@@ -249,7 +249,7 @@ void KIncidenceChooser::showIncidence1()
void KIncidenceChooser::detailsDialogClosed()
{
- KDialogBase* dialog = static_cast<KDialogBase *>( TQT_TQWIDGET( const_cast<TQT_BASE_OBJECT_NAME*>(sender()) ) );
+ KDialogBase* dialog = static_cast<KDialogBase *>(const_cast<TQObject*>(sender())) ;
if ( dialog == mTbL )
mShowDetails1->setText( i18n( "Show details..." ) );
else
@@ -293,7 +293,7 @@ void KIncidenceChooser::showIncidence2()
}
mTbN = new KDialogBase( this, "", false /*not modal*/, mInc2lab->text(), KDialogBase::Ok );
mTbN->setEscapeButton( KDialogBase::Ok );
- connect( mTbN, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( detailsDialogClosed() ) );
+ connect( mTbN, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( detailsDialogClosed() ) );
TQTextBrowser* textBrowser = new TQTextBrowser( mTbN );
mTbN->setMainWidget( textBrowser );
textBrowser->setText( KCal::IncidenceFormatter::extensiveDisplayString( mInc2 ) );
diff --git a/libtdepim/kincidencechooser.h b/libtdepim/kincidencechooser.h
index 51deb7a1..4a2a507e 100644
--- a/libtdepim/kincidencechooser.h
+++ b/libtdepim/kincidencechooser.h
@@ -41,7 +41,7 @@ class TQButtonGroup;
class KDE_EXPORT KIncidenceChooser : public KDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
enum mode {
diff --git a/libtdepim/kmailcompletion.h b/libtdepim/kmailcompletion.h
index 00db2b8c..0e8772ea 100644
--- a/libtdepim/kmailcompletion.h
+++ b/libtdepim/kmailcompletion.h
@@ -35,7 +35,7 @@ namespace KPIM {
*/
class KMailCompletion : public TDECompletion
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp
index 2616f8e2..3549a314 100644
--- a/libtdepim/komposer/core/core.cpp
+++ b/libtdepim/komposer/core/core.cpp
@@ -225,10 +225,10 @@ void
Core::initCore()
{
m_pluginManager = new PluginManager( this );
- connect( m_pluginManager, TQT_SIGNAL(pluginLoaded(Plugin*)),
- TQT_SLOT(slotPluginLoaded(Plugin*)) );
- connect( m_pluginManager, TQT_SIGNAL(allPluginsLoaded()),
- TQT_SLOT(slotAllPluginsLoaded()) );
+ connect( m_pluginManager, TQ_SIGNAL(pluginLoaded(Plugin*)),
+ TQ_SLOT(slotPluginLoaded(Plugin*)) );
+ connect( m_pluginManager, TQ_SIGNAL(allPluginsLoaded()),
+ TQ_SLOT(slotAllPluginsLoaded()) );
m_pluginManager->loadAllPlugins();
@@ -238,39 +238,39 @@ Core::initCore()
void
Core::initConnections()
{
- connect( kapp, TQT_SIGNAL(shutDown()),
- TQT_SLOT(slotQuit()) );
+ connect( kapp, TQ_SIGNAL(shutDown()),
+ TQ_SLOT(slotQuit()) );
}
void
Core::createActions()
{
- KStdAction::close( this, TQT_SLOT(slotClose()), actionCollection() );
+ KStdAction::close( this, TQ_SLOT(slotClose()), actionCollection() );
(void) new TDEAction( i18n( "&Send" ), "mail-send", CTRL+Key_Return,
- this, TQT_SLOT(slotSendNow()), actionCollection(),
+ this, TQ_SLOT(slotSendNow()), actionCollection(),
"send_default" );
(void) new TDEAction( i18n( "&Queue" ), "queue", 0,
- this, TQT_SLOT(slotSendLater()),
+ this, TQ_SLOT(slotSendLater()),
actionCollection(), "send_alternative" );
(void) new TDEAction( i18n( "Save in &Drafts Folder" ), "document-save", 0,
- this, TQT_SLOT(slotSaveDraft()),
+ this, TQ_SLOT(slotSaveDraft()),
actionCollection(), "save_in_drafts" );
(void) new TDEAction( i18n( "&Insert File..." ), "document-open", 0,
- this, TQT_SLOT(slotInsertFile()),
+ this, TQ_SLOT(slotInsertFile()),
actionCollection(), "insert_file" );
(void) new TDEAction( i18n( "&Address Book" ), "contents",0,
- this, TQT_SLOT(slotAddrBook()),
+ this, TQ_SLOT(slotAddrBook()),
actionCollection(), "addressbook" );
(void) new TDEAction( i18n( "&New Composer" ), "mail-message-new",
TDEStdAccel::shortcut( TDEStdAccel::New ),
- this, TQT_SLOT(slotNewComposer()),
+ this, TQ_SLOT(slotNewComposer()),
actionCollection(), "new_composer" );
(void) new TDEAction( i18n( "&Attach File..." ), "attach",
- 0, this, TQT_SLOT(slotAttachFile()),
+ 0, this, TQ_SLOT(slotAttachFile()),
actionCollection(), "attach_file" );
}
diff --git a/libtdepim/komposer/core/core.h b/libtdepim/komposer/core/core.h
index 482ee1db..dcf1427f 100644
--- a/libtdepim/komposer/core/core.h
+++ b/libtdepim/komposer/core/core.h
@@ -43,7 +43,7 @@ namespace Komposer
*/
class Core : public TDEMainWindow, virtual public KomposerIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
Core( TQWidget *parentWidget = 0, const char *name = 0 );
diff --git a/libtdepim/komposer/core/corewidget.h b/libtdepim/komposer/core/corewidget.h
index c2a6a0e7..c0e93b14 100644
--- a/libtdepim/komposer/core/corewidget.h
+++ b/libtdepim/komposer/core/corewidget.h
@@ -30,7 +30,7 @@ namespace Komposer
class CoreWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
CoreWidget( TQWidget *parent, const char *name=0 );
diff --git a/libtdepim/komposer/core/editor.h b/libtdepim/komposer/core/editor.h
index 4e595b3f..41667af9 100644
--- a/libtdepim/komposer/core/editor.h
+++ b/libtdepim/komposer/core/editor.h
@@ -36,7 +36,7 @@ namespace Komposer {
class Editor : public Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
enum TextType {
diff --git a/libtdepim/komposer/core/plugin.h b/libtdepim/komposer/core/plugin.h
index ac0b5498..a462fd90 100644
--- a/libtdepim/komposer/core/plugin.h
+++ b/libtdepim/komposer/core/plugin.h
@@ -31,7 +31,7 @@ namespace Komposer
class Plugin : public TQObject,
virtual public KXMLGUIClient
{
- Q_OBJECT
+ TQ_OBJECT
public:
virtual ~Plugin();
diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp
index 9a33b990..8c4e025d 100644
--- a/libtdepim/komposer/core/pluginmanager.cpp
+++ b/libtdepim/komposer/core/pluginmanager.cpp
@@ -78,7 +78,7 @@ PluginManager::PluginManager( TQObject *parent )
d->shutdownMode = Private::StartingUp;
KSettings::Dispatcher::self()->registerInstance( TDEGlobal::instance(),
- this, TQT_SLOT( loadAllPlugins() ) );
+ this, TQ_SLOT( loadAllPlugins() ) );
d->plugins = KPluginInfo::fromServices(
TDETrader::self()->query( TQString::fromLatin1( "Komposer/Plugin" ),
@@ -168,7 +168,7 @@ PluginManager::shutdown()
}
}
- TQTimer::singleShot( 3000, this, TQT_SLOT(slotShutdownTimeout()) );
+ TQTimer::singleShot( 3000, this, TQ_SLOT(slotShutdownTimeout()) );
}
void
@@ -256,7 +256,7 @@ PluginManager::loadAllPlugins()
}
// Schedule the plugins to load
- TQTimer::singleShot( 0, this, TQT_SLOT( slotLoadNextPlugin() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotLoadNextPlugin() ) );
}
void PluginManager::slotLoadNextPlugin()
@@ -278,7 +278,7 @@ void PluginManager::slotLoadNextPlugin()
// allPluginsLoaded() signal's handling. This has the added benefit that
// the signal is delayed one event loop, so the accounts are more likely
// to be instantiated.
- TQTimer::singleShot( 0, this, TQT_SLOT( slotLoadNextPlugin() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotLoadNextPlugin() ) );
}
Plugin*
@@ -289,7 +289,7 @@ PluginManager::loadPlugin( const TQString &pluginId,
return loadPluginInternal( pluginId );
} else {
d->pluginsToLoad.push( pluginId );
- TQTimer::singleShot( 0, this, TQT_SLOT( slotLoadNextPlugin() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotLoadNextPlugin() ) );
return 0;
}
}
@@ -317,10 +317,10 @@ PluginManager::loadPluginInternal( const TQString &pluginId )
d->loadedPlugins.insert( info, plugin );
info->setPluginEnabled( true );
- connect( plugin, TQT_SIGNAL(destroyed(TQObject*)),
- this, TQT_SLOT(slotPluginDestroyed(TQObject*)) );
- connect( plugin, TQT_SIGNAL(readyForUnload()),
- this, TQT_SLOT(slotPluginReadyForUnload()) );
+ connect( plugin, TQ_SIGNAL(destroyed(TQObject*)),
+ this, TQ_SLOT(slotPluginDestroyed(TQObject*)) );
+ connect( plugin, TQ_SIGNAL(readyForUnload()),
+ this, TQ_SLOT(slotPluginReadyForUnload()) );
kdDebug() << k_funcinfo << "Successfully loaded plugin '"
<< pluginId << "'" << endl;
@@ -396,7 +396,7 @@ PluginManager::slotPluginDestroyed( TQObject *plugin )
{
// Use a timer to make sure any pending deleteLater() calls have
// been handled first
- TQTimer::singleShot( 0, this, TQT_SLOT(slotShutdownDone()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(slotShutdownDone()) );
}
}
diff --git a/libtdepim/komposer/core/pluginmanager.h b/libtdepim/komposer/core/pluginmanager.h
index d9366b3f..b4a16f8e 100644
--- a/libtdepim/komposer/core/pluginmanager.h
+++ b/libtdepim/komposer/core/pluginmanager.h
@@ -38,7 +38,7 @@ namespace Komposer
class PluginManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp
index abacd0eb..f8260c10 100644
--- a/libtdepim/komposer/core/prefsmodule.cpp
+++ b/libtdepim/komposer/core/prefsmodule.cpp
@@ -81,8 +81,8 @@ EditorSelection::EditorSelection( const TQString &text, TQString &reference,
m_editorsCombo = new KComboBox( m_box );
boxLayout->addWidget( m_editorsCombo );
- connect( m_editorsCombo, TQT_SIGNAL(activated(constTQString&)),
- TQT_SLOT(slotActivated(const TQString&)) );
+ connect( m_editorsCombo, TQ_SIGNAL(activated(constTQString&)),
+ TQ_SLOT(slotActivated(const TQString&)) );
}
EditorSelection::~EditorSelection()
diff --git a/libtdepim/komposer/core/prefsmodule.h b/libtdepim/komposer/core/prefsmodule.h
index a7733019..5be0ec34 100644
--- a/libtdepim/komposer/core/prefsmodule.h
+++ b/libtdepim/komposer/core/prefsmodule.h
@@ -34,7 +34,7 @@ namespace Komposer {
class PrefsModule : public KPrefsModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
PrefsModule( TQWidget *parent=0, const char *name=0 );
@@ -43,7 +43,7 @@ namespace Komposer {
class EditorSelection : public KPrefsWid
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/komposer/core/tests/managertest.h b/libtdepim/komposer/core/tests/managertest.h
index d131f830..76de80d2 100644
--- a/libtdepim/komposer/core/tests/managertest.h
+++ b/libtdepim/komposer/core/tests/managertest.h
@@ -31,7 +31,7 @@ namespace Komposer {
class ManagerTest : public TQObject,
public Tester
{
- Q_OBJECT
+ TQ_OBJECT
public:
ManagerTest( TQObject* parent = 0 );
diff --git a/libtdepim/komposer/core/tests/testmanager.cpp b/libtdepim/komposer/core/tests/testmanager.cpp
index a690c67c..40fe5181 100644
--- a/libtdepim/komposer/core/tests/testmanager.cpp
+++ b/libtdepim/komposer/core/tests/testmanager.cpp
@@ -15,10 +15,10 @@ TestManager::TestManager( TQObject *parent )
: TQObject( parent )
{
m_manager = new PluginManager( this );
- connect( m_manager, TQT_SIGNAL(pluginLoaded(Plugin*)),
- TQT_SLOT(slotPluginLoaded(Plugin*)) );
- connect( m_manager, TQT_SIGNAL(allPluginsLoaded()),
- TQT_SLOT(slotAllPluginsLoaded()) );
+ connect( m_manager, TQ_SIGNAL(pluginLoaded(Plugin*)),
+ TQ_SLOT(slotPluginLoaded(Plugin*)) );
+ connect( m_manager, TQ_SIGNAL(allPluginsLoaded()),
+ TQ_SLOT(slotAllPluginsLoaded()) );
m_manager->loadAllPlugins();
TQValueList<KPluginInfo*> plugins = m_manager->availablePlugins();
diff --git a/libtdepim/komposer/core/tests/testmanager.h b/libtdepim/komposer/core/tests/testmanager.h
index 67c04414..73b0471b 100644
--- a/libtdepim/komposer/core/tests/testmanager.h
+++ b/libtdepim/komposer/core/tests/testmanager.h
@@ -11,7 +11,7 @@ using Komposer::Plugin;
class TestManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
TestManager( TQObject *parent );
diff --git a/libtdepim/komposer/plugins/default/defaulteditor.cpp b/libtdepim/komposer/plugins/default/defaulteditor.cpp
index fe059b9e..1aba9705 100644
--- a/libtdepim/komposer/plugins/default/defaulteditor.cpp
+++ b/libtdepim/komposer/plugins/default/defaulteditor.cpp
@@ -98,71 +98,71 @@ DefaultEditor::createActions( TDEActionCollection *ac )
//
// File Actions
//
- (void) KStdAction::open( this, TQT_SLOT(open()), ac );
- (void) KStdAction::openRecent( this, TQT_SLOT(openURL(const KURL &)), ac );
- (void) KStdAction::save( this, TQT_SLOT(save()), ac );
- (void) KStdAction::saveAs( this, TQT_SLOT(saveAs()), ac );
+ (void) KStdAction::open( this, TQ_SLOT(open()), ac );
+ (void) KStdAction::openRecent( this, TQ_SLOT(openURL(const KURL &)), ac );
+ (void) KStdAction::save( this, TQ_SLOT(save()), ac );
+ (void) KStdAction::saveAs( this, TQ_SLOT(saveAs()), ac );
//
// Edit Actions
//
- TDEAction *actionUndo = KStdAction::undo( m_textEdit, TQT_SLOT(undo()), ac );
+ TDEAction *actionUndo = KStdAction::undo( m_textEdit, TQ_SLOT(undo()), ac );
actionUndo->setEnabled( false );
- connect( m_textEdit, TQT_SIGNAL(undoAvailable(bool)),
- actionUndo, TQT_SLOT(setEnabled(bool)) );
+ connect( m_textEdit, TQ_SIGNAL(undoAvailable(bool)),
+ actionUndo, TQ_SLOT(setEnabled(bool)) );
- TDEAction *actionRedo = KStdAction::redo( m_textEdit, TQT_SLOT(redo()), ac );
+ TDEAction *actionRedo = KStdAction::redo( m_textEdit, TQ_SLOT(redo()), ac );
actionRedo->setEnabled( false );
- connect( m_textEdit, TQT_SIGNAL(redoAvailable(bool)),
- actionRedo, TQT_SLOT(setEnabled(bool)) );
+ connect( m_textEdit, TQ_SIGNAL(redoAvailable(bool)),
+ actionRedo, TQ_SLOT(setEnabled(bool)) );
- TDEAction *action_cut = KStdAction::cut( m_textEdit, TQT_SLOT(cut()), ac );
+ TDEAction *action_cut = KStdAction::cut( m_textEdit, TQ_SLOT(cut()), ac );
action_cut->setEnabled( false );
- connect( m_textEdit, TQT_SIGNAL(copyAvailable(bool)),
- action_cut, TQT_SLOT(setEnabled(bool)) );
+ connect( m_textEdit, TQ_SIGNAL(copyAvailable(bool)),
+ action_cut, TQ_SLOT(setEnabled(bool)) );
- TDEAction *action_copy = KStdAction::copy( m_textEdit, TQT_SLOT(copy()), ac );
+ TDEAction *action_copy = KStdAction::copy( m_textEdit, TQ_SLOT(copy()), ac );
action_copy->setEnabled( false );
- connect( m_textEdit, TQT_SIGNAL(copyAvailable(bool)),
- action_copy, TQT_SLOT(setEnabled(bool)) );
+ connect( m_textEdit, TQ_SIGNAL(copyAvailable(bool)),
+ action_copy, TQ_SLOT(setEnabled(bool)) );
- (void) KStdAction::print( this, TQT_SLOT(print()), ac );
+ (void) KStdAction::print( this, TQ_SLOT(print()), ac );
- (void) KStdAction::paste( m_textEdit, TQT_SLOT(paste()), ac );
+ (void) KStdAction::paste( m_textEdit, TQ_SLOT(paste()), ac );
(void) new TDEAction( i18n( "C&lear" ), 0,
- m_textEdit, TQT_SLOT(removeSelectedText()),
+ m_textEdit, TQ_SLOT(removeSelectedText()),
ac, "edit_clear" );
- (void) KStdAction::selectAll( m_textEdit, TQT_SLOT(selectAll()), ac );
+ (void) KStdAction::selectAll( m_textEdit, TQ_SLOT(selectAll()), ac );
//
// View Actions
//
- (void) KStdAction::zoomIn( m_textEdit, TQT_SLOT(zoomIn()), ac );
- (void) KStdAction::zoomOut( m_textEdit, TQT_SLOT(zoomOut()), ac );
+ (void) KStdAction::zoomIn( m_textEdit, TQ_SLOT(zoomIn()), ac );
+ (void) KStdAction::zoomOut( m_textEdit, TQ_SLOT(zoomOut()), ac );
//
// Character Formatting
//
m_actionBold = new TDEToggleAction( i18n("&Bold"), "format-text-bold", CTRL+Key_B,
ac, "format_bold" );
- connect( m_actionBold, TQT_SIGNAL(toggled(bool)),
- m_textEdit, TQT_SLOT(setBold(bool)) );
+ connect( m_actionBold, TQ_SIGNAL(toggled(bool)),
+ m_textEdit, TQ_SLOT(setBold(bool)) );
m_actionItalic = new TDEToggleAction( i18n("&Italic"), "format-text-italic", CTRL+Key_I,
ac, "format_italic" );
- connect( m_actionItalic, TQT_SIGNAL(toggled(bool)),
- m_textEdit, TQT_SLOT(setItalic(bool) ));
+ connect( m_actionItalic, TQ_SIGNAL(toggled(bool)),
+ m_textEdit, TQ_SLOT(setItalic(bool) ));
m_actionUnderline = new TDEToggleAction( i18n("&Underline"), "format-text-underline", CTRL+Key_U,
ac, "format_underline" );
- connect( m_actionUnderline, TQT_SIGNAL(toggled(bool)),
- m_textEdit, TQT_SLOT(setUnderline(bool)) );
+ connect( m_actionUnderline, TQ_SIGNAL(toggled(bool)),
+ m_textEdit, TQ_SLOT(setUnderline(bool)) );
(void) new TDEAction( i18n("Text &Color..."), "colorpicker", 0,
- this, TQT_SLOT(formatColor()),
+ this, TQ_SLOT(formatColor()),
ac, "format_color" );
//
@@ -170,37 +170,37 @@ DefaultEditor::createActions( TDEActionCollection *ac )
//
m_actionFont = new TDEFontAction( i18n("&Font"), 0,
ac, "format_font" );
- connect( m_actionFont, TQT_SIGNAL(activated(const TQString &)),
- m_textEdit, TQT_SLOT(setFamily(const TQString &)) );
+ connect( m_actionFont, TQ_SIGNAL(activated(const TQString &)),
+ m_textEdit, TQ_SLOT(setFamily(const TQString &)) );
m_actionFontSize = new TDEFontSizeAction( i18n("Font &Size"), 0,
ac, "format_font_size" );
- connect( m_actionFontSize, TQT_SIGNAL(fontSizeChanged(int)),
- m_textEdit, TQT_SLOT(setPointSize(int)) );
+ connect( m_actionFontSize, TQ_SIGNAL(fontSizeChanged(int)),
+ m_textEdit, TQ_SLOT(setPointSize(int)) );
//
// Alignment
//
m_actionAlignLeft = new TDEToggleAction( i18n("Align &Left"), "format-text-direction-ltr", 0,
ac, "format_align_left" );
- connect( m_actionAlignLeft, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(setAlignLeft(bool)) );
+ connect( m_actionAlignLeft, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(setAlignLeft(bool)) );
m_actionAlignCenter = new TDEToggleAction( i18n("Align &Center"), "text_center", 0,
ac, "format_align_center" );
- connect( m_actionAlignCenter, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(setAlignCenter(bool)) );
+ connect( m_actionAlignCenter, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(setAlignCenter(bool)) );
m_actionAlignRight = new TDEToggleAction( i18n("Align &Right"), "format-text-direction-rtl", 0,
ac, "format_align_right" );
- connect( m_actionAlignRight, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(setAlignRight(bool)) );
+ connect( m_actionAlignRight, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(setAlignRight(bool)) );
m_actionAlignJustify = new TDEToggleAction( i18n("&Justify"), "text_block", 0,
ac, "format_align_justify" );
- connect( m_actionAlignJustify, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(setAlignJustify(bool)) );
+ connect( m_actionAlignJustify, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(setAlignJustify(bool)) );
m_actionAlignLeft->setExclusiveGroup( "alignment" );
m_actionAlignCenter->setExclusiveGroup( "alignment" );
@@ -210,19 +210,19 @@ DefaultEditor::createActions( TDEActionCollection *ac )
//
// Tools
//
- (void) KStdAction::spelling( this, TQT_SLOT(checkSpelling()), ac );
+ (void) KStdAction::spelling( this, TQ_SLOT(checkSpelling()), ac );
//
// Setup enable/disable
//
updateActions();
- connect( m_textEdit, TQT_SIGNAL(currentFontChanged(const TQFont &)),
- this, TQT_SLOT( updateFont() ) );
- connect( m_textEdit, TQT_SIGNAL(currentFontChanged(const TQFont &)),
- this, TQT_SLOT(updateCharFmt()) );
- connect( m_textEdit, TQT_SIGNAL(cursorPositionChanged(int, int)),
- this, TQT_SLOT(updateAligment()) );
+ connect( m_textEdit, TQ_SIGNAL(currentFontChanged(const TQFont &)),
+ this, TQ_SLOT( updateFont() ) );
+ connect( m_textEdit, TQ_SIGNAL(currentFontChanged(const TQFont &)),
+ this, TQ_SLOT(updateCharFmt()) );
+ connect( m_textEdit, TQ_SIGNAL(cursorPositionChanged(int, int)),
+ this, TQ_SLOT(updateAligment()) );
}
void
diff --git a/libtdepim/komposer/plugins/default/defaulteditor.h b/libtdepim/komposer/plugins/default/defaulteditor.h
index 5763b554..3c55a792 100644
--- a/libtdepim/komposer/plugins/default/defaulteditor.h
+++ b/libtdepim/komposer/plugins/default/defaulteditor.h
@@ -33,7 +33,7 @@ class TDEActionCollection;
class DefaultEditor : public Komposer::Editor
{
- Q_OBJECT
+ TQ_OBJECT
public:
DefaultEditor( TQObject *parent, const char *name, const TQStringList &args );
diff --git a/libtdepim/kpixmapregionselectorwidget.cpp b/libtdepim/kpixmapregionselectorwidget.cpp
index fa93fe3d..9cfe8f00 100644
--- a/libtdepim/kpixmapregionselectorwidget.cpp
+++ b/libtdepim/kpixmapregionselectorwidget.cpp
@@ -144,13 +144,13 @@ TDEPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu()
popup->insertTitle(i18n("Image Operations"));
TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "object-rotate-right",
- 0, TQT_TQOBJECT(this), TQT_SLOT(rotateClockwise()),
- TQT_TQOBJECT(popup), "rotateclockwise");
+ 0, this, TQ_SLOT(rotateClockwise()),
+ popup, "rotateclockwise");
action->plug(popup);
action = new TDEAction(i18n("Rotate &Counterclockwise"), "object-rotate-left",
- 0, TQT_TQOBJECT(this), TQT_SLOT(rotateCounterclockwise()),
- TQT_TQOBJECT(popup), "rotatecounterclockwise");
+ 0, this, TQ_SLOT(rotateCounterclockwise()),
+ popup, "rotatecounterclockwise");
action->plug(popup);
/*
@@ -218,7 +218,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev)
TQMouseEvent *mev= (TQMouseEvent *)(ev);
//kdDebug() << TQString("click at %1,%2").arg( mev->x() ).arg( mev->y() ) << endl;
- if ( mev->button() == Qt::RightButton )
+ if ( mev->button() == TQt::RightButton )
{
TDEPopupMenu *popup = createPopupMenu( );
popup->exec( mev->globalPos() );
@@ -429,7 +429,7 @@ void KPixmapRegionSelectorWidget::setMaximumWidgetSize(int width, int height)
{
/* We have to resize the pixmap to get it complete on the screen */
TQImage image=m_originalPixmap.convertToImage();
- m_originalPixmap.convertFromImage( image.smoothScale( width, height, TQ_ScaleMin ) );
+ m_originalPixmap.convertFromImage( image.smoothScale( width, height, TQImage::ScaleMin ) );
//m_originalPixmap.convertFromImage( KImageEffect::sample( image, width, height ) );
double oldZoomFactor = m_zoomFactor;
m_zoomFactor=m_originalPixmap.width()/(double)m_unzoomedPixmap.width();
diff --git a/libtdepim/kpixmapregionselectorwidget.h b/libtdepim/kpixmapregionselectorwidget.h
index 9af02c2c..7a90e2ac 100644
--- a/libtdepim/kpixmapregionselectorwidget.h
+++ b/libtdepim/kpixmapregionselectorwidget.h
@@ -46,7 +46,7 @@ namespace KPIM {
*/
class KPixmapRegionSelectorWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/kprefsdialog.cpp b/libtdepim/kprefsdialog.cpp
index ae24bc22..b910dc33 100644
--- a/libtdepim/kprefsdialog.cpp
+++ b/libtdepim/kprefsdialog.cpp
@@ -103,7 +103,7 @@ KPrefsWidBool::KPrefsWidBool( TDEConfigSkeleton::ItemBool *item, TQWidget *paren
: mItem( item )
{
mCheck = new TQCheckBox( item->label(), parent);
- connect( mCheck, TQT_SIGNAL( clicked() ), TQT_SIGNAL( changed() ) );
+ connect( mCheck, TQ_SIGNAL( clicked() ), TQ_SIGNAL( changed() ) );
if ( !item->whatsThis().isNull() ) {
TQWhatsThis::add( mCheck, item->whatsThis() );
}
@@ -144,7 +144,7 @@ KPrefsWidInt::KPrefsWidInt( TDEConfigSkeleton::ItemInt *item,
if ( !item->maxValue().isNull() ) {
mSpin->setMaxValue( item->maxValue().toInt() );
}
- connect( mSpin, TQT_SIGNAL( valueChanged( int ) ), TQT_SIGNAL( changed() ) );
+ connect( mSpin, TQ_SIGNAL( valueChanged( int ) ), TQ_SIGNAL( changed() ) );
mLabel->setBuddy( mSpin );
TQString whatsThis = mItem->whatsThis();
if ( !whatsThis.isEmpty() ) {
@@ -187,7 +187,7 @@ KPrefsWidColor::KPrefsWidColor( TDEConfigSkeleton::ItemColor *item,
: mItem( item )
{
mButton = new KColorButton( parent );
- connect( mButton, TQT_SIGNAL( changed( const TQColor & ) ), TQT_SIGNAL( changed() ) );
+ connect( mButton, TQ_SIGNAL( changed( const TQColor & ) ), TQ_SIGNAL( changed() ) );
mLabel = new TQLabel( mButton, mItem->label()+':', parent );
mLabel->setBuddy( mButton );
TQString whatsThis = mItem->whatsThis();
@@ -232,7 +232,7 @@ KPrefsWidFont::KPrefsWidFont( TDEConfigSkeleton::ItemFont *item,
mPreview->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
mButton = new TQPushButton( i18n("Choose..."), parent );
- connect( mButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectFont() ) );
+ connect( mButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectFont() ) );
TQString whatsThis = mItem->whatsThis();
if (!whatsThis.isNull()) {
TQWhatsThis::add(mPreview, whatsThis);
@@ -287,7 +287,7 @@ KPrefsWidTime::KPrefsWidTime( TDEConfigSkeleton::ItemDateTime *item,
mLabel = new TQLabel( mItem->label()+':', parent );
mTimeEdit = new KTimeEdit( parent );
mLabel->setBuddy( mTimeEdit );
- connect( mTimeEdit, TQT_SIGNAL( timeChanged( TQTime ) ), TQT_SIGNAL( changed() ) );
+ connect( mTimeEdit, TQ_SIGNAL( timeChanged( TQTime ) ), TQ_SIGNAL( changed() ) );
TQString whatsThis = mItem->whatsThis();
if ( !whatsThis.isNull() ) {
TQWhatsThis::add( mTimeEdit, whatsThis );
@@ -330,7 +330,7 @@ KPrefsWidDuration::KPrefsWidDuration( TDEConfigSkeleton::ItemDateTime *item,
mTimeEdit->setDisplay( TQTimeEdit::Hours | TQTimeEdit::Minutes );
mTimeEdit->setRange( TQTime( 0, 1 ), TQTime( 24, 0 ) ); // [1min, 24hr]
connect( mTimeEdit,
- TQT_SIGNAL( valueChanged( const TQTime & ) ), TQT_SIGNAL( changed() ) );
+ TQ_SIGNAL( valueChanged( const TQTime & ) ), TQ_SIGNAL( changed() ) );
TQString whatsThis = mItem->whatsThis();
if ( !whatsThis.isNull() ) {
TQWhatsThis::add( mTimeEdit, whatsThis );
@@ -367,7 +367,7 @@ KPrefsWidDate::KPrefsWidDate( TDEConfigSkeleton::ItemDateTime *item,
mLabel = new TQLabel( mItem->label()+':', parent );
mDateEdit = new KDateEdit( parent );
mLabel->setBuddy( mDateEdit );
- connect( mDateEdit, TQT_SIGNAL( dateChanged( const TQDate& ) ), TQT_SIGNAL( changed() ) );
+ connect( mDateEdit, TQ_SIGNAL( dateChanged( const TQDate& ) ), TQ_SIGNAL( changed() ) );
TQString whatsThis = mItem->whatsThis();
if ( !whatsThis.isNull() ) {
TQWhatsThis::add( mDateEdit, whatsThis );
@@ -401,8 +401,8 @@ KPrefsWidRadios::KPrefsWidRadios( TDEConfigSkeleton::ItemEnum *item,
TQWidget *parent )
: mItem( item )
{
- mBox = new TQButtonGroup( 1, Qt::Horizontal, mItem->label(), parent );
- connect( mBox, TQT_SIGNAL( clicked( int ) ), TQT_SIGNAL( changed() ) );
+ mBox = new TQButtonGroup( 1, TQt::Horizontal, mItem->label(), parent );
+ connect( mBox, TQ_SIGNAL( clicked( int ) ), TQ_SIGNAL( changed() ) );
}
KPrefsWidRadios::~KPrefsWidRadios()
@@ -446,7 +446,7 @@ KPrefsWidCombo::KPrefsWidCombo( TDEConfigSkeleton::ItemEnum *item,
TQHBox *hbox = new TQHBox(parent);
new TQLabel( mItem->label(), hbox );
mCombo = new TQComboBox( hbox );
- connect( mCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) );
+ connect( mCombo, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( changed() ) );
}
KPrefsWidCombo::~KPrefsWidCombo()
@@ -483,8 +483,8 @@ KPrefsWidString::KPrefsWidString( TDEConfigSkeleton::ItemString *item,
mLabel = new TQLabel( mItem->label()+':', parent );
mEdit = new TQLineEdit( parent );
mLabel->setBuddy( mEdit );
- connect( mEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- TQT_SIGNAL( changed() ) );
+ connect( mEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ TQ_SIGNAL( changed() ) );
mEdit->setEchoMode( echomode );
TQString whatsThis = mItem->whatsThis();
if ( !whatsThis.isNull() ) {
@@ -534,8 +534,8 @@ KPrefsWidPath::KPrefsWidPath( TDEConfigSkeleton::ItemPath *item, TQWidget *paren
mLabel->setBuddy( mURLRequester );
mURLRequester->setMode( mode );
mURLRequester->setFilter( filter );
- connect( mURLRequester, TQT_SIGNAL( textChanged( const TQString & ) ),
- TQT_SIGNAL( changed() ) );
+ connect( mURLRequester, TQ_SIGNAL( textChanged( const TQString & ) ),
+ TQ_SIGNAL( changed() ) );
TQString whatsThis = mItem->whatsThis();
if ( !whatsThis.isNull() ) {
TQWhatsThis::add( mURLRequester, whatsThis );
@@ -742,8 +742,8 @@ KPrefsDialog::KPrefsDialog( TDEConfigSkeleton *prefs, TQWidget *parent, char *na
// TODO: This seems to cause a crash on exit. Investigate later.
// mPrefsWids.setAutoDelete(true);
-// connect(this,TQT_SIGNAL(defaultClicked()),TQT_SLOT(setDefaults()));
- connect(this,TQT_SIGNAL(cancelClicked()),TQT_SLOT(reject()));
+// connect(this,TQ_SIGNAL(defaultClicked()),TQ_SLOT(setDefaults()));
+ connect(this,TQ_SIGNAL(cancelClicked()),TQ_SLOT(reject()));
}
KPrefsDialog::~KPrefsDialog()
@@ -869,7 +869,7 @@ void KPrefsModule::addWid( KPrefsWid *wid )
{
KPrefsWidManager::addWid( wid );
- connect( wid, TQT_SIGNAL( changed() ), TQT_SLOT( slotWidChanged() ) );
+ connect( wid, TQ_SIGNAL( changed() ), TQ_SLOT( slotWidChanged() ) );
}
void KPrefsModule::slotWidChanged()
diff --git a/libtdepim/kprefsdialog.h b/libtdepim/kprefsdialog.h
index 86c7b81f..080d592e 100644
--- a/libtdepim/kprefsdialog.h
+++ b/libtdepim/kprefsdialog.h
@@ -57,7 +57,7 @@ class KURLRequester;
*/
class KDE_EXPORT KPrefsWid : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -278,7 +278,7 @@ class KDE_EXPORT KPrefsWidDate : public KPrefsWid
*/
class KDE_EXPORT KPrefsWidColor : public KPrefsWid
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -321,7 +321,7 @@ class KDE_EXPORT KPrefsWidColor : public KPrefsWid
*/
class KDE_EXPORT KPrefsWidFont : public KPrefsWid
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -720,7 +720,7 @@ class KDE_EXPORT KPrefsWidManager
*/
class KDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -774,7 +774,7 @@ class KDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager
class KDE_EXPORT KPrefsModule : public TDECModule, public KPrefsWidManager
{
- Q_OBJECT
+ TQ_OBJECT
public:
KPrefsModule( TDEConfigSkeleton *, TQWidget *parent = 0, const char *name = 0 );
diff --git a/libtdepim/krsqueezedtextlabel.h b/libtdepim/krsqueezedtextlabel.h
index 877c2c8f..518493c1 100644
--- a/libtdepim/krsqueezedtextlabel.h
+++ b/libtdepim/krsqueezedtextlabel.h
@@ -39,7 +39,7 @@
* TQLabel
*/
class KDE_EXPORT KRSqueezedTextLabel : public TQLabel {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/kscoring.cpp b/libtdepim/kscoring.cpp
index e447ac7e..b0ebf72d 100644
--- a/libtdepim/kscoring.cpp
+++ b/libtdepim/kscoring.cpp
@@ -18,8 +18,6 @@
#undef TQT_NO_ASCII_CAST
#endif
-#undef TQT_NO_COMPAT
-
#include <iostream>
#include <tqfile.h>
@@ -86,7 +84,7 @@ NotifyDialog::NotifyDialog(TQWidget* p)
TQCheckBox *check = new TQCheckBox(i18n("Do not show this message again"),f);
check->setChecked(true);
topL->addWidget(check);
- connect(check,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowAgainToggled(bool)));
+ connect(check,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotShowAgainToggled(bool)));
}
void NotifyDialog::slotShowAgainToggled(bool flag)
diff --git a/libtdepim/kscoring.h b/libtdepim/kscoring.h
index d901d0bf..07ddb178 100644
--- a/libtdepim/kscoring.h
+++ b/libtdepim/kscoring.h
@@ -302,7 +302,7 @@ private:
// Manages the score rules.
class KDE_EXPORT KScoringManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -409,7 +409,7 @@ class KDE_EXPORT KScoringManager : public TQObject
//----------------------------------------------------------------------------
class KDE_EXPORT NotifyDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
static void display(ScorableArticle&,const TQString&);
diff --git a/libtdepim/kscoringeditor.cpp b/libtdepim/kscoringeditor.cpp
index 7942e4ef..1a536e82 100644
--- a/libtdepim/kscoringeditor.cpp
+++ b/libtdepim/kscoringeditor.cpp
@@ -15,8 +15,6 @@
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US
*/
-#undef TQT_NO_COMPAT
-
#include "kscoring.h"
#include "kscoringeditor.h"
@@ -78,7 +76,7 @@ SingleConditionWidget::SingleConditionWidget(KScoringManager *m,TQWidget *p, con
matches->insertStringList(KScoringExpression::conditionNames());
TQToolTip::add(matches,i18n("Select the type of match"));
firstRow->addWidget(matches,1);
- connect( matches, TQT_SIGNAL( activated( int ) ), TQT_SLOT( toggleRegExpButton( int ) ) );
+ connect( matches, TQ_SIGNAL( activated( int ) ), TQ_SLOT( toggleRegExpButton( int ) ) );
TQHBoxLayout *secondRow = new TQHBoxLayout( topL );
secondRow->setSpacing( 1 );
expr = new KLineEdit( this );
@@ -88,7 +86,7 @@ SingleConditionWidget::SingleConditionWidget(KScoringManager *m,TQWidget *p, con
secondRow->addWidget( expr );
regExpButton = new TQPushButton( i18n("Edit..."), this );
secondRow->addWidget( regExpButton );
- connect( regExpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( showRegExpDialog() ) );
+ connect( regExpButton, TQ_SIGNAL( clicked() ), TQ_SLOT( showRegExpDialog() ) );
// occupy at much width as possible
setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed));
@@ -253,7 +251,7 @@ SingleActionWidget::SingleActionWidget(KScoringManager *m,TQWidget *p, const cha
}
}
- connect(types,TQT_SIGNAL(activated(int)),stack,TQT_SLOT(raiseWidget(int)));
+ connect(types,TQ_SIGNAL(activated(int)),stack,TQ_SLOT(raiseWidget(int)));
// raise the dummy label
types->setCurrentItem(0);
@@ -415,7 +413,7 @@ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n)
groupL->addWidget( groupsLabel, 2, 0 );
TQPushButton *groupsBtn = new TQPushButton(i18n("A&dd Group"), groupB);
- connect(groupsBtn,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddGroup()));
+ connect(groupsBtn,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddGroup()));
groupL->addWidget( groupsBtn, 3, 0 );
groupsBox = new KComboBox( false, groupB, "groupsBox" );
@@ -430,15 +428,15 @@ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n)
expireEdit = new KIntSpinBox(1,99999,1,30,10, groupB, "expireWidget");
//Init suffix
slotExpireEditChanged(30);
- connect(expireEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotExpireEditChanged(int)));
+ connect(expireEdit, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotExpireEditChanged(int)));
groupL->addWidget( expireEdit, 5, 1 );
expireLabel = new TQLabel(expireEdit, i18n("&Rule is valid for:"), groupB, "expireLabel");
groupL->addWidget( expireLabel, 5, 0 );
expireLabel->setEnabled(false);
expireEdit->setEnabled(false);
- connect(expireCheck, TQT_SIGNAL(toggled(bool)), expireLabel, TQT_SLOT(setEnabled(bool)));
- connect(expireCheck, TQT_SIGNAL(toggled(bool)), expireEdit, TQT_SLOT(setEnabled(bool)));
+ connect(expireCheck, TQ_SIGNAL(toggled(bool)), expireLabel, TQ_SLOT(setEnabled(bool)));
+ connect(expireCheck, TQ_SIGNAL(toggled(bool)), expireEdit, TQ_SLOT(setEnabled(bool)));
//------------- Conditions ---------------------
TQGroupBox *groupConds = new TQGroupBox(i18n("Conditions"), this);
@@ -459,7 +457,7 @@ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n)
condEditor = new ConditionEditWidget(manager,groupConds);
condL->addMultiCellWidget(condEditor, 2,2, 0,1);
- connect(condEditor,TQT_SIGNAL(widgetRemoved()),this,TQT_SLOT(slotShrink()));
+ connect(condEditor,TQ_SIGNAL(widgetRemoved()),this,TQ_SLOT(slotShrink()));
//------------- Actions ---------------------
TQGroupBox *groupActions = new TQGroupBox(i18n("Actions"), this);
@@ -468,7 +466,7 @@ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n)
actionL->addSpacing(fontMetrics().lineSpacing()-4);
actionEditor = new ActionEditWidget(manager,groupActions);
actionL->addWidget(actionEditor);
- connect(actionEditor,TQT_SIGNAL(widgetRemoved()),this,TQT_SLOT(slotShrink()));
+ connect(actionEditor,TQ_SIGNAL(widgetRemoved()),this,TQ_SLOT(slotShrink()));
topLayout->addStretch(1);
@@ -602,13 +600,13 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p,
TQVBoxLayout *topL = new TQVBoxLayout(this,standalone? 0:5,KDialog::spacingHint());
ruleList = new TDEListBox(this);
if (standalone) {
- connect(ruleList,TQT_SIGNAL(doubleClicked(TQListBoxItem*)),
- this,TQT_SLOT(slotEditRule(TQListBoxItem*)));
- connect(ruleList,TQT_SIGNAL(returnPressed(TQListBoxItem*)),
- this,TQT_SLOT(slotEditRule(TQListBoxItem*)));
+ connect(ruleList,TQ_SIGNAL(doubleClicked(TQListBoxItem*)),
+ this,TQ_SLOT(slotEditRule(TQListBoxItem*)));
+ connect(ruleList,TQ_SIGNAL(returnPressed(TQListBoxItem*)),
+ this,TQ_SLOT(slotEditRule(TQListBoxItem*)));
}
- connect(ruleList, TQT_SIGNAL(currentChanged(TQListBoxItem*)),
- this, TQT_SLOT(slotRuleSelected(TQListBoxItem*)));
+ connect(ruleList, TQ_SIGNAL(currentChanged(TQListBoxItem*)),
+ this, TQ_SLOT(slotRuleSelected(TQListBoxItem*)));
topL->addWidget(ruleList);
TQHBoxLayout *btnL = new TQHBoxLayout( topL, KDialog::spacingHint() );
@@ -616,12 +614,12 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p,
mRuleUp->setPixmap( BarIcon( "go-up", TDEIcon::SizeSmall ) );
TQToolTip::add( mRuleUp, i18n("Move rule up") );
btnL->addWidget( mRuleUp );
- connect( mRuleUp, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRuleUp() ) );
+ connect( mRuleUp, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRuleUp() ) );
mRuleDown = new TQPushButton( this );
mRuleDown->setPixmap( BarIcon( "go-down", TDEIcon::SizeSmall ) );
TQToolTip::add( mRuleDown, i18n("Move rule down") );
btnL->addWidget( mRuleDown );
- connect( mRuleDown, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRuleDown() ) );
+ connect( mRuleDown, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRuleDown() ) );
btnL = new TQHBoxLayout( topL, KDialog::spacingHint() );
editRule=0L;
@@ -629,25 +627,25 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p,
newRule->setPixmap( BarIcon( "document-new", TDEIcon::SizeSmall ) );
TQToolTip::add(newRule,i18n("New rule")),
btnL->addWidget(newRule);
- connect(newRule, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewRule()));
+ connect(newRule, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewRule()));
// if we're standalone, we need an additional edit button
if (standalone) {
editRule = new TQPushButton(this);
editRule->setIconSet( BarIconSet("edit", TDEIcon::SizeSmall) );
TQToolTip::add(editRule,i18n("Edit rule"));
btnL->addWidget(editRule);
- connect(editRule,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotEditRule()));
+ connect(editRule,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotEditRule()));
}
delRule = new TQPushButton(this);
delRule->setIconSet( BarIconSet( "edit-delete", TDEIcon::SizeSmall ) );
TQToolTip::add(delRule,i18n("Remove rule"));
btnL->addWidget(delRule);
- connect(delRule, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelRule()));
+ connect(delRule, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelRule()));
copyRule = new TQPushButton(this);
copyRule->setIconSet(BarIconSet("edit-copy", TDEIcon::SizeSmall));
TQToolTip::add(copyRule,i18n("Copy rule"));
btnL->addWidget(copyRule);
- connect(copyRule, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCopyRule()));
+ connect(copyRule, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCopyRule()));
// the group filter
TQBoxLayout *filterL = new TQVBoxLayout(topL,KDialog::spacingHint());
@@ -656,17 +654,17 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p,
filterBox->insertItem(i18n("<all groups>"));
filterBox->insertStringList(l);
filterBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
- connect(filterBox,TQT_SIGNAL(activated(const TQString&)),
- this,TQT_SLOT(slotGroupFilter(const TQString&)));
+ connect(filterBox,TQ_SIGNAL(activated(const TQString&)),
+ this,TQ_SLOT(slotGroupFilter(const TQString&)));
slotGroupFilter(i18n("<all groups>"));
TQLabel *lab = new TQLabel(filterBox,i18n("Sho&w only rules for group:"),this);
filterL->addWidget(lab);
filterL->addWidget(filterBox);
- connect(manager,TQT_SIGNAL(changedRules()),
- this,TQT_SLOT(updateRuleList()));
- connect(manager,TQT_SIGNAL(changedRuleName(const TQString&,const TQString&)),
- this,TQT_SLOT(slotRuleNameChanged(const TQString&,const TQString&)));
+ connect(manager,TQ_SIGNAL(changedRules()),
+ this,TQ_SLOT(updateRuleList()));
+ connect(manager,TQ_SIGNAL(changedRuleName(const TQString&,const TQString&)),
+ this,TQ_SLOT(slotRuleNameChanged(const TQString&,const TQString&)));
updateRuleList();
updateButton();
@@ -874,12 +872,12 @@ KScoringEditor::KScoringEditor(KScoringManager* m,
hbl->addWidget(ruleLister);
ruleEditor = new RuleEditWidget(manager,w);
hbl->addWidget(ruleEditor);
- connect(ruleLister,TQT_SIGNAL(ruleSelected(const TQString&)),
- ruleEditor, TQT_SLOT(slotEditRule(const TQString&)));
- connect(ruleLister, TQT_SIGNAL(leavingRule()),
- ruleEditor, TQT_SLOT(updateRule()));
- connect(ruleEditor, TQT_SIGNAL(shrink()), TQT_SLOT(slotShrink()));
- connect(this,TQT_SIGNAL(finished()),TQT_SLOT(slotFinished()));
+ connect(ruleLister,TQ_SIGNAL(ruleSelected(const TQString&)),
+ ruleEditor, TQ_SLOT(slotEditRule(const TQString&)));
+ connect(ruleLister, TQ_SIGNAL(leavingRule()),
+ ruleEditor, TQ_SLOT(updateRule()));
+ connect(ruleEditor, TQ_SIGNAL(shrink()), TQ_SLOT(slotShrink()));
+ connect(this,TQ_SIGNAL(finished()),TQ_SLOT(slotFinished()));
ruleLister->slotRuleSelected(0);
resize(550, sizeHint().height());
}
@@ -911,7 +909,7 @@ void KScoringEditor::setRule(KScoringRule* r)
void KScoringEditor::slotShrink()
{
- TQTimer::singleShot(5, this, TQT_SLOT(slotDoShrink()));
+ TQTimer::singleShot(5, this, TQ_SLOT(slotDoShrink()));
}
void KScoringEditor::slotDoShrink()
@@ -966,7 +964,7 @@ KScoringEditorWidgetDialog::KScoringEditorWidgetDialog(KScoringManager *m, const
TQFrame *f = makeMainWidget();
TQBoxLayout *topL = new TQVBoxLayout(f);
ruleEditor = new RuleEditWidget(manager,f);
- connect(ruleEditor, TQT_SIGNAL(shrink()), TQT_SLOT(slotShrink()));
+ connect(ruleEditor, TQ_SIGNAL(shrink()), TQ_SLOT(slotShrink()));
topL->addWidget(ruleEditor);
ruleEditor->slotEditRule(ruleName);
resize(0,0);
@@ -989,7 +987,7 @@ void KScoringEditorWidgetDialog::slotOk()
void KScoringEditorWidgetDialog::slotShrink()
{
- TQTimer::singleShot(5, this, TQT_SLOT(slotDoShrink()));
+ TQTimer::singleShot(5, this, TQ_SLOT(slotDoShrink()));
}
void KScoringEditorWidgetDialog::slotDoShrink()
@@ -1010,8 +1008,8 @@ KScoringEditorWidget::KScoringEditorWidget(KScoringManager *m,TQWidget *p, const
TQBoxLayout *topL = new TQVBoxLayout(this);
ruleLister = new RuleListWidget(manager,true,this);
topL->addWidget(ruleLister);
- connect(ruleLister,TQT_SIGNAL(ruleEdited(const TQString&)),
- this,TQT_SLOT(slotRuleEdited(const TQString &)));
+ connect(ruleLister,TQ_SIGNAL(ruleEdited(const TQString&)),
+ this,TQ_SLOT(slotRuleEdited(const TQString &)));
}
KScoringEditorWidget::~KScoringEditorWidget()
diff --git a/libtdepim/kscoringeditor.h b/libtdepim/kscoringeditor.h
index 33677662..8df84e17 100644
--- a/libtdepim/kscoringeditor.h
+++ b/libtdepim/kscoringeditor.h
@@ -51,7 +51,7 @@ class KColorCombo;
*/
class KDE_EXPORT SingleConditionWidget : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
friend class ConditionEditWidget;
public:
@@ -84,7 +84,7 @@ private:
*/
class ConditionEditWidget: public KWidgetLister
{
- Q_OBJECT
+ TQ_OBJECT
public:
ConditionEditWidget(KScoringManager *,TQWidget *p =0, const char *n =0);
@@ -103,7 +103,7 @@ private:
*/
class SingleActionWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
friend class ActionEditWidget;
public:
@@ -133,7 +133,7 @@ private:
*/
class KDE_EXPORT ActionEditWidget : public KWidgetLister
{
- Q_OBJECT
+ TQ_OBJECT
public:
ActionEditWidget(KScoringManager *m,TQWidget *p =0, const char *n =0);
@@ -151,7 +151,7 @@ private:
*/
class RuleEditWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
RuleEditWidget(KScoringManager *m,TQWidget *p =0, const char *n =0);
@@ -202,7 +202,7 @@ private:
*/
class KDE_EXPORT RuleListWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
RuleListWidget(KScoringManager *m, bool =false, TQWidget *p =0, const char *n =0);
@@ -253,7 +253,7 @@ private:
class KDE_EXPORT KScoringEditor : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
~KScoringEditor();
@@ -284,7 +284,7 @@ private:
class KScoringEditorWidgetDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KScoringEditorWidgetDialog(KScoringManager *m, const TQString& rName, TQWidget *parent=0, const char *name=0);
@@ -301,7 +301,7 @@ private:
class KDE_EXPORT KScoringEditorWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KScoringEditorWidget(KScoringManager *m,TQWidget *p =0, const char *n =0);
diff --git a/libtdepim/ksubscription.cpp b/libtdepim/ksubscription.cpp
index d72776bc..7bb7179d 100644
--- a/libtdepim/ksubscription.cpp
+++ b/libtdepim/ksubscription.cpp
@@ -227,7 +227,7 @@ KSubscription::KSubscription( TQWidget *parent, const TQString &caption,
TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", TDEIcon::Small, 0 ) );
filterEdit = new KLineEdit(page);
TQLabel *l = new TQLabel(filterEdit,i18n("S&earch:"), page);
- connect( clearButton, TQT_SIGNAL( clicked() ), filterEdit, TQT_SLOT( clear() ) );
+ connect( clearButton, TQ_SIGNAL( clicked() ), filterEdit, TQ_SLOT( clear() ) );
// checkboxes
noTreeCB = new TQCheckBox(i18n("Disable &tree view"), page);
@@ -323,29 +323,29 @@ KSubscription::KSubscription( TQWidget *parent, const TQString &caption,
filterEdit->setFocus();
// items clicked
- connect(groupView, TQT_SIGNAL(clicked(TQListViewItem *)),
- this, TQT_SLOT(slotChangeButtonState(TQListViewItem*)));
- connect(subView, TQT_SIGNAL(clicked(TQListViewItem *)),
- this, TQT_SLOT(slotChangeButtonState(TQListViewItem*)));
- connect(unsubView, TQT_SIGNAL(clicked(TQListViewItem *)),
- this, TQT_SLOT(slotChangeButtonState(TQListViewItem*)));
+ connect(groupView, TQ_SIGNAL(clicked(TQListViewItem *)),
+ this, TQ_SLOT(slotChangeButtonState(TQListViewItem*)));
+ connect(subView, TQ_SIGNAL(clicked(TQListViewItem *)),
+ this, TQ_SLOT(slotChangeButtonState(TQListViewItem*)));
+ connect(unsubView, TQ_SIGNAL(clicked(TQListViewItem *)),
+ this, TQ_SLOT(slotChangeButtonState(TQListViewItem*)));
// connect buttons
- connect(arrowBtn1, TQT_SIGNAL(clicked()), TQT_SLOT(slotButton1()));
- connect(arrowBtn2, TQT_SIGNAL(clicked()), TQT_SLOT(slotButton2()));
- connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotLoadFolders()));
+ connect(arrowBtn1, TQ_SIGNAL(clicked()), TQ_SLOT(slotButton1()));
+ connect(arrowBtn2, TQ_SIGNAL(clicked()), TQ_SLOT(slotButton2()));
+ connect(this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotLoadFolders()));
// connect checkboxes
- connect(subCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotCBToggled()));
- connect(newCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotCBToggled()));
- connect(noTreeCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotCBToggled()));
+ connect(subCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotCBToggled()));
+ connect(newCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotCBToggled()));
+ connect(noTreeCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotCBToggled()));
// connect textfield
- connect(filterEdit, TQT_SIGNAL(textChanged(const TQString&)),
- TQT_SLOT(slotFilterTextChanged(const TQString&)));
+ connect(filterEdit, TQ_SIGNAL(textChanged(const TQString&)),
+ TQ_SLOT(slotFilterTextChanged(const TQString&)));
// update status
- connect(this, TQT_SIGNAL(listChanged()), TQT_SLOT(slotUpdateStatusLabel()));
+ connect(this, TQ_SIGNAL(listChanged()), TQ_SLOT(slotUpdateStatusLabel()));
}
//-----------------------------------------------------------------------------
diff --git a/libtdepim/ksubscription.h b/libtdepim/ksubscription.h
index 27b5695c..c2d71050 100644
--- a/libtdepim/ksubscription.h
+++ b/libtdepim/ksubscription.h
@@ -187,7 +187,7 @@ class KDE_EXPORT GroupItem : public TQCheckListItem
class KDE_EXPORT KSubscription : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/ktimeedit.cpp b/libtdepim/ktimeedit.cpp
index edb871e8..4dd66280 100644
--- a/libtdepim/ktimeedit.cpp
+++ b/libtdepim/ktimeedit.cpp
@@ -43,7 +43,7 @@
class KOTimeValidator : public TQValidator
{
public:
- KOTimeValidator(TQWidget* parent, const char* name=0) : TQValidator(TQT_TQOBJECT(parent), name) {}
+ KOTimeValidator(TQWidget* parent, const char* name=0) : TQValidator(parent, name) {}
virtual State validate(TQString& str, int& /*cursorPos*/) const
{
@@ -126,11 +126,11 @@ KTimeEdit::KTimeEdit( TQWidget *parent, TQTime qt, const char *name )
insertItem( TDEGlobal::locale()->formatTime( TQTime( 23, 59, 59 ) ) );
updateText();
- setFocusPolicy(TQ_StrongFocus);
+ setFocusPolicy(TQWidget::StrongFocus);
- connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(active(int)));
- connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(hilit(int)));
- connect(this, TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(changedText()));
+ connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(active(int)));
+ connect(this, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(hilit(int)));
+ connect(this, TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(changedText()));
}
KTimeEdit::~KTimeEdit()
diff --git a/libtdepim/ktimeedit.h b/libtdepim/ktimeedit.h
index 554128b6..a4dbc754 100644
--- a/libtdepim/ktimeedit.h
+++ b/libtdepim/ktimeedit.h
@@ -43,7 +43,7 @@
*/
class KDE_EXPORT KTimeEdit : public TQComboBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** constructs a new time edit. */
diff --git a/libtdepim/kvcarddrag.h b/libtdepim/kvcarddrag.h
index 8ac98042..9a9cfda3 100644
--- a/libtdepim/kvcarddrag.h
+++ b/libtdepim/kvcarddrag.h
@@ -39,7 +39,7 @@ class KVCardDragPrivate;
*/
class KDE_EXPORT KVCardDrag : public TQStoredDrag
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/kwidgetlister.cpp b/libtdepim/kwidgetlister.cpp
index d279c8bc..0ad66de7 100644
--- a/libtdepim/kwidgetlister.cpp
+++ b/libtdepim/kwidgetlister.cpp
@@ -71,12 +71,12 @@ KWidgetLister::KWidgetLister( int minWidgets, int maxWidgets, TQWidget *parent,
mButtonBox->setStretchFactor( mBtnClear, 0 );
//---------- connect everything
- connect( mBtnMore, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotMore()) );
- connect( mBtnFewer, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotFewer()) );
- connect( mBtnClear, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotClear()) );
+ connect( mBtnMore, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotMore()) );
+ connect( mBtnFewer, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotFewer()) );
+ connect( mBtnClear, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotClear()) );
enableControls();
}
diff --git a/libtdepim/kwidgetlister.h b/libtdepim/kwidgetlister.h
index 95716430..4924f684 100644
--- a/libtdepim/kwidgetlister.h
+++ b/libtdepim/kwidgetlister.h
@@ -64,7 +64,7 @@ class TQHBox;
class KDE_EXPORT KWidgetLister : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KWidgetLister( int minWidgets=1, int maxWidgets=8, TQWidget* parent=0, const char* name=0 );
diff --git a/libtdepim/kxface.h b/libtdepim/kxface.h
index a78f411d..ce7e98b3 100644
--- a/libtdepim/kxface.h
+++ b/libtdepim/kxface.h
@@ -521,7 +521,7 @@ namespace KPIM {
class KDE_EXPORT KXFace : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/ldapclient.cpp b/libtdepim/ldapclient.cpp
index 8e478388..55d8362b 100644
--- a/libtdepim/ldapclient.cpp
+++ b/libtdepim/ldapclient.cpp
@@ -137,12 +137,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()
@@ -345,8 +345,8 @@ LdapSearch::LdapSearch()
}
readConfig();
- connect(KDirWatch::self(), TQT_SIGNAL(dirty (const TQString&)),this,
- TQT_SLOT(slotFileChanged(const TQString&)));
+ connect(KDirWatch::self(), TQ_SIGNAL(dirty (const TQString&)),this,
+ TQ_SLOT(slotFileChanged(const TQString&)));
}
void LdapSearch::readWeighForClient( LdapClient *client, TDEConfig *config, int clientNumber )
@@ -394,17 +394,17 @@ void LdapSearch::readConfig()
attrs << "cn" << "mail" << "givenname" << "sn" << "objectClass";
ldapClient->setAttrs( attrs );
- connect( ldapClient, TQT_SIGNAL( result( const KPIM::LdapObject& ) ),
- this, TQT_SLOT( slotLDAPResult( const KPIM::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 KPIM::LdapObject& ) ),
+ this, TQ_SLOT( slotLDAPResult( const KPIM::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() ) );
}
mConfigFile = locateLocal( "config", "kabldaprc" );
KDirWatch::self()->addFile( mConfigFile );
diff --git a/libtdepim/ldapclient.h b/libtdepim/ldapclient.h
index b1d8814c..a6249f7a 100644
--- a/libtdepim/ldapclient.h
+++ b/libtdepim/ldapclient.h
@@ -141,7 +141,7 @@ class LdapObject
*/
class KDE_EXPORT LdapClient : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -245,7 +245,7 @@ typedef TQValueList<LdapResult> LdapResultList;
*/
class KDE_EXPORT LdapSearch : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp
index 17f1d984..26cc3d24 100644
--- a/libtdepim/ldapsearchdialog.cpp
+++ b/libtdepim/ldapsearchdialog.cpp
@@ -136,7 +136,7 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name )
page );
groupBox->setFrameShape( TQGroupBox::Box );
groupBox->setFrameShadow( TQGroupBox::Sunken );
- groupBox->setColumnLayout( 0, Qt::Vertical );
+ groupBox->setColumnLayout( 0, TQt::Vertical );
TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 2,
5, spacingHint() );
boxLayout->setColStretch( 1, 1 );
@@ -195,10 +195,10 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name )
mNumHosts = 0;
mIsOK = false;
- connect( mRecursiveCheckbox, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotSetScope( bool ) ) );
- connect( mSearchButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotStartSearch() ) );
+ connect( mRecursiveCheckbox, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotSetScope( bool ) ) );
+ connect( mSearchButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotStartSearch() ) );
setTabOrder(mSearchEdit, mFilterCombo);
setTabOrder(mFilterCombo, mSearchButton);
@@ -258,7 +258,7 @@ void LDAPSearchDialog::restoreSettings()
if ( !pwdBindDN.isEmpty() )
ldapServer.setPwdBindDN( pwdBindDN );
- KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, TQT_TQOBJECT(this), "ldapclient" );
+ KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, this, "ldapclient" );
ldapClient->setServer( ldapServer );
TQStringList attrs;
@@ -268,12 +268,12 @@ void LDAPSearchDialog::restoreSettings()
ldapClient->setAttrs( attrs );
- connect( ldapClient, TQT_SIGNAL( result( const KPIM::LdapObject& ) ),
- this, TQT_SLOT( slotAddResult( const KPIM::LdapObject& ) ) );
- connect( ldapClient, TQT_SIGNAL( done() ),
- this, TQT_SLOT( slotSearchDone() ) );
- connect( ldapClient, TQT_SIGNAL( error( const TQString& ) ),
- this, TQT_SLOT( slotError( const TQString& ) ) );
+ connect( ldapClient, TQ_SIGNAL( result( const KPIM::LdapObject& ) ),
+ this, TQ_SLOT( slotAddResult( const KPIM::LdapObject& ) ) );
+ connect( ldapClient, TQ_SIGNAL( done() ),
+ this, TQ_SLOT( slotSearchDone() ) );
+ connect( ldapClient, TQ_SIGNAL( error( const TQString& ) ),
+ this, TQ_SLOT( slotError( const TQString& ) ) );
mLdapClientList.append( ldapClient );
}
@@ -378,10 +378,10 @@ void LDAPSearchDialog::slotStartSearch()
TQApplication::setOverrideCursor( TQt::waitCursor );
mSearchButton->setText( i18n( "Stop" ) );
- disconnect( mSearchButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotStartSearch() ) );
- connect( mSearchButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotStopSearch() ) );
+ disconnect( mSearchButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotStartSearch() ) );
+ connect( mSearchButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotStopSearch() ) );
bool startsWith = (mSearchType->currentItem() == 1);
@@ -410,10 +410,10 @@ void LDAPSearchDialog::slotSearchDone()
return;
}
- disconnect( mSearchButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotStopSearch() ) );
- connect( mSearchButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotStartSearch() ) );
+ disconnect( mSearchButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotStopSearch() ) );
+ connect( mSearchButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotStartSearch() ) );
mSearchButton->setText( i18n( "Search" ) );
TQApplication::restoreOverrideCursor();
diff --git a/libtdepim/ldapsearchdialog.h b/libtdepim/ldapsearchdialog.h
index 3d8c3bc2..cf33cb8a 100644
--- a/libtdepim/ldapsearchdialog.h
+++ b/libtdepim/ldapsearchdialog.h
@@ -37,7 +37,7 @@ namespace KPIM {
class LDAPSearchDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/overlaywidget.cpp b/libtdepim/overlaywidget.cpp
index 7c72883c..067e2d71 100644
--- a/libtdepim/overlaywidget.cpp
+++ b/libtdepim/overlaywidget.cpp
@@ -76,7 +76,7 @@ void OverlayWidget::setAlignWidget( TQWidget * w )
bool OverlayWidget::eventFilter( TQObject* o, TQEvent* e)
{
- if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(mAlignWidget) &&
+ if ( o == mAlignWidget &&
( e->type() == TQEvent::Move || e->type() == TQEvent::Resize ) ) {
reposition();
}
diff --git a/libtdepim/overlaywidget.h b/libtdepim/overlaywidget.h
index 7ba8d4d8..acc7fe97 100644
--- a/libtdepim/overlaywidget.h
+++ b/libtdepim/overlaywidget.h
@@ -43,7 +43,7 @@ namespace KPIM {
*/
class OverlayWidget : public TQHBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/progressdialog.cpp b/libtdepim/progressdialog.cpp
index d3a37003..e780c297 100644
--- a/libtdepim/progressdialog.cpp
+++ b/libtdepim/progressdialog.cpp
@@ -75,7 +75,7 @@ TransactionItem* TransactionItemView::addTransactionItem( ProgressItem* item, bo
{
TransactionItem *ti = new TransactionItem( mBigBox, item, first );
ti->hide();
- TQTimer::singleShot( 1000, ti, TQT_SLOT( show() ) );
+ TQTimer::singleShot( 1000, ti, TQ_SLOT( show() ) );
return ti;
}
@@ -169,8 +169,8 @@ TransactionItem::TransactionItem( TQWidget* parent,
if ( item->canBeCanceled() ) {
mCancelButton = new TQPushButton( SmallIcon( "cancel" ), TQString(), h );
TQToolTip::add( mCancelButton, i18n("Cancel this operation.") );
- connect ( mCancelButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotItemCanceled() ));
+ connect ( mCancelButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotItemCanceled() ));
}
h = new TQHBox( this );
@@ -262,7 +262,7 @@ ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const c
pbClose->setFixedSize( 16, 16 );
pbClose->setIconSet( TDEGlobal::iconLoader()->loadIconSet( "window-close", TDEIcon::Small, 14 ) );
TQToolTip::add( pbClose, i18n( "Hide detailed progress window" ) );
- connect(pbClose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose()));
+ connect(pbClose, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClose()));
TQWidget* spacer = new TQWidget( rightBox ); // don't let the close button take up all the height
rightBox->setStretchFactor( spacer, 100 );
*/
@@ -272,22 +272,22 @@ ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const c
* appearing and vanishing items.
*/
ProgressManager *pm = ProgressManager::instance();
- connect ( pm, TQT_SIGNAL( progressItemAdded( KPIM::ProgressItem* ) ),
- this, TQT_SLOT( slotTransactionAdded( KPIM::ProgressItem* ) ) );
- connect ( pm, TQT_SIGNAL( progressItemCompleted( KPIM::ProgressItem* ) ),
- this, TQT_SLOT( slotTransactionCompleted( KPIM::ProgressItem* ) ) );
- connect ( pm, TQT_SIGNAL( progressItemProgress( KPIM::ProgressItem*, unsigned int ) ),
- this, TQT_SLOT( slotTransactionProgress( KPIM::ProgressItem*, unsigned int ) ) );
- connect ( pm, TQT_SIGNAL( progressItemStatus( KPIM::ProgressItem*, const TQString& ) ),
- this, TQT_SLOT( slotTransactionStatus( KPIM::ProgressItem*, const TQString& ) ) );
- connect ( pm, TQT_SIGNAL( progressItemLabel( KPIM::ProgressItem*, const TQString& ) ),
- this, TQT_SLOT( slotTransactionLabel( KPIM::ProgressItem*, const TQString& ) ) );
- connect ( pm, TQT_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ),
- this, TQT_SLOT( slotTransactionUsesCrypto( KPIM::ProgressItem*, bool ) ) );
- connect ( pm, TQT_SIGNAL( progressItemUsesBusyIndicator(KPIM::ProgressItem*, bool) ),
- this, TQT_SLOT( slotTransactionUsesBusyIndicator( KPIM::ProgressItem*, bool ) ) );
- connect ( pm, TQT_SIGNAL( showProgressDialog() ),
- this, TQT_SLOT( slotShow() ) );
+ connect ( pm, TQ_SIGNAL( progressItemAdded( KPIM::ProgressItem* ) ),
+ this, TQ_SLOT( slotTransactionAdded( KPIM::ProgressItem* ) ) );
+ connect ( pm, TQ_SIGNAL( progressItemCompleted( KPIM::ProgressItem* ) ),
+ this, TQ_SLOT( slotTransactionCompleted( KPIM::ProgressItem* ) ) );
+ connect ( pm, TQ_SIGNAL( progressItemProgress( KPIM::ProgressItem*, unsigned int ) ),
+ this, TQ_SLOT( slotTransactionProgress( KPIM::ProgressItem*, unsigned int ) ) );
+ connect ( pm, TQ_SIGNAL( progressItemStatus( KPIM::ProgressItem*, const TQString& ) ),
+ this, TQ_SLOT( slotTransactionStatus( KPIM::ProgressItem*, const TQString& ) ) );
+ connect ( pm, TQ_SIGNAL( progressItemLabel( KPIM::ProgressItem*, const TQString& ) ),
+ this, TQ_SLOT( slotTransactionLabel( KPIM::ProgressItem*, const TQString& ) ) );
+ connect ( pm, TQ_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ),
+ this, TQ_SLOT( slotTransactionUsesCrypto( KPIM::ProgressItem*, bool ) ) );
+ connect ( pm, TQ_SIGNAL( progressItemUsesBusyIndicator(KPIM::ProgressItem*, bool) ),
+ this, TQ_SLOT( slotTransactionUsesBusyIndicator( KPIM::ProgressItem*, bool ) ) );
+ connect ( pm, TQ_SIGNAL( showProgressDialog() ),
+ this, TQ_SLOT( slotShow() ) );
}
void ProgressDialog::closeEvent( TQCloseEvent* e )
@@ -319,7 +319,7 @@ void ProgressDialog::slotTransactionAdded( ProgressItem *item )
if ( ti )
mTransactionsToListviewItems.replace( item, ti );
if ( first && mWasLastShown )
- TQTimer::singleShot( 1000, this, TQT_SLOT( slotShow() ) );
+ TQTimer::singleShot( 1000, this, TQ_SLOT( slotShow() ) );
}
}
@@ -330,14 +330,14 @@ void ProgressDialog::slotTransactionCompleted( ProgressItem *item )
TransactionItem *ti = mTransactionsToListviewItems[ item ];
mTransactionsToListviewItems.remove( item );
ti->setItemComplete();
- TQTimer::singleShot( 3000, ti, TQT_SLOT( deleteLater() ) );
+ TQTimer::singleShot( 3000, ti, TQ_SLOT( deleteLater() ) );
// see the slot for comments as to why that works
- connect ( ti, TQT_SIGNAL( destroyed() ),
- mScrollView, TQT_SLOT( slotLayoutFirstItem() ) );
+ connect ( ti, TQ_SIGNAL( destroyed() ),
+ mScrollView, TQ_SLOT( slotLayoutFirstItem() ) );
}
// This was the last item, hide.
if ( mTransactionsToListviewItems.empty() )
- TQTimer::singleShot( 3000, this, TQT_SLOT( slotHide() ) );
+ TQTimer::singleShot( 3000, this, TQ_SLOT( slotHide() ) );
}
void ProgressDialog::slotTransactionCanceled( ProgressItem* )
diff --git a/libtdepim/progressdialog.h b/libtdepim/progressdialog.h
index 051d12b3..85a82bbd 100644
--- a/libtdepim/progressdialog.h
+++ b/libtdepim/progressdialog.h
@@ -51,7 +51,7 @@ class TransactionItem;
class SSLLabel;
class TransactionItemView : public TQScrollView {
- Q_OBJECT
+ TQ_OBJECT
public:
TransactionItemView( TQWidget * parent = 0,
@@ -77,7 +77,7 @@ private:
class TransactionItem : public TQVBox {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -117,7 +117,7 @@ protected:
class KDE_EXPORT ProgressDialog : public OverlayWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/progressmanager.cpp b/libtdepim/progressmanager.cpp
index 37216e94..68e8ac28 100644
--- a/libtdepim/progressmanager.cpp
+++ b/libtdepim/progressmanager.cpp
@@ -162,22 +162,22 @@ ProgressItem* ProgressManager::createProgressItemImpl(
}
}
// connect all signals
- connect ( t, TQT_SIGNAL( progressItemCompleted(KPIM::ProgressItem*) ),
- this, TQT_SLOT( slotTransactionCompleted(KPIM::ProgressItem*) ) );
- connect ( t, TQT_SIGNAL( progressItemProgress(KPIM::ProgressItem*, unsigned int) ),
- this, TQT_SIGNAL( progressItemProgress(KPIM::ProgressItem*, unsigned int) ) );
- connect ( t, TQT_SIGNAL( progressItemAdded(KPIM::ProgressItem*) ),
- this, TQT_SIGNAL( progressItemAdded(KPIM::ProgressItem*) ) );
- connect ( t, TQT_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ),
- this, TQT_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ) );
- connect ( t, TQT_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ),
- this, TQT_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ) );
- connect ( t, TQT_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ),
- this, TQT_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ) );
- connect ( t, TQT_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ),
- this, TQT_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ) );
- connect ( t, TQT_SIGNAL( progressItemUsesBusyIndicator(KPIM::ProgressItem*, bool) ),
- this, TQT_SIGNAL( progressItemUsesBusyIndicator(KPIM::ProgressItem*, bool) ) );
+ connect ( t, TQ_SIGNAL( progressItemCompleted(KPIM::ProgressItem*) ),
+ this, TQ_SLOT( slotTransactionCompleted(KPIM::ProgressItem*) ) );
+ connect ( t, TQ_SIGNAL( progressItemProgress(KPIM::ProgressItem*, unsigned int) ),
+ this, TQ_SIGNAL( progressItemProgress(KPIM::ProgressItem*, unsigned int) ) );
+ connect ( t, TQ_SIGNAL( progressItemAdded(KPIM::ProgressItem*) ),
+ this, TQ_SIGNAL( progressItemAdded(KPIM::ProgressItem*) ) );
+ connect ( t, TQ_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ),
+ this, TQ_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ) );
+ connect ( t, TQ_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ),
+ this, TQ_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ) );
+ connect ( t, TQ_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ),
+ this, TQ_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ) );
+ connect ( t, TQ_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ),
+ this, TQ_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ) );
+ connect ( t, TQ_SIGNAL( progressItemUsesBusyIndicator(KPIM::ProgressItem*, bool) ),
+ this, TQ_SIGNAL( progressItemUsesBusyIndicator(KPIM::ProgressItem*, bool) ) );
emit progressItemAdded( t );
} else {
diff --git a/libtdepim/progressmanager.h b/libtdepim/progressmanager.h
index 4ec17567..59dc7262 100644
--- a/libtdepim/progressmanager.h
+++ b/libtdepim/progressmanager.h
@@ -38,7 +38,7 @@ typedef TQMap<ProgressItem*, bool> ProgressItemMap;
class KDE_EXPORT ProgressItem : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
friend class ProgressManager;
friend class TQDict< ProgressItem >; // so it can be deleted from dicts
@@ -266,7 +266,7 @@ signals:
class KDE_EXPORT ProgressManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/resourceabc.h b/libtdepim/resourceabc.h
index e1213e3e..0eee0901 100644
--- a/libtdepim/resourceabc.h
+++ b/libtdepim/resourceabc.h
@@ -43,7 +43,7 @@ namespace KPIM {
class KDE_EXPORT ResourceABC : public TDEABC::Resource
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/sendsmsdialog.cpp b/libtdepim/sendsmsdialog.cpp
index 2b658112..2f451d3a 100644
--- a/libtdepim/sendsmsdialog.cpp
+++ b/libtdepim/sendsmsdialog.cpp
@@ -48,10 +48,10 @@ SendSMSDialog::SendSMSDialog( const TQString &recipientName, TQWidget *parent, c
setButtonText( Ok, i18n( "Send" ) );
- connect( mText, TQT_SIGNAL( textChanged() ),
- this, TQT_SLOT( updateMessageLength() ) );
- connect( mText, TQT_SIGNAL( textChanged() ),
- this, TQT_SLOT( updateButtons() ) );
+ connect( mText, TQ_SIGNAL( textChanged() ),
+ this, TQ_SLOT( updateMessageLength() ) );
+ connect( mText, TQ_SIGNAL( textChanged() ),
+ this, TQ_SLOT( updateButtons() ) );
updateButtons();
diff --git a/libtdepim/sendsmsdialog.h b/libtdepim/sendsmsdialog.h
index 5dec286b..fd9d1b6b 100644
--- a/libtdepim/sendsmsdialog.h
+++ b/libtdepim/sendsmsdialog.h
@@ -29,7 +29,7 @@ class TQTextEdit;
class SendSMSDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/sidebarextension.h b/libtdepim/sidebarextension.h
index 67211499..9abd6ea7 100644
--- a/libtdepim/sidebarextension.h
+++ b/libtdepim/sidebarextension.h
@@ -37,7 +37,7 @@ namespace KParts
**/
class KDE_EXPORT SideBarExtension : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/statusbarprogresswidget.cpp b/libtdepim/statusbarprogresswidget.cpp
index 34f68703..d0cd9d7d 100644
--- a/libtdepim/statusbarprogresswidget.cpp
+++ b/libtdepim/statusbarprogresswidget.cpp
@@ -98,22 +98,22 @@ StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog
mode = None;
setMode();
- connect( m_pButton, TQT_SIGNAL( clicked() ),
- progressDialog, TQT_SLOT( slotToggleVisibility() ) );
+ connect( m_pButton, TQ_SIGNAL( clicked() ),
+ progressDialog, TQ_SLOT( slotToggleVisibility() ) );
- connect ( ProgressManager::instance(), TQT_SIGNAL( progressItemAdded( KPIM::ProgressItem * ) ),
- this, TQT_SLOT( slotProgressItemAdded( KPIM::ProgressItem * ) ) );
- connect ( ProgressManager::instance(), TQT_SIGNAL( progressItemCompleted( KPIM::ProgressItem * ) ),
- this, TQT_SLOT( slotProgressItemCompleted( KPIM::ProgressItem * ) ) );
- connect ( ProgressManager::instance(), TQT_SIGNAL(progressItemUsesBusyIndicator(KPIM::ProgressItem*,bool)),
- this, TQT_SLOT( updateBusyMode() ) );
+ connect ( ProgressManager::instance(), TQ_SIGNAL( progressItemAdded( KPIM::ProgressItem * ) ),
+ this, TQ_SLOT( slotProgressItemAdded( KPIM::ProgressItem * ) ) );
+ connect ( ProgressManager::instance(), TQ_SIGNAL( progressItemCompleted( KPIM::ProgressItem * ) ),
+ this, TQ_SLOT( slotProgressItemCompleted( KPIM::ProgressItem * ) ) );
+ connect ( ProgressManager::instance(), TQ_SIGNAL(progressItemUsesBusyIndicator(KPIM::ProgressItem*,bool)),
+ this, TQ_SLOT( updateBusyMode() ) );
- connect ( progressDialog, TQT_SIGNAL( visibilityChanged( bool )),
- this, TQT_SLOT( slotProgressDialogVisible( bool ) ) );
+ connect ( progressDialog, TQ_SIGNAL( visibilityChanged( bool )),
+ this, TQ_SLOT( slotProgressDialogVisible( bool ) ) );
mDelayTimer = new TQTimer( this );
- connect ( mDelayTimer, TQT_SIGNAL( timeout() ),
- this, TQT_SLOT( slotShowItemDelayed() ) );
+ connect ( mDelayTimer, TQ_SIGNAL( timeout() ),
+ this, TQ_SLOT( slotShowItemDelayed() ) );
}
// There are three cases: no progressitem, one progressitem (connect to it directly),
@@ -132,8 +132,8 @@ void StatusbarProgressWidget::updateBusyMode()
else { // N items
if ( !mBusyTimer ) {
mBusyTimer = new TQTimer( this );
- connect( mBusyTimer, TQT_SIGNAL( timeout() ),
- this, TQT_SLOT( slotBusyIndicator() ) );
+ connect( mBusyTimer, TQ_SIGNAL( timeout() ),
+ this, TQ_SLOT( slotBusyIndicator() ) );
mDelayTimer->start( 1000, true );
}
}
@@ -153,7 +153,7 @@ void StatusbarProgressWidget::slotProgressItemCompleted( ProgressItem *item )
connectSingleItem(); // if going back to 1 item
if ( ProgressManager::instance()->isEmpty() ) { // No item
// Done. In 5s the progress-widget will close, then we can clean up the statusbar
- TQTimer::singleShot( 5000, this, TQT_SLOT( slotClean() ) );
+ TQTimer::singleShot( 5000, this, TQ_SLOT( slotClean() ) );
} else if ( mCurrentItem ) { // Exactly one item
delete mBusyTimer;
mBusyTimer = 0;
@@ -164,14 +164,14 @@ void StatusbarProgressWidget::slotProgressItemCompleted( ProgressItem *item )
void StatusbarProgressWidget::connectSingleItem()
{
if ( mCurrentItem ) {
- disconnect ( mCurrentItem, TQT_SIGNAL( progressItemProgress( KPIM::ProgressItem *, unsigned int ) ),
- this, TQT_SLOT( slotProgressItemProgress( KPIM::ProgressItem *, unsigned int ) ) );
+ disconnect ( mCurrentItem, TQ_SIGNAL( progressItemProgress( KPIM::ProgressItem *, unsigned int ) ),
+ this, TQ_SLOT( slotProgressItemProgress( KPIM::ProgressItem *, unsigned int ) ) );
mCurrentItem = 0;
}
mCurrentItem = ProgressManager::instance()->singleItem();
if ( mCurrentItem ) {
- connect ( mCurrentItem, TQT_SIGNAL( progressItemProgress( KPIM::ProgressItem *, unsigned int ) ),
- this, TQT_SLOT( slotProgressItemProgress( KPIM::ProgressItem *, unsigned int ) ) );
+ connect ( mCurrentItem, TQ_SIGNAL( progressItemProgress( KPIM::ProgressItem *, unsigned int ) ),
+ this, TQ_SLOT( slotProgressItemProgress( KPIM::ProgressItem *, unsigned int ) ) );
}
}
@@ -268,7 +268,7 @@ bool StatusbarProgressWidget::eventFilter( TQObject *, TQEvent *ev )
if ( ev->type() == TQEvent::MouseButtonPress ) {
TQMouseEvent *e = (TQMouseEvent*)ev;
- if ( e->button() == Qt::LeftButton && mode != None ) { // toggle view on left mouse button
+ if ( e->button() == TQt::LeftButton && mode != None ) { // toggle view on left mouse button
// Consensus seems to be that we should show/hide the fancy dialog when the user
// clicks anywhere in the small one.
mProgressDialog->slotToggleVisibility();
diff --git a/libtdepim/statusbarprogresswidget.h b/libtdepim/statusbarprogresswidget.h
index f09c14b5..def30fee 100644
--- a/libtdepim/statusbarprogresswidget.h
+++ b/libtdepim/statusbarprogresswidget.h
@@ -53,7 +53,7 @@ class ProgressDialog;
class KDE_EXPORT StatusbarProgressWidget : public TQFrame {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/tdeabcresourcecached.cpp b/libtdepim/tdeabcresourcecached.cpp
index 42a06e45..63eb2f75 100644
--- a/libtdepim/tdeabcresourcecached.cpp
+++ b/libtdepim/tdeabcresourcecached.cpp
@@ -36,8 +36,8 @@ ResourceCached::ResourceCached( const TDEConfig *config )
mSavePolicy( SaveDelayed ), mSaveInterval( 10 ),
mKABCSaveTimer( 0, "mKABCSaveTimer" )
{
- connect( &mKABCReloadTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotKABCReload() ) );
- connect( &mKABCSaveTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotKABCSave() ) );
+ connect( &mKABCReloadTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotKABCReload() ) );
+ connect( &mKABCSaveTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotKABCSave() ) );
if (config)
this->readConfig(const_cast<TDEConfig *>(config));
diff --git a/libtdepim/tdeabcresourcecached.h b/libtdepim/tdeabcresourcecached.h
index f67abc61..5d3e27a3 100644
--- a/libtdepim/tdeabcresourcecached.h
+++ b/libtdepim/tdeabcresourcecached.h
@@ -33,7 +33,7 @@ namespace TDEABC {
class KDE_EXPORT ResourceCached : public Resource
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/tdeconfigwizard.cpp b/libtdepim/tdeconfigwizard.cpp
index 8c2620d1..7b982aea 100644
--- a/libtdepim/tdeconfigwizard.cpp
+++ b/libtdepim/tdeconfigwizard.cpp
@@ -56,10 +56,10 @@ TDEConfigWizard::~TDEConfigWizard()
void TDEConfigWizard::init()
{
- connect( this, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ),
- TQT_SLOT( slotAboutToShowPage( TQWidget * ) ) );
+ connect( this, TQ_SIGNAL( aboutToShowPage( TQWidget * ) ),
+ TQ_SLOT( slotAboutToShowPage( TQWidget * ) ) );
- TQTimer::singleShot( 0, this, TQT_SLOT( readConfig() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( readConfig() ) );
}
void TDEConfigWizard::setPropagator( TDEConfigPropagator *p )
diff --git a/libtdepim/tdeconfigwizard.h b/libtdepim/tdeconfigwizard.h
index 93221a85..19da572d 100644
--- a/libtdepim/tdeconfigwizard.h
+++ b/libtdepim/tdeconfigwizard.h
@@ -32,7 +32,7 @@ class TQListView;
*/
class KDE_EXPORT TDEConfigWizard : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
index 74d7329b..18952fe1 100644
--- a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
+++ b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
@@ -48,7 +48,7 @@ void KPartsGenericPart::load()
delete m_part;
}
// "this" is both the parent widget and the parent object
- m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), TQT_TQWIDGET(this), 0, TQT_TQOBJECT(this), 0 );
+ m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), this, 0, this, 0 );
if ( m_part ) {
m_part->openURL( m_url );
m_part->widget()->show();
diff --git a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.h b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.h
index 91c96d2f..bb4514c1 100644
--- a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.h
+++ b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.h
@@ -30,7 +30,7 @@ namespace KParts { class ReadOnlyPart; }
* a KParts::ReadOnlyPart is available
*/
class KPartsGenericPart : public TQWidget {
- Q_OBJECT
+ TQ_OBJECT
TQ_PROPERTY( TQString url READ url WRITE setURL )
TQ_PROPERTY( TQString mimetype READ mimetype WRITE setMimetype )
diff --git a/libtdepim/tests/testdateedit.cpp b/libtdepim/tests/testdateedit.cpp
index a87e950c..39c8447d 100644
--- a/libtdepim/tests/testdateedit.cpp
+++ b/libtdepim/tests/testdateedit.cpp
@@ -39,8 +39,8 @@ DateEdit::DateEdit( TQWidget *parent, const char *name )
KDateEdit *edit = new KDateEdit( this );
layout->addWidget( edit );
- connect( edit, TQT_SIGNAL( dateChanged( const TQDate& ) ),
- this, TQT_SLOT( dateChanged( const TQDate& ) ) );
+ connect( edit, TQ_SIGNAL( dateChanged( const TQDate& ) ),
+ this, TQ_SLOT( dateChanged( const TQDate& ) ) );
}
void DateEdit::dateChanged( const TQDate &date )
diff --git a/libtdepim/tests/testdateedit.h b/libtdepim/tests/testdateedit.h
index 73c9ec91..82fbddb9 100644
--- a/libtdepim/tests/testdateedit.h
+++ b/libtdepim/tests/testdateedit.h
@@ -26,7 +26,7 @@
class DateEdit : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/tests/testdistrlist.h b/libtdepim/tests/testdistrlist.h
index 1e602a33..62375ffc 100644
--- a/libtdepim/tests/testdistrlist.h
+++ b/libtdepim/tests/testdistrlist.h
@@ -23,7 +23,7 @@
class TestDistrList : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/weaver.h b/libtdepim/weaver.h
index 20e076f4..b949a110 100644
--- a/libtdepim/weaver.h
+++ b/libtdepim/weaver.h
@@ -162,7 +162,7 @@ namespace ThreadWeaver {
*/
class KDE_EXPORT Job : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Construct a Job object. */
@@ -295,7 +295,7 @@ namespace ThreadWeaver {
which it assigns jobs from it's queue. */
class KDE_EXPORT Weaver : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
Weaver (TQObject* parent=0, const char* name=0,
diff --git a/libtdepim/weaverextensions.cpp b/libtdepim/weaverextensions.cpp
index ad5b144c..01d68ff7 100644
--- a/libtdepim/weaverextensions.cpp
+++ b/libtdepim/weaverextensions.cpp
@@ -25,14 +25,14 @@ namespace ThreadWeaver {
void WeaverExtension::attach (Weaver *w)
{
- connect (w, TQT_SIGNAL (threadCreated (Thread *) ),
- TQT_SLOT (threadCreated (Thread *) ) );
- connect (w, TQT_SIGNAL (threadDestroyed (Thread *) ),
- TQT_SLOT (threadDestroyed (Thread *) ) );
- connect (w, TQT_SIGNAL (threadBusy (Thread *) ),
- TQT_SLOT (threadBusy (Thread *) ) );
- connect (w, TQT_SIGNAL (threadSuspended (Thread *) ),
- TQT_SLOT (threadSuspended (Thread *) ) );
+ connect (w, TQ_SIGNAL (threadCreated (Thread *) ),
+ TQ_SLOT (threadCreated (Thread *) ) );
+ connect (w, TQ_SIGNAL (threadDestroyed (Thread *) ),
+ TQ_SLOT (threadDestroyed (Thread *) ) );
+ connect (w, TQ_SIGNAL (threadBusy (Thread *) ),
+ TQ_SLOT (threadBusy (Thread *) ) );
+ connect (w, TQ_SIGNAL (threadSuspended (Thread *) ),
+ TQ_SLOT (threadSuspended (Thread *) ) );
}
WeaverExtension::~WeaverExtension()
diff --git a/libtdepim/weaverextensions.h b/libtdepim/weaverextensions.h
index b107378e..52984a29 100644
--- a/libtdepim/weaverextensions.h
+++ b/libtdepim/weaverextensions.h
@@ -31,7 +31,7 @@ namespace ThreadWeaver {
programs. Derive from it to actually create an extension. */
class WeaverExtension : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
WeaverExtension ( TQObject *parent = 0, const char *name = 0);
diff --git a/libtdepim/weaverlogger.h b/libtdepim/weaverlogger.h
index 54e7e010..889f080e 100644
--- a/libtdepim/weaverlogger.h
+++ b/libtdepim/weaverlogger.h
@@ -24,7 +24,7 @@ namespace ThreadWeaver {
information about thread execution. */
class WeaverThreadLogger : public WeaverExtension
{
- Q_OBJECT
+ TQ_OBJECT
public:
WeaverThreadLogger( TQObject *parent = 0, const char *name = 0);
diff --git a/plugins/kmail/bodypartformatter/attendeeselector.cpp b/plugins/kmail/bodypartformatter/attendeeselector.cpp
index 08bf9c00..c0c89307 100644
--- a/plugins/kmail/bodypartformatter/attendeeselector.cpp
+++ b/plugins/kmail/bodypartformatter/attendeeselector.cpp
@@ -38,15 +38,15 @@ AttendeeSelector::AttendeeSelector(TQWidget * parent)
layout->setMargin( 0 );
ui->addButton->setGuiItem( KStdGuiItem::add() );
- connect( ui->addButton, TQT_SIGNAL(clicked()), TQT_SLOT(addClicked()) );
+ connect( ui->addButton, TQ_SIGNAL(clicked()), TQ_SLOT(addClicked()) );
ui->removeButton->setGuiItem( KStdGuiItem::remove() );
- connect( ui->removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeClicked()) );
+ connect( ui->removeButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeClicked()) );
ui->attendeeEdit->setClickMessage( i18n("Click to add a new attendee") );
- connect( ui->attendeeEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(textChanged(const TQString&)) );
- connect( ui->attendeeEdit, TQT_SIGNAL(returnPressed(const TQString&)), TQT_SLOT(addClicked()) );
+ connect( ui->attendeeEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(textChanged(const TQString&)) );
+ connect( ui->attendeeEdit, TQ_SIGNAL(returnPressed(const TQString&)), TQ_SLOT(addClicked()) );
- connect( ui->attendeeList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(selectionChanged()) );
+ connect( ui->attendeeList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(selectionChanged()) );
}
TQStringList AttendeeSelector::attendees() const
diff --git a/plugins/kmail/bodypartformatter/attendeeselector.h b/plugins/kmail/bodypartformatter/attendeeselector.h
index f111ac53..05c73d5f 100644
--- a/plugins/kmail/bodypartformatter/attendeeselector.h
+++ b/plugins/kmail/bodypartformatter/attendeeselector.h
@@ -29,7 +29,7 @@ class AttendeeSelectorWidget;
*/
class AttendeeSelector : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
AttendeeSelector( TQWidget *parent = 0 );
diff --git a/plugins/kmail/bodypartformatter/delegateselector.h b/plugins/kmail/bodypartformatter/delegateselector.h
index 9f34e3c5..775c8858 100644
--- a/plugins/kmail/bodypartformatter/delegateselector.h
+++ b/plugins/kmail/bodypartformatter/delegateselector.h
@@ -33,7 +33,7 @@ class TQCheckBox;
*/
class DelegateSelector : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdeabc/frontend/main.cpp b/tdeabc/frontend/main.cpp
index 0e941e01..706d94e7 100644
--- a/tdeabc/frontend/main.cpp
+++ b/tdeabc/frontend/main.cpp
@@ -15,6 +15,6 @@ int main( int argc, char ** argv )
MainWindow *w = new MainWindow;
w->show();
- app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) );
+ app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) );
return app.exec();
}
diff --git a/tdeabc/frontend/mainWindow.ui b/tdeabc/frontend/mainWindow.ui
index 240114a6..4bce4b34 100644
--- a/tdeabc/frontend/mainWindow.ui
+++ b/tdeabc/frontend/mainWindow.ui
@@ -1365,7 +1365,7 @@
<variable>TQString mCurrentAddress</variable>
<variable>TQString mCurrentPhone</variable>
</variables>
-<Q_SLOTS>
+<slots>
<slot>init()</slot>
<slot>destroy()</slot>
<slot>fileSave()</slot>
@@ -1404,6 +1404,6 @@
<slot>addressBookLocked()</slot>
<slot>addressBookUnlocked()</slot>
<slot>fileOpenStd()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/tdeabc/frontend/mainWindow.ui.h b/tdeabc/frontend/mainWindow.ui.h
index 8e678b93..5a32e6cc 100644
--- a/tdeabc/frontend/mainWindow.ui.h
+++ b/tdeabc/frontend/mainWindow.ui.h
@@ -39,12 +39,12 @@ void MainWindow::init()
mEmailListView->header()->hide();
mCategoryListView->header()->hide();
- connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook * ) ),
- TQT_SLOT( addressBookChanged() ) );
- connect( mAddressBook, TQT_SIGNAL( addressBookLocked( AddressBook * ) ),
- TQT_SLOT( addressBookLocked() ) );
- connect( mAddressBook, TQT_SIGNAL( addressBookUnlocked( AddressBook * ) ),
- TQT_SLOT( addressBookUnlocked() ) );
+ connect( mAddressBook, TQ_SIGNAL( addressBookChanged( AddressBook * ) ),
+ TQ_SLOT( addressBookChanged() ) );
+ connect( mAddressBook, TQ_SIGNAL( addressBookLocked( AddressBook * ) ),
+ TQ_SLOT( addressBookLocked() ) );
+ connect( mAddressBook, TQ_SIGNAL( addressBookUnlocked( AddressBook * ) ),
+ TQ_SLOT( addressBookUnlocked() ) );
}
void MainWindow::destroy()
diff --git a/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp b/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp
index d36582ba..ea688aac 100644
--- a/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp
+++ b/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp
@@ -42,8 +42,8 @@ void KABC2Mutt::run()
mAddressBook = TDEABC::StdAddressBook::self( true );
TDEABC::StdAddressBook::setAutomaticSave( false );
- connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook* ) ),
- this, TQT_SLOT( loadingFinished() ) );
+ connect( mAddressBook, TQ_SIGNAL( addressBookChanged( AddressBook* ) ),
+ this, TQ_SLOT( loadingFinished() ) );
}
void KABC2Mutt::loadingFinished()
diff --git a/tdeabc/tdeabc2mutt/tdeabc2mutt.h b/tdeabc/tdeabc2mutt/tdeabc2mutt.h
index a0e58a59..6c9960c7 100644
--- a/tdeabc/tdeabc2mutt/tdeabc2mutt.h
+++ b/tdeabc/tdeabc2mutt/tdeabc2mutt.h
@@ -24,7 +24,7 @@
class KABC2Mutt : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdefile-plugins/ics/tdefile_ics.h b/tdefile-plugins/ics/tdefile_ics.h
index 756a11be..aa8e6c2e 100644
--- a/tdefile-plugins/ics/tdefile_ics.h
+++ b/tdefile-plugins/ics/tdefile_ics.h
@@ -26,7 +26,7 @@ class TQStringList;
class ICSPlugin : public KFilePlugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
ICSPlugin( TQObject *parent, const char *name, const TQStringList& args );
diff --git a/tdefile-plugins/palm-databases/tdefile_palm.h b/tdefile-plugins/palm-databases/tdefile_palm.h
index 22124aa7..e9521543 100644
--- a/tdefile-plugins/palm-databases/tdefile_palm.h
+++ b/tdefile-plugins/palm-databases/tdefile_palm.h
@@ -28,7 +28,7 @@ class TQStringList;
class KPalmPlugin: public KFilePlugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdefile-plugins/rfc822/tdefile_rfc822.h b/tdefile-plugins/rfc822/tdefile_rfc822.h
index c8f3f2f8..cf33ade9 100644
--- a/tdefile-plugins/rfc822/tdefile_rfc822.h
+++ b/tdefile-plugins/rfc822/tdefile_rfc822.h
@@ -26,7 +26,7 @@ class TQStringList;
class KRfc822Plugin: public KFilePlugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdefile-plugins/vcf/tdefile_vcf.h b/tdefile-plugins/vcf/tdefile_vcf.h
index de5243e1..bc724b8f 100644
--- a/tdefile-plugins/vcf/tdefile_vcf.h
+++ b/tdefile-plugins/vcf/tdefile_vcf.h
@@ -26,7 +26,7 @@ class TQStringList;
class KVcfPlugin: public KFilePlugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdeioslave/opengroupware/opengroupware.cpp b/tdeioslave/opengroupware/opengroupware.cpp
index 882b4c6b..b202373e 100644
--- a/tdeioslave/opengroupware/opengroupware.cpp
+++ b/tdeioslave/opengroupware/opengroupware.cpp
@@ -194,8 +194,8 @@ void OpenGroupware::getCalendar( const KURL &_url )
// FIXME do progress handling
mListEventsJob = TDEIO::davPropFind( url, props, "0", false );
- connect( mListEventsJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotGetCalendarListingResult( TDEIO::Job * ) ) );
+ connect( mListEventsJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotGetCalendarListingResult( TDEIO::Job * ) ) );
}
void OpenGroupware::getAddressbook( const KURL &url )
diff --git a/tdeioslave/opengroupware/opengroupware.h b/tdeioslave/opengroupware/opengroupware.h
index 151187db..597634c6 100644
--- a/tdeioslave/opengroupware/opengroupware.h
+++ b/tdeioslave/opengroupware/opengroupware.h
@@ -32,7 +32,7 @@ namespace TDEIO {
class OpenGroupware : public TQObject, public TDEIO::SlaveBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
OpenGroupware( const TQCString &protocol, const TQCString &pool,
diff --git a/tderesources/birthdays/resourcetdeabc.cpp b/tderesources/birthdays/resourcetdeabc.cpp
index d36ebddd..2e937a7d 100644
--- a/tderesources/birthdays/resourcetdeabc.cpp
+++ b/tderesources/birthdays/resourcetdeabc.cpp
@@ -125,7 +125,7 @@ bool ResourceTDEABC::doOpen()
kdDebug(5800) << "ResourceTDEABC::doOpen()" << endl;
mAddressbook = TDEABC::StdAddressBook::self( true );
- connect( mAddressbook, TQT_SIGNAL(addressBookChanged(AddressBook*)), TQT_SLOT( reload() ) );
+ connect( mAddressbook, TQ_SIGNAL(addressBookChanged(AddressBook*)), TQ_SLOT( reload() ) );
return true;
}
@@ -220,7 +220,7 @@ bool ResourceTDEABC::doLoad()
TQString anniversary_string = (*it).custom( "KADDRESSBOOK", "X-Anniversary" );
if (anniversary_string.isEmpty() )
continue;
- TQDateTime anniversary = TQDate::fromString( anniversary_string, Qt::ISODate );
+ TQDateTime anniversary = TQDate::fromString( anniversary_string, TQt::ISODate );
if ( !anniversary.isValid() )
continue;
@@ -232,7 +232,7 @@ bool ResourceTDEABC::doLoad()
for ( addrIt = anniversaries.begin(); addrIt != anniversaries.end(); ++addrIt ) {
if ( name == (*addrIt).realName() ) {
TQDate spouseAnniversary =
- TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate );
+ TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), TQt::ISODate );
if ( anniversary == TQDateTime(spouseAnniversary) ) {
found = true;
break;
@@ -247,7 +247,7 @@ bool ResourceTDEABC::doLoad()
}
for ( addrIt = anniversaries.begin(); addrIt != anniversaries.end(); ++addrIt ) {
- TQDate anniversary = TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate );
+ TQDate anniversary = TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), TQt::ISODate );
kdDebug(5800) << "found a anniversary " << TQString(anniversary.toString()) << endl;
TQString name;
TQString name_1 = (*addrIt).nickName();
diff --git a/tderesources/birthdays/resourcetdeabc.h b/tderesources/birthdays/resourcetdeabc.h
index 35271c1d..93c15d94 100644
--- a/tderesources/birthdays/resourcetdeabc.h
+++ b/tderesources/birthdays/resourcetdeabc.h
@@ -47,7 +47,7 @@ namespace KCal {
*/
class KDE_EXPORT ResourceTDEABC : public ResourceCalendar
{
- Q_OBJECT
+ TQ_OBJECT
friend class ResourceTDEABCConfig;
diff --git a/tderesources/birthdays/resourcetdeabcconfig.cpp b/tderesources/birthdays/resourcetdeabcconfig.cpp
index 0f9b3279..4b3b0a1d 100644
--- a/tderesources/birthdays/resourcetdeabcconfig.cpp
+++ b/tderesources/birthdays/resourcetdeabcconfig.cpp
@@ -61,13 +61,13 @@ ResourceTDEABCConfig::ResourceTDEABCConfig( TQWidget* parent, const char* name
mCategoryView->setEnabled( false );
topLayout->addMultiCellWidget( mCategoryView, 4, 4, 0, 1 );
- connect( mUseCategories, TQT_SIGNAL( toggled( bool ) ),
- mCategoryView, TQT_SLOT( setEnabled( bool ) ) );
+ connect( mUseCategories, TQ_SIGNAL( toggled( bool ) ),
+ mCategoryView, TQ_SLOT( setEnabled( bool ) ) );
mAlarmTimeEdit->setDisabled(true);
mALabel->setDisabled(true);
- connect(mAlarm, TQT_SIGNAL(clicked()), TQT_SLOT(alarmClicked()));
+ connect(mAlarm, TQ_SIGNAL(clicked()), TQ_SLOT(alarmClicked()));
setReadOnly( true );
diff --git a/tderesources/birthdays/resourcetdeabcconfig.h b/tderesources/birthdays/resourcetdeabcconfig.h
index 80efd02b..88ade268 100644
--- a/tderesources/birthdays/resourcetdeabcconfig.h
+++ b/tderesources/birthdays/resourcetdeabcconfig.h
@@ -40,7 +40,7 @@ namespace KCal {
*/
class ResourceTDEABCConfig : public KRES::ConfigWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceTDEABCConfig( TQWidget* parent = 0, const char* name = 0 );
diff --git a/tderesources/blogging/API_Blog.h b/tderesources/blogging/API_Blog.h
index 5ad5b478..91f6e623 100644
--- a/tderesources/blogging/API_Blog.h
+++ b/tderesources/blogging/API_Blog.h
@@ -83,7 +83,7 @@ protected:
class APIBlog : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
APIBlog( const KURL &server, TQObject *parent = 0L, const char *name = 0L );
diff --git a/tderesources/blogging/bloggingcalendaradaptor.cpp b/tderesources/blogging/bloggingcalendaradaptor.cpp
index 2ed925a8..9c899e5c 100644
--- a/tderesources/blogging/bloggingcalendaradaptor.cpp
+++ b/tderesources/blogging/bloggingcalendaradaptor.cpp
@@ -102,17 +102,17 @@ void BloggingCalendarAdaptor::setAPI( KBlog::APIBlog *api )
delete mAPI;
mAPI = api;
mAuthenticated = false;
- connect( api, TQT_SIGNAL( userInfoRetrieved( const TQString &, const TQString &,
+ connect( api, TQ_SIGNAL( userInfoRetrieved( const TQString &, const TQString &,
const TQString & ) ),
- TQT_SLOT( slotUserInfoRetrieved( const TQString &, const TQString &,
+ TQ_SLOT( slotUserInfoRetrieved( const TQString &, const TQString &,
const TQString & ) ) );
- connect( api, TQT_SIGNAL( folderInfoRetrieved( const TQString &, const TQString & ) ),
- TQT_SLOT( slotFolderInfoRetrieved( const TQString&, const TQString & ) ) );
- connect( api, TQT_SIGNAL( itemOnServer( const KURL & ) ),
- TQT_SIGNAL( itemOnServer( const KURL & ) ) );
- connect( api, TQT_SIGNAL( itemDownloaded( KCal::Incidence *, const TQString &,
+ connect( api, TQ_SIGNAL( folderInfoRetrieved( const TQString &, const TQString & ) ),
+ TQ_SLOT( slotFolderInfoRetrieved( const TQString&, const TQString & ) ) );
+ connect( api, TQ_SIGNAL( itemOnServer( const KURL & ) ),
+ TQ_SIGNAL( itemOnServer( const KURL & ) ) );
+ connect( api, TQ_SIGNAL( itemDownloaded( KCal::Incidence *, const TQString &,
const KURL &, const TQString &, const TQString & ) ),
- TQT_SLOT( calendarItemDownloaded( KCal::Incidence *, const TQString &,
+ TQ_SLOT( calendarItemDownloaded( KCal::Incidence *, const TQString &,
const KURL &, const TQString &, const TQString & ) ) );
}
diff --git a/tderesources/blogging/bloggingcalendaradaptor.h b/tderesources/blogging/bloggingcalendaradaptor.h
index ee6d292a..527955fb 100644
--- a/tderesources/blogging/bloggingcalendaradaptor.h
+++ b/tderesources/blogging/bloggingcalendaradaptor.h
@@ -50,7 +50,7 @@ class BloggingUploadItem : public KPIM::GroupwareUploadItem
class BloggingCalendarAdaptor : public CalendarAdaptor
{
-Q_OBJECT
+TQ_OBJECT
public:
BloggingCalendarAdaptor();
diff --git a/tderesources/blogging/kcal_resourceblogging.h b/tderesources/blogging/kcal_resourceblogging.h
index 56d3cad2..2e401d8f 100644
--- a/tderesources/blogging/kcal_resourceblogging.h
+++ b/tderesources/blogging/kcal_resourceblogging.h
@@ -35,7 +35,7 @@ namespace KCal {
*/
class KDE_EXPORT ResourceBlogging : public ResourceGroupwareBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceBlogging();
diff --git a/tderesources/blogging/kcal_resourcebloggingconfig.h b/tderesources/blogging/kcal_resourcebloggingconfig.h
index d2062d76..7d69f830 100644
--- a/tderesources/blogging/kcal_resourcebloggingconfig.h
+++ b/tderesources/blogging/kcal_resourcebloggingconfig.h
@@ -27,7 +27,7 @@ namespace KCal {
class KDE_EXPORT ResourceBloggingConfig : public ResourceGroupwareBaseConfig
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceBloggingConfig( TQWidget *parent = 0, const char *name = 0 );
diff --git a/tderesources/blogging/xmlrpcjob.h b/tderesources/blogging/xmlrpcjob.h
index c03346a6..fbff25c9 100644
--- a/tderesources/blogging/xmlrpcjob.h
+++ b/tderesources/blogging/xmlrpcjob.h
@@ -44,7 +44,7 @@ namespace TDEIO {
* @since 3.4
*/
class XmlrpcJob : public TransferJob {
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/tderesources/caldav/config.cpp b/tderesources/caldav/config.cpp
index b83660f8..4a9888ea 100644
--- a/tderesources/caldav/config.cpp
+++ b/tderesources/caldav/config.cpp
@@ -167,12 +167,12 @@ void ResourceCalDavConfig::setupUI() {
mainLayout->addWidget(mRememberPassword, 8, 1);
mTasksUrl->setEnabled(mUseSTasks->isChecked());
- connect( mUseSTasks, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( slotSTasksToggled( bool ) ) );
+ connect( mUseSTasks, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( slotSTasksToggled( bool ) ) );
mJournalsUrl->setEnabled(mUseSJournals->isChecked());
- connect( mUseSJournals, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( slotSJournalsToggled( bool ) ) );
+ connect( mUseSJournals, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( slotSJournalsToggled( bool ) ) );
// configs
TQHBoxLayout* horizontal = new TQHBoxLayout(this);
diff --git a/tderesources/caldav/config.h b/tderesources/caldav/config.h
index fe03114c..4dec65f3 100644
--- a/tderesources/caldav/config.h
+++ b/tderesources/caldav/config.h
@@ -39,7 +39,7 @@ class CalDavSaveConfig;
*/
class KDE_EXPORT ResourceCalDavConfig : public KRES::ConfigWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/caldav/configwidgets.cpp b/tderesources/caldav/configwidgets.cpp
index db620741..9f4f1e11 100644
--- a/tderesources/caldav/configwidgets.cpp
+++ b/tderesources/caldav/configwidgets.cpp
@@ -103,8 +103,8 @@ CalDavReloadConfig::CalDavReloadConfig( TQWidget *parent )
d->mGroup->insert( automaticReloadOnStartup, 1 );
d->mGroup->insert( noAutomaticReload, 0 );
- connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( slotIntervalToggled( bool ) ) );
+ connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( slotIntervalToggled( bool ) ) );
TQHBox *intervalBox = new TQHBox( groupBox );
//new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox );
@@ -113,7 +113,7 @@ CalDavReloadConfig::CalDavReloadConfig( TQWidget *parent )
d->mIntervalSpin->setRange( 1, 900 );
d->mIntervalSpin->setEnabled( false );
- groupBox->setColumnLayout(1, Qt::Vertical);
+ groupBox->setColumnLayout(1, TQt::Vertical);
TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout());
vbox->addWidget(intervalRadio);
vbox->addWidget(intervalBox);
@@ -179,8 +179,8 @@ CalDavSaveConfig::CalDavSaveConfig( TQWidget *parent )
d->mGroup->insert( onExit, 1 );
d->mGroup->insert( intervalRadio, 2 );
- connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( slotIntervalToggled( bool ) ) );
+ connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( slotIntervalToggled( bool ) ) );
TQHBox *intervalBox = new TQHBox( groupBox );
//new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox );
@@ -206,7 +206,7 @@ CalDavSaveConfig::CalDavSaveConfig( TQWidget *parent )
intervalRadio->hide();
intervalBox->hide();
- groupBox->setColumnLayout(1, Qt::Vertical);
+ groupBox->setColumnLayout(1, TQt::Vertical);
TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout());
vbox->addWidget(delay);
vbox->addWidget(every);
diff --git a/tderesources/caldav/configwidgets.h b/tderesources/caldav/configwidgets.h
index 1e524844..5bee6aa9 100644
--- a/tderesources/caldav/configwidgets.h
+++ b/tderesources/caldav/configwidgets.h
@@ -49,7 +49,7 @@ class ResourceCached;
*/
class KDE_EXPORT CalDavReloadConfig : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
explicit CalDavReloadConfig( TQWidget *parent = 0 );
@@ -76,7 +76,7 @@ class KDE_EXPORT CalDavReloadConfig : public TQWidget
*/
class KDE_EXPORT CalDavSaveConfig : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
explicit CalDavSaveConfig( TQWidget *parent = 0 );
diff --git a/tderesources/caldav/resource.cpp b/tderesources/caldav/resource.cpp
index 8fae5c98..2c63da22 100644
--- a/tderesources/caldav/resource.cpp
+++ b/tderesources/caldav/resource.cpp
@@ -197,7 +197,7 @@ bool ResourceCalDav::doSave() {
clearChanges();
if (mWriteRetryTimer != NULL) {
if (mWriteRetryTimer->isActive() == false) {
- disconnect( mWriteRetryTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doSave()) );
+ disconnect( mWriteRetryTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doSave()) );
delete mWriteRetryTimer;
mWriteRetryTimer = NULL;
}
@@ -249,8 +249,8 @@ void ResourceCalDav::init() {
// creating jobs
// TQt4 handles this quite differently, as shown below,
// whereas TQt3 needs events (see ::event())
-// connect(mLoader, TQT_SIGNAL(finished()), this, TQT_SLOT(loadFinished()));
-// connect(mWriter, TQT_SIGNAL(finished()), this, TQT_SLOT(writingFinished()));
+// connect(mLoader, TQ_SIGNAL(finished()), this, TQ_SLOT(loadFinished()));
+// connect(mWriter, TQ_SIGNAL(finished()), this, TQ_SLOT(writingFinished()));
setType("ResourceCalDav");
}
@@ -850,7 +850,7 @@ bool ResourceCalDav::startWriting(const TQString& url, const TQString& tasksUrl,
if ((mLoader->running() == true) || (mLoadingQueue.isEmpty() == false) || (mWriter->running() == true) || (mWritingQueue.isEmpty() == false)) {
if (mWriteRetryTimer == NULL) {
mWriteRetryTimer = new TQTimer(this);
- connect( mWriteRetryTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doSave()) );
+ connect( mWriteRetryTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doSave()) );
}
mWriteRetryTimer->start(1000, TRUE);
return false;
@@ -995,7 +995,7 @@ void ResourceCalDav::writingFinished() {
}
// Give the remote system a few seconds to process the data before we allow any read operations
- TQTimer::singleShot( 3000, this, TQT_SLOT(releaseReadLockout()) );
+ TQTimer::singleShot( 3000, this, TQ_SLOT(releaseReadLockout()) );
// Writing queue and mWritingQueueReady flag are not shared resources, i.e. only one thread has an access to them.
// That's why no mutexes are required.
diff --git a/tderesources/caldav/resource.h b/tderesources/caldav/resource.h
index 96f88a45..7e4bbdc5 100644
--- a/tderesources/caldav/resource.h
+++ b/tderesources/caldav/resource.h
@@ -43,7 +43,7 @@ class CalDavWriter;
*/
class KDE_EXPORT ResourceCalDav : public ResourceCached
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/carddav/config.h b/tderesources/carddav/config.h
index e9919723..027dc069 100644
--- a/tderesources/carddav/config.h
+++ b/tderesources/carddav/config.h
@@ -38,7 +38,7 @@ class CardDavSaveConfig;
*/
class KDE_EXPORT ResourceCardDavConfig : public KRES::ConfigWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/carddav/configwidgets.cpp b/tderesources/carddav/configwidgets.cpp
index d0e55a5f..60fc5ed2 100644
--- a/tderesources/carddav/configwidgets.cpp
+++ b/tderesources/carddav/configwidgets.cpp
@@ -102,8 +102,8 @@ CardDavReloadConfig::CardDavReloadConfig( TQWidget *parent )
d->mGroup->insert( automaticReloadOnStartup, 1 );
d->mGroup->insert( noAutomaticReload, 0 );
- connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( slotIntervalToggled( bool ) ) );
+ connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( slotIntervalToggled( bool ) ) );
TQHBox *intervalBox = new TQHBox( groupBox );
//new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox );
@@ -112,7 +112,7 @@ CardDavReloadConfig::CardDavReloadConfig( TQWidget *parent )
d->mIntervalSpin->setRange( 1, 900 );
d->mIntervalSpin->setEnabled( false );
- groupBox->setColumnLayout(1, Qt::Vertical);
+ groupBox->setColumnLayout(1, TQt::Vertical);
TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout());
vbox->addWidget(intervalRadio);
vbox->addWidget(intervalBox);
@@ -178,8 +178,8 @@ CardDavSaveConfig::CardDavSaveConfig( TQWidget *parent )
d->mGroup->insert( onExit, 1 );
d->mGroup->insert( intervalRadio, 2 );
- connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( slotIntervalToggled( bool ) ) );
+ connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( slotIntervalToggled( bool ) ) );
TQHBox *intervalBox = new TQHBox( groupBox );
//new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox );
@@ -205,7 +205,7 @@ CardDavSaveConfig::CardDavSaveConfig( TQWidget *parent )
intervalRadio->hide();
intervalBox->hide();
- groupBox->setColumnLayout(1, Qt::Vertical);
+ groupBox->setColumnLayout(1, TQt::Vertical);
TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout());
vbox->addWidget(delay);
vbox->addWidget(every);
diff --git a/tderesources/carddav/configwidgets.h b/tderesources/carddav/configwidgets.h
index f63535c9..3fcb10f8 100644
--- a/tderesources/carddav/configwidgets.h
+++ b/tderesources/carddav/configwidgets.h
@@ -48,7 +48,7 @@ class ResourceCached;
*/
class KDE_EXPORT CardDavReloadConfig : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
explicit CardDavReloadConfig( TQWidget *parent = 0 );
@@ -75,7 +75,7 @@ class KDE_EXPORT CardDavReloadConfig : public TQWidget
*/
class KDE_EXPORT CardDavSaveConfig : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
explicit CardDavSaveConfig( TQWidget *parent = 0 );
diff --git a/tderesources/carddav/resource.cpp b/tderesources/carddav/resource.cpp
index 69eb98e4..ddd6928e 100644
--- a/tderesources/carddav/resource.cpp
+++ b/tderesources/carddav/resource.cpp
@@ -197,7 +197,7 @@ bool ResourceCardDav::doSave() {
clearChanges();
if (mWriteRetryTimer != NULL) {
if (mWriteRetryTimer->isActive() == false) {
- disconnect( mWriteRetryTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doSave()) );
+ disconnect( mWriteRetryTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doSave()) );
delete mWriteRetryTimer;
mWriteRetryTimer = NULL;
}
@@ -256,8 +256,8 @@ void ResourceCardDav::init() {
// creating jobs
// TQt4 handles this quite differently, as shown below,
// whereas TQt3 needs events (see ::event())
-// connect(mLoader, TQT_SIGNAL(finished()), this, TQT_SLOT(loadFinished()));
-// connect(mWriter, TQT_SIGNAL(finished()), this, TQT_SLOT(writingFinished()));
+// connect(mLoader, TQ_SIGNAL(finished()), this, TQ_SLOT(loadFinished()));
+// connect(mWriter, TQ_SIGNAL(finished()), this, TQ_SLOT(writingFinished()));
setType("ResourceCardDav");
}
@@ -609,7 +609,7 @@ bool ResourceCardDav::startWriting(const TQString& url) {
if ((mLoader->running() == true) || (mLoadingQueue.isEmpty() == false) || (mWriter->running() == true) || (mWritingQueue.isEmpty() == false)) {
if (mWriteRetryTimer == NULL) {
mWriteRetryTimer = new TQTimer(this);
- connect( mWriteRetryTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doSave()) );
+ connect( mWriteRetryTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doSave()) );
}
mWriteRetryTimer->start(1000, TRUE);
return false;
diff --git a/tderesources/carddav/resource.h b/tderesources/carddav/resource.h
index a24b12a7..e255714a 100644
--- a/tderesources/carddav/resource.h
+++ b/tderesources/carddav/resource.h
@@ -42,7 +42,7 @@ class CardDavWriter;
*/
class KDE_EXPORT ResourceCardDav : public ResourceCached
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/egroupware/debugdialog.h b/tderesources/egroupware/debugdialog.h
index bde17988..008e881e 100644
--- a/tderesources/egroupware/debugdialog.h
+++ b/tderesources/egroupware/debugdialog.h
@@ -31,7 +31,7 @@ class KTextBrowser;
*/
class DebugDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.cpp b/tderesources/egroupware/kcal_resourcexmlrpc.cpp
index 676770ed..9ccc24b5 100644
--- a/tderesources/egroupware/kcal_resourcexmlrpc.cpp
+++ b/tderesources/egroupware/kcal_resourcexmlrpc.cpp
@@ -197,8 +197,8 @@ bool ResourceXMLRPC::doOpen()
args.insert( "password", mPrefs->password() );
mServer->call( "system.login", TQVariant( args ),
- this, TQT_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mSynchronizer->start();
@@ -214,8 +214,8 @@ void ResourceXMLRPC::doClose()
args.insert( "kp3", mKp3 );
mServer->call( "system.logout", TQVariant( args ),
- this, TQT_SLOT( logoutFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( logoutFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mSynchronizer->start();
}
@@ -243,8 +243,8 @@ bool ResourceXMLRPC::doLoad()
args.insert( "end", TQDateTime( TQDate::currentDate().addDays( 2000 ) ) );
mServer->call( SearchEventsCommand, args,
- this, TQT_SLOT( listEventsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( listEventsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
args.clear();
columns.insert( "type", "task" );
@@ -253,16 +253,16 @@ bool ResourceXMLRPC::doLoad()
args.insert( "order", "id_parent" );
mServer->call( SearchTodosCommand, args,
- this, TQT_SLOT( listTodosFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( listTodosFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mServer->call( LoadEventCategoriesCommand, TQVariant( TQStringVariantMap() ),
- this, TQT_SLOT( loadEventCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( loadEventCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mServer->call( LoadTodoCategoriesCommand, TQVariant( false ),
- this, TQT_SLOT( loadTodoCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( loadTodoCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
return true;
}
@@ -286,8 +286,8 @@ bool ResourceXMLRPC::doSave()
args.insert( "id", idMapper().remoteId( (*evIt)->uid() ).toInt() );
mServer->call( AddEventCommand, TQVariant( args ),
- this, TQT_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
counter++;
}
}
@@ -302,8 +302,8 @@ bool ResourceXMLRPC::doSave()
args.insert( "id", idMapper().remoteId( (*todoIt)->uid() ).toInt() );
mServer->call( AddTodoCommand, TQVariant( args ),
- this, TQT_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
counter++;
}
}
@@ -340,8 +340,8 @@ bool ResourceXMLRPC::addEvent( Event* ev )
writeEvent( ev, args );
args.insert( "id", idMapper().remoteId( ev->uid() ).toInt() );
mServer->call( AddEventCommand, TQVariant( args ),
- this, TQT_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mCalendar.deleteIncidence( oldEvent );
mCalendar.addIncidence( ev );
@@ -350,8 +350,8 @@ bool ResourceXMLRPC::addEvent( Event* ev )
} else { // new event
writeEvent( ev, args );
mServer->call( AddEventCommand, TQVariant( args ),
- this, TQT_SLOT( addEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ),
+ this, TQ_SLOT( addEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ),
TQVariant( ev->uid() ) );
mCalendar.addEvent( ev );
@@ -369,9 +369,9 @@ bool ResourceXMLRPC::deleteEvent( Event* ev )
return false;
mServer->call( DeleteEventCommand, idMapper().remoteId( ev->uid() ).toInt(),
- this, TQT_SLOT( deleteEventFinished( const TQValueList<TQVariant>&,
+ this, TQ_SLOT( deleteEventFinished( const TQValueList<TQVariant>&,
const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ),
TQVariant( ev->uid() ) );
return true;
}
@@ -420,8 +420,8 @@ bool ResourceXMLRPC::addTodo( Todo *todo )
writeTodo( todo, args );
args.insert( "id", idMapper().remoteId( todo->uid() ).toInt() );
mServer->call( AddTodoCommand, TQVariant( args ),
- this, TQT_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mCalendar.deleteIncidence( oldTodo );
mCalendar.addIncidence( todo );
@@ -430,8 +430,8 @@ bool ResourceXMLRPC::addTodo( Todo *todo )
} else { // new todo
writeTodo( todo, args );
mServer->call( AddTodoCommand, TQVariant( args ),
- this, TQT_SLOT( addTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ),
+ this, TQ_SLOT( addTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ),
TQVariant( todo->uid() ) );
mCalendar.addTodo( todo );
@@ -449,9 +449,9 @@ bool ResourceXMLRPC::deleteTodo( Todo *todo )
return false;
mServer->call( DeleteTodoCommand, idMapper().remoteId( todo->uid() ).toInt(),
- this, TQT_SLOT( deleteTodoFinished( const TQValueList<TQVariant>&,
+ this, TQ_SLOT( deleteTodoFinished( const TQValueList<TQVariant>&,
const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ),
TQVariant( todo->uid() ) );
return true;
}
diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.h b/tderesources/egroupware/kcal_resourcexmlrpc.h
index 0e46c6d3..b3eef632 100644
--- a/tderesources/egroupware/kcal_resourcexmlrpc.h
+++ b/tderesources/egroupware/kcal_resourcexmlrpc.h
@@ -52,7 +52,7 @@ class EGroupwarePrefs;
*/
class KDE_EXPORT ResourceXMLRPC : public ResourceCached
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/egroupware/kcal_resourcexmlrpcconfig.h b/tderesources/egroupware/kcal_resourcexmlrpcconfig.h
index b99bca73..0cd619c0 100644
--- a/tderesources/egroupware/kcal_resourcexmlrpcconfig.h
+++ b/tderesources/egroupware/kcal_resourcexmlrpcconfig.h
@@ -32,7 +32,7 @@ namespace KCal {
class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.cpp b/tderesources/egroupware/knotes_resourcexmlrpc.cpp
index 9a477076..05306c87 100644
--- a/tderesources/egroupware/knotes_resourcexmlrpc.cpp
+++ b/tderesources/egroupware/knotes_resourcexmlrpc.cpp
@@ -123,8 +123,8 @@ bool ResourceXMLRPC::load()
args.insert( "password", mPrefs->password() );
mServer->call( "system.login", TQVariant( args ),
- this, TQT_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mSynchronizer->start();
@@ -135,8 +135,8 @@ bool ResourceXMLRPC::load()
args.insert( "order", "id_parent" );
mServer->call( SearchNotesCommand, args,
- this, TQT_SLOT( listNotesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( listNotesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mSynchronizer->start();
@@ -163,15 +163,15 @@ bool ResourceXMLRPC::addNote( KCal::Journal *journal )
writeNote( journal, args );
args.insert( "id", mUidMap[ journal->uid() ].toInt() );
mServer->call( AddNoteCommand, TQVariant( args ),
- this, TQT_SLOT( updateNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( updateNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mCalendar.addJournal( journal );
added = true;
}
} else {
mServer->call( AddNoteCommand, TQVariant( args ),
- this, TQT_SLOT( addNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ),
+ this, TQ_SLOT( addNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ),
TQVariant( journal->uid() ) );
mCalendar.addJournal( journal );
@@ -189,8 +189,8 @@ bool ResourceXMLRPC::deleteNote( KCal::Journal *journal )
int id = mUidMap[ journal->uid() ].toInt();
mServer->call( DeleteNoteCommand, id,
- this, TQT_SLOT( deleteNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ),
+ this, TQ_SLOT( deleteNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ),
TQVariant( journal->uid() ) );
mSynchronizer->start();
diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.h b/tderesources/egroupware/knotes_resourcexmlrpc.h
index 336488de..e0b19cfc 100644
--- a/tderesources/egroupware/knotes_resourcexmlrpc.h
+++ b/tderesources/egroupware/knotes_resourcexmlrpc.h
@@ -48,7 +48,7 @@ class EGroupwarePrefs;
*/
class KDE_EXPORT ResourceXMLRPC : public ResourceNotes
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/egroupware/knotes_resourcexmlrpcconfig.h b/tderesources/egroupware/knotes_resourcexmlrpcconfig.h
index e6b05bee..25557d4f 100644
--- a/tderesources/egroupware/knotes_resourcexmlrpcconfig.h
+++ b/tderesources/egroupware/knotes_resourcexmlrpcconfig.h
@@ -32,7 +32,7 @@ namespace KNotes {
class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/egroupware/synchronizer.h b/tderesources/egroupware/synchronizer.h
index ed9fd135..9e14fd93 100644
--- a/tderesources/egroupware/synchronizer.h
+++ b/tderesources/egroupware/synchronizer.h
@@ -37,8 +37,8 @@
...
job = TDEIO::file_copy( url, file, -1, true );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotResult( TDEIO::Job * ) ) );
mSynchronizer.start(); // will block here until the slot was called
...
diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp
index dd791cd8..4e95f792 100644
--- a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp
+++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp
@@ -159,8 +159,8 @@ bool ResourceXMLRPC::doOpen()
args.insert( "password", mPrefs->password() );
mServer->call( "system.login", TQVariant( args ),
- this, TQT_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mSynchronizer->start();
@@ -174,8 +174,8 @@ void ResourceXMLRPC::doClose()
args.insert( "kp3", mKp3 );
mServer->call( "system.logout", TQVariant( args ),
- this, TQT_SLOT( logoutFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( logoutFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mSynchronizer->start();
}
@@ -205,16 +205,16 @@ bool ResourceXMLRPC::asyncLoad()
args.insert( "include_users", "calendar" );
mServer->call( SearchContactsCommand, args,
- this, TQT_SLOT( listContactsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( listContactsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mServer->call( LoadCategoriesCommand, TQVariant( false ),
- this, TQT_SLOT( loadCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( loadCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mServer->call( LoadCustomFieldsCommand, TQVariant( TQValueList<TQVariant>() ),
- this, TQT_SLOT( loadCustomFieldsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( loadCustomFieldsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
return true;
}
@@ -253,8 +253,8 @@ void ResourceXMLRPC::addContact( const Addressee& addr )
writeContact( addr, args );
mServer->call( AddContactCommand, args,
- this, TQT_SLOT( addContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( addContactFault( int, const TQString&, const TQVariant& ) ),
+ this, TQ_SLOT( addContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( addContactFault( int, const TQString&, const TQVariant& ) ),
TQVariant( addr.uid() ) );
}
@@ -270,8 +270,8 @@ void ResourceXMLRPC::updateContact( const Addressee& addr )
args.insert( "id", idMapper().remoteId( addr.uid() ) );
mServer->call( AddContactCommand, args,
- this, TQT_SLOT( updateContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( updateContactFault( int, const TQString&, const TQVariant& ) ),
+ this, TQ_SLOT( updateContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( updateContactFault( int, const TQString&, const TQVariant& ) ),
TQVariant( addr.uid() ) );
}
@@ -284,8 +284,8 @@ void ResourceXMLRPC::deleteContact( const Addressee& addr )
}
mServer->call( DeleteContactCommand, idMapper().remoteId( addr.uid() ),
- this, TQT_SLOT( deleteContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( deleteContactFault( int, const TQString&, const TQVariant& ) ),
+ this, TQ_SLOT( deleteContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( deleteContactFault( int, const TQString&, const TQVariant& ) ),
TQVariant( addr.uid() ) );
}
diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.h b/tderesources/egroupware/tdeabc_resourcexmlrpc.h
index c0ccb944..d671912a 100644
--- a/tderesources/egroupware/tdeabc_resourcexmlrpc.h
+++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.h
@@ -39,7 +39,7 @@ class EGroupwarePrefs;
class KDE_EXPORT ResourceXMLRPC : public ResourceCached
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h
index 57773483..6208f684 100644
--- a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h
+++ b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h
@@ -31,7 +31,7 @@ namespace TDEABC {
class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/egroupware/xmlrpciface.cpp b/tderesources/egroupware/xmlrpciface.cpp
index 4afb0b84..29d5563e 100644
--- a/tderesources/egroupware/xmlrpciface.cpp
+++ b/tderesources/egroupware/xmlrpciface.cpp
@@ -78,10 +78,10 @@ void Query::call( const TQString &server, const TQString &method,
job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" );
job->addMetaData( "ConnectTimeout", "50" );
- connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- this, TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ this, TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ this, TQ_SLOT( slotResult( TDEIO::Job * ) ) );
m_pendingJobs.append( job );
}
@@ -222,7 +222,7 @@ TQString Query::marshal( const TQVariant &arg ) const
case TQVariant::ByteArray:
return "<value><base64>" + KCodecs::base64Encode( arg.toByteArray() ) + "</base64></value>\r\n";
case TQVariant::DateTime:
- return "<value><datetime.iso8601>" + arg.toDateTime().toString( Qt::ISODate ) + "</datetime.iso8601></value>\r\n";
+ return "<value><datetime.iso8601>" + arg.toDateTime().toString( TQt::ISODate ) + "</datetime.iso8601></value>\r\n";
case TQVariant::List:
{
TQString markup = "<value><array><data>\r\n";
@@ -279,7 +279,7 @@ TQVariant Query::demarshal( const TQDomElement &elem ) const
else if ( typeName == "base64" )
return TQVariant( KCodecs::base64Decode( TQCString(typeElement.text().latin1()) ) );
else if ( typeName == "datetime" || typeName == "datetime.iso8601" )
- return TQVariant( TQDateTime::fromString( typeElement.text(), Qt::ISODate ) );
+ return TQVariant( TQDateTime::fromString( typeElement.text(), TQt::ISODate ) );
else if ( typeName == "array" )
{
TQValueList<TQVariant> values;
@@ -360,9 +360,9 @@ void Server::call( const TQString &method, const TQValueList<TQVariant> &args,
kdWarning() << "Cannot execute call to " << method << ": empty server URL" << endl;
Query *query = Query::create( id, this );
- connect( query, TQT_SIGNAL( message( const TQValueList<TQVariant> &, const TQVariant& ) ), msgObj, messageSlot );
- connect( query, TQT_SIGNAL( fault( int, const TQString&, const TQVariant& ) ), faultObj, faultSlot );
- connect( query, TQT_SIGNAL( finished( Query* ) ), this, TQT_SLOT( queryFinished( Query* ) ) );
+ connect( query, TQ_SIGNAL( message( const TQValueList<TQVariant> &, const TQVariant& ) ), msgObj, messageSlot );
+ connect( query, TQ_SIGNAL( fault( int, const TQString&, const TQVariant& ) ), faultObj, faultSlot );
+ connect( query, TQ_SIGNAL( finished( Query* ) ), this, TQ_SLOT( queryFinished( Query* ) ) );
mPendingQueries.append( query );
query->call( m_url.url(), method, args, m_userAgent );
diff --git a/tderesources/egroupware/xmlrpciface.h b/tderesources/egroupware/xmlrpciface.h
index df2f3a6d..fb2f23df 100644
--- a/tderesources/egroupware/xmlrpciface.h
+++ b/tderesources/egroupware/xmlrpciface.h
@@ -32,7 +32,7 @@ namespace KXMLRPC
class Query : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -77,7 +77,7 @@ namespace KXMLRPC
class Server : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
Server( const KURL &url = KURL(),
diff --git a/tderesources/exchange/resourceexchange.cpp b/tderesources/exchange/resourceexchange.cpp
index ae65f9cd..a2cbbed0 100644
--- a/tderesources/exchange/resourceexchange.cpp
+++ b/tderesources/exchange/resourceexchange.cpp
@@ -123,18 +123,18 @@ bool ResourceExchange::doOpen()
kdDebug() << "ResourceExchange::doOpen()" << endl;
mClient = new ExchangeClient( mAccount, mTimeZoneId );
- connect( mClient, TQT_SIGNAL( downloadFinished( int, const TQString & ) ),
- TQT_SLOT( slotDownloadFinished( int, const TQString & ) ) );
- connect( mClient, TQT_SIGNAL( event( KCal::Event *, const KURL & ) ),
- TQT_SLOT( downloadedEvent( KCal::Event *, const KURL & ) ) );
+ connect( mClient, TQ_SIGNAL( downloadFinished( int, const TQString & ) ),
+ TQ_SLOT( slotDownloadFinished( int, const TQString & ) ) );
+ connect( mClient, TQ_SIGNAL( event( KCal::Event *, const KURL & ) ),
+ TQ_SLOT( downloadedEvent( KCal::Event *, const KURL & ) ) );
#if 0
kdDebug() << "Creating monitor" << endl;
TQHostAddress ip;
ip.setAddress( mAccount->host() );
mMonitor = new ExchangeMonitor( mAccount, ExchangeMonitor::CallBack, ip );
- connect( mMonitor, TQT_SIGNAL(notify( const TQValueList<long>& , const TQValueList<KURL>& )), this, TQT_SLOT(slotMonitorNotify( const TQValueList<long>& , const TQValueList<KURL>& )) );
- connect( mMonitor, TQT_SIGNAL(error(int , const TQString&)), this, TQT_SLOT(slotMonitorError(int , const TQString&)) );
+ connect( mMonitor, TQ_SIGNAL(notify( const TQValueList<long>& , const TQValueList<KURL>& )), this, TQ_SLOT(slotMonitorNotify( const TQValueList<long>& , const TQValueList<KURL>& )) );
+ connect( mMonitor, TQ_SIGNAL(error(int , const TQString&)), this, TQ_SLOT(slotMonitorError(int , const TQString&)) );
mMonitor->addWatch( mAccount->calendarURL(), ExchangeMonitor::UpdateNewMember, 1 );
#endif
diff --git a/tderesources/exchange/resourceexchange.h b/tderesources/exchange/resourceexchange.h
index 120a4de9..23113dad 100644
--- a/tderesources/exchange/resourceexchange.h
+++ b/tderesources/exchange/resourceexchange.h
@@ -47,7 +47,7 @@ class CalFormat;
// FIXME: Use ResourceCached
class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/exchange/resourceexchangeconfig.cpp b/tderesources/exchange/resourceexchangeconfig.cpp
index 3b3bf14f..57ad9d0f 100644
--- a/tderesources/exchange/resourceexchangeconfig.cpp
+++ b/tderesources/exchange/resourceexchangeconfig.cpp
@@ -62,7 +62,7 @@ ResourceExchangeConfig::ResourceExchangeConfig( TQWidget* parent, const char* n
mAutoMailbox = new TQCheckBox( i18n( "Determine mailbox &automatically" ), this );
mainLayout->addMultiCellWidget( mAutoMailbox, 5, 5, 0, 1 );
- connect( mAutoMailbox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAuto(bool)) );
+ connect( mAutoMailbox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAuto(bool)) );
mMailboxEdit = new KLineEdit( this );
mainLayout->addWidget( new TQLabel( i18n( "Mailbox URL:" ), this ), 6, 0 );
@@ -70,11 +70,11 @@ ResourceExchangeConfig::ResourceExchangeConfig( TQWidget* parent, const char* n
mTryFindMailbox = new TQPushButton( i18n( "&Find" ), this );
mainLayout->addWidget( mTryFindMailbox, 6, 2 );
- connect( mTryFindMailbox, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFindClicked()) );
+ connect( mTryFindMailbox, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFindClicked()) );
label = new TQLabel( i18n( "Cache timeout:" ), this );
mCacheEdit = new KIntNumInput( this );
- connect(mCacheEdit, TQT_SIGNAL(valueChanged( int )), TQT_SLOT(slotCacheEditChanged( int )));
+ connect(mCacheEdit, TQ_SIGNAL(valueChanged( int )), TQ_SLOT(slotCacheEditChanged( int )));
mCacheEdit->setMinValue( 0 );
mainLayout->addWidget( label, 7, 0 );
mainLayout->addWidget( mCacheEdit, 7, 1 );
diff --git a/tderesources/exchange/resourceexchangeconfig.h b/tderesources/exchange/resourceexchangeconfig.h
index c008c2ce..f9332bad 100644
--- a/tderesources/exchange/resourceexchangeconfig.h
+++ b/tderesources/exchange/resourceexchangeconfig.h
@@ -36,7 +36,7 @@ namespace KCal {
class ResourceExchangeConfig : public KRES::ConfigWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/featureplan/kcal_resourcefeatureplan.h b/tderesources/featureplan/kcal_resourcefeatureplan.h
index c86d18bc..7b64e12a 100644
--- a/tderesources/featureplan/kcal_resourcefeatureplan.h
+++ b/tderesources/featureplan/kcal_resourcefeatureplan.h
@@ -39,7 +39,7 @@ namespace KCal {
*/
class KDE_EXPORT ResourceFeaturePlan : public ResourceCached
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceFeaturePlan( const TDEConfig * );
diff --git a/tderesources/featureplan/kcal_resourcefeatureplanconfig.h b/tderesources/featureplan/kcal_resourcefeatureplanconfig.h
index 917ce52e..23809cea 100644
--- a/tderesources/featureplan/kcal_resourcefeatureplanconfig.h
+++ b/tderesources/featureplan/kcal_resourcefeatureplanconfig.h
@@ -33,7 +33,7 @@ namespace KCal {
class KDE_EXPORT ResourceFeaturePlanConfig : public KRES::ConfigWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/groupdav/kcal_resourcegroupdav.h b/tderesources/groupdav/kcal_resourcegroupdav.h
index dba9bd27..68aa44a6 100644
--- a/tderesources/groupdav/kcal_resourcegroupdav.h
+++ b/tderesources/groupdav/kcal_resourcegroupdav.h
@@ -33,7 +33,7 @@ namespace KCal {
*/
class KDE_EXPORT ResourceGroupDav : public ResourceGroupwareBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceGroupDav();
diff --git a/tderesources/groupdav/tdeabc_resourcegroupdav.h b/tderesources/groupdav/tdeabc_resourcegroupdav.h
index 7aa82f71..9057a8d8 100644
--- a/tderesources/groupdav/tdeabc_resourcegroupdav.h
+++ b/tderesources/groupdav/tdeabc_resourcegroupdav.h
@@ -29,7 +29,7 @@ namespace TDEABC {
class KDE_EXPORT ResourceGroupDav : public ResourceGroupwareBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/groupware/kcal_resourcegroupware.cpp b/tderesources/groupware/kcal_resourcegroupware.cpp
index 6200773b..f3897d79 100644
--- a/tderesources/groupware/kcal_resourcegroupware.cpp
+++ b/tderesources/groupware/kcal_resourcegroupware.cpp
@@ -159,16 +159,16 @@ bool ResourceGroupware::doLoad()
mJobData = TQString();
mDownloadJob = KPIM::GroupwareJob::getCalendar( url );
- connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
- connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotJobResult( TDEIO::Job * ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
mProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Downloading calendar") );
connect( mProgress,
- TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- TQT_SLOT( cancelLoad() ) );
+ TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQ_SLOT( cancelLoad() ) );
return true;
}
diff --git a/tderesources/groupware/kcal_resourcegroupware.h b/tderesources/groupware/kcal_resourcegroupware.h
index 323f6ade..56ad9ce6 100644
--- a/tderesources/groupware/kcal_resourcegroupware.h
+++ b/tderesources/groupware/kcal_resourcegroupware.h
@@ -41,7 +41,7 @@ namespace KCal {
*/
class ResourceGroupware : public ResourceCached
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceGroupware();
diff --git a/tderesources/groupware/kcal_resourcegroupwareconfig.h b/tderesources/groupware/kcal_resourcegroupwareconfig.h
index 7bfa34d4..53dcff7a 100644
--- a/tderesources/groupware/kcal_resourcegroupwareconfig.h
+++ b/tderesources/groupware/kcal_resourcegroupwareconfig.h
@@ -40,7 +40,7 @@ class ResourceCachedSaveConfig;
*/
class ResourceGroupwareConfig : public KRES::ConfigWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceGroupwareConfig( TQWidget *parent = 0, const char *name = 0 );
diff --git a/tderesources/groupware/tdeabc_resourcegroupware.cpp b/tderesources/groupware/tdeabc_resourcegroupware.cpp
index e8f0c0a2..b6b25911 100644
--- a/tderesources/groupware/tdeabc_resourcegroupware.cpp
+++ b/tderesources/groupware/tdeabc_resourcegroupware.cpp
@@ -244,18 +244,18 @@ bool ResourceGroupware::asyncLoad()
mJobData = TQString();
mDownloadJob = KPIM::GroupwareJob::getAddressBook( url );
- connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
- connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
- connect( mDownloadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
- TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotJobResult( TDEIO::Job * ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+ TQ_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) );
mProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Downloading addressbook") );
connect( mProgress,
- TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- TQT_SLOT( cancelLoad() ) );
+ TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQ_SLOT( cancelLoad() ) );
return true;
}
diff --git a/tderesources/groupware/tdeabc_resourcegroupware.h b/tderesources/groupware/tdeabc_resourcegroupware.h
index 59bbc9a4..47d4a5fd 100644
--- a/tderesources/groupware/tdeabc_resourcegroupware.h
+++ b/tderesources/groupware/tdeabc_resourcegroupware.h
@@ -34,7 +34,7 @@ class GroupwarePrefs;
class ResourceGroupware : public ResourceCached
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp b/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp
index e171c7e7..74e86600 100644
--- a/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp
+++ b/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp
@@ -106,7 +106,7 @@ ResourceGroupwareConfig::ResourceGroupwareConfig( TQWidget* parent, const char*
mainLayout->addWidget( label, 6, 0 );
mainLayout->addWidget( mAddressBookBox, 6, 1 );
- connect( updateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateAddressBookList() ) );
+ connect( updateButton, TQ_SIGNAL( clicked() ), TQ_SLOT( updateAddressBookList() ) );
}
void ResourceGroupwareConfig::loadSettings( KRES::Resource *res )
diff --git a/tderesources/groupware/tdeabc_resourcegroupwareconfig.h b/tderesources/groupware/tdeabc_resourcegroupwareconfig.h
index 86825bbf..7cf839d9 100644
--- a/tderesources/groupware/tdeabc_resourcegroupwareconfig.h
+++ b/tderesources/groupware/tdeabc_resourcegroupwareconfig.h
@@ -35,7 +35,7 @@ class ResourceGroupware;
class ResourceGroupwareConfig : public KRES::ConfigWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/groupwise/groupwisesettingswidget.cpp b/tderesources/groupwise/groupwisesettingswidget.cpp
index 48de8143..cbff52ac 100644
--- a/tderesources/groupwise/groupwisesettingswidget.cpp
+++ b/tderesources/groupwise/groupwisesettingswidget.cpp
@@ -27,8 +27,8 @@
GroupWiseSettingsWidget::GroupWiseSettingsWidget( TQWidget * parent )
: GroupWiseSettingsWidgetBase( parent )
{
- connect( m_settingsList, TQT_SIGNAL( itemRenamed( TQListViewItem *, int ) ),
- this, TQT_SLOT( slotItemRenamed( TQListViewItem *, int ) ) );
+ connect( m_settingsList, TQ_SIGNAL( itemRenamed( TQListViewItem *, int ) ),
+ this, TQ_SLOT( slotItemRenamed( TQListViewItem *, int ) ) );
}
void GroupWiseSettingsWidget::slotItemRenamed( TQListViewItem * item, int )
diff --git a/tderesources/groupwise/groupwisesettingswidget.h b/tderesources/groupwise/groupwisesettingswidget.h
index 9fff6aa7..9e81533d 100644
--- a/tderesources/groupwise/groupwisesettingswidget.h
+++ b/tderesources/groupwise/groupwisesettingswidget.h
@@ -30,7 +30,7 @@ class TQListViewItem;
class GroupWiseSettingsWidget : public GroupWiseSettingsWidgetBase
{
-Q_OBJECT
+TQ_OBJECT
public:
GroupWiseSettingsWidget( TQWidget * parent );
diff --git a/tderesources/groupwise/kcal_resourcegroupwise.cpp b/tderesources/groupwise/kcal_resourcegroupwise.cpp
index a8a0727e..6c3db3a8 100644
--- a/tderesources/groupwise/kcal_resourcegroupwise.cpp
+++ b/tderesources/groupwise/kcal_resourcegroupwise.cpp
@@ -158,16 +158,16 @@ bool ResourceGroupwise::doLoad()
mJobData = TQString();
mDownloadJob = TDEIO::get( url, false, false );
- connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
- connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotJobResult( TDEIO::Job * ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
mProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Downloading calendar") );
connect( mProgress,
- TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- TQT_SLOT( cancelLoad() ) );
+ TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQ_SLOT( cancelLoad() ) );
return true;
}
diff --git a/tderesources/groupwise/kcal_resourcegroupwise.h b/tderesources/groupwise/kcal_resourcegroupwise.h
index 5743a282..1bf1a5dc 100644
--- a/tderesources/groupwise/kcal_resourcegroupwise.h
+++ b/tderesources/groupwise/kcal_resourcegroupwise.h
@@ -43,7 +43,7 @@ class GroupwisePrefsBase;
*/
class KDE_EXPORT ResourceGroupwise : public ResourceCached
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp
index cb9f4493..bd081f5e 100644
--- a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp
+++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp
@@ -73,7 +73,7 @@ ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* parent, const char*
mainLayout->addMultiCellWidget( mSaveConfig, 6, 6, 0, 1 );
settingsButton->hide();
- // connect( settingsButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotViewUserSettings() ) );
+ // connect( settingsButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotViewUserSettings() ) );
}
@@ -123,7 +123,7 @@ void ResourceGroupwiseConfig::slotViewUserSettings()
if ( s )
{
- KDialogBase * dialog = new KDialogBase( ::tqqt_cast<TQWidget*>(parent() ), "gwsettingswidget", true, i18n( "GroupWise Settings" ) );
+ KDialogBase * dialog = new KDialogBase( ::tqt_cast<TQWidget*>(parent() ), "gwsettingswidget", true, i18n( "GroupWise Settings" ) );
// TQVBoxLayout * layout = new TQVBoxLayout( dialog );
GroupWiseSettingsWidget * settingsWidget = new GroupWiseSettingsWidget( dialog );
dialog->setMainWidget( settingsWidget );
diff --git a/tderesources/groupwise/kcal_resourcegroupwiseconfig.h b/tderesources/groupwise/kcal_resourcegroupwiseconfig.h
index 87447e0a..e982b819 100644
--- a/tderesources/groupwise/kcal_resourcegroupwiseconfig.h
+++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.h
@@ -41,7 +41,7 @@ class ResourceCachedSaveConfig;
*/
class KDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceGroupwiseConfig( TQWidget *parent = 0, const char *name = 0 );
diff --git a/tderesources/groupwise/soap/groupwiseserver.cpp b/tderesources/groupwise/soap/groupwiseserver.cpp
index 07342ec4..3ba461b9 100644
--- a/tderesources/groupwise/soap/groupwiseserver.cpp
+++ b/tderesources/groupwise/soap/groupwiseserver.cpp
@@ -114,7 +114,7 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *,
// kdDebug() << "Creating KSSLSocket()" << endl;
m_sock = new KSSLSocket();
m_sock->setTimeout( KProtocolManager::connectTimeout() );
- connect( m_sock, TQT_SIGNAL( sslFailure() ), TQT_SLOT( slotSslError() ) );
+ connect( m_sock, TQ_SIGNAL( sslFailure() ), TQ_SLOT( slotSslError() ) );
} else {
m_sock = new KExtendedSocket();
}
diff --git a/tderesources/groupwise/soap/groupwiseserver.h b/tderesources/groupwise/soap/groupwiseserver.h
index 0a0f70e0..31cd8f14 100644
--- a/tderesources/groupwise/soap/groupwiseserver.h
+++ b/tderesources/groupwise/soap/groupwiseserver.h
@@ -93,7 +93,7 @@ class DeltaInfo
class GroupwiseServer : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/groupwise/soap/gwconverter.cpp b/tderesources/groupwise/soap/gwconverter.cpp
index bda455f7..b842f15b 100644
--- a/tderesources/groupwise/soap/gwconverter.cpp
+++ b/tderesources/groupwise/soap/gwconverter.cpp
@@ -67,8 +67,8 @@ char* GWConverter::qStringToChar( const TQString &string )
TQDate GWConverter::charToTQDate( const char *str )
{
- if ( !str ) return TQDate(); // FIXME: Qt::ISODate is probably no good here because it expects yyyy-MM-dd not yyyyMMdd
- return TQDate::fromString( TQString::fromUtf8( str ), Qt::ISODate );
+ if ( !str ) return TQDate(); // FIXME: TQt::ISODate is probably no good here because it expects yyyy-MM-dd not yyyyMMdd
+ return TQDate::fromString( TQString::fromUtf8( str ), TQt::ISODate );
}
char *GWConverter::qDateTimeToChar( const TQDateTime &dt,
@@ -94,7 +94,7 @@ std::string* GWConverter::qDateTimeToString( const TQDateTime &dt )
TQDateTime GWConverter::stringToTQDateTime( const std::string* str )
{
- TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str->c_str() ), Qt::ISODate );
+ TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str->c_str() ), TQt::ISODate );
return dt;
}
@@ -111,15 +111,15 @@ std::string* GWConverter::qDateToString( const TQDate &date )
TQDate GWConverter::stringToTQDate( std::string* str )
{
//NB this ISODate may become unnecessary, if GW stops sending in yyyy-mm-dd format again
- return TQDate::fromString( TQString::fromLatin1( str->c_str() ), Qt::ISODate );
+ return TQDate::fromString( TQString::fromLatin1( str->c_str() ), TQt::ISODate );
}
TQDateTime GWConverter::charToTQDateTime( const char *str )
{
if ( !str ) return TQDateTime();
// kdDebug() << "charToTQDateTime(): " << str << endl;
- // as above re Qt::ISODate
- TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str ), Qt::ISODate );
+ // as above re TQt::ISODate
+ TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str ), TQt::ISODate );
// kdDebug() << " " << dt.toString() << endl;
return dt;
}
diff --git a/tderesources/groupwise/soap/incidenceconverter.cpp b/tderesources/groupwise/soap/incidenceconverter.cpp
index 84e28e69..5491f3db 100644
--- a/tderesources/groupwise/soap/incidenceconverter.cpp
+++ b/tderesources/groupwise/soap/incidenceconverter.cpp
@@ -543,7 +543,7 @@ bool IncidenceConverter::convertFromCalendarItem( ngwt__CalendarItem* item,
std::vector<xsd__date>::const_iterator it;
for ( it = dateList->begin(); it != dateList->end(); ++it ) {
- TQDate date = TQDate::fromString( s2q( *it ), Qt::ISODate );
+ TQDate date = TQDate::fromString( s2q( *it ), TQt::ISODate );
if ( date.isValid() )
}
}
@@ -689,7 +689,7 @@ void IncidenceConverter::setRecurrence( KCal::Incidence * incidence, ngwt__Calen
// recurrence date - try setting it using the recurrence start date - didn't help
/* std::string startDate;
- startDate.append( recur->recurStart().date().toString( Qt::ISODate ).utf8() );
+ startDate.append( recur->recurStart().date().toString( TQt::ISODate ).utf8() );
item->rdate = soap_new_ngwt__RecurrenceDateType( soap(), -1 );
item->rdate->date.push_back( startDate );*/
// exceptions list - try sending empty list even if no exceptions
@@ -704,7 +704,7 @@ void IncidenceConverter::setRecurrence( KCal::Incidence * incidence, ngwt__Calen
for ( KCal::DateList::ConstIterator it = exceptions.begin(); it != exceptions.end(); ++it )
{
std::string startDate;
- startDate.append( TQString((*it).toString( Qt::ISODate )).utf8() );
+ startDate.append( TQString((*it).toString( TQt::ISODate )).utf8() );
item->exdate->date.push_back( startDate );
}
}
diff --git a/tderesources/groupwise/soap/ksslsocket.cpp b/tderesources/groupwise/soap/ksslsocket.cpp
index 2f085cf2..b753249d 100644
--- a/tderesources/groupwise/soap/ksslsocket.cpp
+++ b/tderesources/groupwise/soap/ksslsocket.cpp
@@ -57,9 +57,9 @@ KSSLSocket::KSSLSocket() : KExtendedSocket()
setBlockingMode(false);
//Connect internal slots
- TQObject::connect( this, TQT_SIGNAL(connectionSuccess()), this, TQT_SLOT(slotConnected()) );
- TQObject::connect( this, TQT_SIGNAL(closed(int)), this, TQT_SLOT(slotDisconnected()) );
- TQObject::connect( this, TQT_SIGNAL(connectionFailed(int)), this, TQT_SLOT(slotDisconnected()));
+ TQObject::connect( this, TQ_SIGNAL(connectionSuccess()), this, TQ_SLOT(slotConnected()) );
+ TQObject::connect( this, TQ_SIGNAL(closed(int)), this, TQ_SLOT(slotDisconnected()) );
+ TQObject::connect( this, TQ_SIGNAL(connectionFailed(int)), this, TQ_SLOT(slotDisconnected()));
}
KSSLSocket::~KSSLSocket()
diff --git a/tderesources/groupwise/soap/ksslsocket.h b/tderesources/groupwise/soap/ksslsocket.h
index 42545948..aa4225b8 100644
--- a/tderesources/groupwise/soap/ksslsocket.h
+++ b/tderesources/groupwise/soap/ksslsocket.h
@@ -27,7 +27,7 @@ class KSSLSocketPrivate;
class KSSLSocket : public KExtendedSocket
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/groupwise/soap/stdsoap2.cpp b/tderesources/groupwise/soap/stdsoap2.cpp
index b83b2bb4..e3d42998 100644
--- a/tderesources/groupwise/soap/stdsoap2.cpp
+++ b/tderesources/groupwise/soap/stdsoap2.cpp
@@ -3827,9 +3827,6 @@ soap_accept(struct soap *soap)
#elif defined(PALM)
fcntl((SOAP_SOCKET)soap->master, F_SETFL, fcntl((SOAP_SOCKET)soap->master, F_GETFL,0)&~O_NONBLOCK);
fcntl((SOAP_SOCKET)soap->socket, F_SETFL, fcntl((SOAP_SOCKET)soap->socket, F_GETFL,0)&~O_NONBLOCK);
-#elif defined(SYMBIAN)
- long blocking = 0;
- ioctl((SOAP_SOCKET)soap->master, 0/*FIONBIO*/, &blocking);
#else
fcntl((SOAP_SOCKET)soap->master, F_SETFL, fcntl((SOAP_SOCKET)soap->master, F_GETFL)&~O_NONBLOCK);
fcntl((SOAP_SOCKET)soap->socket, F_SETFL, fcntl((SOAP_SOCKET)soap->socket, F_GETFL)&~O_NONBLOCK);
diff --git a/tderesources/groupwise/soap/stdsoap2.h b/tderesources/groupwise/soap/stdsoap2.h
index b68c2407..adb5037b 100644
--- a/tderesources/groupwise/soap/stdsoap2.h
+++ b/tderesources/groupwise/soap/stdsoap2.h
@@ -153,11 +153,6 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
# endif
#endif
-#ifdef __SYMBIAN32__
-# define SYMBIAN
-# undef WIN32
-#endif
-
#if defined(__palmos__) || defined(PALM_GCC) || defined(__PALMOS_TRAPS__)
# ifndef PALM
# define PALM
@@ -333,12 +328,6 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
# define O_NONBLOCK FNONBIO
# include <sys_socket.h>
# include "palmFunctions.h"
-# elif defined(SYMBIAN)
-# define WITH_LEAN
-# define WITH_NONAMESPACES
-# define HAVE_STRTOD /* use STRTOD since sscanf doesn't seem to work */
-# include <e32def.h>
-# include <sys/ioctl.h>
# elif defined(VXWORKS)
# define HAVE_STRRCHR
# define HAVE_STRTOD
@@ -445,9 +434,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
# include <sockLib.h>
# endif
# ifndef VXWORKS
-# ifndef SYMBIAN
-# include <strings.h>
-# endif
+# include <strings.h>
# endif
# ifdef SUN_OS
# include <sys/stream.h> /* SUN */
@@ -565,10 +552,7 @@ extern "C" {
#define SOAP_INVALID_SOCKET (-1)
#define soap_valid_socket(n) ((n) != SOAP_INVALID_SOCKET)
-#if defined(SYMBIAN)
-# define LONG64 long
-# define ULONG64 unsigned LONG64
-#elif !defined(WIN32) || defined(__GLIBC__) || defined(__GNU__)
+#if !defined(WIN32) || defined(__GLIBC__) || defined(__GNU__)
# ifndef LONG64
# define LONG64 long long
# define ULONG64 unsigned LONG64
@@ -583,8 +567,6 @@ extern "C" {
#if defined(WIN32)
# define soap_int32 __int32
-#elif defined(SYMBIAN)
-# define soap_int32 long
#elif defined(PALM)
# define soap_int32 Int32
#else
@@ -601,13 +583,8 @@ extern "C" {
# define SOAP_ERANGE ERANGE
# define SOAP_EINTR EINTR
# define SOAP_EAGAIN EAGAIN
-# ifdef SYMBIAN
-# define SOAP_EWOULDBLOCK 9898
-# define SOAP_EINPROGRESS 9899
-# else
-# define SOAP_EWOULDBLOCK EWOULDBLOCK
-# define SOAP_EINPROGRESS EINPROGRESS
-# endif
+# define SOAP_EWOULDBLOCK EWOULDBLOCK
+# define SOAP_EINPROGRESS EINPROGRESS
#endif
#ifdef WIN32
diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.cpp b/tderesources/groupwise/tdeabc_resourcegroupwise.cpp
index 7c3ed791..04ecc769 100644
--- a/tderesources/groupwise/tdeabc_resourcegroupwise.cpp
+++ b/tderesources/groupwise/tdeabc_resourcegroupwise.cpp
@@ -288,8 +288,8 @@ bool ResourceGroupwise::asyncLoad()
{
mProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n( "Loading GroupWise resource %1" ).arg( resourceName() ), TQString(), true /*CanBeCancelled*/, mPrefs->url().startsWith("https" ) );
- connect( mProgress, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- TQT_SLOT( cancelLoad() ) );
+ connect( mProgress, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQ_SLOT( cancelLoad() ) );
}
if ( addressBooks().isEmpty() ) {
@@ -349,15 +349,15 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType )
mJob = TDEIO::get( url, false, false ); // TODO: make the GW jobs call finished if the URL
// contains no address book IDs
kdDebug() << " Job address: " << mJob << endl;
- connect( mJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotReadJobData( TDEIO::Job *, const TQByteArray & ) ) );
- connect( mJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
- TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) );
+ connect( mJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotReadJobData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( mJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+ TQ_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) );
if ( bookType == System )
{
- connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( fetchSABResult( TDEIO::Job * ) ) );
+ connect( mJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( fetchSABResult( TDEIO::Job * ) ) );
mSABProgress = KPIM::ProgressManager::instance()->createProgressItem(
mProgress, KPIM::ProgressManager::getUniqueID(),
i18n( "Fetching System Address Book" ), TQString(),
@@ -366,8 +366,8 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType )
}
else
{
- connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( fetchUABResult( TDEIO::Job * ) ) );
+ connect( mJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( fetchUABResult( TDEIO::Job * ) ) );
mUABProgress = KPIM::ProgressManager::instance()->createProgressItem(
mProgress, KPIM::ProgressManager::getUniqueID(),
i18n( "Fetching User Address Books" ), TQString(),
@@ -446,12 +446,12 @@ void ResourceGroupwise::updateSystemAddressBook()
mJob = TDEIO::get( url, false, false );
mJob->setInteractive( false );
- connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( updateSABResult( TDEIO::Job * ) ) );
- connect( mJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotUpdateJobData( TDEIO::Job *, const TQByteArray & ) ) );
- connect( mJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
- TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) );
+ connect( mJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( updateSABResult( TDEIO::Job * ) ) );
+ connect( mJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotUpdateJobData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( mJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+ TQ_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) );
return;
}
diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.h b/tderesources/groupwise/tdeabc_resourcegroupwise.h
index b57c36e8..ccf74403 100644
--- a/tderesources/groupwise/tdeabc_resourcegroupwise.h
+++ b/tderesources/groupwise/tdeabc_resourcegroupwise.h
@@ -41,7 +41,7 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached
{
friend class ResourceGroupwiseConfig;
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -143,7 +143,7 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached
/** DATA PROCESSING SLOTS **/
void slotReadJobData( TDEIO::Job *, const TQByteArray & );
void slotUpdateJobData( TDEIO::Job *, const TQByteArray & );
- /** HELPER TQT_SLOT **/
+ /** HELPER TQ_SLOT **/
void slotJobPercent( TDEIO::Job *job, unsigned long percent );
void cancelLoad();
diff --git a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp
index 49016cdd..69dd7a6f 100644
--- a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp
+++ b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp
@@ -102,7 +102,7 @@ ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* parent, const char*
mainLayout->addWidget( label, 6, 0 );
mainLayout->addWidget( mAddressBookBox, 6, 1 );
- connect( updateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateAddressBookList() ) );
+ connect( updateButton, TQ_SIGNAL( clicked() ), TQ_SLOT( updateAddressBookList() ) );
}
void ResourceGroupwiseConfig::loadSettings( KRES::Resource *res )
diff --git a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h
index 233743f8..2e3ccea4 100644
--- a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h
+++ b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h
@@ -38,7 +38,7 @@ class ResourceGroupwise;
class KDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/groupwise/tdeioslave/groupwise.cpp b/tderesources/groupwise/tdeioslave/groupwise.cpp
index c51fa4e4..1c68d654 100644
--- a/tderesources/groupwise/tdeioslave/groupwise.cpp
+++ b/tderesources/groupwise/tdeioslave/groupwise.cpp
@@ -295,14 +295,14 @@ void Groupwise::getAddressbook( const KURL &url )
GroupwiseServer server( u, user, pass, 0 );
- connect( &server, TQT_SIGNAL( readAddressBookTotalSize( int ) ),
- TQT_SLOT( slotReadAddressBookTotalSize( int ) ) );
- connect( &server, TQT_SIGNAL( readAddressBookProcessedSize( int ) ),
- TQT_SLOT( slotReadAddressBookProcessedSize( int ) ) );
- connect( &server, TQT_SIGNAL( errorMessage( const TQString &, bool ) ),
- TQT_SLOT( slotServerErrorMessage( const TQString &, bool ) ) );
- connect( &server, TQT_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ),
- TQT_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) );
+ connect( &server, TQ_SIGNAL( readAddressBookTotalSize( int ) ),
+ TQ_SLOT( slotReadAddressBookTotalSize( int ) ) );
+ connect( &server, TQ_SIGNAL( readAddressBookProcessedSize( int ) ),
+ TQ_SLOT( slotReadAddressBookProcessedSize( int ) ) );
+ connect( &server, TQ_SIGNAL( errorMessage( const TQString &, bool ) ),
+ TQ_SLOT( slotServerErrorMessage( const TQString &, bool ) ) );
+ connect( &server, TQ_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ),
+ TQ_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) );
kdDebug() << "Login" << endl;
if ( !server.login() ) {
@@ -369,10 +369,10 @@ void Groupwise::updateAddressbook( const KURL &url )
debugMessage( "update IDs: " + ids.join( "," ) );
GroupwiseServer server( u, user, pass, 0 );
- connect( &server, TQT_SIGNAL( errorMessage( const TQString &, bool ) ),
- TQT_SLOT( slotServerErrorMessage( const TQString &, bool ) ) );
- connect( &server, TQT_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ),
- TQT_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) );
+ connect( &server, TQ_SIGNAL( errorMessage( const TQString &, bool ) ),
+ TQ_SLOT( slotServerErrorMessage( const TQString &, bool ) ) );
+ connect( &server, TQ_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ),
+ TQ_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) );
kdDebug() << " Login" << endl;
if ( !server.login() ) {
diff --git a/tderesources/groupwise/tdeioslave/groupwise.h b/tderesources/groupwise/tdeioslave/groupwise.h
index 5004682d..73fb48bb 100644
--- a/tderesources/groupwise/tdeioslave/groupwise.h
+++ b/tderesources/groupwise/tdeioslave/groupwise.h
@@ -26,7 +26,7 @@
class Groupwise : public TQObject, public TDEIO::SlaveBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
void get( const KURL &url );
diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp
index 869ddca8..24f6efe0 100644
--- a/tderesources/kolab/kcal/resourcekolab.cpp
+++ b/tderesources/kolab/kcal/resourcekolab.cpp
@@ -77,8 +77,8 @@ ResourceKolab::ResourceKolab( const TDEConfig *config )
setResourceName( i18n( "Kolab Server" ) );
}
setType( "imap" );
- connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ),
- this, TQT_SLOT( slotEmitResourceChanged() ) );
+ connect( &mResourceChangedTimer, TQ_SIGNAL( timeout() ),
+ this, TQ_SLOT( slotEmitResourceChanged() ) );
}
ResourceKolab::~ResourceKolab()
@@ -402,7 +402,7 @@ void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subre
KIncidenceChooser* ch = new KIncidenceChooser();
ch->setIncidence( local ,inc );
if ( KIncidenceChooser::chooseMode == KIncidenceChooser::ask ) {
- connect ( this, TQT_SIGNAL( useGlobalMode() ), ch, TQT_SLOT ( useGlobalMode() ) );
+ connect ( this, TQ_SIGNAL( useGlobalMode() ), ch, TQ_SLOT ( useGlobalMode() ) );
if ( ch->exec() ) {
if ( KIncidenceChooser::chooseMode != KIncidenceChooser::ask ) {
emit useGlobalMode() ;
@@ -711,7 +711,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
/* Will be needed when kmail triggers a delete, so we don't delete the inocent
* incidence that's sharing the uid with this one */
- mOriginalUID2fakeUID[tqMakePair( incidence->schedulingID(), subResource )] = uid;
+ mOriginalUID2fakeUID[qMakePair( incidence->schedulingID(), subResource )] = uid;
}
}
/* Add to the cache if the add didn't come from KOrganizer, in which case
@@ -1185,7 +1185,7 @@ void ResourceKolab::setSubresourceActive( const TQString &subresource, bool v )
}
mResourceChangedTimer.changeInterval( 100 );
}
- TQTimer::singleShot( 0, this, TQT_SLOT(writeConfig()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(writeConfig()) );
}
bool ResourceKolab::subresourceWritable( const TQString& subresource ) const
diff --git a/tderesources/kolab/kcal/resourcekolab.h b/tderesources/kolab/kcal/resourcekolab.h
index 8a4da37c..a8404cd3 100644
--- a/tderesources/kolab/kcal/resourcekolab.h
+++ b/tderesources/kolab/kcal/resourcekolab.h
@@ -51,7 +51,7 @@ class KDE_EXPORT ResourceKolab : public KCal::ResourceCalendar,
public KCal::IncidenceBase::Observer,
public Kolab::ResourceKolabBase
{
- Q_OBJECT
+ TQ_OBJECT
friend struct TemporarySilencer;
diff --git a/tderesources/kolab/knotes/resourcekolab.h b/tderesources/kolab/knotes/resourcekolab.h
index 5f205b16..5f1023b4 100644
--- a/tderesources/kolab/knotes/resourcekolab.h
+++ b/tderesources/kolab/knotes/resourcekolab.h
@@ -53,7 +53,7 @@ class KDE_EXPORT ResourceKolab : public ResourceNotes,
public KCal::IncidenceBase::Observer,
public ResourceKolabBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/kolab/shared/kmailconnection.cpp b/tderesources/kolab/shared/kmailconnection.cpp
index 8011c15d..ac4904a8 100644
--- a/tderesources/kolab/shared/kmailconnection.cpp
+++ b/tderesources/kolab/shared/kmailconnection.cpp
@@ -56,8 +56,8 @@ KMailConnection::KMailConnection( ResourceKolabBase* resource,
mDCOPClient->registerAs( objId, true );
kapp->dcopClient()->setNotifications( true );
- connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ),
- this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
+ connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
+ this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
}
KMailConnection::~KMailConnection()
diff --git a/tderesources/kolab/shared/kmailconnection.h b/tderesources/kolab/shared/kmailconnection.h
index 62003b5f..5497246a 100644
--- a/tderesources/kolab/shared/kmailconnection.h
+++ b/tderesources/kolab/shared/kmailconnection.h
@@ -49,7 +49,7 @@ class ResourceKolabBase;
This class provides the kmail connectivity for IMAP resources.
*/
class KMailConnection : public TQObject, public DCOPObject {
- Q_OBJECT
+ TQ_OBJECT
//
K_DCOP
diff --git a/tderesources/kolab/shared/kolabbase.cpp b/tderesources/kolab/shared/kolabbase.cpp
index 1dc5418b..5834fd1f 100644
--- a/tderesources/kolab/shared/kolabbase.cpp
+++ b/tderesources/kolab/shared/kolabbase.cpp
@@ -409,12 +409,12 @@ TQDomDocument KolabBase::domTree()
TQString KolabBase::dateTimeToString( const TQDateTime& time )
{
- return time.toString( Qt::ISODate ) + 'Z';
+ return time.toString( TQt::ISODate ) + 'Z';
}
TQString KolabBase::dateToString( const TQDate& date )
{
- return date.toString( Qt::ISODate );
+ return date.toString( TQt::ISODate );
}
TQDateTime KolabBase::stringToDateTime( const TQString& _date )
@@ -423,15 +423,15 @@ TQDateTime KolabBase::stringToDateTime( const TQString& _date )
//Deal with data from some clients that always append a Z to dates.
if ( date.endsWith( "ZZ" ) )
date.truncate( date.length() - 2 );
- //In TQt3, Qt::ISODate cannot handle a trailing Z for UTC, so remove if found.
+ //In TQt3, TQt::ISODate cannot handle a trailing Z for UTC, so remove if found.
else if ( date.endsWith( "Z" ) )
date.truncate( date.length() - 1 );
- return TQDateTime::fromString( date, Qt::ISODate );
+ return TQDateTime::fromString( date, TQt::ISODate );
}
TQDate KolabBase::stringToDate( const TQString& date )
{
- return TQDate::fromString( date, Qt::ISODate );
+ return TQDate::fromString( date, TQt::ISODate );
}
TQString KolabBase::sensitivityToString( Sensitivity s )
diff --git a/tderesources/kolab/tdeabc/resourcekolab.h b/tderesources/kolab/tdeabc/resourcekolab.h
index 9b4b4a17..3347a177 100644
--- a/tderesources/kolab/tdeabc/resourcekolab.h
+++ b/tderesources/kolab/tdeabc/resourcekolab.h
@@ -52,7 +52,7 @@ namespace TDEABC {
class KDE_EXPORT ResourceKolab : public KPIM::ResourceABC,
public Kolab::ResourceKolabBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/lib/calendaradaptor.h b/tderesources/lib/calendaradaptor.h
index 7a2567e3..dc203440 100644
--- a/tderesources/lib/calendaradaptor.h
+++ b/tderesources/lib/calendaradaptor.h
@@ -51,7 +51,7 @@ class CalendarUploadItem : public KPIM::GroupwareUploadItem
class KDE_EXPORT CalendarAdaptor : public KPIM::GroupwareDataAdaptor
{
- Q_OBJECT
+ TQ_OBJECT
public:
CalendarAdaptor();
diff --git a/tderesources/lib/folderconfig.cpp b/tderesources/lib/folderconfig.cpp
index e400c02f..facdf13b 100644
--- a/tderesources/lib/folderconfig.cpp
+++ b/tderesources/lib/folderconfig.cpp
@@ -47,12 +47,12 @@ FolderConfig::FolderConfig( TQWidget *parent )
TQBoxLayout *topLayout = new TQVBoxLayout( this );
topLayout->addSpacing( KDialog::spacingHint() );
- TQGroupBox *topBox = new TQGroupBox( 1, Qt::Horizontal, i18n("Folder Selection"),
+ TQGroupBox *topBox = new TQGroupBox( 1, TQt::Horizontal, i18n("Folder Selection"),
this );
topLayout->addWidget( topBox );
TQPushButton *button = new TQPushButton( i18n("Update Folder List"), topBox );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SIGNAL( updateFoldersClicked() ) );
+ connect( button, TQ_SIGNAL( clicked() ), TQ_SIGNAL( updateFoldersClicked() ) );
mFolderList = new FolderListView( topBox );
@@ -81,7 +81,7 @@ void FolderConfig::setFolderLister( FolderLister *f )
if ( suptypes.contains( FolderLister::Unknown ) ) types << FolderListView::Unknown;
mFolderList->setEnabledTypes( types );
- connect( mFolderLister, TQT_SIGNAL( foldersRead() ), TQT_SLOT( updateFolderList() ) );
+ connect( mFolderLister, TQ_SIGNAL( foldersRead() ), TQ_SLOT( updateFolderList() ) );
}
void FolderConfig::retrieveFolderList( const KURL &url )
diff --git a/tderesources/lib/folderconfig.h b/tderesources/lib/folderconfig.h
index e027095d..892128a4 100644
--- a/tderesources/lib/folderconfig.h
+++ b/tderesources/lib/folderconfig.h
@@ -37,7 +37,7 @@ class FolderLister;
class KDE_EXPORT FolderConfig : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
FolderConfig( TQWidget *parent );
diff --git a/tderesources/lib/folderlister.cpp b/tderesources/lib/folderlister.cpp
index c12d3ae6..ec40e8cc 100644
--- a/tderesources/lib/folderlister.cpp
+++ b/tderesources/lib/folderlister.cpp
@@ -216,12 +216,12 @@ void FolderLister::setAdaptor( KPIM::GroupwareDataAdaptor *adaptor )
disconnect( mAdaptor, 0, this, 0 );
}
mAdaptor = adaptor;
- connect( mAdaptor, TQT_SIGNAL( folderInfoRetrieved( const KURL &,
+ connect( mAdaptor, TQ_SIGNAL( folderInfoRetrieved( const KURL &,
const TQString &, KPIM::FolderLister::ContentType ) ),
- this, TQT_SLOT( processFolderResult( const KURL &, const TQString &,
+ this, TQ_SLOT( processFolderResult( const KURL &, const TQString &,
KPIM::FolderLister::ContentType ) ) );
- connect( mAdaptor, TQT_SIGNAL( folderSubitemRetrieved( const KURL &, bool ) ),
- this, TQT_SLOT( folderSubitemRetrieved( const KURL &, bool ) ) );
+ connect( mAdaptor, TQ_SIGNAL( folderSubitemRetrieved( const KURL &, bool ) ),
+ this, TQ_SLOT( folderSubitemRetrieved( const KURL &, bool ) ) );
}
void FolderLister::folderSubitemRetrieved( const KURL &url, bool isFolder )
@@ -272,8 +272,8 @@ void FolderLister::doRetrieveFolder( const KURL &u )
kdDebug(7000) << "FolderLister::retrieveFolders: adjustedURL="
<< url.prettyURL() << endl;
- connect( listjob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotListJobResult( TDEIO::Job * ) ) );
+ connect( listjob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotListJobResult( TDEIO::Job * ) ) );
} else {
// TODO: Indicate a problem to the user!
kdWarning() << "Unable to create the folder list job for the url "
diff --git a/tderesources/lib/folderlister.h b/tderesources/lib/folderlister.h
index ac99d516..8a5ba529 100644
--- a/tderesources/lib/folderlister.h
+++ b/tderesources/lib/folderlister.h
@@ -47,7 +47,7 @@ class GroupwarePrefsBase;
class KDE_EXPORT FolderLister : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
enum Type { AddressBook, Calendar };
diff --git a/tderesources/lib/folderlistview.cpp b/tderesources/lib/folderlistview.cpp
index c9e03daa..f2427c48 100644
--- a/tderesources/lib/folderlistview.cpp
+++ b/tderesources/lib/folderlistview.cpp
@@ -43,10 +43,10 @@ FolderListView::FolderListView( TQWidget *parent, const TQValueList<Property> &t
{
setEnabledTypes( types );
- connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)),
- this, TQT_SLOT(slotMousePressed(int, TQListViewItem*, const TQPoint&, int)) );
- connect( this, TQT_SIGNAL(spacePressed(TQListViewItem*)),
- this, TQT_SLOT(showPopupMenu(TQListViewItem*)) );
+ connect( this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)),
+ this, TQ_SLOT(slotMousePressed(int, TQListViewItem*, const TQPoint&, int)) );
+ connect( this, TQ_SIGNAL(spacePressed(TQListViewItem*)),
+ this, TQ_SLOT(showPopupMenu(TQListViewItem*)) );
}
void FolderListView::setEnabledTypes( const TQValueList<Property> &types )
@@ -99,32 +99,32 @@ void FolderListView::showPopupMenu( FolderListItem *i, const TQPoint &globalPos
int id;
m.insertTitle( folder.name, 9999 );
- id = m.insertItem( i18n("&Enabled"), this, TQT_SLOT(slotPopupHandler(int)), 0, FolderName );
+ id = m.insertItem( i18n("&Enabled"), this, TQ_SLOT(slotPopupHandler(int)), 0, FolderName );
m.setItemChecked( id, i->isOn() );
m.insertSeparator();
if ( ( folder.type & KPIM::FolderLister::Event ) && (mTypes.contains( Event ) ) ) {
- id = m.insertItem( i18n("Default for New &Events"), this, TQT_SLOT(slotPopupHandler(int)), 0, Event );
+ id = m.insertItem( i18n("Default for New &Events"), this, TQ_SLOT(slotPopupHandler(int)), 0, Event );
m.setItemChecked( id, i->isDefault( Event ) );
}
if ( ( folder.type & KPIM::FolderLister::Todo ) && (mTypes.contains( Todo ) ) ) {
- id = m.insertItem( i18n("Default for New &Todos"), this, TQT_SLOT(slotPopupHandler(int)), 0, Todo );
+ id = m.insertItem( i18n("Default for New &Todos"), this, TQ_SLOT(slotPopupHandler(int)), 0, Todo );
m.setItemChecked( id, i->isDefault( Todo ) );
}
if ( ( folder.type & KPIM::FolderLister::Journal ) && (mTypes.contains( Journal ) ) ) {
- id = m.insertItem( i18n("Default for New &Journals"), this, TQT_SLOT(slotPopupHandler(int)), 0, Journal );
+ id = m.insertItem( i18n("Default for New &Journals"), this, TQ_SLOT(slotPopupHandler(int)), 0, Journal );
m.setItemChecked( id, i->isDefault( Journal ) );
}
if ( ( folder.type & KPIM::FolderLister::Contact ) && (mTypes.contains( Contact ) ) ) {
- id = m.insertItem( i18n("Default for New &Contacts"), this, TQT_SLOT(slotPopupHandler(int)), 0, Contact );
+ id = m.insertItem( i18n("Default for New &Contacts"), this, TQ_SLOT(slotPopupHandler(int)), 0, Contact );
m.setItemChecked( id, i->isDefault( Contact ) );
}
if ( ( folder.type == KPIM::FolderLister::All ) && (mTypes.contains( All ) ) ) {
- id = m.insertItem( i18n("Default for All New &Items"), this, TQT_SLOT(slotPopupHandler(int)), 0, All );
+ id = m.insertItem( i18n("Default for All New &Items"), this, TQ_SLOT(slotPopupHandler(int)), 0, All );
m.setItemChecked( id, i->isDefault( All ) );
}
if ( ( folder.type == KPIM::FolderLister::Unknown ) && (mTypes.contains( Unknown ) ) ) {
- id = m.insertItem( i18n("Default for &Unknown New Items"), this, TQT_SLOT(slotPopupHandler(int)), 0, Unknown );
+ id = m.insertItem( i18n("Default for &Unknown New Items"), this, TQ_SLOT(slotPopupHandler(int)), 0, Unknown );
m.setItemChecked( id, i->isDefault( Unknown ) );
}
@@ -147,10 +147,10 @@ void FolderListView::slotPopupHandler( int z )
void FolderListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& pos, int c)
{
if ( dynamic_cast<FolderListItem*>(i) ) {
- if ( btn == Qt::RightButton ) {
+ if ( btn == TQt::RightButton ) {
showPopupMenu( (FolderListItem*)i, /*mapToGlobal(*/pos/*)*/ );
}
- else if ( btn == Qt::LeftButton && c > 0 ) {
+ else if ( btn == TQt::LeftButton && c > 0 ) {
// map pos to item/column and call FolderListItem::activate(col, pos)
((FolderListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) );
// } else {
diff --git a/tderesources/lib/folderlistview.h b/tderesources/lib/folderlistview.h
index 08cadce6..a54ffd56 100644
--- a/tderesources/lib/folderlistview.h
+++ b/tderesources/lib/folderlistview.h
@@ -37,7 +37,7 @@ class FolderListCaption;
*/
class FolderListView : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
friend class FolderListItem;
diff --git a/tderesources/lib/folderselectdialog.cpp b/tderesources/lib/folderselectdialog.cpp
index ab599153..7ffd3e38 100644
--- a/tderesources/lib/folderselectdialog.cpp
+++ b/tderesources/lib/folderselectdialog.cpp
@@ -53,10 +53,10 @@ FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString&
mListBox->ensureCurrentVisible();
layout->addWidget( mListBox, 10 );
- connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ),
- TQT_SLOT( slotOk() ) );
- connect( mListBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ),
- TQT_SLOT( slotOk() ) );
+ connect( mListBox, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ),
+ TQ_SLOT( slotOk() ) );
+ connect( mListBox, TQ_SIGNAL( returnPressed( TQListBoxItem * ) ),
+ TQ_SLOT( slotOk() ) );
mListBox->setFocus();
diff --git a/tderesources/lib/groupwaredataadaptor.h b/tderesources/lib/groupwaredataadaptor.h
index 0370aa6f..27807124 100644
--- a/tderesources/lib/groupwaredataadaptor.h
+++ b/tderesources/lib/groupwaredataadaptor.h
@@ -90,7 +90,7 @@ class KDE_EXPORT GroupwareUploadItem
class KDE_EXPORT GroupwareDataAdaptor : public TQObject
{
-Q_OBJECT
+TQ_OBJECT
public:
GroupwareDataAdaptor();
diff --git a/tderesources/lib/groupwaredownloadjob.cpp b/tderesources/lib/groupwaredownloadjob.cpp
index 52a01fd4..1381b929 100644
--- a/tderesources/lib/groupwaredownloadjob.cpp
+++ b/tderesources/lib/groupwaredownloadjob.cpp
@@ -59,21 +59,21 @@ void GroupwareDownloadJob::run()
mItemsForDownload.clear();
mCurrentlyOnServer.clear();
- connect( adaptor(), TQT_SIGNAL( itemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ),
- TQT_SLOT( slotItemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ) );
- connect( adaptor(), TQT_SIGNAL( itemOnServer( const KURL & ) ),
- TQT_SLOT( slotItemOnServer( const KURL & ) ) );
- connect( adaptor(), TQT_SIGNAL( itemDownloaded( const TQString &, const KURL &, const TQString & ) ),
- TQT_SLOT( slotItemDownloaded( const TQString &, const KURL &, const TQString & ) ) );
- connect( adaptor(), TQT_SIGNAL( itemDownloadError( const KURL &, const TQString & ) ),
- TQT_SLOT( slotItemDownloadError( const KURL &, const TQString & ) ) );
+ connect( adaptor(), TQ_SIGNAL( itemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ),
+ TQ_SLOT( slotItemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ) );
+ connect( adaptor(), TQ_SIGNAL( itemOnServer( const KURL & ) ),
+ TQ_SLOT( slotItemOnServer( const KURL & ) ) );
+ connect( adaptor(), TQ_SIGNAL( itemDownloaded( const TQString &, const KURL &, const TQString & ) ),
+ TQ_SLOT( slotItemDownloaded( const TQString &, const KURL &, const TQString & ) ) );
+ connect( adaptor(), TQ_SIGNAL( itemDownloadError( const KURL &, const TQString & ) ),
+ TQ_SLOT( slotItemDownloadError( const KURL &, const TQString & ) ) );
mProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(),
adaptor()->downloadProgressMessage() );
connect( mProgress,
- TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- TQT_SLOT( cancelLoad() ) );
+ TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQ_SLOT( cancelLoad() ) );
listItems();
}
@@ -105,10 +105,10 @@ void GroupwareDownloadJob::listItems()
mListItemsData = TQString();
mListEventsJob = adaptor()->createListItemsJob( url );
- connect( mListEventsJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotListItemsResult( TDEIO::Job * ) ) );
- connect( mListEventsJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotListItemsData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( mListEventsJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotListItemsResult( TDEIO::Job * ) ) );
+ connect( mListEventsJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotListItemsData( TDEIO::Job *, const TQByteArray & ) ) );
}
}
@@ -187,10 +187,10 @@ void GroupwareDownloadJob::downloadItem()
mDownloadJob = adaptor()->createDownloadJob( href, ctype );
}
- connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotDownloadItemResult( TDEIO::Job * ) ) );
- connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotDownloadItemData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotDownloadItemResult( TDEIO::Job * ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotDownloadItemData( TDEIO::Job *, const TQByteArray & ) ) );
}
}
diff --git a/tderesources/lib/groupwaredownloadjob.h b/tderesources/lib/groupwaredownloadjob.h
index 6cf3bf24..d754ecb5 100644
--- a/tderesources/lib/groupwaredownloadjob.h
+++ b/tderesources/lib/groupwaredownloadjob.h
@@ -41,7 +41,7 @@ class ProgressItem;
*/
class GroupwareDownloadJob : public GroupwareJob
{
- Q_OBJECT
+ TQ_OBJECT
public:
GroupwareDownloadJob( GroupwareDataAdaptor *adaptor );
diff --git a/tderesources/lib/groupwareresourcejob.cpp b/tderesources/lib/groupwareresourcejob.cpp
index b7e4b57b..09972b85 100644
--- a/tderesources/lib/groupwareresourcejob.cpp
+++ b/tderesources/lib/groupwareresourcejob.cpp
@@ -30,7 +30,7 @@ using namespace KPIM;
GroupwareJob::GroupwareJob( GroupwareDataAdaptor *adaptor )
: mAdaptor( adaptor )
{
- TQTimer::singleShot( 0, this, TQT_SLOT( run() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( run() ) );
}
bool GroupwareJob::error() const
diff --git a/tderesources/lib/groupwareresourcejob.h b/tderesources/lib/groupwareresourcejob.h
index d32caaae..1b7697e3 100644
--- a/tderesources/lib/groupwareresourcejob.h
+++ b/tderesources/lib/groupwareresourcejob.h
@@ -37,7 +37,7 @@ class GroupwareDataAdaptor;
*/
class GroupwareJob : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
GroupwareJob( GroupwareDataAdaptor *adaptor );
diff --git a/tderesources/lib/groupwareuploadjob.cpp b/tderesources/lib/groupwareuploadjob.cpp
index 51307d83..4c0f1ba2 100644
--- a/tderesources/lib/groupwareuploadjob.cpp
+++ b/tderesources/lib/groupwareuploadjob.cpp
@@ -52,22 +52,22 @@ void GroupwareUploadJob::run()
KPIM::ProgressManager::getUniqueID(),
adaptor()->uploadProgressMessage() );
connect( mUploadProgress,
- TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- TQT_SLOT( cancelSave() ) );
+ TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQ_SLOT( cancelSave() ) );
- connect( adaptor(), TQT_SIGNAL( itemDeletionError( const KURL &, const TQString & ) ),
- TQT_SLOT( slotItemDeleteError( const KURL &, const TQString & ) ) );
- connect( adaptor(), TQT_SIGNAL( itemUploadError( const KURL &, const TQString & ) ),
- TQT_SLOT( slotItemUploadError( const KURL &, const TQString & ) ) );
- connect( adaptor(), TQT_SIGNAL( itemUploadNewError( const TQString &, const TQString & ) ),
- TQT_SLOT( slotItemUploadNewError( const TQString &, const TQString & ) ) );
+ connect( adaptor(), TQ_SIGNAL( itemDeletionError( const KURL &, const TQString & ) ),
+ TQ_SLOT( slotItemDeleteError( const KURL &, const TQString & ) ) );
+ connect( adaptor(), TQ_SIGNAL( itemUploadError( const KURL &, const TQString & ) ),
+ TQ_SLOT( slotItemUploadError( const KURL &, const TQString & ) ) );
+ connect( adaptor(), TQ_SIGNAL( itemUploadNewError( const TQString &, const TQString & ) ),
+ TQ_SLOT( slotItemUploadNewError( const TQString &, const TQString & ) ) );
- connect( adaptor(), TQT_SIGNAL( itemDeleted( const TQString &, const KURL & ) ),
- TQT_SLOT( slotItemDeleted( const TQString &, const KURL & ) ) );
- connect( adaptor(), TQT_SIGNAL( itemUploaded( const TQString &, const KURL & ) ),
- TQT_SLOT( slotItemUploaded( const TQString &, const KURL & ) ) );
- connect( adaptor(), TQT_SIGNAL( itemUploadedNew( const TQString &, const KURL& ) ),
- TQT_SLOT( slotItemUploadedNew( const TQString &, const KURL & ) ) );
+ connect( adaptor(), TQ_SIGNAL( itemDeleted( const TQString &, const KURL & ) ),
+ TQ_SLOT( slotItemDeleted( const TQString &, const KURL & ) ) );
+ connect( adaptor(), TQ_SIGNAL( itemUploaded( const TQString &, const KURL & ) ),
+ TQ_SLOT( slotItemUploaded( const TQString &, const KURL & ) ) );
+ connect( adaptor(), TQ_SIGNAL( itemUploadedNew( const TQString &, const KURL& ) ),
+ TQ_SLOT( slotItemUploadedNew( const TQString &, const KURL & ) ) );
mUploadProgress->setTotalItems( mAddedItems.size() + mChangedItems.size() +
@@ -81,7 +81,7 @@ void GroupwareUploadJob::deleteItem()
{
kdDebug(5800)<<"GroupwareUploadJob::deleteItem()"<<endl;
if ( mDeletedItems.isEmpty() ) {
- TQTimer::singleShot( 0, this, TQT_SLOT( uploadItem() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( uploadItem() ) );
} else {
kdDebug(7000) << " Deleting " << mDeletedItems.size() << " items from the server " << endl;
@@ -102,10 +102,10 @@ kdDebug() << "Not using batch delete " << endl;
if ( mDeletionJob ) {
mDeletionJobData = TQString();
- connect( mDeletionJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
- TQT_SLOT( slotDeletionJobResult( TDEIO::Job* ) ) );
-// connect( mDeletionJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
-// TQT_SLOT( slotDeletionJobData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( mDeletionJob, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ TQ_SLOT( slotDeletionJobResult( TDEIO::Job* ) ) );
+// connect( mDeletionJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+// TQ_SLOT( slotDeletionJobData( TDEIO::Job *, const TQByteArray & ) ) );
} else {
deleteItem();
}
@@ -129,7 +129,7 @@ void GroupwareUploadJob::slotDeletionJobResult( TDEIO::Job *job )
adaptor()->interpretRemoveJob( job, mDeletionJobData );
}
mDeletionJob = 0;
- TQTimer::singleShot( 0, this, TQT_SLOT( deleteItem() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( deleteItem() ) );
}
@@ -138,7 +138,7 @@ void GroupwareUploadJob::uploadItem()
{
kdDebug(5800)<<"GroupwareUploadJob::uploadItem()"<<endl;
if ( mChangedItems.isEmpty() ) {
- TQTimer::singleShot( 0, this, TQT_SLOT( uploadNewItem() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( uploadNewItem() ) );
} else {
kdDebug(5800)<<"We still have "<<mChangedItems.count()<<" changed items to upload"<<endl;
@@ -159,10 +159,10 @@ kdDebug() << "Not using batch upload " << endl;
if ( mUploadJob ) {
mUploadJobData = TQString();
- connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
- TQT_SLOT( slotUploadJobResult( TDEIO::Job* ) ) );
- connect( mUploadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotUploadJobData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ TQ_SLOT( slotUploadJobResult( TDEIO::Job* ) ) );
+ connect( mUploadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotUploadJobData( TDEIO::Job *, const TQByteArray & ) ) );
} else {
uploadItem();
}
@@ -185,7 +185,7 @@ void GroupwareUploadJob::slotUploadJobResult( TDEIO::Job *job )
adaptor()->interpretUploadJob( job, mUploadJobData );
}
mUploadJob = 0;
- TQTimer::singleShot( 0, this, TQT_SLOT( uploadItem() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( uploadItem() ) );
}
@@ -217,10 +217,10 @@ kdDebug() << "Not using batch create to " << url.url() << " for item of type " <
if ( mUploadJob ) {
mUploadNewJobData = TQString();
- connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
- TQT_SLOT( slotUploadNewJobResult( TDEIO::Job* ) ) );
- connect( mUploadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotUploadNewJobData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ TQ_SLOT( slotUploadNewJobResult( TDEIO::Job* ) ) );
+ connect( mUploadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotUploadNewJobData( TDEIO::Job *, const TQByteArray & ) ) );
} else {
uploadNewItem();
}
@@ -246,7 +246,7 @@ void GroupwareUploadJob::slotUploadNewJobResult( TDEIO::Job *job )
adaptor()->interpretUploadNewJob( job, mUploadNewJobData );
}
mUploadJob = 0;
- TQTimer::singleShot( 0, this, TQT_SLOT( uploadNewItem() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( uploadNewItem() ) );
}
diff --git a/tderesources/lib/groupwareuploadjob.h b/tderesources/lib/groupwareuploadjob.h
index 13ba3ed5..9845457b 100644
--- a/tderesources/lib/groupwareuploadjob.h
+++ b/tderesources/lib/groupwareuploadjob.h
@@ -46,7 +46,7 @@ class ProgressItem;
*/
class GroupwareUploadJob : public GroupwareJob
{
- Q_OBJECT
+ TQ_OBJECT
public:
GroupwareUploadJob( GroupwareDataAdaptor *adaptor );
diff --git a/tderesources/lib/kcal_cachesettingsdlg.h b/tderesources/lib/kcal_cachesettingsdlg.h
index 18586455..f9462e5d 100644
--- a/tderesources/lib/kcal_cachesettingsdlg.h
+++ b/tderesources/lib/kcal_cachesettingsdlg.h
@@ -41,7 +41,7 @@ class ResourceCachedSaveConfig;
*/
class KDE_EXPORT CacheSettingsDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
CacheSettingsDialog( TQWidget *parent = 0, const char *name = 0 );
diff --git a/tderesources/lib/kcal_resourcegroupwarebase.cpp b/tderesources/lib/kcal_resourcegroupwarebase.cpp
index 8474ed21..1710a11e 100644
--- a/tderesources/lib/kcal_resourcegroupwarebase.cpp
+++ b/tderesources/lib/kcal_resourcegroupwarebase.cpp
@@ -195,8 +195,8 @@ bool ResourceGroupwareBase::doOpen()
return false;
} else {
mLoginFinished = false;
- connect( loginJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotLoginJobResult( TDEIO::Job* ) ) );
+ connect( loginJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotLoginJobResult( TDEIO::Job* ) ) );
enter_loop();
return mLoginFinished;
}
@@ -217,7 +217,7 @@ void tqt_leave_modal( TQWidget *widget );
void ResourceGroupwareBase::enter_loop()
{
TQWidget dummy(0,0,WType_Dialog | WShowModal);
- dummy.setFocusPolicy( TQ_NoFocus );
+ dummy.setFocusPolicy( TQWidget::NoFocus );
tqt_enter_modal(&dummy);
tqApp->enter_loop();
tqt_leave_modal(&dummy);
@@ -239,8 +239,8 @@ void ResourceGroupwareBase::doClose()
if ( adaptor() &&
adaptor()->flags() & KPIM::GroupwareDataAdaptor::GWResNeedsLogoff ) {
TDEIO::Job *logoffJob = adaptor()->createLogoffJob( prefs()->url(), prefs()->user(), prefs()->password() );
- connect( logoffJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotLogoffJobResult( TDEIO::Job* ) ) );
+ connect( logoffJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotLogoffJobResult( TDEIO::Job* ) ) );
// TODO: Do we really need to block while waiting for the job to return?
enter_loop();
}
@@ -276,8 +276,8 @@ bool ResourceGroupwareBase::doLoad()
emit resourceChanged( this );
mDownloadJob = createDownloadJob( adaptor() );
- connect( mDownloadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ),
- TQT_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ),
+ TQ_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) );
return true;
}
@@ -322,8 +322,8 @@ bool ResourceGroupwareBase::doSave()
if ( !confirmSave() ) return false;
mUploadJob = createUploadJob( adaptor() );
- connect( mUploadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ),
- TQT_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) );
+ connect( mUploadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ),
+ TQ_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) );
Incidence::List inc;
Incidence::List::Iterator it;
@@ -376,8 +376,8 @@ void ResourceGroupwareBase::slotUploadJobResult( KPIM::GroupwareJob *job )
if ( !mDownloadJob ) {
mDownloadJob = createDownloadJob( adaptor() );
- connect( mDownloadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ),
- TQT_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ),
+ TQ_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) );
} else {
kdWarning() << k_funcinfo << "Download still in progress. "
"Can't happen. (TM)" << endl;
diff --git a/tderesources/lib/kcal_resourcegroupwarebase.h b/tderesources/lib/kcal_resourcegroupwarebase.h
index f7f80435..ae4ca579 100644
--- a/tderesources/lib/kcal_resourcegroupwarebase.h
+++ b/tderesources/lib/kcal_resourcegroupwarebase.h
@@ -51,7 +51,7 @@ class CalendarAdaptor;
*/
class KDE_EXPORT ResourceGroupwareBase : public ResourceCached
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceGroupwareBase();
diff --git a/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp b/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp
index 1ca2570a..4f576ed7 100644
--- a/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp
+++ b/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp
@@ -68,15 +68,15 @@ ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* parent,
mPasswordEdit->setEchoMode( KLineEdit::Password );
mFolderConfig = new KPIM::FolderConfig( this );
- connect( mFolderConfig, TQT_SIGNAL( updateFoldersClicked() ),
- TQT_SLOT( updateFolders() ) );
+ connect( mFolderConfig, TQ_SIGNAL( updateFoldersClicked() ),
+ TQ_SLOT( updateFolders() ) );
mainLayout->addMultiCellWidget( mFolderConfig, 4, 4, 0, 1 );
TQHBox *hBox = new TQHBox( this );
mCacheSettingsButton = new KPushButton( i18n("Configure Cache Settings..."), hBox );
mainLayout->addMultiCellWidget( hBox, 5, 5, 0, 1 );
- connect( mCacheSettingsButton, TQT_SIGNAL( clicked() ),
- TQT_SLOT( showCacheSettings() ) );
+ connect( mCacheSettingsButton, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( showCacheSettings() ) );
mCacheDialog = new CacheSettingsDialog( this );
}
diff --git a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h
index 940ba61b..db3ddd98 100644
--- a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h
+++ b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h
@@ -46,7 +46,7 @@ class CacheSettingsDialog;
*/
class KDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceGroupwareBaseConfig( TQWidget *parent = 0, const char *name = 0 );
diff --git a/tderesources/lib/tdeabc_resourcegroupwarebase.cpp b/tderesources/lib/tdeabc_resourcegroupwarebase.cpp
index f4a46990..cf73e03a 100644
--- a/tderesources/lib/tdeabc_resourcegroupwarebase.cpp
+++ b/tderesources/lib/tdeabc_resourcegroupwarebase.cpp
@@ -177,8 +177,8 @@ bool ResourceGroupwareBase::asyncLoad()
loadCache();
mDownloadJob = createDownloadJob( mAdaptor );
- connect( mDownloadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ),
- TQT_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ),
+ TQ_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) );
return true;
}
@@ -212,8 +212,8 @@ bool ResourceGroupwareBase::asyncSave( Ticket* )
}
mUploadJob = createUploadJob( mAdaptor );
- connect( mUploadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ),
- TQT_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) );
+ connect( mUploadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ),
+ TQ_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) );
TDEABC::Addressee::List addr;
TDEABC::Addressee::List::Iterator it;
diff --git a/tderesources/lib/tdeabc_resourcegroupwarebase.h b/tderesources/lib/tdeabc_resourcegroupwarebase.h
index 9d122fe4..bea6ca91 100644
--- a/tderesources/lib/tdeabc_resourcegroupwarebase.h
+++ b/tderesources/lib/tdeabc_resourcegroupwarebase.h
@@ -42,7 +42,7 @@ class AddressBookAdaptor;
class KDE_EXPORT ResourceGroupwareBase : public ResourceCached
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp
index 69dfb3d8..a80ce9e0 100644
--- a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp
+++ b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp
@@ -67,8 +67,8 @@ ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* parent, con
mainLayout->addMultiCellWidget( hline, 3, 3, 0, 1 );
mFolderConfig = new KPIM::FolderConfig( this );
- connect( mFolderConfig, TQT_SIGNAL( updateFoldersClicked() ),
- TQT_SLOT( updateFolders() ) );
+ connect( mFolderConfig, TQ_SIGNAL( updateFoldersClicked() ),
+ TQ_SLOT( updateFolders() ) );
mainLayout->addMultiCellWidget( mFolderConfig, 4, 4, 0, 1 );
}
diff --git a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h
index 37e98ef4..c1ccb689 100644
--- a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h
+++ b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h
@@ -38,7 +38,7 @@ class ResourceGroupwareBase;
class KDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/lib/webdavhandler.cpp b/tderesources/lib/webdavhandler.cpp
index af5eb276..d3255c36 100644
--- a/tderesources/lib/webdavhandler.cpp
+++ b/tderesources/lib/webdavhandler.cpp
@@ -120,7 +120,7 @@ bool WebdavHandler::extractDateTime( const TQDomElement &node, const TQString &e
{
TQDomElement element = node.namedItem( entry ).toElement();
if ( !element.isNull() && !element.text().isEmpty() ) {
- value = TQDateTime::fromString( element.text(), Qt::ISODate );
+ value = TQDateTime::fromString( element.text(), TQt::ISODate );
return true;
}
return false;
diff --git a/tderesources/newexchange/exchangecalendaradaptor.cpp b/tderesources/newexchange/exchangecalendaradaptor.cpp
index 5b51de5e..3b7aa36d 100644
--- a/tderesources/newexchange/exchangecalendaradaptor.cpp
+++ b/tderesources/newexchange/exchangecalendaradaptor.cpp
@@ -109,7 +109,7 @@ void ExchangeDelete::findUidSingleMaster( TQString const& uid )
TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", query, false );
job->setWindow( mWindow );
- connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFindUidResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotFindUidResult(TDEIO::Job *)));
}
*/
diff --git a/tderesources/newexchange/exchangeconvertercalendar.cpp b/tderesources/newexchange/exchangeconvertercalendar.cpp
index 85baf974..58c31535 100644
--- a/tderesources/newexchange/exchangeconvertercalendar.cpp
+++ b/tderesources/newexchange/exchangeconvertercalendar.cpp
@@ -314,8 +314,8 @@ void ExchangeDownload::handleRecurrence( TQString uid )
query, false );
TDEIO::Scheduler::scheduleJob( job );
job->setWindow( mWindow );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotMasterResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotMasterResult( TDEIO::Job * ) ) );
}
*/
@@ -410,7 +410,7 @@ kdDebug()<<"ExchangeConverterCalendar::readIncidence: ERROR: No UID given"<<endl
TQStringList::Iterator it = tmplst.begin();
KCal::DateList exdates;
for ( ; it != tmplst.end(); ++it ) {
- exdates.append( /*utcAsZone(*/ TQDateTime::fromString( *it, Qt::ISODate )/*,
+ exdates.append( /*utcAsZone(*/ TQDateTime::fromString( *it, TQt::ISODate )/*,
localTimeZoneId )*/.date() );
}
event->recurrence()->setExDates( exdates );
@@ -593,7 +593,7 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
void addDateProp( TQDomElement &el ) { el.setAttribute( "b:dt", "dateTime.tz" ); }
void addFloatProp( TQDomElement &el ) { el.setAttribute( "b:dt", "float" ); }
void addIntProp( TQDomElement &el ) { el.setAttribute( "b:dt", "int" ); }
- TQString timePropString( const TQDateTime &dt ) { return dt.toString( Qt::ISODate )+"Z"; }
+ TQString timePropString( const TQDateTime &dt ) { return dt.toString( TQt::ISODate )+"Z"; }
bool visitIncidence( Incidence *incidence )
{
@@ -730,8 +730,8 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
/* FIXME:
domCalendarProperty( "uid", todo->uid() );
- domCalendarProperty( "created", todo->created().toString( Qt::ISODate ) );
- domCalendarProperty( "lastmodified", todo->lastModified().toString( Qt::ISODate ) );*/
+ domCalendarProperty( "created", todo->created().toString( TQt::ISODate ) );
+ domCalendarProperty( "lastmodified", todo->lastModified().toString( TQt::ISODate ) );*/
// TODO
/*propertyTask1( TaskProp_Owner );
propertyTask2( TaskProp_ContactNames );
@@ -758,8 +758,8 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
"outlookmessageclass", "IPM.Journal" );
/* FIXME:
domCalendarProperty( "uid", todo->uid() );
- domCalendarProperty( "created", todo->created().toString( Qt::ISODate ) );
- domCalendarProperty( "lastmodified", todo->lastModified().toString( Qt::ISODate ) );*/
+ domCalendarProperty( "created", todo->created().toString( TQt::ISODate ) );
+ domCalendarProperty( "lastmodified", todo->lastModified().toString( TQt::ISODate ) );*/
// TODO
return true;
}
diff --git a/tderesources/newexchange/kcal_resourceexchange.h b/tderesources/newexchange/kcal_resourceexchange.h
index 823ed9a7..886319a4 100644
--- a/tderesources/newexchange/kcal_resourceexchange.h
+++ b/tderesources/newexchange/kcal_resourceexchange.h
@@ -31,7 +31,7 @@ namespace KCal {
*/
class KDE_EXPORT ResourceExchange : public ResourceGroupwareBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceExchange();
diff --git a/tderesources/newexchange/tdeabc_resourceexchange.h b/tderesources/newexchange/tdeabc_resourceexchange.h
index a5ae0e5e..121cdf11 100644
--- a/tderesources/newexchange/tdeabc_resourceexchange.h
+++ b/tderesources/newexchange/tdeabc_resourceexchange.h
@@ -27,7 +27,7 @@ namespace TDEABC {
class KDE_EXPORT ResourceExchange : public ResourceGroupwareBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/remote/resourceremote.cpp b/tderesources/remote/resourceremote.cpp
index 0a58aefb..9ee4aef5 100644
--- a/tderesources/remote/resourceremote.cpp
+++ b/tderesources/remote/resourceremote.cpp
@@ -197,11 +197,11 @@ bool ResourceRemote::doLoad()
mDownloadJob = TDEIO::file_copy( mDownloadUrl, KURL( cacheFile() ), -1, true,
false, !mUseProgressManager );
- connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotLoadJobResult( TDEIO::Job * ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotLoadJobResult( TDEIO::Job * ) ) );
if ( mUseProgressManager ) {
- connect( mDownloadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
- TQT_SLOT( slotPercent( TDEIO::Job *, unsigned long ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+ TQ_SLOT( slotPercent( TDEIO::Job *, unsigned long ) ) );
mProgress = KPIM::ProgressManager::createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Downloading Calendar") );
@@ -283,8 +283,8 @@ bool ResourceRemote::doSave()
saveCache();
mUploadJob = TDEIO::file_copy( KURL( cacheFile() ), mUploadUrl, -1, true );
- connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotSaveJobResult( TDEIO::Job * ) ) );
+ connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotSaveJobResult( TDEIO::Job * ) ) );
return true;
}
diff --git a/tderesources/remote/resourceremote.h b/tderesources/remote/resourceremote.h
index ec7be921..6989169f 100644
--- a/tderesources/remote/resourceremote.h
+++ b/tderesources/remote/resourceremote.h
@@ -50,7 +50,7 @@ namespace KCal {
*/
class KDE_EXPORT ResourceRemote : public ResourceCached
{
- Q_OBJECT
+ TQ_OBJECT
friend class ResourceRemoteConfig;
diff --git a/tderesources/remote/resourceremoteconfig.h b/tderesources/remote/resourceremoteconfig.h
index fdf26203..45417795 100644
--- a/tderesources/remote/resourceremoteconfig.h
+++ b/tderesources/remote/resourceremoteconfig.h
@@ -44,7 +44,7 @@ class ResourceCachedSaveConfig;
*/
class KDE_EXPORT ResourceRemoteConfig : public KRES::ConfigWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceRemoteConfig( TQWidget *parent = 0, const char *name = 0 );
diff --git a/tderesources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp
index ff9158d1..6b796e5d 100644
--- a/tderesources/scalix/kcal/resourcescalix.cpp
+++ b/tderesources/scalix/kcal/resourcescalix.cpp
@@ -66,8 +66,8 @@ ResourceScalix::ResourceScalix( const TDEConfig *config )
mCalendar( TQString::fromLatin1("UTC") ), mOpen( false )
{
setType( "scalix" );
- connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ),
- this, TQT_SLOT( slotEmitResourceChanged() ) );
+ connect( &mResourceChangedTimer, TQ_SIGNAL( timeout() ),
+ this, TQ_SLOT( slotEmitResourceChanged() ) );
}
ResourceScalix::~ResourceScalix()
@@ -310,7 +310,7 @@ void ResourceScalix::resolveConflict( KCal::Incidence* inc, const TQString& subr
KIncidenceChooser* ch = new KIncidenceChooser();
ch->setIncidence( local ,inc );
if ( KIncidenceChooser::chooseMode == KIncidenceChooser::ask ) {
- connect ( this, TQT_SIGNAL( useGlobalMode() ), ch, TQT_SLOT ( useGlobalMode() ) );
+ connect ( this, TQ_SIGNAL( useGlobalMode() ), ch, TQ_SLOT ( useGlobalMode() ) );
if ( ch->exec() )
if ( KIncidenceChooser::chooseMode != KIncidenceChooser::ask )
emit useGlobalMode() ;
diff --git a/tderesources/scalix/kcal/resourcescalix.h b/tderesources/scalix/kcal/resourcescalix.h
index d4e564c0..5b283534 100644
--- a/tderesources/scalix/kcal/resourcescalix.h
+++ b/tderesources/scalix/kcal/resourcescalix.h
@@ -50,7 +50,7 @@ class KDE_EXPORT ResourceScalix : public KCal::ResourceCalendar,
public KCal::IncidenceBase::Observer,
public Scalix::ResourceScalixBase
{
- Q_OBJECT
+ TQ_OBJECT
friend struct TemporarySilencer;
diff --git a/tderesources/scalix/knotes/resourcescalix.h b/tderesources/scalix/knotes/resourcescalix.h
index ab40b707..bcfa8cf5 100644
--- a/tderesources/scalix/knotes/resourcescalix.h
+++ b/tderesources/scalix/knotes/resourcescalix.h
@@ -52,7 +52,7 @@ class KDE_EXPORT ResourceScalix : public ResourceNotes,
public KCal::IncidenceBase::Observer,
public ResourceScalixBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/scalix/scalixadmin/delegatedialog.cpp b/tderesources/scalix/scalixadmin/delegatedialog.cpp
index 8674ce70..af843285 100644
--- a/tderesources/scalix/scalixadmin/delegatedialog.cpp
+++ b/tderesources/scalix/scalixadmin/delegatedialog.cpp
@@ -63,7 +63,7 @@ DelegateDialog::DelegateDialog( TQWidget *parent )
row++;
}
- connect( emailSelector, TQT_SIGNAL( clicked() ), TQT_SLOT( selectEmail() ) );
+ connect( emailSelector, TQ_SIGNAL( clicked() ), TQ_SLOT( selectEmail() ) );
setMainWidget( page );
}
diff --git a/tderesources/scalix/scalixadmin/delegatedialog.h b/tderesources/scalix/scalixadmin/delegatedialog.h
index 2f258113..874bced5 100644
--- a/tderesources/scalix/scalixadmin/delegatedialog.h
+++ b/tderesources/scalix/scalixadmin/delegatedialog.h
@@ -34,7 +34,7 @@ class Delegate;
class DelegateDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/scalix/scalixadmin/delegatemanager.h b/tderesources/scalix/scalixadmin/delegatemanager.h
index 05b0262d..b58d8ac9 100644
--- a/tderesources/scalix/scalixadmin/delegatemanager.h
+++ b/tderesources/scalix/scalixadmin/delegatemanager.h
@@ -28,7 +28,7 @@
class DelegateManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/scalix/scalixadmin/delegatepage.cpp b/tderesources/scalix/scalixadmin/delegatepage.cpp
index b4368f7d..b43dac85 100644
--- a/tderesources/scalix/scalixadmin/delegatepage.cpp
+++ b/tderesources/scalix/scalixadmin/delegatepage.cpp
@@ -53,10 +53,10 @@ DelegatePage::DelegatePage( TQWidget *parent )
mRemoveButton->setEnabled( false );
layout->addWidget( mRemoveButton, 1, 2 );
- connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) );
- connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addDelegate() ) );
- connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editDelegate() ) );
- connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeDelegate() ) );
+ connect( mView, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( selectionChanged() ) );
+ connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addDelegate() ) );
+ connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editDelegate() ) );
+ connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeDelegate() ) );
loadAllDelegates();
}
@@ -69,7 +69,7 @@ void DelegatePage::loadAllDelegates()
{
Scalix::GetDelegatesJob *job = Scalix::getDelegates( Settings::self()->globalSlave(),
Settings::self()->accountUrl() );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( allDelegates( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( allDelegates( TDEIO::Job* ) ) );
}
void DelegatePage::addDelegate()
@@ -88,7 +88,7 @@ void DelegatePage::addDelegate()
Scalix::SetDelegateJob *job = Scalix::setDelegate( Settings::self()->globalSlave(),
Settings::self()->accountUrl(),
delegate.email(), delegate.rights() );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( delegateAdded( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( delegateAdded( TDEIO::Job* ) ) );
}
void DelegatePage::editDelegate()
@@ -113,7 +113,7 @@ void DelegatePage::editDelegate()
Scalix::SetDelegateJob *job = Scalix::setDelegate( Settings::self()->globalSlave(),
Settings::self()->accountUrl(),
delegate.email(), delegate.rights() );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( delegateAdded( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( delegateAdded( TDEIO::Job* ) ) );
}
void DelegatePage::removeDelegate()
@@ -124,7 +124,7 @@ void DelegatePage::removeDelegate()
Scalix::DeleteDelegateJob *job = Scalix::deleteDelegate( Settings::self()->globalSlave(),
Settings::self()->accountUrl(), delegate.email() );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( delegateRemoved( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( delegateRemoved( TDEIO::Job* ) ) );
}
void DelegatePage::allDelegates( TDEIO::Job *job )
diff --git a/tderesources/scalix/scalixadmin/delegatepage.h b/tderesources/scalix/scalixadmin/delegatepage.h
index 0523effe..eabd988d 100644
--- a/tderesources/scalix/scalixadmin/delegatepage.h
+++ b/tderesources/scalix/scalixadmin/delegatepage.h
@@ -30,7 +30,7 @@ class DelegateView;
class DelegatePage : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/scalix/scalixadmin/delegateview.cpp b/tderesources/scalix/scalixadmin/delegateview.cpp
index 79b8cf33..e999baff 100644
--- a/tderesources/scalix/scalixadmin/delegateview.cpp
+++ b/tderesources/scalix/scalixadmin/delegateview.cpp
@@ -48,7 +48,7 @@ DelegateView::DelegateView( DelegateManager *manager, TQWidget *parent )
setFullWidth( true );
setAllColumnsShowFocus( true );
- connect( mManager, TQT_SIGNAL( changed() ), TQT_SLOT( delegateChanged() ) );
+ connect( mManager, TQ_SIGNAL( changed() ), TQ_SLOT( delegateChanged() ) );
delegateChanged();
}
diff --git a/tderesources/scalix/scalixadmin/delegateview.h b/tderesources/scalix/scalixadmin/delegateview.h
index 0416b8a0..2b72d284 100644
--- a/tderesources/scalix/scalixadmin/delegateview.h
+++ b/tderesources/scalix/scalixadmin/delegateview.h
@@ -31,7 +31,7 @@ class DelegateManager;
class DelegateView : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/scalix/scalixadmin/jobs.cpp b/tderesources/scalix/scalixadmin/jobs.cpp
index e07b17ca..d965438d 100644
--- a/tderesources/scalix/scalixadmin/jobs.cpp
+++ b/tderesources/scalix/scalixadmin/jobs.cpp
@@ -207,8 +207,8 @@ DeleteDelegateJob::DeleteDelegateJob( const KURL& url, const TQByteArray &packed
GetDelegatesJob::GetDelegatesJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo )
: TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
{
- connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
- this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
+ connect( this, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+ this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
}
Delegate::List GetDelegatesJob::delegates() const
@@ -259,8 +259,8 @@ DeleteOtherUserJob::DeleteOtherUserJob( const KURL& url, const TQByteArray &pack
GetOtherUsersJob::GetOtherUsersJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo )
: TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
{
- connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
- this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
+ connect( this, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+ this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
}
TQStringList GetOtherUsersJob::otherUsers() const
@@ -281,8 +281,8 @@ SetOutOfOfficeJob::SetOutOfOfficeJob( const KURL& url, const TQByteArray &packed
GetOutOfOfficeJob::GetOutOfOfficeJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo )
: TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
{
- connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
- this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
+ connect( this, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+ this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
}
bool GetOutOfOfficeJob::enabled() const
diff --git a/tderesources/scalix/scalixadmin/jobs.h b/tderesources/scalix/scalixadmin/jobs.h
index 832db070..0f65a104 100644
--- a/tderesources/scalix/scalixadmin/jobs.h
+++ b/tderesources/scalix/scalixadmin/jobs.h
@@ -132,7 +132,7 @@ namespace Scalix {
class GetDelegatesJob : public TDEIO::SimpleJob
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -161,7 +161,7 @@ namespace Scalix {
class GetOtherUsersJob : public TDEIO::SimpleJob
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -184,7 +184,7 @@ namespace Scalix {
class GetOutOfOfficeJob : public TDEIO::SimpleJob
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/scalix/scalixadmin/ldapview.cpp b/tderesources/scalix/scalixadmin/ldapview.cpp
index 3e6eea04..a58dec2e 100644
--- a/tderesources/scalix/scalixadmin/ldapview.cpp
+++ b/tderesources/scalix/scalixadmin/ldapview.cpp
@@ -56,10 +56,10 @@ LdapView::LdapView( TQWidget *parent )
attrs << "surname" << "mail";
mClient->setAttrs( attrs );
- connect( mClient, TQT_SIGNAL( result( const TDEABC::LdapObject& ) ),
- this, TQT_SLOT( entryAdded( const TDEABC::LdapObject& ) ) );
- connect( mClient, TQT_SIGNAL( error( const TQString& ) ),
- this, TQT_SLOT( error( const TQString& ) ) );
+ connect( mClient, TQ_SIGNAL( result( const TDEABC::LdapObject& ) ),
+ this, TQ_SLOT( entryAdded( const TDEABC::LdapObject& ) ) );
+ connect( mClient, TQ_SIGNAL( error( const TQString& ) ),
+ this, TQ_SLOT( error( const TQString& ) ) );
}
LdapView::~LdapView()
diff --git a/tderesources/scalix/scalixadmin/ldapview.h b/tderesources/scalix/scalixadmin/ldapview.h
index 9de45817..f405045b 100644
--- a/tderesources/scalix/scalixadmin/ldapview.h
+++ b/tderesources/scalix/scalixadmin/ldapview.h
@@ -29,7 +29,7 @@ class LdapObject;
class LdapView : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/scalix/scalixadmin/otherusermanager.h b/tderesources/scalix/scalixadmin/otherusermanager.h
index 26f33ee4..e02e53a1 100644
--- a/tderesources/scalix/scalixadmin/otherusermanager.h
+++ b/tderesources/scalix/scalixadmin/otherusermanager.h
@@ -26,7 +26,7 @@
class OtherUserManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/scalix/scalixadmin/otheruserpage.cpp b/tderesources/scalix/scalixadmin/otheruserpage.cpp
index 3cc220ea..f7594acf 100644
--- a/tderesources/scalix/scalixadmin/otheruserpage.cpp
+++ b/tderesources/scalix/scalixadmin/otheruserpage.cpp
@@ -52,9 +52,9 @@ OtherUserPage::OtherUserPage( TQWidget *parent )
mDeleteButton->setEnabled( false );
layout->addWidget( mDeleteButton, 1, 1 );
- connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) );
- connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addUser() ) );
- connect( mDeleteButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeUser() ) );
+ connect( mView, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( selectionChanged() ) );
+ connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addUser() ) );
+ connect( mDeleteButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeUser() ) );
loadAllUsers();
}
@@ -67,7 +67,7 @@ void OtherUserPage::loadAllUsers()
{
Scalix::GetOtherUsersJob *job = Scalix::getOtherUsers( Settings::self()->globalSlave(),
Settings::self()->accountUrl() );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( allUsers( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( allUsers( TDEIO::Job* ) ) );
}
void OtherUserPage::addUser()
@@ -82,7 +82,7 @@ void OtherUserPage::addUser()
Scalix::AddOtherUserJob *job = Scalix::addOtherUser( Settings::self()->globalSlave(),
Settings::self()->accountUrl(), email );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( userAdded( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( userAdded( TDEIO::Job* ) ) );
}
void OtherUserPage::removeUser()
@@ -93,7 +93,7 @@ void OtherUserPage::removeUser()
Scalix::DeleteOtherUserJob *job = Scalix::deleteOtherUser( Settings::self()->globalSlave(),
Settings::self()->accountUrl(), email );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( userRemoved( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( userRemoved( TDEIO::Job* ) ) );
}
void OtherUserPage::allUsers( TDEIO::Job *job )
diff --git a/tderesources/scalix/scalixadmin/otheruserpage.h b/tderesources/scalix/scalixadmin/otheruserpage.h
index e8c5e269..03527125 100644
--- a/tderesources/scalix/scalixadmin/otheruserpage.h
+++ b/tderesources/scalix/scalixadmin/otheruserpage.h
@@ -30,7 +30,7 @@ class OtherUserView;
class OtherUserPage : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/scalix/scalixadmin/otheruserview.cpp b/tderesources/scalix/scalixadmin/otheruserview.cpp
index e8aa13bc..be09dc74 100644
--- a/tderesources/scalix/scalixadmin/otheruserview.cpp
+++ b/tderesources/scalix/scalixadmin/otheruserview.cpp
@@ -45,7 +45,7 @@ OtherUserView::OtherUserView( OtherUserManager *manager, TQWidget *parent )
addColumn( i18n( "Registered Accounts" ) );
setFullWidth( true );
- connect( mManager, TQT_SIGNAL( changed() ), TQT_SLOT( userChanged() ) );
+ connect( mManager, TQ_SIGNAL( changed() ), TQ_SLOT( userChanged() ) );
userChanged();
}
diff --git a/tderesources/scalix/scalixadmin/otheruserview.h b/tderesources/scalix/scalixadmin/otheruserview.h
index 832b09b8..b52ce1d7 100644
--- a/tderesources/scalix/scalixadmin/otheruserview.h
+++ b/tderesources/scalix/scalixadmin/otheruserview.h
@@ -27,7 +27,7 @@ class OtherUserManager;
class OtherUserView : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/scalix/scalixadmin/outofofficepage.cpp b/tderesources/scalix/scalixadmin/outofofficepage.cpp
index e807379a..343f4f4c 100644
--- a/tderesources/scalix/scalixadmin/outofofficepage.cpp
+++ b/tderesources/scalix/scalixadmin/outofofficepage.cpp
@@ -38,7 +38,7 @@ OutOfOfficePage::OutOfOfficePage( TQWidget *parent )
{
TQGridLayout *layout = new TQGridLayout( this, 4, 2, 11, 6 );
- TQButtonGroup *group = new TQButtonGroup( 1, Qt::Vertical, this );
+ TQButtonGroup *group = new TQButtonGroup( 1, TQt::Vertical, this );
mDisabled = new TQRadioButton( i18n( "I am in the office" ), group );
mDisabled->setChecked( true );
@@ -55,10 +55,10 @@ OutOfOfficePage::OutOfOfficePage( TQWidget *parent )
statusChanged();
- connect( mEnabled, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( statusChanged() ) );
- connect( mEnabled, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( changed() ) );
- connect( mSaveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( store() ) );
- connect( mMessage, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( changed() ) );
+ connect( mEnabled, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( statusChanged() ) );
+ connect( mEnabled, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( changed() ) );
+ connect( mSaveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( store() ) );
+ connect( mMessage, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( changed() ) );
load();
}
@@ -71,7 +71,7 @@ void OutOfOfficePage::load()
{
Scalix::GetOutOfOfficeJob *job = Scalix::getOutOfOffice( Settings::self()->globalSlave(),
Settings::self()->accountUrl() );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( loaded( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( loaded( TDEIO::Job* ) ) );
}
void OutOfOfficePage::loaded( TDEIO::Job* job )
@@ -98,7 +98,7 @@ void OutOfOfficePage::store()
mEnabled->isChecked(),
mMessage->text() );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( stored( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( stored( TDEIO::Job* ) ) );
mSaveButton->setEnabled( false );
}
diff --git a/tderesources/scalix/scalixadmin/outofofficepage.h b/tderesources/scalix/scalixadmin/outofofficepage.h
index f9863fa1..b96de352 100644
--- a/tderesources/scalix/scalixadmin/outofofficepage.h
+++ b/tderesources/scalix/scalixadmin/outofofficepage.h
@@ -30,7 +30,7 @@ class TQTextEdit;
class OutOfOfficePage : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/scalix/scalixadmin/passwordpage.cpp b/tderesources/scalix/scalixadmin/passwordpage.cpp
index 38262725..f67e4251 100644
--- a/tderesources/scalix/scalixadmin/passwordpage.cpp
+++ b/tderesources/scalix/scalixadmin/passwordpage.cpp
@@ -62,9 +62,9 @@ PasswordPage::PasswordPage( TQWidget *parent )
layout->setRowSpacing( 3, 1 );
- connect( mPassword, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged() ) );
- connect( mPasswordRetype, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged() ) );
- connect( mButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( buttonClicked() ) );
+ connect( mPassword, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( textChanged() ) );
+ connect( mPasswordRetype, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( textChanged() ) );
+ connect( mButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( buttonClicked() ) );
}
void PasswordPage::buttonClicked()
@@ -77,7 +77,7 @@ void PasswordPage::buttonClicked()
mJob = Scalix::setPassword( Settings::self()->globalSlave(), Settings::self()->accountUrl(),
Settings::self()->accountPassword(), mPassword->text() );
- connect( mJob, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( finished( TDEIO::Job* ) ) );
+ connect( mJob, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( finished( TDEIO::Job* ) ) );
updateState( true );
} else {
diff --git a/tderesources/scalix/scalixadmin/passwordpage.h b/tderesources/scalix/scalixadmin/passwordpage.h
index 5255193e..d7d6f455 100644
--- a/tderesources/scalix/scalixadmin/passwordpage.h
+++ b/tderesources/scalix/scalixadmin/passwordpage.h
@@ -32,7 +32,7 @@ class Job;
class PasswordPage : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/scalix/shared/kmailconnection.cpp b/tderesources/scalix/shared/kmailconnection.cpp
index 147b9822..6f239cc2 100644
--- a/tderesources/scalix/shared/kmailconnection.cpp
+++ b/tderesources/scalix/shared/kmailconnection.cpp
@@ -55,8 +55,8 @@ KMailConnection::KMailConnection( ResourceScalixBase* resource,
mDCOPClient->registerAs( objId, true );
kapp->dcopClient()->setNotifications( true );
- connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ),
- this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
+ connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
+ this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
}
KMailConnection::~KMailConnection()
diff --git a/tderesources/scalix/shared/kmailconnection.h b/tderesources/scalix/shared/kmailconnection.h
index 7fec6274..b8f102cd 100644
--- a/tderesources/scalix/shared/kmailconnection.h
+++ b/tderesources/scalix/shared/kmailconnection.h
@@ -48,7 +48,7 @@ class ResourceScalixBase;
This class provides the kmail connectivity for IMAP resources.
*/
class KMailConnection : public TQObject, public DCOPObject {
- Q_OBJECT
+ TQ_OBJECT
//
K_DCOP
diff --git a/tderesources/scalix/shared/scalixbase.cpp b/tderesources/scalix/shared/scalixbase.cpp
index f07a6983..51ef8798 100644
--- a/tderesources/scalix/shared/scalixbase.cpp
+++ b/tderesources/scalix/shared/scalixbase.cpp
@@ -372,12 +372,12 @@ TQDomDocument ScalixBase::domTree()
TQString ScalixBase::dateTimeToString( const TQDateTime& time )
{
- return time.toString( Qt::ISODate ) + 'Z';
+ return time.toString( TQt::ISODate ) + 'Z';
}
TQString ScalixBase::dateToString( const TQDate& date )
{
- return date.toString( Qt::ISODate );
+ return date.toString( TQt::ISODate );
}
TQDateTime ScalixBase::stringToDateTime( const TQString& _date )
@@ -385,12 +385,12 @@ TQDateTime ScalixBase::stringToDateTime( const TQString& _date )
TQString date( _date );
if ( date.endsWith( "Z" ) )
date.truncate( date.length() - 1 );
- return TQDateTime::fromString( date, Qt::ISODate );
+ return TQDateTime::fromString( date, TQt::ISODate );
}
TQDate ScalixBase::stringToDate( const TQString& date )
{
- return TQDate::fromString( date, Qt::ISODate );
+ return TQDate::fromString( date, TQt::ISODate );
}
TQString ScalixBase::sensitivityToString( Sensitivity s )
diff --git a/tderesources/scalix/tdeabc/contact.cpp b/tderesources/scalix/tdeabc/contact.cpp
index 190837a0..6d4cc2bf 100644
--- a/tderesources/scalix/tdeabc/contact.cpp
+++ b/tderesources/scalix/tdeabc/contact.cpp
@@ -71,7 +71,7 @@ TQString Contact::toXml( const TDEABC::Addressee &addr )
xml += "<reminder_set>" + custom( "reminder_set", addr, "false" ) + "</reminder_set>\n";
xml += "<send_rich_info>" + custom( "send_rich_info", addr, "false" ) + "</send_rich_info>\n";
xml += "<subject>" + addr.formattedName() + "</subject>\n";
- xml += "<last_modification_time>" + addr.revision().toString( Qt::ISODate ) + "</last_modification_time>\n";
+ xml += "<last_modification_time>" + addr.revision().toString( TQt::ISODate ) + "</last_modification_time>\n";
xml += "<display_name_prefix>" + addr.prefix() + "</display_name_prefix>\n";
xml += "<first_name>" + addr.givenName() + "</first_name>\n";
@@ -166,7 +166,7 @@ TQString Contact::toXml( const TDEABC::Addressee &addr )
xml += "<office_location>" + addr.custom( "KADDRESSBOOK", "X-Office" ) + "</office_location>\n";
xml += "<spouse>" + addr.custom( "KADDRESSBOOK", "X-SpousesName" ) + "</spouse>\n";
- xml += "<bday>" + addr.birthday().toString( Qt::ISODate ) + "</bday>\n";
+ xml += "<bday>" + addr.birthday().toString( TQt::ISODate ) + "</bday>\n";
xml += "<anniversary>" + addr.custom( "KADDRESSBOOK", "X-Anniversary" ) + "</anniversary>\n";
xml += "<mapi_charset>" + custom( "mapi_charset", addr, "UTF8" ) + "</mapi_charset>";
@@ -235,7 +235,7 @@ TDEABC::Addressee Contact::fromXml( const TQString &xml )
else if ( element.tagName() == "send_rich_info" )
setCustom( "send_rich_info", element.text(), addr );
else if ( element.tagName() == "last_modification_time" )
- addr.setRevision( TQDateTime::fromString( element.text(), Qt::ISODate ) );
+ addr.setRevision( TQDateTime::fromString( element.text(), TQt::ISODate ) );
// name
else if ( element.tagName() == "display_name_prefix" )
@@ -352,7 +352,7 @@ TDEABC::Addressee Contact::fromXml( const TQString &xml )
addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", element.text() );
else if ( element.tagName() == "bday" )
- addr.setBirthday( TQDateTime::fromString( element.text(), Qt::ISODate ) );
+ addr.setBirthday( TQDateTime::fromString( element.text(), TQt::ISODate ) );
else if ( element.tagName() == "anniversary" )
addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", element.text() );
else
diff --git a/tderesources/scalix/tdeabc/resourcescalix.h b/tderesources/scalix/tdeabc/resourcescalix.h
index f5c8ffe6..ee3c8af9 100644
--- a/tderesources/scalix/tdeabc/resourcescalix.h
+++ b/tderesources/scalix/tdeabc/resourcescalix.h
@@ -53,7 +53,7 @@ namespace TDEABC {
class KDE_EXPORT ResourceScalix : public KPIM::ResourceABC,
public Scalix::ResourceScalixBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/scalix/tdeioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp
index 0af6c466..8dbb8651 100644
--- a/tderesources/scalix/tdeioslave/scalix.cpp
+++ b/tderesources/scalix/tdeioslave/scalix.cpp
@@ -116,10 +116,10 @@ void Scalix::retrieveFreeBusy( const KURL &url )
mFreeBusyData = TQString();
TDEIO::SimpleJob *job = TDEIO::special( imapUrl, packedArgs, false );
- connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
- this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
- this, TQT_SLOT( slotRetrieveResult( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+ this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQ_SLOT( slotRetrieveResult( TDEIO::Job* ) ) );
tqApp->eventLoop()->enterLoop();
}
@@ -182,8 +182,8 @@ void Scalix::publishFreeBusy( const KURL &url )
.arg( url.host() );
TDEIO::SimpleJob *job = TDEIO::special( imapUrl, packedArgs, false );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
- this, TQT_SLOT( slotPublishResult( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQ_SLOT( slotPublishResult( TDEIO::Job* ) ) );
tqApp->eventLoop()->enterLoop();
}
diff --git a/tderesources/scalix/tdeioslave/scalix.h b/tderesources/scalix/tdeioslave/scalix.h
index f4dbdead..78a71447 100644
--- a/tderesources/scalix/tdeioslave/scalix.h
+++ b/tderesources/scalix/tdeioslave/scalix.h
@@ -28,7 +28,7 @@
class Scalix : public TQObject, public TDEIO::SlaveBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/slox/kcalresourceslox.cpp b/tderesources/slox/kcalresourceslox.cpp
index 4c2ab12c..e93b8944 100644
--- a/tderesources/slox/kcalresourceslox.cpp
+++ b/tderesources/slox/kcalresourceslox.cpp
@@ -226,16 +226,16 @@ void KCalResourceSlox::requestEvents()
kdDebug() << "REQUEST CALENDAR: \n" << doc.toString( 2 ) << endl;
mLoadEventsJob = TDEIO::davPropFind( url, doc, "0", false );
- connect( mLoadEventsJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotLoadEventsResult( TDEIO::Job * ) ) );
- connect( mLoadEventsJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
- TQT_SLOT( slotEventsProgress( TDEIO::Job *, unsigned long ) ) );
+ connect( mLoadEventsJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotLoadEventsResult( TDEIO::Job * ) ) );
+ connect( mLoadEventsJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+ TQ_SLOT( slotEventsProgress( TDEIO::Job *, unsigned long ) ) );
mLoadEventsProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Downloading events") );
connect( mLoadEventsProgress,
- TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- TQT_SLOT( cancelLoadEvents() ) );
+ TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQ_SLOT( cancelLoadEvents() ) );
mPrefs->setLastEventSync( TQDateTime::currentDateTime() );
}
@@ -271,16 +271,16 @@ void KCalResourceSlox::requestTodos()
kdDebug() << "REQUEST TASKS: \n" << doc.toString( 2 ) << endl;
mLoadTodosJob = TDEIO::davPropFind( url, doc, "0", false );
- connect( mLoadTodosJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotLoadTodosResult( TDEIO::Job * ) ) );
- connect( mLoadTodosJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
- TQT_SLOT( slotTodosProgress( TDEIO::Job *, unsigned long ) ) );
+ connect( mLoadTodosJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotLoadTodosResult( TDEIO::Job * ) ) );
+ connect( mLoadTodosJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+ TQ_SLOT( slotTodosProgress( TDEIO::Job *, unsigned long ) ) );
mLoadTodosProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Downloading to-dos") );
connect( mLoadTodosProgress,
- TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- TQT_SLOT( cancelLoadTodos() ) );
+ TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQ_SLOT( cancelLoadTodos() ) );
mPrefs->setLastTodoSync( TQDateTime::currentDateTime() );
}
@@ -380,16 +380,16 @@ void KCalResourceSlox::uploadIncidences()
kdDebug() << "UPLOAD: \n" << doc.toString( 2 ) << endl;
mUploadJob = TDEIO::davPropPatch( url, doc, false );
- connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotUploadResult( TDEIO::Job * ) ) );
- connect( mUploadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
- TQT_SLOT( slotUploadProgress( TDEIO::Job *, unsigned long ) ) );
+ connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotUploadResult( TDEIO::Job * ) ) );
+ connect( mUploadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+ TQ_SLOT( slotUploadProgress( TDEIO::Job *, unsigned long ) ) );
mUploadProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Uploading incidence") );
connect( mUploadProgress,
- TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- TQT_SLOT( cancelUpload() ) );
+ TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQ_SLOT( cancelUpload() ) );
}
void KCalResourceSlox::createIncidenceAttributes( TQDomDocument &doc,
diff --git a/tderesources/slox/kcalresourceslox.h b/tderesources/slox/kcalresourceslox.h
index cfad65ed..a4a80b3e 100644
--- a/tderesources/slox/kcalresourceslox.h
+++ b/tderesources/slox/kcalresourceslox.h
@@ -60,7 +60,7 @@ class SloxAccounts;
*/
class KDE_EXPORT KCalResourceSlox : public KCal::ResourceCached, public SloxBase
{
- Q_OBJECT
+ TQ_OBJECT
friend class KCalResourceSloxConfig;
diff --git a/tderesources/slox/kcalresourcesloxconfig.cpp b/tderesources/slox/kcalresourcesloxconfig.cpp
index 83246a03..8652263f 100644
--- a/tderesources/slox/kcalresourcesloxconfig.cpp
+++ b/tderesources/slox/kcalresourcesloxconfig.cpp
@@ -72,11 +72,11 @@ KCalResourceSloxConfig::KCalResourceSloxConfig( TQWidget* parent, const char* n
mCalButton = new KPushButton( i18n("Calendar Folder..."), this );
mainLayout->addWidget( mCalButton, 5, 0 );
- connect( mCalButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectCalendarFolder() ) );
+ connect( mCalButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectCalendarFolder() ) );
mTaskButton = new KPushButton( i18n("Task Folder..."), this );
mainLayout->addWidget( mTaskButton, 5, 1 );
- connect( mTaskButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectTaskFolder() ) );
+ connect( mTaskButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectTaskFolder() ) );
mReloadConfig = new KCal::ResourceCachedReloadConfig( this );
mainLayout->addMultiCellWidget( mReloadConfig, 6, 6, 0, 1 );
diff --git a/tderesources/slox/kcalresourcesloxconfig.h b/tderesources/slox/kcalresourcesloxconfig.h
index f5784f84..21670bbb 100644
--- a/tderesources/slox/kcalresourcesloxconfig.h
+++ b/tderesources/slox/kcalresourcesloxconfig.h
@@ -44,7 +44,7 @@ class SloxBase;
*/
class KDE_EXPORT KCalResourceSloxConfig : public KRES::ConfigWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KCalResourceSloxConfig( TQWidget *parent = 0, const char *name = 0 );
diff --git a/tderesources/slox/sloxaccounts.cpp b/tderesources/slox/sloxaccounts.cpp
index 3afa7019..e5ba2651 100644
--- a/tderesources/slox/sloxaccounts.cpp
+++ b/tderesources/slox/sloxaccounts.cpp
@@ -139,8 +139,8 @@ void SloxAccounts::requestAccounts()
mDownloadJob = TDEIO::davPropFind( url, doc, "0", false );
}
- connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotResult( TDEIO::Job * ) ) );
}
void SloxAccounts::slotResult( TDEIO::Job *job )
diff --git a/tderesources/slox/sloxaccounts.h b/tderesources/slox/sloxaccounts.h
index 1af80586..7b5e92a1 100644
--- a/tderesources/slox/sloxaccounts.h
+++ b/tderesources/slox/sloxaccounts.h
@@ -32,7 +32,7 @@ class SloxBase;
class KDE_EXPORT SloxAccounts : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
SloxAccounts( SloxBase *res, const KURL &baseUrl );
diff --git a/tderesources/slox/sloxfolderdialog.cpp b/tderesources/slox/sloxfolderdialog.cpp
index 716c2d40..c1f1086e 100644
--- a/tderesources/slox/sloxfolderdialog.cpp
+++ b/tderesources/slox/sloxfolderdialog.cpp
@@ -37,7 +37,7 @@ SloxFolderDialog::SloxFolderDialog( SloxFolderManager *manager, FolderType type,
mListView->addColumn( i18n("Folder ID"), 0 );
setMainWidget( mListView );
updateFolderView();
- connect( manager, TQT_SIGNAL( foldersUpdated() ), TQT_SLOT( updateFolderView() ) );
+ connect( manager, TQ_SIGNAL( foldersUpdated() ), TQ_SLOT( updateFolderView() ) );
}
SloxFolderDialog::~SloxFolderDialog()
diff --git a/tderesources/slox/sloxfolderdialog.h b/tderesources/slox/sloxfolderdialog.h
index 1a0749ea..0b8785ea 100644
--- a/tderesources/slox/sloxfolderdialog.h
+++ b/tderesources/slox/sloxfolderdialog.h
@@ -30,7 +30,7 @@ class SloxFolderManager;
class SloxFolderDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
SloxFolderDialog( SloxFolderManager *manager, FolderType type, TQWidget* parent = 0, const char *name = 0 );
diff --git a/tderesources/slox/sloxfoldermanager.cpp b/tderesources/slox/sloxfoldermanager.cpp
index d7284d3a..b862a388 100644
--- a/tderesources/slox/sloxfoldermanager.cpp
+++ b/tderesources/slox/sloxfoldermanager.cpp
@@ -79,8 +79,8 @@ void SloxFolderManager::requestFolders()
mDownloadJob = TDEIO::davPropFind( url, doc, "0", false );
- connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotResult( TDEIO::Job * ) ) );
}
void SloxFolderManager::slotResult( TDEIO::Job *job )
diff --git a/tderesources/slox/sloxfoldermanager.h b/tderesources/slox/sloxfoldermanager.h
index 3907dab7..f61ab471 100644
--- a/tderesources/slox/sloxfoldermanager.h
+++ b/tderesources/slox/sloxfoldermanager.h
@@ -37,7 +37,7 @@ class SloxFolder;
class KDE_EXPORT SloxFolderManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
SloxFolderManager( SloxBase *res, const KURL &baseUrl );
diff --git a/tderesources/slox/tdeabcresourceslox.cpp b/tderesources/slox/tdeabcresourceslox.cpp
index 79036abd..d77347d3 100644
--- a/tderesources/slox/tdeabcresourceslox.cpp
+++ b/tderesources/slox/tdeabcresourceslox.cpp
@@ -208,16 +208,16 @@ bool ResourceSlox::asyncLoad()
kdDebug() << "REQUEST CONTACTS: \n" << doc.toString( 2 ) << endl;
mDownloadJob = TDEIO::davPropFind( url, doc, "0", false );
- connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotResult( TDEIO::Job * ) ) );
- connect( mDownloadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
- TQT_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotResult( TDEIO::Job * ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+ TQ_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) );
mDownloadProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Downloading contacts") );
connect( mDownloadProgress,
- TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- TQT_SLOT( cancelDownload() ) );
+ TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQ_SLOT( cancelDownload() ) );
mPrefs->setLastSync( TQDateTime::currentDateTime() );
@@ -402,7 +402,7 @@ void ResourceSlox::parseContactAttribute( const TQDomElement &e, Addressee &a )
a.insertCustom( "KADDRESSBOOK", "X-SpousesName", text );
} else if ( tag == fieldName( Anniversary ) ) {
TQDateTime dt = WebdavHandler::sloxToTQDateTime( text );
- a.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt.toString( Qt::ISODate ) );
+ a.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt.toString( TQt::ISODate ) );
} else if ( tag == fieldName( Categories ) ) {
a.setCategories( TQStringList::split( TQRegExp(",\\s*"), text ) );
} else if ( type() == "ox" ) { // FIXME: Address reading is missing for SLOX
@@ -521,16 +521,16 @@ void ResourceSlox::uploadContacts()
url.setPass( mPrefs->password() );
mUploadJob = TDEIO::davPropPatch( url, doc, false );
- connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotUploadResult( TDEIO::Job * ) ) );
- connect( mUploadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
- TQT_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) );
+ connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotUploadResult( TDEIO::Job * ) ) );
+ connect( mUploadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+ TQ_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) );
mUploadProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Uploading contacts") );
connect( mUploadProgress,
- TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- TQT_SLOT( cancelUpload() ) );
+ TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQ_SLOT( cancelUpload() ) );
}
void ResourceSlox::createAddresseeFields( TQDomDocument &doc, TQDomElement &prop,
@@ -577,7 +577,7 @@ void ResourceSlox::createAddresseeFields( TQDomDocument &doc, TQDomElement &prop
TQString anniversary = a.custom( "KADDRESSBOOK", "X-Anniversary" );
if ( !anniversary.isEmpty() )
WebdavHandler::addSloxElement( this, doc, prop, fieldName( Anniversary ),
- WebdavHandler::qDateTimeToSlox( TQDateTime::fromString( anniversary, Qt::ISODate ).date() ) );
+ WebdavHandler::qDateTimeToSlox( TQDateTime::fromString( anniversary, TQt::ISODate ).date() ) );
else
WebdavHandler::addSloxElement( this, doc, prop, fieldName( Anniversary ) );
}
diff --git a/tderesources/slox/tdeabcresourceslox.h b/tderesources/slox/tdeabcresourceslox.h
index a37f17d6..225f8a33 100644
--- a/tderesources/slox/tdeabcresourceslox.h
+++ b/tderesources/slox/tdeabcresourceslox.h
@@ -47,7 +47,7 @@ class SloxPrefs;
class KDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceSlox( const TDEConfig * );
diff --git a/tderesources/slox/tdeabcresourcesloxconfig.cpp b/tderesources/slox/tdeabcresourcesloxconfig.cpp
index 8ad6701c..36f76238 100644
--- a/tderesources/slox/tdeabcresourcesloxconfig.cpp
+++ b/tderesources/slox/tdeabcresourcesloxconfig.cpp
@@ -69,7 +69,7 @@ ResourceSloxConfig::ResourceSloxConfig( TQWidget* parent, const char* name )
mFolderButton = new KPushButton( i18n("Select Folder..."), this );
mainLayout->addMultiCellWidget( mFolderButton, 4, 4, 0, 1 );
- connect( mFolderButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectAddressFolder() ) );
+ connect( mFolderButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectAddressFolder() ) );
}
diff --git a/tderesources/slox/tdeabcresourcesloxconfig.h b/tderesources/slox/tdeabcresourcesloxconfig.h
index 36e02126..46a9a74a 100644
--- a/tderesources/slox/tdeabcresourcesloxconfig.h
+++ b/tderesources/slox/tdeabcresourcesloxconfig.h
@@ -34,7 +34,7 @@ namespace TDEABC {
class KDE_EXPORT ResourceSloxConfig : public KRES::ConfigWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/slox/testsloxaccounts.cpp b/tderesources/slox/testsloxaccounts.cpp
index 22c44e66..ea7b3da1 100644
--- a/tderesources/slox/testsloxaccounts.cpp
+++ b/tderesources/slox/testsloxaccounts.cpp
@@ -55,7 +55,7 @@ int main(int argc,char **argv)
app.setMainWidget( &button );
button.show();
- TQObject::connect( &button, TQT_SIGNAL( clicked() ), &app, TQT_SLOT( quit() ) );
+ TQObject::connect( &button, TQ_SIGNAL( clicked() ), &app, TQ_SLOT( quit() ) );
app.exec();
}
diff --git a/tderesources/slox/webdavhandler.cpp b/tderesources/slox/webdavhandler.cpp
index 4b57e1de..8d677bd0 100644
--- a/tderesources/slox/webdavhandler.cpp
+++ b/tderesources/slox/webdavhandler.cpp
@@ -199,7 +199,7 @@ TQDateTime WebdavHandler::sloxToTQDateTime( const TQString &str )
TQDateTime dt;
if (preEpoch) {
- dt.setTime_t( 0, Qt::UTC );
+ dt.setTime_t( 0, TQt::UTC );
if (ticks > INT_MAX) {
dt = dt.addSecs(-INT_MAX);
ticks -= INT_MAX;
@@ -208,7 +208,7 @@ TQDateTime WebdavHandler::sloxToTQDateTime( const TQString &str )
}
else
{
- dt.setTime_t( ticks, Qt::UTC );
+ dt.setTime_t( ticks, TQt::UTC );
}
return dt;
diff --git a/tderesources/tvanytime/kcal_resourcetvanytime.cpp b/tderesources/tvanytime/kcal_resourcetvanytime.cpp
index 12161d90..44b3e324 100644
--- a/tderesources/tvanytime/kcal_resourcetvanytime.cpp
+++ b/tderesources/tvanytime/kcal_resourcetvanytime.cpp
@@ -93,8 +93,8 @@ void ResourceTVAnytime::init()
//setReadOnly( true );
- connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ),
- this, TQT_SLOT( slotEmitResourceChanged() ) );
+ connect( &mResourceChangedTimer, TQ_SIGNAL( timeout() ),
+ this, TQ_SLOT( slotEmitResourceChanged() ) );
}
TVAnytimePrefsBase *ResourceTVAnytime::prefs()
@@ -179,15 +179,15 @@ bool ResourceTVAnytime::doLoad()
// TODO: find out if the file to download is fresh. if not, just work with the cache.
mDownloadJob = TDEIO::file_copy( url, destination, -1, true );
- connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotJobResult( TDEIO::Job * ) ) );
mProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Downloading program schedule") );
connect( mProgress,
- TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- TQT_SLOT( cancelLoad() ) );
+ TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQ_SLOT( cancelLoad() ) );
return true;
}
diff --git a/tderesources/tvanytime/kcal_resourcetvanytime.h b/tderesources/tvanytime/kcal_resourcetvanytime.h
index 636389be..cea9004b 100644
--- a/tderesources/tvanytime/kcal_resourcetvanytime.h
+++ b/tderesources/tvanytime/kcal_resourcetvanytime.h
@@ -50,7 +50,7 @@ class TVAnytimePrefsBase;
*/
class KDE_EXPORT ResourceTVAnytime : public ResourceCached
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h
index 814cc492..926bc7f3 100644
--- a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h
+++ b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h
@@ -40,7 +40,7 @@ class ResourceCachedSaveConfig;
*/
class KDE_EXPORT ResourceTVAnytimeConfig : public KRES::ConfigWidget
{
-Q_OBJECT
+TQ_OBJECT
public:
ResourceTVAnytimeConfig( TQWidget *parent = 0, const char *name = 0 );
diff --git a/translations/desktop_files/kaddressbook-desktops/it.po b/translations/desktop_files/kaddressbook-desktops/it.po
index 045b8611..5d5942a5 100644
--- a/translations/desktop_files/kaddressbook-desktops/it.po
+++ b/translations/desktop_files/kaddressbook-desktops/it.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-12-24 13:21+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdepim/kaddressbook-desktop-files/it/>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.14.2\n"
#. Name
#: csv-templates/kaddressbook.desktop:9
@@ -24,7 +25,7 @@ msgstr "Rubrica indirizzi (KDE 3.1)"
#. Name
#: csv-templates/outlook2000.desktop:8
msgid "Outlook 2000"
-msgstr ""
+msgstr "Outlook 2000"
#. Name
#: csv-templates/yahoo.desktop:9
@@ -59,7 +60,7 @@ msgstr "KAddressbook protocollo messaggistica istantanea"
#. Name
#: editors/protocols/aimprotocol.desktop:7
msgid "AIM"
-msgstr ""
+msgstr "AIM"
#. Comment
#: editors/protocols/aimprotocol.desktop:9
@@ -68,9 +69,8 @@ msgstr "Protocollo AIM"
#. Name
#: editors/protocols/gaduprotocol.desktop:7
-#, fuzzy
msgid "Gadu-Gadu"
-msgstr "Protocollo Gadu-Gadu"
+msgstr "Gadu-Gadu"
#. Comment
#: editors/protocols/gaduprotocol.desktop:9
@@ -80,17 +80,17 @@ msgstr "Protocollo Gadu-Gadu"
#. Name
#: editors/protocols/groupwiseprotocol.desktop:7
msgid "GroupWise"
-msgstr ""
+msgstr "GroupWise"
#. Comment
#: editors/protocols/groupwiseprotocol.desktop:9
msgid "Novell GroupWise Messenger"
-msgstr ""
+msgstr "Novell GroupWise Messenger"
#. Name
#: editors/protocols/icqprotocol.desktop:7
msgid "ICQ"
-msgstr ""
+msgstr "ICQ"
#. Comment
#: editors/protocols/icqprotocol.desktop:9
@@ -100,17 +100,17 @@ msgstr "Protocollo ICQ"
#. Name
#: editors/protocols/ircprotocol.desktop:7
msgid "IRC"
-msgstr ""
+msgstr "IRC"
#. Comment
#: editors/protocols/ircprotocol.desktop:9
msgid "Internet Relay Chat"
-msgstr ""
+msgstr "Internet Relay Chat"
#. Name
#: editors/protocols/jabberprotocol.desktop:7
msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
#. Comment
#: editors/protocols/jabberprotocol.desktop:9
@@ -119,9 +119,8 @@ msgstr "Protocollo Jabber"
#. Name
#: editors/protocols/meanwhileprotocol.desktop:7
-#, fuzzy
msgid "Meanwhile"
-msgstr "Protocollo Meanwhile"
+msgstr "Meanwhile"
#. Comment
#: editors/protocols/meanwhileprotocol.desktop:9
@@ -133,12 +132,12 @@ msgstr "Protocollo Meanwhile"
#: editors/protocols/msnprotocol.desktop:7
#: editors/protocols/msnprotocol.desktop:9
msgid "MSN Messenger"
-msgstr ""
+msgstr "MSN Messenger"
#. Name
#: editors/protocols/skypeprotocol.desktop:7
msgid "Skype"
-msgstr ""
+msgstr "Skype"
#. Comment
#: editors/protocols/skypeprotocol.desktop:9
@@ -148,7 +147,7 @@ msgstr "Telefonia internet Skype"
#. Name
#: editors/protocols/smsprotocol.desktop:7
msgid "SMS"
-msgstr ""
+msgstr "SMS"
#. Comment
#: editors/protocols/smsprotocol.desktop:9
@@ -158,7 +157,7 @@ msgstr "Protocollo SMS"
#. Name
#: editors/protocols/yahooprotocol.desktop:7
msgid "Yahoo"
-msgstr ""
+msgstr "Yahoo"
#. Comment
#: editors/protocols/yahooprotocol.desktop:9
@@ -207,9 +206,8 @@ msgstr "Plugin importa/esporta di KAddressbook"
#. Name
#: kaddressbook.desktop:2
-#, fuzzy
msgid "KAddressBook"
-msgstr "Rubrica indirizzi Yahoo!"
+msgstr "KAddressBook"
#. GenericName
#: kaddressbook.desktop:4
@@ -288,7 +286,6 @@ msgstr "Vista tabella"
#. Name
#: xxport/bookmark_xxport.desktop:7
-#, fuzzy
msgid "KAB Bookmark XXPort Plugin"
msgstr "Plugin KAB telefono cellulare XXPort"
@@ -299,9 +296,8 @@ msgstr "Plugin per esportare come segnalibro gli indirizzi web dei contatti"
#. Name
#: xxport/csv_xxport.desktop:7
-#, fuzzy
msgid "KAB CSV XXPort Plugin"
-msgstr "Plugin KAB telefono cellulare XXPort"
+msgstr "Plugin CSV KAB XXPort"
#. Comment
#: xxport/csv_xxport.desktop:9
@@ -310,9 +306,8 @@ msgstr "Plugin per importare ed esportare contatti in formato CSV"
#. Name
#: xxport/eudora_xxport.desktop:7
-#, fuzzy
msgid "KAB Eudora XXPort Plugin"
-msgstr "Plugin KAB telefono cellulare XXPort"
+msgstr "Plugin KAB Eudora XXPort"
#. Comment
#: xxport/eudora_xxport.desktop:9
@@ -332,9 +327,8 @@ msgstr ""
#. Name
#: xxport/kde2_xxport.desktop:7
-#, fuzzy
msgid "KAB KDE2 XXPort Plugin"
-msgstr "Plugin KAB telefono cellulare XXPort"
+msgstr "Plugin KAB KDE2 XXPort"
#. Comment
#: xxport/kde2_xxport.desktop:9
@@ -343,23 +337,20 @@ msgstr "Plugin per importare le vecchie voci della rubrica di KDE2"
#. Name
#: xxport/ldif_xxport.desktop:7
-#, fuzzy
msgid "KAB LDIF XXPort Plugin"
-msgstr "Plugin KAB telefono cellulare XXPort"
+msgstr "Plugin KAB LDIF XXPort"
#. Comment
#: xxport/ldif_xxport.desktop:9
msgid ""
"Plugin to import and export contacts in Netscape and Mozilla LDIF format"
msgstr ""
-"Plugin per importare ed esportare contatti in formato Netscape e Mozilla "
-"LDIF "
+"Plugin per importare ed esportare contatti in formato Netscape e Mozilla LDIF"
#. Name
#: xxport/opera_xxport.desktop:7
-#, fuzzy
msgid "KAB Opera XXPort Plugin"
-msgstr "Plugin KAB telefono cellulare XXPort"
+msgstr "Plugin KAB Opera XXPort"
#. Comment
#: xxport/opera_xxport.desktop:9
@@ -368,9 +359,8 @@ msgstr "Plugin per importare contatti da Opera"
#. Name
#: xxport/pab_xxport.desktop:7
-#, fuzzy
msgid "KAB MS Exchange Personal Addressbook XXPort Plugin"
-msgstr "Plugin per importare rubriche personali da MS Exchange"
+msgstr "Plugin KAB per importare rubriche personali da MS Exchange XXPort"
#. Comment
#: xxport/pab_xxport.desktop:9
@@ -379,9 +369,8 @@ msgstr "Plugin per importare rubriche personali da MS Exchange"
#. Name
#: xxport/vcard_xxport.desktop:7
-#, fuzzy
msgid "KAB vCard XXPort Plugin"
-msgstr "Plugin KAB telefono cellulare XXPort"
+msgstr "Plugin KAB vCard XXPort"
#. Comment
#: xxport/vcard_xxport.desktop:9
diff --git a/translations/desktop_files/kalarm-desktops/it.po b/translations/desktop_files/kalarm-desktops/it.po
index c1dd4b34..bb2643ec 100644
--- a/translations/desktop_files/kalarm-desktops/it.po
+++ b/translations/desktop_files/kalarm-desktops/it.po
@@ -1,26 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-12-20 06:21+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdepim/kalarm-desktop-files/it/>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.14.2\n"
#. Name
#: kalarm.desktop:2 kalarm.tray.desktop:2
-#, fuzzy
msgid "KAlarm"
-msgstr "Demone degli avvisi"
+msgstr "KAlarm"
#. GenericName
#: kalarm.desktop:4
diff --git a/translations/desktop_files/kitchensync.desktop/af.po b/translations/desktop_files/kitchensync.desktop/af.po
deleted file mode 100644
index aa9603a1..00000000
--- a/translations/desktop_files/kitchensync.desktop/af.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: af\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Sinkronisasie"
diff --git a/translations/desktop_files/kitchensync.desktop/bg.po b/translations/desktop_files/kitchensync.desktop/bg.po
deleted file mode 100644
index a9c54135..00000000
--- a/translations/desktop_files/kitchensync.desktop/bg.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: bg\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Синхронизация"
diff --git a/translations/desktop_files/kitchensync.desktop/ca.po b/translations/desktop_files/kitchensync.desktop/ca.po
deleted file mode 100644
index d297a7f6..00000000
--- a/translations/desktop_files/kitchensync.desktop/ca.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ca\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Sincronització"
diff --git a/translations/desktop_files/kitchensync.desktop/cs.po b/translations/desktop_files/kitchensync.desktop/cs.po
deleted file mode 100644
index 850f467c..00000000
--- a/translations/desktop_files/kitchensync.desktop/cs.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# Slávek Banko <slavek.banko@axis.cz>, 2020.
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: 2020-09-20 18:30+0000\n"
-"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
-"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
-"tdepim/kitchensync-kitchensyncdesktop/cs/>\n"
-"Language: cs\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 4.2.2\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr "KitchenSync"
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Synchronizace"
diff --git a/translations/desktop_files/kitchensync.desktop/cy.po b/translations/desktop_files/kitchensync.desktop/cy.po
deleted file mode 100644
index 7a23271e..00000000
--- a/translations/desktop_files/kitchensync.desktop/cy.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: cy\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Cydamseriad"
diff --git a/translations/desktop_files/kitchensync.desktop/da.po b/translations/desktop_files/kitchensync.desktop/da.po
deleted file mode 100644
index 1194d988..00000000
--- a/translations/desktop_files/kitchensync.desktop/da.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Synkronisering"
diff --git a/translations/desktop_files/kitchensync.desktop/de.po b/translations/desktop_files/kitchensync.desktop/de.po
deleted file mode 100644
index 6fd32591..00000000
--- a/translations/desktop_files/kitchensync.desktop/de.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Abgleich"
diff --git a/translations/desktop_files/kitchensync.desktop/el.po b/translations/desktop_files/kitchensync.desktop/el.po
deleted file mode 100644
index aa44c9cc..00000000
--- a/translations/desktop_files/kitchensync.desktop/el.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: el\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Συγχρονισμός"
diff --git a/translations/desktop_files/kitchensync.desktop/eo.po b/translations/desktop_files/kitchensync.desktop/eo.po
deleted file mode 100644
index f4db496b..00000000
--- a/translations/desktop_files/kitchensync.desktop/eo.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: eo\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Sinkronigo"
diff --git a/translations/desktop_files/kitchensync.desktop/es.po b/translations/desktop_files/kitchensync.desktop/es.po
deleted file mode 100644
index 031578d7..00000000
--- a/translations/desktop_files/kitchensync.desktop/es.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: es\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Sincronización"
diff --git a/translations/desktop_files/kitchensync.desktop/et.po b/translations/desktop_files/kitchensync.desktop/et.po
deleted file mode 100644
index 9eb23ab8..00000000
--- a/translations/desktop_files/kitchensync.desktop/et.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: et\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Sünkroniseerimine"
diff --git a/translations/desktop_files/kitchensync.desktop/eu.po b/translations/desktop_files/kitchensync.desktop/eu.po
deleted file mode 100644
index f09c6ab6..00000000
--- a/translations/desktop_files/kitchensync.desktop/eu.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: eu\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Sinkronizazioa"
diff --git a/translations/desktop_files/kitchensync.desktop/fa.po b/translations/desktop_files/kitchensync.desktop/fa.po
deleted file mode 100644
index dec9e816..00000000
--- a/translations/desktop_files/kitchensync.desktop/fa.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: fa\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "همگامی"
diff --git a/translations/desktop_files/kitchensync.desktop/fi.po b/translations/desktop_files/kitchensync.desktop/fi.po
deleted file mode 100644
index f15caf9c..00000000
--- a/translations/desktop_files/kitchensync.desktop/fi.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: fi\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Synkronointi"
diff --git a/translations/desktop_files/kitchensync.desktop/fr.po b/translations/desktop_files/kitchensync.desktop/fr.po
deleted file mode 100644
index 7b58176c..00000000
--- a/translations/desktop_files/kitchensync.desktop/fr.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Synchronisation"
diff --git a/translations/desktop_files/kitchensync.desktop/fy.po b/translations/desktop_files/kitchensync.desktop/fy.po
deleted file mode 100644
index 8e0aca26..00000000
--- a/translations/desktop_files/kitchensync.desktop/fy.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: fy\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Syngronisaasje"
diff --git a/translations/desktop_files/kitchensync.desktop/ga.po b/translations/desktop_files/kitchensync.desktop/ga.po
deleted file mode 100644
index e8f8af41..00000000
--- a/translations/desktop_files/kitchensync.desktop/ga.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ga\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Sioncrónú"
diff --git a/translations/desktop_files/kitchensync.desktop/gl.po b/translations/desktop_files/kitchensync.desktop/gl.po
deleted file mode 100644
index 7341d717..00000000
--- a/translations/desktop_files/kitchensync.desktop/gl.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: gl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Sincronización"
diff --git a/translations/desktop_files/kitchensync.desktop/he.po b/translations/desktop_files/kitchensync.desktop/he.po
deleted file mode 100644
index ab62622e..00000000
--- a/translations/desktop_files/kitchensync.desktop/he.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: he\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "סינכרון"
diff --git a/translations/desktop_files/kitchensync.desktop/hu.po b/translations/desktop_files/kitchensync.desktop/hu.po
deleted file mode 100644
index e55f30d1..00000000
--- a/translations/desktop_files/kitchensync.desktop/hu.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: hu\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Szinkronizáció"
diff --git a/translations/desktop_files/kitchensync.desktop/is.po b/translations/desktop_files/kitchensync.desktop/is.po
deleted file mode 100644
index fe9c27c0..00000000
--- a/translations/desktop_files/kitchensync.desktop/is.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: is\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Samstilling"
diff --git a/translations/desktop_files/kitchensync.desktop/it.po b/translations/desktop_files/kitchensync.desktop/it.po
deleted file mode 100644
index 4f6e3971..00000000
--- a/translations/desktop_files/kitchensync.desktop/it.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# Michele Calgaro <michele.calgaro@yahoo.it>, 2020.
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: 2020-11-22 12:59+0000\n"
-"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
-"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
-"projects/tdepim/kitchensync-kitchensyncdesktop/it/>\n"
-"Language: it\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.3.2\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr "KitchenSync"
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Sincronizzazione"
diff --git a/translations/desktop_files/kitchensync.desktop/ja.po b/translations/desktop_files/kitchensync.desktop/ja.po
deleted file mode 100644
index 1ca0c51c..00000000
--- a/translations/desktop_files/kitchensync.desktop/ja.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ja\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "同期"
diff --git a/translations/desktop_files/kitchensync.desktop/kitchensync.desktop.pot b/translations/desktop_files/kitchensync.desktop/kitchensync.desktop.pot
deleted file mode 100644
index a2d45baa..00000000
--- a/translations/desktop_files/kitchensync.desktop/kitchensync.desktop.pot
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr ""
diff --git a/translations/desktop_files/kitchensync.desktop/kk.po b/translations/desktop_files/kitchensync.desktop/kk.po
deleted file mode 100644
index a2c8762f..00000000
--- a/translations/desktop_files/kitchensync.desktop/kk.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: kk\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Қадамдастыру"
diff --git a/translations/desktop_files/kitchensync.desktop/km.po b/translations/desktop_files/kitchensync.desktop/km.po
deleted file mode 100644
index 942e0e12..00000000
--- a/translations/desktop_files/kitchensync.desktop/km.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: km\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "ការ​​ធ្វើ​សមកាលកម្ម"
diff --git a/translations/desktop_files/kitchensync.desktop/lt.po b/translations/desktop_files/kitchensync.desktop/lt.po
deleted file mode 100644
index e60638d7..00000000
--- a/translations/desktop_files/kitchensync.desktop/lt.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: lt\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Sinchronizacija"
diff --git a/translations/desktop_files/kitchensync.desktop/ms.po b/translations/desktop_files/kitchensync.desktop/ms.po
deleted file mode 100644
index 5aca2988..00000000
--- a/translations/desktop_files/kitchensync.desktop/ms.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ms\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Segerakan"
diff --git a/translations/desktop_files/kitchensync.desktop/nb.po b/translations/desktop_files/kitchensync.desktop/nb.po
deleted file mode 100644
index 7c77c120..00000000
--- a/translations/desktop_files/kitchensync.desktop/nb.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nb\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Synkronisering"
diff --git a/translations/desktop_files/kitchensync.desktop/nds.po b/translations/desktop_files/kitchensync.desktop/nds.po
deleted file mode 100644
index 693864ac..00000000
--- a/translations/desktop_files/kitchensync.desktop/nds.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nds\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Synkroniseren"
diff --git a/translations/desktop_files/kitchensync.desktop/nl.po b/translations/desktop_files/kitchensync.desktop/nl.po
deleted file mode 100644
index 19d86073..00000000
--- a/translations/desktop_files/kitchensync.desktop/nl.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Synchronisatie"
diff --git a/translations/desktop_files/kitchensync.desktop/nn.po b/translations/desktop_files/kitchensync.desktop/nn.po
deleted file mode 100644
index acf4fa78..00000000
--- a/translations/desktop_files/kitchensync.desktop/nn.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nn\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Synkronisering"
diff --git a/translations/desktop_files/kitchensync.desktop/pl.po b/translations/desktop_files/kitchensync.desktop/pl.po
deleted file mode 100644
index d98a2399..00000000
--- a/translations/desktop_files/kitchensync.desktop/pl.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: pl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Synchronizacja"
diff --git a/translations/desktop_files/kitchensync.desktop/pt.po b/translations/desktop_files/kitchensync.desktop/pt.po
deleted file mode 100644
index f5b3f084..00000000
--- a/translations/desktop_files/kitchensync.desktop/pt.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: pt\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr "KitchenSyncFilter"
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Sincronização"
diff --git a/translations/desktop_files/kitchensync.desktop/pt_BR.po b/translations/desktop_files/kitchensync.desktop/pt_BR.po
deleted file mode 100644
index 33725fb9..00000000
--- a/translations/desktop_files/kitchensync.desktop/pt_BR.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Gerenciador de Sincronização"
diff --git a/translations/desktop_files/kitchensync.desktop/ru.po b/translations/desktop_files/kitchensync.desktop/ru.po
deleted file mode 100644
index 082d779f..00000000
--- a/translations/desktop_files/kitchensync.desktop/ru.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ru\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Синхронизация"
diff --git a/translations/desktop_files/kitchensync.desktop/sk.po b/translations/desktop_files/kitchensync.desktop/sk.po
deleted file mode 100644
index ffe13e30..00000000
--- a/translations/desktop_files/kitchensync.desktop/sk.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sk\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Synchronizácia"
diff --git a/translations/desktop_files/kitchensync.desktop/sl.po b/translations/desktop_files/kitchensync.desktop/sl.po
deleted file mode 100644
index 21e500dd..00000000
--- a/translations/desktop_files/kitchensync.desktop/sl.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Usklajevanje"
diff --git a/translations/desktop_files/kitchensync.desktop/sr.po b/translations/desktop_files/kitchensync.desktop/sr.po
deleted file mode 100644
index e68068b7..00000000
--- a/translations/desktop_files/kitchensync.desktop/sr.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Синхронизација"
diff --git a/translations/desktop_files/kitchensync.desktop/sr@Latn.po b/translations/desktop_files/kitchensync.desktop/sr@Latn.po
deleted file mode 100644
index cb76b969..00000000
--- a/translations/desktop_files/kitchensync.desktop/sr@Latn.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sr@Latn\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Sinhronizacija"
diff --git a/translations/desktop_files/kitchensync.desktop/sv.po b/translations/desktop_files/kitchensync.desktop/sv.po
deleted file mode 100644
index 6a04957d..00000000
--- a/translations/desktop_files/kitchensync.desktop/sv.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sv\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr "Kitchensync"
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Synkronisering"
diff --git a/translations/desktop_files/kitchensync.desktop/ta.po b/translations/desktop_files/kitchensync.desktop/ta.po
deleted file mode 100644
index 08bc3b19..00000000
--- a/translations/desktop_files/kitchensync.desktop/ta.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ta\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "கூட்டிணைப்பு"
diff --git a/translations/desktop_files/kitchensync.desktop/tr.po b/translations/desktop_files/kitchensync.desktop/tr.po
deleted file mode 100644
index bc40061d..00000000
--- a/translations/desktop_files/kitchensync.desktop/tr.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Senkronizasyon"
diff --git a/translations/desktop_files/kitchensync.desktop/uk.po b/translations/desktop_files/kitchensync.desktop/uk.po
deleted file mode 100644
index 7a559271..00000000
--- a/translations/desktop_files/kitchensync.desktop/uk.po
+++ /dev/null
@@ -1,29 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# Roman Savochenko <roman@oscada.org>, 2020.
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: 2020-08-19 19:59+0000\n"
-"Last-Translator: Roman Savochenko <roman@oscada.org>\n"
-"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
-"projects/tdepim/kitchensync-kitchensyncdesktop/uk/>\n"
-"Language: uk\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.1.1\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr "KitchenSync"
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "Синхронізація"
diff --git a/translations/desktop_files/kitchensync.desktop/zh_CN.po b/translations/desktop_files/kitchensync.desktop/zh_CN.po
deleted file mode 100644
index 95da8d40..00000000
--- a/translations/desktop_files/kitchensync.desktop/zh_CN.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-09 19:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: zh_CN\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: kitchensync.desktop:2
-msgid "KitchenSync"
-msgstr ""
-
-#. GenericName
-#: kitchensync.desktop:4
-msgid "Synchronization"
-msgstr "同步"
diff --git a/translations/desktop_files/kmail-desktops/it.po b/translations/desktop_files/kmail-desktops/it.po
index 30766947..aaf106d2 100644
--- a/translations/desktop_files/kmail-desktops/it.po
+++ b/translations/desktop_files/kmail-desktops/it.po
@@ -1,25 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2023.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-07-09 20:57+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2023-01-18 04:22+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdepim/kmail-desktop-files/it/>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.14.2\n"
#. Name
#: KMail.desktop:2 kmail_view.desktop:2
msgid "KMail"
-msgstr ""
+msgstr "KMail"
#. GenericName
#: KMail.desktop:4
@@ -29,7 +30,7 @@ msgstr "Programma di posta elettronica"
#. Name
#: application_octetstream.desktop:2
msgid "Application Octetstream"
-msgstr ""
+msgstr "Applicazione Flusso Ottetti"
#. Comment
#: application_octetstream.desktop:4
@@ -134,7 +135,7 @@ msgstr "kmail;sicurezza;"
#. Name
#: konqueror/servicemenus/email.desktop:8
msgid "Email File"
-msgstr ""
+msgstr "Invia posta elettronica"
#. Name
#: profiles/profile-default-rc.desktop:2
@@ -159,7 +160,7 @@ msgstr "Dimensioni più grandi dei caratteri per chi ha problemi di vista"
#. Name
#: profiles/profile-html-rc.desktop:2
msgid "HTML"
-msgstr ""
+msgstr "HTML"
#. Comment
#: profiles/profile-html-rc.desktop:4
diff --git a/translations/desktop_files/kmobile-desktops/it.po b/translations/desktop_files/kmobile-desktops/it.po
index a1b29e6a..141ea8b1 100644
--- a/translations/desktop_files/kmobile-desktops/it.po
+++ b/translations/desktop_files/kmobile-desktops/it.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2023.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-07-10 02:25+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2023-01-20 02:22+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdepim/kmobile-desktop-files/it/>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.14.2\n"
#. Name
#: devices/digicam/libkmobile_digicam.desktop:2
@@ -37,7 +38,7 @@ msgid ""
"This driver supports many NOKIA and other mobile phones via the gammu library"
msgstr ""
"Questo driver supporta molti NOKIA e altri telefoni cellulari tramite la "
-"libreria gammu."
+"libreria gammu"
#. Name
#: devices/gnokii/libkmobile_gnokii.desktop:2
@@ -65,9 +66,8 @@ msgstr "Dispositivo portatile skeleton"
#. Name
#: kmobile.desktop:8
-#, fuzzy
msgid "KMobile"
-msgstr "Dispositivo portatile"
+msgstr "KMobile"
#. GenericName
#: kmobile.desktop:10
diff --git a/translations/desktop_files/knode-desktops/it.po b/translations/desktop_files/knode-desktops/it.po
index a2036acc..294563e4 100644
--- a/translations/desktop_files/knode-desktops/it.po
+++ b/translations/desktop_files/knode-desktops/it.po
@@ -1,25 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2023.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-07-10 03:42+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2023-01-20 02:22+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdepim/knode-desktop-files/it/>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.14.2\n"
#. Name
#: KNode.desktop:12
msgid "KNode"
-msgstr ""
+msgstr "KNode"
#. GenericName
#: KNode.desktop:14
diff --git a/translations/desktop_files/kontact-desktops/af.po b/translations/desktop_files/kontact-desktops/af.po
index ef239878..8548927b 100644
--- a/translations/desktop_files/kontact-desktops/af.po
+++ b/translations/desktop_files/kontact-desktops/af.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/ar.po b/translations/desktop_files/kontact-desktops/ar.po
index 0f63b97b..aefe84bb 100644
--- a/translations/desktop_files/kontact-desktops/ar.po
+++ b/translations/desktop_files/kontact-desktops/ar.po
@@ -59,16 +59,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/az.po b/translations/desktop_files/kontact-desktops/az.po
index ca04f30e..c661cf7e 100644
--- a/translations/desktop_files/kontact-desktops/az.po
+++ b/translations/desktop_files/kontact-desktops/az.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/be.po b/translations/desktop_files/kontact-desktops/be.po
index 4a467d09..45f7d013 100644
--- a/translations/desktop_files/kontact-desktops/be.po
+++ b/translations/desktop_files/kontact-desktops/be.po
@@ -59,16 +59,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/bg.po b/translations/desktop_files/kontact-desktops/bg.po
index 5e727709..10cd1f41 100644
--- a/translations/desktop_files/kontact-desktops/bg.po
+++ b/translations/desktop_files/kontact-desktops/bg.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr "Приставка за KArm"
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr "Синхронизация"
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr "Приставка за синхронизация"
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr "Преглед на пощата"
diff --git a/translations/desktop_files/kontact-desktops/br.po b/translations/desktop_files/kontact-desktops/br.po
index bc32a773..245f8f53 100644
--- a/translations/desktop_files/kontact-desktops/br.po
+++ b/translations/desktop_files/kontact-desktops/br.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/bs.po b/translations/desktop_files/kontact-desktops/bs.po
index ab2be2c5..678f5f1f 100644
--- a/translations/desktop_files/kontact-desktops/bs.po
+++ b/translations/desktop_files/kontact-desktops/bs.po
@@ -59,16 +59,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/ca.po b/translations/desktop_files/kontact-desktops/ca.po
index f64e5252..cfacf098 100644
--- a/translations/desktop_files/kontact-desktops/ca.po
+++ b/translations/desktop_files/kontact-desktops/ca.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr "Component de seguiment dels temps (endollable del KArm)"
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr "Component de sincronització (endollable del KitchenSync)"
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr "Resum de correu"
diff --git a/translations/desktop_files/kontact-desktops/cs.po b/translations/desktop_files/kontact-desktops/cs.po
index 061be7e1..ab094bbb 100644
--- a/translations/desktop_files/kontact-desktops/cs.po
+++ b/translations/desktop_files/kontact-desktops/cs.po
@@ -59,16 +59,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr "Komponenta měřiče času (modul KArm)"
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr "Synchronizace"
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr "Komponenta pro synchronizaci (modul Kitchensync)"
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr "Přehled emailů"
diff --git a/translations/desktop_files/kontact-desktops/cy.po b/translations/desktop_files/kontact-desktops/cy.po
index d0368dae..0790d69b 100644
--- a/translations/desktop_files/kontact-desktops/cy.po
+++ b/translations/desktop_files/kontact-desktops/cy.po
@@ -59,16 +59,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/da.po b/translations/desktop_files/kontact-desktops/da.po
index c23603bb..2c62cda9 100644
--- a/translations/desktop_files/kontact-desktops/da.po
+++ b/translations/desktop_files/kontact-desktops/da.po
@@ -59,16 +59,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr "Time Tracker-komponent (KArm-plugin)"
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr "Synkronisergingskomponent (Kitchensync-plugin)"
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr "Oversigt over e-mail"
diff --git a/translations/desktop_files/kontact-desktops/de.po b/translations/desktop_files/kontact-desktops/de.po
index 65243b3e..bd82bf28 100644
--- a/translations/desktop_files/kontact-desktops/de.po
+++ b/translations/desktop_files/kontact-desktops/de.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr "Zeiterfassungskomponente (KArm-Modul)"
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr "Abgleich"
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr "Synchronisationskomponente (KitchenSync-Modul)"
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr "E-Mail-Übersicht"
diff --git a/translations/desktop_files/kontact-desktops/el.po b/translations/desktop_files/kontact-desktops/el.po
index 40617bfa..e35991de 100644
--- a/translations/desktop_files/kontact-desktops/el.po
+++ b/translations/desktop_files/kontact-desktops/el.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr "Συστατικό γραμμής χρόνου (Πρόσθετο του KArm)"
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr "Συγχρονισμός"
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr "Συστατικό συγχρονισμού (Πρόσθετο του Kitchensynk)"
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr "Επισκόπηση αλληλογραφίας"
diff --git a/translations/desktop_files/kontact-desktops/eo.po b/translations/desktop_files/kontact-desktops/eo.po
index 5d64576e..c79e10d5 100644
--- a/translations/desktop_files/kontact-desktops/eo.po
+++ b/translations/desktop_files/kontact-desktops/eo.po
@@ -59,16 +59,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/es.po b/translations/desktop_files/kontact-desktops/es.po
index e1de2389..62453e5f 100644
--- a/translations/desktop_files/kontact-desktops/es.po
+++ b/translations/desktop_files/kontact-desktops/es.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/et.po b/translations/desktop_files/kontact-desktops/et.po
index 381c6dc3..2ffef1e4 100644
--- a/translations/desktop_files/kontact-desktops/et.po
+++ b/translations/desktop_files/kontact-desktops/et.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr "Ajaarvestaja plugin (KArm)"
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr "Sünkroniseerimine"
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr "Sünkroniseerimise plugin (KitchenSync)"
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr "E-posti ülevaade"
diff --git a/translations/desktop_files/kontact-desktops/eu.po b/translations/desktop_files/kontact-desktops/eu.po
index 5d12dd49..c15b149e 100644
--- a/translations/desktop_files/kontact-desktops/eu.po
+++ b/translations/desktop_files/kontact-desktops/eu.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/fa.po b/translations/desktop_files/kontact-desktops/fa.po
index d39d06a6..cd970c37 100644
--- a/translations/desktop_files/kontact-desktops/fa.po
+++ b/translations/desktop_files/kontact-desktops/fa.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/fi.po b/translations/desktop_files/kontact-desktops/fi.po
index 8c69e8d2..9b362877 100644
--- a/translations/desktop_files/kontact-desktops/fi.po
+++ b/translations/desktop_files/kontact-desktops/fi.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/fr.po b/translations/desktop_files/kontact-desktops/fr.po
index e1f0678a..b0a155a8 100644
--- a/translations/desktop_files/kontact-desktops/fr.po
+++ b/translations/desktop_files/kontact-desktops/fr.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/fy.po b/translations/desktop_files/kontact-desktops/fy.po
index b8ea9039..f1471fdf 100644
--- a/translations/desktop_files/kontact-desktops/fy.po
+++ b/translations/desktop_files/kontact-desktops/fy.po
@@ -59,16 +59,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/ga.po b/translations/desktop_files/kontact-desktops/ga.po
index dc32b832..53f7ced4 100644
--- a/translations/desktop_files/kontact-desktops/ga.po
+++ b/translations/desktop_files/kontact-desktops/ga.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/gl.po b/translations/desktop_files/kontact-desktops/gl.po
index e1429c6f..4f1ddb7f 100644
--- a/translations/desktop_files/kontact-desktops/gl.po
+++ b/translations/desktop_files/kontact-desktops/gl.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/he.po b/translations/desktop_files/kontact-desktops/he.po
index 75e109ed..87a17ab0 100644
--- a/translations/desktop_files/kontact-desktops/he.po
+++ b/translations/desktop_files/kontact-desktops/he.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/hi.po b/translations/desktop_files/kontact-desktops/hi.po
index 84893e0c..b38f6143 100644
--- a/translations/desktop_files/kontact-desktops/hi.po
+++ b/translations/desktop_files/kontact-desktops/hi.po
@@ -59,16 +59,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/hr.po b/translations/desktop_files/kontact-desktops/hr.po
index 3ce1d085..fcc6ded2 100644
--- a/translations/desktop_files/kontact-desktops/hr.po
+++ b/translations/desktop_files/kontact-desktops/hr.po
@@ -59,16 +59,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/hu.po b/translations/desktop_files/kontact-desktops/hu.po
index fc6f51cd..3fe1d895 100644
--- a/translations/desktop_files/kontact-desktops/hu.po
+++ b/translations/desktop_files/kontact-desktops/hu.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/id.po b/translations/desktop_files/kontact-desktops/id.po
index 1117c0d2..883f7147 100644
--- a/translations/desktop_files/kontact-desktops/id.po
+++ b/translations/desktop_files/kontact-desktops/id.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/is.po b/translations/desktop_files/kontact-desktops/is.po
index 1f033962..6eade932 100644
--- a/translations/desktop_files/kontact-desktops/is.po
+++ b/translations/desktop_files/kontact-desktops/is.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/it.po b/translations/desktop_files/kontact-desktops/it.po
index ee3be1e5..cac49eaf 100644
--- a/translations/desktop_files/kontact-desktops/it.po
+++ b/translations/desktop_files/kontact-desktops/it.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2023.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2023-02-02 02:22+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdepim/kontact-desktop-files/it/>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.15.2\n"
#. Name
#: interfaces/kontactplugin.desktop:4
@@ -50,7 +51,7 @@ msgstr "Componente contatti (plugin KAddressbook)"
#. Name
#: plugins/karm/karmplugin.desktop:15
msgid "Timer"
-msgstr ""
+msgstr "Timer"
#. Comment
#: plugins/karm/karmplugin.desktop:17
@@ -58,16 +59,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr "Componente segna-tempo (plugin Karm)"
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr "Componente di sincronizzazione (plugin KitchenSync)"
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr "Panoramica posta elettronica"
@@ -96,7 +87,7 @@ msgstr "Componente posta elettronica (plugin KMail)"
#: plugins/knode/knodeplugin.desktop:16
#: plugins/newsticker/newstickerplugin.desktop:17 src/kontact.setdlg:32
msgid "News"
-msgstr ""
+msgstr "Notizie"
#. Comment
#: plugins/knode/knodeplugin.desktop:18
@@ -161,7 +152,7 @@ msgstr "Componente elenco delle cose da fare (plugin KOrganizer)"
#. Name
#: plugins/kpilot/kpilotplugin.desktop:18
msgid "Palm"
-msgstr ""
+msgstr "Palm"
#. Comment
#: plugins/kpilot/kpilotplugin.desktop:20
@@ -255,9 +246,8 @@ msgstr "Componente meteorologico di Kontact"
#. Name
#: src/Kontact.desktop:6 src/kontactconfig.desktop:15 src/kontactdcop.desktop:2
-#, fuzzy
msgid "Kontact"
-msgstr "Contatti"
+msgstr "Kontact"
#. GenericName
#: src/Kontact.desktop:8
@@ -266,36 +256,33 @@ msgstr "Gestione informazioni personali"
#. Comment
#: src/kontactconfig.desktop:17
-#, fuzzy
msgid "TDE Kontact"
-msgstr "Contatti"
+msgstr "TDE Kontact"
#. Keywords
#: src/kontactconfig.desktop:19
-#, fuzzy
msgid "kontact;"
-msgstr "Contatti"
+msgstr "contatti;"
#. Description
#: profiles/KontactDefaults/profile.cfg:2
msgid "Default KDE Kontact settings"
-msgstr ""
+msgstr "Impostazioni predefinite di TDE Kontact"
#. Name
#: profiles/KontactDefaults/profile.cfg:4
-#, fuzzy
msgid "Kontact Style"
-msgstr "Plugin Kontact"
+msgstr "Stile Kontact"
#. Description
#: profiles/OutlookDefaults/profile.cfg:2
msgid "Settings resembling MS Outlook"
-msgstr ""
+msgstr "Impostazioni simili a MS Outlook"
#. Name
#: profiles/OutlookDefaults/profile.cfg:4
msgid "Outlook Style "
-msgstr ""
+msgstr "Style Outlook "
#. Name
#: src/kontact.setdlg:2
@@ -319,8 +306,7 @@ msgid ""
"View Item</i> and represents a <i>Kontact Component</i>."
msgstr ""
"Configurazione del plugin di posta elettronica <b>KMail</b> di Kontact, "
-"include una <i>vista sommario</i> e rappresenta un <i>componente Kontact</"
-"i>. "
+"include una <i>vista sommario</i> e rappresenta un <i>componente Kontact</i>."
#. Comment
#: src/kontact.setdlg:15
diff --git a/translations/desktop_files/kontact-desktops/ja.po b/translations/desktop_files/kontact-desktops/ja.po
index 10867a40..f25c2fe7 100644
--- a/translations/desktop_files/kontact-desktops/ja.po
+++ b/translations/desktop_files/kontact-desktops/ja.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr "タイムトラッカーコンポーネント (KArm プラグイン)"
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr "同期"
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr "同期コンポーネント (KitchenSync プラグイン)"
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr "メールの要約"
diff --git a/translations/desktop_files/kontact-desktops/kk.po b/translations/desktop_files/kontact-desktops/kk.po
index c14103e9..35edca57 100644
--- a/translations/desktop_files/kontact-desktops/kk.po
+++ b/translations/desktop_files/kontact-desktops/kk.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/km.po b/translations/desktop_files/kontact-desktops/km.po
index 31e202d0..20436b81 100644
--- a/translations/desktop_files/kontact-desktops/km.po
+++ b/translations/desktop_files/kontact-desktops/km.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/kontact-desktops.pot b/translations/desktop_files/kontact-desktops/kontact-desktops.pot
index a636a8d0..e33e850a 100644
--- a/translations/desktop_files/kontact-desktops/kontact-desktops.pot
+++ b/translations/desktop_files/kontact-desktops/kontact-desktops.pot
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/lt.po b/translations/desktop_files/kontact-desktops/lt.po
index 438b4034..2ff0472a 100644
--- a/translations/desktop_files/kontact-desktops/lt.po
+++ b/translations/desktop_files/kontact-desktops/lt.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/lv.po b/translations/desktop_files/kontact-desktops/lv.po
index ca624423..da09f286 100644
--- a/translations/desktop_files/kontact-desktops/lv.po
+++ b/translations/desktop_files/kontact-desktops/lv.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/mk.po b/translations/desktop_files/kontact-desktops/mk.po
index cd876396..623a46f9 100644
--- a/translations/desktop_files/kontact-desktops/mk.po
+++ b/translations/desktop_files/kontact-desktops/mk.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/ms.po b/translations/desktop_files/kontact-desktops/ms.po
index f0f2c319..b79ed431 100644
--- a/translations/desktop_files/kontact-desktops/ms.po
+++ b/translations/desktop_files/kontact-desktops/ms.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/nb.po b/translations/desktop_files/kontact-desktops/nb.po
index fad1cb1f..fae377a2 100644
--- a/translations/desktop_files/kontact-desktops/nb.po
+++ b/translations/desktop_files/kontact-desktops/nb.po
@@ -59,16 +59,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/nds.po b/translations/desktop_files/kontact-desktops/nds.po
index 494a0023..f6d1db5c 100644
--- a/translations/desktop_files/kontact-desktops/nds.po
+++ b/translations/desktop_files/kontact-desktops/nds.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr "Tietlogbook-Komponent (KArm-Moduul)"
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr "Synkroniseren"
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr "Synkroniseer-Komponent (Kitchensynk-Moduul)"
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr "Nettpost-Översicht"
diff --git a/translations/desktop_files/kontact-desktops/ne.po b/translations/desktop_files/kontact-desktops/ne.po
index 3e30d915..716f3b3a 100644
--- a/translations/desktop_files/kontact-desktops/ne.po
+++ b/translations/desktop_files/kontact-desktops/ne.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/nl.po b/translations/desktop_files/kontact-desktops/nl.po
index 9c16b1e9..0cac82fb 100644
--- a/translations/desktop_files/kontact-desktops/nl.po
+++ b/translations/desktop_files/kontact-desktops/nl.po
@@ -59,16 +59,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr "Tijdsregistratiecomponent (KArm-plugin)"
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr "Synchronisatiecomponent (Kitchensynk-plugin)"
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr "E-mailoverzicht"
diff --git a/translations/desktop_files/kontact-desktops/nn.po b/translations/desktop_files/kontact-desktops/nn.po
index e718bc6f..cbfb1ac0 100644
--- a/translations/desktop_files/kontact-desktops/nn.po
+++ b/translations/desktop_files/kontact-desktops/nn.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/nso.po b/translations/desktop_files/kontact-desktops/nso.po
index fa6f146a..66b5ce6b 100644
--- a/translations/desktop_files/kontact-desktops/nso.po
+++ b/translations/desktop_files/kontact-desktops/nso.po
@@ -59,16 +59,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/pa.po b/translations/desktop_files/kontact-desktops/pa.po
index 3aadd886..8c00b8ee 100644
--- a/translations/desktop_files/kontact-desktops/pa.po
+++ b/translations/desktop_files/kontact-desktops/pa.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/pl.po b/translations/desktop_files/kontact-desktops/pl.po
index cd394570..8fff36cf 100644
--- a/translations/desktop_files/kontact-desktops/pl.po
+++ b/translations/desktop_files/kontact-desktops/pl.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr "Składnik śledzenia czasu (wtyczka KArm)"
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr "Synchronizacja"
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr "Składnik synchronizacji (wtyczka KitchenSync)"
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr "Poczta"
diff --git a/translations/desktop_files/kontact-desktops/pt.po b/translations/desktop_files/kontact-desktops/pt.po
index 6832965b..7ded651f 100644
--- a/translations/desktop_files/kontact-desktops/pt.po
+++ b/translations/desktop_files/kontact-desktops/pt.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/pt_BR.po b/translations/desktop_files/kontact-desktops/pt_BR.po
index ed9fa15e..830c3cc1 100644
--- a/translations/desktop_files/kontact-desktops/pt_BR.po
+++ b/translations/desktop_files/kontact-desktops/pt_BR.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/ro.po b/translations/desktop_files/kontact-desktops/ro.po
index ec253920..7024a543 100644
--- a/translations/desktop_files/kontact-desktops/ro.po
+++ b/translations/desktop_files/kontact-desktops/ro.po
@@ -59,16 +59,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/ru.po b/translations/desktop_files/kontact-desktops/ru.po
index cf91c5f9..6fb26724 100644
--- a/translations/desktop_files/kontact-desktops/ru.po
+++ b/translations/desktop_files/kontact-desktops/ru.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/rw.po b/translations/desktop_files/kontact-desktops/rw.po
index ac127f1c..2c4ed46f 100644
--- a/translations/desktop_files/kontact-desktops/rw.po
+++ b/translations/desktop_files/kontact-desktops/rw.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/se.po b/translations/desktop_files/kontact-desktops/se.po
index 0f9992aa..afefa83b 100644
--- a/translations/desktop_files/kontact-desktops/se.po
+++ b/translations/desktop_files/kontact-desktops/se.po
@@ -59,16 +59,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/sk.po b/translations/desktop_files/kontact-desktops/sk.po
index e8e75642..95318c54 100644
--- a/translations/desktop_files/kontact-desktops/sk.po
+++ b/translations/desktop_files/kontact-desktops/sk.po
@@ -59,16 +59,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/sl.po b/translations/desktop_files/kontact-desktops/sl.po
index b545890a..4afc0d94 100644
--- a/translations/desktop_files/kontact-desktops/sl.po
+++ b/translations/desktop_files/kontact-desktops/sl.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/sr.po b/translations/desktop_files/kontact-desktops/sr.po
index c157c67c..f13f0bfb 100644
--- a/translations/desktop_files/kontact-desktops/sr.po
+++ b/translations/desktop_files/kontact-desktops/sr.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr "Компонента праћења времена (прикључак KArm-а)"
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr "Компонента синхронизације (прикључак KitchenSync-а)"
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr "Преглед е-поште"
diff --git a/translations/desktop_files/kontact-desktops/sr@Latn.po b/translations/desktop_files/kontact-desktops/sr@Latn.po
index d7b5d3f0..30a86c38 100644
--- a/translations/desktop_files/kontact-desktops/sr@Latn.po
+++ b/translations/desktop_files/kontact-desktops/sr@Latn.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr "Komponenta praćenja vremena (priključak KArm-a)"
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr "Komponenta sinhronizacije (priključak KitchenSync-a)"
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr "Pregled e-pošte"
diff --git a/translations/desktop_files/kontact-desktops/sv.po b/translations/desktop_files/kontact-desktops/sv.po
index 11cd06a7..b0ee90b7 100644
--- a/translations/desktop_files/kontact-desktops/sv.po
+++ b/translations/desktop_files/kontact-desktops/sv.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr "Komponent för tidmätning (Karm-insticksprogram)"
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr "Synkronisering"
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr "Synkroniseringskomponent (Kitchensynk-insticksprogram)"
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr "E-postöversikt"
diff --git a/translations/desktop_files/kontact-desktops/ta.po b/translations/desktop_files/kontact-desktops/ta.po
index 2cbc3423..2aa5c5a4 100644
--- a/translations/desktop_files/kontact-desktops/ta.po
+++ b/translations/desktop_files/kontact-desktops/ta.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/tg.po b/translations/desktop_files/kontact-desktops/tg.po
index 18e690ea..98ec2ee1 100644
--- a/translations/desktop_files/kontact-desktops/tg.po
+++ b/translations/desktop_files/kontact-desktops/tg.po
@@ -59,16 +59,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/th.po b/translations/desktop_files/kontact-desktops/th.po
index 3ce01d42..8d487031 100644
--- a/translations/desktop_files/kontact-desktops/th.po
+++ b/translations/desktop_files/kontact-desktops/th.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/tr.po b/translations/desktop_files/kontact-desktops/tr.po
index 29f4f2d1..b9624ebb 100644
--- a/translations/desktop_files/kontact-desktops/tr.po
+++ b/translations/desktop_files/kontact-desktops/tr.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/uk.po b/translations/desktop_files/kontact-desktops/uk.po
index 8a6b083c..336a2b0f 100644
--- a/translations/desktop_files/kontact-desktops/uk.po
+++ b/translations/desktop_files/kontact-desktops/uk.po
@@ -60,16 +60,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr "Компонент Трекеру Часу (Втулок KArm)"
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr "Синхр"
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr "Компонент Синхронізації (Втулок Kitchensynk)"
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr "Переглянути Е-Пошту"
diff --git a/translations/desktop_files/kontact-desktops/uz.po b/translations/desktop_files/kontact-desktops/uz.po
index ca7c146c..a4c52d7b 100644
--- a/translations/desktop_files/kontact-desktops/uz.po
+++ b/translations/desktop_files/kontact-desktops/uz.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/ven.po b/translations/desktop_files/kontact-desktops/ven.po
index 2618806b..1523d4d9 100644
--- a/translations/desktop_files/kontact-desktops/ven.po
+++ b/translations/desktop_files/kontact-desktops/ven.po
@@ -59,16 +59,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/vi.po b/translations/desktop_files/kontact-desktops/vi.po
index cfd1aaec..bb42f83a 100644
--- a/translations/desktop_files/kontact-desktops/vi.po
+++ b/translations/desktop_files/kontact-desktops/vi.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/xh.po b/translations/desktop_files/kontact-desktops/xh.po
index 1b00b6db..a4fbf852 100644
--- a/translations/desktop_files/kontact-desktops/xh.po
+++ b/translations/desktop_files/kontact-desktops/xh.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/translations/desktop_files/kontact-desktops/zh_CN.po b/translations/desktop_files/kontact-desktops/zh_CN.po
index 776fe3a5..c85c5969 100644
--- a/translations/desktop_files/kontact-desktops/zh_CN.po
+++ b/translations/desktop_files/kontact-desktops/zh_CN.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr "时间追踪组件(KArm 插件)"
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr "同步组件(KitchenSync 插件)"
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr "邮件概览"
diff --git a/translations/desktop_files/kontact-desktops/zh_TW.po b/translations/desktop_files/kontact-desktops/zh_TW.po
index 42b8c6c1..d9cfa7e1 100644
--- a/translations/desktop_files/kontact-desktops/zh_TW.po
+++ b/translations/desktop_files/kontact-desktops/zh_TW.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr "時間追蹤器組件(KArm 外掛程式)"
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr "同步"
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr "同步組件(KitchenSynk 外掛程式)"
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr "郵件概要"
diff --git a/translations/desktop_files/kontact-desktops/zu.po b/translations/desktop_files/kontact-desktops/zu.po
index 0788fcab..8866e704 100644
--- a/translations/desktop_files/kontact-desktops/zu.po
+++ b/translations/desktop_files/kontact-desktops/zu.po
@@ -58,16 +58,6 @@ msgid "Time Tracker Component (KArm Plugin)"
msgstr ""
#. Name
-#: plugins/kitchensync/kitchensync.desktop:15
-msgid "Sync"
-msgstr ""
-
-#. Comment
-#: plugins/kitchensync/kitchensync.desktop:17
-msgid "Synchronization Component (Kitchensynk Plugin)"
-msgstr ""
-
-#. Name
#: plugins/kmail/kcmkmailsummary.desktop:13
msgid "E-Mail Overview"
msgstr ""
diff --git a/wizards/groupwarewizard.cpp b/wizards/groupwarewizard.cpp
index 1f520ce5..3df995ce 100644
--- a/wizards/groupwarewizard.cpp
+++ b/wizards/groupwarewizard.cpp
@@ -39,8 +39,8 @@ GroupwareWizard::GroupwareWizard( TQWidget *parent, const char *name )
layout->addWidget( mOverViewPage );
- connect( mOverViewPage, TQT_SIGNAL( cancel() ),
- tqApp, TQT_SLOT( quit() ) );
+ connect( mOverViewPage, TQ_SIGNAL( cancel() ),
+ tqApp, TQ_SLOT( quit() ) );
resize( 400, 200 );
}
diff --git a/wizards/groupwarewizard.h b/wizards/groupwarewizard.h
index 5f0deee8..03923ac3 100644
--- a/wizards/groupwarewizard.h
+++ b/wizards/groupwarewizard.h
@@ -28,7 +28,7 @@ class OverViewPage;
class GroupwareWizard : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/wizards/groupwisewizard.cpp b/wizards/groupwisewizard.cpp
index 4e828291..f6b019ef 100644
--- a/wizards/groupwisewizard.cpp
+++ b/wizards/groupwisewizard.cpp
@@ -314,14 +314,14 @@ GroupwiseWizard::GroupwiseWizard() : TDEConfigWizard( new GroupwisePropagator )
topLayout = new TQGridLayout( mEmailPage );
topLayout->setSpacing( spacingHint() );
- mEmailBox = new TQGroupBox( 1, Qt::Horizontal,
+ mEmailBox = new TQGroupBox( 1, TQt::Horizontal,
i18n("Create Mail Account"), mEmailPage );
mEmailBox->setCheckable( true );
topLayout->addWidget( mEmailBox, 0, 0 );
mEmailWidget = new TQWidget( mEmailBox );
- connect( mEmailBox, TQT_SIGNAL( toggled( bool ) ), mEmailWidget,
- TQT_SLOT( setEnabled( bool ) ) );
+ connect( mEmailBox, TQ_SIGNAL( toggled( bool ) ), mEmailWidget,
+ TQ_SLOT( setEnabled( bool ) ) );
TQGridLayout *accountLayout= new TQGridLayout( mEmailWidget );
accountLayout->setSpacing( spacingHint() );
@@ -340,8 +340,8 @@ GroupwiseWizard::GroupwiseWizard() : TDEConfigWizard( new GroupwisePropagator )
accountLayout->setRowStretch( 2, 1 );
- connect( this, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ),
- TQT_SLOT( slotAboutToShowPage( TQWidget * ) ) );
+ connect( this, TQ_SIGNAL( aboutToShowPage( TQWidget * ) ),
+ TQ_SLOT( slotAboutToShowPage( TQWidget * ) ) );
setupRulesPage();
diff --git a/wizards/groupwisewizard.h b/wizards/groupwisewizard.h
index 734e14d7..f2786805 100644
--- a/wizards/groupwisewizard.h
+++ b/wizards/groupwisewizard.h
@@ -30,7 +30,7 @@ class TQGroupBox;
class KDE_EXPORT GroupwiseWizard : public TDEConfigWizard
{
- Q_OBJECT
+ TQ_OBJECT
public:
GroupwiseWizard();
diff --git a/wizards/overviewpage.cpp b/wizards/overviewpage.cpp
index e9f6596a..9e4aba5d 100644
--- a/wizards/overviewpage.cpp
+++ b/wizards/overviewpage.cpp
@@ -66,7 +66,7 @@ OverViewPage::OverViewPage( TQWidget *parent, const char *name )
#ifdef WITH_EGROUPWARE
button = new TQPushButton( i18n("eGroupware"), this );
layout->addMultiCellWidget( button, 3, 3, 0, 3 );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardEGroupware() ) );
+ connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( showWizardEGroupware() ) );
#endif
// FIXME: Maybe hyperlinks would be better than buttons.
@@ -74,20 +74,20 @@ OverViewPage::OverViewPage( TQWidget *parent, const char *name )
#ifdef WITH_KOLAB
button = new TQPushButton( i18n("Kolab"), this );
layout->addMultiCellWidget( button, 4, 4, 0, 3 );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardKolab() ) );
+ connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( showWizardKolab() ) );
#endif
#ifdef WITH_SLOX
button = new TQPushButton( i18n("SUSE Linux Openexchange (SLOX)"), this );
layout->addMultiCellWidget( button, 5, 5, 0, 3 );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardSlox() ) );
+ connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( showWizardSlox() ) );
#endif
#ifdef WITH_NEWEXCHANGE
button = new TQPushButton( i18n("Microsoft Exchange"), this );
button->hide(); // not quite ready yet
layout->addMultiCellWidget( button, 6, 6, 0, 3 );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardExchange() ) );
+ connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( showWizardExchange() ) );
#endif
TQFrame *frame = new TQFrame( this );
@@ -97,7 +97,7 @@ OverViewPage::OverViewPage( TQWidget *parent, const char *name )
TQPushButton *cancelButton = new KPushButton( KStdGuiItem::close(), this );
layout->addWidget( cancelButton, 8, 3 );
- connect( cancelButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( cancel() ) );
+ connect( cancelButton, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( cancel() ) );
layout->setRowStretch( 7, 1 );
diff --git a/wizards/overviewpage.h b/wizards/overviewpage.h
index 6120d739..6701d9c1 100644
--- a/wizards/overviewpage.h
+++ b/wizards/overviewpage.h
@@ -26,7 +26,7 @@
class OverViewPage : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/wizards/servertypemanager.h b/wizards/servertypemanager.h
index 4f4591a1..a44da492 100644
--- a/wizards/servertypemanager.h
+++ b/wizards/servertypemanager.h
@@ -28,7 +28,7 @@
class ServerTypeManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public: