summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
commit86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch)
tree97d3ac2c2f60780d9a1de4f82caac7cb27534501
parenta9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff)
downloadtdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz
tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
-rw-r--r--akregator/src/akregator_part.cpp24
-rw-r--r--akregator/src/akregator_part.h8
-rw-r--r--akregator/src/akregator_view.cpp6
-rw-r--r--akregator/src/akregator_view.h10
-rw-r--r--akregator/src/articlefilter.cpp32
-rw-r--r--akregator/src/articlefilter.h42
-rw-r--r--akregator/src/articleviewer.cpp4
-rw-r--r--akregator/src/configdialog.cpp6
-rw-r--r--akregator/src/configdialog.h6
-rw-r--r--akregator/src/frame.cpp2
-rw-r--r--akregator/src/librss/image.cpp14
-rw-r--r--akregator/src/librss/image.h6
-rw-r--r--akregator/src/librss/loader.cpp22
-rw-r--r--akregator/src/librss/loader.h8
-rw-r--r--akregator/src/mainwindow.cpp4
-rw-r--r--akregator/src/mainwindow.h6
-rw-r--r--akregator/src/pageviewer.cpp4
-rw-r--r--akregator/src/pageviewer.h2
-rw-r--r--akregator/src/viewer.cpp6
-rw-r--r--akregator/src/viewer.h4
-rw-r--r--certmanager/certificatewizardimpl.cpp14
-rw-r--r--certmanager/certificatewizardimpl.h4
-rw-r--r--certmanager/certmanager.cpp34
-rw-r--r--certmanager/certmanager.h8
-rw-r--r--certmanager/conf/appearanceconfigpage.cpp6
-rw-r--r--certmanager/conf/appearanceconfigpage.h2
-rw-r--r--certmanager/conf/appearanceconfigwidget.cpp12
-rw-r--r--certmanager/conf/appearanceconfigwidget.h2
-rw-r--r--certmanager/conf/configuredialog.cpp4
-rw-r--r--certmanager/conf/dirservconfigpage.cpp8
-rw-r--r--certmanager/conf/dirservconfigpage.h2
-rw-r--r--certmanager/conf/dnorderconfigpage.cpp6
-rw-r--r--certmanager/conf/dnorderconfigpage.h2
-rw-r--r--certmanager/conf/kleopatra_config_appear.desktop2
-rw-r--r--certmanager/conf/kleopatra_config_dirserv.desktop2
-rw-r--r--certmanager/conf/kleopatra_config_dnorder.desktop2
-rw-r--r--certmanager/kwatchgnupg/kwatchgnupgconfig.cpp4
-rw-r--r--certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp6
-rw-r--r--certmanager/lib/backends/chiasmus/chiasmusbackend.cpp14
-rw-r--r--certmanager/lib/cryptplugwrapper.cpp2
-rw-r--r--certmanager/lib/cryptplugwrapper.h2
-rw-r--r--certmanager/lib/kleo/cryptobackendfactory.cpp8
-rw-r--r--certmanager/lib/kleo/cryptobackendfactory.h6
-rw-r--r--certmanager/lib/kleo/dn.cpp4
-rw-r--r--certmanager/lib/kleo/kconfigbasedkeyfilter.cpp8
-rw-r--r--certmanager/lib/kleo/kconfigbasedkeyfilter.h8
-rw-r--r--certmanager/lib/kleo/keyfiltermanager.cpp6
-rw-r--r--certmanager/lib/ui/cryptoconfigmodule.h2
-rw-r--r--certmanager/lib/ui/keyselectiondialog.cpp4
-rw-r--r--certmanager/storedtransferjob.cpp20
-rw-r--r--certmanager/storedtransferjob.h12
-rw-r--r--kabc/kabcdistlistupdater/kabcdistlistupdater.cpp2
-rw-r--r--kaddressbook/addresseeconfig.cpp14
-rw-r--r--kaddressbook/addresseeeditordialog.cpp4
-rw-r--r--kaddressbook/addresseeeditorwidget.cpp2
-rw-r--r--kaddressbook/common/filter.cpp18
-rw-r--r--kaddressbook/common/filter.h8
-rw-r--r--kaddressbook/common/kabprefs.cpp2
-rw-r--r--kaddressbook/common/kabprefs.h2
-rw-r--r--kaddressbook/imagewidget.cpp4
-rw-r--r--kaddressbook/interfaces/configurewidget.cpp4
-rw-r--r--kaddressbook/interfaces/configurewidget.h4
-rw-r--r--kaddressbook/interfaces/core.h6
-rw-r--r--kaddressbook/kabcore.cpp2
-rw-r--r--kaddressbook/kabcore.h6
-rw-r--r--kaddressbook/kaddressbookmain.cpp4
-rw-r--r--kaddressbook/kaddressbookmain.h6
-rw-r--r--kaddressbook/kaddressbookview.cpp4
-rw-r--r--kaddressbook/kaddressbookview.h10
-rw-r--r--kaddressbook/kcmconfigs/addresseewidget.cpp8
-rw-r--r--kaddressbook/kcmconfigs/extensionconfigdialog.cpp2
-rw-r--r--kaddressbook/kcmconfigs/extensionconfigdialog.h4
-rw-r--r--kaddressbook/kcmconfigs/kabconfig.desktop2
-rw-r--r--kaddressbook/kcmconfigs/kabconfigwidget.cpp4
-rw-r--r--kaddressbook/kcmconfigs/kabcustomfields.desktop2
-rw-r--r--kaddressbook/kcmconfigs/kabldapconfig.desktop2
-rw-r--r--kaddressbook/kcmconfigs/kcmkabconfig.cpp4
-rw-r--r--kaddressbook/kcmconfigs/kcmkabconfig.h2
-rw-r--r--kaddressbook/kcmconfigs/kcmkabcustomfields.cpp2
-rw-r--r--kaddressbook/kcmconfigs/kcmkabldapconfig.cpp4
-rw-r--r--kaddressbook/kcmconfigs/kcmkabldapconfig.h2
-rw-r--r--kaddressbook/kcmconfigs/ldapoptionswidget.cpp8
-rw-r--r--kaddressbook/keywidget.cpp6
-rw-r--r--kaddressbook/ldapsearchdialog.cpp8
-rw-r--r--kaddressbook/nameeditdialog.cpp2
-rw-r--r--kaddressbook/printing/detailledstyle.cpp4
-rw-r--r--kaddressbook/soundwidget.cpp4
-rw-r--r--kaddressbook/viewconfigurefieldspage.cpp4
-rw-r--r--kaddressbook/viewconfigurefieldspage.h4
-rw-r--r--kaddressbook/viewconfigurefilterpage.cpp4
-rw-r--r--kaddressbook/viewconfigurefilterpage.h6
-rw-r--r--kaddressbook/viewconfigurewidget.cpp8
-rw-r--r--kaddressbook/viewconfigurewidget.h8
-rw-r--r--kaddressbook/viewmanager.cpp16
-rw-r--r--kaddressbook/views/configurecardviewdialog.cpp8
-rw-r--r--kaddressbook/views/configurecardviewdialog.h10
-rw-r--r--kaddressbook/views/configuretableviewdialog.cpp8
-rw-r--r--kaddressbook/views/configuretableviewdialog.h10
-rw-r--r--kaddressbook/views/kaddressbookcardview.cpp4
-rw-r--r--kaddressbook/views/kaddressbookcardview.h6
-rw-r--r--kaddressbook/views/kaddressbookiconview.cpp2
-rw-r--r--kaddressbook/views/kaddressbookiconview.h4
-rw-r--r--kaddressbook/views/kaddressbooktableview.cpp4
-rw-r--r--kaddressbook/views/kaddressbooktableview.h6
-rw-r--r--kaddressbook/xxport/csv_xxport.cpp2
-rw-r--r--kaddressbook/xxport/csvimportdialog.cpp2
-rw-r--r--kaddressbook/xxport/ldif_xxport.cpp2
-rw-r--r--kaddressbook/xxport/vcard_xxport.cpp16
-rw-r--r--kalarm/alarmcalendar.cpp28
-rw-r--r--kalarm/alarmcalendar.h4
-rw-r--r--kalarm/birthdaydlg.cpp4
-rw-r--r--kalarm/daemon.cpp4
-rw-r--r--kalarm/editdlg.cpp4
-rw-r--r--kalarm/functions.cpp4
-rw-r--r--kalarm/kalarmapp.cpp4
-rw-r--r--kalarm/kalarmd/adcalendar.cpp6
-rw-r--r--kalarm/kalarmd/adcalendar.h4
-rw-r--r--kalarm/kalarmd/adconfigdata.cpp10
-rw-r--r--kalarm/kalarmd/alarmdaemon.cpp4
-rw-r--r--kalarm/kamail.cpp10
-rw-r--r--kalarm/lib/messagebox.cpp6
-rw-r--r--kalarm/lib/messagebox.h6
-rw-r--r--kalarm/mainwindow.cpp14
-rw-r--r--kalarm/mainwindow.h4
-rw-r--r--kalarm/messagewin.cpp16
-rw-r--r--kalarm/messagewin.h4
-rw-r--r--kalarm/preferences.cpp14
-rw-r--r--kalarm/sounddlg.cpp12
-rw-r--r--kandy/src/kandy.cpp6
-rw-r--r--kandy/src/kandy.h6
-rw-r--r--kandy/src/kandyview.cpp4
-rw-r--r--kandy/src/mobilemain.cpp4
-rw-r--r--kandy/src/mobilemain.h6
-rw-r--r--karm/karmstorage.cpp4
-rw-r--r--karm/mainwindow.cpp8
-rw-r--r--karm/mainwindow.h4
-rw-r--r--karm/preferences.cpp12
-rw-r--r--kioslaves/imap4/imap4.cc24
-rw-r--r--kioslaves/imap4/imap4.h4
-rw-r--r--kioslaves/imap4/imapparser.cc4
-rw-r--r--kioslaves/imap4/imapparser.h2
-rw-r--r--kioslaves/mbox/mbox.cc14
-rw-r--r--kioslaves/mbox/mbox.h4
-rw-r--r--kioslaves/mbox/readmbox.cc6
-rw-r--r--kioslaves/mbox/stat.cc48
-rw-r--r--kioslaves/mbox/stat.h12
-rw-r--r--kioslaves/opengroupware/opengroupware.cpp12
-rw-r--r--kioslaves/opengroupware/opengroupware.h10
-rw-r--r--kioslaves/sieve/configure.in.in4
-rw-r--r--kioslaves/sieve/sieve.cpp30
-rw-r--r--kioslaves/sieve/sieve.h4
-rw-r--r--kmail/Mainpage.dox2
-rw-r--r--kmail/aboutdata.cpp2
-rw-r--r--kmail/accountmanager.cpp12
-rw-r--r--kmail/accountwizard.cpp10
-rw-r--r--kmail/acljobs.cpp48
-rw-r--r--kmail/acljobs.h28
-rw-r--r--kmail/actionscheduler.cpp6
-rw-r--r--kmail/annotationjobs.cpp56
-rw-r--r--kmail/annotationjobs.h38
-rw-r--r--kmail/antispamconfig.cpp6
-rw-r--r--kmail/antispamwizard.cpp14
-rw-r--r--kmail/antispamwizard.h4
-rw-r--r--kmail/attachmentstrategy.cpp2
-rw-r--r--kmail/backupjob.cpp4
-rw-r--r--kmail/cachedimapjob.cpp138
-rw-r--r--kmail/cachedimapjob.h24
-rw-r--r--kmail/callback.cpp2
-rw-r--r--kmail/composer.h2
-rw-r--r--kmail/configuredialog.cpp154
-rw-r--r--kmail/configuredialog.h4
-rw-r--r--kmail/configuredialog_p.cpp14
-rw-r--r--kmail/configuredialog_p.h38
-rw-r--r--kmail/copyfolderjob.cpp4
-rw-r--r--kmail/csshelper.cpp8
-rw-r--r--kmail/expirejob.cpp2
-rw-r--r--kmail/favoritefolderview.cpp4
-rw-r--r--kmail/filterimporterexporter.cpp16
-rw-r--r--kmail/filterimporterexporter.h8
-rw-r--r--kmail/folderdiaacltab.cpp24
-rw-r--r--kmail/folderdiaacltab.h6
-rw-r--r--kmail/folderdiaquotatab.cpp14
-rw-r--r--kmail/folderdiaquotatab.h2
-rw-r--r--kmail/folderjob.cpp2
-rw-r--r--kmail/folderstorage.cpp10
-rw-r--r--kmail/foldertreebase.cpp4
-rw-r--r--kmail/folderviewtooltip.h2
-rw-r--r--kmail/globalsettings.h2
-rw-r--r--kmail/headeritem.cpp4
-rw-r--r--kmail/headerstrategy.cpp4
-rw-r--r--kmail/headerstyle.cpp4
-rw-r--r--kmail/htmlstatusbar.cpp6
-rw-r--r--kmail/identitydialog.cpp4
-rw-r--r--kmail/imapaccountbase.cpp164
-rw-r--r--kmail/imapaccountbase.h58
-rw-r--r--kmail/imapjob.cpp68
-rw-r--r--kmail/imapjob.h18
-rw-r--r--kmail/index.cpp20
-rw-r--r--kmail/kcm_kmail.cpp12
-rw-r--r--kmail/kmaccount.cpp8
-rw-r--r--kmail/kmaccount.h6
-rw-r--r--kmail/kmacctcachedimap.cpp12
-rw-r--r--kmail/kmacctcachedimap.h6
-rw-r--r--kmail/kmacctimap.cpp20
-rw-r--r--kmail/kmacctimap.h6
-rw-r--r--kmail/kmacctlocal.cpp4
-rw-r--r--kmail/kmacctlocal.h4
-rw-r--r--kmail/kmacctmaildir.cpp4
-rw-r--r--kmail/kmacctmaildir.h4
-rw-r--r--kmail/kmail_config_accounts.desktop2
-rw-r--r--kmail/kmail_config_appearance.desktop2
-rw-r--r--kmail/kmail_config_composer.desktop2
-rw-r--r--kmail/kmail_config_identity.desktop2
-rw-r--r--kmail/kmail_config_misc.desktop2
-rw-r--r--kmail/kmail_config_security.desktop2
-rw-r--r--kmail/kmailicalifaceimpl.cpp14
-rw-r--r--kmail/kmcommands.cpp58
-rw-r--r--kmail/kmcommands.h16
-rw-r--r--kmail/kmcomposewin.cpp58
-rw-r--r--kmail/kmcomposewin.h8
-rw-r--r--kmail/kmedit.cpp2
-rw-r--r--kmail/kmfilter.cpp6
-rw-r--r--kmail/kmfilter.h8
-rw-r--r--kmail/kmfilterdlg.cpp4
-rw-r--r--kmail/kmfiltermgr.cpp8
-rw-r--r--kmail/kmfolder.cpp4
-rw-r--r--kmail/kmfolder.h4
-rw-r--r--kmail/kmfoldercachedimap.cpp76
-rw-r--r--kmail/kmfoldercachedimap.h22
-rw-r--r--kmail/kmfolderdia.cpp2
-rw-r--r--kmail/kmfolderimap.cpp162
-rw-r--r--kmail/kmfolderimap.h24
-rw-r--r--kmail/kmfoldermaildir.cpp12
-rw-r--r--kmail/kmfoldermaildir.h4
-rw-r--r--kmail/kmfoldermbox.cpp2
-rw-r--r--kmail/kmfoldermgr.cpp8
-rw-r--r--kmail/kmfoldersearch.cpp4
-rw-r--r--kmail/kmfolderseldlg.cpp4
-rw-r--r--kmail/kmfoldertree.cpp18
-rw-r--r--kmail/kmheaders.cpp34
-rw-r--r--kmail/kmheaders.h2
-rw-r--r--kmail/kmkernel.cpp56
-rw-r--r--kmail/kmkernel.h14
-rw-r--r--kmail/kmlineeditspell.cpp6
-rw-r--r--kmail/kmmainwidget.cpp36
-rw-r--r--kmail/kmmainwidget.h10
-rw-r--r--kmail/kmmessage.cpp18
-rw-r--r--kmail/kmmimeparttree.cpp12
-rw-r--r--kmail/kmmimeparttree.h10
-rw-r--r--kmail/kmmsgbase.cpp2
-rw-r--r--kmail/kmmsgpartdlg.cpp6
-rw-r--r--kmail/kmmsgpartdlg.h2
-rw-r--r--kmail/kmpopfiltercnfrmdlg.cpp2
-rw-r--r--kmail/kmreaderwin.cpp14
-rw-r--r--kmail/kmreaderwin.h4
-rw-r--r--kmail/kmsearchpattern.cpp12
-rw-r--r--kmail/kmsearchpattern.h22
-rw-r--r--kmail/kmsender.cpp38
-rw-r--r--kmail/kmsender.h2
-rw-r--r--kmail/kmsender_p.h12
-rw-r--r--kmail/kmservertest.cpp44
-rw-r--r--kmail/kmservertest.h16
-rw-r--r--kmail/kmstartup.cpp4
-rw-r--r--kmail/kmtransport.cpp20
-rw-r--r--kmail/listjob.cpp28
-rw-r--r--kmail/listjob.h6
-rw-r--r--kmail/mailinglist-magic.cpp4
-rw-r--r--kmail/mailinglist-magic.h6
-rw-r--r--kmail/messagecomposer.cpp22
-rw-r--r--kmail/networkaccount.cpp6
-rw-r--r--kmail/networkaccount.h14
-rw-r--r--kmail/newfolderdialog.cpp4
-rw-r--r--kmail/objecttreeparser.cpp2
-rw-r--r--kmail/partNode.cpp4
-rw-r--r--kmail/partNode.h2
-rw-r--r--kmail/popaccount.cpp72
-rw-r--r--kmail/popaccount.h18
-rw-r--r--kmail/quotajobs.cpp20
-rw-r--r--kmail/quotajobs.h12
-rw-r--r--kmail/recipientspicker.cpp6
-rw-r--r--kmail/renamejob.cpp14
-rw-r--r--kmail/renamejob.h4
-rw-r--r--kmail/searchjob.cpp30
-rw-r--r--kmail/searchjob.h8
-rw-r--r--kmail/searchwindow.cpp6
-rw-r--r--kmail/sieveconfig.cpp4
-rw-r--r--kmail/sieveconfig.h6
-rw-r--r--kmail/sievejob.cpp44
-rw-r--r--kmail/sievejob.h12
-rw-r--r--kmail/snippetwidget.cpp2
-rw-r--r--kmail/snippetwidget.h4
-rw-r--r--kmail/transportmanager.cpp4
-rw-r--r--kmail/util.h2
-rw-r--r--kmail/xfaceconfigurator.cpp8
-rw-r--r--kmobile/devices/gnokii/gnokii_mobile.cpp30
-rw-r--r--kmobile/devices/gnokii/gnokii_mobile.h4
-rw-r--r--kmobile/devices/skeleton/skeleton.cpp6
-rw-r--r--kmobile/kioslave/kio_mobile.cpp82
-rw-r--r--kmobile/kioslave/kio_mobile.h2
-rw-r--r--kmobile/kmobile.cpp6
-rw-r--r--kmobile/kmobile.h8
-rw-r--r--kmobile/kmobiledevice.cpp78
-rw-r--r--kmobile/kmobiledevice.h34
-rw-r--r--kmobile/kmobileitem.cpp6
-rw-r--r--kmobile/kmobileitem.h6
-rw-r--r--kmobile/kmobileview.cpp6
-rw-r--r--kmobile/kmobileview.h8
-rw-r--r--knode/articlewidget.cpp4
-rw-r--r--knode/headerview.cpp4
-rw-r--r--knode/knaccountmanager.cpp2
-rw-r--r--knode/knapplication.cpp2
-rw-r--r--knode/knarticlewindow.cpp4
-rw-r--r--knode/kncollectionview.cpp4
-rw-r--r--knode/kncomposer.cpp20
-rw-r--r--knode/knconfig.cpp48
-rw-r--r--knode/knconfig.h8
-rw-r--r--knode/knconfigpages.cpp24
-rw-r--r--knode/knconfigpages.h4
-rw-r--r--knode/knconfigwidgets.cpp32
-rw-r--r--knode/knconfigwidgets.h32
-rw-r--r--knode/knfiltermanager.cpp4
-rw-r--r--knode/knglobals.cpp2
-rw-r--r--knode/knglobals.h2
-rw-r--r--knode/knjobdata.cpp14
-rw-r--r--knode/knjobdata.h12
-rw-r--r--knode/knmainwidget.cpp8
-rw-r--r--knode/knnetaccess.cpp10
-rw-r--r--knode/knnetaccess.h4
-rw-r--r--knode/knode_config_accounts.desktop2
-rw-r--r--knode/knode_config_appearance.desktop2
-rw-r--r--knode/knode_config_cleanup.desktop2
-rw-r--r--knode/knode_config_identity.desktop2
-rw-r--r--knode/knode_config_post_news.desktop2
-rw-r--r--knode/knode_config_privacy.desktop2
-rw-r--r--knode/knode_config_read_news.desktop2
-rw-r--r--knode/knserverinfo.cpp4
-rw-r--r--knode/knserverinfo.h6
-rw-r--r--knode/smtpaccountwidget_base.ui2
-rw-r--r--knode/utilities.cpp10
-rw-r--r--knotes/ChangeLog16
-rw-r--r--knotes/TODO6
-rw-r--r--knotes/knote.cpp16
-rw-r--r--knotes/knoteconfigdlg.cpp2
-rw-r--r--knotes/knoteconfigdlg.h2
-rw-r--r--knotes/knotesapp.cpp4
-rw-r--r--knotes/knotesapp.h4
-rw-r--r--knotes/knoteslegacy.cpp4
-rw-r--r--knotes/knotesnetrecv.cpp2
-rw-r--r--knotes/knotesnetsend.cpp2
-rw-r--r--knotes/resourcelocal.cpp4
-rw-r--r--knotes/resourcelocal.h4
-rw-r--r--knotes/resourcelocal_plugin.cpp4
-rw-r--r--knotes/resourcenotes.cpp2
-rw-r--r--knotes/resourcenotes.h4
-rw-r--r--kode/kwsdl/converter.cpp10
-rw-r--r--kode/kwsdl/kung/binaryinputfield.cpp10
-rw-r--r--kode/kwsdl/kung/transport.cpp10
-rw-r--r--kode/kwsdl/kung/transport.h4
-rw-r--r--kode/kwsdl/schema/fileprovider.cpp14
-rw-r--r--kode/kwsdl/schema/fileprovider.h6
-rw-r--r--kode/kwsdl/tests/google/transport.cpp10
-rw-r--r--kode/kwsdl/tests/google/transport.h4
-rw-r--r--konsolekalendar/stdcalendar.cpp2
-rw-r--r--kontact/interfaces/plugin.h6
-rw-r--r--kontact/plugins/akregator/akregator_plugin.cpp4
-rw-r--r--kontact/plugins/akregator/akregator_plugin.h4
-rw-r--r--kontact/plugins/kmail/kcmkmailsummary.cpp8
-rw-r--r--kontact/plugins/kmail/kcmkmailsummary.desktop2
-rw-r--r--kontact/plugins/kmail/kcmkmailsummary.h2
-rw-r--r--kontact/plugins/kmail/summarywidget.cpp2
-rw-r--r--kontact/plugins/korganizer/kcmkorgsummary.cpp8
-rw-r--r--kontact/plugins/korganizer/kcmkorgsummary.desktop2
-rw-r--r--kontact/plugins/korganizer/kcmkorgsummary.h2
-rw-r--r--kontact/plugins/korganizer/summarywidget.cpp2
-rw-r--r--kontact/plugins/korganizer/todosummarywidget.cpp2
-rw-r--r--kontact/plugins/newsticker/kcmkontactknt.cpp12
-rw-r--r--kontact/plugins/newsticker/kcmkontactknt.desktop2
-rw-r--r--kontact/plugins/newsticker/kcmkontactknt.h2
-rw-r--r--kontact/plugins/newsticker/summarywidget.cpp2
-rw-r--r--kontact/plugins/specialdates/kcmsdsummary.cpp8
-rw-r--r--kontact/plugins/specialdates/kcmsdsummary.desktop2
-rw-r--r--kontact/plugins/specialdates/kcmsdsummary.h2
-rw-r--r--kontact/plugins/specialdates/sdsummarywidget.cpp6
-rw-r--r--kontact/plugins/summary/kcmkontactsummary.cpp12
-rw-r--r--kontact/plugins/summary/kcmkontactsummary.desktop2
-rw-r--r--kontact/plugins/summary/kcmkontactsummary.h2
-rw-r--r--kontact/plugins/summary/summaryview_part.cpp6
-rw-r--r--kontact/src/kcmkontact.cpp4
-rw-r--r--kontact/src/kcmkontact.h4
-rw-r--r--kontact/src/kontactconfig.desktop2
-rw-r--r--kontact/src/mainwindow.cpp16
-rw-r--r--kontact/src/mainwindow.h6
-rw-r--r--kontact/src/profilemanager.cpp12
-rw-r--r--kontact/src/profilemanager.h2
-rw-r--r--korganizer/README2
-rw-r--r--korganizer/actionmanager.cpp42
-rw-r--r--korganizer/actionmanager.h8
-rw-r--r--korganizer/calendarview.cpp10
-rw-r--r--korganizer/calendarview.h6
-rw-r--r--korganizer/eventarchiver.cpp8
-rw-r--r--korganizer/freebusymanager.cpp34
-rw-r--r--korganizer/freebusymanager.h8
-rw-r--r--korganizer/interfaces/korganizer/printplugin.h4
-rw-r--r--korganizer/koagenda.h2
-rw-r--r--korganizer/koagendaview.cpp4
-rw-r--r--korganizer/koagendaview.h6
-rw-r--r--korganizer/kodialogmanager.cpp6
-rw-r--r--korganizer/kodialogmanager.h4
-rw-r--r--korganizer/koeditorattachments.cpp10
-rw-r--r--korganizer/koeventviewer.cpp4
-rw-r--r--korganizer/koeventviewer.h4
-rw-r--r--korganizer/koglobals.cpp2
-rw-r--r--korganizer/koglobals.h4
-rw-r--r--korganizer/koincidenceeditor.cpp4
-rw-r--r--korganizer/kolistview.cpp4
-rw-r--r--korganizer/kolistview.h4
-rw-r--r--korganizer/koprefs.cpp6
-rw-r--r--korganizer/koprefs.h2
-rw-r--r--korganizer/koprefsdialog.cpp20
-rw-r--r--korganizer/korgac/alarmdialog.cpp6
-rw-r--r--korganizer/korgac/alarmdockwindow.cpp8
-rw-r--r--korganizer/korgac/koalarmclient.cpp10
-rw-r--r--korganizer/korgac/testalarmdlg.cpp2
-rw-r--r--korganizer/korganizer.cpp10
-rw-r--r--korganizer/korganizer.h6
-rw-r--r--korganizer/korganizer_configcolors.desktop2
-rw-r--r--korganizer/korganizer_configdesignerfields.desktop2
-rw-r--r--korganizer/korganizer_configfonts.desktop2
-rw-r--r--korganizer/korganizer_configfreebusy.desktop2
-rw-r--r--korganizer/korganizer_configgroupautomation.desktop2
-rw-r--r--korganizer/korganizer_configgroupscheduling.desktop2
-rw-r--r--korganizer/korganizer_configmain.desktop2
-rw-r--r--korganizer/korganizer_configplugins.desktop2
-rw-r--r--korganizer/korganizer_configtime.desktop2
-rw-r--r--korganizer/korganizer_configviews.desktop2
-rw-r--r--korganizer/kotodoview.cpp4
-rw-r--r--korganizer/kotodoview.h4
-rw-r--r--korganizer/koviewmanager.cpp10
-rw-r--r--korganizer/koviewmanager.h8
-rw-r--r--korganizer/plugins/datenums/configdialog.cpp4
-rw-r--r--korganizer/plugins/datenums/datenums.cpp2
-rw-r--r--korganizer/plugins/hebrew/configdialog.cpp4
-rw-r--r--korganizer/plugins/hebrew/hebrew.cpp2
-rw-r--r--korganizer/plugins/projectview/koprojectview.cpp6
-rw-r--r--korganizer/plugins/projectview/koprojectview.h2
-rw-r--r--korganizer/plugins/timespanview/kotimespanview.cpp4
-rw-r--r--korganizer/plugins/timespanview/kotimespanview.h4
-rw-r--r--korganizer/previewdialog.cpp12
-rw-r--r--korganizer/printing/calprinter.h6
-rw-r--r--korganizer/printing/calprintpluginbase.cpp4
-rw-r--r--korganizer/stdcalendar.cpp2
-rw-r--r--korganizer/timelabels.h2
-rw-r--r--korn/accountmanager.cpp10
-rw-r--r--korn/accountmanager.h10
-rw-r--r--korn/boxcontainer.cpp4
-rw-r--r--korn/boxcontainer.h14
-rw-r--r--korn/boxcontaineritem.cpp2
-rw-r--r--korn/boxcontaineritem.h6
-rw-r--r--korn/dcop_proto.cpp4
-rw-r--r--korn/dcop_proto.h8
-rw-r--r--korn/dcopdrop.cpp4
-rw-r--r--korn/dcopdrop.h6
-rw-r--r--korn/dockeditem.cpp2
-rw-r--r--korn/dockeditem.h6
-rw-r--r--korn/imap_proto.h6
-rw-r--r--korn/keditlistboxman.cpp2
-rw-r--r--korn/keditlistboxman.h12
-rw-r--r--korn/kio.cpp20
-rw-r--r--korn/kio.h12
-rw-r--r--korn/kio_count.cpp58
-rw-r--r--korn/kio_count.h12
-rw-r--r--korn/kio_delete.cpp40
-rw-r--r--korn/kio_delete.h14
-rw-r--r--korn/kio_proto.cpp2
-rw-r--r--korn/kio_proto.h24
-rw-r--r--korn/kio_read.cpp12
-rw-r--r--korn/kio_read.h8
-rw-r--r--korn/kio_single_subject.cpp26
-rw-r--r--korn/kio_single_subject.h16
-rw-r--r--korn/kio_subjects.cpp12
-rw-r--r--korn/kio_subjects.h6
-rw-r--r--korn/kmail_proto.cpp18
-rw-r--r--korn/kmail_proto.h14
-rw-r--r--korn/kornaccountcfgimpl.cpp2
-rw-r--r--korn/kornaccountcfgimpl.h6
-rw-r--r--korn/kornboxcfg.ui10
-rw-r--r--korn/kornboxcfgimpl.cpp18
-rw-r--r--korn/kornboxcfgimpl.h26
-rw-r--r--korn/korncfg.ui10
-rw-r--r--korn/korncfgimpl.cpp8
-rw-r--r--korn/korncfgimpl.h6
-rw-r--r--korn/kornshell.cpp2
-rw-r--r--korn/kornshell.h4
-rw-r--r--korn/maildir_proto.h8
-rw-r--r--korn/maildrop.cpp6
-rw-r--r--korn/maildrop.h10
-rw-r--r--korn/mbox_proto.h8
-rw-r--r--korn/password.cpp16
-rw-r--r--korn/password.h18
-rw-r--r--korn/polldrop.cpp4
-rw-r--r--korn/polldrop.h4
-rw-r--r--korn/pop3_proto.h6
-rw-r--r--korn/protocol.h8
-rw-r--r--korn/qmail_proto.h2
-rw-r--r--kresources/birthdays/resourcekabc.cpp6
-rw-r--r--kresources/birthdays/resourcekabc.h8
-rw-r--r--kresources/blogging/API_Blog.h24
-rw-r--r--kresources/blogging/API_Blogger.cpp42
-rw-r--r--kresources/blogging/API_Blogger.h24
-rw-r--r--kresources/blogging/bloggingcalendaradaptor.cpp22
-rw-r--r--kresources/blogging/bloggingcalendaradaptor.h24
-rw-r--r--kresources/blogging/kcal_resourceblogging.cpp6
-rw-r--r--kresources/blogging/kcal_resourceblogging.h6
-rw-r--r--kresources/blogging/xmlrpcjob.cpp24
-rw-r--r--kresources/blogging/xmlrpcjob.h8
-rw-r--r--kresources/caldav/preferences.cpp4
-rw-r--r--kresources/caldav/preferences.h2
-rw-r--r--kresources/caldav/resource.cpp6
-rw-r--r--kresources/caldav/resource.h6
-rw-r--r--kresources/carddav/preferences.cpp4
-rw-r--r--kresources/carddav/preferences.h2
-rw-r--r--kresources/carddav/resource.cpp6
-rw-r--r--kresources/carddav/resource.h6
-rw-r--r--kresources/egroupware/kabc_resourcexmlrpc.cpp4
-rw-r--r--kresources/egroupware/kabc_resourcexmlrpc.h6
-rw-r--r--kresources/egroupware/kcal_resourcexmlrpc.cpp6
-rw-r--r--kresources/egroupware/kcal_resourcexmlrpc.h6
-rw-r--r--kresources/egroupware/knotes_resourcexmlrpc.cpp6
-rw-r--r--kresources/egroupware/knotes_resourcexmlrpc.h6
-rw-r--r--kresources/egroupware/synchronizer.h8
-rw-r--r--kresources/egroupware/xmlrpciface.cpp16
-rw-r--r--kresources/egroupware/xmlrpciface.h8
-rw-r--r--kresources/exchange/resourceexchange.cpp4
-rw-r--r--kresources/exchange/resourceexchange.h4
-rw-r--r--kresources/featureplan/kcal_resourcefeatureplan.cpp6
-rw-r--r--kresources/featureplan/kcal_resourcefeatureplan.h6
-rw-r--r--kresources/groupdav/groupdavaddressbookadaptor.h12
-rw-r--r--kresources/groupdav/groupdavcalendaradaptor.h14
-rw-r--r--kresources/groupdav/groupdavglobals.cpp34
-rw-r--r--kresources/groupdav/groupdavglobals.h18
-rw-r--r--kresources/groupdav/kabc_resourcegroupdav.cpp2
-rw-r--r--kresources/groupdav/kabc_resourcegroupdav.h2
-rw-r--r--kresources/groupdav/kcal_resourcegroupdav.cpp2
-rw-r--r--kresources/groupdav/kcal_resourcegroupdav.h2
-rw-r--r--kresources/groupware/kabc_resourcegroupware.cpp24
-rw-r--r--kresources/groupware/kabc_resourcegroupware.h16
-rw-r--r--kresources/groupware/kcal_resourcegroupware.cpp18
-rw-r--r--kresources/groupware/kcal_resourcegroupware.h12
-rw-r--r--kresources/groupwise/kabc_resourcegroupwise.cpp52
-rw-r--r--kresources/groupwise/kabc_resourcegroupwise.h22
-rw-r--r--kresources/groupwise/kcal_resourcegroupwise.cpp20
-rw-r--r--kresources/groupwise/kcal_resourcegroupwise.h12
-rw-r--r--kresources/groupwise/kioslave/groupwise.cpp4
-rw-r--r--kresources/groupwise/kioslave/groupwise.h2
-rw-r--r--kresources/groupwise/soap/groupwiseserver.cpp2
-rw-r--r--kresources/groupwise/soap/ksslsocket.cpp10
-rw-r--r--kresources/groupwise/soap/ksslsocket.h2
-rw-r--r--kresources/kolab/kabc/contact.cpp8
-rw-r--r--kresources/kolab/kabc/resourcekolab.cpp16
-rw-r--r--kresources/kolab/kabc/resourcekolab.h4
-rw-r--r--kresources/kolab/kabc/resourcekolab_plugin.cpp2
-rw-r--r--kresources/kolab/kcal/resourcekolab.cpp18
-rw-r--r--kresources/kolab/kcal/resourcekolab.h6
-rw-r--r--kresources/kolab/kcal/resourcekolab_plugin.cpp2
-rw-r--r--kresources/kolab/knotes/resourcekolab.cpp10
-rw-r--r--kresources/kolab/knotes/resourcekolab.h2
-rw-r--r--kresources/kolab/knotes/resourcekolab_plugin.cpp2
-rw-r--r--kresources/lib/Makefile.am2
-rw-r--r--kresources/lib/davaddressbookadaptor.cpp4
-rw-r--r--kresources/lib/davaddressbookadaptor.h2
-rw-r--r--kresources/lib/davcalendaradaptor.cpp4
-rw-r--r--kresources/lib/davcalendaradaptor.h2
-rw-r--r--kresources/lib/folderlister.cpp16
-rw-r--r--kresources/lib/folderlister.h10
-rw-r--r--kresources/lib/groupwaredataadaptor.cpp36
-rw-r--r--kresources/lib/groupwaredataadaptor.h66
-rw-r--r--kresources/lib/groupwaredownloadjob.cpp26
-rw-r--r--kresources/lib/groupwaredownloadjob.h14
-rw-r--r--kresources/lib/groupwareuploadjob.cpp36
-rw-r--r--kresources/lib/groupwareuploadjob.h18
-rw-r--r--kresources/lib/kabc_resourcegroupwarebase.cpp6
-rw-r--r--kresources/lib/kabc_resourcegroupwarebase.h8
-rw-r--r--kresources/lib/kcal_resourcegroupwarebase.cpp24
-rw-r--r--kresources/lib/kcal_resourcegroupwarebase.h12
-rw-r--r--kresources/newexchange/exchangeaddressbookadaptor.cpp6
-rw-r--r--kresources/newexchange/exchangeaddressbookadaptor.h16
-rw-r--r--kresources/newexchange/exchangecalendaradaptor.cpp18
-rw-r--r--kresources/newexchange/exchangecalendaradaptor.h20
-rw-r--r--kresources/newexchange/exchangeconvertercalendar.cpp8
-rw-r--r--kresources/newexchange/exchangeglobals.cpp30
-rw-r--r--kresources/newexchange/exchangeglobals.h16
-rw-r--r--kresources/newexchange/kabc_resourceexchange.cpp2
-rw-r--r--kresources/newexchange/kabc_resourceexchange.h2
-rw-r--r--kresources/newexchange/kcal_resourceexchange.cpp2
-rw-r--r--kresources/newexchange/kcal_resourceexchange.h2
-rw-r--r--kresources/remote/resourceremote.cpp28
-rw-r--r--kresources/remote/resourceremote.h20
-rw-r--r--kresources/scalix/kabc/resourcescalix.cpp16
-rw-r--r--kresources/scalix/kabc/resourcescalix.h4
-rw-r--r--kresources/scalix/kabc/resourcescalix_plugin.cpp2
-rw-r--r--kresources/scalix/kcal/resourcescalix.cpp18
-rw-r--r--kresources/scalix/kcal/resourcescalix.h6
-rw-r--r--kresources/scalix/kcal/resourcescalix_plugin.cpp2
-rw-r--r--kresources/scalix/kioslave/scalix.cpp34
-rw-r--r--kresources/scalix/kioslave/scalix.h8
-rw-r--r--kresources/scalix/knotes/resourcescalix.cpp10
-rw-r--r--kresources/scalix/knotes/resourcescalix.h2
-rw-r--r--kresources/scalix/knotes/resourcescalix_plugin.cpp2
-rw-r--r--kresources/scalix/scalixadmin/delegatepage.cpp14
-rw-r--r--kresources/scalix/scalixadmin/delegatepage.h6
-rw-r--r--kresources/scalix/scalixadmin/jobs.cpp72
-rw-r--r--kresources/scalix/scalixadmin/jobs.h42
-rw-r--r--kresources/scalix/scalixadmin/otheruserpage.cpp12
-rw-r--r--kresources/scalix/scalixadmin/otheruserpage.h6
-rw-r--r--kresources/scalix/scalixadmin/outofofficepage.cpp8
-rw-r--r--kresources/scalix/scalixadmin/outofofficepage.h4
-rw-r--r--kresources/scalix/scalixadmin/passwordpage.cpp20
-rw-r--r--kresources/scalix/scalixadmin/passwordpage.h6
-rw-r--r--kresources/scalix/scalixadmin/settings.cpp46
-rw-r--r--kresources/scalix/scalixadmin/settings.h6
-rw-r--r--kresources/slox/kabcresourceslox.cpp32
-rw-r--r--kresources/slox/kabcresourceslox.h20
-rw-r--r--kresources/slox/kcalresourceslox.cpp48
-rw-r--r--kresources/slox/kcalresourceslox.h28
-rw-r--r--kresources/slox/sloxaccounts.cpp12
-rw-r--r--kresources/slox/sloxaccounts.h6
-rw-r--r--kresources/slox/sloxfoldermanager.cpp8
-rw-r--r--kresources/slox/sloxfoldermanager.h6
-rw-r--r--kresources/slox/webdavhandler.cpp2
-rw-r--r--kresources/tvanytime/kcal_resourcetvanytime.cpp14
-rw-r--r--kresources/tvanytime/kcal_resourcetvanytime.h10
-rw-r--r--kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp2
-rw-r--r--libemailfunctions/networkstatus.cpp4
-rw-r--r--libkcal/attachmenthandler.cpp10
-rw-r--r--libkcal/calendarnull.h2
-rw-r--r--libkcal/calendarresources.cpp2
-rw-r--r--libkcal/calendarresources.h6
-rw-r--r--libkcal/freebusyurlstore.cpp2
-rw-r--r--libkcal/freebusyurlstore.h4
-rw-r--r--libkcal/resourcecached.cpp6
-rw-r--r--libkcal/resourcecached.h6
-rw-r--r--libkcal/resourcecalendar.cpp4
-rw-r--r--libkcal/resourcecalendar.h4
-rw-r--r--libkcal/resourcelocal.cpp4
-rw-r--r--libkcal/resourcelocal.h8
-rw-r--r--libkcal/resourcelocaldir.cpp6
-rw-r--r--libkcal/resourcelocaldir.h8
-rw-r--r--libkcal/tests/testresource.cpp6
-rw-r--r--libkcal/tests/testresource.h6
-rw-r--r--libkpgp/kpgp.cpp12
-rw-r--r--libkpgp/kpgp.h6
-rw-r--r--libkpgp/kpgpui.cpp10
-rw-r--r--libkpimexchange/configure.in.in2
-rw-r--r--libkpimexchange/core/exchangeaccount.cpp20
-rw-r--r--libkpimexchange/core/exchangeaccount.h2
-rw-r--r--libkpimexchange/core/exchangeclient.cpp2
-rw-r--r--libkpimexchange/core/exchangeclient.h2
-rw-r--r--libkpimexchange/core/exchangedelete.cpp14
-rw-r--r--libkpimexchange/core/exchangedelete.h4
-rw-r--r--libkpimexchange/core/exchangedownload.cpp48
-rw-r--r--libkpimexchange/core/exchangedownload.h8
-rw-r--r--libkpimexchange/core/exchangemonitor.cpp32
-rw-r--r--libkpimexchange/core/exchangemonitor.h8
-rw-r--r--libkpimexchange/core/exchangeupload.cpp30
-rw-r--r--libkpimexchange/core/exchangeupload.h6
-rw-r--r--libkpimidentities/identity.cpp10
-rw-r--r--libkpimidentities/identity.h14
-rw-r--r--libkpimidentities/identitymanager.cpp18
-rw-r--r--libkpimidentities/identitymanager.h10
-rw-r--r--libtdepim/TODO4
-rw-r--r--libtdepim/addresseeemailselection.cpp2
-rw-r--r--libtdepim/addresseelineedit.cpp4
-rw-r--r--libtdepim/addresseelineedit.h2
-rw-r--r--libtdepim/addresseeview.cpp26
-rw-r--r--libtdepim/addresseeview.h12
-rw-r--r--libtdepim/cfgc/README2
-rw-r--r--libtdepim/completionordereditor.cpp6
-rw-r--r--libtdepim/completionordereditor.h4
-rw-r--r--libtdepim/groupwarejob.cpp10
-rw-r--r--libtdepim/groupwarejob.h6
-rw-r--r--libtdepim/kabcresourcecached.cpp8
-rw-r--r--libtdepim/kabcresourcecached.h6
-rw-r--r--libtdepim/kabcresourcenull.h2
-rw-r--r--libtdepim/kaccount.cpp4
-rw-r--r--libtdepim/kaccount.h10
-rw-r--r--libtdepim/kaddrbook.cpp2
-rw-r--r--libtdepim/kcmdesignerfields.cpp8
-rw-r--r--libtdepim/kcmdesignerfields.h2
-rw-r--r--libtdepim/kconfigpropagator.cpp52
-rw-r--r--libtdepim/kconfigpropagator.h26
-rw-r--r--libtdepim/kconfigwizard.cpp48
-rw-r--r--libtdepim/kconfigwizard.h22
-rw-r--r--libtdepim/kfoldertree.cpp6
-rw-r--r--libtdepim/kimportdialog.cpp2
-rw-r--r--libtdepim/komposer/core/prefsmodule.cpp2
-rw-r--r--libtdepim/kpimprefs.cpp4
-rw-r--r--libtdepim/kpimprefs.h2
-rw-r--r--libtdepim/kprefsdialog.cpp88
-rw-r--r--libtdepim/kprefsdialog.h126
-rw-r--r--libtdepim/kresourceprefs.cpp6
-rw-r--r--libtdepim/kresourceprefs.h2
-rw-r--r--libtdepim/ldapclient.cpp36
-rw-r--r--libtdepim/ldapclient.h16
-rw-r--r--libtdepim/ldapsearchdialog.cpp8
-rw-r--r--libtdepim/recentaddresses.cpp12
-rw-r--r--libtdepim/recentaddresses.h10
-rw-r--r--libtdepim/resourceabc.cpp2
-rw-r--r--libtdepim/resourceabc.h2
-rw-r--r--libtdepim/tests/testdistrlist.cpp4
-rw-r--r--libtdepim/tests/testwizard.cpp6
-rw-r--r--plugins/kmail/bodypartformatter/text_vcard.cpp2
-rw-r--r--wizards/egroupwarewizard.cpp30
-rw-r--r--wizards/egroupwarewizard.h2
-rw-r--r--wizards/exchangewizard.cpp24
-rw-r--r--wizards/exchangewizard.h2
-rw-r--r--wizards/groupwisewizard.cpp24
-rw-r--r--wizards/groupwisewizard.h2
-rw-r--r--wizards/kmailchanges.cpp6
-rw-r--r--wizards/kmailchanges.h4
-rw-r--r--wizards/kolabkmailchanges.cpp24
-rw-r--r--wizards/kolabkmailchanges.h2
-rw-r--r--wizards/kolabwizard.cpp26
-rw-r--r--wizards/kolabwizard.h2
-rw-r--r--wizards/scalixkmailchanges.cpp24
-rw-r--r--wizards/scalixkmailchanges.h2
-rw-r--r--wizards/scalixwizard.cpp32
-rw-r--r--wizards/scalixwizard.h2
-rw-r--r--wizards/servertype.h2
-rw-r--r--wizards/sloxwizard.cpp22
-rw-r--r--wizards/sloxwizard.h2
730 files changed, 4105 insertions, 4105 deletions
diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index cab78590..41632adb 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -197,7 +197,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
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(KIO::Job*)), this, TQT_SIGNAL(started(KIO::Job*)));
+ connect(m_view, TQT_SIGNAL(signalStarted(TDEIO::Job*)), this, TQT_SIGNAL(started(TDEIO::Job*)));
connect(m_view, TQT_SIGNAL(signalCompleted()), this, TQT_SIGNAL(completed()));
// notify the part that this is our internal widget
@@ -308,7 +308,7 @@ Part::~Part()
delete m_applyFiltersInterceptor;
}
-void Part::readProperties(KConfig* config)
+void Part::readProperties(TDEConfig* config)
{
m_backedUpList = false;
openStandardFeedList();
@@ -317,7 +317,7 @@ void Part::readProperties(KConfig* config)
m_view->readProperties(config);
}
-void Part::saveProperties(KConfig* config)
+void Part::saveProperties(TDEConfig* config)
{
if (m_view)
{
@@ -619,9 +619,9 @@ void Part::importFile(const KURL& url)
{
isRemote = true;
- if (!KIO::NetAccess::download(url, filename, m_view) )
+ if (!TDEIO::NetAccess::download(url, filename, m_view) )
{
- KMessageBox::error(m_view, KIO::NetAccess::lastErrorString() );
+ KMessageBox::error(m_view, TDEIO::NetAccess::lastErrorString() );
return;
}
}
@@ -640,7 +640,7 @@ void Part::importFile(const KURL& url)
KMessageBox::error(m_view, i18n("The file %1 could not be read, check if it exists or if it is readable for the current user.").arg(filename), i18n("Read Error"));
if (isRemote)
- KIO::NetAccess::removeTempFile(filename);
+ TDEIO::NetAccess::removeTempFile(filename);
}
void Part::exportFile(const KURL& url)
@@ -680,8 +680,8 @@ void Part::exportFile(const KURL& url)
stream << m_view->feedListToOPML().toString() << "\n";
tmpfile.close();
- if (!KIO::NetAccess::upload(tmpfile.name(), url, m_view))
- KMessageBox::error(m_view, KIO::NetAccess::lastErrorString() );
+ if (!TDEIO::NetAccess::upload(tmpfile.name(), url, m_view))
+ KMessageBox::error(m_view, TDEIO::NetAccess::lastErrorString() );
}
}
@@ -780,10 +780,10 @@ void Part::showKNotifyOptions()
void Part::showOptions()
{
- if ( KConfigDialog::showDialog( "settings" ) )
+ if ( TDEConfigDialog::showDialog( "settings" ) )
return;
- KConfigDialog* dialog = new ConfigDialog( m_view, "settings", Settings::self() );
+ TDEConfigDialog* dialog = new ConfigDialog( m_view, "settings", Settings::self() );
connect( dialog, TQT_SIGNAL(settingsChanged()),
this, TQT_SLOT(slotSettingsChanged()) );
@@ -848,10 +848,10 @@ void Part::initFonts()
if (Settings::serifFont().isEmpty())
Settings::setSerifFont(fonts[3]);
- KConfig* conf = Settings::self()->config();
+ TDEConfig* conf = Settings::self()->config();
conf->setGroup("HTML Settings");
- KConfig konq("konquerorrc", true, false);
+ TDEConfig konq("konquerorrc", true, false);
konq.setGroup("HTML Settings");
if (!conf->hasKey("MinimumFontSize"))
diff --git a/akregator/src/akregator_part.h b/akregator/src/akregator_part.h
index 276fb14c..68062a0c 100644
--- a/akregator/src/akregator_part.h
+++ b/akregator/src/akregator_part.h
@@ -38,7 +38,7 @@ class TQDomDocument;
class TQTimer;
class TDEAboutData;
-class KConfig;
+class TDEConfig;
class KURL;
namespace Akregator
@@ -117,17 +117,17 @@ namespace Akregator
virtual void addFeed();
/**
- This method is called when this app is restored. The KConfig
+ This method is called when this app is restored. The TDEConfig
object points to the session management config file that was saved
with @ref saveProperties
Calls AkregatorView's saveProperties.
*/
- virtual void readProperties(KConfig* config);
+ virtual void readProperties(TDEConfig* config);
/** This method is called when it is time for the app to save its
properties for session management purposes.
Calls AkregatorView's readProperties. */
- virtual void saveProperties(KConfig* config);
+ virtual void saveProperties(TDEConfig* config);
/** merges a nested part's GUI into the gui of this part
@return true iff merging was successful, i.e. the GUI factory was not NULL */
diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp
index 605ae738..e1ed5a1d 100644
--- a/akregator/src/akregator_view.cpp
+++ b/akregator/src/akregator_view.cpp
@@ -328,7 +328,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
if ( sp2sizes.count() >= m_articleSplitter->sizes().count() )
m_articleSplitter->setSizes( sp2sizes );
- KConfig *conf = Settings::self()->config();
+ TDEConfig *conf = Settings::self()->config();
conf->setGroup("General");
if(!conf->readBoolEntry("Disable Introduction", false))
{
@@ -1445,7 +1445,7 @@ void View::slotMouseOverInfo(const KFileItem *kifi)
}
}
-void View::readProperties(KConfig* config)
+void View::readProperties(TDEConfig* config)
{
if (!Settings::resetQuickFilterOnNodeChange())
@@ -1474,7 +1474,7 @@ void View::readProperties(KConfig* config)
}
}
-void View::saveProperties(KConfig* config)
+void View::saveProperties(TDEConfig* config)
{
// save filter settings
config->writeEntry("searchLine", m_searchBar->text());
diff --git a/akregator/src/akregator_view.h b/akregator/src/akregator_view.h
index 98950008..939b7aa4 100644
--- a/akregator/src/akregator_view.h
+++ b/akregator/src/akregator_view.h
@@ -42,7 +42,7 @@ class TQHBox;
class TQToolButton;
class TQListViewItem;
class KComboBox;
-class KConfig;
+class TDEConfig;
class KFileItem;
class KLineEdit;
class KListView;
@@ -50,7 +50,7 @@ class KListViewItem;
class KTabWidget;
class Viewer;
-namespace KIO {
+namespace TDEIO {
class Job;
}
@@ -124,8 +124,8 @@ namespace Akregator {
void addFeedToGroup(const TQString& url, const TQString& group);
/** session management **/
- virtual void readProperties(KConfig* config);
- virtual void saveProperties(KConfig* config);
+ virtual void readProperties(TDEConfig* config);
+ virtual void saveProperties(TDEConfig* config);
Frame* currentFrame() const { return m_currentFrame; }
@@ -136,7 +136,7 @@ namespace Akregator {
void setWindowCaption(const TQString&);
void setStatusBarText(const TQString&);
void setProgress(int);
- void signalStarted(KIO::Job*);
+ void signalStarted(TDEIO::Job*);
void signalCompleted();
void signalCanceled(const TQString&);
diff --git a/akregator/src/articlefilter.cpp b/akregator/src/articlefilter.cpp
index 080d61e7..27ecd64e 100644
--- a/akregator/src/articlefilter.cpp
+++ b/akregator/src/articlefilter.cpp
@@ -122,7 +122,7 @@ Criterion::Criterion( Subject subject, Predicate predicate, const TQVariant &obj
}
-void Criterion::writeConfig(KConfig* config) const
+void Criterion::writeConfig(TDEConfig* config) const
{
config->writeEntry(TQString::fromLatin1("subject"), subjectToString(m_subject));
@@ -133,7 +133,7 @@ void Criterion::writeConfig(KConfig* config) const
config->writeEntry(TQString::fromLatin1("objectValue"), m_object);
}
-void Criterion::readConfig(KConfig* config)
+void Criterion::readConfig(TDEConfig* config)
{
m_subject = stringToSubject(config->readEntry(TQString::fromLatin1("subject")));
m_predicate = stringToPredicate(config->readEntry(TQString::fromLatin1("predicate")));
@@ -267,7 +267,7 @@ bool ArticleMatcher::matches( const Article &a ) const
return true;
}
-void ArticleMatcher::writeConfig(KConfig* config) const
+void ArticleMatcher::writeConfig(TDEConfig* config) const
{
config->writeEntry(TQString::fromLatin1("matcherAssociation"), associationToString(m_association));
@@ -283,7 +283,7 @@ void ArticleMatcher::writeConfig(KConfig* config) const
}
}
-void ArticleMatcher::readConfig(KConfig* config)
+void ArticleMatcher::readConfig(TDEConfig* config)
{
m_criteria.clear();
m_association = stringToAssociation(config->readEntry(TQString::fromLatin1("matcherAssociation")));
@@ -406,13 +406,13 @@ TagMatcher::TagMatcher(const TagMatcher& other) : AbstractMatcher(other), d(0)
*this = other;
}
-void TagMatcher::writeConfig(KConfig* config) const
+void TagMatcher::writeConfig(TDEConfig* config) const
{
config->writeEntry(TQString::fromLatin1("matcherType"), TQString::fromLatin1("TagMatcher"));
config->writeEntry(TQString::fromLatin1("matcherParams"), d->tagID);
}
-void TagMatcher::readConfig(KConfig* config)
+void TagMatcher::readConfig(TDEConfig* config)
{
d->tagID = config->readEntry(TQString::fromLatin1("matcherParams"));
}
@@ -462,13 +462,13 @@ void SetStatusAction::setStatus(int status)
m_status = status;
}
-void SetStatusAction::writeConfig(KConfig* config) const
+void SetStatusAction::writeConfig(TDEConfig* config) const
{
config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("SetStatusAction"));
config->writeEntry(TQString::fromLatin1("actionParams"), m_status);
}
-void SetStatusAction::readConfig(KConfig* config)
+void SetStatusAction::readConfig(TDEConfig* config)
{
m_status = config->readNumEntry(TQString::fromLatin1("actionParams"), Article::Read);
}
@@ -579,7 +579,7 @@ bool ArticleFilter::operator==(const ArticleFilter& other) const
return *(d->matcher) == *(other.d->matcher) && *(d->action) == *(other.d->action) && d->name == other.d->name;
}
-void ArticleFilterList::writeConfig(KConfig* config) const
+void ArticleFilterList::writeConfig(TDEConfig* config) const
{
config->setGroup(TQString::fromLatin1("Filters"));
config->writeEntry(TQString::fromLatin1("count"), count());
@@ -592,7 +592,7 @@ void ArticleFilterList::writeConfig(KConfig* config) const
}
}
-void ArticleFilterList::readConfig(KConfig* config)
+void ArticleFilterList::readConfig(TDEConfig* config)
{
clear();
config->setGroup(TQString::fromLatin1("Filters"));
@@ -607,12 +607,12 @@ void ArticleFilterList::readConfig(KConfig* config)
}
-void AssignTagAction::readConfig(KConfig* config)
+void AssignTagAction::readConfig(TDEConfig* config)
{
m_tagID = config->readEntry(TQString::fromLatin1("actionParams"));
}
-void AssignTagAction::writeConfig(KConfig* config) const
+void AssignTagAction::writeConfig(TDEConfig* config) const
{
config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("AssignTagAction"));
config->writeEntry(TQString::fromLatin1("actionParams"), m_tagID);
@@ -638,11 +638,11 @@ void AssignTagAction::setTagID(const TQString& tagID)
m_tagID = tagID;
}
-void DeleteAction::readConfig(KConfig* /*config*/)
+void DeleteAction::readConfig(TDEConfig* /*config*/)
{
}
-void DeleteAction::writeConfig(KConfig* config) const
+void DeleteAction::writeConfig(TDEConfig* config) const
{
config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("DeleteAction"));
}
@@ -654,7 +654,7 @@ bool DeleteAction::operator==(const AbstractAction& other)
return o != 0;
}
-void ArticleFilter::readConfig(KConfig* config)
+void ArticleFilter::readConfig(TDEConfig* config)
{
delete d->matcher;
d->matcher = 0;
@@ -688,7 +688,7 @@ void ArticleFilter::readConfig(KConfig* config)
d->action->readConfig(config);
}
-void ArticleFilter::writeConfig(KConfig* config) const
+void ArticleFilter::writeConfig(TDEConfig* config) const
{
config->writeEntry(TQString::fromLatin1("name"), d->name);
config->writeEntry(TQString::fromLatin1("id"), d->id);
diff --git a/akregator/src/articlefilter.h b/akregator/src/articlefilter.h
index d0bd00e7..5f1e7af3 100644
--- a/akregator/src/articlefilter.h
+++ b/akregator/src/articlefilter.h
@@ -32,7 +32,7 @@
#include <tqvaluelist.h>
#include <tqvariant.h>
-class KConfig;
+class TDEConfig;
namespace Akregator {
@@ -77,8 +77,8 @@ class ArticleFilter
ArticleFilter& operator=(const ArticleFilter& other);
bool operator==(const ArticleFilter& other) const;
- void writeConfig(KConfig* config) const;
- void readConfig(KConfig* config);
+ void writeConfig(TDEConfig* config) const;
+ void readConfig(TDEConfig* config);
private:
class ArticleFilterPrivate;
@@ -90,8 +90,8 @@ class ArticleFilterList : public TQValueList<ArticleFilter>
{
public:
- void writeConfig(KConfig* config) const;
- void readConfig(KConfig* config);
+ void writeConfig(TDEConfig* config) const;
+ void readConfig(TDEConfig* config);
};
/** Abstract base class for matchers, a matcher just takes an article and checks whether the article matches some criterion or not.
@@ -107,8 +107,8 @@ class AbstractMatcher
virtual bool matches(const Article& article) const = 0;
- virtual void writeConfig(KConfig* config) const = 0;
- virtual void readConfig(KConfig* config) = 0;
+ virtual void writeConfig(TDEConfig* config) const = 0;
+ virtual void readConfig(TDEConfig* config) = 0;
virtual bool operator==(const AbstractMatcher&) const = 0;
virtual bool operator!=(const AbstractMatcher &other) const = 0;
@@ -129,8 +129,8 @@ class TagMatcher : public AbstractMatcher
virtual TagMatcher* clone() const;
- virtual void writeConfig(KConfig* config) const;
- virtual void readConfig(KConfig* config);
+ virtual void writeConfig(TDEConfig* config) const;
+ virtual void readConfig(TDEConfig* config);
TagMatcher& operator=(const TagMatcher& other);
virtual bool operator==(const AbstractMatcher&) const;
@@ -147,8 +147,8 @@ class AbstractAction
public:
virtual void exec(Article& article) = 0;
- virtual void writeConfig(KConfig* config) const = 0;
- virtual void readConfig(KConfig* config) = 0;
+ virtual void writeConfig(TDEConfig* config) const = 0;
+ virtual void readConfig(TDEConfig* config) = 0;
virtual AbstractAction* clone() const = 0;
virtual bool operator==(const AbstractAction& other) = 0;
@@ -159,8 +159,8 @@ class DeleteAction : public AbstractAction
public:
virtual void exec(Article& article);
- virtual void writeConfig(KConfig* config) const;
- virtual void readConfig(KConfig* config);
+ virtual void writeConfig(TDEConfig* config) const;
+ virtual void readConfig(TDEConfig* config);
virtual DeleteAction* clone() const { return new DeleteAction; }
virtual bool operator==(const AbstractAction& other);
@@ -176,8 +176,8 @@ class SetStatusAction : public AbstractAction
int status() const;
void setStatus(int status);
- virtual void writeConfig(KConfig* config) const;
- virtual void readConfig(KConfig* config);
+ virtual void writeConfig(TDEConfig* config) const;
+ virtual void readConfig(TDEConfig* config);
virtual SetStatusAction* clone() const { return new SetStatusAction(*this); }
virtual bool operator==(const AbstractAction& other);
@@ -196,8 +196,8 @@ class AssignTagAction : public AbstractAction
const TQString& tagID() const;
void setTagID(const TQString& tagID);
- virtual void writeConfig(KConfig* config) const;
- virtual void readConfig(KConfig* config);
+ virtual void writeConfig(TDEConfig* config) const;
+ virtual void readConfig(TDEConfig* config);
virtual AssignTagAction* clone() const { return new AssignTagAction(*this); }
virtual bool operator==(const AbstractAction& other);
@@ -236,8 +236,8 @@ class ArticleMatcher : public AbstractMatcher
virtual bool operator!=(const AbstractMatcher &other) const;
- virtual void writeConfig(KConfig* config) const;
- virtual void readConfig(KConfig* config);
+ virtual void writeConfig(TDEConfig* config) const;
+ virtual void readConfig(TDEConfig* config);
private:
@@ -280,8 +280,8 @@ class Criterion
bool satisfiedBy( const Article &article ) const;
- virtual void writeConfig(KConfig* config) const;
- virtual void readConfig(KConfig* config);
+ virtual void writeConfig(TDEConfig* config) const;
+ virtual void readConfig(TDEConfig* config);
Subject subject() const;
Predicate predicate() const;
diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp
index b9dee41a..32d931f8 100644
--- a/akregator/src/articleviewer.cpp
+++ b/akregator/src/articleviewer.cpp
@@ -484,7 +484,7 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
//TQString url = article.enclosure().url();
//TQString type = article.enclosure().type();
//int length = article.enclosure().length();
- //TQString lengthStr = KIO::convertSize(length);
+ //TQString lengthStr = TDEIO::convertSize(length);
//text += TQString("<hr><div><a href=\"%1\">%2</a> (%3, %4)</div>").arg(url).arg(url).arg(lengthStr).arg(type);
}
@@ -744,7 +744,7 @@ void ArticleViewer::urlSelected(const TQString &url, int button, int state, cons
{
if(url == "config:/disable_introduction") {
if(KMessageBox::questionYesNo( widget(), i18n("Are you sure you want to disable this introduction page?"), i18n("Disable Introduction Page"), i18n("Disable"), i18n("Keep Enabled") ) == KMessageBox::Yes) {
- KConfig *conf = Settings::self()->config();
+ TDEConfig *conf = Settings::self()->config();
conf->setGroup("General");
conf->writeEntry("Disable Introduction", "true");
}
diff --git a/akregator/src/configdialog.cpp b/akregator/src/configdialog.cpp
index 4c3d4350..b88272b4 100644
--- a/akregator/src/configdialog.cpp
+++ b/akregator/src/configdialog.cpp
@@ -41,7 +41,7 @@
namespace Akregator
{
-ConfigDialog::ConfigDialog(TQWidget* parent, const char* name, KConfigSkeleton* config, DialogType dialogType, int dialogButtons, ButtonCode defaultButton, bool modal) : KConfigDialog(parent, name, config, dialogType, dialogButtons, defaultButton, modal)
+ConfigDialog::ConfigDialog(TQWidget* parent, const char* name, TDEConfigSkeleton* config, DialogType dialogType, int dialogButtons, ButtonCode defaultButton, bool modal) : TDEConfigDialog(parent, name, config, dialogType, dialogButtons, defaultButton, modal)
{
addPage(new SettingsGeneral(this, "General"), i18n("General"), "package_settings");
addPage(new SettingsArchive(this, "Archive"), i18n("Archive"), "package_settings");
@@ -57,7 +57,7 @@ ConfigDialog::ConfigDialog(TQWidget* parent, const char* name, KConfigSkeleton*
void ConfigDialog::updateSettings()
{
Settings::setArchiveBackend(m_settingsAdvanced->selectedFactory());
- KConfigDialog::updateSettings();
+ TDEConfigDialog::updateSettings();
}
void ConfigDialog::updateWidgets()
@@ -67,7 +67,7 @@ void ConfigDialog::updateWidgets()
m_settingsAppearance->slider_mediumFontSize->setDisabled(m_config->isImmutable("MediumFontSize"));
m_settingsAppearance->lbl_MinimumFontSize->setDisabled(m_config->isImmutable("MinimumFontSize"));
m_settingsAppearance->lbl_MediumFontSize->setDisabled(m_config->isImmutable("MediumFontSize"));
- KConfigDialog::updateWidgets();
+ TDEConfigDialog::updateWidgets();
}
ConfigDialog::~ConfigDialog() {}
diff --git a/akregator/src/configdialog.h b/akregator/src/configdialog.h
index a2842c3f..db2161cb 100644
--- a/akregator/src/configdialog.h
+++ b/akregator/src/configdialog.h
@@ -32,13 +32,13 @@ namespace Akregator {
class SettingsAdvanced;
class SettingsAppearance;
-class ConfigDialog : public KConfigDialog
+class ConfigDialog : public TDEConfigDialog
{
Q_OBJECT
public:
- ConfigDialog(TQWidget *parent, const char *name, KConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);
+ ConfigDialog(TQWidget *parent, const char *name, TDEConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);
virtual ~ConfigDialog();
@@ -49,7 +49,7 @@ class ConfigDialog : public KConfigDialog
virtual void updateWidgets();
private:
- KConfigSkeleton* m_config;
+ TDEConfigSkeleton* m_config;
SettingsAdvanced* m_settingsAdvanced;
SettingsAppearance* m_settingsAppearance;
diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp
index baa472fd..14b32522 100644
--- a/akregator/src/frame.cpp
+++ b/akregator/src/frame.cpp
@@ -57,7 +57,7 @@ Frame::Frame(TQObject * parent, KParts::ReadOnlyPart *p, TQWidget *visWidget, co
if (ext)
connect( ext, TQT_SIGNAL(loadingProgress(int)), this, TQT_SLOT(setProgress(int)) );
- connect(p, TQT_SIGNAL(started(KIO::Job*)), this, TQT_SLOT(setStarted()));
+ 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()));
diff --git a/akregator/src/librss/image.cpp b/akregator/src/librss/image.cpp
index cb8d7c86..4dff9822 100644
--- a/akregator/src/librss/image.cpp
+++ b/akregator/src/librss/image.cpp
@@ -32,7 +32,7 @@ struct Image::Private : public Shared
unsigned int height;
unsigned int width;
TQBuffer *pixmapBuffer;
- KIO::Job *job;
+ TDEIO::Job *job;
};
Image::Image() : TQObject(), d(new Private)
@@ -111,18 +111,18 @@ void Image::getPixmap()
d->pixmapBuffer = new TQBuffer;
d->pixmapBuffer->open(IO_WriteOnly);
- d->job = KIO::get(d->url, false, false);
- connect(d->job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
- this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
- connect(d->job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotResult(KIO::Job *)));
+ 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 *)));
}
-void Image::slotData(KIO::Job *, const TQByteArray &data)
+void Image::slotData(TDEIO::Job *, const TQByteArray &data)
{
d->pixmapBuffer->writeBlock(data.data(), data.size());
}
-void Image::slotResult(KIO::Job *job)
+void Image::slotResult(TDEIO::Job *job)
{
TQPixmap pixmap;
if (!job->error())
diff --git a/akregator/src/librss/image.h b/akregator/src/librss/image.h
index 350253b4..ab0cf687 100644
--- a/akregator/src/librss/image.h
+++ b/akregator/src/librss/image.h
@@ -17,7 +17,7 @@
class TQDomNode;
-namespace KIO
+namespace TDEIO
{
class Job;
}
@@ -161,8 +161,8 @@ namespace RSS
void gotPixmap(const TQPixmap &pixmap);
private slots:
- void slotData(KIO::Job *job, const TQByteArray &data);
- void slotResult(KIO::Job *job);
+ void slotData(TDEIO::Job *job, const TQByteArray &data);
+ void slotResult(TDEIO::Job *job);
private:
struct Private;
diff --git a/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp
index 95f75e60..12036ec9 100644
--- a/akregator/src/librss/loader.cpp
+++ b/akregator/src/librss/loader.cpp
@@ -52,7 +52,7 @@ class FileRetriever::Private
TQBuffer *buffer;
int lastError;
- KIO::Job *job;
+ TDEIO::Job *job;
static KStaticDeleter<TQString> userAgentsd;
static TQString* userAgent;
};
@@ -103,7 +103,7 @@ void FileRetriever::retrieveData(const KURL &url)
if (u.protocol()=="feed")
u.setProtocol("http");
- d->job = KIO::get(u, false, false);
+ d->job = TDEIO::get(u, false, false);
d->job->addMetaData("cache", m_useCache ? "refresh" : "reload");
TQString ua = userAgent();
@@ -113,11 +113,11 @@ void FileRetriever::retrieveData(const KURL &url)
TQTimer::singleShot(1000*90, this, TQT_SLOT(slotTimeout()));
- connect(d->job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
- TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
- connect(d->job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotResult(KIO::Job *)));
- connect(d->job, TQT_SIGNAL(permanentRedirection(KIO::Job *, const KURL &, const KURL &)),
- TQT_SLOT(slotPermanentRedirection(KIO::Job *, const KURL &, const KURL &)));
+ 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 &)));
}
void FileRetriever::slotTimeout()
@@ -127,7 +127,7 @@ void FileRetriever::slotTimeout()
delete d->buffer;
d->buffer = NULL;
- d->lastError = KIO::ERR_SERVER_TIMEOUT;
+ d->lastError = TDEIO::ERR_SERVER_TIMEOUT;
emit dataRetrieved(TQByteArray(), false);
}
@@ -137,12 +137,12 @@ int FileRetriever::errorCode() const
return d->lastError;
}
-void FileRetriever::slotData(KIO::Job *, const TQByteArray &data)
+void FileRetriever::slotData(TDEIO::Job *, const TQByteArray &data)
{
d->buffer->writeBlock(data.data(), data.size());
}
-void FileRetriever::slotResult(KIO::Job *job)
+void FileRetriever::slotResult(TDEIO::Job *job)
{
TQByteArray data = d->buffer->buffer();
data.detach();
@@ -154,7 +154,7 @@ void FileRetriever::slotResult(KIO::Job *job)
emit dataRetrieved(data, d->lastError == 0);
}
-void FileRetriever::slotPermanentRedirection(KIO::Job *, const KURL &, const KURL &newUrl)
+void FileRetriever::slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &newUrl)
{
emit permanentRedirection(newUrl);
}
diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h
index 0f463d77..a0c9f29d 100644
--- a/akregator/src/librss/loader.h
+++ b/akregator/src/librss/loader.h
@@ -17,7 +17,7 @@ class KURL;
#include <tqobject.h>
-namespace KIO
+namespace TDEIO
{
class Job;
}
@@ -139,9 +139,9 @@ namespace RSS
void slotTimeout();
private slots:
- void slotData(KIO::Job *job, const TQByteArray &data);
- void slotResult(KIO::Job *job);
- void slotPermanentRedirection(KIO::Job *job, const KURL &fromUrl,
+ void slotData(TDEIO::Job *job, const TQByteArray &data);
+ void slotResult(TDEIO::Job *job);
+ void slotPermanentRedirection(TDEIO::Job *job, const KURL &fromUrl,
const KURL &toUrl);
private:
diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp
index 275a7a91..3e520842 100644
--- a/akregator/src/mainwindow.cpp
+++ b/akregator/src/mainwindow.cpp
@@ -163,7 +163,7 @@ void MainWindow::setupActions()
KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
}
-void MainWindow::saveProperties(KConfig* config)
+void MainWindow::saveProperties(TDEConfig* config)
{
if (!m_part)
loadPart();
@@ -174,7 +174,7 @@ void MainWindow::saveProperties(KConfig* config)
//delete m_part;
}
-void MainWindow::readProperties(KConfig* config)
+void MainWindow::readProperties(TDEConfig* config)
{
if (!m_part)
loadPart();
diff --git a/akregator/src/mainwindow.h b/akregator/src/mainwindow.h
index c076cb33..c7321dbd 100644
--- a/akregator/src/mainwindow.h
+++ b/akregator/src/mainwindow.h
@@ -102,14 +102,14 @@ protected:
* This method is called when it is time for the app to save its
* properties for session management purposes.
*/
- void saveProperties(KConfig *);
+ void saveProperties(TDEConfig *);
/**
- * This method is called when this app is restored. The KConfig
+ * This method is called when this app is restored. The TDEConfig
* object points to the session management config file that was saved
* with @ref saveProperties
*/
- void readProperties(KConfig *);
+ void readProperties(TDEConfig *);
/**
* Reimplemented to save settings
*/
diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp
index 4baef48c..0506906b 100644
--- a/akregator/src/pageviewer.cpp
+++ b/akregator/src/pageviewer.cpp
@@ -144,7 +144,7 @@ PageViewer::PageViewer(TQWidget *parent, const char *name)
connect( this, TQT_SIGNAL(setWindowCaption (const TQString &)),
this, TQT_SLOT(slotSetCaption (const TQString &)) );
- connect(this, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(slotStarted(KIO::Job* )));
+ 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 &)));
@@ -337,7 +337,7 @@ void PageViewer::addHistoryEntry(const KURL& url)
}
// Taken from KDevelop (lib/widgets/kdevhtmlpart.cpp)
-void PageViewer::slotStarted( KIO::Job * )
+void PageViewer::slotStarted( TDEIO::Job * )
{
d->stopAction->setEnabled(true);
}
diff --git a/akregator/src/pageviewer.h b/akregator/src/pageviewer.h
index 352a5914..8b4b59e4 100644
--- a/akregator/src/pageviewer.h
+++ b/akregator/src/pageviewer.h
@@ -63,7 +63,7 @@ namespace Akregator
virtual void slotPaletteOrFontChanged();
- void slotStarted(KIO::Job *);
+ void slotStarted(TDEIO::Job *);
void slotCompleted();
void slotCancelled(const TQString &errMsg);
void slotBackAboutToShow();
diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp
index 153fb8ae..fa62e128 100644
--- a/akregator/src/viewer.cpp
+++ b/akregator/src/viewer.cpp
@@ -57,8 +57,8 @@ Viewer::Viewer(TQWidget *parent, const char *name)
setStatusMessagesEnabled(true);
// change the cursor when loading stuff...
- connect( this, TQT_SIGNAL(started(KIO::Job *)),
- this, TQT_SLOT(slotStarted(KIO::Job *)));
+ connect( this, TQT_SIGNAL(started(TDEIO::Job *)),
+ this, TQT_SLOT(slotStarted(TDEIO::Job *)));
connect( this, TQT_SIGNAL(completed()),
this, TQT_SLOT(slotCompleted()));
@@ -256,7 +256,7 @@ void Viewer::slotSaveLinkAs()
KParts::BrowserRun::simpleSave(tmp, tmp.fileName());
}
-void Viewer::slotStarted(KIO::Job *)
+void Viewer::slotStarted(TDEIO::Job *)
{
widget()->setCursor( waitCursor );
}
diff --git a/akregator/src/viewer.h b/akregator/src/viewer.h
index 41a2250e..e7e0722d 100644
--- a/akregator/src/viewer.h
+++ b/akregator/src/viewer.h
@@ -29,7 +29,7 @@
class KURL;
-namespace KIO
+namespace TDEIO
{
class MetaData;
}
@@ -107,7 +107,7 @@ namespace Akregator
virtual void slotSaveLinkAs();
/** This changes cursor to wait cursor */
- void slotStarted(KIO::Job *);
+ void slotStarted(TDEIO::Job *);
/** This reverts cursor back to normal one */
void slotCompleted();
diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp
index 789f24b0..364c5cd0 100644
--- a/certmanager/certificatewizardimpl.cpp
+++ b/certmanager/certificatewizardimpl.cpp
@@ -129,7 +129,7 @@ CertificateWizardImpl::CertificateWizardImpl( TQWidget* parent, const char* nam
connect( storeUR, TQT_SIGNAL( urlSelected( const TQString& ) ),
this, TQT_SLOT( slotURLSelected( const TQString& ) ) );
- const KConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" );
+ const TDEConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" );
caEmailED->setText( config.readEntry( "CAEmailAddress" ) );
connect( this, TQT_SIGNAL( helpClicked() ),
@@ -337,7 +337,7 @@ void CertificateWizardImpl::createPersonalDataPage()
TQGridLayout* grid = new TQGridLayout( edContainer, 2, 1,
KDialog::marginHint(), KDialog::spacingHint() );
- KConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" );
+ TDEConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" );
TQStringList attrOrder = config.readListEntry( "DNAttributeOrder" );
if ( attrOrder.empty() )
attrOrder << "CN!" << "L" << "OU" << "O!" << "C!" << "EMAIL!";
@@ -477,7 +477,7 @@ void CertificateWizardImpl::accept()
// Save in file/URL
KURL url = saveFileUrl();
bool overwrite = false;
- if ( KIO::NetAccess::exists( url, false /*dest*/, this ) ) {
+ if ( TDEIO::NetAccess::exists( url, false /*dest*/, this ) ) {
if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(
this,
i18n( "A file named \"%1\" already exists. "
@@ -488,10 +488,10 @@ void CertificateWizardImpl::accept()
overwrite = true;
}
- KIO::Job* uploadJob = KIOext::put( _keyData, url, -1, overwrite, false /*resume*/ );
+ TDEIO::Job* uploadJob = KIOext::put( _keyData, url, -1, overwrite, false /*resume*/ );
uploadJob->setWindow( this );
- connect( uploadJob, TQT_SIGNAL( result( KIO::Job* ) ),
- this, TQT_SLOT( slotUploadResult( KIO::Job* ) ) );
+ connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) );
// Can't press finish again during the upload
setFinishEnabled( finishPage, false );
}
@@ -501,7 +501,7 @@ void CertificateWizardImpl::accept()
This slot is invoked by the KIO job used in newCertificate
to save/upload the certificate, when finished (success or error).
*/
-void CertificateWizardImpl::slotUploadResult( KIO::Job* job )
+void CertificateWizardImpl::slotUploadResult( TDEIO::Job* job )
{
if ( job->error() ) {
job->showErrorDialog();
diff --git a/certmanager/certificatewizardimpl.h b/certmanager/certificatewizardimpl.h
index b2256297..9ac52f7a 100644
--- a/certmanager/certificatewizardimpl.h
+++ b/certmanager/certificatewizardimpl.h
@@ -42,7 +42,7 @@
namespace GpgME {
class KeyGenerationResult;
}
-namespace KIO {
+namespace TDEIO {
class Job;
}
@@ -75,7 +75,7 @@ private slots:
void slotHelpClicked();
- void slotUploadResult( KIO::Job* );
+ void slotUploadResult( TDEIO::Job* );
private:
void createPersonalDataPage();
diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index 66f53fe1..7c86e8b2 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -218,7 +218,7 @@ CertManager::~CertManager() {
}
void CertManager::readConfig( bool noQueryGiven ) {
- KConfig config( "kleopatrarc" );
+ TDEConfig config( "kleopatrarc" );
config.setGroup( "Display Options" );
mHierarchicalView = config.readBoolEntry( "hierarchicalView", false );
if ( noQueryGiven ) {
@@ -227,7 +227,7 @@ void CertManager::readConfig( bool noQueryGiven ) {
}
void CertManager::writeConfig() {
- KConfig config( "kleopatrarc" );
+ TDEConfig config( "kleopatrarc" );
config.setGroup( "Display Options" );
config.writeEntry( "hierarchicalView", mKeyListView->hierarchical() );
config.writeEntry( "startInRemoteMode", mNextFindRemote );
@@ -685,10 +685,10 @@ void CertManager::slotImportCertFromFile( const KURL & certURL )
// Download the cert
KIOext::StoredTransferJob* importJob = KIOext::storedGet( certURL );
importJob->setWindow( this );
- connect( importJob, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotImportResult(KIO::Job*)) );
+ connect( importJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotImportResult(TDEIO::Job*)) );
}
-void CertManager::slotImportResult( KIO::Job* job )
+void CertManager::slotImportResult( TDEIO::Job* job )
{
if ( job->error() ) {
job->showErrorDialog();
@@ -904,17 +904,17 @@ void CertManager::importCRLFromFile() {
KTempFile tempFile;
KURL destURL;
destURL.setPath( tempFile.name() );
- KIO::Job* copyJob = KIO::file_copy( url, destURL, 0600, true, false );
+ TDEIO::Job* copyJob = TDEIO::file_copy( url, destURL, 0600, true, false );
copyJob->setWindow( this );
- connect( copyJob, TQT_SIGNAL( result( KIO::Job * ) ),
- TQT_SLOT( slotImportCRLJobFinished( KIO::Job * ) ) );
+ connect( copyJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ TQT_SLOT( slotImportCRLJobFinished( TDEIO::Job * ) ) );
}
}
}
-void CertManager::slotImportCRLJobFinished( KIO::Job *job )
+void CertManager::slotImportCRLJobFinished( TDEIO::Job *job )
{
- KIO::FileCopyJob* fcjob = static_cast<KIO::FileCopyJob*>( job );
+ TDEIO::FileCopyJob* fcjob = static_cast<TDEIO::FileCopyJob*>( job );
TQString tempFilePath = fcjob->destURL().path();
if ( job->error() ) {
job->showErrorDialog();
@@ -1234,7 +1234,7 @@ void CertManager::startCertificateExport( const TQStringList & fingerprints ) {
// return true if we should proceed, false if we should abort
static bool checkOverwrite( const KURL& url, bool& overwrite, TQWidget* w )
{
- if ( KIO::NetAccess::exists( url, false /*dest*/, w ) ) {
+ if ( TDEIO::NetAccess::exists( url, false /*dest*/, w ) ) {
if ( KMessageBox::Cancel ==
KMessageBox::warningContinueCancel(
w,
@@ -1269,10 +1269,10 @@ void CertManager::slotCertificateExportResult( const GpgME::Error & err, const T
if ( !checkOverwrite( url, overwrite, this ) )
return;
- KIO::Job* uploadJob = KIOext::put( data, url, -1, overwrite, false /*resume*/ );
+ TDEIO::Job* uploadJob = KIOext::put( data, url, -1, overwrite, false /*resume*/ );
uploadJob->setWindow( this );
- connect( uploadJob, TQT_SIGNAL( result( KIO::Job* ) ),
- this, TQT_SLOT( slotUploadResult( KIO::Job* ) ) );
+ connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) );
}
@@ -1388,13 +1388,13 @@ void CertManager::slotSecretKeyExportResult( const GpgME::Error & err, const TQB
if ( !checkOverwrite( url, overwrite, this ) )
return;
- KIO::Job* uploadJob = KIOext::put( data, url, -1, overwrite, false /*resume*/ );
+ TDEIO::Job* uploadJob = KIOext::put( data, url, -1, overwrite, false /*resume*/ );
uploadJob->setWindow( this );
- connect( uploadJob, TQT_SIGNAL( result( KIO::Job* ) ),
- this, TQT_SLOT( slotUploadResult( KIO::Job* ) ) );
+ connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) );
}
-void CertManager::slotUploadResult( KIO::Job* job )
+void CertManager::slotUploadResult( TDEIO::Job* job )
{
if ( job->error() )
job->showErrorDialog();
diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h
index 835f408c..2ecc5e9d 100644
--- a/certmanager/certmanager.h
+++ b/certmanager/certmanager.h
@@ -51,7 +51,7 @@ namespace Kleo {
class Job;
}
-namespace KIO {
+namespace TDEIO {
class Job;
}
class TDEProcess;
@@ -99,11 +99,11 @@ private slots:
void slotDeleteCertificate();
void slotExportSecretKey();
void slotExportCertificate();
- void slotUploadResult( KIO::Job* job );
+ void slotUploadResult( TDEIO::Job* job );
void slotImportCertFromFile();
void slotImportCertFromFile( const KURL & filename );
- void slotImportResult( KIO::Job* );
+ void slotImportResult( TDEIO::Job* );
void slotCertificateImportResult( const GpgME::ImportResult & result );
void slotCertificateDownloadResult( const GpgME::Error & error, const TQByteArray & keyData );
@@ -115,7 +115,7 @@ private slots:
void importCRLFromFile();
void importCRLFromLDAP();
- void slotImportCRLJobFinished( KIO::Job * );
+ void slotImportCRLJobFinished( TDEIO::Job * );
void slotDirmngrExited();
void slotStderr( TDEProcess*, char*, int );
diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp
index 9e5d0f74..53030bbd 100644
--- a/certmanager/conf/appearanceconfigpage.cpp
+++ b/certmanager/conf/appearanceconfigpage.cpp
@@ -39,7 +39,7 @@
#include <tdepimmacros.h>
AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, const char * name )
- : KCModule( parent, name )
+ : TDECModule( parent, name )
{
TQVBoxLayout* lay = new TQVBoxLayout( this );
mWidget = new Kleo::AppearanceConfigWidget( this );
@@ -70,7 +70,7 @@ void AppearanceConfigurationPage::defaults()
extern "C"
{
- KDE_EXPORT KCModule *create_kleopatra_config_appear( TQWidget *parent, const char * )
+ KDE_EXPORT TDECModule *create_kleopatra_config_appear( TQWidget *parent, const char * )
{
AppearanceConfigurationPage *page =
new AppearanceConfigurationPage( parent, "kleopatra_config_appear" );
@@ -78,7 +78,7 @@ extern "C"
}
}
-// tdelibs-3.2 didn't have the changed signal in KCModule...
+// tdelibs-3.2 didn't have the changed signal in TDECModule...
void AppearanceConfigurationPage::slotChanged()
{
emit changed(true);
diff --git a/certmanager/conf/appearanceconfigpage.h b/certmanager/conf/appearanceconfigpage.h
index 89c56cfc..9425e1e6 100644
--- a/certmanager/conf/appearanceconfigpage.h
+++ b/certmanager/conf/appearanceconfigpage.h
@@ -41,7 +41,7 @@ namespace Kleo {
/**
* "Appearance" configuration page for kleopatra's configuration dialog
*/
-class AppearanceConfigurationPage : public KCModule {
+class AppearanceConfigurationPage : public TDECModule {
Q_OBJECT
public:
diff --git a/certmanager/conf/appearanceconfigwidget.cpp b/certmanager/conf/appearanceconfigwidget.cpp
index 57a76741..96c0bfff 100644
--- a/certmanager/conf/appearanceconfigwidget.cpp
+++ b/certmanager/conf/appearanceconfigwidget.cpp
@@ -66,7 +66,7 @@ using namespace Kleo;
class CategoryListViewItem : public TQListViewItem
{
public:
- CategoryListViewItem( TQListView* lv, TQListViewItem* prev, const KConfigBase& config )
+ CategoryListViewItem( TQListView* lv, TQListViewItem* prev, const TDEConfigBase& config )
: TQListViewItem( lv, prev ) {
setName( config.readEntry( "Name", i18n("<unnamed>") ) );
@@ -85,7 +85,7 @@ public:
mDirty = false;
}
- void save( KConfigBase& config ) {
+ void save( TDEConfigBase& config ) {
config.writeEntry( "Name", text( 0 ) );
config.writeEntry( "foreground-color", mForegroundColor );
config.writeEntry( "background-color", mBackgroundColor );
@@ -235,19 +235,19 @@ void AppearanceConfigWidget::slotDefaultClicked()
void AppearanceConfigWidget::load()
{
categoriesLV->clear();
- KConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
+ TDEConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
if ( !config )
return;
TQStringList groups = config->groupList().grep( TQRegExp( "^Key Filter #\\d+$" ) );
for ( TQStringList::const_iterator it = groups.begin() ; it != groups.end() ; ++it ) {
- KConfigGroup cfg( config, *it );
+ TDEConfigGroup cfg( config, *it );
(void) new CategoryListViewItem( categoriesLV, categoriesLV->lastItem(), cfg );
}
}
void AppearanceConfigWidget::save()
{
- KConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
+ TDEConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
if ( !config )
return;
// We know (assume) that the groups in the config object haven't changed,
@@ -263,7 +263,7 @@ void AppearanceConfigWidget::save()
TQListViewItemIterator lvit( categoriesLV );
for ( TQStringList::const_iterator it = groups.begin() ; it != groups.end() && lvit.current(); ++it, ++lvit ) {
CategoryListViewItem* item = static_cast<CategoryListViewItem*>(lvit.current() );
- KConfigGroup cfg( config, *it );
+ TDEConfigGroup cfg( config, *it );
item->save( cfg );
}
config->sync();
diff --git a/certmanager/conf/appearanceconfigwidget.h b/certmanager/conf/appearanceconfigwidget.h
index 3840df13..f6ca9c8e 100644
--- a/certmanager/conf/appearanceconfigwidget.h
+++ b/certmanager/conf/appearanceconfigwidget.h
@@ -36,7 +36,7 @@
#include "appearanceconfigwidgetbase.h"
#include <tqstringlist.h>
-class KConfig;
+class TDEConfig;
namespace Kleo {
diff --git a/certmanager/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp
index 57ed0ee4..fde9df9d 100644
--- a/certmanager/conf/configuredialog.cpp
+++ b/certmanager/conf/configuredialog.cpp
@@ -52,7 +52,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
// the KCMultiDialog starts with the size of the first kcm, not
// the largest one. This way at least after the first showing of
// the largest kcm the size is kept.
- const KConfigGroup geometry( TDEGlobal::config(), "Geometry" );
+ const TDEConfigGroup geometry( TDEGlobal::config(), "Geometry" );
const int width = geometry.readNumEntry( "ConfigureDialogWidth" );
const int height = geometry.readNumEntry( "ConfigureDialogHeight" );
if ( width != 0 && height != 0 ) {
@@ -62,7 +62,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
}
void ConfigureDialog::hideEvent( TQHideEvent * ) {
- KConfigGroup geometry( TDEGlobal::config(), "Geometry" );
+ TDEConfigGroup geometry( TDEGlobal::config(), "Geometry" );
geometry.writeEntry( "ConfigureDialogWidth", width() );
geometry.writeEntry( "ConfigureDialogHeight",height() );
}
diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp
index 9d82d86e..40ab0998 100644
--- a/certmanager/conf/dirservconfigpage.cpp
+++ b/certmanager/conf/dirservconfigpage.cpp
@@ -116,7 +116,7 @@ public:
}
private:
- KConfig mConfig;
+ TDEConfig mConfig;
};
#endif
@@ -138,7 +138,7 @@ static const char s_addnewservers_groupName[] = "LDAP";
static const char s_addnewservers_entryName[] = "add-servers";
DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget * parent, const char * name )
- : KCModule( parent, name )
+ : TDECModule( parent, name )
{
mConfig = Kleo::CryptoBackendFactory::instance()->config();
TQVBoxLayout* lay = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
@@ -259,7 +259,7 @@ void DirectoryServicesConfigurationPage::defaults()
extern "C"
{
- KDE_EXPORT KCModule *create_kleopatra_config_dirserv( TQWidget *parent, const char * )
+ KDE_EXPORT TDECModule *create_kleopatra_config_dirserv( TQWidget *parent, const char * )
{
DirectoryServicesConfigurationPage *page =
new DirectoryServicesConfigurationPage( parent, "kleopatra_config_dirserv" );
@@ -267,7 +267,7 @@ extern "C"
}
}
-// tdelibs-3.2 didn't have the changed signal in KCModule...
+// tdelibs-3.2 didn't have the changed signal in TDECModule...
void DirectoryServicesConfigurationPage::slotChanged()
{
emit changed(true);
diff --git a/certmanager/conf/dirservconfigpage.h b/certmanager/conf/dirservconfigpage.h
index c5ebcad1..536cf76e 100644
--- a/certmanager/conf/dirservconfigpage.h
+++ b/certmanager/conf/dirservconfigpage.h
@@ -50,7 +50,7 @@ namespace Kleo {
* The user can configure LDAP servers in this page, to be used for listing/fetching
* remote certificates in kleopatra.
*/
-class KDE_EXPORT DirectoryServicesConfigurationPage : public KCModule {
+class KDE_EXPORT DirectoryServicesConfigurationPage : public TDECModule {
Q_OBJECT
public:
diff --git a/certmanager/conf/dnorderconfigpage.cpp b/certmanager/conf/dnorderconfigpage.cpp
index a224b6f7..a802a06f 100644
--- a/certmanager/conf/dnorderconfigpage.cpp
+++ b/certmanager/conf/dnorderconfigpage.cpp
@@ -39,7 +39,7 @@
#include <tqlayout.h>
DNOrderConfigPage::DNOrderConfigPage( TQWidget * parent, const char * name )
- : KCModule( parent, name )
+ : TDECModule( parent, name )
{
TQVBoxLayout * vlay = new TQVBoxLayout( this );
mWidget = Kleo::DNAttributeMapper::instance()->configWidget( this, "mWidget" );
@@ -65,12 +65,12 @@ void DNOrderConfigPage::defaults() {
mWidget->defaults();
}
-// tdelibs-3.2 didn't have the changed signal in KCModule...
+// tdelibs-3.2 didn't have the changed signal in TDECModule...
void DNOrderConfigPage::slotChanged() {
emit changed(true);
}
-extern "C" KDE_EXPORT KCModule * create_kleopatra_config_dnorder( TQWidget * parent, const char * ) {
+extern "C" KDE_EXPORT TDECModule * create_kleopatra_config_dnorder( TQWidget * parent, const char * ) {
return new DNOrderConfigPage( parent, "kleopatra_config_dnorder" );
}
diff --git a/certmanager/conf/dnorderconfigpage.h b/certmanager/conf/dnorderconfigpage.h
index b053c5cb..b183b1f2 100644
--- a/certmanager/conf/dnorderconfigpage.h
+++ b/certmanager/conf/dnorderconfigpage.h
@@ -41,7 +41,7 @@ namespace Kleo {
/**
* "DN Order" configuration page for kleopatra's configuration dialog
*/
-class DNOrderConfigPage : public KCModule {
+class DNOrderConfigPage : public TDECModule {
Q_OBJECT
public:
diff --git a/certmanager/conf/kleopatra_config_appear.desktop b/certmanager/conf/kleopatra_config_appear.desktop
index 1fb2cc71..b0ee2ac7 100644
--- a/certmanager/conf/kleopatra_config_appear.desktop
+++ b/certmanager/conf/kleopatra_config_appear.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=looknfeel
Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
DocPath=kleopatra/configuration-appearance.html
X-TDE-ModuleType=Library
diff --git a/certmanager/conf/kleopatra_config_dirserv.desktop b/certmanager/conf/kleopatra_config_dirserv.desktop
index f645cffb..33e65a7a 100644
--- a/certmanager/conf/kleopatra_config_dirserv.desktop
+++ b/certmanager/conf/kleopatra_config_dirserv.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=network
Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
DocPath=kleopatra/configuration.html#configuration-directory-services
X-TDE-ModuleType=Library
diff --git a/certmanager/conf/kleopatra_config_dnorder.desktop b/certmanager/conf/kleopatra_config_dnorder.desktop
index beec7945..f77761ac 100644
--- a/certmanager/conf/kleopatra_config_dnorder.desktop
+++ b/certmanager/conf/kleopatra_config_dnorder.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=looknfeel
Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
DocPath=kleopatra/configuration-dn-order.html
X-TDE-ModuleType=Library
diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
index 5a49f134..200175b2 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
@@ -157,7 +157,7 @@ void KWatchGnuPGConfig::slotSetHistorySizeUnlimited() {
void KWatchGnuPGConfig::loadConfig()
{
- KConfig* config = kapp->config();
+ TDEConfig* config = kapp->config();
config->setGroup("WatchGnuPG");
mExeED->setURL( config->readEntry( "Executable", "watchgnupg" ) );
mSocketED->setURL( config->readEntry( "Socket", TQDir::home().canonicalPath()
@@ -175,7 +175,7 @@ void KWatchGnuPGConfig::loadConfig()
void KWatchGnuPGConfig::saveConfig()
{
- KConfig* config = kapp->config();
+ TDEConfig* config = kapp->config();
config->setGroup("WatchGnuPG");
config->writeEntry( "Executable", mExeED->url() );
config->writeEntry( "Socket", mSocketED->url() );
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
index 24264319..9bcd0b39 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
@@ -138,7 +138,7 @@ void KWatchGnuPGMainWindow::startWatcher()
.arg( TQDateTime::currentDateTime().toString(Qt::ISODate)));
}
mWatcher->clearArguments();
- KConfig* config = kapp->config();
+ TDEConfig* config = kapp->config();
config->setGroup("WatchGnuPG");
*mWatcher << config->readEntry("Executable", WATCHGNUPGBINARY);
*mWatcher << "--force";
@@ -162,7 +162,7 @@ void KWatchGnuPGMainWindow::setGnuPGConfig()
if ( !cconfig )
return;
//Q_ASSERT( cconfig );
- KConfig* config = kapp->config();
+ TDEConfig* config = kapp->config();
config->setGroup("WatchGnuPG");
TQStringList comps = cconfig->componentList();
for( TQStringList::const_iterator it = comps.begin(); it != comps.end(); ++it ) {
@@ -270,7 +270,7 @@ void KWatchGnuPGMainWindow::slotConfigure()
void KWatchGnuPGMainWindow::slotReadConfig()
{
- KConfig* config = kapp->config();
+ TDEConfig* config = kapp->config();
config->setGroup("LogWindow");
mCentralWidget->setWordWrap( config->readBoolEntry("WordWrap", false)
?TQTextEdit::WidgetWidth
diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
index b3e75140..da875e30 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
@@ -197,13 +197,13 @@ namespace {
TQVariant value() const { return mValue; }
- void sync( KConfigBase * config ) {
+ void sync( TDEConfigBase * config ) {
if ( !mDirty )
return;
mDirty = false;
config->writeEntry( kleo_chiasmus_config_entries[mIdx].name, mValue );
}
- void read( const KConfigBase * config ) {
+ void read( const TDEConfigBase * config ) {
mDirty = false;
mValue = config->readPropertyEntry( kleo_chiasmus_config_entries[mIdx].name, defaultValue() );
}
@@ -254,7 +254,7 @@ namespace {
class ChiasmusGeneralGroup : public Kleo::CryptoConfigGroup {
mutable std::map<TQString,ChiasmusConfigEntry*> mCache;
- mutable KConfig * mConfigObject;
+ mutable TDEConfig * mConfigObject;
public:
ChiasmusGeneralGroup() : Kleo::CryptoConfigGroup(), mConfigObject( 0 ) {}
~ChiasmusGeneralGroup() { clear(); delete mConfigObject; }
@@ -271,7 +271,7 @@ namespace {
Kleo::CryptoConfigEntry * entry( const TQString & name ) const {
if ( ChiasmusConfigEntry * entry = mCache[name] )
return entry;
- const KConfigGroup group( configObject(), "Chiasmus" );
+ const TDEConfigGroup group( configObject(), "Chiasmus" );
for ( unsigned int i = 0 ; i < kleo_chiasmus_config_entries_dim ; ++i )
if ( name == kleo_chiasmus_config_entries[i].name ) {
ChiasmusConfigEntry * entry = new ChiasmusConfigEntry( i );
@@ -282,17 +282,17 @@ namespace {
}
void sync() {
- KConfigGroup group( configObject(), "Chiasmus" );
+ TDEConfigGroup group( configObject(), "Chiasmus" );
for ( std::map<TQString,ChiasmusConfigEntry*>::const_iterator it = mCache.begin(), end = mCache.end() ; it != end ; ++it )
it->second->sync( &group );
group.sync();
clear();
}
private:
- KConfig * configObject() const {
+ TDEConfig * configObject() const {
if ( !mConfigObject )
// this is unsafe. We're a lib, used by concurrent apps.
- mConfigObject = new KConfig( "chiasmusbackendrc" );
+ mConfigObject = new TDEConfig( "chiasmusbackendrc" );
return mConfigObject;
}
void clear() {
diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp
index 6f07c954..f997e930 100644
--- a/certmanager/lib/cryptplugwrapper.cpp
+++ b/certmanager/lib/cryptplugwrapper.cpp
@@ -133,7 +133,7 @@ public:
_unknownAttrsHandling = unknownAttrsInfix;
_unknownAttrsHandlingChar = "INFIX";
}
- DNBeautifier( KConfig* config,
+ DNBeautifier( TDEConfig* config,
const TQString& cfgGroup,
const TQString& cfgAttributeOrderEntry,
const TQString& cfgUnknownAttrsEntry,
diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h
index bf197670..39fd680a 100644
--- a/certmanager/lib/cryptplugwrapper.h
+++ b/certmanager/lib/cryptplugwrapper.h
@@ -57,7 +57,7 @@
#include <tdepimmacros.h>
-class KConfigBase;
+class TDEConfigBase;
class QGpgMECryptoConfig;
namespace GpgME {
diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp
index 295c05c6..f67343ca 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.cpp
+++ b/certmanager/lib/kleo/cryptobackendfactory.cpp
@@ -178,10 +178,10 @@ Kleo::BackendConfigWidget * Kleo::CryptoBackendFactory::configWidget( TQWidget *
return new Kleo::BackendConfigWidget( mSelf, parent, name );
}
-KConfig* Kleo::CryptoBackendFactory::configObject() const {
+TDEConfig* Kleo::CryptoBackendFactory::configObject() const {
if ( !mConfigObject )
// this is unsafe. We're a lib, used by concurrent apps.
- mConfigObject = new KConfig( "libkleopatrarc" );
+ mConfigObject = new TDEConfig( "libkleopatrarc" );
return mConfigObject;
}
@@ -195,7 +195,7 @@ void Kleo::CryptoBackendFactory::setOpenPGPBackend( const CryptoBackend* backend
void Kleo::CryptoBackendFactory::setProtocolBackend( const char * protocol, const CryptoBackend * backend ) {
const TQString name = backend ? backend->name() : TQString() ;
- KConfigGroup group( configObject(), "Backends" );
+ TDEConfigGroup group( configObject(), "Backends" );
group.writeEntry( protocol, name );
configObject()->sync();
mBackends[protocol] = backend;
@@ -218,7 +218,7 @@ static const char * defaultBackend( const char * proto ) {
void Kleo::CryptoBackendFactory::readConfig() {
mBackends.clear();
- const KConfigGroup group( configObject(), "Backends" );
+ const TDEConfigGroup group( configObject(), "Backends" );
for ( ProtocolSet::const_iterator it = mAvailableProtocols.begin(), end = mAvailableProtocols.end() ; it != end ; ++it ) {
const TQString backend = group.readEntry( *it, defaultBackend( *it ) );
mBackends[*it] = backendByName( backend );
diff --git a/certmanager/lib/kleo/cryptobackendfactory.h b/certmanager/lib/kleo/cryptobackendfactory.h
index da1743f9..09012da3 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.h
+++ b/certmanager/lib/kleo/cryptobackendfactory.h
@@ -46,7 +46,7 @@ namespace Kleo {
}
class TQString;
-class KConfig;
+class TDEConfig;
namespace Kleo {
@@ -76,7 +76,7 @@ namespace Kleo {
Kleo::BackendConfigWidget * configWidget( TQWidget * parent=0, const char * name=0 ) const;
- KConfig* configObject() const;
+ TDEConfig* configObject() const;
// The preferred backend for smime (can be 0) - currently unused
//const CryptoBackend* smimeBackend() const;
@@ -97,7 +97,7 @@ namespace Kleo {
protected:
std::vector<CryptoBackend*> mBackendList;
- mutable KConfig* mConfigObject;
+ mutable TDEConfig* mConfigObject;
typedef std::map<const char *, const CryptoBackend*, lt_i_str> BackendMap;
BackendMap mBackends;
typedef std::vector<const char *> ProtocolSet;
diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp
index 774302ba..3249cc73 100644
--- a/certmanager/lib/kleo/dn.cpp
+++ b/certmanager/lib/kleo/dn.cpp
@@ -484,7 +484,7 @@ Kleo::DNAttributeMapper::Private::Private()
Kleo::DNAttributeMapper::DNAttributeMapper() {
d = new Private();
- const KConfigGroup config( kapp->config(), "DN" );
+ const TDEConfigGroup config( kapp->config(), "DN" );
d->attributeOrder = config.readListEntry( "AttributeOrder" );
if ( d->attributeOrder.empty() )
std::copy( defaultOrder, defaultOrder + sizeof defaultOrder / sizeof *defaultOrder,
@@ -529,7 +529,7 @@ void Kleo::DNAttributeMapper::setAttributeOrder( const TQStringList & order ) {
if ( order.empty() )
std::copy( defaultOrder, defaultOrder + sizeof defaultOrder / sizeof *defaultOrder,
std::back_inserter( d->attributeOrder ) );
- KConfigGroup config( kapp->config(), "DN" );
+ TDEConfigGroup config( kapp->config(), "DN" );
config.writeEntry( "AttributeOrder", order );
}
diff --git a/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp b/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp
index 47e1548e..4ed6ab37 100644
--- a/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp
+++ b/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp
@@ -67,7 +67,7 @@ static GpgME::UserID::Validity map2Validity( const TQString & s ) {
}
-Kleo::KConfigBasedKeyFilter::KConfigBasedKeyFilter( const KConfigBase & config )
+Kleo::TDEConfigBasedKeyFilter::TDEConfigBasedKeyFilter( const TDEConfigBase & config )
: KeyFilter(),
mSpecificity( 0 ),
mItalic( false ),
@@ -151,11 +151,11 @@ Kleo::KConfigBasedKeyFilter::KConfigBasedKeyFilter( const KConfigBase & config )
}
}
-Kleo::KConfigBasedKeyFilter::~KConfigBasedKeyFilter() {
+Kleo::TDEConfigBasedKeyFilter::~TDEConfigBasedKeyFilter() {
}
-bool Kleo::KConfigBasedKeyFilter::matches( const GpgME::Key & key ) const {
+bool Kleo::TDEConfigBasedKeyFilter::matches( const GpgME::Key & key ) const {
#ifdef MATCH
#undef MATCH
#endif
@@ -243,7 +243,7 @@ static inline TQFont adapt( TQFont font, bool it, bool b, bool strike ) {
return font;
}
-TQFont Kleo::KConfigBasedKeyFilter::font( const TQFont & f ) const {
+TQFont Kleo::TDEConfigBasedKeyFilter::font( const TQFont & f ) const {
if ( mUseFullFont )
return resizedFont( mFont, f.pointSize(), mStrikeOut );
else
diff --git a/certmanager/lib/kleo/kconfigbasedkeyfilter.h b/certmanager/lib/kleo/kconfigbasedkeyfilter.h
index 98050cc6..487b3791 100644
--- a/certmanager/lib/kleo/kconfigbasedkeyfilter.h
+++ b/certmanager/lib/kleo/kconfigbasedkeyfilter.h
@@ -41,14 +41,14 @@
#include <gpgmepp/key.h>
-class KConfigBase;
+class TDEConfigBase;
namespace Kleo {
- class KConfigBasedKeyFilter : public KeyFilter {
+ class TDEConfigBasedKeyFilter : public KeyFilter {
public:
- explicit KConfigBasedKeyFilter( const KConfigBase & config );
- ~KConfigBasedKeyFilter();
+ explicit TDEConfigBasedKeyFilter( const TDEConfigBase & config );
+ ~TDEConfigBasedKeyFilter();
bool matches( const GpgME::Key & key ) const;
unsigned int specificity() const { return mSpecificity; }
diff --git a/certmanager/lib/kleo/keyfiltermanager.cpp b/certmanager/lib/kleo/keyfiltermanager.cpp
index 6edc7c57..1276f9fd 100644
--- a/certmanager/lib/kleo/keyfiltermanager.cpp
+++ b/certmanager/lib/kleo/keyfiltermanager.cpp
@@ -104,13 +104,13 @@ static inline bool by_increasing_specificity( const Kleo::KeyFilter * left, cons
void Kleo::KeyFilterManager::reload() {
d->clear();
- KConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
+ TDEConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
if ( !config )
return;
const TQStringList groups = config->groupList().grep( TQRegExp( "^Key Filter #\\d+$" ) );
for ( TQStringList::const_iterator it = groups.begin() ; it != groups.end() ; ++it ) {
- const KConfigGroup cfg( config, *it );
- d->filters.push_back( new KConfigBasedKeyFilter( cfg ) );
+ const TDEConfigGroup cfg( config, *it );
+ d->filters.push_back( new TDEConfigBasedKeyFilter( cfg ) );
}
std::stable_sort( d->filters.begin(), d->filters.end(), by_increasing_specificity );
}
diff --git a/certmanager/lib/ui/cryptoconfigmodule.h b/certmanager/lib/ui/cryptoconfigmodule.h
index 4d5042f5..2902423c 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.h
+++ b/certmanager/lib/ui/cryptoconfigmodule.h
@@ -43,7 +43,7 @@ namespace Kleo {
/**
* Crypto Config Module widget, dynamically generated from CryptoConfig
- * It's a simple TQWidget so that it can be embedded into a dialog or into a KCModule.
+ * It's a simple TQWidget so that it can be embedded into a dialog or into a TDECModule.
*/
class CryptoConfigModule : public KJanusWidget {
Q_OBJECT
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index 35a97611..adb25749 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -449,14 +449,14 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection
KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() );
TQSize dialogSize( 500, 400 );
- KConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" );
+ TDEConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" );
dialogSize = dialogConfig.readSizeEntry( "Dialog size", &dialogSize );
resize( dialogSize );
}
}
Kleo::KeySelectionDialog::~KeySelectionDialog() {
- KConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" );
+ TDEConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" );
dialogConfig.writeEntry( "Dialog size", size() );
dialogConfig.sync();
}
diff --git a/certmanager/storedtransferjob.cpp b/certmanager/storedtransferjob.cpp
index fd9e601b..e2e9ea95 100644
--- a/certmanager/storedtransferjob.cpp
+++ b/certmanager/storedtransferjob.cpp
@@ -19,7 +19,7 @@
#include "storedtransferjob.h"
-using namespace KIOext;
+using namespace TDEIOext;
#define KIO_ARGS TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream
@@ -27,13 +27,13 @@ StoredTransferJob::StoredTransferJob(const KURL& url, int command,
const TQByteArray &packedArgs,
const TQByteArray &_staticData,
bool showProgressInfo)
- : KIO::TransferJob( url, command, packedArgs, _staticData, showProgressInfo ),
+ : TDEIO::TransferJob( url, command, packedArgs, _staticData, showProgressInfo ),
m_uploadOffset( 0 )
{
- connect( this, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotData( KIO::Job *, const TQByteArray & ) ) );
- connect( this, TQT_SIGNAL( dataReq( KIO::Job *, TQByteArray & ) ),
- TQT_SLOT( slotDataReq( KIO::Job *, TQByteArray & ) ) );
+ 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 & ) ) );
}
void StoredTransferJob::setData( const TQByteArray& arr )
@@ -43,7 +43,7 @@ void StoredTransferJob::setData( const TQByteArray& arr )
m_data = arr;
}
-void StoredTransferJob::slotData( KIO::Job *, const TQByteArray &data )
+void StoredTransferJob::slotData( TDEIO::Job *, const TQByteArray &data )
{
// check for end-of-data marker:
if ( data.size() == 0 )
@@ -53,7 +53,7 @@ void StoredTransferJob::slotData( KIO::Job *, const TQByteArray &data )
memcpy( m_data.data() + oldSize, data.data(), data.size() );
}
-void StoredTransferJob::slotDataReq( KIO::Job *, TQByteArray &data )
+void StoredTransferJob::slotDataReq( TDEIO::Job *, TQByteArray &data )
{
// Inspired from kmail's KMKernel::byteArrayToRemoteFile
// send the data in 64 KB chunks
@@ -80,7 +80,7 @@ StoredTransferJob *KIOext::storedGet( const KURL& url, bool reload, bool showPro
{
// Send decoded path and encoded query
KIO_ARGS << url;
- StoredTransferJob * job = new StoredTransferJob( url, KIO::CMD_GET, packedArgs, TQByteArray(), showProgressInfo );
+ StoredTransferJob * job = new StoredTransferJob( url, TDEIO::CMD_GET, packedArgs, TQByteArray(), showProgressInfo );
if (reload)
job->addMetaData("cache", "reload");
return job;
@@ -90,7 +90,7 @@ StoredTransferJob *KIOext::put( const TQByteArray& arr, const KURL& url, int per
bool overwrite, bool resume, bool showProgressInfo )
{
KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions;
- StoredTransferJob * job = new StoredTransferJob( url, KIO::CMD_PUT, packedArgs, TQByteArray(), showProgressInfo );
+ StoredTransferJob * job = new StoredTransferJob( url, TDEIO::CMD_PUT, packedArgs, TQByteArray(), showProgressInfo );
job->setData( arr );
return job;
}
diff --git a/certmanager/storedtransferjob.h b/certmanager/storedtransferjob.h
index ddc687fc..7fab7706 100644
--- a/certmanager/storedtransferjob.h
+++ b/certmanager/storedtransferjob.h
@@ -23,28 +23,28 @@
#include <kio/job.h>
// To be moved to KIO?
-namespace KIOext {
+namespace TDEIOext {
/**
* StoredTransferJob is a TransferJob (for downloading or uploading data) that
* also stores a TQByteArray with the data, making it simpler to use than the
* standard TransferJob.
*
- * For KIO::get it puts the data into the member TQByteArray, so the user
+ * For TDEIO::get it puts the data into the member TQByteArray, so the user
* of this class can get hold of the whole data at once by calling data()
* when the result signal is emitted.
* You should only use StoredTransferJob to download data if you cannot
* process the data by chunks while it's being downloaded, since storing
* everything in a TQByteArray can potentially require a lot of memory.
*
- * For KIO::put the user of this class simply provides the bytearray from
+ * For TDEIO::put the user of this class simply provides the bytearray from
* the start, and the job takes care of uploading it.
* You should only use StoredTransferJob to upload data if you cannot
* provide the in chunks while it's being uploaded, since storing
* everything in a TQByteArray can potentially require a lot of memory.
*
*/
-class StoredTransferJob : public KIO::TransferJob {
+class StoredTransferJob : public TDEIO::TransferJob {
Q_OBJECT
@@ -76,8 +76,8 @@ public:
TQByteArray data() const { return m_data; }
private slots:
- void slotData( KIO::Job *job, const TQByteArray &data );
- void slotDataReq( KIO::Job *job, TQByteArray &data );
+ void slotData( TDEIO::Job *job, const TQByteArray &data );
+ void slotDataReq( TDEIO::Job *job, TQByteArray &data );
private:
TQByteArray m_data;
int m_uploadOffset;
diff --git a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
index d8f5e996..99d7080d 100644
--- a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
+++ b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
@@ -85,7 +85,7 @@ int main( int argc, char **argv )
if ( args->isSet( "disable-autostart" ) ) {
kdDebug() << "Disable autostart." << endl;
- KConfig *config = app.config();
+ TDEConfig *config = app.config();
config->setGroup( "Startup" );
config->writeEntry( "EnableAutostart", false );
}
diff --git a/kaddressbook/addresseeconfig.cpp b/kaddressbook/addresseeconfig.cpp
index 98495c41..81f5ceef 100644
--- a/kaddressbook/addresseeconfig.cpp
+++ b/kaddressbook/addresseeconfig.cpp
@@ -48,7 +48,7 @@ Addressee AddresseeConfig::addressee()
void AddresseeConfig::setAutomaticNameParsing( bool value )
{
- KConfig config( "kaddressbook_addrconfig" );
+ TDEConfig config( "kaddressbook_addrconfig" );
config.setGroup( mAddressee.uid() );
config.writeEntry( "AutomaticNameParsing", value );
config.sync();
@@ -56,7 +56,7 @@ void AddresseeConfig::setAutomaticNameParsing( bool value )
bool AddresseeConfig::automaticNameParsing()
{
- KConfig config( "kaddressbook_addrconfig" );
+ TDEConfig config( "kaddressbook_addrconfig" );
config.setGroup( mAddressee.uid() );
return config.readBoolEntry( "AutomaticNameParsing",
KABPrefs::instance()->automaticNameParsing() );
@@ -64,7 +64,7 @@ bool AddresseeConfig::automaticNameParsing()
void AddresseeConfig::setNoDefaultAddrTypes( const TQValueList<int> &types )
{
- KConfig config( "kaddressbook_addrconfig" );
+ TDEConfig config( "kaddressbook_addrconfig" );
config.setGroup( mAddressee.uid() );
config.writeEntry( "NoDefaultAddrTypes", types );
config.sync();
@@ -72,14 +72,14 @@ void AddresseeConfig::setNoDefaultAddrTypes( const TQValueList<int> &types )
TQValueList<int> AddresseeConfig::noDefaultAddrTypes() const
{
- KConfig config( "kaddressbook_addrconfig" );
+ TDEConfig config( "kaddressbook_addrconfig" );
config.setGroup( mAddressee.uid() );
return config.readIntListEntry( "NoDefaultAddrTypes" );
}
void AddresseeConfig::setCustomFields( const TQStringList &fields )
{
- KConfig config( "kaddressbook_addrconfig" );
+ TDEConfig config( "kaddressbook_addrconfig" );
config.setGroup( mAddressee.uid() );
config.writeEntry( "LocalCustomFields", fields );
config.sync();
@@ -87,13 +87,13 @@ void AddresseeConfig::setCustomFields( const TQStringList &fields )
TQStringList AddresseeConfig::customFields() const
{
- KConfig config( "kaddressbook_addrconfig" );
+ TDEConfig config( "kaddressbook_addrconfig" );
config.setGroup( mAddressee.uid() );
return config.readListEntry( "LocalCustomFields" );
}
void AddresseeConfig::remove()
{
- KConfig config( "kaddressbook_addrconfig" );
+ TDEConfig config( "kaddressbook_addrconfig" );
config.deleteGroup( mAddressee.uid() );
}
diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp
index cbb60bd2..d203e4dd 100644
--- a/kaddressbook/addresseeeditordialog.cpp
+++ b/kaddressbook/addresseeeditordialog.cpp
@@ -60,7 +60,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core,
enableButton( KDialogBase::Apply, false );
- KConfig config( "kaddressbookrc" );
+ TDEConfig config( "kaddressbookrc" );
config.setGroup( "AddresseeEditor" );
TQSize defaultSize( 750, 570 );
resize( config.readSizeEntry( "Size", &defaultSize ) );
@@ -70,7 +70,7 @@ AddresseeEditorDialog::~AddresseeEditorDialog()
{
kdDebug(5720) << "~AddresseeEditorDialog()" << endl;
- KConfig config( "kaddressbookrc" );
+ TDEConfig config( "kaddressbookrc" );
config.setGroup( "AddresseeEditor" );
config.writeEntry( "Size", size() );
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index b875c99a..e4cd5a3a 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -519,7 +519,7 @@ void AddresseeEditorWidget::load()
mNameEdit->blockSignals( false );
if ( mAddressee.formattedName().isEmpty() ) {
- KConfig config( "kaddressbookrc" );
+ TDEConfig config( "kaddressbookrc" );
config.setGroup( "General" );
mFormattedNameType = config.readNumEntry( "FormattedNameType", 1 );
mAddressee.setFormattedName( NameEditDialog::formattedName( mAddressee, mFormattedNameType ) );
diff --git a/kaddressbook/common/filter.cpp b/kaddressbook/common/filter.cpp
index 932f6f10..1872ecea 100644
--- a/kaddressbook/common/filter.cpp
+++ b/kaddressbook/common/filter.cpp
@@ -121,7 +121,7 @@ const TQStringList &Filter::categories() const
return mCategoryList;
}
-void Filter::save( KConfig *config )
+void Filter::save( TDEConfig *config )
{
config->writeEntry( "Name", mName );
config->writeEntry( "Enabled", mEnabled );
@@ -129,7 +129,7 @@ void Filter::save( KConfig *config )
config->writeEntry( "MatchRule", (int)mMatchRule );
}
-void Filter::restore( KConfig *config )
+void Filter::restore( TDEConfig *config )
{
mName = config->readEntry( "Name", "<internal error>" );
mEnabled = config->readBoolEntry( "Enabled", true );
@@ -139,10 +139,10 @@ void Filter::restore( KConfig *config )
mIsEmpty = false;
}
-void Filter::save( KConfig *config, const TQString &baseGroup, Filter::List &list )
+void Filter::save( TDEConfig *config, const TQString &baseGroup, Filter::List &list )
{
{
- KConfigGroupSaver s( config, baseGroup );
+ TDEConfigGroupSaver s( config, baseGroup );
// remove the old filters
uint count = config->readNumEntry( "Count" );
@@ -155,31 +155,31 @@ void Filter::save( KConfig *config, const TQString &baseGroup, Filter::List &lis
Filter::List::Iterator iter;
for ( iter = list.begin(); iter != list.end(); ++iter ) {
if ( !(*iter).mInternal ) {
- KConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup )
+ TDEConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup )
.arg( index ) );
(*iter).save( config );
index++;
}
}
- KConfigGroupSaver s( config, baseGroup );
+ TDEConfigGroupSaver s( config, baseGroup );
config->writeEntry( "Count", index );
}
-Filter::List Filter::restore( KConfig *config, const TQString &baseGroup )
+Filter::List Filter::restore( TDEConfig *config, const TQString &baseGroup )
{
Filter::List list;
int count = 0;
Filter f;
{
- KConfigGroupSaver s( config, baseGroup );
+ TDEConfigGroupSaver s( config, baseGroup );
count = config->readNumEntry( "Count", 0 );
}
for ( int i = 0; i < count; i++ ) {
{
- KConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup ).arg( i ) );
+ TDEConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup ).arg( i ) );
f.restore( config );
}
diff --git a/kaddressbook/common/filter.h b/kaddressbook/common/filter.h
index cb13ce53..e8518b8e 100644
--- a/kaddressbook/common/filter.h
+++ b/kaddressbook/common/filter.h
@@ -102,12 +102,12 @@ class Filter
/**
Saves the filter to the config file. The group should already be set.
*/
- void save( KConfig *config );
+ void save( TDEConfig *config );
/**
Loads the filter from the config file. The group should already be set.
*/
- void restore( KConfig *config );
+ void restore( TDEConfig *config );
/**
Saves a list of filters to the config file.
@@ -118,7 +118,7 @@ class Filter
will be append for each filter saved.
@param list The list of filters to be saved.
*/
- static void save( KConfig *config, const TQString &baseGroup, Filter::List &list );
+ static void save( TDEConfig *config, const TQString &baseGroup, Filter::List &list );
/**
Restores a list of filters from a config file.
@@ -128,7 +128,7 @@ class Filter
@return The list of filters.
*/
- static Filter::List restore( KConfig *config, const TQString &baseGroup );
+ static Filter::List restore( TDEConfig *config, const TQString &baseGroup );
/**
Sets the filter rule. If the rule is Filter::Matching (default),
diff --git a/kaddressbook/common/kabprefs.cpp b/kaddressbook/common/kabprefs.cpp
index 18180b80..8a45fc14 100644
--- a/kaddressbook/common/kabprefs.cpp
+++ b/kaddressbook/common/kabprefs.cpp
@@ -33,7 +33,7 @@ static KStaticDeleter<KABPrefs> staticDeleter;
KABPrefs::KABPrefs()
: KABPrefsBase()
{
- KConfigSkeleton::setCurrentGroup( "General" );
+ TDEConfigSkeleton::setCurrentGroup( "General" );
TQStringList defaultMap;
defaultMap << "http://maps.google.com/maps?f=q&hl=%1&q=%n,%l,%s";
diff --git a/kaddressbook/common/kabprefs.h b/kaddressbook/common/kabprefs.h
index c0c92bdc..4ac486f7 100644
--- a/kaddressbook/common/kabprefs.h
+++ b/kaddressbook/common/kabprefs.h
@@ -28,7 +28,7 @@
#include <tdepimmacros.h>
#include "kabprefs_base.h"
-class KConfig;
+class TDEConfig;
class KDE_EXPORT KABPrefs : public KABPrefsBase
{
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index bb206488..1d64fde3 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -67,11 +67,11 @@ KABC::Picture ImageLoader::loadPicture( const KURL &url, bool *ok )
image.load( url.path() );
picture.setData( image );
(*ok) = true;
- } else if ( KIO::NetAccess::download( url, tempFile, mParent ) ) {
+ } else if ( TDEIO::NetAccess::download( url, tempFile, mParent ) ) {
image.load( tempFile );
picture.setData( image );
(*ok) = true;
- KIO::NetAccess::removeTempFile( tempFile );
+ TDEIO::NetAccess::removeTempFile( tempFile );
}
if ( !(*ok) ) {
diff --git a/kaddressbook/interfaces/configurewidget.cpp b/kaddressbook/interfaces/configurewidget.cpp
index 16bec28a..c5efa60a 100644
--- a/kaddressbook/interfaces/configurewidget.cpp
+++ b/kaddressbook/interfaces/configurewidget.cpp
@@ -37,12 +37,12 @@ ConfigureWidget::~ConfigureWidget()
{
}
-void ConfigureWidget::restoreSettings( KConfig* )
+void ConfigureWidget::restoreSettings( TDEConfig* )
{
// should be reimplemented in the views, extensions etc.
}
-void ConfigureWidget::saveSettings( KConfig* )
+void ConfigureWidget::saveSettings( TDEConfig* )
{
// should be reimplemented in the views, extensions etc.
}
diff --git a/kaddressbook/interfaces/configurewidget.h b/kaddressbook/interfaces/configurewidget.h
index 10eb3de8..d1d23c8c 100644
--- a/kaddressbook/interfaces/configurewidget.h
+++ b/kaddressbook/interfaces/configurewidget.h
@@ -47,7 +47,7 @@ class KDE_EXPORT ConfigureWidget : public TQWidget
values from the config file.
Important: Don't change the group of cfg!
*/
- virtual void restoreSettings( KConfig *cfg );
+ virtual void restoreSettings( TDEConfig *cfg );
/**
This method is called after the user clicked the 'Ok' button.
@@ -55,7 +55,7 @@ class KDE_EXPORT ConfigureWidget : public TQWidget
the GUI to the config file.
Important: Don't change the group of cfg!
*/
- virtual void saveSettings( KConfig *cfg );
+ virtual void saveSettings( TDEConfig *cfg );
/**
diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h
index 996044f4..c291f208 100644
--- a/kaddressbook/interfaces/core.h
+++ b/kaddressbook/interfaces/core.h
@@ -45,7 +45,7 @@ class Resource;
class TQWidget;
class KActionCollection;
-class KConfig;
+class TDEConfig;
class KURL;
namespace KAB {
@@ -66,9 +66,9 @@ class KDE_EXPORT Core : public TQObject
virtual KABC::AddressBook *addressBook() const = 0;
/**
- Returns a pointer to the KConfig object of the application.
+ Returns a pointer to the TDEConfig object of the application.
*/
- virtual KConfig *config() const = 0;
+ virtual TDEConfig *config() const = 0;
/**
Returns a pointer to the global KActionCollection object. So
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 8d4dd2fd..0b517bf0 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -250,7 +250,7 @@ KABC::AddressBook *KABCore::addressBook() const
return mAddressBook;
}
-KConfig *KABCore::config() const
+TDEConfig *KABCore::config() const
{
return KABPrefs::instance()->config();
}
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index d3ce562b..c8d36872 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -49,7 +49,7 @@ class CategorySelectDialog;
class TDEAboutData;
class KAction;
class KActionCollection;
-class KConfig;
+class TDEConfig;
class KPushButton;
class KStatusBar;
class KToggleAction;
@@ -106,9 +106,9 @@ class KDE_EXPORT KABCore : public KAB::Core
KABC::AddressBook *addressBook() const;
/**
- Returns a pointer to the KConfig object of the application.
+ Returns a pointer to the TDEConfig object of the application.
*/
- KConfig *config() const;
+ TDEConfig *config() const;
/**
Returns a pointer to the global KActionCollection object. So
diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp
index 081ab2a5..9c2d476e 100644
--- a/kaddressbook/kaddressbookmain.cpp
+++ b/kaddressbook/kaddressbookmain.cpp
@@ -135,11 +135,11 @@ void KAddressBookMain::syncAllResources()
mCore->load();
}
-void KAddressBookMain::saveProperties( KConfig* )
+void KAddressBookMain::saveProperties( TDEConfig* )
{
}
-void KAddressBookMain::readProperties( KConfig* )
+void KAddressBookMain::readProperties( TDEConfig* )
{
}
diff --git a/kaddressbook/kaddressbookmain.h b/kaddressbook/kaddressbookmain.h
index 2444b28e..3e8ffb83 100644
--- a/kaddressbook/kaddressbookmain.h
+++ b/kaddressbook/kaddressbookmain.h
@@ -75,14 +75,14 @@ class KAddressBookMain : public KMainWindow, virtual public KAddressBookIface
This function is called when it is time for the app to save its
properties for session management purposes.
*/
- void saveProperties( KConfig* );
+ void saveProperties( TDEConfig* );
/**
- This function is called when this app is restored. The KConfig
+ This function is called when this app is restored. The TDEConfig
object points to the session management config file that was saved
with @ref saveProperties
*/
- void readProperties( KConfig* );
+ void readProperties( TDEConfig* );
virtual bool queryClose();
diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp
index 028663e3..15ea63ba 100644
--- a/kaddressbook/kaddressbookview.cpp
+++ b/kaddressbook/kaddressbookview.cpp
@@ -53,7 +53,7 @@ KAddressBookView::~KAddressBookView()
<< name() << endl;
}
-void KAddressBookView::readConfig( KConfig *config )
+void KAddressBookView::readConfig( TDEConfig *config )
{
mFieldList = KABC::Field::restoreFields( config, "KABCFields" );
@@ -64,7 +64,7 @@ void KAddressBookView::readConfig( KConfig *config )
mDefaultFilterName = config->readEntry( "DefaultFilterName" );
}
-void KAddressBookView::writeConfig( KConfig* )
+void KAddressBookView::writeConfig( TDEConfig* )
{
// Most of writing the config is handled by the ConfigureViewDialog
}
diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h
index 86153200..1f26ca71 100644
--- a/kaddressbook/kaddressbookview.h
+++ b/kaddressbook/kaddressbookview.h
@@ -36,7 +36,7 @@
#include "filter.h"
#include "viewconfigurewidget.h"
-class KConfig;
+class TDEConfig;
class KXMLGUIClient;
class TQDropEvent;
@@ -80,10 +80,10 @@ class KDE_EXPORT KAddressBookView : public TQWidget
If overloaded in the subclass, do not forget to call super class's
method.
- @param config The KConfig object to read from. The group will already
+ @param config The TDEConfig object to read from. The group will already
be set, so do not change the group.
*/
- virtual void readConfig( KConfig *config );
+ virtual void readConfig( TDEConfig *config );
/**
Called whenever this view should write the config. The view should not
@@ -94,9 +94,9 @@ class KDE_EXPORT KAddressBookView : public TQWidget
If overloaded in the subclass, do not forget to call the super class's
method.
*/
- // The KConfig object is unused so we do not document it
+ // The TDEConfig object is unused so we do not document it
// else doxygen will complain.
- virtual void writeConfig( KConfig * );
+ virtual void writeConfig( TDEConfig * );
/**
Returns a TQString with all the selected email addresses concatenated
diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index 80af9227..6bbc45be 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -169,28 +169,28 @@ AddresseeWidget::~AddresseeWidget()
void AddresseeWidget::restoreSettings()
{
- KConfig config( "kabcrc" );
+ TDEConfig config( "kabcrc" );
config.setGroup( "General" );
mPrefix->setNameParts( config.readListEntry( "Prefixes" ) );
mInclusion->setNameParts( config.readListEntry( "Inclusions" ) );
mSuffix->setNameParts( config.readListEntry( "Suffixes" ) );
- KConfig cfg( "kaddressbookrc" );
+ TDEConfig cfg( "kaddressbookrc" );
cfg.setGroup( "General" );
mFormattedNameCombo->setCurrentItem( cfg.readNumEntry( "FormattedNameType", 1 ) );
}
void AddresseeWidget::saveSettings()
{
- KConfig config( "kabcrc" );
+ TDEConfig config( "kabcrc" );
config.setGroup( "General" );
config.writeEntry( "Prefixes", mPrefix->nameParts() );
config.writeEntry( "Inclusions", mInclusion->nameParts() );
config.writeEntry( "Suffixes", mSuffix->nameParts() );
- KConfig cfg( "kaddressbookrc" );
+ TDEConfig cfg( "kaddressbookrc" );
cfg.setGroup( "General" );
cfg.writeEntry( "FormattedNameType", mFormattedNameCombo->currentItem() );
diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
index 97c8d0b2..5bdec2f8 100644
--- a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
+++ b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
@@ -29,7 +29,7 @@
#include "extensionconfigdialog.h"
#include "extensionwidget.h"
-ExtensionConfigDialog::ExtensionConfigDialog( KAB::ExtensionFactory *factory, KConfig *config,
+ExtensionConfigDialog::ExtensionConfigDialog( KAB::ExtensionFactory *factory, TDEConfig *config,
TQWidget *parent, const char *name )
: KDialogBase( Plain, i18n( "Extension Settings" ), Ok | Cancel, Ok, parent,
name, true, true ), mWidget( 0 ), mConfig( config )
diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.h b/kaddressbook/kcmconfigs/extensionconfigdialog.h
index 93a3c850..0aa97f74 100644
--- a/kaddressbook/kcmconfigs/extensionconfigdialog.h
+++ b/kaddressbook/kcmconfigs/extensionconfigdialog.h
@@ -38,7 +38,7 @@ class ExtensionConfigDialog : public KDialogBase
public:
- ExtensionConfigDialog( KAB::ExtensionFactory *factory, KConfig *config,
+ ExtensionConfigDialog( KAB::ExtensionFactory *factory, TDEConfig *config,
TQWidget *parent, const char *name = 0 );
~ExtensionConfigDialog();
@@ -47,7 +47,7 @@ class ExtensionConfigDialog : public KDialogBase
private:
KAB::ConfigureWidget *mWidget;
- KConfig *mConfig;
+ TDEConfig *mConfig;
};
#endif
diff --git a/kaddressbook/kcmconfigs/kabconfig.desktop b/kaddressbook/kcmconfigs/kabconfig.desktop
index fdf752b0..fa84b328 100644
--- a/kaddressbook/kcmconfigs/kabconfig.desktop
+++ b/kaddressbook/kcmconfigs/kabconfig.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=kaddressbook
Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
DocPath=kaddressbook/preferences.html
X-TDE-ModuleType=Library
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index e4c6e23d..18cb1a90 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -174,7 +174,7 @@ void KABConfigWidget::restoreSettings()
mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().arg( TDEGlobal::locale()->country() ) );
mLocationMapURL->lineEdit()->setCursorPosition( 0 );
- KConfig config( "kabcrc", false, false );
+ TDEConfig config( "kabcrc", false, false );
config.setGroup( "General" );
mTradeAsFamilyName->setChecked( config.readBoolEntry( "TradeAsFamilyName", true ) );
mLimitContactDisplay->setChecked( config.readBoolEntry( "LimitContactDisplay", true ) );
@@ -197,7 +197,7 @@ void KABConfigWidget::saveSettings()
KABPrefs::instance()->writeConfig();
- KConfig config( "kabcrc", false, false );
+ TDEConfig config( "kabcrc", false, false );
config.setGroup( "General" );
config.writeEntry( "TradeAsFamilyName", mTradeAsFamilyName->isChecked() );
config.writeEntry( "LimitContactDisplay", mLimitContactDisplay->isChecked() );
diff --git a/kaddressbook/kcmconfigs/kabcustomfields.desktop b/kaddressbook/kcmconfigs/kabcustomfields.desktop
index 2806171c..c9cd4742 100644
--- a/kaddressbook/kcmconfigs/kabcustomfields.desktop
+++ b/kaddressbook/kcmconfigs/kabcustomfields.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=dlgedit
Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
DocPath=kaddressbook/preferences.html
X-TDE-ModuleType=Library
diff --git a/kaddressbook/kcmconfigs/kabldapconfig.desktop b/kaddressbook/kcmconfigs/kabldapconfig.desktop
index 321f9c81..33eb263e 100644
--- a/kaddressbook/kcmconfigs/kabldapconfig.desktop
+++ b/kaddressbook/kcmconfigs/kabldapconfig.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=find
Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
DocPath=kaddressbook/preferences.html#preferences-ldap-lookup
X-TDE-ModuleType=Library
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
index 296f7955..8f3bb5e5 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
@@ -35,13 +35,13 @@
extern "C"
{
- KDE_EXPORT KCModule *create_kabconfig( TQWidget *parent, const char * ) {
+ KDE_EXPORT TDECModule *create_kabconfig( TQWidget *parent, const char * ) {
return new KCMKabConfig( parent, "kcmkabconfig" );
}
}
KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name )
- : KCModule( parent, name )
+ : TDECModule( parent, name )
{
TQVBoxLayout *layout = new TQVBoxLayout( this );
mConfigWidget = new KABConfigWidget( this, "mConfigWidget" );
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.h b/kaddressbook/kcmconfigs/kcmkabconfig.h
index ceadd6c9..c920d409 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.h
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.h
@@ -28,7 +28,7 @@
class KABConfigWidget;
-class KCMKabConfig : public KCModule
+class KCMKabConfig : public TDECModule
{
Q_OBJECT
diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
index 0a76b6d2..dcbcd2c5 100644
--- a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
@@ -33,7 +33,7 @@
extern "C"
{
- KDE_EXPORT KCModule *create_kabcustomfields( TQWidget *parent, const char * ) {
+ KDE_EXPORT TDECModule *create_kabcustomfields( TQWidget *parent, const char * ) {
return new KCMKabCustomFields( parent, "kcmkabcustomfields" );
}
}
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
index 66fcde2f..ba512b63 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
@@ -36,13 +36,13 @@
extern "C"
{
- KDE_EXPORT KCModule *create_kabldapconfig( TQWidget *parent, const char * ) {
+ KDE_EXPORT TDECModule *create_kabldapconfig( TQWidget *parent, const char * ) {
return new KCMKabLdapConfig( parent, "kcmkabldapconfig" );
}
}
KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name )
- : KCModule( parent, name )
+ : TDECModule( parent, name )
{
TQVBoxLayout *layout = new TQVBoxLayout( this );
mConfigWidget = new LDAPOptionsWidget( this );
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.h b/kaddressbook/kcmconfigs/kcmkabldapconfig.h
index 0325c88e..8539c515 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.h
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.h
@@ -30,7 +30,7 @@
class LDAPOptionsWidget;
-class KCMKabLdapConfig : public KCModule
+class KCMKabLdapConfig : public TDECModule
{
Q_OBJECT
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
index 92eda991..0f33eca6 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
@@ -197,8 +197,8 @@ void LDAPOptionsWidget::slotMoveDown()
void LDAPOptionsWidget::restoreSettings()
{
mHostListView->clear();
- KConfig *config = KPIM::LdapSearch::config();
- KConfigGroupSaver saver( config, "LDAP" );
+ TDEConfig *config = KPIM::LdapSearch::config();
+ TDEConfigGroupSaver saver( config, "LDAP" );
TQString host;
@@ -222,10 +222,10 @@ void LDAPOptionsWidget::restoreSettings()
void LDAPOptionsWidget::saveSettings()
{
- KConfig *config = KPIM::LdapSearch::config();
+ TDEConfig *config = KPIM::LdapSearch::config();
config->deleteGroup( "LDAP" );
- KConfigGroupSaver saver( config, "LDAP" );
+ TDEConfigGroupSaver saver( config, "LDAP" );
uint selected = 0; uint unselected = 0;
TQListViewItemIterator it( mHostListView );
diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp
index 42920b3b..b3fd9af2 100644
--- a/kaddressbook/keywidget.cpp
+++ b/kaddressbook/keywidget.cpp
@@ -118,7 +118,7 @@ void KeyWidget::addKey()
return;
TQString tmpFile;
- if ( KIO::NetAccess::download( url, tmpFile, this ) ) {
+ if ( TDEIO::NetAccess::download( url, tmpFile, this ) ) {
TQFile file( tmpFile );
if ( !file.open( IO_ReadOnly ) ) {
TQString text( i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ) );
@@ -140,7 +140,7 @@ void KeyWidget::addKey()
emit changed();
- KIO::NetAccess::removeTempFile( tmpFile );
+ TDEIO::NetAccess::removeTempFile( tmpFile );
}
updateKeyCombo();
@@ -175,7 +175,7 @@ void KeyWidget::exportKey()
(*s) << key.textData();
tempFile.close();
- KIO::NetAccess::upload( tempFile.name(), url, kapp->mainWidget() );
+ TDEIO::NetAccess::upload( tempFile.name(), url, kapp->mainWidget() );
}
void KeyWidget::updateKeyCombo()
diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp
index cf7b1d5f..6537bebe 100644
--- a/kaddressbook/ldapsearchdialog.cpp
+++ b/kaddressbook/ldapsearchdialog.cpp
@@ -249,14 +249,14 @@ void LDAPSearchDialog::restoreSettings()
mLdapClientList.setAutoDelete( true );
mLdapClientList.clear();
- KConfig kabConfig( "kaddressbookrc" );
+ TDEConfig kabConfig( "kaddressbookrc" );
kabConfig.setGroup( "LDAPSearch" );
mSearchType->setCurrentItem( kabConfig.readNumEntry( "SearchType", 0 ) );
// then read the config file and register all selected
// server in the list
- KConfig* config = KPIM::LdapSearch::config();
- KConfigGroupSaver saver( config, "LDAP" );
+ TDEConfig* config = KPIM::LdapSearch::config();
+ TDEConfigGroupSaver saver( config, "LDAP" );
mNumHosts = config->readUnsignedNumEntry( "NumSelectedHosts" );
if ( !mNumHosts ) {
KMessageBox::error( this, i18n( "You must select a LDAP server before searching.\nYou can do this from the menu Settings/Configure KAddressBook." ) );
@@ -316,7 +316,7 @@ void LDAPSearchDialog::restoreSettings()
void LDAPSearchDialog::saveSettings()
{
- KConfig config( "kaddressbookrc" );
+ TDEConfig config( "kaddressbookrc" );
config.setGroup( "LDAPSearch" );
config.writeEntry( "SearchType", mSearchType->currentItem() );
config.sync();
diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp
index 718ce8e2..8f70f0f8 100644
--- a/kaddressbook/nameeditdialog.cpp
+++ b/kaddressbook/nameeditdialog.cpp
@@ -124,7 +124,7 @@ NameEditDialog::NameEditDialog( const KABC::Addressee &addr, int type,
mFormattedNameEdit->setText( addr.formattedName() );
// Prefix and suffix combos
- KConfig config( "kabcrc" );
+ TDEConfig config( "kabcrc" );
config.setGroup( "General" );
TQStringList sTitle;
diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp
index 37766973..a8062651 100644
--- a/kaddressbook/printing/detailledstyle.cpp
+++ b/kaddressbook/printing/detailledstyle.cpp
@@ -69,7 +69,7 @@ DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *na
mPainter( 0 ),
mPrintProgress( 0 )
{
- KConfig *config;
+ TDEConfig *config;
TQFont font;
bool kdeFonts;
TQFont standard = TDEGlobalSettings::generalFont();
@@ -145,7 +145,7 @@ void DetailledPrintStyle::print( const KABC::Addressee::List &contacts, PrintPro
TQFont comment = TQFont("Helvetica", 10, TQFont::Normal);
// store the configuration settings:
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
config->setGroup( ConfigSectionName );
useKDEFonts = mPageAppearance->cbStandardFonts->isChecked();
config->writeEntry( UseKDEFonts, useKDEFonts );
diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp
index ec412aa3..f4558258 100644
--- a/kaddressbook/soundwidget.cpp
+++ b/kaddressbook/soundwidget.cpp
@@ -147,7 +147,7 @@ void SoundWidget::loadSound()
if ( url.isLocalFile() )
fileName = url.path();
- else if ( !KIO::NetAccess::download( url, fileName, this ) )
+ else if ( !TDEIO::NetAccess::download( url, fileName, this ) )
return;
TQFile file( fileName );
@@ -159,7 +159,7 @@ void SoundWidget::loadSound()
file.close();
if ( !url.isLocalFile() )
- KIO::NetAccess::removeTempFile( fileName );
+ TDEIO::NetAccess::removeTempFile( fileName );
}
void SoundWidget::updateGUI()
diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp
index bbe0f3f1..e3c9a81c 100644
--- a/kaddressbook/viewconfigurefieldspage.cpp
+++ b/kaddressbook/viewconfigurefieldspage.cpp
@@ -61,7 +61,7 @@ ViewConfigureFieldsPage::ViewConfigureFieldsPage( KABC::AddressBook *ab,
initGUI();
}
-void ViewConfigureFieldsPage::restoreSettings( KConfig *config )
+void ViewConfigureFieldsPage::restoreSettings( TDEConfig *config )
{
KABC::Field::List fields = KABC::Field::restoreFields( config, "KABCFields" );
@@ -75,7 +75,7 @@ void ViewConfigureFieldsPage::restoreSettings( KConfig *config )
slotShowFields( mCategoryCombo->currentItem() );
}
-void ViewConfigureFieldsPage::saveSettings( KConfig *config )
+void ViewConfigureFieldsPage::saveSettings( TDEConfig *config )
{
KABC::Field::List fields;
diff --git a/kaddressbook/viewconfigurefieldspage.h b/kaddressbook/viewconfigurefieldspage.h
index 0ac75709..91bf6da7 100644
--- a/kaddressbook/viewconfigurefieldspage.h
+++ b/kaddressbook/viewconfigurefieldspage.h
@@ -44,8 +44,8 @@ class ViewConfigureFieldsPage : public TQWidget
ViewConfigureFieldsPage( KABC::AddressBook *ab, TQWidget *parent = 0,
const char *name = 0 );
- void restoreSettings( KConfig* );
- void saveSettings( KConfig* );
+ void restoreSettings( TDEConfig* );
+ void saveSettings( TDEConfig* );
public slots:
void slotSelect();
diff --git a/kaddressbook/viewconfigurefilterpage.cpp b/kaddressbook/viewconfigurefilterpage.cpp
index 39bab7c8..9602f2d3 100644
--- a/kaddressbook/viewconfigurefilterpage.cpp
+++ b/kaddressbook/viewconfigurefilterpage.cpp
@@ -79,7 +79,7 @@ ViewConfigureFilterPage::~ViewConfigureFilterPage()
delete mFilterGroup;
}
-void ViewConfigureFilterPage::restoreSettings( KConfig *config )
+void ViewConfigureFilterPage::restoreSettings( TDEConfig *config )
{
mFilterCombo->clear();
@@ -97,7 +97,7 @@ void ViewConfigureFilterPage::restoreSettings( KConfig *config )
mFilterCombo->setCurrentText( config->readEntry( "DefaultFilterName" ) );
}
-void ViewConfigureFilterPage::saveSettings( KConfig *config )
+void ViewConfigureFilterPage::saveSettings( TDEConfig *config )
{
config->writeEntry( "DefaultFilterName", mFilterCombo->currentText() );
config->writeEntry( "DefaultFilterType", mFilterGroup->id( mFilterGroup->selected() ) );
diff --git a/kaddressbook/viewconfigurefilterpage.h b/kaddressbook/viewconfigurefilterpage.h
index 7367d59d..a29bf880 100644
--- a/kaddressbook/viewconfigurefilterpage.h
+++ b/kaddressbook/viewconfigurefilterpage.h
@@ -29,7 +29,7 @@
class TQButtonGroup;
class KComboBox;
-class KConfig;
+class TDEConfig;
class ViewConfigureFilterPage : public TQWidget
{
@@ -40,8 +40,8 @@ class ViewConfigureFilterPage : public TQWidget
ViewConfigureFilterPage( TQWidget *parent, const char *name = 0 );
~ViewConfigureFilterPage();
- void restoreSettings( KConfig* );
- void saveSettings( KConfig* );
+ void restoreSettings( TDEConfig* );
+ void saveSettings( TDEConfig* );
protected slots:
void buttonClicked( int id );
diff --git a/kaddressbook/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp
index 8278b2f1..415430d9 100644
--- a/kaddressbook/viewconfigurewidget.cpp
+++ b/kaddressbook/viewconfigurewidget.cpp
@@ -66,13 +66,13 @@ ViewConfigureWidget::~ViewConfigureWidget()
{
}
-void ViewConfigureWidget::restoreSettings( KConfig *config )
+void ViewConfigureWidget::restoreSettings( TDEConfig *config )
{
mFieldsPage->restoreSettings( config );
mFilterPage->restoreSettings( config );
}
-void ViewConfigureWidget::saveSettings( KConfig *config )
+void ViewConfigureWidget::saveSettings( TDEConfig *config )
{
mFieldsPage->saveSettings( config );
mFilterPage->saveSettings( config );
@@ -98,12 +98,12 @@ ViewConfigureDialog::~ViewConfigureDialog()
{
}
-void ViewConfigureDialog::restoreSettings( KConfig *config )
+void ViewConfigureDialog::restoreSettings( TDEConfig *config )
{
mConfigWidget->restoreSettings( config );
}
-void ViewConfigureDialog::saveSettings( KConfig *config )
+void ViewConfigureDialog::saveSettings( TDEConfig *config )
{
mConfigWidget->saveSettings( config );
}
diff --git a/kaddressbook/viewconfigurewidget.h b/kaddressbook/viewconfigurewidget.h
index e65e095d..c13f0fab 100644
--- a/kaddressbook/viewconfigurewidget.h
+++ b/kaddressbook/viewconfigurewidget.h
@@ -61,7 +61,7 @@ class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget
Do not change the group of the config object in this method.
*/
- virtual void restoreSettings( KConfig *config );
+ virtual void restoreSettings( TDEConfig *config );
/**
Writes the configuration from the GUI to the config object. If this
@@ -69,7 +69,7 @@ class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget
Do not change the group of the config object in this method.
*/
- virtual void saveSettings( KConfig *config );
+ virtual void saveSettings( TDEConfig *config );
/**
@@ -95,8 +95,8 @@ class ViewConfigureDialog : public KDialogBase
TQWidget *parent, const char *name = 0 );
~ViewConfigureDialog();
- void restoreSettings( KConfig* );
- void saveSettings( KConfig* );
+ void restoreSettings( TDEConfig* );
+ void saveSettings( TDEConfig* );
protected slots:
void slotHelp();
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 3938c14a..2616bf33 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -83,7 +83,7 @@ void ViewManager::restoreSettings()
// been modified by global settings
TQDictIterator<KAddressBookView> it( mViewDict );
for ( it.toFirst(); it.current(); ++it ) {
- KConfigGroupSaver saver( mCore->config(), it.currentKey() );
+ TDEConfigGroupSaver saver( mCore->config(), it.currentKey() );
it.current()->readConfig( mCore->config() );
}
@@ -96,7 +96,7 @@ void ViewManager::saveSettings()
{
TQDictIterator<KAddressBookView> it( mViewDict );
for ( it.toFirst(); it.current(); ++it ) {
- KConfigGroupSaver saver( mCore->config(), it.currentKey() );
+ TDEConfigGroupSaver saver( mCore->config(), it.currentKey() );
(*it)->writeConfig( mCore->config() );
}
@@ -199,8 +199,8 @@ void ViewManager::setActiveView( const TQString &name )
// Check if we found the view. If we didn't, then we need to create it
if ( view == 0 ) {
- KConfig *config = mCore->config();
- KConfigGroupSaver saver( config, name );
+ TDEConfig *config = mCore->config();
+ TDEConfigGroupSaver saver( config, name );
TQString type = config->readEntry( "Type", "Table" );
kdDebug(5720) << "ViewManager::setActiveView: creating view - " << name << endl;
@@ -278,7 +278,7 @@ void ViewManager::editView()
if ( wdg ) {
ViewConfigureDialog dlg( wdg, mActiveView->caption(), this );
- KConfigGroupSaver saver( mCore->config(), mActiveView->caption() );
+ TDEConfigGroupSaver saver( mCore->config(), mActiveView->caption() );
dlg.restoreSettings( mCore->config() );
if ( dlg.exec() ) {
@@ -314,7 +314,7 @@ void ViewManager::deleteView()
mViewNameList.remove( mActiveView->caption() );
// remove the view from the config file
- KConfig *config = mCore->config();
+ TDEConfig *config = mCore->config();
config->deleteGroup( mActiveView->caption() );
mViewDict.remove( mActiveView->caption() );
@@ -356,9 +356,9 @@ void ViewManager::addView()
mViewNameList.append( newName );
// write the view to the config file,
- KConfig *config = mCore->config();
+ TDEConfig *config = mCore->config();
config->deleteGroup( newName );
- KConfigGroupSaver saver( config, newName );
+ TDEConfigGroupSaver saver( config, newName );
config->writeEntry( "Type", type );
// try to set the active view
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index 0ffc5e5d..347bd423 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -60,14 +60,14 @@ ConfigureCardViewWidget::~ConfigureCardViewWidget()
{
}
-void ConfigureCardViewWidget::restoreSettings( KConfig *config )
+void ConfigureCardViewWidget::restoreSettings( TDEConfig *config )
{
ViewConfigureWidget::restoreSettings( config );
mAdvancedPage->restoreSettings( config );
}
-void ConfigureCardViewWidget::saveSettings( KConfig *config )
+void ConfigureCardViewWidget::saveSettings( TDEConfig *config )
{
ViewConfigureWidget::saveSettings( config );
@@ -86,7 +86,7 @@ CardViewLookNFeelPage::~CardViewLookNFeelPage()
{
}
-void CardViewLookNFeelPage::restoreSettings( KConfig *config )
+void CardViewLookNFeelPage::restoreSettings( TDEConfig *config )
{
// colors
cbEnableCustomColors->setChecked( config->readBoolEntry( "EnableCustomColors", false ) );
@@ -132,7 +132,7 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config )
cbShowEmptyFields->setChecked( config->readBoolEntry( "ShowEmptyFields", false ) );
}
-void CardViewLookNFeelPage::saveSettings( KConfig *config )
+void CardViewLookNFeelPage::saveSettings( TDEConfig *config )
{
// colors
config->writeEntry( "EnableCustomColors", cbEnableCustomColors->isChecked() );
diff --git a/kaddressbook/views/configurecardviewdialog.h b/kaddressbook/views/configurecardviewdialog.h
index 9c079d88..892532c5 100644
--- a/kaddressbook/views/configurecardviewdialog.h
+++ b/kaddressbook/views/configurecardviewdialog.h
@@ -34,7 +34,7 @@ class TQString;
class TQWidget;
class TQCheckBox;
class TQLabel;
-class KConfig;
+class TDEConfig;
namespace KABC { class AddressBook; }
@@ -51,8 +51,8 @@ class ConfigureCardViewWidget : public ViewConfigureWidget
ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name );
virtual ~ConfigureCardViewWidget();
- virtual void restoreSettings( KConfig* );
- virtual void saveSettings( KConfig* );
+ virtual void restoreSettings( TDEConfig* );
+ virtual void saveSettings( TDEConfig* );
private:
class CardViewLookNFeelPage *mAdvancedPage;
@@ -86,8 +86,8 @@ class CardViewLookNFeelPage : public TQVBox {
CardViewLookNFeelPage( TQWidget *parent=0, const char *name=0 );
~CardViewLookNFeelPage();
- void restoreSettings( KConfig* );
- void saveSettings( KConfig* );
+ void restoreSettings( TDEConfig* );
+ void saveSettings( TDEConfig* );
private slots:
void setTextFont();
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index a8359884..987feb17 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -56,14 +56,14 @@ ConfigureTableViewWidget::~ConfigureTableViewWidget()
{
}
-void ConfigureTableViewWidget::restoreSettings( KConfig *config )
+void ConfigureTableViewWidget::restoreSettings( TDEConfig *config )
{
ViewConfigureWidget::restoreSettings( config );
mPage->restoreSettings( config );
}
-void ConfigureTableViewWidget::saveSettings( KConfig *config )
+void ConfigureTableViewWidget::saveSettings( TDEConfig *config )
{
ViewConfigureWidget::saveSettings( config );
@@ -81,7 +81,7 @@ LookAndFeelPage::LookAndFeelPage(TQWidget *parent, const char *name)
enableBackgroundToggled(mBackgroundBox->isChecked());
}
-void LookAndFeelPage::restoreSettings( KConfig *config )
+void LookAndFeelPage::restoreSettings( TDEConfig *config )
{
mAlternateButton->setChecked(config->readBoolEntry("ABackground", true));
mLineButton->setChecked(config->readBoolEntry("SingleLine", false));
@@ -97,7 +97,7 @@ void LookAndFeelPage::restoreSettings( KConfig *config )
#endif
}
-void LookAndFeelPage::saveSettings( KConfig *config )
+void LookAndFeelPage::saveSettings( TDEConfig *config )
{
config->writeEntry("ABackground", mAlternateButton->isChecked());
config->writeEntry("SingleLine", mLineButton->isChecked());
diff --git a/kaddressbook/views/configuretableviewdialog.h b/kaddressbook/views/configuretableviewdialog.h
index d4a79a6f..94fd2a68 100644
--- a/kaddressbook/views/configuretableviewdialog.h
+++ b/kaddressbook/views/configuretableviewdialog.h
@@ -31,7 +31,7 @@ class TQWidget;
class TQRadioButton;
class TQCheckBox;
class KURLRequester;
-class KConfig;
+class TDEConfig;
namespace KABC { class AddressBook; }
@@ -48,8 +48,8 @@ class ConfigureTableViewWidget : public ViewConfigureWidget
ConfigureTableViewWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name );
virtual ~ConfigureTableViewWidget();
- virtual void restoreSettings( KConfig* );
- virtual void saveSettings( KConfig* );
+ virtual void restoreSettings( TDEConfig* );
+ virtual void saveSettings( TDEConfig* );
private:
void initGUI();
@@ -69,8 +69,8 @@ class LookAndFeelPage : public TQWidget
LookAndFeelPage( TQWidget *parent, const char *name = 0 );
~LookAndFeelPage() {}
- void restoreSettings( KConfig* );
- void saveSettings( KConfig* );
+ void restoreSettings( TDEConfig* );
+ void saveSettings( TDEConfig* );
protected slots:
void enableBackgroundToggled( bool );
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index 4656f62b..30e1ca67 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -178,7 +178,7 @@ KABC::Field *KAddressBookCardView::sortField() const
return KABC::Field::allFields()[ 0 ];
}
-void KAddressBookCardView::readConfig( KConfig *config )
+void KAddressBookCardView::readConfig( TDEConfig *config )
{
KAddressBookView::readConfig( config );
@@ -238,7 +238,7 @@ void KAddressBookCardView::readConfig( KConfig *config )
this, TQT_SLOT( addresseeExecuted( CardViewItem* ) ) );
}
-void KAddressBookCardView::writeConfig( KConfig *config )
+void KAddressBookCardView::writeConfig( TDEConfig *config )
{
config->writeEntry( "ItemWidth", mCardView->itemWidth() );
KAddressBookView::writeConfig( config );
diff --git a/kaddressbook/views/kaddressbookcardview.h b/kaddressbook/views/kaddressbookcardview.h
index f14b12fc..90b738d5 100644
--- a/kaddressbook/views/kaddressbookcardview.h
+++ b/kaddressbook/views/kaddressbookcardview.h
@@ -32,7 +32,7 @@
class TQDragEntryEvent;
class TQDropEvent;
-class KConfig;
+class TDEConfig;
class AddresseeCardView;
/**
@@ -54,8 +54,8 @@ class KAddressBookCardView : public KAddressBookView
virtual TQString type() const { return "Card"; }
virtual KABC::Field *sortField() const;
- virtual void readConfig( KConfig *config );
- virtual void writeConfig( KConfig *config );
+ virtual void readConfig( TDEConfig *config );
+ virtual void writeConfig( TDEConfig *config );
void scrollUp();
void scrollDown();
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index 42e315c5..adf3de0e 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -167,7 +167,7 @@ KABC::Field *KAddressBookIconView::sortField() const
return KABC::Field::allFields()[ 2 ];
}
-void KAddressBookIconView::readConfig( KConfig *config )
+void KAddressBookIconView::readConfig( TDEConfig *config )
{
KAddressBookView::readConfig( config );
diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h
index 8cbc98a9..56984cfc 100644
--- a/kaddressbook/views/kaddressbookiconview.h
+++ b/kaddressbook/views/kaddressbookiconview.h
@@ -29,7 +29,7 @@
#include "kaddressbookview.h"
class TQIconViewItem;
-class KConfig;
+class TDEConfig;
class AddresseeIconView;
class AddresseeIconViewItem;
@@ -52,7 +52,7 @@ class KAddressBookIconView : public KAddressBookView
virtual TQStringList selectedUids();
virtual TQString type() const { return "Icon"; }
virtual KABC::Field *sortField() const;
- virtual void readConfig( KConfig *config );
+ virtual void readConfig( TDEConfig *config );
void scrollUp();
void scrollDown();
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index de1ae2ec..9432dafa 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -173,14 +173,14 @@ KABC::Field *KAddressBookTableView::sortField() const
return ( mListView->sortColumn() == -1 ? fields()[ 0 ] : fields()[ mListView->sortColumn() ] );
}
-void KAddressBookTableView::writeConfig( KConfig *config )
+void KAddressBookTableView::writeConfig( TDEConfig *config )
{
KAddressBookView::writeConfig( config );
mListView->saveLayout( config, config->group() );
}
-void KAddressBookTableView::readConfig( KConfig *config )
+void KAddressBookTableView::readConfig( TDEConfig *config )
{
KAddressBookView::readConfig( config );
diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h
index 3b2e0df1..4ebdfd93 100644
--- a/kaddressbook/views/kaddressbooktableview.h
+++ b/kaddressbook/views/kaddressbooktableview.h
@@ -41,7 +41,7 @@
class TQListViewItem;
class TQListBox;
class TQVBoxLayout;
-class KConfig;
+class TDEConfig;
class KIMProxy;
class ContactListViewItem;
@@ -75,8 +75,8 @@ friend class ContactListView;
virtual void setFirstSelected( bool selected = true );
virtual KABC::Field *sortField() const;
- virtual void readConfig( KConfig *config );
- virtual void writeConfig( KConfig *config );
+ virtual void readConfig( TDEConfig *config );
+ virtual void writeConfig( TDEConfig *config );
virtual TQString type() const { return "Table"; }
void scrollUp();
diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp
index 9c270a2e..f3d47bfc 100644
--- a/kaddressbook/xxport/csv_xxport.cpp
+++ b/kaddressbook/xxport/csv_xxport.cpp
@@ -66,7 +66,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
doExport( tmpFile.file(), list );
tmpFile.close();
- return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+ return TDEIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
} else {
TQFile file( url.path() );
if ( !file.open( IO_WriteOnly ) ) {
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 72882301..40c209dc 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -866,7 +866,7 @@ void CSVImportDialog::saveTemplate()
if ( name.isEmpty() )
return;
- KConfig config( fileName );
+ TDEConfig config( fileName );
config.setGroup( "General" );
config.writeEntry( "DatePattern", mDatePatternEdit->text() );
config.writeEntry( "Columns", mTable->numCols() );
diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp
index 30718a9f..f0c13e61 100644
--- a/kaddressbook/xxport/ldif_xxport.cpp
+++ b/kaddressbook/xxport/ldif_xxport.cpp
@@ -114,7 +114,7 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString
doExport( tmpFile.file(), list );
tmpFile.close();
- return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+ return TDEIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
} else {
TQString filename = url.path();
TQFile file( filename );
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index ad85389f..34a6809f 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -146,7 +146,7 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS
else
testUrl = baseUrl.url() + "/" + (*it).givenName() + "_" + (*it).familyName();
- if ( KIO::NetAccess::exists( testUrl + (counter == 0 ? "" : TQString::number( counter )) + ".vcf", false, parentWidget() ) ) {
+ if ( TDEIO::NetAccess::exists( testUrl + (counter == 0 ? "" : TQString::number( counter )) + ".vcf", false, parentWidget() ) ) {
counter++;
url = testUrl + TQString::number( counter ) + ".vcf";
} else
@@ -220,7 +220,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
bool anyFailures = false;
KURL::List::Iterator it;
for ( it = urls.begin(); it != urls.end(); ++it ) {
- if ( KIO::NetAccess::download( *it, fileName, parentWidget() ) ) {
+ if ( TDEIO::NetAccess::download( *it, fileName, parentWidget() ) ) {
TQFile file( fileName );
@@ -247,7 +247,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
addrList += parseVCard( vCardText );
}
#endif
- KIO::NetAccess::removeTempFile( fileName );
+ TDEIO::NetAccess::removeTempFile( fileName );
} else {
TQString text = i18n( "<qt>When trying to read the vCard, there was an error opening the file '%1': %2</qt>" );
text = text.arg( (*it).url() );
@@ -258,7 +258,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
}
} else {
TQString text = i18n( "<qt>Unable to access vCard: %1</qt>" );
- text = text.arg( KIO::NetAccess::lastErrorString() );
+ text = text.arg( TDEIO::NetAccess::lastErrorString() );
KMessageBox::error( parentWidget(), text, caption );
anyFailures = true;
}
@@ -302,7 +302,7 @@ bool VCardXXPort::doExport( const KURL &url, const TQByteArray &data )
tmpFile.file()->writeBlock( data.data(), data.size() );
tmpFile.close();
- return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+ return TDEIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
}
#else
KABC::AddresseeList VCardXXPort::parseVCard( const TQString &data ) const
@@ -327,7 +327,7 @@ bool VCardXXPort::doExport( const KURL &url, const TQString &data )
stream << data;
tmpFile.close();
- return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+ return TDEIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
}
#endif
@@ -561,7 +561,7 @@ VCardExportSelectionDialog::VCardExportSelectionDialog( TQWidget *parent,
mEncryptionKeys = new TQCheckBox( i18n( "Encryption keys" ), page );
layout->addWidget( mEncryptionKeys );
- KConfig config( "kaddressbookrc" );
+ TDEConfig config( "kaddressbookrc" );
config.setGroup( "XXPortVCard" );
mPrivateBox->setChecked( config.readBoolEntry( "ExportPrivateFields", true ) );
@@ -572,7 +572,7 @@ VCardExportSelectionDialog::VCardExportSelectionDialog( TQWidget *parent,
VCardExportSelectionDialog::~VCardExportSelectionDialog()
{
- KConfig config( "kaddressbookrc" );
+ TDEConfig config( "kaddressbookrc" );
config.setGroup( "XXPortVCard" );
config.writeEntry( "ExportPrivateFields", mPrivateBox->isChecked() );
diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp
index f17cd749..1e64b046 100644
--- a/kalarm/alarmcalendar.cpp
+++ b/kalarm/alarmcalendar.cpp
@@ -90,7 +90,7 @@ AlarmCalendar* AlarmCalendar::mCalendars[NCALS] = { 0, 0, 0, 0 };
*/
bool AlarmCalendar::initialiseCalendars()
{
- KConfig* config = kapp->config();
+ TDEConfig* config = kapp->config();
config->setGroup(TQString::fromLatin1("General"));
TQString activeKey = TQString::fromLatin1("Calendar");
TQString expiredKey = TQString::fromLatin1("ExpiredCalendar");
@@ -150,7 +150,7 @@ bool AlarmCalendar::initialiseCalendars()
* Create an alarm calendar instance.
* If 'configKey' is non-null, the calendar will be converted to ICal format.
*/
-AlarmCalendar* AlarmCalendar::createCalendar(CalID type, KConfig* config, TQString& writePath, const TQString& configKey)
+AlarmCalendar* AlarmCalendar::createCalendar(CalID type, TDEConfig* config, TQString& writePath, const TQString& configKey)
{
static TQRegExp vcsRegExp(TQString::fromLatin1("\\.vcs$"));
static TQString ical = TQString::fromLatin1(".ics");
@@ -266,7 +266,7 @@ bool AlarmCalendar::open()
// Check for file's existence, assuming that it does exist when uncertain,
// to avoid overwriting it.
- if (!KIO::NetAccess::exists(mUrl, true, MainWindow::mainMainWindow()))
+ if (!TDEIO::NetAccess::exists(mUrl, true, MainWindow::mainMainWindow()))
{
// The calendar file doesn't yet exist, so create it
if (create())
@@ -318,7 +318,7 @@ int AlarmCalendar::load()
kdDebug(5950) << "AlarmCalendar::load(): " << mUrl.prettyURL() << endl;
TQString tmpFile;
- if (!KIO::NetAccess::download(mUrl, tmpFile, MainWindow::mainMainWindow()))
+ if (!TDEIO::NetAccess::download(mUrl, tmpFile, MainWindow::mainMainWindow()))
{
kdError(5950) << "AlarmCalendar::load(): Load failure" << endl;
KMessageBox::error(0, i18n("Cannot open calendar:\n%1").arg(mUrl.prettyURL()));
@@ -331,9 +331,9 @@ int AlarmCalendar::load()
if (!loaded)
{
// Check if the file is zero length
- KIO::NetAccess::removeTempFile(tmpFile);
- KIO::UDSEntry uds;
- KIO::NetAccess::stat(mUrl, uds, MainWindow::mainMainWindow());
+ TDEIO::NetAccess::removeTempFile(tmpFile);
+ TDEIO::UDSEntry uds;
+ TDEIO::NetAccess::stat(mUrl, uds, MainWindow::mainMainWindow());
KFileItem fi(uds, mUrl);
if (!fi.size())
return 0; // file is zero length
@@ -346,7 +346,7 @@ int AlarmCalendar::load()
return -1;
}
if (!mLocalFile.isEmpty())
- KIO::NetAccess::removeTempFile(mLocalFile); // removes it only if it IS a temporary file
+ TDEIO::NetAccess::removeTempFile(mLocalFile); // removes it only if it IS a temporary file
mLocalFile = tmpFile;
CalendarCompat::fix(*mCalendar, mLocalFile); // convert events to current KAlarm format for when calendar is saved
@@ -389,7 +389,7 @@ bool AlarmCalendar::saveCal(const TQString& newFile)
if (!mICalUrl.isLocalFile())
{
- if (!KIO::NetAccess::upload(saveFilename, mICalUrl, MainWindow::mainMainWindow()))
+ if (!TDEIO::NetAccess::upload(saveFilename, mICalUrl, MainWindow::mainMainWindow()))
{
kdError(5950) << "AlarmCalendar::saveCal(" << saveFilename << "): upload failed.\n";
KMessageBox::error(0, i18n("Cannot upload calendar to\n'%1'").arg(mICalUrl.prettyURL()));
@@ -403,7 +403,7 @@ bool AlarmCalendar::saveCal(const TQString& newFile)
// Save the change in the config file.
if (!mConfigKey.isNull())
{
- KConfig* config = kapp->config();
+ TDEConfig* config = kapp->config();
config->setGroup(TQString::fromLatin1("General"));
config->writePathEntry(mConfigKey, mICalUrl.path());
config->sync();
@@ -424,7 +424,7 @@ void AlarmCalendar::close()
{
if (!mLocalFile.isEmpty())
{
- KIO::NetAccess::removeTempFile(mLocalFile); // removes it only if it IS a temporary file
+ TDEIO::NetAccess::removeTempFile(mLocalFile); // removes it only if it IS a temporary file
mLocalFile = "";
}
if (mCalendar)
@@ -474,7 +474,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent)
}
else
{
- if (!KIO::NetAccess::download(url, filename, MainWindow::mainMainWindow()))
+ if (!TDEIO::NetAccess::download(url, filename, MainWindow::mainMainWindow()))
{
kdError(5950) << "AlarmCalendar::importAlarms(): Download failure" << endl;
KMessageBox::error(parent, i18n("Cannot download calendar:\n%1").arg(url.prettyURL()));
@@ -561,7 +561,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent)
templat->saveCal();
}
if (!local)
- KIO::NetAccess::removeTempFile(filename);
+ TDEIO::NetAccess::removeTempFile(filename);
return success;
}
@@ -615,7 +615,7 @@ void AlarmCalendar::convertToICal()
{
if (!mConfigKey.isNull())
{
- KConfig* config = kapp->config();
+ TDEConfig* config = kapp->config();
config->setGroup(TQString::fromLatin1("General"));
config->writePathEntry(mConfigKey, mICalUrl.path());
config->sync();
diff --git a/kalarm/alarmcalendar.h b/kalarm/alarmcalendar.h
index cebd6460..91977ea9 100644
--- a/kalarm/alarmcalendar.h
+++ b/kalarm/alarmcalendar.h
@@ -26,7 +26,7 @@
#include <libkcal/calendarlocal.h>
#include "alarmevent.h"
-class KConfig;
+class TDEConfig;
/** Provides read and write access to calendar files.
@@ -93,7 +93,7 @@ class AlarmCalendar : public TQObject
bool saveCal(const TQString& newFile = TQString());
void purge(int daysToKeep);
void startPurgeTimer();
- static AlarmCalendar* createCalendar(CalID, KConfig*, TQString& writePath, const TQString& configKey = TQString());
+ static AlarmCalendar* createCalendar(CalID, TDEConfig*, TQString& writePath, const TQString& configKey = TQString());
static AlarmCalendar* calendarOpen(CalID);
static AlarmCalendar* mCalendars[NCALS]; // the calendars
diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp
index b12a41cf..0727507f 100644
--- a/kalarm/birthdaydlg.cpp
+++ b/kalarm/birthdaydlg.cpp
@@ -80,7 +80,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent)
// Prefix and suffix to the name in the alarm text
// Get default prefix and suffix texts from config file
- KConfig* config = kapp->config();
+ TDEConfig* config = kapp->config();
config->setGroup(TQString::fromLatin1("General"));
mPrefixText = config->readEntry(TQString::fromLatin1("BirthdayPrefix"), i18n("Birthday: "));
mSuffixText = config->readEntry(TQString::fromLatin1("BirthdaySuffix"));
@@ -343,7 +343,7 @@ TQValueList<KAEvent> BirthdayDlg::events() const
void BirthdayDlg::slotOk()
{
// Save prefix and suffix texts to use as future defaults
- KConfig* config = kapp->config();
+ TDEConfig* config = kapp->config();
config->setGroup(TQString::fromLatin1("General"));
config->writeEntry(TQString::fromLatin1("BirthdayPrefix"), mPrefix->text());
config->writeEntry(TQString::fromLatin1("BirthdaySuffix"), mSuffix->text());
diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp
index 29ac67d4..707865f8 100644
--- a/kalarm/daemon.cpp
+++ b/kalarm/daemon.cpp
@@ -413,7 +413,7 @@ void Daemon::enableAutoStart(bool enable)
// The return status doesn't report failure even if the daemon isn't running,
// so in case of failure, rewrite the config file in any case.
- KConfig adconfig(locate("config", DAEMON_APP_NAME"rc"));
+ TDEConfig adconfig(locate("config", DAEMON_APP_NAME"rc"));
adconfig.setGroup(TQString::fromLatin1(DAEMON_AUTOSTART_SECTION));
adconfig.writeEntry(TQString::fromLatin1(DAEMON_AUTOSTART_KEY), enable);
adconfig.sync();
@@ -436,7 +436,7 @@ void Daemon::notifyTimeChanged()
*/
bool Daemon::autoStart()
{
- KConfig adconfig(locate("config", DAEMON_APP_NAME"rc"));
+ TDEConfig adconfig(locate("config", DAEMON_APP_NAME"rc"));
adconfig.setGroup(TQString::fromLatin1(DAEMON_AUTOSTART_SECTION));
return adconfig.readBoolEntry(TQString::fromLatin1(DAEMON_AUTOSTART_KEY), true);
}
diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp
index b0da4471..62c445ad 100644
--- a/kalarm/editdlg.cpp
+++ b/kalarm/editdlg.cpp
@@ -1954,8 +1954,8 @@ bool EditAlarmDlg::checkText(TQString& result, bool showErrorMessage) const
url = alarmtext;
url.cleanPath();
alarmtext = url.prettyURL();
- KIO::UDSEntry uds;
- if (!KIO::NetAccess::stat(url, uds, MainWindow::mainMainWindow()))
+ TDEIO::UDSEntry uds;
+ if (!TDEIO::NetAccess::stat(url, uds, MainWindow::mainMainWindow()))
err = NONEXISTENT;
else
{
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index da43fdad..4723c342 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -745,7 +745,7 @@ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString
*/
bool readConfigWindowSize(const char* window, TQSize& result)
{
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
config->setGroup(TQString::fromLatin1(window));
TQWidget* desktop = TQT_TQWIDGET(TDEApplication::desktop());
TQSize s = TQSize(config->readNumEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), 0),
@@ -762,7 +762,7 @@ bool readConfigWindowSize(const char* window, TQSize& result)
*/
void writeConfigWindowSize(const char* window, const TQSize& size)
{
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
config->setGroup(TQString::fromLatin1(window));
TQWidget* desktop = TQT_TQWIDGET(TDEApplication::desktop());
config->writeEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), size.width());
diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
index 1d315e34..29f498fc 100644
--- a/kalarm/kalarmapp.cpp
+++ b/kalarm/kalarmapp.cpp
@@ -120,7 +120,7 @@ KAlarmApp::KAlarmApp()
{
connect(AlarmCalendar::expiredCalendar(), TQT_SIGNAL(purged()), TQT_SLOT(slotExpiredPurged()));
- KConfig* config = kapp->config();
+ TDEConfig* config = kapp->config();
config->setGroup(TQString::fromLatin1("General"));
mNoSystemTray = config->readBoolEntry(TQString::fromLatin1("NoSystemTray"), false);
mSavedNoSystemTray = mNoSystemTray;
@@ -1042,7 +1042,7 @@ bool KAlarmApp::checkSystemTray()
// daemon with the correct NOTIFY type. If that happened when there was no system
// tray and alarms are disabled when KAlarm is not running, registering with
// NO_START_NOTIFY could result in alarms never being seen.
- KConfig* config = kapp->config();
+ TDEConfig* config = kapp->config();
config->setGroup(TQString::fromLatin1("General"));
config->writeEntry(TQString::fromLatin1("NoSystemTray"), mNoSystemTray);
config->sync();
diff --git a/kalarm/kalarmd/adcalendar.cpp b/kalarm/kalarmd/adcalendar.cpp
index 3b9c9f55..db2e4e3d 100644
--- a/kalarm/kalarmd/adcalendar.cpp
+++ b/kalarm/kalarmd/adcalendar.cpp
@@ -95,13 +95,13 @@ bool ADCalendar::loadFile(bool reset)
mTempFileName = tempFile.name();
KURL dest;
dest.setPath(mTempFileName);
- KIO::FileCopyJob* job = KIO::file_copy(url, dest, -1, true);
- connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotDownloadJobResult(KIO::Job*)));
+ TDEIO::FileCopyJob* job = TDEIO::file_copy(url, dest, -1, true);
+ connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotDownloadJobResult(TDEIO::Job*)));
}
return true;
}
-void ADCalendar::slotDownloadJobResult(KIO::Job *job)
+void ADCalendar::slotDownloadJobResult(TDEIO::Job *job)
{
if (job->error())
{
diff --git a/kalarm/kalarmd/adcalendar.h b/kalarm/kalarmd/adcalendar.h
index 965be105..bbc96214 100644
--- a/kalarm/kalarmd/adcalendar.h
+++ b/kalarm/kalarmd/adcalendar.h
@@ -22,7 +22,7 @@
#define ADCALENDAR_H
#include <libkcal/calendarlocal.h>
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
class ADCalendar;
@@ -72,7 +72,7 @@ class ADCalendar : public KCal::CalendarLocal
ADCalendar(const TQString& url, const TQCString& appname);
private slots:
- void slotDownloadJobResult(KIO::Job*);
+ void slotDownloadJobResult(TDEIO::Job*);
private:
struct EventKey
diff --git a/kalarm/kalarmd/adconfigdata.cpp b/kalarm/kalarmd/adconfigdata.cpp
index e6211076..0253e320 100644
--- a/kalarm/kalarmd/adconfigdata.cpp
+++ b/kalarm/kalarmd/adconfigdata.cpp
@@ -48,7 +48,7 @@ void ADConfigData::readConfig()
{
kdDebug(5900) << "ADConfigData::readConfig()" << endl;
ClientInfo::clear();
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
TQStringList clients = config->groupList().grep(CLIENT_GROUP_SEARCH);
for (TQStringList::Iterator cl = clients.begin(); cl != clients.end(); ++cl)
{
@@ -101,7 +101,7 @@ void ADConfigData::readConfig()
*/
void ADConfigData::writeClient(const TQCString& appName, const ClientInfo* cinfo)
{
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
config->setGroup(CLIENT_GROUP + TQString::fromLocal8Bit(appName));
config->writeEntry(TITLE_KEY, cinfo->title());
config->writeEntry(DCOP_OBJECT_KEY, TQString(TQString::fromLocal8Bit(cinfo->dcopObject())));
@@ -115,7 +115,7 @@ void ADConfigData::writeClient(const TQCString& appName, const ClientInfo* cinfo
*/
void ADConfigData::removeClient(const TQCString& appName)
{
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
config->deleteGroup(CLIENT_GROUP + TQString::fromLocal8Bit(appName));
config->sync();
}
@@ -125,7 +125,7 @@ void ADConfigData::removeClient(const TQCString& appName)
*/
void ADConfigData::setCalendar(const TQCString& appName, ADCalendar* cal)
{
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
config->setGroup(CLIENT_GROUP + TQString::fromLocal8Bit(appName));
config->writePathEntry(CALENDAR_KEY, cal->urlString());
config->sync();
@@ -137,7 +137,7 @@ void ADConfigData::setCalendar(const TQCString& appName, ADCalendar* cal)
void ADConfigData::enableAutoStart(bool on)
{
kdDebug(5900) << "ADConfigData::enableAutoStart(" << on << ")\n";
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
config->reparseConfiguration();
config->setGroup(TQString::fromLatin1(DAEMON_AUTOSTART_SECTION));
config->writeEntry(TQString::fromLatin1(DAEMON_AUTOSTART_KEY), on);
diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp
index 8fd34b11..75bb4d2d 100644
--- a/kalarm/kalarmd/alarmdaemon.cpp
+++ b/kalarm/kalarmd/alarmdaemon.cpp
@@ -83,7 +83,7 @@ AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name)
* come in the wrong order, KAlarm won't know that it is supposed to restore
* itself and instead will simply open a new window.
*/
- KConfig kaconfig(locate("config", "kalarmrc"));
+ TDEConfig kaconfig(locate("config", "kalarmrc"));
kaconfig.setGroup(TQString::fromLatin1("General"));
autostart = kaconfig.readBoolEntry(AUTOSTART_TRAY, false);
if (autostart)
@@ -594,7 +594,7 @@ void AlarmDaemon::notifyCalStatus(const ADCalendar* cal)
*/
void AlarmDaemon::readKAlarmConfig()
{
- KConfig config(locate("config", "kalarmrc"));
+ TDEConfig config(locate("config", "kalarmrc"));
config.setGroup(TQString::fromLatin1("General"));
TQDateTime defTime(TQDate(1900,1,1), TQTime());
mStartOfDay = config.readDateTimeEntry(START_OF_DAY, &defTime).time();
diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp
index a9eabaf4..e0c50d3c 100644
--- a/kalarm/kamail.cpp
+++ b/kalarm/kamail.cpp
@@ -443,8 +443,8 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event)
TQString attachment = (*at).local8Bit();
KURL url(attachment);
url.cleanPath();
- KIO::UDSEntry uds;
- if (!KIO::NetAccess::stat(url, uds, MainWindow::mainMainWindow())) {
+ TDEIO::UDSEntry uds;
+ if (!TDEIO::NetAccess::stat(url, uds, MainWindow::mainMainWindow())) {
kdError(5950) << "KAMail::appendBodyAttachments(): not found: " << attachment << endl;
return i18n("Attachment not found:\n%1").arg(attachment);
}
@@ -470,7 +470,7 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event)
// Read the file contents
TQString tmpFile;
- if (!KIO::NetAccess::download(url, tmpFile, MainWindow::mainMainWindow())) {
+ if (!TDEIO::NetAccess::download(url, tmpFile, MainWindow::mainMainWindow())) {
kdError(5950) << "KAMail::appendBodyAttachments(): load failure: " << attachment << endl;
return attachError.arg(attachment);
}
@@ -831,8 +831,8 @@ int KAMail::checkAttachment(TQString& attachment, KURL* url)
*/
bool KAMail::checkAttachment(const KURL& url)
{
- KIO::UDSEntry uds;
- if (!KIO::NetAccess::stat(url, uds, MainWindow::mainMainWindow()))
+ TDEIO::UDSEntry uds;
+ if (!TDEIO::NetAccess::stat(url, uds, MainWindow::mainMainWindow()))
return false; // doesn't exist
KFileItem fi(uds, url);
if (fi.isDir() || !fi.isReadable())
diff --git a/kalarm/lib/messagebox.cpp b/kalarm/lib/messagebox.cpp
index c58287be..721ee5ea 100644
--- a/kalarm/lib/messagebox.cpp
+++ b/kalarm/lib/messagebox.cpp
@@ -23,7 +23,7 @@
#include "messagebox.h"
-KConfig* MessageBox::mConfig = 0;
+TDEConfig* MessageBox::mConfig = 0;
TQMap<TQString, KMessageBox::ButtonCode> MessageBox::mContinueDefaults;
@@ -108,7 +108,7 @@ bool MessageBox::setDefaultShouldBeShownContinue(const TQString& dontShowAgainNa
if (dontShowAgainName.isEmpty())
return false;
// First check whether there is an existing setting
- KConfig* config = mConfig ? mConfig : TDEGlobal::config();
+ TDEConfig* config = mConfig ? mConfig : TDEGlobal::config();
config->setGroup(TQString::fromLatin1("Notification Messages"));
if (config->hasKey(dontShowAgainName))
return false;
@@ -167,7 +167,7 @@ void MessageBox::saveDontShowAgain(const TQString& dontShowAgainName, bool yesno
{
if (dontShowAgainName.isEmpty())
return;
- KConfig* config = mConfig ? mConfig : TDEGlobal::config();
+ TDEConfig* config = mConfig ? mConfig : TDEGlobal::config();
config->setGroup(TQString::fromLatin1("Notification Messages"));
bool global = (dontShowAgainName[0] == ':');
if (yesno)
diff --git a/kalarm/lib/messagebox.h b/kalarm/lib/messagebox.h
index 7a84cf20..b0cae293 100644
--- a/kalarm/lib/messagebox.h
+++ b/kalarm/lib/messagebox.h
@@ -113,12 +113,12 @@ class MessageBox : public KMessageBox
* @param dontShow If true, the message box will be suppressed and will return Continue.
*/
static void saveDontShowAgainContinue(const TQString& dontShowAgainName, bool dontShow = true);
- /** Sets the KConfig object to be used by the MessageBox class. */
- static void setDontShowAskAgainConfig(KConfig* cfg) { mConfig = cfg; }
+ /** Sets the TDEConfig object to be used by the MessageBox class. */
+ static void setDontShowAskAgainConfig(TDEConfig* cfg) { mConfig = cfg; }
private:
static void saveDontShowAgain(const TQString& dontShowAgainName, bool yesno, bool dontShow, const char* yesnoResult = 0);
- static KConfig* mConfig;
+ static TDEConfig* mConfig;
static TQMap<TQString, ButtonCode> mContinueDefaults;
};
diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp
index e4462db5..765678c6 100644
--- a/kalarm/mainwindow.cpp
+++ b/kalarm/mainwindow.cpp
@@ -125,7 +125,7 @@ MainWindow::MainWindow(bool restored)
kdDebug(5950) << "MainWindow::MainWindow()\n";
setAutoSaveSettings(TQString::fromLatin1(WINDOW_NAME)); // save window sizes etc.
setPlainCaption(kapp->aboutData()->programName());
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
config->setGroup(VIEW_GROUP);
mShowExpired = config->readBoolEntry(SHOW_ARCHIVED_KEY, false);
mShowTime = config->readBoolEntry(SHOW_TIME_KEY, true);
@@ -199,7 +199,7 @@ MainWindow::~MainWindow()
* Save settings to the session managed config file, for restoration
* when the program is restored.
*/
-void MainWindow::saveProperties(KConfig* config)
+void MainWindow::saveProperties(TDEConfig* config)
{
config->writeEntry(TQString::fromLatin1("HiddenTrayParent"), isTrayParent() && isHidden());
config->writeEntry(TQString::fromLatin1("ShowExpired"), mShowExpired);
@@ -212,7 +212,7 @@ void MainWindow::saveProperties(KConfig* config)
* This function is automatically called whenever the app is being
* restored. Read in whatever was saved in saveProperties().
*/
-void MainWindow::readProperties(KConfig* config)
+void MainWindow::readProperties(TDEConfig* config)
{
mHiddenTrayParent = config->readBoolEntry(TQString::fromLatin1("HiddenTrayParent"));
mShowExpired = config->readBoolEntry(TQString::fromLatin1("ShowExpired"));
@@ -314,7 +314,7 @@ void MainWindow::hideEvent(TQHideEvent* he)
*/
void MainWindow::columnsReordered()
{
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
config->setGroup(TQString::fromLatin1(WINDOW_NAME));
config->writeEntry(TQString::fromLatin1("ColumnOrder"), mListView->columnOrder());
config->sync();
@@ -792,7 +792,7 @@ void MainWindow::slotShowTime()
else
{
mListView->selectTimeColumns(mShowTime, mShowTimeTo);
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
config->setGroup(VIEW_GROUP);
config->writeEntry(SHOW_TIME_KEY, mShowTime);
config->writeEntry(SHOW_TIME_TO_KEY, mShowTimeTo);
@@ -811,7 +811,7 @@ void MainWindow::slotShowTimeTo()
else
{
mListView->selectTimeColumns(mShowTime, mShowTimeTo);
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
config->setGroup(VIEW_GROUP);
config->writeEntry(SHOW_TIME_KEY, mShowTime);
config->writeEntry(SHOW_TIME_TO_KEY, mShowTimeTo);
@@ -829,7 +829,7 @@ void MainWindow::slotShowExpired()
mActionShowExpired->setToolTip(mShowExpired ? i18n_HideExpiredAlarms() : i18n_ShowExpiredAlarms());
mListView->showExpired(mShowExpired);
mListView->refresh();
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
config->setGroup(VIEW_GROUP);
config->writeEntry(SHOW_ARCHIVED_KEY, mShowExpired);
}
diff --git a/kalarm/mainwindow.h b/kalarm/mainwindow.h
index d8ca5181..47a02447 100644
--- a/kalarm/mainwindow.h
+++ b/kalarm/mainwindow.h
@@ -87,8 +87,8 @@ class MainWindow : public MainWindowBase
virtual void closeEvent(TQCloseEvent*);
virtual void dragEnterEvent(TQDragEnterEvent*);
virtual void dropEvent(TQDropEvent*);
- virtual void saveProperties(KConfig*);
- virtual void readProperties(KConfig*);
+ virtual void saveProperties(TDEConfig*);
+ virtual void readProperties(TDEConfig*);
private slots:
void slotNew();
diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp
index 3e63853e..0315b8f4 100644
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@ -348,7 +348,7 @@ void MessageWin::initView()
bool dir = false;
TQString tmpFile;
KURL url(mMessage);
- if (KIO::NetAccess::download(url, tmpFile, MainWindow::mainMainWindow()))
+ if (TDEIO::NetAccess::download(url, tmpFile, MainWindow::mainMainWindow()))
{
TQFile qfile(tmpFile);
TQFileInfo info(qfile);
@@ -368,12 +368,12 @@ void MessageWin::initView()
view->resize(TQSize(h, h).expandedTo(view->sizeHint()));
TQWhatsThis::add(view, i18n("The contents of the file to be displayed"));
}
- KIO::NetAccess::removeTempFile(tmpFile);
+ TDEIO::NetAccess::removeTempFile(tmpFile);
}
if (!opened)
{
// File couldn't be opened
- bool exists = KIO::NetAccess::exists(url, true, MainWindow::mainMainWindow());
+ bool exists = TDEIO::NetAccess::exists(url, true, MainWindow::mainMainWindow());
mErrorMsgs += dir ? i18n("File is a folder") : exists ? i18n("Failed to open file") : i18n("File not found");
}
break;
@@ -658,7 +658,7 @@ void MessageWin::setRemainingTextMinute()
* Save settings to the session managed config file, for restoration
* when the program is restored.
*/
-void MessageWin::saveProperties(KConfig* config)
+void MessageWin::saveProperties(TDEConfig* config)
{
if (mShown && !mErrorWindow)
{
@@ -701,7 +701,7 @@ void MessageWin::saveProperties(KConfig* config)
* This function is automatically called whenever the app is being restored.
* Read in whatever was saved in saveProperties().
*/
-void MessageWin::readProperties(KConfig* config)
+void MessageWin::readProperties(TDEConfig* config)
{
mInvalid = config->readBoolEntry(TQString::fromLatin1("Invalid"), false);
mEventID = config->readEntry(TQString::fromLatin1("EventID"));
@@ -853,8 +853,8 @@ void MessageWin::slotPlayAudio()
// First check that it exists, to avoid possible crashes if the filename is badly specified
MainWindow* mmw = MainWindow::mainMainWindow();
KURL url(mAudioFile);
- if (!url.isValid() || !KIO::NetAccess::exists(url, true, mmw)
- || !KIO::NetAccess::download(url, mLocalAudioFile, mmw))
+ if (!url.isValid() || !TDEIO::NetAccess::exists(url, true, mmw)
+ || !TDEIO::NetAccess::download(url, mLocalAudioFile, mmw))
{
kdError(5950) << "MessageWin::playAudio(): Open failure: " << mAudioFile << endl;
if (!haveErrorMessage(ErrMsg_AudioFile))
@@ -1057,7 +1057,7 @@ void MessageWin::stopPlay()
delete mArtsDispatcher; mArtsDispatcher = 0;
if (!mLocalAudioFile.isEmpty())
{
- KIO::NetAccess::removeTempFile(mLocalAudioFile); // removes it only if it IS a temporary file
+ TDEIO::NetAccess::removeTempFile(mLocalAudioFile); // removes it only if it IS a temporary file
mLocalAudioFile = TQString();
}
if (mSilenceButton)
diff --git a/kalarm/messagewin.h b/kalarm/messagewin.h
index 03deea6b..96f8b1f9 100644
--- a/kalarm/messagewin.h
+++ b/kalarm/messagewin.h
@@ -66,8 +66,8 @@ class MessageWin : public MainWindowBase
virtual void moveEvent(TQMoveEvent*);
virtual void resizeEvent(TQResizeEvent*);
virtual void closeEvent(TQCloseEvent*);
- virtual void saveProperties(KConfig*);
- virtual void readProperties(KConfig*);
+ virtual void saveProperties(TDEConfig*);
+ virtual void readProperties(TDEConfig*);
private slots:
void slotEdit();
diff --git a/kalarm/preferences.cpp b/kalarm/preferences.cpp
index c77c72f1..24669fbe 100644
--- a/kalarm/preferences.cpp
+++ b/kalarm/preferences.cpp
@@ -37,7 +37,7 @@
#include "preferences.moc"
-static TQString translateXTermPath(KConfig*, const TQString& cmdline, bool write);
+static TQString translateXTermPath(TDEConfig*, const TQString& cmdline, bool write);
Preferences* Preferences::mInstance = 0;
@@ -252,7 +252,7 @@ void Preferences::read()
{
initialise();
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
config->setGroup(GENERAL_SECTION);
TQStringList cols = config->readListEntry(MESSAGE_COLOURS);
if (!cols.count())
@@ -358,7 +358,7 @@ void Preferences::read()
*/
void Preferences::save(bool syncToDisc)
{
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
config->setGroup(GENERAL_SECTION);
config->writeEntry(VERSION_NUM, KALARM_VERSION);
TQStringList colours;
@@ -433,7 +433,7 @@ void Preferences::syncToDisc()
void Preferences::updateStartOfDayCheck()
{
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
config->setGroup(GENERAL_SECTION);
config->writeEntry(START_OF_DAY_CHECK, startOfDayCheck());
config->sync();
@@ -549,7 +549,7 @@ bool Preferences::notifying(const TQString& messageID)
*/
void Preferences::convertOldPrefs()
{
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
config->setGroup(GENERAL_SECTION);
int version = KAlarm::getVersionNumber(config->readEntry(VERSION_NUM));
if (version >= KAlarm::Version(1,4,22))
@@ -647,11 +647,11 @@ void Preferences::convertOldPrefs()
* Note that only a home directory specification at the start of the path is
* translated, so there's no need to worry about missing out some of the
* executable's path due to quotes etc.
-* N.B. Calling KConfig::read/writePathEntry() on the entire command line
+* N.B. Calling TDEConfig::read/writePathEntry() on the entire command line
* causes a crash on some systems, so it's necessary to extract the
* executable path first before processing.
*/
-TQString translateXTermPath(KConfig* config, const TQString& cmdline, bool write)
+TQString translateXTermPath(TDEConfig* config, const TQString& cmdline, bool write)
{
TQString params;
TQString cmd = cmdline;
diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp
index bb89711a..1f386f30 100644
--- a/kalarm/sounddlg.cpp
+++ b/kalarm/sounddlg.cpp
@@ -295,8 +295,8 @@ void SoundDlg::playSound()
return;
KURL url(mFileName);
MainWindow* mmw = MainWindow::mainMainWindow();
- if (!url.isValid() || !KIO::NetAccess::exists(url, true, mmw)
- || !KIO::NetAccess::download(url, mLocalAudioFile, mmw))
+ if (!url.isValid() || !TDEIO::NetAccess::exists(url, true, mmw)
+ || !TDEIO::NetAccess::download(url, mLocalAudioFile, mmw))
{
kdError(5950) << "SoundDlg::playAudio(): Open failure: " << mFileName << endl;
KMessageBox::error(this, i18n("Cannot open audio file:\n%1").arg(mFileName));
@@ -369,7 +369,7 @@ void SoundDlg::stopPlay()
delete mPlayTimer; mPlayTimer = 0;
if (!mLocalAudioFile.isEmpty())
{
- KIO::NetAccess::removeTempFile(mLocalAudioFile); // removes it only if it IS a temporary file
+ TDEIO::NetAccess::removeTempFile(mLocalAudioFile); // removes it only if it IS a temporary file
mLocalAudioFile = TQString();
}
mFilePlay->setPixmap(SmallIcon("player_play"));
@@ -400,7 +400,7 @@ bool SoundDlg::checkFile()
{
// It's an absolute path or URL.
// Only allow local files for KAudioPlayer.
- if (url.isLocalFile() && KIO::NetAccess::exists(url, true, this))
+ if (url.isLocalFile() && TDEIO::NetAccess::exists(url, true, this))
{
mFileName = url.path();
return true;
@@ -425,7 +425,7 @@ bool SoundDlg::checkFile()
{
url.setPath(*it);
url.addPath(mFileName);
- if (KIO::NetAccess::exists(url, true, this))
+ if (TDEIO::NetAccess::exists(url, true, this))
{
mFileName = url.path();
return true;
@@ -435,7 +435,7 @@ bool SoundDlg::checkFile()
}
url.setPath(TQDir::homeDirPath());
url.addPath(mFileName);
- if (KIO::NetAccess::exists(url, true, this))
+ if (TDEIO::NetAccess::exists(url, true, this))
{
mFileName = url.path();
return true;
diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp
index 6fb5fc2a..f7c29d0c 100644
--- a/kandy/src/kandy.cpp
+++ b/kandy/src/kandy.cpp
@@ -88,7 +88,7 @@ Kandy::Kandy(CommandScheduler *scheduler)
connect(mView,TQT_SIGNAL(modifiedChanged(bool)),TQT_SLOT(setTitle()));
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("General");
TQString currentProfile = config->readEntry("CurrentProfile",
locate("appdata","default.kandy"));
@@ -148,14 +148,14 @@ void Kandy::setupActions()
createGUI();
}
-void Kandy::saveProperties(KConfig */*config*/)
+void Kandy::saveProperties(TDEConfig */*config*/)
{
// the 'config' object points to the session managed
// config file. anything you write here will be available
// later when this app is restored
}
-void Kandy::readProperties(KConfig */*config*/)
+void Kandy::readProperties(TDEConfig */*config*/)
{
// the 'config' object points to the session managed
// config file. this function is automatically called whenever
diff --git a/kandy/src/kandy.h b/kandy/src/kandy.h
index 8a2cd0b3..05bd39b3 100644
--- a/kandy/src/kandy.h
+++ b/kandy/src/kandy.h
@@ -91,14 +91,14 @@ class Kandy : public KMainWindow
* This function is called when it is time for the app to save its
* properties for session management purposes.
*/
- void saveProperties(KConfig *);
+ void saveProperties(TDEConfig *);
/**
- * This function is called when this app is restored. The KConfig
+ * This function is called when this app is restored. The TDEConfig
* object points to the session management config file that was saved
* with @ref saveProperties
*/
- void readProperties(KConfig *);
+ void readProperties(TDEConfig *);
private slots:
diff --git a/kandy/src/kandyview.cpp b/kandy/src/kandyview.cpp
index 662802f5..99336c92 100644
--- a/kandy/src/kandyview.cpp
+++ b/kandy/src/kandyview.cpp
@@ -283,7 +283,7 @@ bool KandyView::loadFile(const TQString& filename)
new CommandItem(mCommandList,cmds->at(i));
}
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("General");
config->writeEntry("CurrentProfile",filename);
@@ -296,7 +296,7 @@ bool KandyView::saveFile(const TQString& filename)
{
if (!mScheduler->saveProfile(filename)) return false;
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("General");
config->writeEntry("CurrentProfile",filename);
diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp
index 9a800306..318b3eaa 100644
--- a/kandy/src/mobilemain.cpp
+++ b/kandy/src/mobilemain.cpp
@@ -86,14 +86,14 @@ void MobileMain::setupActions()
createGUI("kandymobileui.rc");
}
-void MobileMain::saveProperties(KConfig */*config*/)
+void MobileMain::saveProperties(TDEConfig */*config*/)
{
// the 'config' object points to the session managed
// config file. anything you write here will be available
// later when this app is restored
}
-void MobileMain::readProperties(KConfig */*config*/)
+void MobileMain::readProperties(TDEConfig */*config*/)
{
// the 'config' object points to the session managed
// config file. this function is automatically called whenever
diff --git a/kandy/src/mobilemain.h b/kandy/src/mobilemain.h
index 7c7c4845..eeff40bb 100644
--- a/kandy/src/mobilemain.h
+++ b/kandy/src/mobilemain.h
@@ -78,14 +78,14 @@ class MobileMain : public KMainWindow
* This function is called when it is time for the app to save its
* properties for session management purposes.
*/
- void saveProperties(KConfig *);
+ void saveProperties(TDEConfig *);
/**
- * This function is called when this app is restored. The KConfig
+ * This function is called when this app is restored. The TDEConfig
* object points to the session management config file that was saved
* with @ref saveProperties
*/
- void readProperties(KConfig *);
+ void readProperties(TDEConfig *);
private slots:
diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp
index 85c1bab4..bda5831b 100644
--- a/karm/karmstorage.cpp
+++ b/karm/karmstorage.cpp
@@ -686,7 +686,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview,
TQTextStream *stream=tmpFile.textStream();
*stream << retval;
tmpFile.close();
- if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::fromLatin1("Could not upload");
+ if (!TDEIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::fromLatin1("Could not upload");
}
}
@@ -1043,7 +1043,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview,
TQTextStream *stream=tmpFile.textStream();
*stream << retval;
tmpFile.close();
- if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::fromLatin1("Could not upload");
+ if (!TDEIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::fromLatin1("Could not upload");
}
}
return err;
diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index 73892442..c7e717e4 100644
--- a/karm/mainwindow.cpp
+++ b/karm/mainwindow.cpp
@@ -214,14 +214,14 @@ void MainWindow::starStatusBar()
statusBar()->insertItem( i18n("Total" ), 1, 0, true );
}
-void MainWindow::saveProperties( KConfig* cfg )
+void MainWindow::saveProperties( TDEConfig* cfg )
{
_taskView->stopAllTimers();
_taskView->save();
cfg->writeEntry( "WindowShown", isVisible());
}
-void MainWindow::readProperties( KConfig* cfg )
+void MainWindow::readProperties( TDEConfig* cfg )
{
if( cfg->readBoolEntry( "WindowShown", true ))
show();
@@ -440,7 +440,7 @@ void MainWindow::loadGeometry()
if (initialGeometrySet()) setAutoSaveSettings();
else
{
- KConfig &config = *kapp->config();
+ TDEConfig &config = *kapp->config();
config.setGroup( TQString::fromLatin1("Main Window Geometry") );
int w = config.readNumEntry( TQString::fromLatin1("Width"), 100 );
@@ -454,7 +454,7 @@ void MainWindow::loadGeometry()
void MainWindow::saveGeometry()
{
- KConfig &config = *TDEGlobal::config();
+ TDEConfig &config = *TDEGlobal::config();
config.setGroup( TQString::fromLatin1("Main Window Geometry"));
config.writeEntry( TQString::fromLatin1("Width"), width());
config.writeEntry( TQString::fromLatin1("Height"), height());
diff --git a/karm/mainwindow.h b/karm/mainwindow.h
index d5a53a20..366af3d7 100644
--- a/karm/mainwindow.h
+++ b/karm/mainwindow.h
@@ -109,8 +109,8 @@ class MainWindow : public KParts::MainWindow, virtual public KarmDCOPIface
protected:
void starStatusBar();
- virtual void saveProperties( KConfig* );
- virtual void readProperties( KConfig* );
+ virtual void saveProperties( TDEConfig* );
+ virtual void readProperties( TDEConfig* );
void saveGeometry();
void loadGeometry();
bool queryClose();
diff --git a/karm/preferences.cpp b/karm/preferences.cpp
index 6544931a..1dd13625 100644
--- a/karm/preferences.cpp
+++ b/karm/preferences.cpp
@@ -251,7 +251,7 @@ TQString Preferences::userRealName() const { return _userRealNa
//---------------------------------------------------------------------------
void Preferences::load()
{
- KConfig &config = *kapp->config();
+ TDEConfig &config = *kapp->config();
config.setGroup( TQString::fromLatin1("Idle detection") );
_doIdleDetectionV = config.readBoolEntry( TQString::fromLatin1("enabled"),
@@ -286,7 +286,7 @@ void Preferences::load()
void Preferences::save()
{
- KConfig &config = *TDEGlobal::config();
+ TDEConfig &config = *TDEGlobal::config();
config.setGroup( TQString::fromLatin1("Idle detection"));
config.writeEntry( TQString::fromLatin1("enabled"), _doIdleDetectionV);
@@ -311,23 +311,23 @@ void Preferences::save()
config.sync();
}
-// HACK: this entire config dialog should be upgraded to KConfigXT
+// HACK: this entire config dialog should be upgraded to TDEConfigXT
bool Preferences::readBoolEntry( const TQString& key )
{
- KConfig &config = *TDEGlobal::config();
+ TDEConfig &config = *TDEGlobal::config();
return config.readBoolEntry ( key, true );
}
void Preferences::writeEntry( const TQString &key, bool value)
{
- KConfig &config = *TDEGlobal::config();
+ TDEConfig &config = *TDEGlobal::config();
config.writeEntry( key, value );
config.sync();
}
void Preferences::deleteEntry( const TQString &key )
{
- KConfig &config = *TDEGlobal::config();
+ TDEConfig &config = *TDEGlobal::config();
config.deleteEntry( key );
config.sync();
}
diff --git a/kioslaves/imap4/imap4.cc b/kioslaves/imap4/imap4.cc
index e17808a0..6654bb3d 100644
--- a/kioslaves/imap4/imap4.cc
+++ b/kioslaves/imap4/imap4.cc
@@ -96,7 +96,7 @@ extern "C" {
#define IMAP_PROTOCOL "imap"
#define IMAP_SSL_PROTOCOL "imaps"
-using namespace KIO;
+using namespace TDEIO;
extern "C"
{
@@ -768,14 +768,14 @@ void
IMAP4Protocol::setSubURL (const KURL & _url)
{
kdDebug(7116) << "IMAP4::setSubURL - " << _url.prettyURL() << endl;
- KIO::TCPSlaveBase::setSubURL (_url);
+ TDEIO::TCPSlaveBase::setSubURL (_url);
}
void
IMAP4Protocol::put (const KURL & _url, int, bool, bool)
{
kdDebug(7116) << "IMAP4::put - " << _url.prettyURL() << endl;
-// KIO::TCPSlaveBase::put(_url,permissions,overwrite,resume);
+// TDEIO::TCPSlaveBase::put(_url,permissions,overwrite,resume);
TQString aBox, aSequence, aLType, aSection, aValidity, aDelimiter, aInfo;
enum IMAP_TYPE aType =
parseURL (_url, aBox, aSection, aLType, aSequence, aValidity, aDelimiter, aInfo);
@@ -1823,7 +1823,7 @@ void
IMAP4Protocol::dispatch (int command, const TQByteArray & data)
{
kdDebug(7116) << "IMAP4::dispatch - command=" << command << endl;
- KIO::TCPSlaveBase::dispatch (command, data);
+ TDEIO::TCPSlaveBase::dispatch (command, data);
}
void
@@ -1884,7 +1884,7 @@ IMAP4Protocol::stat (const KURL & _url)
if (found)
error(ERR_COULD_NOT_STAT, aBox);
else
- error(KIO::ERR_DOES_NOT_EXIST, aBox);
+ error(TDEIO::ERR_DOES_NOT_EXIST, aBox);
return;
}
if ((aSection == "UIDNEXT" && geStatus().uidNextAvailable())
@@ -2126,7 +2126,7 @@ bool IMAP4Protocol::makeLogin ()
kdDebug(7116) << "IMAP4::makeLogin - attempting login" << endl;
- KIO::AuthInfo authInfo;
+ TDEIO::AuthInfo authInfo;
authInfo.username = myUser;
authInfo.password = myPass;
authInfo.prompt = i18n ("Username and password for your IMAP account:");
@@ -2143,21 +2143,21 @@ bool IMAP4Protocol::makeLogin ()
}
}
if (!clientLogin (myUser, myPass, resultInfo))
- error(KIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to login. Probably the "
+ error(TDEIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to login. Probably the "
"password is wrong.\nThe server %1 replied:\n%2").arg(myHost).arg(resultInfo));
}
else
{
#ifdef HAVE_LIBSASL2
if (!clientAuthenticate (this, authInfo, myHost, myAuth, mySSL, resultInfo))
- error(KIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to authenticate via %1.\n"
+ error(TDEIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to authenticate via %1.\n"
"The server %2 replied:\n%3").arg(myAuth).arg(myHost).arg(resultInfo));
else {
myUser = authInfo.username;
myPass = authInfo.password;
}
#else
- error(KIO::ERR_COULD_NOT_LOGIN, i18n("SASL authentication is not compiled into kio_imap4."));
+ error(TDEIO::ERR_COULD_NOT_LOGIN, i18n("SASL authentication is not compiled into kio_imap4."));
#endif
}
if ( hasCapability("NAMESPACE") )
@@ -2326,7 +2326,7 @@ IMAP4Protocol::doListEntry (const TQString & encodedUrl, int stretch, imapCache
atom.m_str = myUser;
entry.append (atom);
- atom.m_uds = KIO::UDS_ACCESS;
+ atom.m_uds = TDEIO::UDS_ACCESS;
atom.m_long = (withFlags) ? cache->getFlags() : S_IRUSR | S_IXUSR | S_IWUSR;
entry.append (atom);
@@ -2704,7 +2704,7 @@ IMAP4Protocol::assureBox (const TQString & aBox, bool readonly)
error(ERR_SLAVE_DEFINED, i18n("Unable to open folder %1. The server replied: %2").arg(aBox).arg(cmdInfo));
}
} else {
- error(KIO::ERR_DOES_NOT_EXIST, aBox);
+ error(TDEIO::ERR_DOES_NOT_EXIST, aBox);
}
return false;
}
@@ -2726,7 +2726,7 @@ IMAP4Protocol::assureBox (const TQString & aBox, bool readonly)
// if it is the mode we want
if (!getSelected().readWrite() && !readonly)
{
- error(KIO::ERR_CANNOT_OPEN_FOR_WRITING, aBox);
+ error(TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, aBox);
return false;
}
diff --git a/kioslaves/imap4/imap4.h b/kioslaves/imap4/imap4.h
index d03f8c0c..164cf855 100644
--- a/kioslaves/imap4/imap4.h
+++ b/kioslaves/imap4/imap4.h
@@ -45,7 +45,7 @@ enum IMAP_TYPE
/** @brief IOSlave derived class */
class IMAP4Protocol:public
- KIO::TCPSlaveBase,
+ TDEIO::TCPSlaveBase,
public
imapParser,
public
@@ -194,7 +194,7 @@ private:
TQByteArray outputCache;
TQBuffer outputBuffer;
TQ_ULONG outputBufferIndex;
- KIO::filesize_t mProcessedSize;
+ TDEIO::filesize_t mProcessedSize;
char readBuffer[IMAP_BUFFER];
ssize_t readBufferLen;
diff --git a/kioslaves/imap4/imapparser.cc b/kioslaves/imap4/imapparser.cc
index d7ad8697..8cb06e31 100644
--- a/kioslaves/imap4/imapparser.cc
+++ b/kioslaves/imap4/imapparser.cc
@@ -169,7 +169,7 @@ imapParser::clientLogin (const TQString & aUser, const TQString & aPass,
}
#ifdef HAVE_LIBSASL2
-static bool sasl_interact( KIO::SlaveBase *slave, KIO::AuthInfo &ai, void *in )
+static bool sasl_interact( TDEIO::SlaveBase *slave, TDEIO::AuthInfo &ai, void *in )
{
kdDebug(7116) << "sasl_interact" << endl;
sasl_interact_t *interact = ( sasl_interact_t * ) in;
@@ -215,7 +215,7 @@ static bool sasl_interact( KIO::SlaveBase *slave, KIO::AuthInfo &ai, void *in )
#endif
bool
-imapParser::clientAuthenticate ( KIO::SlaveBase *slave, KIO::AuthInfo &ai,
+imapParser::clientAuthenticate ( TDEIO::SlaveBase *slave, TDEIO::AuthInfo &ai,
const TQString & aFTQDN, const TQString & aAuth, bool isSSL, TQString & resultInfo)
{
bool retVal = false;
diff --git a/kioslaves/imap4/imapparser.h b/kioslaves/imap4/imapparser.h
index d24e9c81..7c498b09 100644
--- a/kioslaves/imap4/imapparser.h
+++ b/kioslaves/imap4/imapparser.h
@@ -248,7 +248,7 @@ public:
* @param resultInfo The resultinfo from the command
* @return success or failure
*/
- bool clientAuthenticate (KIO::SlaveBase *slave, KIO::AuthInfo &ai, const TQString & aFTQDN,
+ bool clientAuthenticate (TDEIO::SlaveBase *slave, TDEIO::AuthInfo &ai, const TQString & aFTQDN,
const TQString & aAuth, bool isSSL, TQString & resultInfo);
/**
diff --git a/kioslaves/mbox/mbox.cc b/kioslaves/mbox/mbox.cc
index 3d56c09f..0c4fca81 100644
--- a/kioslaves/mbox/mbox.cc
+++ b/kioslaves/mbox/mbox.cc
@@ -59,7 +59,7 @@ int kdemain( int argc, char * argv[] )
}
MBoxProtocol::MBoxProtocol( const TQCString& arg1, const TQCString& arg2 )
- : KIO::SlaveBase( "mbox2", arg1, arg2 ),
+ : TDEIO::SlaveBase( "mbox2", arg1, arg2 ),
m_errorState( true )
{
@@ -79,7 +79,7 @@ void MBoxProtocol::get( const KURL& url )
if( info.type() == UrlInfo::invalid && !m_errorState )
{
- error( KIO::ERR_DOES_NOT_EXIST, info.url() );
+ error( TDEIO::ERR_DOES_NOT_EXIST, info.url() );
return;
}
@@ -106,7 +106,7 @@ void MBoxProtocol::listDir( const KURL& url )
{
m_errorState = false;
- KIO::UDSEntry entry;
+ TDEIO::UDSEntry entry;
UrlInfo info( url, UrlInfo::directory );
ReadMBox mbox( &info, this, hasMetaData( "onlynew" ), hasMetaData( "savetime" ) );
@@ -115,7 +115,7 @@ void MBoxProtocol::listDir( const KURL& url )
if( info.type() != UrlInfo::directory )
{
- error( KIO::ERR_DOES_NOT_EXIST, info.url() );
+ error( TDEIO::ERR_DOES_NOT_EXIST, info.url() );
return;
}
@@ -126,7 +126,7 @@ void MBoxProtocol::listDir( const KURL& url )
listEntry( entry, false );
}
- listEntry( KIO::UDSEntry(), true );
+ listEntry( TDEIO::UDSEntry(), true );
finished();
}
@@ -135,7 +135,7 @@ void MBoxProtocol::stat( const KURL& url )
UrlInfo info( url );
if( info.type() == UrlInfo::invalid )
{
- error( KIO::ERR_DOES_NOT_EXIST, url.path() );
+ error( TDEIO::ERR_DOES_NOT_EXIST, url.path() );
return;
} else
{
@@ -154,7 +154,7 @@ void MBoxProtocol::mimetype( const KURL& url )
return;
if( info.type() == UrlInfo::invalid )
- error( KIO::ERR_DOES_NOT_EXIST, i18n( "Invalid URL" ) );
+ error( TDEIO::ERR_DOES_NOT_EXIST, i18n( "Invalid URL" ) );
else
mimeType( info.mimetype() );
finished();
diff --git a/kioslaves/mbox/mbox.h b/kioslaves/mbox/mbox.h
index 6d207ab3..159c4213 100644
--- a/kioslaves/mbox/mbox.h
+++ b/kioslaves/mbox/mbox.h
@@ -28,11 +28,11 @@ class KURL;
* This class is the main class and implements all function
* which can be called through the user.
*/
-class MBoxProtocol : public KIO::SlaveBase
+class MBoxProtocol : public TDEIO::SlaveBase
{
public:
/**
- * Constructor, for the parameters, See KIO::SlaveBase
+ * Constructor, for the parameters, See TDEIO::SlaveBase
*/
MBoxProtocol( const TQCString&, const TQCString& );
/**
diff --git a/kioslaves/mbox/readmbox.cc b/kioslaves/mbox/readmbox.cc
index 280bb461..3125fd74 100644
--- a/kioslaves/mbox/readmbox.cc
+++ b/kioslaves/mbox/readmbox.cc
@@ -53,14 +53,14 @@ ReadMBox::ReadMBox( const UrlInfo* info, MBoxProtocol* parent, bool onlynew, boo
{
if( m_info->type() == UrlInfo::invalid )
- m_mbox->emitError( KIO::ERR_DOES_NOT_EXIST, info->url() );
+ m_mbox->emitError( TDEIO::ERR_DOES_NOT_EXIST, info->url() );
if( !open( savetime ) )
- m_mbox->emitError( KIO::ERR_CANNOT_OPEN_FOR_READING, info->url() );
+ m_mbox->emitError( TDEIO::ERR_CANNOT_OPEN_FOR_READING, info->url() );
if( m_info->type() == UrlInfo::message )
if( !searchMessage( m_info->id() ) )
- m_mbox->emitError( KIO::ERR_DOES_NOT_EXIST, info->url() );
+ m_mbox->emitError( TDEIO::ERR_DOES_NOT_EXIST, info->url() );
}
ReadMBox::~ReadMBox()
diff --git a/kioslaves/mbox/stat.cc b/kioslaves/mbox/stat.cc
index 00285b14..c5d9a3bd 100644
--- a/kioslaves/mbox/stat.cc
+++ b/kioslaves/mbox/stat.cc
@@ -26,20 +26,20 @@
#include <sys/stat.h>
-KIO::UDSEntry Stat::stat( const UrlInfo& info )
+TDEIO::UDSEntry Stat::stat( const UrlInfo& info )
{
if( info.type() == UrlInfo::message )
return Stat::statMessage( info );
else if( info.type() == UrlInfo::directory )
return Stat::statDirectory( info );
else
- return KIO::UDSEntry();
+ return TDEIO::UDSEntry();
}
-KIO::UDSEntry Stat::stat( ReadMBox& mbox, const UrlInfo& info )
+TDEIO::UDSEntry Stat::stat( ReadMBox& mbox, const UrlInfo& info )
{
kdDebug() << "Stat::stat()" << endl;
- KIO::UDSEntry entry;
+ TDEIO::UDSEntry entry;
TQString url;
if( info.type() == UrlInfo::invalid )
@@ -47,54 +47,54 @@ KIO::UDSEntry Stat::stat( ReadMBox& mbox, const UrlInfo& info )
else if( info.type() == UrlInfo::message )
mbox.searchMessage( info.id() );
- Stat::addAtom( entry, KIO::UDS_FILE_TYPE, S_IFREG );
- Stat::addAtom( entry, KIO::UDS_MIME_TYPE, "message/rfc822" );
+ Stat::addAtom( entry, TDEIO::UDS_FILE_TYPE, S_IFREG );
+ Stat::addAtom( entry, TDEIO::UDS_MIME_TYPE, "message/rfc822" );
url = TQString( "mbox:%1/%2" ).arg( info.filename(), mbox.currentID() );
- Stat::addAtom( entry, KIO::UDS_URL, url );
+ Stat::addAtom( entry, TDEIO::UDS_URL, url );
if( mbox.currentID().isEmpty() )
- Stat::addAtom( entry, KIO::UDS_NAME, "foobar" );
+ Stat::addAtom( entry, TDEIO::UDS_NAME, "foobar" );
else
- Stat::addAtom( entry, KIO::UDS_NAME, mbox.currentID() );
+ Stat::addAtom( entry, TDEIO::UDS_NAME, mbox.currentID() );
- Stat::addAtom( entry, KIO::UDS_SIZE, mbox.skipMessage() );
+ Stat::addAtom( entry, TDEIO::UDS_SIZE, mbox.skipMessage() );
return entry;
}
-KIO::UDSEntry Stat::statDirectory( const UrlInfo& info )
+TDEIO::UDSEntry Stat::statDirectory( const UrlInfo& info )
{
kdDebug() << "statDirectory()" << endl;
- KIO::UDSEntry entry;
+ TDEIO::UDSEntry entry;
//Specific things for a directory
- Stat::addAtom( entry, KIO::UDS_FILE_TYPE, S_IFDIR );
- Stat::addAtom( entry, KIO::UDS_NAME, info.filename() );
+ Stat::addAtom( entry, TDEIO::UDS_FILE_TYPE, S_IFDIR );
+ Stat::addAtom( entry, TDEIO::UDS_NAME, info.filename() );
return entry;
}
-KIO::UDSEntry Stat::statMessage( const UrlInfo& info )
+TDEIO::UDSEntry Stat::statMessage( const UrlInfo& info )
{
kdDebug() << "statMessage( " << info.url() << " )" << endl;
- KIO::UDSEntry entry;
+ TDEIO::UDSEntry entry;
TQString url = TQString( "mbox:%1" ).arg( info.url() );
//Specific things for a message
- Stat::addAtom( entry, KIO::UDS_FILE_TYPE, S_IFREG );
- Stat::addAtom( entry, KIO::UDS_MIME_TYPE, "message/rfc822" );
+ Stat::addAtom( entry, TDEIO::UDS_FILE_TYPE, S_IFREG );
+ Stat::addAtom( entry, TDEIO::UDS_MIME_TYPE, "message/rfc822" );
- Stat::addAtom( entry, KIO::UDS_URL, url );
+ Stat::addAtom( entry, TDEIO::UDS_URL, url );
url = url.right( url.length() - url.findRev( "/" ) - 1 );
- Stat::addAtom( entry, KIO::UDS_NAME, url );
+ Stat::addAtom( entry, TDEIO::UDS_NAME, url );
return entry;
}
-void Stat::addAtom( KIO::UDSEntry& entry, unsigned int uds, const TQString& str )
+void Stat::addAtom( TDEIO::UDSEntry& entry, unsigned int uds, const TQString& str )
{
- KIO::UDSAtom atom;
+ TDEIO::UDSAtom atom;
atom.m_uds = uds;
atom.m_str = str;
atom.m_long = 0;
@@ -103,9 +103,9 @@ void Stat::addAtom( KIO::UDSEntry& entry, unsigned int uds, const TQString& str
}
-void Stat::addAtom( KIO::UDSEntry& entry, unsigned int uds, long lng )
+void Stat::addAtom( TDEIO::UDSEntry& entry, unsigned int uds, long lng )
{
- KIO::UDSAtom atom;
+ TDEIO::UDSAtom atom;
atom.m_uds = uds;
atom.m_str = TQString();
atom.m_long = lng;
diff --git a/kioslaves/mbox/stat.h b/kioslaves/mbox/stat.h
index 3efbcaf6..8ce593cc 100644
--- a/kioslaves/mbox/stat.h
+++ b/kioslaves/mbox/stat.h
@@ -50,7 +50,7 @@ public:
* @param info The file information
* @return The information of the file as destribed in UrlInfo.
*/
- static KIO::UDSEntry stat( const UrlInfo& info );
+ static TDEIO::UDSEntry stat( const UrlInfo& info );
/**
* This function gives information with a given ReadMBox and UrlInfo.
* Through this, it is possible to ask the stats of the next message,
@@ -59,24 +59,24 @@ public:
* @param info The url information.
* @return The requesteds information.
*/
- static KIO::UDSEntry stat( ReadMBox& mbox, const UrlInfo& info );
+ static TDEIO::UDSEntry stat( ReadMBox& mbox, const UrlInfo& info );
/**
* This function gets the stats of a given mbox-file in an UDSEntry.
* @param info The location of the mbox-file.
* @return A list of Atoms.
*/
- static KIO::UDSEntry statDirectory( const UrlInfo& info );
+ static TDEIO::UDSEntry statDirectory( const UrlInfo& info );
/**
* This function gets the stats of a geven mbox-message in a UDSEntry.
* @param info The url of the mbox-message.
* @return Information shipped in an UDSEntry.
*/
- static KIO::UDSEntry statMessage( const UrlInfo& info );
+ static TDEIO::UDSEntry statMessage( const UrlInfo& info );
private:
- static void addAtom( KIO::UDSEntry& entry, unsigned int key, const TQString& value );
- static void addAtom( KIO::UDSEntry& entry, unsigned int key, const long value );
+ static void addAtom( TDEIO::UDSEntry& entry, unsigned int key, const TQString& value );
+ static void addAtom( TDEIO::UDSEntry& entry, unsigned int key, const long value );
};
#endif
diff --git a/kioslaves/opengroupware/opengroupware.cpp b/kioslaves/opengroupware/opengroupware.cpp
index 70ffd7dc..b4c19b71 100644
--- a/kioslaves/opengroupware/opengroupware.cpp
+++ b/kioslaves/opengroupware/opengroupware.cpp
@@ -193,9 +193,9 @@ void OpenGroupware::getCalendar( const KURL &_url )
kdDebug(7000) << "getCalendar: " << url.prettyURL() << endl;
// FIXME do progress handling
- mListEventsJob = KIO::davPropFind( url, props, "0", false );
- connect( mListEventsJob, TQT_SIGNAL( result( KIO::Job * ) ),
- TQT_SLOT( slotGetCalendarListingResult( KIO::Job * ) ) );
+ mListEventsJob = TDEIO::davPropFind( url, props, "0", false );
+ connect( mListEventsJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ TQT_SLOT( slotGetCalendarListingResult( TDEIO::Job * ) ) );
}
void OpenGroupware::getAddressbook( const KURL &url )
@@ -205,7 +205,7 @@ void OpenGroupware::getAddressbook( const KURL &url )
void OpenGroupware::errorMessage( const TQString &msg )
{
- error( KIO::ERR_SLAVE_DEFINED, msg );
+ error( TDEIO::ERR_SLAVE_DEFINED, msg );
}
void OpenGroupware::debugMessage( const TQString &msg )
@@ -218,7 +218,7 @@ void OpenGroupware::debugMessage( const TQString &msg )
}
-void OpenGroupware::slotGetCalendarListingResult( KIO::Job *job )
+void OpenGroupware::slotGetCalendarListingResult( TDEIO::Job *job )
{
kdDebug(7000) << k_funcinfo << endl;
@@ -242,7 +242,7 @@ void OpenGroupware::slotGetCalendarListingResult( KIO::Job *job )
}
-void OpenGroupware::slotGetCalendarResult( KIO::Job *job )
+void OpenGroupware::slotGetCalendarResult( TDEIO::Job *job )
{
Q_UNUSED( job );
}
diff --git a/kioslaves/opengroupware/opengroupware.h b/kioslaves/opengroupware/opengroupware.h
index 075af372..da104c8c 100644
--- a/kioslaves/opengroupware/opengroupware.h
+++ b/kioslaves/opengroupware/opengroupware.h
@@ -24,13 +24,13 @@
#include <tqobject.h>
-namespace KIO {
+namespace TDEIO {
class Job;
class DavJob;
}
-class OpenGroupware : public TQObject, public KIO::SlaveBase
+class OpenGroupware : public TQObject, public TDEIO::SlaveBase
{
Q_OBJECT
@@ -48,10 +48,10 @@ class OpenGroupware : public TQObject, public KIO::SlaveBase
void getCalendar( const KURL &url );
void getAddressbook( const KURL &url );
protected slots:
- void slotGetCalendarListingResult( KIO::Job* );
- void slotGetCalendarResult( KIO::Job* );
+ void slotGetCalendarListingResult( TDEIO::Job* );
+ void slotGetCalendarResult( TDEIO::Job* );
private:
- KIO::DavJob *mListEventsJob;
+ TDEIO::DavJob *mListEventsJob;
};
#endif
diff --git a/kioslaves/sieve/configure.in.in b/kioslaves/sieve/configure.in.in
index a722cfeb..ffc1b4b7 100644
--- a/kioslaves/sieve/configure.in.in
+++ b/kioslaves/sieve/configure.in.in
@@ -4,7 +4,7 @@ AC_ARG_ENABLE(broken-timsieved-workaround,
[versions <= 1.1.0 of the timsieved (part of the Cyrus
IMAP suite) do not interpret the HAVESPACE command of
the sieve protocol. This option makes the sieve
- KIO::Slave simply omit that command.])],
+ TDEIO::Slave simply omit that command.])],
[case "${enableval}" in
yes) AC_MSG_RESULT(yes)
need_broken_timsieved_support="yes" ;;
@@ -14,5 +14,5 @@ esac],[AC_MSG_RESULT(no)])
if test "$need_broken_timsieved_support" = "yes"; then
AC_SUBST(HAVE_BROKEN_TIMSIEVED)
- AC_DEFINE(HAVE_BROKEN_TIMSIEVED,1,[Define if the sieve KIO::Slave must be able to talk to timsieved <= 1.1.0])
+ AC_DEFINE(HAVE_BROKEN_TIMSIEVED,1,[Define if the sieve TDEIO::Slave must be able to talk to timsieved <= 1.1.0])
fi
diff --git a/kioslaves/sieve/sieve.cpp b/kioslaves/sieve/sieve.cpp
index 4e95c5a1..9d373c2a 100644
--- a/kioslaves/sieve/sieve.cpp
+++ b/kioslaves/sieve/sieve.cpp
@@ -77,7 +77,7 @@ static sasl_callback_t callbacks[] = {
static const unsigned int SIEVE_DEFAULT_RECIEVE_BUFFER = 512;
-using namespace KIO;
+using namespace TDEIO;
extern "C"
{
KDE_EXPORT int kdemain(int argc, char **argv)
@@ -441,7 +441,7 @@ void kio_sieveProtocol::disconnect(bool forcibly)
// This crashes under certain conditions as described in
// http://intevation.de/roundup/kolab/issue2442
- // Fixing KIO::TCPSlaveBase::atEnd() for !fd would also work but 3.x is on life support.
+ // Fixing TDEIO::TCPSlaveBase::atEnd() for !fd would also work but 3.x is on life support.
//if (!operationSuccessful())
// ksDebug() << "Server did not logout cleanly." << endl;
}
@@ -745,7 +745,7 @@ void kio_sieveProtocol::get(const KURL& url)
do {
// wait for data...
if ( !waitForResponse( 600 ) ) {
- error( KIO::ERR_SERVER_TIMEOUT, m_sServer );
+ error( TDEIO::ERR_SERVER_TIMEOUT, m_sServer );
disconnect( true );
return;
}
@@ -757,7 +757,7 @@ void kio_sieveProtocol::get(const KURL& url)
ssize_t this_recv_len = read( dat.data(), dat.size() );
if ( this_recv_len < 1 && !isConnectionValid() ) {
- error( KIO::ERR_CONNECTION_BROKEN, m_sServer );
+ error( TDEIO::ERR_CONNECTION_BROKEN, m_sServer );
disconnect( true );
return;
}
@@ -856,15 +856,15 @@ void kio_sieveProtocol::stat(const KURL& url)
if (filename.isEmpty()) {
UDSAtom atom;
- atom.m_uds = KIO::UDS_NAME;
+ atom.m_uds = TDEIO::UDS_NAME;
atom.m_str = "/";
entry.append(atom);
- atom.m_uds = KIO::UDS_FILE_TYPE;
+ atom.m_uds = TDEIO::UDS_FILE_TYPE;
atom.m_long = S_IFDIR;
entry.append(atom);
- atom.m_uds = KIO::UDS_ACCESS;
+ atom.m_uds = TDEIO::UDS_ACCESS;
atom.m_long = 0700;
entry.append(atom);
@@ -885,22 +885,22 @@ void kio_sieveProtocol::stat(const KURL& url)
entry.clear();
UDSAtom atom;
- atom.m_uds = KIO::UDS_NAME;
+ atom.m_uds = TDEIO::UDS_NAME;
atom.m_str = TQString::fromUtf8(r.getKey());
entry.append(atom);
- atom.m_uds = KIO::UDS_FILE_TYPE;
+ atom.m_uds = TDEIO::UDS_FILE_TYPE;
atom.m_long = S_IFREG;
entry.append(atom);
- atom.m_uds = KIO::UDS_ACCESS;
+ atom.m_uds = TDEIO::UDS_ACCESS;
if ( r.getExtra() == "ACTIVE" )
atom.m_long = 0700; // mark exec'able
else
atom.m_long = 0600;
entry.append(atom);
- atom.m_uds = KIO::UDS_MIME_TYPE;
+ atom.m_uds = TDEIO::UDS_MIME_TYPE;
atom.m_str = "application/sieve";
entry.append(atom);
@@ -937,22 +937,22 @@ void kio_sieveProtocol::listDir(const KURL& url)
entry.clear();
UDSAtom atom;
- atom.m_uds = KIO::UDS_NAME;
+ atom.m_uds = TDEIO::UDS_NAME;
atom.m_str = TQString::fromUtf8(r.getKey());
entry.append(atom);
- atom.m_uds = KIO::UDS_FILE_TYPE;
+ atom.m_uds = TDEIO::UDS_FILE_TYPE;
atom.m_long = S_IFREG;
entry.append(atom);
- atom.m_uds = KIO::UDS_ACCESS;
+ atom.m_uds = TDEIO::UDS_ACCESS;
if ( r.getExtra() == "ACTIVE" )
atom.m_long = 0700; // mark exec'able
else
atom.m_long = 0600;
entry.append(atom);
- atom.m_uds = KIO::UDS_MIME_TYPE;
+ atom.m_uds = TDEIO::UDS_MIME_TYPE;
atom.m_str = "application/sieve";
entry.append(atom);
diff --git a/kioslaves/sieve/sieve.h b/kioslaves/sieve/sieve.h
index d435892e..2168da72 100644
--- a/kioslaves/sieve/sieve.h
+++ b/kioslaves/sieve/sieve.h
@@ -58,7 +58,7 @@ protected:
TQCString extra;
};
-class kio_sieveProtocol : public KIO::TCPSlaveBase
+class kio_sieveProtocol : public TDEIO::TCPSlaveBase
{
public:
@@ -104,7 +104,7 @@ protected:
int operationResult();
bool parseCapabilities(bool requestCapabilities = false);
- bool saslInteract( void *in, KIO::AuthInfo &ai );
+ bool saslInteract( void *in, TDEIO::AuthInfo &ai );
// IOSlave global data
uint m_connMode;
diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox
index d970bbe8..927acc7e 100644
--- a/kmail/Mainpage.dox
+++ b/kmail/Mainpage.dox
@@ -171,7 +171,7 @@ of which you have to reimplement at least the first two:
- void installProfile()
This is called when the user selected a profile and hit apply. A
- profile is just another KConfig object. Therefore, this method
+ profile is just another TDEConfig object. Therefore, this method
should be the same as setup(), except that you should only alter
widgets for configs that really exist in the profile.
diff --git a/kmail/aboutdata.cpp b/kmail/aboutdata.cpp
index c655583c..6e80f20d 100644
--- a/kmail/aboutdata.cpp
+++ b/kmail/aboutdata.cpp
@@ -156,7 +156,7 @@ namespace KMail {
};
static const about_data credits[] = {
- { "Sam Abed", 0, 0, 0 }, // KConfigXT porting, smileys->emoticons replacement
+ { "Sam Abed", 0, 0, 0 }, // TDEConfigXT porting, smileys->emoticons replacement
{ "Joern Ahrens", 0, 0, 0 }, // implement wish 77182 (Add some separators to "Mark Message as" popup menu)
{ "Tom Albers", 0, 0, 0 }, // small fixes, bugzilla maintenance
{ "Albert Cervera Areny", 0, 0, 0 }, // implemented wish 88309 (optional compression of attachments)
diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp
index 0610622f..a2bb384f 100644
--- a/kmail/accountmanager.cpp
+++ b/kmail/accountmanager.cpp
@@ -49,10 +49,10 @@ AccountManager::~AccountManager()
//-----------------------------------------------------------------------------
void AccountManager::writeConfig( bool withSync )
{
- KConfig* config = KMKernel::config();
+ TDEConfig* config = KMKernel::config();
TQString groupName;
- KConfigGroupSaver saver(config, "General");
+ TDEConfigGroupSaver saver(config, "General");
config->writeEntry("accounts", mAcctList.count());
// first delete all account groups in the config file:
@@ -66,7 +66,7 @@ void AccountManager::writeConfig( bool withSync )
int i = 1;
for ( AccountList::ConstIterator it( mAcctList.begin() ), end( mAcctList.end() ); it != end; ++it, ++i ) {
groupName.sprintf("Account %d", i);
- KConfigGroupSaver saver(config, groupName);
+ TDEConfigGroupSaver saver(config, groupName);
(*it)->writeConfig(*config);
}
if (withSync) config->sync();
@@ -76,7 +76,7 @@ void AccountManager::writeConfig( bool withSync )
//-----------------------------------------------------------------------------
void AccountManager::readConfig(void)
{
- KConfig* config = KMKernel::config();
+ TDEConfig* config = KMKernel::config();
KMAccount* acct;
TQString acctType, acctName;
TQCString groupName;
@@ -87,13 +87,13 @@ void AccountManager::readConfig(void)
delete *it;
mAcctList.clear();
- KConfigGroup general(config, "General");
+ TDEConfigGroup general(config, "General");
num = general.readNumEntry("accounts", 0);
for (i=1; i<=num; i++)
{
groupName.sprintf("Account %d", i);
- KConfigGroupSaver saver(config, groupName);
+ TDEConfigGroupSaver saver(config, groupName);
acctType = config->readEntry("Type");
// Provide backwards compatibility
if (acctType == "advanced pop" || acctType == "experimental pop")
diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp
index 5ae16164..89861527 100644
--- a/kmail/accountwizard.cpp
+++ b/kmail/accountwizard.cpp
@@ -120,7 +120,7 @@ AccountWizard::AccountWizard( KMKernel *kernel, TQWidget *parent )
void AccountWizard::start( KMKernel *kernel, TQWidget *parent )
{
- KConfigGroup wizardConfig( KMKernel::config(), "AccountWizard" );
+ TDEConfigGroup wizardConfig( KMKernel::config(), "AccountWizard" );
if ( wizardConfig.readBoolEntry( "ShowOnStartup", true ) ) {
AccountWizard wizard( kernel, parent );
@@ -367,7 +367,7 @@ void AccountWizard::accept()
void AccountWizard::createTransport()
{
// create outgoing account
- KConfigGroup general( KMKernel::config(), "General" );
+ TDEConfigGroup general( KMKernel::config(), "General" );
uint numTransports = general.readNumEntry( "transports", 0 );
@@ -403,7 +403,7 @@ void AccountWizard::transportCreated()
{
mTransportInfoList.append( mTransportInfo );
- KConfigGroup general( KMKernel::config(), "General" );
+ TDEConfigGroup general( KMKernel::config(), "General" );
general.writeEntry( "transports", mTransportInfoList.count() );
for ( uint i = 0 ; i < mTransportInfoList.count() ; i++ )
@@ -411,12 +411,12 @@ void AccountWizard::transportCreated()
// No default transport? => set the first transport as the default
if ( GlobalSettings::self()->defaultTransport().isEmpty() ) {
- KConfigGroup general( KMKernel::config(), "General" );
+ TDEConfigGroup general( KMKernel::config(), "General" );
if ( mTransportInfoList.count() > 0 ) {
KMTransportInfo info;
info.readConfig( 1 );
- KConfigGroup composer( KMKernel::config(), "Composer" );
+ TDEConfigGroup composer( KMKernel::config(), "Composer" );
GlobalSettings::self()->setDefaultTransport( info.name );
GlobalSettings::self()->setCurrentTransport( info.name );
}
diff --git a/kmail/acljobs.cpp b/kmail/acljobs.cpp
index 1ad1a69b..2aa55b0c 100644
--- a/kmail/acljobs.cpp
+++ b/kmail/acljobs.cpp
@@ -120,7 +120,7 @@ TQString ACLJobs::permissionsToString( unsigned int permissions )
}
#endif
-KIO::SimpleJob* ACLJobs::setACL( KIO::Slave* slave, const KURL& url, const TQString& user, unsigned int permissions )
+TDEIO::SimpleJob* ACLJobs::setACL( TDEIO::Slave* slave, const KURL& url, const TQString& user, unsigned int permissions )
{
TQString perm = TQString::fromLatin1( permissionsToIMAPRights( permissions ) );
@@ -128,53 +128,53 @@ KIO::SimpleJob* ACLJobs::setACL( KIO::Slave* slave, const KURL& url, const TQStr
TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)'A' << (int)'S' << url << user << perm;
- KIO::SimpleJob* job = KIO::special( url, packedArgs, false );
- KIO::Scheduler::assignJobToSlave( slave, job );
+ TDEIO::SimpleJob* job = TDEIO::special( url, packedArgs, false );
+ TDEIO::Scheduler::assignJobToSlave( slave, job );
return job;
}
-ACLJobs::DeleteACLJob* ACLJobs::deleteACL( KIO::Slave* slave, const KURL& url, const TQString& user )
+ACLJobs::DeleteACLJob* ACLJobs::deleteACL( TDEIO::Slave* slave, const KURL& url, const TQString& user )
{
TQByteArray packedArgs;
TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)'A' << (int)'D' << url << user;
ACLJobs::DeleteACLJob* job = new ACLJobs::DeleteACLJob( url, user, packedArgs, false );
- KIO::Scheduler::assignJobToSlave( slave, job );
+ TDEIO::Scheduler::assignJobToSlave( slave, job );
return job;
}
-ACLJobs::GetACLJob* ACLJobs::getACL( KIO::Slave* slave, const KURL& url )
+ACLJobs::GetACLJob* ACLJobs::getACL( TDEIO::Slave* slave, const KURL& url )
{
TQByteArray packedArgs;
TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)'A' << (int)'G' << url;
ACLJobs::GetACLJob* job = new ACLJobs::GetACLJob( url, packedArgs, false );
- KIO::Scheduler::assignJobToSlave( slave, job );
+ TDEIO::Scheduler::assignJobToSlave( slave, job );
return job;
}
-ACLJobs::GetUserRightsJob* ACLJobs::getUserRights( KIO::Slave* slave, const KURL& url )
+ACLJobs::GetUserRightsJob* ACLJobs::getUserRights( TDEIO::Slave* slave, const KURL& url )
{
TQByteArray packedArgs;
TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)'A' << (int)'M' << url;
ACLJobs::GetUserRightsJob* job = new ACLJobs::GetUserRightsJob( url, packedArgs, false );
- KIO::Scheduler::assignJobToSlave( slave, job );
+ TDEIO::Scheduler::assignJobToSlave( slave, job );
return job;
}
ACLJobs::GetACLJob::GetACLJob( const KURL& url, const TQByteArray &packedArgs,
bool showProgressInfo )
- : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
+ : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
{
- connect( this, TQT_SIGNAL(infoMessage(KIO::Job*,const TQString&)),
- TQT_SLOT(slotInfoMessage(KIO::Job*,const TQString&)) );
+ connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
+ TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) );
}
-void ACLJobs::GetACLJob::slotInfoMessage( KIO::Job*, const TQString& str )
+void ACLJobs::GetACLJob::slotInfoMessage( TDEIO::Job*, const TQString& str )
{
// Parse the result
TQStringList lst = TQStringList::split( "\"", str, true );
@@ -189,13 +189,13 @@ void ACLJobs::GetACLJob::slotInfoMessage( KIO::Job*, const TQString& str )
ACLJobs::GetUserRightsJob::GetUserRightsJob( const KURL& url, const TQByteArray &packedArgs,
bool showProgressInfo )
- : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
+ : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
{
- connect( this, TQT_SIGNAL(infoMessage(KIO::Job*,const TQString&)),
- TQT_SLOT(slotInfoMessage(KIO::Job*,const TQString&)) );
+ connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
+ TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) );
}
-void ACLJobs::GetUserRightsJob::slotInfoMessage( KIO::Job*, const TQString& str )
+void ACLJobs::GetUserRightsJob::slotInfoMessage( TDEIO::Job*, const TQString& str )
{
// Parse the result
m_permissions = IMAPRightsToPermission( str, url(), TQString() );
@@ -204,15 +204,15 @@ void ACLJobs::GetUserRightsJob::slotInfoMessage( KIO::Job*, const TQString& str
ACLJobs::DeleteACLJob::DeleteACLJob( const KURL& url, const TQString& userId,
const TQByteArray &packedArgs,
bool showProgressInfo )
- : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo ),
+ : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ),
mUserId( userId )
{
}
////
-ACLJobs::MultiSetACLJob::MultiSetACLJob( KIO::Slave* slave, const KURL& url, const ACLList& acl, bool showProgressInfo )
- : KIO::Job( showProgressInfo ),
+ACLJobs::MultiSetACLJob::MultiSetACLJob( TDEIO::Slave* slave, const KURL& url, const ACLList& acl, bool showProgressInfo )
+ : TDEIO::Job( showProgressInfo ),
mSlave( slave ),
mUrl( url ), mACLList( acl ), mACLListIterator( mACLList.begin() )
{
@@ -228,7 +228,7 @@ void ACLJobs::MultiSetACLJob::slotStart()
if ( mACLListIterator != mACLList.end() )
{
const ACLListEntry& entry = *mACLListIterator;
- KIO::Job* job = 0;
+ TDEIO::Job* job = 0;
if ( entry.permissions > -1 )
job = setACL( mSlave, mUrl, entry.userId, entry.permissions );
else
@@ -240,10 +240,10 @@ void ACLJobs::MultiSetACLJob::slotStart()
}
}
-void ACLJobs::MultiSetACLJob::slotResult( KIO::Job *job )
+void ACLJobs::MultiSetACLJob::slotResult( TDEIO::Job *job )
{
if ( job->error() ) {
- KIO::Job::slotResult( job ); // will set the error and emit result(this)
+ TDEIO::Job::slotResult( job ); // will set the error and emit result(this)
return;
}
subjobs.remove(job);
@@ -255,7 +255,7 @@ void ACLJobs::MultiSetACLJob::slotResult( KIO::Job *job )
slotStart();
}
-ACLJobs::MultiSetACLJob* ACLJobs::multiSetACL( KIO::Slave* slave, const KURL& url, const ACLList& acl )
+ACLJobs::MultiSetACLJob* ACLJobs::multiSetACL( TDEIO::Slave* slave, const KURL& url, const ACLList& acl )
{
return new MultiSetACLJob( slave, url, acl, false /*showProgressInfo*/ );
}
diff --git a/kmail/acljobs.h b/kmail/acljobs.h
index 6404a228..b4bfd0df 100644
--- a/kmail/acljobs.h
+++ b/kmail/acljobs.h
@@ -86,26 +86,26 @@ namespace ACLJobs {
All = List | Read | WriteFlags | Insert | Post | Create | Delete | Administer | WriteSeenFlag
};
/// Set the permissions for a given user on a given url
- KIO::SimpleJob* setACL( KIO::Slave* slave, const KURL& url, const TQString& user, unsigned int permissions );
+ TDEIO::SimpleJob* setACL( TDEIO::Slave* slave, const KURL& url, const TQString& user, unsigned int permissions );
class DeleteACLJob;
/// Delete the permissions for a given user on a given url
- DeleteACLJob* deleteACL( KIO::Slave* slave, const KURL& url, const TQString& user );
+ DeleteACLJob* deleteACL( TDEIO::Slave* slave, const KURL& url, const TQString& user );
class GetACLJob;
/// List all ACLs for a given url
- GetACLJob* getACL( KIO::Slave* slave, const KURL& url );
+ GetACLJob* getACL( TDEIO::Slave* slave, const KURL& url );
class GetUserRightsJob;
/// Get the users' rights for a given url
- GetUserRightsJob* getUserRights( KIO::Slave* slave, const KURL& url );
+ GetUserRightsJob* getUserRights( TDEIO::Slave* slave, const KURL& url );
class MultiSetACLJob;
/// Set and delete a list of permissions for different users on a given url
- MultiSetACLJob* multiSetACL( KIO::Slave* slave, const KURL& url, const ACLList& acl );
+ MultiSetACLJob* multiSetACL( TDEIO::Slave* slave, const KURL& url, const ACLList& acl );
/// List all ACLs for a given url
- class GetACLJob : public KIO::SimpleJob
+ class GetACLJob : public TDEIO::SimpleJob
{
Q_OBJECT
@@ -116,13 +116,13 @@ namespace ACLJobs {
const ACLList& entries() const { return m_entries; }
protected slots:
- void slotInfoMessage( KIO::Job*, const TQString& );
+ void slotInfoMessage( TDEIO::Job*, const TQString& );
private:
ACLList m_entries;
};
/// Get the users' rights for a given url
- class GetUserRightsJob : public KIO::SimpleJob
+ class GetUserRightsJob : public TDEIO::SimpleJob
{
Q_OBJECT
@@ -132,14 +132,14 @@ namespace ACLJobs {
unsigned int permissions() const { return m_permissions; }
protected slots:
- void slotInfoMessage( KIO::Job*, const TQString& );
+ void slotInfoMessage( TDEIO::Job*, const TQString& );
private:
unsigned int m_permissions;
};
/// Delete the permissions for a given user on a given url
/// This class only exists to store the userid in the job
- class DeleteACLJob : public KIO::SimpleJob
+ class DeleteACLJob : public TDEIO::SimpleJob
{
Q_OBJECT
@@ -155,12 +155,12 @@ namespace ACLJobs {
};
/// Set and delete a list of permissions for different users on a given url
- class MultiSetACLJob : public KIO::Job {
+ class MultiSetACLJob : public TDEIO::Job {
Q_OBJECT
public:
- MultiSetACLJob( KIO::Slave* slave, const KURL& url, const ACLList& acl, bool showProgressInfo );
+ MultiSetACLJob( TDEIO::Slave* slave, const KURL& url, const ACLList& acl, bool showProgressInfo );
signals:
// Emitted when a given user's permissions were successfully changed.
@@ -169,10 +169,10 @@ namespace ACLJobs {
protected slots:
virtual void slotStart();
- virtual void slotResult( KIO::Job *job );
+ virtual void slotResult( TDEIO::Job *job );
private:
- KIO::Slave* mSlave;
+ TDEIO::Slave* mSlave;
const KURL mUrl;
const ACLList mACLList;
ACLList::const_iterator mACLListIterator;
diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp
index 215e5451..6f8e43b0 100644
--- a/kmail/actionscheduler.cpp
+++ b/kmail/actionscheduler.cpp
@@ -544,7 +544,7 @@ void ActionScheduler::processMessage()
bool mdnEnabled = true;
{
- KConfigGroup mdnConfig( kmkernel->config(), "MDN" );
+ TDEConfigGroup mdnConfig( kmkernel->config(), "MDN" );
int mode = mdnConfig.readNumEntry( "default-policy", 0 );
if (!mode || mode < 0 || mode > 3)
mdnEnabled = false;
@@ -820,8 +820,8 @@ bool ActionScheduler::isEnabled()
return sEnabled;
sEnabledChecked = true;
- KConfig* config = KMKernel::config();
- KConfigGroupSaver saver(config, "General");
+ TDEConfig* config = KMKernel::config();
+ TDEConfigGroupSaver saver(config, "General");
sEnabled = config->readBoolEntry("action-scheduler", false);
return sEnabled;
}
diff --git a/kmail/annotationjobs.cpp b/kmail/annotationjobs.cpp
index 6fb6645e..6aa4d932 100644
--- a/kmail/annotationjobs.cpp
+++ b/kmail/annotationjobs.cpp
@@ -34,21 +34,21 @@
using namespace KMail;
-KIO::SimpleJob* AnnotationJobs::setAnnotation(
- KIO::Slave* slave, const KURL& url, const TQString& entry,
+TDEIO::SimpleJob* AnnotationJobs::setAnnotation(
+ TDEIO::Slave* slave, const KURL& url, const TQString& entry,
const TQMap<TQString,TQString>& attributes )
{
TQByteArray packedArgs;
TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)'M' << (int)'S' << url << entry << attributes;
- KIO::SimpleJob* job = KIO::special( url, packedArgs, false );
- KIO::Scheduler::assignJobToSlave( slave, job );
+ TDEIO::SimpleJob* job = TDEIO::special( url, packedArgs, false );
+ TDEIO::Scheduler::assignJobToSlave( slave, job );
return job;
}
AnnotationJobs::GetAnnotationJob* AnnotationJobs::getAnnotation(
- KIO::Slave* slave, const KURL& url, const TQString& entry,
+ TDEIO::Slave* slave, const KURL& url, const TQString& entry,
const TQStringList& attributes )
{
TQByteArray packedArgs;
@@ -56,21 +56,21 @@ AnnotationJobs::GetAnnotationJob* AnnotationJobs::getAnnotation(
stream << (int)'M' << (int)'G' << url << entry << attributes;
GetAnnotationJob* job = new GetAnnotationJob( url, entry, packedArgs, false );
- KIO::Scheduler::assignJobToSlave( slave, job );
+ TDEIO::Scheduler::assignJobToSlave( slave, job );
return job;
}
AnnotationJobs::GetAnnotationJob::GetAnnotationJob( const KURL& url, const TQString& entry,
const TQByteArray &packedArgs,
bool showProgressInfo )
- : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo ),
+ : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ),
mEntry( entry )
{
- connect( this, TQT_SIGNAL(infoMessage(KIO::Job*,const TQString&)),
- TQT_SLOT(slotInfoMessage(KIO::Job*,const TQString&)) );
+ connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
+ TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) );
}
-void AnnotationJobs::GetAnnotationJob::slotInfoMessage( KIO::Job*, const TQString& str )
+void AnnotationJobs::GetAnnotationJob::slotInfoMessage( TDEIO::Job*, const TQString& str )
{
// Parse the result
TQStringList lst = TQStringList::split( "\r", str );
@@ -83,8 +83,8 @@ void AnnotationJobs::GetAnnotationJob::slotInfoMessage( KIO::Job*, const TQStrin
}
AnnotationJobs::MultiGetAnnotationJob::MultiGetAnnotationJob(
- KIO::Slave* slave, const KURL& url, const TQStringList& entries, bool showProgressInfo )
- : KIO::Job( showProgressInfo ),
+ TDEIO::Slave* slave, const KURL& url, const TQStringList& entries, bool showProgressInfo )
+ : TDEIO::Job( showProgressInfo ),
mSlave( slave ),
mUrl( url ), mEntryList( entries ), mEntryListIterator( mEntryList.begin() )
{
@@ -97,17 +97,17 @@ void AnnotationJobs::MultiGetAnnotationJob::slotStart()
if ( mEntryListIterator != mEntryList.end() ) {
TQStringList attributes;
attributes << "value";
- KIO::Job* job = getAnnotation( mSlave, mUrl, *mEntryListIterator, attributes );
+ TDEIO::Job* job = getAnnotation( mSlave, mUrl, *mEntryListIterator, attributes );
addSubjob( job );
} else { // done!
emitResult();
}
}
-void AnnotationJobs::MultiGetAnnotationJob::slotResult( KIO::Job *job )
+void AnnotationJobs::MultiGetAnnotationJob::slotResult( TDEIO::Job *job )
{
if ( job->error() ) {
- KIO::Job::slotResult( job ); // will set the error and emit result(this)
+ TDEIO::Job::slotResult( job ); // will set the error and emit result(this)
return;
}
subjobs.remove( job );
@@ -130,7 +130,7 @@ void AnnotationJobs::MultiGetAnnotationJob::slotResult( KIO::Job *job )
slotStart();
}
-AnnotationJobs::MultiGetAnnotationJob* AnnotationJobs::multiGetAnnotation( KIO::Slave* slave, const KURL& url, const TQStringList& entries )
+AnnotationJobs::MultiGetAnnotationJob* AnnotationJobs::multiGetAnnotation( TDEIO::Slave* slave, const KURL& url, const TQStringList& entries )
{
return new MultiGetAnnotationJob( slave, url, entries, false /*showProgressInfo*/ );
}
@@ -138,8 +138,8 @@ AnnotationJobs::MultiGetAnnotationJob* AnnotationJobs::multiGetAnnotation( KIO::
////
AnnotationJobs::MultiSetAnnotationJob::MultiSetAnnotationJob(
- KIO::Slave* slave, const KURL& url, const AnnotationList& annotations, bool showProgressInfo )
- : KIO::Job( showProgressInfo ),
+ TDEIO::Slave* slave, const KURL& url, const AnnotationList& annotations, bool showProgressInfo )
+ : TDEIO::Job( showProgressInfo ),
mSlave( slave ),
mUrl( url ), mAnnotationList( annotations ), mAnnotationListIterator( mAnnotationList.begin() )
{
@@ -156,17 +156,17 @@ void AnnotationJobs::MultiSetAnnotationJob::slotStart()
TQMap<TQString, TQString> attributes;
attributes.insert( attr.name, attr.value );
kdDebug() << k_funcinfo << " setting annotation " << attr.entry << " " << attr.name << " " << attr.value << endl;
- KIO::Job* job = setAnnotation( mSlave, mUrl, attr.entry, attributes );
+ TDEIO::Job* job = setAnnotation( mSlave, mUrl, attr.entry, attributes );
addSubjob( job );
} else { // done!
emitResult();
}
}
-void AnnotationJobs::MultiSetAnnotationJob::slotResult( KIO::Job *job )
+void AnnotationJobs::MultiSetAnnotationJob::slotResult( TDEIO::Job *job )
{
if ( job->error() ) {
- KIO::Job::slotResult( job ); // will set the error and emit result(this)
+ TDEIO::Job::slotResult( job ); // will set the error and emit result(this)
return;
}
subjobs.remove( job );
@@ -179,17 +179,17 @@ void AnnotationJobs::MultiSetAnnotationJob::slotResult( KIO::Job *job )
}
AnnotationJobs::MultiSetAnnotationJob* AnnotationJobs::multiSetAnnotation(
- KIO::Slave* slave, const KURL& url, const AnnotationList& annotations )
+ TDEIO::Slave* slave, const KURL& url, const AnnotationList& annotations )
{
return new MultiSetAnnotationJob( slave, url, annotations, false /*showProgressInfo*/ );
}
-AnnotationJobs::MultiUrlGetAnnotationJob::MultiUrlGetAnnotationJob( KIO::Slave* slave,
+AnnotationJobs::MultiUrlGetAnnotationJob::MultiUrlGetAnnotationJob( TDEIO::Slave* slave,
const KURL& baseUrl,
const TQStringList& paths,
const TQString& annotation )
- : KIO::Job( false ),
+ : TDEIO::Job( false ),
mSlave( slave ),
mUrl( baseUrl ),
mPathList( paths ),
@@ -207,17 +207,17 @@ void AnnotationJobs::MultiUrlGetAnnotationJob::slotStart()
attributes << "value";
KURL url(mUrl);
url.setPath( *mPathListIterator );
- KIO::Job* job = getAnnotation( mSlave, url, mAnnotation, attributes );
+ TDEIO::Job* job = getAnnotation( mSlave, url, mAnnotation, attributes );
addSubjob( job );
} else { // done!
emitResult();
}
}
-void AnnotationJobs::MultiUrlGetAnnotationJob::slotResult( KIO::Job *job )
+void AnnotationJobs::MultiUrlGetAnnotationJob::slotResult( TDEIO::Job *job )
{
if ( job->error() ) {
- KIO::Job::slotResult( job ); // will set the error and emit result(this)
+ TDEIO::Job::slotResult( job ); // will set the error and emit result(this)
return;
}
subjobs.remove( job );
@@ -241,7 +241,7 @@ TQMap<TQString, TQString> AnnotationJobs::MultiUrlGetAnnotationJob::annotations(
return mAnnotations;
}
-AnnotationJobs::MultiUrlGetAnnotationJob* AnnotationJobs::multiUrlGetAnnotation( KIO::Slave* slave,
+AnnotationJobs::MultiUrlGetAnnotationJob* AnnotationJobs::multiUrlGetAnnotation( TDEIO::Slave* slave,
const KURL& baseUrl,
const TQStringList& paths,
const TQString& annotation )
diff --git a/kmail/annotationjobs.h b/kmail/annotationjobs.h
index 3972a80b..8b50a025 100644
--- a/kmail/annotationjobs.h
+++ b/kmail/annotationjobs.h
@@ -65,14 +65,14 @@ namespace AnnotationJobs {
* @param entry the name of the annotation entry
* @param attributes attribute name+value pairs
*/
-KIO::SimpleJob* setAnnotation( KIO::Slave* slave, const KURL& url, const TQString& entry,
+TDEIO::SimpleJob* setAnnotation( TDEIO::Slave* slave, const KURL& url, const TQString& entry,
const TQMap<TQString,TQString>& attributes );
class MultiSetAnnotationJob;
/**
* Set multiple annotation entries
*/
-MultiSetAnnotationJob* multiSetAnnotation( KIO::Slave* slave, const KURL& url, const AnnotationList& annotations );
+MultiSetAnnotationJob* multiSetAnnotation( TDEIO::Slave* slave, const KURL& url, const AnnotationList& annotations );
class GetAnnotationJob;
/**
@@ -82,7 +82,7 @@ class GetAnnotationJob;
* @param entry the name of the annotation entry
* @param attributes attribute names
*/
-GetAnnotationJob* getAnnotation( KIO::Slave* slave, const KURL& url, const TQString& entry,
+GetAnnotationJob* getAnnotation( TDEIO::Slave* slave, const KURL& url, const TQString& entry,
const TQStringList& attributes );
class MultiGetAnnotationJob;
@@ -90,7 +90,7 @@ class MultiGetAnnotationJob;
* Get multiple annotation entries
* Currently we assume we want to get the "value" for each, to simplify the data structure.
*/
-MultiGetAnnotationJob* multiGetAnnotation( KIO::Slave* slave, const KURL& url, const TQStringList& entries );
+MultiGetAnnotationJob* multiGetAnnotation( TDEIO::Slave* slave, const KURL& url, const TQStringList& entries );
class MultiUrlGetAnnotationJob;
/**
@@ -98,14 +98,14 @@ class MultiUrlGetAnnotationJob;
* @param paths The paths to get the annotation for
* @param annotation The annotation to get
*/
-MultiUrlGetAnnotationJob* multiUrlGetAnnotation( KIO::Slave* slave,
+MultiUrlGetAnnotationJob* multiUrlGetAnnotation( TDEIO::Slave* slave,
const KURL& baseUrl,
const TQStringList& paths,
const TQString& annotation );
/// for getAnnotation()
-class GetAnnotationJob : public KIO::SimpleJob
+class GetAnnotationJob : public TDEIO::SimpleJob
{
Q_OBJECT
@@ -116,20 +116,20 @@ public:
const AnnotationList& annotations() const { return mAnnotations; }
protected slots:
- void slotInfoMessage( KIO::Job*, const TQString& );
+ void slotInfoMessage( TDEIO::Job*, const TQString& );
private:
AnnotationList mAnnotations;
TQString mEntry;
};
/// for multiGetAnnotation
-class MultiGetAnnotationJob : public KIO::Job
+class MultiGetAnnotationJob : public TDEIO::Job
{
Q_OBJECT
public:
- MultiGetAnnotationJob( KIO::Slave* slave, const KURL& url, const TQStringList& entries, bool showProgressInfo );
+ MultiGetAnnotationJob( TDEIO::Slave* slave, const KURL& url, const TQStringList& entries, bool showProgressInfo );
signals:
// Emitted when a given annotation was found - or not found
@@ -137,33 +137,33 @@ signals:
protected slots:
virtual void slotStart();
- virtual void slotResult( KIO::Job *job );
+ virtual void slotResult( TDEIO::Job *job );
private:
- KIO::Slave* mSlave;
+ TDEIO::Slave* mSlave;
const KURL mUrl;
const TQStringList mEntryList;
TQStringList::const_iterator mEntryListIterator;
};
/// for multiUrlGetAnnotation
-class MultiUrlGetAnnotationJob : public KIO::Job
+class MultiUrlGetAnnotationJob : public TDEIO::Job
{
Q_OBJECT
public:
- MultiUrlGetAnnotationJob( KIO::Slave* slave, const KURL& baseUrl,
+ MultiUrlGetAnnotationJob( TDEIO::Slave* slave, const KURL& baseUrl,
const TQStringList& paths, const TQString& annotation );
TQMap<TQString, TQString> annotations() const;
protected slots:
virtual void slotStart();
- virtual void slotResult( KIO::Job *job );
+ virtual void slotResult( TDEIO::Job *job );
private:
- KIO::Slave* mSlave;
+ TDEIO::Slave* mSlave;
const KURL mUrl;
const TQStringList mPathList;
TQStringList::const_iterator mPathListIterator;
@@ -172,13 +172,13 @@ private:
};
/// for multiSetAnnotation
-class MultiSetAnnotationJob : public KIO::Job
+class MultiSetAnnotationJob : public TDEIO::Job
{
Q_OBJECT
public:
- MultiSetAnnotationJob( KIO::Slave* slave, const KURL& url, const AnnotationList& annotations, bool showProgressInfo );
+ MultiSetAnnotationJob( TDEIO::Slave* slave, const KURL& url, const AnnotationList& annotations, bool showProgressInfo );
signals:
// Emitted when a given annotation was successfully changed
@@ -186,10 +186,10 @@ signals:
protected slots:
virtual void slotStart();
- virtual void slotResult( KIO::Job *job );
+ virtual void slotResult( TDEIO::Job *job );
private:
- KIO::Slave* mSlave;
+ TDEIO::Slave* mSlave;
const KURL mUrl;
const AnnotationList mAnnotationList;
AnnotationList::const_iterator mAnnotationListIterator;
diff --git a/kmail/antispamconfig.cpp b/kmail/antispamconfig.cpp
index 0cb047fd..9a1c8347 100644
--- a/kmail/antispamconfig.cpp
+++ b/kmail/antispamconfig.cpp
@@ -54,12 +54,12 @@ AntiSpamConfig * AntiSpamConfig::instance() {
void AntiSpamConfig::readConfig()
{
mAgents.clear();
- KConfig config( "kmail.antispamrc", true );
+ TDEConfig config( "kmail.antispamrc", true );
config.setReadDefaults( true );
- KConfigGroup general( &config, "General" );
+ TDEConfigGroup general( &config, "General" );
unsigned int totalTools = general.readUnsignedNumEntry( "tools", 0 );
for ( unsigned int i = 1; i <= totalTools; ++i ) {
- KConfigGroup tool( &config, TQString("Spamtool #%1").arg( i ) );
+ TDEConfigGroup tool( &config, TQString("Spamtool #%1").arg( i ) );
if ( tool.hasKey( "ScoreHeader" ) ) {
TQString name = tool.readEntry( "ScoreName" );
TQCString header = tool.readEntry( "ScoreHeader" ).latin1();
diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp
index 2f6750f2..d83a19e1 100644
--- a/kmail/antispamwizard.cpp
+++ b/kmail/antispamwizard.cpp
@@ -680,9 +680,9 @@ AntiSpamWizard::ConfigReader::ConfigReader( WizardMode mode,
mMode( mode )
{
if ( mMode == AntiSpam )
- mConfig = new KConfig( "kmail.antispamrc", true );
+ mConfig = new TDEConfig( "kmail.antispamrc", true );
else
- mConfig = new KConfig( "kmail.antivirusrc", true );
+ mConfig = new TDEConfig( "kmail.antivirusrc", true );
}
AntiSpamWizard::ConfigReader::~ConfigReader( )
@@ -698,11 +698,11 @@ void AntiSpamWizard::ConfigReader::readAndMergeConfig()
: TQString("Virustool #%1");
// read the configuration from the global config file
mConfig->setReadDefaults( true );
- KConfigGroup general( mConfig, "General" );
+ TDEConfigGroup general( mConfig, "General" );
int registeredTools = general.readNumEntry( "tools", 0 );
for (int i = 1; i <= registeredTools; i++)
{
- KConfigGroup toolConfig( mConfig, groupName.arg( i ) );
+ TDEConfigGroup toolConfig( mConfig, groupName.arg( i ) );
if( !toolConfig.readBoolEntry( "HeadersOnly", false ) )
mToolList.append( readToolConfig( toolConfig ) );
}
@@ -710,11 +710,11 @@ void AntiSpamWizard::ConfigReader::readAndMergeConfig()
// read the configuration from the user config file
// and merge newer config data
mConfig->setReadDefaults( false );
- KConfigGroup user_general( mConfig, "General" );
+ TDEConfigGroup user_general( mConfig, "General" );
int user_registeredTools = user_general.readNumEntry( "tools", 0 );
for (int i = 1; i <= user_registeredTools; i++)
{
- KConfigGroup toolConfig( mConfig, groupName.arg( i ) );
+ TDEConfigGroup toolConfig( mConfig, groupName.arg( i ) );
if( !toolConfig.readBoolEntry( "HeadersOnly", false ) )
mergeToolConfig( readToolConfig( toolConfig ) );
}
@@ -730,7 +730,7 @@ void AntiSpamWizard::ConfigReader::readAndMergeConfig()
AntiSpamWizard::SpamToolConfig
- AntiSpamWizard::ConfigReader::readToolConfig( KConfigGroup & configGroup )
+ AntiSpamWizard::ConfigReader::readToolConfig( TDEConfigGroup & configGroup )
{
TQString id = configGroup.readEntry( "Ident" );
int version = configGroup.readNumEntry( "Version" );
diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h
index e66d2f35..ed9e4a3b 100644
--- a/kmail/antispamwizard.h
+++ b/kmail/antispamwizard.h
@@ -225,10 +225,10 @@ namespace KMail {
private:
TQValueList<SpamToolConfig> & mToolList;
- KConfig *mConfig;
+ TDEConfig *mConfig;
WizardMode mMode;
- SpamToolConfig readToolConfig( KConfigGroup & configGroup );
+ SpamToolConfig readToolConfig( TDEConfigGroup & configGroup );
SpamToolConfig createDummyConfig();
void mergeToolConfig( SpamToolConfig config );
diff --git a/kmail/attachmentstrategy.cpp b/kmail/attachmentstrategy.cpp
index 23bd0595..87157ed4 100644
--- a/kmail/attachmentstrategy.cpp
+++ b/kmail/attachmentstrategy.cpp
@@ -211,7 +211,7 @@ static AttachmentStrategy::Display smartDisplay( const partNode *node )
if ( lowerType == "hidden" ) return hidden();
if ( lowerType == "headeronly" ) return headerOnly();
// don't kdFatal here, b/c the strings are user-provided
- // (KConfig), so fail gracefully to the default:
+ // (TDEConfig), so fail gracefully to the default:
return smart();
}
diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp
index fd53997b..132a8dba 100644
--- a/kmail/backupjob.cpp
+++ b/kmail/backupjob.cpp
@@ -175,9 +175,9 @@ void BackupJob::finish()
.arg( mRootFolder->name() ).arg( mMailArchivePath.path() );
text += "\n" + i18n( "1 message of size %1 was archived.",
"%n messages with the total size of %1 were archived.", mArchivedMessages )
- .arg( KIO::convertSize( mArchivedSize ) );
+ .arg( TDEIO::convertSize( mArchivedSize ) );
text += "\n" + i18n( "The archive file has a size of %1." )
- .arg( KIO::convertSize( archiveFileInfo.size() ) );
+ .arg( TDEIO::convertSize( archiveFileInfo.size() ) );
KMessageBox::information( mParentWidget, text, i18n( "Archiving finished." ) );
if ( mDeleteFoldersAfterCompletion ) {
diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp
index 5e5232d4..143c18c5 100644
--- a/kmail/cachedimapjob.cpp
+++ b/kmail/cachedimapjob.cpp
@@ -167,8 +167,8 @@ void CachedImapJob::execute()
ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
jd.items << mFolder->label(); // for the err msg
- KIO::SimpleJob *simpleJob = KIO::special( url.url(), packedArgs, false );
- KIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
+ TDEIO::SimpleJob *simpleJob = TDEIO::special( url.url(), packedArgs, false );
+ TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
mAccount->insertJob(simpleJob, jd);
mAccount->setSentCustomLoginCommand( true );
@@ -195,19 +195,19 @@ void CachedImapJob::listMessages()
KURL url = mAccount->getUrl();
url.setPath( mFolder->imapPath() + ";UID=1:*;SECTION=FLAGS RFC822.SIZE");
- KIO::SimpleJob *job = KIO::get(url, false, false);
- KIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
+ TDEIO::SimpleJob *job = TDEIO::get(url, false, false);
+ TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
jd.cancellable = true;
mAccount->insertJob( job, jd );
- connect( job, TQT_SIGNAL( result(KIO::Job *) ),
- this, TQT_SLOT( slotListMessagesResult( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
+ this, TQT_SLOT( slotListMessagesResult( TDEIO::Job* ) ) );
// send the data directly for KMFolderCachedImap
- connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
- mFolder, TQT_SLOT( slotGetMessagesData( KIO::Job* , const TQByteArray& ) ) );
+ connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+ mFolder, TQT_SLOT( slotGetMessagesData( TDEIO::Job* , const TQByteArray& ) ) );
}
-void CachedImapJob::slotDeleteNextMessages( KIO::Job* job )
+void CachedImapJob::slotDeleteNextMessages( TDEIO::Job* job )
{
if (job) {
KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
@@ -236,12 +236,12 @@ void CachedImapJob::slotDeleteNextMessages( KIO::Job* job )
url.setPath( mFolder->imapPath() +
TQString::fromLatin1(";UID=%1").arg(uids) );
- KIO::SimpleJob *simpleJob = KIO::file_delete( url, false );
- KIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob );
+ TDEIO::SimpleJob *simpleJob = TDEIO::file_delete( url, false );
+ TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob );
ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
mAccount->insertJob( simpleJob, jd );
- connect( simpleJob, TQT_SIGNAL( result(KIO::Job *) ),
- this, TQT_SLOT( slotDeleteNextMessages(KIO::Job *) ) );
+ connect( simpleJob, TQT_SIGNAL( result(TDEIO::Job *) ),
+ this, TQT_SLOT( slotDeleteNextMessages(TDEIO::Job *) ) );
}
void CachedImapJob::expungeFolder()
@@ -250,15 +250,15 @@ void CachedImapJob::expungeFolder()
// Special URL that means EXPUNGE
url.setPath( mFolder->imapPath() + TQString::fromLatin1(";UID=*") );
- KIO::SimpleJob *job = KIO::file_delete( url, false );
- KIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
+ TDEIO::SimpleJob *job = TDEIO::file_delete( url, false );
+ TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
mAccount->insertJob( job, jd );
- connect( job, TQT_SIGNAL( result(KIO::Job *) ),
- this, TQT_SLOT( slotExpungeResult(KIO::Job *) ) );
+ connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
+ this, TQT_SLOT( slotExpungeResult(TDEIO::Job *) ) );
}
-void CachedImapJob::slotExpungeResult( KIO::Job * job )
+void CachedImapJob::slotExpungeResult( TDEIO::Job * job )
{
KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
@@ -276,7 +276,7 @@ void CachedImapJob::slotExpungeResult( KIO::Job * job )
delete this;
}
-void CachedImapJob::slotGetNextMessage(KIO::Job * job)
+void CachedImapJob::slotGetNextMessage(TDEIO::Job * job)
{
if (job) {
KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
@@ -346,18 +346,18 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job)
ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
jd.cancellable = true;
mMsg->setTransferInProgress(true);
- KIO::SimpleJob *simpleJob = KIO::get(url, false, false);
- KIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
+ TDEIO::SimpleJob *simpleJob = TDEIO::get(url, false, false);
+ TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
mAccount->insertJob(simpleJob, jd);
- connect(simpleJob, TQT_SIGNAL(processedSize(KIO::Job *, KIO::filesize_t)),
- this, TQT_SLOT(slotProcessedSize(KIO::Job *, KIO::filesize_t)));
- connect(simpleJob, TQT_SIGNAL(result(KIO::Job *)),
- this, TQT_SLOT(slotGetNextMessage(KIO::Job *)));
- connect(simpleJob, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
- mFolder, TQT_SLOT(slotSimpleData(KIO::Job *, const TQByteArray &)));
+ 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 &)));
}
-void CachedImapJob::slotProcessedSize(KIO::Job *, KIO::filesize_t processed)
+void CachedImapJob::slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t processed)
{
emit progress( mSentBytes + processed, mTotalBytes );
}
@@ -417,23 +417,23 @@ void CachedImapJob::slotPutNextMessage()
jd.msgList.append( mMsg );
mMsg->setTransferInProgress(true);
- KIO::SimpleJob *simpleJob = KIO::put(url, 0, false, false, false);
- KIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
+ 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(KIO::Job *) ),
- TQT_SLOT( slotPutMessageResult(KIO::Job *) ) );
- connect( simpleJob, TQT_SIGNAL( dataReq(KIO::Job *, TQByteArray &) ),
- TQT_SLOT( slotPutMessageDataReq(KIO::Job *, TQByteArray &) ) );
- connect( simpleJob, TQT_SIGNAL( data(KIO::Job *, const TQByteArray &) ),
- mFolder, TQT_SLOT( slotSimpleData(KIO::Job *, const TQByteArray &) ) );
- connect( simpleJob, TQT_SIGNAL(infoMessage(KIO::Job *, const TQString &)),
- TQT_SLOT(slotPutMessageInfoData(KIO::Job *, const TQString &)) );
+ 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 &)) );
}
//-----------------------------------------------------------------------------
-// TODO: port to KIO::StoredTransferJob once it's ok to require tdelibs-3.3
-void CachedImapJob::slotPutMessageDataReq(KIO::Job *job, TQByteArray &data)
+// TODO: port to TDEIO::StoredTransferJob once it's ok to require tdelibs-3.3
+void CachedImapJob::slotPutMessageDataReq(TDEIO::Job *job, TQByteArray &data)
{
KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
@@ -452,7 +452,7 @@ void CachedImapJob::slotPutMessageDataReq(KIO::Job *job, TQByteArray &data)
}
//----------------------------------------------------------------------------
-void CachedImapJob::slotPutMessageInfoData( KIO::Job *job, const TQString &data )
+void CachedImapJob::slotPutMessageInfoData( TDEIO::Job *job, const TQString &data )
{
KMFolderCachedImap *imapFolder = static_cast<KMFolderCachedImap*>( mDestFolder->storage() );
if ( imapFolder ) {
@@ -472,7 +472,7 @@ void CachedImapJob::slotPutMessageInfoData( KIO::Job *job, const TQString &data
//-----------------------------------------------------------------------------
-void CachedImapJob::slotPutMessageResult(KIO::Job *job)
+void CachedImapJob::slotPutMessageResult(TDEIO::Job *job)
{
KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
@@ -524,7 +524,7 @@ void CachedImapJob::slotPutMessageResult(KIO::Job *job)
}
-void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
+void CachedImapJob::slotAddNextSubfolder( TDEIO::Job * job )
{
if (job) {
KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
@@ -587,11 +587,11 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
jd.items << folder->label(); // for the err msg
jd.current = folder->folder();
- KIO::SimpleJob *simpleJob = KIO::mkdir(url);
- KIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
+ TDEIO::SimpleJob *simpleJob = TDEIO::mkdir(url);
+ TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
mAccount->insertJob(simpleJob, jd);
- connect( simpleJob, TQT_SIGNAL(result(KIO::Job *)),
- this, TQT_SLOT(slotAddNextSubfolder(KIO::Job *)) );
+ connect( simpleJob, TQT_SIGNAL(result(TDEIO::Job *)),
+ this, TQT_SLOT(slotAddNextSubfolder(TDEIO::Job *)) );
} else {
TQByteArray packedArgs;
TQDataStream stream( packedArgs, IO_WriteOnly );
@@ -605,16 +605,16 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
jd.items << folder->label(); // for the err msg
jd.current = folder->folder();
- KIO::SimpleJob *simpleJob = KIO::special( url.url(), packedArgs, false );
- KIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
+ TDEIO::SimpleJob *simpleJob = TDEIO::special( url.url(), packedArgs, false );
+ TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
mAccount->insertJob(simpleJob, jd);
- connect( simpleJob, TQT_SIGNAL(result(KIO::Job *)),
- this, TQT_SLOT(slotAddNextSubfolder(KIO::Job *)) );
+ connect( simpleJob, TQT_SIGNAL(result(TDEIO::Job *)),
+ this, TQT_SLOT(slotAddNextSubfolder(TDEIO::Job *)) );
}
}
-void CachedImapJob::slotDeleteNextFolder( KIO::Job *job )
+void CachedImapJob::slotDeleteNextFolder( TDEIO::Job *job )
{
if (job) {
KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
@@ -645,11 +645,11 @@ void CachedImapJob::slotDeleteNextFolder( KIO::Job *job )
url.setPath(folderPath);
ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
jd.path = url.path();
- KIO::SimpleJob *simpleJob = KIO::file_delete(url, false);
- KIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
+ TDEIO::SimpleJob *simpleJob = TDEIO::file_delete(url, false);
+ TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
mAccount->insertJob(simpleJob, jd);
- connect( simpleJob, TQT_SIGNAL( result(KIO::Job *) ),
- TQT_SLOT( slotDeleteNextFolder(KIO::Job *) ) );
+ connect( simpleJob, TQT_SIGNAL( result(TDEIO::Job *) ),
+ TQT_SLOT( slotDeleteNextFolder(TDEIO::Job *) ) );
}
void CachedImapJob::checkUidValidity()
@@ -660,16 +660,16 @@ void CachedImapJob::checkUidValidity()
ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
jd.cancellable = true;
- KIO::SimpleJob *job = KIO::get( url, false, false );
- KIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
+ TDEIO::SimpleJob *job = TDEIO::get( url, false, false );
+ TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
mAccount->insertJob( job, jd );
- connect( job, TQT_SIGNAL(result(KIO::Job *)),
- TQT_SLOT(slotCheckUidValidityResult(KIO::Job *)) );
- connect( job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
- mFolder, TQT_SLOT(slotSimpleData(KIO::Job *, const TQByteArray &)));
+ 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 &)));
}
-void CachedImapJob::slotCheckUidValidityResult(KIO::Job * job)
+void CachedImapJob::slotCheckUidValidityResult(TDEIO::Job * job)
{
KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
@@ -749,11 +749,11 @@ void CachedImapJob::renameFolder( const TQString &newName )
ImapAccountBase::jobData jd( newName, mFolder->folder() );
jd.path = mNewImapPath;
- KIO::SimpleJob *simpleJob = KIO::rename( urlSrc, urlDst, false );
- KIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob );
+ TDEIO::SimpleJob *simpleJob = TDEIO::rename( urlSrc, urlDst, false );
+ TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob );
mAccount->insertJob( simpleJob, jd );
- connect( simpleJob, TQT_SIGNAL(result(KIO::Job *)),
- TQT_SLOT(slotRenameFolderResult(KIO::Job *)) );
+ connect( simpleJob, TQT_SIGNAL(result(TDEIO::Job *)),
+ TQT_SLOT(slotRenameFolderResult(TDEIO::Job *)) );
}
static void renameChildFolders( KMFolderDir* dir, const TQString& oldPath,
@@ -844,7 +844,7 @@ void CachedImapJob::slotSubscribtionChange2Done( const TQString&, bool )
delete this;
}
-void CachedImapJob::slotRenameFolderResult( KIO::Job *job )
+void CachedImapJob::slotRenameFolderResult( TDEIO::Job *job )
{
KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
@@ -873,7 +873,7 @@ void CachedImapJob::slotRenameFolderResult( KIO::Job *job )
}
}
-void CachedImapJob::slotListMessagesResult( KIO::Job * job )
+void CachedImapJob::slotListMessagesResult( TDEIO::Job * job )
{
KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
diff --git a/kmail/cachedimapjob.h b/kmail/cachedimapjob.h
index f37953d3..592ba392 100644
--- a/kmail/cachedimapjob.h
+++ b/kmail/cachedimapjob.h
@@ -109,19 +109,19 @@ protected:
void listMessages();
protected slots:
- virtual void slotGetNextMessage( KIO::Job *job = 0 );
- virtual void slotAddNextSubfolder( KIO::Job *job = 0 );
+ virtual void slotGetNextMessage( TDEIO::Job *job = 0 );
+ virtual void slotAddNextSubfolder( TDEIO::Job *job = 0 );
virtual void slotPutNextMessage();
- virtual void slotPutMessageDataReq( KIO::Job *job, TQByteArray &data );
- virtual void slotPutMessageResult( KIO::Job *job );
- virtual void slotPutMessageInfoData(KIO::Job *, const TQString &data);
- virtual void slotExpungeResult( KIO::Job *job );
- virtual void slotDeleteNextFolder( KIO::Job *job = 0 );
- virtual void slotCheckUidValidityResult( KIO::Job *job );
- virtual void slotRenameFolderResult( KIO::Job *job );
- virtual void slotListMessagesResult( KIO::Job * job );
- void slotDeleteNextMessages( KIO::Job* job = 0 );
- void slotProcessedSize( KIO::Job *, KIO::filesize_t processed );
+ virtual void slotPutMessageDataReq( TDEIO::Job *job, TQByteArray &data );
+ virtual void slotPutMessageResult( TDEIO::Job *job );
+ virtual void slotPutMessageInfoData(TDEIO::Job *, const TQString &data);
+ virtual void slotExpungeResult( TDEIO::Job *job );
+ virtual void slotDeleteNextFolder( TDEIO::Job *job = 0 );
+ virtual void slotCheckUidValidityResult( TDEIO::Job *job );
+ virtual void slotRenameFolderResult( TDEIO::Job *job );
+ virtual void slotListMessagesResult( TDEIO::Job * job );
+ void slotDeleteNextMessages( TDEIO::Job* job = 0 );
+ void slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t processed );
void slotSubscribtionChange1Done( const TQString&, bool );
void slotSubscribtionChange2Done( const TQString&, bool );
void slotSubscribtionChange1Failed( const TQString &errorMessage );
diff --git a/kmail/callback.cpp b/kmail/callback.cpp
index 7a7a583f..9b6da633 100644
--- a/kmail/callback.cpp
+++ b/kmail/callback.cpp
@@ -139,7 +139,7 @@ bool Callback::mailICal( const TQString& to, const TQString &iCal,
// Outlook will only understand the reply if the From: header is the
// same as the To: header of the invitation message.
- KConfigGroup options( KMKernel::config(), "Groupware" );
+ TDEConfigGroup options( KMKernel::config(), "Groupware" );
if( !options.readBoolEntry( "LegacyMangleFromToHeaders", true ) ) {
if( identity != KPIM::Identity::null() ) {
msg->setFrom( identity.fullEmailAddr() );
diff --git a/kmail/composer.h b/kmail/composer.h
index 4bbad316..3d86ec57 100644
--- a/kmail/composer.h
+++ b/kmail/composer.h
@@ -19,7 +19,7 @@ class KMMessagePart;
class TQListViewItem;
class MailComposerIface;
-namespace KIO {
+namespace TDEIO {
class Job;
}
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 4bad5bc5..7b24e228 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -156,7 +156,7 @@ namespace {
I18N_NOOP("<qt><p>This setting has been fixed by your administrator.</p>"
"<p>If you think this is an error, please contact him.</p></qt>");
- void checkLockDown( TQWidget * w, const KConfigBase & c, const char * key ) {
+ void checkLockDown( TQWidget * w, const TDEConfigBase & c, const char * key ) {
if ( c.entryIsImmutable( key ) ) {
w->setEnabled( false );
TQToolTip::add( w, i18n( lockedDownWarning ) );
@@ -176,13 +176,13 @@ namespace {
b->setText( i18n( e.desc ) );
}
- void loadWidget( TQCheckBox * b, const KConfigBase & c, const BoolConfigEntry & e ) {
+ void loadWidget( TQCheckBox * b, const TDEConfigBase & c, const BoolConfigEntry & e ) {
Q_ASSERT( c.group() == e.group );
checkLockDown( b, c, e.key );
b->setChecked( c.readBoolEntry( e.key, e.defaultValue ) );
}
- void loadWidget( TQButtonGroup * g, const KConfigBase & c, const EnumConfigEntry & e ) {
+ void loadWidget( TQButtonGroup * g, const TDEConfigBase & c, const EnumConfigEntry & e ) {
Q_ASSERT( c.group() == e.group );
Q_ASSERT( g->count() == e.numItems );
checkLockDown( g, c, e.key );
@@ -195,19 +195,19 @@ namespace {
g->setButton( e.defaultItem );
}
- void saveCheckBox( TQCheckBox * b, KConfigBase & c, const BoolConfigEntry & e ) {
+ void saveCheckBox( TQCheckBox * b, TDEConfigBase & c, const BoolConfigEntry & e ) {
Q_ASSERT( c.group() == e.group );
c.writeEntry( e.key, b->isChecked() );
}
- void saveButtonGroup( TQButtonGroup * g, KConfigBase & c, const EnumConfigEntry & e ) {
+ void saveButtonGroup( TQButtonGroup * g, TDEConfigBase & c, const EnumConfigEntry & e ) {
Q_ASSERT( c.group() == e.group );
Q_ASSERT( g->count() == e.numItems );
c.writeEntry( e.key, e.items[ g->id( g->selected() ) ].key );
}
template <typename T_Widget, typename T_Entry>
- inline void loadProfile( T_Widget * g, const KConfigBase & c, const T_Entry & e ) {
+ inline void loadProfile( T_Widget * g, const TDEConfigBase & c, const T_Entry & e ) {
if ( c.hasKey( e.key ) )
loadWidget( g, c, e );
}
@@ -233,7 +233,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
// the KCMultiDialog starts with the size of the first kcm, not
// the largest one. This way at least after the first showing of
// the largest kcm the size is kept.
- KConfigGroup geometry( KMKernel::config(), "Geometry" );
+ TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
int width = geometry.readNumEntry( "ConfigureDialogWidth" );
int height = geometry.readNumEntry( "ConfigureDialogHeight" );
if ( width != 0 && height != 0 ) {
@@ -243,7 +243,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
}
void ConfigureDialog::hideEvent( TQHideEvent *ev ) {
- KConfigGroup geometry( KMKernel::config(), "Geometry" );
+ TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
geometry.writeEntry( "ConfigureDialogWidth", width() );
geometry.writeEntry( "ConfigureDialogHeight",height() );
KDialogBase::hideEvent( ev );
@@ -270,8 +270,8 @@ void ConfigureDialog::slotUser2() {
return;
}
mProfileDialog = new ProfileDialog( this, "mProfileDialog" );
- connect( mProfileDialog, TQT_SIGNAL(profileSelected(KConfig*)),
- this, TQT_SIGNAL(installProfile(KConfig*)) );
+ connect( mProfileDialog, TQT_SIGNAL(profileSelected(TDEConfig*)),
+ this, TQT_SIGNAL(installProfile(TDEConfig*)) );
mProfileDialog->show();
}
@@ -359,7 +359,7 @@ void IdentityPage::save() {
if( mOldNumberOfIdentities < 2 && mIdentityList->childCount() > 1 ) {
// have more than one identity, so better show the combo in the
// composer now:
- KConfigGroup composer( KMKernel::config(), "Composer" );
+ TDEConfigGroup composer( KMKernel::config(), "Composer" );
int showHeaders = composer.readNumEntry( "headers", HDR_STANDARD );
showHeaders |= HDR_IDENTITY;
composer.writeEntry( "headers", showHeaders );
@@ -367,7 +367,7 @@ void IdentityPage::save() {
// and now the reverse
if( mOldNumberOfIdentities > 1 && mIdentityList->childCount() < 2 ) {
// have only one identity, so remove the combo in the composer:
- KConfigGroup composer( KMKernel::config(), "Composer" );
+ TDEConfigGroup composer( KMKernel::config(), "Composer" );
int showHeaders = composer.readNumEntry( "headers", HDR_STANDARD );
showHeaders &= ~HDR_IDENTITY;
composer.writeEntry( "headers", showHeaders );
@@ -970,8 +970,8 @@ void AccountsPage::SendingTab::doLoadFromGlobalSettings() {
}
void AccountsPage::SendingTab::doLoadOther() {
- KConfigGroup general( KMKernel::config(), "General");
- KConfigGroup composer( KMKernel::config(), "Composer");
+ TDEConfigGroup general( KMKernel::config(), "General");
+ TDEConfigGroup composer( KMKernel::config(), "Composer");
int numTransports = general.readNumEntry("transports", 0);
@@ -1032,8 +1032,8 @@ void AccountsPage::SendingTab::doLoadOther() {
}
void AccountsPage::SendingTab::save() {
- KConfigGroup general( KMKernel::config(), "General" );
- KConfigGroup composer( KMKernel::config(), "Composer" );
+ TDEConfigGroup general( KMKernel::config(), "General" );
+ TDEConfigGroup composer( KMKernel::config(), "Composer" );
// Save transports:
general.writeEntry( "transports", mTransportInfoList.count() );
@@ -1391,7 +1391,7 @@ void AccountsPage::ReceivingTab::doLoadFromGlobalSettings() {
}
void AccountsPage::ReceivingTab::doLoadOther() {
- KConfigGroup general( KMKernel::config(), "General" );
+ TDEConfigGroup general( KMKernel::config(), "General" );
mAccountList->clear();
TQListViewItem *top = 0;
@@ -1453,7 +1453,7 @@ void AccountsPage::ReceivingTab::save() {
kmkernel->cleanupImapFolders();
// Save Mail notification settings
- KConfigGroup general( KMKernel::config(), "General" );
+ TDEConfigGroup general( KMKernel::config(), "General" );
general.writeEntry( "beep-on-mail", mBeepNewMailCheck->isChecked() );
GlobalSettings::self()->setVerboseNewMailNotification( mVerboseNotificationCheck->isChecked() );
@@ -1644,7 +1644,7 @@ void AppearancePage::FontsTab::slotFontSelectorChanged( int index )
}
void AppearancePage::FontsTab::doLoadOther() {
- KConfigGroup fonts( KMKernel::config(), "Fonts" );
+ TDEConfigGroup fonts( KMKernel::config(), "Fonts" );
mFont[0] = TDEGlobalSettings::generalFont();
TQFont fixedFont = TDEGlobalSettings::fixedFont();
@@ -1657,8 +1657,8 @@ void AppearancePage::FontsTab::doLoadOther() {
slotFontSelectorChanged( 0 );
}
-void AppearancePage::FontsTab::installProfile( KConfig * profile ) {
- KConfigGroup fonts( profile, "Fonts" );
+void AppearancePage::FontsTab::installProfile( TDEConfig * profile ) {
+ TDEConfigGroup fonts( profile, "Fonts" );
// read fonts that are defined in the profile:
bool needChange = false;
@@ -1678,7 +1678,7 @@ void AppearancePage::FontsTab::installProfile( KConfig * profile ) {
}
void AppearancePage::FontsTab::save() {
- KConfigGroup fonts( KMKernel::config(), "Fonts" );
+ TDEConfigGroup fonts( KMKernel::config(), "Fonts" );
// read the current font (might have been modified)
if ( mActiveFontIndex >= 0 )
@@ -1786,7 +1786,7 @@ AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * parent, const char
}
void AppearancePage::ColorsTab::doLoadOther() {
- KConfigGroup reader( KMKernel::config(), "Reader" );
+ TDEConfigGroup reader( KMKernel::config(), "Reader" );
mCustomColorCheck->setChecked( !reader.readBoolEntry( "defaultColors", true ) );
mRecycleColorCheck->setChecked( reader.readBoolEntry( "RecycleQuoteColors", false ) );
@@ -1827,8 +1827,8 @@ void AppearancePage::ColorsTab::doLoadOther() {
this, TQT_SLOT( slotEmitChanged( void ) ) );
}
-void AppearancePage::ColorsTab::installProfile( KConfig * profile ) {
- KConfigGroup reader( profile, "Reader" );
+void AppearancePage::ColorsTab::installProfile( TDEConfig * profile ) {
+ TDEConfigGroup reader( profile, "Reader" );
if ( reader.hasKey( "defaultColors" ) )
mCustomColorCheck->setChecked( !reader.readBoolEntry( "defaultColors" ) );
@@ -1841,7 +1841,7 @@ void AppearancePage::ColorsTab::installProfile( KConfig * profile ) {
}
void AppearancePage::ColorsTab::save() {
- KConfigGroup reader( KMKernel::config(), "Reader" );
+ TDEConfigGroup reader( KMKernel::config(), "Reader" );
bool customColors = mCustomColorCheck->isChecked();
reader.writeEntry( "defaultColors", !customColors );
@@ -1940,8 +1940,8 @@ AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * parent, const char
}
void AppearancePage::LayoutTab::doLoadOther() {
- const KConfigGroup reader( KMKernel::config(), "Reader" );
- const KConfigGroup geometry( KMKernel::config(), "Geometry" );
+ const TDEConfigGroup reader( KMKernel::config(), "Reader" );
+ const TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
loadWidget( mFolderListGroup, geometry, folderListMode );
loadWidget( mMIMETreeLocationGroup, reader, mimeTreeLocation );
@@ -1950,9 +1950,9 @@ void AppearancePage::LayoutTab::doLoadOther() {
mFavoriteFolderViewCB->setChecked( GlobalSettings::self()->enableFavoriteFolderView() );
}
-void AppearancePage::LayoutTab::installProfile( KConfig * profile ) {
- const KConfigGroup reader( profile, "Reader" );
- const KConfigGroup geometry( profile, "Geometry" );
+void AppearancePage::LayoutTab::installProfile( TDEConfig * profile ) {
+ const TDEConfigGroup reader( profile, "Reader" );
+ const TDEConfigGroup geometry( profile, "Geometry" );
loadProfile( mFolderListGroup, geometry, folderListMode );
loadProfile( mMIMETreeLocationGroup, reader, mimeTreeLocation );
@@ -1961,8 +1961,8 @@ void AppearancePage::LayoutTab::installProfile( KConfig * profile ) {
}
void AppearancePage::LayoutTab::save() {
- KConfigGroup reader( KMKernel::config(), "Reader" );
- KConfigGroup geometry( KMKernel::config(), "Geometry" );
+ TDEConfigGroup reader( KMKernel::config(), "Reader" );
+ TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
saveButtonGroup( mFolderListGroup, geometry, folderListMode );
saveButtonGroup( mMIMETreeLocationGroup, reader, mimeTreeLocation );
@@ -2114,8 +2114,8 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
}
void AppearancePage::HeadersTab::doLoadOther() {
- KConfigGroup general( KMKernel::config(), "General" );
- KConfigGroup geometry( KMKernel::config(), "Geometry" );
+ TDEConfigGroup general( KMKernel::config(), "General" );
+ TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
// "General Options":
mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages", false ) );
@@ -2150,9 +2150,9 @@ void AppearancePage::HeadersTab::setDateDisplay( int num, const TQString & forma
mDateDisplay->setButton( numDateDisplayConfig - 2 ); // default
}
-void AppearancePage::HeadersTab::installProfile( KConfig * profile ) {
- KConfigGroup general( profile, "General" );
- KConfigGroup geometry( profile, "Geometry" );
+void AppearancePage::HeadersTab::installProfile( TDEConfig * profile ) {
+ TDEConfigGroup general( profile, "General" );
+ TDEConfigGroup geometry( profile, "Geometry" );
if ( geometry.hasKey( "nestedMessages" ) )
mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages" ) );
@@ -2176,8 +2176,8 @@ void AppearancePage::HeadersTab::installProfile( KConfig * profile ) {
}
void AppearancePage::HeadersTab::save() {
- KConfigGroup general( KMKernel::config(), "General" );
- KConfigGroup geometry( KMKernel::config(), "Geometry" );
+ TDEConfigGroup general( KMKernel::config(), "General" );
+ TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
if ( geometry.readBoolEntry( "nestedMessages", false )
!= mNestedMessagesCheck->isChecked() ) {
@@ -2191,7 +2191,7 @@ void AppearancePage::HeadersTab::save() {
TQStringList groups = KMKernel::config()->groupList().grep( TQRegExp("^Folder-") );
kdDebug(5006) << "groups.count() == " << groups.count() << endl;
for ( TQStringList::const_iterator it = groups.begin() ; it != groups.end() ; ++it ) {
- KConfigGroup group( KMKernel::config(), *it );
+ TDEConfigGroup group( KMKernel::config(), *it );
group.deleteEntry( "threadMessagesOverride" );
}
}
@@ -2433,14 +2433,14 @@ void AppearancePage::ReaderTab::doLoadFromGlobalSettings()
void AppearancePage::ReaderTab::doLoadOther()
{
- const KConfigGroup reader( KMKernel::config(), "Reader" );
+ const TDEConfigGroup reader( KMKernel::config(), "Reader" );
loadWidget( mShowColorbarCheck, reader, showColorbarMode );
loadWidget( mShowSpamStatusCheck, reader, showSpamStatusMode );
}
void AppearancePage::ReaderTab::save() {
- KConfigGroup reader( KMKernel::config(), "Reader" );
+ TDEConfigGroup reader( KMKernel::config(), "Reader" );
saveCheckBox( mShowColorbarCheck, reader, showColorbarMode );
saveCheckBox( mShowSpamStatusCheck, reader, showSpamStatusMode );
GlobalSettings::self()->setCloseAfterReplyOrForward( mCloseAfterReplyOrForwardCheck->isChecked() );
@@ -2459,8 +2459,8 @@ void AppearancePage::ReaderTab::save() {
}
-void AppearancePage::ReaderTab::installProfile( KConfig * /* profile */ ) {
- const KConfigGroup reader( KMKernel::config(), "Reader" );
+void AppearancePage::ReaderTab::installProfile( TDEConfig * /* profile */ ) {
+ const TDEConfigGroup reader( KMKernel::config(), "Reader" );
loadProfile( mCloseAfterReplyOrForwardCheck, reader, closeAfterReplyOrForward );
loadProfile( mShowColorbarCheck, reader, showColorbarMode );
loadProfile( mShowSpamStatusCheck, reader, showSpamStatusMode );
@@ -2512,8 +2512,8 @@ void AppearancePage::SystemTrayTab::doLoadFromGlobalSettings() {
mSystemTrayGroup->setEnabled( mSystemTrayCheck->isChecked() );
}
-void AppearancePage::SystemTrayTab::installProfile( KConfig * profile ) {
- KConfigGroup general( profile, "General" );
+void AppearancePage::SystemTrayTab::installProfile( TDEConfig * profile ) {
+ TDEConfigGroup general( profile, "General" );
if ( general.hasKey( "SystemTrayEnabled" ) ) {
mSystemTrayCheck->setChecked( general.readBoolEntry( "SystemTrayEnabled" ) );
@@ -2832,9 +2832,9 @@ void ComposerPage::GeneralTab::doLoadFromGlobalSettings() {
mEditorRequester->setURL( GlobalSettings::self()->externalEditor() );
}
-void ComposerPage::GeneralTab::installProfile( KConfig * profile ) {
- KConfigGroup composer( profile, "Composer" );
- KConfigGroup general( profile, "General" );
+void ComposerPage::GeneralTab::installProfile( TDEConfig * profile ) {
+ TDEConfigGroup composer( profile, "Composer" );
+ TDEConfigGroup general( profile, "General" );
if ( composer.hasKey( "signature" ) ) {
bool state = composer.readBoolEntry("signature");
@@ -3320,7 +3320,7 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) {
}
void ComposerPage::CharsetTab::doLoadOther() {
- KConfigGroup composer( KMKernel::config(), "Composer" );
+ TDEConfigGroup composer( KMKernel::config(), "Composer" );
TQStringList charsets = composer.readListEntry( "pref-charsets" );
for ( TQStringList::Iterator it = charsets.begin() ;
@@ -3336,7 +3336,7 @@ void ComposerPage::CharsetTab::doLoadOther() {
}
void ComposerPage::CharsetTab::save() {
- KConfigGroup composer( KMKernel::config(), "Composer" );
+ TDEConfigGroup composer( KMKernel::config(), "Composer" );
TQStringList charsetList = mCharsetListEditor->stringList();
TQStringList::Iterator it = charsetList.begin();
@@ -3509,7 +3509,7 @@ void ComposerPage::HeadersTab::slotRemoveMimeHeader()
}
void ComposerPage::HeadersTab::doLoadOther() {
- KConfigGroup general( KMKernel::config(), "General" );
+ TDEConfigGroup general( KMKernel::config(), "General" );
TQString suffix = general.readEntry( "myMessageIdSuffix" );
mMessageIdSuffixEdit->setText( suffix );
@@ -3525,7 +3525,7 @@ void ComposerPage::HeadersTab::doLoadOther() {
int count = general.readNumEntry( "mime-header-count", 0 );
for( int i = 0 ; i < count ; i++ ) {
- KConfigGroup config( KMKernel::config(),
+ TDEConfigGroup config( KMKernel::config(),
TQCString("Mime #") + TQCString().setNum(i) );
TQString name = config.readEntry( "name" );
TQString value = config.readEntry( "value" );
@@ -3543,7 +3543,7 @@ void ComposerPage::HeadersTab::doLoadOther() {
}
void ComposerPage::HeadersTab::save() {
- KConfigGroup general( KMKernel::config(), "General" );
+ TDEConfigGroup general( KMKernel::config(), "General" );
general.writeEntry( "useCustomMessageIdSuffix",
mCreateOwnMessageIdCheck->isChecked() );
@@ -3554,7 +3554,7 @@ void ComposerPage::HeadersTab::save() {
TQListViewItem * item = mTagList->firstChild();
for ( ; item ; item = item->itemBelow() )
if( !item->text(0).isEmpty() ) {
- KConfigGroup config( KMKernel::config(), TQCString("Mime #")
+ TDEConfigGroup config( KMKernel::config(), TQCString("Mime #")
+ TQCString().setNum( numValidEntries ) );
config.writeEntry( "name", item->text( 0 ) );
config.writeEntry( "value", item->text( 1 ) );
@@ -3708,7 +3708,7 @@ SecurityPage::SecurityPage( TQWidget * parent, const char * name )
}
-void SecurityPage::installProfile( KConfig * profile ) {
+void SecurityPage::installProfile( TDEConfig * profile ) {
mGeneralTab->installProfile( profile );
mComposerCryptoTab->installProfile( profile );
mWarningTab->installProfile( profile );
@@ -3910,7 +3910,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
}
void SecurityPage::GeneralTab::doLoadOther() {
- const KConfigGroup reader( KMKernel::config(), "Reader" );
+ const TDEConfigGroup reader( KMKernel::config(), "Reader" );
mHtmlMailCheck->setChecked( reader.readBoolEntry( "htmlMail", false ) );
mExternalReferences->setChecked( reader.readBoolEntry( "htmlLoadExternal", false ) );
@@ -3918,7 +3918,7 @@ void SecurityPage::GeneralTab::doLoadOther() {
mAlwaysDecrypt->setChecked( GlobalSettings::self()->alwaysDecrypt() );
- const KConfigGroup mdn( KMKernel::config(), "MDN" );
+ const TDEConfigGroup mdn( KMKernel::config(), "MDN" );
int num = mdn.readNumEntry( "default-policy", 0 );
if ( num < 0 || num >= mMDNGroup->count() ) num = 0;
@@ -3929,9 +3929,9 @@ void SecurityPage::GeneralTab::doLoadOther() {
mNoMDNsWhenEncryptedCheck->setChecked(mdn.readBoolEntry( "not-send-when-encrypted", true ));
}
-void SecurityPage::GeneralTab::installProfile( KConfig * profile ) {
- const KConfigGroup reader( profile, "Reader" );
- const KConfigGroup mdn( profile, "MDN" );
+void SecurityPage::GeneralTab::installProfile( TDEConfig * profile ) {
+ const TDEConfigGroup reader( profile, "Reader" );
+ const TDEConfigGroup mdn( profile, "MDN" );
if ( reader.hasKey( "htmlMail" ) )
mHtmlMailCheck->setChecked( reader.readBoolEntry( "htmlMail" ) );
@@ -3955,8 +3955,8 @@ void SecurityPage::GeneralTab::installProfile( KConfig * profile ) {
}
void SecurityPage::GeneralTab::save() {
- KConfigGroup reader( KMKernel::config(), "Reader" );
- KConfigGroup mdn( KMKernel::config(), "MDN" );
+ TDEConfigGroup reader( KMKernel::config(), "Reader" );
+ TDEConfigGroup mdn( KMKernel::config(), "MDN" );
if (reader.readBoolEntry( "htmlMail", false ) != mHtmlMailCheck->isChecked())
{
@@ -3976,7 +3976,7 @@ void SecurityPage::GeneralTab::save() {
{
if (*it)
{
- KConfigGroupSaver saver(KMKernel::config(),
+ TDEConfigGroupSaver saver(KMKernel::config(),
"Folder-" + (*it)->idString());
KMKernel::config()->writeEntry("htmlMailOverride", false);
}
@@ -4014,7 +4014,7 @@ SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * parent,
}
void SecurityPage::ComposerCryptoTab::doLoadOther() {
- const KConfigGroup composer( KMKernel::config(), "Composer" );
+ const TDEConfigGroup composer( KMKernel::config(), "Composer" );
// If you change default values, sync messagecomposer.cpp too
@@ -4031,8 +4031,8 @@ void SecurityPage::ComposerCryptoTab::doLoadOther() {
mWidget->mStoreEncrypted->setChecked( composer.readBoolEntry( "crypto-store-encrypted", true ) );
}
-void SecurityPage::ComposerCryptoTab::installProfile( KConfig * profile ) {
- const KConfigGroup composer( profile, "Composer" );
+void SecurityPage::ComposerCryptoTab::installProfile( TDEConfig * profile ) {
+ const TDEConfigGroup composer( profile, "Composer" );
if ( composer.hasKey( "pgp-auto-sign" ) )
mWidget->mAutoSignature->setChecked( composer.readBoolEntry( "pgp-auto-sign" ) );
@@ -4053,7 +4053,7 @@ void SecurityPage::ComposerCryptoTab::installProfile( KConfig * profile ) {
}
void SecurityPage::ComposerCryptoTab::save() {
- KConfigGroup composer( KMKernel::config(), "Composer" );
+ TDEConfigGroup composer( KMKernel::config(), "Composer" );
composer.writeEntry( "pgp-auto-sign", mWidget->mAutoSignature->isChecked() );
@@ -4097,7 +4097,7 @@ SecurityPageWarningTab::SecurityPageWarningTab( TQWidget * parent, const char *
}
void SecurityPage::WarningTab::doLoadOther() {
- const KConfigGroup composer( KMKernel::config(), "Composer" );
+ const TDEConfigGroup composer( KMKernel::config(), "Composer" );
mWidget->warnUnencryptedCB->setChecked( composer.readBoolEntry( "crypto-warning-unencrypted", false ) );
mWidget->mWarnUnsigned->setChecked( composer.readBoolEntry( "crypto-warning-unsigned", false ) );
@@ -4118,8 +4118,8 @@ void SecurityPage::WarningTab::doLoadOther() {
mWidget->enableAllWarningsPB->setEnabled( true );
}
-void SecurityPage::WarningTab::installProfile( KConfig * profile ) {
- const KConfigGroup composer( profile, "Composer" );
+void SecurityPage::WarningTab::installProfile( TDEConfig * profile ) {
+ const TDEConfigGroup composer( profile, "Composer" );
if ( composer.hasKey( "crypto-warning-unencrypted" ) )
mWidget->warnUnencryptedCB->setChecked( composer.readBoolEntry( "crypto-warning-unencrypted" ) );
@@ -4147,7 +4147,7 @@ void SecurityPage::WarningTab::installProfile( KConfig * profile ) {
}
void SecurityPage::WarningTab::save() {
- KConfigGroup composer( KMKernel::config(), "Composer" );
+ TDEConfigGroup composer( KMKernel::config(), "Composer" );
composer.writeEntry( "crypto-warn-recv-not-in-cert", mWidget->warnReceiverNotInCertificateCB->isChecked() );
composer.writeEntry( "crypto-warning-unencrypted", mWidget->warnUnencryptedCB->isChecked() );
@@ -4390,7 +4390,7 @@ void SecurityPage::SMimeTab::slotUpdateHTTPActions() {
mWidget->customHTTPProxy->setEnabled( enableProxySettings );
}
-void SecurityPage::SMimeTab::installProfile( KConfig * ) {
+void SecurityPage::SMimeTab::installProfile( TDEConfig * ) {
}
static void saveCheckBoxToKleoEntry( TQCheckBox* cb, Kleo::CryptoConfigEntry* entry ) {
@@ -4758,7 +4758,7 @@ void MiscPage::FolderTab::doLoadFromGlobalSettings() {
}
void MiscPage::FolderTab::doLoadOther() {
- KConfigGroup general( KMKernel::config(), "General" );
+ TDEConfigGroup general( KMKernel::config(), "General" );
mEmptyTrashCheck->setChecked( general.readBoolEntry( "empty-trash-on-exit", true ) );
mOnStartupOpenFolder->setFolder( general.readEntry( "startupFolder",
@@ -4775,7 +4775,7 @@ void MiscPage::FolderTab::doLoadOther() {
}
void MiscPage::FolderTab::save() {
- KConfigGroup general( KMKernel::config(), "General" );
+ TDEConfigGroup general( KMKernel::config(), "General" );
general.writeEntry( "empty-trash-on-exit", mEmptyTrashCheck->isChecked() );
general.writeEntry( "confirm-before-empty", mEmptyFolderConfirmCheck->isChecked() );
@@ -5076,7 +5076,7 @@ void MiscPage::GroupwareTab::doLoadFromGlobalSettings() {
}
void MiscPage::GroupwareTab::save() {
- KConfigGroup groupware( KMKernel::config(), "Groupware" );
+ TDEConfigGroup groupware( KMKernel::config(), "Groupware" );
// Write the groupware config
if ( mEnableGwCB ) {
diff --git a/kmail/configuredialog.h b/kmail/configuredialog.h
index a3ffff0b..265bc957 100644
--- a/kmail/configuredialog.h
+++ b/kmail/configuredialog.h
@@ -25,7 +25,7 @@
#include <tqguardedptr.h>
#include <kcmultidialog.h>
-class KConfig;
+class TDEConfig;
class ProfileDialog;
namespace KMail {
class ImapAccountBase;
@@ -48,7 +48,7 @@ signals:
resp. Only keys that this profile is supposed to alter should be
included in the file.
*/
- void installProfile( KConfig *profile );
+ void installProfile( TDEConfig *profile );
void configChanged();
protected:
void hideEvent( TQHideEvent *i );
diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp
index daa326d2..c430171e 100644
--- a/kmail/configuredialog_p.cpp
+++ b/kmail/configuredialog_p.cpp
@@ -333,7 +333,7 @@ void ProfileDialog::setup() {
TQListViewItem * listItem = 0;
for ( TQStringList::const_iterator it = mProfileList.begin() ;
it != mProfileList.end() ; ++it ) {
- KConfig profile( *it, true /* read-only */, false /* no KDE global */ );
+ TDEConfig profile( *it, true /* read-only */, false /* no KDE global */ );
profile.setGroup("KMail Profile");
TQString name = profile.readEntry( "Name" );
if ( name.isEmpty() ) {
@@ -358,7 +358,7 @@ void ProfileDialog::slotOk() {
assert( (unsigned int)index < mProfileList.count() );
- KConfig profile( *mProfileList.at(index), true, false );
+ TDEConfig profile( *mProfileList.at(index), true, false );
emit profileSelected( &profile );
KDialogBase::slotOk();
}
@@ -385,11 +385,11 @@ void ConfigModuleWithTabs::load() {
if ( tab )
tab->load();
}
- KCModule::load();
+ TDECModule::load();
}
void ConfigModuleWithTabs::save() {
- KCModule::save();
+ TDECModule::save();
for ( int i = 0 ; i < mTabWidget->count() ; ++i ) {
ConfigModuleTab *tab = dynamic_cast<ConfigModuleTab*>( mTabWidget->page(i) );
if ( tab )
@@ -401,10 +401,10 @@ void ConfigModuleWithTabs::defaults() {
ConfigModuleTab *tab = dynamic_cast<ConfigModuleTab*>( mTabWidget->currentPage() );
if ( tab )
tab->defaults();
- KCModule::defaults();
+ TDECModule::defaults();
}
-void ConfigModuleWithTabs::installProfile(KConfig * /* profile */ ) {
+void ConfigModuleWithTabs::installProfile(TDEConfig * /* profile */ ) {
for ( int i = 0 ; i < mTabWidget->count() ; ++i ) {
ConfigModuleTab *tab = dynamic_cast<ConfigModuleTab*>( mTabWidget->page(i) );
if ( tab )
@@ -421,7 +421,7 @@ void ConfigModuleTab::load()
void ConfigModuleTab::defaults()
{
// reset settings which are available via GlobalSettings to their defaults
- // (stolen from KConfigDialogManager::updateWidgetsDefault())
+ // (stolen from TDEConfigDialogManager::updateWidgetsDefault())
const bool bUseDefaults = GlobalSettings::self()->useDefaults( true );
doLoadFromGlobalSettings();
GlobalSettings::self()->useDefaults( bUseDefaults );
diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h
index 0ed45d95..7b05ddb3 100644
--- a/kmail/configuredialog_p.h
+++ b/kmail/configuredialog_p.h
@@ -40,7 +40,7 @@ class ListView;
class ConfigureDialog;
class KIntSpinBox;
class SimpleStringListEditor;
-class KConfig;
+class TDEConfig;
class TQPoint;
class ComposerCryptoConfiguration;
class WarningConfiguration;
@@ -161,7 +161,7 @@ public:
ProfileDialog( TQWidget * parent=0, const char * name=0, bool modal=false );
signals:
- void profileSelected( KConfig * profile );
+ void profileSelected( TDEConfig * profile );
private slots:
void slotSelectionChanged();
@@ -176,12 +176,12 @@ private:
};
#include <kdialog.h>
-class ConfigModule : public KCModule {
+class ConfigModule : public TDECModule {
Q_OBJECT
public:
ConfigModule( TQWidget * parent=0, const char * name=0 )
- : KCModule ( parent, name )
+ : TDECModule ( parent, name )
{}
~ConfigModule() {}
@@ -198,7 +198,7 @@ signals:
from the profile only for those entries that
really have keys defined in the profile.
*/
- void installProfile( KConfig * profile );
+ void installProfile( TDEConfig * profile );
};
@@ -230,7 +230,7 @@ private:
// via GlobalSettings
virtual void doLoadOther() {}
// reimplement this for loading default values of settings which are
- // not available via GlobalSettings (KConfigXT).
+ // not available via GlobalSettings (TDEConfigXT).
virtual void doResetToDefaultsOther() {}
};
@@ -250,7 +250,7 @@ public:
virtual void load();
virtual void save();
virtual void defaults();
- virtual void installProfile( KConfig * profile );
+ virtual void installProfile( TDEConfig * profile );
protected:
void addTab( ConfigModuleTab* tab, const TQString & title );
@@ -437,7 +437,7 @@ public:
TQString helpAnchor() const;
void save();
- void installProfile( KConfig * profile );
+ void installProfile( TDEConfig * profile );
private slots:
void slotFontSelectorChanged( int );
@@ -465,7 +465,7 @@ public:
TQString helpAnchor() const;
void save();
- void installProfile( KConfig * profile );
+ void installProfile( TDEConfig * profile );
private:
//virtual void doLoadFromGlobalSettings();
@@ -487,7 +487,7 @@ public:
TQString helpAnchor() const;
void save();
- void installProfile( KConfig * profile );
+ void installProfile( TDEConfig * profile );
private:
//virtual void doLoadFromGlobalSettings();
@@ -511,7 +511,7 @@ public:
TQString helpAnchor() const;
void save();
- void installProfile( KConfig * profile );
+ void installProfile( TDEConfig * profile );
private: // methods
//virtual void doLoadFromGlobalSettings();
@@ -538,7 +538,7 @@ public:
TQString helpAnchor() const;
void save();
- void installProfile( KConfig * profile );
+ void installProfile( TDEConfig * profile );
private:
virtual void doLoadFromGlobalSettings();
@@ -570,7 +570,7 @@ public:
TQString helpAnchor() const;
void save();
- void installProfile( KConfig * profile );
+ void installProfile( TDEConfig * profile );
private:
virtual void doLoadFromGlobalSettings();
@@ -619,7 +619,7 @@ public:
TQString helpAnchor() const;
void save();
- void installProfile( KConfig * profile );
+ void installProfile( TDEConfig * profile );
protected slots:
void slotConfigureRecentAddresses();
void slotConfigureCompletionOrder();
@@ -852,7 +852,7 @@ public:
TQString helpAnchor() const;
void save();
- void installProfile( KConfig * profile );
+ void installProfile( TDEConfig * profile );
private:
//virtual void doLoadFromGlobalSettings();
@@ -879,7 +879,7 @@ public:
TQString helpAnchor() const;
void save();
- void installProfile( KConfig * profile );
+ void installProfile( TDEConfig * profile );
private:
//virtual void doLoadFromGlobalSettings();
@@ -899,7 +899,7 @@ public:
TQString helpAnchor() const;
void save();
- void installProfile( KConfig * profile );
+ void installProfile( TDEConfig * profile );
private slots:
void slotReenableAllWarningsClicked();
@@ -925,7 +925,7 @@ public:
// Can't use k_dcop here. dcopidl can't parse this file, dcopidlng has a namespace bug.
void save();
- void installProfile( KConfig * profile );
+ void installProfile( TDEConfig * profile );
private slots:
void slotUpdateHTTPActions();
@@ -969,7 +969,7 @@ public:
TQString helpAnchor() const;
// OpenPGP tab is special:
- void installProfile( KConfig * profile );
+ void installProfile( TDEConfig * profile );
typedef SecurityPageGeneralTab GeneralTab;
typedef SecurityPageComposerCryptoTab ComposerCryptoTab;
diff --git a/kmail/copyfolderjob.cpp b/kmail/copyfolderjob.cpp
index a83b1cd6..21f475d6 100644
--- a/kmail/copyfolderjob.cpp
+++ b/kmail/copyfolderjob.cpp
@@ -171,8 +171,8 @@ void CopyFolderJob::slotCopyNextChild( bool success )
bool CopyFolderJob::createTargetDir()
{
// get the default mailbox type
- KConfig * const config = KMKernel::config();
- KConfigGroupSaver saver(config, "General");
+ TDEConfig * const config = KMKernel::config();
+ TDEConfigGroupSaver saver(config, "General");
int deftype = config->readNumEntry("default-mailbox-format", 1);
if ( deftype < 0 || deftype > 1 ) deftype = 1;
diff --git a/kmail/csshelper.cpp b/kmail/csshelper.cpp
index 3fe2fd78..61bdbdd1 100644
--- a/kmail/csshelper.cpp
+++ b/kmail/csshelper.cpp
@@ -44,11 +44,11 @@ namespace KMail {
CSSHelper::CSSHelper( const TQPaintDeviceMetrics &pdm ) :
KPIM::CSSHelper( pdm )
{
- KConfig * config = KMKernel::config();
+ TDEConfig * config = KMKernel::config();
- KConfigGroup reader( config, "Reader" );
- KConfigGroup fonts( config, "Fonts" );
- KConfigGroup pixmaps( config, "Pixmaps" );
+ TDEConfigGroup reader( config, "Reader" );
+ TDEConfigGroup fonts( config, "Fonts" );
+ TDEConfigGroup pixmaps( config, "Pixmaps" );
mRecycleQuoteColors = reader.readBoolEntry( "RecycleQuoteColors", false );
diff --git a/kmail/expirejob.cpp b/kmail/expirejob.cpp
index be5003b3..2fcc323e 100644
--- a/kmail/expirejob.cpp
+++ b/kmail/expirejob.cpp
@@ -205,7 +205,7 @@ void ExpireJob::done()
if ( !str.isEmpty() )
BroadcastStatus::instance()->setStatusMsg( str );
- KConfigGroup group( KMKernel::config(), "Folder-" + mSrcFolder->idString() );
+ TDEConfigGroup group( KMKernel::config(), "Folder-" + mSrcFolder->idString() );
group.writeEntry( "Current", -1 ); // i.e. make it invalid, the serial number will be used
if ( !moving ) {
diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp
index e1c7d6b8..8b629f83 100644
--- a/kmail/favoritefolderview.cpp
+++ b/kmail/favoritefolderview.cpp
@@ -435,9 +435,9 @@ void FavoriteFolderView::contentsDragEnterEvent(TQDragEnterEvent * e)
void FavoriteFolderView::readColorConfig()
{
FolderTreeBase::readColorConfig();
- KConfig* conf = KMKernel::config();
+ TDEConfig* conf = KMKernel::config();
// Custom/System color support
- KConfigGroupSaver saver(conf, "Reader");
+ TDEConfigGroupSaver saver(conf, "Reader");
TQColor c = TDEGlobalSettings::alternateBackgroundColor();
if ( !conf->readBoolEntry("defaultColors", true) )
mPaintInfo.colBack = conf->readColorEntry( "AltBackgroundColor",&c );
diff --git a/kmail/filterimporterexporter.cpp b/kmail/filterimporterexporter.cpp
index d63278ad..3f6208d6 100644
--- a/kmail/filterimporterexporter.cpp
+++ b/kmail/filterimporterexporter.cpp
@@ -139,9 +139,9 @@ void FilterSelectionDialog::slotSelectAllButton()
}
/* static */
-TQValueList<KMFilter*> FilterImporterExporter::readFiltersFromConfig( KConfig* config, bool bPopFilter )
+TQValueList<KMFilter*> FilterImporterExporter::readFiltersFromConfig( TDEConfig* config, bool bPopFilter )
{
- KConfigGroupSaver saver(config, "General");
+ TDEConfigGroupSaver saver(config, "General");
int numFilters = 0;
if (bPopFilter)
numFilters = config->readNumEntry("popfilters",0);
@@ -152,7 +152,7 @@ TQValueList<KMFilter*> FilterImporterExporter::readFiltersFromConfig( KConfig* c
for ( int i=0 ; i < numFilters ; ++i ) {
TQString grpName;
grpName.sprintf("%s #%d", (bPopFilter ? "PopFilter" : "Filter") , i);
- KConfigGroupSaver saver(config, grpName);
+ TDEConfigGroupSaver saver(config, grpName);
KMFilter * filter = new KMFilter(config, bPopFilter);
filter->purify();
if ( filter->isEmpty() ) {
@@ -168,7 +168,7 @@ TQValueList<KMFilter*> FilterImporterExporter::readFiltersFromConfig( KConfig* c
}
/* static */
-void FilterImporterExporter::writeFiltersToConfig( const TQValueList<KMFilter*>& filters, KConfig* config, bool bPopFilter )
+void FilterImporterExporter::writeFiltersToConfig( const TQValueList<KMFilter*>& filters, TDEConfig* config, bool bPopFilter )
{
// first, delete all groups:
TQStringList filterGroups =
@@ -186,12 +186,12 @@ void FilterImporterExporter::writeFiltersToConfig( const TQValueList<KMFilter*>&
grpName.sprintf("PopFilter #%d", i);
else
grpName.sprintf("Filter #%d", i);
- KConfigGroupSaver saver(config, grpName);
+ TDEConfigGroupSaver saver(config, grpName);
(*it)->writeConfig(config);
++i;
}
}
- KConfigGroupSaver saver(config, "General");
+ TDEConfigGroupSaver saver(config, "General");
if (bPopFilter)
config->writeEntry("popfilters", i);
else
@@ -222,7 +222,7 @@ TQValueList<KMFilter*> FilterImporterExporter::importFilters()
}
}
- KConfig config( fileName );
+ TDEConfig config( fileName );
TQValueList<KMFilter*> imported = readFiltersFromConfig( &config, mPopFilter );
FilterSelectionDialog dlg( mParent );
dlg.setFilters( imported );
@@ -237,7 +237,7 @@ void FilterImporterExporter::exportFilters(const TQValueList<KMFilter*> & filter
if ( saveUrl.isEmpty() || !Util::checkOverwrite( saveUrl, mParent ) )
return;
- KConfig config( saveUrl.path() );
+ TDEConfig config( saveUrl.path() );
FilterSelectionDialog dlg( mParent );
dlg.setFilters( filters );
dlg.exec();
diff --git a/kmail/filterimporterexporter.h b/kmail/filterimporterexporter.h
index 1b46ac02..051288f5 100644
--- a/kmail/filterimporterexporter.h
+++ b/kmail/filterimporterexporter.h
@@ -33,7 +33,7 @@
#include <tqvaluelist.h>
#include <kdialogbase.h>
class KMFilter;
-class KConfig;
+class TDEConfig;
class TQWidget;
class KPushButton;
@@ -41,7 +41,7 @@ namespace KMail
{
/**
- @short Utility class that provides persisting of filters to/from KConfig.
+ @short Utility class that provides persisting of filters to/from TDEConfig.
@author Till Adam <till@kdab.net>
*/
class FilterImporterExporter
@@ -59,8 +59,8 @@ public:
* and which filters to import. */
TQValueList<KMFilter*> importFilters();
- static void writeFiltersToConfig( const TQValueList<KMFilter*>& filters, KConfig* config, bool bPopFilter );
- static TQValueList<KMFilter*> readFiltersFromConfig( KConfig* config, bool bPopFilter );
+ static void writeFiltersToConfig( const TQValueList<KMFilter*>& filters, TDEConfig* config, bool bPopFilter );
+ static TQValueList<KMFilter*> readFiltersFromConfig( TDEConfig* config, bool bPopFilter );
private:
TQWidget* mParent;
bool mPopFilter;
diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index b6c3e2c1..65f65600 100644
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@@ -414,7 +414,7 @@ void KMail::FolderDiaACLTab::load()
// warning mImapAccount can be 0 if creating a subsubsubfolder with dimap... (bug?)
if ( mImapAccount && mImapAccount->login().find('@') == -1 )
defaultFormat = "username"; // no @ found, so we assume it's just the username
- KConfigGroup configGroup( kmkernel->config(), "IMAP" );
+ TDEConfigGroup configGroup( kmkernel->config(), "IMAP" );
TQString str = configGroup.readEntry( "UserIdFormat", defaultFormat );
mUserIdFormat = FullEmail;
if ( str == "username" )
@@ -474,7 +474,7 @@ void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString
mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) );
else
// Connection error (error message box already shown by the account)
- mLabel->setText( KIO::buildErrorString( errorCode, errorMsg ) );
+ mLabel->setText( TDEIO::buildErrorString( errorCode, errorMsg ) );
return;
}
@@ -507,18 +507,18 @@ 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*, KIO::Job*, const KMail::ACLList& )),
- this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
+ connect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
+ this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
}
-void KMail::FolderDiaACLTab::slotReceivedACL( KMFolder* folder, KIO::Job* job, const KMail::ACLList& 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*, KIO::Job*, const KMail::ACLList& )),
- this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
+ disconnect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
+ this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
if ( job && job->error() ) {
- if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION )
+ if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION )
mLabel->setText( i18n( "This IMAP server does not have support for access control lists (ACL)" ) );
else
mLabel->setText( i18n( "Error retrieving access control list (ACL) from server\n%1" ).arg( job->errorString() ) );
@@ -752,18 +752,18 @@ void KMail::FolderDiaACLTab::slotDirectoryListingFinished(KMFolderImap* f)
return;
mImapPath = folderImap->imapPath();
- KIO::Job* job = ACLJobs::multiSetACL( mImapAccount->slave(), imapURL(), mACLList );
+ TDEIO::Job* job = ACLJobs::multiSetACL( mImapAccount->slave(), imapURL(), mACLList );
ImapAccountBase::jobData jd;
jd.total = 1; jd.done = 0; jd.parent = 0;
mImapAccount->insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(KIO::Job *)),
- TQT_SLOT(slotMultiSetACLResult(KIO::Job *)));
+ 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 )) );
}
-void KMail::FolderDiaACLTab::slotMultiSetACLResult(KIO::Job* job)
+void KMail::FolderDiaACLTab::slotMultiSetACLResult(TDEIO::Job* job)
{
ImapAccountBase::JobIterator it = mImapAccount->findJob( job );
if ( it == mImapAccount->jobsEnd() ) return;
diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h
index b5484d7c..4f7f3ab4 100644
--- a/kmail/folderdiaacltab.h
+++ b/kmail/folderdiaacltab.h
@@ -42,7 +42,7 @@ class TQWidgetStack;
class TQHBox;
class TQVButtonGroup;
class KListView;
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
namespace KMail {
@@ -101,8 +101,8 @@ public:
private slots:
// Network (KIO) slots
void slotConnectionResult( int, const TQString& );
- void slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& );
- void slotMultiSetACLResult(KIO::Job *);
+ void slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& );
+ void slotMultiSetACLResult(TDEIO::Job *);
void slotACLChanged( const TQString&, int );
void slotReceivedUserRights( KMFolder* folder );
void slotDirectoryListingFinished(KMFolderImap*);
diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp
index 133a2b1a..3fdb308f 100644
--- a/kmail/folderdiaquotatab.cpp
+++ b/kmail/folderdiaquotatab.cpp
@@ -139,27 +139,27 @@ void KMail::FolderDiaQuotaTab::slotConnectionResult( int errorCode, const TQStri
mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) );
else
// Connection error (error message box already shown by the account)
- mLabel->setText( KIO::buildErrorString( errorCode, errorMsg ) );
+ mLabel->setText( TDEIO::buildErrorString( errorCode, errorMsg ) );
return;
}
- connect( mImapAccount, TQT_SIGNAL( receivedStorageQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& ) ),
- this, TQT_SLOT( slotReceivedQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& ) ) );
+ connect( mImapAccount, TQT_SIGNAL( receivedStorageQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& ) ),
+ this, TQT_SLOT( slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& ) ) );
KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
mImapAccount->getStorageQuotaInfo( folder, mImapPath );
}
void KMail::FolderDiaQuotaTab::slotReceivedQuotaInfo( KMFolder* folder,
- KIO::Job* job,
+ TDEIO::Job* job,
const KMail::QuotaInfo& info )
{
if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) {
//KMFolderImap* folderImap = static_cast<KMFolderImap*>( folder->storage() );
- disconnect( mImapAccount, TQT_SIGNAL(receivedStorageQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& )),
- this, TQT_SLOT(slotReceivedQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& )) );
+ disconnect( mImapAccount, TQT_SIGNAL(receivedStorageQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& )),
+ this, TQT_SLOT(slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& )) );
if ( job && job->error() ) {
- if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION )
+ if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION )
mLabel->setText( i18n( "This account does not have support for quota information." ) );
else
mLabel->setText( i18n( "Error retrieving quota information from server\n%1" ).arg( job->errorString() ) );
diff --git a/kmail/folderdiaquotatab.h b/kmail/folderdiaquotatab.h
index 222b7efc..dd36cf97 100644
--- a/kmail/folderdiaquotatab.h
+++ b/kmail/folderdiaquotatab.h
@@ -70,7 +70,7 @@ private:
private slots:
// Network (KIO) slots
void slotConnectionResult( int, const TQString& );
- void slotReceivedQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& );
+ void slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& );
private:
diff --git a/kmail/folderjob.cpp b/kmail/folderjob.cpp
index 655e18d7..852082a9 100644
--- a/kmail/folderjob.cpp
+++ b/kmail/folderjob.cpp
@@ -114,7 +114,7 @@ FolderJob::start()
//----------------------------------------------------------------------------
void FolderJob::kill()
{
- mErrorCode = KIO::ERR_USER_CANCELED;
+ mErrorCode = TDEIO::ERR_USER_CANCELED;
delete this;
}
diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp
index bfc36b70..00368e6d 100644
--- a/kmail/folderstorage.cpp
+++ b/kmail/folderstorage.cpp
@@ -771,7 +771,7 @@ void FolderStorage::remove()
needsCompact = false; //we are dead - no need to compact us
// Erase settings, otherwise they might interfer when recreating the folder
- KConfig* config = KMKernel::config();
+ TDEConfig* config = KMKernel::config();
config->deleteGroup( "Folder-" + folder()->idString() );
emit closed(folder());
@@ -918,8 +918,8 @@ void FolderStorage::headerOfMsgChanged(const KMMsgBase* aMsg, int idx)
void FolderStorage::readConfig()
{
//kdDebug(5006)<<"#### READING CONFIG = "<< name() <<endl;
- KConfig* config = KMKernel::config();
- KConfigGroupSaver saver(config, "Folder-" + folder()->idString());
+ TDEConfig* config = KMKernel::config();
+ TDEConfigGroupSaver saver(config, "Folder-" + folder()->idString());
if (mUnreadMsgs == -1)
mUnreadMsgs = config->readNumEntry("UnreadMsgs", -1);
if (mTotalMsgs == -1)
@@ -938,8 +938,8 @@ void FolderStorage::readConfig()
//-----------------------------------------------------------------------------
void FolderStorage::writeConfig()
{
- KConfig* config = KMKernel::config();
- KConfigGroupSaver saver(config, "Folder-" + folder()->idString());
+ TDEConfig* config = KMKernel::config();
+ TDEConfigGroupSaver saver(config, "Folder-" + folder()->idString());
config->writeEntry("UnreadMsgs",
mGuessedUnreadMsgs == -1 ? mUnreadMsgs : mGuessedUnreadMsgs);
config->writeEntry("TotalMsgs", mTotalMsgs);
diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp
index 2584f925..b2f82ad9 100644
--- a/kmail/foldertreebase.cpp
+++ b/kmail/foldertreebase.cpp
@@ -105,9 +105,9 @@ bool FolderTreeBase::event(TQEvent * e)
void FolderTreeBase::readColorConfig()
{
- KConfig* conf = KMKernel::config();
+ TDEConfig* conf = KMKernel::config();
// Custom/System color support
- KConfigGroupSaver saver(conf, "Reader");
+ TDEConfigGroupSaver saver(conf, "Reader");
TQColor c1=TQColor(kapp->palette().active().text());
TQColor c2=TQColor("blue");
TQColor c4=TQColor(kapp->palette().active().base());
diff --git a/kmail/folderviewtooltip.h b/kmail/folderviewtooltip.h
index dfc3bbba..f7e3953e 100644
--- a/kmail/folderviewtooltip.h
+++ b/kmail/folderviewtooltip.h
@@ -35,7 +35,7 @@ class FolderViewToolTip : public TQToolTip
.arg( item->folder()->prettyURL().replace( " ", "&nbsp;" ) )
.arg( item->totalCount() < 0 ? "-" : TQString::number( item->totalCount() ) )
.arg( item->unreadCount() < 0 ? "-" : TQString::number( item->unreadCount() ) )
- .arg( KIO::convertSize( item->folderSize() ) );
+ .arg( TDEIO::convertSize( item->folderSize() ) );
if ( KMFolderCachedImap* imap = dynamic_cast<KMFolderCachedImap*>( item->folder()->storage() ) ) {
QuotaInfo info = imap->quotaInfo();
diff --git a/kmail/globalsettings.h b/kmail/globalsettings.h
index f0b16f0c..dd8cd5b5 100644
--- a/kmail/globalsettings.h
+++ b/kmail/globalsettings.h
@@ -37,7 +37,7 @@ public:
static GlobalSettings *self();
- /** Call this slot instead of directly @ref KConfig::sync() to
+ /** Call this slot instead of directly @ref TDEConfig::sync() to
minimize the overall config writes. Calling this slot will
schedule a sync of the application config file using a timer, so
that many consecutive calls can be condensed into a single
diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp
index c63a1ba1..3dbb2b9f 100644
--- a/kmail/headeritem.cpp
+++ b/kmail/headeritem.cpp
@@ -199,9 +199,9 @@ TQString HeaderItem::text( int col) const
} else if(col == headers->paintInfo()->sizeCol
&& headers->paintInfo()->showSize) {
if ( mMsgBase->parent()->folderType() == KMFolderTypeImap ) {
- tmp = KIO::convertSize( mMsgBase->msgSizeServer() );
+ tmp = TDEIO::convertSize( mMsgBase->msgSizeServer() );
} else {
- tmp = KIO::convertSize( mMsgBase->msgSize() );
+ tmp = TDEIO::convertSize( mMsgBase->msgSize() );
}
}
return tmp;
diff --git a/kmail/headerstrategy.cpp b/kmail/headerstrategy.cpp
index 239525d3..4bd06811 100644
--- a/kmail/headerstrategy.cpp
+++ b/kmail/headerstrategy.cpp
@@ -205,7 +205,7 @@ namespace KMail {
CustomHeaderStrategy::CustomHeaderStrategy()
: HeaderStrategy()
{
- KConfigGroup customHeader( KMKernel::config(), "Custom Headers" );
+ TDEConfigGroup customHeader( KMKernel::config(), "Custom Headers" );
if ( customHeader.hasKey( "headers to display" ) ) {
mHeadersToDisplay = customHeader.readListEntry( "headers to display" );
for ( TQStringList::iterator it = mHeadersToDisplay.begin() ; it != mHeadersToDisplay.end() ; ++ it )
@@ -269,7 +269,7 @@ namespace KMail {
if ( lowerType == "brief" ) return brief();
if ( lowerType == "custom" ) return custom();
// don't kdFatal here, b/c the strings are user-provided
- // (KConfig), so fail gracefully to the default:
+ // (TDEConfig), so fail gracefully to the default:
return standard();
}
diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp
index c3a5b8b2..5c4108ee 100644
--- a/kmail/headerstyle.cpp
+++ b/kmail/headerstyle.cpp
@@ -423,7 +423,7 @@ namespace KMail {
if ( !strategy )
strategy = HeaderStrategy::rich();
- KConfigGroup configReader( KMKernel::config(), "Reader" );
+ TDEConfigGroup configReader( KMKernel::config(), "Reader" );
// ### from kmreaderwin begin
// The direction of the header is determined according to the direction
@@ -1085,7 +1085,7 @@ namespace KMail {
if ( lowerType == "enterprise" ) return enterprise();
//if ( lowerType == "fancy" ) return fancy(); // not needed, see below
// don't kdFatal here, b/c the strings are user-provided
- // (KConfig), so fail gracefully to the default:
+ // (TDEConfig), so fail gracefully to the default:
return fancy();
}
diff --git a/kmail/htmlstatusbar.cpp b/kmail/htmlstatusbar.cpp
index d8c00251..d2c35b42 100644
--- a/kmail/htmlstatusbar.cpp
+++ b/kmail/htmlstatusbar.cpp
@@ -101,7 +101,7 @@ TQString KMail::HtmlStatusBar::message() const {
}
namespace {
- inline KConfig * config() {
+ inline TDEConfig * config() {
#ifndef KMAIL_TESTING
return KMKernel::config();
#else
@@ -111,7 +111,7 @@ namespace {
}
TQColor KMail::HtmlStatusBar::fgColor() const {
- KConfigGroup conf( config(), "Reader" );
+ TDEConfigGroup conf( config(), "Reader" );
switch ( mode() ) {
case Html:
return conf.readColorEntry( "ColorbarForegroundHTML", &TQt::white );
@@ -124,7 +124,7 @@ TQColor KMail::HtmlStatusBar::fgColor() const {
}
TQColor KMail::HtmlStatusBar::bgColor() const {
- KConfigGroup conf( config(), "Reader" );
+ TDEConfigGroup conf( config(), "Reader" );
switch ( mode() ) {
case Html:
diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp
index b37a400d..f180d61d 100644
--- a/kmail/identitydialog.cpp
+++ b/kmail/identitydialog.cpp
@@ -434,7 +434,7 @@ namespace KMail {
mXFaceConfigurator->layout()->setMargin( KDialog::marginHint() );
tabWidget->addTab( mXFaceConfigurator, i18n("&Picture") );
- KConfigGroup geometry( KMKernel::config(), "Geometry" );
+ TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
if ( geometry.hasKey( "Identity Dialog size" ) )
resize( geometry.readSizeEntry( "Identity Dialog size" ) );
mNameEdit->setFocus();
@@ -444,7 +444,7 @@ namespace KMail {
}
IdentityDialog::~IdentityDialog() {
- KConfigGroup geometry( KMKernel::config(), "Geometry" );
+ TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
geometry.writeEntry( "Identity Dialog size", size() );
}
diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index 6380251e..e97a260e 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -55,16 +55,16 @@ using KPIM::ProgressManager;
#include <kconfig.h>
#include <klocale.h>
#include <kmessagebox.h>
-using KIO::MetaData;
+using TDEIO::MetaData;
#include <kio/passdlg.h>
-using KIO::PasswordDialog;
+using TDEIO::PasswordDialog;
#include <kio/scheduler.h>
#include <kio/slave.h>
#include <mimelib/bodypart.h>
#include <mimelib/body.h>
#include <mimelib/headers.h>
#include <mimelib/message.h>
-//using KIO::Scheduler; // use FQN below
+//using TDEIO::Scheduler; // use FQN below
#include <tqregexp.h>
#include <tqstylesheet.h>
@@ -105,10 +105,10 @@ namespace KMail {
{
mPort = imapDefaultPort;
mBodyPartList.setAutoDelete(true);
- KIO::Scheduler::connect(TQT_SIGNAL(slaveError(KIO::Slave *, int, const TQString &)),
- this, TQT_SLOT(slotSchedulerSlaveError(KIO::Slave *, int, const TQString &)));
- KIO::Scheduler::connect(TQT_SIGNAL(slaveConnected(KIO::Slave *)),
- this, TQT_SLOT(slotSchedulerSlaveConnected(KIO::Slave *)));
+ 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()));
}
@@ -189,7 +189,7 @@ namespace KMail {
//
//
- void ImapAccountBase::readConfig( /*const*/ KConfig/*Base*/ & config ) {
+ void ImapAccountBase::readConfig( /*const*/ TDEConfig/*Base*/ & config ) {
NetworkAccount::readConfig( config );
setAutoExpunge( config.readBoolEntry( "auto-expunge", false ) );
@@ -229,7 +229,7 @@ namespace KMail {
localBlacklistFromStringList( config.readListEntry( "locallyUnsubscribedFolders" ) );
}
- void ImapAccountBase::writeConfig( KConfig/*Base*/ & config ) /*const*/ {
+ void ImapAccountBase::writeConfig( TDEConfig/*Base*/ & config ) /*const*/ {
NetworkAccount::writeConfig( config );
config.writeEntry( "auto-expunge", autoExpunge() );
@@ -288,7 +288,7 @@ namespace KMail {
// "keep password" checkbox. Then, we set [Passwords]Keep to
// storePasswd(), so that the checkbox in the dialog will be
// init'ed correctly:
- KConfigGroup passwords( TDEGlobal::config(), "Passwords" );
+ TDEConfigGroup passwords( TDEGlobal::config(), "Passwords" );
passwords.writeEntry( "Keep", storePasswd() );
TQString msg = i18n("You need to supply a username and a password to "
"access this mailbox.");
@@ -301,7 +301,7 @@ namespace KMail {
if (ret != TQDialog::Accepted ) {
mPasswordDialogIsActive = false;
mAskAgain = false;
- emit connectionResult( KIO::ERR_USER_CANCELED, TQString() );
+ emit connectionResult( TDEIO::ERR_USER_CANCELED, TQString() );
return Error;
}
mPasswordDialogIsActive = false;
@@ -315,7 +315,7 @@ namespace KMail {
if ( mSlave && !mSlaveConnected ) return Connecting;
mSlaveConnected = false;
- mSlave = KIO::Scheduler::getConnectedSlave( getUrl(), slaveConfig() );
+ mSlave = TDEIO::Scheduler::getConnectedSlave( getUrl(), slaveConfig() );
if ( !mSlave ) {
KMessageBox::error(0, i18n("Could not start process for %1.")
.arg( getUrl().protocol() ) );
@@ -329,7 +329,7 @@ namespace KMail {
return Connecting;
}
- bool ImapAccountBase::handleJobError( KIO::Job *job, const TQString& context, bool abortSync )
+ bool ImapAccountBase::handleJobError( TDEIO::Job *job, const TQString& context, bool abortSync )
{
JobIterator it = findJob( job );
if ( it != jobsEnd() && (*it).progressItem )
@@ -376,8 +376,8 @@ namespace KMail {
// create the KIO-job
if ( makeConnection() != Connected )
return;// ## doesn't handle Connecting
- KIO::SimpleJob *job = KIO::special(url, packedArgs, false);
- KIO::Scheduler::assignJobToSlave(mSlave, job);
+ TDEIO::SimpleJob *job = TDEIO::special(url, packedArgs, false);
+ TDEIO::Scheduler::assignJobToSlave(mSlave, job);
jobData jd( url.url(), NULL );
// a bit of a hack to save one slot
if (subscribe) jd.onlySubscribed = true;
@@ -385,18 +385,18 @@ namespace KMail {
jd.quiet = quiet;
insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(KIO::Job *)),
- TQT_SLOT(slotSubscriptionResult(KIO::Job *)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+ TQT_SLOT(slotSubscriptionResult(TDEIO::Job *)));
}
//-----------------------------------------------------------------------------
- void ImapAccountBase::slotSubscriptionResult( KIO::Job * job )
+ void ImapAccountBase::slotSubscriptionResult( TDEIO::Job * job )
{
// result of a subscription-job
JobIterator it = findJob( job );
if ( it == jobsEnd() ) return;
bool onlySubscribed = (*it).onlySubscribed;
- TQString path = static_cast<KIO::SimpleJob*>(job)->url().path();
+ TQString path = static_cast<TDEIO::SimpleJob*>(job)->url().path();
if (job->error())
{
if ( !(*it).quiet )
@@ -437,11 +437,11 @@ namespace KMail {
jd.cancellable = true;
insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(KIO::Job *)),
- TQT_SLOT(slotGetUserRightsResult(KIO::Job *)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+ TQT_SLOT(slotGetUserRightsResult(TDEIO::Job *)));
}
- void ImapAccountBase::slotGetUserRightsResult( KIO::Job* _job )
+ void ImapAccountBase::slotGetUserRightsResult( TDEIO::Job* _job )
{
ACLJobs::GetUserRightsJob* job = static_cast<ACLJobs::GetUserRightsJob *>( _job );
JobIterator it = findJob( job );
@@ -449,7 +449,7 @@ namespace KMail {
KMFolder* folder = (*it).parent;
if ( job->error() ) {
- if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) // that's when the imap server doesn't support ACLs
+ if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION ) // that's when the imap server doesn't support ACLs
mACLSupport = false;
else
kdWarning(5006) << "slotGetUserRightsResult: " << job->errorString() << endl;
@@ -481,11 +481,11 @@ namespace KMail {
jd.cancellable = true;
insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(KIO::Job *)),
- TQT_SLOT(slotGetACLResult(KIO::Job *)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+ TQT_SLOT(slotGetACLResult(TDEIO::Job *)));
}
- void ImapAccountBase::slotGetACLResult( KIO::Job* _job )
+ void ImapAccountBase::slotGetACLResult( TDEIO::Job* _job )
{
ACLJobs::GetACLJob* job = static_cast<ACLJobs::GetACLJob *>( _job );
JobIterator it = findJob( job );
@@ -509,16 +509,16 @@ namespace KMail {
jd.cancellable = true;
insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(KIO::Job *)),
- TQT_SLOT(slotGetStorageQuotaInfoResult(KIO::Job *)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+ TQT_SLOT(slotGetStorageQuotaInfoResult(TDEIO::Job *)));
}
- void ImapAccountBase::slotGetStorageQuotaInfoResult( KIO::Job* _job )
+ void ImapAccountBase::slotGetStorageQuotaInfoResult( TDEIO::Job* _job )
{
QuotaJobs::GetStorageQuotaJob* job = static_cast<QuotaJobs::GetStorageQuotaJob *>( _job );
JobIterator it = findJob( job );
if ( it == jobsEnd() ) return;
- if ( job->error() && job->error() == KIO::ERR_UNSUPPORTED_ACTION )
+ if ( job->error() && job->error() == TDEIO::ERR_UNSUPPORTED_ACTION )
setHasNoQuotaSupport();
KMFolder* folder = (*it).parent; // can be 0
@@ -534,10 +534,10 @@ namespace KMail {
stream << ( int ) 'N';
- KIO::SimpleJob *job = KIO::special( getUrl(), packedArgs, false );
- KIO::Scheduler::assignJobToSlave(mSlave, job);
- connect( job, TQT_SIGNAL(result( KIO::Job * ) ),
- this, TQT_SLOT( slotSimpleResult( KIO::Job * ) ) );
+ 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 * ) ) );
} else {
/* Stop the timer, we have disconnected. We have to make sure it is
started again when a new slave appears. */
@@ -548,7 +548,7 @@ namespace KMail {
void ImapAccountBase::slotIdleTimeout()
{
if ( mSlave ) {
- KIO::Scheduler::disconnectSlave(mSlave);
+ TDEIO::Scheduler::disconnectSlave(mSlave);
mSlave = 0;
mSlaveConnected = false;
/* As for the noop timer, we need to make sure this one is started
@@ -566,7 +566,7 @@ namespace KMail {
//-----------------------------------------------------------------------------
- void ImapAccountBase::slotSchedulerSlaveError(KIO::Slave *aSlave, int errorCode,
+ void ImapAccountBase::slotSchedulerSlaveError(TDEIO::Slave *aSlave, int errorCode,
const TQString &errorMsg)
{
if (aSlave != mSlave) return;
@@ -580,7 +580,7 @@ namespace KMail {
resetConnectionList( this );
if ( mSlave )
{
- KIO::Scheduler::disconnectSlave( slave() );
+ TDEIO::Scheduler::disconnectSlave( slave() );
mSlave = 0;
}
}
@@ -588,7 +588,7 @@ namespace KMail {
}
//-----------------------------------------------------------------------------
- void ImapAccountBase::slotSchedulerSlaveConnected(KIO::Slave *aSlave)
+ void ImapAccountBase::slotSchedulerSlaveConnected(TDEIO::Slave *aSlave)
{
if (aSlave != mSlave) return;
mSlaveConnected = true;
@@ -605,14 +605,14 @@ namespace KMail {
TQByteArray packedArgs;
TQDataStream stream( packedArgs, IO_WriteOnly);
stream << (int) 'c';
- KIO::SimpleJob *job = KIO::special( getUrl(), packedArgs, false );
- KIO::Scheduler::assignJobToSlave( mSlave, job );
- connect( job, TQT_SIGNAL(infoMessage(KIO::Job*, const TQString&)),
- TQT_SLOT(slotCapabilitiesResult(KIO::Job*, const TQString&)) );
+ 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&)) );
}
//-----------------------------------------------------------------------------
- void ImapAccountBase::slotCapabilitiesResult( KIO::Job*, const TQString& result )
+ void ImapAccountBase::slotCapabilitiesResult( TDEIO::Job*, const TQString& result )
{
mCapabilities = TQStringList::split(' ', result.lower() );
kdDebug(5006) << "capabilities:" << mCapabilities << endl;
@@ -649,15 +649,15 @@ namespace KMail {
TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
this,
TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) );
- KIO::SimpleJob *job = KIO::special( getUrl(), packedArgs, false );
- KIO::Scheduler::assignJobToSlave( mSlave, job );
+ TDEIO::SimpleJob *job = TDEIO::special( getUrl(), packedArgs, false );
+ TDEIO::Scheduler::assignJobToSlave( mSlave, job );
insertJob( job, jd );
- connect( job, TQT_SIGNAL( infoMessage(KIO::Job*, const TQString&) ),
- TQT_SLOT( slotNamespaceResult(KIO::Job*, const TQString&) ) );
+ connect( job, TQT_SIGNAL( infoMessage(TDEIO::Job*, const TQString&) ),
+ TQT_SLOT( slotNamespaceResult(TDEIO::Job*, const TQString&) ) );
}
//-----------------------------------------------------------------------------
- void ImapAccountBase::slotNamespaceResult( KIO::Job* job, const TQString& str )
+ void ImapAccountBase::slotNamespaceResult( TDEIO::Job* job, const TQString& str )
{
JobIterator it = findJob( job );
if ( it == jobsEnd() ) return;
@@ -847,7 +847,7 @@ namespace KMail {
}
//-----------------------------------------------------------------------------
- void ImapAccountBase::slotSimpleResult(KIO::Job * job)
+ void ImapAccountBase::slotSimpleResult(TDEIO::Job * job)
{
JobIterator it = findJob( job );
bool quiet = false;
@@ -860,20 +860,20 @@ namespace KMail {
if (!quiet)
handleJobError(job, TQString() );
else {
- if ( job->error() == KIO::ERR_CONNECTION_BROKEN && slave() ) {
+ if ( job->error() == TDEIO::ERR_CONNECTION_BROKEN && slave() ) {
// make sure ERR_CONNECTION_BROKEN is properly handled and the slave
// disconnected even when quiet()
- KIO::Scheduler::disconnectSlave( slave() );
+ TDEIO::Scheduler::disconnectSlave( slave() );
mSlave = 0;
}
- if (job->error() == KIO::ERR_SLAVE_DIED)
+ if (job->error() == TDEIO::ERR_SLAVE_DIED)
slaveDied();
}
}
}
//-----------------------------------------------------------------------------
- bool ImapAccountBase::handlePutError( KIO::Job* job, jobData& jd, KMFolder* folder )
+ bool ImapAccountBase::handlePutError( TDEIO::Job* job, jobData& jd, KMFolder* folder )
{
Q_ASSERT( !jd.msgList.isEmpty() );
KMMessage* msg = jd.msgList.first();
@@ -891,7 +891,7 @@ namespace KMail {
return handleJobError( job, myError );
}
- TQString ImapAccountBase::prettifyQuotaError( const TQString& _error, KIO::Job * job )
+ TQString ImapAccountBase::prettifyQuotaError( const TQString& _error, TDEIO::Job * job )
{
TQString error = _error;
if ( error.find( "quota", 0, false ) == -1 ) return error;
@@ -917,27 +917,27 @@ namespace KMail {
}
//-----------------------------------------------------------------------------
- bool ImapAccountBase::handleError( int errorCode, const TQString &errorMsg, KIO::Job* job, const TQString& context, bool abortSync )
+ bool ImapAccountBase::handleError( int errorCode, const TQString &errorMsg, TDEIO::Job* job, const TQString& context, bool abortSync )
{
// Copy job's data before a possible killAllJobs
TQStringList errors;
- if ( job && job->error() != KIO::ERR_SLAVE_DEFINED /*workaround for tdelibs-3.2*/)
+ if ( job && job->error() != TDEIO::ERR_SLAVE_DEFINED /*workaround for tdelibs-3.2*/)
errors = job->detailedErrorStrings();
bool jobsKilled = true;
switch( errorCode ) {
- case KIO::ERR_SLAVE_DIED: slaveDied(); killAllJobs( true ); break;
- case KIO::ERR_COULD_NOT_AUTHENTICATE: // bad password
+ case TDEIO::ERR_SLAVE_DIED: slaveDied(); killAllJobs( true ); break;
+ case TDEIO::ERR_COULD_NOT_AUTHENTICATE: // bad password
mAskAgain = true;
// fallthrough intended
- case KIO::ERR_CONNECTION_BROKEN:
- case KIO::ERR_COULD_NOT_CONNECT:
- case KIO::ERR_SERVER_TIMEOUT:
+ case TDEIO::ERR_CONNECTION_BROKEN:
+ case TDEIO::ERR_COULD_NOT_CONNECT:
+ case TDEIO::ERR_SERVER_TIMEOUT:
// These mean that we'll have to reconnect on the next attempt, so disconnect and set mSlave to 0.
killAllJobs( true );
break;
- case KIO::ERR_COULD_NOT_LOGIN:
- case KIO::ERR_USER_CANCELED:
+ case TDEIO::ERR_COULD_NOT_LOGIN:
+ case TDEIO::ERR_USER_CANCELED:
killAllJobs( false );
break;
default:
@@ -949,21 +949,21 @@ namespace KMail {
}
// check if we still display an error
- if ( !mErrorDialogIsActive && errorCode != KIO::ERR_USER_CANCELED ) {
+ if ( !mErrorDialogIsActive && errorCode != TDEIO::ERR_USER_CANCELED ) {
mErrorDialogIsActive = true;
- TQString msg = context + '\n' + prettifyQuotaError( KIO::buildErrorString( errorCode, errorMsg ), job );
+ TQString msg = context + '\n' + prettifyQuotaError( TDEIO::buildErrorString( errorCode, errorMsg ), job );
TQString caption = i18n("Error");
- if ( jobsKilled || errorCode == KIO::ERR_COULD_NOT_LOGIN ) {
- if ( errorCode == KIO::ERR_SERVER_TIMEOUT || errorCode == KIO::ERR_CONNECTION_BROKEN ) {
+ if ( jobsKilled || errorCode == TDEIO::ERR_COULD_NOT_LOGIN ) {
+ 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" );
// Show it in the status bar, in case the user has ticked "don't show again"
- if ( errorCode == KIO::ERR_CONNECTION_BROKEN )
+ if ( errorCode == TDEIO::ERR_CONNECTION_BROKEN )
KPIM::BroadcastStatus::instance()->setStatusMsg(
i18n( "The connection to account %1 was broken." ).arg( name() ) );
- else if ( errorCode == KIO::ERR_SERVER_TIMEOUT )
+ else if ( errorCode == TDEIO::ERR_SERVER_TIMEOUT )
KPIM::BroadcastStatus::instance()->setStatusMsg(
i18n( "The connection to account %1 timed out." ).arg( name() ) );
} else {
@@ -997,12 +997,12 @@ namespace KMail {
//-----------------------------------------------------------------------------
void ImapAccountBase::cancelMailCheck()
{
- TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
+ TQMap<TDEIO::Job*, jobData>::Iterator it = mapJobData.begin();
while ( it != mapJobData.end() ) {
kdDebug(5006) << "cancelMailCheck: job is cancellable: " << (*it).cancellable << endl;
if ( (*it).cancellable ) {
it.key()->kill();
- TQMap<KIO::Job*, jobData>::Iterator rmit = it;
+ TQMap<TDEIO::Job*, jobData>::Iterator rmit = it;
++it;
mapJobData.remove( rmit );
// We killed a job -> this kills the slave
@@ -1209,13 +1209,13 @@ namespace KMail {
if ( makeConnection() != Connected )
return; // can't happen with dimap
- KIO::SimpleJob *job = KIO::special(url, packedArgs, false);
- KIO::Scheduler::assignJobToSlave(slave(), job);
+ TDEIO::SimpleJob *job = TDEIO::special(url, packedArgs, false);
+ TDEIO::Scheduler::assignJobToSlave(slave(), job);
ImapAccountBase::jobData jd( url.url(), folder );
jd.path = path;
insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(KIO::Job *)),
- TQT_SLOT(slotSetStatusResult(KIO::Job *)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+ TQT_SLOT(slotSetStatusResult(TDEIO::Job *)));
}
void ImapAccountBase::setImapSeenStatus(KMFolder * folder, const TQString & path, bool seen)
@@ -1231,24 +1231,24 @@ namespace KMail {
if ( makeConnection() != Connected )
return; // can't happen with dimap
- KIO::SimpleJob *job = KIO::special(url, packedArgs, false);
- KIO::Scheduler::assignJobToSlave(slave(), job);
+ TDEIO::SimpleJob *job = TDEIO::special(url, packedArgs, false);
+ TDEIO::Scheduler::assignJobToSlave(slave(), job);
ImapAccountBase::jobData jd( url.url(), folder );
jd.path = path;
insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(KIO::Job *)),
- TQT_SLOT(slotSetStatusResult(KIO::Job *)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+ TQT_SLOT(slotSetStatusResult(TDEIO::Job *)));
}
//-----------------------------------------------------------------------------
- void ImapAccountBase::slotSetStatusResult(KIO::Job * job)
+ void ImapAccountBase::slotSetStatusResult(TDEIO::Job * job)
{
ImapAccountBase::JobIterator it = findJob(job);
if ( it == jobsEnd() ) return;
int errorCode = job->error();
KMFolder * const parent = (*it).parent;
const TQString path = (*it).path;
- if (errorCode && errorCode != KIO::ERR_CANNOT_OPEN_FOR_WRITING)
+ if (errorCode && errorCode != TDEIO::ERR_CANNOT_OPEN_FOR_WRITING)
{
bool cont = handleJobError( job, i18n( "Error while uploading status of messages to server: " ) + '\n' );
emit imapStatusChanged( parent, path, cont );
@@ -1282,7 +1282,7 @@ namespace KMail {
}
//-----------------------------------------------------------------------------
- void KMail::ImapAccountBase::removeJob( KIO::Job* job )
+ void KMail::ImapAccountBase::removeJob( TDEIO::Job* job )
{
mapJobData.remove( job );
}
diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h
index 26e5f5e3..ec08ea5f 100644
--- a/kmail/imapaccountbase.h
+++ b/kmail/imapaccountbase.h
@@ -34,14 +34,14 @@
class AccountManager;
class KMFolder;
-class KConfig/*Base*/;
+class TDEConfig/*Base*/;
class KMMessagePart;
class DwBodyPart;
class DwMessage;
class FolderStorage;
template <typename T> class TQValueVector;
-namespace KIO {
+namespace TDEIO {
class Job;
}
@@ -97,10 +97,10 @@ namespace KMail {
virtual void setListOnlyOpenFolders( bool only );
/** Configure the slave by adding to the meta data map */
- virtual KIO::MetaData slaveConfig() const;
+ virtual TDEIO::MetaData slaveConfig() const;
- virtual void readConfig( KConfig& config );
- virtual void writeConfig( KConfig& config );
+ virtual void readConfig( TDEConfig& config );
+ virtual void writeConfig( TDEConfig& config );
/**
* The state of the kioslave connection
@@ -119,7 +119,7 @@ namespace KMail {
/**
* Connect to the server, if no connection is active
* Returns Connected (ok), Error (ko) or Connecting - which means
- * that one should wait for the slaveConnected signal from KIO::Scheduler
+ * that one should wait for the slaveConnected signal from TDEIO::Scheduler
* before proceeding.
*/
ConnectionState makeConnection();
@@ -164,17 +164,17 @@ namespace KMail {
bool onlySubscribed, quiet, cancellable;
};
- typedef TQMap<KIO::Job *, jobData>::Iterator JobIterator;
+ typedef TQMap<TDEIO::Job *, jobData>::Iterator JobIterator;
/**
* Call this when starting a new job
*/
- void insertJob( KIO::Job* job, const jobData& data ) {
+ void insertJob( TDEIO::Job* job, const jobData& data ) {
mapJobData.insert( job, data );
}
/**
* Look for the jobData related to a given job. Compare with end()
*/
- JobIterator findJob( KIO::Job* job ) { return mapJobData.find( job ); }
+ JobIterator findJob( TDEIO::Job* job ) { return mapJobData.find( job ); }
JobIterator jobsEnd() { return mapJobData.end(); }
/**
* Call this when a job is finished.
@@ -182,7 +182,7 @@ namespace KMail {
*/
void removeJob( JobIterator& it );
- void removeJob( KIO::Job* job );
+ void removeJob( TDEIO::Job* job );
/**
* Subscribe (@p subscribe = TRUE) / Unsubscribe the folder
@@ -322,7 +322,7 @@ namespace KMail {
* React to an error from the job. Uses job->error and job->errorString and calls
* the protected virtual handleJobError with them. See handleError below for details.
*/
- bool handleJobError( KIO::Job* job, const TQString& context, bool abortSync = false );
+ bool handleJobError( TDEIO::Job* job, const TQString& context, bool abortSync = false );
/**
* Returns the root folder of this account
@@ -425,29 +425,29 @@ namespace KMail {
* is called when the changeSubscription has finished
* emits subscriptionChanged
*/
- void slotSubscriptionResult(KIO::Job * job);
+ void slotSubscriptionResult(TDEIO::Job * job);
protected slots:
virtual void slotCheckQueuedFolders();
/// Handle a message coming from the KIO scheduler saying that the slave is now connected
- void slotSchedulerSlaveConnected(KIO::Slave *aSlave);
+ void slotSchedulerSlaveConnected(TDEIO::Slave *aSlave);
/// Handle an error coming from the KIO scheduler
- void slotSchedulerSlaveError(KIO::Slave *aSlave, int, const TQString &errorMsg);
+ void slotSchedulerSlaveError(TDEIO::Slave *aSlave, int, const TQString &errorMsg);
/**
* Only delete information about the job and ignore write errors
*/
- void slotSetStatusResult(KIO::Job * job);
+ void slotSetStatusResult(TDEIO::Job * job);
/// Result of getUserRights() job
- void slotGetUserRightsResult( KIO::Job* _job );
+ void slotGetUserRightsResult( TDEIO::Job* _job );
/// Result of getACL() job
- void slotGetACLResult( KIO::Job* _job );
+ void slotGetACLResult( TDEIO::Job* _job );
/// Result of getStorageQuotaInfo() job
- void slotGetStorageQuotaInfoResult( KIO::Job* _job );
+ void slotGetStorageQuotaInfoResult( TDEIO::Job* _job );
/**
* Send a NOOP command regularly to keep the slave from disconnecting
@@ -466,10 +466,10 @@ namespace KMail {
/**
* Only delete information about the job
*/
- void slotSimpleResult(KIO::Job * job);
+ void slotSimpleResult(TDEIO::Job * job);
/** Gets and parses the namespaces */
- void slotNamespaceResult( KIO::Job*, const TQString& str );
+ void slotNamespaceResult( TDEIO::Job*, const TQString& str );
/**
* Saves the fetched namespaces
@@ -479,7 +479,7 @@ namespace KMail {
/**
* Saves the capabilities list
*/
- void slotCapabilitiesResult( KIO::Job*, const TQString& result );
+ void slotCapabilitiesResult( TDEIO::Job*, const TQString& result );
protected:
@@ -499,10 +499,10 @@ namespace KMail {
* @param abortSync if true, abort sync in all cases (see above). If false, ask the user (when possible).
* @return false when aborting, true when continuing
*/
- virtual bool handleError( int error, const TQString &errorMsg, KIO::Job* job, const TQString& context, bool abortSync = false );
+ virtual bool handleError( int error, const TQString &errorMsg, TDEIO::Job* job, const TQString& context, bool abortSync = false );
- /** Handle an error during KIO::put - helper method */
- bool handlePutError( KIO::Job* job, jobData& jd, KMFolder* folder );
+ /** Handle an error during TDEIO::put - helper method */
+ bool handlePutError( TDEIO::Job* job, jobData& jd, KMFolder* folder );
virtual TQString protocol() const;
virtual unsigned short int defaultPort() const;
@@ -519,13 +519,13 @@ namespace KMail {
// used for writing the blacklist out to the config file
TQStringList locallyBlacklistedFolders() const;
void localBlacklistFromStringList( const TQStringList & );
- TQString prettifyQuotaError( const TQString& _error, KIO::Job * job );
+ TQString prettifyQuotaError( const TQString& _error, TDEIO::Job * job );
protected:
TQPtrList<TQGuardedPtr<KMFolder> > mOpenFolders;
TQStringList mSubfolderNames, mSubfolderPaths,
mSubfolderMimeTypes, mSubfolderAttributes;
- TQMap<KIO::Job *, jobData> mapJobData;
+ TQMap<TDEIO::Job *, jobData> mapJobData;
/** used to detect when the slave has not been used for a while */
TQTimer mIdleTimer;
/** used to send a noop to the slave in regular intervals to keep it from disonnecting */
@@ -579,7 +579,7 @@ namespace KMail {
* Emitted when the slave managed or failed to connect
* This is always emitted at some point after makeConnection returned Connecting.
* @param errorCode 0 for success, != 0 in case of error
- * @param errorMsg if errorCode is != 0, this goes with errorCode to call KIO::buildErrorString
+ * @param errorMsg if errorCode is != 0, this goes with errorCode to call TDEIO::buildErrorString
*/
void connectionResult( int errorCode, const TQString& errorMsg );
@@ -617,7 +617,7 @@ namespace KMail {
* @param job the job that was used for doing so (can be used to display errors)
* @param entries the ACL list. Make your copy of it, it comes from the job.
*/
- void receivedACL( KMFolder* folder, KIO::Job* job, const KMail::ACLList& entries );
+ void receivedACL( KMFolder* folder, TDEIO::Job* job, const KMail::ACLList& entries );
/**
* Emitted when the getQuotaInfo job is done,
@@ -627,7 +627,7 @@ namespace KMail {
* @param info The quota information for this folder. Make your copy of it,
* it comes from the job.
*/
- void receivedStorageQuotaInfo( KMFolder* folder, KIO::Job* job, const KMail::QuotaInfo& entries );
+ void receivedStorageQuotaInfo( KMFolder* folder, TDEIO::Job* job, const KMail::QuotaInfo& entries );
/**
* Emitted when we got the namespaces
diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp
index ab57da23..2fee6acf 100644
--- a/kmail/imapjob.cpp
+++ b/kmail/imapjob.cpp
@@ -157,17 +157,17 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
jd.progressItem->setTotalItems( jd.total );
connect ( jd.progressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)),
account, TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) );
- KIO::SimpleJob *job = KIO::put( url, 0, false, false, false );
- KIO::Scheduler::assignJobToSlave( account->slave(), job );
+ 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(KIO::Job *)),
- TQT_SLOT(slotPutMessageResult(KIO::Job *)) );
- connect( job, TQT_SIGNAL(dataReq(KIO::Job *, TQByteArray &)),
- TQT_SLOT(slotPutMessageDataReq(KIO::Job *, TQByteArray &)) );
- connect( job, TQT_SIGNAL(infoMessage(KIO::Job *, const TQString &)),
- TQT_SLOT(slotPutMessageInfoData(KIO::Job *, const TQString &)) );
- connect( job, TQT_SIGNAL(processedSize(KIO::Job *, KIO::filesize_t)),
- TQT_SLOT(slotProcessedSize(KIO::Job *, KIO::filesize_t)));
+ 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)));
}
}
else if ( jt == tCopyMessage || jt == tMoveMessage )
@@ -198,16 +198,16 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
jd.progressItem->setTotalItems( jd.total );
connect ( jd.progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)),
account, TQT_SLOT( slotAbortRequested(KPIM::ProgressItem* ) ) );
- KIO::SimpleJob *simpleJob = KIO::special( url, packedArgs, false );
- KIO::Scheduler::assignJobToSlave( account->slave(), simpleJob );
+ 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(KIO::Job *)),
- TQT_SLOT(slotCopyMessageResult(KIO::Job *)) );
+ connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)),
+ TQT_SLOT(slotCopyMessageResult(TDEIO::Job *)) );
if ( jt == tMoveMessage )
{
- connect( mJob, TQT_SIGNAL(infoMessage(KIO::Job *, const TQString &)),
- TQT_SLOT(slotCopyMessageInfoData(KIO::Job *, const TQString &)) );
+ connect( mJob, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)),
+ TQT_SLOT(slotCopyMessageInfoData(TDEIO::Job *, const TQString &)) );
}
}
else {
@@ -321,30 +321,30 @@ void ImapJob::slotGetNextMessage()
account, TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) );
jd.progressItem->setTotalItems( jd.total );
- KIO::SimpleJob *simpleJob = KIO::get( url, false, false );
- KIO::Scheduler::assignJobToSlave( account->slave(), simpleJob );
+ TDEIO::SimpleJob *simpleJob = TDEIO::get( url, false, false );
+ TDEIO::Scheduler::assignJobToSlave( account->slave(), simpleJob );
mJob = simpleJob;
account->insertJob( mJob, jd );
if ( mPartSpecifier.find( "STRUCTURE", 0, false ) != -1 )
{
- connect( mJob, TQT_SIGNAL(result(KIO::Job *)),
- this, TQT_SLOT(slotGetBodyStructureResult(KIO::Job *)) );
+ connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)),
+ this, TQT_SLOT(slotGetBodyStructureResult(TDEIO::Job *)) );
} else {
- connect( mJob, TQT_SIGNAL(result(KIO::Job *)),
- this, TQT_SLOT(slotGetMessageResult(KIO::Job *)) );
+ connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)),
+ this, TQT_SLOT(slotGetMessageResult(TDEIO::Job *)) );
}
- connect( mJob, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
- msgParent, TQT_SLOT(slotSimpleData(KIO::Job *, const TQByteArray &)) );
+ connect( mJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+ msgParent, TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)) );
if ( jd.total > 1 )
{
- connect(mJob, TQT_SIGNAL(processedSize(KIO::Job *, KIO::filesize_t)),
- this, TQT_SLOT(slotProcessedSize(KIO::Job *, KIO::filesize_t)));
+ connect(mJob, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)),
+ this, TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t)));
}
}
//-----------------------------------------------------------------------------
-void ImapJob::slotGetMessageResult( KIO::Job * job )
+void ImapJob::slotGetMessageResult( TDEIO::Job * job )
{
KMMessage *msg = mMsgList.first();
if (!msg || !msg->parent() || !job) {
@@ -461,7 +461,7 @@ void ImapJob::slotGetMessageResult( KIO::Job * job )
}
//-----------------------------------------------------------------------------
-void ImapJob::slotGetBodyStructureResult( KIO::Job * job )
+void ImapJob::slotGetBodyStructureResult( TDEIO::Job * job )
{
KMMessage *msg = mMsgList.first();
if (!msg || !msg->parent() || !job) {
@@ -499,7 +499,7 @@ void ImapJob::slotGetBodyStructureResult( KIO::Job * job )
}
//-----------------------------------------------------------------------------
-void ImapJob::slotPutMessageDataReq( KIO::Job *job, TQByteArray &data )
+void ImapJob::slotPutMessageDataReq( TDEIO::Job *job, TQByteArray &data )
{
KMAcctImap *account = static_cast<KMFolderImap*>(mDestFolder->storage())->account();
if ( !account )
@@ -525,7 +525,7 @@ void ImapJob::slotPutMessageDataReq( KIO::Job *job, TQByteArray &data )
//-----------------------------------------------------------------------------
-void ImapJob::slotPutMessageResult( KIO::Job *job )
+void ImapJob::slotPutMessageResult( TDEIO::Job *job )
{
KMAcctImap *account = static_cast<KMFolderImap*>(mDestFolder->storage())->account();
if ( !account )
@@ -570,7 +570,7 @@ void ImapJob::slotPutMessageResult( KIO::Job *job )
}
//-----------------------------------------------------------------------------
-void ImapJob::slotCopyMessageInfoData(KIO::Job * job, const TQString & data)
+void ImapJob::slotCopyMessageInfoData(TDEIO::Job * job, const TQString & data)
{
KMFolderImap * imapFolder = static_cast<KMFolderImap*>(mDestFolder->storage());
KMAcctImap *account = imapFolder->account();
@@ -609,7 +609,7 @@ void ImapJob::slotCopyMessageInfoData(KIO::Job * job, const TQString & data)
}
//----------------------------------------------------------------------------
-void ImapJob::slotPutMessageInfoData(KIO::Job *job, const TQString &data)
+void ImapJob::slotPutMessageInfoData(TDEIO::Job *job, const TQString &data)
{
KMFolderImap * imapFolder = static_cast<KMFolderImap*>(mDestFolder->storage());
KMAcctImap *account = imapFolder->account();
@@ -634,7 +634,7 @@ void ImapJob::slotPutMessageInfoData(KIO::Job *job, const TQString &data)
//-----------------------------------------------------------------------------
-void ImapJob::slotCopyMessageResult( KIO::Job *job )
+void ImapJob::slotCopyMessageResult( TDEIO::Job *job )
{
KMAcctImap *account = static_cast<KMFolderImap*>(mDestFolder->storage())->account();
if ( !account )
@@ -684,7 +684,7 @@ void ImapJob::setParentFolder( const KMFolderImap* parent )
}
//-----------------------------------------------------------------------------
-void ImapJob::slotProcessedSize(KIO::Job * job, KIO::filesize_t processed)
+void ImapJob::slotProcessedSize(TDEIO::Job * job, TDEIO::filesize_t processed)
{
KMMessage *msg = mMsgList.first();
if (!msg || !job) {
diff --git a/kmail/imapjob.h b/kmail/imapjob.h
index 5cbbd69e..2f7a0401 100644
--- a/kmail/imapjob.h
+++ b/kmail/imapjob.h
@@ -69,23 +69,23 @@ public:
void setParentProgressItem( KPIM::ProgressItem *p ) { mParentProgressItem = p; }
private slots:
- void slotGetMessageResult( KIO::Job * job );
- void slotGetBodyStructureResult( KIO::Job * job );
+ void slotGetMessageResult( TDEIO::Job * job );
+ void slotGetBodyStructureResult( TDEIO::Job * job );
void slotGetNextMessage();
/** Feeds the message in pieces to the server */
- void slotPutMessageDataReq( KIO::Job *job, TQByteArray &data );
- void slotPutMessageResult( KIO::Job *job );
- void slotPutMessageInfoData(KIO::Job *, const TQString &data);
+ void slotPutMessageDataReq( TDEIO::Job *job, TQByteArray &data );
+ void slotPutMessageResult( TDEIO::Job *job );
+ void slotPutMessageInfoData(TDEIO::Job *, const TQString &data);
/** result of a copy-operation */
- void slotCopyMessageResult( KIO::Job *job );
- void slotCopyMessageInfoData( KIO::Job *, const TQString &data );
- void slotProcessedSize( KIO::Job *, KIO::filesize_t processed );
+ void slotCopyMessageResult( TDEIO::Job *job );
+ void slotCopyMessageInfoData( TDEIO::Job *, const TQString &data );
+ void slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t processed );
private:
void execute();
void init( JobType jt, TQString sets, KMFolderImap *folder,
TQPtrList<KMMessage>& msgList );
- KIO::Job *mJob;
+ TDEIO::Job *mJob;
TQByteArray mData;
const AttachmentStrategy *mAttachmentStrategy;
KMFolderImap *mParentFolder;
diff --git a/kmail/index.cpp b/kmail/index.cpp
index 9a4d73b1..17de11d7 100644
--- a/kmail/index.cpp
+++ b/kmail/index.cpp
@@ -100,7 +100,7 @@ KMMsgIndex::KMMsgIndex( TQObject* parent ):
//connect( mSyncTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( syncIndex() ) );
#ifdef HAVE_INDEXLIB
- KConfigGroup cfg( KMKernel::config(), "text-index" );
+ TDEConfigGroup cfg( KMKernel::config(), "text-index" );
if ( !cfg.readBoolEntry( "enabled", false ) ) {
indexlib::remove( mIndexPath );
mLockFile.force_unlock();
@@ -138,7 +138,7 @@ KMMsgIndex::KMMsgIndex( TQObject* parent ):
KMMsgIndex::~KMMsgIndex() {
kdDebug( 5006 ) << "KMMsgIndex::~KMMsgIndex()" << endl;
#ifdef HAVE_INDEXLIB
- KConfigGroup cfg( KMKernel::config(), "text-index" );
+ TDEConfigGroup cfg( KMKernel::config(), "text-index" );
cfg.writeEntry( "creating", mState == s_creating );
TQValueList<int> pendingMsg;
if ( mState == s_processing ) {
@@ -159,15 +159,15 @@ bool KMMsgIndex::isIndexable( KMFolder* folder ) const {
bool KMMsgIndex::isIndexed( KMFolder* folder ) const {
if ( !isIndexable( folder ) ) return false;
- KConfig* config = KMKernel::config();
- KConfigGroupSaver saver( config, "Folder-" + folder->idString() );
+ TDEConfig* config = KMKernel::config();
+ TDEConfigGroupSaver saver( config, "Folder-" + folder->idString() );
return !config->readBoolEntry( folderIndexDisabledKey, false );
}
void KMMsgIndex::setEnabled( bool e ) {
kdDebug( 5006 ) << "KMMsgIndex::setEnabled( " << e << " )" << endl;
- KConfig* config = KMKernel::config();
- KConfigGroupSaver saver( config, "text-index" );
+ TDEConfig* config = KMKernel::config();
+ TDEConfigGroupSaver saver( config, "text-index" );
if ( config->readBoolEntry( "enabled", !e ) == e ) return;
config->writeEntry( "enabled", e );
if ( e ) {
@@ -191,8 +191,8 @@ void KMMsgIndex::setEnabled( bool e ) {
}
void KMMsgIndex::setIndexingEnabled( KMFolder* folder, bool e ) {
- KConfig* config = KMKernel::config();
- KConfigGroupSaver saver( config, "Folder-" + folder->idString() );
+ TDEConfig* config = KMKernel::config();
+ TDEConfigGroupSaver saver( config, "Folder-" + folder->idString() );
if ( config->readBoolEntry( folderIndexDisabledKey, e ) == e ) return; // nothing to do
config->writeEntry( folderIndexDisabledKey, e );
@@ -328,8 +328,8 @@ void KMMsgIndex::act() {
f->open("msgindex");
}
const KMMsgDict* dict = KMMsgDict::instance();
- KConfig* config = KMKernel::config();
- KConfigGroupSaver saver( config, "Folder-" + f->idString() );
+ TDEConfig* config = KMKernel::config();
+ TDEConfigGroupSaver saver( config, "Folder-" + f->idString() );
if ( config->readBoolEntry( folderIndexDisabledKey, true ) ) {
for ( int i = 0; i < f->count(); ++i ) {
mPendingMsgs.push_back( dict->getMsgSerNum( f, i ) );
diff --git a/kmail/kcm_kmail.cpp b/kmail/kcm_kmail.cpp
index 3ba43637..eaea2b50 100644
--- a/kmail/kcm_kmail.cpp
+++ b/kmail/kcm_kmail.cpp
@@ -31,7 +31,7 @@
//----------------------------
extern "C"
{
- KDE_EXPORT KCModule *create_kmail_config_misc( TQWidget *parent, const char * )
+ KDE_EXPORT TDECModule *create_kmail_config_misc( TQWidget *parent, const char * )
{
MiscPage *page = new MiscPage( parent, "kcmkmail_config_misc" );
return page;
@@ -40,7 +40,7 @@ extern "C"
extern "C"
{
- KDE_EXPORT KCModule *create_kmail_config_appearance( TQWidget *parent, const char * )
+ KDE_EXPORT TDECModule *create_kmail_config_appearance( TQWidget *parent, const char * )
{
AppearancePage *page =
new AppearancePage( parent, "kcmkmail_config_appearance" );
@@ -50,7 +50,7 @@ extern "C"
extern "C"
{
- KDE_EXPORT KCModule *create_kmail_config_composer( TQWidget *parent, const char * )
+ KDE_EXPORT TDECModule *create_kmail_config_composer( TQWidget *parent, const char * )
{
ComposerPage *page = new ComposerPage( parent, "kcmkmail_config_composer" );
return page;
@@ -59,7 +59,7 @@ extern "C"
extern "C"
{
- KDE_EXPORT KCModule *create_kmail_config_identity( TQWidget *parent, const char * )
+ KDE_EXPORT TDECModule *create_kmail_config_identity( TQWidget *parent, const char * )
{
IdentityPage *page = new IdentityPage( parent, "kcmkmail_config_identity" );
return page;
@@ -68,7 +68,7 @@ extern "C"
extern "C"
{
- KDE_EXPORT KCModule *create_kmail_config_accounts( TQWidget *parent, const char * )
+ KDE_EXPORT TDECModule *create_kmail_config_accounts( TQWidget *parent, const char * )
{
AccountsPage *page = new AccountsPage( parent, "kcmkmail_config_accounts" );
return page;
@@ -77,7 +77,7 @@ extern "C"
extern "C"
{
- KDE_EXPORT KCModule *create_kmail_config_security( TQWidget *parent, const char * )
+ KDE_EXPORT TDECModule *create_kmail_config_security( TQWidget *parent, const char * )
{
SecurityPage *page = new SecurityPage( parent, "kcmkmail_config_security" );
return page;
diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp
index e7d88410..64f13d76 100644
--- a/kmail/kmaccount.cpp
+++ b/kmail/kmaccount.cpp
@@ -142,7 +142,7 @@ void KMAccount::setFolder(KMFolder* aFolder, bool addAccount)
//-----------------------------------------------------------------------------
-void KMAccount::readConfig(KConfig& config)
+void KMAccount::readConfig(TDEConfig& config)
{
TQString folderName;
mFolder = 0;
@@ -175,7 +175,7 @@ void KMAccount::readTimerConfig()
}
//-----------------------------------------------------------------------------
-void KMAccount::writeConfig(KConfig& config)
+void KMAccount::writeConfig(TDEConfig& config)
{
// ID, Name
KAccount::writeConfig(config);
@@ -196,10 +196,10 @@ void KMAccount::writeConfig(KConfig& config)
//-----------------------------------------------------------------------------
void KMAccount::sendReceipt(KMMessage* aMsg)
{
- KConfig* cfg = KMKernel::config();
+ TDEConfig* cfg = KMKernel::config();
bool sendReceipts;
- KConfigGroupSaver saver(cfg, "General");
+ TDEConfigGroupSaver saver(cfg, "General");
sendReceipts = cfg->readBoolEntry("send-receipts", false);
if (!sendReceipts) return;
diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h
index 258fe9c0..f0455b3b 100644
--- a/kmail/kmaccount.h
+++ b/kmail/kmaccount.h
@@ -33,7 +33,7 @@ class TQTimer;
class KMFolder;
class KMAcctFolder;
-class KConfig;
+class TDEConfig;
class KMFolderJob;
class KMFolderCachedImap;
class AccountsPageReceivingTab;
@@ -143,14 +143,14 @@ public:
* manager when a new account is created. The config group is
* already properly set by the caller.
*/
- virtual void readConfig(KConfig& config);
+ virtual void readConfig(TDEConfig& config);
void readTimerConfig();
/**
* Write all account information to given config file. The config group
* is already properly set by the caller.
*/
- virtual void writeConfig(KConfig& config);
+ virtual void writeConfig(TDEConfig& config);
/**
* Set/get interval for checking if new mail arrived (in minutes).
diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp
index 2a797acb..473b0b99 100644
--- a/kmail/kmacctcachedimap.cpp
+++ b/kmail/kmacctcachedimap.cpp
@@ -132,7 +132,7 @@ TQValueList<KMFolderCachedImap*> KMAcctCachedImap::killAllJobsInternal( bool dis
// Make list of folders to reset. This must be done last, since folderComplete
// can trigger the next queued mail check already.
TQValueList<KMFolderCachedImap*> folderList;
- TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
+ TQMap<TDEIO::Job*, jobData>::Iterator it = mapJobData.begin();
for (; it != mapJobData.end(); ++it) {
if ((*it).parent)
folderList << static_cast<KMFolderCachedImap*>((*it).parent->storage());
@@ -150,7 +150,7 @@ TQValueList<KMFolderCachedImap*> KMAcctCachedImap::killAllJobsInternal( bool dis
KMAccount::deleteFolderJobs();
if ( disconnectSlave && mSlave ) {
- KIO::Scheduler::disconnectSlave( mSlave );
+ TDEIO::Scheduler::disconnectSlave( mSlave );
mSlave = 0;
}
return folderList;
@@ -161,7 +161,7 @@ void KMAcctCachedImap::cancelMailCheck()
{
// Make list of folders to reset, like in killAllJobs
TQValueList<KMFolderCachedImap*> folderList;
- TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
+ TQMap<TDEIO::Job*, jobData>::Iterator it = mapJobData.begin();
for (; it != mapJobData.end(); ++it) {
if ( (*it).cancellable && (*it).parent )
folderList << static_cast<KMFolderCachedImap*>((*it).parent->storage());
@@ -308,7 +308,7 @@ void KMAcctCachedImap::addLastUnreadMsgCount( const KMFolderCachedImap *folder,
//
//
-void KMAcctCachedImap::readConfig( /*const*/ KConfig/*Base*/ & config ) {
+void KMAcctCachedImap::readConfig( /*const*/ TDEConfig/*Base*/ & config ) {
ImapAccountBase::readConfig( config );
// Apparently this method is only ever called once (from KMKernel::init) so this is ok
mPreviouslyDeletedFolders = config.readListEntry( "deleted-folders" );
@@ -323,7 +323,7 @@ void KMAcctCachedImap::readConfig( /*const*/ KConfig/*Base*/ & config ) {
mGroupwareType = (GroupwareType)config.readNumEntry( "groupwareType", GroupwareKolab );
}
-void KMAcctCachedImap::writeConfig( KConfig/*Base*/ & config ) /*const*/ {
+void KMAcctCachedImap::writeConfig( TDEConfig/*Base*/ & config ) /*const*/ {
ImapAccountBase::writeConfig( config );
config.writeEntry( "deleted-folders", mDeletedFolders + mPreviouslyDeletedFolders );
config.writeEntry( "renamed-folders-paths", mRenamedFolders.keys() );
@@ -447,7 +447,7 @@ void KMAcctCachedImap::slotProgressItemCanceled( ProgressItem* )
killAllJobs( abortConnection );
if ( abortConnection ) {
// If we were trying to connect, tell kmfoldercachedimap so that it moves on
- emit connectionResult( KIO::ERR_USER_CANCELED, TQString() );
+ emit connectionResult( TDEIO::ERR_USER_CANCELED, TQString() );
}
}
diff --git a/kmail/kmacctcachedimap.h b/kmail/kmacctcachedimap.h
index a896fc42..a580b90c 100644
--- a/kmail/kmacctcachedimap.h
+++ b/kmail/kmacctcachedimap.h
@@ -47,7 +47,7 @@ namespace KMail {
using KMail::ImapJob;
using KMail::CachedImapJob;
-namespace KIO {
+namespace TDEIO {
class Job;
}
@@ -92,8 +92,8 @@ public:
virtual void setImapFolder(KMFolderCachedImap *);
KMFolderCachedImap* imapFolder() const { return mFolder; }
- virtual void readConfig( /*const*/ KConfig/*Base*/ & config );
- virtual void writeConfig( KConfig/*Base*/ & config ) /*const*/;
+ virtual void readConfig( /*const*/ TDEConfig/*Base*/ & config );
+ virtual void writeConfig( TDEConfig/*Base*/ & config ) /*const*/;
/**
* Invalidate the local cache.
diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp
index e57543d3..a70091e7 100644
--- a/kmail/kmacctimap.cpp
+++ b/kmail/kmacctimap.cpp
@@ -70,7 +70,7 @@ KMAcctImap::KMAcctImap(AccountManager* aOwner, const TQString& aAccountName, uin
TQString serNumUri = locateLocal( "data", "kmail/unfiltered." +
TQString("%1").arg(KAccount::id()) );
- KConfig config( serNumUri );
+ TDEConfig config( serNumUri );
TQStringList serNums = config.readListEntry( "unfiltered" );
mFilterSerNumsToSave.setAutoDelete( false );
@@ -89,7 +89,7 @@ KMAcctImap::~KMAcctImap()
TQString serNumUri = locateLocal( "data", "kmail/unfiltered." +
TQString("%1").arg(KAccount::id()) );
- KConfig config( serNumUri );
+ TDEConfig config( serNumUri );
TQStringList serNums;
TQDictIterator<int> it( mFilterSerNumsToSave );
for( ; it.current(); ++it )
@@ -125,10 +125,10 @@ void KMAcctImap::setImapFolder(KMFolderImap *aFolder)
//-----------------------------------------------------------------------------
-bool KMAcctImap::handleError( int errorCode, const TQString &errorMsg, KIO::Job* job, const TQString& context, bool abortSync )
+bool KMAcctImap::handleError( int errorCode, const TQString &errorMsg, TDEIO::Job* job, const TQString& context, bool abortSync )
{
/* TODO check where to handle this one better. */
- if ( errorCode == KIO::ERR_DOES_NOT_EXIST ) {
+ if ( errorCode == TDEIO::ERR_DOES_NOT_EXIST ) {
// folder is gone, so reload the folderlist
if ( mFolder )
mFolder->listDirectory();
@@ -141,7 +141,7 @@ bool KMAcctImap::handleError( int errorCode, const TQString &errorMsg, KIO::Job*
//-----------------------------------------------------------------------------
void KMAcctImap::killAllJobs( bool disconnectSlave )
{
- TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
+ TQMap<TDEIO::Job*, jobData>::Iterator it = mapJobData.begin();
for ( ; it != mapJobData.end(); ++it)
{
TQPtrList<KMMessage> msgList = (*it).msgList;
@@ -193,7 +193,7 @@ void KMAcctImap::killAllJobs( bool disconnectSlave )
mCountRemainChecks = 0;
}
if ( disconnectSlave && slave() ) {
- KIO::Scheduler::disconnectSlave( slave() );
+ TDEIO::Scheduler::disconnectSlave( slave() );
mSlave = 0;
}
}
@@ -233,9 +233,9 @@ void KMAcctImap::ignoreJobsForFolder( KMFolder* folder )
void KMAcctImap::removeSlaveJobsForFolder( KMFolder* folder )
{
// Make sure the folder is not referenced in any kio slave jobs
- TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
+ TQMap<TDEIO::Job*, jobData>::Iterator it = mapJobData.begin();
while ( it != mapJobData.end() ) {
- TQMap<KIO::Job*, jobData>::Iterator i = it;
+ TQMap<TDEIO::Job*, jobData>::Iterator i = it;
it++;
if ( (*i).parent ) {
if ( (*i).parent == folder ) {
@@ -250,7 +250,7 @@ void KMAcctImap::cancelMailCheck()
{
// Make list of folders to reset, like in killAllJobs
TQValueList<KMFolderImap*> folderList;
- TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
+ TQMap<TDEIO::Job*, jobData>::Iterator it = mapJobData.begin();
for (; it != mapJobData.end(); ++it) {
if ( (*it).cancellable && (*it).parent ) {
folderList << static_cast<KMFolderImap*>((*it).parent->storage());
@@ -533,7 +533,7 @@ void KMAcctImap::listDirectory()
}
//-----------------------------------------------------------------------------
-void KMAcctImap::readConfig(KConfig& config)
+void KMAcctImap::readConfig(TDEConfig& config)
{
ImapAccountBase::readConfig( config );
}
diff --git a/kmail/kmacctimap.h b/kmail/kmacctimap.h
index 455ab931..99f07f16 100644
--- a/kmail/kmacctimap.h
+++ b/kmail/kmacctimap.h
@@ -31,7 +31,7 @@ namespace KMail {
class ImapJob;
class ActionScheduler;
}
-namespace KIO {
+namespace TDEIO {
class Job;
}
class FolderStorage;
@@ -83,7 +83,7 @@ public:
* manager when a new account is created. The config group is
* already properly set by the caller.
*/
- virtual void readConfig(KConfig& config);
+ virtual void readConfig(TDEConfig& config);
/**
* Returns the root folder of this account
@@ -109,7 +109,7 @@ protected:
* Handle an error coming from a KIO job
* See ImapAccountBase::handleJobError for details.
*/
- virtual bool handleError( int error, const TQString &errorMsg, KIO::Job* job, const TQString& context, bool abortSync = false );
+ virtual bool handleError( int error, const TQString &errorMsg, TDEIO::Job* job, const TQString& context, bool abortSync = false );
virtual void cancelMailCheck();
TQPtrList<KMail::ImapJob> mJobList;
diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp
index d1e15f83..813d180c 100644
--- a/kmail/kmacctlocal.cpp
+++ b/kmail/kmacctlocal.cpp
@@ -270,7 +270,7 @@ void KMAcctLocal::postProcess()
//-----------------------------------------------------------------------------
-void KMAcctLocal::readConfig(KConfig& config)
+void KMAcctLocal::readConfig(TDEConfig& config)
{
KMAccount::readConfig(config);
mLocation = config.readPathEntry("Location", mLocation);
@@ -291,7 +291,7 @@ void KMAcctLocal::readConfig(KConfig& config)
//-----------------------------------------------------------------------------
-void KMAcctLocal::writeConfig(KConfig& config)
+void KMAcctLocal::writeConfig(TDEConfig& config)
{
KMAccount::writeConfig(config);
diff --git a/kmail/kmacctlocal.h b/kmail/kmacctlocal.h
index 2abe34f5..398dd16e 100644
--- a/kmail/kmacctlocal.h
+++ b/kmail/kmacctlocal.h
@@ -34,8 +34,8 @@ public:
virtual TQString type(void) const;
virtual void processNewMail(bool);
- virtual void readConfig(KConfig&);
- virtual void writeConfig(KConfig&);
+ virtual void readConfig(TDEConfig&);
+ virtual void writeConfig(TDEConfig&);
private:
bool preProcess();
diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp
index b3c5d31c..5a203c2d 100644
--- a/kmail/kmacctmaildir.cpp
+++ b/kmail/kmacctmaildir.cpp
@@ -213,7 +213,7 @@ void KMAcctMaildir::processNewMail(bool)
//-----------------------------------------------------------------------------
-void KMAcctMaildir::readConfig(KConfig& config)
+void KMAcctMaildir::readConfig(TDEConfig& config)
{
KMAccount::readConfig(config);
mLocation = config.readPathEntry("Location", mLocation);
@@ -221,7 +221,7 @@ void KMAcctMaildir::readConfig(KConfig& config)
//-----------------------------------------------------------------------------
-void KMAcctMaildir::writeConfig(KConfig& config)
+void KMAcctMaildir::writeConfig(TDEConfig& config)
{
KMAccount::writeConfig(config);
config.writePathEntry("Location", mLocation);
diff --git a/kmail/kmacctmaildir.h b/kmail/kmacctmaildir.h
index 1c655861..e6279606 100644
--- a/kmail/kmacctmaildir.h
+++ b/kmail/kmacctmaildir.h
@@ -26,8 +26,8 @@ public:
virtual TQString type(void) const;
virtual void processNewMail(bool);
- virtual void readConfig(KConfig&);
- virtual void writeConfig(KConfig&);
+ virtual void readConfig(TDEConfig&);
+ virtual void writeConfig(TDEConfig&);
protected:
TQString mLocation;
diff --git a/kmail/kmail_config_accounts.desktop b/kmail/kmail_config_accounts.desktop
index e510c7d4..ca6099e0 100644
--- a/kmail/kmail_config_accounts.desktop
+++ b/kmail/kmail_config_accounts.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=network
Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kmail
diff --git a/kmail/kmail_config_appearance.desktop b/kmail/kmail_config_appearance.desktop
index 753a66bb..4ffe54b1 100644
--- a/kmail/kmail_config_appearance.desktop
+++ b/kmail/kmail_config_appearance.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=looknfeel
Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kmail
diff --git a/kmail/kmail_config_composer.desktop b/kmail/kmail_config_composer.desktop
index bdb44e28..b40fd5c9 100644
--- a/kmail/kmail_config_composer.desktop
+++ b/kmail/kmail_config_composer.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=edit
Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kmail
diff --git a/kmail/kmail_config_identity.desktop b/kmail/kmail_config_identity.desktop
index cba142ff..bf489e60 100644
--- a/kmail/kmail_config_identity.desktop
+++ b/kmail/kmail_config_identity.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=identity
Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kmail
diff --git a/kmail/kmail_config_misc.desktop b/kmail/kmail_config_misc.desktop
index 3cc3e320..79a646e7 100644
--- a/kmail/kmail_config_misc.desktop
+++ b/kmail/kmail_config_misc.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=misc
Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kmail
diff --git a/kmail/kmail_config_security.desktop b/kmail/kmail_config_security.desktop
index a99d1953..a4d385cc 100644
--- a/kmail/kmail_config_security.desktop
+++ b/kmail/kmail_config_security.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=encrypted
Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kmail
diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp
index abf480c9..fbafbc1b 100644
--- a/kmail/kmailicalifaceimpl.cpp
+++ b/kmail/kmailicalifaceimpl.cpp
@@ -1073,7 +1073,7 @@ void KMailICalIfaceImpl::slotFolderRemoved( KMFolder* folder )
// pretend the folder just changed back to the mail type, which
// does the right thing, namely remove resource
folderContentsTypeChanged( folder, KMail::ContentsTypeMail );
- KConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
+ TDEConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
configGroup.deleteEntry( folder->idString() + "-storageFormat" );
configGroup.deleteEntry( folder->idString() + "-changes" );
}
@@ -1493,7 +1493,7 @@ void KMailICalIfaceImpl::setStorageFormat( KMFolder* folder, StorageFormat forma
FolderInfo info( format, NoChange );
mFolderInfoMap.insert( folder, info );
}
- KConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
+ TDEConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
configGroup.writeEntry( folder->idString() + "-storageFormat",
format == StorageXML ? "xml" : "icalvcard" );
}
@@ -1506,13 +1506,13 @@ void KMailICalIfaceImpl::addFolderChange( KMFolder* folder, FolderChanges change
} else { // Otherwise, well, it's a folder we don't care about.
kdDebug(5006) << "addFolderChange: nothing known about folder " << folder->location() << endl;
}
- KConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
+ TDEConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
configGroup.writeEntry( folder->idString() + "-changes", (*it).mChanges );
}
KMailICalIfaceImpl::FolderInfo KMailICalIfaceImpl::readFolderInfo( const KMFolder * const folder ) const
{
- KConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
+ TDEConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
TQString str = configGroup.readEntry( folder->idString() + "-storageFormat", "unset" );
FolderInfo info;
if ( str == "unset" ) {
@@ -1591,7 +1591,7 @@ void KMailICalIfaceImpl::triggerKolabFreeBusy( const KURL& folderURL )
kdDebug() << "Triggering PFB update for " << folderURL << " : getting " << httpURL << endl;
// "Fire and forget". No need for error handling, nor for explicit deletion.
// Maybe we should try to prevent launching it if it's already running (for this URL) though.
- /*KIO::Job* job =*/ KIO::get( httpURL, false, false /*no progress info*/ );
+ /*TDEIO::Job* job =*/ TDEIO::get( httpURL, false, false /*no progress info*/ );
}
void KMailICalIfaceImpl::slotFolderPropertiesChanged( KMFolder* folder )
@@ -1660,7 +1660,7 @@ void KMailICalIfaceImpl::changeResourceUIName( const TQString &folderPath, const
if ( f ) {
KMailICalIfaceImpl::getResourceMap()->insert( folderPath, newName );
kmkernel->folderMgr()->renameFolder( f, newName );
- KConfigGroup configGroup( kmkernel->config(), "Resource UINames" );
+ TDEConfigGroup configGroup( kmkernel->config(), "Resource UINames" );
configGroup.writeEntry( folderPath, newName );
}
}
@@ -1950,7 +1950,7 @@ void KMailICalIfaceImpl::readConfig()
subresourceAdded( folderContentsType( KMail::ContentsTypeNote ), mNotes->location(), mNotes->label(), true, false );
}
- KConfig *config = kmkernel->config();
+ TDEConfig *config = kmkernel->config();
config->setGroup("Resource UINames");
*KMailICalIfaceImpl::mSubResourceUINamesMap = config->entryMap( "Resource UINames" );
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index 7108fff6..9c1d25f9 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -636,7 +636,7 @@ KMCommand::Result KMUrlSaveCommand::execute()
parentWidget() );
if ( saveUrl.isEmpty() )
return Canceled;
- if ( KIO::NetAccess::exists( saveUrl, false, parentWidget() ) )
+ if ( TDEIO::NetAccess::exists( saveUrl, false, parentWidget() ) )
{
if (KMessageBox::warningContinueCancel(0,
i18n("<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>")
@@ -644,13 +644,13 @@ KMCommand::Result KMUrlSaveCommand::execute()
!= KMessageBox::Continue)
return Canceled;
}
- KIO::Job *job = KIO::file_copy(mUrl, saveUrl, -1, true);
- connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotUrlSaveResult(KIO::Job*)));
+ TDEIO::Job *job = TDEIO::file_copy(mUrl, saveUrl, -1, true);
+ connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotUrlSaveResult(TDEIO::Job*)));
setEmitsCompletedItself( true );
return OK;
}
-void KMUrlSaveCommand::slotUrlSaveResult( KIO::Job *job )
+void KMUrlSaveCommand::slotUrlSaveResult( TDEIO::Job *job )
{
if ( job->error() ) {
job->showErrorDialog();
@@ -841,14 +841,14 @@ KURL KMSaveMsgCommand::url()
KMCommand::Result KMSaveMsgCommand::execute()
{
- mJob = KIO::put( mUrl, S_IRUSR|S_IWUSR, false, false );
+ mJob = TDEIO::put( mUrl, S_IRUSR|S_IWUSR, false, false );
mJob->slotTotalSize( mTotalSize );
mJob->setAsyncDataEnabled( true );
mJob->setReportDataSent( true );
- connect(mJob, TQT_SIGNAL(dataReq(KIO::Job*, TQByteArray &)),
+ connect(mJob, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray &)),
TQT_SLOT(slotSaveDataReq()));
- connect(mJob, TQT_SIGNAL(result(KIO::Job*)),
- TQT_SLOT(slotSaveResult(KIO::Job*)));
+ connect(mJob, TQT_SIGNAL(result(TDEIO::Job*)),
+ TQT_SLOT(slotSaveResult(TDEIO::Job*)));
setEmitsCompletedItself( true );
return OK;
}
@@ -904,7 +904,7 @@ void KMSaveMsgCommand::slotSaveDataReq()
}
}
} else {
- mJob->slotError( KIO::ERR_ABORTED,
+ mJob->slotError( TDEIO::ERR_ABORTED,
i18n("The message was removed while saving it. "
"It has not been saved.") );
}
@@ -955,11 +955,11 @@ void KMSaveMsgCommand::slotMessageRetrievedForSaving(KMMessage *msg)
}
}
-void KMSaveMsgCommand::slotSaveResult(KIO::Job *job)
+void KMSaveMsgCommand::slotSaveResult(TDEIO::Job *job)
{
if (job->error())
{
- if (job->error() == KIO::ERR_FILE_ALREADY_EXIST)
+ if (job->error() == TDEIO::ERR_FILE_ALREADY_EXIST)
{
if (KMessageBox::warningContinueCancel(0,
i18n("File %1 exists.\nDo you want to replace it?")
@@ -967,14 +967,14 @@ void KMSaveMsgCommand::slotSaveResult(KIO::Job *job)
== KMessageBox::Continue) {
mOffset = 0;
- mJob = KIO::put( mUrl, S_IRUSR|S_IWUSR, true, false );
+ mJob = TDEIO::put( mUrl, S_IRUSR|S_IWUSR, true, false );
mJob->slotTotalSize( mTotalSize );
mJob->setAsyncDataEnabled( true );
mJob->setReportDataSent( true );
- connect(mJob, TQT_SIGNAL(dataReq(KIO::Job*, TQByteArray &)),
+ connect(mJob, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray &)),
TQT_SLOT(slotSaveDataReq()));
- connect(mJob, TQT_SIGNAL(result(KIO::Job*)),
- TQT_SLOT(slotSaveResult(KIO::Job*)));
+ connect(mJob, TQT_SIGNAL(result(TDEIO::Job*)),
+ TQT_SLOT(slotSaveResult(TDEIO::Job*)));
}
}
else
@@ -1012,17 +1012,17 @@ KMCommand::Result KMOpenMsgCommand::execute()
setDeletesItself( false );
return Canceled;
}
- mJob = KIO::get( mUrl, false, false );
+ mJob = TDEIO::get( mUrl, false, false );
mJob->setReportDataSent( true );
- connect( mJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
- this, TQT_SLOT( slotDataArrived( KIO::Job*, const TQByteArray & ) ) );
- connect( mJob, TQT_SIGNAL( result( KIO::Job * ) ),
- TQT_SLOT( slotResult( KIO::Job * ) ) );
+ 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 * ) ) );
setEmitsCompletedItself( true );
return OK;
}
-void KMOpenMsgCommand::slotDataArrived( KIO::Job *, const TQByteArray & data )
+void KMOpenMsgCommand::slotDataArrived( TDEIO::Job *, const TQByteArray & data )
{
if ( data.isEmpty() )
return;
@@ -1030,7 +1030,7 @@ void KMOpenMsgCommand::slotDataArrived( KIO::Job *, const TQByteArray & data )
mMsgString.append( data.data(), data.size() );
}
-void KMOpenMsgCommand::slotResult( KIO::Job *job )
+void KMOpenMsgCommand::slotResult( TDEIO::Job *job )
{
if ( job->error() ) {
// handle errors
@@ -1607,7 +1607,7 @@ KMPrintCommand::KMPrintCommand( TQWidget *parent, KMMessage *msg,
if ( GlobalSettings::useDefaultFonts() )
mOverrideFont = TDEGlobalSettings::generalFont();
else {
- KConfigGroup fonts( KMKernel::config(), "Fonts" );
+ TDEConfigGroup fonts( KMKernel::config(), "Fonts" );
TQString tmp = fonts.readEntry( "print-font", TDEGlobalSettings::generalFont().toString() );
mOverrideFont.fromString( tmp );
}
@@ -2641,7 +2641,7 @@ void KMSaveAttachmentsCommand::slotSaveAll()
}
- if ( KIO::NetAccess::exists( curUrl, false, parentWidget() ) ) {
+ if ( TDEIO::NetAccess::exists( curUrl, false, parentWidget() ) ) {
if ( KMessageBox::warningContinueCancel( parentWidget(),
i18n( "A file named %1 already exists. Do you want to overwrite it?" )
.arg( curUrl.fileName() ),
@@ -2773,7 +2773,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node,
if ( !url.isLocalFile() )
{
tf.close();
- if ( !KIO::NetAccess::upload( tf.name(), url, parentWidget() ) )
+ if ( !TDEIO::NetAccess::upload( tf.name(), url, parentWidget() ) )
{
KMessageBox::error( parentWidget(),
i18n( "Could not write the file %1." )
@@ -3334,13 +3334,13 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::E
return;
d.setDisabled( true ); // we got this far, don't delete yet
- KIO::Job * uploadJob = KIO::storedPut( result.toByteArray(), url, -1, overwrite, false /*resume*/ );
+ TDEIO::Job * uploadJob = TDEIO::storedPut( result.toByteArray(), url, -1, overwrite, false /*resume*/ );
uploadJob->setWindow( parentWidget() );
- connect( uploadJob, TQT_SIGNAL(result(KIO::Job*)),
- this, TQT_SLOT(slotAtmDecryptWithChiasmusUploadResult(KIO::Job*)) );
+ connect( uploadJob, TQT_SIGNAL(result(TDEIO::Job*)),
+ this, TQT_SLOT(slotAtmDecryptWithChiasmusUploadResult(TDEIO::Job*)) );
}
-void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusUploadResult( KIO::Job * job )
+void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusUploadResult( TDEIO::Job * job )
{
if ( job->error() )
job->showErrorDialog();
diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h
index 698ae64b..3bb20988 100644
--- a/kmail/kmcommands.h
+++ b/kmail/kmcommands.h
@@ -34,7 +34,7 @@ class KMReaderWin;
class partNode;
class DwBodyPart;
class DwEntity;
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
namespace KMail {
class Composer;
class FolderJob;
@@ -290,7 +290,7 @@ public:
KMUrlSaveCommand( const KURL &url, TQWidget *parent );
private slots:
- void slotUrlSaveResult( KIO::Job *job );
+ void slotUrlSaveResult( TDEIO::Job *job );
private:
virtual Result execute();
@@ -352,7 +352,7 @@ private:
private slots:
void slotSaveDataReq();
- void slotSaveResult(KIO::Job *job);
+ void slotSaveResult(TDEIO::Job *job);
/** the message has been transferred for saving */
void slotMessageRetrievedForSaving(KMMessage *msg);
@@ -366,7 +366,7 @@ private:
TQByteArray mData;
int mOffset;
size_t mTotalSize;
- KIO::TransferJob *mJob;
+ TDEIO::TransferJob *mJob;
};
class KDE_EXPORT KMOpenMsgCommand : public KMCommand
@@ -382,14 +382,14 @@ private:
virtual Result execute();
private slots:
- void slotDataArrived( KIO::Job *job, const TQByteArray & data );
- void slotResult( KIO::Job *job );
+ void slotDataArrived( TDEIO::Job *job, const TQByteArray & data );
+ void slotResult( TDEIO::Job *job );
private:
static const int MAX_CHUNK_SIZE = 64*1024;
KURL mUrl;
DwString mMsgString;
- KIO::TransferJob *mJob;
+ TDEIO::TransferJob *mJob;
const TQString mEncoding;
};
@@ -1075,7 +1075,7 @@ private slots:
void slotPartComplete();
void slotAtmDecryptWithChiasmusResult( const GpgME::Error &, const TQVariant & );
- void slotAtmDecryptWithChiasmusUploadResult( KIO::Job * );
+ void slotAtmDecryptWithChiasmusUploadResult( TDEIO::Job * );
private:
partNode* mNode;
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index 31d36b4d..0857ae2b 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -344,7 +344,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id )
mSignatureStateIndicator->setAlignment( TQt::AlignHCenter );
hbox->addWidget( mSignatureStateIndicator );
- KConfigGroup reader( KMKernel::config(), "Reader" );
+ TDEConfigGroup reader( KMKernel::config(), "Reader" );
TQPalette p( mSignatureStateIndicator->palette() );
TQColor defaultSignedColor( 0x40, 0xFF, 0x40 ); // light green // pgp ok, trusted key
@@ -505,10 +505,10 @@ KMComposeWin::~KMComposeWin()
delete mMsg;
mMsg = 0;
}
- TQMap<KIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.begin();
+ TQMap<TDEIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.begin();
while ( it != mMapAtmLoadData.end() )
{
- KIO::Job *job = it.key();
+ TDEIO::Job *job = it.key();
mMapAtmLoadData.remove( it );
job->kill();
it = mMapAtmLoadData.begin();
@@ -797,7 +797,7 @@ void KMComposeWin::writeConfig(void)
GlobalSettings::self()->setComposerSize( size() );
GlobalSettings::self()->setShowSnippetManager( mSnippetAction->isChecked() );
- KConfigGroupSaver saver( KMKernel::config(), "Geometry" );
+ TDEConfigGroupSaver saver( KMKernel::config(), "Geometry" );
saveMainWindowSettings( KMKernel::config(), "Composer" );
GlobalSettings::setSnippetSplitterPosition( mSnippetSplitter->sizes() );
@@ -2384,7 +2384,7 @@ Kleo::CryptoMessageFormat KMComposeWin::cryptoMessageFormat() const {
bool KMComposeWin::encryptToSelf() const {
// return !Kpgp::Module::getKpgp() || Kpgp::Module::getKpgp()->encryptToSelf();
- KConfigGroup group( KMKernel::config(), "Composer" );
+ TDEConfigGroup group( KMKernel::config(), "Composer" );
return group.readBoolEntry( "crypto-encrypt-to-self", true );
}
@@ -2410,8 +2410,8 @@ bool KMComposeWin::addAttach(const KURL aUrl)
return false;
}
- KIO::TransferJob *job = KIO::get(aUrl);
- KIO::Scheduler::scheduleJob( job );
+ TDEIO::TransferJob *job = TDEIO::get(aUrl);
+ TDEIO::Scheduler::scheduleJob( job );
atmLoadData ld;
ld.url = aUrl;
ld.data = TQByteArray();
@@ -2421,10 +2421,10 @@ bool KMComposeWin::addAttach(const KURL aUrl)
mMapAtmLoadData.insert(job, ld);
mAttachJobs[job] = aUrl;
- connect(job, TQT_SIGNAL(result(KIO::Job *)),
- TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(KIO::Job *)));
- connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
- TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(KIO::Job *, const TQByteArray &)));
+ 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 &)));
return true;
}
@@ -2496,7 +2496,7 @@ void KMComposeWin::msgPartToItem(const KMMessagePart* msgPart,
lvi->setText(0, msgPart->fileName());
else
lvi->setText(0, msgPart->name());
- lvi->setText(1, KIO::convertSize( msgPart->decodedSize()));
+ lvi->setText(1, TDEIO::convertSize( msgPart->decodedSize()));
lvi->setText(2, msgPart->contentTransferEncodingStr());
lvi->setText(3, prettyMimeType(msgPart->typeStr() + "/" + msgPart->subtypeStr()));
lvi->setAttachmentSize(msgPart->decodedSize());
@@ -2753,7 +2753,7 @@ void KMComposeWin::slotAttachFile()
TQString recent;
KURL recentURL = KFileDialog::getStartURL( TQString(), recent );
if ( !recentURL.url().isEmpty() &&
- !KIO::NetAccess::exists( recentURL, true, this ) ) {
+ !TDEIO::NetAccess::exists( recentURL, true, this ) ) {
recentURL = KURL( TQDir::homeDirPath() );
}
@@ -2771,9 +2771,9 @@ void KMComposeWin::slotAttachFile()
//-----------------------------------------------------------------------------
-void KMComposeWin::slotAttachFileData(KIO::Job *job, const TQByteArray &data)
+void KMComposeWin::slotAttachFileData(TDEIO::Job *job, const TQByteArray &data)
{
- TQMap<KIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.find(job);
+ TQMap<TDEIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.find(job);
assert(it != mMapAtmLoadData.end());
TQBuffer buff((*it).data);
buff.open(IO_WriteOnly | IO_Append);
@@ -2783,12 +2783,12 @@ void KMComposeWin::slotAttachFileData(KIO::Job *job, const TQByteArray &data)
//-----------------------------------------------------------------------------
-void KMComposeWin::slotAttachFileResult(KIO::Job *job)
+void KMComposeWin::slotAttachFileResult(TDEIO::Job *job)
{
- TQMap<KIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.find(job);
+ TQMap<TDEIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.find(job);
assert(it != mMapAtmLoadData.end());
KURL attachURL;
- TQMap<KIO::Job*, KURL>::iterator jit = mAttachJobs.find(job);
+ TQMap<TDEIO::Job*, KURL>::iterator jit = mAttachJobs.find(job);
bool attachURLfound = (jit != mAttachJobs.end());
if (attachURLfound)
{
@@ -2834,7 +2834,7 @@ void KMComposeWin::slotAttachFileResult(KIO::Job *job)
KCursorSaver busy(KBusyPtr::busy());
TQString name( (*it).url.fileName() );
// ask the job for the mime type of the file
- TQString mimeType = static_cast<KIO::MimetypeJob*>(job)->mimetype();
+ TQString mimeType = static_cast<TDEIO::MimetypeJob*>(job)->mimetype();
if ( name.isEmpty() ) {
// URL ends with '/' (e.g. http://www.kde.org/)
@@ -2901,7 +2901,7 @@ void KMComposeWin::slotAttachFileResult(KIO::Job *job)
}
// show message part dialog, if not configured away (default):
- KConfigGroup composer(KMKernel::config(), "Composer");
+ TDEConfigGroup composer(KMKernel::config(), "Composer");
if ( GlobalSettings::self()->showMessagePartDialogOnAttach() ) {
const KCursorSaver saver( TQCursor::ArrowCursor );
KMMsgPartDialogCompat dlg(mMainWidget);
@@ -2955,8 +2955,8 @@ void KMComposeWin::slotInsertFile()
mRecentAction->addURL(u);
// Prevent race condition updating list when multiple composers are open
{
- KConfig *config = KMKernel::config();
- KConfigGroupSaver saver( config, "Composer" );
+ TDEConfig *config = KMKernel::config();
+ TDEConfigGroupSaver saver( config, "Composer" );
TQString encoding = TDEGlobal::charsets()->encodingForName(combo->currentText()).latin1();
TQStringList urls = config->readListEntry( "recent-urls" );
TQStringList encodings = config->readListEntry( "recent-encodings" );
@@ -2987,15 +2987,15 @@ void KMComposeWin::slotInsertRecentFile(const KURL& u)
{
if (u.fileName().isEmpty()) return;
- KIO::Job *job = KIO::get(u);
+ TDEIO::Job *job = TDEIO::get(u);
atmLoadData ld;
ld.url = u;
ld.data = TQByteArray();
ld.insert = true;
// Get the encoding previously used when inserting this file
{
- KConfig *config = KMKernel::config();
- KConfigGroupSaver saver( config, "Composer" );
+ TDEConfig *config = KMKernel::config();
+ TDEConfigGroupSaver saver( config, "Composer" );
TQStringList urls = config->readListEntry( "recent-urls" );
TQStringList encodings = config->readListEntry( "recent-encodings" );
int index = urls.findIndex( u.prettyURL() );
@@ -3005,10 +3005,10 @@ void KMComposeWin::slotInsertRecentFile(const KURL& u)
}
}
mMapAtmLoadData.insert(job, ld);
- connect(job, TQT_SIGNAL(result(KIO::Job *)),
- TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(KIO::Job *)));
- connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
- TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(KIO::Job *, const TQByteArray &)));
+ 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 &)));
}
diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h
index 02f92154..840d3434 100644
--- a/kmail/kmcomposewin.h
+++ b/kmail/kmcomposewin.h
@@ -488,8 +488,8 @@ private slots:
/**
* KIO slots for attachment insertion
*/
- void slotAttachFileData(KIO::Job *, const TQByteArray &);
- void slotAttachFileResult(KIO::Job *);
+ void slotAttachFileData(TDEIO::Job *, const TQByteArray &);
+ void slotAttachFileResult(TDEIO::Job *);
void slotListAction(const TQString &);
void slotFontAction(const TQString &);
@@ -829,7 +829,7 @@ private:
TQStringList mFolderNames;
TQValueList<TQGuardedPtr<KMFolder> > mFolderList;
- TQMap<KIO::Job*, KURL> mAttachJobs;
+ TQMap<TDEIO::Job*, KURL> mAttachJobs;
KURL::List mAttachFilesPending;
int mAttachFilesSend;
@@ -893,7 +893,7 @@ private:
bool insert;
TQCString encoding;
};
- TQMap<KIO::Job *, atmLoadData> mMapAtmLoadData;
+ TQMap<TDEIO::Job *, atmLoadData> mMapAtmLoadData;
// These are for passing on methods over the applyChanges calls
KMail::MessageSender::SendMethod mSendMethod;
diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp
index e4fb4689..044e0541 100644
--- a/kmail/kmedit.cpp
+++ b/kmail/kmedit.cpp
@@ -254,7 +254,7 @@ void KMEdit::initializeAutoSpellChecking()
TQColor defaultForeground( kapp->palette().active().text() );
TQColor c = TQt::red;
- KConfigGroup readerConfig( KMKernel::config(), "Reader" );
+ TDEConfigGroup readerConfig( KMKernel::config(), "Reader" );
TQColor col1;
if ( !readerConfig.readBoolEntry( "defaultColors", true ) )
col1 = readerConfig.readColorEntry( "ForegroundColor", &defaultForeground );
diff --git a/kmail/kmfilter.cpp b/kmail/kmfilter.cpp
index 28a64633..e9e9f379 100644
--- a/kmail/kmfilter.cpp
+++ b/kmail/kmfilter.cpp
@@ -39,7 +39,7 @@ using KMail::FilterLog;
#include <assert.h>
-KMFilter::KMFilter( KConfig* aConfig, bool popFilter )
+KMFilter::KMFilter( TDEConfig* aConfig, bool popFilter )
: bPopFilter(popFilter)
{
if (!bPopFilter)
@@ -210,7 +210,7 @@ bool KMFilter::applyOnAccount( uint id ) const
//-----------------------------------------------------------------------------
-void KMFilter::readConfig(KConfig* config)
+void KMFilter::readConfig(TDEConfig* config)
{
// MKSearchPattern::readConfig ensures
// that the pattern is purified.
@@ -295,7 +295,7 @@ void KMFilter::readConfig(KConfig* config)
}
-void KMFilter::writeConfig(KConfig* config) const
+void KMFilter::writeConfig(TDEConfig* config) const
{
mPattern.writeConfig(config);
diff --git a/kmail/kmfilter.h b/kmail/kmfilter.h
index 4414f59d..109e491e 100644
--- a/kmail/kmfilter.h
+++ b/kmail/kmfilter.h
@@ -28,7 +28,7 @@
#include <tqptrlist.h>
class TQString;
-class KConfig;
+class TDEConfig;
class KMMessage;
class KMFilterAction;
class KMFolder;
@@ -67,7 +67,7 @@ public:
/** Constructor that initializes from given config file, if given.
* Filters are stored one by one in config groups, i.e. one filter, one group.
* The config group has to be preset if config is not 0. */
- KMFilter( KConfig* aConfig=0 , bool popFilter = false);
+ KMFilter( TDEConfig* aConfig=0 , bool popFilter = false);
/** Copy constructor. Constructs a deep copy of @p aFilter. */
KMFilter( const KMFilter & other );
@@ -107,13 +107,13 @@ public:
constructor above) has to be preset. The config object will be
deleted by higher levels, so it is not allowed to store a
pointer to it anywhere inside this function. */
- void writeConfig( KConfig* config ) const;
+ void writeConfig( TDEConfig* config ) const;
/** Initialize from given config file. The config group (see
constructor above) has to be preset. The config object will be
deleted by higher levels, so it is not allowed to store a
pointer to it anywhere inside this function. */
- void readConfig( KConfig* config );
+ void readConfig( TDEConfig* config );
/** Remove empty rules (and actions one day). */
void purify();
diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp
index 4ba4422c..fd00a3cc 100644
--- a/kmail/kmfilterdlg.cpp
+++ b/kmail/kmfilterdlg.cpp
@@ -339,7 +339,7 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo
connect( this, TQT_SIGNAL(finished()),
this, TQT_SLOT(slotFinished()) );
- KConfigGroup geometry( KMKernel::config(), "Geometry");
+ TDEConfigGroup geometry( KMKernel::config(), "Geometry");
const char * configKey
= bPopFilter ? "popFilterDialogSize" : "filterDialogSize";
if ( geometry.hasKey( configKey ) )
@@ -356,7 +356,7 @@ void KMFilterDlg::slotFinished() {
}
void KMFilterDlg::slotSaveSize() {
- KConfigGroup geometry( KMKernel::config(), "Geometry" );
+ TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
geometry.writeEntry( bPopFilter ? "popFilterDialogSize" : "filterDialogSize", size() );
}
diff --git a/kmail/kmfiltermgr.cpp b/kmail/kmfiltermgr.cpp
index 9118d14c..1f5d9ad5 100644
--- a/kmail/kmfiltermgr.cpp
+++ b/kmail/kmfiltermgr.cpp
@@ -67,11 +67,11 @@ void KMFilterMgr::clear()
//-----------------------------------------------------------------------------
void KMFilterMgr::readConfig(void)
{
- KConfig* config = KMKernel::config();
+ TDEConfig* config = KMKernel::config();
clear();
if (bPopFilter) {
- KConfigGroupSaver saver(config, "General");
+ TDEConfigGroupSaver saver(config, "General");
mShowLater = config->readNumEntry("popshowDLmsgs",0);
}
mFilters = FilterImporterExporter::readFiltersFromConfig( config, bPopFilter );
@@ -80,11 +80,11 @@ void KMFilterMgr::readConfig(void)
//-----------------------------------------------------------------------------
void KMFilterMgr::writeConfig(bool withSync)
{
- KConfig* config = KMKernel::config();
+ TDEConfig* config = KMKernel::config();
// Now, write out the new stuff:
FilterImporterExporter::writeFiltersToConfig( mFilters, config, bPopFilter );
- KConfigGroupSaver saver(config, "General");
+ TDEConfigGroupSaver saver(config, "General");
if (bPopFilter)
config->writeEntry("popshowDLmsgs", mShowLater);
diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp
index de6814ca..5c4af405 100644
--- a/kmail/kmfolder.cpp
+++ b/kmail/kmfolder.cpp
@@ -158,7 +158,7 @@ KMFolder::~KMFolder()
delete mStorage;
}
-void KMFolder::readConfig( KConfig* config )
+void KMFolder::readConfig( TDEConfig* config )
{
if ( !config->readEntry("SystemLabel").isEmpty() )
mSystemLabel = config->readEntry("SystemLabel");
@@ -197,7 +197,7 @@ void KMFolder::readConfig( KConfig* config )
}
}
-void KMFolder::writeConfig( KConfig* config ) const
+void KMFolder::writeConfig( TDEConfig* config ) const
{
config->writeEntry("SystemLabel", mSystemLabel);
config->writeEntry("ExpireMessages", mExpireMessages);
diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h
index fe290000..87be5840 100644
--- a/kmail/kmfolder.h
+++ b/kmail/kmfolder.h
@@ -128,10 +128,10 @@ public:
bool hasAccounts() const { return (mAcctList != 0); }
/** This is used by the storage to read the folder specific configuration */
- void readConfig( KConfig* config );
+ void readConfig( TDEConfig* config );
/** This is used by the storage to save the folder specific configuration */
- void writeConfig( KConfig* config ) const;
+ void writeConfig( TDEConfig* config ) const;
FolderStorage* storage() { return mStorage; }
/** if the folder is const, the storage should be as well */
diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
index e7009a23..4ce92cb1 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/kmail/kmfoldercachedimap.cpp
@@ -250,8 +250,8 @@ void KMFolderCachedImap::initializeFrom( KMFolderCachedImap* parent )
void KMFolderCachedImap::readConfig()
{
- KConfig* config = KMKernel::config();
- KConfigGroupSaver saver( config, "Folder-" + folder()->idString() );
+ TDEConfig* config = KMKernel::config();
+ TDEConfigGroupSaver saver( config, "Folder-" + folder()->idString() );
if( mImapPath.isEmpty() ) mImapPath = config->readEntry( "ImapPath" );
if( TQString( name() ).upper() == "INBOX" && mImapPath == "/INBOX/" )
{
@@ -329,7 +329,7 @@ void KMFolderCachedImap::writeConfig()
if ( mFolderRemoved )
return;
- KConfigGroup configGroup( KMKernel::config(), "Folder-" + folder()->idString() );
+ TDEConfigGroup configGroup( KMKernel::config(), "Folder-" + folder()->idString() );
configGroup.writeEntry( "ImapPath", mImapPath );
configGroup.writeEntry( "NoContent", mNoContent );
configGroup.writeEntry( "ReadOnly", mReadOnly );
@@ -369,7 +369,7 @@ void KMFolderCachedImap::writeConfig()
void KMFolderCachedImap::writeConfigKeysWhichShouldNotGetOverwrittenByReadConfig()
{
- KConfigGroup configGroup( KMKernel::config(), "Folder-" + folder()->idString() );
+ TDEConfigGroup configGroup( KMKernel::config(), "Folder-" + folder()->idString() );
if ( !folder()->noContent() )
{
configGroup.writeEntry( "AnnotationFolderTypeChanged", mAnnotationFolderTypeChanged );
@@ -1148,13 +1148,13 @@ void KMFolderCachedImap::serverSyncInternal()
annotations.append( attr );
kdDebug(5006) << "Setting test attribute to "<< url << endl;
- KIO::Job* job = AnnotationJobs::multiSetAnnotation( mAccount->slave(),
+ TDEIO::Job* job = AnnotationJobs::multiSetAnnotation( mAccount->slave(),
url, annotations );
ImapAccountBase::jobData jd( url.url(), folder() );
jd.cancellable = true; // we can always do so later
mAccount->insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(KIO::Job *)),
- TQT_SLOT(slotTestAnnotationResult(KIO::Job *)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+ TQT_SLOT(slotTestAnnotationResult(TDEIO::Job *)));
break;
}
@@ -1199,8 +1199,8 @@ void KMFolderCachedImap::serverSyncInternal()
connect( job, TQT_SIGNAL(annotationResult(const TQString&, const TQString&, bool)),
TQT_SLOT(slotAnnotationResult(const TQString&, const TQString&, bool)) );
- connect( job, TQT_SIGNAL(result(KIO::Job *)),
- TQT_SLOT(slotGetAnnotationResult(KIO::Job *)) );
+ connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
+ TQT_SLOT(slotGetAnnotationResult(TDEIO::Job *)) );
break;
}
}
@@ -1232,7 +1232,7 @@ void KMFolderCachedImap::serverSyncInternal()
kdDebug(5006) << k_funcinfo << "Setting sharedseen annotation for " << label() << " to " << val << endl;
}
if ( !annotations.isEmpty() ) {
- KIO::Job* job =
+ TDEIO::Job* job =
AnnotationJobs::multiSetAnnotation( mAccount->slave(), url, annotations );
ImapAccountBase::jobData jd( url.url(), folder() );
jd.cancellable = true; // we can always do so later
@@ -1240,8 +1240,8 @@ void KMFolderCachedImap::serverSyncInternal()
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(KIO::Job *)),
- TQT_SLOT(slotSetAnnotationResult(KIO::Job *)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+ TQT_SLOT(slotSetAnnotationResult(TDEIO::Job *)));
break;
}
}
@@ -1260,12 +1260,12 @@ void KMFolderCachedImap::serverSyncInternal()
newState( mProgress, i18n("Setting permissions"));
KURL url = mAccount->getUrl();
url.setPath( imapPath() );
- KIO::Job* job = KMail::ACLJobs::multiSetACL( mAccount->slave(), url, mACLList );
+ TDEIO::Job* job = KMail::ACLJobs::multiSetACL( mAccount->slave(), url, mACLList );
ImapAccountBase::jobData jd( url.url(), folder() );
mAccount->insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(KIO::Job *)),
- TQT_SLOT(slotMultiSetACLResult(KIO::Job *)));
+ 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 )) );
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*, KIO::Job*, const KMail::ACLList& )),
- this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
+ connect( mAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
+ this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
break;
}
case SYNC_STATE_FIND_SUBFOLDERS:
@@ -1306,13 +1306,13 @@ void KMFolderCachedImap::serverSyncInternal()
newState( mProgress, i18n("Getting quota information"));
KURL url = mAccount->getUrl();
url.setPath( imapPath() );
- KIO::Job* job = KMail::QuotaJobs::getStorageQuota( mAccount->slave(), url );
+ 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(KIO::Job *)),
- TQT_SLOT(slotQuotaResult(KIO::Job *)) );
+ connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
+ TQT_SLOT(slotQuotaResult(TDEIO::Job *)) );
break;
}
case SYNC_STATE_CLOSE:
@@ -1437,7 +1437,7 @@ void KMFolderCachedImap::slotConnectionResult( int errorCode, const TQString& er
serverSyncInternal();
} else {
// Error (error message already shown by the account)
- newState( mProgress, KIO::buildErrorString( errorCode, errorMsg ));
+ newState( mProgress, TDEIO::buildErrorString( errorCode, errorMsg ));
emit folderComplete(this, false);
}
}
@@ -1819,7 +1819,7 @@ void KMFolderCachedImap::slotGetLastMessagesResult(KMail::FolderJob *job)
}
// Connected to the listMessages job in CachedImapJob
-void KMFolderCachedImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data)
+void KMFolderCachedImap::slotGetMessagesData(TDEIO::Job * job, const TQByteArray & data)
{
KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
@@ -2347,8 +2347,8 @@ void KMFolderCachedImap::listDirectory2()
ImapAccountBase::jobData jd( TQString(), folder() );
jd.cancellable = true;
mAccount->insertJob(job, jd);
- connect( job, TQT_SIGNAL(result(KIO::Job *)),
- TQT_SLOT(slotMultiUrlGetAnnotationResult(KIO::Job *)) );
+ connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
+ TQT_SLOT(slotMultiUrlGetAnnotationResult(TDEIO::Job *)) );
} else {
createFoldersNewOnServerAndFinishListing( foldersNewOnServer );
@@ -2449,7 +2449,7 @@ void KMFolderCachedImap::slotSubFolderCloseToQuotaChanged()
}
}
-void KMFolderCachedImap::slotSimpleData(KIO::Job * job, const TQByteArray & data)
+void KMFolderCachedImap::slotSimpleData(TDEIO::Job * job, const TQByteArray & data)
{
KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
if (it == mAccount->jobsEnd()) return;
@@ -2513,11 +2513,11 @@ KMFolderCachedImap::setReadOnly( bool readOnly )
}
void
-KMFolderCachedImap::slotReceivedACL( KMFolder* folder, KIO::Job* job, const KMail::ACLList& aclList )
+KMFolderCachedImap::slotReceivedACL( KMFolder* folder, TDEIO::Job* job, const KMail::ACLList& aclList )
{
if ( folder->storage() == this ) {
- disconnect( mAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )),
- this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
+ disconnect( mAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
+ this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
mACLListState = job->error() ? KMail::ACLJobs::FetchFailed : KMail::ACLJobs::Ok;
mACLList = aclList;
serverSyncInternal();
@@ -2551,7 +2551,7 @@ KMFolderCachedImap::setACLList( const ACLList& arr )
}
void
-KMFolderCachedImap::slotMultiSetACLResult(KIO::Job *job)
+KMFolderCachedImap::slotMultiSetACLResult(TDEIO::Job *job)
{
KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen
@@ -2795,7 +2795,7 @@ void KMFolderCachedImap::slotAnnotationResult(const TQString& entry, const TQStr
}
}
-void KMFolderCachedImap::slotGetAnnotationResult( KIO::Job* job )
+void KMFolderCachedImap::slotGetAnnotationResult( TDEIO::Job* job )
{
KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
Q_ASSERT( it != mAccount->jobsEnd() );
@@ -2805,7 +2805,7 @@ void KMFolderCachedImap::slotGetAnnotationResult( KIO::Job* job )
AnnotationJobs::GetAnnotationJob* annjob = static_cast<AnnotationJobs::GetAnnotationJob *>( job );
if ( annjob->error() ) {
- if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) {
+ if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION ) {
// that's when the imap server doesn't support annotations
if ( GlobalSettings::self()->theIMAPResourceStorageFormat() == GlobalSettings::EnumTheIMAPResourceStorageFormat::XML
&& (uint)GlobalSettings::self()->theIMAPResourceAccount() == mAccount->id() )
@@ -2821,7 +2821,7 @@ void KMFolderCachedImap::slotGetAnnotationResult( KIO::Job* job )
serverSyncInternal();
}
-void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job )
+void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( TDEIO::Job* job )
{
KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
Q_ASSERT( it != mAccount->jobsEnd() );
@@ -2833,7 +2833,7 @@ void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job )
AnnotationJobs::MultiUrlGetAnnotationJob* annjob
= static_cast<AnnotationJobs::MultiUrlGetAnnotationJob *>( job );
if ( annjob->error() ) {
- if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) {
+ if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION ) {
// that's when the imap server doesn't support annotations
if ( GlobalSettings::self()->theIMAPResourceStorageFormat() == GlobalSettings::EnumTheIMAPResourceStorageFormat::XML
&& (uint)GlobalSettings::self()->theIMAPResourceAccount() == mAccount->id() )
@@ -2873,7 +2873,7 @@ void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job )
createFoldersNewOnServerAndFinishListing( folders );
}
-void KMFolderCachedImap::slotQuotaResult( KIO::Job* job )
+void KMFolderCachedImap::slotQuotaResult( TDEIO::Job* job )
{
KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
Q_ASSERT( it != mAccount->jobsEnd() );
@@ -2884,7 +2884,7 @@ void KMFolderCachedImap::slotQuotaResult( KIO::Job* job )
QuotaJobs::GetStorageQuotaJob* quotajob = static_cast<QuotaJobs::GetStorageQuotaJob *>( job );
QuotaInfo empty;
if ( quotajob->error() ) {
- if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) {
+ if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION ) {
// that's when the imap server doesn't support quota
mAccount->setHasNoQuotaSupport();
setQuotaInfo( empty );
@@ -2916,7 +2916,7 @@ KMFolderCachedImap::slotAnnotationChanged( const TQString& entry, const TQString
}
}
-void KMFolderCachedImap::slotTestAnnotationResult(KIO::Job *job)
+void KMFolderCachedImap::slotTestAnnotationResult(TDEIO::Job *job)
{
KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
Q_ASSERT( it != mAccount->jobsEnd() );
@@ -2936,7 +2936,7 @@ void KMFolderCachedImap::slotTestAnnotationResult(KIO::Job *job)
}
void
-KMFolderCachedImap::slotSetAnnotationResult(KIO::Job *job)
+KMFolderCachedImap::slotSetAnnotationResult(TDEIO::Job *job)
{
KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen
@@ -2945,7 +2945,7 @@ KMFolderCachedImap::slotSetAnnotationResult(KIO::Job *job)
bool cont = true;
if ( job->error() ) {
// Don't show error if the server doesn't support ANNOTATEMORE and this folder only contains mail
- if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION && contentsType() == ContentsTypeMail ) {
+ if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION && contentsType() == ContentsTypeMail ) {
if (mAccount->slave()) mAccount->removeJob(job);
} else {
cont = mAccount->handleJobError( job, i18n( "Error while setting annotation: " ) + '\n' );
diff --git a/kmail/kmfoldercachedimap.h b/kmail/kmfoldercachedimap.h
index 59c444e6..e82da6c3 100644
--- a/kmail/kmfoldercachedimap.h
+++ b/kmail/kmfoldercachedimap.h
@@ -341,13 +341,13 @@ public:
virtual bool mailCheckInProgress() const;
protected slots:
- void slotGetMessagesData(KIO::Job * job, const TQByteArray & data);
+ void slotGetMessagesData(TDEIO::Job * job, const TQByteArray & data);
void getMessagesResult(KMail::FolderJob *, bool lastSet);
void slotGetLastMessagesResult(KMail::FolderJob *);
void slotProgress(unsigned long done, unsigned long total);
void slotPutProgress( unsigned long, unsigned long );
- //virtual void slotCheckValidityResult(KIO::Job * job);
+ //virtual void slotCheckValidityResult(TDEIO::Job * job);
void slotSubFolderComplete(KMFolderCachedImap*, bool);
void slotSubFolderCloseToQuotaChanged();
@@ -356,21 +356,21 @@ protected slots:
void slotCheckUidValidityResult( KMail::FolderJob* job );
void slotPermanentFlags( int flags );
- void slotTestAnnotationResult(KIO::Job *job);
- void slotGetAnnotationResult( KIO::Job* );
- void slotMultiUrlGetAnnotationResult( KIO::Job* );
- void slotSetAnnotationResult(KIO::Job *job);
+ void slotTestAnnotationResult(TDEIO::Job *job);
+ void slotGetAnnotationResult( TDEIO::Job* );
+ void slotMultiUrlGetAnnotationResult( TDEIO::Job* );
+ void slotSetAnnotationResult(TDEIO::Job *job);
void slotReceivedUserRights( KMFolder* );
- void slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& );
+ void slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& );
- void slotMultiSetACLResult(KIO::Job *);
+ void slotMultiSetACLResult(TDEIO::Job *);
void slotACLChanged( const TQString&, int );
void slotAnnotationResult(const TQString& entry, const TQString& value, bool found);
void slotAnnotationChanged( const TQString& entry, const TQString& attribute, const TQString& value );
void slotDeleteMessagesResult(KMail::FolderJob *);
void slotImapStatusChanged(KMFolder* folder, const TQString&, bool);
void slotStorageQuotaResult( const QuotaInfo& );
- void slotQuotaResult( KIO::Job* job );
+ void slotQuotaResult( TDEIO::Job* job );
protected:
/* returns true if there were messages to delete
@@ -414,9 +414,9 @@ protected:
public slots:
/**
- * Add the data a KIO::Job retrieves to the buffer
+ * Add the data a TDEIO::Job retrieves to the buffer
*/
- void slotSimpleData(KIO::Job * job, const TQByteArray & data);
+ void slotSimpleData(TDEIO::Job * job, const TQByteArray & data);
/**
* Troubleshoot the IMAP cache
diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp
index 161354bc..3f7208a9 100644
--- a/kmail/kmfolderdia.cpp
+++ b/kmail/kmfolderdia.cpp
@@ -225,7 +225,7 @@ void KMFolderDialog::slotCancelAccept()
void KMFolderDialog::slotChanged( bool )
{
// TODO, support for 'changed', and Apply button.
- // sample code for here: KCMultiDialog calls bool changed() on every KCModuleProxy...
+ // sample code for here: KCMultiDialog calls bool changed() on every TDECModuleProxy...
}
void KMFolderDialog::setFolder( KMFolder* folder )
diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp
index 6d3d468e..07a52c5c 100644
--- a/kmail/kmfolderimap.cpp
+++ b/kmail/kmfolderimap.cpp
@@ -186,8 +186,8 @@ void KMFolderImap::setAccount(KMAcctImap *aAccount)
//-----------------------------------------------------------------------------
void KMFolderImap::readConfig()
{
- KConfig* config = KMKernel::config();
- KConfigGroupSaver saver(config, "Folder-" + folder()->idString());
+ TDEConfig* config = KMKernel::config();
+ TDEConfigGroupSaver saver(config, "Folder-" + folder()->idString());
mCheckMail = config->readBoolEntry("checkmail", true);
mUidValidity = config->readEntry("UidValidity");
@@ -210,8 +210,8 @@ void KMFolderImap::readConfig()
//-----------------------------------------------------------------------------
void KMFolderImap::writeConfig()
{
- KConfig* config = KMKernel::config();
- KConfigGroupSaver saver(config, "Folder-" + folder()->idString());
+ TDEConfig* config = KMKernel::config();
+ TDEConfigGroupSaver saver(config, "Folder-" + folder()->idString());
config->writeEntry("checkmail", mCheckMail);
config->writeEntry("UidValidity", mUidValidity);
config->writeEntry("ImapPath", mImapPath);
@@ -239,8 +239,8 @@ void KMFolderImap::remove()
emit removed(folder(), false);
return;
}
- KIO::SimpleJob *job = KIO::file_delete(url, false);
- KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+ TDEIO::SimpleJob *job = TDEIO::file_delete(url, false);
+ TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
ImapAccountBase::jobData jd(url.url());
jd.progressItem = ProgressManager::createProgressItem(
"ImapFolderRemove" + ProgressManager::getUniqueID(),
@@ -249,12 +249,12 @@ void KMFolderImap::remove()
false,
account()->useSSL() || account()->useTLS() );
account()->insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(KIO::Job *)),
- this, TQT_SLOT(slotRemoveFolderResult(KIO::Job *)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+ this, TQT_SLOT(slotRemoveFolderResult(TDEIO::Job *)));
}
//-----------------------------------------------------------------------------
-void KMFolderImap::slotRemoveFolderResult(KIO::Job *job)
+void KMFolderImap::slotRemoveFolderResult(TDEIO::Job *job)
{
ImapAccountBase::JobIterator it = account()->findJob(job);
if ( it == account()->jobsEnd() ) return;
@@ -1076,13 +1076,13 @@ void KMFolderImap::checkValidity()
account()->mailCheckProgressItem()->setStatus( folder()->prettyURL() );
}
ImapAccountBase::jobData jd( url.url() );
- KIO::SimpleJob *job = KIO::get(url, false, false);
- KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+ TDEIO::SimpleJob *job = TDEIO::get(url, false, false);
+ TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
account()->insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(KIO::Job *)),
- TQT_SLOT(slotCheckValidityResult(KIO::Job *)));
- connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
- TQT_SLOT(slotSimpleData(KIO::Job *, const TQByteArray &)));
+ 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 &)));
// Only check once at a time.
mCheckingValidity = true;
}
@@ -1105,14 +1105,14 @@ ulong KMFolderImap::lastUid()
//-----------------------------------------------------------------------------
-void KMFolderImap::slotCheckValidityResult(KIO::Job * job)
+void KMFolderImap::slotCheckValidityResult(TDEIO::Job * job)
{
kdDebug(5006) << "KMFolderImap::slotCheckValidityResult of: " << fileName() << endl;
mCheckingValidity = false;
ImapAccountBase::JobIterator it = account()->findJob(job);
if ( it == account()->jobsEnd() ) return;
if (job->error()) {
- if ( job->error() != KIO::ERR_ACCESS_DENIED ) {
+ if ( job->error() != TDEIO::ERR_ACCESS_DENIED ) {
// we suppress access denied messages because they are normally a result of
// explicitely set ACLs. Do not save this information (e.g. setNoContent) so that
// we notice when this changes
@@ -1233,37 +1233,37 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid)
if ( mMailCheckProgressItem )
mMailCheckProgressItem->setStatus( i18n("Retrieving message status") );
url.setPath(imapPath() + ";SECTION=UID FLAGS");
- KIO::SimpleJob *job = KIO::listDir(url, false);
- KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+ TDEIO::SimpleJob *job = TDEIO::listDir(url, false);
+ TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
ImapAccountBase::jobData jd( url.url(), folder() );
jd.cancellable = true;
account()->insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(KIO::Job *)),
- this, TQT_SLOT(slotListFolderResult(KIO::Job *)));
- connect(job, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList &)),
- this, TQT_SLOT(slotListFolderEntries(KIO::Job *,
- const KIO::UDSEntryList &)));
+ 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 *,
+ const TDEIO::UDSEntryList &)));
} else {
mContentState = imapDownloadInProgress;
if ( mMailCheckProgressItem )
mMailCheckProgressItem->setStatus( i18n("Retrieving messages") );
url.setPath(imapPath() + ";UID=" + startUid
+ ":*;SECTION=ENVELOPE");
- KIO::SimpleJob *newJob = KIO::get(url, false, false);
- KIO::Scheduler::assignJobToSlave(account()->slave(), newJob);
+ TDEIO::SimpleJob *newJob = TDEIO::get(url, false, false);
+ TDEIO::Scheduler::assignJobToSlave(account()->slave(), newJob);
ImapAccountBase::jobData jd( url.url(), folder() );
jd.cancellable = true;
account()->insertJob(newJob, jd);
- connect(newJob, TQT_SIGNAL(result(KIO::Job *)),
- this, TQT_SLOT(slotGetLastMessagesResult(KIO::Job *)));
- connect(newJob, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
- this, TQT_SLOT(slotGetMessagesData(KIO::Job *, const TQByteArray &)));
+ 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 &)));
}
}
//-----------------------------------------------------------------------------
-void KMFolderImap::slotListFolderResult(KIO::Job * job)
+void KMFolderImap::slotListFolderResult(TDEIO::Job * job)
{
ImapAccountBase::JobIterator it = account()->findJob(job);
if ( it == account()->jobsEnd() ) return;
@@ -1356,39 +1356,39 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job)
mContentState = imapDownloadInProgress;
KURL url = account()->getUrl();
url.setPath(imapPath() + ";UID=" + *i + ";SECTION=ENVELOPE");
- KIO::SimpleJob *newJob = KIO::get(url, false, false);
+ TDEIO::SimpleJob *newJob = TDEIO::get(url, false, false);
jd.url = url.url();
- KIO::Scheduler::assignJobToSlave(account()->slave(), newJob);
+ TDEIO::Scheduler::assignJobToSlave(account()->slave(), newJob);
account()->insertJob(newJob, jd);
- connect(newJob, TQT_SIGNAL(result(KIO::Job *)),
+ connect(newJob, TQT_SIGNAL(result(TDEIO::Job *)),
this, (i == sets.at(sets.count() - 1))
- ? TQT_SLOT(slotGetLastMessagesResult(KIO::Job *))
- : TQT_SLOT(slotGetMessagesResult(KIO::Job *)));
- connect(newJob, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
- this, TQT_SLOT(slotGetMessagesData(KIO::Job *, const TQByteArray &)));
+ ? 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 &)));
}
}
//-----------------------------------------------------------------------------
-void KMFolderImap::slotListFolderEntries(KIO::Job * job,
- const KIO::UDSEntryList & uds)
+void KMFolderImap::slotListFolderEntries(TDEIO::Job * job,
+ const TDEIO::UDSEntryList & uds)
{
ImapAccountBase::JobIterator it = account()->findJob(job);
if ( it == account()->jobsEnd() ) return;
TQString mimeType, name;
long int flags = 0;
- for (KIO::UDSEntryList::ConstIterator udsIt = uds.begin();
+ for (TDEIO::UDSEntryList::ConstIterator udsIt = uds.begin();
udsIt != uds.end(); udsIt++)
{
- for (KIO::UDSEntry::ConstIterator eIt = (*udsIt).begin();
+ for (TDEIO::UDSEntry::ConstIterator eIt = (*udsIt).begin();
eIt != (*udsIt).end(); eIt++)
{
- if ((*eIt).m_uds == KIO::UDS_NAME)
+ if ((*eIt).m_uds == TDEIO::UDS_NAME)
name = (*eIt).m_str;
- else if ((*eIt).m_uds == KIO::UDS_MIME_TYPE)
+ else if ((*eIt).m_uds == TDEIO::UDS_MIME_TYPE)
mimeType = (*eIt).m_str;
- else if ((*eIt).m_uds == KIO::UDS_ACCESS)
+ else if ((*eIt).m_uds == TDEIO::UDS_ACCESS)
flags = (*eIt).m_long;
}
if ((mimeType == "message/rfc822-imap" || mimeType == "message/rfc822") &&
@@ -1519,7 +1519,7 @@ KMFolderImap::ignoreJobsForMessage( KMMessage* msg )
}
//-----------------------------------------------------------------------------
-void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data)
+void KMFolderImap::slotGetMessagesData(TDEIO::Job * job, const TQByteArray & data)
{
if ( data.isEmpty() ) return; // optimization
ImapAccountBase::JobIterator it = account()->findJob(job);
@@ -1687,7 +1687,7 @@ KMFolderImap::doCreateJob( TQPtrList<KMMessage>& msgList, const TQString& sets,
}
//-----------------------------------------------------------------------------
-void KMFolderImap::getMessagesResult(KIO::Job * job, bool lastSet)
+void KMFolderImap::getMessagesResult(TDEIO::Job * job, bool lastSet)
{
ImapAccountBase::JobIterator it = account()->findJob(job);
if ( it == account()->jobsEnd() ) return;
@@ -1704,14 +1704,14 @@ void KMFolderImap::getMessagesResult(KIO::Job * job, bool lastSet)
//-----------------------------------------------------------------------------
-void KMFolderImap::slotGetLastMessagesResult(KIO::Job * job)
+void KMFolderImap::slotGetLastMessagesResult(TDEIO::Job * job)
{
getMessagesResult(job, true);
}
//-----------------------------------------------------------------------------
-void KMFolderImap::slotGetMessagesResult(KIO::Job * job)
+void KMFolderImap::slotGetMessagesResult(TDEIO::Job * job)
{
getMessagesResult(job, false);
}
@@ -1735,18 +1735,18 @@ void KMFolderImap::createFolder(const TQString &name, const TQString& parentPath
}
url.setPath( path );
- KIO::SimpleJob *job = KIO::mkdir(url);
- KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+ TDEIO::SimpleJob *job = TDEIO::mkdir(url);
+ TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
ImapAccountBase::jobData jd( url.url(), folder() );
jd.items = name;
account()->insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(KIO::Job *)),
- this, TQT_SLOT(slotCreateFolderResult(KIO::Job *)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+ this, TQT_SLOT(slotCreateFolderResult(TDEIO::Job *)));
}
//-----------------------------------------------------------------------------
-void KMFolderImap::slotCreateFolderResult(KIO::Job * job)
+void KMFolderImap::slotCreateFolderResult(TDEIO::Job * job)
{
ImapAccountBase::JobIterator it = account()->findJob(job);
if ( it == account()->jobsEnd() ) return;
@@ -1757,7 +1757,7 @@ void KMFolderImap::slotCreateFolderResult(KIO::Job * job)
if (job->error())
{
- if ( job->error() == KIO::ERR_COULD_NOT_MKDIR ) {
+ if ( job->error() == TDEIO::ERR_COULD_NOT_MKDIR ) {
// Creating a folder failed, remove it from the tree.
account()->listDirectory( );
}
@@ -1807,7 +1807,7 @@ bool KMFolderImap::autoExpunge()
//-----------------------------------------------------------------------------
-void KMFolderImap::slotSimpleData(KIO::Job * job, const TQByteArray & data)
+void KMFolderImap::slotSimpleData(TDEIO::Job * job, const TQByteArray & data)
{
if ( data.isEmpty() ) return; // optimization
ImapAccountBase::JobIterator it = account()->findJob(job);
@@ -1837,12 +1837,12 @@ void KMFolderImap::deleteMessage(KMMessage * msg)
url.setPath(msg_parent->imapPath() + ";UID=" + TQString::number(uid) );
if ( account()->makeConnection() != ImapAccountBase::Connected )
return;
- KIO::SimpleJob *job = KIO::file_delete(url, false);
- KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+ TDEIO::SimpleJob *job = TDEIO::file_delete(url, false);
+ TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
ImapAccountBase::jobData jd( url.url(), 0 );
account()->insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(KIO::Job *)),
- account(), TQT_SLOT(slotSimpleResult(KIO::Job *)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+ account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *)));
}
void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList)
@@ -1870,12 +1870,12 @@ void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList)
url.setPath(msg_parent->imapPath() + ";UID=" + uid);
if ( account()->makeConnection() != ImapAccountBase::Connected )
return;
- KIO::SimpleJob *job = KIO::file_delete(url, false);
- KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+ TDEIO::SimpleJob *job = TDEIO::file_delete(url, false);
+ TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
ImapAccountBase::jobData jd( url.url(), 0 );
account()->insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(KIO::Job *)),
- account(), TQT_SLOT(slotSimpleResult(KIO::Job *)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+ account(), TQT_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(KIO::Job *)));
+ disconnect(this, TQT_SLOT(slotListFolderResult(TDEIO::Job *)));
quiet( false );
reallyGetFolder( TQString() );
}
@@ -2070,13 +2070,13 @@ void KMFolderImap::expungeFolder(KMFolderImap * aFolder, bool quiet)
url.setPath(aFolder->imapPath() + ";UID=*");
if ( account()->makeConnection() != ImapAccountBase::Connected )
return;
- KIO::SimpleJob *job = KIO::file_delete(url, false);
- KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+ TDEIO::SimpleJob *job = TDEIO::file_delete(url, false);
+ TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
ImapAccountBase::jobData jd( url.url(), 0 );
jd.quiet = quiet;
account()->insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(KIO::Job *)),
- account(), TQT_SLOT(slotSimpleResult(KIO::Job *)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+ account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *)));
}
//-----------------------------------------------------------------------------
@@ -2132,19 +2132,19 @@ bool KMFolderImap::processNewMail(bool)
false,
account()->useSSL() || account()->useTLS() );
- KIO::SimpleJob *job = KIO::stat(url, false);
- KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+ TDEIO::SimpleJob *job = TDEIO::stat(url, false);
+ TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
ImapAccountBase::jobData jd(url.url(), folder() );
jd.cancellable = true;
account()->insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(KIO::Job *)),
- TQT_SLOT(slotStatResult(KIO::Job *)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+ TQT_SLOT(slotStatResult(TDEIO::Job *)));
return true;
}
//-----------------------------------------------------------------------------
-void KMFolderImap::slotStatResult(KIO::Job * job)
+void KMFolderImap::slotStatResult(TDEIO::Job * job)
{
slotCompleteMailCheckProgress();
ImapAccountBase::JobIterator it = account()->findJob(job);
@@ -2154,10 +2154,10 @@ void KMFolderImap::slotStatResult(KIO::Job * job)
{
account()->handleJobError( job, i18n("Error while getting folder information.") );
} else {
- KIO::UDSEntry uds = static_cast<KIO::StatJob*>(job)->statResult();
- for (KIO::UDSEntry::ConstIterator it = uds.begin(); it != uds.end(); it++)
+ TDEIO::UDSEntry uds = static_cast<TDEIO::StatJob*>(job)->statResult();
+ for (TDEIO::UDSEntry::ConstIterator it = uds.begin(); it != uds.end(); it++)
{
- if ((*it).m_uds == KIO::UDS_SIZE)
+ if ((*it).m_uds == TDEIO::UDS_SIZE)
{
if (mReadOnly)
{
@@ -2242,13 +2242,13 @@ int KMFolderImap::expungeContents()
url.setPath( imapPath() + ";UID=1:*");
if ( account()->makeConnection() == ImapAccountBase::Connected )
{
- KIO::SimpleJob *job = KIO::file_delete(url, false);
- KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+ TDEIO::SimpleJob *job = TDEIO::file_delete(url, false);
+ TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
ImapAccountBase::jobData jd( url.url(), 0 );
jd.quiet = true;
account()->insertJob(job, jd);
- connect(job, TQT_SIGNAL(result(KIO::Job *)),
- account(), TQT_SLOT(slotSimpleResult(KIO::Job *)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+ account(), TQT_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
diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h
index 059e1a4c..490b13a6 100644
--- a/kmail/kmfolderimap.h
+++ b/kmail/kmfolderimap.h
@@ -372,9 +372,9 @@ public slots:
virtual void take(TQPtrList<KMMessage>);
/**
- * Add the data a KIO::Job retrieves to the buffer
+ * Add the data a TDEIO::Job retrieves to the buffer
*/
- void slotSimpleData(KIO::Job * job, const TQByteArray & data);
+ void slotSimpleData(TDEIO::Job * job, const TQByteArray & data);
/**
* Convert IMAP flags to a message status
@@ -426,7 +426,7 @@ protected:
virtual FolderJob* doCreateJob( TQPtrList<KMMessage>& msgList, const TQString& sets,
FolderJob::JobType jt, KMFolder *folder ) const;
- void getMessagesResult(KIO::Job * job, bool lastSet);
+ void getMessagesResult(TDEIO::Job * job, bool lastSet);
/** Called by KMFolder::expunge() to delete the actual contents.
At the time of the call the folder has already been closed, and
@@ -452,7 +452,7 @@ protected slots:
* Retrieve the whole folder or only the changes
*/
void checkValidity();
- void slotCheckValidityResult(KIO::Job * job);
+ void slotCheckValidityResult(TDEIO::Job * job);
/**
* Get the folder now (internal)
@@ -462,30 +462,30 @@ protected slots:
/**
* For listing the contents of a folder
*/
- void slotListFolderResult(KIO::Job * job);
- void slotListFolderEntries(KIO::Job * job, const KIO::UDSEntryList & uds);
+ void slotListFolderResult(TDEIO::Job * job);
+ void slotListFolderEntries(TDEIO::Job * job, const TDEIO::UDSEntryList & uds);
/**
* For retrieving a message digest
*/
- void slotGetMessagesResult(KIO::Job * job);
- void slotGetLastMessagesResult(KIO::Job * job);
- void slotGetMessagesData(KIO::Job * job, const TQByteArray & data);
+ void slotGetMessagesResult(TDEIO::Job * job);
+ void slotGetLastMessagesResult(TDEIO::Job * job);
+ void slotGetMessagesData(TDEIO::Job * job, const TQByteArray & data);
/**
* For creating a new subfolder
*/
- void slotCreateFolderResult(KIO::Job * job);
+ void slotCreateFolderResult(TDEIO::Job * job);
/**
* Remove the folder also locally, if removing on the server succeeded
*/
- void slotRemoveFolderResult(KIO::Job *job);
+ void slotRemoveFolderResult(TDEIO::Job *job);
/**
* Update the number of unseen messages
*/
- void slotStatResult(KIO::Job *job);
+ void slotStatResult(TDEIO::Job *job);
/**
* notify the progress item that the mail check for this folder is
diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp
index c12a5891..c6fa7be2 100644
--- a/kmail/kmfoldermaildir.cpp
+++ b/kmail/kmfoldermaildir.cpp
@@ -1012,7 +1012,7 @@ static bool removeDirAndContentsRecursively( const TQString & path )
//-----------------------------------------------------------------------------
int KMFolderMaildir::removeContents()
{
- // NOTE: Don' use KIO::netaccess, it has reentrancy problems and multiple
+ // NOTE: Don' use TDEIO::netaccess, it has reentrancy problems and multiple
// mailchecks going on trigger them, when removing dirs
if ( !removeDirAndContentsRecursively( location() + "/new/" ) ) return 1;
if ( !removeDirAndContentsRecursively( location() + "/cur/" ) ) return 1;
@@ -1132,14 +1132,14 @@ 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( KIO::Job* ) ),
- this, TQT_SLOT( slotDirSizeJobResult( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQT_SLOT( slotDirSizeJobResult( TDEIO::Job* ) ) );
}
return -1;
}
-void KMFolderMaildir::slotDirSizeJobResult( KIO::Job* job )
+void KMFolderMaildir::slotDirSizeJobResult( TDEIO::Job* job )
{
mCurrentlyCheckingFolderSize = false;
KDirSize * dirsize = dynamic_cast<KDirSize*>( job );
@@ -1164,8 +1164,8 @@ void KMFolderMaildir::slotDirSizeJobResult( KIO::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( KIO::Job* ) ),
- entry.first, TQT_SLOT( slotDirSizeJobResult( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+ entry.first, TQT_SLOT( slotDirSizeJobResult( TDEIO::Job* ) ) );
break;
}
else
diff --git a/kmail/kmfoldermaildir.h b/kmail/kmfoldermaildir.h
index 832638ad..fc199031 100644
--- a/kmail/kmfoldermaildir.h
+++ b/kmail/kmfoldermaildir.h
@@ -13,7 +13,7 @@ namespace KMail {
class MaildirJob;
class AttachmentStrategy;
}
-namespace KIO {
+namespace TDEIO {
class Job;
}
@@ -145,7 +145,7 @@ protected:
int addMsgInternal( KMMessage* msg, int* index_return = 0, bool stripUid=false );
private slots:
- void slotDirSizeJobResult( KIO::Job* job );
+ void slotDirSizeJobResult( TDEIO::Job* job );
private:
void readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgStatus status);
diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp
index 7e033523..13799680 100644
--- a/kmail/kmfoldermbox.cpp
+++ b/kmail/kmfoldermbox.cpp
@@ -145,7 +145,7 @@ int KMFolderMbox::open(const char *owner)
// message boxes don't have a "Don't ask again" checkbox.
if (kmkernel->startingUp())
{
- KConfigGroup configGroup( KMKernel::config(), "Notification Messages" );
+ TDEConfigGroup configGroup( KMKernel::config(), "Notification Messages" );
bool showMessage =
configGroup.readBoolEntry( "showIndexRegenerationMessage", true );
if (showMessage)
diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp
index 34958e5a..2c3d10a5 100644
--- a/kmail/kmfoldermgr.cpp
+++ b/kmail/kmfoldermgr.cpp
@@ -59,8 +59,8 @@ KMFolderMgr::~KMFolderMgr()
//-----------------------------------------------------------------------------
void KMFolderMgr::expireAll() {
- KConfig *config = KMKernel::config();
- KConfigGroupSaver saver(config, "General");
+ TDEConfig *config = KMKernel::config();
+ TDEConfigGroupSaver saver(config, "General");
int ret = KMessageBox::Continue;
if (config->readBoolEntry("warn-before-expire", true)) {
@@ -314,8 +314,8 @@ KMFolder* KMFolderMgr::findOrCreate(const TQString& aFolderName, bool sysFldr,
if (know_type == false)
{
know_type = true;
- KConfig *config = KMKernel::config();
- KConfigGroupSaver saver(config, "General");
+ TDEConfig *config = KMKernel::config();
+ TDEConfigGroupSaver saver(config, "General");
if (config->hasKey("default-mailbox-format"))
{
if (config->readNumEntry("default-mailbox-format", 1) == 0)
diff --git a/kmail/kmfoldersearch.cpp b/kmail/kmfoldersearch.cpp
index 819d5ff8..fa34f5b9 100644
--- a/kmail/kmfoldersearch.cpp
+++ b/kmail/kmfoldersearch.cpp
@@ -92,7 +92,7 @@ KMSearch::~KMSearch()
bool KMSearch::write(TQString location) const
{
- KConfig config(location);
+ TDEConfig config(location);
config.setGroup("Search Folder");
if (mSearchPattern)
mSearchPattern->writeConfig(&config);
@@ -106,7 +106,7 @@ bool KMSearch::write(TQString location) const
bool KMSearch::read(TQString location)
{
- KConfig config( location );
+ TDEConfig config( location );
config.setGroup( "Search Folder" );
if ( !mSearchPattern )
mSearchPattern = new KMSearchPattern();
diff --git a/kmail/kmfolderseldlg.cpp b/kmail/kmfolderseldlg.cpp
index 719dce4e..f30ab4b3 100644
--- a/kmail/kmfolderseldlg.cpp
+++ b/kmail/kmfolderseldlg.cpp
@@ -122,7 +122,7 @@ void KMFolderSelDlg::setFlags( bool mustBeReadWrite, bool showOutbox,
void KMFolderSelDlg::readConfig()
{
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup( "FolderSelectionDialog" );
TQSize size = config->readSizeEntry( "Size" );
@@ -143,7 +143,7 @@ void KMFolderSelDlg::readConfig()
void KMFolderSelDlg::writeConfig()
{
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup( "FolderSelectionDialog" );
config->writeEntry( "Size", size() );
diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp
index 7bec817b..9d259f56 100644
--- a/kmail/kmfoldertree.cpp
+++ b/kmail/kmfoldertree.cpp
@@ -480,13 +480,13 @@ void KMFolderTree::connectSignals()
//-----------------------------------------------------------------------------
void KMFolderTree::readConfig (void)
{
- KConfig* conf = KMKernel::config();
+ TDEConfig* conf = KMKernel::config();
readColorConfig();
// Custom/Ssystem font support
{
- KConfigGroupSaver saver(conf, "Fonts");
+ TDEConfigGroupSaver saver(conf, "Fonts");
if (!conf->readBoolEntry("defaultFonts",true)) {
TQFont folderFont( TDEGlobalSettings::generalFont() );
setFont(conf->readFontEntry("folder-font", &folderFont));
@@ -1045,9 +1045,9 @@ void KMFolderTree::doFolderSelected( TQListViewItem* qlvi, bool keepSelection )
//-----------------------------------------------------------------------------
void KMFolderTree::resizeEvent(TQResizeEvent* e)
{
- KConfig* conf = KMKernel::config();
+ TDEConfig* conf = KMKernel::config();
- KConfigGroupSaver saver(conf, "Geometry");
+ TDEConfigGroupSaver saver(conf, "Geometry");
conf->writeEntry(name(), size().width());
KListView::resizeEvent(e);
@@ -1321,7 +1321,7 @@ void KMFolderTree::addChildFolder( KMFolder *folder, TQWidget * parent )
// config file.
bool KMFolderTree::readIsListViewItemOpen(KMFolderTreeItem *fti)
{
- KConfig* config = KMKernel::config();
+ TDEConfig* config = KMKernel::config();
KMFolder *folder = fti->folder();
TQString name;
if (folder)
@@ -1338,7 +1338,7 @@ bool KMFolderTree::readIsListViewItemOpen(KMFolderTreeItem *fti)
} else {
return false;
}
- KConfigGroupSaver saver(config, name);
+ TDEConfigGroupSaver saver(config, name);
return config->readBoolEntry("isOpen", false);
}
@@ -1347,7 +1347,7 @@ bool KMFolderTree::readIsListViewItemOpen(KMFolderTreeItem *fti)
// Saves open/closed state of a folder directory into the config file
void KMFolderTree::writeIsListViewItemOpen(KMFolderTreeItem *fti)
{
- KConfig* config = KMKernel::config();
+ TDEConfig* config = KMKernel::config();
KMFolder *folder = fti->folder();
TQString name;
if (folder && !folder->idString().isEmpty())
@@ -1364,7 +1364,7 @@ void KMFolderTree::writeIsListViewItemOpen(KMFolderTreeItem *fti)
} else {
return;
}
- KConfigGroupSaver saver(config, name);
+ TDEConfigGroupSaver saver(config, name);
config->writeEntry("isOpen", fti->isOpen() );
}
@@ -1374,7 +1374,7 @@ void KMFolderTree::cleanupConfigFile()
{
if ( childCount() == 0 )
return; // just in case reload wasn't called before
- KConfig* config = KMKernel::config();
+ TDEConfig* config = KMKernel::config();
TQStringList existingFolders;
TQListViewItemIterator fldIt(this);
TQMap<TQString,bool> folderMap;
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index bfe87194..8e142c91 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -426,9 +426,9 @@ bool KMHeaders::event(TQEvent *e)
//-----------------------------------------------------------------------------
void KMHeaders::readColorConfig (void)
{
- KConfig* config = KMKernel::config();
+ TDEConfig* config = KMKernel::config();
// Custom/System colors
- KConfigGroupSaver saver(config, "Reader");
+ TDEConfigGroupSaver saver(config, "Reader");
TQColor c1=TQColor(kapp->palette().active().text());
TQColor c2=TQColor("red");
TQColor c3=TQColor("blue");
@@ -468,11 +468,11 @@ void KMHeaders::readColorConfig (void)
//-----------------------------------------------------------------------------
void KMHeaders::readConfig (void)
{
- KConfig* config = KMKernel::config();
+ TDEConfig* config = KMKernel::config();
// Backing pixmap support
{ // area for config group "Pixmaps"
- KConfigGroupSaver saver(config, "Pixmaps");
+ TDEConfigGroupSaver saver(config, "Pixmaps");
TQString pixmapFile = config->readEntry("Headers");
mPaintInfo.pixmapOn = false;
if (!pixmapFile.isEmpty()) {
@@ -482,7 +482,7 @@ void KMHeaders::readConfig (void)
}
{ // area for config group "General"
- KConfigGroupSaver saver(config, "General");
+ TDEConfigGroupSaver saver(config, "General");
bool show = config->readBoolEntry("showMessageSize");
slotToggleColumn(KPaintInfo::COL_SIZE, show);
@@ -530,7 +530,7 @@ void KMHeaders::readConfig (void)
// Custom/System fonts
{ // area for config group "General"
- KConfigGroupSaver saver(config, "Fonts");
+ TDEConfigGroupSaver saver(config, "Fonts");
if (!(config->readBoolEntry("defaultFonts",true)))
{
TQFont listFont( TDEGlobalSettings::generalFont() );
@@ -551,13 +551,13 @@ void KMHeaders::readConfig (void)
// Behavior
{
- KConfigGroupSaver saver(config, "Geometry");
+ TDEConfigGroupSaver saver(config, "Geometry");
mReaderWindowActive = config->readEntry( "readerWindowMode", "below" ) != "hide";
}
}
//-----------------------------------------------------------------------------
-void KMHeaders::restoreColumnLayout( KConfig *config, const TQString &group )
+void KMHeaders::restoreColumnLayout( TDEConfig *config, const TQString &group )
{
// KListView::restoreLayout() will call setSorting(), which is reimplemented by us.
// We don't want to change the sort order, so we set a flag here that is checked in
@@ -591,8 +591,8 @@ void KMHeaders::refreshNestedState(void)
{
bool oldState = isThreaded();
NestingPolicy oldNestPolicy = nestingPolicy;
- KConfig* config = KMKernel::config();
- KConfigGroupSaver saver(config, "Geometry");
+ TDEConfig* config = KMKernel::config();
+ TDEConfigGroupSaver saver(config, "Geometry");
mNested = config->readBoolEntry( "nestedMessages", false );
nestingPolicy = (NestingPolicy)config->readNumEntry( "nestingPolicy", OpenUnread );
@@ -609,9 +609,9 @@ void KMHeaders::refreshNestedState(void)
void KMHeaders::readFolderConfig (void)
{
if (!mFolder) return;
- KConfig* config = KMKernel::config();
+ TDEConfig* config = KMKernel::config();
- KConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
+ TDEConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
mNestedOverride = config->readBoolEntry( "threadMessagesOverride", false );
mSortCol = config->readNumEntry("SortColumn", mSortCol+1 /* inited to date column */);
mSortDescending = (mSortCol < 0);
@@ -625,7 +625,7 @@ void KMHeaders::readFolderConfig (void)
mPaintInfo.status = config->readBoolEntry( "Status", false );
{ //area for config group "Geometry"
- KConfigGroupSaver saver(config, "Geometry");
+ TDEConfigGroupSaver saver(config, "Geometry");
mNested = config->readBoolEntry( "nestedMessages", false );
nestingPolicy = (NestingPolicy)config->readNumEntry( "nestingPolicy", OpenUnread );
}
@@ -639,10 +639,10 @@ void KMHeaders::readFolderConfig (void)
void KMHeaders::writeFolderConfig (void)
{
if (!mFolder) return;
- KConfig* config = KMKernel::config();
+ TDEConfig* config = KMKernel::config();
int mSortColAdj = mSortCol + 1;
- KConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
+ TDEConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
config->writeEntry("SortColumn", (mSortDescending ? -mSortColAdj : mSortColAdj));
config->writeEntry("Top", topItemIndex());
config->writeEntry("Current", currentItemIndex());
@@ -659,9 +659,9 @@ void KMHeaders::writeFolderConfig (void)
//-----------------------------------------------------------------------------
void KMHeaders::writeConfig (void)
{
- KConfig* config = KMKernel::config();
+ TDEConfig* config = KMKernel::config();
saveLayout(config, "Header-Geometry");
- KConfigGroupSaver saver(config, "General");
+ TDEConfigGroupSaver saver(config, "General");
config->writeEntry("showMessageSize" , mPaintInfo.showSize);
config->writeEntry("showAttachmentColumn" , mPaintInfo.showAttachment);
config->writeEntry("showInvitationColumn" , mPaintInfo.showInvitation);
diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h
index 28b75142..b894b0c7 100644
--- a/kmail/kmheaders.h
+++ b/kmail/kmheaders.h
@@ -141,7 +141,7 @@ public:
*
* Note that if you want to restore the sort order correctly, call readConfig().
*/
- void restoreColumnLayout( KConfig *config, const TQString &group );
+ void restoreColumnLayout( TDEConfig *config, const TQString &group );
/** Return the current message */
virtual KMMessage* currentMsg();
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 11e291ef..e5dd7072 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -173,10 +173,10 @@ KMKernel::KMKernel (TQObject *parent, const char *name) :
KMKernel::~KMKernel ()
{
- TQMap<KIO::Job*, putData>::Iterator it = mPutJobs.begin();
+ TQMap<TDEIO::Job*, putData>::Iterator it = mPutJobs.begin();
while ( it != mPutJobs.end() )
{
- KIO::Job *job = it.key();
+ TDEIO::Job *job = it.key();
mPutJobs.remove( it );
job->kill();
it = mPutJobs.begin();
@@ -528,7 +528,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc,
bool iCalAutoSend = false;
bool noWordWrap = false;
bool isICalInvitation = false;
- KConfigGroup options( config(), "Groupware" );
+ TDEConfigGroup options( config(), "Groupware" );
if ( !attachData.isEmpty() ) {
isICalInvitation = attachName == "cal.ics" &&
attachType == "text" &&
@@ -566,7 +566,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc,
msgPart->setCharset( attachCharset );
}
// Don't show the composer window, if the automatic sending is checked
- KConfigGroup options( config(), "Groupware" );
+ TDEConfigGroup options( config(), "Groupware" );
iCalAutoSend = options.readBoolEntry( "AutomaticSending", true );
}
}
@@ -1411,7 +1411,7 @@ void KMKernel::recoverDeadLetters()
}
//-----------------------------------------------------------------------------
-void KMKernel::initFolders(KConfig* cfg)
+void KMKernel::initFolders(TDEConfig* cfg)
{
TQString name;
@@ -1498,11 +1498,11 @@ void KMKernel::init()
the_shuttingDown = false;
the_server_is_ready = false;
- KConfig* cfg = KMKernel::config();
+ TDEConfig* cfg = KMKernel::config();
TQDir dir;
- KConfigGroupSaver saver(cfg, "General");
+ TDEConfigGroupSaver saver(cfg, "General");
the_firstStart = cfg->readBoolEntry("first-start", true);
cfg->writeEntry("first-start", false);
the_previousVersion = cfg->readEntry("previous-version");
@@ -1547,7 +1547,7 @@ void KMKernel::init()
the_server_is_ready = true;
imProxy()->initialize();
{ // area for config group "Composer"
- KConfigGroupSaver saver(cfg, "Composer");
+ TDEConfigGroupSaver saver(cfg, "Composer");
if (cfg->readListEntry("pref-charsets").isEmpty())
{
cfg->writeEntry("pref-charsets", "us-ascii,iso-8859-1,locale,utf-8");
@@ -1780,8 +1780,8 @@ void KMKernel::cleanup(void)
the_weaver = 0;
#endif
- KConfig* config = KMKernel::config();
- KConfigGroupSaver saver(config, "General");
+ TDEConfig* config = KMKernel::config();
+ TDEConfigGroupSaver saver(config, "General");
if (the_trashFolder) {
@@ -1872,7 +1872,7 @@ bool KMKernel::transferMail( TQString & destinationDir )
// disabled for now since moving fails in certain cases (e.g. if symbolic links are involved)
const TQString kmailName = kapp->aboutData()->programName();
TQString msg;
- if ( KIO::NetAccess::exists( destinationDir, true, 0 ) ) {
+ if ( TDEIO::NetAccess::exists( destinationDir, true, 0 ) ) {
// if destinationDir exists, we need to warn about possible
// overwriting of files. otherwise, we don't have to
msg = i18n( "%1-%3 is the application name, %4-%7 are folder path",
@@ -1906,10 +1906,10 @@ bool KMKernel::transferMail( TQString & destinationDir )
return true;
}
- if ( !KIO::NetAccess::move( dir, destinationDir ) ) {
- kdDebug(5006) << k_funcinfo << "Moving " << dir << " to " << destinationDir << " failed: " << KIO::NetAccess::lastErrorString() << endl;
+ if ( !TDEIO::NetAccess::move( dir, destinationDir ) ) {
+ kdDebug(5006) << k_funcinfo << "Moving " << dir << " to " << destinationDir << " failed: " << TDEIO::NetAccess::lastErrorString() << endl;
kdDebug(5006) << k_funcinfo << "Deleting " << destinationDir << endl;
- KIO::NetAccess::del( destinationDir, 0 );
+ TDEIO::NetAccess::del( destinationDir, 0 );
destinationDir = dir;
return false;
}
@@ -2002,21 +2002,21 @@ void KMKernel::action(bool mailto, bool check, const TQString &to,
void KMKernel::byteArrayToRemoteFile(const TQByteArray &aData, const KURL &aURL,
bool overwrite)
{
- // ## when KDE 3.3 is out: use KIO::storedPut to remove slotDataReq altogether
- KIO::Job *job = KIO::put(aURL, -1, overwrite, false);
+ // ## when KDE 3.3 is out: use TDEIO::storedPut to remove slotDataReq altogether
+ 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(KIO::Job*,TQByteArray&)),
- TQT_SLOT(slotDataReq(KIO::Job*,TQByteArray&)));
- connect(job, TQT_SIGNAL(result(KIO::Job*)),
- TQT_SLOT(slotResult(KIO::Job*)));
+ 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*)));
}
-void KMKernel::slotDataReq(KIO::Job *job, TQByteArray &data)
+void KMKernel::slotDataReq(TDEIO::Job *job, TQByteArray &data)
{
// send the data in 64 KB chunks
const int MAX_CHUNK_SIZE = 64*1024;
- TQMap<KIO::Job*, putData>::Iterator it = mPutJobs.find(job);
+ TQMap<TDEIO::Job*, putData>::Iterator it = mPutJobs.find(job);
assert(it != mPutJobs.end());
int remainingBytes = (*it).data.size() - (*it).offset;
if( remainingBytes > MAX_CHUNK_SIZE )
@@ -2037,13 +2037,13 @@ void KMKernel::slotDataReq(KIO::Job *job, TQByteArray &data)
}
}
-void KMKernel::slotResult(KIO::Job *job)
+void KMKernel::slotResult(TDEIO::Job *job)
{
- TQMap<KIO::Job*, putData>::Iterator it = mPutJobs.find(job);
+ TQMap<TDEIO::Job*, putData>::Iterator it = mPutJobs.find(job);
assert(it != mPutJobs.end());
if (job->error())
{
- if (job->error() == KIO::ERR_FILE_ALREADY_EXIST)
+ if (job->error() == TDEIO::ERR_FILE_ALREADY_EXIST)
{
if (KMessageBox::warningContinueCancel(0,
i18n("File %1 exists.\nDo you want to replace it?")
@@ -2286,7 +2286,7 @@ void KMKernel::slotEmptyTrash()
}
}
-KConfig* KMKernel::config()
+TDEConfig* KMKernel::config()
{
assert(mySelf);
if (!mySelf->mConfig)
@@ -2352,9 +2352,9 @@ KMMainWidget *KMKernel::getKMMainWidget()
void KMKernel::slotRunBackgroundTasks() // called regularly by timer
{
- // Hidden KConfig keys. Not meant to be used, but a nice fallback in case
+ // Hidden TDEConfig keys. Not meant to be used, but a nice fallback in case
// a stable kmail release goes out with a nasty bug in CompactionJob...
- KConfigGroup generalGroup( config(), "General" );
+ TDEConfigGroup generalGroup( config(), "General" );
if ( generalGroup.readBoolEntry( "auto-expiring", true ) ) {
the_folderMgr->expireAllFolders( false /*scheduled, not immediate*/ );
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index 471a7740..fb01231b 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -21,7 +21,7 @@
#define kmkernel KMKernel::self()
#define kmconfig KMKernel::config()
-namespace KIO {
+namespace TDEIO {
class Job;
}
namespace KWallet {
@@ -249,7 +249,7 @@ public:
/** normal control stuff */
static KMKernel *self() { return mySelf; }
- static KConfig *config();
+ static TDEConfig *config();
void init();
void readConfig();
@@ -257,7 +257,7 @@ public:
void recreateCorruptIndexFiles();
void testDir(const char *_name);
void recoverDeadLetters();
- void initFolders(KConfig* cfg);
+ void initFolders(TDEConfig* cfg);
void closeAllKMailWindows();
void cleanup(void);
void quit();
@@ -416,7 +416,7 @@ public slots:
/// Save contents of all open composer widnows to ~/dead.letter
void dumpDeadLetters();
- /** Call this slot instead of directly KConfig::sync() to
+ /** Call this slot instead of directly TDEConfig::sync() to
minimize the overall config writes. Calling this slot will
schedule a sync of the application config file using a timer, so
that many consecutive calls can be condensed into a single
@@ -432,8 +432,8 @@ public slots:
void slotConfigChanged();
protected slots:
- void slotDataReq(KIO::Job*,TQByteArray&);
- void slotResult(KIO::Job*);
+ void slotDataReq(TDEIO::Job*,TQByteArray&);
+ void slotResult(TDEIO::Job*);
signals:
void configChanged();
@@ -470,7 +470,7 @@ private:
TQByteArray data;
int offset;
};
- TQMap<KIO::Job *, putData> mPutJobs;
+ TQMap<TDEIO::Job *, putData> mPutJobs;
/** previous KMail version. If different from current,
the user has just updated. read from config */
TQString the_previousVersion;
diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp
index c078cfe7..acf0b0c0 100644
--- a/kmail/kmlineeditspell.cpp
+++ b/kmail/kmlineeditspell.cpp
@@ -119,7 +119,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event )
else {
KABC::VCardConverter converter;
TQString fileName;
- if ( KIO::NetAccess::download( (*it), fileName, parentWidget() ) ) {
+ if ( TDEIO::NetAccess::download( (*it), fileName, parentWidget() ) ) {
TQFile file( fileName );
file.open( IO_ReadOnly );
const TQByteArray data = file.readAll();
@@ -129,7 +129,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event )
#else
list += converter.parseVCards( data );
#endif
- KIO::NetAccess::removeTempFile( fileName );
+ TDEIO::NetAccess::removeTempFile( fileName );
} else {
TQString caption( i18n( "vCard Import Failed" ) );
TQString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" ).arg( (*it).url() );
@@ -188,7 +188,7 @@ void KMLineEdit::loadContacts()
TQStringList::Iterator it = recent.begin();
TQString name, email;
- KConfig config( "kpimcompletionorder" );
+ TDEConfig config( "kpimcompletionorder" );
config.setGroup( "CompletionWeights" );
int weight = config.readEntry( "Recent Addresses", "10" ).toInt();
int idx = addCompletionSource( i18n( "Recent Addresses" ), weight );
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 622e70ad..14ccaba0 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -137,7 +137,7 @@ static KStaticDeleter<TQValueList<KMMainWidget*> > mwlsd;
//-----------------------------------------------------------------------------
KMMainWidget::KMMainWidget(TQWidget *parent, const char *name,
KXMLGUIClient *aGUIClient,
- KActionCollection *actionCollection, KConfig* config ) :
+ KActionCollection *actionCollection, TDEConfig* config ) :
TQWidget(parent, name),
mFavoritesCheckMailAction( 0 ),
mFavoriteFolderView( 0 ),
@@ -287,8 +287,8 @@ void KMMainWidget::destruct()
//-----------------------------------------------------------------------------
void KMMainWidget::readPreConfig(void)
{
- const KConfigGroup geometry( KMKernel::config(), "Geometry" );
- const KConfigGroup reader( KMKernel::config(), "Reader" );
+ const TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
+ const TDEConfigGroup reader( KMKernel::config(), "Reader" );
mLongFolderList = geometry.readEntry( "FolderList", "long" ) != "short";
mReaderWindowActive = geometry.readEntry( "readerWindowMode", "below" ) != "hide";
@@ -307,8 +307,8 @@ void KMMainWidget::readFolderConfig(void)
if (!mFolder)
return;
- KConfig *config = KMKernel::config();
- KConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
+ TDEConfig *config = KMKernel::config();
+ TDEConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
mFolderThreadPref = config->readBoolEntry( "threadMessagesOverride", false );
mFolderThreadSubjPref = config->readBoolEntry( "threadMessagesBySubject", true );
mFolderHtmlPref = config->readBoolEntry( "htmlMailOverride", false );
@@ -322,8 +322,8 @@ void KMMainWidget::writeFolderConfig(void)
if (!