From 8103f3767e023c58049df75422bc4c87cedae1a2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 30 Jan 2013 13:48:54 -0600 Subject: [PATCH] Fix a few remaining references to kio_ --- config.h.cmake | 6 +++--- doc/tdeioslave/mrml.docbook | 2 +- kcontrol/privacy/kprivacymanager.cpp | 2 +- khelpcenter/DESIGN | 2 +- konqueror/remoteencodingplugin/kremoteencodingplugin.cpp | 4 ++-- ksysguard/gui/SensorDisplayLib/ProcessList.cc | 2 +- libkonq/knewmenu.cc | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config.h.cmake b/config.h.cmake index 1b6bad421..9f877ced1 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -57,18 +57,18 @@ // tdm, kcontrol #cmakedefine HAVE_GETIFADDRS 1 -// kio_fish +// tdeio_fish #cmakedefine HAVE_STROPTS 1 #cmakedefine HAVE_LIBUTIL_H 1 #cmakedefine HAVE_UTIL_H 1 #cmakedefine HAVE_PTY_H 1 #cmakedefine HAVE_OPENPTY 1 -// kio_man +// tdeio_man #cmakedefine HAVE_UNISTD_H 1 #cmakedefine HAVE_STRING_H 1 -// kio_smtp, ksysguard +// tdeio_smtp, ksysguard #cmakedefine kde_socklen_t @kde_socklen_t@ // tdefile_media diff --git a/doc/tdeioslave/mrml.docbook b/doc/tdeioslave/mrml.docbook index 6dcde8bd6..ecfd8a119 100644 --- a/doc/tdeioslave/mrml.docbook +++ b/doc/tdeioslave/mrml.docbook @@ -17,7 +17,7 @@ protocol to provide standardized access to Multimedia retrieval software. See http://www.mrml.net for more information. -kio_mrml is used for the Image Finding feature in &tde; +tdeio_mrml is used for the Image Finding feature in &tde; ⪚ type mrml:/ or mrml:/some.other.server in &konqueror; to start searching for images. diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp index 9ec3a5647..869446e42 100644 --- a/kcontrol/privacy/kprivacymanager.cpp +++ b/kcontrol/privacy/kprivacymanager.cpp @@ -111,7 +111,7 @@ bool KPrivacyManager::clearFormCompletion() const bool KPrivacyManager::clearWebCache() const { TDEProcess process; - process << "kio_http_cache_cleaner" << "--clear-all"; + process << "tdeio_http_cache_cleaner" << "--clear-all"; return process.start(TDEProcess::DontCare); } diff --git a/khelpcenter/DESIGN b/khelpcenter/DESIGN index 8cc769d82..fd8bbb289 100644 --- a/khelpcenter/DESIGN +++ b/khelpcenter/DESIGN @@ -276,7 +276,7 @@ KHC::View --------- KHC::View inherits TDEHTMLPart and does the actual job of showing some sort of document. Most importantly, it has a slot which passes it a KURL pointing to a -document to show. KHC::View will invoke kio_help if necessary (if the URL's +document to show. KHC::View will invoke tdeio_help if necessary (if the URL's protocol == "help") by itself and otherwise use the plain URL. # TODO: Things I didn't really think about yet: the interface between the diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp index ec9d6ef2a..b4de7a003 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp @@ -167,7 +167,7 @@ KRemoteEncodingPlugin::slotAboutToShow() void KRemoteEncodingPlugin::slotItemSelected(int id) { - TDEConfig config(("kio_" + m_currentURL.protocol() + "rc").latin1()); + TDEConfig config(("tdeio_" + m_currentURL.protocol() + "rc").latin1()); TQString host = m_currentURL.host(); if (!m_menu->popupMenu()->isItemChecked(id)) @@ -188,7 +188,7 @@ KRemoteEncodingPlugin::slotDefault() { // We have no choice but delete all higher domain level // settings here since it affects what will be matched. - TDEConfig config(("kio_" + m_currentURL.protocol() + "rc").latin1()); + TDEConfig config(("tdeio_" + m_currentURL.protocol() + "rc").latin1()); TQStringList partList = TQStringList::split('.', m_currentURL.host(), false); if (!partList.isEmpty()) diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cc index 5bb68b394..4fd3e766e 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc @@ -185,7 +185,7 @@ ProcessList::ProcessList(TQWidget *parent, const char* name) aliases.insert("tdesud", new TQString("kdeapp")); aliases.insert("tdm", new TQString("kdeapp")); aliases.insert("khotkeys", new TQString("kdeapp")); - aliases.insert("kio_file", new TQString("kdeapp")); + aliases.insert("tdeio_file", new TQString("kdeapp")); aliases.insert("tdeio_uiserver", new TQString("kdeapp")); aliases.insert("tdelauncher", new TQString("kdeapp")); aliases.insert("ksmserver", new TQString("kdeapp")); diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc index 5620a650d..2e6247c21 100644 --- a/libkonq/knewmenu.cc +++ b/libkonq/knewmenu.cc @@ -512,7 +512,7 @@ void KNewMenu::slotResult( TDEIO::Job * job ) } else { - // Normal (local) file. Need to "touch" it, kio_file copied the mtime. + // Normal (local) file. Need to "touch" it, tdeio_file copied the mtime. (void) ::utime( TQFile::encodeName( destURL.path() ), 0 ); } }