diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:00:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:00:38 -0600 |
| commit | 4bc3dcd8cbc23e1470e121e25a83d57c22e61b26 (patch) | |
| tree | 7d379893635b06789888944241a976a4f2b440ab /konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp | |
| parent | 08a66075486dc740840cfb817bf0ca301c6f0385 (diff) | |
| download | tdeaddons-4bc3dcd8cbc23e1470e121e25a83d57c22e61b26.tar.gz tdeaddons-4bc3dcd8cbc23e1470e121e25a83d57c22e61b26.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp')
| -rw-r--r-- | konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp index 05619ed..e5f8f60 100644 --- a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp +++ b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp @@ -21,7 +21,7 @@ #include <kapplication.h> #include <kaction.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <tdehtml_part.h> #include <kinstance.h> @@ -249,7 +249,7 @@ bool SettingsPlugin::cookiesEnabled( const TQString& url ) // -// sync with kcontrol/kio/ksaveioconfig.* ! +// sync with kcontrol/tdeio/ksaveioconfig.* ! // void SettingsPlugin::toggleProxy() @@ -266,7 +266,7 @@ void SettingsPlugin::toggleProxy() type = KProtocolManager::NoProxy; } - TDEConfig config("kioslaverc", false, false); + TDEConfig config("tdeioslaverc", false, false); config.setGroup( "Proxy Settings" ); config.writeEntry( "ProxyType", type ); |