diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /konqueror/remoteencodingplugin | |
| parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
| download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/remoteencodingplugin')
| -rw-r--r-- | konqueror/remoteencodingplugin/kremoteencodingplugin.cpp | 8 | ||||
| -rw-r--r-- | konqueror/remoteencodingplugin/kremoteencodingplugin.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp index a927f37e0..9ae297285 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp @@ -135,7 +135,7 @@ KRemoteEncodingPlugin::updateMenu() for (unsigned i = 0; i < m_menu->popupMenu()->count(); i++) m_menu->popupMenu()->setItemChecked(m_menu->popupMenu()->idAt(i), false); - TQString charset = KIO::SlaveConfig::self()->configData(m_currentURL.protocol(), m_currentURL.host(), + TQString charset = TDEIO::SlaveConfig::self()->configData(m_currentURL.protocol(), m_currentURL.host(), DATA_KEY); if (!charset.isEmpty()) { @@ -167,7 +167,7 @@ KRemoteEncodingPlugin::slotAboutToShow() void KRemoteEncodingPlugin::slotItemSelected(int id) { - KConfig config(("kio_" + m_currentURL.protocol() + "rc").latin1()); + TDEConfig config(("kio_" + 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. - KConfig config(("kio_" + m_currentURL.protocol() + "rc").latin1()); + TDEConfig config(("kio_" + m_currentURL.protocol() + "rc").latin1()); TQStringList partList = TQStringList::split('.', m_currentURL.host(), false); if (!partList.isEmpty()) @@ -248,7 +248,7 @@ KRemoteEncodingPlugin::updateBrowser() { TQCString rtype; TQByteArray rdata; - client->call( *it, "KIO::Scheduler", "reparseSlaveConfiguration(TQString)", + client->call( *it, "TDEIO::Scheduler", "reparseSlaveConfiguration(TQString)", data, rtype, rdata); } delete client; diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.h b/konqueror/remoteencodingplugin/kremoteencodingplugin.h index b518da326..d663baf6c 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.h +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.h @@ -27,7 +27,7 @@ #include <kparts/plugin.h> class KActionMenu; -class KConfig; +class TDEConfig; class KonqDirPart; class KRemoteEncodingPlugin: public KParts::Plugin |