summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--KDE2PORTING.html20
-rw-r--r--KDE3PORTING.html10
-rw-r--r--TODO12
-rw-r--r--arts/kde/kartsserver.cpp2
-rw-r--r--arts/kde/kioinputstream_impl.cpp42
-rw-r--r--arts/kde/kioinputstream_impl.h12
-rw-r--r--arts/kde/kplayobjectfactory.cc4
-rw-r--r--arts/knotify/knotify.cpp32
-rw-r--r--arts/knotify/knotify.h4
-rw-r--r--dcop/dcopidl/dcopidl_test.h4
-rw-r--r--dnssd/settings.kcfgc2
-rw-r--r--interfaces/kimproxy/library/kimproxy.cpp2
-rw-r--r--interfaces/kio/http.h2
-rw-r--r--interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp4
-rw-r--r--interfaces/ktexteditor/configinterface.h10
-rw-r--r--interfaces/ktexteditor/editorchooser.cpp14
-rw-r--r--interfaces/ktexteditor/editorchooser.h6
-rw-r--r--interfaces/ktexteditor/sessionconfiginterface.h6
-rw-r--r--kabc/addressbook.cpp4
-rw-r--r--kabc/addresseehelper.cpp2
-rw-r--r--kabc/addresslineedit.cpp8
-rw-r--r--kabc/addresslineedit.h6
-rw-r--r--kabc/field.h6
-rw-r--r--kabc/kab2kabc.cpp4
-rw-r--r--kabc/ldapclient.cpp22
-rw-r--r--kabc/ldapclient.h6
-rw-r--r--kabc/ldapconfigwidget.cpp16
-rw-r--r--kabc/ldapconfigwidget.h14
-rw-r--r--kabc/plugins/dir/resourcedir.cpp4
-rw-r--r--kabc/plugins/dir/resourcedir.h4
-rw-r--r--kabc/plugins/evolution/resourceevo.cpp4
-rw-r--r--kabc/plugins/evolution/resourceevo.h2
-rw-r--r--kabc/plugins/file/resourcefile.cpp4
-rw-r--r--kabc/plugins/file/resourcefile.h4
-rw-r--r--kabc/plugins/ldapkio/resourceldapkio.cpp244
-rw-r--r--kabc/plugins/ldapkio/resourceldapkio.h26
-rw-r--r--kabc/plugins/ldapkio/resourceldapkioconfig.cpp2
-rw-r--r--kabc/plugins/net/resourcenet.cpp36
-rw-r--r--kabc/plugins/net/resourcenet.h10
-rw-r--r--kabc/plugins/sql/resourcesql.cpp2
-rw-r--r--kabc/plugins/sql/resourcesql.h2
-rw-r--r--kabc/plugins/sql/resourcesqlconfig.cpp4
-rw-r--r--kabc/plugins/sql/resourcesqlconfig.h4
-rw-r--r--kabc/resource.cpp4
-rw-r--r--kabc/resource.h4
-rw-r--r--kabc/scripts/field.src.cpp12
-rw-r--r--kabc/sound.h4
-rw-r--r--kabc/stdaddressbook.cpp4
-rw-r--r--kate/interfaces/view.h10
-rw-r--r--kate/part/kateconfig.cpp20
-rw-r--r--kate/part/kateconfig.h14
-rw-r--r--kate/part/katedialogs.cpp14
-rw-r--r--kate/part/katedialogs.h6
-rw-r--r--kate/part/katedocument.cpp36
-rw-r--r--kate/part/katedocument.h18
-rw-r--r--kate/part/katefiletype.cpp4
-rw-r--r--kate/part/katehighlight.cpp18
-rw-r--r--kate/part/katehighlight.h4
-rw-r--r--kate/part/katejscript.cpp8
-rw-r--r--kate/part/kateluaindentscript.cpp2
-rw-r--r--kate/part/kateschema.cpp10
-rw-r--r--kate/part/kateschema.h6
-rw-r--r--kate/part/katesyntaxdocument.cpp2
-rw-r--r--kate/part/kateview.cpp6
-rw-r--r--kate/part/kateview.h4
-rw-r--r--kate/part/kateviewhelpers.cpp2
-rw-r--r--kate/part/test_regression.cpp6
-rw-r--r--kate/part/test_regression.h12
-rw-r--r--kate/plugins/autobookmarker/autobookmarker.cpp4
-rw-r--r--kate/plugins/insertfile/insertfileplugin.cpp6
-rw-r--r--kate/plugins/insertfile/insertfileplugin.h6
-rw-r--r--kate/plugins/isearch/ISearchPlugin.cpp4
-rw-r--r--kate/plugins/wordcompletion/docwordcompletion.cpp4
-rw-r--r--kcert/kcertpart.cc2
-rw-r--r--kcmshell/main.cpp8
-rw-r--r--kconf_update/kconf_update.cpp28
-rw-r--r--kded/kded.cpp6
-rw-r--r--kdewidgets/kde.widgets2
-rw-r--r--kdewidgets/makekdewidgets.cpp18
-rw-r--r--kdewidgets/tests/test.widgets2
-rw-r--r--kdoctools/kio_help.cpp16
-rw-r--r--kdoctools/kio_help.h2
-rw-r--r--khtml/css/cssstyleselector.cpp4
-rw-r--r--khtml/ecma/kjs_debugwin.cpp4
-rw-r--r--khtml/ecma/kjs_navigator.cpp2
-rw-r--r--khtml/ecma/xmlhttprequest.cpp42
-rw-r--r--khtml/ecma/xmlhttprequest.h16
-rw-r--r--khtml/html/html_formimpl.cpp8
-rw-r--r--khtml/java/kjavaappletserver.cpp4
-rw-r--r--khtml/java/kjavaappletviewer.cpp8
-rw-r--r--khtml/java/kjavaappletviewer.h4
-rw-r--r--khtml/java/kjavadownloader.cpp54
-rw-r--r--khtml/java/kjavadownloader.h16
-rw-r--r--khtml/khtml_ext.cpp14
-rw-r--r--khtml/khtml_ext.h4
-rw-r--r--khtml/khtml_factory.cpp2
-rw-r--r--khtml/khtml_iface.cc4
-rw-r--r--khtml/khtml_part.cpp120
-rw-r--r--khtml/khtml_part.h22
-rw-r--r--khtml/khtml_run.cpp2
-rw-r--r--khtml/khtml_run.h2
-rw-r--r--khtml/khtml_settings.cc14
-rw-r--r--khtml/khtml_settings.h10
-rw-r--r--khtml/khtmlimage.cpp4
-rw-r--r--khtml/khtmlimage.h2
-rw-r--r--khtml/khtmlpart_p.h8
-rw-r--r--khtml/khtmlview.cpp6
-rw-r--r--khtml/kmultipart/kmultipart.cpp14
-rw-r--r--khtml/kmultipart/kmultipart.h6
-rw-r--r--khtml/misc/knsplugininstaller.cpp32
-rw-r--r--khtml/misc/knsplugininstaller.h12
-rw-r--r--khtml/misc/loader.cpp42
-rw-r--r--khtml/misc/loader.h26
-rw-r--r--khtml/test_regression.cpp2
-rw-r--r--khtml/testkhtml.cpp2
-rw-r--r--khtml/xml/dom_docimpl.cpp4
-rw-r--r--kinit/autostart.cpp2
-rw-r--r--kinit/kdostartupconfig.cpp4
-rw-r--r--kinit/kinit.cpp4
-rw-r--r--kinit/kioslave.cpp2
-rw-r--r--kinit/klauncher.cpp12
-rw-r--r--kinit/klauncher.h8
-rw-r--r--kio/DESIGN2
-rw-r--r--kio/DESIGN.metadata4
-rw-r--r--kio/Mainpage.dox6
-rw-r--r--kio/bookmarks/kbookmarkimporter_kde1.cc6
-rw-r--r--kio/bookmarks/kbookmarkmanager.cc2
-rw-r--r--kio/bookmarks/kbookmarkmenu.cc6
-rw-r--r--kio/bookmarks/kbookmarkmenu.h2
-rw-r--r--kio/httpfilter/httpfilter.cc4
-rw-r--r--kio/kcmodule.desktop2
-rw-r--r--kio/kfile/kcombiview.cpp4
-rw-r--r--kio/kfile/kcombiview.h4
-rw-r--r--kio/kfile/kcustommenueditor.cpp4
-rw-r--r--kio/kfile/kcustommenueditor.h6
-rw-r--r--kio/kfile/kdiroperator.cpp40
-rw-r--r--kio/kfile/kdiroperator.h30
-rw-r--r--kio/kfile/kdirselectdialog.cpp18
-rw-r--r--kio/kfile/kdirselectdialog.h6
-rw-r--r--kio/kfile/kdirsize.cpp44
-rw-r--r--kio/kfile/kdirsize.h20
-rw-r--r--kio/kfile/kdiskfreesp.cpp2
-rw-r--r--kio/kfile/kfiledetailview.cpp8
-rw-r--r--kio/kfile/kfiledetailview.h4
-rw-r--r--kio/kfile/kfiledialog.cpp68
-rw-r--r--kio/kfile/kfiledialog.h10
-rw-r--r--kio/kfile/kfileiconview.cpp24
-rw-r--r--kio/kfile/kfileiconview.h8
-rw-r--r--kio/kfile/kfilepreview.cpp4
-rw-r--r--kio/kfile/kfilepreview.h4
-rw-r--r--kio/kfile/kfilespeedbar.cpp8
-rw-r--r--kio/kfile/kfilespeedbar.h4
-rw-r--r--kio/kfile/kfileview.cpp16
-rw-r--r--kio/kfile/kfileview.h8
-rw-r--r--kio/kfile/kimagefilepreview.cpp20
-rw-r--r--kio/kfile/kimagefilepreview.h8
-rw-r--r--kio/kfile/knotifydialog.cpp8
-rw-r--r--kio/kfile/knotifydialog.h4
-rw-r--r--kio/kfile/kopenwith.cpp12
-rw-r--r--kio/kfile/kpropertiesdialog.cpp120
-rw-r--r--kio/kfile/kpropertiesdialog.h14
-rw-r--r--kio/kfile/krecentdirs.cpp8
-rw-r--r--kio/kfile/krecentdocument.cpp6
-rw-r--r--kio/kfile/kurlbar.cpp20
-rw-r--r--kio/kfile/kurlbar.h14
-rw-r--r--kio/kfile/tests/kcustommenueditortest.cpp2
-rw-r--r--kio/kio/authinfo.cpp6
-rw-r--r--kio/kio/authinfo.h2
-rw-r--r--kio/kio/chmodjob.cpp40
-rw-r--r--kio/kio/chmodjob.h12
-rw-r--r--kio/kio/connection.cpp6
-rw-r--r--kio/kio/connection.h8
-rw-r--r--kio/kio/dataprotocol.cpp2
-rw-r--r--kio/kio/dataprotocol.h4
-rw-r--r--kio/kio/dataslave.cpp6
-rw-r--r--kio/kio/dataslave.h8
-rw-r--r--kio/kio/davjob.cpp20
-rw-r--r--kio/kio/davjob.h12
-rw-r--r--kio/kio/defaultprogress.cpp54
-rw-r--r--kio/kio/defaultprogress.h54
-rw-r--r--kio/kio/forwardingslavebase.cpp142
-rw-r--r--kio/kio/forwardingslavebase.h50
-rw-r--r--kio/kio/global.cpp320
-rw-r--r--kio/kio/global.h24
-rw-r--r--kio/kio/http_slave_defaults.h2
-rw-r--r--kio/kio/job.cpp458
-rw-r--r--kio/kio/job.h6
-rw-r--r--kio/kio/jobclasses.h314
-rw-r--r--kio/kio/kautomount.cpp16
-rw-r--r--kio/kio/kautomount.h10
-rw-r--r--kio/kio/kdirlister.cpp164
-rw-r--r--kio/kio/kdirlister.h26
-rw-r--r--kio/kio/kdirlister_p.h24
-rw-r--r--kio/kio/kdirwatch.cpp6
-rw-r--r--kio/kio/kemailsettings.cpp4
-rw-r--r--kio/kio/kfileitem.cpp118
-rw-r--r--kio/kio/kfileitem.h20
-rw-r--r--kio/kio/kfilemetainfo.cpp8
-rw-r--r--kio/kio/kimageio.cpp2
-rw-r--r--kio/kio/kmimetype.cpp16
-rw-r--r--kio/kio/kmimetype.h6
-rw-r--r--kio/kio/kmimetypechooser.cpp6
-rw-r--r--kio/kio/knfsshare.cpp2
-rw-r--r--kio/kio/kprotocolmanager.cpp64
-rw-r--r--kio/kio/kprotocolmanager.h8
-rw-r--r--kio/kio/kremoteencoding.h6
-rw-r--r--kio/kio/krun.cpp52
-rw-r--r--kio/kio/krun.h14
-rw-r--r--kio/kio/kservice.cpp4
-rw-r--r--kio/kio/kservicegroup.cpp2
-rw-r--r--kio/kio/kshred.h4
-rw-r--r--kio/kio/ktrader.cpp6
-rw-r--r--kio/kio/ktraderparse.cpp6
-rw-r--r--kio/kio/ktraderparsetree.cpp2
-rw-r--r--kio/kio/ktraderparsetree.h2
-rw-r--r--kio/kio/kurifilter.h4
-rw-r--r--kio/kio/kurlcompletion.cpp36
-rw-r--r--kio/kio/kurlcompletion.h4
-rw-r--r--kio/kio/kuserprofile.cpp2
-rw-r--r--kio/kio/metainfojob.cpp20
-rw-r--r--kio/kio/metainfojob.h8
-rw-r--r--kio/kio/netaccess.cpp102
-rw-r--r--kio/kio/netaccess.h54
-rw-r--r--kio/kio/observer.cpp92
-rw-r--r--kio/kio/observer.h68
-rw-r--r--kio/kio/passdlg.cpp6
-rw-r--r--kio/kio/passdlg.h2
-rw-r--r--kio/kio/paste.cpp42
-rw-r--r--kio/kio/paste.h2
-rw-r--r--kio/kio/pastedialog.cpp8
-rw-r--r--kio/kio/pastedialog.h2
-rw-r--r--kio/kio/previewjob.cpp42
-rw-r--r--kio/kio/previewjob.h8
-rw-r--r--kio/kio/progressbase.cpp138
-rw-r--r--kio/kio/progressbase.h76
-rw-r--r--kio/kio/renamedlg.cpp30
-rw-r--r--kio/kio/renamedlg.h12
-rw-r--r--kio/kio/renamedlgplugin.h6
-rw-r--r--kio/kio/scheduler.cpp46
-rw-r--r--kio/kio/scheduler.h66
-rw-r--r--kio/kio/sessiondata.cpp4
-rw-r--r--kio/kio/sessiondata.h4
-rw-r--r--kio/kio/skipdlg.cpp4
-rw-r--r--kio/kio/skipdlg.h2
-rw-r--r--kio/kio/slave.cpp34
-rw-r--r--kio/kio/slave.h26
-rw-r--r--kio/kio/slavebase.cpp38
-rw-r--r--kio/kio/slavebase.h24
-rw-r--r--kio/kio/slaveconfig.cpp12
-rw-r--r--kio/kio/slaveconfig.h2
-rw-r--r--kio/kio/slaveinterface.cpp46
-rw-r--r--kio/kio/slaveinterface.h40
-rw-r--r--kio/kio/statusbarprogress.cpp12
-rw-r--r--kio/kio/statusbarprogress.h14
-rw-r--r--kio/kio/tcpslavebase.cpp16
-rw-r--r--kio/kio/tcpslavebase.h2
-rw-r--r--kio/kio/thumbcreator.h2
-rw-r--r--kio/kioexec/main.cpp24
-rw-r--r--kio/kioexec/main.h4
-rw-r--r--kio/kpasswdserver/kpasswdserver.cpp42
-rw-r--r--kio/kpasswdserver/kpasswdserver.h22
-rw-r--r--kio/kssl/TODO2
-rw-r--r--kio/kssl/kopenssl.cc4
-rwxr-xr-xkio/kssl/kssl/certkde2
-rw-r--r--kio/kssl/ksslcertificatehome.cc2
-rw-r--r--kio/kssl/ksslsettings.cc2
-rw-r--r--kio/kssl/ksslsettings.h2
-rw-r--r--kio/misc/kpac/downloader.cpp14
-rw-r--r--kio/misc/kpac/downloader.h6
-rw-r--r--kio/misc/ksendbugmail/smtp.cpp14
-rw-r--r--kio/misc/ksendbugmail/smtp.h6
-rw-r--r--kio/misc/kssld/kssld.cpp20
-rw-r--r--kio/misc/ktelnetservice.cpp2
-rw-r--r--kio/misc/kwalletd/kwalletd.cpp10
-rw-r--r--kio/misc/uiserver.cpp84
-rw-r--r--kio/misc/uiserver.h48
-rw-r--r--kio/tests/dataprotocoltest.cpp12
-rw-r--r--kio/tests/jobtest.cpp84
-rw-r--r--kio/tests/jobtest.h6
-rw-r--r--kio/tests/kdefaultprogresstest.cpp2
-rw-r--r--kio/tests/kdirlistertest.cpp8
-rw-r--r--kio/tests/kdirlistertest.h4
-rw-r--r--kio/tests/kionetrctest.cpp4
-rw-r--r--kio/tests/kiopassdlgtest.cpp2
-rw-r--r--kio/tests/kioslavetest.cpp102
-rw-r--r--kio/tests/kioslavetest.h16
-rw-r--r--kio/tests/kpropsdlgtest.cpp2
-rw-r--r--kio/tests/kurifiltertest.cpp2
-rw-r--r--kio/tests/netaccesstest.cpp4
-rw-r--r--kio/tests/previewtest.cpp6
-rw-r--r--kio/tests/previewtest.h2
-rw-r--r--kio/tests/speed.cpp30
-rw-r--r--kio/tests/speed.h6
-rw-r--r--kioslave/file/file.cc220
-rw-r--r--kioslave/file/file.h6
-rw-r--r--kioslave/ftp/ftp.cc48
-rw-r--r--kioslave/ftp/ftp.h14
-rw-r--r--kioslave/http/http.cc62
-rw-r--r--kioslave/http/http.h24
-rw-r--r--kioslave/http/kcookiejar/kcookiejar.cpp6
-rw-r--r--kioslave/http/kcookiejar/kcookiejar.h6
-rw-r--r--kioslave/http/kcookiejar/kcookieserver.cpp2
-rw-r--r--kioslave/http/kcookiejar/kcookieserver.h4
-rw-r--r--kioslave/http/kcookiejar/tests/kcookiejartest.cpp4
-rw-r--r--kioslave/iso/iso.cpp26
-rw-r--r--kioslave/iso/iso.h4
-rw-r--r--kioslave/iso/kiso.cpp4
-rw-r--r--kioslave/metainfo/metainfo.cpp2
-rw-r--r--kioslave/metainfo/metainfo.h2
-rw-r--r--kmdi/kmdi/dockcontainer.cpp4
-rw-r--r--kmdi/kmdi/dockcontainer.h4
-rw-r--r--kmdi/kmdi/guiclient.cpp2
-rw-r--r--kmdi/kmdidockcontainer.cpp4
-rw-r--r--kmdi/kmdidockcontainer.h8
-rw-r--r--kmdi/kmdiguiclient.cpp2
-rw-r--r--knewstuff/downloaddialog.cpp38
-rw-r--r--knewstuff/downloaddialog.h12
-rw-r--r--knewstuff/engine.cpp46
-rw-r--r--knewstuff/engine.h18
-rw-r--r--knewstuff/knewstuffgeneric.h4
-rw-r--r--knewstuff/knewstuffsecure.cpp10
-rw-r--r--knewstuff/provider.cpp16
-rw-r--r--knewstuff/provider.h6
-rw-r--r--knewstuff/uploaddialog.cpp4
-rw-r--r--kparts/browserextension.h4
-rw-r--r--kparts/browserrun.cpp52
-rw-r--r--kparts/browserrun.h14
-rw-r--r--kparts/componentfactory.h2
-rw-r--r--kparts/part.cpp16
-rw-r--r--kparts/part.h14
-rw-r--r--kparts/plugin.cpp2
-rw-r--r--kparts/plugin.h2
-rw-r--r--krandr/randr.cpp12
-rw-r--r--krandr/randr.h14
-rw-r--r--kresources/README.design2
-rw-r--r--kresources/configdialog.cpp2
-rw-r--r--kresources/configpage.cpp4
-rw-r--r--kresources/configpage.h6
-rw-r--r--kresources/factory.cpp2
-rw-r--r--kresources/factory.h4
-rw-r--r--kresources/kcmkresources.cpp2
-rw-r--r--kresources/kcmkresources.h2
-rw-r--r--kresources/manager.h4
-rw-r--r--kresources/managerimpl.cpp6
-rw-r--r--kresources/managerimpl.h10
-rw-r--r--kresources/resource.cpp4
-rw-r--r--kresources/resource.h20
-rw-r--r--krsync/krsync.cpp10
-rw-r--r--krsync/krsync.h12
-rw-r--r--kspell2/settings.cpp6
-rw-r--r--kstyles/kthemestyle/kthemebase.cpp2
-rw-r--r--kstyles/kthemestyle/kthemebase.h4
-rw-r--r--kstyles/kthemestyle/kthemestyle.h4
-rw-r--r--kutils/Mainpage.dox2
-rw-r--r--kutils/TODO14
-rw-r--r--kutils/kcmodulecontainer.cpp48
-rw-r--r--kutils/kcmodulecontainer.h54
-rw-r--r--kutils/kcmoduleinfo.cpp58
-rw-r--r--kutils/kcmoduleinfo.h42
-rw-r--r--kutils/kcmoduleloader.cpp40
-rw-r--r--kutils/kcmoduleloader.h46
-rw-r--r--kutils/kcmoduleproxy.cpp96
-rw-r--r--kutils/kcmoduleproxy.h70
-rw-r--r--kutils/kcmoduleproxyIface.h20
-rw-r--r--kutils/kcmoduleproxyIfaceImpl.cpp38
-rw-r--r--kutils/kcmoduleproxyIfaceImpl.h20
-rw-r--r--kutils/kcmultidialog.cpp32
-rw-r--r--kutils/kcmultidialog.h16
-rw-r--r--kutils/kplugininfo.cpp22
-rw-r--r--kutils/kplugininfo.h30
-rw-r--r--kutils/kpluginselector.cpp44
-rw-r--r--kutils/kpluginselector.h20
-rw-r--r--kutils/kpluginselector_p.h12
-rw-r--r--kutils/ksettings/README.dox14
-rw-r--r--kutils/ksettings/dialog.cpp26
-rw-r--r--kutils/ksettings/dialog.h6
-rw-r--r--kutils/ksettings/dispatcher.cpp4
-rw-r--r--kutils/ksettings/dispatcher.h14
-rw-r--r--kutils/ksettings/pluginpage.cpp4
-rw-r--r--kutils/ksettings/pluginpage.h12
-rw-r--r--kwallet/client/kwallet.cc4
-rw-r--r--libkmid/deviceman.cc2
-rw-r--r--tdecore/AUTHORS4
-rw-r--r--tdecore/DESIGN.kconfig36
-rw-r--r--tdecore/KCONFIG_DESIGN32
-rw-r--r--tdecore/README.kiosk2
-rw-r--r--tdecore/kaccel.cpp4
-rw-r--r--tdecore/kaccel.h10
-rw-r--r--tdecore/kaccelaction.cpp12
-rw-r--r--tdecore/kaccelaction.h10
-rw-r--r--tdecore/kaccelbase.cpp4
-rw-r--r--tdecore/kaccelbase.h4
-rw-r--r--tdecore/kapplication.cpp46
-rw-r--r--tdecore/kapplication.h16
-rw-r--r--tdecore/kcharsets.cpp2
-rw-r--r--tdecore/kcheckaccelerators.cpp2
-rw-r--r--tdecore/kclipboard.cpp2
-rw-r--r--tdecore/kconfig.cpp48
-rw-r--r--tdecore/kconfig.h36
-rw-r--r--tdecore/kconfig_compiler/README.dox8
-rw-r--r--tdecore/kconfig_compiler/example/autoexample.cpp2
-rw-r--r--tdecore/kconfig_compiler/example/exampleprefs_base.kcfgc2
-rw-r--r--tdecore/kconfig_compiler/kcfg.xsd2
-rw-r--r--tdecore/kconfig_compiler/kconfig_compiler.cpp18
-rw-r--r--tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp12
-rw-r--r--tdecore/kconfig_compiler/tests/kconfigcompiler_test.h4
-rw-r--r--tdecore/kconfig_compiler/tests/myprefs.h4
-rw-r--r--tdecore/kconfig_compiler/tests/test1.cpp.ref46
-rw-r--r--tdecore/kconfig_compiler/tests/test1.h.ref2
-rw-r--r--tdecore/kconfig_compiler/tests/test1.kcfgc2
-rw-r--r--tdecore/kconfig_compiler/tests/test2.cpp.ref34
-rw-r--r--tdecore/kconfig_compiler/tests/test3.cpp.ref10
-rw-r--r--tdecore/kconfig_compiler/tests/test3.h.ref2
-rw-r--r--tdecore/kconfig_compiler/tests/test4.cpp.ref38
-rw-r--r--tdecore/kconfig_compiler/tests/test4.h.ref4
-rw-r--r--tdecore/kconfig_compiler/tests/test5.cpp.ref38
-rw-r--r--tdecore/kconfig_compiler/tests/test5.h.ref4
-rw-r--r--tdecore/kconfig_compiler/tests/test6.cpp.ref14
-rw-r--r--tdecore/kconfig_compiler/tests/test6.h.ref2
-rw-r--r--tdecore/kconfig_compiler/tests/test7.cpp.ref14
-rw-r--r--tdecore/kconfig_compiler/tests/test7.h.ref2
-rw-r--r--tdecore/kconfig_compiler/tests/test8a.cpp.ref10
-rw-r--r--tdecore/kconfig_compiler/tests/test8a.h.ref2
-rw-r--r--tdecore/kconfig_compiler/tests/test8b.cpp.ref12
-rw-r--r--tdecore/kconfig_compiler/tests/test8b.h.ref2
-rw-r--r--tdecore/kconfig_compiler/tests/test9.cpp.ref14
-rw-r--r--tdecore/kconfig_compiler/tests/test9.h.ref2
-rw-r--r--tdecore/kconfig_compiler/tests/test9.kcfgc2
-rw-r--r--tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref80
-rw-r--r--tdecore/kconfig_compiler/tests/test_dpointer.h.ref4
-rw-r--r--tdecore/kconfigbackend.cpp50
-rw-r--r--tdecore/kconfigbackend.h34
-rw-r--r--tdecore/kconfigbase.cpp290
-rw-r--r--tdecore/kconfigbase.h108
-rw-r--r--tdecore/kconfigdialogmanager.cpp38
-rw-r--r--tdecore/kconfigdialogmanager.h28
-rw-r--r--tdecore/kconfigskeleton.cpp424
-rw-r--r--tdecore/kconfigskeleton.h182
-rw-r--r--tdecore/kdebug.areas12
-rw-r--r--tdecore/kdebug.cpp4
-rw-r--r--tdecore/kdesktopfile.cpp8
-rw-r--r--tdecore/kdesktopfile.h4
-rw-r--r--tdecore/kdetcompmgr.cpp4
-rw-r--r--tdecore/kextsock.cpp30
-rw-r--r--tdecore/kextsock.h36
-rw-r--r--tdecore/kglobal.cpp2
-rw-r--r--tdecore/kglobal.h4
-rw-r--r--tdecore/kglobalaccel.cpp6
-rw-r--r--tdecore/kglobalaccel.h12
-rw-r--r--tdecore/kglobalsettings.cpp88
-rw-r--r--tdecore/kglobalsettings.h2
-rw-r--r--tdecore/kiconeffect.cpp4
-rw-r--r--tdecore/kiconloader.cpp4
-rw-r--r--tdecore/kiconloader.h2
-rw-r--r--tdecore/kicontheme.cpp10
-rw-r--r--tdecore/kicontheme.h2
-rw-r--r--tdecore/kinstance.cpp2
-rw-r--r--tdecore/kinstance.h10
-rw-r--r--tdecore/kkeyserver_x11.cpp4
-rw-r--r--tdecore/klocale.cpp34
-rw-r--r--tdecore/klocale.h18
-rw-r--r--tdecore/knotifyclient.cpp24
-rw-r--r--tdecore/krootprop.h4
-rw-r--r--tdecore/kshortcutlist.cpp8
-rw-r--r--tdecore/kshortcutlist.h6
-rw-r--r--tdecore/ksimpleconfig.cpp14
-rw-r--r--tdecore/ksimpleconfig.h10
-rw-r--r--tdecore/ksimpledirwatch.cpp2
-rw-r--r--tdecore/ksock.cpp70
-rw-r--r--tdecore/ksock.h64
-rw-r--r--tdecore/ksockaddr.cpp52
-rw-r--r--tdecore/ksockaddr.h56
-rw-r--r--tdecore/ksocks.cpp6
-rw-r--r--tdecore/ksocks.h6
-rw-r--r--tdecore/kstandarddirs.cpp4
-rw-r--r--tdecore/kstandarddirs.h4
-rw-r--r--tdecore/kstdaccel.cpp2
-rw-r--r--tdecore/ktempdir.h2
-rw-r--r--tdecore/kuniqueapplication.cpp2
-rw-r--r--tdecore/kurldrag.h2
-rw-r--r--tdecore/network/kbufferedsocket.cpp14
-rw-r--r--tdecore/network/kbufferedsocket.h10
-rw-r--r--tdecore/network/kclientsocketbase.cpp12
-rw-r--r--tdecore/network/kclientsocketbase.h40
-rw-r--r--tdecore/network/kdatagramsocket.cpp4
-rw-r--r--tdecore/network/kdatagramsocket.h12
-rw-r--r--tdecore/network/khttpproxysocketdevice.cpp26
-rw-r--r--tdecore/network/khttpproxysocketdevice.h10
-rw-r--r--tdecore/network/kmulticastsocket.h8
-rw-r--r--tdecore/network/kmulticastsocketdevice.h12
-rw-r--r--tdecore/network/kresolver.cpp10
-rw-r--r--tdecore/network/kresolver.h10
-rw-r--r--tdecore/network/kreverseresolver.cpp16
-rw-r--r--tdecore/network/kreverseresolver.h6
-rw-r--r--tdecore/network/kserversocket.cpp106
-rw-r--r--tdecore/network/kserversocket.h42
-rw-r--r--tdecore/network/ksockssocketdevice.cpp50
-rw-r--r--tdecore/network/ksockssocketdevice.h20
-rw-r--r--tdecore/network/kstreamsocket.h6
-rw-r--r--tdecore/network/tdesocketaddress.cpp86
-rw-r--r--tdecore/network/tdesocketaddress.h46
-rw-r--r--tdecore/network/tdesocketbase.cpp66
-rw-r--r--tdecore/network/tdesocketbase.h52
-rw-r--r--tdecore/network/tdesocketbuffer.cpp28
-rw-r--r--tdecore/network/tdesocketbuffer_p.h12
-rw-r--r--tdecore/network/tdesocketdevice.cpp130
-rw-r--r--tdecore/network/tdesocketdevice.h80
-rw-r--r--tdecore/networkbackends/network-manager/network-manager.cpp2
-rw-r--r--tdecore/tdehardwaredevices.cpp12
-rw-r--r--tdecore/tests/kconfigtest.cpp20
-rw-r--r--tdecore/tests/kconfigtestgui.cpp26
-rw-r--r--tdecore/tests/kconfigtestgui.h10
-rw-r--r--tdecore/tests/kresolvertest.cpp2
-rw-r--r--tdecore/tests/ksocktest.cpp2
-rw-r--r--tdecore/tests/kstddirstest.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdconf.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsddialog.cpp2
-rw-r--r--tdeprint/cups/cupsinfos.cpp4
-rw-r--r--tdeprint/cups/kmconfigcups.cpp4
-rw-r--r--tdeprint/cups/kmconfigcups.h4
-rw-r--r--tdeprint/cups/kmconfigcupsdir.cpp4
-rw-r--r--tdeprint/cups/kmconfigcupsdir.h4
-rw-r--r--tdeprint/cups/kmcupsconfigwidget.cpp2
-rw-r--r--tdeprint/cups/kmcupsconfigwidget.h4
-rw-r--r--tdeprint/cups/kmcupsmanager.cpp10
-rw-r--r--tdeprint/kmfactory.cpp10
-rw-r--r--tdeprint/kmfactory.h6
-rw-r--r--tdeprint/kmjobmanager.cpp4
-rw-r--r--tdeprint/kmmanager.cpp2
-rw-r--r--tdeprint/kprintdialog.cpp14
-rw-r--r--tdeprint/kprinter.cpp4
-rw-r--r--tdeprint/kprinterimpl.cpp6
-rw-r--r--tdeprint/kprintpreview.cpp2
-rw-r--r--tdeprint/lpd/kmlpdmanager.cpp2
-rw-r--r--tdeprint/lpr/kmconfiglpr.cpp4
-rw-r--r--tdeprint/lpr/kmconfiglpr.h4
-rw-r--r--tdeprint/lpr/lprsettings.cpp2
-rw-r--r--tdeprint/management/kmconfigdialog.cpp4
-rw-r--r--tdeprint/management/kmconfigfilter.cpp4
-rw-r--r--tdeprint/management/kmconfigfilter.h4
-rw-r--r--tdeprint/management/kmconfigfonts.cpp4
-rw-r--r--tdeprint/management/kmconfigfonts.h4
-rw-r--r--tdeprint/management/kmconfiggeneral.cpp4
-rw-r--r--tdeprint/management/kmconfiggeneral.h4
-rw-r--r--tdeprint/management/kmconfigjobs.cpp4
-rw-r--r--tdeprint/management/kmconfigjobs.h4
-rw-r--r--tdeprint/management/kmconfigpage.cpp4
-rw-r--r--tdeprint/management/kmconfigpage.h6
-rw-r--r--tdeprint/management/kmconfigpreview.cpp4
-rw-r--r--tdeprint/management/kmconfigpreview.h4
-rw-r--r--tdeprint/management/kmdriverdbwidget.cpp4
-rw-r--r--tdeprint/management/kmjobviewer.cpp8
-rw-r--r--tdeprint/management/kmmainview.cpp4
-rw-r--r--tdeprint/management/kmtimer.cpp2
-rw-r--r--tdeprint/management/kmwdrivertest.cpp2
-rw-r--r--tdeprint/management/kmwsocketutil.cpp2
-rw-r--r--tdeprint/management/networkscanner.cpp4
-rw-r--r--tdeprint/printerfilter.cpp4
-rw-r--r--tdeprint/rlpr/kmconfigproxy.cpp4
-rw-r--r--tdeprint/rlpr/kmconfigproxy.h6
-rw-r--r--tdeprint/rlpr/kmproxywidget.cpp4
-rw-r--r--tdeprint/rlpr/kmproxywidget.h6
-rw-r--r--tdeprint/rlpr/krlprprinterimpl.cpp2
-rw-r--r--tdeprint/tdeprintcheck.cpp2
-rw-r--r--tdeprint/tdeprintcheck.h2
-rw-r--r--tdeprint/tdeprintd.cpp16
-rw-r--r--tdesu/process.cpp2
-rw-r--r--tdesu/su.cpp2
-rw-r--r--tdeui/AUTHORS4
-rw-r--r--tdeui/kaction.h4
-rw-r--r--tdeui/kactionclasses.cpp4
-rw-r--r--tdeui/kactionclasses.h16
-rw-r--r--tdeui/kactioncollection.cpp4
-rw-r--r--tdeui/kactioncollection.h8
-rw-r--r--tdeui/kbugreport.cpp2
-rw-r--r--tdeui/kcmenumngr.cpp2
-rw-r--r--tdeui/kcmodule.cpp66
-rw-r--r--tdeui/kcmodule.h58
-rw-r--r--tdeui/kcolordialog.cpp4
-rw-r--r--tdeui/kcombobox.h4
-rw-r--r--tdeui/kconfigdialog.cpp58
-rw-r--r--tdeui/kconfigdialog.h56
-rw-r--r--tdeui/kcursor.cpp8
-rw-r--r--tdeui/kdialog.cpp2
-rw-r--r--tdeui/kdialogbase.cpp8
-rw-r--r--tdeui/kdialogbase.h8
-rw-r--r--tdeui/kdockwidget.cpp20
-rw-r--r--tdeui/kdockwidget.h32
-rw-r--r--tdeui/kdockwidget_p.h4
-rw-r--r--tdeui/kfontcombo.cpp2
-rw-r--r--tdeui/kfontdialog.cpp4
-rw-r--r--tdeui/kkeydialog.cpp10
-rw-r--r--tdeui/kkeydialog.h6
-rw-r--r--tdeui/klineedit.cpp2
-rw-r--r--tdeui/klistview.cpp8
-rw-r--r--tdeui/klistview.h14
-rw-r--r--tdeui/kmainwindow.cpp28
-rw-r--r--tdeui/kmainwindow.h24
-rw-r--r--tdeui/kmenubar.cpp6
-rw-r--r--tdeui/kmessagebox.cpp28
-rw-r--r--tdeui/kmessagebox.h6
-rw-r--r--tdeui/kpanelapplet.h8
-rw-r--r--tdeui/kpanelextension.cpp2
-rw-r--r--tdeui/kpanelextension.h8
-rw-r--r--tdeui/kpanelmenu.cpp2
-rw-r--r--tdeui/kpassdlg.cpp8
-rw-r--r--tdeui/kpixmapio.cpp2
-rw-r--r--tdeui/ksconfig.cpp4
-rw-r--r--tdeui/ksconfig.h4
-rw-r--r--tdeui/kscrollview.cpp2
-rw-r--r--tdeui/kshortcutdialog.cpp4
-rw-r--r--tdeui/kstatusbar.cpp2
-rw-r--r--tdeui/kstdguiitem.h2
-rw-r--r--tdeui/kswitchlanguagedialog.cpp8
-rw-r--r--tdeui/ksyntaxhighlighter.cpp10
-rw-r--r--tdeui/ksystemtray.cpp4
-rw-r--r--tdeui/ktabwidget.cpp2
-rw-r--r--tdeui/ktip.cpp6
-rw-r--r--tdeui/ktoolbar.cpp34
-rw-r--r--tdeui/ktoolbar.h10
-rw-r--r--tdeui/tests/kcolordlgtest.cpp2
-rw-r--r--tdeui/tests/kdockwidgetdemo.cpp6
-rw-r--r--tdeui/tests/kfontdialogtest.cpp2
623 files changed, 6007 insertions, 6007 deletions
diff --git a/KDE2PORTING.html b/KDE2PORTING.html
index 41b9f537..f23a2443 100644
--- a/KDE2PORTING.html
+++ b/KDE2PORTING.html
@@ -31,7 +31,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
<LI><A HREF="#khtmlw">khtmlw</A></LI>
<LI><A HREF="#KIntegerLine">KIntegerLine, KIntLineEdit</A></LI>
<LI><A HREF="#KDNDIcon">KDNDIcon, KDNDDropZone, KDNDWidget, tdecore/drag.h</A></LI>
-<LI><A HREF="#KConfigBase">KConfigBase, KConfig, KSimpleConfig</A></LI>
+<LI><A HREF="#TDEConfigBase">TDEConfigBase, TDEConfig, KSimpleConfig</A></LI>
<LI><A HREF="#libkfm">libkfm</A></LI>
<LI><A HREF="#KDialog">KDialog</A></LI>
<LI><A HREF="#kcharsets">kcharsets</A></LI>
@@ -205,7 +205,7 @@ must have created a TDEApplication object before the methods can be used.<P>
<TD COLSPAN="2">
<PRE>
#include &lt;kglobal.h&gt;
- #include &lt;kconfig.h&gt; // Needed to use KConfig
+ #include &lt;kconfig.h&gt; // Needed to use TDEConfig
#include &lt;klocale.h&gt; // Needed to use KLocale
#include &lt;kiconloader.h&gt; // Needed to use KIconLoader
</PRE>
@@ -215,7 +215,7 @@ must have created a TDEApplication object before the methods can be used.<P>
<TD>
<PRE>
...
- KConfig *appcfg = TDEGlobal::config();
+ TDEConfig *appcfg = TDEGlobal::config();
TQString mystr = i18n( "This is a string" );
@@ -469,17 +469,17 @@ are necessary to convert your old KDND-based stuff to Qt DND.<P>
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
-<H3><A NAME="KConfigBase">KConfigBase, KConfig, KSimpleConfig</A></H3>
+<H3><A NAME="TDEConfigBase">TDEConfigBase, TDEConfig, KSimpleConfig</A></H3>
These classes have been largely re-implemented. The external API
remains mostly the same, with the single notable change that
the groupIterator and entryIterator methods have been removed and
instead replaced by groupList (which returns a TQStringList of groups)
and entryMap(const TQString &amp;group) (which returns a TQMap of entries
- in the specified group). This is due to internal changes in KConfig
+ in the specified group). This is due to internal changes in TDEConfig
which would make providing iterators possibly rather difficult.<P>
- Much more extensive documentation on the KConfig and friends API can
+ Much more extensive documentation on the TDEConfig and friends API can
be found in the kdoc generated documentation from the header files,
and in tdecore/KCONFIG_DESIGN.<P>
@@ -505,16 +505,16 @@ are necessary to convert your old KDND-based stuff to Qt DND.<P>
<STRONG> Replacement table :</STRONG><P>
<TABLE BORDER="1">
-<TR><TD>KFM::download </TD><TD>-&gt; KIO::NetAccess::download (tdelibs/kio/netaccess.h)</TD></TR>
-<TR><TD>KFM::removeTempFile </TD><TD>-&gt; KIO::NetAccess::removeTempFile</TD></TR>
+<TR><TD>KFM::download </TD><TD>-&gt; TDEIO::NetAccess::download (tdelibs/kio/netaccess.h)</TD></TR>
+<TR><TD>KFM::removeTempFile </TD><TD>-&gt; TDEIO::NetAccess::removeTempFile</TD></TR>
<TR><TD COLSPAN="2" ROWSPAN="0">refreshDesktop, sortDesktop, selectRootIcons : removed; kdesktop handles it</TD></TR>
<TR><TD>KFM::configure </TD><TD>-&gt; see konqueror DCOP interface</TD></TR>
<TR><TD>KFM::openURL </TD><TD>-&gt; "(void) new KRun (url)" (tdelibs/kio/krun.h)</TD></TR>
<TR><TD>KFM::refreshDirectory </TD><TD>-&gt; not needed anymore since konqy/kdesktop use KDirWatch</TD></TR>
<TR><TD>KFM::openProperties </TD><TD>-&gt; "(void) new KPropertiesDialog (url)" (tdelibs/kfile/kpropsdlg.h)</TD></TR>
<TR><TD>KFM::exec </TD><TD>-&gt; "(void) new KRun (url)" (tdelibs/kio/krun.h)</TD></TR>
-<TR><TD>KFM::copy, KFM::move </TD><TD>-&gt; KIO::Job (async, see kio/job.h)<BR>
- or KIO::NetAccess (sync, see kio/netaccess.h)</TD></TR>
+<TR><TD>KFM::copy, KFM::move </TD><TD>-&gt; TDEIO::Job (async, see kio/job.h)<BR>
+ or TDEIO::NetAccess (sync, see kio/netaccess.h)</TD></TR>
<TR><TD>DlgLocation </TD><TD>-&gt; Use KLineEditDlg (tdeui/klineeditdlg.h) instead</TD></TR>
</TABLE>
diff --git a/KDE3PORTING.html b/KDE3PORTING.html
index 1c96f6ec..aa16c489 100644
--- a/KDE3PORTING.html
+++ b/KDE3PORTING.html
@@ -391,7 +391,7 @@ TQString&) is not a slot anymore.
<li>setMaxCacheAge( int )
<li>setUseCache( bool )
<li>setMaxCacheSize( int )
-<li>setCacheControl( KIO::CacheControl )
+<li>setCacheControl( TDEIO::CacheControl )
<li>setUseProxy( bool )
<li>setUseReverseProxy( bool )
<li>setProxyType( ProxyType )
@@ -406,7 +406,7 @@ TQString&) is not a slot anymore.
<li>In order to support files &gt; 4Gb, the file size / file-offset argument
in the signals totalSize, processedSize and canResume, which are used
by the io-slaves and passed along to jobs, has been changed from
- <b>unsigned long</b> to <b>KIO::filesize_t</b>.
+ <b>unsigned long</b> to <b>TDEIO::filesize_t</b>.
Make sure to check if you use these signals since your compiler
will typically not generate a compile-time error for these changes,
instead you might get a run-time error when you try to connect to
@@ -568,7 +568,7 @@ sorting is utilized by letting its view-items provide a TQString key() method. T
KFileView offers the two methods
<ul>
<li>TQString sortingKey( const TQString&amp; value, bool isDir, int sortSpec )</li>
-<li>TQString sortingKey( KIO::filesize_t value, bool isDir, int sortSpec )</li>
+<li>TQString sortingKey( TDEIO::filesize_t value, bool isDir, int sortSpec )</li>
</ul>
which the view-classes can use to generate the string for the key() method. The KFile::SortMode
enum has been removed, as TQDir::SortSpec is used entirely.
@@ -577,8 +577,8 @@ enum has been removed, as TQDir::SortSpec is used entirely.
Further changes:
<table>
<tr><th>Old:</th><th>New:</th></tr>
-<tr><td>not existant</td><td>virtual void readConfig( KConfig *, const TQString&amp; group = TQString::null )</td></tr>
-<tr><td>not existant</td><td>void writeConfig( KConfig *, const TQString&amp; group = TQString::null)</td></tr>
+<tr><td>not existant</td><td>virtual void readConfig( TDEConfig *, const TQString&amp; group = TQString::null )</td></tr>
+<tr><td>not existant</td><td>void writeConfig( TDEConfig *, const TQString&amp; group = TQString::null)</td></tr>
<tr><td>virtual void setCurrentItem( const TQString&amp; filename, KFileViewItem * )</td><td>Replaced with the two methods below.</td></tr>
<tr><td>&nbsp;</td><td>void setCurrentItem( const TQString&amp; filename );</td></tr>
<tr><td>&nbsp;</td><td>virtual void setCurrentItem( const KFileViewItem * ) = 0;</td></tr>
diff --git a/TODO b/TODO
index 26845a9d..57dd5a13 100644
--- a/TODO
+++ b/TODO
@@ -3,7 +3,7 @@ that we would like to make for the next binary incompatible release.
- Check for forked classes in kde pim and other modules
-- There is no reason why KConfigBase should inherit from QObject, get rid of that.
+- There is no reason why TDEConfigBase should inherit from QObject, get rid of that.
- Change all FooPrivate *d; -> Private * const d; and place initialization
in the constructor (for classes that would benefit from this). To help catch silly
@@ -24,7 +24,7 @@ that we would like to make for the next binary incompatible release.
See: http://groups.google.com/groups?selm=4ognb0%243cd%40linda.teleport.com&oe=UTF-8&output=gplain
Also free the client from the requirement to inherit from KShared.
-- Remove all KSocket, KServerSocket, KSocks and KExtendedSocket references
+- Remove all TDESocket, TDEServerSocket, KSocks and KExtendedSocket references
throughout KDE in favor of KNetwork's socket implementations.
Also, revise the namespace usage.
thiago.macieira@kdemail.net
@@ -88,7 +88,7 @@ that we would like to make for the next binary incompatible release.
- Other ideas in this thread: http://lists.kde.org/?l=kde-core-devel&m=107608067302571&w=2
(Contributors to that thread, please add specific items here.)
-- KConfigBase: For all the read*Entry methods that take a QFont *, QPoint *, QSize *, etc.
+- TDEConfigBase: For all the read*Entry methods that take a QFont *, QPoint *, QSize *, etc.
for the default value, add overloads that use a const reference, so that one can write
resize( config->readSizeEntry( "Bleh", size() ); for example. Constructing a null
QFont/QPoint/QSize is cheap enough to justify a consistent and usable API (IMHO) .
@@ -110,7 +110,7 @@ that we would like to make for the next binary incompatible release.
calls (readBoolEntry()). Although not technicaly a binary incompatiblity...
just something to bring up for possible change (for the better)
- Use KConfigXT instead! /FransE
+ Use TDEConfigXT instead! /FransE
- Is it really necessary to bother people using the KCM APIs with withFallback? I have
never heard of it failing and when would you not like to have that fallback? I think
@@ -118,7 +118,7 @@ that we would like to make for the next binary incompatible release.
- Do we need to have factory arguments in the KCM API? (who would use it anyway?)
-- KCModuleInfo should use d-pointer. Perhaps there is more classes.
+- TDECModuleInfo should use d-pointer. Perhaps there is more classes.
- The config options in kdeglobals needs to be cleaned up a little. Perhaps I'm being picky..
* They should be named properly, for example "enableIcons" instead of "EnableIcons". Or atleast
@@ -212,7 +212,7 @@ an alternative help->contents action)
- KListView: merge setDropHighlighter and setDropVisualizer, add a setDnDMode to choose between
"dnd to move items" (e.g. keditbookmarks) and "dnd onto items" (e.g. kmail). Unless Qt4 does it all :)
-- Move KIO::findDeviceMountPoint, findPathMoundPoint, probably_slow_mounted, and testFileSystemFlag to KMountPoint,
+- Move TDEIO::findDeviceMountPoint, findPathMoundPoint, probably_slow_mounted, and testFileSystemFlag to KMountPoint,
to merge that code.
- Refactor the kio/bookmarks code so we don't need to use the static d-pointer trick anymore.
diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp
index 50a2ae46..cd97d0cc 100644
--- a/arts/kde/kartsserver.cpp
+++ b/arts/kde/kartsserver.cpp
@@ -59,7 +59,7 @@ Arts::SoundServerV2 KArtsServer::server(void)
// aRts seems not to be running, let's try to run it
// First, let's read the configuration as in kcmarts
- KConfig config("kcmartsrc", false /*bReadOnly*/, false /*bUseKDEGlobals*/);
+ TDEConfig config("kcmartsrc", false /*bReadOnly*/, false /*bUseKDEGlobals*/);
TDEProcess proc;
config.setGroup("Arts");
diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp
index 8c131bfd..ab215a58 100644
--- a/arts/kde/kioinputstream_impl.cpp
+++ b/arts/kde/kioinputstream_impl.cpp
@@ -75,19 +75,19 @@ void KIOInputStream_impl::streamStart()
if(m_job != 0)
m_job->kill();
- m_job = KIO::get(m_url, false, false);
+ m_job = TDEIO::get(m_url, false, false);
m_job->addMetaData("accept", "audio/x-mp3, video/mpeg, application/ogg");
m_job->addMetaData("UserAgent", TQString::fromLatin1("aRts/") + TQString::fromLatin1(ARTS_VERSION));
- TQObject::connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
- this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
- TQObject::connect(m_job, TQT_SIGNAL(result(KIO::Job *)),
- this, TQT_SLOT(slotResult(KIO::Job *)));
- TQObject::connect(m_job, TQT_SIGNAL(mimetype(KIO::Job *, const TQString &)),
- this, TQT_SLOT(slotScanMimeType(KIO::Job *, const TQString &)));
- TQObject::connect(m_job, TQT_SIGNAL(totalSize( KIO::Job *, KIO::filesize_t)),
- this, TQT_SLOT(slotTotalSize(KIO::Job *, KIO::filesize_t)));
+ TQObject::connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+ this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+ TQObject::connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)),
+ this, TQT_SLOT(slotResult(TDEIO::Job *)));
+ TQObject::connect(m_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
+ this, TQT_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &)));
+ TQObject::connect(m_job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)),
+ this, TQT_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t)));
m_streamStarted = true;
}
@@ -98,14 +98,14 @@ void KIOInputStream_impl::streamEnd()
if(m_job != 0)
{
- TQObject::disconnect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
- this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
- TQObject::disconnect(m_job, TQT_SIGNAL(result(KIO::Job *)),
- this, TQT_SLOT(slotResult(KIO::Job *)));
- TQObject::disconnect(m_job, TQT_SIGNAL(mimetype(KIO::Job *, const TQString &)),
- this, TQT_SLOT(slotScanMimeType(KIO::Job *, const TQString &)));
- TQObject::disconnect(m_job, TQT_SIGNAL(totalSize( KIO::Job *, KIO::filesize_t)),
- this, TQT_SLOT(slotTotalSize(KIO::Job *, KIO::filesize_t)));
+ TQObject::disconnect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+ this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+ TQObject::disconnect(m_job, TQT_SIGNAL(result(TDEIO::Job *)),
+ this, TQT_SLOT(slotResult(TDEIO::Job *)));
+ TQObject::disconnect(m_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
+ this, TQT_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &)));
+ TQObject::disconnect(m_job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)),
+ this, TQT_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t)));
if ( m_streamPulled )
outdata.endPull();
@@ -124,7 +124,7 @@ bool KIOInputStream_impl::openURL(const std::string& url)
return true;
}
-void KIOInputStream_impl::slotData(KIO::Job *, const TQByteArray &data)
+void KIOInputStream_impl::slotData(TDEIO::Job *, const TQByteArray &data)
{
if(m_finished)
m_finished = false;
@@ -136,7 +136,7 @@ void KIOInputStream_impl::slotData(KIO::Job *, const TQByteArray &data)
processQueue();
}
-void KIOInputStream_impl::slotResult(KIO::Job *job)
+void KIOInputStream_impl::slotResult(TDEIO::Job *job)
{
// jobs delete themselves after emitting their result
m_finished = true;
@@ -151,13 +151,13 @@ void KIOInputStream_impl::slotResult(KIO::Job *job)
}
}
-void KIOInputStream_impl::slotScanMimeType(KIO::Job *, const TQString &mimetype)
+void KIOInputStream_impl::slotScanMimeType(TDEIO::Job *, const TQString &mimetype)
{
kdDebug( 400 ) << "got mimetype: " << mimetype << endl;
emit mimeTypeFound(mimetype);
}
-void KIOInputStream_impl::slotTotalSize(KIO::Job *, KIO::filesize_t size)
+void KIOInputStream_impl::slotTotalSize(TDEIO::Job *, TDEIO::filesize_t size)
{
m_size = size;
}
diff --git a/arts/kde/kioinputstream_impl.h b/arts/kde/kioinputstream_impl.h
index 5377fc80..06052e04 100644
--- a/arts/kde/kioinputstream_impl.h
+++ b/arts/kde/kioinputstream_impl.h
@@ -62,14 +62,14 @@ signals:
void mimeTypeFound(const TQString & mimetype);
private slots:
- void slotData(KIO::Job *, const TQByteArray &);
- void slotResult(KIO::Job *);
- void slotScanMimeType(KIO::Job *, const TQString &mimetype);
- void slotTotalSize(KIO::Job *, KIO::filesize_t size);
+ void slotData(TDEIO::Job *, const TQByteArray &);
+ void slotResult(TDEIO::Job *);
+ void slotScanMimeType(TDEIO::Job *, const TQString &mimetype);
+ void slotTotalSize(TDEIO::Job *, TDEIO::filesize_t size);
private:
KURL m_url;
- KIO::TransferJob *m_job;
+ TDEIO::TransferJob *m_job;
TQByteArray m_data;
bool m_finished;
bool m_firstBuffer;
@@ -79,7 +79,7 @@ private:
unsigned int m_packetBuffer;
const unsigned int m_packetSize;
- KIO::filesize_t m_size;
+ TDEIO::filesize_t m_size;
static const unsigned int PACKET_COUNT;
};
diff --git a/arts/kde/kplayobjectfactory.cc b/arts/kde/kplayobjectfactory.cc
index 29ee20e3..c0969294 100644
--- a/arts/kde/kplayobjectfactory.cc
+++ b/arts/kde/kplayobjectfactory.cc
@@ -69,7 +69,7 @@ KPlayObject *KPlayObjectFactory::createPlayObject(const KURL& _url, const TQStri
// I hate it
// It sucks
// kio_media please die
- KURL url = KIO::NetAccess::mostLocalURL(_url, 0);
+ KURL url = TDEIO::NetAccess::mostLocalURL(_url, 0);
if(!m_server.isNull())
{
@@ -140,7 +140,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons
// I hate it
// It sucks
// kio_media please die
- KURL url = KIO::NetAccess::mostLocalURL(_url, 0);
+ KURL url = TDEIO::NetAccess::mostLocalURL(_url, 0);
// return a NULL playobject if the server is NULL
if ( d->server.isNull() || url.isEmpty() )
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp
index 5ff63351..b8c1642f 100644
--- a/arts/knotify/knotify.cpp
+++ b/arts/knotify/knotify.cpp
@@ -73,10 +73,10 @@
class KNotifyPrivate
{
public:
- KConfig* globalEvents;
- KConfig* globalConfig;
- TQMap<TQString, KConfig*> events;
- TQMap<TQString, KConfig*> configs;
+ TDEConfig* globalEvents;
+ TDEConfig* globalConfig;
+ TQMap<TQString, TDEConfig*> events;
+ TQMap<TQString, TDEConfig*> configs;
TQString externalPlayer;
TDEProcess *externalPlayerProc;
@@ -136,8 +136,8 @@ KDE_EXPORT int kdemain(int argc, char **argv)
// abort this.
#ifndef WITHOUT_ARTS
- KConfigGroup config( TDEGlobal::config(), "StartProgress" );
- KConfig artsKCMConfig( "kcmartsrc" );
+ TDEConfigGroup config( TDEGlobal::config(), "StartProgress" );
+ TDEConfig artsKCMConfig( "kcmartsrc" );
artsKCMConfig.setGroup( "Arts" );
bool useArts = artsKCMConfig.readBoolEntry( "StartServer", true );
if (useArts)
@@ -245,8 +245,8 @@ KNotify::KNotify( bool useArts )
: TQObject(), DCOPObject("Notify")
{
d = new KNotifyPrivate;
- d->globalEvents = new KConfig("knotify/eventsrc", true, false, "data");
- d->globalConfig = new KConfig("knotify.eventsrc", true, false);
+ d->globalEvents = new TDEConfig("knotify/eventsrc", true, false, "data");
+ d->globalConfig = new TDEConfig("knotify.eventsrc", true, false);
d->externalPlayerProc = 0;
d->useArts = useArts;
d->inStartup = true;
@@ -285,7 +285,7 @@ KNotify::~KNotify()
void KNotify::loadConfig() {
// load external player settings
- KConfig *kc = TDEGlobal::config();
+ TDEConfig *kc = TDEGlobal::config();
kc->setGroup("Misc");
d->useExternal = kc->readBoolEntry( "Use external player", false );
d->externalPlayer = kc->readPathEntry("External player");
@@ -313,7 +313,7 @@ void KNotify::reconfigure()
// clear loaded config files
d->globalConfig->reparseConfiguration();
- for ( TQMapIterator<TQString,KConfig*> it = d->configs.begin(); it != d->configs.end(); ++it )
+ for ( TQMapIterator<TQString,TDEConfig*> it = d->configs.begin(); it != d->configs.end(); ++it )
delete it.data();
d->configs.clear();
}
@@ -344,8 +344,8 @@ void KNotify::notify(const TQString &event, const TQString &fromApp,
}
TQString commandline;
- KConfig *eventsFile = NULL;
- KConfig *configFile = NULL;
+ TDEConfig *eventsFile = NULL;
+ TDEConfig *configFile = NULL;
// check for valid events
if ( !event.isEmpty() ) {
@@ -354,13 +354,13 @@ void KNotify::notify(const TQString &event, const TQString &fromApp,
if ( d->events.contains( fromApp ) ) {
eventsFile = d->events[fromApp];
} else {
- eventsFile=new KConfig(locate("data", fromApp+"/eventsrc"),true,false);
+ eventsFile=new TDEConfig(locate("data", fromApp+"/eventsrc"),true,false);
d->events.insert( fromApp, eventsFile );
}
if ( d->configs.contains( fromApp) ) {
configFile = d->configs[fromApp];
} else {
- configFile=new KConfig(fromApp+".eventsrc",true,false);
+ configFile=new TDEConfig(fromApp+".eventsrc",true,false);
d->configs.insert( fromApp, configFile );
}
@@ -588,12 +588,12 @@ bool KNotify::notifyByMessagebox(const TQString &text, int level, WId winId)
bool KNotify::notifyByPassivePopup( const TQString &text,
const TQString &appName,
- KConfig* eventsFile,
+ TDEConfig* eventsFile,
WId senderWinId )
{
KIconLoader iconLoader( appName );
if ( eventsFile != NULL ) {
- KConfigGroup config( eventsFile, "!Global!" );
+ TDEConfigGroup config( eventsFile, "!Global!" );
TQString iconName = config.readEntry( "IconName", appName );
TQPixmap icon = iconLoader.loadIcon( iconName, KIcon::Small );
TQString title = config.readEntry( "Comment", appName );
diff --git a/arts/knotify/knotify.h b/arts/knotify/knotify.h
index a6fec674..410821af 100644
--- a/arts/knotify/knotify.h
+++ b/arts/knotify/knotify.h
@@ -26,7 +26,7 @@
class KNotifyPrivate;
class TDEProcess;
-class KConfig;
+class TDEConfig;
class KNotify : public TQObject, public DCOPObject
{
@@ -75,7 +75,7 @@ private:
bool notifyByLogfile(const TQString &text, const TQString &file);
bool notifyByStderr(const TQString &text);
bool notifyByPassivePopup(const TQString &text, const TQString &appName,
- KConfig* eventsFile, WId winId );
+ TDEConfig* eventsFile, WId winId );
bool notifyByExecute(const TQString &command,
const TQString& event,
const TQString& fromApp,
diff --git a/dcop/dcopidl/dcopidl_test.h b/dcop/dcopidl/dcopidl_test.h
index 2e896fb5..6f39cab9 100644
--- a/dcop/dcopidl/dcopidl_test.h
+++ b/dcop/dcopidl/dcopidl_test.h
@@ -14,7 +14,7 @@ class Test2;
// this has to work too
#include <tqstring.h>
-typedef TQMap<KIO::Job *, KIODownload> KIODownloadMap;
+typedef TQMap<TDEIO::Job *, KIODownload> KIODownloadMap;
class Test3;
// Those namespaces are opened and closed, so they should be just ignored
@@ -78,7 +78,7 @@ private:
Test3 *doc();
struct KIODownload;
- typedef TQMap<KIO::Job *, KIODownload> KIODownloadMap;
+ typedef TQMap<TDEIO::Job *, KIODownload> KIODownloadMap;
};
class Test2 : public DCOPObject
diff --git a/dnssd/settings.kcfgc b/dnssd/settings.kcfgc
index df47ad3a..63764fc5 100644
--- a/dnssd/settings.kcfgc
+++ b/dnssd/settings.kcfgc
@@ -1,7 +1,7 @@
ClassName=Configuration
File=kcm_kdnssd.kcfg
GlobalEnums=false
-Inherits=KConfigSkeleton
+Inherits=TDEConfigSkeleton
ItemAccessors=false
MemberVariables=private
Mutators=true
diff --git a/interfaces/kimproxy/library/kimproxy.cpp b/interfaces/kimproxy/library/kimproxy.cpp
index 9acfe00d..e8118b8b 100644
--- a/interfaces/kimproxy/library/kimproxy.cpp
+++ b/interfaces/kimproxy/library/kimproxy.cpp
@@ -643,7 +643,7 @@ KIMIface_stub * KIMProxy::stubForProtocol( const TQString &protocol)
TQString KIMProxy::preferredApp()
{
- KConfig *store = new KSimpleConfig( IM_CLIENT_PREFERENCES_FILE );
+ TDEConfig *store = new KSimpleConfig( IM_CLIENT_PREFERENCES_FILE );
store->setGroup( IM_CLIENT_PREFERENCES_SECTION );
TQString preferredApp = store->readEntry( IM_CLIENT_PREFERENCES_ENTRY );
//kdDebug( 790 ) << k_funcinfo << "found preferred app: " << preferredApp << endl;
diff --git a/interfaces/kio/http.h b/interfaces/kio/http.h
index 15803209..6a07e997 100644
--- a/interfaces/kio/http.h
+++ b/interfaces/kio/http.h
@@ -21,7 +21,7 @@
#define KIOSLAVE_HTTP_H_
-namespace KIO {
+namespace TDEIO {
/** HTTP / DAV method **/
enum HTTP_METHOD {HTTP_GET, HTTP_PUT, HTTP_POST, HTTP_HEAD, HTTP_DELETE,
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
index 061f8405..2998af9f 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
+++ b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
@@ -91,14 +91,14 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
}
m_autoPlay = new TQCheckBox( i18n("Play &automatically"), box );
- KConfigGroup config( TDEGlobal::config(), ConfigGroup );
+ TDEConfigGroup config( TDEGlobal::config(), ConfigGroup );
m_autoPlay->setChecked( config.readBoolEntry( "Autoplay sounds", true ) );
connect( m_autoPlay, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleAuto(bool)) );
}
KFileAudioPreview::~KFileAudioPreview()
{
- KConfigGroup config( TDEGlobal::config(), ConfigGroup );
+ TDEConfigGroup config( TDEGlobal::config(), ConfigGroup );
config.writeEntry( "Autoplay sounds", m_autoPlay->isChecked() );
delete d;
diff --git a/interfaces/ktexteditor/configinterface.h b/interfaces/ktexteditor/configinterface.h
index cb853846..4879fa66 100644
--- a/interfaces/ktexteditor/configinterface.h
+++ b/interfaces/ktexteditor/configinterface.h
@@ -22,7 +22,7 @@
#include <tdelibs_export.h>
class TQCString;
-class KConfig;
+class TDEConfig;
namespace KTextEditor
{
@@ -60,14 +60,14 @@ class KTEXTEDITOR_EXPORT ConfigInterface
Read/Write the config of the part to a given kconfig object
to store the settings in a different place than the standard
*/
- virtual void readConfig (KConfig *) = 0;
- virtual void writeConfig (KConfig *) = 0;
+ virtual void readConfig (TDEConfig *) = 0;
+ virtual void writeConfig (TDEConfig *) = 0;
/**
Read/Write session config of only this document/view/plugin
*/
- virtual void readSessionConfig (KConfig *) = 0;
- virtual void writeSessionConfig (KConfig *) = 0;
+ virtual void readSessionConfig (TDEConfig *) = 0;
+ virtual void writeSessionConfig (TDEConfig *) = 0;
/**
Shows a config dialog for the part, changes will be applied
diff --git a/interfaces/ktexteditor/editorchooser.cpp b/interfaces/ktexteditor/editorchooser.cpp
index 85466f55..807d342d 100644
--- a/interfaces/ktexteditor/editorchooser.cpp
+++ b/interfaces/ktexteditor/editorchooser.cpp
@@ -47,7 +47,7 @@ EditorChooser::EditorChooser(TQWidget *parent,const char *name) :
KTrader::OfferList offers = KTrader::self()->query("text/plain", "'KTextEditor/Document' in ServiceTypes");
- KConfig *config=new KConfig("default_components");
+ TDEConfig *config=new TDEConfig("default_components");
config->setGroup("KTextEditor");
TQString editor = config->readPathEntry("embeddedEditor");
@@ -75,7 +75,7 @@ EditorChooser:: ~EditorChooser(){
}
void EditorChooser::readAppSetting(const TQString& postfix){
- KConfig *cfg=kapp->config();
+ TDEConfig *cfg=kapp->config();
TQString previousGroup=cfg->group();
cfg->setGroup("KTEXTEDITOR:"+postfix);
TQString editor=cfg->readPathEntry("editor");
@@ -90,7 +90,7 @@ void EditorChooser::readAppSetting(const TQString& postfix){
}
void EditorChooser::writeAppSetting(const TQString& postfix){
- KConfig *cfg=kapp->config();
+ TDEConfig *cfg=kapp->config();
TQString previousGroup=cfg->group();
cfg->setGroup("KTEXTEDITOR:"+postfix);
cfg->writeEntry("DEVELOPER_INFO","NEVER TRY TO USE VALUES FROM THAT GROUP, THEY ARE SUBJECT TO CHANGES");
@@ -105,14 +105,14 @@ KTextEditor::Document *EditorChooser::createDocument(TQObject *parent,const char
KTextEditor::Document *tmpDoc=0;
- KConfig *cfg=kapp->config();
+ TDEConfig *cfg=kapp->config();
TQString previousGroup=cfg->group();
cfg->setGroup("KTEXTEDITOR:"+postfix);
TQString editor=cfg->readPathEntry("editor");
cfg->setGroup(previousGroup);
if (editor.isEmpty())
{
- KConfig *config=new KConfig("default_components");
+ TDEConfig *config=new TDEConfig("default_components");
config->setGroup("KTextEditor");
editor = config->readPathEntry("embeddedEditor", "katepart");
delete config;
@@ -135,14 +135,14 @@ KTextEditor::Editor *EditorChooser::createEditor(TQWidget *parentWidget,TQObject
KTextEditor::Editor *tmpEd=0;
- KConfig *cfg=kapp->config();
+ TDEConfig *cfg=kapp->config();
TQString previousGroup=cfg->group();
cfg->setGroup("KTEXTEDITOR:"+postfix);
TQString editor=cfg->readPathEntry("editor");
cfg->setGroup(previousGroup);
if (editor.isEmpty())
{
- KConfig *config=new KConfig("default_components");
+ TDEConfig *config=new TDEConfig("default_components");
config->setGroup("KTextEditor");
editor = config->readPathEntry("embeddedEditor", "katepart");
delete config;
diff --git a/interfaces/ktexteditor/editorchooser.h b/interfaces/ktexteditor/editorchooser.h
index 0010dd3a..d56e8d8e 100644
--- a/interfaces/ktexteditor/editorchooser.h
+++ b/interfaces/ktexteditor/editorchooser.h
@@ -6,7 +6,7 @@
#include <tqwidget.h>
-class KConfig;
+class TDEConfig;
class TQString;
namespace KTextEditor
@@ -45,8 +45,8 @@ public:
virtual const TQStringList &choices();
virtual void saveSettings();
- void readAppSetting(KConfig *cfg,const TQString& postfix);
- void writeAppSetting(KConfig *cfg,const TQString& postfix);
+ void readAppSetting(TDEConfig *cfg,const TQString& postfix);
+ void writeAppSetting(TDEConfig *cfg,const TQString& postfix);
public slots:
virtual void madeChoice(int pos,const TQString &choice);
diff --git a/interfaces/ktexteditor/sessionconfiginterface.h b/interfaces/ktexteditor/sessionconfiginterface.h
index c79de001..b4fb5223 100644
--- a/interfaces/ktexteditor/sessionconfiginterface.h
+++ b/interfaces/ktexteditor/sessionconfiginterface.h
@@ -22,7 +22,7 @@
#include <tdelibs_export.h>
class TQCString;
-class KConfig;
+class TDEConfig;
namespace KTextEditor
{
@@ -53,8 +53,8 @@ class KTEXTEDITOR_EXPORT SessionConfigInterface
* In case of the document, that means for example it should reload the file,
* restore all marks, ...
*/
- virtual void readSessionConfig (KConfig *) = 0;
- virtual void writeSessionConfig (KConfig *) = 0;
+ virtual void readSessionConfig (TDEConfig *) = 0;
+ virtual void writeSessionConfig (TDEConfig *) = 0;
private:
class PrivateSessionConfigInterface *d;
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 45d4f10e..b31df2b7 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -41,7 +41,7 @@ struct AddressBook::AddressBookData
{
Field::List mAllFields;
ErrorHandler *mErrorHandler;
- KConfig *mConfig;
+ TDEConfig *mConfig;
KRES::Manager<Resource> *mManager;
TQPtrList<Resource> mPendingLoadResources;
TQPtrList<Resource> mPendingSaveResources;
@@ -318,7 +318,7 @@ AddressBook::AddressBook( const TQString &config )
if ( config.isEmpty() )
d->mConfig = 0;
else
- d->mConfig = new KConfig( config );
+ d->mConfig = new TDEConfig( config );
d->mManager = new KRES::Manager<Resource>( "contact" );
d->mManager->readConfig( d->mConfig );
d->end.d->mResources = TQValueList<Resource*>();
diff --git a/kabc/addresseehelper.cpp b/kabc/addresseehelper.cpp
index f04adc95..90879586 100644
--- a/kabc/addresseehelper.cpp
+++ b/kabc/addresseehelper.cpp
@@ -81,7 +81,7 @@ void AddresseeHelper::initSettings()
mPrefixes.insert( "von" );
mPrefixes.insert( "de" );
- KConfig config( "kabcrc", true, false ); // readonly, no kdeglobals
+ TDEConfig config( "kabcrc", true, false ); // readonly, no kdeglobals
config.setGroup( "General" );
addToSet( config.readListEntry( "Prefixes" ), mTitles );
diff --git a/kabc/addresslineedit.cpp b/kabc/addresslineedit.cpp
index 6f056a40..76d99f63 100644
--- a/kabc/addresslineedit.cpp
+++ b/kabc/addresslineedit.cpp
@@ -61,13 +61,13 @@ TQTimer* AddressLineEdit::s_LDAPTimer = 0L;
LdapSearch* AddressLineEdit::s_LDAPSearch = 0L;
TQString* AddressLineEdit::s_LDAPText = 0L;
AddressLineEdit* AddressLineEdit::s_LDAPLineEdit = 0L;
-KConfig *AddressLineEdit::s_config = 0L;
+TDEConfig *AddressLineEdit::s_config = 0L;
static KStaticDeleter<KCompletion> completionDeleter;
static KStaticDeleter<TQTimer> ldapTimerDeleter;
static KStaticDeleter<LdapSearch> ldapSearchDeleter;
static KStaticDeleter<TQString> ldapTextDeleter;
-static KStaticDeleter<KConfig> configDeleter;
+static KStaticDeleter<TDEConfig> configDeleter;
AddressLineEdit::AddressLineEdit(TQWidget* parent,
bool useCompletion,
@@ -136,10 +136,10 @@ AddressLineEdit::~AddressLineEdit()
//-----------------------------------------------------------------------------
-KConfig* AddressLineEdit::config()
+TDEConfig* AddressLineEdit::config()
{
if ( !s_config )
- configDeleter.setObject( s_config, new KConfig( "kabldaprc", false, false ) ); // Open read-write, no kdeglobals
+ configDeleter.setObject( s_config, new TDEConfig( "kabldaprc", false, false ) ); // Open read-write, no kdeglobals
return s_config;
}
diff --git a/kabc/addresslineedit.h b/kabc/addresslineedit.h
index 093acf97..0cbd5dd4 100644
--- a/kabc/addresslineedit.h
+++ b/kabc/addresslineedit.h
@@ -30,7 +30,7 @@
#include "klineedit.h"
#include "kcompletion.h"
-class KConfig;
+class TDEConfig;
namespace KABC {
@@ -61,7 +61,7 @@ public:
*/
virtual void setFont( const TQFont& );
- static KConfig *config();
+ static TDEConfig *config();
public slots:
/**
@@ -112,7 +112,7 @@ private:
static LdapSearch *s_LDAPSearch;
static TQString *s_LDAPText;
static AddressLineEdit *s_LDAPLineEdit;
- static KConfig *s_config;
+ static TDEConfig *s_config;
private:
class AddressLineEditPrivate* d;
diff --git a/kabc/field.h b/kabc/field.h
index 7a622b90..118ce2d5 100644
--- a/kabc/field.h
+++ b/kabc/field.h
@@ -26,7 +26,7 @@
#include "addressee.h"
-class KConfig;
+class TDEConfig;
namespace KABC {
@@ -134,7 +134,7 @@ public:
* @param identifier The unique identifier
* @param fields The list of the fields
*/
- static void saveFields( KConfig *cfg, const TQString &identifier,
+ static void saveFields( TDEConfig *cfg, const TQString &identifier,
const Field::List &fields );
/**
* This is the same as above, with the difference, that
@@ -149,7 +149,7 @@ public:
* @param cfg The config file object
* @param identifier The unique identifier
*/
- static Field::List restoreFields( KConfig *cfg, const TQString &identifier );
+ static Field::List restoreFields( TDEConfig *cfg, const TQString &identifier );
/**
* This is the same as above, with the difference, that
diff --git a/kabc/kab2kabc.cpp b/kabc/kab2kabc.cpp
index 2447229d..11b80639 100644
--- a/kabc/kab2kabc.cpp
+++ b/kabc/kab2kabc.cpp
@@ -123,7 +123,7 @@ void importKMailAddressBook( KABC::AddressBook *ab )
TQString fileName = locateLocal( "data", "kmail/addressbook" );
TQString kmailConfigName = locate( "config", "kmailrc" );
if ( !kmailConfigName.isEmpty() ) {
- KConfig cfg( kmailConfigName );
+ TDEConfig cfg( kmailConfigName );
cfg.setGroup( "Addressbook" );
fileName = cfg.readPathEntry( "default", fileName );
}
@@ -458,7 +458,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/kabc/ldapclient.cpp b/kabc/ldapclient.cpp
index 39e4c504..568408ba 100644
--- a/kabc/ldapclient.cpp
+++ b/kabc/ldapclient.cpp
@@ -137,12 +137,12 @@ void LdapClient::startQuery( const TQString& filter )
startParseLDIF();
mActive = true;
- mJob = KIO::get( url, false, false );
- connect( mJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
- this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
- connect( mJob, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
- this, TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString& ) ) );
- connect( mJob, TQT_SIGNAL( result( KIO::Job* ) ),
+ mJob = TDEIO::get( url, false, false );
+ connect( mJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+ this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+ connect( mJob, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+ this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
+ connect( mJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
this, TQT_SLOT( slotDone() ) );
}
@@ -156,7 +156,7 @@ void LdapClient::cancelQuery()
mActive = false;
}
-void LdapClient::slotData( KIO::Job*, const TQByteArray& data )
+void LdapClient::slotData( TDEIO::Job*, const TQByteArray& data )
{
#ifndef NDEBUG // don't create the QString
// TQString str( data );
@@ -165,7 +165,7 @@ void LdapClient::slotData( KIO::Job*, const TQByteArray& data )
parseLDIF( data );
}
-void LdapClient::slotInfoMessage( KIO::Job*, const TQString & )
+void LdapClient::slotInfoMessage( TDEIO::Job*, const TQString & )
{
//tqDebug("Job said \"%s\"", info.latin1());
}
@@ -180,8 +180,8 @@ void LdapClient::slotDone()
}
#endif
int err = mJob->error();
- if ( err && err != KIO::ERR_USER_CANCELED ) {
- emit error( KIO::buildErrorString( err, TQString("%1:%2").arg( mHost ).arg( mPort ) ) );
+ if ( err && err != TDEIO::ERR_USER_CANCELED ) {
+ emit error( TDEIO::buildErrorString( err, TQString("%1:%2").arg( mHost ).arg( mPort ) ) );
}
emit done();
}
@@ -251,7 +251,7 @@ LdapSearch::LdapSearch()
}
// stolen from KAddressBook
- KConfig config( "kabldaprc", true );
+ TDEConfig config( "kabldaprc", true );
config.setGroup( "LDAP" );
int numHosts = config.readUnsignedNumEntry( "NumSelectedHosts");
if ( !numHosts ) {
diff --git a/kabc/ldapclient.h b/kabc/ldapclient.h
index 2054b130..5f851359 100644
--- a/kabc/ldapclient.h
+++ b/kabc/ldapclient.h
@@ -157,8 +157,8 @@ class KABC_EXPORT LdapClient : public TQObject
void cancelQuery();
protected slots:
- void slotData( KIO::Job*, const TQByteArray &data );
- void slotInfoMessage( KIO::Job*, const TQString &info );
+ void slotData( TDEIO::Job*, const TQByteArray &data );
+ void slotInfoMessage( TDEIO::Job*, const TQString &info );
void slotDone();
protected:
@@ -172,7 +172,7 @@ class KABC_EXPORT LdapClient : public TQObject
TQString mScope;
TQStringList mAttrs;
- TQGuardedPtr<KIO::SimpleJob> mJob;
+ TQGuardedPtr<TDEIO::SimpleJob> mJob;
bool mActive;
LdapObject mCurrentObject;
diff --git a/kabc/ldapconfigwidget.cpp b/kabc/ldapconfigwidget.cpp
index b0a899d8..eff79a73 100644
--- a/kabc/ldapconfigwidget.cpp
+++ b/kabc/ldapconfigwidget.cpp
@@ -243,7 +243,7 @@ void LdapConfigWidget::initWidget()
}
-void LdapConfigWidget::loadData( KIO::Job*, const TQByteArray& d )
+void LdapConfigWidget::loadData( TDEIO::Job*, const TQByteArray& d )
{
LDIF::ParseVal ret;
@@ -261,10 +261,10 @@ void LdapConfigWidget::loadData( KIO::Job*, const TQByteArray& d )
} while ( ret != LDIF::MoreData );
}
-void LdapConfigWidget::loadResult( KIO::Job* job)
+void LdapConfigWidget::loadResult( TDEIO::Job* job)
{
int error = job->error();
- if ( error && error != KIO::ERR_USER_CANCELED )
+ if ( error && error != TDEIO::ERR_USER_CANCELED )
mErrorMsg = job->errorString();
else
mErrorMsg = "";
@@ -291,12 +291,12 @@ void LdapConfigWidget::sendQuery()
kdDebug(5700) << "sendQuery url: " << _url.prettyURL() << endl;
mLdif.startParsing();
- KIO::Job *job = KIO::get( _url, true, false );
+ TDEIO::Job *job = TDEIO::get( _url, true, false );
job->addMetaData("no-auth-prompt","true");
- connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
- this, TQT_SLOT( loadData( KIO::Job*, const TQByteArray& ) ) );
- connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
- this, TQT_SLOT( loadResult( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+ this, TQT_SLOT( loadData( TDEIO::Job*, const TQByteArray& ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQT_SLOT( loadResult( TDEIO::Job* ) ) );
if ( mProg == NULL )
mProg = new KProgressDialog( this, 0, i18n("LDAP Query"), _url.prettyURL(), true );
diff --git a/kabc/ldapconfigwidget.h b/kabc/ldapconfigwidget.h
index c4144b02..0fd0dd7e 100644
--- a/kabc/ldapconfigwidget.h
+++ b/kabc/ldapconfigwidget.h
@@ -44,7 +44,7 @@ namespace KABC {
@short LDAP Configuration widget
This class can be used to query the user for LDAP connection parameters.
- It's KConfigXT compatible, using widget names starting with kcfg_
+ It's TDEConfigXT compatible, using widget names starting with kcfg_
*/
class KABC_EXPORT LdapConfigWidget : public TQWidget
@@ -223,23 +223,23 @@ namespace KABC {
/**
* Sets the size limit.
- * KConfig widget name: kcfg_ldapsizelimit
+ * TDEConfig widget name: kcfg_ldapsizelimit
*/
void setSizeLimit( int sizelimit );
/**
* Returns the size limit.
- * KConfig widget name: kcfg_ldapsizelimit
+ * TDEConfig widget name: kcfg_ldapsizelimit
*/
int sizeLimit() const;
/**
* Sets the time limit.
- * KConfig widget name: kcfg_ldaptimelimit
+ * TDEConfig widget name: kcfg_ldaptimelimit
*/
void setTimeLimit( int timelimit );
/**
* Returns the time limit.
- * KConfig widget name: kcfg_ldaptimelimit
+ * TDEConfig widget name: kcfg_ldaptimelimit
*/
int timeLimit() const;
@@ -262,8 +262,8 @@ namespace KABC {
void setSASL( int state );
void mQueryDNClicked();
void mQueryMechClicked();
- void loadData( KIO::Job*, const TQByteArray& );
- void loadResult( KIO::Job* );
+ void loadData( TDEIO::Job*, const TQByteArray& );
+ void loadResult( TDEIO::Job* );
private:
int mFlags;
diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp
index 0897c9ce..0dfd0352 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/kabc/plugins/dir/resourcedir.cpp
@@ -56,7 +56,7 @@ extern "C"
}
-ResourceDir::ResourceDir( const KConfig *config )
+ResourceDir::ResourceDir( const TDEConfig *config )
: Resource( config ), mAsynchronous( false )
{
if ( config ) {
@@ -100,7 +100,7 @@ ResourceDir::~ResourceDir()
mFormat = 0;
}
-void ResourceDir::writeConfig( KConfig *config )
+void ResourceDir::writeConfig( TDEConfig *config )
{
Resource::writeConfig( config );
diff --git a/kabc/plugins/dir/resourcedir.h b/kabc/plugins/dir/resourcedir.h
index 96c894e2..a7b04164 100644
--- a/kabc/plugins/dir/resourcedir.h
+++ b/kabc/plugins/dir/resourcedir.h
@@ -43,11 +43,11 @@ class KABC_EXPORT ResourceDir : public Resource
Q_OBJECT
public:
- ResourceDir( const KConfig* );
+ ResourceDir( const TDEConfig* );
ResourceDir( const TQString &path, const TQString &type = "vcard" );
~ResourceDir();
- virtual void writeConfig( KConfig* );
+ virtual void writeConfig( TDEConfig* );
virtual bool doOpen();
virtual void doClose();
diff --git a/kabc/plugins/evolution/resourceevo.cpp b/kabc/plugins/evolution/resourceevo.cpp
index 9a44b2ad..415e9928 100644
--- a/kabc/plugins/evolution/resourceevo.cpp
+++ b/kabc/plugins/evolution/resourceevo.cpp
@@ -17,7 +17,7 @@ using namespace KABC;
class EvolutionFactory : public KRES::PluginFactoryBase
{
public:
- KRES::Resource *resource( const KConfig *config )
+ KRES::Resource *resource( const TDEConfig *config )
{
return new ResourceEvolution( config );
}
@@ -36,7 +36,7 @@ extern "C"
}
}
-ResourceEvolution::ResourceEvolution( const KConfig* conf )
+ResourceEvolution::ResourceEvolution( const TDEConfig* conf )
: Resource( conf ), mWrap(0l)
{
m_isOpen = false;
diff --git a/kabc/plugins/evolution/resourceevo.h b/kabc/plugins/evolution/resourceevo.h
index 0f5b3a0d..29e163e1 100644
--- a/kabc/plugins/evolution/resourceevo.h
+++ b/kabc/plugins/evolution/resourceevo.h
@@ -7,7 +7,7 @@ namespace Evolution {
namespace KABC {
class ResourceEvolution : public Resource {
public:
- ResourceEvolution( const KConfig* config );
+ ResourceEvolution( const TDEConfig* config );
~ResourceEvolution();
bool doOpen();
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index b391dffa..3e5b1fa8 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -46,7 +46,7 @@
using namespace KABC;
-ResourceFile::ResourceFile( const KConfig *config )
+ResourceFile::ResourceFile( const TDEConfig *config )
: Resource( config ), mFormat( 0 ),
mAsynchronous( false )
{
@@ -98,7 +98,7 @@ ResourceFile::~ResourceFile()
mFormat = 0;
}
-void ResourceFile::writeConfig( KConfig *config )
+void ResourceFile::writeConfig( TDEConfig *config )
{
Resource::writeConfig( config );
diff --git a/kabc/plugins/file/resourcefile.h b/kabc/plugins/file/resourcefile.h
index b44c22ec..494c43ea 100644
--- a/kabc/plugins/file/resourcefile.h
+++ b/kabc/plugins/file/resourcefile.h
@@ -47,7 +47,7 @@ class KABC_EXPORT ResourceFile : public Resource
@param cfg The config object where custom resource settings are stored.
*/
- ResourceFile( const KConfig *cfg );
+ ResourceFile( const TDEConfig *cfg );
/**
Construct file resource on file @arg fileName using format @arg formatName.
@@ -62,7 +62,7 @@ class KABC_EXPORT ResourceFile : public Resource
/**
Writes the config back.
*/
- virtual void writeConfig( KConfig *cfg );
+ virtual void writeConfig( TDEConfig *cfg );
/**
Tries to open the file and checks for the proper format.
diff --git a/kabc/plugins/ldapkio/resourceldapkio.cpp b/kabc/plugins/ldapkio/resourceldapkio.cpp
index e8da1b6a..03a49e81 100644
--- a/kabc/plugins/ldapkio/resourceldapkio.cpp
+++ b/kabc/plugins/ldapkio/resourceldapkio.cpp
@@ -47,7 +47,7 @@ using namespace KABC;
void tqt_enter_modal( TQWidget *widget );
void tqt_leave_modal( TQWidget *widget );
-class ResourceLDAPKIO::ResourceLDAPKIOPrivate
+class ResourceLDAPTDEIO::ResourceLDAPKIOPrivate
{
public:
LDIF mLdif;
@@ -69,7 +69,7 @@ class ResourceLDAPKIO::ResourceLDAPKIOPrivate
KTempFile *mTmp;
};
-ResourceLDAPKIO::ResourceLDAPKIO( const KConfig *config )
+ResourceLDAPTDEIO::ResourceLDAPKIO( const TDEConfig *config )
: Resource( config )
{
d = new ResourceLDAPKIOPrivate;
@@ -115,12 +115,12 @@ ResourceLDAPKIO::ResourceLDAPKIO( const KConfig *config )
init();
}
-ResourceLDAPKIO::~ResourceLDAPKIO()
+ResourceLDAPTDEIO::~ResourceLDAPKIO()
{
delete d;
}
-void ResourceLDAPKIO::enter_loop()
+void ResourceLDAPTDEIO::enter_loop()
{
TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal));
dummy.setFocusPolicy( TQ_NoFocus );
@@ -129,14 +129,14 @@ void ResourceLDAPKIO::enter_loop()
tqt_leave_modal(&dummy);
}
-void ResourceLDAPKIO::entries( KIO::Job*, const KIO::UDSEntryList & list )
+void ResourceLDAPTDEIO::entries( TDEIO::Job*, const TDEIO::UDSEntryList & list )
{
- KIO::UDSEntryListConstIterator it = list.begin();
- KIO::UDSEntryListConstIterator end = list.end();
+ TDEIO::UDSEntryListConstIterator it = list.begin();
+ TDEIO::UDSEntryListConstIterator end = list.end();
for (; it != end; ++it) {
- KIO::UDSEntry::ConstIterator it2 = (*it).begin();
+ TDEIO::UDSEntry::ConstIterator it2 = (*it).begin();
for( ; it2 != (*it).end(); it2++ ) {
- if ( (*it2).m_uds == KIO::UDS_URL ) {
+ if ( (*it2).m_uds == TDEIO::UDS_URL ) {
KURL tmpurl( (*it2).m_str );
d->mResultDn = tmpurl.path();
kdDebug(7125) << "findUid(): " << d->mResultDn << endl;
@@ -147,20 +147,20 @@ void ResourceLDAPKIO::entries( KIO::Job*, const KIO::UDSEntryList & list )
}
}
-void ResourceLDAPKIO::listResult( KIO::Job *job)
+void ResourceLDAPTDEIO::listResult( TDEIO::Job *job)
{
d->mError = job->error();
- if ( d->mError && d->mError != KIO::ERR_USER_CANCELED )
+ if ( d->mError && d->mError != TDEIO::ERR_USER_CANCELED )
mErrorMsg = job->errorString();
else
mErrorMsg = "";
tqApp->exit_loop();
}
-TQString ResourceLDAPKIO::findUid( const TQString &uid )
+TQString ResourceLDAPTDEIO::findUid( const TQString &uid )
{
LDAPUrl url( d->mLDAPUrl );
- KIO::UDSEntry entry;
+ TDEIO::UDSEntry entry;
mErrorMsg = d->mResultDn = "";
@@ -168,21 +168,21 @@ TQString ResourceLDAPKIO::findUid( const TQString &uid )
url.setFilter( "(" + mAttributes[ "uid" ] + "=" + uid + ")" + mFilter );
url.setExtension( "x-dir", "one" );
- kdDebug(7125) << "ResourceLDAPKIO::findUid() uid: " << uid << " url " <<
+ kdDebug(7125) << "ResourceLDAPTDEIO::findUid() uid: " << uid << " url " <<
url.prettyURL() << endl;
- KIO::ListJob * listJob = KIO::listDir( url, false /* no GUI */ );
+ TDEIO::ListJob * listJob = TDEIO::listDir( url, false /* no GUI */ );
connect( listJob,
- TQT_SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList& ) ),
- TQT_SLOT( entries( KIO::Job*, const KIO::UDSEntryList& ) ) );
- connect( listJob, TQT_SIGNAL( result( KIO::Job* ) ),
- this, TQT_SLOT( listResult( KIO::Job* ) ) );
+ TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ),
+ TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
+ connect( listJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQT_SLOT( listResult( TDEIO::Job* ) ) );
enter_loop();
return d->mResultDn;
}
-TQCString ResourceLDAPKIO::addEntry( const TQString &attr, const TQString &value, bool mod )
+TQCString ResourceLDAPTDEIO::addEntry( const TQString &attr, const TQString &value, bool mod )
{
TQCString tmp;
if ( !attr.isEmpty() ) {
@@ -193,7 +193,7 @@ TQCString ResourceLDAPKIO::addEntry( const TQString &attr, const TQString &value
return ( tmp );
}
-bool ResourceLDAPKIO::AddresseeToLDIF( TQByteArray &ldif, const Addressee &addr,
+bool ResourceLDAPTDEIO::AddresseeToLDIF( TQByteArray &ldif, const Addressee &addr,
const TQString &olddn )
{
TQCString tmp;
@@ -313,14 +313,14 @@ bool ResourceLDAPKIO::AddresseeToLDIF( TQByteArray &ldif, const Addressee &addr,
return true;
}
-void ResourceLDAPKIO::setReadOnly( bool value )
+void ResourceLDAPTDEIO::setReadOnly( bool value )
{
//save the original readonly flag, because offline using disables writing
d->mReadOnly = true;
Resource::setReadOnly( value );
}
-void ResourceLDAPKIO::init()
+void ResourceLDAPTDEIO::init()
{
if ( mPort == 0 ) mPort = 389;
@@ -417,7 +417,7 @@ void ResourceLDAPKIO::init()
kdDebug(7125) << "resource_ldapkio url: " << d->mLDAPUrl.prettyURL() << endl;
}
-void ResourceLDAPKIO::writeConfig( KConfig *config )
+void ResourceLDAPTDEIO::writeConfig( TDEConfig *config )
{
Resource::writeConfig( config );
@@ -450,7 +450,7 @@ void ResourceLDAPKIO::writeConfig( KConfig *config )
config->writeEntry( "LdapAttributes", attributes );
}
-Ticket *ResourceLDAPKIO::requestSaveTicket()
+Ticket *ResourceLDAPTDEIO::requestSaveTicket()
{
if ( !addressBook() ) {
kdDebug(7125) << "no addressbook" << endl;
@@ -460,21 +460,21 @@ Ticket *ResourceLDAPKIO::requestSaveTicket()
return createTicket( this );
}
-void ResourceLDAPKIO::releaseSaveTicket( Ticket *ticket )
+void ResourceLDAPTDEIO::releaseSaveTicket( Ticket *ticket )
{
delete ticket;
}
-bool ResourceLDAPKIO::doOpen()
+bool ResourceLDAPTDEIO::doOpen()
{
return true;
}
-void ResourceLDAPKIO::doClose()
+void ResourceLDAPTDEIO::doClose()
{
}
-void ResourceLDAPKIO::createCache()
+void ResourceLDAPTDEIO::createCache()
{
d->mTmp = NULL;
if ( d->mCachePolicy == Cache_NoConnection && d->mAutoCache ) {
@@ -483,7 +483,7 @@ void ResourceLDAPKIO::createCache()
}
}
-void ResourceLDAPKIO::activateCache()
+void ResourceLDAPTDEIO::activateCache()
{
if ( d->mTmp && d->mError == 0 ) {
d->mTmp->close();
@@ -495,12 +495,12 @@ void ResourceLDAPKIO::activateCache()
}
}
-KIO::Job *ResourceLDAPKIO::loadFromCache()
+TDEIO::Job *ResourceLDAPTDEIO::loadFromCache()
{
- KIO::Job *job = NULL;
+ TDEIO::Job *job = NULL;
if ( d->mCachePolicy == Cache_Always ||
( d->mCachePolicy == Cache_NoConnection &&
- d->mError == KIO::ERR_COULD_NOT_CONNECT ) ) {
+ d->mError == TDEIO::ERR_COULD_NOT_CONNECT ) ) {
d->mAddr = Addressee();
d->mAd = Address( Address::Home );
@@ -510,17 +510,17 @@ KIO::Job *ResourceLDAPKIO::loadFromCache()
Resource::setReadOnly( true );
KURL url( d->mCacheDst );
- job = KIO::get( url, true, false );
- connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
- this, TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) );
+ job = TDEIO::get( url, true, false );
+ connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+ this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
}
return job;
}
-bool ResourceLDAPKIO::load()
+bool ResourceLDAPTDEIO::load()
{
- kdDebug(7125) << "ResourceLDAPKIO::load()" << endl;
- KIO::Job *job;
+ kdDebug(7125) << "ResourceLDAPTDEIO::load()" << endl;
+ TDEIO::Job *job;
clear();
//clear the addressee
@@ -534,18 +534,18 @@ bool ResourceLDAPKIO::load()
createCache();
if ( d->mCachePolicy != Cache_Always ) {
- job = KIO::get( d->mLDAPUrl, true, false );
- connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
- this, TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) );
- connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
- this, TQT_SLOT( syncLoadSaveResult( KIO::Job* ) ) );
+ job = TDEIO::get( d->mLDAPUrl, true, false );
+ connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+ this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) );
enter_loop();
}
job = loadFromCache();
if ( job ) {
- connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
- this, TQT_SLOT( syncLoadSaveResult( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) );
enter_loop();
}
if ( mErrorMsg.isEmpty() ) {
@@ -558,7 +558,7 @@ bool ResourceLDAPKIO::load()
}
}
-bool ResourceLDAPKIO::asyncLoad()
+bool ResourceLDAPTDEIO::asyncLoad()
{
clear();
//clear the addressee
@@ -571,18 +571,18 @@ bool ResourceLDAPKIO::asyncLoad()
createCache();
if ( d->mCachePolicy != Cache_Always ) {
- KIO::Job *job = KIO::get( d->mLDAPUrl, true, false );
- connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
- this, TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) );
- connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
- this, TQT_SLOT( result( KIO::Job* ) ) );
+ TDEIO::Job *job = TDEIO::get( d->mLDAPUrl, true, false );
+ connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+ this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQT_SLOT( result( TDEIO::Job* ) ) );
} else {
result( NULL );
}
return true;
}
-void ResourceLDAPKIO::data( KIO::Job *, const TQByteArray &data )
+void ResourceLDAPTDEIO::data( TDEIO::Job *, const TQByteArray &data )
{
if ( data.size() ) {
d->mLdif.setLDIF( data );
@@ -685,11 +685,11 @@ void ResourceLDAPKIO::data( KIO::Job *, const TQByteArray &data )
} while ( ret != LDIF::MoreData );
}
-void ResourceLDAPKIO::loadCacheResult( KIO::Job *job )
+void ResourceLDAPTDEIO::loadCacheResult( TDEIO::Job *job )
{
mErrorMsg = "";
d->mError = job->error();
- if ( d->mError && d->mError != KIO::ERR_USER_CANCELED ) {
+ if ( d->mError && d->mError != TDEIO::ERR_USER_CANCELED ) {
mErrorMsg = job->errorString();
}
if ( !mErrorMsg.isEmpty() )
@@ -698,12 +698,12 @@ void ResourceLDAPKIO::loadCacheResult( KIO::Job *job )
emit loadingFinished( this );
}
-void ResourceLDAPKIO::result( KIO::Job *job )
+void ResourceLDAPTDEIO::result( TDEIO::Job *job )
{
mErrorMsg = "";
if ( job ) {
d->mError = job->error();
- if ( d->mError && d->mError != KIO::ERR_USER_CANCELED ) {
+ if ( d->mError && d->mError != TDEIO::ERR_USER_CANCELED ) {
mErrorMsg = job->errorString();
}
} else {
@@ -711,11 +711,11 @@ void ResourceLDAPKIO::result( KIO::Job *job )
}
activateCache();
- KIO::Job *cjob;
+ TDEIO::Job *cjob;
cjob = loadFromCache();
if ( cjob ) {
- connect( cjob, TQT_SIGNAL( result( KIO::Job* ) ),
- this, TQT_SLOT( loadCacheResult( KIO::Job* ) ) );
+ connect( cjob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQT_SLOT( loadCacheResult( TDEIO::Job* ) ) );
} else {
if ( !mErrorMsg.isEmpty() )
emit loadingError( this, mErrorMsg );
@@ -724,16 +724,16 @@ void ResourceLDAPKIO::result( KIO::Job *job )
}
}
-bool ResourceLDAPKIO::save( Ticket* )
+bool ResourceLDAPTDEIO::save( Ticket* )
{
kdDebug(7125) << "ResourceLDAPKIO save" << endl;
d->mSaveIt = begin();
- KIO::Job *job = KIO::put( d->mLDAPUrl, -1, true, false, false );
- connect( job, TQT_SIGNAL( dataReq( KIO::Job*, TQByteArray& ) ),
- this, TQT_SLOT( saveData( KIO::Job*, TQByteArray& ) ) );
- connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
- this, TQT_SLOT( syncLoadSaveResult( KIO::Job* ) ) );
+ TDEIO::Job *job = TDEIO::put( d->mLDAPUrl, -1, true, false, false );
+ connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ),
+ this, TQT_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) );
enter_loop();
if ( mErrorMsg.isEmpty() ) {
kdDebug(7125) << "ResourceLDAPKIO save ok!" << endl;
@@ -745,22 +745,22 @@ bool ResourceLDAPKIO::save( Ticket* )
}
}
-bool ResourceLDAPKIO::asyncSave( Ticket* )
+bool ResourceLDAPTDEIO::asyncSave( Ticket* )
{
kdDebug(7125) << "ResourceLDAPKIO asyncSave" << endl;
d->mSaveIt = begin();
- KIO::Job *job = KIO::put( d->mLDAPUrl, -1, true, false, false );
- connect( job, TQT_SIGNAL( dataReq( KIO::Job*, TQByteArray& ) ),
- this, TQT_SLOT( saveData( KIO::Job*, TQByteArray& ) ) );
- connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
- this, TQT_SLOT( saveResult( KIO::Job* ) ) );
+ TDEIO::Job *job = TDEIO::put( d->mLDAPUrl, -1, true, false, false );
+ connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ),
+ this, TQT_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQT_SLOT( saveResult( TDEIO::Job* ) ) );
return true;
}
-void ResourceLDAPKIO::syncLoadSaveResult( KIO::Job *job )
+void ResourceLDAPTDEIO::syncLoadSaveResult( TDEIO::Job *job )
{
d->mError = job->error();
- if ( d->mError && d->mError != KIO::ERR_USER_CANCELED )
+ if ( d->mError && d->mError != TDEIO::ERR_USER_CANCELED )
mErrorMsg = job->errorString();
else
mErrorMsg = "";
@@ -769,16 +769,16 @@ void ResourceLDAPKIO::syncLoadSaveResult( KIO::Job *job )
tqApp->exit_loop();
}
-void ResourceLDAPKIO::saveResult( KIO::Job *job )
+void ResourceLDAPTDEIO::saveResult( TDEIO::Job *job )
{
d->mError = job->error();
- if ( d->mError && d->mError != KIO::ERR_USER_CANCELED )
+ if ( d->mError && d->mError != TDEIO::ERR_USER_CANCELED )
emit savingError( this, job->errorString() );
else
emit savingFinished( this );
}
-void ResourceLDAPKIO::saveData( KIO::Job*, TQByteArray& data )
+void ResourceLDAPTDEIO::saveData( TDEIO::Job*, TQByteArray& data )
{
while ( d->mSaveIt != end() &&
!(*d->mSaveIt).changed() ) d->mSaveIt++;
@@ -799,7 +799,7 @@ void ResourceLDAPKIO::saveData( KIO::Job*, TQByteArray& data )
d->mSaveIt++;
}
-void ResourceLDAPKIO::removeAddressee( const Addressee& addr )
+void ResourceLDAPTDEIO::removeAddressee( const Addressee& addr )
{
TQString dn = findUid( addr.uid() );
@@ -815,7 +815,7 @@ void ResourceLDAPKIO::removeAddressee( const Addressee& addr )
url.setPath( "/" + dn );
url.setExtension( "x-dir", "base" );
url.setScope( LDAPUrl::Base );
- if ( KIO::NetAccess::del( url, NULL ) ) mAddrMap.erase( addr.uid() );
+ if ( TDEIO::NetAccess::del( url, NULL ) ) mAddrMap.erase( addr.uid() );
} else {
//maybe it's not saved yet
mAddrMap.erase( addr.uid() );
@@ -823,216 +823,216 @@ void ResourceLDAPKIO::removeAddressee( const Addressee& addr )
}
-void ResourceLDAPKIO::setUser( const TQString &user )
+void ResourceLDAPTDEIO::setUser( const TQString &user )
{
mUser = user;
}
-TQString ResourceLDAPKIO::user() const
+TQString ResourceLDAPTDEIO::user() const
{
return mUser;
}
-void ResourceLDAPKIO::setPassword( const TQString &password )
+void ResourceLDAPTDEIO::setPassword( const TQString &password )
{
mPassword = password;
}
-TQString ResourceLDAPKIO::password() const
+TQString ResourceLDAPTDEIO::password() const
{
return mPassword;
}
-void ResourceLDAPKIO::setDn( const TQString &dn )
+void ResourceLDAPTDEIO::setDn( const TQString &dn )
{
mDn = dn;
}
-TQString ResourceLDAPKIO::dn() const
+TQString ResourceLDAPTDEIO::dn() const
{
return mDn;
}
-void ResourceLDAPKIO::setHost( const TQString &host )
+void ResourceLDAPTDEIO::setHost( const TQString &host )
{
mHost = host;
}
-TQString ResourceLDAPKIO::host() const
+TQString ResourceLDAPTDEIO::host() const
{
return mHost;
}
-void ResourceLDAPKIO::setPort( int port )
+void ResourceLDAPTDEIO::setPort( int port )
{
mPort = port;
}
-int ResourceLDAPKIO::port() const
+int ResourceLDAPTDEIO::port() const
{
return mPort;
}
-void ResourceLDAPKIO::setVer( int ver )
+void ResourceLDAPTDEIO::setVer( int ver )
{
d->mVer = ver;
}
-int ResourceLDAPKIO::ver() const
+int ResourceLDAPTDEIO::ver() const
{
return d->mVer;
}
-void ResourceLDAPKIO::setSizeLimit( int sizelimit )
+void ResourceLDAPTDEIO::setSizeLimit( int sizelimit )
{
d->mSizeLimit = sizelimit;
}
-int ResourceLDAPKIO::sizeLimit()
+int ResourceLDAPTDEIO::sizeLimit()
{
return d->mSizeLimit;
}
-void ResourceLDAPKIO::setTimeLimit( int timelimit )
+void ResourceLDAPTDEIO::setTimeLimit( int timelimit )
{
d->mTimeLimit = timelimit;
}
-int ResourceLDAPKIO::timeLimit()
+int ResourceLDAPTDEIO::timeLimit()
{
return d->mTimeLimit;
}
-void ResourceLDAPKIO::setFilter( const TQString &filter )
+void ResourceLDAPTDEIO::setFilter( const TQString &filter )
{
mFilter = filter;
}
-TQString ResourceLDAPKIO::filter() const
+TQString ResourceLDAPTDEIO::filter() const
{
return mFilter;
}
-void ResourceLDAPKIO::setIsAnonymous( bool value )
+void ResourceLDAPTDEIO::setIsAnonymous( bool value )
{
mAnonymous = value;
}
-bool ResourceLDAPKIO::isAnonymous() const
+bool ResourceLDAPTDEIO::isAnonymous() const
{
return mAnonymous;
}
-void ResourceLDAPKIO::setIsTLS( bool value )
+void ResourceLDAPTDEIO::setIsTLS( bool value )
{
d->mTLS = value;
}
-bool ResourceLDAPKIO::isTLS() const
+bool ResourceLDAPTDEIO::isTLS() const
{
return d->mTLS;
}
-void ResourceLDAPKIO::setIsSSL( bool value )
+void ResourceLDAPTDEIO::setIsSSL( bool value )
{
d->mSSL = value;
}
-bool ResourceLDAPKIO::isSSL() const
+bool ResourceLDAPTDEIO::isSSL() const
{
return d->mSSL;
}
-void ResourceLDAPKIO::setIsSubTree( bool value )
+void ResourceLDAPTDEIO::setIsSubTree( bool value )
{
d->mSubTree = value;
}
-bool ResourceLDAPKIO::isSubTree() const
+bool ResourceLDAPTDEIO::isSubTree() const
{
return d->mSubTree;
}
-void ResourceLDAPKIO::setAttributes( const TQMap<TQString, TQString> &attributes )
+void ResourceLDAPTDEIO::setAttributes( const TQMap<TQString, TQString> &attributes )
{
mAttributes = attributes;
}
-TQMap<TQString, TQString> ResourceLDAPKIO::attributes() const
+TQMap<TQString, TQString> ResourceLDAPTDEIO::attributes() const
{
return mAttributes;
}
-void ResourceLDAPKIO::setRDNPrefix( int value )
+void ResourceLDAPTDEIO::setRDNPrefix( int value )
{
d->mRDNPrefix = value;
}
-int ResourceLDAPKIO::RDNPrefix() const
+int ResourceLDAPTDEIO::RDNPrefix() const
{
return d->mRDNPrefix;
}
-void ResourceLDAPKIO::setIsSASL( bool value )
+void ResourceLDAPTDEIO::setIsSASL( bool value )
{
d->mSASL = value;
}
-bool ResourceLDAPKIO::isSASL() const
+bool ResourceLDAPTDEIO::isSASL() const
{
return d->mSASL;
}
-void ResourceLDAPKIO::setMech( const TQString &mech )
+void ResourceLDAPTDEIO::setMech( const TQString &mech )
{
d->mMech = mech;
}
-TQString ResourceLDAPKIO::mech() const
+TQString ResourceLDAPTDEIO::mech() const
{
return d->mMech;
}
-void ResourceLDAPKIO::setRealm( const TQString &realm )
+void ResourceLDAPTDEIO::setRealm( const TQString &realm )
{
d->mRealm = realm;
}
-TQString ResourceLDAPKIO::realm() const
+TQString ResourceLDAPTDEIO::realm() const
{
return d->mRealm;
}
-void ResourceLDAPKIO::setBindDN( const TQString &binddn )
+void ResourceLDAPTDEIO::setBindDN( const TQString &binddn )
{
d->mBindDN = binddn;
}
-TQString ResourceLDAPKIO::bindDN() const
+TQString ResourceLDAPTDEIO::bindDN() const
{
return d->mBindDN;
}
-void ResourceLDAPKIO::setCachePolicy( int pol )
+void ResourceLDAPTDEIO::setCachePolicy( int pol )
{
d->mCachePolicy = pol;
}
-int ResourceLDAPKIO::cachePolicy() const
+int ResourceLDAPTDEIO::cachePolicy() const
{
return d->mCachePolicy;
}
-void ResourceLDAPKIO::setAutoCache( bool value )
+void ResourceLDAPTDEIO::setAutoCache( bool value )
{
d->mAutoCache = value;
}
-bool ResourceLDAPKIO::autoCache()
+bool ResourceLDAPTDEIO::autoCache()
{
return d->mAutoCache;
}
-TQString ResourceLDAPKIO::cacheDst() const
+TQString ResourceLDAPTDEIO::cacheDst() const
{
return d->mCacheDst;
}
diff --git a/kabc/plugins/ldapkio/resourceldapkio.h b/kabc/plugins/ldapkio/resourceldapkio.h
index 2b5685fd..8519955d 100644
--- a/kabc/plugins/ldapkio/resourceldapkio.h
+++ b/kabc/plugins/ldapkio/resourceldapkio.h
@@ -26,7 +26,7 @@
#include <kabc/ldif.h>
#include <kio/job.h>
-class KConfig;
+class TDEConfig;
namespace KABC {
@@ -37,14 +37,14 @@ class KABC_EXPORT ResourceLDAPKIO : public Resource
public:
enum CachePolicy{ Cache_No, Cache_NoConnection, Cache_Always };
- ResourceLDAPKIO( const KConfig* );
+ ResourceLDAPKIO( const TDEConfig* );
virtual ~ResourceLDAPKIO();
/**
* Call this after you used one of the set... methods
*/
virtual void init();
- virtual void writeConfig( KConfig* );
+ virtual void writeConfig( TDEConfig* );
virtual bool doOpen();
virtual void doClose();
@@ -128,14 +128,14 @@ class KABC_EXPORT ResourceLDAPKIO : public Resource
TQString cacheDst() const;
protected slots:
- void entries( KIO::Job*, const KIO::UDSEntryList& );
- void data( KIO::Job*, const TQByteArray& );
- void result( KIO::Job* );
- void listResult( KIO::Job* );
- void syncLoadSaveResult( KIO::Job* );
- void saveResult( KIO::Job* );
- void saveData( KIO::Job*, TQByteArray& );
- void loadCacheResult( KIO::Job* );
+ void entries( TDEIO::Job*, const TDEIO::UDSEntryList& );
+ void data( TDEIO::Job*, const TQByteArray& );
+ void result( TDEIO::Job* );
+ void listResult( TDEIO::Job* );
+ void syncLoadSaveResult( TDEIO::Job* );
+ void saveResult( TDEIO::Job* );
+ void saveData( TDEIO::Job*, TQByteArray& );
+ void loadCacheResult( TDEIO::Job* );
private:
TQString mUser;
@@ -151,9 +151,9 @@ protected slots:
int mGetCounter; //KDE 4: remove
bool mErrorOccured; //KDE 4: remove
TQString mErrorMsg;
- TQMap<KIO::Job*, TQByteArray> mJobMap; //KDE 4: remove
+ TQMap<TDEIO::Job*, TQByteArray> mJobMap; //KDE 4: remove
- KIO::Job *loadFromCache();
+ TDEIO::Job *loadFromCache();
void createCache();
void activateCache();
void enter_loop();
diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
index 27132852..7ecd1455 100644
--- a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
+++ b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
@@ -378,7 +378,7 @@ int OfflineDialog::cachePolicy() const
void OfflineDialog::loadCache()
{
- if ( KIO::NetAccess::download( mSrc, mDst, this ) ) {
+ if ( TDEIO::NetAccess::download( mSrc, mDst, this ) ) {
KMessageBox::information( this,
i18n("Successfully downloaded directory server contents!") );
} else {
diff --git a/kabc/plugins/net/resourcenet.cpp b/kabc/plugins/net/resourcenet.cpp
index 91488587..78fb1625 100644
--- a/kabc/plugins/net/resourcenet.cpp
+++ b/kabc/plugins/net/resourcenet.cpp
@@ -40,16 +40,16 @@ using namespace KABC;
class ResourceNet::ResourceNetPrivate
{
public:
- KIO::Job *mLoadJob;
+ TDEIO::Job *mLoadJob;
bool mIsLoading;
- KIO::Job *mSaveJob;
+ TDEIO::Job *mSaveJob;
bool mIsSaving;
TQString mLastErrorString;
};
-ResourceNet::ResourceNet( const KConfig *config )
+ResourceNet::ResourceNet( const TDEConfig *config )
: Resource( config ), mFormat( 0 ),
mTempFile( 0 ),
d( new ResourceNetPrivate )
@@ -104,7 +104,7 @@ ResourceNet::~ResourceNet()
deleteLocalTempFile();
}
-void ResourceNet::writeConfig( KConfig *config )
+void ResourceNet::writeConfig( TDEConfig *config )
{
Resource::writeConfig( config );
@@ -137,7 +137,7 @@ bool ResourceNet::load()
{
TQString tempFile;
- if ( !KIO::NetAccess::download( mUrl, tempFile, 0 ) ) {
+ if ( !TDEIO::NetAccess::download( mUrl, tempFile, 0 ) ) {
addressBook()->error( i18n( "Unable to download file '%1'." ).arg( mUrl.prettyURL() ) );
return false;
}
@@ -145,7 +145,7 @@ bool ResourceNet::load()
TQFile file( tempFile );
if ( !file.open( IO_ReadOnly ) ) {
addressBook()->error( i18n( "Unable to open file '%1'." ).arg( tempFile ) );
- KIO::NetAccess::removeTempFile( tempFile );
+ TDEIO::NetAccess::removeTempFile( tempFile );
return false;
}
@@ -153,7 +153,7 @@ bool ResourceNet::load()
if ( !result )
addressBook()->error( i18n( "Problems during parsing file '%1'." ).arg( tempFile ) );
- KIO::NetAccess::removeTempFile( tempFile );
+ TDEIO::NetAccess::removeTempFile( tempFile );
return result;
}
@@ -189,11 +189,11 @@ bool ResourceNet::asyncLoad()
KURL dest;
dest.setPath( mTempFile->name() );
- KIO::Scheduler::checkSlaveOnHold( true );
- d->mLoadJob = KIO::file_copy( mUrl, dest, -1, true, false, false );
+ TDEIO::Scheduler::checkSlaveOnHold( true );
+ d->mLoadJob = TDEIO::file_copy( mUrl, dest, -1, true, false, false );
d->mIsLoading = true;
- connect( d->mLoadJob, TQT_SIGNAL( result( KIO::Job* ) ),
- this, TQT_SLOT( downloadFinished( KIO::Job* ) ) );
+ connect( d->mLoadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQT_SLOT( downloadFinished( TDEIO::Job* ) ) );
return true;
}
@@ -247,7 +247,7 @@ bool ResourceNet::save( Ticket* )
return false;
}
- ok = KIO::NetAccess::upload( tempFile.name(), mUrl, 0 );
+ ok = TDEIO::NetAccess::upload( tempFile.name(), mUrl, 0 );
if ( !ok )
addressBook()->error( i18n( "Unable to upload to '%1'." ).arg( mUrl.prettyURL() ) );
@@ -283,11 +283,11 @@ bool ResourceNet::asyncSave( Ticket* )
KURL src;
src.setPath( mTempFile->name() );
- KIO::Scheduler::checkSlaveOnHold( true );
+ TDEIO::Scheduler::checkSlaveOnHold( true );
d->mIsSaving = true;
- d->mSaveJob = KIO::file_copy( src, mUrl, -1, true, false, false );
- connect( d->mSaveJob, TQT_SIGNAL( result( KIO::Job* ) ),
- this, TQT_SLOT( uploadFinished( KIO::Job* ) ) );
+ d->mSaveJob = TDEIO::file_copy( src, mUrl, -1, true, false, false );
+ connect( d->mSaveJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQT_SLOT( uploadFinished( TDEIO::Job* ) ) );
return true;
}
@@ -344,7 +344,7 @@ TQString ResourceNet::format() const
return mFormatName;
}
-void ResourceNet::downloadFinished( KIO::Job* )
+void ResourceNet::downloadFinished( TDEIO::Job* )
{
kdDebug(5700) << "ResourceNet::downloadFinished()" << endl;
@@ -370,7 +370,7 @@ void ResourceNet::downloadFinished( KIO::Job* )
deleteLocalTempFile();
}
-void ResourceNet::uploadFinished( KIO::Job *job )
+void ResourceNet::uploadFinished( TDEIO::Job *job )
{
kdDebug(5700) << "ResourceFile::uploadFinished()" << endl;
diff --git a/kabc/plugins/net/resourcenet.h b/kabc/plugins/net/resourcenet.h
index 326c3780..a13bfa17 100644
--- a/kabc/plugins/net/resourcenet.h
+++ b/kabc/plugins/net/resourcenet.h
@@ -31,7 +31,7 @@ class TQFile;
class TQTimer;
class KTempFile;
-namespace KIO {
+namespace TDEIO {
class Job;
}
@@ -47,11 +47,11 @@ class KABC_EXPORT ResourceNet : public Resource
Q_OBJECT
public:
- ResourceNet( const KConfig* );
+ ResourceNet( const TDEConfig* );
ResourceNet( const KURL &url, const TQString &format );
~ResourceNet();
- virtual void writeConfig( KConfig* );
+ virtual void writeConfig( TDEConfig* );
virtual bool doOpen();
virtual void doClose();
@@ -88,8 +88,8 @@ class KABC_EXPORT ResourceNet : public Resource
void init( const KURL &url, const TQString &format );
private slots:
- void downloadFinished( KIO::Job* );
- void uploadFinished( KIO::Job* );
+ void downloadFinished( TDEIO::Job* );
+ void uploadFinished( TDEIO::Job* );
void signalError();
private:
diff --git a/kabc/plugins/sql/resourcesql.cpp b/kabc/plugins/sql/resourcesql.cpp
index 55f02bae..150fe54e 100644
--- a/kabc/plugins/sql/resourcesql.cpp
+++ b/kabc/plugins/sql/resourcesql.cpp
@@ -39,7 +39,7 @@ extern "C"
}
}
-ResourceSql::ResourceSql( AddressBook *ab, const KConfig *config )
+ResourceSql::ResourceSql( AddressBook *ab, const TDEConfig *config )
: Resource( ab ), mDb( 0 )
{
TQString user, password, db, host;
diff --git a/kabc/plugins/sql/resourcesql.h b/kabc/plugins/sql/resourcesql.h
index 80ebf9e7..9f120184 100644
--- a/kabc/plugins/sql/resourcesql.h
+++ b/kabc/plugins/sql/resourcesql.h
@@ -35,7 +35,7 @@ class ResourceSql : public Resource
public:
ResourceSql( AddressBook *ab, const TQString &user, const TQString &password,
const TQString &db, const TQString &host );
- ResourceSql( AddressBook *ab, const KConfig * );
+ ResourceSql( AddressBook *ab, const TDEConfig * );
bool open();
void close();
diff --git a/kabc/plugins/sql/resourcesqlconfig.cpp b/kabc/plugins/sql/resourcesqlconfig.cpp
index ef1651cd..f62890c3 100644
--- a/kabc/plugins/sql/resourcesqlconfig.cpp
+++ b/kabc/plugins/sql/resourcesqlconfig.cpp
@@ -74,7 +74,7 @@ ResourceSqlConfig::ResourceSqlConfig( TQWidget* parent, const char* name )
mainLayout->addWidget( mDbName, 4, 1 );
}
-void ResourceSqlConfig::loadSettings( KConfig *config )
+void ResourceSqlConfig::loadSettings( TDEConfig *config )
{
mUser->setText( config->readEntry( "SqlUser" ) );
mPassword->setText( KABC::Resource::cryptStr( config->readEntry( "SqlPassword" ) ) );
@@ -83,7 +83,7 @@ void ResourceSqlConfig::loadSettings( KConfig *config )
mPort->setValue( config->readNumEntry( "SqlPort" ) );
}
-void ResourceSqlConfig::saveSettings( KConfig *config )
+void ResourceSqlConfig::saveSettings( TDEConfig *config )
{
config->writeEntry( "SqlUser", mUser->text() );
config->writeEntry( "SqlPassword", KABC::Resource::cryptStr( mPassword->text() ) );
diff --git a/kabc/plugins/sql/resourcesqlconfig.h b/kabc/plugins/sql/resourcesqlconfig.h
index 7bd27d96..ae2de7d6 100644
--- a/kabc/plugins/sql/resourcesqlconfig.h
+++ b/kabc/plugins/sql/resourcesqlconfig.h
@@ -36,8 +36,8 @@ public:
ResourceSqlConfig( TQWidget* parent = 0, const char* name = 0 );
public slots:
- void loadSettings( KConfig *config );
- void saveSettings( KConfig *config );
+ void loadSettings( TDEConfig *config );
+ void saveSettings( TDEConfig *config );
private:
KLineEdit* mUser;
diff --git a/kabc/resource.cpp b/kabc/resource.cpp
index d43c6832..57c8588e 100644
--- a/kabc/resource.cpp
+++ b/kabc/resource.cpp
@@ -197,7 +197,7 @@ bool Resource::ConstIterator::operator!=( const ConstIterator &it )
}
-Resource::Resource( const KConfig *config )
+Resource::Resource( const TDEConfig *config )
: KRES::Resource( config ), mAddressBook( 0 )
{
}
@@ -236,7 +236,7 @@ Resource::ConstIterator Resource::end() const
return it;
}
-void Resource::writeConfig( KConfig *config )
+void Resource::writeConfig( TDEConfig *config )
{
KRES::Resource::writeConfig( config );
}
diff --git a/kabc/resource.h b/kabc/resource.h
index 0412a22b..4824ffda 100644
--- a/kabc/resource.h
+++ b/kabc/resource.h
@@ -118,7 +118,7 @@ class KABC_EXPORT Resource : public KRES::Resource
@param config The config object where the derived classes can
read out their settings.
*/
- Resource( const KConfig *config );
+ Resource( const TDEConfig *config );
/**
Destructor.
@@ -157,7 +157,7 @@ class KABC_EXPORT Resource : public KRES::Resource
/**
Writes the resource specific config to file.
*/
- virtual void writeConfig( KConfig *config );
+ virtual void writeConfig( TDEConfig *config );
/**
Request a ticket, you have to pass through save() to
diff --git a/kabc/scripts/field.src.cpp b/kabc/scripts/field.src.cpp
index b0704e39..6362d223 100644
--- a/kabc/scripts/field.src.cpp
+++ b/kabc/scripts/field.src.cpp
@@ -428,13 +428,13 @@ void Field::deleteFields()
void Field::saveFields( const TQString &identifier,
const Field::List &fields )
{
- KConfig *cfg = TDEGlobal::config();
- KConfigGroupSaver( cfg, "KABCFields" );
+ TDEConfig *cfg = TDEGlobal::config();
+ TDEConfigGroupSaver( cfg, "KABCFields" );
saveFields( cfg, identifier, fields );
}
-void Field::saveFields( KConfig *cfg, const TQString &identifier,
+void Field::saveFields( TDEConfig *cfg, const TQString &identifier,
const Field::List &fields )
{
TQValueList<int> fieldIds;
@@ -458,13 +458,13 @@ void Field::saveFields( KConfig *cfg, const TQString &identifier,
Field::List Field::restoreFields( const TQString &identifier )
{
- KConfig *cfg = TDEGlobal::config();
- KConfigGroupSaver( cfg, "KABCFields" );
+ TDEConfig *cfg = TDEGlobal::config();
+ TDEConfigGroupSaver( cfg, "KABCFields" );
return restoreFields( cfg, identifier );
}
-Field::List Field::restoreFields( KConfig *cfg, const TQString &identifier )
+Field::List Field::restoreFields( TDEConfig *cfg, const TQString &identifier )
{
const TQValueList<int> fieldIds = cfg->readIntListEntry( identifier );
diff --git a/kabc/sound.h b/kabc/sound.h
index 133c0fac..98dcf320 100644
--- a/kabc/sound.h
+++ b/kabc/sound.h
@@ -40,10 +40,10 @@ namespace KABC {
* KAudioPlayer::play( tmp.name() );
* } else if(!sound.url().isEmpty()) {
* TQString tmpFile;
- * if(!KIO::NetAccess::download(KURL(themeURL.url()), tmpFile, NULL))
+ * if(!TDEIO::NetAccess::download(KURL(themeURL.url()), tmpFile, NULL))
* {
* KMessageBox::error(0L,
- * KIO::NetAccess::lastErrorString(),
+ * TDEIO::NetAccess::lastErrorString(),
* i18n("Failed to download sound file"),
* KMessageBox::Notify
* );
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp
index 6b574d86..1cf43645 100644
--- a/kabc/stdaddressbook.cpp
+++ b/kabc/stdaddressbook.cpp
@@ -188,7 +188,7 @@ bool StdAddressBook::automaticSave()
// should get const for 4.X
Addressee StdAddressBook::whoAmI()
{
- KConfig config( "kabcrc" );
+ TDEConfig config( "kabcrc" );
config.setGroup( "General" );
return findByUid( config.readEntry( "WhoAmI" ) );
@@ -196,7 +196,7 @@ Addressee StdAddressBook::whoAmI()
void StdAddressBook::setWhoAmI( const Addressee &addr )
{
- KConfig config( "kabcrc" );
+ TDEConfig config( "kabcrc" );
config.setGroup( "General" );
config.writeEntry( "WhoAmI", addr.uid() );
diff --git a/kate/interfaces/view.h b/kate/interfaces/view.h
index 90c61d5a..20bcdf53 100644
--- a/kate/interfaces/view.h
+++ b/kate/interfaces/view.h
@@ -28,7 +28,7 @@
#include <ktexteditor/codecompletioninterface.h>
#include <ktexteditor/dynwordwrapinterface.h>
-class KConfig;
+class TDEConfig;
namespace Kate
{
@@ -189,14 +189,14 @@ class KATEPARTINTERFACES_EXPORT View : public KTextEditor::View, public KTextEdi
public:
/**
- Reads session config out of the KConfig object. This also includes
+ Reads session config out of the TDEConfig object. This also includes
the actual cursor position and the bookmarks.
*/
- virtual void readSessionConfig(KConfig *) { ; };
+ virtual void readSessionConfig(TDEConfig *) { ; };
/**
- Writes session config into the KConfig object.
+ Writes session config into the TDEConfig object.
*/
- virtual void writeSessionConfig(KConfig *) { ; };
+ virtual void writeSessionConfig(TDEConfig *) { ; };
public slots:
/**
diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp
index ef6da69c..81b001c3 100644
--- a/kate/part/kateconfig.cpp
+++ b/kate/part/kateconfig.cpp
@@ -114,7 +114,7 @@ KateDocumentConfig::KateDocumentConfig ()
m_pluginsSet.fill (true);
// init with defaults from config or really hardcoded ones
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
config->setGroup("Kate Document Defaults");
readConfig (config);
}
@@ -149,7 +149,7 @@ KateDocumentConfig::~KateDocumentConfig ()
{
}
-void KateDocumentConfig::readConfig (KConfig *config)
+void KateDocumentConfig::readConfig (TDEConfig *config)
{
configStart ();
@@ -191,7 +191,7 @@ void KateDocumentConfig::readConfig (KConfig *config)
configEnd ();
}
-void KateDocumentConfig::writeConfig (KConfig *config)
+void KateDocumentConfig::writeConfig (TDEConfig *config)
{
config->writeEntry("Tab Width", tabWidth());
@@ -631,7 +631,7 @@ KateViewConfig::KateViewConfig ()
s_global = this;
// init with defaults from config or really hardcoded ones
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
config->setGroup("Kate View Defaults");
readConfig (config);
}
@@ -660,7 +660,7 @@ KateViewConfig::~KateViewConfig ()
{
}
-void KateViewConfig::readConfig (KConfig *config)
+void KateViewConfig::readConfig (TDEConfig *config)
{
configStart ();
@@ -693,7 +693,7 @@ void KateViewConfig::readConfig (KConfig *config)
configEnd ();
}
-void KateViewConfig::writeConfig (KConfig *config)
+void KateViewConfig::writeConfig (TDEConfig *config)
{
config->writeEntry( "Dynamic Word Wrap", dynWordWrap() );
config->writeEntry( "Dynamic Word Wrap Indicators", dynWordWrapIndicators() );
@@ -1022,7 +1022,7 @@ KateRendererConfig::KateRendererConfig ()
s_global = this;
// init with defaults from config or really hardcoded ones
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
config->setGroup("Kate Renderer Defaults");
readConfig (config);
}
@@ -1054,7 +1054,7 @@ KateRendererConfig::~KateRendererConfig ()
delete m_font;
}
-void KateRendererConfig::readConfig (KConfig *config)
+void KateRendererConfig::readConfig (TDEConfig *config)
{
configStart ();
@@ -1067,7 +1067,7 @@ void KateRendererConfig::readConfig (KConfig *config)
configEnd ();
}
-void KateRendererConfig::writeConfig (KConfig *config)
+void KateRendererConfig::writeConfig (TDEConfig *config)
{
config->writeEntry ("Schema", KateFactory::self()->schemaManager()->name(schema()));
@@ -1125,7 +1125,7 @@ void KateRendererConfig::setSchemaInternal( int schema )
m_schemaSet = true;
m_schema = schema;
- KConfig *config (KateFactory::self()->schemaManager()->schema(schema));
+ TDEConfig *config (KateFactory::self()->schemaManager()->schema(schema));
TQColor tmp0 (TDEGlobalSettings::baseColor());
TQColor tmp1 (TDEGlobalSettings::highlightColor());
diff --git a/kate/part/kateconfig.h b/kate/part/kateconfig.h
index 56d094cd..4c1f7294 100644
--- a/kate/part/kateconfig.h
+++ b/kate/part/kateconfig.h
@@ -32,7 +32,7 @@ class KateRenderer;
class KateFontStruct;
class KateFontMetrics;
-class KConfig;
+class TDEConfig;
class TQFont;
class TQTextCodec;
@@ -115,12 +115,12 @@ class KateDocumentConfig : public KateConfig
/**
* Read config from object
*/
- void readConfig (KConfig *config);
+ void readConfig (TDEConfig *config);
/**
* Write config to object
*/
- void writeConfig (KConfig *config);
+ void writeConfig (TDEConfig *config);
protected:
void updateConfig ();
@@ -304,12 +304,12 @@ class KateViewConfig : public KateConfig
/**
* Read config from object
*/
- void readConfig (KConfig *config);
+ void readConfig (TDEConfig *config);
/**
* Write config to object
*/
- void writeConfig (KConfig *config);
+ void writeConfig (TDEConfig *config);
protected:
void updateConfig ();
@@ -432,12 +432,12 @@ class KateRendererConfig : public KateConfig
/**
* Read config from object
*/
- void readConfig (KConfig *config);
+ void readConfig (TDEConfig *config);
/**
* Write config to object
*/
- void writeConfig (KConfig *config);
+ void writeConfig (TDEConfig *config);
protected:
void updateConfig ();
diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp
index 1ae41626..aa122a7b 100644
--- a/kate/part/katedialogs.cpp
+++ b/kate/part/katedialogs.cpp
@@ -1369,7 +1369,7 @@ void KateHlConfigPage::apply ()
for ( TQIntDictIterator<KateHlData> it( hlDataDict ); it.current(); ++it )
KateHlManager::self()->getHl( it.currentKey() )->setData( it.current() );
- KateHlManager::self()->getKConfig()->sync ();
+ KateHlManager::self()->getTDEConfig()->sync ();
}
void KateHlConfigPage::reload ()
@@ -1453,20 +1453,20 @@ KateHlDownloadDialog::KateHlDownloadDialog(TQWidget *parent, const char *name, b
new TQLabel(i18n("<b>Note:</b> New versions are selected automatically."), vbox);
actionButton (User1)->setIconSet(SmallIconSet("ok"));
- transferJob = KIO::get(
+ transferJob = TDEIO::get(
KURL(TQString(HLDOWNLOADPATH)
+ TQString("update-")
+ TQString(KATEPART_VERSION)
+ TQString(".xml")), true, true );
- connect(transferJob, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
- this, TQT_SLOT(listDataReceived(KIO::Job *, const TQByteArray &)));
-// void data( KIO::Job *, const TQByteArray &data);
+ connect(transferJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+ this, TQT_SLOT(listDataReceived(TDEIO::Job *, const TQByteArray &)));
+// void data( TDEIO::Job *, const TQByteArray &data);
resize(450, 400);
}
KateHlDownloadDialog::~KateHlDownloadDialog(){}
-void KateHlDownloadDialog::listDataReceived(KIO::Job *, const TQByteArray &data)
+void KateHlDownloadDialog::listDataReceived(TDEIO::Job *, const TQByteArray &data)
{
if (!transferJob || transferJob->isErrorPage())
{
@@ -1538,7 +1538,7 @@ void KateHlDownloadDialog::slotUser1()
TQString filename=src.fileName(false);
TQString dest = destdir+filename;
- KIO::NetAccess::download(src,dest, this);
+ TDEIO::NetAccess::download(src,dest, this);
}
}
diff --git a/kate/part/katedialogs.h b/kate/part/katedialogs.h
index 169ffaff..fc9fa0a1 100644
--- a/kate/part/katedialogs.h
+++ b/kate/part/katedialogs.h
@@ -46,7 +46,7 @@ struct syntaxContextData;
class KateDocument;
class KateView;
-namespace KIO
+namespace TDEIO
{
class Job;
class TransferJob;
@@ -350,10 +350,10 @@ class KateHlDownloadDialog: public KDialogBase
private:
class TQListView *list;
class TQString listData;
- KIO::TransferJob *transferJob;
+ TDEIO::TransferJob *transferJob;
private slots:
- void listDataReceived(KIO::Job *, const TQByteArray &data);
+ void listDataReceived(TDEIO::Job *, const TQByteArray &data);
public slots:
void slotUser1();
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index b264e653..f8f190c1 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -1879,7 +1879,7 @@ void KateDocument::setDontChangeHlOnSave()
//END
//BEGIN KTextEditor::ConfigInterface stuff
-void KateDocument::readConfig(KConfig *config)
+void KateDocument::readConfig(TDEConfig *config)
{
config->setGroup("Kate Document Defaults");
@@ -1895,7 +1895,7 @@ void KateDocument::readConfig(KConfig *config)
KateRendererConfig::global()->readConfig (config);
}
-void KateDocument::writeConfig(KConfig *config)
+void KateDocument::writeConfig(TDEConfig *config)
{
config->setGroup("Kate Document Defaults");
@@ -1913,18 +1913,18 @@ void KateDocument::writeConfig(KConfig *config)
void KateDocument::readConfig()
{
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
readConfig (config);
}
void KateDocument::writeConfig()
{
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
writeConfig (config);
config->sync();
}
-void KateDocument::readSessionConfig(KConfig *kconfig)
+void KateDocument::readSessionConfig(TDEConfig *kconfig)
{
// restore the url
KURL url (kconfig->readEntry("URL"));
@@ -1953,7 +1953,7 @@ void KateDocument::readSessionConfig(KConfig *kconfig)
addMark( marks[i], KateDocument::markType01 );
}
-void KateDocument::writeSessionConfig(KConfig *kconfig)
+void KateDocument::writeSessionConfig(TDEConfig *kconfig)
{
if ( m_url.isLocalFile() && !TDEGlobal::dirs()->relativeLocation("tmp", m_url.path()).startsWith("/"))
return;
@@ -2302,14 +2302,14 @@ bool KateDocument::openURL( const KURL &url )
m_tempFile = new KTempFile ();
m_file = m_tempFile->name();
- m_job = KIO::get ( url, false, isProgressInfoEnabled() );
+ m_job = TDEIO::get ( url, false, isProgressInfoEnabled() );
// connect to slots
- connect( m_job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
- TQT_SLOT( slotDataKate( KIO::Job*, const TQByteArray& ) ) );
+ connect( m_job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+ TQT_SLOT( slotDataKate( TDEIO::Job*, const TQByteArray& ) ) );
- connect( m_job, TQT_SIGNAL( result( KIO::Job* ) ),
- TQT_SLOT( slotFinishedKate( KIO::Job* ) ) );
+ connect( m_job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+ TQT_SLOT( slotFinishedKate( TDEIO::Job* ) ) );
TQWidget *w = widget ();
if (!w && !m_views.isEmpty ())
@@ -2324,7 +2324,7 @@ bool KateDocument::openURL( const KURL &url )
}
}
-void KateDocument::slotDataKate ( KIO::Job *, const TQByteArray &data )
+void KateDocument::slotDataKate ( TDEIO::Job *, const TQByteArray &data )
{
// kdDebug(13020) << "KateDocument::slotData" << endl;
@@ -2334,7 +2334,7 @@ void KateDocument::slotDataKate ( KIO::Job *, const TQByteArray &data )
m_tempFile->file()->writeBlock (data);
}
-void KateDocument::slotFinishedKate ( KIO::Job * job )
+void KateDocument::slotFinishedKate ( TDEIO::Job * job )
{
// kdDebug(13020) << "KateDocument::slotJobFinished" << endl;
@@ -2373,7 +2373,7 @@ bool KateDocument::openFile()
return openFile (0);
}
-bool KateDocument::openFile(KIO::Job * job)
+bool KateDocument::openFile(TDEIO::Job * job)
{
m_loading = true;
// add new m_file to dirwatch
@@ -2520,8 +2520,8 @@ bool KateDocument::save()
// get the right permissions, start with safe default
mode_t perms = 0600;
- KIO::UDSEntry fentry;
- if (KIO::NetAccess::stat (url(), fentry, kapp->mainWidget()))
+ TDEIO::UDSEntry fentry;
+ if (TDEIO::NetAccess::stat (url(), fentry, kapp->mainWidget()))
{
kdDebug () << "stating succesfull: " << url() << endl;
KFileItem item (fentry, url());
@@ -2530,8 +2530,8 @@ bool KateDocument::save()
// first del existing file if any, than copy over the file we have
// failure if a: the existing file could not be deleted, b: the file could not be copied
- if ( (!KIO::NetAccess::exists( u, false, kapp->mainWidget() ) || KIO::NetAccess::del( u, kapp->mainWidget() ))
- && KIO::NetAccess::file_copy( url(), u, perms, true, false, kapp->mainWidget() ) )
+ if ( (!TDEIO::NetAccess::exists( u, false, kapp->mainWidget() ) || TDEIO::NetAccess::del( u, kapp->mainWidget() ))
+ && TDEIO::NetAccess::file_copy( url(), u, perms, true, false, kapp->mainWidget() ) )
{
kdDebug(13020)<<"backing up successfull ("<<url().prettyURL()<<" -> "<<u.prettyURL()<<")"<<endl;
}
diff --git a/kate/part/katedocument.h b/kate/part/katedocument.h
index d967a25a..fec6983e 100644
--- a/kate/part/katedocument.h
+++ b/kate/part/katedocument.h
@@ -46,7 +46,7 @@
namespace KTextEditor { class Plugin; }
-namespace KIO { class TransferJob; }
+namespace TDEIO { class TransferJob; }
class KateUndoGroup;
class KateCmd;
@@ -439,10 +439,10 @@ class KateDocument : public Kate::Document,
public slots:
void readConfig ();
void writeConfig ();
- void readConfig (KConfig *);
- void writeConfig (KConfig *);
- void readSessionConfig (KConfig *);
- void writeSessionConfig (KConfig *);
+ void readConfig (TDEConfig *);
+ void writeConfig (TDEConfig *);
+ void readSessionConfig (TDEConfig *);
+ void writeSessionConfig (TDEConfig *);
void configDialog ();
//
@@ -555,7 +555,7 @@ class KateDocument : public Kate::Document,
/* Anders: Reimplemented to do kate specific stuff */
bool saveAs( const KURL &url );
- bool openFile (KIO::Job * job);
+ bool openFile (TDEIO::Job * job);
bool openFile ();
bool saveFile ();
@@ -565,8 +565,8 @@ class KateDocument : public Kate::Document,
void setModified( bool m );
private slots:
- void slotDataKate ( KIO::Job* kio_job, const TQByteArray &data );
- void slotFinishedKate ( KIO::Job * job );
+ void slotDataKate ( TDEIO::Job* kio_job, const TQByteArray &data );
+ void slotFinishedKate ( TDEIO::Job * job );
private:
void abortLoadKate();
@@ -1004,7 +1004,7 @@ class KateDocument : public Kate::Document,
static TQRegExp kvLineMime;
static TQRegExp kvVar;
- KIO::TransferJob *m_job;
+ TDEIO::TransferJob *m_job;
KTempFile *m_tempFile;
// TemplateInterface
diff --git a/kate/part/katefiletype.cpp b/kate/part/katefiletype.cpp
index 11d5e9a4..a00d39bf 100644
--- a/kate/part/katefiletype.cpp
+++ b/kate/part/katefiletype.cpp
@@ -72,7 +72,7 @@ KateFileTypeManager::~KateFileTypeManager ()
//
void KateFileTypeManager::update ()
{
- KConfig config ("katefiletyperc", false, false);
+ TDEConfig config ("katefiletyperc", false, false);
TQStringList g (config.groupList());
g.sort ();
@@ -101,7 +101,7 @@ void KateFileTypeManager::update ()
//
void KateFileTypeManager::save (TQPtrList<KateFileType> *v)
{
- KConfig config ("katefiletyperc", false, false);
+ TDEConfig config ("katefiletyperc", false, false);
TQStringList newg;
for (uint z=0; z < v->count(); z++)
diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp
index ca1276a6..08da7e97 100644
--- a/kate/part/katehighlight.cpp
+++ b/kate/part/katehighlight.cpp
@@ -1599,7 +1599,7 @@ void KateHighlighting::doHighlight ( KateTextLine *prevLine,
void KateHighlighting::loadWildcards()
{
- KConfig *config = KateHlManager::self()->getKConfig();
+ TDEConfig *config = KateHlManager::self()->getTDEConfig();
config->setGroup("Highlighting " + iName);
TQString extensionString = config->readEntry("Wildcards", iWildcards);
@@ -1636,7 +1636,7 @@ TQStringList& KateHighlighting::getPlainExtensions()
TQString KateHighlighting::getMimetypes()
{
- KConfig *config = KateHlManager::self()->getKConfig();
+ TDEConfig *config = KateHlManager::self()->getTDEConfig();
config->setGroup("Highlighting " + iName);
return config->readEntry("Mimetypes", iMimetypes);
@@ -1644,7 +1644,7 @@ TQString KateHighlighting::getMimetypes()
int KateHighlighting::priority()
{
- KConfig *config = KateHlManager::self()->getKConfig();
+ TDEConfig *config = KateHlManager::self()->getTDEConfig();
config->setGroup("Highlighting " + iName);
return config->readNumEntry("Priority", m_priority);
@@ -1652,7 +1652,7 @@ int KateHighlighting::priority()
KateHlData *KateHighlighting::getData()
{
- KConfig *config = KateHlManager::self()->getKConfig();
+ TDEConfig *config = KateHlManager::self()->getTDEConfig();
config->setGroup("Highlighting " + iName);
KateHlData *hlData = new KateHlData(
@@ -1666,7 +1666,7 @@ KateHlData *KateHighlighting::getData()
void KateHighlighting::setData(KateHlData *hlData)
{
- KConfig *config = KateHlManager::self()->getKConfig();
+ TDEConfig *config = KateHlManager::self()->getTDEConfig();
config->setGroup("Highlighting " + iName);
config->writeEntry("Wildcards",hlData->wildcards);
@@ -1676,7 +1676,7 @@ void KateHighlighting::setData(KateHlData *hlData)
void KateHighlighting::getKateHlItemDataList (uint schema, KateHlItemDataList &list)
{
- KConfig *config = KateHlManager::self()->getKConfig();
+ TDEConfig *config = KateHlManager::self()->getTDEConfig();
config->setGroup("Highlighting " + iName + " - Schema " + KateFactory::self()->schemaManager()->name(schema));
list.clear();
@@ -1729,7 +1729,7 @@ void KateHighlighting::getKateHlItemDataList (uint schema, KateHlItemDataList &l
*/
void KateHighlighting::setKateHlItemDataList(uint schema, KateHlItemDataList &list)
{
- KConfig *config = KateHlManager::self()->getKConfig();
+ TDEConfig *config = KateHlManager::self()->getTDEConfig();
config->setGroup("Highlighting " + iName + " - Schema "
+ KateFactory::self()->schemaManager()->name(schema));
@@ -3264,7 +3264,7 @@ void KateHlManager::getDefaults(uint schema, KateAttributeList &list)
error->setSelectedTextColor(Qt::red);
list.append(error);
- KConfig *config = KateHlManager::self()->self()->getKConfig();
+ TDEConfig *config = KateHlManager::self()->self()->getTDEConfig();
config->setGroup("Default Item Styles - Schema " + KateFactory::self()->schemaManager()->name(schema));
for (uint z = 0; z < defaultStyles(); z++)
@@ -3317,7 +3317,7 @@ void KateHlManager::getDefaults(uint schema, KateAttributeList &list)
void KateHlManager::setDefaults(uint schema, KateAttributeList &list)
{
- KConfig *config = KateHlManager::self()->self()->getKConfig();
+ TDEConfig *config = KateHlManager::self()->self()->getTDEConfig();
config->setGroup("Default Item Styles - Schema " + KateFactory::self()->schemaManager()->name(schema));
for (uint z = 0; z < defaultStyles(); z++)
diff --git a/kate/part/katehighlight.h b/kate/part/katehighlight.h
index e312e4a0..1b71e454 100644
--- a/kate/part/katehighlight.h
+++ b/kate/part/katehighlight.h
@@ -350,7 +350,7 @@ class KateHlManager : public TQObject
static KateHlManager *self();
- inline KConfig *getKConfig() { return &m_config; };
+ inline TDEConfig *getTDEConfig() { return &m_config; };
KateHighlighting *getHl(int n);
int nameFind(const TQString &name);
@@ -396,7 +396,7 @@ class KateHlManager : public TQObject
static KateHlManager *s_self;
- KConfig m_config;
+ TDEConfig m_config;
TQStringList commonSuffixes;
KateSyntaxDocument *syntax;
diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp
index d33f2694..b7703ccd 100644
--- a/kate/part/katejscript.cpp
+++ b/kate/part/katejscript.cpp
@@ -642,7 +642,7 @@ void KateJScriptManager::collectScripts (bool force)
return;
// We'll store the scripts list in this config
- KConfig config("katepartjscriptrc", false, false);
+ TDEConfig config("katepartjscriptrc", false, false);
// figure out if the kate install is too new
config.setGroup ("General");
@@ -685,7 +685,7 @@ void KateJScriptManager::collectScripts (bool force)
if (dfi.exists())
{
- KConfig df (desktopFile, true, false);
+ TDEConfig df (desktopFile, true, false);
df.setDesktopGroup ();
// get cmdname, fallback to baseName, if it is empty, therefor not use the kconfig fallback
@@ -778,7 +778,7 @@ bool KateJScriptManager::help( Kate::View *, const TQString &cmd, TQString &msg
if (!m_scripts[cmd] || !m_scripts[cmd]->desktopFileExists)
return false;
- KConfig df (m_scripts[cmd]->desktopFilename(), true, false);
+ TDEConfig df (m_scripts[cmd]->desktopFilename(), true, false);
df.setDesktopGroup ();
msg = df.readEntry ("X-Kate-Help");
@@ -1016,7 +1016,7 @@ void KateIndentJScriptManager::collectScripts (bool force)
// We'll store the scripts list in this config
- KConfig config("katepartindentjscriptrc", false, false);
+ TDEConfig config("katepartindentjscriptrc", false, false);
#if 0
// figure out if the kate install is too new
config.setGroup ("General");
diff --git a/kate/part/kateluaindentscript.cpp b/kate/part/kateluaindentscript.cpp
index 178831f6..c06f3864 100644
--- a/kate/part/kateluaindentscript.cpp
+++ b/kate/part/kateluaindentscript.cpp
@@ -371,7 +371,7 @@ void KateLUAIndentScriptManager::collectScripts (bool force)
<<"================================================="<<endl;
// We'll store the scripts list in this config
- KConfig config("katepartluaindentscriptrc", false, false);
+ TDEConfig config("katepartluaindentscriptrc", false, false);
#if 0
// figure out if the kate install is too new
config.setGroup ("General");
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index bb3aa286..fa8b21f6 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -194,7 +194,7 @@ void KateSchemaManager::update (bool readfromfile)
// get the right group
// special handling of the default schemas ;)
//
-KConfig *KateSchemaManager::schema (uint number)
+TDEConfig *KateSchemaManager::schema (uint number)
{
if ((number>1) && (number < m_schemas.count()))
m_config.setGroup (m_schemas[number]);
@@ -440,7 +440,7 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema )
mark[6] = Qt::red;
SchemaColors c;
- KConfig *config = KateFactory::self()->schemaManager()->schema(newSchema);
+ TDEConfig *config = KateFactory::self()->schemaManager()->schema(newSchema);
c.back= config->readColorEntry("Color Background", &tmp0);
c.selected = config->readColorEntry("Color Selection", &tmp1);
@@ -493,7 +493,7 @@ void KateSchemaConfigColorTab::apply ()
for ( it = m_schemas.begin(); it != m_schemas.end(); ++it )
{
kdDebug(13030)<<"APPLY scheme = "<<it.key()<<endl;
- KConfig *config = KateFactory::self()->schemaManager()->schema( it.key() );
+ TDEConfig *config = KateFactory::self()->schemaManager()->schema( it.key() );
kdDebug(13030)<<"Using config group "<<config->group()<<endl;
SchemaColors c = it.data();
@@ -759,7 +759,7 @@ void KateSchemaConfigHighlightTab::schemaChanged (uint schema)
// Set listview colors
// We do that now, because we can now get the "normal text" color.
- // TODO this reads of the KConfig object, which should be changed when
+ // TODO this reads of the TDEConfig object, which should be changed when
// the color tab is fixed.
TQPalette p ( m_styles->palette() );
TQColor _c ( TDEGlobalSettings::baseColor() );
@@ -905,7 +905,7 @@ void KateSchemaConfigPage::apply()
KateRendererConfig::global()->reloadSchema();
// sync the hl config for real
- KateHlManager::self()->getKConfig()->sync ();
+ KateHlManager::self()->getTDEConfig()->sync ();
}
void KateSchemaConfigPage::reload()
diff --git a/kate/part/kateschema.h b/kate/part/kateschema.h
index 566b6ea2..f6eb8ef6 100644
--- a/kate/part/kateschema.h
+++ b/kate/part/kateschema.h
@@ -55,7 +55,7 @@ class KateSchemaManager
/**
* return kconfig with right group set or set to Normal if not there
*/
- KConfig *schema (uint number);
+ TDEConfig *schema (uint number);
void addSchema (const TQString &t);
@@ -85,7 +85,7 @@ class KateSchemaManager
static TQString printingSchema ();
private:
- KConfig m_config;
+ TDEConfig m_config;
TQStringList m_schemas;
};
@@ -216,7 +216,7 @@ class KateSchemaConfigFontTab : public TQWidget
~KateSchemaConfigFontTab();
public:
- void readConfig (KConfig *config);
+ void readConfig (TDEConfig *config);
public slots:
void apply();
diff --git a/kate/part/katesyntaxdocument.cpp b/kate/part/katesyntaxdocument.cpp
index 34f44bf6..4093f872 100644
--- a/kate/part/katesyntaxdocument.cpp
+++ b/kate/part/katesyntaxdocument.cpp
@@ -335,7 +335,7 @@ void KateSyntaxDocument::setupModeList (bool force)
return;
// We'll store the ModeList in katesyntaxhighlightingrc
- KConfig config("katesyntaxhighlightingrc", false, false);
+ TDEConfig config("katesyntaxhighlightingrc", false, false);
// figure our if the kate install is too new
config.setGroup ("General");
diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp
index 50f186c8..ca457aca 100644
--- a/kate/part/kateview.cpp
+++ b/kate/part/kateview.cpp
@@ -930,12 +930,12 @@ void KateView::joinLines()
m_doc->joinLines( first, last );
}
-void KateView::readSessionConfig(KConfig *config)
+void KateView::readSessionConfig(TDEConfig *config)
{
setCursorPositionInternal (config->readNumEntry("CursorLine"), config->readNumEntry("CursorColumn"), 1);
}
-void KateView::writeSessionConfig(KConfig *config)
+void KateView::writeSessionConfig(TDEConfig *config)
{
config->writeEntry("CursorLine",m_viewInternal->cursor.line());
config->writeEntry("CursorColumn",m_viewInternal->cursor.col());
@@ -1839,7 +1839,7 @@ void KateView::exportAsHTML ()
if ( url.isLocalFile() )
return;
- KIO::NetAccess::upload( filename, url, 0 );
+ TDEIO::NetAccess::upload( filename, url, 0 );
}
//END
diff --git a/kate/part/kateview.h b/kate/part/kateview.h
index aa428096..f4ec5480 100644
--- a/kate/part/kateview.h
+++ b/kate/part/kateview.h
@@ -370,8 +370,8 @@ class KateView : public Kate::View,
// config file / session management functions
public:
- void readSessionConfig(KConfig *);
- void writeSessionConfig(KConfig *);
+ void readSessionConfig(TDEConfig *);
+ void writeSessionConfig(TDEConfig *);
public slots:
int getEol();
diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp
index a7a88b94..eca6716c 100644
--- a/kate/part/kateviewhelpers.cpp
+++ b/kate/part/kateviewhelpers.cpp
@@ -1151,7 +1151,7 @@ void KateIconBorder::showMarkMenu( uint line, const TQPoint& pos )
{
KateViewConfig::global()->setDefaultMarkType (vec[result-100]);
// flush config, otherwise it isn't nessecarily done
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
config->setGroup("Kate View Defaults");
KateViewConfig::global()->writeConfig( config );
}
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index c996b216..109a3c8b 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -650,7 +650,7 @@ int main(int argc, char *argv[])
RegressionTest *RegressionTest::curr = 0;
-RegressionTest::RegressionTest(KateDocument *part, KConfig *baseConfig,
+RegressionTest::RegressionTest(KateDocument *part, TDEConfig *baseConfig,
const TQString &baseDir,
const TQString &outputDir, bool _genOutput)
: TQObject(part)
@@ -723,14 +723,14 @@ RegressionTest::~RegressionTest()
delete m_failureSave;
}
-void RegressionTest::setFailureSnapshotConfig(KConfig *cfg, const TQString &sname)
+void RegressionTest::setFailureSnapshotConfig(TDEConfig *cfg, const TQString &sname)
{
Q_ASSERT(cfg);
m_failureComp = cfg;
m_failureComp->setGroup(sname);
}
-void RegressionTest::setFailureSnapshotSaver(KConfig *cfg, const TQString &sname)
+void RegressionTest::setFailureSnapshotSaver(TDEConfig *cfg, const TQString &sname)
{
Q_ASSERT(cfg);
m_failureSave = cfg;
diff --git a/kate/part/test_regression.h b/kate/part/test_regression.h
index 0bc71771..2128ce25 100644
--- a/kate/part/test_regression.h
+++ b/kate/part/test_regression.h
@@ -165,7 +165,7 @@ class RegressionTest : public TQObject
Q_OBJECT
public:
- RegressionTest(KateDocument *part, KConfig *baseConfig,
+ RegressionTest(KateDocument *part, TDEConfig *baseConfig,
const TQString &baseDir, const TQString &outputDir,
bool _genOutput);
~RegressionTest();
@@ -181,21 +181,21 @@ public:
void rereadConfig();
static void createMissingDirs(const TQString &path);
- void setFailureSnapshotConfig(KConfig *cfg, const TQString &snapshotname);
- void setFailureSnapshotSaver(KConfig *cfg, const TQString &snapshotname);
+ void setFailureSnapshotConfig(TDEConfig *cfg, const TQString &snapshotname);
+ void setFailureSnapshotSaver(TDEConfig *cfg, const TQString &snapshotname);
void createLink( const TQString& test, int failures );
void doFailureReport( const TQString& test, int failures );
KateDocument *m_part;
KateView *m_view;
- KConfig *m_baseConfig;
+ TDEConfig *m_baseConfig;
TQString m_baseDir;
TQString m_outputDir;
bool m_genOutput;
TQString m_currentBase;
- KConfig *m_failureComp;
- KConfig *m_failureSave;
+ TDEConfig *m_failureComp;
+ TDEConfig *m_failureSave;
TQString m_currentOutput;
TQString m_currentCategory;
diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp
index a0e61f3d..2a7a6de4 100644
--- a/kate/plugins/autobookmarker/autobookmarker.cpp
+++ b/kate/plugins/autobookmarker/autobookmarker.cpp
@@ -199,7 +199,7 @@ void ABGlobal::readConfig()
m_ents = new ABEntityList;
else
m_ents->clear();
- KConfig *config = new KConfig("ktexteditor_autobookmarkerrc");
+ TDEConfig *config = new TDEConfig("ktexteditor_autobookmarkerrc");
uint n( 0 );
while ( config->hasGroup( TQString("autobookmark%1").arg( n ) ) )
@@ -225,7 +225,7 @@ void ABGlobal::readConfig()
void ABGlobal::writeConfig()
{
- KConfig *config = new KConfig("ktexteditor_autobookmarkerrc");
+ TDEConfig *config = new TDEConfig("ktexteditor_autobookmarkerrc");
// clean the config object
TQStringList l = config->groupList();
diff --git a/kate/plugins/insertfile/insertfileplugin.cpp b/kate/plugins/insertfile/insertfileplugin.cpp
index 6a350831..082c0ffc 100644
--- a/kate/plugins/insertfile/insertfileplugin.cpp
+++ b/kate/plugins/insertfile/insertfileplugin.cpp
@@ -103,12 +103,12 @@ void InsertFilePluginView::slotInsertFile()
KURL destURL;
destURL.setPath( _tmpfile );
- _job = KIO::file_copy( _file, destURL, 0600, true, false, true );
- connect( _job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotFinished ( KIO::Job * ) ) );
+ _job = TDEIO::file_copy( _file, destURL, 0600, true, false, true );
+ connect( _job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotFinished ( TDEIO::Job * ) ) );
}
}
-void InsertFilePluginView::slotFinished( KIO::Job *job )
+void InsertFilePluginView::slotFinished( TDEIO::Job *job )
{
assert( job == _job );
_job = 0;
diff --git a/kate/plugins/insertfile/insertfileplugin.h b/kate/plugins/insertfile/insertfileplugin.h
index 9331f810..d6751f0d 100644
--- a/kate/plugins/insertfile/insertfileplugin.h
+++ b/kate/plugins/insertfile/insertfileplugin.h
@@ -58,13 +58,13 @@ class InsertFilePluginView : public TQObject, public KXMLGUIClient
/* display a file dialog, and insert the chosen file */
void slotInsertFile();
private slots:
- void slotFinished( KIO::Job *job );
- //slotAborted( KIO::Job *job );
+ void slotFinished( TDEIO::Job *job );
+ //slotAborted( TDEIO::Job *job );
private:
void insertFile();
KURL _file;
TQString _tmpfile;
- KIO::FileCopyJob *_job;
+ TDEIO::FileCopyJob *_job;
};
#endif // _INSERT_FILE_PLUGIN_H_
diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp
index 249abf9f..27d0b138 100644
--- a/kate/plugins/isearch/ISearchPlugin.cpp
+++ b/kate/plugins/isearch/ISearchPlugin.cpp
@@ -170,12 +170,12 @@ void ISearchPluginView::setView( KTextEditor::View* view )
void ISearchPluginView::readConfig()
{
- // KConfig* config = instance()->config();
+ // TDEConfig* config = instance()->config();
}
void ISearchPluginView::writeConfig()
{
- // KConfig* config = instance()->config();
+ // TDEConfig* config = instance()->config();
}
void ISearchPluginView::setCaseSensitive( bool caseSensitive )
diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp
index 37da5522..2c2bbcb2 100644
--- a/kate/plugins/wordcompletion/docwordcompletion.cpp
+++ b/kate/plugins/wordcompletion/docwordcompletion.cpp
@@ -68,7 +68,7 @@ DocWordCompletionPlugin::DocWordCompletionPlugin( TQObject *parent,
void DocWordCompletionPlugin::readConfig()
{
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
config->setGroup( "DocWordCompletion Plugin" );
m_treshold = config->readNumEntry( "treshold", 3 );
m_autopopup = config->readBoolEntry( "autopopup", true );
@@ -76,7 +76,7 @@ void DocWordCompletionPlugin::readConfig()
void DocWordCompletionPlugin::writeConfig()
{
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
config->setGroup("DocWordCompletion Plugin");
config->writeEntry("autopopup", m_autopopup );
config->writeEntry("treshold", m_treshold );
diff --git a/kcert/kcertpart.cc b/kcert/kcertpart.cc
index 5b31c816..ca591220 100644
--- a/kcert/kcertpart.cc
+++ b/kcert/kcertpart.cc
@@ -740,7 +740,7 @@ void KCertPart::slotImport() {
if (!_silentImport)
KMessageBox::information(_frame, i18n("Certificate has been successfully imported into TDE.\nYou can manage your certificate settings from the TDE Control Center."), i18n("Certificate Import"));
} else if (_ca) {
- KConfig cfg("ksslcalist", true, false);
+ TDEConfig cfg("ksslcalist", true, false);
if (cfg.hasGroup(_ca->getSubject())) {
TQString msg = _curName + "\n" + i18n("A certificate with that name already exists. Are you sure that you wish to replace it?");
int rc= KMessageBox::warningContinueCancel(_frame, msg, i18n("Certificate Import"),i18n("Replace"));
diff --git a/kcmshell/main.cpp b/kcmshell/main.cpp
index 2ef0ac78..5d71fbaa 100644
--- a/kcmshell/main.cpp
+++ b/kcmshell/main.cpp
@@ -106,7 +106,7 @@ static KService::Ptr locateModule(const TQCString& module)
if ( module.left( 4 ) != "kde-" && service->library().isEmpty() )
return locateModule( "kde-" + module );
- if(!KCModuleLoader::testModule( module ))
+ if(!TDECModuleLoader::testModule( module ))
{
kdDebug(780) << "According to \"" << module << "\"'s test function, it should Not be loaded." << endl;
return 0;
@@ -301,7 +301,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
id = args->getOption( "embed-proxy" ).toInt(&idValid);
if( idValid )
{
- KCModuleProxy *module = new KCModuleProxy( modules.first()->desktopEntryName() );
+ TDECModuleProxy *module = new TDECModuleProxy( modules.first()->desktopEntryName() );
module->realModule();
QXEmbed::embedClientIntoWindow( module, id);
app.exec();
@@ -318,7 +318,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
i18n("Configure - %1").arg(kapp->caption()), 0, "", true );
for (KService::List::ConstIterator it = modules.begin(); it != modules.end(); ++it)
- dlg->addModule(KCModuleInfo(*it));
+ dlg->addModule(TDECModuleInfo(*it));
if ( args->isSet( "embed" ))
{
@@ -339,7 +339,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
if (kapp->iconName() != kapp->name())
setIcon(dlg, kapp->iconName());
else if ( modules.count() == 1 )
- setIcon(dlg, KCModuleInfo( modules.first()).icon());
+ setIcon(dlg, TDECModuleInfo( modules.first()).icon());
dlg->exec();
delete dlg;
diff --git a/kconf_update/kconf_update.cpp b/kconf_update/kconf_update.cpp
index 15a96367..daf66ca9 100644
--- a/kconf_update/kconf_update.cpp
+++ b/kconf_update/kconf_update.cpp
@@ -73,11 +73,11 @@ public:
void gotScriptArguments(const TQString &_arguments);
void resetOptions();
- void copyGroup(KConfigBase *cfg1, const TQString &grp1,
- KConfigBase *cfg2, const TQString &grp2);
+ void copyGroup(TDEConfigBase *cfg1, const TQString &grp1,
+ TDEConfigBase *cfg2, const TQString &grp2);
protected:
- KConfig *config;
+ TDEConfig *config;
TQString currentFilename;
bool skip;
bool debug;
@@ -86,9 +86,9 @@ protected:
TQString oldFile;
TQString newFile;
TQString newFileName;
- KConfig *oldConfig1; // Config to read keys from.
- KConfig *oldConfig2; // Config to delete keys from.
- KConfig *newConfig;
+ TDEConfig *oldConfig1; // Config to read keys from.
+ TDEConfig *oldConfig2; // Config to delete keys from.
+ TDEConfig *newConfig;
TQString oldGroup;
TQString newGroup;
@@ -113,7 +113,7 @@ KonfUpdate::KonfUpdate()
oldConfig2 = 0;
newConfig = 0;
- config = new KConfig("kconf_updaterc");
+ config = new TDEConfig("kconf_updaterc");
TQStringList updateFiles;
TDECmdLineArgs *args=TDECmdLineArgs::parsedArgs();
@@ -501,7 +501,7 @@ void KonfUpdate::gotFile(const TQString &_file)
if (!oldFile.isEmpty())
{
- oldConfig2 = new KConfig(oldFile, false, false);
+ oldConfig2 = new TDEConfig(oldFile, false, false);
TQString cfg_id = currentFilename + ":" + id;
oldConfig2->setGroup("$Version");
TQStringList ids = oldConfig2->readListEntry("update_info");
@@ -514,7 +514,7 @@ void KonfUpdate::gotFile(const TQString &_file)
if (!newFile.isEmpty())
{
- newConfig = new KConfig(newFile, false, false);
+ newConfig = new TDEConfig(newFile, false, false);
newConfig->setGroup("$Version");
ids = newConfig->readListEntry("update_info");
if (ids.contains(cfg_id))
@@ -528,7 +528,7 @@ void KonfUpdate::gotFile(const TQString &_file)
newConfig = oldConfig2;
}
- oldConfig1 = new KConfig(oldFile, true, false);
+ oldConfig1 = new TDEConfig(oldFile, true, false);
}
else
{
@@ -703,8 +703,8 @@ void KonfUpdate::gotOptions(const TQString &_options)
}
}
-void KonfUpdate::copyGroup(KConfigBase *cfg1, const TQString &grp1,
- KConfigBase *cfg2, const TQString &grp2)
+void KonfUpdate::copyGroup(TDEConfigBase *cfg1, const TQString &grp1,
+ TDEConfigBase *cfg2, const TQString &grp2)
{
cfg1->setGroup(grp1);
cfg2->setGroup(grp2);
@@ -905,10 +905,10 @@ void KonfUpdate::gotScript(const TQString &_script)
// Merging in new entries.
m_bCopy = true;
{
- KConfig *saveOldConfig1 = oldConfig1;
+ TDEConfig *saveOldConfig1 = oldConfig1;
TQString saveOldGroup = oldGroup;
TQString saveNewGroup = newGroup;
- oldConfig1 = new KConfig(tmp2.name(), true, false);
+ oldConfig1 = new TDEConfig(tmp2.name(), true, false);
// For all groups...
TQStringList grpList = oldConfig1->groupList();
diff --git a/kded/kded.cpp b/kded/kded.cpp
index efbde001..d06c44c3 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -155,7 +155,7 @@ bool Kded::process(const TQCString &obj, const TQCString &fun,
void Kded::initModules()
{
m_dontLoad.clear();
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
bool kde_running = !( getenv( "TDE_FULL_SESSION" ) == NULL || getenv( "TDE_FULL_SESSION" )[ 0 ] == '\0' );
// not the same user like the one running the session (most likely we're run via sudo or something)
if( getenv( "TDE_SESSION_UID" ) != NULL && uid_t( atoi( getenv( "TDE_SESSION_UID" ))) != getuid())
@@ -225,7 +225,7 @@ void Kded::initModules()
void Kded::loadSecondPhase()
{
kdDebug(7020) << "Loading second phase autoload" << endl;
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
KService::List kdedModules = KServiceType::offers("KDEDModule");
for(KService::List::ConstIterator it = kdedModules.begin(); it != kdedModules.end(); ++it)
{
@@ -905,7 +905,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
}
TDEInstance *instance = new TDEInstance(&aboutData);
- KConfig *config = instance->config(); // Enable translations.
+ TDEConfig *config = instance->config(); // Enable translations.
if (args->isSet("check"))
{
diff --git a/kdewidgets/kde.widgets b/kdewidgets/kde.widgets
index 8ca72586..0a4bf622 100644
--- a/kdewidgets/kde.widgets
+++ b/kdewidgets/kde.widgets
@@ -26,7 +26,7 @@ Group=Graphics (KDE)
ToolTip=Combo Box (KDE)
Group=Input (KDE)
-[KCModule]
+[TDECModule]
ToolTip=KControl Center Module (KDE)
IsContainer=true
Group=Container (KDE)
diff --git a/kdewidgets/makekdewidgets.cpp b/kdewidgets/makekdewidgets.cpp
index bec6988b..8e2856c5 100644
--- a/kdewidgets/makekdewidgets.cpp
+++ b/kdewidgets/makekdewidgets.cpp
@@ -117,11 +117,11 @@ static KCmdLineOptions options[] =
KCmdLineLastOption
};
-static TQString buildWidgetDef( const TQString &name, KConfig &input, const TQString &group );
-static TQString buildWidgetCreate( const TQString &name, KConfig &input );
-static TQString buildWidgetInclude( const TQString &name, KConfig &input );
+static TQString buildWidgetDef( const TQString &name, TDEConfig &input, const TQString &group );
+static TQString buildWidgetCreate( const TQString &name, TDEConfig &input );
+static TQString buildWidgetInclude( const TQString &name, TDEConfig &input );
static void buildFile( TQTextStream &stream, const TQString& group, const TQString& fileName, const TQString& pluginName, const TQString& iconPath );
-static TQString buildPixmap( const TQString &name, KConfig &input, const TQString &iconPath );
+static TQString buildPixmap( const TQString &name, TDEConfig &input, const TQString &iconPath );
int main( int argc, char **argv ) {
new TDEInstance( "makekdewidgets" );
@@ -160,7 +160,7 @@ int main( int argc, char **argv ) {
}
void buildFile( TQTextStream &ts, const TQString& group, const TQString& fileName, const TQString& pluginName, const TQString& iconPath ) {
- KConfig input( fileName, true, false );
+ TDEConfig input( fileName, true, false );
input.setGroup( "Global" );
TQMap<TQString, TQString> MainMap;
MainMap.insert( "PluginName", input.readEntry( "PluginName", pluginName ) );
@@ -195,7 +195,7 @@ void buildFile( TQTextStream &ts, const TQString& group, const TQString& fileNam
}
-TQString buildWidgetDef( const TQString &name, KConfig &input, const TQString &group ) {
+TQString buildWidgetDef( const TQString &name, TDEConfig &input, const TQString &group ) {
input.setGroup( name );
TQMap<TQString, TQString> defMap;
defMap.insert( "Group", input.readEntry( "Group", group ).replace( "\"", "\\\"" ) );
@@ -209,7 +209,7 @@ TQString buildWidgetDef( const TQString &name, KConfig &input, const TQString &g
return KMacroExpander::expandMacros( widgetDef, defMap );
}
-TQString buildWidgetCreate( const TQString &name, KConfig &input ) {
+TQString buildWidgetCreate( const TQString &name, TDEConfig &input ) {
input.setGroup( name );
TQMap<TQString, TQString> createMap;
createMap.insert( "ImplClass", input.readEntry( "ImplClass", name ) );
@@ -218,12 +218,12 @@ TQString buildWidgetCreate( const TQString &name, KConfig &input ) {
return KMacroExpander::expandMacros( widgetCreate, createMap );
}
-TQString buildWidgetInclude( const TQString &name, KConfig &input ) {
+TQString buildWidgetInclude( const TQString &name, TDEConfig &input ) {
input.setGroup( name );
return "#include <" + input.readEntry( "IncludeFile", name.lower() + ".h" ) + ">";
}
-TQString buildPixmap( const TQString &name, KConfig &input, const TQString &iconPath ) {
+TQString buildPixmap( const TQString &name, TDEConfig &input, const TQString &iconPath ) {
input.setGroup( name );
TQString cleanName = name.lower().replace( ":", "_" );
TQString iconName = input.readEntry( "IconSet", cleanName + ".png" );
diff --git a/kdewidgets/tests/test.widgets b/kdewidgets/tests/test.widgets
index d375f0ad..ed320bc6 100644
--- a/kdewidgets/tests/test.widgets
+++ b/kdewidgets/tests/test.widgets
@@ -26,7 +26,7 @@ Group=Graphics (KDE)
ToolTip=Combo Box (KDE)
Group=Input (KDE)
-[KCModule]
+[TDECModule]
ToolTip=KControl Center Module (KDE)
IsContainer=true
Group=Container (KDE)
diff --git a/kdoctools/kio_help.cpp b/kdoctools/kio_help.cpp
index dda8fa32..19712f82 100644
--- a/kdoctools/kio_help.cpp
+++ b/kdoctools/kio_help.cpp
@@ -35,7 +35,7 @@
#include <libxslt/transform.h>
#include "xslt.h"
-using namespace KIO;
+using namespace TDEIO;
TQString HelpProtocol::langLookup(const TQString& fname)
{
@@ -169,7 +169,7 @@ void HelpProtocol::get( const KURL& url )
if (doc.isEmpty())
{
- error( KIO::ERR_DOES_NOT_EXIST, url.url() );
+ error( TDEIO::ERR_DOES_NOT_EXIST, url.url() );
return;
}
@@ -345,24 +345,24 @@ void HelpProtocol::get_file( const KURL& url )
struct stat buff;
if ( ::stat( _path.data(), &buff ) == -1 ) {
if ( errno == EACCES )
- error( KIO::ERR_ACCESS_DENIED, url.path() );
+ error( TDEIO::ERR_ACCESS_DENIED, url.path() );
else
- error( KIO::ERR_DOES_NOT_EXIST, url.path() );
+ error( TDEIO::ERR_DOES_NOT_EXIST, url.path() );
return;
}
if ( S_ISDIR( buff.st_mode ) ) {
- error( KIO::ERR_IS_DIRECTORY, url.path() );
+ error( TDEIO::ERR_IS_DIRECTORY, url.path() );
return;
}
if ( S_ISFIFO( buff.st_mode ) || S_ISSOCK ( buff.st_mode ) ) {
- error( KIO::ERR_CANNOT_OPEN_FOR_READING, url.path() );
+ error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.path() );
return;
}
int fd = open( _path.data(), O_RDONLY);
if ( fd < 0 ) {
- error( KIO::ERR_CANNOT_OPEN_FOR_READING, url.path() );
+ error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.path() );
return;
}
@@ -379,7 +379,7 @@ void HelpProtocol::get_file( const KURL& url )
{
if (errno == EINTR)
continue;
- error( KIO::ERR_COULD_NOT_READ, url.path());
+ error( TDEIO::ERR_COULD_NOT_READ, url.path());
close(fd);
return;
}
diff --git a/kdoctools/kio_help.h b/kdoctools/kio_help.h
index 13c198af..957a0e2e 100644
--- a/kdoctools/kio_help.h
+++ b/kdoctools/kio_help.h
@@ -18,7 +18,7 @@
#include <kio/global.h>
#include <kio/slavebase.h>
-class HelpProtocol : public KIO::SlaveBase
+class HelpProtocol : public TDEIO::SlaveBase
{
public:
diff --git a/khtml/css/cssstyleselector.cpp b/khtml/css/cssstyleselector.cpp
index 6559a2b9..3f4a8cd2 100644
--- a/khtml/css/cssstyleselector.cpp
+++ b/khtml/css/cssstyleselector.cpp
@@ -2076,7 +2076,7 @@ static TQColor colorForCSSValue( int css_value )
else if ( css_value == CSS_VAL_INFOTEXT )
return TQToolTip::palette().inactive().foreground();
else if ( css_value == CSS_VAL_BACKGROUND ) {
- KConfig bckgrConfig("kdesktoprc", true, false); // No multi-screen support
+ TDEConfig bckgrConfig("kdesktoprc", true, false); // No multi-screen support
bckgrConfig.setGroup("Desktop0");
// Desktop background.
return bckgrConfig.readColorEntry("Color1", &tqApp->palette().disabled().background());
@@ -2089,7 +2089,7 @@ static TQColor colorForCSSValue( int css_value )
TQColor c = pal.color( uicol->group, uicol->role );
#ifndef APPLE_CHANGES
if ( uicol->configEntry ) {
- KConfig *globalConfig = TDEGlobal::config();
+ TDEConfig *globalConfig = TDEGlobal::config();
globalConfig->setGroup( uicol->configGroup );
c = globalConfig->readColorEntry( uicol->configEntry, &c );
}
diff --git a/khtml/ecma/kjs_debugwin.cpp b/khtml/ecma/kjs_debugwin.cpp
index 674a3f3c..73a55cf9 100644
--- a/khtml/ecma/kjs_debugwin.cpp
+++ b/khtml/ecma/kjs_debugwin.cpp
@@ -860,8 +860,8 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch
}
if (dontShowAgain) {
- KConfig *config = kapp->config();
- KConfigGroupSaver saver(config,TQString::fromLatin1("Java/JavaScript Settings"));
+ TDEConfig *config = kapp->config();
+ TDEConfigGroupSaver saver(config,TQString::fromLatin1("Java/JavaScript Settings"));
config->writeEntry("ReportJavaScriptErrors",TQVariant(false,0));
config->sync();
TQByteArray data;
diff --git a/khtml/ecma/kjs_navigator.cpp b/khtml/ecma/kjs_navigator.cpp
index 426c6834..9bd99ada 100644
--- a/khtml/ecma/kjs_navigator.cpp
+++ b/khtml/ecma/kjs_navigator.cpp
@@ -306,7 +306,7 @@ PluginBase::PluginBase(ExecState *exec, bool loadPluginInfo)
continue;
}
// read configuration
- KConfig kc( locate ("data", pluginsinfo.toString()) );
+ TDEConfig kc( locate ("data", pluginsinfo.toString()) );
unsigned num = (unsigned int) kc.readNumEntry("number");
for ( unsigned n = 0; n < num; n++ ) {
kc.setGroup( TQString::number(n) );
diff --git a/khtml/ecma/xmlhttprequest.cpp b/khtml/ecma/xmlhttprequest.cpp
index 08ba0751..8a8a86c1 100644
--- a/khtml/ecma/xmlhttprequest.cpp
+++ b/khtml/ecma/xmlhttprequest.cpp
@@ -42,7 +42,7 @@
#include "KWQLoader.h"
#else
#include <kio/netaccess.h>
-using KIO::NetAccess;
+using TDEIO::NetAccess;
#endif
#define BANNED_HTTP_HEADERS "authorization,proxy-authorization,"\
@@ -81,23 +81,23 @@ XMLHttpRequestQObject::XMLHttpRequestQObject(XMLHttpRequest *_jsObject)
}
#ifdef APPLE_CHANGES
-void XMLHttpRequestQObject::slotData( KIO::Job* job, const char *data, int size )
+void XMLHttpRequestQObject::slotData( TDEIO::Job* job, const char *data, int size )
{
jsObject->slotData(job, data, size);
}
#else
-void XMLHttpRequestQObject::slotData( KIO::Job* job, const TQByteArray &data )
+void XMLHttpRequestQObject::slotData( TDEIO::Job* job, const TQByteArray &data )
{
jsObject->slotData(job, data);
}
#endif
-void XMLHttpRequestQObject::slotFinished( KIO::Job* job )
+void XMLHttpRequestQObject::slotFinished( TDEIO::Job* job )
{
jsObject->slotFinished(job);
}
-void XMLHttpRequestQObject::slotRedirection( KIO::Job* job, const KURL& url)
+void XMLHttpRequestQObject::slotRedirection( TDEIO::Job* job, const KURL& url)
{
jsObject->slotRedirection( job, url );
}
@@ -344,7 +344,7 @@ void XMLHttpRequest::send(const TQString& _body)
const TQString protocol = url.protocol().lower();
// Abandon the request when the protocol is other than "http",
- // instead of blindly doing a KIO::get on other protocols like file:/.
+ // instead of blindly doing a TDEIO::get on other protocols like file:/.
if (!protocol.startsWith("http") && !protocol.startsWith("webdav"))
{
abort();
@@ -359,14 +359,14 @@ void XMLHttpRequest::send(const TQString& _body)
TQCString str = _body.utf8();
buf.duplicate(str.data(), str.size() - 1);
- job = KIO::http_post( url, buf, false );
+ job = TDEIO::http_post( url, buf, false );
if(contentType.isNull())
job->addMetaData( "content-type", "Content-type: text/plain" );
else
job->addMetaData( "content-type", contentType );
}
else {
- job = KIO::get( url, false, false );
+ job = TDEIO::get( url, false, false );
}
if (!requestHeaders.isEmpty()) {
@@ -421,22 +421,22 @@ void XMLHttpRequest::send(const TQString& _body)
return;
}
- qObject->connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
- TQT_SLOT( slotFinished( KIO::Job* ) ) );
+ qObject->connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+ TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
#ifdef APPLE_CHANGES
- qObject->connect( job, TQT_SIGNAL( data( KIO::Job*, const char*, int ) ),
- TQT_SLOT( slotData( KIO::Job*, const char*, int ) ) );
+ qObject->connect( job, TQT_SIGNAL( data( TDEIO::Job*, const char*, int ) ),
+ TQT_SLOT( slotData( TDEIO::Job*, const char*, int ) ) );
#else
- qObject->connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
- TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
+ qObject->connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+ TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
#endif
- qObject->connect( job, TQT_SIGNAL(redirection(KIO::Job*, const KURL& ) ),
- TQT_SLOT( slotRedirection(KIO::Job*, const KURL&) ) );
+ qObject->connect( job, TQT_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ),
+ TQT_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) );
#ifdef APPLE_CHANGES
KWQServeRequest(khtml::Cache::loader(), doc->docLoader(), job);
#else
- KIO::Scheduler::scheduleJob( job );
+ TDEIO::Scheduler::scheduleJob( job );
#endif
}
@@ -610,7 +610,7 @@ void XMLHttpRequest::processSyncLoadResults(const TQByteArray &data, const KURL
slotFinished(0);
}
-void XMLHttpRequest::slotFinished(KIO::Job *)
+void XMLHttpRequest::slotFinished(TDEIO::Job *)
{
if (decoder) {
response += decoder->flush();
@@ -625,7 +625,7 @@ void XMLHttpRequest::slotFinished(KIO::Job *)
decoder = 0;
}
-void XMLHttpRequest::slotRedirection(KIO::Job*, const KURL& url)
+void XMLHttpRequest::slotRedirection(TDEIO::Job*, const KURL& url)
{
if (!urlMatchesDocumentDomain(url)) {
abort();
@@ -633,9 +633,9 @@ void XMLHttpRequest::slotRedirection(KIO::Job*, const KURL& url)
}
#ifdef APPLE_CHANGES
-void XMLHttpRequest::slotData( KIO::Job*, const char *data, int len )
+void XMLHttpRequest::slotData( TDEIO::Job*, const char *data, int len )
#else
-void XMLHttpRequest::slotData(KIO::Job*, const TQByteArray &_data)
+void XMLHttpRequest::slotData(TDEIO::Job*, const TQByteArray &_data)
#endif
{
if (state < Loaded ) {
diff --git a/khtml/ecma/xmlhttprequest.h b/khtml/ecma/xmlhttprequest.h
index 2c646708..93420453 100644
--- a/khtml/ecma/xmlhttprequest.h
+++ b/khtml/ecma/xmlhttprequest.h
@@ -75,12 +75,12 @@ namespace KJS {
XMLHttpRequestQObject *qObject;
#ifdef APPLE_CHANGES
- void slotData( KIO::Job* job, const char *data, int size );
+ void slotData( TDEIO::Job* job, const char *data, int size );
#else
- void slotData( KIO::Job* job, const TQByteArray &data );
+ void slotData( TDEIO::Job* job, const TQByteArray &data );
#endif
- void slotFinished( KIO::Job* );
- void slotRedirection( KIO::Job*, const KURL& );
+ void slotFinished( TDEIO::Job* );
+ void slotRedirection( TDEIO::Job*, const KURL& );
void processSyncLoadResults(const TQByteArray &data, const KURL &finalURL, const TQString &headers);
@@ -103,7 +103,7 @@ namespace KJS {
TQString m_mimeTypeOverride;
TQString contentType;
- KIO::TransferJob * job;
+ TDEIO::TransferJob * job;
XMLHttpRequestState state;
JSEventListener *onReadyStateChangeListener;
@@ -129,9 +129,9 @@ namespace KJS {
XMLHttpRequestQObject(XMLHttpRequest *_jsObject);
public slots:
- void slotData( KIO::Job* job, const TQByteArray &data );
- void slotFinished( KIO::Job* job );
- void slotRedirection( KIO::Job* job, const KURL& url);
+ void slotData( TDEIO::Job* job, const TQByteArray &data );
+ void slotFinished( TDEIO::Job* job );
+ void slotRedirection( TDEIO::Job* job, const KURL& url);
private:
XMLHttpRequest *jsObject;
diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp
index 7477679b..c7c232dc 100644
--- a/khtml/html/html_formimpl.cpp
+++ b/khtml/html/html_formimpl.cpp
@@ -1615,16 +1615,16 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis
fileurl = KURL::fromPathOrURL(val);
}
- KIO::UDSEntry filestat;
+ TDEIO::UDSEntry filestat;
// can't submit file in www-url-form encoded
TQWidget* const toplevel = static_cast<RenderSubmitButton*>(m_render)->widget()->topLevelWidget();
if (multipart) {
TQCString filearray( "" );
- if ( KIO::NetAccess::stat(fileurl, filestat, toplevel)) {
+ if ( TDEIO::NetAccess::stat(fileurl, filestat, toplevel)) {
const KFileItem fileitem(filestat, fileurl, true, false);
if ( fileitem.isFile() &&
- KIO::NetAccess::download(fileurl, local, toplevel) ) {
+ TDEIO::NetAccess::download(fileurl, local, toplevel) ) {
TQFile file(local);
filearray.resize(file.size()+1);
if ( file.open( IO_ReadOnly ) ) {
@@ -1633,7 +1633,7 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis
filearray[readbytes] = '\0';
file.close();
}
- KIO::NetAccess::removeTempFile( local );
+ TDEIO::NetAccess::removeTempFile( local );
}
}
encoding += filearray;
diff --git a/khtml/java/kjavaappletserver.cpp b/khtml/java/kjavaappletserver.cpp
index 56e056a6..a82a80a0 100644
--- a/khtml/java/kjavaappletserver.cpp
+++ b/khtml/java/kjavaappletserver.cpp
@@ -193,7 +193,7 @@ void KJavaAppletServer::freeJavaServer()
//instead of immediately quitting here, set a timer to kill us
//if there are still no servers- give us one minute
//this is to prevent repeated loading and unloading of the jvm
- KConfig config( "konquerorrc", true );
+ TDEConfig config( "konquerorrc", true );
config.setGroup( "Java/JavaScript Settings" );
if( config.readBoolEntry( "ShutdownAppletServer", true ) )
{
@@ -214,7 +214,7 @@ void KJavaAppletServer::checkShutdown()
void KJavaAppletServer::setupJava( KJavaProcess *p )
{
- KConfig config ( "konquerorrc", true );
+ TDEConfig config ( "konquerorrc", true );
config.setGroup( "Java/JavaScript Settings" );
TQString jvm_path = "java";
diff --git a/khtml/java/kjavaappletviewer.cpp b/khtml/java/kjavaappletviewer.cpp
index 05c2eb7d..979403df 100644
--- a/khtml/java/kjavaappletviewer.cpp
+++ b/khtml/java/kjavaappletviewer.cpp
@@ -315,12 +315,12 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
if (!server->usingKIO ()) {
/* if this page needs authentication */
- KIO::AuthInfo info;
+ TDEIO::AuthInfo info;
TQString errorMsg;
TQCString replyType;
TQByteArray params;
TQByteArray reply;
- KIO::AuthInfo authResult;
+ TDEIO::AuthInfo authResult;
//(void) dcopClient(); // Make sure to have a dcop client.
info.url = baseurl;
@@ -329,9 +329,9 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
TQDataStream stream(params, IO_WriteOnly);
stream << info << m_view->topLevelWidget()->winId();
- if (!kapp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(KIO::AuthInfo, long int)", params, replyType, reply ) ) {
+ if (!kapp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(TDEIO::AuthInfo, long int)", params, replyType, reply ) ) {
kdWarning() << "Can't communicate with kded_kpasswdserver!" << endl;
- } else if ( replyType == "KIO::AuthInfo" ) {
+ } else if ( replyType == "TDEIO::AuthInfo" ) {
TQDataStream stream2( reply, IO_ReadOnly );
stream2 >> authResult;
applet->setUser (authResult.username);
diff --git a/khtml/java/kjavaappletviewer.h b/khtml/java/kjavaappletviewer.h
index b76f2036..cf2c2072 100644
--- a/khtml/java/kjavaappletviewer.h
+++ b/khtml/java/kjavaappletviewer.h
@@ -41,7 +41,7 @@ class KJavaProcess;
class KJavaAppletViewer;
class TDEAboutData;
class TDEInstance;
-class KConfig;
+class TDEConfig;
class CoverWidget;
class KJavaAppletViewerBrowserExtension : public KParts::BrowserExtension {
@@ -107,7 +107,7 @@ private slots:
void delayedCreateTimeOut ();
private:
TQGuardedPtr <CoverWidget> m_view;
- KConfig * m_config;
+ TDEConfig * m_config;
KJavaProcess * process;
KJavaAppletViewerBrowserExtension * m_browserextension;
KJavaAppletViewerLiveConnectExtension * m_liveconnect;
diff --git a/khtml/java/kjavadownloader.cpp b/khtml/java/kjavadownloader.cpp
index 60334cbf..a12b585b 100644
--- a/khtml/java/kjavadownloader.cpp
+++ b/khtml/java/kjavadownloader.cpp
@@ -58,13 +58,13 @@ public:
~KJavaDownloaderPrivate()
{
delete url;
- if (job) job->kill(); // KIO::Job::kill deletes itself
+ if (job) job->kill(); // TDEIO::Job::kill deletes itself
}
private:
int loaderID;
KURL* url;
TQByteArray file;
- KIO::TransferJob* job;
+ TDEIO::TransferJob* job;
int responseCode;
bool isfirstdata;
};
@@ -79,16 +79,16 @@ KJavaDownloader::KJavaDownloader( int ID, const TQString& url )
d->loaderID = ID;
d->url = new KURL( url );
- d->job = KIO::get( *d->url, false, false );
+ d->job = TDEIO::get( *d->url, false, false );
d->job->addMetaData("PropagateHttpHeader", "true");
- connect( d->job, TQT_SIGNAL(data( KIO::Job*, const TQByteArray& )),
- this, TQT_SLOT(slotData( KIO::Job*, const TQByteArray& )) );
- connect( d->job, TQT_SIGNAL(connected(KIO::Job*)),
- this, TQT_SLOT(slotConnected(KIO::Job*)));
- connect( d->job, TQT_SIGNAL(mimetype(KIO::Job*, const TQString&)),
- this, TQT_SLOT(slotMimetype(KIO::Job*, const TQString&)));
- connect( d->job, TQT_SIGNAL(result(KIO::Job*)),
- this, TQT_SLOT(slotResult(KIO::Job*)) );
+ connect( d->job, TQT_SIGNAL(data( TDEIO::Job*, const TQByteArray& )),
+ this, TQT_SLOT(slotData( TDEIO::Job*, const TQByteArray& )) );
+ connect( d->job, TQT_SIGNAL(connected(TDEIO::Job*)),
+ this, TQT_SLOT(slotConnected(TDEIO::Job*)));
+ connect( d->job, TQT_SIGNAL(mimetype(TDEIO::Job*, const TQString&)),
+ this, TQT_SLOT(slotMimetype(TDEIO::Job*, const TQString&)));
+ connect( d->job, TQT_SIGNAL(result(TDEIO::Job*)),
+ this, TQT_SLOT(slotResult(TDEIO::Job*)) );
}
KJavaDownloader::~KJavaDownloader()
@@ -96,7 +96,7 @@ KJavaDownloader::~KJavaDownloader()
delete d;
}
-void KJavaDownloader::slotData( KIO::Job*, const TQByteArray& qb )
+void KJavaDownloader::slotData( TDEIO::Job*, const TQByteArray& qb )
{
//kdDebug(6100) << "slotData(" << d->loaderID << ")" << endl;
@@ -116,17 +116,17 @@ void KJavaDownloader::slotData( KIO::Job*, const TQByteArray& qb )
KJavaAppletServer::freeJavaServer();
}
-void KJavaDownloader::slotConnected(KIO::Job*)
+void KJavaDownloader::slotConnected(TDEIO::Job*)
{
kdDebug(6100) << "slave connected" << endl;
d->responseCode = d->job->error();
}
-void KJavaDownloader::slotMimetype(KIO::Job*, const TQString & type) {
+void KJavaDownloader::slotMimetype(TDEIO::Job*, const TQString & type) {
kdDebug(6100) << "slave mimetype " << type << endl;
}
-void KJavaDownloader::slotResult( KIO::Job* )
+void KJavaDownloader::slotResult( TDEIO::Job* )
{
kdDebug(6100) << "slotResult(" << d->loaderID << ")" << endl;
@@ -149,7 +149,7 @@ void KJavaDownloader::slotResult( KIO::Job* )
{
server->sendURLData( d->loaderID, FINISHED, d->file );
}
- d->job = 0L; // signal KIO::Job::result deletes itself
+ d->job = 0L; // signal TDEIO::Job::result deletes itself
server->removeDataJob( d->loaderID ); // will delete this
KJavaAppletServer::freeJavaServer();
}
@@ -161,7 +161,7 @@ void KJavaDownloader::jobCommand( int cmd )
case KJAS_STOP: {
kdDebug(6100) << "jobCommand(" << d->loaderID << ") stop" << endl;
d->job->kill();
- d->job = 0L; // KIO::Job::kill deletes itself
+ d->job = 0L; // TDEIO::Job::kill deletes itself
KJavaAppletServer* server = KJavaAppletServer::allocateJavaServer();
server->removeDataJob( d->loaderID ); // will delete this
KJavaAppletServer::freeJavaServer();
@@ -187,12 +187,12 @@ public:
~KJavaUploaderPrivate()
{
delete url;
- if (job) job->kill(); // KIO::Job::kill deletes itself
+ if (job) job->kill(); // TDEIO::Job::kill deletes itself
}
int loaderID;
KURL* url;
TQByteArray file;
- KIO::TransferJob* job;
+ TDEIO::TransferJob* job;
bool finished;
};
@@ -213,12 +213,12 @@ void KJavaUploader::start()
kdDebug(6100) << "KJavaUploader::start(" << d->loaderID << ")" << endl;
KJavaAppletServer* server = KJavaAppletServer::allocateJavaServer();
// create a suspended job
- d->job = KIO::put( *d->url, -1, false, false, false );
+ d->job = TDEIO::put( *d->url, -1, false, false, false );
d->job->suspend();
- connect( d->job, TQT_SIGNAL(dataReq( KIO::Job*, TQByteArray& )),
- this, TQT_SLOT(slotDataRequest( KIO::Job*, TQByteArray& )) );
- connect( d->job, TQT_SIGNAL(result(KIO::Job*)),
- this, TQT_SLOT(slotResult(KIO::Job*)) );
+ connect( d->job, TQT_SIGNAL(dataReq( TDEIO::Job*, TQByteArray& )),
+ this, TQT_SLOT(slotDataRequest( TDEIO::Job*, TQByteArray& )) );
+ connect( d->job, TQT_SIGNAL(result(TDEIO::Job*)),
+ this, TQT_SLOT(slotResult(TDEIO::Job*)) );
server->sendURLData( d->loaderID, CONNECTED, d->file );
KJavaAppletServer::freeJavaServer();
}
@@ -228,7 +228,7 @@ KJavaUploader::~KJavaUploader()
delete d;
}
-void KJavaUploader::slotDataRequest( KIO::Job*, TQByteArray& qb )
+void KJavaUploader::slotDataRequest( TDEIO::Job*, TQByteArray& qb )
{
// send our data and suspend
kdDebug(6100) << "slotDataRequest(" << d->loaderID << ") finished:" << d->finished << endl;
@@ -256,7 +256,7 @@ void KJavaUploader::data( const TQByteArray& qb )
d->job->resume();
}
-void KJavaUploader::slotResult( KIO::Job* )
+void KJavaUploader::slotResult( TDEIO::Job* )
{
kdDebug(6100) << "slotResult(" << d->loaderID << ") job:" << d->job << endl;
@@ -276,7 +276,7 @@ void KJavaUploader::slotResult( KIO::Job* )
}
else // shouldn't come here
kdError(6100) << "slotResult(" << d->loaderID << ") job:" << d->job << endl;
- d->job = 0L; // signal KIO::Job::result deletes itself
+ d->job = 0L; // signal TDEIO::Job::result deletes itself
server->removeDataJob( d->loaderID ); // will delete this
KJavaAppletServer::freeJavaServer();
}
diff --git a/khtml/java/kjavadownloader.h b/khtml/java/kjavadownloader.h
index f9514304..ab655339 100644
--- a/khtml/java/kjavadownloader.h
+++ b/khtml/java/kjavadownloader.h
@@ -27,13 +27,13 @@
/**
* @short A class for handling downloads from KIO
*
- * This class handles a KIO::get job and passes the data
+ * This class handles a TDEIO::get job and passes the data
* back to the AppletServer.
*
* @author Wynn Wilkes, wynnw@calderasystems.com
*/
-namespace KIO {
+namespace TDEIO {
class Job;
}
@@ -59,10 +59,10 @@ public:
virtual void jobCommand( int cmd );
protected slots:
- void slotData( KIO::Job*, const TQByteArray& );
- void slotConnected( KIO::Job* );
- void slotMimetype( KIO::Job*, const TQString& );
- void slotResult( KIO::Job* );
+ void slotData( TDEIO::Job*, const TQByteArray& );
+ void slotConnected( TDEIO::Job* );
+ void slotMimetype( TDEIO::Job*, const TQString& );
+ void slotResult( TDEIO::Job* );
private:
KJavaDownloaderPrivate* d;
@@ -81,8 +81,8 @@ public:
virtual void data( const TQByteArray& qb );
void start();
protected slots:
- void slotDataRequest( KIO::Job*, TQByteArray& );
- void slotResult( KIO::Job* );
+ void slotDataRequest( TDEIO::Job*, TQByteArray& );
+ void slotResult( TDEIO::Job* );
private:
KJavaUploaderPrivate* d;
diff --git a/khtml/khtml_ext.cpp b/khtml/khtml_ext.cpp
index 44c060b6..2e4660f2 100644
--- a/khtml/khtml_ext.cpp
+++ b/khtml/khtml_ext.cpp
@@ -437,7 +437,7 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc,
// Fill search provider entries
- KConfig config("kuriikwsfilterrc");
+ TDEConfig config("kuriikwsfilterrc");
config.setGroup("General");
const TQString defaultEngine = config.readEntry("DefaultSearchEngine", "google");
const char keywordDelimiter = config.readNumEntry("KeywordDelimiter", ':');
@@ -648,7 +648,7 @@ KHTMLPopupGUIClient::~KHTMLPopupGUIClient()
void KHTMLPopupGUIClient::slotSaveLinkAs()
{
- KIO::MetaData metaData;
+ TDEIO::MetaData metaData;
metaData["referrer"] = d->m_khtml->referrer();
saveURL( d->m_khtml->widget(), i18n( "Save Link As" ), d->m_url, metaData );
}
@@ -668,7 +668,7 @@ void KHTMLPopupGUIClient::slotSendImage()
void KHTMLPopupGUIClient::slotSaveImageAs()
{
- KIO::MetaData metaData;
+ TDEIO::MetaData metaData;
metaData["referrer"] = d->m_khtml->referrer();
saveURL( d->m_khtml->widget(), i18n( "Save Image As" ), d->m_imageURL, metaData, TQString::null, 0, d->m_suggestedFilename );
}
@@ -824,7 +824,7 @@ void KHTMLPopupGUIClient::saveURL( TQWidget *parent, const TQString &caption,
{
TQFileInfo info( destURL.path() );
if( info.exists() ) {
- // TODO: use KIO::RenameDlg (shows more information)
+ // TODO: use TDEIO::RenameDlg (shows more information)
query = KMessageBox::warningContinueCancel( parent, i18n( "A file named \"%1\" already exists. " "Are you sure you want to overwrite it?" ).arg( info.fileName() ), i18n( "Overwrite File?" ), i18n( "Overwrite" ) );
}
}
@@ -862,7 +862,7 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL,
destFile.close();
KURL url2 = KURL();
url2.setPath(destFile.name());
- KIO::file_move(url2, destURL, -1, true /*overwrite*/);
+ TDEIO::file_move(url2, destURL, -1, true /*overwrite*/);
saved = true;
}
}
@@ -876,7 +876,7 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL,
bool downloadViaKIO = true;
if ( !url.isLocalFile() )
{
- KConfig cfg("konquerorrc", false, false);
+ TDEConfig cfg("konquerorrc", false, false);
cfg.setGroup("HTML Settings");
TQString downloadManger = cfg.readPathEntry("DownloadManager");
if (!downloadManger.isEmpty())
@@ -907,7 +907,7 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL,
if ( downloadViaKIO )
{
- KIO::Job *job = KIO::file_copy( url, destURL, -1, true /*overwrite*/ );
+ TDEIO::Job *job = TDEIO::file_copy( url, destURL, -1, true /*overwrite*/ );
job->setMetaData(metadata);
job->addMetaData("MaxCacheSize", "0"); // Don't store in http cache.
job->addMetaData("cache", "cache"); // Use entry from cache if available.
diff --git a/khtml/khtml_ext.h b/khtml/khtml_ext.h
index 47ab9722..4878c0ac 100644
--- a/khtml/khtml_ext.h
+++ b/khtml/khtml_ext.h
@@ -120,12 +120,12 @@ public:
virtual ~KHTMLPopupGUIClient();
static void saveURL( TQWidget *parent, const TQString &caption, const KURL &url,
- const TQMap<TQString, TQString> &metaData = KIO::MetaData(),
+ const TQMap<TQString, TQString> &metaData = TDEIO::MetaData(),
const TQString &filter = TQString::null, long cacheId = 0,
const TQString &suggestedFilename = TQString::null );
static void saveURL( const KURL &url, const KURL &destination,
- const TQMap<TQString, TQString> &metaData = KIO::MetaData(),
+ const TQMap<TQString, TQString> &metaData = TDEIO::MetaData(),
long cacheId = 0 );
private slots:
void slotSaveLinkAs();
diff --git a/khtml/khtml_factory.cpp b/khtml/khtml_factory.cpp
index 6b566288..63e44025 100644
--- a/khtml/khtml_factory.cpp
+++ b/khtml/khtml_factory.cpp
@@ -120,7 +120,7 @@ void KHTMLFactory::ref()
// that the factory gets deleted from within a qPostRoutine, called
// from the TQApplication destructor. That however is too late, because
// we want to destruct a TDEInstance object, which involves destructing
- // a KConfig object, which might call TDEGlobal::dirs() (in sync()) which
+ // a TDEConfig object, which might call TDEGlobal::dirs() (in sync()) which
// probably is not going to work ;-)
// well, perhaps I'm wrong here, but as I'm unsure I try to stay on the
// safe side ;-) -> let's use a simple reference counting scheme
diff --git a/khtml/khtml_iface.cc b/khtml/khtml_iface.cc
index 2746ba0d..9576379e 100644
--- a/khtml/khtml_iface.cc
+++ b/khtml/khtml_iface.cc
@@ -191,7 +191,7 @@ void KHTMLPartIface::saveBackground(const TQString &destination)
if (back.isEmpty())
return;
- KIO::MetaData metaData;
+ TDEIO::MetaData metaData;
metaData["referrer"] = part->referrer();
KHTMLPopupGUIClient::saveURL( back, KURL( destination ), metaData );
}
@@ -203,7 +203,7 @@ void KHTMLPartIface::saveDocument(const TQString &destination)
if ( srcURL.fileName(false).isEmpty() )
srcURL.setFileName( "index.html" );
- KIO::MetaData metaData;
+ TDEIO::MetaData metaData;
// Referrer unknown?
KHTMLPopupGUIClient::saveURL( srcURL, KURL( destination ), metaData, part->cacheId() );
}
diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp
index bf4566c8..c0733c99 100644
--- a/khtml/khtml_part.cpp
+++ b/khtml/khtml_part.cpp
@@ -306,7 +306,7 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
d->m_paSetEncoding->insert( d->m_manualDetection );
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
if ( config->hasGroup( "HTML Settings" ) ) {
config->setGroup( "HTML Settings" );
khtml::Decoder::AutoDetectLanguage language;
@@ -434,7 +434,7 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
this, TQT_SLOT( updateActions() ) );
connect( this, TQT_SIGNAL( completed( bool ) ),
this, TQT_SLOT( updateActions() ) );
- connect( this, TQT_SIGNAL( started( KIO::Job * ) ),
+ connect( this, TQT_SIGNAL( started( TDEIO::Job * ) ),
this, TQT_SLOT( updateActions() ) );
d->m_popupMenuXML = KXMLGUIFactory::readConfigFile( locate( "data", "khtml/khtml_popupmenu.rc", KHTMLFactory::instance() ) );
@@ -469,7 +469,7 @@ KHTMLPart::~KHTMLPart()
{
//kdDebug(6050) << "KHTMLPart::~KHTMLPart " << this << endl;
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup( "HTML Settings" );
config->writeEntry( "AutomaticDetectionLanguage", d->m_autoDetectLanguage );
@@ -590,7 +590,7 @@ bool KHTMLPart::openURL( const KURL &url )
KURL mainURL = urls.first();
int error = mainURL.queryItem( "error" ).toInt();
// error=0 isn't a valid error code, so 0 means it's missing from the URL
- if ( error == 0 ) error = KIO::ERR_UNKNOWN;
+ if ( error == 0 ) error = TDEIO::ERR_UNKNOWN;
TQString errorText = mainURL.queryItem( "errText", HINT_UTF8 );
urls.pop_front();
d->m_workingURL = KURL::join( urls );
@@ -698,36 +698,36 @@ bool KHTMLPart::openURL( const KURL &url )
if (d->m_restored)
{
args.metaData().insert("referrer", d->m_pageReferrer);
- d->m_cachePolicy = KIO::CC_Cache;
+ d->m_cachePolicy = TDEIO::CC_Cache;
}
else if (args.reload)
- d->m_cachePolicy = KIO::CC_Reload;
+ d->m_cachePolicy = TDEIO::CC_Reload;
else
d->m_cachePolicy = KProtocolManager::cacheControl();
if ( args.doPost() && (m_url.protocol().startsWith("http")) )
{
- d->m_job = KIO::http_post( m_url, args.postData, false );
+ d->m_job = TDEIO::http_post( m_url, args.postData, false );
d->m_job->addMetaData("content-type", args.contentType() );
}
else
{
- d->m_job = KIO::get( m_url, false, false );
- d->m_job->addMetaData("cache", KIO::getCacheControlString(d->m_cachePolicy));
+ d->m_job = TDEIO::get( m_url, false, false );
+ d->m_job->addMetaData("cache", TDEIO::getCacheControlString(d->m_cachePolicy));
}
if (widget())
d->m_job->setWindow(widget()->topLevelWidget());
d->m_job->addMetaData(args.metaData());
- connect( d->m_job, TQT_SIGNAL( result( KIO::Job* ) ),
- TQT_SLOT( slotFinished( KIO::Job* ) ) );
- connect( d->m_job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
- TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
- connect ( d->m_job, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
- TQT_SLOT( slotInfoMessage(KIO::Job*, const TQString& ) ) );
- connect( d->m_job, TQT_SIGNAL(redirection(KIO::Job*, const KURL& ) ),
- TQT_SLOT( slotRedirection(KIO::Job*, const KURL&) ) );
+ connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+ TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
+ connect( d->m_job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+ TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+ connect ( d->m_job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+ TQT_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) );
+ connect( d->m_job, TQT_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ),
+ TQT_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) );
d->m_bComplete = false;
d->m_bLoadEventEmitted = false;
@@ -743,14 +743,14 @@ bool KHTMLPart::openURL( const KURL &url )
d->m_bPluginsEnabled = KHTMLFactory::defaultHTMLSettings()->isPluginsEnabled(url.host());
- connect( d->m_job, TQT_SIGNAL( speed( KIO::Job*, unsigned long ) ),
- this, TQT_SLOT( slotJobSpeed( KIO::Job*, unsigned long ) ) );
+ connect( d->m_job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ),
+ this, TQT_SLOT( slotJobSpeed( TDEIO::Job*, unsigned long ) ) );
- connect( d->m_job, TQT_SIGNAL( percent( KIO::Job*, unsigned long ) ),
- this, TQT_SLOT( slotJobPercent( KIO::Job*, unsigned long ) ) );
+ connect( d->m_job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ),
+ this, TQT_SLOT( slotJobPercent( TDEIO::Job*, unsigned long ) ) );
- connect( d->m_job, TQT_SIGNAL( result( KIO::Job* ) ),
- this, TQT_SLOT( slotJobDone( KIO::Job* ) ) );
+ connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQT_SLOT( slotJobDone( TDEIO::Job* ) ) );
d->m_jobspeed = 0;
@@ -758,9 +758,9 @@ bool KHTMLPart::openURL( const KURL &url )
// do a stat to see whether the stylesheet was changed in the meanwhile.
if ( args.reload && !settings()->userStyleSheet().isEmpty() ) {
KURL url( settings()->userStyleSheet() );
- KIO::StatJob *job = KIO::stat( url, false /* don't show progress */ );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
- this, TQT_SLOT( slotUserSheetStatDone( KIO::Job * ) ) );
+ TDEIO::StatJob *job = TDEIO::stat( url, false /* don't show progress */ );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ this, TQT_SLOT( slotUserSheetStatDone( TDEIO::Job * ) ) );
}
emit started( 0L );
@@ -876,7 +876,7 @@ TQString KHTMLPart::documentSource() const
} else
{
TQString tmpFile;
- if( KIO::NetAccess::download( m_url, tmpFile, NULL ) )
+ if( TDEIO::NetAccess::download( m_url, tmpFile, NULL ) )
{
TQFile f( tmpFile );
if ( f.open( IO_ReadOnly ) )
@@ -886,7 +886,7 @@ TQString KHTMLPart::documentSource() const
sourceStr = stream.read();
f.close();
}
- KIO::NetAccess::removeTempFile( tmpFile );
+ TDEIO::NetAccess::removeTempFile( tmpFile );
}
}
@@ -1511,7 +1511,7 @@ DOM::DocumentImpl *KHTMLPart::xmlDocImpl() const
return 0;
}
-void KHTMLPart::slotInfoMessage(KIO::Job* kio_job, const TQString& msg)
+void KHTMLPart::slotInfoMessage(TDEIO::Job* kio_job, const TQString& msg)
{
assert(d->m_job == kio_job);
@@ -1562,7 +1562,7 @@ void KHTMLPart::setPageSecurity( PageSecurity sec )
d->m_statusBarIconLabel->setPixmap( SmallIcon( iconName, instance() ) );
}
-void KHTMLPart::slotData( KIO::Job* kio_job, const TQByteArray &data )
+void KHTMLPart::slotData( TDEIO::Job* kio_job, const TQByteArray &data )
{
assert ( d->m_job == kio_job );
@@ -1579,8 +1579,8 @@ void KHTMLPart::slotData( KIO::Job* kio_job, const TQByteArray &data )
begin( d->m_workingURL, d->m_extension->urlArgs().xOffset, d->m_extension->urlArgs().yOffset );
d->m_job->resume();
- if (d->m_cachePolicy == KIO::CC_Refresh)
- d->m_doc->docLoader()->setCachePolicy(KIO::CC_Verify);
+ if (d->m_cachePolicy == TDEIO::CC_Refresh)
+ d->m_doc->docLoader()->setCachePolicy(TDEIO::CC_Verify);
else
d->m_doc->docLoader()->setCachePolicy(d->m_cachePolicy);
@@ -1696,12 +1696,12 @@ void KHTMLPart::slotRestoreData(const TQByteArray &data )
}
}
-void KHTMLPart::showError( KIO::Job* job )
+void KHTMLPart::showError( TDEIO::Job* job )
{
kdDebug(6050) << "KHTMLPart::showError d->m_bParsing=" << (d->m_doc && d->m_doc->parsing()) << " d->m_bComplete=" << d->m_bComplete
<< " d->m_bCleared=" << d->m_bCleared << endl;
- if (job->error() == KIO::ERR_NO_CONTENT)
+ if (job->error() == TDEIO::ERR_NO_CONTENT)
return;
if ( (d->m_doc && d->m_doc->parsing()) || d->m_workingURL.isEmpty() ) // if we got any data already
@@ -1728,7 +1728,7 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU
errText += TQString::fromLatin1( "</TITLE></HEAD><BODY><P>" );
errText += i18n( "An error occurred while loading <B>%1</B>:" ).arg( reqUrl.htmlURL() );
errText += TQString::fromLatin1( "</P>" );
- errText += TQStyleSheet::convertFromPlainText( KIO::buildErrorString( errorCode, text ) );
+ errText += TQStyleSheet::convertFromPlainText( TDEIO::buildErrorString( errorCode, text ) );
errText += TQString::fromLatin1( "</BODY></HTML>" );
write(errText);
end();
@@ -1749,7 +1749,7 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU
TQString errorName, techName, description;
TQStringList causes, solutions;
- TQByteArray raw = KIO::rawErrorDetail( errorCode, text, &reqUrl );
+ TQByteArray raw = TDEIO::rawErrorDetail( errorCode, text, &reqUrl );
TQDataStream stream(raw, IO_ReadOnly);
stream >> errorName >> techName >> description >> causes >> solutions;
@@ -1812,7 +1812,7 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU
end();
}
-void KHTMLPart::slotFinished( KIO::Job * job )
+void KHTMLPart::slotFinished( TDEIO::Job * job )
{
d->m_job = 0L;
d->m_jobspeed = 0L;
@@ -1826,7 +1826,7 @@ void KHTMLPart::slotFinished( KIO::Job * job )
// KIO cannot change a redirection request from GET to LISTDIR,
// we have to take care of it here once we know for sure it is
// a directory...
- if (job->error() == KIO::ERR_IS_DIRECTORY)
+ if (job->error() == TDEIO::ERR_IS_DIRECTORY)
{
KParts::URLArgs args;
emit d->m_extension->openURLRequest( d->m_workingURL, args );
@@ -1841,7 +1841,7 @@ void KHTMLPart::slotFinished( KIO::Job * job )
return;
}
- KIO::TransferJob *tjob = ::tqqt_cast<KIO::TransferJob*>(job);
+ TDEIO::TransferJob *tjob = ::tqqt_cast<TDEIO::TransferJob*>(job);
if (tjob && tjob->isErrorPage()) {
khtml::RenderPart *renderPart = d->m_frame ? static_cast<khtml::RenderPart *>(d->m_frame->m_frame) : 0;
if (renderPart) {
@@ -1861,7 +1861,7 @@ void KHTMLPart::slotFinished( KIO::Job * job )
d->m_frame->m_jscript->dataReceived();
if ( d->m_doc && d->m_doc->docLoader()->expireDate() && m_url.protocol().lower().startsWith("http"))
- KIO::http_update_cache(m_url, false, d->m_doc->docLoader()->expireDate());
+ TDEIO::http_update_cache(m_url, false, d->m_doc->docLoader()->expireDate());
d->m_workingURL = KURL();
@@ -2140,14 +2140,14 @@ void KHTMLPart::slotProgressUpdate()
emit d->m_extension->loadingProgress( percent );
}
-void KHTMLPart::slotJobSpeed( KIO::Job* /*job*/, unsigned long speed )
+void KHTMLPart::slotJobSpeed( TDEIO::Job* /*job*/, unsigned long speed )
{
d->m_jobspeed = speed;
if (!parentPart())
setStatusBarText(jsStatusBarText(), BarOverrideText);
}
-void KHTMLPart::slotJobPercent( KIO::Job* /*job*/, unsigned long percent )
+void KHTMLPart::slotJobPercent( TDEIO::Job* /*job*/, unsigned long percent )
{
d->m_jobPercent = percent;
@@ -2155,7 +2155,7 @@ void KHTMLPart::slotJobPercent( KIO::Job* /*job*/, unsigned long percent )
d->m_progressUpdateTimer.start( 0, true );
}
-void KHTMLPart::slotJobDone( KIO::Job* /*job*/ )
+void KHTMLPart::slotJobDone( TDEIO::Job* /*job*/ )
{
d->m_jobPercent = 100;
@@ -2163,16 +2163,16 @@ void KHTMLPart::slotJobDone( KIO::Job* /*job*/ )
d->m_progressUpdateTimer.start( 0, true );
}
-void KHTMLPart::slotUserSheetStatDone( KIO::Job *_job )
+void KHTMLPart::slotUserSheetStatDone( TDEIO::Job *_job )
{
- using namespace KIO;
+ using namespace TDEIO;
if ( _job->error() ) {
showError( _job );
return;
}
- const UDSEntry entry = dynamic_cast<KIO::StatJob *>( _job )->statResult();
+ const UDSEntry entry = dynamic_cast<TDEIO::StatJob *>( _job )->statResult();
UDSEntry::ConstIterator it = entry.begin();
const UDSEntry::ConstIterator end = entry.end();
for ( ; it != end; ++it ) {
@@ -2453,7 +2453,7 @@ void KHTMLPart::slotRedirect()
emit completed();
}
-void KHTMLPart::slotRedirection(KIO::Job*, const KURL& url)
+void KHTMLPart::slotRedirection(TDEIO::Job*, const KURL& url)
{
// the slave told us that we got redirected
//kdDebug( 6050 ) << "redirection by KIO to " << url.url() << endl;
@@ -3757,7 +3757,7 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi
if ( u.isLocalFile() )
{
- // TODO : use KIO::stat() and create a KFileItem out of its result,
+ // TODO : use TDEIO::stat() and create a KFileItem out of its result,
// to use KFileItem::statusBarText()
TQCString path = TQFile::encodeName( u.path() );
@@ -3932,7 +3932,7 @@ bool KHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, c
if ( button == Qt::LeftButton && ( state & ShiftButton ) )
{
- KIO::MetaData metaData;
+ TDEIO::MetaData metaData;
metaData["referrer"] = d->m_referrer;
KHTMLPopupGUIClient::saveURL( d->m_view, i18n( "Save As" ), cURL, metaData );
return false;
@@ -4124,7 +4124,7 @@ KURL KHTMLPart::backgroundURL() const
void KHTMLPart::slotSaveBackground()
{
- KIO::MetaData metaData;
+ TDEIO::MetaData metaData;
metaData["referrer"] = d->m_referrer;
KHTMLPopupGUIClient::saveURL( d->m_view, i18n("Save Background Image As"), backgroundURL(), metaData );
}
@@ -4136,7 +4136,7 @@ void KHTMLPart::slotSaveDocument()
if ( srcURL.fileName(false).isEmpty() )
srcURL.setFileName( "index" + defaultExtension() );
- KIO::MetaData metaData;
+ TDEIO::MetaData metaData;
// Referre unknown?
KHTMLPopupGUIClient::saveURL( d->m_view, i18n( "Save As" ), srcURL, metaData, "text/html", d->m_cacheId );
}
@@ -4211,7 +4211,7 @@ void KHTMLPart::slotSaveFrame()
if ( srcURL.fileName(false).isEmpty() )
srcURL.setFileName( "index" + defaultExtension() );
- KIO::MetaData metaData;
+ TDEIO::MetaData metaData;
// Referrer unknown?
KHTMLPopupGUIClient::saveURL( d->m_view, i18n( "Save Frame As" ), srcURL, metaData, "text/html" );
}
@@ -4391,7 +4391,7 @@ bool KHTMLPart::requestObject( khtml::ChildFrame *child, const KURL &url, const
args.serviceType = child->m_serviceType;
child->m_args = args;
- child->m_args.reload = (d->m_cachePolicy == KIO::CC_Reload);
+ child->m_args.reload = (d->m_cachePolicy == TDEIO::CC_Reload);
child->m_serviceName = TQString();
if (!d->m_referrer.isEmpty() && !child->m_args.metaData().contains( "referrer" ))
child->m_args.metaData()["referrer"] = d->m_referrer;
@@ -4518,8 +4518,8 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
if (sb)
sb->setStatusBar( d->m_statusBarExtension->statusBar() );
- connect( part, TQT_SIGNAL( started( KIO::Job *) ),
- this, TQT_SLOT( slotChildStarted( KIO::Job *) ) );
+ connect( part, TQT_SIGNAL( started( TDEIO::Job *) ),
+ this, TQT_SLOT( slotChildStarted( TDEIO::Job *) ) );
connect( part, TQT_SIGNAL( completed() ),
this, TQT_SLOT( slotChildCompleted() ) );
connect( part, TQT_SIGNAL( completed(bool) ),
@@ -4594,7 +4594,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
return true;
}
- child->m_args.reload = (d->m_cachePolicy == KIO::CC_Reload);
+ child->m_args.reload = (d->m_cachePolicy == TDEIO::CC_Reload);
// make sure the part has a way to find out about the mimetype.
// we actually set it in child->m_args in requestObject already,
@@ -4776,9 +4776,9 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt
KGuiItem(i18n("&Send Unencrypted")),
"WarnOnUnencryptedForm");
// Move this setting into KSSL instead
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
- KConfigGroupSaver saver( config, grpNotifMsgs );
+ TDEConfigGroupSaver saver( config, grpNotifMsgs );
if (!config->readBoolEntry("WarnOnUnencryptedForm", true)) {
config->deleteEntry("WarnOnUnencryptedForm");
@@ -5028,7 +5028,7 @@ void KHTMLPart::slotParentCompleted()
}
}
-void KHTMLPart::slotChildStarted( KIO::Job *job )
+void KHTMLPart::slotChildStarted( TDEIO::Job *job )
{
khtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) );
@@ -5773,7 +5773,7 @@ void KHTMLPart::setStatusBarText( const TQString& text, StatusBarPriority p)
if (!tobe.isEmpty() && d->m_jobspeed)
tobe += " ";
if (d->m_jobspeed)
- tobe += i18n( "(%1/s)" ).arg( KIO::convertSize( d->m_jobspeed ) );
+ tobe += i18n( "(%1/s)" ).arg( TDEIO::convertSize( d->m_jobspeed ) );
}
tobe = "<qt>"+tobe;
diff --git a/khtml/khtml_part.h b/khtml/khtml_part.h
index e65a41c1..d84296f0 100644
--- a/khtml/khtml_part.h
+++ b/khtml/khtml_part.h
@@ -274,7 +274,7 @@ public:
* verbose error description a as page, depending on the users configuration.
* @p job is the job that signaled the error situation
*/
- virtual void showError( KIO::Job* job );
+ virtual void showError( TDEIO::Job* job );
/**
* Returns a reference to the DOM HTML document (for non-HTML documents, returns null)
@@ -1118,7 +1118,7 @@ protected:
/**
* presents a detailed error message to the user.
- * @p errorCode kio error code, eg KIO::ERR_SERVER_TIMEOUT.
+ * @p errorCode kio error code, eg TDEIO::ERR_SERVER_TIMEOUT.
* @p text kio additional information text.
* @p url the url that triggered the error.
*/
@@ -1288,11 +1288,11 @@ private slots:
/**
* @internal
*/
- void slotData( KIO::Job*, const TQByteArray &data );
+ void slotData( TDEIO::Job*, const TQByteArray &data );
/**
* @internal
*/
- void slotInfoMessage( KIO::Job*, const TQString& msg );
+ void slotInfoMessage( TDEIO::Job*, const TQString& msg );
/**
* @internal
*/
@@ -1300,7 +1300,7 @@ private slots:
/**
* @internal
*/
- void slotFinished( KIO::Job* );
+ void slotFinished( TDEIO::Job* );
/**
* @internal
*/
@@ -1312,7 +1312,7 @@ private slots:
/**
* @internal
*/
- void slotRedirection( KIO::Job*, const KURL& );
+ void slotRedirection( TDEIO::Job*, const KURL& );
/**
* @internal
*/
@@ -1405,7 +1405,7 @@ private slots:
/**
* @internal
*/
- void slotChildStarted( KIO::Job *job );
+ void slotChildStarted( TDEIO::Job *job );
/**
* @internal
*/
@@ -1451,22 +1451,22 @@ private slots:
/*
* @internal
*/
- void slotJobPercent( KIO::Job*, unsigned long );
+ void slotJobPercent( TDEIO::Job*, unsigned long );
/*
* @internal
*/
- void slotJobDone( KIO::Job* );
+ void slotJobDone( TDEIO::Job* );
/*
* @internal
*/
- void slotUserSheetStatDone( KIO::Job* );
+ void slotUserSheetStatDone( TDEIO::Job* );
/*
* @internal
*/
- void slotJobSpeed( KIO::Job*, unsigned long );
+ void slotJobSpeed( TDEIO::Job*, unsigned long );
/**
* @internal
diff --git a/khtml/khtml_run.cpp b/khtml/khtml_run.cpp
index 90770d38..c999562b 100644
--- a/khtml/khtml_run.cpp
+++ b/khtml/khtml_run.cpp
@@ -84,7 +84,7 @@ void KHTMLRun::save( const KURL & url, const TQString & suggestedFilename )
}
// KDE4: remove
-void KHTMLRun::handleError( KIO::Job *job )
+void KHTMLRun::handleError( TDEIO::Job *job )
{
KParts::BrowserRun::handleError( job );
}
diff --git a/khtml/khtml_run.h b/khtml/khtml_run.h
index e1be45fd..0420e91a 100644
--- a/khtml/khtml_run.h
+++ b/khtml/khtml_run.h
@@ -47,7 +47,7 @@ public:
//KHTMLPart *htmlPart() const;
protected:
- virtual void handleError( KIO::Job * job );
+ virtual void handleError( TDEIO::Job * job );
virtual void save( const KURL & url, const TQString & suggestedFilename );
bool askSave( const KURL & url, KService::Ptr offer, const TQString & mimeType, const TQString & suggestedFilename );
diff --git a/khtml/khtml_settings.cc b/khtml/khtml_settings.cc
index 5c5db734..43027187 100644
--- a/khtml/khtml_settings.cc
+++ b/khtml/khtml_settings.cc
@@ -186,7 +186,7 @@ void KHTMLSettings::splitDomainAdvice(const TQString& configStr, TQString &domai
}
}
-void KHTMLSettings::readDomainSettings(KConfig *config, bool reset,
+void KHTMLSettings::readDomainSettings(TDEConfig *config, bool reset,
bool global, KPerDomainSettings &pd_settings) {
TQString jsPrefix = global ? TQString::null
: TQString::fromLatin1("javascript.");
@@ -289,17 +289,17 @@ bool KHTMLSettings::hoverLink() const
void KHTMLSettings::init()
{
- KConfig global( "khtmlrc", true, false );
+ TDEConfig global( "khtmlrc", true, false );
init( &global, true );
- KConfig *local = TDEGlobal::config();
+ TDEConfig *local = TDEGlobal::config();
if ( !local )
return;
init( local, false );
}
-void KHTMLSettings::init( KConfig * config, bool reset )
+void KHTMLSettings::init( TDEConfig * config, bool reset )
{
TQString group_save = config->group();
if (reset || config->hasGroup("MainView Settings"))
@@ -741,7 +741,7 @@ bool KHTMLSettings::isAdFiltered( const TQString &url ) const
void KHTMLSettings::addAdFilter( const TQString &url )
{
- KConfig config( "khtmlrc", false, false );
+ TDEConfig config( "khtmlrc", false, false );
config.setGroup( "Filter Settings" );
TQRegExp rx;
@@ -1027,7 +1027,7 @@ void KHTMLSettings::setJSErrorsEnabled(bool enabled)
{
d->m_jsErrorsEnabled = enabled;
// save it
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("HTML Settings");
config->writeEntry("ReportJSErrors", enabled);
config->sync();
@@ -1052,7 +1052,7 @@ void KHTMLSettings::setJSPopupBlockerPassivePopup(bool enabled)
{
d->m_jsPopupBlockerPassivePopup = enabled;
// save it
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("Java/JavaScript Settings");
config->writeEntry("PopupBlockerPassivePopup", enabled);
config->sync();
diff --git a/khtml/khtml_settings.h b/khtml/khtml_settings.h
index bb089e5a..4d68845f 100644
--- a/khtml/khtml_settings.h
+++ b/khtml/khtml_settings.h
@@ -20,7 +20,7 @@
#ifndef __konq_htmlsettings_h__
#define __konq_htmlsettings_h__
-class KConfig;
+class TDEConfig;
#include <tqcolor.h>
#include <tqstring.h>
#include <tqstringlist.h>
@@ -108,11 +108,11 @@ public:
void init();
/** Read settings from @p config.
- * @param config is a pointer to KConfig object.
+ * @param config is a pointer to TDEConfig object.
* @param reset if true, settings are always set; if false,
* settings are only set if the config file has a corresponding key.
*/
- void init( KConfig * config, bool reset = true );
+ void init( TDEConfig * config, bool reset = true );
/**
* Destructor. Don't delete any instance by yourself.
@@ -193,13 +193,13 @@ public:
/** reads from @p config's current group, forcing initialization
* if @p reset is true.
- * @param config is a pointer to KConfig object.
+ * @param config is a pointer to TDEConfig object.
* @param reset true if initialization is to be forced.
* @param global true if the global domain is to be read.
* @param pd_settings will be initialised with the computed (inherited)
* settings.
*/
- void readDomainSettings(KConfig *config, bool reset,
+ void readDomainSettings(TDEConfig *config, bool reset,
bool global, KPerDomainSettings &pd_settings);
TQString settingsToCSS() const;
diff --git a/khtml/khtmlimage.cpp b/khtml/khtmlimage.cpp
index 4cb4bb3f..f9593e50 100644
--- a/khtml/khtmlimage.cpp
+++ b/khtml/khtmlimage.cpp
@@ -158,7 +158,7 @@ bool KHTMLImage::openURL( const KURL &url )
DOM::DocumentImpl *impl = dynamic_cast<DOM::DocumentImpl *>( m_khtml->document().handle() ); // ### hack ;-)
if (!impl) return false;
if ( m_ext->urlArgs().reload )
- impl->docLoader()->setCachePolicy( KIO::CC_Reload );
+ impl->docLoader()->setCachePolicy( TDEIO::CC_Reload );
khtml::DocLoader *dl = impl->docLoader();
m_image = dl->requestImage( m_url.url() );
@@ -232,7 +232,7 @@ void KHTMLImage::guiActivateEvent( KParts::GUIActivateEvent *e )
}
/*
-void KHTMLImage::slotImageJobFinished( KIO::Job *job )
+void KHTMLImage::slotImageJobFinished( TDEIO::Job *job )
{
if ( job->error() )
{
diff --git a/khtml/khtmlimage.h b/khtml/khtmlimage.h
index 6db0cbf5..5f165bd8 100644
--- a/khtml/khtmlimage.h
+++ b/khtml/khtmlimage.h
@@ -81,7 +81,7 @@ protected:
private slots:
void restoreScrollPosition();
-// void slotImageJobFinished( KIO::Job *job );
+// void slotImageJobFinished( TDEIO::Job *job );
// void updateWindowCaption();
diff --git a/khtml/khtmlpart_p.h b/khtml/khtmlpart_p.h
index cebee945..f914ef29 100644
--- a/khtml/khtmlpart_p.h
+++ b/khtml/khtmlpart_p.h
@@ -60,7 +60,7 @@ class KURLLabel;
class KJavaAppletContext;
class KJSErrorDlg;
-namespace KIO
+namespace TDEIO
{
class Job;
class TransferJob;
@@ -198,7 +198,7 @@ public:
m_job = 0L;
m_bComplete = true;
m_bLoadEventEmitted = true;
- m_cachePolicy = KIO::CC_Verify;
+ m_cachePolicy = TDEIO::CC_Verify;
m_manager = 0L;
m_settings = new KHTMLSettings(*KHTMLFactory::defaultHTMLSettings());
m_bClearing = false;
@@ -356,7 +356,7 @@ public:
KHTMLSettings *m_settings;
- KIO::TransferJob * m_job;
+ TDEIO::TransferJob * m_job;
TQString m_statusBarText[3];
unsigned long m_jobspeed;
@@ -387,7 +387,7 @@ public:
KURL m_workingURL;
- KIO::CacheControl m_cachePolicy;
+ TDEIO::CacheControl m_cachePolicy;
TQTimer m_redirectionTimer;
TQTime m_parsetime;
int m_delayRedirect;
diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp
index 411d03f2..4a5c7cf2 100644
--- a/khtml/khtmlview.cpp
+++ b/khtml/khtmlview.cpp
@@ -994,8 +994,8 @@ void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse )
bool hasHorBar = visibleWidth() < contentsWidth();
bool hasVerBar = visibleHeight() < contentsHeight();
- KConfig *config = TDEGlobal::config();
- KConfigGroupSaver saver( config, "HTML Settings" );
+ TDEConfig *config = TDEGlobal::config();
+ TDEConfigGroupSaver saver( config, "HTML Settings" );
if ( config->readBoolEntry( "ShowMouseScrollIndicator", true ) ) {
d->m_mouseScrollIndicator->show();
d->m_mouseScrollIndicator->unsetCursor();
@@ -4517,7 +4517,7 @@ static const int SCROLL_TICK = 20;
void KHTMLView::scrollBy(int dx, int dy)
{
- KConfigGroup cfg( TDEGlobal::config(), "KDE" );
+ TDEConfigGroup cfg( TDEGlobal::config(), "KDE" );
if( !cfg.readBoolEntry( "SmoothScrolling", false )) {
TQScrollView::scrollBy( dx, dy );
return;
diff --git a/khtml/kmultipart/kmultipart.cpp b/khtml/kmultipart/kmultipart.cpp
index 65be07e8..32c514f1 100644
--- a/khtml/kmultipart/kmultipart.cpp
+++ b/khtml/kmultipart/kmultipart.cpp
@@ -163,14 +163,14 @@ bool KMultiPart::openURL( const KURL &url )
// Hmm, args.reload is set to true when reloading, but this doesn't seem to be enough...
// I get "HOLD: Reusing held slave for <url>", and the old data
- m_job = KIO::get( url, args.reload, false );
+ m_job = TDEIO::get( url, args.reload, false );
emit started( 0 /*m_job*/ ); // don't pass the job, it would interfer with our own infoMessage
- connect( m_job, TQT_SIGNAL( result( KIO::Job * ) ),
- this, TQT_SLOT( slotJobFinished( KIO::Job * ) ) );
- connect( m_job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
- this, TQT_SLOT( slotData( KIO::Job *, const TQByteArray & ) ) );
+ connect( m_job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ this, TQT_SLOT( slotJobFinished( TDEIO::Job * ) ) );
+ connect( m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ this, TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
m_numberOfFrames = 0;
m_numberOfFramesSkipped = 0;
@@ -184,7 +184,7 @@ bool KMultiPart::openURL( const KURL &url )
// Yes, libtdenetwork's has such a parser already (MultiPart),
// but it works on the complete string, expecting the whole data to be available....
// The version here is asynchronous.
-void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data )
+void KMultiPart::slotData( TDEIO::Job *job, const TQByteArray &data )
{
if (m_boundary.isNull())
{
@@ -533,7 +533,7 @@ void KMultiPart::guiActivateEvent( KParts::GUIActivateEvent * )
// m_part->guiActivateEvent( e );
}
-void KMultiPart::slotJobFinished( KIO::Job *job )
+void KMultiPart::slotJobFinished( TDEIO::Job *job )
{
if ( job->error() )
{
diff --git a/khtml/kmultipart/kmultipart.h b/khtml/kmultipart/kmultipart.h
index 7ba5ba2f..1e6f8362 100644
--- a/khtml/kmultipart/kmultipart.h
+++ b/khtml/kmultipart/kmultipart.h
@@ -62,8 +62,8 @@ protected:
private slots:
void reallySendData( const TQByteArray& line );
//void slotPopupMenu( KXMLGUIClient *cl, const TQPoint &pos, const KURL &u, const TQString &mime, mode_t mode );
- void slotJobFinished( KIO::Job *job );
- void slotData( KIO::Job *, const TQByteArray & );
+ void slotJobFinished( TDEIO::Job *job );
+ void slotData( TDEIO::Job *, const TQByteArray & );
//void updateWindowCaption();
void slotPartCompleted();
@@ -77,7 +77,7 @@ private:
TQGuardedPtr<KParts::ReadOnlyPart> m_part;
bool m_isHTMLPart;
bool m_partIsLoading;
- KIO::Job* m_job;
+ TDEIO::Job* m_job;
TQCString m_boundary;
int m_boundaryLength;
TQString m_mimeType; // the one handled by m_part - store the kservice instead?
diff --git a/khtml/misc/knsplugininstaller.cpp b/khtml/misc/knsplugininstaller.cpp
index f155008e..b953f34f 100644
--- a/khtml/misc/knsplugininstaller.cpp
+++ b/khtml/misc/knsplugininstaller.cpp
@@ -102,7 +102,7 @@ bool KNSPluginInstallEngine::isActive()
{
// check if we have a configuration key in the kde registry
TQString pluginsListFile;
- KConfig cfg("kcmnspluginrc", true);
+ TDEConfig cfg("kcmnspluginrc", true);
cfg.setGroup("Misc");
pluginsListFile = cfg.readPathEntry("PluginsListFile");
return !pluginsListFile.isEmpty();
@@ -117,7 +117,7 @@ const TQValueList<KNSPluginInfo>& KNSPluginInstallEngine::pluginList() const
bool KNSPluginInstallEngine::loadConfig()
{
TQString pluginsListFile;
- KConfig cfg("kcmnspluginrc", true);
+ TDEConfig cfg("kcmnspluginrc", true);
cfg.setGroup("Misc");
pluginsListFile = cfg.readPathEntry("PluginsListFile");
if(!pluginsListFile.isEmpty())
@@ -136,7 +136,7 @@ bool KNSPluginInstallEngine::loadXmlConfig()
if(m_pluginsXmlConfig.isEmpty())
{
TQString tmpFile;
- if(KIO::NetAccess::download(m_pluginsListFileURL, tmpFile, NULL)) {
+ if(TDEIO::NetAccess::download(m_pluginsListFileURL, tmpFile, NULL)) {
TQFile f(tmpFile);
if(!f.open(IO_ReadOnly))
return false;
@@ -144,7 +144,7 @@ bool KNSPluginInstallEngine::loadXmlConfig()
stream.setEncoding(TQTextStream::UnicodeUTF8);
m_pluginsXmlConfig = stream.read();
f.close();
- KIO::NetAccess::removeTempFile(tmpFile);
+ TDEIO::NetAccess::removeTempFile(tmpFile);
} else
return false;
}
@@ -232,20 +232,20 @@ void KNSPluginInstallEngine::startInstall(KNSPluginInfo info)
tempFile.unlink();
tempFile.close();
// start the download job
- m_downloadJob = KIO::copy(info.pluginURL(), "file://"+m_tmpPluginFileName, false );
+ m_downloadJob = TDEIO::copy(info.pluginURL(), "file://"+m_tmpPluginFileName, false );
// connect signals
- connect(m_downloadJob, TQT_SIGNAL(percent (KIO::Job *, unsigned long)), this , TQT_SLOT(slotDownLoadProgress(KIO::Job *, unsigned long)));
- connect(m_downloadJob, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotDownloadResult(KIO::Job *)) );
+ connect(m_downloadJob, TQT_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQT_SLOT(slotDownLoadProgress(TDEIO::Job *, unsigned long)));
+ connect(m_downloadJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotDownloadResult(TDEIO::Job *)) );
kdDebug(DEBUG_NUMBER) << "download plugin " << m_tmpPluginFileName << endl;
}
-void KNSPluginInstallEngine::slotDownLoadProgress(KIO::Job *, unsigned long percent)
+void KNSPluginInstallEngine::slotDownLoadProgress(TDEIO::Job *, unsigned long percent)
{
// propagate the download progression
emit installProgress( ((int)percent)/3 );
}
-void KNSPluginInstallEngine::slotDownloadResult(KIO::Job *job)
+void KNSPluginInstallEngine::slotDownloadResult(TDEIO::Job *job)
{
// test if the download job suceed
if(job->error()) {
@@ -279,9 +279,9 @@ void KNSPluginInstallEngine::slotDownloadResult(KIO::Job *job)
for( it = pluginFileList.begin(); it != pluginFileList.end(); ++it ) {
urlList.append( KURL("tar://"+m_tmpPluginFileName+"/"+(*it)) );
}
- m_installFileJob = KIO::copy(urlList , destURL, false );
- connect(m_installFileJob, TQT_SIGNAL(percent (KIO::Job *, unsigned long)), this , TQT_SLOT(slotCopyProgress(KIO::Job *, unsigned long)));
- connect(m_installFileJob, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotCopyResult(KIO::Job *)) );
+ m_installFileJob = TDEIO::copy(urlList , destURL, false );
+ connect(m_installFileJob, TQT_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQT_SLOT(slotCopyProgress(TDEIO::Job *, unsigned long)));
+ connect(m_installFileJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotCopyResult(TDEIO::Job *)) );
}
kdDebug(DEBUG_NUMBER) << "COPY FILE " << m_tmpPluginFileName << endl;
@@ -289,13 +289,13 @@ void KNSPluginInstallEngine::slotDownloadResult(KIO::Job *job)
m_downloadJob = NULL;
}
-void KNSPluginInstallEngine::slotCopyProgress(KIO::Job *, unsigned long percent)
+void KNSPluginInstallEngine::slotCopyProgress(TDEIO::Job *, unsigned long percent)
{
// propagate the download progression
emit installProgress( ((int)percent)/3 + 33 );
}
-void KNSPluginInstallEngine::slotCopyResult(KIO::Job *job)
+void KNSPluginInstallEngine::slotCopyResult(TDEIO::Job *job)
{
// test if the download job suceed
if(job->error()) {
@@ -501,14 +501,14 @@ void KNSPluginWizard::showPage(TQWidget *page)
TQString tmpFile;
if(info.licenceURL().isValid())
// retrieve the licence if we have an url
- if(KIO::NetAccess::download(info.licenceURL(), tmpFile, NULL)) {
+ if(TDEIO::NetAccess::download(info.licenceURL(), tmpFile, NULL)) {
TQFile f(tmpFile);
if(f.open(IO_ReadOnly)) {
TQTextStream stream(&f);
stream.setEncoding(TQTextStream::UnicodeUTF8);
licence = stream.read();
f.close();
- KIO::NetAccess::removeTempFile(tmpFile);
+ TDEIO::NetAccess::removeTempFile(tmpFile);
}
}
// else display the licence found in the xml config
diff --git a/khtml/misc/knsplugininstaller.h b/khtml/misc/knsplugininstaller.h
index 0910a685..24020246 100644
--- a/khtml/misc/knsplugininstaller.h
+++ b/khtml/misc/knsplugininstaller.h
@@ -138,8 +138,8 @@ private:
KMimeType::Ptr m_mime;
KURL m_pluginsListFileURL;
TQString m_tmpPluginFileName;
- KIO::CopyJob *m_downloadJob;
- KIO::CopyJob *m_installFileJob;
+ TDEIO::CopyJob *m_downloadJob;
+ TDEIO::CopyJob *m_installFileJob;
KNSPluginInfo m_toInstallPluginInfo;
TQProcess *m_scanProc;
@@ -151,12 +151,12 @@ signals:
private slots:
// Used to monitor the plugin downloading
- void slotDownLoadProgress(KIO::Job *job, unsigned long percent);
- void slotDownloadResult(KIO::Job *job);
+ void slotDownLoadProgress(TDEIO::Job *job, unsigned long percent);
+ void slotDownloadResult(TDEIO::Job *job);
// Used to monitor the plugin installation
- void slotCopyProgress(KIO::Job *job, unsigned long percent);
- void slotCopyResult(KIO::Job *job);
+ void slotCopyProgress(TDEIO::Job *job, unsigned long percent);
+ void slotCopyResult(TDEIO::Job *job);
// Used to monitor the plugins scan
void readScanProcFromStdout();
diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp
index b9400f22..79a8c214 100644
--- a/khtml/misc/loader.cpp
+++ b/khtml/misc/loader.cpp
@@ -208,7 +208,7 @@ TQTextCodec* CachedObject::codecForBuffer( const TQString& charset, const TQByte
// -------------------------------------------------------------------------------------------
-CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const DOMString &url, KIO::CacheControl _cachePolicy,
+CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const DOMString &url, TDEIO::CacheControl _cachePolicy,
const char *accept)
: CachedObject(url, CSSStyleSheet, _cachePolicy, 0)
{
@@ -227,7 +227,7 @@ CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const DOMString &url, KI
}
CachedCSSStyleSheet::CachedCSSStyleSheet(const DOMString &url, const TQString &stylesheet_data)
- : CachedObject(url, CSSStyleSheet, KIO::CC_Verify, stylesheet_data.length())
+ : CachedObject(url, CSSStyleSheet, TDEIO::CC_Verify, stylesheet_data.length())
{
m_loading = false;
m_status = Persistent;
@@ -321,7 +321,7 @@ TQString CachedCSSStyleSheet::checkCharset(const TQByteArray& buffer ) const
// -------------------------------------------------------------------------------------------
-CachedScript::CachedScript(DocLoader* dl, const DOMString &url, KIO::CacheControl _cachePolicy, const char*)
+CachedScript::CachedScript(DocLoader* dl, const DOMString &url, TDEIO::CacheControl _cachePolicy, const char*)
: CachedObject(url, Script, _cachePolicy, 0)
{
// It's javascript we want.
@@ -334,7 +334,7 @@ CachedScript::CachedScript(DocLoader* dl, const DOMString &url, KIO::CacheContro
}
CachedScript::CachedScript(const DOMString &url, const TQString &script_data)
- : CachedObject(url, Script, KIO::CC_Verify, script_data.length())
+ : CachedObject(url, Script, TDEIO::CC_Verify, script_data.length())
{
m_loading = false;
m_status = Persistent;
@@ -466,7 +466,7 @@ static TQString buildAcceptHeader()
// -------------------------------------------------------------------------------------
-CachedImage::CachedImage(DocLoader* dl, const DOMString &url, KIO::CacheControl _cachePolicy, const char*)
+CachedImage::CachedImage(DocLoader* dl, const DOMString &url, TDEIO::CacheControl _cachePolicy, const char*)
: TQObject(), CachedObject(url, Image, _cachePolicy, 0)
{
static const TQString &acceptHeader = TDEGlobal::staticQString( buildAcceptHeader() );
@@ -943,7 +943,7 @@ Request::~Request()
DocLoader::DocLoader(KHTMLPart* part, DocumentImpl* doc)
{
- m_cachePolicy = KIO::CC_Verify;
+ m_cachePolicy = TDEIO::CC_Verify;
m_expireDate = 0;
m_creationDate = time(0);
m_bautoloadImages = true;
@@ -991,7 +991,7 @@ void DocLoader::insertCachedObject( CachedObject* o ) const
bool DocLoader::needReload(CachedObject *existing, const TQString& fullURL)
{
bool reload = false;
- if (m_cachePolicy == KIO::CC_Verify)
+ if (m_cachePolicy == TDEIO::CC_Verify)
{
if (!m_reloadedURLs.contains(fullURL))
{
@@ -1003,7 +1003,7 @@ bool DocLoader::needReload(CachedObject *existing, const TQString& fullURL)
}
}
}
- else if ((m_cachePolicy == KIO::CC_Reload) || (m_cachePolicy == KIO::CC_Refresh))
+ else if ((m_cachePolicy == TDEIO::CC_Reload) || (m_cachePolicy == TDEIO::CC_Refresh))
{
if (!m_reloadedURLs.contains(fullURL))
{
@@ -1153,9 +1153,9 @@ void Loader::servePendingRequests()
#endif
KURL u(req->object->url().string());
- KIO::TransferJob* job = KIO::get( u, false, false /*no GUI*/);
+ TDEIO::TransferJob* job = TDEIO::get( u, false, false /*no GUI*/);
- job->addMetaData("cache", KIO::getCacheControlString(req->object->cachePolicy()));
+ job->addMetaData("cache", TDEIO::getCacheControlString(req->object->cachePolicy()));
if (!req->object->accept().isEmpty())
job->addMetaData("accept", req->object->accept());
if ( req->m_docLoader )
@@ -1171,21 +1171,21 @@ void Loader::servePendingRequests()
}
}
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotFinished( KIO::Job * ) ) );
- connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray &)),
- TQT_SLOT( slotData( KIO::Job*, const TQByteArray &)));
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotFinished( TDEIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray &)),
+ TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray &)));
if ( req->object->schedule() )
- KIO::Scheduler::scheduleJob( job );
+ TDEIO::Scheduler::scheduleJob( job );
m_requestsLoading.insert(job, req);
}
}
-void Loader::slotFinished( KIO::Job* job )
+void Loader::slotFinished( TDEIO::Job* job )
{
Request *r = m_requestsLoading.take( job );
- KIO::TransferJob* j = static_cast<KIO::TransferJob*>(job);
+ TDEIO::TransferJob* j = static_cast<TDEIO::TransferJob*>(job);
if ( !r )
return;
@@ -1247,7 +1247,7 @@ void Loader::slotFinished( KIO::Job* job )
m_timer.start(0, true);
}
-void Loader::slotData( KIO::Job*job, const TQByteArray &data )
+void Loader::slotData( TDEIO::Job*job, const TQByteArray &data )
{
Request *r = m_requestsLoading[job];
if(!r) {
@@ -1303,7 +1303,7 @@ void Loader::cancelRequests( DocLoader* dl )
if ( lIt.current()->m_docLoader == dl )
{
//kdDebug( 6060 ) << "canceling loading request for " << lIt.current()->object->url().string() << endl;
- KIO::Job *job = static_cast<KIO::Job *>( lIt.currentKey() );
+ TDEIO::Job *job = static_cast<TDEIO::Job *>( lIt.currentKey() );
Cache::removeCacheEntry( lIt.current()->object );
m_requestsLoading.remove( lIt.currentKey() );
job->kill();
@@ -1314,7 +1314,7 @@ void Loader::cancelRequests( DocLoader* dl )
}
}
-KIO::Job *Loader::jobForRequest( const DOM::DOMString &url ) const
+TDEIO::Job *Loader::jobForRequest( const DOM::DOMString &url ) const
{
TQPtrDictIterator<Request> it( m_requestsLoading );
@@ -1323,7 +1323,7 @@ KIO::Job *Loader::jobForRequest( const DOM::DOMString &url ) const
CachedObject *obj = it.current()->object;
if ( obj && obj->url() == url )
- return static_cast<KIO::Job *>( it.currentKey() );
+ return static_cast<TDEIO::Job *>( it.currentKey() );
}
return 0;
@@ -1424,7 +1424,7 @@ void Cache::clear()
template<typename CachedObjectType, enum CachedObject::Type CachedType>
CachedObjectType* Cache::requestObject( DocLoader* dl, const KURL& kurl, const char* accept )
{
- KIO::CacheControl cachePolicy = dl ? dl->cachePolicy() : KIO::CC_Verify;
+ TDEIO::CacheControl cachePolicy = dl ? dl->cachePolicy() : TDEIO::CC_Verify;
TQString url = kurl.url();
CachedObject* o = cache->find(url);
diff --git a/khtml/misc/loader.h b/khtml/misc/loader.h
index e950f176..833b98b8 100644
--- a/khtml/misc/loader.h
+++ b/khtml/misc/loader.h
@@ -57,7 +57,7 @@
class TQMovie;
class KHTMLPart;
-namespace KIO {
+namespace TDEIO {
class Job;
class TransferJob;
}
@@ -99,7 +99,7 @@ namespace khtml
Cached // regular case
};
- CachedObject(const DOM::DOMString &url, Type type, KIO::CacheControl _cachePolicy, int size)
+ CachedObject(const DOM::DOMString &url, Type type, TDEIO::CacheControl _cachePolicy, int size)
: m_url(url), m_type(type), m_cachePolicy(_cachePolicy),
m_expireDate(0), m_size(size)
{
@@ -140,7 +140,7 @@ namespace khtml
bool free() const { return m_free; }
- KIO::CacheControl cachePolicy() const { return m_cachePolicy; }
+ TDEIO::CacheControl cachePolicy() const { return m_cachePolicy; }
void setRequest(Request *_request);
@@ -169,7 +169,7 @@ namespace khtml
Type m_type;
Status m_status;
int m_accessCount;
- KIO::CacheControl m_cachePolicy;
+ TDEIO::CacheControl m_cachePolicy;
time_t m_expireDate;
int m_size;
bool m_deleted : 1;
@@ -195,7 +195,7 @@ namespace khtml
class CachedCSSStyleSheet : public CachedObject
{
public:
- CachedCSSStyleSheet(DocLoader* dl, const DOM::DOMString &url, KIO::CacheControl cachePolicy,
+ CachedCSSStyleSheet(DocLoader* dl, const DOM::DOMString &url, TDEIO::CacheControl cachePolicy,
const char *accept);
CachedCSSStyleSheet(const DOM::DOMString &url, const TQString &stylesheet_data);
@@ -226,7 +226,7 @@ namespace khtml
class CachedScript : public CachedObject
{
public:
- CachedScript(DocLoader* dl, const DOM::DOMString &url, KIO::CacheControl cachePolicy, const char* accept );
+ CachedScript(DocLoader* dl, const DOM::DOMString &url, TDEIO::CacheControl cachePolicy, const char* accept );
CachedScript(const DOM::DOMString &url, const TQString &script_data);
const DOM::DOMString &script() const { return m_script; }
@@ -257,7 +257,7 @@ namespace khtml
{
Q_OBJECT
public:
- CachedImage(DocLoader* dl, const DOM::DOMString &url, KIO::CacheControl cachePolicy, const char* accept);
+ CachedImage(DocLoader* dl, const DOM::DOMString &url, TDEIO::CacheControl cachePolicy, const char* accept);
virtual ~CachedImage();
const TQPixmap &pixmap() const;
@@ -354,7 +354,7 @@ namespace khtml
CachedScript *requestScript( const DOM::DOMString &url, const TQString& charset);
bool autoloadImages() const { return m_bautoloadImages; }
- KIO::CacheControl cachePolicy() const { return m_cachePolicy; }
+ TDEIO::CacheControl cachePolicy() const { return m_cachePolicy; }
KHTMLSettings::KAnimationAdvice showAnimations() const { return m_showAnimations; }
time_t expireDate() const { return m_expireDate; }
KHTMLPart* part() const { return m_part; }
@@ -363,7 +363,7 @@ namespace khtml
void setCacheCreationDate( time_t );
void setExpireDate( time_t, bool relative );
void setAutoloadImages( bool );
- void setCachePolicy( KIO::CacheControl cachePolicy ) { m_cachePolicy = cachePolicy; }
+ void setCachePolicy( TDEIO::CacheControl cachePolicy ) { m_cachePolicy = cachePolicy; }
void setShowAnimations( KHTMLSettings::KAnimationAdvice );
void pauseAnimations();
void resumeAnimations();
@@ -381,7 +381,7 @@ namespace khtml
mutable TQPtrDict<CachedObject> m_docObjects;
time_t m_expireDate;
time_t m_creationDate;
- KIO::CacheControl m_cachePolicy;
+ TDEIO::CacheControl m_cachePolicy;
bool m_bautoloadImages : 1;
KHTMLSettings::KAnimationAdvice m_showAnimations : 2;
KHTMLPart* m_part;
@@ -418,7 +418,7 @@ namespace khtml
void cancelRequests( DocLoader* dl );
// may return 0L
- KIO::Job *jobForRequest( const DOM::DOMString &url ) const;
+ TDEIO::Job *jobForRequest( const DOM::DOMString &url ) const;
signals:
void requestStarted( khtml::DocLoader* dl, khtml::CachedObject* obj );
@@ -426,8 +426,8 @@ namespace khtml
void requestFailed( khtml::DocLoader* dl, khtml::CachedObject *obj );
protected slots:
- void slotFinished( KIO::Job * );
- void slotData( KIO::Job *, const TQByteArray & );
+ void slotFinished( TDEIO::Job * );
+ void slotData( TDEIO::Job *, const TQByteArray & );
void servePendingRequests();
protected:
diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp
index 62785e20..172e63e4 100644
--- a/khtml/test_regression.cpp
+++ b/khtml/test_regression.cpp
@@ -521,7 +521,7 @@ int main(int argc, char *argv[])
a.config()->writeEntry( "kjscupguard_alarmhandler", true );
a.config()->setGroup("HTML Settings");
a.config()->writeEntry("ReportJSErrors", false);
- KConfig cfg( "khtmlrc" );
+ TDEConfig cfg( "khtmlrc" );
cfg.setGroup("HTML Settings");
cfg.writeEntry( "StandardFont", HTML_DEFAULT_VIEW_SANSSERIF_FONT );
cfg.writeEntry( "FixedFont", HTML_DEFAULT_VIEW_FIXED_FONT );
diff --git a/khtml/testkhtml.cpp b/khtml/testkhtml.cpp
index ba5bf063..e0135d09 100644
--- a/khtml/testkhtml.cpp
+++ b/khtml/testkhtml.cpp
@@ -138,7 +138,7 @@ int main(int argc, char *argv[])
void Dummy::doBenchmark()
{
- KConfigGroup settings(TDEGlobal::config(), "bench");
+ TDEConfigGroup settings(TDEGlobal::config(), "bench");
results.clear();
TQString directory = KFileDialog::getExistingDirectory(settings.readPathEntry("path"), m_part->view(),
diff --git a/khtml/xml/dom_docimpl.cpp b/khtml/xml/dom_docimpl.cpp
index 3a277ecf..ff206a1c 100644
--- a/khtml/xml/dom_docimpl.cpp
+++ b/khtml/xml/dom_docimpl.cpp
@@ -1718,7 +1718,7 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con
KURL url = v->part()->url();
if ((str == "no-cache") && url.protocol().startsWith("http"))
{
- KIO::http_update_cache(url, true, 0);
+ TDEIO::http_update_cache(url, true, 0);
}
}
else if( (strcasecmp(equiv, "set-cookie") == 0))
@@ -2491,7 +2491,7 @@ void DocumentImpl::error(int err, const TQString &text)
int exceptioncode = 0;
EventImpl *evt = new EventImpl(EventImpl::ERROR_EVENT,false,false);
if (err != 0)
- evt->setMessage(KIO::buildErrorString(err,text));
+ evt->setMessage(TDEIO::buildErrorString(err,text));
else
evt->setMessage(text);
evt->ref();
diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp
index 4e8b6c78..3fe0825a 100644
--- a/kinit/autostart.cpp
+++ b/kinit/autostart.cpp
@@ -102,7 +102,7 @@ static bool startCondition(const TQString &condition)
if (list[0].isEmpty() || list[2].isEmpty())
return true;
- KConfig config(list[0], true, false);
+ TDEConfig config(list[0], true, false);
if (!list[1].isEmpty())
config.setGroup(list[1]);
diff --git a/kinit/kdostartupconfig.cpp b/kinit/kdostartupconfig.cpp
index 470e7fab..b74417c3 100644
--- a/kinit/kdostartupconfig.cpp
+++ b/kinit/kdostartupconfig.cpp
@@ -95,7 +95,7 @@ int main()
return 6;
if( group.left( 1 ) == "[" && group.right( 1 ) == "]" )
{ // whole config group
- KConfig cfg( file );
+ TDEConfig cfg( file );
group = group.mid( 1, group.length() - 2 );
TQMap< TQString, TQString > entries = cfg.entryMap( group );
startupconfig << "# " << line << "\n";
@@ -115,7 +115,7 @@ int main()
{ // a single key
if( key.isEmpty())
return 7;
- KConfig cfg( file );
+ TDEConfig cfg( file );
cfg.setGroup( group );
TQString value = cfg.readEntry( key, def );
startupconfig << "# " << line << "\n";
diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp
index d7e7c7e1..1f65658d 100644
--- a/kinit/kinit.cpp
+++ b/kinit/kinit.cpp
@@ -171,7 +171,7 @@ int tdeinit_x_errhandler( Display *, XErrorEvent *err );
extern "C" KParts::Plugin* _kinit_init_kparts() { return new KParts::Plugin(); }
/* These are to link libkio even if 'smart' linker is used */
#include <kio/authinfo.h>
-extern "C" KIO::AuthInfo* _kioslave_init_kio() { return new KIO::AuthInfo(); }
+extern "C" TDEIO::AuthInfo* _kioslave_init_kio() { return new TDEIO::AuthInfo(); }
/*
* Close fd's which are only useful for the parent process.
@@ -1758,7 +1758,7 @@ int main(int argc, char **argv, char **envp)
tdeinit_initsetproctitle(argc, argv, envp);
tdeinit_library_path();
// Don't make our instance the global instance
- // (do it only after tdeinit_library_path, that one indirectly uses KConfig,
+ // (do it only after tdeinit_library_path, that one indirectly uses TDEConfig,
// which seems to be buggy and always use TDEGlobal instead of the maching TDEInstance)
TDEGlobal::_instance = 0L;
// don't change envvars before tdeinit_initsetproctitle()
diff --git a/kinit/kioslave.cpp b/kinit/kioslave.cpp
index f132abb0..0cb77db0 100644
--- a/kinit/kioslave.cpp
+++ b/kinit/kioslave.cpp
@@ -49,7 +49,7 @@
/* These are to link libkio even if 'smart' linker is used */
#include <kio/authinfo.h>
-extern "C" KIO::AuthInfo* _kioslave_init_kio() { return new KIO::AuthInfo(); }
+extern "C" TDEIO::AuthInfo* _kioslave_init_kio() { return new TDEIO::AuthInfo(); }
int main(int argc, char **argv)
{
diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp
index 3f5510ea..8c66789e 100644
--- a/kinit/klauncher.cpp
+++ b/kinit/klauncher.cpp
@@ -61,12 +61,12 @@
// Dispose slaves after being idle for SLAVE_MAX_IDLE seconds
#define SLAVE_MAX_IDLE 30
-using namespace KIO;
+using namespace TDEIO;
template class TQPtrList<KLaunchRequest>;
template class TQPtrList<IdleSlave>;
-IdleSlave::IdleSlave(KSocket *socket)
+IdleSlave::IdleSlave(TDESocket *socket)
{
mConn.init(socket);
mConn.connect(this, TQT_SLOT(gotInput()));
@@ -194,9 +194,9 @@ KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
domainname.close();
domainname.unlink();
#endif
- mPoolSocket = new KServerSocket(static_cast<const char*>(TQFile::encodeName(mPoolSocketName)));
- connect(mPoolSocket, TQT_SIGNAL(accepted( KSocket *)),
- TQT_SLOT(acceptSlave(KSocket *)));
+ mPoolSocket = new TDEServerSocket(static_cast<const char*>(TQFile::encodeName(mPoolSocketName)));
+ connect(mPoolSocket, TQT_SIGNAL(accepted( TDESocket *)),
+ TQT_SLOT(acceptSlave(TDESocket *)));
connect(&mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(idleTimeout()));
@@ -1353,7 +1353,7 @@ KLauncher::waitForSlave(pid_t pid)
}
void
-KLauncher::acceptSlave(KSocket *slaveSocket)
+KLauncher::acceptSlave(TDESocket *slaveSocket)
{
IdleSlave *slave = new IdleSlave(slaveSocket);
// Send it a SLAVE_STATUS command.
diff --git a/kinit/klauncher.h b/kinit/klauncher.h
index 8058bb31..37b10f05 100644
--- a/kinit/klauncher.h
+++ b/kinit/klauncher.h
@@ -43,7 +43,7 @@ class IdleSlave : public TQObject
{
Q_OBJECT
public:
- IdleSlave(KSocket *socket);
+ IdleSlave(TDESocket *socket);
bool match( const TQString &protocol, const TQString &host, bool connected);
void connect( const TQString &app_socket);
pid_t pid() const { return mPid;}
@@ -59,7 +59,7 @@ protected slots:
void gotInput();
protected:
- KIO::Connection mConn;
+ TDEIO::Connection mConn;
TQString mProtocol;
TQString mHost;
bool mConnected;
@@ -169,7 +169,7 @@ public slots:
void slotKDEInitData(int);
void slotAppRegistered(const TQCString &appId);
void slotSlaveStatus(IdleSlave *);
- void acceptSlave( KSocket *);
+ void acceptSlave( TDESocket *);
void slotSlaveGone();
void idleTimeout();
@@ -182,7 +182,7 @@ protected:
KLaunchRequest *lastRequest;
TQPtrList<SlaveWaitRequest> mSlaveWaitRequest;
TQString mPoolSocketName;
- KServerSocket *mPoolSocket;
+ TDEServerSocket *mPoolSocket;
TQPtrList<IdleSlave> mSlaveList;
TQTimer mTimer;
TQTimer mAutoTimer;
diff --git a/kio/DESIGN b/kio/DESIGN
index c84bd218..08617bbd 100644
--- a/kio/DESIGN
+++ b/kio/DESIGN
@@ -190,7 +190,7 @@ B. customized progress dialogs
This will be similar to what we had before.
- ProgressBase class that all other dialogs will inherit.
- will contain an initialization method setJob( KIO::Job*) for apps of the
+ will contain an initialization method setJob( TDEIO::Job*) for apps of the
second class (see A.2 above), that will connect job's signals to dialog's
slots
diff --git a/kio/DESIGN.metadata b/kio/DESIGN.metadata
index 9890c961..783d7f52 100644
--- a/kio/DESIGN.metadata
+++ b/kio/DESIGN.metadata
@@ -132,11 +132,11 @@ DefaultRemoteProtocol string Protocol to redirect file://<hostname>/ URLs to, de
Examples:
E.g. the following disables cookies:
-job = KIO::get( KURL("http://www.kde.org"), false, false);
+job = TDEIO::get( KURL("http://www.kde.org"), false, false);
job->addMetaData("cookies", "none");
If you want to handle cookies yourself, you can do:
-job = KIO::get( KURL("http://www.kde.org"), false, false);
+job = TDEIO::get( KURL("http://www.kde.org"), false, false);
job->addMetaData("cookies", "manual");
job->addMetaData("setcookies", "Cookie: foo=bar; gnat=gnork");
diff --git a/kio/Mainpage.dox b/kio/Mainpage.dox
index bb7f2796..7545c29e 100644
--- a/kio/Mainpage.dox
+++ b/kio/Mainpage.dox
@@ -6,8 +6,8 @@
* this to provide its network-enabled file management.
*
* The easiest way to use this library from a %Trinity application is via the
- * KIO::NetAccess class (for easy synchronous access) or via the
- * KIO::Job class (for more complex asynchronous jobs).
+ * TDEIO::NetAccess class (for easy synchronous access) or via the
+ * TDEIO::Job class (for more complex asynchronous jobs).
*
* This library also implements the System Configuration Cache (KSycoca).
*
@@ -44,7 +44,7 @@
* view based on KIconView. Additionally, there are some compound views,
* like a view using the icon-view for files on the right side and another
* view for directories on the left. A view, that shows a preview for the
- * currently selected file (using KIO::PreviewJob to generate previews)
+ * currently selected file (using TDEIO::PreviewJob to generate previews)
* and any other view to show the files is also available.
*
* All those views share a common baseclass, named KFileView, which
diff --git a/kio/bookmarks/kbookmarkimporter_kde1.cc b/kio/bookmarks/kbookmarkimporter_kde1.cc
index 49999e67..ac0d29b9 100644
--- a/kio/bookmarks/kbookmarkimporter_kde1.cc
+++ b/kio/bookmarks/kbookmarkimporter_kde1.cc
@@ -81,8 +81,8 @@ void KBookmarkImporter::scanIntern( TQDomElement & parentElem, const TQString &
parentElem.appendChild( groupElem );
TQDomElement textElem = m_pDoc->createElement( "title" );
groupElem.appendChild( textElem );
- textElem.appendChild( m_pDoc->createTextNode( KIO::decodeFileName( ep->d_name ) ) );
- if ( KIO::decodeFileName( ep->d_name ) == "Toolbar" )
+ textElem.appendChild( m_pDoc->createTextNode( TDEIO::decodeFileName( ep->d_name ) ) );
+ if ( TDEIO::decodeFileName( ep->d_name ) == "Toolbar" )
groupElem.setAttribute("toolbar","yes");
scanIntern( groupElem, file.path() );
}
@@ -136,7 +136,7 @@ void KBookmarkImporter::parseBookmark( TQDomElement & parentElem, TQCString _tex
if (icon.right( 4 ) == ".xpm" ) // prevent warnings
icon.truncate( icon.length() - 4 );
- TQString text = KIO::decodeFileName( TQString::fromLocal8Bit(_text) );
+ TQString text = TDEIO::decodeFileName( TQString::fromLocal8Bit(_text) );
if ( text.length() > 8 && text.right( 8 ) == ".desktop" )
text.truncate( text.length() - 8 );
if ( text.length() > 7 && text.right( 7 ) == ".kdelnk" )
diff --git a/kio/bookmarks/kbookmarkmanager.cc b/kio/bookmarks/kbookmarkmanager.cc
index 9e6d711d..a87e0f20 100644
--- a/kio/bookmarks/kbookmarkmanager.cc
+++ b/kio/bookmarks/kbookmarkmanager.cc
@@ -702,7 +702,7 @@ KBookmarkSettings* KBookmarkSettings::s_self = 0;
void KBookmarkSettings::readSettings()
{
- KConfig config("kbookmarkrc", false, false);
+ TDEConfig config("kbookmarkrc", false, false);
config.setGroup("Bookmarks");
// add bookmark dialog usage - no reparse
diff --git a/kio/bookmarks/kbookmarkmenu.cc b/kio/bookmarks/kbookmarkmenu.cc
index 20ce42a8..5e85bc1f 100644
--- a/kio/bookmarks/kbookmarkmenu.cc
+++ b/kio/bookmarks/kbookmarkmenu.cc
@@ -1099,7 +1099,7 @@ void KBookmarkMenuNSImporter::endFolder()
KBookmarkMenu::DynMenuInfo KBookmarkMenu::showDynamicBookmarks( const TQString &id )
{
- KConfig config("kbookmarkrc", false, false);
+ TDEConfig config("kbookmarkrc", false, false);
config.setGroup("Bookmarks");
DynMenuInfo info;
@@ -1131,7 +1131,7 @@ KBookmarkMenu::DynMenuInfo KBookmarkMenu::showDynamicBookmarks( const TQString &
TQStringList KBookmarkMenu::dynamicBookmarksList()
{
- KConfig config("kbookmarkrc", false, false);
+ TDEConfig config("kbookmarkrc", false, false);
config.setGroup("Bookmarks");
TQStringList mlist;
@@ -1145,7 +1145,7 @@ TQStringList KBookmarkMenu::dynamicBookmarksList()
void KBookmarkMenu::setDynamicBookmarks(const TQString &id, const DynMenuInfo &newMenu)
{
- KConfig config("kbookmarkrc", false, false);
+ TDEConfig config("kbookmarkrc", false, false);
// add group unconditionally
config.setGroup("DynamicMenu-" + id);
diff --git a/kio/bookmarks/kbookmarkmenu.h b/kio/bookmarks/kbookmarkmenu.h
index fa0368b6..b54398a0 100644
--- a/kio/bookmarks/kbookmarkmenu.h
+++ b/kio/bookmarks/kbookmarkmenu.h
@@ -50,7 +50,7 @@ class KBookmarkOwner;
class KBookmarkMenu;
class KPopupMenu;
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
/**
* This class provides a bookmark menu. It is typically used in
diff --git a/kio/httpfilter/httpfilter.cc b/kio/httpfilter/httpfilter.cc
index 6a5a1346..0f2adf20 100644
--- a/kio/httpfilter/httpfilter.cc
+++ b/kio/httpfilter/httpfilter.cc
@@ -275,7 +275,7 @@ HTTPFilterGZip::slotInput(const TQByteArray &d)
}
}
if (!bHasFinished)
- emit error( KIO::ERR_SLAVE_DEFINED, i18n("Unexpected end of data, some information may be lost."));
+ emit error( TDEIO::ERR_SLAVE_DEFINED, i18n("Unexpected end of data, some information may be lost."));
return;
}
if (bHasFinished)
@@ -332,7 +332,7 @@ HTTPFilterGZip::slotInput(const TQByteArray &d)
int result = inflate( &zstr, Z_NO_FLUSH );
if ((result != Z_OK) && (result != Z_STREAM_END))
{
- emit error( KIO::ERR_SLAVE_DEFINED, i18n("Receiving corrupt data."));
+ emit error( TDEIO::ERR_SLAVE_DEFINED, i18n("Receiving corrupt data."));
break;
}
int bytesOut = 8192 - zstr.avail_out;
diff --git a/kio/kcmodule.desktop b/kio/kcmodule.desktop
index c3ab7853..5cbe9b78 100644
--- a/kio/kcmodule.desktop
+++ b/kio/kcmodule.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
-X-TDE-ServiceType=KCModule
+X-TDE-ServiceType=TDECModule
Name=TDE Control Module
Name[af]=TDE Beheer Module
Name[ar]=وحدة تحكم كيدي
diff --git a/kio/kfile/kcombiview.cpp b/kio/kfile/kcombiview.cpp
index 8ba9d29b..3f199fb9 100644
--- a/kio/kfile/kcombiview.cpp
+++ b/kio/kfile/kcombiview.cpp
@@ -305,14 +305,14 @@ KFileView *KCombiView::focusView( KFileView *preferred ) const
return (preferred && w == preferred->widget()) ? preferred : other;
}
-void KCombiView::readConfig( KConfig *config, const TQString& group )
+void KCombiView::readConfig( TDEConfig *config, const TQString& group )
{
left->readConfig( config, group );
if ( right )
right->readConfig( config, group );
}
-void KCombiView::writeConfig( KConfig *config, const TQString& group )
+void KCombiView::writeConfig( TDEConfig *config, const TQString& group )
{
left->writeConfig( config, group );
if ( right )
diff --git a/kio/kfile/kcombiview.h b/kio/kfile/kcombiview.h
index 6186ab74..2747c51a 100644
--- a/kio/kfile/kcombiview.h
+++ b/kio/kfile/kcombiview.h
@@ -93,8 +93,8 @@ public:
virtual void setSorting( TQDir::SortSpec sort );
- virtual void readConfig( KConfig *, const TQString& group = TQString::null );
- virtual void writeConfig( KConfig *, const TQString& group = TQString::null);
+ virtual void readConfig( TDEConfig *, const TQString& group = TQString::null );
+ virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null);
void ensureItemVisible( const KFileItem * );
diff --git a/kio/kfile/kcustommenueditor.cpp b/kio/kfile/kcustommenueditor.cpp
index 1c762bfb..2049860d 100644
--- a/kio/kfile/kcustommenueditor.cpp
+++ b/kio/kfile/kcustommenueditor.cpp
@@ -119,7 +119,7 @@ void KCustomMenuEditor::refreshButton()
}
void
-KCustomMenuEditor::load(KConfigBase *cfg)
+KCustomMenuEditor::load(TDEConfigBase *cfg)
{
cfg->setGroup(TQString::null);
int count = cfg->readNumEntry("NrOfItems");
@@ -147,7 +147,7 @@ KCustomMenuEditor::load(KConfigBase *cfg)
}
void
-KCustomMenuEditor::save(KConfigBase *cfg)
+KCustomMenuEditor::save(TDEConfigBase *cfg)
{
// First clear the whole config file.
TQStringList groups = cfg->groupList();
diff --git a/kio/kfile/kcustommenueditor.h b/kio/kfile/kcustommenueditor.h
index cc20c620..9112780b 100644
--- a/kio/kfile/kcustommenueditor.h
+++ b/kio/kfile/kcustommenueditor.h
@@ -22,7 +22,7 @@
#include <kdialogbase.h>
class KListView;
-class KConfigBase;
+class TDEConfigBase;
/*
* Dialog for editing custom menus.
@@ -42,12 +42,12 @@ public:
/**
* load the custom menu
*/
- void load(KConfigBase *);
+ void load(TDEConfigBase *);
/**
* save the custom menu
*/
- void save(KConfigBase *);
+ void save(TDEConfigBase *);
public slots:
void slotNewItem();
diff --git a/kio/kfile/kdiroperator.cpp b/kio/kfile/kdiroperator.cpp
index 0f2e9f4e..1b7e1135 100644
--- a/kio/kfile/kdiroperator.cpp
+++ b/kio/kfile/kdiroperator.cpp
@@ -90,7 +90,7 @@ public:
KActionSeparator *viewActionSeparator;
int dropOptions;
- KConfig *config;
+ TDEConfig *config;
TQString configGroup;
};
@@ -388,13 +388,13 @@ void KDirOperator::mkdir()
TQString where = url().pathOrURL();
TQString name = i18n( "New Folder" );
if ( url().isLocalFile() && TQFileInfo( url().path(+1) + name ).exists() )
- name = KIO::RenameDlg::suggestName( url(), name );
+ name = TDEIO::RenameDlg::suggestName( url(), name );
TQString dir = KInputDialog::getText( i18n( "New Folder" ),
i18n( "Create new folder in:\n%1" ).arg( where ),
name, &ok, this);
if (ok)
- mkdir( KIO::encodeFileName( dir ), true );
+ mkdir( TDEIO::encodeFileName( dir ), true );
}
bool KDirOperator::mkdir( const TQString& directory, bool enterDirectory )
@@ -413,8 +413,8 @@ bool KDirOperator::mkdir( const TQString& directory, bool enterDirectory )
for ( ; it != dirs.end(); ++it )
{
url.addPath( *it );
- exists = KIO::NetAccess::exists( url, false, 0 );
- writeOk = !exists && KIO::NetAccess::mkdir( url, topLevelWidget() );
+ exists = TDEIO::NetAccess::exists( url, false, 0 );
+ writeOk = !exists && TDEIO::NetAccess::mkdir( url, topLevelWidget() );
}
if ( exists ) // url was already existant
@@ -433,13 +433,13 @@ bool KDirOperator::mkdir( const TQString& directory, bool enterDirectory )
return writeOk;
}
-KIO::DeleteJob * KDirOperator::del( const KFileItemList& items,
+TDEIO::DeleteJob * KDirOperator::del( const KFileItemList& items,
bool ask, bool showProgress )
{
return del( items, this, ask, showProgress );
}
-KIO::DeleteJob * KDirOperator::del( const KFileItemList& items,
+TDEIO::DeleteJob * KDirOperator::del( const KFileItemList& items,
TQWidget *parent,
bool ask, bool showProgress )
{
@@ -483,7 +483,7 @@ KIO::DeleteJob * KDirOperator::del( const KFileItemList& items,
}
if ( doIt ) {
- KIO::DeleteJob *job = KIO::del( urls, false, showProgress );
+ TDEIO::DeleteJob *job = TDEIO::del( urls, false, showProgress );
job->setWindow (topLevelWidget());
job->setAutoErrorHandlingEnabled( true, parent );
return job;
@@ -502,7 +502,7 @@ void KDirOperator::deleteSelected()
del( *list );
}
-KIO::CopyJob * KDirOperator::trash( const KFileItemList& items,
+TDEIO::CopyJob * KDirOperator::trash( const KFileItemList& items,
TQWidget *parent,
bool ask, bool showProgress )
{
@@ -546,7 +546,7 @@ KIO::CopyJob * KDirOperator::trash( const KFileItemList& items,
}
if ( doIt ) {
- KIO::CopyJob *job = KIO::trash( urls, showProgress );
+ TDEIO::CopyJob *job = TDEIO::trash( urls, showProgress );
job->setWindow (topLevelWidget());
job->setAutoErrorHandlingEnabled( true, parent );
return job;
@@ -718,7 +718,7 @@ void KDirOperator::pathChanged()
// it may be, that we weren't ready at this time
TQApplication::restoreOverrideCursor();
- // when KIO::Job emits finished, the slot will restore the cursor
+ // when TDEIO::Job emits finished, the slot will restore the cursor
TQApplication::setOverrideCursor( tqwaitCursor );
if ( !isReadable( currUrl )) {
@@ -812,8 +812,8 @@ bool KDirOperator::checkPreviewSupport()
KToggleAction *previewAction = static_cast<KToggleAction*>( myActionCollection->action( "preview" ));
bool hasPreviewSupport = false;
- KConfig *kc = TDEGlobal::config();
- KConfigGroupSaver cs( kc, ConfigGroup );
+ TDEConfig *kc = TDEGlobal::config();
+ TDEConfigGroupSaver cs( kc, ConfigGroup );
if ( kc->readBoolEntry( "Show Default Preview", true ) )
hasPreviewSupport = checkPreviewInternal();
@@ -823,7 +823,7 @@ bool KDirOperator::checkPreviewSupport()
bool KDirOperator::checkPreviewInternal() const
{
- TQStringList supported = KIO::PreviewJob::supportedMimeTypes();
+ TQStringList supported = TDEIO::PreviewJob::supportedMimeTypes();
// no preview support for directories?
if ( dirOnlyMode() && supported.findIndex( "inode/directory" ) == -1 )
return false;
@@ -1385,8 +1385,8 @@ void KDirOperator::setupMenu(int whichActions)
actionMenu->insert( mkdirAction );
if (currUrl.isLocalFile() && !(TDEApplication::keyboardMouseState() & TQt::ShiftButton))
actionMenu->insert( myActionCollection->action( "trash" ) );
- KConfig *globalconfig = TDEGlobal::config();
- KConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") );
+ TDEConfig *globalconfig = TDEGlobal::config();
+ TDEConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") );
if (!currUrl.isLocalFile() || (TDEApplication::keyboardMouseState() & TQt::ShiftButton) ||
globalconfig->readBoolEntry("ShowDeleteCommand", false))
actionMenu->insert( myActionCollection->action( "delete" ) );
@@ -1439,7 +1439,7 @@ void KDirOperator::updateViewActions()
detailedAction->setChecked( KFile::isDetailView( fv ));
}
-void KDirOperator::readConfig( KConfig *kc, const TQString& group )
+void KDirOperator::readConfig( TDEConfig *kc, const TQString& group )
{
if ( !kc )
return;
@@ -1495,7 +1495,7 @@ void KDirOperator::readConfig( KConfig *kc, const TQString& group )
kc->setGroup( oldGroup );
}
-void KDirOperator::writeConfig( KConfig *kc, const TQString& group )
+void KDirOperator::writeConfig( TDEConfig *kc, const TQString& group )
{
if ( !kc )
return;
@@ -1718,13 +1718,13 @@ void KDirOperator::slotRefreshItems( const KFileItemList& items )
m_fileView->updateView( it.current() );
}
-void KDirOperator::setViewConfig( KConfig *config, const TQString& group )
+void KDirOperator::setViewConfig( TDEConfig *config, const TQString& group )
{
d->config = config;
d->configGroup = group;
}
-KConfig * KDirOperator::viewConfig()
+TDEConfig * KDirOperator::viewConfig()
{
return d->config;
}
diff --git a/kio/kfile/kdiroperator.h b/kio/kfile/kdiroperator.h
index e644f7b9..73798b92 100644
--- a/kio/kfile/kdiroperator.h
+++ b/kio/kfile/kdiroperator.h
@@ -41,7 +41,7 @@ class KActionSeparator;
class KActionMenu;
class TQWidgetStack;
class KProgress;
-namespace KIO {
+namespace TDEIO {
class CopyJob;
class DeleteJob;
}
@@ -60,7 +60,7 @@ namespace KIO {
* show either a simple or detailed view and additionally a preview widget
* (see setPreviewWidget()). KImageFilePreview is one implementation
* of a preview widget, that displays previews for all supported filetypes
- * utilizing KIO::PreviewJob.
+ * utilizing TDEIO::PreviewJob.
*
* Currently, those classes don't support Drag&Drop out of the box -- there
* you have to use your own view-classes. You can use some DnD-aware views
@@ -407,16 +407,16 @@ class KIO_EXPORT KDirOperator : public TQWidget
* @since 3.1
*/
// ### KDE4: make virtual
- void setViewConfig( KConfig *config, const TQString& group );
+ void setViewConfig( TDEConfig *config, const TQString& group );
/**
- * Returns the KConfig object used for saving and restoring view's
+ * Returns the TDEConfig object used for saving and restoring view's
* configuration.
- * @returns the KConfig object used for saving and restoring view's
+ * @returns the TDEConfig object used for saving and restoring view's
* configuration.
* @since 3.1
*/
- KConfig *viewConfig();
+ TDEConfig *viewConfig();
/**
* Returns the group name used for saving and restoring view's
@@ -440,7 +440,7 @@ class KIO_EXPORT KDirOperator : public TQWidget
* @see setViewConfig
* @see writeConfig
*/
- virtual void readConfig( KConfig *, const TQString& group = TQString::null );
+ virtual void readConfig( TDEConfig *, const TQString& group = TQString::null );
/**
* Saves the current settings like sorting, simple or detailed view.
@@ -448,7 +448,7 @@ class KIO_EXPORT KDirOperator : public TQWidget
* @see readConfig
* @see setViewConfig
*/
- virtual void writeConfig( KConfig *, const TQString& group = TQString::null );
+ virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null );
/**
@@ -482,18 +482,18 @@ class KIO_EXPORT KDirOperator : public TQWidget
bool mkdir( const TQString& directory, bool enterDirectory = true );
/**
- * Starts and returns a KIO::DeleteJob to delete the given @p items.
+ * Starts and returns a TDEIO::DeleteJob to delete the given @p items.
*
* @param items the list of items to be deleted
* @param ask specifies whether a confirmation dialog should be shown
* @param showProgress passed to the DeleteJob to show a progress dialog
*/
// ### KDE4: make virtual
- KIO::DeleteJob * del( const KFileItemList& items,
+ TDEIO::DeleteJob * del( const KFileItemList& items,
bool ask = true, bool showProgress = true );
/**
- * Starts and returns a KIO::DeleteJob to delete the given @p items.
+ * Starts and returns a TDEIO::DeleteJob to delete the given @p items.
*
* @param items the list of items to be deleted
* @param parent the parent widget used for the confirmation dialog
@@ -502,7 +502,7 @@ class KIO_EXPORT KDirOperator : public TQWidget
* @since 3.1
*/
// ### KDE4: make virtual
- KIO::DeleteJob * del( const KFileItemList& items, TQWidget *parent,
+ TDEIO::DeleteJob * del( const KFileItemList& items, TQWidget *parent,
bool ask = true, bool showProgress = true );
/**
@@ -563,7 +563,7 @@ class KIO_EXPORT KDirOperator : public TQWidget
void setDropOptions(int options);
/**
- * Starts and returns a KIO::CopyJob to trash the given @p items.
+ * Starts and returns a TDEIO::CopyJob to trash the given @p items.
*
* @param items the list of items to be trashed
* @param parent the parent widget used for the confirmation dialog
@@ -572,7 +572,7 @@ class KIO_EXPORT KDirOperator : public TQWidget
* @since 3.4
*/
// ### KDE4: make virtual
- KIO::CopyJob * trash( const KFileItemList& items, TQWidget *parent,
+ TDEIO::CopyJob * trash( const KFileItemList& items, TQWidget *parent,
bool ask = true, bool showProgress = true );
protected:
@@ -634,7 +634,7 @@ protected:
void prepareCompletionObjects();
/**
- * Checks if there support from KIO::PreviewJob for the currently
+ * Checks if there support from TDEIO::PreviewJob for the currently
* shown files, taking mimeFilter() and nameFilter() into account
* Enables/disables the preview-action accordingly.
*/
diff --git a/kio/kfile/kdirselectdialog.cpp b/kio/kfile/kdirselectdialog.cpp
index 8f8a8b29..48dd3a2e 100644
--- a/kio/kfile/kdirselectdialog.cpp
+++ b/kio/kfile/kdirselectdialog.cpp
@@ -267,20 +267,20 @@ void KDirSelectDialog::slotNextDirToList( KFileTreeViewItem *item )
}
}
-void KDirSelectDialog::readConfig( KConfig *config, const TQString& group )
+void KDirSelectDialog::readConfig( TDEConfig *config, const TQString& group )
{
d->urlCombo->clear();
- KConfigGroup conf( config, group );
+ TDEConfigGroup conf( config, group );
d->urlCombo->setHistoryItems( conf.readPathListEntry( "History Items" ));
TQSize defaultSize( 400, 450 );
resize( conf.readSizeEntry( "DirSelectDialog Size", &defaultSize ));
}
-void KDirSelectDialog::saveConfig( KConfig *config, const TQString& group )
+void KDirSelectDialog::saveConfig( TDEConfig *config, const TQString& group )
{
- KConfigGroup conf( config, group );
+ TDEConfigGroup conf( config, group );
conf.writePathEntry( "History Items", d->urlCombo->historyItems(), ',',
true, true);
conf.writeEntry( "DirSelectDialog Size", size(), true, true );
@@ -406,9 +406,9 @@ void KDirSelectDialog::slotMkdir()
TQString where = url().pathOrURL();
TQString name = i18n( "New Folder" );
if ( url().isLocalFile() && TQFileInfo( url().path(+1) + name ).exists() )
- name = KIO::RenameDlg::suggestName( url(), name );
+ name = TDEIO::RenameDlg::suggestName( url(), name );
- TQString directory = KIO::encodeFileName( KInputDialog::getText( i18n( "New Folder" ),
+ TQString directory = TDEIO::encodeFileName( KInputDialog::getText( i18n( "New Folder" ),
i18n( "Create new folder in:\n%1" ).arg( where ),
name, &ok, this));
if (!ok)
@@ -425,8 +425,8 @@ void KDirSelectDialog::slotMkdir()
for ( ; it != dirs.end(); ++it )
{
folderurl.addPath( *it );
- exists = KIO::NetAccess::exists( folderurl, false, 0 );
- writeOk = !exists && KIO::NetAccess::mkdir( folderurl, topLevelWidget() );
+ exists = TDEIO::NetAccess::exists( folderurl, false, 0 );
+ writeOk = !exists && TDEIO::NetAccess::mkdir( folderurl, topLevelWidget() );
}
if ( exists ) // url was already existant
@@ -470,7 +470,7 @@ KURL KDirSelectDialog::selectDirectory( const TQString& startDir,
myDialog.setCaption( caption );
if ( myDialog.exec() == TQDialog::Accepted )
- return KIO::NetAccess::mostLocalURL(myDialog.url(),parent);
+ return TDEIO::NetAccess::mostLocalURL(myDialog.url(),parent);
else
return KURL();
}
diff --git a/kio/kfile/kdirselectdialog.h b/kio/kfile/kdirselectdialog.h
index 79358f4f..106fe77f 100644
--- a/kio/kfile/kdirselectdialog.h
+++ b/kio/kfile/kdirselectdialog.h
@@ -25,7 +25,7 @@
class TQPopupMenu;
class TQVBoxLayout;
-class KConfig;
+class TDEConfig;
class KFileTreeBranch;
class KFileTreeView;
class KFileTreeViewItem;
@@ -111,8 +111,8 @@ private slots:
void slotMkdir();
private:
- void readConfig( KConfig *config, const TQString& group );
- void saveConfig( KConfig *config, const TQString& group );
+ void readConfig( TDEConfig *config, const TQString& group );
+ void saveConfig( TDEConfig *config, const TQString& group );
void openNextDir( KFileTreeViewItem *parent );
KFileTreeBranch * createBranch( const KURL& url );
diff --git a/kio/kfile/kdirsize.cpp b/kio/kfile/kdirsize.cpp
index 3ab42817..14936679 100644
--- a/kio/kfile/kdirsize.cpp
+++ b/kio/kfile/kdirsize.cpp
@@ -24,16 +24,16 @@
#include <tqtimer.h>
#include <config-kfile.h>
-using namespace KIO;
+using namespace TDEIO;
KDirSize::KDirSize( const KURL & directory )
- : KIO::Job(false /*No GUI*/), m_bAsync(true), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L)
+ : TDEIO::Job(false /*No GUI*/), m_bAsync(true), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L)
{
startNextJob( directory );
}
KDirSize::KDirSize( const KFileItemList & lstItems )
- : KIO::Job(false /*No GUI*/), m_bAsync(true), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L), m_lstItems(lstItems)
+ : TDEIO::Job(false /*No GUI*/), m_bAsync(true), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L), m_lstItems(lstItems)
{
TQTimer::singleShot( 0, this, TQT_SLOT(processList()) );
}
@@ -69,38 +69,38 @@ void KDirSize::processList()
void KDirSize::startNextJob( const KURL & url )
{
- KIO::ListJob * listJob = KIO::listRecursive( url, false /* no GUI */ );
- connect( listJob, TQT_SIGNAL(entries( KIO::Job *,
- const KIO::UDSEntryList& )),
- TQT_SLOT( slotEntries( KIO::Job*,
- const KIO::UDSEntryList& )));
+ TDEIO::ListJob * listJob = TDEIO::listRecursive( url, false /* no GUI */ );
+ connect( listJob, TQT_SIGNAL(entries( TDEIO::Job *,
+ const TDEIO::UDSEntryList& )),
+ TQT_SLOT( slotEntries( TDEIO::Job*,
+ const TDEIO::UDSEntryList& )));
addSubjob( listJob );
}
-void KDirSize::slotEntries( KIO::Job*, const KIO::UDSEntryList & list )
+void KDirSize::slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList & list )
{
static const TQString& dot = TDEGlobal::staticQString( "." );
static const TQString& dotdot = TDEGlobal::staticQString( ".." );
- KIO::UDSEntryListConstIterator it = list.begin();
- KIO::UDSEntryListConstIterator end = list.end();
+ TDEIO::UDSEntryListConstIterator it = list.begin();
+ TDEIO::UDSEntryListConstIterator end = list.end();
for (; it != end; ++it) {
- KIO::UDSEntry::ConstIterator it2 = (*it).begin();
- KIO::filesize_t size = 0;
+ TDEIO::UDSEntry::ConstIterator it2 = (*it).begin();
+ TDEIO::filesize_t size = 0;
bool isLink = false;
bool isDir = false;
TQString name;
for( ; it2 != (*it).end(); it2++ ) {
switch( (*it2).m_uds ) {
- case KIO::UDS_NAME:
+ case TDEIO::UDS_NAME:
name = (*it2).m_str;
break;
- case KIO::UDS_LINK_DEST:
+ case TDEIO::UDS_LINK_DEST:
isLink = !(*it2).m_str.isEmpty();
break;
- case KIO::UDS_SIZE:
+ case TDEIO::UDS_SIZE:
size = ((*it2).m_long);
break;
- case KIO::UDS_FILE_TYPE:
+ case TDEIO::UDS_FILE_TYPE:
isDir = S_ISDIR((*it2).m_long);
break;
default:
@@ -135,7 +135,7 @@ KDirSize * KDirSize::dirSizeJob( const KFileItemList & lstItems )
}
//static
-KIO::filesize_t KDirSize::dirSize( const KURL & directory )
+TDEIO::filesize_t KDirSize::dirSize( const KURL & directory )
{
KDirSize * dirSize = dirSizeJob( directory );
dirSize->setSync();
@@ -144,9 +144,9 @@ KIO::filesize_t KDirSize::dirSize( const KURL & directory )
}
-void KDirSize::slotResult( KIO::Job * job )
+void KDirSize::slotResult( TDEIO::Job * job )
{
- kdDebug(kfile_area) << " KDirSize::slotResult( KIO::Job * job ) m_lstItems:" << m_lstItems.count() << endl;
+ kdDebug(kfile_area) << " KDirSize::slotResult( TDEIO::Job * job ) m_lstItems:" << m_lstItems.count() << endl;
if ( !m_lstItems.isEmpty() )
{
subjobs.remove(job); // Remove job, but don't kill this job.
@@ -156,11 +156,11 @@ void KDirSize::slotResult( KIO::Job * job )
{
if ( !m_bAsync )
tqApp->exit_loop();
- KIO::Job::slotResult( job );
+ TDEIO::Job::slotResult( job );
}
}
void KDirSize::virtual_hook( int id, void* data )
-{ KIO::Job::virtual_hook( id, data ); }
+{ TDEIO::Job::virtual_hook( id, data ); }
#include "kdirsize.moc"
diff --git a/kio/kfile/kdirsize.h b/kio/kfile/kdirsize.h
index 64ae8076..41fe87eb 100644
--- a/kio/kfile/kdirsize.h
+++ b/kio/kfile/kdirsize.h
@@ -27,7 +27,7 @@
* Computes a directory size (similar to "du", but doesn't give the same results
* since we simply sum up the dir and file sizes, whereas du speaks disk blocks)
*/
-class KIO_EXPORT KDirSize : public KIO::Job
+class KIO_EXPORT KDirSize : public TDEIO::Job
{
Q_OBJECT
protected:
@@ -39,14 +39,14 @@ public:
/**
* @return the size we found
*/
- KIO::filesize_t totalSize() const { return m_totalSize; }
+ TDEIO::filesize_t totalSize() const { return m_totalSize; }
/**
* @return the total number of files (counting symlinks to files, sockets
* and character devices as files) in this directory and all sub-directories
* @since 3.3
*/
- KIO::filesize_t totalFiles() const { return m_totalFiles; }
+ TDEIO::filesize_t totalFiles() const { return m_totalFiles; }
/**
* @return the total number of sub-directories found (not including the
@@ -54,7 +54,7 @@ public:
* as directories)
* @since 3.3
*/
- KIO::filesize_t totalSubdirs() const { return m_totalSubdirs; }
+ TDEIO::filesize_t totalSubdirs() const { return m_totalSubdirs; }
/**
* Asynchronous method. Connect to the result signal.
@@ -75,7 +75,7 @@ public:
* Synchronous method - you get the result as soon as
* the call returns.
*/
- static KIO::filesize_t dirSize( const KURL & directory );
+ static TDEIO::filesize_t dirSize( const KURL & directory );
protected:
/**
@@ -87,15 +87,15 @@ protected:
protected slots:
- virtual void slotResult( KIO::Job *job );
- void slotEntries( KIO::Job * , const KIO::UDSEntryList &);
+ virtual void slotResult( TDEIO::Job *job );
+ void slotEntries( TDEIO::Job * , const TDEIO::UDSEntryList &);
void processList();
private:
bool m_bAsync;
- KIO::filesize_t m_totalSize;
- KIO::filesize_t m_totalFiles;
- KIO::filesize_t m_totalSubdirs;
+ TDEIO::filesize_t m_totalSize;
+ TDEIO::filesize_t m_totalFiles;
+ TDEIO::filesize_t m_totalSubdirs;
KFileItemList m_lstItems;
protected:
virtual void virtual_hook( int id, void* data );
diff --git a/kio/kfile/kdiskfreesp.cpp b/kio/kfile/kdiskfreesp.cpp
index 21338c05..18245bdc 100644
--- a/kio/kfile/kdiskfreesp.cpp
+++ b/kio/kfile/kdiskfreesp.cpp
@@ -163,7 +163,7 @@ void KDiskFreeSp::dfDone()
KDiskFreeSp * KDiskFreeSp::findUsageInfo( const TQString & path )
{
KDiskFreeSp * job = new KDiskFreeSp;
- TQString mountPoint = KIO::findPathMountPoint( path );
+ TQString mountPoint = TDEIO::findPathMountPoint( path );
job->readDF( mountPoint );
return job;
}
diff --git a/kio/kfile/kfiledetailview.cpp b/kio/kfile/kfiledetailview.cpp
index 1bc6f625..099a7cee 100644
--- a/kio/kfile/kfiledetailview.cpp
+++ b/kio/kfile/kfiledetailview.cpp
@@ -130,12 +130,12 @@ KFileDetailView::~KFileDetailView()
delete d;
}
-void KFileDetailView::readConfig( KConfig *config, const TQString& group )
+void KFileDetailView::readConfig( TDEConfig *config, const TQString& group )
{
restoreLayout( config, group );
}
-void KFileDetailView::writeConfig( KConfig *config, const TQString& group )
+void KFileDetailView::writeConfig( TDEConfig *config, const TQString& group )
{
saveLayout( config, group );
}
@@ -327,7 +327,7 @@ void KFileDetailView::setSortingKey( KFileListViewItem *item,
TQDir::SortSpec spec = KFileView::sorting();
if ( spec & TQDir::Time )
- item->setKey( sortingKey( i->time( KIO::UDS_MODIFICATION_TIME ),
+ item->setKey( sortingKey( i->time( TDEIO::UDS_MODIFICATION_TIME ),
i->isDir(), spec ));
else if ( spec & TQDir::Size )
item->setKey( sortingKey( i->size(), i->isDir(), spec ));
@@ -399,7 +399,7 @@ void KFileDetailView::slotSortingChanged( int col )
if ( sortSpec & TQDir::Time ) {
for ( ; (item = it.current()); ++it )
- viewItem(item)->setKey( sortingKey( item->time( KIO::UDS_MODIFICATION_TIME ), item->isDir(), sortSpec ));
+ viewItem(item)->setKey( sortingKey( item->time( TDEIO::UDS_MODIFICATION_TIME ), item->isDir(), sortSpec ));
}
else if ( sortSpec & TQDir::Size ) {
diff --git a/kio/kfile/kfiledetailview.h b/kio/kfile/kfiledetailview.h
index 937c8f56..9c41cfb9 100644
--- a/kio/kfile/kfiledetailview.h
+++ b/kio/kfile/kfiledetailview.h
@@ -149,8 +149,8 @@ public:
void determineIcon( KFileListViewItem *item );
TQScrollView *scrollWidget() const { return (TQScrollView*) this; }
- virtual void readConfig( KConfig *, const TQString& group = TQString::null );
- virtual void writeConfig( KConfig *, const TQString& group = TQString::null);
+ virtual void readConfig( TDEConfig *, const TQString& group = TQString::null );
+ virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null);
signals:
/**
diff --git a/kio/kfile/kfiledialog.cpp b/kio/kfile/kfiledialog.cpp
index 5e163414..1538d5db 100644
--- a/kio/kfile/kfiledialog.cpp
+++ b/kio/kfile/kfiledialog.cpp
@@ -97,7 +97,7 @@
enum Buttons { HOTLIST_BUTTON,
PATH_COMBO, CONFIGURE_BUTTON };
-template class TQPtrList<KIO::StatJob>;
+template class TQPtrList<TDEIO::StatJob>;
namespace {
static void silenceQToolBar(TQtMsgType, const char *)
@@ -136,7 +136,7 @@ struct KFileDialogPrivate
bool autoSelectExtChecked; // whether or not the _user_ has checked the above box
TQString extension; // current extension for this filter
- TQPtrList<KIO::StatJob> statJobs;
+ TQPtrList<TDEIO::StatJob> statJobs;
KURL::List urlList; //the list of selected urls
@@ -185,7 +185,7 @@ KFileDialog::~KFileDialog()
{
hide();
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
if (d->urlBar)
d->urlBar->save( config );
@@ -402,7 +402,7 @@ void KFileDialog::slotOk()
}
}
- KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget());
+ KURL url = TDEIO::NetAccess::mostLocalURL(d->url,topLevelWidget());
if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly &&
!url.isLocalFile() ) {
// ### after message freeze, add message for directories!
@@ -446,7 +446,7 @@ void KFileDialog::slotOk()
return;
}
- KURL url = KIO::NetAccess::mostLocalURL(selectedURL,topLevelWidget());
+ KURL url = TDEIO::NetAccess::mostLocalURL(selectedURL,topLevelWidget());
if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly &&
!url.isLocalFile() ) {
KMessageBox::sorry( d->mainWidget,
@@ -528,12 +528,12 @@ void KFileDialog::slotOk()
if (!kapp->authorizeURLAction("open", KURL(), d->url))
{
- TQString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, d->url.prettyURL());
+ TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, d->url.prettyURL());
KMessageBox::error( d->mainWidget, msg);
return;
}
- KIO::StatJob *job = 0L;
+ TDEIO::StatJob *job = 0L;
d->statJobs.clear();
d->filenames = KShell::tildeExpand(locationEdit->currentText());
@@ -546,7 +546,7 @@ void KFileDialog::slotOk()
{
if (!kapp->authorizeURLAction("open", KURL(), *it))
{
- TQString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, (*it).prettyURL());
+ TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, (*it).prettyURL());
KMessageBox::error( d->mainWidget, msg);
return;
}
@@ -554,32 +554,32 @@ void KFileDialog::slotOk()
for ( KURL::List::ConstIterator it = list.begin();
it != list.end(); ++it )
{
- job = KIO::stat( *it, !(*it).isLocalFile() );
+ job = TDEIO::stat( *it, !(*it).isLocalFile() );
job->setWindow (topLevelWidget());
- KIO::Scheduler::scheduleJob( job );
+ TDEIO::Scheduler::scheduleJob( job );
d->statJobs.append( job );
- 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;
}
- job = KIO::stat(d->url,!d->url.isLocalFile());
+ job = TDEIO::stat(d->url,!d->url.isLocalFile());
job->setWindow (topLevelWidget());
d->statJobs.append( job );
- connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotStatResult(KIO::Job*)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotStatResult(TDEIO::Job*)));
}
-static bool isDirectory (const KIO::UDSEntry &t)
+static bool isDirectory (const TDEIO::UDSEntry &t)
{
bool isDir = false;
- for (KIO::UDSEntry::ConstIterator it = t.begin();
+ for (TDEIO::UDSEntry::ConstIterator it = t.begin();
it != t.end();
it++)
{
- if ((*it).m_uds == KIO::UDS_FILE_TYPE)
+ if ((*it).m_uds == TDEIO::UDS_FILE_TYPE)
{
isDir = S_ISDIR ((mode_t) ((*it).m_long));
break;
@@ -592,10 +592,10 @@ static bool isDirectory (const KIO::UDSEntry &t)
// FIXME : count all errors and show messagebox when d->statJobs.count() == 0
// in case of an error, we cancel the whole operation (clear d->statJobs and
// don't call accept)
-void KFileDialog::slotStatResult(KIO::Job* job)
+void KFileDialog::slotStatResult(TDEIO::Job* job)
{
kdDebug(kfile_area) << "slotStatResult" << endl;
- KIO::StatJob *sJob = static_cast<KIO::StatJob *>( job );
+ TDEIO::StatJob *sJob = static_cast<TDEIO::StatJob *>( job );
if ( !d->statJobs.removeRef( sJob ) ) {
return;
@@ -611,7 +611,7 @@ void KFileDialog::slotStatResult(KIO::Job* job)
return;
}
- KIO::UDSEntry t = sJob->statResult();
+ TDEIO::UDSEntry t = sJob->statResult();
if (isDirectory (t))
{
if ( ops->dirOnlyMode() )
@@ -672,7 +672,7 @@ void KFileDialog::accept()
locationEdit->insertItem( file, 1 );
}
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setForceGlobal( true );
writeConfig( config, ConfigGroup );
config->setForceGlobal( false );
@@ -1038,7 +1038,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
initGUI(); // activate GM
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
readRecentFiles( config );
adjustSize();
@@ -1550,7 +1550,7 @@ TQString KFileDialog::selectedFile() const
{
if ( result() == TQDialog::Accepted )
{
- KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget());
+ KURL url = TDEIO::NetAccess::mostLocalURL(d->url,topLevelWidget());
if (url.isLocalFile())
return url.path();
else {
@@ -1572,7 +1572,7 @@ TQStringList KFileDialog::selectedFiles() const
KURL::List urls = parseSelectedURLs();
TQValueListConstIterator<KURL> it = urls.begin();
while ( it != urls.end() ) {
- url = KIO::NetAccess::mostLocalURL(*it,topLevelWidget());
+ url = TDEIO::NetAccess::mostLocalURL(*it,topLevelWidget());
if ( url.isLocalFile() )
list.append( url.path() );
++it;
@@ -1698,7 +1698,7 @@ KFile::Mode KFileDialog::mode() const
}
-void KFileDialog::readConfig( KConfig *kc, const TQString& group )
+void KFileDialog::readConfig( TDEConfig *kc, const TQString& group )
{
if ( !kc )
return;
@@ -1749,7 +1749,7 @@ void KFileDialog::readConfig( KConfig *kc, const TQString& group )
kc->setGroup( oldGroup );
}
-void KFileDialog::writeConfig( KConfig *kc, const TQString& group )
+void KFileDialog::writeConfig( TDEConfig *kc, const TQString& group )
{
if ( !kc )
return;
@@ -1771,7 +1771,7 @@ void KFileDialog::writeConfig( KConfig *kc, const TQString& group )
}
-void KFileDialog::readRecentFiles( KConfig *kc )
+void KFileDialog::readRecentFiles( TDEConfig *kc )
{
TQString oldGroup = kc->group();
kc->setGroup( ConfigGroup );
@@ -1786,7 +1786,7 @@ void KFileDialog::readRecentFiles( KConfig *kc )
kc->setGroup( oldGroup );
}
-void KFileDialog::saveRecentFiles( KConfig *kc )
+void KFileDialog::saveRecentFiles( TDEConfig *kc )
{
TQString oldGroup = kc->group();
kc->setGroup( ConfigGroup );
@@ -1816,7 +1816,7 @@ void KFileDialog::slotCancel()
ops->close();
KDialogBase::slotCancel();
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setForceGlobal( true );
writeConfig( config, ConfigGroup );
config->setForceGlobal( false );
@@ -2069,8 +2069,8 @@ void KFileDialog::updateLocationEditExtension (const TQString &lastExtension)
)
{
// exists?
- KIO::UDSEntry t;
- if (KIO::NetAccess::stat (url, t, topLevelWidget()))
+ TDEIO::UDSEntry t;
+ if (TDEIO::NetAccess::stat (url, t, topLevelWidget()))
{
kdDebug (kfile_area) << "\tfile exists" << endl;
@@ -2142,13 +2142,13 @@ void KFileDialog::appendExtension (KURL &url)
const bool suppressExtension = (dot == len - 1);
const bool unspecifiedExtension = (dot <= 0);
- // don't KIO::NetAccess::Stat if unnecessary
+ // don't TDEIO::NetAccess::Stat if unnecessary
if (!(suppressExtension || unspecifiedExtension))
return;
// exists?
- KIO::UDSEntry t;
- if (KIO::NetAccess::stat (url, t, topLevelWidget()))
+ TDEIO::UDSEntry t;
+ if (TDEIO::NetAccess::stat (url, t, topLevelWidget()))
{
kdDebug (kfile_area) << "\tfile exists - won't append extension" << endl;
return;
diff --git a/kio/kfile/kfiledialog.h b/kio/kfile/kfiledialog.h
index 33e0c9b1..51d817b2 100644
--- a/kio/kfile/kfiledialog.h
+++ b/kio/kfile/kfiledialog.h
@@ -854,22 +854,22 @@ protected:
/**
* Reads configuration and applies it (size, recent directories, ...)
*/
- virtual void readConfig( KConfig *, const TQString& group = TQString::null );
+ virtual void readConfig( TDEConfig *, const TQString& group = TQString::null );
/**
* Saves the current configuration
*/
- virtual void writeConfig( KConfig *, const TQString& group = TQString::null );
+ virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null );
/**
* Reads the recent used files and inserts them into the location combobox
*/
- virtual void readRecentFiles( KConfig * );
+ virtual void readRecentFiles( TDEConfig * );
/**
* Saves the entries from the location combobox.
*/
- virtual void saveRecentFiles( KConfig * );
+ virtual void saveRecentFiles( TDEConfig * );
/**
* Parses the string "line" for files. If line doesn't contain any ", the
@@ -929,7 +929,7 @@ protected slots:
void slotFilterChanged();
void fileHighlighted(const KFileItem *i);
void fileSelected(const KFileItem *i);
- void slotStatResult(KIO::Job* job);
+ void slotStatResult(TDEIO::Job* job);
void slotLoadingFinished();
void fileCompletion( const TQString& );
diff --git a/kio/kfile/kfileiconview.cpp b/kio/kfile/kfileiconview.cpp
index a9882d56..5d9977de 100644
--- a/kio/kfile/kfileiconview.cpp
+++ b/kio/kfile/kfileiconview.cpp
@@ -102,7 +102,7 @@ public:
KRadioAction *smallColumns, *largeRows;
KAction *zoomIn, *zoomOut;
KToggleAction *previews;
- KIO::PreviewJob *job;
+ TDEIO::PreviewJob *job;
KFileIconViewItem *dropItem;
TQTimer previewTimer;
TQTimer autoOpenTimer;
@@ -187,10 +187,10 @@ KFileIconView::~KFileIconView()
delete d;
}
-void KFileIconView::readConfig( KConfig *kc, const TQString& group )
+void KFileIconView::readConfig( TDEConfig *kc, const TQString& group )
{
TQString gr = group.isEmpty() ? TQString("KFileIconView") : group;
- KConfigGroupSaver cs( kc, gr );
+ TDEConfigGroupSaver cs( kc, gr );
TQString small = TQString::fromLatin1("SmallColumns");
d->previewIconSize = kc->readNumEntry( "Preview Size", DEFAULT_PREVIEW_SIZE );
d->previews->setChecked( kc->readBoolEntry( "ShowPreviews", DEFAULT_SHOW_PREVIEWS ) );
@@ -208,10 +208,10 @@ void KFileIconView::readConfig( KConfig *kc, const TQString& group )
showPreviews();
}
-void KFileIconView::writeConfig( KConfig *kc, const TQString& group )
+void KFileIconView::writeConfig( TDEConfig *kc, const TQString& group )
{
TQString gr = group.isEmpty() ? TQString("KFileIconView") : group;
- KConfigGroupSaver cs( kc, gr );
+ TDEConfigGroupSaver cs( kc, gr );
TQString viewMode = d->smallColumns->isChecked() ?
TQString::fromLatin1("SmallColumns") :
@@ -578,7 +578,7 @@ void KFileIconView::slotPreviewsToggled( bool on )
void KFileIconView::showPreviews()
{
if ( d->previewMimeTypes.isEmpty() )
- d->previewMimeTypes = KIO::PreviewJob::supportedMimeTypes();
+ d->previewMimeTypes = TDEIO::PreviewJob::supportedMimeTypes();
stopPreview();
d->previews->setChecked( true );
@@ -591,18 +591,18 @@ void KFileIconView::showPreviews()
updateIcons();
}
- d->job = KIO::filePreview(*items(), d->previewIconSize,d->previewIconSize);
+ d->job = TDEIO::filePreview(*items(), d->previewIconSize,d->previewIconSize);
d->job->setIgnoreMaximumSize(d->ignoreMaximumSize);
- connect( d->job, TQT_SIGNAL( result( KIO::Job * )),
- this, TQT_SLOT( slotPreviewResult( KIO::Job * )));
+ connect( d->job, TQT_SIGNAL( result( TDEIO::Job * )),
+ this, TQT_SLOT( slotPreviewResult( TDEIO::Job * )));
connect( d->job, TQT_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )),
TQT_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) ));
// connect( d->job, TQT_SIGNAL( failed( const KFileItem* )),
// this, TQT_SLOT( slotFailed( const KFileItem* ) ));
}
-void KFileIconView::slotPreviewResult( KIO::Job *job )
+void KFileIconView::slotPreviewResult( TDEIO::Job *job )
{
if ( job == d->job )
d->job = 0L;
@@ -683,7 +683,7 @@ void KFileIconView::setSorting( TQDir::SortSpec spec )
if ( spec & TQDir::Time ) {
for ( ; (item = it.current()); ++it )
// warning, time_t is often signed -> cast it
- viewItem(item)->setKey( sortingKey( (unsigned long)item->time( KIO::UDS_MODIFICATION_TIME ), item->isDir(), spec ));
+ viewItem(item)->setKey( sortingKey( (unsigned long)item->time( TDEIO::UDS_MODIFICATION_TIME ), item->isDir(), spec ));
}
else if ( spec & TQDir::Size ) {
@@ -775,7 +775,7 @@ void KFileIconView::initItem( KFileIconViewItem *item, const KFileItem *i,
if ( spec & TQDir::Time )
// warning, time_t is often signed -> cast it
- item->setKey( sortingKey( (unsigned long) i->time( KIO::UDS_MODIFICATION_TIME ),
+ item->setKey( sortingKey( (unsigned long) i->time( TDEIO::UDS_MODIFICATION_TIME ),
i->isDir(), spec ));
else if ( spec & TQDir::Size )
item->setKey( sortingKey( i->size(), i->isDir(), spec ));
diff --git a/kio/kfile/kfileiconview.h b/kio/kfile/kfileiconview.h
index a4fd34ea..209e4828 100644
--- a/kio/kfile/kfileiconview.h
+++ b/kio/kfile/kfileiconview.h
@@ -68,7 +68,7 @@ private:
};
-namespace KIO {
+namespace TDEIO {
class Job;
}
@@ -141,8 +141,8 @@ public:
virtual void setSorting(TQDir::SortSpec sort);
- virtual void readConfig( KConfig *, const TQString& group = TQString::null );
- virtual void writeConfig( KConfig *, const TQString& group = TQString::null);
+ virtual void readConfig( TDEConfig *, const TQString& group = TQString::null );
+ virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null);
// for KMimeTypeResolver
void mimeTypeDeterminationFinished();
@@ -212,7 +212,7 @@ private slots:
void slotLargeRows();
void slotPreviewsToggled( bool );
- void slotPreviewResult( KIO::Job * );
+ void slotPreviewResult( TDEIO::Job * );
void gotPreview( const KFileItem *item, const TQPixmap& pix );
void slotAutoOpen();
diff --git a/kio/kfile/kfilepreview.cpp b/kio/kfile/kfilepreview.cpp
index b221a1eb..04124570 100644
--- a/kio/kfile/kfilepreview.cpp
+++ b/kio/kfile/kfilepreview.cpp
@@ -264,12 +264,12 @@ KActionCollection * KFilePreview::actionCollection() const
}
}
-void KFilePreview::readConfig( KConfig *config, const TQString& group )
+void KFilePreview::readConfig( TDEConfig *config, const TQString& group )
{
left->readConfig( config, group );
}
-void KFilePreview::writeConfig( KConfig *config, const TQString& group )
+void KFilePreview::writeConfig( TDEConfig *config, const TQString& group )
{
left->writeConfig( config, group );
}
diff --git a/kio/kfile/kfilepreview.h b/kio/kfile/kfilepreview.h
index 123d221f..79dda298 100644
--- a/kio/kfile/kfilepreview.h
+++ b/kio/kfile/kfilepreview.h
@@ -83,8 +83,8 @@ public:
virtual void setSorting( TQDir::SortSpec sort );
- virtual void readConfig( KConfig *, const TQString& group = TQString::null );
- virtual void writeConfig( KConfig *, const TQString& group = TQString::null);
+ virtual void readConfig( TDEConfig *, const TQString& group = TQString::null );
+ virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null);
/**
* This overrides KFileView::actionCollection() by returning
diff --git a/kio/kfile/kfilespeedbar.cpp b/kio/kfile/kfilespeedbar.cpp
index 9ab3b8ee..567d929e 100644
--- a/kio/kfile/kfilespeedbar.cpp
+++ b/kio/kfile/kfilespeedbar.cpp
@@ -35,8 +35,8 @@
KFileSpeedBar::KFileSpeedBar( TQWidget *parent, const char *name )
: KURLBar( true, parent, name )
{
- KConfig *config = TDEGlobal::config();
- KConfigGroupSaver cs( config, ConfigGroup );
+ TDEConfig *config = TDEGlobal::config();
+ TDEConfigGroupSaver cs( config, ConfigGroup );
m_initializeSpeedbar = config->readBoolEntry( "Set speedbar defaults",
true );
setIconSize(KIcon::SizeSmallMedium);
@@ -121,11 +121,11 @@ KFileSpeedBar::~KFileSpeedBar()
{
}
-void KFileSpeedBar::save( KConfig *config )
+void KFileSpeedBar::save( TDEConfig *config )
{
if ( m_initializeSpeedbar && isModified() )
{
- KConfigGroup conf( config, ConfigGroup );
+ TDEConfigGroup conf( config, ConfigGroup );
// write to kdeglobals
conf.writeEntry( "Set speedbar defaults", false, true, true );
}
diff --git a/kio/kfile/kfilespeedbar.h b/kio/kfile/kfilespeedbar.h
index 28c62165..f7a27131 100644
--- a/kio/kfile/kfilespeedbar.h
+++ b/kio/kfile/kfilespeedbar.h
@@ -21,7 +21,7 @@
#include <kurlbar.h>
-class KConfig;
+class TDEConfig;
class KIO_EXPORT KFileSpeedBar : public KURLBar
{
@@ -30,7 +30,7 @@ public:
KFileSpeedBar( TQWidget *parent = 0, const char *name = 0 );
~KFileSpeedBar();
- virtual void save( KConfig *config );
+ virtual void save( TDEConfig *config );
virtual TQSize sizeHint() const;
private:
diff --git a/kio/kfile/kfileview.cpp b/kio/kfile/kfileview.cpp
index b32746aa..a62b8aa5 100644
--- a/kio/kfile/kfileview.cpp
+++ b/kio/kfile/kfileview.cpp
@@ -212,8 +212,8 @@ sort_by_name:
break;
case TQDir::Time:
{
- time_t t1 = fi1->time( KIO::UDS_MODIFICATION_TIME );
- time_t t2 = fi2->time( KIO::UDS_MODIFICATION_TIME );
+ time_t t1 = fi1->time( TDEIO::UDS_MODIFICATION_TIME );
+ time_t t2 = fi2->time( TDEIO::UDS_MODIFICATION_TIME );
if ( t1 != t2 ) {
bigger = (t1 > t2);
break;
@@ -228,8 +228,8 @@ sort_by_name:
}
case TQDir::Size:
{
- KIO::filesize_t s1 = fi1->size();
- KIO::filesize_t s2 = fi2->size();
+ TDEIO::filesize_t s1 = fi1->size();
+ TDEIO::filesize_t s2 = fi2->size();
if ( s1 != s2 ) {
bigger = (s1 > s2);
break;
@@ -369,11 +369,11 @@ KActionCollection * KFileView::actionCollection() const
return d->actions;
}
-void KFileView::readConfig( KConfig *, const TQString& )
+void KFileView::readConfig( TDEConfig *, const TQString& )
{
}
-void KFileView::writeConfig( KConfig *, const TQString& )
+void KFileView::writeConfig( TDEConfig *, const TQString& )
{
}
@@ -386,12 +386,12 @@ TQString KFileView::sortingKey( const TQString& value, bool isDir, int sortSpec
return result.prepend( start );
}
-TQString KFileView::sortingKey( KIO::filesize_t value, bool isDir, int sortSpec)
+TQString KFileView::sortingKey( TDEIO::filesize_t value, bool isDir, int sortSpec)
{
bool reverse = sortSpec & TQDir::Reversed;
bool dirsFirst = sortSpec & TQDir::DirsFirst;
char start = (isDir && dirsFirst) ? (reverse ? '2' : '0') : '1';
- return KIO::number( value ).rightJustify( 24, '0' ).prepend( start );
+ return TDEIO::number( value ).rightJustify( 24, '0' ).prepend( start );
}
void KFileView::setDropOptions(int options)
diff --git a/kio/kfile/kfileview.h b/kio/kfile/kfileview.h
index bce40832..5a6bfd00 100644
--- a/kio/kfile/kfileview.h
+++ b/kio/kfile/kfileview.h
@@ -346,8 +346,8 @@ public:
KFileViewSignaler * signaler() const { return sig; }
- virtual void readConfig( KConfig *, const TQString& group = TQString::null );
- virtual void writeConfig( KConfig *, const TQString& group = TQString::null);
+ virtual void readConfig( TDEConfig *, const TQString& group = TQString::null );
+ virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null);
/**
* Various options for drag and drop support.
@@ -392,10 +392,10 @@ public:
/**
* An overloaded method that takes not a TQString, but a number as sort
* criterion. You can use this for file-sizes or dates/times for example.
- * If you use a time_t, you need to cast that to KIO::filesize_t because
+ * If you use a time_t, you need to cast that to TDEIO::filesize_t because
* of ambiguity problems.
*/
- static TQString sortingKey( KIO::filesize_t value, bool isDir,int sortSpec);
+ static TQString sortingKey( TDEIO::filesize_t value, bool isDir,int sortSpec);
/**
* @internal
diff --git a/kio/kfile/kimagefilepreview.cpp b/kio/kfile/kimagefilepreview.cpp
index c55acaf9..0cc0ef2a 100644
--- a/kio/kfile/kimagefilepreview.cpp
+++ b/kio/kfile/kimagefilepreview.cpp
@@ -35,8 +35,8 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent )
: KPreviewWidgetBase( parent ),
m_job( 0L )
{
- KConfig *config = TDEGlobal::config();
- KConfigGroupSaver cs( config, ConfigGroup );
+ TDEConfig *config = TDEGlobal::config();
+ TDEConfigGroupSaver cs( config, ConfigGroup );
autoMode = config->readBoolEntry( "Automatic Preview", true );
TQVBoxLayout *vb = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
@@ -62,7 +62,7 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent )
timer = new TQTimer( this );
connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(showPreview()) );
- setSupportedMimeTypes( KIO::PreviewJob::supportedMimeTypes() );
+ setSupportedMimeTypes( TDEIO::PreviewJob::supportedMimeTypes() );
}
KImageFilePreview::~KImageFilePreview()
@@ -70,8 +70,8 @@ KImageFilePreview::~KImageFilePreview()
if ( m_job )
m_job->kill();
- KConfig *config = TDEGlobal::config();
- KConfigGroupSaver cs( config, ConfigGroup );
+ TDEConfig *config = TDEGlobal::config();
+ TDEConfigGroupSaver cs( config, ConfigGroup );
config->writeEntry( "Automatic Preview", autoPreview->isChecked() );
}
@@ -109,8 +109,8 @@ void KImageFilePreview::showPreview( const KURL &url, bool force )
if ( force ) // explicitly requested previews shall always be generated!
m_job->setIgnoreMaximumSize( true );
- connect( m_job, TQT_SIGNAL( result( KIO::Job * )),
- this, TQT_SLOT( slotResult( KIO::Job * )));
+ connect( m_job, TQT_SIGNAL( result( TDEIO::Job * )),
+ this, TQT_SLOT( slotResult( TDEIO::Job * )));
connect( m_job, TQT_SIGNAL( gotPreview( const KFileItem*,
const TQPixmap& )),
TQT_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) ));
@@ -142,11 +142,11 @@ TQSize KImageFilePreview::sizeHint() const
return TQSize( 20, 200 ); // otherwise it ends up huge???
}
-KIO::PreviewJob * KImageFilePreview::createJob( const KURL& url, int w, int h )
+TDEIO::PreviewJob * KImageFilePreview::createJob( const KURL& url, int w, int h )
{
KURL::List urls;
urls.append( url );
- return KIO::filePreview( urls, w, h, 0, 0, true, false );
+ return TDEIO::filePreview( urls, w, h, 0, 0, true, false );
}
void KImageFilePreview::gotPreview( const KFileItem* item, const TQPixmap& pm )
@@ -164,7 +164,7 @@ void KImageFilePreview::slotFailed( const KFileItem* item )
KIcon::DisabledState ));
}
-void KImageFilePreview::slotResult( KIO::Job *job )
+void KImageFilePreview::slotResult( TDEIO::Job *job )
{
if ( job == m_job )
m_job = 0L;
diff --git a/kio/kfile/kimagefilepreview.h b/kio/kfile/kimagefilepreview.h
index 864fc5d3..a86f4f92 100644
--- a/kio/kfile/kimagefilepreview.h
+++ b/kio/kfile/kimagefilepreview.h
@@ -23,7 +23,7 @@ class TQTimer;
class KFileDialog;
class KFileItem;
-namespace KIO { class Job; class PreviewJob; }
+namespace TDEIO { class Job; class PreviewJob; }
/**
* Image preview widget for the file dialog.
@@ -51,11 +51,11 @@ class KIO_EXPORT KImageFilePreview : public KPreviewWidgetBase
protected:
virtual void resizeEvent(TQResizeEvent *e);
- virtual KIO::PreviewJob * createJob( const KURL& url,
+ virtual TDEIO::PreviewJob * createJob( const KURL& url,
int w, int h );
private slots:
- void slotResult( KIO::Job * );
+ void slotResult( TDEIO::Job * );
virtual void slotFailed( const KFileItem* );
private:
@@ -66,7 +66,7 @@ class KIO_EXPORT KImageFilePreview : public KPreviewWidgetBase
TQLabel *infoLabel;
TQCheckBox *autoPreview;
TQPushButton *previewButton;
- KIO::PreviewJob *m_job;
+ TDEIO::PreviewJob *m_job;
protected:
virtual void virtual_hook( int id, void* data );
private:
diff --git a/kio/kfile/knotifydialog.cpp b/kio/kfile/knotifydialog.cpp
index 69d7be4e..088f9be5 100644
--- a/kio/kfile/knotifydialog.cpp
+++ b/kio/kfile/knotifydialog.cpp
@@ -915,7 +915,7 @@ void KNotifyWidget::openExecDialog( KURLRequester *requester )
void KNotifyWidget::playSound()
{
TQString soundPath = m_soundPath->url();
- if (!KIO::NetAccess::exists( m_soundPath->url(), true, 0 )) {
+ if (!TDEIO::NetAccess::exists( m_soundPath->url(), true, 0 )) {
bool foundSound=false;
// find the first "sound"-resource that contains files
@@ -930,7 +930,7 @@ void KNotifyWidget::playSound()
while ( it != soundDirs.end() ) {
dir = *it;
if ( dir.isReadable() && dir.count() > 2 &&
- KIO::NetAccess::exists( *it + m_soundPath->url(), true, 0 )) {
+ TDEIO::NetAccess::exists( *it + m_soundPath->url(), true, 0 )) {
foundSound=true;
soundPath = *it + m_soundPath->url();
break;
@@ -1003,8 +1003,8 @@ Application::Application( const TQString &path )
TQString config_file = path;
config_file[config_file.find('/')] = '.';
m_events = 0L;
- config = new KConfig(config_file, false, false);
- kc = new KConfig(path, true, false, "data");
+ config = new TDEConfig(config_file, false, false);
+ kc = new TDEConfig(path, true, false, "data");
kc->setGroup( TQString::fromLatin1("!Global!") );
m_icon = kc->readEntry(TQString::fromLatin1("IconName"),
TQString::fromLatin1("misc"));
diff --git a/kio/kfile/knotifydialog.h b/kio/kfile/knotifydialog.h
index ef5d356f..acab7e23 100644
--- a/kio/kfile/knotifydialog.h
+++ b/kio/kfile/knotifydialog.h
@@ -168,8 +168,8 @@ namespace KNotify
TQString m_appname;
EventList *m_events;
- KConfig *kc; // The file that defines the events.
- KConfig *config; // The file that contains the settings for the events
+ TDEConfig *kc; // The file that defines the events.
+ TDEConfig *config; // The file that contains the settings for the events
};
diff --git a/kio/kfile/kopenwith.cpp b/kio/kfile/kopenwith.cpp
index 9a3fcabd..efeaa1f0 100644
--- a/kio/kfile/kopenwith.cpp
+++ b/kio/kfile/kopenwith.cpp
@@ -412,8 +412,8 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
// init the history combo and insert it into the URL-Requester
KHistoryCombo *combo = new KHistoryCombo();
combo->setDuplicatesEnabled( false );
- KConfig *kc = TDEGlobal::config();
- KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") );
+ TDEConfig *kc = TDEGlobal::config();
+ TDEConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") );
int max = kc->readNumEntry( TQString::fromLatin1("Maximum history"), 15 );
combo->setMaxCount( max );
int mode = kc->readNumEntry(TQString::fromLatin1("CompletionMode"),
@@ -483,7 +483,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
// check to see if we use konsole if not disable the nocloseonexit
// because we don't know how to do this on other terminal applications
- KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
+ TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole"));
if (bReadOnly || preferredTerminal != "konsole")
@@ -666,7 +666,7 @@ void KOpenWithDlg::slotOK()
if (terminal->isChecked())
{
- KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
+ TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole"));
m_command = preferredTerminal;
// only add --noclose when we are sure it is konsole we're using
@@ -813,8 +813,8 @@ void KOpenWithDlg::accept()
if ( combo ) {
combo->addToHistory( edit->url() );
- KConfig *kc = TDEGlobal::config();
- KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") );
+ TDEConfig *kc = TDEGlobal::config();
+ TDEConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") );
kc->writeEntry( TQString::fromLatin1("History"), combo->historyItems() );
kc->writeEntry(TQString::fromLatin1("CompletionMode"),
combo->completionMode());
diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp
index 94b95a2b..e9296ca9 100644
--- a/kio/kfile/kpropertiesdialog.cpp
+++ b/kio/kfile/kpropertiesdialog.cpp
@@ -146,7 +146,7 @@ static TQString nameFromFileName(TQString nameStr)
if ( nameStr.endsWith(".kdelnk") )
nameStr.truncate( nameStr.length() - 7 );
// Make it human-readable (%2F => '/', ...)
- nameStr = KIO::decodeFileName( nameStr );
+ nameStr = TDEIO::decodeFileName( nameStr );
return nameStr;
}
@@ -174,7 +174,7 @@ public:
KPropertiesDialog::KPropertiesDialog (KFileItem* item,
TQWidget* parent, const char* name,
bool modal, bool autoShow)
- : KDialogBase (KDialogBase::Tabbed, i18n( "Properties for %1" ).arg(KIO::decodeFileName(item->url().fileName())),
+ : KDialogBase (KDialogBase::Tabbed, i18n( "Properties for %1" ).arg(TDEIO::decodeFileName(item->url().fileName())),
KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
parent, name, modal)
{
@@ -206,7 +206,7 @@ KPropertiesDialog::KPropertiesDialog (KFileItemList _items,
// TODO: replace <never used> with "Properties for 1 item". It's very confusing how it has to be translated otherwise
// (empty translation before the "\n" is not allowed by msgfmt...)
_items.count()>1 ? i18n( "<never used>","Properties for %n Selected Items",_items.count()) :
- i18n( "Properties for %1" ).arg(KIO::decodeFileName(_items.first()->url().fileName())),
+ i18n( "Properties for %1" ).arg(TDEIO::decodeFileName(_items.first()->url().fileName())),
KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
parent, name, modal)
{
@@ -229,16 +229,16 @@ KPropertiesDialog::KPropertiesDialog (const KURL& _url, mode_t /* _mode is now u
TQWidget* parent, const char* name,
bool modal, bool autoShow)
: KDialogBase (KDialogBase::Tabbed,
- i18n( "Properties for %1" ).arg(KIO::decodeFileName(_url.fileName())),
+ i18n( "Properties for %1" ).arg(TDEIO::decodeFileName(_url.fileName())),
KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
parent, name, modal),
m_singleUrl( _url )
{
d = new KPropertiesDialogPrivate;
- KIO::UDSEntry entry;
+ TDEIO::UDSEntry entry;
- KIO::NetAccess::stat(_url, entry, parent);
+ TDEIO::NetAccess::stat(_url, entry, parent);
m_items.append( new KFileItem( entry, _url ) );
init (modal, autoShow);
@@ -249,16 +249,16 @@ KPropertiesDialog::KPropertiesDialog (const KURL& _url,
TQWidget* parent, const char* name,
bool modal, bool autoShow)
: KDialogBase (KDialogBase::Tabbed,
- i18n( "Properties for %1" ).arg(KIO::decodeFileName(_url.fileName())),
+ i18n( "Properties for %1" ).arg(TDEIO::decodeFileName(_url.fileName())),
KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
parent, name, modal),
m_singleUrl( _url )
{
d = new KPropertiesDialogPrivate;
- KIO::UDSEntry entry;
+ TDEIO::UDSEntry entry;
- KIO::NetAccess::stat(_url, entry, parent);
+ TDEIO::NetAccess::stat(_url, entry, parent);
m_items.append( new KFileItem( entry, _url ) );
init (modal, autoShow);
@@ -269,7 +269,7 @@ KPropertiesDialog::KPropertiesDialog (const KURL& _tempUrl, const KURL& _current
TQWidget* parent, const char* name,
bool modal, bool autoShow)
: KDialogBase (KDialogBase::Tabbed,
- i18n( "Properties for %1" ).arg(KIO::decodeFileName(_tempUrl.fileName())),
+ i18n( "Properties for %1" ).arg(TDEIO::decodeFileName(_tempUrl.fileName())),
KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
parent, name, modal),
@@ -360,7 +360,7 @@ void KPropertiesDialog::setFileNameReadOnly( bool ro )
}
}
-void KPropertiesDialog::slotStatResult( KIO::Job * )
+void KPropertiesDialog::slotStatResult( TDEIO::Job * )
{
}
@@ -725,7 +725,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
TQString mimeComment = item->mimeComment();
d->mimeType = item->mimetype();
bool hasTotalSize;
- KIO::filesize_t totalSize = item->size(hasTotalSize);
+ TDEIO::filesize_t totalSize = item->size(hasTotalSize);
TQString magicMimeComment;
if ( isLocal ) {
KMimeType::Ptr magicMimeType = KMimeType::findByFileContent( url.path() );
@@ -894,7 +894,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
{
TQLabel *lab = new TQLabel(d->m_frame );
if ( d->bMultiple )
- lab->setText( KIO::itemsSummaryString( iFileCount + iDirCount, iFileCount, iDirCount, 0, false ) );
+ lab->setText( TDEIO::itemsSummaryString( iFileCount + iDirCount, iFileCount, iDirCount, 0, false ) );
else
lab->setText( filename );
nameArea = lab;
@@ -992,7 +992,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
if ( !hasDirs ) // Only files [and symlinks]
{
if(hasTotalSize) {
- m_sizeLabel->setText(KIO::convertSizeWithBytes(totalSize));
+ m_sizeLabel->setText(TDEIO::convertSizeWithBytes(totalSize));
}
m_sizeDetermineButton = 0L;
@@ -1034,7 +1034,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
{
TQDateTime dt;
bool hasTime;
- time_t tim = item->time(KIO::UDS_CREATION_TIME, hasTime);
+ time_t tim = item->time(TDEIO::UDS_CREATION_TIME, hasTime);
if ( hasTime )
{
l = new TQLabel(i18n("Created:"), d->m_frame );
@@ -1045,7 +1045,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
grid->addWidget(l, curRow++, 2);
}
- tim = item->time(KIO::UDS_MODIFICATION_TIME, hasTime);
+ tim = item->time(TDEIO::UDS_MODIFICATION_TIME, hasTime);
if ( hasTime )
{
l = new TQLabel(i18n("Modified:"), d->m_frame );
@@ -1056,7 +1056,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
grid->addWidget(l, curRow++, 2);
}
- tim = item->time(KIO::UDS_ACCESS_TIME, hasTime);
+ tim = item->time(TDEIO::UDS_ACCESS_TIME, hasTime);
if ( hasTime )
{
l = new TQLabel(i18n("Accessed:"), d->m_frame );
@@ -1074,7 +1074,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
grid->addMultiCellWidget(sep, curRow, curRow, 0, 2);
++curRow;
- TQString mountPoint = KIO::findPathMountPoint( url.path() );
+ TQString mountPoint = TDEIO::findPathMountPoint( url.path() );
if (mountPoint != "/")
{
@@ -1193,8 +1193,8 @@ void KFilePropsPlugin::slotFoundMountPoint( const TQString&,
d->m_freeSpaceLabel->setText(
// xgettext:no-c-format -- Don't warn about translating the %1 out of %2 part.
i18n("Available space out of total partition size (percent used)", "%1 out of %2 (%3% used)")
- .arg(KIO::convertSizeFromKB(kBAvail))
- .arg(KIO::convertSizeFromKB(kBSize))
+ .arg(TDEIO::convertSizeFromKB(kBAvail))
+ .arg(TDEIO::convertSizeFromKB(kBSize))
.arg( 100 - (int)(100.0 * kBAvail / kBSize) ));
}
@@ -1208,34 +1208,34 @@ void KFilePropsPlugin::slotFoundMountPoint( const unsigned long& kBSize,
d->m_freeSpaceLabel->setText(
// xgettext:no-c-format -- Don't warn about translating the %1 out of %2 part.
i18n("Available space out of total partition size (percent used)", "%1 out of %2 (%3% used)")
- .arg(KIO::convertSizeFromKB(kBAvail))
- .arg(KIO::convertSizeFromKB(kBSize))
+ .arg(TDEIO::convertSizeFromKB(kBAvail))
+ .arg(TDEIO::convertSizeFromKB(kBSize))
.arg( 100 - (int)(100.0 * kBAvail / kBSize) ));
}
void KFilePropsPlugin::slotDirSizeUpdate()
{
- KIO::filesize_t totalSize = d->dirSizeJob->totalSize();
- KIO::filesize_t totalFiles = d->dirSizeJob->totalFiles();
- KIO::filesize_t totalSubdirs = d->dirSizeJob->totalSubdirs();
+ TDEIO::filesize_t totalSize = d->dirSizeJob->totalSize();
+ TDEIO::filesize_t totalFiles = d->dirSizeJob->totalFiles();
+ TDEIO::filesize_t totalSubdirs = d->dirSizeJob->totalSubdirs();
m_sizeLabel->setText( i18n("Calculating... %1 (%2)\n%3, %4")
- .arg(KIO::convertSize(totalSize))
+ .arg(TDEIO::convertSize(totalSize))
.arg(TDEGlobal::locale()->formatNumber(totalSize, 0))
.arg(i18n("1 file","%n files",totalFiles))
.arg(i18n("1 sub-folder","%n sub-folders",totalSubdirs)));
}
-void KFilePropsPlugin::slotDirSizeFinished( KIO::Job * job )
+void KFilePropsPlugin::slotDirSizeFinished( TDEIO::Job * job )
{
if (job->error())
m_sizeLabel->setText( job->errorString() );
else
{
- KIO::filesize_t totalSize = static_cast<KDirSize*>(job)->totalSize();
- KIO::filesize_t totalFiles = static_cast<KDirSize*>(job)->totalFiles();
- KIO::filesize_t totalSubdirs = static_cast<KDirSize*>(job)->totalSubdirs();
+ TDEIO::filesize_t totalSize = static_cast<KDirSize*>(job)->totalSize();
+ TDEIO::filesize_t totalFiles = static_cast<KDirSize*>(job)->totalFiles();
+ TDEIO::filesize_t totalSubdirs = static_cast<KDirSize*>(job)->totalSubdirs();
m_sizeLabel->setText( TQString::fromLatin1("%1 (%2)\n%3, %4")
- .arg(KIO::convertSize(totalSize))
+ .arg(TDEIO::convertSize(totalSize))
.arg(TDEGlobal::locale()->formatNumber(totalSize, 0))
.arg(i18n("1 file","%n files",totalFiles))
.arg(i18n("1 sub-folder","%n sub-folders",totalSubdirs)));
@@ -1259,8 +1259,8 @@ void KFilePropsPlugin::slotSizeDetermine()
connect( d->dirSizeUpdateTimer, TQT_SIGNAL( timeout() ),
TQT_SLOT( slotDirSizeUpdate() ) );
d->dirSizeUpdateTimer->start(500);
- connect( d->dirSizeJob, TQT_SIGNAL( result( KIO::Job * ) ),
- TQT_SLOT( slotDirSizeFinished( KIO::Job * ) ) );
+ connect( d->dirSizeJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ TQT_SLOT( slotDirSizeFinished( TDEIO::Job * ) ) );
m_sizeStopButton->setEnabled(true);
m_sizeDetermineButton->setEnabled(false);
@@ -1270,7 +1270,7 @@ void KFilePropsPlugin::slotSizeDetermine()
bool isLocal;
KFileItem * item = properties->item();
KURL url = item->mostLocalURL( isLocal );
- TQString mountPoint = KIO::findPathMountPoint( url.path() );
+ TQString mountPoint = TDEIO::findPathMountPoint( url.path() );
KDiskFreeSp * job = new KDiskFreeSp;
connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&,
@@ -1334,10 +1334,10 @@ void KFilePropsPlugin::applyChanges()
kdDebug(250) << "oldname = " << oldName << endl;
kdDebug(250) << "newname = " << n << endl;
if ( oldName != n || m_bFromTemplate ) { // true for any from-template file
- KIO::Job * job = 0L;
+ TDEIO::Job * job = 0L;
KURL oldurl = properties->kurl();
- TQString newFileName = KIO::encodeFileName(n);
+ TQString newFileName = TDEIO::encodeFileName(n);
if (d->bDesktopFile && !newFileName.endsWith(".desktop") && !newFileName.endsWith(".kdelnk"))
newFileName += ".desktop";
@@ -1353,14 +1353,14 @@ void KFilePropsPlugin::applyChanges()
// Don't remove the template !!
if ( !m_bFromTemplate ) // (normal renaming)
- job = KIO::move( oldurl, properties->kurl() );
+ job = TDEIO::move( oldurl, properties->kurl() );
else // Copying a template
- job = KIO::copy( oldurl, properties->kurl() );
+ job = TDEIO::copy( oldurl, properties->kurl() );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
- TQT_SLOT( slotCopyFinished( KIO::Job * ) ) );
- connect( job, TQT_SIGNAL( renamed( KIO::Job *, const KURL &, const KURL & ) ),
- TQT_SLOT( slotFileRenamed( KIO::Job *, const KURL &, const KURL & ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ TQT_SLOT( slotCopyFinished( TDEIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( renamed( TDEIO::Job *, const KURL &, const KURL & ) ),
+ TQT_SLOT( slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & ) ) );
// wait for job
TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal));
tqt_enter_modal(&dummy);
@@ -1378,7 +1378,7 @@ void KFilePropsPlugin::applyChanges()
slotCopyFinished( 0L );
}
-void KFilePropsPlugin::slotCopyFinished( KIO::Job * job )
+void KFilePropsPlugin::slotCopyFinished( TDEIO::Job * job )
{
kdDebug(250) << "KFilePropsPlugin::slotCopyFinished" << endl;
if (job)
@@ -1389,7 +1389,7 @@ void KFilePropsPlugin::slotCopyFinished( KIO::Job * job )
{
job->showErrorDialog( d->m_frame );
// Didn't work. Revert the URL to the old one
- properties->updateUrl( static_cast<KIO::CopyJob*>(job)->srcURLs().first() );
+ properties->updateUrl( static_cast<TDEIO::CopyJob*>(job)->srcURLs().first() );
properties->abortApplying(); // Don't apply the changes to the wrong file !
return;
}
@@ -1431,9 +1431,9 @@ void KFilePropsPlugin::applyIconChanges()
if ( !iconButton || !d->bIconChanged )
return;
// handle icon changes - only local files (or pseudo-local) for now
- // TODO: Use KTempFile and KIO::file_copy with overwrite = true
+ // TODO: Use KTempFile and TDEIO::file_copy with overwrite = true
KURL url = properties->kurl();
- url = KIO::NetAccess::mostLocalURL( url, properties );
+ url = TDEIO::NetAccess::mostLocalURL( url, properties );
if (url.isLocalFile()) {
TQString path;
@@ -1478,7 +1478,7 @@ void KFilePropsPlugin::applyIconChanges()
}
}
-void KFilePropsPlugin::slotFileRenamed( KIO::Job *, const KURL &, const KURL & newUrl )
+void KFilePropsPlugin::slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & newUrl )
{
// This is called in case of an existing local file during the copy/move operation,
// if the user chooses Rename.
@@ -1633,7 +1633,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
} else {
//We don't know, for remote files, if they are ours or not.
//So we let the user change permissions, and
- //KIO::chmod will tell, if he had no right to do it.
+ //TDEIO::chmod will tell, if he had no right to do it.
isMyFile = true;
}
@@ -2506,17 +2506,17 @@ void KFilePermissionsPropsPlugin::applyChanges()
&& !permissionChange && !ACLChange && !defaultACLChange )
return;
- KIO::Job * job;
+ TDEIO::Job * job;
if (files.count() > 0) {
- job = KIO::chmod( files, orFilePermissions, ~andFilePermissions,
+ job = TDEIO::chmod( files, orFilePermissions, ~andFilePermissions,
owner, group, false );
if ( ACLChange && d->fileSystemSupportsACLs )
job->addMetaData( "ACL_STRING", d->extendedACL.isValid()?d->extendedACL.asString():"ACL_DELETE" );
if ( defaultACLChange && d->fileSystemSupportsACLs )
job->addMetaData( "DEFAULT_ACL_STRING", d->defaultACL.isValid()?d->defaultACL.asString():"ACL_DELETE" );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
- TQT_SLOT( slotChmodResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ TQT_SLOT( slotChmodResult( TDEIO::Job * ) ) );
// Wait for job
TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal));
tqt_enter_modal(&dummy);
@@ -2524,15 +2524,15 @@ void KFilePermissionsPropsPlugin::applyChanges()
tqt_leave_modal(&dummy);
}
if (dirs.count() > 0) {
- job = KIO::chmod( dirs, orDirPermissions, ~andDirPermissions,
+ job = TDEIO::chmod( dirs, orDirPermissions, ~andDirPermissions,
owner, group, recursive );
if ( ACLChange && d->fileSystemSupportsACLs )
job->addMetaData( "ACL_STRING", d->extendedACL.isValid()?d->extendedACL.asString():"ACL_DELETE" );
if ( defaultACLChange && d->fileSystemSupportsACLs )
job->addMetaData( "DEFAULT_ACL_STRING", d->defaultACL.isValid()?d->defaultACL.asString():"ACL_DELETE" );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
- TQT_SLOT( slotChmodResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ TQT_SLOT( slotChmodResult( TDEIO::Job * ) ) );
// Wait for job
TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal));
tqt_enter_modal(&dummy);
@@ -2541,7 +2541,7 @@ void KFilePermissionsPropsPlugin::applyChanges()
}
}
-void KFilePermissionsPropsPlugin::slotChmodResult( KIO::Job * job )
+void KFilePermissionsPropsPlugin::slotChmodResult( TDEIO::Job * job )
{
kdDebug(250) << "KFilePermissionsPropsPlugin::slotChmodResult" << endl;
if (job->error())
@@ -3042,8 +3042,8 @@ void KDevicePropsPlugin::slotFoundMountPoint( const unsigned long& kBSize,
d->m_freeSpaceLabel->setText(
// xgettext:no-c-format -- Don't warn about translating the %1 out of %2 part.
i18n("Available space out of total partition size (percent used)", "%1 out of %2 (%3% used)")
- .arg(KIO::convertSizeFromKB(kBAvail))
- .arg(KIO::convertSizeFromKB(kBSize))
+ .arg(TDEIO::convertSizeFromKB(kBAvail))
+ .arg(TDEIO::convertSizeFromKB(kBSize))
.arg( 100 - (int)(100.0 * kBAvail / kBSize) ));
d->m_freeSpaceBar->setProgress(percUsed, 100);
@@ -3446,7 +3446,7 @@ void KDesktopPropsPlugin::slotAdvanced()
// check to see if we use konsole if not do not add the nocloseonexit
// because we don't know how to do this on other terminal applications
- KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
+ TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication",
TQString::fromLatin1("konsole"));
@@ -3672,7 +3672,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
// check to see if we use konsole if not do not add the nocloseonexit
// because we don't know how to do this on other terminal applications
- KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
+ TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication",
TQString::fromLatin1("konsole"));
diff --git a/kio/kfile/kpropertiesdialog.h b/kio/kfile/kpropertiesdialog.h
index d6a8223d..df814f7d 100644
--- a/kio/kfile/kpropertiesdialog.h
+++ b/kio/kfile/kpropertiesdialog.h
@@ -48,7 +48,7 @@ class TQComboBox;
#define KPropsPage KPropsDlgPlugin
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
/**
* The main properties dialog class.
@@ -142,7 +142,7 @@ public:
* @param name is the internal name.
* @param modal tells the dialog whether it should be modal.
* IMPORTANT: This constructor, together with modal=true, leads to a grave
- * display bug (due to KIO::stat() being run before the dialog has all the
+ * display bug (due to TDEIO::stat() being run before the dialog has all the
* necessary information). Do not use this combination for now.
* For local files with a known mimetype, simply create a KFileItem and pass
* it to the other constructor.
@@ -412,7 +412,7 @@ private:
TQPtrList<KPropsDlgPlugin> m_pageList;
private slots:
- void slotStatResult( KIO::Job * ); // No longer used
+ void slotStatResult( TDEIO::Job * ); // No longer used
protected:
virtual void virtual_hook( int id, void* data );
private:
@@ -523,10 +523,10 @@ public:
protected slots:
void slotEditFileType();
- void slotCopyFinished( KIO::Job * );
- void slotFileRenamed( KIO::Job *, const KURL &, const KURL & );
+ void slotCopyFinished( TDEIO::Job * );
+ void slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & );
void slotDirSizeUpdate();
- void slotDirSizeFinished( KIO::Job * );
+ void slotDirSizeFinished( TDEIO::Job * );
void slotFoundMountPoint( const TQString& mp, unsigned long kBSize,
unsigned long kBUsed, unsigned long kBAvail );
void slotSizeStop();
@@ -600,7 +600,7 @@ public:
private slots:
- void slotChmodResult( KIO::Job * );
+ void slotChmodResult( TDEIO::Job * );
void slotShowAdvancedPermissions();
private:
diff --git a/kio/kfile/krecentdirs.cpp b/kio/kfile/krecentdirs.cpp
index 60966837..6f4a01f3 100644
--- a/kio/kfile/krecentdirs.cpp
+++ b/kio/kfile/krecentdirs.cpp
@@ -32,7 +32,7 @@
#define MAX_DIR_HISTORY 3
-static void recentdirs_done(KConfig *config)
+static void recentdirs_done(TDEConfig *config)
{
if (config == TDEGlobal::config())
{
@@ -44,9 +44,9 @@ static void recentdirs_done(KConfig *config)
}
}
-static KConfig *recentdirs_readList(TQString &key, TQStringList &result, bool readOnly)
+static TDEConfig *recentdirs_readList(TQString &key, TQStringList &result, bool readOnly)
{
- KConfig *config;
+ TDEConfig *config;
if ((key.length() < 2) || (key[0] != ':'))
key = ":default";
if (key[1] == ':')
@@ -87,7 +87,7 @@ void KRecentDirs::add(const TQString &fileClass, const TQString &directory)
{
TQString key = fileClass;
TQStringList result;
- KConfig *config = recentdirs_readList(key, result, false);
+ TDEConfig *config = recentdirs_readList(key, result, false);
// make sure the dir is first in history
result.remove(directory);
result.prepend(directory);
diff --git a/kio/kfile/krecentdocument.cpp b/kio/kfile/krecentdocument.cpp
index d91e7551..1ec4a98c 100644
--- a/kio/kfile/krecentdocument.cpp
+++ b/kio/kfile/krecentdocument.cpp
@@ -86,7 +86,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
openStr.replace( TQRegExp("\\$"), "$$" ); // Desktop files with type "Link" are $-variable expanded
kdDebug(250) << "KRecentDocument::add for " << openStr << endl;
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
TQString oldGrp = config->group();
config->setGroup(TQString::fromLatin1("RecentDocuments"));
bool useRecent = config->readBoolEntry(TQString::fromLatin1("UseRecent"), true);
@@ -169,8 +169,8 @@ void KRecentDocument::clear()
int KRecentDocument::maximumItems()
{
- KConfig *config = TDEGlobal::config();
- KConfigGroupSaver sa(config, TQString::fromLatin1("RecentDocuments"));
+ TDEConfig *config = TDEGlobal::config();
+ TDEConfigGroupSaver sa(config, TQString::fromLatin1("RecentDocuments"));
return config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10);
}
diff --git a/kio/kfile/kurlbar.cpp b/kio/kfile/kurlbar.cpp
index 1d2cf154..95f30ee2 100644
--- a/kio/kfile/kurlbar.cpp
+++ b/kio/kfile/kurlbar.cpp
@@ -577,16 +577,16 @@ KURL KURLBar::currentURL() const
return item ? item->url() : KURL();
}
-void KURLBar::readConfig( KConfig *appConfig, const TQString& itemGroup )
+void KURLBar::readConfig( TDEConfig *appConfig, const TQString& itemGroup )
{
m_isImmutable = appConfig->groupIsImmutable( itemGroup );
- KConfigGroupSaver cs( appConfig, itemGroup );
+ TDEConfigGroupSaver cs( appConfig, itemGroup );
d->defaultIconSize = m_iconSize;
m_iconSize = appConfig->readNumEntry( "Speedbar IconSize", m_iconSize );
if ( m_useGlobal ) { // read global items
- KConfig *globalConfig = TDEGlobal::config();
- KConfigGroupSaver cs( globalConfig, (TQString)(itemGroup +" (Global)"));
+ TDEConfig *globalConfig = TDEGlobal::config();
+ TDEConfigGroupSaver cs( globalConfig, (TQString)(itemGroup +" (Global)"));
int num = globalConfig->readNumEntry( "Number of Entries" );
for ( int i = 0; i < num; i++ ) {
readItem( i, globalConfig, false );
@@ -600,7 +600,7 @@ void KURLBar::readConfig( KConfig *appConfig, const TQString& itemGroup )
}
}
-void KURLBar::readItem( int i, KConfig *config, bool applicationLocal )
+void KURLBar::readItem( int i, TDEConfig *config, bool applicationLocal )
{
TQString number = TQString::number( i );
KURL url = KURL::fromPathOrURL( config->readPathEntry( TQString("URL_") + number ));
@@ -610,9 +610,9 @@ void KURLBar::readItem( int i, KConfig *config, bool applicationLocal )
TQString description = config->readEntry( TQString("Description_") + number );
if (description.isEmpty() && url.protocol()=="beagle") {
- KIO::UDSEntry uds;
+ TDEIO::UDSEntry uds;
const KURL kurl("beagle:?beagled-status");
- if (!KIO::NetAccess::stat(kurl, uds))
+ if (!TDEIO::NetAccess::stat(kurl, uds))
return;
description = i18n("Desktop Search");
@@ -626,9 +626,9 @@ void KURLBar::readItem( int i, KConfig *config, bool applicationLocal )
config->readNumEntry( TQString("IconGroup_") + number )) );
}
-void KURLBar::writeConfig( KConfig *config, const TQString& itemGroup )
+void KURLBar::writeConfig( TDEConfig *config, const TQString& itemGroup )
{
- KConfigGroupSaver cs1( config, itemGroup );
+ TDEConfigGroupSaver cs1( config, itemGroup );
if(!config->hasDefault("Speedbar IconSize") && m_iconSize == d->defaultIconSize )
config->revertToDefault("Speedbar IconSize");
else
@@ -685,7 +685,7 @@ void KURLBar::writeConfig( KConfig *config, const TQString& itemGroup )
m_isModified = false;
}
-void KURLBar::writeItem( KURLBarItem *item, int i, KConfig *config,
+void KURLBar::writeItem( KURLBarItem *item, int i, TDEConfig *config,
bool global )
{
if ( !item->isPersistent() )
diff --git a/kio/kfile/kurlbar.h b/kio/kfile/kurlbar.h
index 29a73ff3..df9d1579 100644
--- a/kio/kfile/kurlbar.h
+++ b/kio/kfile/kurlbar.h
@@ -28,7 +28,7 @@
#include <klistbox.h>
#include <kurl.h>
-class KConfig;
+class TDEConfig;
class KURLBar;
/**
@@ -215,7 +215,7 @@ class KURLBarListBox;
* read and write the configuration of all the entries. It can differentiate
* between global and local entries -- global entries will be saved in the
* global configuration (kdeglobals), while local entries will be saved in
- * your application's KConfig object.
+ * your application's TDEConfig object.
*
* Due to the configurability, you usually only insert some default entries
* once and then solely use the read and writeConfig methods to preserve the
@@ -331,27 +331,27 @@ public:
* inside the group @p itemGroup. All items in there will be restored.
* The reading of every item is delegated to the readItem() method.
*/
- virtual void readConfig( KConfig *config, const TQString& itemGroup );
+ virtual void readConfig( TDEConfig *config, const TQString& itemGroup );
/**
* Call this method to save the current configuration into @p config,
* inside the group @p iconGroup. The writeItem() method is used
* to save each item.
*/
- virtual void writeConfig( KConfig *config, const TQString& itemGroup );
+ virtual void writeConfig( TDEConfig *config, const TQString& itemGroup );
/**
* Called from readConfig() to read the i'th from @p config.
* After reading a KURLBarItem is created and initialized with the read
* values (as well as the given @p applicationLocal).
*/
- virtual void readItem( int i, KConfig *config, bool applicationLocal );
+ virtual void readItem( int i, TDEConfig *config, bool applicationLocal );
/**
* Called from writeConfig() to save the KURLBarItem @p item as the
* i'th entry in the config-object.
* @p global tell whether it should be saved in the global configuration
- * or not (using KConfig::writeEntry( key, value, true, global ) ).
+ * or not (using TDEConfig::writeEntry( key, value, true, global ) ).
*/
- virtual void writeItem( KURLBarItem *item, int i, KConfig *, bool global );
+ virtual void writeItem( KURLBarItem *item, int i, TDEConfig *, bool global );
/**
* @returns the current KURLBarItem, or 0L if none.
diff --git a/kio/kfile/tests/kcustommenueditortest.cpp b/kio/kfile/tests/kcustommenueditortest.cpp
index 9e00687a..1fc6da49 100644
--- a/kio/kfile/tests/kcustommenueditortest.cpp
+++ b/kio/kfile/tests/kcustommenueditortest.cpp
@@ -8,7 +8,7 @@ int main(int argc, char** argv)
KLocale::setMainCatalogue("tdelibs");
TDEApplication app(argc, argv, "KCustomMenuEditorTest");
KCustomMenuEditor editor(0);
- KConfig *cfg = new KConfig("kdesktop_custom_menu2");
+ TDEConfig *cfg = new TDEConfig("kdesktop_custom_menu2");
editor.load(cfg);
if (editor.exec())
{
diff --git a/kio/kio/authinfo.cpp b/kio/kio/authinfo.cpp
index 6f0592ac..483bc682 100644
--- a/kio/kio/authinfo.cpp
+++ b/kio/kio/authinfo.cpp
@@ -39,7 +39,7 @@
#define NETRC_READ_BUF_SIZE 4096
-using namespace KIO;
+using namespace TDEIO;
AuthInfo::AuthInfo()
{
@@ -72,7 +72,7 @@ AuthInfo& AuthInfo::operator= ( const AuthInfo& info )
return *this;
}
-TQDataStream& KIO::operator<< (TQDataStream& s, const AuthInfo& a)
+TQDataStream& TDEIO::operator<< (TQDataStream& s, const AuthInfo& a)
{
s << a.url << a.username << a.password << a.prompt << a.caption
<< a.comment << a.commentLabel << a.realmValue << a.digestInfo
@@ -81,7 +81,7 @@ TQDataStream& KIO::operator<< (TQDataStream& s, const AuthInfo& a)
return s;
}
-TQDataStream& KIO::operator>> (TQDataStream& s, AuthInfo& a)
+TQDataStream& TDEIO::operator>> (TQDataStream& s, AuthInfo& a)
{
TQ_UINT8 verify = 0;
TQ_UINT8 ro = 0;
diff --git a/kio/kio/authinfo.h b/kio/kio/authinfo.h
index 3f92e58d..130db085 100644
--- a/kio/kio/authinfo.h
+++ b/kio/kio/authinfo.h
@@ -26,7 +26,7 @@
#include <kurl.h>
-namespace KIO {
+namespace TDEIO {
/**
* This class is intended to make it easier to prompt for, cache
diff --git a/kio/kio/chmodjob.cpp b/kio/kio/chmodjob.cpp
index e1d343c1..e1c8a64e 100644
--- a/kio/kio/chmodjob.cpp
+++ b/kio/kio/chmodjob.cpp
@@ -38,12 +38,12 @@
#include <kdirnotify_stub.h>
-using namespace KIO;
+using namespace TDEIO;
ChmodJob::ChmodJob( const KFileItemList& lstItems, int permissions, int mask,
int newOwner, int newGroup,
bool recursive, bool showProgressInfo )
- : KIO::Job( showProgressInfo ), state( STATE_LISTING ),
+ : TDEIO::Job( showProgressInfo ), state( STATE_LISTING ),
m_permissions( permissions ), m_mask( mask ),
m_newOwner( newOwner ), m_newGroup( newGroup ),
m_recursive( recursive ), m_lstItems( lstItems )
@@ -76,11 +76,11 @@ void ChmodJob::processList()
if ( item->isDir() && m_recursive )
{
//kdDebug(7007) << "ChmodJob::processList dir -> listing" << endl;
- KIO::ListJob * listJob = KIO::listRecursive( item->url(), false /* no GUI */ );
- connect( listJob, TQT_SIGNAL(entries( KIO::Job *,
- const KIO::UDSEntryList& )),
- TQT_SLOT( slotEntries( KIO::Job*,
- const KIO::UDSEntryList& )));
+ TDEIO::ListJob * listJob = TDEIO::listRecursive( item->url(), false /* no GUI */ );
+ connect( listJob, TQT_SIGNAL(entries( TDEIO::Job *,
+ const TDEIO::UDSEntryList& )),
+ TQT_SLOT( slotEntries( TDEIO::Job*,
+ const TDEIO::UDSEntryList& )));
addSubjob( listJob );
return; // we'll come back later, when this one's finished
}
@@ -93,28 +93,28 @@ void ChmodJob::processList()
chmodNextFile();
}
-void ChmodJob::slotEntries( KIO::Job*, const KIO::UDSEntryList & list )
+void ChmodJob::slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList & list )
{
- KIO::UDSEntryListConstIterator it = list.begin();
- KIO::UDSEntryListConstIterator end = list.end();
+ TDEIO::UDSEntryListConstIterator it = list.begin();
+ TDEIO::UDSEntryListConstIterator end = list.end();
for (; it != end; ++it) {
- KIO::UDSEntry::ConstIterator it2 = (*it).begin();
+ TDEIO::UDSEntry::ConstIterator it2 = (*it).begin();
mode_t permissions = 0;
bool isDir = false;
bool isLink = false;
TQString relativePath;
for( ; it2 != (*it).end(); it2++ ) {
switch( (*it2).m_uds ) {
- case KIO::UDS_NAME:
+ case TDEIO::UDS_NAME:
relativePath = (*it2).m_str;
break;
- case KIO::UDS_FILE_TYPE:
+ case TDEIO::UDS_FILE_TYPE:
isDir = S_ISDIR((*it2).m_long);
break;
- case KIO::UDS_LINK_DEST:
+ case TDEIO::UDS_LINK_DEST:
isLink = !(*it2).m_str.isEmpty();
break;
- case KIO::UDS_ACCESS:
+ case TDEIO::UDS_ACCESS:
permissions = (mode_t)((*it2).m_long);
break;
default:
@@ -182,7 +182,7 @@ void ChmodJob::chmodNextFile()
kdDebug(7007) << "ChmodJob::chmodNextFile chmod'ing " << info.url.prettyURL()
<< " to " << TQString::number(info.permissions,8) << endl;
- KIO::SimpleJob * job = KIO::chmod( info.url, info.permissions );
+ TDEIO::SimpleJob * job = TDEIO::chmod( info.url, info.permissions );
// copy the metadata for acl and default acl
const TQString aclString = queryMetaData( "ACL_STRING" );
const TQString defaultAclString = queryMetaData( "DEFAULT_ACL_STRING" );
@@ -197,7 +197,7 @@ void ChmodJob::chmodNextFile()
emitResult();
}
-void ChmodJob::slotResult( KIO::Job * job )
+void ChmodJob::slotResult( TDEIO::Job * job )
{
if ( job->error() )
{
@@ -206,7 +206,7 @@ void ChmodJob::slotResult( KIO::Job * job )
emitResult();
return;
}
- //kdDebug(7007) << " ChmodJob::slotResult( KIO::Job * job ) m_lstItems:" << m_lstItems.count() << endl;
+ //kdDebug(7007) << " ChmodJob::slotResult( TDEIO::Job * job ) m_lstItems:" << m_lstItems.count() << endl;
switch ( state )
{
case STATE_LISTING:
@@ -227,7 +227,7 @@ void ChmodJob::slotResult( KIO::Job * job )
}
// antlarr: KDE 4: Make owner and group be const TQString &
-KIO_EXPORT ChmodJob *KIO::chmod( const KFileItemList& lstItems, int permissions, int mask,
+KIO_EXPORT ChmodJob *TDEIO::chmod( const KFileItemList& lstItems, int permissions, int mask,
TQString owner, TQString group,
bool recursive, bool showProgressInfo )
{
@@ -253,6 +253,6 @@ KIO_EXPORT ChmodJob *KIO::chmod( const KFileItemList& lstItems, int permissions,
}
void ChmodJob::virtual_hook( int id, void* data )
-{ KIO::Job::virtual_hook( id, data ); }
+{ TDEIO::Job::virtual_hook( id, data ); }
#include "chmodjob.moc"
diff --git a/kio/kio/chmodjob.h b/kio/kio/chmodjob.h
index fdb873b1..c501add6 100644
--- a/kio/kio/chmodjob.h
+++ b/kio/kio/chmodjob.h
@@ -28,19 +28,19 @@
#include <kio/job.h>
#include <kfileitem.h>
-namespace KIO {
+namespace TDEIO {
/**
* This job changes permissions on a list of files or directories,
* optionally in a recursive manner.
- * @see KIO::chmod()
+ * @see TDEIO::chmod()
*/
- class KIO_EXPORT ChmodJob : public KIO::Job
+ class KIO_EXPORT ChmodJob : public TDEIO::Job
{
Q_OBJECT
public:
/**
- * Create new ChmodJobs using the KIO::chmod() function.
+ * Create new ChmodJobs using the TDEIO::chmod() function.
*/
ChmodJob( const KFileItemList & lstItems, int permissions, int mask,
int newOwner, int newGroup,
@@ -51,8 +51,8 @@ namespace KIO {
protected slots:
- virtual void slotResult( KIO::Job *job );
- void slotEntries( KIO::Job * , const KIO::UDSEntryList & );
+ virtual void slotResult( TDEIO::Job *job );
+ void slotEntries( TDEIO::Job * , const TDEIO::UDSEntryList & );
void processList();
private:
diff --git a/kio/kio/connection.cpp b/kio/kio/connection.cpp
index b2a84a79..d85f4921 100644
--- a/kio/kio/connection.cpp
+++ b/kio/kio/connection.cpp
@@ -43,7 +43,7 @@
#include <kdebug.h>
#include <tqsocketnotifier.h>
-using namespace KIO;
+using namespace TDEIO;
Connection::Connection()
{
@@ -83,7 +83,7 @@ void Connection::close()
delete socket;
socket = 0;
- // KSocket has already closed the file descriptor, but we need to
+ // TDESocket has already closed the file descriptor, but we need to
// close the file-stream as well otherwise we leak memory.
// As a result we close the file descriptor twice, but that should
// be harmless
@@ -121,7 +121,7 @@ void Connection::dequeue()
}
}
-void Connection::init(KSocket *sock)
+void Connection::init(TDESocket *sock)
{
delete notifier;
notifier = 0;
diff --git a/kio/kio/connection.h b/kio/kio/connection.h
index a30131af..720e4e93 100644
--- a/kio/kio/connection.h
+++ b/kio/kio/connection.h
@@ -30,10 +30,10 @@
#include <tqptrlist.h>
#include <tqobject.h>
-class KSocket;
+class TDESocket;
class TQSocketNotifier;
-namespace KIO {
+namespace TDEIO {
struct KIO_EXPORT Task {
int cmd;
@@ -62,7 +62,7 @@ namespace KIO {
* @param sock the socket to use
* @see inited()
*/
- void init(KSocket *sock);
+ void init(TDESocket *sock);
/**
* Initialize the connection to use the given file
* descriptors.
@@ -143,7 +143,7 @@ namespace KIO {
private:
int fd_in;
FILE *f_out;
- KSocket *socket;
+ TDESocket *socket;
TQSocketNotifier *notifier;
TQObject *receiver;
const char *member;
diff --git a/kio/kio/dataprotocol.cpp b/kio/kio/dataprotocol.cpp
index 0ee463d8..1e3db04d 100644
--- a/kio/kio/dataprotocol.cpp
+++ b/kio/kio/dataprotocol.cpp
@@ -42,7 +42,7 @@
# define DISPATCH(f) f
#endif
-using namespace KIO;
+using namespace TDEIO;
#ifdef DATAKIOSLAVE
extern "C" {
diff --git a/kio/kio/dataprotocol.h b/kio/kio/dataprotocol.h
index 44dccfcc..472b4288 100644
--- a/kio/kio/dataprotocol.h
+++ b/kio/kio/dataprotocol.h
@@ -37,14 +37,14 @@ class KURL;
# include "kio/dataslave.h"
#endif
-namespace KIO {
+namespace TDEIO {
/** This kioslave provides support of data urls as specified by rfc 2397
* @see http://www.ietf.org/rfc/rfc2397.txt
* @author Leo Savernik
*/
#if defined(DATAKIOSLAVE)
-class DataProtocol : public KIO::SlaveBase {
+class DataProtocol : public TDEIO::SlaveBase {
#elif defined(TESTKIO)
class DataProtocol : public TestSlave {
#else
diff --git a/kio/kio/dataslave.cpp b/kio/kio/dataslave.cpp
index d16ecc0d..528368ba 100644
--- a/kio/kio/dataslave.cpp
+++ b/kio/kio/dataslave.cpp
@@ -28,7 +28,7 @@
#include <tqtimer.h>
-using namespace KIO;
+using namespace TDEIO;
#define KIO_DATA_POLL_INTERVAL 0
@@ -198,12 +198,12 @@ void DataSlave::virtual_hook( int id, void* data ) {
return;
}
default:
- KIO::Slave::virtual_hook( id, data );
+ TDEIO::Slave::virtual_hook( id, data );
}
}
DISPATCH_IMPL1(mimeType, const TQString &, s)
-DISPATCH_IMPL1(totalSize, KIO::filesize_t, size)
+DISPATCH_IMPL1(totalSize, TDEIO::filesize_t, size)
DISPATCH_IMPL(sendMetaData)
DISPATCH_IMPL1(data, const TQByteArray &, ba)
diff --git a/kio/kio/dataslave.h b/kio/kio/dataslave.h
index 71eae6cd..3567f3fa 100644
--- a/kio/kio/dataslave.h
+++ b/kio/kio/dataslave.h
@@ -35,7 +35,7 @@ class TQTimer;
#define DISPATCH_DECL1(type, paramtype, param) \
void dispatch_##type(paramtype param);
-namespace KIO {
+namespace TDEIO {
/**
* This class provides a high performance implementation for the data
@@ -46,7 +46,7 @@ namespace KIO {
* detail of KIO and subject to change without notice.
* @author Leo Savernik
*/
- class DataSlave : public KIO::Slave {
+ class DataSlave : public TDEIO::Slave {
Q_OBJECT
public:
DataSlave();
@@ -90,7 +90,7 @@ namespace KIO {
struct QueueStruct {
QueueType type;
TQString s;
- KIO::filesize_t size;
+ TDEIO::filesize_t size;
TQByteArray ba;
QueueStruct() {}
@@ -100,7 +100,7 @@ namespace KIO {
DispatchQueue dispatchQueue;
DISPATCH_DECL1(mimeType, const TQString &, s)
- DISPATCH_DECL1(totalSize, KIO::filesize_t, size)
+ DISPATCH_DECL1(totalSize, TDEIO::filesize_t, size)
DISPATCH_DECL(sendMetaData)
DISPATCH_DECL1(data, const TQByteArray &, ba)
DISPATCH_DECL(finished)
diff --git a/kio/kio/davjob.cpp b/kio/kio/davjob.cpp
index 1f3b208a..f1ba2d2d 100644
--- a/kio/kio/davjob.cpp
+++ b/kio/kio/davjob.cpp
@@ -40,7 +40,7 @@
#define KIO_ARGS TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream
-using namespace KIO;
+using namespace TDEIO;
class DavJob::DavJobPrivate
{
@@ -50,7 +50,7 @@ public:
};
DavJob::DavJob( const KURL& url, int method, const TQString& request, bool showProgressInfo )
- : TransferJob( url, KIO::CMD_SPECIAL, TQByteArray(), TQByteArray(), showProgressInfo )
+ : TransferJob( url, TDEIO::CMD_SPECIAL, TQByteArray(), TQByteArray(), showProgressInfo )
{
d = new DavJobPrivate;
// We couldn't set the args when calling the parent constructor,
@@ -86,10 +86,10 @@ void DavJob::slotFinished()
istream >> s_url;
istream >> s_method;
// PROPFIND
- if ( (s_cmd == 7) && (s_method == (int)KIO::DAV_PROPFIND) ) {
+ if ( (s_cmd == 7) && (s_method == (int)TDEIO::DAV_PROPFIND) ) {
m_packedArgs.truncate(0);
TQDataStream stream( m_packedArgs, IO_WriteOnly );
- stream << (int)7 << m_redirectionURL << (int)KIO::DAV_PROPFIND;
+ stream << (int)7 << m_redirectionURL << (int)TDEIO::DAV_PROPFIND;
}
} else if ( ! m_response.setContent( d->str_response, true ) ) {
// An error occurred parsing the XML response
@@ -114,20 +114,20 @@ void DavJob::slotFinished()
/* Convenience methods */
// KDE 4: Make it const TQString &
-DavJob* KIO::davPropFind( const KURL& url, const TQDomDocument& properties, TQString depth, bool showProgressInfo )
+DavJob* TDEIO::davPropFind( const KURL& url, const TQDomDocument& properties, TQString depth, bool showProgressInfo )
{
- DavJob *job = new DavJob( url, (int) KIO::DAV_PROPFIND, properties.toString(), showProgressInfo );
+ DavJob *job = new DavJob( url, (int) TDEIO::DAV_PROPFIND, properties.toString(), showProgressInfo );
job->addMetaData( "davDepth", depth );
return job;
}
-DavJob* KIO::davPropPatch( const KURL& url, const TQDomDocument& properties, bool showProgressInfo )
+DavJob* TDEIO::davPropPatch( const KURL& url, const TQDomDocument& properties, bool showProgressInfo )
{
- return new DavJob( url, (int) KIO::DAV_PROPPATCH, properties.toString(), showProgressInfo );
+ return new DavJob( url, (int) TDEIO::DAV_PROPPATCH, properties.toString(), showProgressInfo );
}
-DavJob* KIO::davSearch( const KURL& url, const TQString& nsURI, const TQString& qName, const TQString& query, bool showProgressInfo )
+DavJob* TDEIO::davSearch( const KURL& url, const TQString& nsURI, const TQString& qName, const TQString& query, bool showProgressInfo )
{
TQDomDocument doc;
TQDomElement searchrequest = doc.createElementNS( "DAV:", "searchrequest" );
@@ -136,7 +136,7 @@ DavJob* KIO::davSearch( const KURL& url, const TQString& nsURI, const TQString&
searchelement.appendChild( text );
searchrequest.appendChild( searchelement );
doc.appendChild( searchrequest );
- return new DavJob( url, KIO::DAV_SEARCH, doc.toString(), showProgressInfo );
+ return new DavJob( url, TDEIO::DAV_SEARCH, doc.toString(), showProgressInfo );
}
#include "davjob.moc"
diff --git a/kio/kio/davjob.h b/kio/kio/davjob.h
index 98d0fe70..3232f9e0 100644
--- a/kio/kio/davjob.h
+++ b/kio/kio/davjob.h
@@ -39,7 +39,7 @@
class Observer;
class TQTimer;
-namespace KIO {
+namespace TDEIO {
class Slave;
class SlaveInterface;
@@ -49,9 +49,9 @@ namespace KIO {
* Data is sent to the slave on request of the slave ( dataReq).
* If data coming from the slave can not be handled, the
* reading of data from the slave should be suspended.
- * @see KIO::davPropFind()
- * @see KIO::davPropPatch()
- * @see KIO::davSearch()
+ * @see TDEIO::davPropFind()
+ * @see TDEIO::davPropPatch()
+ * @see TDEIO::davSearch()
* @since 3.1
*/
class KIO_EXPORT DavJob : public TransferJob {
@@ -59,8 +59,8 @@ namespace KIO {
public:
/**
- * Use KIO::davPropFind(), KIO::davPropPatch() and
- * KIO::davSearch() to create a new DavJob.
+ * Use TDEIO::davPropFind(), TDEIO::davPropPatch() and
+ * TDEIO::davSearch() to create a new DavJob.
*/
DavJob(const KURL& url, int method,
const TQString& request, bool showProgressInfo);
diff --git a/kio/kio/defaultprogress.cpp b/kio/kio/defaultprogress.cpp
index 3f16f565..72bec0cf 100644
--- a/kio/kio/defaultprogress.cpp
+++ b/kio/kio/defaultprogress.cpp
@@ -42,7 +42,7 @@
#include "jobclasses.h"
#include "defaultprogress.h"
-namespace KIO {
+namespace TDEIO {
class DefaultProgress::DefaultProgressPrivate
{
@@ -184,7 +184,7 @@ DefaultProgress::~DefaultProgress()
delete d;
}
-void DefaultProgress::slotTotalSize( KIO::Job*, KIO::filesize_t size )
+void DefaultProgress::slotTotalSize( TDEIO::Job*, TDEIO::filesize_t size )
{
// size is measured in bytes
if ( m_iTotalSize == size )
@@ -195,7 +195,7 @@ void DefaultProgress::slotTotalSize( KIO::Job*, KIO::filesize_t size )
}
-void DefaultProgress::slotTotalFiles( KIO::Job*, unsigned long files )
+void DefaultProgress::slotTotalFiles( TDEIO::Job*, unsigned long files )
{
if ( m_iTotalFiles == files )
return;
@@ -204,7 +204,7 @@ void DefaultProgress::slotTotalFiles( KIO::Job*, unsigned long files )
}
-void DefaultProgress::slotTotalDirs( KIO::Job*, unsigned long dirs )
+void DefaultProgress::slotTotalDirs( TDEIO::Job*, unsigned long dirs )
{
if ( m_iTotalDirs == dirs )
return;
@@ -232,18 +232,18 @@ void DefaultProgress::showTotals()
//static
TQString DefaultProgress::makePercentString( unsigned long percent,
- KIO::filesize_t totalSize,
+ TDEIO::filesize_t totalSize,
unsigned long totalFiles )
{
if ( totalSize )
- return i18n( "%1 % of %2 " ).arg( TQString::number(percent) , KIO::convertSize( totalSize ) );
+ return i18n( "%1 % of %2 " ).arg( TQString::number(percent) , TDEIO::convertSize( totalSize ) );
else if ( totalFiles )
return i18n( "%1 % of 1 file", "%1 % of %n files", totalFiles ).arg( percent );
else
return i18n( "%1 %" ).arg( percent );
}
-void DefaultProgress::slotPercent( KIO::Job*, unsigned long percent )
+void DefaultProgress::slotPercent( TDEIO::Job*, unsigned long percent )
{
TQString caption = makePercentString( percent, m_iTotalSize, m_iTotalFiles );
m_pProgressBar->setValue( percent );
@@ -270,26 +270,26 @@ void DefaultProgress::slotPercent( KIO::Job*, unsigned long percent )
}
-void DefaultProgress::slotInfoMessage( KIO::Job*, const TQString & msg )
+void DefaultProgress::slotInfoMessage( TDEIO::Job*, const TQString & msg )
{
speedLabel->setText( msg );
speedLabel->setAlignment( speedLabel->alignment() & ~TQt::WordBreak );
}
-void DefaultProgress::slotProcessedSize( KIO::Job*, KIO::filesize_t bytes ) {
+void DefaultProgress::slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t bytes ) {
if ( m_iProcessedSize == bytes )
return;
m_iProcessedSize = bytes;
TQString tmp = i18n( "%1 of %2 complete")
- .arg( KIO::convertSize(bytes) )
- .arg( KIO::convertSize(m_iTotalSize));
+ .arg( TDEIO::convertSize(bytes) )
+ .arg( TDEIO::convertSize(m_iTotalSize));
sizeLabel->setText( tmp );
}
-void DefaultProgress::slotProcessedDirs( KIO::Job*, unsigned long dirs )
+void DefaultProgress::slotProcessedDirs( TDEIO::Job*, unsigned long dirs )
{
if ( m_iProcessedDirs == dirs )
return;
@@ -303,7 +303,7 @@ void DefaultProgress::slotProcessedDirs( KIO::Job*, unsigned long dirs )
}
-void DefaultProgress::slotProcessedFiles( KIO::Job*, unsigned long files )
+void DefaultProgress::slotProcessedFiles( TDEIO::Job*, unsigned long files )
{
if ( m_iProcessedFiles == files )
return;
@@ -319,18 +319,18 @@ void DefaultProgress::slotProcessedFiles( KIO::Job*, unsigned long files )
}
-void DefaultProgress::slotSpeed( KIO::Job*, unsigned long speed )
+void DefaultProgress::slotSpeed( TDEIO::Job*, unsigned long speed )
{
if ( speed == 0 ) {
speedLabel->setText( i18n( "Stalled") );
} else {
- speedLabel->setText( i18n( "%1/s ( %2 remaining )").arg( KIO::convertSize( speed ))
- .arg( KIO::convertSeconds( KIO::calculateRemainingSeconds( m_iTotalSize, m_iProcessedSize, speed ))) );
+ speedLabel->setText( i18n( "%1/s ( %2 remaining )").arg( TDEIO::convertSize( speed ))
+ .arg( TDEIO::convertSeconds( TDEIO::calculateRemainingSeconds( m_iTotalSize, m_iProcessedSize, speed ))) );
}
}
-void DefaultProgress::slotCopying( KIO::Job*, const KURL& from, const KURL& to )
+void DefaultProgress::slotCopying( TDEIO::Job*, const KURL& from, const KURL& to )
{
if ( d->noCaptionYet ) {
setCaption(i18n("Copy File(s) Progress"));
@@ -344,7 +344,7 @@ void DefaultProgress::slotCopying( KIO::Job*, const KURL& from, const KURL& to )
}
-void DefaultProgress::slotMoving( KIO::Job*, const KURL& from, const KURL& to )
+void DefaultProgress::slotMoving( TDEIO::Job*, const KURL& from, const KURL& to )
{
if ( d->noCaptionYet ) {
setCaption(i18n("Move File(s) Progress"));
@@ -358,7 +358,7 @@ void DefaultProgress::slotMoving( KIO::Job*, const KURL& from, const KURL& to )
}
-void DefaultProgress::slotCreatingDir( KIO::Job*, const KURL& dir )
+void DefaultProgress::slotCreatingDir( TDEIO::Job*, const KURL& dir )
{
if ( d->noCaptionYet ) {
setCaption(i18n("Creating Folder"));
@@ -370,7 +370,7 @@ void DefaultProgress::slotCreatingDir( KIO::Job*, const KURL& dir )
}
-void DefaultProgress::slotDeleting( KIO::Job*, const KURL& url )
+void DefaultProgress::slotDeleting( TDEIO::Job*, const KURL& url )
{
if ( d->noCaptionYet ) {
setCaption(i18n("Delete File(s) Progress"));
@@ -381,7 +381,7 @@ void DefaultProgress::slotDeleting( KIO::Job*, const KURL& url )
setDestVisible( false );
}
-void DefaultProgress::slotTransferring( KIO::Job*, const KURL& url )
+void DefaultProgress::slotTransferring( TDEIO::Job*, const KURL& url )
{
if ( d->noCaptionYet ) {
setCaption(i18n("Loading Progress"));
@@ -391,31 +391,31 @@ void DefaultProgress::slotTransferring( KIO::Job*, const KURL& url )
setDestVisible( false );
}
-void DefaultProgress::slotStating( KIO::Job*, const KURL& url )
+void DefaultProgress::slotStating( TDEIO::Job*, const KURL& url )
{
setCaption(i18n("Examining File Progress"));
sourceEdit->setText(url.prettyURL());
setDestVisible( false );
}
-void DefaultProgress::slotMounting( KIO::Job*, const TQString & dev, const TQString & point )
+void DefaultProgress::slotMounting( TDEIO::Job*, const TQString & dev, const TQString & point )
{
setCaption(i18n("Mounting %1").arg(dev));
sourceEdit->setText(point);
setDestVisible( false );
}
-void DefaultProgress::slotUnmounting( KIO::Job*, const TQString & point )
+void DefaultProgress::slotUnmounting( TDEIO::Job*, const TQString & point )
{
setCaption(i18n("Unmounting"));
sourceEdit->setText(point);
setDestVisible( false );
}
-void DefaultProgress::slotCanResume( KIO::Job*, KIO::filesize_t resume )
+void DefaultProgress::slotCanResume( TDEIO::Job*, TDEIO::filesize_t resume )
{
if ( resume ) {
- resumeLabel->setText( i18n("Resuming from %1").arg(KIO::number(resume)) );
+ resumeLabel->setText( i18n("Resuming from %1").arg(TDEIO::number(resume)) );
} else {
resumeLabel->setText( i18n("Not resumable") );
}
@@ -453,7 +453,7 @@ void DefaultProgress::slotClean() {
int s = d->startTime.elapsed();
if (!s)
s = 1;
- speedLabel->setText(i18n("%1/s (done)").arg(KIO::convertSize(1000 * m_iTotalSize / s)));
+ speedLabel->setText(i18n("%1/s (done)").arg(TDEIO::convertSize(1000 * m_iTotalSize / s)));
}
setOnlyClean(false);
}
diff --git a/kio/kio/defaultprogress.h b/kio/kio/defaultprogress.h
index 8dca499b..68d405b2 100644
--- a/kio/kio/defaultprogress.h
+++ b/kio/kio/defaultprogress.h
@@ -28,7 +28,7 @@
class KLineEdit;
-namespace KIO {
+namespace TDEIO {
/*
* A default implementation of the progress dialog ProgressBase.
@@ -58,59 +58,59 @@ public:
/// Shared with uiserver.cpp
static TQString makePercentString( unsigned long percent,
- KIO::filesize_t totalSize,
+ TDEIO::filesize_t totalSize,
unsigned long totalFiles );
public slots:
- virtual void slotTotalSize( KIO::Job *job, KIO::filesize_t size );
- virtual void slotTotalFiles( KIO::Job *job, unsigned long files );
- virtual void slotTotalDirs( KIO::Job *job, unsigned long dirs );
+ virtual void slotTotalSize( TDEIO::Job *job, TDEIO::filesize_t size );
+ virtual void slotTotalFiles( TDEIO::Job *job, unsigned long files );
+ virtual void slotTotalDirs( TDEIO::Job *job, unsigned long dirs );
- virtual void slotProcessedSize( KIO::Job *job, KIO::filesize_t bytes );
- virtual void slotProcessedFiles( KIO::Job *job, unsigned long files );
- virtual void slotProcessedDirs( KIO::Job *job, unsigned long dirs );
+ virtual void slotProcessedSize( TDEIO::Job *job, TDEIO::filesize_t bytes );
+ virtual void slotProcessedFiles( TDEIO::Job *job, unsigned long files );
+ virtual void slotProcessedDirs( TDEIO::Job *job, unsigned long dirs );
- virtual void slotSpeed( KIO::Job *job, unsigned long speed );
- virtual void slotPercent( KIO::Job *job, unsigned long percent );
+ virtual void slotSpeed( TDEIO::Job *job, unsigned long speed );
+ virtual void slotPercent( TDEIO::Job *job, unsigned long percent );
/**
* Called to set an information message.
- * @param job the KIO::Job
+ * @param job the TDEIO::Job
* @param msg the message to set
*/
- virtual void slotInfoMessage( KIO::Job *job, const TQString & msg );
+ virtual void slotInfoMessage( TDEIO::Job *job, const TQString & msg );
- virtual void slotCopying( KIO::Job* job, const KURL& src, const KURL& dest );
- virtual void slotMoving( KIO::Job* job, const KURL& src, const KURL& dest );
- virtual void slotDeleting( KIO::Job* job, const KURL& url );
+ virtual void slotCopying( TDEIO::Job* job, const KURL& src, const KURL& dest );
+ virtual void slotMoving( TDEIO::Job* job, const KURL& src, const KURL& dest );
+ virtual void slotDeleting( TDEIO::Job* job, const KURL& url );
/**
* Called when the job is transferring.
- * @param job the KIO::Job
+ * @param job the TDEIO::Job
* @param url the url to transfer
* @since 3.1
*/
- void slotTransferring( KIO::Job* job, const KURL& url );
- virtual void slotCreatingDir( KIO::Job* job, const KURL& dir );
+ void slotTransferring( TDEIO::Job* job, const KURL& url );
+ virtual void slotCreatingDir( TDEIO::Job* job, const KURL& dir );
/**
* Called when the job is requesting a stat.
- * @param job the KIO::Job
+ * @param job the TDEIO::Job
* @param dir the dir to stat
* @since 3.1
*/
- virtual void slotStating( KIO::Job* job, const KURL& dir );
+ virtual void slotStating( TDEIO::Job* job, const KURL& dir );
/**
* Called when the job is mounting.
- * @param job the KIO::Job
+ * @param job the TDEIO::Job
* @param dev the device to mount
* @param point the mount point
*/
- virtual void slotMounting( KIO::Job* job, const TQString & dev, const TQString & point );
+ virtual void slotMounting( TDEIO::Job* job, const TQString & dev, const TQString & point );
/**
* Called when the job is unmounting.
- * @param job the KIO::Job
+ * @param job the TDEIO::Job
* @param point the mount point
*/
- virtual void slotUnmounting( KIO::Job* job, const TQString & point );
- virtual void slotCanResume( KIO::Job* job, KIO::filesize_t from);
+ virtual void slotUnmounting( TDEIO::Job* job, const TQString & point );
+ virtual void slotCanResume( TDEIO::Job* job, TDEIO::filesize_t from);
/**
* Called when the job is cleaned.
@@ -136,11 +136,11 @@ protected:
KProgress* m_pProgressBar;
- KIO::filesize_t m_iTotalSize;
+ TDEIO::filesize_t m_iTotalSize;
unsigned long m_iTotalFiles;
unsigned long m_iTotalDirs;
- KIO::filesize_t m_iProcessedSize;
+ TDEIO::filesize_t m_iProcessedSize;
unsigned long m_iProcessedDirs;
unsigned long m_iProcessedFiles;
diff --git a/kio/kio/forwardingslavebase.cpp b/kio/kio/forwardingslavebase.cpp
index 17f12900..53121986 100644
--- a/kio/kio/forwardingslavebase.cpp
+++ b/kio/kio/forwardingslavebase.cpp
@@ -27,7 +27,7 @@
#include "forwardingslavebase.h"
-namespace KIO
+namespace TDEIO
{
class ForwardingSlaveBasePrivate
@@ -63,7 +63,7 @@ bool ForwardingSlaveBase::internalRewriteURL(const KURL &url, KURL &newURL)
return result;
}
-void ForwardingSlaveBase::prepareUDSEntry(KIO::UDSEntry &entry,
+void ForwardingSlaveBase::prepareUDSEntry(TDEIO::UDSEntry &entry,
bool listing) const
{
kdDebug() << "ForwardingSlaveBase::prepareUDSEntry: listing=="
@@ -73,8 +73,8 @@ void ForwardingSlaveBase::prepareUDSEntry(KIO::UDSEntry &entry,
TQString name;
KURL url;
- KIO::UDSEntry::iterator it = entry.begin();
- KIO::UDSEntry::iterator end = entry.end();
+ TDEIO::UDSEntry::iterator it = entry.begin();
+ TDEIO::UDSEntry::iterator end = entry.end();
for(; it!=end; ++it)
{
@@ -82,11 +82,11 @@ void ForwardingSlaveBase::prepareUDSEntry(KIO::UDSEntry &entry,
switch( (*it).m_uds )
{
- case KIO::UDS_NAME:
+ case TDEIO::UDS_NAME:
name = (*it).m_str;
kdDebug() << "Name = " << name << endl;
break;
- case KIO::UDS_URL:
+ case TDEIO::UDS_URL:
url_found = true;
url = (*it).m_str;
if (listing)
@@ -108,8 +108,8 @@ void ForwardingSlaveBase::prepareUDSEntry(KIO::UDSEntry &entry,
new_url.addPath( name );
}
- KIO::UDSAtom atom;
- atom.m_uds = KIO::UDS_LOCAL_PATH;
+ TDEIO::UDSAtom atom;
+ atom.m_uds = TDEIO::UDS_LOCAL_PATH;
atom.m_long = 0;
atom.m_str = new_url.path();
entry.append(atom);
@@ -123,7 +123,7 @@ void ForwardingSlaveBase::get(const KURL &url)
KURL new_url;
if ( internalRewriteURL(url, new_url) )
{
- KIO::TransferJob *job = KIO::get(new_url, false, false);
+ TDEIO::TransferJob *job = TDEIO::get(new_url, false, false);
connectTransferJob(job);
tqApp->eventLoop()->enterLoop();
@@ -138,7 +138,7 @@ void ForwardingSlaveBase::put(const KURL &url, int permissions,
KURL new_url;
if ( internalRewriteURL(url, new_url) )
{
- KIO::TransferJob *job = KIO::put(new_url, permissions, overwrite,
+ TDEIO::TransferJob *job = TDEIO::put(new_url, permissions, overwrite,
resume, false);
connectTransferJob(job);
@@ -153,7 +153,7 @@ void ForwardingSlaveBase::stat(const KURL &url)
KURL new_url;
if ( internalRewriteURL(url, new_url) )
{
- KIO::SimpleJob *job = KIO::stat(new_url, false);
+ TDEIO::SimpleJob *job = TDEIO::stat(new_url, false);
connectSimpleJob(job);
tqApp->eventLoop()->enterLoop();
@@ -167,7 +167,7 @@ void ForwardingSlaveBase::mimetype(const KURL &url)
KURL new_url;
if ( internalRewriteURL(url, new_url) )
{
- KIO::TransferJob *job = KIO::mimetype(new_url, false);
+ TDEIO::TransferJob *job = TDEIO::mimetype(new_url, false);
connectTransferJob(job);
tqApp->eventLoop()->enterLoop();
@@ -181,7 +181,7 @@ void ForwardingSlaveBase::listDir(const KURL &url)
KURL new_url;
if ( internalRewriteURL(url, new_url) )
{
- KIO::ListJob *job = KIO::listDir(new_url, false);
+ TDEIO::ListJob *job = TDEIO::listDir(new_url, false);
connectListJob(job);
tqApp->eventLoop()->enterLoop();
@@ -195,7 +195,7 @@ void ForwardingSlaveBase::mkdir(const KURL &url, int permissions)
KURL new_url;
if ( internalRewriteURL(url, new_url) )
{
- KIO::SimpleJob *job = KIO::mkdir(new_url, permissions);
+ TDEIO::SimpleJob *job = TDEIO::mkdir(new_url, permissions);
connectSimpleJob(job);
tqApp->eventLoop()->enterLoop();
@@ -210,7 +210,7 @@ void ForwardingSlaveBase::rename(const KURL &src, const KURL &dest,
KURL new_src, new_dest;
if ( internalRewriteURL(src, new_src) && internalRewriteURL(dest, new_dest) )
{
- KIO::Job *job = KIO::rename(new_src, new_dest, overwrite);
+ TDEIO::Job *job = TDEIO::rename(new_src, new_dest, overwrite);
connectJob(job);
tqApp->eventLoop()->enterLoop();
@@ -225,7 +225,7 @@ void ForwardingSlaveBase::symlink(const TQString &target, const KURL &dest,
KURL new_dest;
if ( internalRewriteURL(dest, new_dest) )
{
- KIO::SimpleJob *job = KIO::symlink(target, new_dest, overwrite, false);
+ TDEIO::SimpleJob *job = TDEIO::symlink(target, new_dest, overwrite, false);
connectSimpleJob(job);
tqApp->eventLoop()->enterLoop();
@@ -239,7 +239,7 @@ void ForwardingSlaveBase::chmod(const KURL &url, int permissions)
KURL new_url;
if ( internalRewriteURL(url, new_url) )
{
- KIO::SimpleJob *job = KIO::chmod(new_url, permissions);
+ TDEIO::SimpleJob *job = TDEIO::chmod(new_url, permissions);
connectSimpleJob(job);
tqApp->eventLoop()->enterLoop();
@@ -254,7 +254,7 @@ void ForwardingSlaveBase::copy(const KURL &src, const KURL &dest,
KURL new_src, new_dest;
if ( internalRewriteURL(src, new_src) && internalRewriteURL(dest, new_dest) )
{
- KIO::Job *job = KIO::file_copy(new_src, new_dest, permissions,
+ TDEIO::Job *job = TDEIO::file_copy(new_src, new_dest, permissions,
overwrite, false);
connectJob(job);
@@ -271,12 +271,12 @@ void ForwardingSlaveBase::del(const KURL &url, bool isfile)
{
if (isfile)
{
- KIO::DeleteJob *job = KIO::del(new_url, false, false);
+ TDEIO::DeleteJob *job = TDEIO::del(new_url, false, false);
connectJob(job);
}
else
{
- KIO::SimpleJob *job = KIO::rmdir(new_url);
+ TDEIO::SimpleJob *job = TDEIO::rmdir(new_url);
connectSimpleJob(job);
}
@@ -291,7 +291,7 @@ void ForwardingSlaveBase::localURL(const KURL& remoteURL)
KURL new_url;
if ( internalRewriteURL(remoteURL, new_url) )
{
- KIO::LocalURLJob *job = KIO::localURL(new_url);
+ TDEIO::LocalURLJob *job = TDEIO::localURL(new_url);
connectLocalURLJob(job);
tqApp->eventLoop()->enterLoop();
@@ -305,7 +305,7 @@ void ForwardingSlaveBase::localURL(const KURL& remoteURL)
//////////////////////////////////////////////////////////////////////////////
-void ForwardingSlaveBase::connectJob(KIO::Job *job)
+void ForwardingSlaveBase::connectJob(TDEIO::Job *job)
{
// We will forward the warning message, no need to let the job
// display it itself
@@ -320,57 +320,57 @@ void ForwardingSlaveBase::connectJob(KIO::Job *job)
kdDebug() << it.key() << " = " << it.data() << endl;
#endif
- connect( job, TQT_SIGNAL( result(KIO::Job *) ),
- this, TQT_SLOT( slotResult(KIO::Job *) ) );
- connect( job, TQT_SIGNAL( warning(KIO::Job *, const TQString &) ),
- this, TQT_SLOT( slotWarning(KIO::Job *, const TQString &) ) );
- connect( job, TQT_SIGNAL( infoMessage(KIO::Job *, const TQString &) ),
- this, TQT_SLOT( slotInfoMessage(KIO::Job *, const TQString &) ) );
- connect( job, TQT_SIGNAL( totalSize(KIO::Job *, KIO::filesize_t) ),
- this, TQT_SLOT( slotTotalSize(KIO::Job *, KIO::filesize_t) ) );
- connect( job, TQT_SIGNAL( processedSize(KIO::Job *, KIO::filesize_t) ),
- this, TQT_SLOT( slotProcessedSize(KIO::Job *, KIO::filesize_t) ) );
- connect( job, TQT_SIGNAL( speed(KIO::Job *, unsigned long) ),
- this, TQT_SLOT( slotSpeed(KIO::Job *, unsigned long) ) );
+ connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
+ this, TQT_SLOT( slotResult(TDEIO::Job *) ) );
+ connect( job, TQT_SIGNAL( warning(TDEIO::Job *, const TQString &) ),
+ this, TQT_SLOT( slotWarning(TDEIO::Job *, const TQString &) ) );
+ connect( job, TQT_SIGNAL( infoMessage(TDEIO::Job *, const TQString &) ),
+ this, TQT_SLOT( slotInfoMessage(TDEIO::Job *, const TQString &) ) );
+ connect( job, TQT_SIGNAL( totalSize(TDEIO::Job *, TDEIO::filesize_t) ),
+ this, TQT_SLOT( slotTotalSize(TDEIO::Job *, TDEIO::filesize_t) ) );
+ connect( job, TQT_SIGNAL( processedSize(TDEIO::Job *, TDEIO::filesize_t) ),
+ this, TQT_SLOT( slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t) ) );
+ connect( job, TQT_SIGNAL( speed(TDEIO::Job *, unsigned long) ),
+ this, TQT_SLOT( slotSpeed(TDEIO::Job *, unsigned long) ) );
}
-void ForwardingSlaveBase::connectSimpleJob(KIO::SimpleJob *job)
+void ForwardingSlaveBase::connectSimpleJob(TDEIO::SimpleJob *job)
{
connectJob(job);
- connect( job, TQT_SIGNAL( redirection(KIO::Job *, const KURL &) ),
- this, TQT_SLOT( slotRedirection(KIO::Job *, const KURL &) ) );
+ connect( job, TQT_SIGNAL( redirection(TDEIO::Job *, const KURL &) ),
+ this, TQT_SLOT( slotRedirection(TDEIO::Job *, const KURL &) ) );
}
-void ForwardingSlaveBase::connectListJob(KIO::ListJob *job)
+void ForwardingSlaveBase::connectListJob(TDEIO::ListJob *job)
{
connectSimpleJob(job);
- connect( job, TQT_SIGNAL( entries(KIO::Job *, const KIO::UDSEntryList &) ),
- this, TQT_SLOT( slotEntries(KIO::Job *, const KIO::UDSEntryList &) ) );
+ connect( job, TQT_SIGNAL( entries(TDEIO::Job *, const TDEIO::UDSEntryList &) ),
+ this, TQT_SLOT( slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &) ) );
}
-void ForwardingSlaveBase::connectTransferJob(KIO::TransferJob *job)
+void ForwardingSlaveBase::connectTransferJob(TDEIO::TransferJob *job)
{
connectSimpleJob(job);
- connect( job, TQT_SIGNAL( data(KIO::Job *, const TQByteArray &) ),
- this, TQT_SLOT( slotData(KIO::Job *, const TQByteArray &) ) );
- connect( job, TQT_SIGNAL( dataReq(KIO::Job *, TQByteArray &) ),
- this, TQT_SLOT( slotDataReq(KIO::Job *, TQByteArray &) ) );
- connect( job, TQT_SIGNAL( mimetype(KIO::Job *, const TQString &) ),
- this, TQT_SLOT( slotMimetype(KIO::Job *, const TQString &) ) );
- connect( job, TQT_SIGNAL( canResume(KIO::Job *, KIO::filesize_t) ),
- this, TQT_SLOT( slotCanResume(KIO::Job *, KIO::filesize_t) ) );
+ connect( job, TQT_SIGNAL( data(TDEIO::Job *, const TQByteArray &) ),
+ this, TQT_SLOT( slotData(TDEIO::Job *, const TQByteArray &) ) );
+ connect( job, TQT_SIGNAL( dataReq(TDEIO::Job *, TQByteArray &) ),
+ this, TQT_SLOT( slotDataReq(TDEIO::Job *, TQByteArray &) ) );
+ connect( job, TQT_SIGNAL( mimetype(TDEIO::Job *, const TQString &) ),
+ this, TQT_SLOT( slotMimetype(TDEIO::Job *, const TQString &) ) );
+ connect( job, TQT_SIGNAL( canResume(TDEIO::Job *, TDEIO::filesize_t) ),
+ this, TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t) ) );
}
-void ForwardingSlaveBase::connectLocalURLJob(KIO::LocalURLJob *job)
+void ForwardingSlaveBase::connectLocalURLJob(TDEIO::LocalURLJob *job)
{
connectJob(job);
- connect( job, TQT_SIGNAL( localURL(KIO::Job *, const KURL&, bool) ),
- this, TQT_SLOT( slotLocalURL(KIO::Job *, const KURL&, bool) ) );
+ connect( job, TQT_SIGNAL( localURL(TDEIO::Job *, const KURL&, bool) ),
+ this, TQT_SLOT( slotLocalURL(TDEIO::Job *, const KURL&, bool) ) );
}
//////////////////////////////////////////////////////////////////////////////
-void ForwardingSlaveBase::slotResult(KIO::Job *job)
+void ForwardingSlaveBase::slotResult(TDEIO::Job *job)
{
if ( job->error() != 0)
{
@@ -378,10 +378,10 @@ void ForwardingSlaveBase::slotResult(KIO::Job *job)
}
else
{
- KIO::StatJob *stat_job = dynamic_cast<KIO::StatJob *>(job);
+ TDEIO::StatJob *stat_job = dynamic_cast<TDEIO::StatJob *>(job);
if ( stat_job!=0L )
{
- KIO::UDSEntry entry = stat_job->statResult();
+ TDEIO::UDSEntry entry = stat_job->statResult();
prepareUDSEntry(entry);
statEntry( entry );
}
@@ -391,32 +391,32 @@ void ForwardingSlaveBase::slotResult(KIO::Job *job)
tqApp->eventLoop()->exitLoop();
}
-void ForwardingSlaveBase::slotWarning(KIO::Job* /*job*/, const TQString &msg)
+void ForwardingSlaveBase::slotWarning(TDEIO::Job* /*job*/, const TQString &msg)
{
warning(msg);
}
-void ForwardingSlaveBase::slotInfoMessage(KIO::Job* /*job*/, const TQString &msg)
+void ForwardingSlaveBase::slotInfoMessage(TDEIO::Job* /*job*/, const TQString &msg)
{
infoMessage(msg);
}
-void ForwardingSlaveBase::slotTotalSize(KIO::Job* /*job*/, KIO::filesize_t size)
+void ForwardingSlaveBase::slotTotalSize(TDEIO::Job* /*job*/, TDEIO::filesize_t size)
{
totalSize(size);
}
-void ForwardingSlaveBase::slotProcessedSize(KIO::Job* /*job*/, KIO::filesize_t size)
+void ForwardingSlaveBase::slotProcessedSize(TDEIO::Job* /*job*/, TDEIO::filesize_t size)
{
processedSize(size);
}
-void ForwardingSlaveBase::slotSpeed(KIO::Job* /*job*/, unsigned long bytesPerSecond)
+void ForwardingSlaveBase::slotSpeed(TDEIO::Job* /*job*/, unsigned long bytesPerSecond)
{
speed(bytesPerSecond);
}
-void ForwardingSlaveBase::slotRedirection(KIO::Job *job, const KURL &url)
+void ForwardingSlaveBase::slotRedirection(TDEIO::Job *job, const KURL &url)
{
redirection(url);
@@ -427,13 +427,13 @@ void ForwardingSlaveBase::slotRedirection(KIO::Job *job, const KURL &url)
tqApp->eventLoop()->exitLoop();
}
-void ForwardingSlaveBase::slotEntries(KIO::Job* /*job*/,
- const KIO::UDSEntryList &entries)
+void ForwardingSlaveBase::slotEntries(TDEIO::Job* /*job*/,
+ const TDEIO::UDSEntryList &entries)
{
- KIO::UDSEntryList final_entries = entries;
+ TDEIO::UDSEntryList final_entries = entries;
- KIO::UDSEntryList::iterator it = final_entries.begin();
- KIO::UDSEntryList::iterator end = final_entries.end();
+ TDEIO::UDSEntryList::iterator it = final_entries.begin();
+ TDEIO::UDSEntryList::iterator end = final_entries.end();
for(; it!=end; ++it)
{
@@ -443,28 +443,28 @@ void ForwardingSlaveBase::slotEntries(KIO::Job* /*job*/,
listEntries( final_entries );
}
-void ForwardingSlaveBase::slotData(KIO::Job* /*job*/, const TQByteArray &d)
+void ForwardingSlaveBase::slotData(TDEIO::Job* /*job*/, const TQByteArray &d)
{
data(d);
}
-void ForwardingSlaveBase::slotDataReq(KIO::Job* /*job*/, TQByteArray &data)
+void ForwardingSlaveBase::slotDataReq(TDEIO::Job* /*job*/, TQByteArray &data)
{
dataReq();
readData(data);
}
-void ForwardingSlaveBase::slotMimetype (KIO::Job* /*job*/, const TQString &type)
+void ForwardingSlaveBase::slotMimetype (TDEIO::Job* /*job*/, const TQString &type)
{
mimeType(type);
}
-void ForwardingSlaveBase::slotCanResume (KIO::Job* /*job*/, KIO::filesize_t offset)
+void ForwardingSlaveBase::slotCanResume (TDEIO::Job* /*job*/, TDEIO::filesize_t offset)
{
canResume(offset);
}
-void ForwardingSlaveBase::slotLocalURL(KIO::Job *, const KURL& url, bool)
+void ForwardingSlaveBase::slotLocalURL(TDEIO::Job *, const KURL& url, bool)
{
SlaveBase::localURL(url);
}
diff --git a/kio/kio/forwardingslavebase.h b/kio/kio/forwardingslavebase.h
index 1e6d303e..49d01f4e 100644
--- a/kio/kio/forwardingslavebase.h
+++ b/kio/kio/forwardingslavebase.h
@@ -25,7 +25,7 @@
#include <tqobject.h>
-namespace KIO
+namespace TDEIO
{
class ForwardingSlaveBasePrivate;
@@ -56,7 +56,7 @@ class ForwardingSlaveBasePrivate;
* if ( is_special )
* {
* // Handle the URL ourselves
- * KIO::UDSEntry entry;
+ * TDEIO::UDSEntry entry;
* // Fill entry with UDSAtom instances
* statEntry(entry);
* finished();
@@ -146,7 +146,7 @@ protected:
* @param listing indicate if this entry it created during a listDir
* operation
*/
- virtual void prepareUDSEntry(KIO::UDSEntry &entry,
+ virtual void prepareUDSEntry(TDEIO::UDSEntry &entry,
bool listing=false) const;
/**
@@ -175,28 +175,28 @@ private:
void connectLocalURLJob(LocalURLJob *job);
private slots:
- // KIO::Job
- void slotResult(KIO::Job *job);
- void slotWarning(KIO::Job *job, const TQString &msg);
- void slotInfoMessage(KIO::Job *job, const TQString &msg);
- void slotTotalSize(KIO::Job *job, KIO::filesize_t size);
- void slotProcessedSize(KIO::Job *job, KIO::filesize_t size);
- void slotSpeed(KIO::Job *job, unsigned long bytesPerSecond);
-
- // KIO::SimpleJob subclasses
- void slotRedirection(KIO::Job *job, const KURL &url);
-
- // KIO::ListJob
- void slotEntries(KIO::Job *job, const KIO::UDSEntryList &entries);
-
- // KIO::TransferJob
- void slotData(KIO::Job *job, const TQByteArray &data);
- void slotDataReq(KIO::Job *job, TQByteArray &data);
- void slotMimetype (KIO::Job *job, const TQString &type);
- void slotCanResume (KIO::Job *job, KIO::filesize_t offset);
-
- // KIO::LocalURLJob
- void slotLocalURL(KIO::Job *, const KURL&, bool);
+ // TDEIO::Job
+ void slotResult(TDEIO::Job *job);
+ void slotWarning(TDEIO::Job *job, const TQString &msg);
+ void slotInfoMessage(TDEIO::Job *job, const TQString &msg);
+ void slotTotalSize(TDEIO::Job *job, TDEIO::filesize_t size);
+ void slotProcessedSize(TDEIO::Job *job, TDEIO::filesize_t size);
+ void slotSpeed(TDEIO::Job *job, unsigned long bytesPerSecond);
+
+ // TDEIO::SimpleJob subclasses
+ void slotRedirection(TDEIO::Job *job, const KURL &url);
+
+ // TDEIO::ListJob
+ void slotEntries(TDEIO::Job *job, const TDEIO::UDSEntryList &entries);
+
+ // TDEIO::TransferJob
+ void slotData(TDEIO::Job *job, const TQByteArray &data);
+ void slotDataReq(TDEIO::Job *job, TQByteArray &data);
+ void slotMimetype (TDEIO::Job *job, const TQString &type);
+ void slotCanResume (TDEIO::Job *job, TDEIO::filesize_t offset);
+
+ // TDEIO::LocalURLJob
+ void slotLocalURL(TDEIO::Job *, const KURL&, bool);
};
}
diff --git a/kio/kio/global.cpp b/kio/kio/global.cpp
index 63ba8292..36706a6c 100644
--- a/kio/kio/global.cpp
+++ b/kio/kio/global.cpp
@@ -42,7 +42,7 @@
#include <volmgt.h>
#endif
-KIO_EXPORT TQString KIO::convertSizeWithBytes( KIO::filesize_t size )
+KIO_EXPORT TQString TDEIO::convertSizeWithBytes( TDEIO::filesize_t size )
{
if ( size >= 1024 )
return convertSize( size ) + " (" + i18n( "%1 B" ).arg( TDEGlobal::locale()->formatNumber(size, 0) ) + ")";
@@ -50,7 +50,7 @@ KIO_EXPORT TQString KIO::convertSizeWithBytes( KIO::filesize_t size )
return convertSize( size );
}
-KIO_EXPORT TQString KIO::convertSize( KIO::filesize_t size )
+KIO_EXPORT TQString TDEIO::convertSize( TDEIO::filesize_t size )
{
double fsize = size;
TQString s;
@@ -88,20 +88,20 @@ KIO_EXPORT TQString KIO::convertSize( KIO::filesize_t size )
return s;
}
-KIO_EXPORT TQString KIO::convertSizeFromKB( KIO::filesize_t kbSize )
+KIO_EXPORT TQString TDEIO::convertSizeFromKB( TDEIO::filesize_t kbSize )
{
return convertSize(kbSize * 1024);
}
-KIO_EXPORT TQString KIO::number( KIO::filesize_t size )
+KIO_EXPORT TQString TDEIO::number( TDEIO::filesize_t size )
{
char charbuf[256];
sprintf(charbuf, "%lld", size);
return TQString::fromLatin1(charbuf);
}
-KIO_EXPORT unsigned int KIO::calculateRemainingSeconds( KIO::filesize_t totalSize,
- KIO::filesize_t processedSize, KIO::filesize_t speed )
+KIO_EXPORT unsigned int TDEIO::calculateRemainingSeconds( TDEIO::filesize_t totalSize,
+ TDEIO::filesize_t processedSize, TDEIO::filesize_t speed )
{
if ( (speed != 0) && (totalSize != 0) )
return ( totalSize - processedSize ) / speed;
@@ -109,7 +109,7 @@ KIO_EXPORT unsigned int KIO::calculateRemainingSeconds( KIO::filesize_t totalSiz
return 0;
}
-KIO_EXPORT TQString KIO::convertSeconds( unsigned int seconds )
+KIO_EXPORT TQString TDEIO::convertSeconds( unsigned int seconds )
{
unsigned int days = seconds / 86400;
unsigned int hours = (seconds - (days * 86400)) / 3600;
@@ -124,12 +124,12 @@ KIO_EXPORT TQString KIO::convertSeconds( unsigned int seconds )
return timeStr;
}
-KIO_EXPORT TQTime KIO::calculateRemaining( KIO::filesize_t totalSize, KIO::filesize_t processedSize, KIO::filesize_t speed )
+KIO_EXPORT TQTime TDEIO::calculateRemaining( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed )
{
TQTime remainingTime;
if ( speed != 0 ) {
- KIO::filesize_t secs;
+ TDEIO::filesize_t secs;
if ( totalSize == 0 ) {
secs = 0;
} else {
@@ -147,7 +147,7 @@ KIO_EXPORT TQTime KIO::calculateRemaining( KIO::filesize_t totalSize, KIO::files
return remainingTime;
}
-KIO_EXPORT TQString KIO::itemsSummaryString(uint items, uint files, uint dirs, KIO::filesize_t size, bool showSize)
+KIO_EXPORT TQString TDEIO::itemsSummaryString(uint items, uint files, uint dirs, TDEIO::filesize_t size, bool showSize)
{
TQString text = items == 0 ? i18n( "No Items" ) : i18n( "One Item", "%n Items", items );
text += " - ";
@@ -155,14 +155,14 @@ KIO_EXPORT TQString KIO::itemsSummaryString(uint items, uint files, uint dirs, K
if ( showSize && files > 0 )
{
text += " ";
- text += i18n("(%1 Total)").arg(KIO::convertSize( size ) );
+ text += i18n("(%1 Total)").arg(TDEIO::convertSize( size ) );
}
text += " - ";
text += dirs == 0 ? i18n( "No Folders" ) : i18n("One Folder", "%n Folders", dirs);
return text;
}
-KIO_EXPORT TQString KIO::encodeFileName( const TQString & _str )
+KIO_EXPORT TQString TDEIO::encodeFileName( const TQString & _str )
{
TQString str( _str );
@@ -177,7 +177,7 @@ KIO_EXPORT TQString KIO::encodeFileName( const TQString & _str )
return str;
}
-KIO_EXPORT TQString KIO::decodeFileName( const TQString & _str )
+KIO_EXPORT TQString TDEIO::decodeFileName( const TQString & _str )
{
TQString str;
@@ -205,210 +205,210 @@ KIO_EXPORT TQString KIO::decodeFileName( const TQString & _str )
return str;
}
-KIO_EXPORT TQString KIO::Job::errorString() const
+KIO_EXPORT TQString TDEIO::Job::errorString() const
{
- return KIO::buildErrorString(m_error, m_errorText);
+ return TDEIO::buildErrorString(m_error, m_errorText);
}
-KIO_EXPORT TQString KIO::buildErrorString(int errorCode, const TQString &errorText)
+KIO_EXPORT TQString TDEIO::buildErrorString(int errorCode, const TQString &errorText)
{
TQString result;
switch( errorCode )
{
- case KIO::ERR_CANNOT_OPEN_FOR_READING:
+ case TDEIO::ERR_CANNOT_OPEN_FOR_READING:
result = i18n( "Could not read %1." ).arg( errorText );
break;
- case KIO::ERR_CANNOT_OPEN_FOR_WRITING:
+ case TDEIO::ERR_CANNOT_OPEN_FOR_WRITING:
result = i18n( "Could not write to %1." ).arg( errorText );
break;
- case KIO::ERR_CANNOT_LAUNCH_PROCESS:
+ case TDEIO::ERR_CANNOT_LAUNCH_PROCESS:
result = i18n( "Could not start process %1." ).arg( errorText );
break;
- case KIO::ERR_INTERNAL:
+ case TDEIO::ERR_INTERNAL:
result = i18n( "Internal Error\nPlease send a full bug report at http://bugs.kde.org\n%1" ).arg( errorText );
break;
- case KIO::ERR_MALFORMED_URL:
+ case TDEIO::ERR_MALFORMED_URL:
result = i18n( "Malformed URL %1." ).arg( errorText );
break;
- case KIO::ERR_UNSUPPORTED_PROTOCOL:
+ case TDEIO::ERR_UNSUPPORTED_PROTOCOL:
result = i18n( "The protocol %1 is not supported." ).arg( errorText );
break;
- case KIO::ERR_NO_SOURCE_PROTOCOL:
+ case TDEIO::ERR_NO_SOURCE_PROTOCOL:
result = i18n( "The protocol %1 is only a filter protocol.").arg( errorText );
break;
- case KIO::ERR_UNSUPPORTED_ACTION:
+ case TDEIO::ERR_UNSUPPORTED_ACTION:
result = errorText;
// result = i18n( "Unsupported action %1" ).arg( errorText );
break;
- case KIO::ERR_IS_DIRECTORY:
+ case TDEIO::ERR_IS_DIRECTORY:
result = i18n( "%1 is a folder, but a file was expected." ).arg( errorText );
break;
- case KIO::ERR_IS_FILE:
+ case TDEIO::ERR_IS_FILE:
result = i18n( "%1 is a file, but a folder was expected." ).arg( errorText );
break;
- case KIO::ERR_DOES_NOT_EXIST:
+ case TDEIO::ERR_DOES_NOT_EXIST:
result = i18n( "The file or folder %1 does not exist." ).arg( errorText );
break;
- case KIO::ERR_FILE_ALREADY_EXIST:
+ case TDEIO::ERR_FILE_ALREADY_EXIST:
result = i18n( "A file named %1 already exists." ).arg( errorText );
break;
- case KIO::ERR_DIR_ALREADY_EXIST:
+ case TDEIO::ERR_DIR_ALREADY_EXIST:
result = i18n( "A folder named %1 already exists." ).arg( errorText );
break;
- case KIO::ERR_UNKNOWN_HOST:
+ case TDEIO::ERR_UNKNOWN_HOST:
result = errorText.isEmpty() ? i18n( "No hostname specified." ) : i18n( "Unknown host %1" ).arg( errorText );
break;
- case KIO::ERR_ACCESS_DENIED:
+ case TDEIO::ERR_ACCESS_DENIED:
result = i18n( "Access denied to %1." ).arg( errorText );
break;
- case KIO::ERR_WRITE_ACCESS_DENIED:
+ case TDEIO::ERR_WRITE_ACCESS_DENIED:
result = i18n( "Access denied.\nCould not write to %1." ).arg( errorText );
break;
- case KIO::ERR_CANNOT_ENTER_DIRECTORY:
+ case TDEIO::ERR_CANNOT_ENTER_DIRECTORY:
result = i18n( "Could not enter folder %1." ).arg( errorText );
break;
- case KIO::ERR_PROTOCOL_IS_NOT_A_FILESYSTEM:
+ case TDEIO::ERR_PROTOCOL_IS_NOT_A_FILESYSTEM:
result = i18n( "The protocol %1 does not implement a folder service." ).arg( errorText );
break;
- case KIO::ERR_CYCLIC_LINK:
+ case TDEIO::ERR_CYCLIC_LINK:
result = i18n( "Found a cyclic link in %1." ).arg( errorText );
break;
- case KIO::ERR_USER_CANCELED:
+ case TDEIO::ERR_USER_CANCELED:
// Do nothing in this case. The user doesn't need to be told what he just did.
break;
- case KIO::ERR_CYCLIC_COPY:
+ case TDEIO::ERR_CYCLIC_COPY:
result = i18n( "Found a cyclic link while copying %1." ).arg( errorText );
break;
- case KIO::ERR_COULD_NOT_CREATE_SOCKET:
+ case TDEIO::ERR_COULD_NOT_CREATE_SOCKET:
result = i18n( "Could not create socket for accessing %1." ).arg( errorText );
break;
- case KIO::ERR_COULD_NOT_CONNECT:
+ case TDEIO::ERR_COULD_NOT_CONNECT:
result = i18n( "Could not connect to host %1." ).arg( errorText.isEmpty() ? TQString::fromLatin1("localhost") : errorText );
break;
- case KIO::ERR_CONNECTION_BROKEN:
+ case TDEIO::ERR_CONNECTION_BROKEN:
result = i18n( "Connection to host %1 is broken." ).arg( errorText );
break;
- case KIO::ERR_NOT_FILTER_PROTOCOL:
+ case TDEIO::ERR_NOT_FILTER_PROTOCOL:
result = i18n( "The protocol %1 is not a filter protocol." ).arg( errorText );
break;
- case KIO::ERR_COULD_NOT_MOUNT:
+ case TDEIO::ERR_COULD_NOT_MOUNT:
result = i18n( "Could not mount device.\nThe reported error was:\n%1" ).arg( errorText );
break;
- case KIO::ERR_COULD_NOT_UNMOUNT:
+ case TDEIO::ERR_COULD_NOT_UNMOUNT:
result = i18n( "Could not unmount device.\nThe reported error was:\n%1" ).arg( errorText );
break;
- case KIO::ERR_COULD_NOT_READ:
+ case TDEIO::ERR_COULD_NOT_READ:
result = i18n( "Could not read file %1." ).arg( errorText );
break;
- case KIO::ERR_COULD_NOT_WRITE:
+ case TDEIO::ERR_COULD_NOT_WRITE:
result = i18n( "Could not write to file %1." ).arg( errorText );
break;
- case KIO::ERR_COULD_NOT_BIND:
+ case TDEIO::ERR_COULD_NOT_BIND:
result = i18n( "Could not bind %1." ).arg( errorText );
break;
- case KIO::ERR_COULD_NOT_LISTEN:
+ case TDEIO::ERR_COULD_NOT_LISTEN:
result = i18n( "Could not listen %1." ).arg( errorText );
break;
- case KIO::ERR_COULD_NOT_ACCEPT:
+ case TDEIO::ERR_COULD_NOT_ACCEPT:
result = i18n( "Could not accept %1." ).arg( errorText );
break;
- case KIO::ERR_COULD_NOT_LOGIN:
+ case TDEIO::ERR_COULD_NOT_LOGIN:
result = errorText;
break;
- case KIO::ERR_COULD_NOT_STAT:
+ case TDEIO::ERR_COULD_NOT_STAT:
result = i18n( "Could not access %1." ).arg( errorText );
break;
- case KIO::ERR_COULD_NOT_CLOSEDIR:
+ case TDEIO::ERR_COULD_NOT_CLOSEDIR:
result = i18n( "Could not terminate listing %1." ).arg( errorText );
break;
- case KIO::ERR_COULD_NOT_MKDIR:
+ case TDEIO::ERR_COULD_NOT_MKDIR:
result = i18n( "Could not make folder %1." ).arg( errorText );
break;
- case KIO::ERR_COULD_NOT_RMDIR:
+ case TDEIO::ERR_COULD_NOT_RMDIR:
result = i18n( "Could not remove folder %1." ).arg( errorText );
break;
- case KIO::ERR_CANNOT_RESUME:
+ case TDEIO::ERR_CANNOT_RESUME:
result = i18n( "Could not resume file %1." ).arg( errorText );
break;
- case KIO::ERR_CANNOT_RENAME:
+ case TDEIO::ERR_CANNOT_RENAME:
result = i18n( "Could not rename file %1." ).arg( errorText );
break;
- case KIO::ERR_CANNOT_CHMOD:
+ case TDEIO::ERR_CANNOT_CHMOD:
result = i18n( "Could not change permissions for %1." ).arg( errorText );
break;
- case KIO::ERR_CANNOT_DELETE:
+ case TDEIO::ERR_CANNOT_DELETE:
result = i18n( "Could not delete file %1." ).arg( errorText );
break;
- case KIO::ERR_SLAVE_DIED:
+ case TDEIO::ERR_SLAVE_DIED:
result = i18n( "The process for the %1 protocol died unexpectedly." ).arg( errorText );
break;
- case KIO::ERR_OUT_OF_MEMORY:
+ case TDEIO::ERR_OUT_OF_MEMORY:
result = i18n( "Error. Out of memory.\n%1" ).arg( errorText );
break;
- case KIO::ERR_UNKNOWN_PROXY_HOST:
+ case TDEIO::ERR_UNKNOWN_PROXY_HOST:
result = i18n( "Unknown proxy host\n%1" ).arg( errorText );
break;
- case KIO::ERR_COULD_NOT_AUTHENTICATE:
+ case TDEIO::ERR_COULD_NOT_AUTHENTICATE:
result = i18n( "Authorization failed, %1 authentication not supported" ).arg( errorText );
break;
- case KIO::ERR_ABORTED:
+ case TDEIO::ERR_ABORTED:
result = i18n( "User canceled action\n%1" ).arg( errorText );
break;
- case KIO::ERR_INTERNAL_SERVER:
+ case TDEIO::ERR_INTERNAL_SERVER:
result = i18n( "Internal error in server\n%1" ).arg( errorText );
break;
- case KIO::ERR_SERVER_TIMEOUT:
+ case TDEIO::ERR_SERVER_TIMEOUT:
result = i18n( "Timeout on server\n%1" ).arg( errorText );
break;
- case KIO::ERR_UNKNOWN:
+ case TDEIO::ERR_UNKNOWN:
result = i18n( "Unknown error\n%1" ).arg( errorText );
break;
- case KIO::ERR_UNKNOWN_INTERRUPT:
+ case TDEIO::ERR_UNKNOWN_INTERRUPT:
result = i18n( "Unknown interrupt\n%1" ).arg( errorText );
break;
/*
- case KIO::ERR_CHECKSUM_MISMATCH:
+ case TDEIO::ERR_CHECKSUM_MISMATCH:
if (errorText)
result = i18n( "Warning: MD5 Checksum for %1 does not match checksum returned from server" ).arg(errorText);
else
result = i18n( "Warning: MD5 Checksum for %1 does not match checksum returned from server" ).arg("document");
break;
*/
- case KIO::ERR_CANNOT_DELETE_ORIGINAL:
+ case TDEIO::ERR_CANNOT_DELETE_ORIGINAL:
result = i18n( "Could not delete original file %1.\nPlease check permissions." ).arg( errorText );
break;
- case KIO::ERR_CANNOT_DELETE_PARTIAL:
+ case TDEIO::ERR_CANNOT_DELETE_PARTIAL:
result = i18n( "Could not delete partial file %1.\nPlease check permissions." ).arg( errorText );
break;
- case KIO::ERR_CANNOT_RENAME_ORIGINAL:
+ case TDEIO::ERR_CANNOT_RENAME_ORIGINAL:
result = i18n( "Could not rename original file %1.\nPlease check permissions." ).arg( errorText );
break;
- case KIO::ERR_CANNOT_RENAME_PARTIAL:
+ case TDEIO::ERR_CANNOT_RENAME_PARTIAL:
result = i18n( "Could not rename partial file %1.\nPlease check permissions." ).arg( errorText );
break;
- case KIO::ERR_CANNOT_SYMLINK:
+ case TDEIO::ERR_CANNOT_SYMLINK:
result = i18n( "Could not create symlink %1.\nPlease check permissions." ).arg( errorText );
break;
- case KIO::ERR_NO_CONTENT:
+ case TDEIO::ERR_NO_CONTENT:
result = errorText;
break;
- case KIO::ERR_DISK_FULL:
+ case TDEIO::ERR_DISK_FULL:
result = i18n( "Could not write file %1.\nDisk full." ).arg( errorText );
break;
- case KIO::ERR_IDENTICAL_FILES:
+ case TDEIO::ERR_IDENTICAL_FILES:
result = i18n( "The source and destination are the same file.\n%1" ).arg( errorText );
break;
- case KIO::ERR_SLAVE_DEFINED:
+ case TDEIO::ERR_SLAVE_DEFINED:
result = errorText;
break;
- case KIO::ERR_UPGRADE_REQUIRED:
+ case TDEIO::ERR_UPGRADE_REQUIRED:
result = i18n( "%1 is required by the server, but is not available." ).arg(errorText);
break;
- case KIO::ERR_POST_DENIED:
+ case TDEIO::ERR_POST_DENIED:
result = i18n( "Access to restricted port in POST denied.");
break;
- case KIO::ERR_OFFLINE_MODE:
+ case TDEIO::ERR_OFFLINE_MODE:
result = i18n( "Could not access %1.\nOffline mode active.").arg( errorText );
break;
default:
@@ -419,7 +419,7 @@ KIO_EXPORT TQString KIO::buildErrorString(int errorCode, const TQString &errorTe
return result;
}
-KIO_EXPORT TQString KIO::unsupportedActionErrorString(const TQString &protocol, int cmd) {
+KIO_EXPORT TQString TDEIO::unsupportedActionErrorString(const TQString &protocol, int cmd) {
switch (cmd) {
case CMD_CONNECT:
return i18n("Opening connections is not supported with the protocol %1." ).arg(protocol);
@@ -458,7 +458,7 @@ KIO_EXPORT TQString KIO::unsupportedActionErrorString(const TQString &protocol,
}/*end switch*/
}
-KIO_EXPORT TQStringList KIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0L*/,
+KIO_EXPORT TQStringList TDEIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0L*/,
int method /*= -1*/ ) const
{
TQString errorName, techName, description, ret2;
@@ -508,7 +508,7 @@ KIO_EXPORT TQStringList KIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0
return ret;
}
-KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorText,
+KIO_EXPORT TQByteArray TDEIO::rawErrorDetail(int errorCode, const TQString &errorText,
const KURL *reqUrl /*= 0L*/, int /*method = -1*/ )
{
TQString url, host, protocol, datetime, domain, path, dir, filename;
@@ -612,7 +612,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
TQString sNetwork = i18n( "Check your network connection status." );
switch( errorCode ) {
- case KIO::ERR_CANNOT_OPEN_FOR_READING:
+ case TDEIO::ERR_CANNOT_OPEN_FOR_READING:
errorName = i18n( "Cannot Open Resource For Reading" );
description = i18n( "This means that the contents of the requested file "
"or folder <strong>%1</strong> could not be retrieved, as read "
@@ -622,7 +622,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sAccess << sQuerylock << sSysadmin;
break;
- case KIO::ERR_CANNOT_OPEN_FOR_WRITING:
+ case TDEIO::ERR_CANNOT_OPEN_FOR_WRITING:
errorName = i18n( "Cannot Open Resource For Writing" );
description = i18n( "This means that the file, <strong>%1</strong>, could "
"not be written to as requested, because access with permission to "
@@ -631,7 +631,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sAccess << sQuerylock << sSysadmin;
break;
- case KIO::ERR_CANNOT_LAUNCH_PROCESS:
+ case TDEIO::ERR_CANNOT_LAUNCH_PROCESS:
errorName = i18n( "Cannot Initiate the %1 Protocol" ).arg( protocol );
techName = i18n( "Unable to Launch Process" );
description = i18n( "The program on your computer which provides access "
@@ -644,7 +644,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sUpdate << sSysadmin;
break;
- case KIO::ERR_INTERNAL:
+ case TDEIO::ERR_INTERNAL:
errorName = i18n( "Internal Error" );
description = i18n( "The program on your computer which provides access "
"to the <strong>%1</strong> protocol has reported an internal error." )
@@ -653,7 +653,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sUpdate << sBugreport;
break;
- case KIO::ERR_MALFORMED_URL:
+ case TDEIO::ERR_MALFORMED_URL:
errorName = i18n( "Improperly Formatted URL" );
description = i18n( "The <strong>U</strong>niform <strong>R</strong>esource "
"<strong>L</strong>ocator (URL) that you entered was not properly "
@@ -663,7 +663,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sTypo;
break;
- case KIO::ERR_UNSUPPORTED_PROTOCOL:
+ case TDEIO::ERR_UNSUPPORTED_PROTOCOL:
errorName = i18n( "Unsupported Protocol %1" ).arg( protocol );
description = i18n( "The protocol <strong>%1</strong> is not supported "
"by the TDE programs currently installed on this computer." )
@@ -679,7 +679,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
<< sUpdate << sSysadmin;
break;
- case KIO::ERR_NO_SOURCE_PROTOCOL:
+ case TDEIO::ERR_NO_SOURCE_PROTOCOL:
errorName = i18n( "URL Does Not Refer to a Resource." );
techName = i18n( "Protocol is a Filter Protocol" );
description = i18n( "The <strong>U</strong>niform <strong>R</strong>esource "
@@ -692,7 +692,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sTypo;
break;
- case KIO::ERR_UNSUPPORTED_ACTION:
+ case TDEIO::ERR_UNSUPPORTED_ACTION:
errorName = i18n( "Unsupported Action: %1" ).arg( errorText );
description = i18n( "The requested action is not supported by the TDE "
"program which is implementing the <strong>%1</strong> protocol." )
@@ -704,7 +704,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
"outcome." );
break;
- case KIO::ERR_IS_DIRECTORY:
+ case TDEIO::ERR_IS_DIRECTORY:
errorName = i18n( "File Expected" );
description = i18n( "The request expected a file, however the "
"folder <strong>%1</strong> was found instead." ).arg( dir );
@@ -712,7 +712,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sUpdate << sSysadmin;
break;
- case KIO::ERR_IS_FILE:
+ case TDEIO::ERR_IS_FILE:
errorName = i18n( "Folder Expected" );
description = i18n( "The request expected a folder, however "
"the file <strong>%1</strong> was found instead." ).arg( filename );
@@ -720,7 +720,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sUpdate << sSysadmin;
break;
- case KIO::ERR_DOES_NOT_EXIST:
+ case TDEIO::ERR_DOES_NOT_EXIST:
errorName = i18n( "File or Folder Does Not Exist" );
description = i18n( "The specified file or folder <strong>%1</strong> "
"does not exist." ).arg( dir );
@@ -728,7 +728,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sUpdate << sSysadmin;
break;
- case KIO::ERR_FILE_ALREADY_EXIST:
+ case TDEIO::ERR_FILE_ALREADY_EXIST:
errorName = i18n( "File Already Exists" );
description = i18n( "The requested file could not be created because a "
"file with the same name already exists." );
@@ -738,7 +738,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
<< i18n( "Choose an alternate filename for the new file." );
break;
- case KIO::ERR_DIR_ALREADY_EXIST:
+ case TDEIO::ERR_DIR_ALREADY_EXIST:
errorName = i18n( "Folder Already Exists" );
description = i18n( "The requested folder could not be created because "
"a folder with the same name already exists." );
@@ -748,7 +748,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
<< i18n( "Choose an alternate name for the new folder." );
break;
- case KIO::ERR_UNKNOWN_HOST:
+ case TDEIO::ERR_UNKNOWN_HOST:
errorName = i18n( "Unknown Host" );
description = i18n( "An unknown host error indicates that the server with "
"the requested name, <strong>%1</strong>, could not be "
@@ -759,7 +759,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sNetwork << sSysadmin;
break;
- case KIO::ERR_ACCESS_DENIED:
+ case TDEIO::ERR_ACCESS_DENIED:
errorName = i18n( "Access Denied" );
description = i18n( "Access was denied to the specified resource, "
"<strong>%1</strong>." ).arg( url );
@@ -772,7 +772,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
if ( !isSlaveNetwork ) solutions << sServeradmin;
break;
- case KIO::ERR_WRITE_ACCESS_DENIED:
+ case TDEIO::ERR_WRITE_ACCESS_DENIED:
errorName = i18n( "Write Access Denied" );
description = i18n( "This means that an attempt to write to the file "
"<strong>%1</strong> was rejected." ).arg( filename );
@@ -780,7 +780,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sAccess << sQuerylock << sSysadmin;
break;
- case KIO::ERR_CANNOT_ENTER_DIRECTORY:
+ case TDEIO::ERR_CANNOT_ENTER_DIRECTORY:
errorName = i18n( "Unable to Enter Folder" );
description = i18n( "This means that an attempt to enter (in other words, "
"to open) the requested folder <strong>%1</strong> was rejected." )
@@ -789,7 +789,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sAccess << sQuerylock << sSysadmin;
break;
- case KIO::ERR_PROTOCOL_IS_NOT_A_FILESYSTEM:
+ case TDEIO::ERR_PROTOCOL_IS_NOT_A_FILESYSTEM:
errorName = i18n( "Folder Listing Unavailable" );
techName = i18n( "Protocol %1 is not a Filesystem" ).arg( protocol );
description = i18n( "This means that a request was made which requires "
@@ -799,7 +799,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sUpdate << sBugreport;
break;
- case KIO::ERR_CYCLIC_LINK:
+ case TDEIO::ERR_CYCLIC_LINK:
errorName = i18n( "Cyclic Link Detected" );
description = i18n( "UNIX environments are commonly able to link a file or "
"folder to a separate name and/or location. TDE detected a link or "
@@ -809,7 +809,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
"cause an infinite loop, and try again." ) << sSysadmin;
break;
- case KIO::ERR_USER_CANCELED:
+ case TDEIO::ERR_USER_CANCELED:
// Do nothing in this case. The user doesn't need to be told what he just did.
// rodda: However, if we have been called, an application is about to display
// this information anyway. If we don't return sensible information, the
@@ -820,7 +820,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << i18n( "Retry the request." );
break;
- case KIO::ERR_CYCLIC_COPY:
+ case TDEIO::ERR_CYCLIC_COPY:
errorName = i18n( "Cyclic Link Detected During Copy" );
description = i18n( "UNIX environments are commonly able to link a file or "
"folder to a separate name and/or location. During the requested copy "
@@ -831,7 +831,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
"cause an infinite loop, and try again." ) << sSysadmin;
break;
- case KIO::ERR_COULD_NOT_CREATE_SOCKET:
+ case TDEIO::ERR_COULD_NOT_CREATE_SOCKET:
errorName = i18n( "Could Not Create Network Connection" );
techName = i18n( "Could Not Create Socket" );
description = i18n( "This is a fairly technical error in which a required "
@@ -841,7 +841,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sNetwork << sSysadmin;
break;
- case KIO::ERR_COULD_NOT_CONNECT:
+ case TDEIO::ERR_COULD_NOT_CONNECT:
errorName = i18n( "Connection to Server Refused" );
description = i18n( "The server <strong>%1</strong> refused to allow this "
"computer to make a connection." ).arg( host );
@@ -855,7 +855,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sTryagain << sServeradmin << sSysadmin;
break;
- case KIO::ERR_CONNECTION_BROKEN:
+ case TDEIO::ERR_CONNECTION_BROKEN:
errorName = i18n( "Connection to Server Closed Unexpectedly" );
description = i18n( "Although a connection was established to "
"<strong>%1</strong>, the connection was closed at an unexpected point "
@@ -865,7 +865,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sTryagain << sServeradmin << sSysadmin;
break;
- case KIO::ERR_NOT_FILTER_PROTOCOL:
+ case TDEIO::ERR_NOT_FILTER_PROTOCOL:
errorName = i18n( "URL Resource Invalid" );
techName = i18n( "Protocol %1 is not a Filter Protocol" ).arg( protocol );
description = i18n( "The <strong>U</strong>niform <strong>R</strong>esource "
@@ -880,7 +880,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sTypo << sSysadmin;
break;
- case KIO::ERR_COULD_NOT_MOUNT:
+ case TDEIO::ERR_COULD_NOT_MOUNT:
errorName = i18n( "Unable to Initialize Input/Output Device" );
techName = i18n( "Could Not Mount Device" );
description = i18n( "The requested device could not be initialized "
@@ -899,7 +899,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
"on.; and try again." ) << sAccess << sSysadmin;
break;
- case KIO::ERR_COULD_NOT_UNMOUNT:
+ case TDEIO::ERR_COULD_NOT_UNMOUNT:
errorName = i18n( "Unable to Uninitialize Input/Output Device" );
techName = i18n( "Could Not Unmount Device" );
description = i18n( "The requested device could not be uninitialized "
@@ -917,7 +917,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
"and try again." ) << sAccess << sSysadmin;
break;
- case KIO::ERR_COULD_NOT_READ:
+ case TDEIO::ERR_COULD_NOT_READ:
errorName = i18n( "Cannot Read From Resource" );
description = i18n( "This means that although the resource, "
"<strong>%1</strong>, was able to be opened, an error occurred while "
@@ -930,7 +930,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sSysadmin;
break;
- case KIO::ERR_COULD_NOT_WRITE:
+ case TDEIO::ERR_COULD_NOT_WRITE:
errorName = i18n( "Cannot Write to Resource" );
description = i18n( "This means that although the resource, <strong>%1</strong>"
", was able to be opened, an error occurred while writing to the resource." )
@@ -943,7 +943,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sSysadmin;
break;
- case KIO::ERR_COULD_NOT_BIND:
+ case TDEIO::ERR_COULD_NOT_BIND:
errorName = i18n( "Could Not Listen for Network Connections" );
techName = i18n( "Could Not Bind" );
description = i18n( "This is a fairly technical error in which a required "
@@ -954,7 +954,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sNetwork << sSysadmin;
break;
- case KIO::ERR_COULD_NOT_LISTEN:
+ case TDEIO::ERR_COULD_NOT_LISTEN:
errorName = i18n( "Could Not Listen for Network Connections" );
techName = i18n( "Could Not Listen" );
description = i18n( "This is a fairly technical error in which a required "
@@ -965,7 +965,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sNetwork << sSysadmin;
break;
- case KIO::ERR_COULD_NOT_ACCEPT:
+ case TDEIO::ERR_COULD_NOT_ACCEPT:
errorName = i18n( "Could Not Accept Network Connection" );
description = i18n( "This is a fairly technical error in which an error "
"occurred while attempting to accept an incoming network connection." );
@@ -975,7 +975,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sNetwork << sSysadmin;
break;
- case KIO::ERR_COULD_NOT_LOGIN:
+ case TDEIO::ERR_COULD_NOT_LOGIN:
errorName = i18n( "Could Not Login: %1" ).arg( errorText );
description = i18n( "An attempt to login to perform the requested "
"operation was unsuccessful." );
@@ -987,7 +987,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
"are entered correctly." ) << sServeradmin << sSysadmin;
break;
- case KIO::ERR_COULD_NOT_STAT:
+ case TDEIO::ERR_COULD_NOT_STAT:
errorName = i18n( "Could Not Determine Resource Status" );
techName = i18n( "Could Not Stat Resource" );
description = i18n( "An attempt to determine information about the status "
@@ -999,13 +999,13 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
"are entered correctly." ) << sSysadmin;
break;
- case KIO::ERR_COULD_NOT_CLOSEDIR:
+ case TDEIO::ERR_COULD_NOT_CLOSEDIR:
//result = i18n( "Could not terminate listing %1" ).arg( errorText );
errorName = i18n( "Could Not Cancel Listing" );
techName = i18n( "FIXME: Document this" );
break;
- case KIO::ERR_COULD_NOT_MKDIR:
+ case TDEIO::ERR_COULD_NOT_MKDIR:
errorName = i18n( "Could Not Create Folder" );
description = i18n( "An attempt to create the requested folder failed." );
causes << cAccess << i18n( "The location where the folder was to be created "
@@ -1014,7 +1014,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << i18n( "Retry the request." ) << sAccess;
break;
- case KIO::ERR_COULD_NOT_RMDIR:
+ case TDEIO::ERR_COULD_NOT_RMDIR:
errorName = i18n( "Could Not Remove Folder" );
description = i18n( "An attempt to remove the specified folder, "
"<strong>%1</strong>, failed." ).arg( dir );
@@ -1026,7 +1026,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
"again." ) << sAccess;
break;
- case KIO::ERR_CANNOT_RESUME:
+ case TDEIO::ERR_CANNOT_RESUME:
errorName = i18n( "Could Not Resume File Transfer" );
description = i18n( "The specified request asked that the transfer of "
"file <strong>%1</strong> be resumed at a certain point of the "
@@ -1037,7 +1037,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
"transfer." );
break;
- case KIO::ERR_CANNOT_RENAME:
+ case TDEIO::ERR_CANNOT_RENAME:
errorName = i18n( "Could Not Rename Resource" );
description = i18n( "An attempt to rename the specified resource "
"<strong>%1</strong> failed." ).arg( url );
@@ -1046,7 +1046,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sAccess << sExists;
break;
- case KIO::ERR_CANNOT_CHMOD:
+ case TDEIO::ERR_CANNOT_CHMOD:
errorName = i18n( "Could Not Alter Permissions of Resource" );
description = i18n( "An attempt to alter the permissions on the specified "
"resource <strong>%1</strong> failed." ).arg( url );
@@ -1054,7 +1054,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sAccess << sExists;
break;
- case KIO::ERR_CANNOT_DELETE:
+ case TDEIO::ERR_CANNOT_DELETE:
errorName = i18n( "Could Not Delete Resource" );
description = i18n( "An attempt to delete the specified resource "
"<strong>%1</strong> failed." ).arg( url );
@@ -1062,7 +1062,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sAccess << sExists;
break;
- case KIO::ERR_SLAVE_DIED:
+ case TDEIO::ERR_SLAVE_DIED:
errorName = i18n( "Unexpected Program Termination" );
description = i18n( "The program on your computer which provides access "
"to the <strong>%1</strong> protocol has unexpectedly terminated." )
@@ -1071,7 +1071,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sUpdate << sBugreport;
break;
- case KIO::ERR_OUT_OF_MEMORY:
+ case TDEIO::ERR_OUT_OF_MEMORY:
errorName = i18n( "Out of Memory" );
description = i18n( "The program on your computer which provides access "
"to the <strong>%1</strong> protocol could not obtain the memory "
@@ -1080,7 +1080,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sUpdate << sBugreport;
break;
- case KIO::ERR_UNKNOWN_PROXY_HOST:
+ case TDEIO::ERR_UNKNOWN_PROXY_HOST:
errorName = i18n( "Unknown Proxy Host" );
description = i18n( "While retrieving information about the specified "
"proxy host, <strong>%1</strong>, an Unknown Host error was encountered. "
@@ -1094,7 +1094,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
<< sSysadmin;
break;
- case KIO::ERR_COULD_NOT_AUTHENTICATE:
+ case TDEIO::ERR_COULD_NOT_AUTHENTICATE:
errorName = i18n( "Authentication Failed: Method %1 Not Supported" )
.arg( errorText );
description = i18n( "Although you may have supplied the correct "
@@ -1106,14 +1106,14 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
"authentication method." ) << sSysadmin;
break;
- case KIO::ERR_ABORTED:
+ case TDEIO::ERR_ABORTED:
errorName = i18n( "Request Aborted" );
description = i18n( "The request was not completed because it was "
"aborted." );
solutions << i18n( "Retry the request." );
break;
- case KIO::ERR_INTERNAL_SERVER:
+ case TDEIO::ERR_INTERNAL_SERVER:
errorName = i18n( "Internal Error in Server" );
description = i18n( "The program on the server which provides access "
"to the <strong>%1</strong> protocol has reported an internal error: "
@@ -1127,7 +1127,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
"submit the bug report directly to them." );
break;
- case KIO::ERR_SERVER_TIMEOUT:
+ case TDEIO::ERR_SERVER_TIMEOUT:
errorName = i18n( "Timeout Error" );
description = i18n( "Although contact was made with the server, a "
"response was not received within the amount of time allocated for "
@@ -1145,7 +1145,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sTryagain << sServeradmin;
break;
- case KIO::ERR_UNKNOWN:
+ case TDEIO::ERR_UNKNOWN:
errorName = i18n( "Unknown Error" );
description = i18n( "The program on your computer which provides access "
"to the <strong>%1</strong> protocol has reported an unknown error: "
@@ -1154,7 +1154,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sUpdate << sBugreport;
break;
- case KIO::ERR_UNKNOWN_INTERRUPT:
+ case TDEIO::ERR_UNKNOWN_INTERRUPT:
errorName = i18n( "Unknown Interruption" );
description = i18n( "The program on your computer which provides access "
"to the <strong>%1</strong> protocol has reported an interruption of "
@@ -1163,7 +1163,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sUpdate << sBugreport;
break;
- case KIO::ERR_CANNOT_DELETE_ORIGINAL:
+ case TDEIO::ERR_CANNOT_DELETE_ORIGINAL:
errorName = i18n( "Could Not Delete Original File" );
description = i18n( "The requested operation required the deleting of "
"the original file, most likely at the end of a file move operation. "
@@ -1173,7 +1173,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sAccess;
break;
- case KIO::ERR_CANNOT_DELETE_PARTIAL:
+ case TDEIO::ERR_CANNOT_DELETE_PARTIAL:
errorName = i18n( "Could Not Delete Temporary File" );
description = i18n( "The requested operation required the creation of "
"a temporary file in which to save the new file while being "
@@ -1183,7 +1183,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sAccess;
break;
- case KIO::ERR_CANNOT_RENAME_ORIGINAL:
+ case TDEIO::ERR_CANNOT_RENAME_ORIGINAL:
errorName = i18n( "Could Not Rename Original File" );
description = i18n( "The requested operation required the renaming of "
"the original file <strong>%1</strong>, however it could not be "
@@ -1192,7 +1192,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sAccess;
break;
- case KIO::ERR_CANNOT_RENAME_PARTIAL:
+ case TDEIO::ERR_CANNOT_RENAME_PARTIAL:
errorName = i18n( "Could Not Rename Temporary File" );
description = i18n( "The requested operation required the creation of "
"a temporary file <strong>%1</strong>, however it could not be "
@@ -1201,7 +1201,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sAccess;
break;
- case KIO::ERR_CANNOT_SYMLINK:
+ case TDEIO::ERR_CANNOT_SYMLINK:
errorName = i18n( "Could Not Create Link" );
techName = i18n( "Could Not Create Symbolic Link" );
description = i18n( "The requested symbolic link %1 could not be created." )
@@ -1210,12 +1210,12 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
solutions << sAccess;
break;
- case KIO::ERR_NO_CONTENT:
+ case TDEIO::ERR_NO_CONTENT:
errorName = i18n( "No Content" );
description = errorText;
break;
- case KIO::ERR_DISK_FULL:
+ case TDEIO::ERR_DISK_FULL:
errorName = i18n( "Disk Full" );
description = i18n( "The requested file <strong>%1</strong> could not be "
"written to as there is inadequate disk space." ).arg( errorText );
@@ -1225,7 +1225,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
<< sSysadmin;
break;
- case KIO::ERR_IDENTICAL_FILES:
+ case TDEIO::ERR_IDENTICAL_FILES:
errorName = i18n( "Source and Destination Files Identical" );
description = i18n( "The operation could not be completed because the "
"source and destination files are the same file." );
@@ -1233,7 +1233,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
break;
// We assume that the slave has all the details
- case KIO::ERR_SLAVE_DEFINED:
+ case TDEIO::ERR_SLAVE_DEFINED:
errorName = TQString::null;
description = errorText;
break;
@@ -1368,7 +1368,7 @@ extern "C" void endvfsent( );
#endif /* HAVE_GETMNTINFO */
-TQString KIO::findDeviceMountPoint( const TQString& filename )
+TQString TDEIO::findDeviceMountPoint( const TQString& filename )
{
TQString result;
@@ -1909,13 +1909,13 @@ static TQString get_mount_info(const TQString& filename,
#else //!Q_OS_UNIX
//dummy
-TQString KIO::findDeviceMountPoint( const TQString& filename )
+TQString TDEIO::findDeviceMountPoint( const TQString& filename )
{
return TQString::null;
}
#endif
-TQString KIO::findPathMountPoint(const TQString& filename)
+TQString TDEIO::findPathMountPoint(const TQString& filename)
{
#ifdef Q_OS_UNIX
MountState isautofs = Unseen, isslow = Unseen, ismanual = Wrong;
@@ -1926,7 +1926,7 @@ TQString KIO::findPathMountPoint(const TQString& filename)
#endif
}
-bool KIO::manually_mounted(const TQString& filename)
+bool TDEIO::manually_mounted(const TQString& filename)
{
#ifdef Q_OS_UNIX
MountState isautofs = Unseen, isslow = Unseen, ismanual = Unseen;
@@ -1938,7 +1938,7 @@ bool KIO::manually_mounted(const TQString& filename)
#endif
}
-bool KIO::probably_slow_mounted(const TQString& filename)
+bool TDEIO::probably_slow_mounted(const TQString& filename)
{
#ifdef Q_OS_UNIX
MountState isautofs = Unseen, isslow = Unseen, ismanual = Wrong;
@@ -1950,7 +1950,7 @@ bool KIO::probably_slow_mounted(const TQString& filename)
#endif
}
-bool KIO::testFileSystemFlag(const TQString& filename, FileSystemFlag flag)
+bool TDEIO::testFileSystemFlag(const TQString& filename, FileSystemFlag flag)
{
#ifdef Q_OS_UNIX
MountState isautofs = Unseen, isslow = Unseen, ismanual = Wrong;
@@ -1973,36 +1973,36 @@ bool KIO::testFileSystemFlag(const TQString& filename, FileSystemFlag flag)
return false;
}
-KIO::CacheControl KIO::parseCacheControl(const TQString &cacheControl)
+TDEIO::CacheControl TDEIO::parseCacheControl(const TQString &cacheControl)
{
TQString tmp = cacheControl.lower();
if (tmp == "cacheonly")
- return KIO::CC_CacheOnly;
+ return TDEIO::CC_CacheOnly;
if (tmp == "cache")
- return KIO::CC_Cache;
+ return TDEIO::CC_Cache;
if (tmp == "verify")
- return KIO::CC_Verify;
+ return TDEIO::CC_Verify;
if (tmp == "refresh")
- return KIO::CC_Refresh;
+ return TDEIO::CC_Refresh;
if (tmp == "reload")
- return KIO::CC_Reload;
+ return TDEIO::CC_Reload;
kdDebug() << "unrecognized Cache control option:"<<cacheControl<<endl;
- return KIO::CC_Verify;
+ return TDEIO::CC_Verify;
}
-TQString KIO::getCacheControlString(KIO::CacheControl cacheControl)
+TQString TDEIO::getCacheControlString(TDEIO::CacheControl cacheControl)
{
- if (cacheControl == KIO::CC_CacheOnly)
+ if (cacheControl == TDEIO::CC_CacheOnly)
return "CacheOnly";
- if (cacheControl == KIO::CC_Cache)
+ if (cacheControl == TDEIO::CC_Cache)
return "Cache";
- if (cacheControl == KIO::CC_Verify)
+ if (cacheControl == TDEIO::CC_Verify)
return "Verify";
- if (cacheControl == KIO::CC_Refresh)
+ if (cacheControl == TDEIO::CC_Refresh)
return "Refresh";
- if (cacheControl == KIO::CC_Reload)
+ if (cacheControl == TDEIO::CC_Reload)
return "Reload";
kdDebug() << "unrecognized Cache control enum value:"<<cacheControl<<endl;
return TQString::null;
diff --git a/kio/kio/global.h b/kio/kio/global.h
index 6b0408c0..0091c480 100644
--- a/kio/kio/global.h
+++ b/kio/kio/global.h
@@ -31,7 +31,7 @@
* @short A namespace for KIO globals
*
*/
-namespace KIO
+namespace TDEIO
{
/// 64-bit file offset
typedef TQ_LLONG fileoffset_t;
@@ -44,7 +44,7 @@ namespace KIO
* @param size size in bytes
* @return converted size as a string - e.g. 123.4 kB , 12.0 MB
*/
- KIO_EXPORT TQString convertSize( KIO::filesize_t size );
+ KIO_EXPORT TQString convertSize( TDEIO::filesize_t size );
/**
* Converts @p size from bytes to a string representation with includes
@@ -53,7 +53,7 @@ namespace KIO
* @param size size in bytes
* @return converted size as a string - e.g. 1.4 KB (1495 B), 45 B
*/
- KIO_EXPORT TQString convertSizeWithBytes( KIO::filesize_t size );
+ KIO_EXPORT TQString convertSizeWithBytes( TDEIO::filesize_t size );
/**
* Converts a size to a string representation
* Not unlike TQString::number(...)
@@ -61,7 +61,7 @@ namespace KIO
* @param size size in bytes
* @return converted size as a string - e.g. 123456789
*/
- KIO_EXPORT TQString number( KIO::filesize_t size );
+ KIO_EXPORT TQString number( TDEIO::filesize_t size );
/**
* Converts size from kilo-bytes to the string representation.
@@ -69,7 +69,7 @@ namespace KIO
* @param kbSize size in kilo-bytes
* @return converted size as a string - e.g. 123.4 kB , 12.0 MB
*/
- KIO_EXPORT TQString convertSizeFromKB( KIO::filesize_t kbSize );
+ KIO_EXPORT TQString convertSizeFromKB( TDEIO::filesize_t kbSize );
/**
* Calculates remaining time in seconds from total size, processed size and speed.
@@ -81,8 +81,8 @@ namespace KIO
*
* @since 3.4
*/
- KIO_EXPORT unsigned int calculateRemainingSeconds( KIO::filesize_t totalSize,
- KIO::filesize_t processedSize, KIO::filesize_t speed );
+ KIO_EXPORT unsigned int calculateRemainingSeconds( TDEIO::filesize_t totalSize,
+ TDEIO::filesize_t processedSize, TDEIO::filesize_t speed );
/**
* Convert @p seconds to a string representing number of days, hours, minutes and seconds
@@ -103,7 +103,7 @@ namespace KIO
* @param speed speed in bytes per second
* @return calculated remaining time
*/
- KIO_EXPORT TQTime calculateRemaining( KIO::filesize_t totalSize, KIO::filesize_t processedSize, KIO::filesize_t speed ) KDE_DEPRECATED;
+ KIO_EXPORT TQTime calculateRemaining( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed ) KDE_DEPRECATED;
/**
* Helper for showing information about a set of files and directories
@@ -114,12 +114,12 @@ namespace KIO
* @param showSize whether to show the size in the result
* @return the summary string
*/
- KIO_EXPORT TQString itemsSummaryString(uint items, uint files, uint dirs, KIO::filesize_t size, bool showSize);
+ KIO_EXPORT TQString itemsSummaryString(uint items, uint files, uint dirs, TDEIO::filesize_t size, bool showSize);
/**
* Encodes (from the text displayed to the real filename)
* This translates % into %% and / into %2f
- * Used by KIO::link, for instance.
+ * Used by TDEIO::link, for instance.
* @param str the file name to encode
* @return the encoded file name
*/
@@ -401,7 +401,7 @@ namespace KIO
* @return the cache control value
* @see getCacheControlString()
*/
- KIO_EXPORT KIO::CacheControl parseCacheControl(const TQString &cacheControl);
+ KIO_EXPORT TDEIO::CacheControl parseCacheControl(const TQString &cacheControl);
/**
* Returns a string representation of the given cache control method.
@@ -410,7 +410,7 @@ namespace KIO
* @return the string representation
* @see parseCacheControl()
*/
- KIO_EXPORT TQString getCacheControlString(KIO::CacheControl cacheControl);
+ KIO_EXPORT TQString getCacheControlString(TDEIO::CacheControl cacheControl);
/**
* Returns the mount point where @p device is mounted
diff --git a/kio/kio/http_slave_defaults.h b/kio/kio/http_slave_defaults.h
index 715efcfd..e3247e39 100644
--- a/kio/kio/http_slave_defaults.h
+++ b/kio/kio/http_slave_defaults.h
@@ -27,7 +27,7 @@
#define DEFAULT_MAX_CACHE_AGE 60*60*24*14 // 14 DAYS
#define DEFAULT_CACHE_EXPIRE 3*60 // 3 MINS
#define DEFAULT_CLEAN_CACHE_INTERVAL 30*60 // 30 MINS
-#define DEFAULT_CACHE_CONTROL KIO::CC_Refresh // Verify with remote
+#define DEFAULT_CACHE_CONTROL TDEIO::CC_Refresh // Verify with remote
#define CACHE_REVISION "7\n" // Cache version
// DEFAULT USER AGENT KEY - ENABLES OS NAME
diff --git a/kio/kio/job.cpp b/kio/kio/job.cpp
index 3bbb7243..01bb2c60 100644
--- a/kio/kio/job.cpp
+++ b/kio/kio/job.cpp
@@ -78,8 +78,8 @@ extern "C" {
#include <fixx11h.h>
#endif
-using namespace KIO;
-template class TQPtrList<KIO::Job>;
+using namespace TDEIO;
+template class TQPtrList<TDEIO::Job>;
//this will update the report dialog with 5 Hz, I think this is fast enough, aleXXX
#define REPORT_TIMEOUT 200
@@ -102,7 +102,7 @@ public:
// (requires a new ctor, and moving the ctor code to some init()).
Job* m_parentJob;
int m_extraFlags;
- KIO::filesize_t m_processedSize;
+ TDEIO::filesize_t m_processedSize;
unsigned long m_userTimestamp;
};
@@ -118,16 +118,16 @@ Job::Job(bool showProgressInfo) : TQObject(0, "job"), m_error(0), m_percent(0)
addMetaData("progress-id", TQString::number(m_progressId));
//kdDebug(7007) << "Created job " << this << " with progress info -- m_progressId=" << m_progressId << endl;
// Connect global progress info signals
- connect( this, TQT_SIGNAL( percent( KIO::Job*, unsigned long ) ),
- Observer::self(), TQT_SLOT( slotPercent( KIO::Job*, unsigned long ) ) );
- connect( this, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString & ) ),
- Observer::self(), TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString & ) ) );
- connect( this, TQT_SIGNAL( totalSize( KIO::Job*, KIO::filesize_t ) ),
- Observer::self(), TQT_SLOT( slotTotalSize( KIO::Job*, KIO::filesize_t ) ) );
- connect( this, TQT_SIGNAL( processedSize( KIO::Job*, KIO::filesize_t ) ),
- Observer::self(), TQT_SLOT( slotProcessedSize( KIO::Job*, KIO::filesize_t ) ) );
- connect( this, TQT_SIGNAL( speed( KIO::Job*, unsigned long ) ),
- Observer::self(), TQT_SLOT( slotSpeed( KIO::Job*, unsigned long ) ) );
+ connect( this, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ),
+ Observer::self(), TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) );
+ connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString & ) ),
+ Observer::self(), TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString & ) ) );
+ connect( this, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+ Observer::self(), TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+ connect( this, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+ Observer::self(), TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+ connect( this, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ),
+ Observer::self(), TQT_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) );
}
// Don't exit while this job is running
if (kapp)
@@ -149,12 +149,12 @@ int& Job::extraFlags()
return d->m_extraFlags;
}
-void Job::setProcessedSize(KIO::filesize_t size)
+void Job::setProcessedSize(TDEIO::filesize_t size)
{
d->m_processedSize = size;
}
-KIO::filesize_t Job::getProcessedSize()
+TDEIO::filesize_t Job::getProcessedSize()
{
return d->m_processedSize;
}
@@ -164,15 +164,15 @@ void Job::addSubjob(Job *job, bool inheritMetaData)
//kdDebug(7007) << "addSubjob(" << job << ") this = " << this << endl;
subjobs.append(job);
- connect( job, TQT_SIGNAL(result(KIO::Job*)),
- TQT_SLOT(slotResult(KIO::Job*)) );
+ connect( job, TQT_SIGNAL(result(TDEIO::Job*)),
+ TQT_SLOT(slotResult(TDEIO::Job*)) );
// Forward information from that subjob.
- connect( job, TQT_SIGNAL(speed( KIO::Job*, unsigned long )),
- TQT_SLOT(slotSpeed(KIO::Job*, unsigned long)) );
+ connect( job, TQT_SIGNAL(speed( TDEIO::Job*, unsigned long )),
+ TQT_SLOT(slotSpeed(TDEIO::Job*, unsigned long)) );
- connect( job, TQT_SIGNAL(infoMessage( KIO::Job*, const TQString & )),
- TQT_SLOT(slotInfoMessage(KIO::Job*, const TQString &)) );
+ connect( job, TQT_SIGNAL(infoMessage( TDEIO::Job*, const TQString & )),
+ TQT_SLOT(slotInfoMessage(TDEIO::Job*, const TQString &)) );
if (inheritMetaData)
job->mergeMetaData(m_outgoingMetaData);
@@ -197,7 +197,7 @@ void Job::removeSubjob( Job *job, bool mergeMetaData, bool emitResultIfLast )
emitResult();
}
-void Job::emitPercent( KIO::filesize_t processedSize, KIO::filesize_t totalSize )
+void Job::emitPercent( TDEIO::filesize_t processedSize, TDEIO::filesize_t totalSize )
{
// calculate percents
unsigned long ipercent = m_percent;
@@ -269,13 +269,13 @@ void Job::slotResult( Job *job )
removeSubjob(job);
}
-void Job::slotSpeed( KIO::Job*, unsigned long speed )
+void Job::slotSpeed( TDEIO::Job*, unsigned long speed )
{
//kdDebug(7007) << "Job::slotSpeed " << speed << endl;
emitSpeed( speed );
}
-void Job::slotInfoMessage( KIO::Job*, const TQString & msg )
+void Job::slotInfoMessage( TDEIO::Job*, const TQString & msg )
{
emit infoMessage( this, msg );
}
@@ -352,7 +352,7 @@ bool Job::isInteractive() const
void Job::setWindow(TQWidget *window)
{
m_window = window;
- KIO::Scheduler::registerWindow(window);
+ TDEIO::Scheduler::registerWindow(window);
}
TQWidget *Job::window() const
@@ -397,7 +397,7 @@ TQString Job::queryMetaData(const TQString &key)
return m_incomingMetaData[key];
}
-void Job::setMetaData( const KIO::MetaData &_metaData)
+void Job::setMetaData( const TDEIO::MetaData &_metaData)
{
m_outgoingMetaData = _metaData;
}
@@ -512,11 +512,11 @@ void SimpleJob::start(Slave *slave)
if ((extraFlags() & EF_TransferJobDataSent) == 0)
{
- connect( m_slave, TQT_SIGNAL( totalSize( KIO::filesize_t ) ),
- TQT_SLOT( slotTotalSize( KIO::filesize_t ) ) );
+ connect( m_slave, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ),
+ TQT_SLOT( slotTotalSize( TDEIO::filesize_t ) ) );
- connect( m_slave, TQT_SIGNAL( processedSize( KIO::filesize_t ) ),
- TQT_SLOT( slotProcessedSize( KIO::filesize_t ) ) );
+ connect( m_slave, TQT_SIGNAL( processedSize( TDEIO::filesize_t ) ),
+ TQT_SLOT( slotProcessedSize( TDEIO::filesize_t ) ) );
connect( m_slave, TQT_SIGNAL( speed( unsigned long ) ),
TQT_SLOT( slotSpeed( unsigned long ) ) );
@@ -525,8 +525,8 @@ void SimpleJob::start(Slave *slave)
connect( slave, TQT_SIGNAL( needProgressId() ),
TQT_SLOT( slotNeedProgressId() ) );
- connect( slave, TQT_SIGNAL(metaData( const KIO::MetaData& ) ),
- TQT_SLOT( slotMetaData( const KIO::MetaData& ) ) );
+ connect( slave, TQT_SIGNAL(metaData( const TDEIO::MetaData& ) ),
+ TQT_SLOT( slotMetaData( const TDEIO::MetaData& ) ) );
if (m_window)
{
@@ -648,7 +648,7 @@ void SimpleJob::slotNeedProgressId()
m_slave->setProgressId( m_progressId );
}
-void SimpleJob::slotTotalSize( KIO::filesize_t size )
+void SimpleJob::slotTotalSize( TDEIO::filesize_t size )
{
if (size > m_totalSize)
{
@@ -657,9 +657,9 @@ void SimpleJob::slotTotalSize( KIO::filesize_t size )
}
}
-void SimpleJob::slotProcessedSize( KIO::filesize_t size )
+void SimpleJob::slotProcessedSize( TDEIO::filesize_t size )
{
- //kdDebug(7007) << "SimpleJob::slotProcessedSize " << KIO::number(size) << endl;
+ //kdDebug(7007) << "SimpleJob::slotProcessedSize " << TDEIO::number(size) << endl;
setProcessedSize(size);
emit processedSize( this, size );
if ( size > m_totalSize ) {
@@ -674,7 +674,7 @@ void SimpleJob::slotSpeed( unsigned long speed )
emitSpeed( speed );
}
-void SimpleJob::slotMetaData( const KIO::MetaData &_metaData)
+void SimpleJob::slotMetaData( const TDEIO::MetaData &_metaData)
{
m_incomingMetaData += _metaData;
}
@@ -748,48 +748,48 @@ void MkdirJob::slotFinished()
}
}
-SimpleJob *KIO::mkdir( const KURL& url, int permissions )
+SimpleJob *TDEIO::mkdir( const KURL& url, int permissions )
{
//kdDebug(7007) << "mkdir " << url << endl;
KIO_ARGS << url << permissions;
return new MkdirJob(url, CMD_MKDIR, packedArgs, false);
}
-SimpleJob *KIO::rmdir( const KURL& url )
+SimpleJob *TDEIO::rmdir( const KURL& url )
{
//kdDebug(7007) << "rmdir " << url << endl;
KIO_ARGS << url << TQ_INT8(false); // isFile is false
return new SimpleJob(url, CMD_DEL, packedArgs, false);
}
-SimpleJob *KIO::chmod( const KURL& url, int permissions )
+SimpleJob *TDEIO::chmod( const KURL& url, int permissions )
{
//kdDebug(7007) << "chmod " << url << endl;
KIO_ARGS << url << permissions;
return new SimpleJob(url, CMD_CHMOD, packedArgs, false);
}
-SimpleJob *KIO::rename( const KURL& src, const KURL & dest, bool overwrite )
+SimpleJob *TDEIO::rename( const KURL& src, const KURL & dest, bool overwrite )
{
//kdDebug(7007) << "rename " << src << " " << dest << endl;
KIO_ARGS << src << dest << (TQ_INT8) overwrite;
return new SimpleJob(src, CMD_RENAME, packedArgs, false);
}
-SimpleJob *KIO::symlink( const TQString& target, const KURL & dest, bool overwrite, bool showProgressInfo )
+SimpleJob *TDEIO::symlink( const TQString& target, const KURL & dest, bool overwrite, bool showProgressInfo )
{
//kdDebug(7007) << "symlink target=" << target << " " << dest << endl;
KIO_ARGS << target << dest << (TQ_INT8) overwrite;
return new SimpleJob(dest, CMD_SYMLINK, packedArgs, showProgressInfo);
}
-SimpleJob *KIO::special(const KURL& url, const TQByteArray & data, bool showProgressInfo)
+SimpleJob *TDEIO::special(const KURL& url, const TQByteArray & data, bool showProgressInfo)
{
//kdDebug(7007) << "special " << url << endl;
return new SimpleJob(url, CMD_SPECIAL, data, showProgressInfo);
}
-SimpleJob *KIO::mount( bool ro, const char *fstype, const TQString& dev, const TQString& point, bool showProgressInfo )
+SimpleJob *TDEIO::mount( bool ro, const char *fstype, const TQString& dev, const TQString& point, bool showProgressInfo )
{
KIO_ARGS << int(1) << TQ_INT8( ro ? 1 : 0 )
<< TQString::fromLatin1(fstype) << dev << point;
@@ -799,7 +799,7 @@ SimpleJob *KIO::mount( bool ro, const char *fstype, const TQString& dev, const T
return job;
}
-SimpleJob *KIO::unmount( const TQString& point, bool showProgressInfo )
+SimpleJob *TDEIO::unmount( const TQString& point, bool showProgressInfo )
{
KIO_ARGS << int(2) << point;
SimpleJob *job = special( KURL("file:/"), packedArgs, showProgressInfo );
@@ -837,7 +837,7 @@ void LocalURLJob::slotFinished()
SimpleJob::slotFinished();
}
-LocalURLJob *KIO::localURL( const KURL& remoteUrl )
+LocalURLJob *TDEIO::localURL( const KURL& remoteUrl )
{
KIO_ARGS << remoteUrl;
return new LocalURLJob(remoteUrl, CMD_LOCALURL, packedArgs, false);
@@ -858,15 +858,15 @@ void StatJob::start(Slave *slave)
m_outgoingMetaData.replace( "statSide", m_bSource ? "source" : "dest" );
m_outgoingMetaData.replace( "details", TQString::number(m_details) );
- connect( slave, TQT_SIGNAL( statEntry( const KIO::UDSEntry& ) ),
- TQT_SLOT( slotStatEntry( const KIO::UDSEntry & ) ) );
+ connect( slave, TQT_SIGNAL( statEntry( const TDEIO::UDSEntry& ) ),
+ TQT_SLOT( slotStatEntry( const TDEIO::UDSEntry & ) ) );
connect( slave, TQT_SIGNAL( redirection(const KURL &) ),
TQT_SLOT( slotRedirection(const KURL &) ) );
SimpleJob::start(slave);
}
-void StatJob::slotStatEntry( const KIO::UDSEntry & entry )
+void StatJob::slotStatEntry( const TDEIO::UDSEntry & entry )
{
//kdDebug(7007) << "StatJob::slotStatEntry" << endl;
m_statResult = entry;
@@ -912,18 +912,18 @@ void StatJob::slotFinished()
}
}
-void StatJob::slotMetaData( const KIO::MetaData &_metaData) {
+void StatJob::slotMetaData( const TDEIO::MetaData &_metaData) {
SimpleJob::slotMetaData(_metaData);
storeSSLSessionFromJob(m_redirectionURL);
}
-StatJob *KIO::stat(const KURL& url, bool showProgressInfo)
+StatJob *TDEIO::stat(const KURL& url, bool showProgressInfo)
{
// Assume sideIsSource. Gets are more common than puts.
return stat( url, true, 2, showProgressInfo );
}
-StatJob *KIO::stat(const KURL& url, bool sideIsSource, short int details, bool showProgressInfo)
+StatJob *TDEIO::stat(const KURL& url, bool sideIsSource, short int details, bool showProgressInfo)
{
kdDebug(7007) << "stat " << url << endl;
KIO_ARGS << url;
@@ -935,7 +935,7 @@ StatJob *KIO::stat(const KURL& url, bool sideIsSource, short int details, bool s
return job;
}
-SimpleJob *KIO::http_update_cache( const KURL& url, bool no_cache, time_t expireDate)
+SimpleJob *TDEIO::http_update_cache( const KURL& url, bool no_cache, time_t expireDate)
{
assert( (url.protocol() == "http") || (url.protocol() == "https") );
// Send http update_cache command (2)
@@ -1074,7 +1074,7 @@ void TransferJob::sendAsyncData(const TQByteArray &dataForSlave)
m_slave->send( MSG_DATA, dataForSlave );
if (extraFlags() & EF_TransferJobDataSent)
{
- KIO::filesize_t size = getProcessedSize()+dataForSlave.size();
+ TDEIO::filesize_t size = getProcessedSize()+dataForSlave.size();
setProcessedSize(size);
emit processedSize( this, size );
if ( size > m_totalSize ) {
@@ -1181,8 +1181,8 @@ void TransferJob::start(Slave *slave)
connect( slave, TQT_SIGNAL( needSubURLData() ),
TQT_SLOT( slotNeedSubURLData() ) );
- connect( slave, TQT_SIGNAL(canResume( KIO::filesize_t ) ),
- TQT_SLOT( slotCanResume( KIO::filesize_t ) ) );
+ connect( slave, TQT_SIGNAL(canResume( TDEIO::filesize_t ) ),
+ TQT_SLOT( slotCanResume( TDEIO::filesize_t ) ) );
if (slave->suspended())
{
@@ -1199,14 +1199,14 @@ void TransferJob::start(Slave *slave)
void TransferJob::slotNeedSubURLData()
{
// Job needs data from subURL.
- m_subJob = KIO::get( m_subUrl, false, false);
+ m_subJob = TDEIO::get( m_subUrl, false, false);
suspend(); // Put job on hold until we have some data.
- connect(m_subJob, TQT_SIGNAL( data(KIO::Job*,const TQByteArray &)),
- TQT_SLOT( slotSubURLData(KIO::Job*,const TQByteArray &)));
+ connect(m_subJob, TQT_SIGNAL( data(TDEIO::Job*,const TQByteArray &)),
+ TQT_SLOT( slotSubURLData(TDEIO::Job*,const TQByteArray &)));
addSubjob(m_subJob);
}
-void TransferJob::slotSubURLData(KIO::Job*, const TQByteArray &data)
+void TransferJob::slotSubURLData(TDEIO::Job*, const TQByteArray &data)
{
// The Alternating Bitburg protocol in action again.
staticData = data;
@@ -1214,7 +1214,7 @@ void TransferJob::slotSubURLData(KIO::Job*, const TQByteArray &data)
resume(); // Activate ourselves again.
}
-void TransferJob::slotMetaData( const KIO::MetaData &_metaData) {
+void TransferJob::slotMetaData( const TDEIO::MetaData &_metaData) {
SimpleJob::slotMetaData(_metaData);
storeSSLSessionFromJob(m_redirectionURL);
}
@@ -1224,12 +1224,12 @@ void TransferJob::slotErrorPage()
m_errorPage = true;
}
-void TransferJob::slotCanResume( KIO::filesize_t offset )
+void TransferJob::slotCanResume( TDEIO::filesize_t offset )
{
emit canResume(this, offset);
}
-void TransferJob::slotResult( KIO::Job *job)
+void TransferJob::slotResult( TDEIO::Job *job)
{
// This can only be our suburl.
assert(job == m_subJob);
@@ -1251,7 +1251,7 @@ void TransferJob::slotResult( KIO::Job *job)
removeSubjob( job, false, false ); // Remove job, but don't kill this job.
}
-TransferJob *KIO::get( const KURL& url, bool reload, bool showProgressInfo )
+TransferJob *TDEIO::get( const KURL& url, bool reload, bool showProgressInfo )
{
// Send decoded path and encoded query
KIO_ARGS << url;
@@ -1274,7 +1274,7 @@ public:
};
-TransferJob *KIO::http_post( const KURL& url, const TQByteArray &postData, bool showProgressInfo )
+TransferJob *TDEIO::http_post( const KURL& url, const TQByteArray &postData, bool showProgressInfo )
{
int _error = 0;
@@ -1344,7 +1344,7 @@ TransferJob *KIO::http_post( const KURL& url, const TQByteArray &postData, bool
for (int cnt=0; bad_ports[cnt]; ++cnt)
if (url.port() == bad_ports[cnt])
{
- _error = KIO::ERR_POST_DENIED;
+ _error = TDEIO::ERR_POST_DENIED;
break;
}
@@ -1354,7 +1354,7 @@ TransferJob *KIO::http_post( const KURL& url, const TQByteArray &postData, bool
static TQValueList< int >* overriden_ports = NULL;
if( !override_loaded )
{
- KConfig cfg( "kio_httprc", true );
+ TDEConfig cfg( "kio_httprc", true );
overriden_ports = new TQValueList< int >;
*overriden_ports = cfg.readIntListEntry( "OverriddenPorts" );
override_loaded = true;
@@ -1368,7 +1368,7 @@ TransferJob *KIO::http_post( const KURL& url, const TQByteArray &postData, bool
// filter out non https? protocols
if ((url.protocol() != "http") && (url.protocol() != "https" ))
- _error = KIO::ERR_POST_DENIED;
+ _error = TDEIO::ERR_POST_DENIED;
bool redirection = false;
KURL _url(url);
@@ -1379,7 +1379,7 @@ TransferJob *KIO::http_post( const KURL& url, const TQByteArray &postData, bool
}
if (!_error && !kapp->authorizeURLAction("open", KURL(), _url))
- _error = KIO::ERR_ACCESS_DENIED;
+ _error = TDEIO::ERR_ACCESS_DENIED;
// if request is not valid, return an invalid transfer job
if (_error)
@@ -1411,7 +1411,7 @@ void TransferJob::slotPostRedirection()
}
-TransferJob *KIO::put( const KURL& url, int permissions,
+TransferJob *TDEIO::put( const KURL& url, int permissions,
bool overwrite, bool resume, bool showProgressInfo )
{
KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions;
@@ -1428,10 +1428,10 @@ StoredTransferJob::StoredTransferJob(const KURL& url, int command,
: TransferJob( url, command, packedArgs, _staticData, showProgressInfo ),
m_uploadOffset( 0 )
{
- connect( this, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotStoredData( KIO::Job *, const TQByteArray & ) ) );
- connect( this, TQT_SIGNAL( dataReq( KIO::Job *, TQByteArray & ) ),
- TQT_SLOT( slotStoredDataReq( KIO::Job *, TQByteArray & ) ) );
+ connect( this, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQT_SLOT( slotStoredData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( this, TQT_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ),
+ TQT_SLOT( slotStoredDataReq( TDEIO::Job *, TQByteArray & ) ) );
}
void StoredTransferJob::setData( const TQByteArray& arr )
@@ -1441,7 +1441,7 @@ void StoredTransferJob::setData( const TQByteArray& arr )
m_data = arr;
}
-void StoredTransferJob::slotStoredData( KIO::Job *, const TQByteArray &data )
+void StoredTransferJob::slotStoredData( TDEIO::Job *, const TQByteArray &data )
{
// check for end-of-data marker:
if ( data.size() == 0 )
@@ -1451,7 +1451,7 @@ void StoredTransferJob::slotStoredData( KIO::Job *, const TQByteArray &data )
memcpy( m_data.data() + oldSize, data.data(), data.size() );
}
-void StoredTransferJob::slotStoredDataReq( KIO::Job *, TQByteArray &data )
+void StoredTransferJob::slotStoredDataReq( TDEIO::Job *, TQByteArray &data )
{
// Inspired from kmail's KMKernel::byteArrayToRemoteFile
// send the data in 64 KB chunks
@@ -1472,7 +1472,7 @@ void StoredTransferJob::slotStoredDataReq( KIO::Job *, TQByteArray &data )
}
}
-StoredTransferJob *KIO::storedGet( const KURL& url, bool reload, bool showProgressInfo )
+StoredTransferJob *TDEIO::storedGet( const KURL& url, bool reload, bool showProgressInfo )
{
// Send decoded path and encoded query
KIO_ARGS << url;
@@ -1482,7 +1482,7 @@ StoredTransferJob *KIO::storedGet( const KURL& url, bool reload, bool showProgre
return job;
}
-StoredTransferJob *KIO::storedPut( const TQByteArray& arr, const KURL& url, int permissions,
+StoredTransferJob *TDEIO::storedPut( const TQByteArray& arr, const KURL& url, int permissions,
bool overwrite, bool resume, bool showProgressInfo )
{
KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions;
@@ -1508,7 +1508,7 @@ void MimetypeJob::start(Slave *slave)
void MimetypeJob::slotFinished( )
{
//kdDebug(7007) << "MimetypeJob::slotFinished()" << endl;
- if ( m_error == KIO::ERR_IS_DIRECTORY )
+ if ( m_error == TDEIO::ERR_IS_DIRECTORY )
{
// It is in fact a directory. This happens when HTTP redirects to FTP.
// Due to the "protocol doesn't support listing" code in KRun, we
@@ -1540,7 +1540,7 @@ void MimetypeJob::slotFinished( )
}
}
-MimetypeJob *KIO::mimetype(const KURL& url, bool showProgressInfo )
+MimetypeJob *TDEIO::mimetype(const KURL& url, bool showProgressInfo )
{
KIO_ARGS << url;
MimetypeJob * job = new MimetypeJob(url, CMD_MIMETYPE, packedArgs, showProgressInfo);
@@ -1559,12 +1559,12 @@ DirectCopyJob::DirectCopyJob( const KURL& url, int command,
void DirectCopyJob::start( Slave* slave )
{
- connect( slave, TQT_SIGNAL(canResume( KIO::filesize_t ) ),
- TQT_SLOT( slotCanResume( KIO::filesize_t ) ) );
+ connect( slave, TQT_SIGNAL(canResume( TDEIO::filesize_t ) ),
+ TQT_SLOT( slotCanResume( TDEIO::filesize_t ) ) );
SimpleJob::start(slave);
}
-void DirectCopyJob::slotCanResume( KIO::filesize_t offset )
+void DirectCopyJob::slotCanResume( TDEIO::filesize_t offset )
{
emit canResume(this, offset);
}
@@ -1575,7 +1575,7 @@ void DirectCopyJob::slotCanResume( KIO::filesize_t offset )
class FileCopyJob::FileCopyJobPrivate
{
public:
- KIO::filesize_t m_sourceSize;
+ TDEIO::filesize_t m_sourceSize;
time_t m_modificationTime;
SimpleJob *m_delJob;
};
@@ -1605,7 +1605,7 @@ FileCopyJob::FileCopyJob( const KURL& src, const KURL& dest, int permissions,
m_putJob = 0;
d = new FileCopyJobPrivate;
d->m_delJob = 0;
- d->m_sourceSize = (KIO::filesize_t) -1;
+ d->m_sourceSize = (TDEIO::filesize_t) -1;
d->m_modificationTime = static_cast<time_t>( -1 );
TQTimer::singleShot(0, this, TQT_SLOT(slotStart()));
}
@@ -1677,10 +1677,10 @@ void FileCopyJob::setSourceSize( off_t size )
m_totalSize = size;
}
-void FileCopyJob::setSourceSize64( KIO::filesize_t size )
+void FileCopyJob::setSourceSize64( TDEIO::filesize_t size )
{
d->m_sourceSize = size;
- if (size != (KIO::filesize_t) -1)
+ if (size != (TDEIO::filesize_t) -1)
m_totalSize = size;
}
@@ -1701,8 +1701,8 @@ void FileCopyJob::startCopyJob(const KURL &slave_url)
m_copyJob = new DirectCopyJob(slave_url, CMD_COPY, packedArgs, false);
addSubjob( m_copyJob );
connectSubjob( m_copyJob );
- connect( m_copyJob, TQT_SIGNAL(canResume(KIO::Job *, KIO::filesize_t)),
- TQT_SLOT( slotCanResume(KIO::Job *, KIO::filesize_t)));
+ connect( m_copyJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)),
+ TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t)));
}
void FileCopyJob::startRenameJob(const KURL &slave_url)
@@ -1715,18 +1715,18 @@ void FileCopyJob::startRenameJob(const KURL &slave_url)
void FileCopyJob::connectSubjob( SimpleJob * job )
{
- connect( job, TQT_SIGNAL(totalSize( KIO::Job*, KIO::filesize_t )),
- this, TQT_SLOT( slotTotalSize(KIO::Job*, KIO::filesize_t)) );
+ connect( job, TQT_SIGNAL(totalSize( TDEIO::Job*, TDEIO::filesize_t )),
+ this, TQT_SLOT( slotTotalSize(TDEIO::Job*, TDEIO::filesize_t)) );
- connect( job, TQT_SIGNAL(processedSize( KIO::Job*, KIO::filesize_t )),
- this, TQT_SLOT( slotProcessedSize(KIO::Job*, KIO::filesize_t)) );
+ connect( job, TQT_SIGNAL(processedSize( TDEIO::Job*, TDEIO::filesize_t )),
+ this, TQT_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t)) );
- connect( job, TQT_SIGNAL(percent( KIO::Job*, unsigned long )),
- this, TQT_SLOT( slotPercent(KIO::Job*, unsigned long)) );
+ connect( job, TQT_SIGNAL(percent( TDEIO::Job*, unsigned long )),
+ this, TQT_SLOT( slotPercent(TDEIO::Job*, unsigned long)) );
}
-void FileCopyJob::slotProcessedSize( KIO::Job *, KIO::filesize_t size )
+void FileCopyJob::slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t size )
{
setProcessedSize(size);
emit processedSize( this, size );
@@ -1736,7 +1736,7 @@ void FileCopyJob::slotProcessedSize( KIO::Job *, KIO::filesize_t size )
emitPercent( size, m_totalSize );
}
-void FileCopyJob::slotTotalSize( KIO::Job*, KIO::filesize_t size )
+void FileCopyJob::slotTotalSize( TDEIO::Job*, TDEIO::filesize_t size )
{
if (size > m_totalSize)
{
@@ -1745,7 +1745,7 @@ void FileCopyJob::slotTotalSize( KIO::Job*, KIO::filesize_t size )
}
}
-void FileCopyJob::slotPercent( KIO::Job*, unsigned long pct )
+void FileCopyJob::slotPercent( TDEIO::Job*, unsigned long pct )
{
if ( pct > m_percent )
{
@@ -1770,18 +1770,18 @@ void FileCopyJob::startDataPump()
// The first thing the put job will tell us is whether we can
// resume or not (this is always emitted)
- connect( m_putJob, TQT_SIGNAL(canResume(KIO::Job *, KIO::filesize_t)),
- TQT_SLOT( slotCanResume(KIO::Job *, KIO::filesize_t)));
- connect( m_putJob, TQT_SIGNAL(dataReq(KIO::Job *, TQByteArray&)),
- TQT_SLOT( slotDataReq(KIO::Job *, TQByteArray&)));
+ connect( m_putJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)),
+ TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t)));
+ connect( m_putJob, TQT_SIGNAL(dataReq(TDEIO::Job *, TQByteArray&)),
+ TQT_SLOT( slotDataReq(TDEIO::Job *, TQByteArray&)));
addSubjob( m_putJob );
}
-void FileCopyJob::slotCanResume( KIO::Job* job, KIO::filesize_t offset )
+void FileCopyJob::slotCanResume( TDEIO::Job* job, TDEIO::filesize_t offset )
{
if ( job == m_putJob || job == m_copyJob )
{
- //kdDebug(7007) << "FileCopyJob::slotCanResume from PUT job. offset=" << KIO::number(offset) << endl;
+ //kdDebug(7007) << "FileCopyJob::slotCanResume from PUT job. offset=" << TDEIO::number(offset) << endl;
if (offset)
{
RenameDlg_Result res = R_RESUME;
@@ -1789,7 +1789,7 @@ void FileCopyJob::slotCanResume( KIO::Job* job, KIO::filesize_t offset )
if (!KProtocolManager::autoResume() && !m_overwrite)
{
TQString newPath;
- KIO::Job* job = ( !m_progressId && parentJob() ) ? parentJob() : this;
+ TDEIO::Job* job = ( !m_progressId && parentJob() ) ? parentJob() : this;
// Ask confirmation about resuming previous transfer
res = Observer::self()->open_RenameDlg(
job, i18n("File Already Exists"),
@@ -1822,18 +1822,18 @@ void FileCopyJob::slotCanResume( KIO::Job* job, KIO::filesize_t offset )
m_getJob->addMetaData( "errorPage", "false" );
m_getJob->addMetaData( "AllowCompressedPage", "false" );
// Set size in subjob. This helps if the slave doesn't emit totalSize.
- if ( d->m_sourceSize != (KIO::filesize_t)-1 )
+ if ( d->m_sourceSize != (TDEIO::filesize_t)-1 )
m_getJob->slotTotalSize( d->m_sourceSize );
if (offset)
{
//kdDebug(7007) << "Setting metadata for resume to " << (unsigned long) offset << endl;
// TODO KDE4: rename to seek or offset and document it
// This isn't used only for resuming, but potentially also for extracting (#72302).
- m_getJob->addMetaData( "resume", KIO::number(offset) );
+ m_getJob->addMetaData( "resume", TDEIO::number(offset) );
// Might or might not get emitted
- connect( m_getJob, TQT_SIGNAL(canResume(KIO::Job *, KIO::filesize_t)),
- TQT_SLOT( slotCanResume(KIO::Job *, KIO::filesize_t)));
+ connect( m_getJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)),
+ TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t)));
}
m_putJob->slave()->setOffset( offset );
@@ -1842,10 +1842,10 @@ void FileCopyJob::slotCanResume( KIO::Job* job, KIO::filesize_t offset )
connectSubjob( m_getJob ); // Progress info depends on get
m_getJob->resume(); // Order a beer
- connect( m_getJob, TQT_SIGNAL(data(KIO::Job*,const TQByteArray&)),
- TQT_SLOT( slotData(KIO::Job*,const TQByteArray&)) );
- connect( m_getJob, TQT_SIGNAL(mimetype(KIO::Job*,const TQString&) ),
- TQT_SLOT(slotMimetype(KIO::Job*,const TQString&)) );
+ connect( m_getJob, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)),
+ TQT_SLOT( slotData(TDEIO::Job*,const TQByteArray&)) );
+ connect( m_getJob, TQT_SIGNAL(mimetype(TDEIO::Job*,const TQString&) ),
+ TQT_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) );
}
else // copyjob
{
@@ -1865,7 +1865,7 @@ void FileCopyJob::slotCanResume( KIO::Job* job, KIO::filesize_t offset )
<< " m_getJob=" << m_getJob << " m_putJob=" << m_putJob << endl;
}
-void FileCopyJob::slotData( KIO::Job * , const TQByteArray &data)
+void FileCopyJob::slotData( TDEIO::Job * , const TQByteArray &data)
{
//kdDebug(7007) << "FileCopyJob::slotData" << endl;
//kdDebug(7007) << " data size : " << data.size() << endl;
@@ -1885,7 +1885,7 @@ void FileCopyJob::slotData( KIO::Job * , const TQByteArray &data)
}
}
-void FileCopyJob::slotDataReq( KIO::Job * , TQByteArray &data)
+void FileCopyJob::slotDataReq( TDEIO::Job * , TQByteArray &data)
{
//kdDebug(7007) << "FileCopyJob::slotDataReq" << endl;
if (!m_resumeAnswerSent && !m_getJob)
@@ -1906,12 +1906,12 @@ void FileCopyJob::slotDataReq( KIO::Job * , TQByteArray &data)
m_buffer = TQByteArray();
}
-void FileCopyJob::slotMimetype( KIO::Job*, const TQString& type )
+void FileCopyJob::slotMimetype( TDEIO::Job*, const TQString& type )
{
emit mimetype( this, type );
}
-void FileCopyJob::slotResult( KIO::Job *job)
+void FileCopyJob::slotResult( TDEIO::Job *job)
{
//kdDebug(7007) << "FileCopyJob this=" << this << " ::slotResult(" << job << ")" << endl;
// Did job have an error ?
@@ -1994,19 +1994,19 @@ void FileCopyJob::slotResult( KIO::Job *job)
removeSubjob(job);
}
-FileCopyJob *KIO::file_copy( const KURL& src, const KURL& dest, int permissions,
+FileCopyJob *TDEIO::file_copy( const KURL& src, const KURL& dest, int permissions,
bool overwrite, bool resume, bool showProgressInfo)
{
return new FileCopyJob( src, dest, permissions, false, overwrite, resume, showProgressInfo );
}
-FileCopyJob *KIO::file_move( const KURL& src, const KURL& dest, int permissions,
+FileCopyJob *TDEIO::file_move( const KURL& src, const KURL& dest, int permissions,
bool overwrite, bool resume, bool showProgressInfo)
{
return new FileCopyJob( src, dest, permissions, true, overwrite, resume, showProgressInfo );
}
-SimpleJob *KIO::file_delete( const KURL& src, bool showProgressInfo)
+SimpleJob *TDEIO::file_delete( const KURL& src, bool showProgressInfo)
{
KIO_ARGS << src << TQ_INT8(true); // isFile
return new SimpleJob(src, CMD_DEL, packedArgs, showProgressInfo );
@@ -2025,7 +2025,7 @@ ListJob::ListJob(const KURL& u, bool showProgressInfo, bool _recursive, TQString
stream << u;
}
-void ListJob::slotListEntries( const KIO::UDSEntryList& list )
+void ListJob::slotListEntries( const TDEIO::UDSEntryList& list )
{
// Emit progress info (takes care of emit processedSize and percent)
m_processedEntries += list.count();
@@ -2074,10 +2074,10 @@ void ListJob::slotListEntries( const KIO::UDSEntryList& list )
prefix + filename + "/",
includeHidden);
Scheduler::scheduleJob(job);
- connect(job, TQT_SIGNAL(entries( KIO::Job *,
- const KIO::UDSEntryList& )),
- TQT_SLOT( gotEntries( KIO::Job*,
- const KIO::UDSEntryList& )));
+ connect(job, TQT_SIGNAL(entries( TDEIO::Job *,
+ const TDEIO::UDSEntryList& )),
+ TQT_SLOT( gotEntries( TDEIO::Job*,
+ const TDEIO::UDSEntryList& )));
addSubjob(job);
}
}
@@ -2117,13 +2117,13 @@ void ListJob::slotListEntries( const KIO::UDSEntryList& list )
}
}
-void ListJob::gotEntries(KIO::Job *, const KIO::UDSEntryList& list )
+void ListJob::gotEntries(TDEIO::Job *, const TDEIO::UDSEntryList& list )
{
// Forward entries received by subjob - faking we received them ourselves
emit entries(this, list);
}
-void ListJob::slotResult( KIO::Job * job )
+void ListJob::slotResult( TDEIO::Job * job )
{
// If we can't list a subdir, the result is still ok
// This is why we override Job::slotResult() - to skip error checking
@@ -2146,7 +2146,7 @@ void ListJob::slotRedirection( const KURL & url )
void ListJob::slotFinished()
{
// Support for listing archives as directories
- if ( m_error == KIO::ERR_IS_FILE && m_url.isLocalFile() ) {
+ if ( m_error == TDEIO::ERR_IS_FILE && m_url.isLocalFile() ) {
KMimeType::Ptr ptr = KMimeType::findByURL( m_url, 0, true, true );
if ( ptr ) {
TQString proto = ptr->property("X-TDE-LocalProtocol").toString();
@@ -2178,18 +2178,18 @@ void ListJob::slotFinished()
}
}
-void ListJob::slotMetaData( const KIO::MetaData &_metaData) {
+void ListJob::slotMetaData( const TDEIO::MetaData &_metaData) {
SimpleJob::slotMetaData(_metaData);
storeSSLSessionFromJob(m_redirectionURL);
}
-ListJob *KIO::listDir( const KURL& url, bool showProgressInfo, bool includeHidden )
+ListJob *TDEIO::listDir( const KURL& url, bool showProgressInfo, bool includeHidden )
{
ListJob * job = new ListJob(url, showProgressInfo,false,TQString::null,includeHidden);
return job;
}
-ListJob *KIO::listRecursive( const KURL& url, bool showProgressInfo, bool includeHidden )
+ListJob *TDEIO::listRecursive( const KURL& url, bool showProgressInfo, bool includeHidden )
{
ListJob * job = new ListJob(url, showProgressInfo, true,TQString::null,includeHidden);
return job;
@@ -2212,10 +2212,10 @@ void ListJob::start(Slave *slave)
TQTimer::singleShot(0, this, TQT_SLOT(slotFinished()) );
return;
}
- connect( slave, TQT_SIGNAL( listEntries( const KIO::UDSEntryList& )),
- TQT_SLOT( slotListEntries( const KIO::UDSEntryList& )));
- connect( slave, TQT_SIGNAL( totalSize( KIO::filesize_t ) ),
- TQT_SLOT( slotTotalSize( KIO::filesize_t ) ) );
+ connect( slave, TQT_SIGNAL( listEntries( const TDEIO::UDSEntryList& )),
+ TQT_SLOT( slotListEntries( const TDEIO::UDSEntryList& )));
+ connect( slave, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ),
+ TQT_SLOT( slotTotalSize( TDEIO::filesize_t ) ) );
connect( slave, TQT_SIGNAL( redirection(const KURL &) ),
TQT_SLOT( slotRedirection(const KURL &) ) );
@@ -2260,11 +2260,11 @@ CopyJob::CopyJob( const KURL::List& src, const KURL& dest, CopyMode mode, bool a
d->m_globalDestinationState = destinationState;
if ( showProgressInfo ) {
- connect( this, TQT_SIGNAL( totalFiles( KIO::Job*, unsigned long ) ),
- Observer::self(), TQT_SLOT( slotTotalFiles( KIO::Job*, unsigned long ) ) );
+ connect( this, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ),
+ Observer::self(), TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) );
- connect( this, TQT_SIGNAL( totalDirs( KIO::Job*, unsigned long ) ),
- Observer::self(), TQT_SLOT( slotTotalDirs( KIO::Job*, unsigned long ) ) );
+ connect( this, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ),
+ Observer::self(), TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) );
}
TQTimer::singleShot(0, this, TQT_SLOT(slotStart()));
/**
@@ -2301,7 +2301,7 @@ void CopyJob::slotStart()
m_reportTimer->start(REPORT_TIMEOUT,false);
// Stat the dest
- KIO::Job * job = KIO::stat( m_dest, false, 2, false );
+ TDEIO::Job * job = TDEIO::stat( m_dest, false, 2, false );
//kdDebug(7007) << "CopyJob:stating the dest " << m_dest << endl;
addSubjob(job);
}
@@ -2328,7 +2328,7 @@ void CopyJob::slotResultStating( Job *job )
info.permissions = (mode_t) -1;
info.mtime = (time_t) -1;
info.ctime = (time_t) -1;
- info.size = (KIO::filesize_t)-1;
+ info.size = (TDEIO::filesize_t)-1;
info.uSource = srcurl;
info.uDest = m_dest;
// Append filename or dirname to destination URL, if allowed
@@ -2525,7 +2525,7 @@ void CopyJob::slotReport()
}
}
-void CopyJob::slotEntries(KIO::Job* job, const UDSEntryList& list)
+void CopyJob::slotEntries(TDEIO::Job* job, const UDSEntryList& list)
{
UDSEntryListConstIterator it = list.begin();
UDSEntryListConstIterator end = list.end();
@@ -2535,7 +2535,7 @@ void CopyJob::slotEntries(KIO::Job* job, const UDSEntryList& list)
info.permissions = -1;
info.mtime = (time_t) -1;
info.ctime = (time_t) -1;
- info.size = (KIO::filesize_t)-1;
+ info.size = (TDEIO::filesize_t)-1;
TQString displayName;
KURL url;
TQString localPath;
@@ -2562,7 +2562,7 @@ void CopyJob::slotEntries(KIO::Job* job, const UDSEntryList& list)
info.permissions = ((*it2).m_long);
break;
case UDS_SIZE:
- info.size = (KIO::filesize_t)((*it2).m_long);
+ info.size = (TDEIO::filesize_t)((*it2).m_long);
m_totalSize += info.size;
break;
case UDS_MODIFICATION_TIME:
@@ -2627,7 +2627,7 @@ void CopyJob::slotEntries(KIO::Job* job, const UDSEntryList& list)
// Otherwise, we end up with e.g. dest=..../Desktop/ itself.
// (This can happen when dropping a link to a webpage with no path)
if ( destFileName.isEmpty() )
- destFileName = KIO::encodeFileName( info.uSource.prettyURL() );
+ destFileName = TDEIO::encodeFileName( info.uSource.prettyURL() );
//kdDebug(7007) << " adding destFileName=" << destFileName << endl;
info.uDest.addPath( destFileName );
@@ -2682,7 +2682,7 @@ void CopyJob::statCurrentSrc()
info.permissions = -1;
info.mtime = (time_t) -1;
info.ctime = (time_t) -1;
- info.size = (KIO::filesize_t)-1;
+ info.size = (TDEIO::filesize_t)-1;
info.uSource = m_currentSrcURL;
info.uDest = m_currentDest;
// Append filename or dirname to destination URL, if allowed
@@ -2703,7 +2703,7 @@ void CopyJob::statCurrentSrc()
// Different protocols, we'll create a .desktop file
// We have to change the extension anyway, so while we're at it,
// name the file like the URL
- info.uDest.addPath( KIO::encodeFileName( m_currentSrcURL.prettyURL() )+".desktop" );
+ info.uDest.addPath( TDEIO::encodeFileName( m_currentSrcURL.prettyURL() )+".desktop" );
}
}
files.append( info ); // Files and any symlinks
@@ -2750,8 +2750,8 @@ void CopyJob::statCurrentSrc()
}
// Stat the next src url
- Job * job = KIO::stat( m_currentSrcURL, true, 2, false );
- //kdDebug(7007) << "KIO::stat on " << m_currentSrcURL << endl;
+ Job * job = TDEIO::stat( m_currentSrcURL, true, 2, false );
+ //kdDebug(7007) << "TDEIO::stat on " << m_currentSrcURL << endl;
state = STATE_STATING;
addSubjob(job);
m_currentDestURL=m_dest;
@@ -2790,7 +2790,7 @@ void CopyJob::startRenameJob( const KURL& slave_url )
info.permissions = -1;
info.mtime = (time_t) -1;
info.ctime = (time_t) -1;
- info.size = (KIO::filesize_t)-1;
+ info.size = (TDEIO::filesize_t)-1;
info.uSource = m_currentSrcURL;
info.uDest = dest;
TQValueList<CopyInfo> files;
@@ -2811,10 +2811,10 @@ void CopyJob::startListing( const KURL & src )
d->m_bURLDirty = true;
ListJob * newjob = listRecursive( src, false );
newjob->setUnrestricted(true);
- connect(newjob, TQT_SIGNAL(entries( KIO::Job *,
- const KIO::UDSEntryList& )),
- TQT_SLOT( slotEntries( KIO::Job*,
- const KIO::UDSEntryList& )));
+ connect(newjob, TQT_SIGNAL(entries( TDEIO::Job *,
+ const TDEIO::UDSEntryList& )),
+ TQT_SLOT( slotEntries( TDEIO::Job*,
+ const TDEIO::UDSEntryList& )));
addSubjob( newjob );
}
@@ -2888,9 +2888,9 @@ void CopyJob::slotResultCreatingDirs( Job * job )
// We need to stat the existing dir, to get its last-modification time
KURL existingDest( (*it).uDest );
- SimpleJob * newJob = KIO::stat( existingDest, false, 2, false );
+ SimpleJob * newJob = TDEIO::stat( existingDest, false, 2, false );
Scheduler::scheduleJob(newJob);
- kdDebug(7007) << "KIO::stat for resolving conflict on " << existingDest << endl;
+ kdDebug(7007) << "TDEIO::stat for resolving conflict on " << existingDest << endl;
state = STATE_CONFLICT_CREATING_DIRS;
addSubjob(newJob);
return; // Don't move to next dir yet !
@@ -2919,7 +2919,7 @@ void CopyJob::slotResultCreatingDirs( Job * job )
createNextDir();
}
-void CopyJob::slotResultConflictCreatingDirs( KIO::Job * job )
+void CopyJob::slotResultConflictCreatingDirs( TDEIO::Job * job )
{
// We come here after a conflict has been detected and we've stated the existing dir
@@ -2928,11 +2928,11 @@ void CopyJob::slotResultConflictCreatingDirs( KIO::Job * job )
// Its modification time:
time_t destmtime = (time_t)-1;
time_t destctime = (time_t)-1;
- KIO::filesize_t destsize = 0;
+ TDEIO::filesize_t destsize = 0;
TQString linkDest;
- UDSEntry entry = ((KIO::StatJob*)job)->statResult();
- KIO::UDSEntry::ConstIterator it2 = entry.begin();
+ UDSEntry entry = ((TDEIO::StatJob*)job)->statResult();
+ TDEIO::UDSEntry::ConstIterator it2 = entry.begin();
for( ; it2 != entry.end(); it2++ ) {
switch ((*it2).m_uds) {
case UDS_MODIFICATION_TIME:
@@ -3082,7 +3082,7 @@ void CopyJob::createNextDir()
{
// Create the directory - with default permissions so that we can put files into it
// TODO : change permissions once all is finished; but for stuff coming from CDROM it sucks...
- KIO::SimpleJob *newjob = KIO::mkdir( udir, -1 );
+ TDEIO::SimpleJob *newjob = TDEIO::mkdir( udir, -1 );
Scheduler::scheduleJob(newjob);
m_currentDestURL = udir;
@@ -3132,16 +3132,16 @@ void CopyJob::slotResultCopyingFiles( Job * job )
assert ( subjobs.isEmpty() );
// We need to stat the existing file, to get its last-modification time
KURL existingFile( (*it).uDest );
- SimpleJob * newJob = KIO::stat( existingFile, false, 2, false );
+ SimpleJob * newJob = TDEIO::stat( existingFile, false, 2, false );
Scheduler::scheduleJob(newJob);
- kdDebug(7007) << "KIO::stat for resolving conflict on " << existingFile << endl;
+ kdDebug(7007) << "TDEIO::stat for resolving conflict on " << existingFile << endl;
state = STATE_CONFLICT_COPYING_FILES;
addSubjob(newJob);
return; // Don't move to next file yet !
}
else
{
- if ( m_bCurrentOperationIsLink && ::tqqt_cast<KIO::DeleteJob*>( job ) )
+ if ( m_bCurrentOperationIsLink && ::tqqt_cast<TDEIO::DeleteJob*>( job ) )
{
// Very special case, see a few lines below
// We are deleting the source of a symlink we successfully moved... ignore error
@@ -3158,14 +3158,14 @@ void CopyJob::slotResultCopyingFiles( Job * job )
{
// Special case for moving links. That operation needs two jobs, unlike others.
if ( m_bCurrentOperationIsLink && m_mode == Move
- && !::tqqt_cast<KIO::DeleteJob *>( job ) // Deleting source not already done
+ && !::tqqt_cast<TDEIO::DeleteJob *>( job ) // Deleting source not already done
)
{
subjobs.remove( job );
assert ( subjobs.isEmpty() );
// The only problem with this trick is that the error handling for this del operation
// is not going to be right... see 'Very special case' above.
- KIO::Job * newjob = KIO::del( (*it).uSource, false /*don't shred*/, false /*no GUI*/ );
+ TDEIO::Job * newjob = TDEIO::del( (*it).uSource, false /*don't shred*/, false /*no GUI*/ );
addSubjob( newjob );
return; // Don't move to next file yet !
}
@@ -3195,7 +3195,7 @@ void CopyJob::slotResultCopyingFiles( Job * job )
copyNextFile();
}
-void CopyJob::slotResultConflictCopyingFiles( KIO::Job * job )
+void CopyJob::slotResultConflictCopyingFiles( TDEIO::Job * job )
{
// We come here after a conflict has been detected and we've stated the existing file
// The file we were trying to create:
@@ -3214,10 +3214,10 @@ void CopyJob::slotResultConflictCopyingFiles( KIO::Job * job )
// Its modification time:
time_t destmtime = (time_t)-1;
time_t destctime = (time_t)-1;
- KIO::filesize_t destsize = 0;
+ TDEIO::filesize_t destsize = 0;
TQString linkDest;
- UDSEntry entry = ((KIO::StatJob*)job)->statResult();
- KIO::UDSEntry::ConstIterator it2 = entry.begin();
+ UDSEntry entry = ((TDEIO::StatJob*)job)->statResult();
+ TDEIO::UDSEntry::ConstIterator it2 = entry.begin();
for( ; it2 != entry.end(); it2++ ) {
switch ((*it2).m_uds) {
case UDS_MODIFICATION_TIME:
@@ -3364,7 +3364,7 @@ void CopyJob::copyNextFile()
bOverwrite = shouldOverwrite( destFile );
m_bCurrentOperationIsLink = false;
- KIO::Job * newjob = 0L;
+ TDEIO::Job * newjob = 0L;
if ( m_mode == Link )
{
//kdDebug(7007) << "Linking" << endl;
@@ -3376,7 +3376,7 @@ void CopyJob::copyNextFile()
((*it).uSource.pass() == (*it).uDest.pass()) )
{
// This is the case of creating a real symlink
- KIO::SimpleJob *newJob = KIO::symlink( (*it).uSource.path(), (*it).uDest, bOverwrite, false /*no GUI*/ );
+ TDEIO::SimpleJob *newJob = TDEIO::symlink( (*it).uSource.path(), (*it).uDest, bOverwrite, false /*no GUI*/ );
newjob = newJob;
Scheduler::scheduleJob(newJob);
//kdDebug(7007) << "CopyJob::copyNextFile : Linking target=" << (*it).uSource.path() << " link=" << (*it).uDest << endl;
@@ -3476,7 +3476,7 @@ void CopyJob::copyNextFile()
((*it).uSource.pass() == (*it).uDest.pass()))
// Copying a symlink - only on the same protocol/host/etc. (#5601, downloading an FTP file through its link),
{
- KIO::SimpleJob *newJob = KIO::symlink( (*it).linkDest, (*it).uDest, bOverwrite, false /*no GUI*/ );
+ TDEIO::SimpleJob *newJob = TDEIO::symlink( (*it).linkDest, (*it).uDest, bOverwrite, false /*no GUI*/ );
Scheduler::scheduleJob(newJob);
newjob = newJob;
//kdDebug(7007) << "CopyJob::copyNextFile : Linking target=" << (*it).linkDest << " link=" << (*it).uDest << endl;
@@ -3489,7 +3489,7 @@ void CopyJob::copyNextFile()
// NOTE: if we are moving stuff, the deletion of the source will be done in slotResultCopyingFiles
} else if (m_mode == Move) // Moving a file
{
- KIO::FileCopyJob * moveJob = KIO::file_move( (*it).uSource, (*it).uDest, (*it).permissions, bOverwrite, false, false/*no GUI*/ );
+ TDEIO::FileCopyJob * moveJob = TDEIO::file_move( (*it).uSource, (*it).uDest, (*it).permissions, bOverwrite, false, false/*no GUI*/ );
moveJob->setSourceSize64( (*it).size );
newjob = moveJob;
//kdDebug(7007) << "CopyJob::copyNextFile : Moving " << (*it).uSource << " to " << (*it).uDest << endl;
@@ -3507,7 +3507,7 @@ void CopyJob::copyNextFile()
int permissions = (*it).permissions;
if ( d->m_defaultPermissions || ( remoteSource && (*it).uDest.isLocalFile() ) )
permissions = -1;
- KIO::FileCopyJob * copyJob = KIO::file_copy( (*it).uSource, (*it).uDest, permissions, bOverwrite, false, false/*no GUI*/ );
+ TDEIO::FileCopyJob * copyJob = TDEIO::file_copy( (*it).uSource, (*it).uDest, permissions, bOverwrite, false, false/*no GUI*/ );
copyJob->setParentJob( this ); // in case of rename dialog
copyJob->setSourceSize64( (*it).size );
copyJob->setModificationTime( (*it).mtime );
@@ -3518,10 +3518,10 @@ void CopyJob::copyNextFile()
d->m_bURLDirty = true;
}
addSubjob(newjob);
- connect( newjob, TQT_SIGNAL( processedSize( KIO::Job*, KIO::filesize_t ) ),
- this, TQT_SLOT( slotProcessedSize( KIO::Job*, KIO::filesize_t ) ) );
- connect( newjob, TQT_SIGNAL( totalSize( KIO::Job*, KIO::filesize_t ) ),
- this, TQT_SLOT( slotTotalSize( KIO::Job*, KIO::filesize_t ) ) );
+ connect( newjob, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+ this, TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+ connect( newjob, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+ this, TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
}
else
{
@@ -3539,7 +3539,7 @@ void CopyJob::deleteNextDir()
d->m_bURLDirty = true;
// Take first dir to delete out of list - last ones first !
KURL::List::Iterator it = dirsToRemove.fromLast();
- SimpleJob *job = KIO::rmdir( *it );
+ SimpleJob *job = TDEIO::rmdir( *it );
Scheduler::scheduleJob(job);
dirsToRemove.remove(it);
addSubjob( job );
@@ -3604,7 +3604,7 @@ void CopyJob::setNextDirAttribute()
}
}
-void CopyJob::slotProcessedSize( KIO::Job*, KIO::filesize_t data_size )
+void CopyJob::slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t data_size )
{
//kdDebug(7007) << "CopyJob::slotProcessedSize " << data_size << endl;
m_fileProcessedSize = data_size;
@@ -3621,7 +3621,7 @@ void CopyJob::slotProcessedSize( KIO::Job*, KIO::filesize_t data_size )
emitPercent( m_processedSize + m_fileProcessedSize, m_totalSize );
}
-void CopyJob::slotTotalSize( KIO::Job*, KIO::filesize_t size )
+void CopyJob::slotTotalSize( TDEIO::Job*, TDEIO::filesize_t size )
{
//kdDebug(7007) << "slotTotalSize: " << size << endl;
// Special case for copying a single file
@@ -3753,8 +3753,8 @@ void CopyJob::slotResultRenaming( Job* job )
// we lack mtime info for both the src (not stated)
// and the dest (stated but this info wasn't stored)
// Let's do it for local files, at least
- KIO::filesize_t sizeSrc = (KIO::filesize_t) -1;
- KIO::filesize_t sizeDest = (KIO::filesize_t) -1;
+ TDEIO::filesize_t sizeSrc = (TDEIO::filesize_t) -1;
+ TDEIO::filesize_t sizeDest = (TDEIO::filesize_t) -1;
time_t ctimeSrc = (time_t) -1;
time_t ctimeDest = (time_t) -1;
time_t mtimeSrc = (time_t) -1;
@@ -3799,7 +3799,7 @@ void CopyJob::slotResultRenaming( Job* job )
// Set m_dest to the chosen destination
// This is only for this src url; the next one will revert to d->m_globalDest
m_dest.setPath( newPath );
- KIO::Job* job = KIO::stat( m_dest, false, 2, false );
+ TDEIO::Job* job = TDEIO::stat( m_dest, false, 2, false );
state = STATE_STATING;
destinationState = DEST_NOT_STATED;
addSubjob(job);
@@ -3829,7 +3829,7 @@ void CopyJob::slotResultRenaming( Job* job )
break;
}
}
- } else if ( err != KIO::ERR_UNSUPPORTED_ACTION ) {
+ } else if ( err != TDEIO::ERR_UNSUPPORTED_ACTION ) {
kdDebug(7007) << "Couldn't rename " << m_currentSrcURL << " to " << dest << ", aborting" << endl;
m_error = err;
m_errorText = errText;
@@ -3837,8 +3837,8 @@ void CopyJob::slotResultRenaming( Job* job )
return;
}
kdDebug(7007) << "Couldn't rename " << m_currentSrcURL << " to " << dest << ", reverting to normal way, starting with stat" << endl;
- //kdDebug(7007) << "KIO::stat on " << m_currentSrcURL << endl;
- KIO::Job* job = KIO::stat( m_currentSrcURL, true, 2, false );
+ //kdDebug(7007) << "TDEIO::stat on " << m_currentSrcURL << endl;
+ TDEIO::Job* job = TDEIO::stat( m_currentSrcURL, true, 2, false );
state = STATE_STATING;
addSubjob(job);
m_bOnlyRenames = false;
@@ -3906,40 +3906,40 @@ void CopyJob::slotResult( Job *job )
}
}
-void KIO::CopyJob::setDefaultPermissions( bool b )
+void TDEIO::CopyJob::setDefaultPermissions( bool b )
{
d->m_defaultPermissions = b;
}
// KDE4: remove
-void KIO::CopyJob::setInteractive( bool b )
+void TDEIO::CopyJob::setInteractive( bool b )
{
Job::setInteractive( b );
}
-CopyJob *KIO::copy(const KURL& src, const KURL& dest, bool showProgressInfo )
+CopyJob *TDEIO::copy(const KURL& src, const KURL& dest, bool showProgressInfo )
{
- //kdDebug(7007) << "KIO::copy src=" << src << " dest=" << dest << endl;
+ //kdDebug(7007) << "TDEIO::copy src=" << src << " dest=" << dest << endl;
KURL::List srcList;
srcList.append( src );
return new CopyJob( srcList, dest, CopyJob::Copy, false, showProgressInfo );
}
-CopyJob *KIO::copyAs(const KURL& src, const KURL& dest, bool showProgressInfo )
+CopyJob *TDEIO::copyAs(const KURL& src, const KURL& dest, bool showProgressInfo )
{
- //kdDebug(7007) << "KIO::copyAs src=" << src << " dest=" << dest << endl;
+ //kdDebug(7007) << "TDEIO::copyAs src=" << src << " dest=" << dest << endl;
KURL::List srcList;
srcList.append( src );
return new CopyJob( srcList, dest, CopyJob::Copy, true, showProgressInfo );
}
-CopyJob *KIO::copy( const KURL::List& src, const KURL& dest, bool showProgressInfo )
+CopyJob *TDEIO::copy( const KURL::List& src, const KURL& dest, bool showProgressInfo )
{
//kdDebug(7007) << src << " " << dest << endl;
return new CopyJob( src, dest, CopyJob::Copy, false, showProgressInfo );
}
-CopyJob *KIO::move(const KURL& src, const KURL& dest, bool showProgressInfo )
+CopyJob *TDEIO::move(const KURL& src, const KURL& dest, bool showProgressInfo )
{
//kdDebug(7007) << src << " " << dest << endl;
KURL::List srcList;
@@ -3947,7 +3947,7 @@ CopyJob *KIO::move(const KURL& src, const KURL& dest, bool showProgressInfo )
return new CopyJob( srcList, dest, CopyJob::Move, false, showProgressInfo );
}
-CopyJob *KIO::moveAs(const KURL& src, const KURL& dest, bool showProgressInfo )
+CopyJob *TDEIO::moveAs(const KURL& src, const KURL& dest, bool showProgressInfo )
{
//kdDebug(7007) << src << " " << dest << endl;
KURL::List srcList;
@@ -3955,39 +3955,39 @@ CopyJob *KIO::moveAs(const KURL& src, const KURL& dest, bool showProgressInfo )
return new CopyJob( srcList, dest, CopyJob::Move, true, showProgressInfo );
}
-CopyJob *KIO::move( const KURL::List& src, const KURL& dest, bool showProgressInfo )
+CopyJob *TDEIO::move( const KURL::List& src, const KURL& dest, bool showProgressInfo )
{
//kdDebug(7007) << src << " " << dest << endl;
return new CopyJob( src, dest, CopyJob::Move, false, showProgressInfo );
}
-CopyJob *KIO::link(const KURL& src, const KURL& destDir, bool showProgressInfo )
+CopyJob *TDEIO::link(const KURL& src, const KURL& destDir, bool showProgressInfo )
{
KURL::List srcList;
srcList.append( src );
return new CopyJob( srcList, destDir, CopyJob::Link, false, showProgressInfo );
}
-CopyJob *KIO::link(const KURL::List& srcList, const KURL& destDir, bool showProgressInfo )
+CopyJob *TDEIO::link(const KURL::List& srcList, const KURL& destDir, bool showProgressInfo )
{
return new CopyJob( srcList, destDir, CopyJob::Link, false, showProgressInfo );
}
-CopyJob *KIO::linkAs(const KURL& src, const KURL& destDir, bool showProgressInfo )
+CopyJob *TDEIO::linkAs(const KURL& src, const KURL& destDir, bool showProgressInfo )
{
KURL::List srcList;
srcList.append( src );
return new CopyJob( srcList, destDir, CopyJob::Link, false, showProgressInfo );
}
-CopyJob *KIO::trash(const KURL& src, bool showProgressInfo )
+CopyJob *TDEIO::trash(const KURL& src, bool showProgressInfo )
{
KURL::List srcList;
srcList.append( src );
return new CopyJob( srcList, KURL( "trash:/" ), CopyJob::Move, false, showProgressInfo );
}
-CopyJob *KIO::trash(const KURL::List& srcList, bool showProgressInfo )
+CopyJob *TDEIO::trash(const KURL::List& srcList, bool showProgressInfo )
{
return new CopyJob( srcList, KURL( "trash:/" ), CopyJob::Move, false, showProgressInfo );
}
@@ -4001,21 +4001,21 @@ DeleteJob::DeleteJob( const KURL::List& src, bool /*shred*/, bool showProgressIn
{
if ( showProgressInfo ) {
- connect( this, TQT_SIGNAL( totalFiles( KIO::Job*, unsigned long ) ),
- Observer::self(), TQT_SLOT( slotTotalFiles( KIO::Job*, unsigned long ) ) );
+ connect( this, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ),
+ Observer::self(), TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) );
- connect( this, TQT_SIGNAL( totalDirs( KIO::Job*, unsigned long ) ),
- Observer::self(), TQT_SLOT( slotTotalDirs( KIO::Job*, unsigned long ) ) );
+ connect( this, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ),
+ Observer::self(), TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) );
// See slotReport
- /*connect( this, TQT_SIGNAL( processedFiles( KIO::Job*, unsigned long ) ),
- m_observer, TQT_SLOT( slotProcessedFiles( KIO::Job*, unsigned long ) ) );
+ /*connect( this, TQT_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ),
+ m_observer, TQT_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) );
- connect( this, TQT_SIGNAL( processedDirs( KIO::Job*, unsigned long ) ),
- m_observer, TQT_SLOT( slotProcessedDirs( KIO::Job*, unsigned long ) ) );
+ connect( this, TQT_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ),
+ m_observer, TQT_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) );
- connect( this, TQT_SIGNAL( deleting( KIO::Job*, const KURL& ) ),
- m_observer, TQT_SLOT( slotDeleting( KIO::Job*, const KURL& ) ) );*/
+ connect( this, TQT_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ),
+ m_observer, TQT_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) );*/
m_reportTimer=new TQTimer(this);
connect(m_reportTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotReport()));
@@ -4065,7 +4065,7 @@ void DeleteJob::slotReport()
}
-void DeleteJob::slotEntries(KIO::Job* job, const UDSEntryList& list)
+void DeleteJob::slotEntries(TDEIO::Job* job, const UDSEntryList& list)
{
UDSEntryListConstIterator it = list.begin();
UDSEntryListConstIterator end = list.end();
@@ -4098,7 +4098,7 @@ void DeleteJob::slotEntries(KIO::Job* job, const UDSEntryList& list)
atomsFound++;
break;
case UDS_SIZE:
- m_totalSize += (KIO::filesize_t)((*it2).m_long);
+ m_totalSize += (TDEIO::filesize_t)((*it2).m_long);
atomsFound++;
break;
default:
@@ -4144,9 +4144,9 @@ void DeleteJob::statNextSrc()
}
// Stat it
state = STATE_STATING;
- KIO::SimpleJob * job = KIO::stat( m_currentURL, true, 1, false );
+ TDEIO::SimpleJob * job = TDEIO::stat( m_currentURL, true, 1, false );
Scheduler::scheduleJob(job);
- //kdDebug(7007) << "KIO::stat (DeleteJob) " << m_currentURL << endl;
+ //kdDebug(7007) << "TDEIO::stat (DeleteJob) " << m_currentURL << endl;
addSubjob(job);
//if ( m_progressId ) // Did we get an ID from the observer ?
// Observer::self()->slotDeleting( this, *it ); // show asap
@@ -4192,7 +4192,7 @@ void DeleteJob::deleteNextFile()
}
} else
{ // if remote - or if unlink() failed (we'll use the job's error handling in that case)
- job = KIO::file_delete( *it, false /*no GUI*/);
+ job = TDEIO::file_delete( *it, false /*no GUI*/);
Scheduler::scheduleJob(job);
m_currentURL=(*it);
}
@@ -4231,9 +4231,9 @@ void DeleteJob::deleteNextDir()
if ( KProtocolInfo::canDeleteRecursive( *it ) ) {
// If the ioslave supports recursive deletion of a directory, then
// we only need to send a single CMD_DEL command, so we use file_delete :)
- job = KIO::file_delete( *it, false /*no gui*/ );
+ job = TDEIO::file_delete( *it, false /*no gui*/ );
} else {
- job = KIO::rmdir( *it );
+ job = TDEIO::rmdir( *it );
}
Scheduler::scheduleJob(job);
dirs.remove(it);
@@ -4260,7 +4260,7 @@ void DeleteJob::deleteNextDir()
emitResult();
}
-void DeleteJob::slotProcessedSize( KIO::Job*, KIO::filesize_t data_size )
+void DeleteJob::slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t data_size )
{
// Note: this is the same implementation as CopyJob::slotProcessedSize but
// it's different from FileCopyJob::slotProcessedSize - which is why this
@@ -4307,7 +4307,7 @@ void DeleteJob::slotResult( Job *job )
UDSEntry entry = ((StatJob*)job)->statResult();
bool bDir = false;
bool bLink = false;
- KIO::filesize_t size = (KIO::filesize_t)-1;
+ TDEIO::filesize_t size = (TDEIO::filesize_t)-1;
UDSEntry::ConstIterator it2 = entry.begin();
int atomsFound(0);
for( ; it2 != entry.end(); it2++ )
@@ -4349,10 +4349,10 @@ void DeleteJob::slotResult( Job *job )
ListJob *newjob = listRecursive( url, false );
newjob->setUnrestricted(true); // No KIOSK restrictions
Scheduler::scheduleJob(newjob);
- connect(newjob, TQT_SIGNAL(entries( KIO::Job *,
- const KIO::UDSEntryList& )),
- TQT_SLOT( slotEntries( KIO::Job*,
- const KIO::UDSEntryList& )));
+ connect(newjob, TQT_SIGNAL(entries( TDEIO::Job *,
+ const TDEIO::UDSEntryList& )),
+ TQT_SLOT( slotEntries( TDEIO::Job*,
+ const TDEIO::UDSEntryList& )));
addSubjob(newjob);
} else {
++m_currentStat;
@@ -4417,7 +4417,7 @@ void DeleteJob::slotResult( Job *job )
}
}
-DeleteJob *KIO::del( const KURL& src, bool shred, bool showProgressInfo )
+DeleteJob *TDEIO::del( const KURL& src, bool shred, bool showProgressInfo )
{
KURL::List srcList;
srcList.append( src );
@@ -4425,7 +4425,7 @@ DeleteJob *KIO::del( const KURL& src, bool shred, bool showProgressInfo )
return job;
}
-DeleteJob *KIO::del( const KURL::List& src, bool shred, bool showProgressInfo )
+DeleteJob *TDEIO::del( const KURL::List& src, bool shred, bool showProgressInfo )
{
DeleteJob *job = new DeleteJob( src, shred, showProgressInfo );
return job;
@@ -4599,7 +4599,7 @@ void MultiGetJob::slotMimetype( const TQString &_mimetype )
emit mimetype(m_currentEntry->id, _mimetype);
}
-MultiGetJob *KIO::multi_get(long id, const KURL &url, const MetaData &metaData)
+MultiGetJob *TDEIO::multi_get(long id, const KURL &url, const MetaData &metaData)
{
MultiGetJob * job = new MultiGetJob( url, false );
job->get(id, url, metaData);
@@ -4778,7 +4778,7 @@ void Job::virtual_hook( int, void* )
{ /*BASE::virtual_hook( id, data );*/ }
void SimpleJob::virtual_hook( int id, void* data )
-{ KIO::Job::virtual_hook( id, data ); }
+{ TDEIO::Job::virtual_hook( id, data ); }
void MkdirJob::virtual_hook( int id, void* data )
{ SimpleJob::virtual_hook( id, data ); }
diff --git a/kio/kio/job.h b/kio/kio/job.h
index fed6f82a..03985b63 100644
--- a/kio/kio/job.h
+++ b/kio/kio/job.h
@@ -24,7 +24,7 @@
#include <kio/jobclasses.h>
-namespace KIO {
+namespace TDEIO {
/**
@@ -80,7 +80,7 @@ namespace KIO {
* Create or move a symlink.
* This is the lowlevel operation, similar to file_copy and file_move.
* It doesn't do any check (other than those the slave does)
- * and it doesn't show rename and skip dialogs - use KIO::link for that.
+ * and it doesn't show rename and skip dialogs - use TDEIO::link for that.
* @param target The string that will become the "target" of the link (can be relative)
* @param dest The symlink to create.
* @param overwrite whether to automatically overwrite if the dest exists
@@ -215,7 +215,7 @@ namespace KIO {
*
* Example:
* \code
- * job = KIO::http_post( url, postData, false );
+ * job = TDEIO::http_post( url, postData, false );
* job->addMetaData("content-type", contentType );
* job->addMetaData("referrer", referrerURL);
* \endcode
diff --git a/kio/kio/jobclasses.h b/kio/kio/jobclasses.h
index 9d6624dc..9858b1ce 100644
--- a/kio/kio/jobclasses.h
+++ b/kio/kio/jobclasses.h
@@ -39,7 +39,7 @@ class TQTimer;
#define KIO_COPYJOB_HAS_SETINTERACTIVE // new in 3.4. Used by kio_trash.
-namespace KIO {
+namespace TDEIO {
class Slave;
class SlaveInterface;
@@ -50,9 +50,9 @@ namespace KIO {
* For all jobs created in an application, the code looks like
*
* \code
- * KIO::Job * job = KIO::someoperation( some parameters );
- * connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
- * this, TQT_SLOT( slotResult( KIO::Job * ) ) );
+ * TDEIO::Job * job = TDEIO::someoperation( some parameters );
+ * connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ * this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
* \endcode
* (other connects, specific to the job)
*
@@ -62,8 +62,8 @@ namespace KIO {
* if ( job->error() )
* job->showErrorDialog( this or 0L );
* \endcode
- * @see KIO::Scheduler
- * @see KIO::Slave
+ * @see TDEIO::Scheduler
+ * @see TDEIO::Slave
*/
class KIO_EXPORT Job : public TQObject {
Q_OBJECT
@@ -90,7 +90,7 @@ namespace KIO {
* Returns the error code, if there has been an error.
* Only call this method from the slot connected to result().
* @return the error code for this job, 0 if no error.
- * Error codes are defined in KIO::Error.
+ * Error codes are defined in TDEIO::Error.
*/
int error() const { return m_error; }
@@ -262,7 +262,7 @@ namespace KIO {
* @see addMetaData()
* @see mergeMetaData()
*/
- void setMetaData( const KIO::MetaData &metaData);
+ void setMetaData( const TDEIO::MetaData &metaData);
/**
* Add key/value pair to the meta data that is sent to the slave.
@@ -317,7 +317,7 @@ namespace KIO {
* @see processedSize
* @since 3.2
*/
- KIO::filesize_t getProcessedSize();
+ TDEIO::filesize_t getProcessedSize();
signals:
/**
@@ -325,7 +325,7 @@ namespace KIO {
* failed...). Use error to know the result.
* @param job the job that emitted this signal
*/
- void result( KIO::Job *job );
+ void result( TDEIO::Job *job );
/**
* @deprecated. Don't use !
@@ -334,7 +334,7 @@ namespace KIO {
* in this case, ERR_USER_CANCELED.
* @param job the job that emitted this signal
*/
- void canceled( KIO::Job *job );
+ void canceled( TDEIO::Job *job );
/**
* Emitted to display information about this job, as sent by the slave.
@@ -342,7 +342,7 @@ namespace KIO {
* @param job the job that emitted this signal
* @param msg the info message
*/
- void infoMessage( KIO::Job *job, const TQString & msg );
+ void infoMessage( TDEIO::Job *job, const TQString & msg );
// KDE4: Separate rich-text string from plain-text string, for different widgets.
/**
@@ -351,7 +351,7 @@ namespace KIO {
* @param msg the info message
* @since 3.5
*/
- void warning( KIO::Job *job, const TQString & msg );
+ void warning( TDEIO::Job *job, const TQString & msg );
// KDE4: Separate rich-text string from plain-text string, for different widgets.
/**
@@ -360,7 +360,7 @@ namespace KIO {
* currently unused (in the applications).
* @param job the job that emitted this signal
*/
- void connected( KIO::Job *job );
+ void connected( TDEIO::Job *job );
/**
* Progress signal showing the overall progress of the job
@@ -370,7 +370,7 @@ namespace KIO {
* @param job the job that emitted this signal
* @param percent the percentage
*/
- void percent( KIO::Job *job, unsigned long percent );
+ void percent( TDEIO::Job *job, unsigned long percent );
/**
* Emitted when we know the size of this job (data size for transfers,
@@ -378,7 +378,7 @@ namespace KIO {
* @param job the job that emitted this signal
* @param size the total size in bytes
*/
- void totalSize( KIO::Job *job, KIO::filesize_t size );
+ void totalSize( TDEIO::Job *job, TDEIO::filesize_t size );
/**
* Regularly emitted to show the progress of this job
@@ -386,14 +386,14 @@ namespace KIO {
* @param job the job that emitted this signal
* @param size the processed size in bytes
*/
- void processedSize( KIO::Job *job, KIO::filesize_t size );
+ void processedSize( TDEIO::Job *job, TDEIO::filesize_t size );
/**
* Emitted to display information about the speed of this job.
* @param job the job that emitted this signal
* @param speed the speed in bytes/s
*/
- void speed( KIO::Job *job, unsigned long speed );
+ void speed( TDEIO::Job *job, unsigned long speed );
protected slots:
/**
@@ -404,7 +404,7 @@ namespace KIO {
* @param job the subjob
* @see result()
*/
- virtual void slotResult( KIO::Job *job );
+ virtual void slotResult( TDEIO::Job *job );
/**
* Forward signal from subjob.
@@ -412,14 +412,14 @@ namespace KIO {
* @param speed the speed in bytes/s
* @see speed()
*/
- void slotSpeed( KIO::Job *job, unsigned long speed );
+ void slotSpeed( TDEIO::Job *job, unsigned long speed );
/**
* Forward signal from subjob.
* @param job the subjob
* @param msg the info message
* @see infoMessage()
*/
- void slotInfoMessage( KIO::Job *job, const TQString &msg );
+ void slotInfoMessage( TDEIO::Job *job, const TQString &msg );
/**
* Remove speed information.
@@ -465,7 +465,7 @@ namespace KIO {
* @param processedSize the processed size in bytes
* @param totalSize the total size in bytes
*/
- void emitPercent( KIO::filesize_t processedSize, KIO::filesize_t totalSize );
+ void emitPercent( TDEIO::filesize_t processedSize, TDEIO::filesize_t totalSize );
/**
* Utility function for inherited jobs.
@@ -485,7 +485,7 @@ namespace KIO {
* Set the processed size, does not emit processedSize
* @since 3.2
*/
- void setProcessedSize(KIO::filesize_t size);
+ void setProcessedSize(TDEIO::filesize_t size);
/**
* @internal
@@ -525,7 +525,7 @@ namespace KIO {
* Other jobs are high-level jobs (CopyJob, DeleteJob, FileCopyJob...)
* that manage subjobs but aren't scheduled directly.
*/
- class KIO_EXPORT SimpleJob : public KIO::Job {
+ class KIO_EXPORT SimpleJob : public TDEIO::Job {
Q_OBJECT
public:
@@ -598,7 +598,7 @@ namespace KIO {
* Can also be called by the parent job, when it knows the size.
* @param data_size the total size
*/
- void slotTotalSize( KIO::filesize_t data_size );
+ void slotTotalSize( TDEIO::filesize_t data_size );
protected slots:
/**
@@ -631,7 +631,7 @@ namespace KIO {
* @param data_size the processed size in bytes
* @see processedSize()
*/