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 /kioslave/http/kcookiejar | |
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 'kioslave/http/kcookiejar')
-rw-r--r-- | kioslave/http/kcookiejar/kcookiejar.cpp | 6 | ||||
-rw-r--r-- | kioslave/http/kcookiejar/kcookiejar.h | 6 | ||||
-rw-r--r-- | kioslave/http/kcookiejar/kcookieserver.cpp | 2 | ||||
-rw-r--r-- | kioslave/http/kcookiejar/kcookieserver.h | 4 | ||||
-rw-r--r-- | kioslave/http/kcookiejar/tests/kcookiejartest.cpp | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/kioslave/http/kcookiejar/kcookiejar.cpp b/kioslave/http/kcookiejar/kcookiejar.cpp index e70c97e54..f115a6da6 100644 --- a/kioslave/http/kcookiejar/kcookiejar.cpp +++ b/kioslave/http/kcookiejar/kcookiejar.cpp @@ -257,7 +257,7 @@ KCookieJar::KCookieJar() m_configChanged = false; m_cookiesChanged = false; - KConfig cfg("khtml/domain_info", true, false, "data"); + TDEConfig cfg("khtml/domain_info", true, false, "data"); TQStringList countries = cfg.readListEntry("twoLevelTLD"); for(TQStringList::ConstIterator it = countries.begin(); it != countries.end(); ++it) @@ -1479,7 +1479,7 @@ bool KCookieJar::loadCookies(const TQString &_filename) // Save the cookie configuration // -void KCookieJar::saveConfig(KConfig *_config) +void KCookieJar::saveConfig(TDEConfig *_config) { if (!m_configChanged) return; @@ -1515,7 +1515,7 @@ void KCookieJar::saveConfig(KConfig *_config) // Load the cookie configuration // -void KCookieJar::loadConfig(KConfig *_config, bool reparse ) +void KCookieJar::loadConfig(TDEConfig *_config, bool reparse ) { if ( reparse ) _config->reparseConfiguration(); diff --git a/kioslave/http/kcookiejar/kcookiejar.h b/kioslave/http/kcookiejar/kcookiejar.h index eb64485ea..bb16d75d3 100644 --- a/kioslave/http/kcookiejar/kcookiejar.h +++ b/kioslave/http/kcookiejar/kcookiejar.h @@ -31,7 +31,7 @@ #include <tqptrlist.h> #include <time.h> -class KConfig; +class TDEConfig; class KCookieJar; class KHttpCookie; class KHttpCookieList; @@ -146,12 +146,12 @@ public: /** * Save the cookie configuration */ - void saveConfig(KConfig *_config); + void saveConfig(TDEConfig *_config); /** * Load the cookie configuration */ - void loadConfig(KConfig *_config, bool reparse = false); + void loadConfig(TDEConfig *_config, bool reparse = false); /** * Looks for cookies in the cookie jar which are appropriate for _url. diff --git a/kioslave/http/kcookiejar/kcookieserver.cpp b/kioslave/http/kcookiejar/kcookieserver.cpp index da9c16ce7..94df40b63 100644 --- a/kioslave/http/kcookiejar/kcookieserver.cpp +++ b/kioslave/http/kcookiejar/kcookieserver.cpp @@ -88,7 +88,7 @@ KCookieServer::KCookieServer(const TQCString &name) mAdvicePending = false; mTimer = new TQTimer(); connect( mTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotSave())); - mConfig = new KConfig("kcookiejarrc"); + mConfig = new TDEConfig("kcookiejarrc"); mCookieJar->loadConfig( mConfig ); TQString filename = locateLocal("data", "kcookiejar/cookies"); diff --git a/kioslave/http/kcookiejar/kcookieserver.h b/kioslave/http/kcookiejar/kcookieserver.h index 0c36f10b1..2cbb9ccf1 100644 --- a/kioslave/http/kcookiejar/kcookieserver.h +++ b/kioslave/http/kcookiejar/kcookieserver.h @@ -34,7 +34,7 @@ class KHttpCookie; class TQTimer; class RequestList; class DCOPClient; -class KConfig; +class TDEConfig; class KCookieServer : public KDEDModule { @@ -86,7 +86,7 @@ protected: TQTimer *mTimer; bool mAdvicePending; DCOPClient *mOldCookieServer; - KConfig *mConfig; + TDEConfig *mConfig; private: virtual int newInstance(TQValueList<TQCString>) { return 0; } diff --git a/kioslave/http/kcookiejar/tests/kcookiejartest.cpp b/kioslave/http/kcookiejar/tests/kcookiejartest.cpp index 05f0ac0ea..236e2406b 100644 --- a/kioslave/http/kcookiejar/tests/kcookiejartest.cpp +++ b/kioslave/http/kcookiejar/tests/kcookiejartest.cpp @@ -36,7 +36,7 @@ static const char *description = "KCookiejar regression test"; static KCookieJar *jar; static TQCString *lastYear; static TQCString *nextYear; -static KConfig *config = 0; +static TDEConfig *config = 0; static KCmdLineOptions options[] = @@ -87,7 +87,7 @@ static void clearConfig() delete config; TQString file = locateLocal("config", "kcookiejar-testconfig"); TQFile::remove(file); - config = new KConfig(file); + config = new TDEConfig(file); config->setGroup("Cookie Policy"); config->writeEntry("RejectCrossDomainCookies", false); config->writeEntry("AcceptSessionCookies", false); |