diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
| commit | 7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch) | |
| tree | c76702a7f6310fbe9d437e347535422e836e94e9 /tdecore/ksocks.cpp | |
| parent | a2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff) | |
| parent | 27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff) | |
| download | tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdecore/ksocks.cpp')
| -rw-r--r-- | tdecore/ksocks.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tdecore/ksocks.cpp b/tdecore/ksocks.cpp index 3de74bd88..a6ecc37d2 100644 --- a/tdecore/ksocks.cpp +++ b/tdecore/ksocks.cpp @@ -26,11 +26,11 @@ #include <tqstring.h> #include <tqmap.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "klibloader.h" -#include <kconfig.h> -#include <kapplication.h> +#include <tdeconfig.h> +#include <tdeapplication.h> #include <sys/types.h> #include <sys/socket.h> @@ -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; |