diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:28:24 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:28:24 -0600 |
commit | 20de04ce44f63fb911103d7870d39d2782d14cda (patch) | |
tree | bddd13cef2fae98892caf538dc64b5357732c517 /konq-plugins/khtmlsettingsplugin/settingsplugin.cpp | |
parent | 4c097708c4cc24f3b8e4c21f14644f5715767d47 (diff) | |
download | tdeaddons-20de04ce44f63fb911103d7870d39d2782d14cda.tar.gz tdeaddons-20de04ce44f63fb911103d7870d39d2782d14cda.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'konq-plugins/khtmlsettingsplugin/settingsplugin.cpp')
-rw-r--r-- | konq-plugins/khtmlsettingsplugin/settingsplugin.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp index af688f1..1d0548c 100644 --- a/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp +++ b/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp @@ -122,7 +122,7 @@ void SettingsPlugin::showPopup() return; if (!mConfig) - mConfig = new KConfig("settingspluginrc", false, false); + mConfig = new TDEConfig("settingspluginrc", false, false); KHTMLPart *part = static_cast<KHTMLPart *>( parent() ); @@ -137,20 +137,20 @@ void SettingsPlugin::showPopup() ((KToggleAction*)actionCollection()->action("imageloading"))->setChecked( part->autoloadImages() ); ((KToggleAction*)actionCollection()->action("usecache"))->setChecked(KProtocolManager::useCache()); - KIO::CacheControl cc = KProtocolManager::cacheControl(); + TDEIO::CacheControl cc = KProtocolManager::cacheControl(); switch ( cc ) { - case KIO::CC_Verify: + case TDEIO::CC_Verify: ((KSelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 0 ); break; - case KIO::CC_CacheOnly: + case TDEIO::CC_CacheOnly: ((KSelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 2 ); break; - case KIO::CC_Cache: + case TDEIO::CC_Cache: ((KSelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 1 ); break; - case KIO::CC_Reload: // nothing for now - case KIO::CC_Refresh: + case TDEIO::CC_Reload: // nothing for now + case TDEIO::CC_Refresh: default: break; @@ -237,7 +237,7 @@ bool SettingsPlugin::cookiesEnabled( const TQString& url ) enabled = ( advice == "Accept" ); if ( !enabled && advice == "Dunno" ) { // TODO, check the global setting via dcop - KConfig kc( "kcookiejarrc", true, false ); + TDEConfig kc( "kcookiejarrc", true, false ); kc.setGroup( "Cookie Policy" ); enabled = (kc.readEntry( "CookieGlobalAdvice", "Reject" ) == "Accept"); @@ -266,7 +266,7 @@ void SettingsPlugin::toggleProxy() type = KProtocolManager::NoProxy; } - KConfig config("kioslaverc", false, false); + TDEConfig config("kioslaverc", false, false); config.setGroup( "Proxy Settings" ); config.writeEntry( "ProxyType", type ); @@ -278,7 +278,7 @@ void SettingsPlugin::toggleProxy() void SettingsPlugin::toggleCache() { bool usesCache = KProtocolManager::useCache(); - KConfig config( "kio_httprc", false, false ); + TDEConfig config( "kio_httprc", false, false ); config.writeEntry( "UseCache", !usesCache ); ((KToggleAction*)actionCollection()->action("usecache"))->setChecked( !usesCache ); @@ -292,18 +292,18 @@ void SettingsPlugin::cachePolicyChanged( int p ) switch ( p ) { case 0: - policy = KIO::getCacheControlString( KIO::CC_Verify ); + policy = TDEIO::getCacheControlString( TDEIO::CC_Verify ); break; case 1: - policy = KIO::getCacheControlString( KIO::CC_Cache ); + policy = TDEIO::getCacheControlString( TDEIO::CC_Cache ); break; case 2: - policy = KIO::getCacheControlString( KIO::CC_CacheOnly ); + policy = TDEIO::getCacheControlString( TDEIO::CC_CacheOnly ); break; }; if ( !policy.isEmpty() ) { - KConfig config("kio_httprc", false, false); + TDEConfig config("kio_httprc", false, false); config.writeEntry("cache", policy); updateIOSlaves(); @@ -321,7 +321,7 @@ void SettingsPlugin::updateIOSlaves() TQString protocol; // null -> all of them stream << protocol; - client->send( "*", "KIO::Scheduler", + client->send( "*", "TDEIO::Scheduler", "reparseSlaveConfiguration(TQString)", data ); } |