diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:49 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:49 -0600 |
commit | f8069e2ea048f2657cc417d83820576ec55c181b (patch) | |
tree | cbc5bf540866934a91e0f33b260fc7a25e191fad /kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp | |
parent | e6aaa3624cc6179b82a9bfff1760e742a669064c (diff) | |
download | tdesdk-f8069e2ea048f2657cc417d83820576ec55c181b.tar.gz tdesdk-f8069e2ea048f2657cc417d83820576ec55c181b.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp')
-rw-r--r-- | kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp index 1a0ba180..72042e16 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp @@ -196,20 +196,20 @@ KDBSearchEngine::loadDatabase (TQString database, bool noask = false) ".db"); // rename the old files - KIO::NetAccess::copy (KURL (transFile + ",old"), + TDEIO::NetAccess::copy (KURL (transFile + ",old"), KURL (transFile), 0); - KIO::NetAccess:: + TDEIO::NetAccess:: copy (KURL (database + "/wordsindex." + lang + ".db,old"), KURL (database + "/wordsindex." + lang + ".db"), 0); - KIO::NetAccess:: + TDEIO::NetAccess:: copy (KURL (database + "/keysindex." + lang + ".db,old"), KURL (database + "/keysindex." + lang + ".db"), 0); - KIO::NetAccess:: + TDEIO::NetAccess:: copy (KURL (database + "/catalogsinfo." + lang + ".db,old"), @@ -228,15 +228,15 @@ KDBSearchEngine::loadDatabase (TQString database, bool noask = false) else if (oldstuff) { // rename the old files - KIO::NetAccess::copy (KURL (transFile + ",old"), + TDEIO::NetAccess::copy (KURL (transFile + ",old"), KURL (transFile), 0); - KIO::NetAccess:: + TDEIO::NetAccess:: copy (KURL (database + "/wordsindex." + lang + ".db,old"), KURL (database + "/wordsindex." + lang + ".db"), 0); - KIO::NetAccess:: + TDEIO::NetAccess:: copy (KURL (database + "/keysindex." + lang + ".db,old"), KURL (database + "/keysindex." + lang + ".db"), 0); - KIO::NetAccess:: + TDEIO::NetAccess:: copy (KURL (database + "/catalogsinfo." + lang + ".db,old"), KURL (database + "/catalogsinfo." + lang + ".db"), 0); @@ -1106,10 +1106,10 @@ KDBSearchEngine::isReady () const void -KDBSearchEngine::saveSettings (KConfigBase * config) +KDBSearchEngine::saveSettings (TDEConfigBase * config) { // updateSettings(); //maybe with autoupdate - KConfigGroupSaver cgs (config, "KDBSearchEngine"); + TDEConfigGroupSaver cgs (config, "KDBSearchEngine"); #if KDE_IS_VERSION(3,1,3) config->writePathEntry ("Filename", dbname); #else @@ -1145,11 +1145,11 @@ KDBSearchEngine::saveSettings (KConfigBase * config) void -KDBSearchEngine::readSettings (KConfigBase * config) +KDBSearchEngine::readSettings (TDEConfigBase * config) { TQString newName; - KConfigGroupSaver cgs (config, "KDBSearchEngine"); + TDEConfigGroupSaver cgs (config, "KDBSearchEngine"); TQString defaultLang; TQString oldLang = lang; |