diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
| commit | 703fb0c89c2eee56a1e613e67a446db9d4287929 (patch) | |
| tree | dd8c5ca66075cd89c2638a2b48cf78386a9870a7 /tdecore/ksocks.cpp | |
| parent | 818e7abec3d5d3809b6b77293558678371c16b71 (diff) | |
| download | tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/ksocks.cpp')
| -rw-r--r-- | tdecore/ksocks.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tdecore/ksocks.cpp b/tdecore/ksocks.cpp index 3de74bd88..eb00b1cec 100644 --- a/tdecore/ksocks.cpp +++ b/tdecore/ksocks.cpp @@ -213,7 +213,7 @@ KSocks *KSocks::self() { // Note that we don't use a static deleter here. It makes no sense and tends to cause crashes. if (!_me) { if (kapp) { - KConfigGroup cfg(kapp->config(), "Socks"); + TDEConfigGroup cfg(kapp->config(), "Socks"); _me = new KSocks(&cfg); } else { _disabled = true; @@ -223,7 +223,7 @@ KSocks *KSocks::self() { return _me; } -void KSocks::setConfig(KConfigBase *config) +void KSocks::setConfig(TDEConfigBase *config) { // We can change the config from disabled to enabled // but not the other way around. @@ -239,7 +239,7 @@ void KSocks::setConfig(KConfigBase *config) bool KSocks::activated() { return (_me != 0L); } -KSocks::KSocks(KConfigBase *config) : _socksLib(0L), _st(0L) { +KSocks::KSocks(TDEConfigBase *config) : _socksLib(0L), _st(0L) { _hasSocks = false; _useSocks = false; |