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 | |
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')
20 files changed, 66 insertions, 66 deletions
diff --git a/kbabel/kbabeldict/dictchooser.cpp b/kbabel/kbabeldict/dictchooser.cpp index 55ccbefc..f5a3701f 100644 --- a/kbabel/kbabeldict/dictchooser.cpp +++ b/kbabel/kbabeldict/dictchooser.cpp @@ -304,7 +304,7 @@ void DictChooser::configureSelected() tempConfig.insert(mi->id ,tmp); kdDebug(KBABEL_SEARCH) << "Temp file: " << tmp->name() << endl; - KConfig config(tmp->name()); + TDEConfig config(tmp->name()); config.setGroup(mi->id); box->saveSettings(mi->id, &config); } @@ -323,7 +323,7 @@ void DictChooser::restoreConfig() TQDictIterator<KTempFile> it( tempConfig ); // See TQDictIterator for( ; it.current(); ++it ) { - KConfig config( it.current()->name() ); + TDEConfig config( it.current()->name() ); config.setGroup( it.currentKey() ); box->readSettings( it.currentKey(), &config); } diff --git a/kbabel/kbabeldict/kbabeldict.cpp b/kbabel/kbabeldict/kbabeldict.cpp index c4fd67ae..cb2ed323 100644 --- a/kbabel/kbabeldict/kbabeldict.cpp +++ b/kbabel/kbabeldict/kbabeldict.cpp @@ -73,15 +73,15 @@ KBabelDict::~KBabelDict() void KBabelDict::saveConfig() { - KConfig *config=TDEGlobal::config(); - KConfigGroupSaver gs(config,"KBabelDict"); + TDEConfig *config=TDEGlobal::config(); + TDEConfigGroupSaver gs(config,"KBabelDict"); config->writeEntry("Preferences",view->prefVisible()); } void KBabelDict::readConfig() { - KConfig *config=TDEGlobal::config(); - KConfigGroupSaver gs(config,"KBabelDict"); + TDEConfig *config=TDEGlobal::config(); + TDEConfigGroupSaver gs(config,"KBabelDict"); bool pref=config->readBoolEntry("Preferences",true); if(view->prefVisible() != pref) diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp index 4fa44389..35abc555 100644 --- a/kbabel/kbabeldict/kbabeldictbox.cpp +++ b/kbabel/kbabeldict/kbabeldictbox.cpp @@ -367,7 +367,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) for( TQStringList::Iterator rit = rcList.begin(); rit != rcList.end(); ++rit) { - KConfig rcConfig((*rit),true,false); + TDEConfig rcConfig((*rit),true,false); rcConfig.setGroup("SearchEngine"); @@ -504,9 +504,9 @@ void KBabelDictBox::registerModule( SearchEngine* e ) , TQT_SIGNAL(errorInModule(const TQString&))); } -void KBabelDictBox::saveSettings(KConfigBase *config) +void KBabelDictBox::saveSettings(TDEConfigBase *config) { - KConfigGroupSaver cs(config,"KBabelDict"); + TDEConfigGroupSaver cs(config,"KBabelDict"); config->writeEntry("ResultSplitter",resultSplitter->sizes()); @@ -527,7 +527,7 @@ void KBabelDictBox::saveSettings(KConfigBase *config) } -void KBabelDictBox::saveSettings(const TQString& moduleId, KConfigBase *config) +void KBabelDictBox::saveSettings(const TQString& moduleId, TDEConfigBase *config) { SearchEngine *e; @@ -541,10 +541,10 @@ void KBabelDictBox::saveSettings(const TQString& moduleId, KConfigBase *config) } } -void KBabelDictBox::readSettings(KConfigBase *config) +void KBabelDictBox::readSettings(TDEConfigBase *config) { SearchEngine *e; - KConfigGroupSaver cs(config,"KBabelDict"); + TDEConfigGroupSaver cs(config,"KBabelDict"); TQValueList<int> sizes=config->readIntListEntry("ResultSplitter"); if(!sizes.isEmpty()) resultSplitter->setSizes(sizes); @@ -562,7 +562,7 @@ void KBabelDictBox::readSettings(KConfigBase *config) } } -void KBabelDictBox::readSettings(const TQString& moduleId, KConfigBase *config) +void KBabelDictBox::readSettings(const TQString& moduleId, TDEConfigBase *config) { SearchEngine *e; diff --git a/kbabel/kbabeldict/kbabeldictbox.h b/kbabel/kbabeldict/kbabeldictbox.h index b88c9cfc..5f6fc885 100644 --- a/kbabel/kbabeldict/kbabeldictbox.h +++ b/kbabel/kbabeldict/kbabeldictbox.h @@ -115,25 +115,25 @@ public: * Saves the settings including the settings of the different modules * in the given config object. */ - void saveSettings(KConfigBase *config); + void saveSettings(TDEConfigBase *config); /** * Saves the settings of the given module * in the given config object. */ - void saveSettings(const TQString& moduleId, KConfigBase *config); + void saveSettings(const TQString& moduleId, TDEConfigBase *config); /** * Reads the settings including the settings of the different modules * from the given config object. */ - void readSettings(KConfigBase *config); + void readSettings(TDEConfigBase *config); /** * Reads the settings of the given module * from the given config object. */ - void readSettings(const TQString& moduleId, KConfigBase *config); + void readSettings(const TQString& moduleId, TDEConfigBase *config); diff --git a/kbabel/kbabeldict/kbabeldictview.cpp b/kbabel/kbabeldict/kbabeldictview.cpp index 739dd969..437de9e5 100644 --- a/kbabel/kbabeldict/kbabeldictview.cpp +++ b/kbabel/kbabeldict/kbabeldictview.cpp @@ -129,7 +129,7 @@ KBabelDictView::KBabelDictView( TQWidget* parent, const char* name, WFlags fl ) tempLayout->addWidget(prefStack); tempLayout->addStretch(1); - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); dictBox->readSettings(config); dictBox->setAutoUpdateOptions(true); @@ -185,7 +185,7 @@ KBabelDictView::KBabelDictView( TQWidget* parent, const char* name, WFlags fl ) KBabelDictView::~KBabelDictView() { // no need to delete child widgets, TQt does it all for us - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); dictBox->saveSettings(config); } 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; diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h index d246c5a7..e7edb3c3 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h +++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h @@ -191,8 +191,8 @@ public: virtual bool isReady() const ; virtual bool isSearching() const; - virtual void saveSettings(KConfigBase *config); - virtual void readSettings(KConfigBase *config); + virtual void saveSettings(TDEConfigBase *config); + virtual void readSettings(TDEConfigBase *config); virtual PrefWidget *preferencesWidget(TQWidget *parent); diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp index 699e3530..4ee016cd 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp @@ -440,19 +440,19 @@ DataBaseManager::openDataBase () // use temporary file instead if (ret == 0) { - KIO::NetAccess::del (KURL::fromPathOrURL (transfilename)); + TDEIO::NetAccess::del (KURL::fromPathOrURL (transfilename)); copy_hack (*transFile.file (), transfilenameFile); transFile.unlink (); - KIO::NetAccess::del (KURL::fromPathOrURL (infofilename)); + TDEIO::NetAccess::del (KURL::fromPathOrURL (infofilename)); copy_hack (*infoFile.file (), infofilenameFile); infoFile.unlink (); - KIO::NetAccess::del (KURL::fromPathOrURL (wordsfilename)); + TDEIO::NetAccess::del (KURL::fromPathOrURL (wordsfilename)); copy_hack (*wordsFile.file (), wordfilenameFile); wordsFile.unlink (); - KIO::NetAccess::del (KURL::fromPathOrURL (keysfilename)); + TDEIO::NetAccess::del (KURL::fromPathOrURL (keysfilename)); copy_hack (*keysFile.file (), keysfilenameFile); keysFile.unlink (); diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp index 04c0ffde..d81dcc93 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp @@ -276,9 +276,9 @@ PrefWidget * KDBSearchEngine2::preferencesWidget(TQWidget *parent) return pw; } -void KDBSearchEngine2::saveSettings(KConfigBase *config) +void KDBSearchEngine2::saveSettings(TDEConfigBase *config) { - KConfigGroupSaver cgs(config,"KDBSearchEngine2"); + TDEConfigGroupSaver cgs(config,"KDBSearchEngine2"); @@ -318,7 +318,7 @@ void KDBSearchEngine2::saveSettings(KConfigBase *config) } } -void KDBSearchEngine2::readSettings(KConfigBase *config) +void KDBSearchEngine2::readSettings(TDEConfigBase *config) { /*TQString defaultDir; @@ -331,7 +331,7 @@ void KDBSearchEngine2::readSettings(KConfigBase *config) defaultDir += "kbabeldict/dbsearchengine2"; } */ - KConfigGroupSaver cgs(config,"KDBSearchEngine2"); + TDEConfigGroupSaver cgs(config,"KDBSearchEngine2"); // dbDirectory=config->readEntry("DBDirectory",defaultDir); autoAdd=config->readBoolEntry("AutoAdd",true); diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h index 29615e9e..9f8d804c 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h +++ b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h @@ -43,8 +43,8 @@ class KDBSearchEngine2 : public SearchEngine bool isReady() const {return iAmReady; } - void saveSettings(KConfigBase *config); - void readSettings(KConfigBase *config); + void saveSettings(TDEConfigBase *config); + void readSettings(TDEConfigBase *config); TQString translate(const TQString text); diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp index 923d9897..9ba90514 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp @@ -33,7 +33,7 @@ MessagesSource::MessagesSource() { //FIXMR: check if we should put something in that constructor } -void MessagesSource::writeConfig(KConfigBase *config) +void MessagesSource::writeConfig(TDEConfigBase *config) { config->writeEntry("Location",location.url()); config->writeEntry("LocationType",type); @@ -42,7 +42,7 @@ void MessagesSource::writeConfig(KConfigBase *config) config->writeEntry("Status",status); } -void MessagesSource::readConfig(KConfigBase *config) +void MessagesSource::readConfig(TDEConfigBase *config) { location=config->readEntry("Location"); type=config->readNumEntry("LocationType",0); diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h index 9aaf2dce..be3ff8d7 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h @@ -31,7 +31,7 @@ #include "sourcedialog.h" -class KConfigBase; +class TDEConfigBase; class MessagesSource { @@ -39,8 +39,8 @@ class MessagesSource public: MessagesSource(); - void writeConfig(KConfigBase *config); - void readConfig(KConfigBase *config); + void writeConfig(TDEConfigBase *config); + void readConfig(TDEConfigBase *config); void setDialogValues(SourceDialog *sd); void getDialogValues(SourceDialog *sd); diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp index fad15a21..8101c377 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp @@ -86,7 +86,7 @@ bool PoAuxiliary::isSearching() const } -void PoAuxiliary::saveSettings(KConfigBase *config) +void PoAuxiliary::saveSettings(TDEConfigBase *config) { if(autoUpdate && prefWidget && prefWidget->settingsChanged()) { @@ -97,7 +97,7 @@ void PoAuxiliary::saveSettings(KConfigBase *config) config->writeEntry("IgnoreFuzzy",ignoreFuzzy); } -void PoAuxiliary::readSettings(KConfigBase *config) +void PoAuxiliary::readSettings(TDEConfigBase *config) { bool needLoading=false; diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h index eaa8b890..c04a8db4 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h +++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h @@ -62,8 +62,8 @@ public: virtual bool isSearching() const; - virtual void saveSettings(KConfigBase *config); - virtual void readSettings(KConfigBase *config); + virtual void saveSettings(TDEConfigBase *config); + virtual void readSettings(TDEConfigBase *config); virtual PrefWidget *preferencesWidget(TQWidget *parent); diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp index 078d853a..e7a82d9a 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp @@ -113,7 +113,7 @@ bool PoCompendium::isSearching() const } -void PoCompendium::saveSettings(KConfigBase *config ) +void PoCompendium::saveSettings(TDEConfigBase *config ) { if(autoUpdate && prefWidget && prefWidget->settingsChanged()) { @@ -133,7 +133,7 @@ void PoCompendium::saveSettings(KConfigBase *config ) config->writeEntry("Compendium", url); } -void PoCompendium::readSettings(KConfigBase *config) +void PoCompendium::readSettings(TDEConfigBase *config) { caseSensitive = config->readBoolEntry("CaseSensitive", false); ignoreFuzzy = config->readBoolEntry("IgnoreFuzzy",true); diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.h b/kbabel/kbabeldict/modules/pocompendium/pocompendium.h index ef6eec63..deb1a16d 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.h +++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.h @@ -45,7 +45,7 @@ #include <tqptrlist.h> class CompendiumPreferencesWidget; -class KConfigBase; +class TDEConfigBase; class TQTimer; class PoCompendium : public SearchEngine @@ -65,8 +65,8 @@ public: virtual bool isSearching() const; - virtual void saveSettings(KConfigBase *config); - virtual void readSettings(KConfigBase *config); + virtual void saveSettings(TDEConfigBase *config); + virtual void readSettings(TDEConfigBase *config); virtual PrefWidget *preferencesWidget(TQWidget *parent); diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp index 7f2bc8b6..913402d8 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp @@ -107,7 +107,7 @@ bool TmxCompendium::isSearching() const } -void TmxCompendium::saveSettings(KConfigBase *config) +void TmxCompendium::saveSettings(TDEConfigBase *config) { if(autoUpdate && prefWidget && prefWidget->settingsChanged()) { @@ -126,7 +126,7 @@ void TmxCompendium::saveSettings(KConfigBase *config) config->writeEntry("Compendium", url); } -void TmxCompendium::readSettings(KConfigBase *config) +void TmxCompendium::readSettings(TDEConfigBase *config) { caseSensitive = config->readBoolEntry("CaseSensitive", false); wholeWords = config->readBoolEntry("WholeWords",true); diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.h b/kbabel/kbabeldict/modules/tmx/tmxcompendium.h index 8f75f5e6..992c5d93 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.h +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.h @@ -44,7 +44,7 @@ #include <tqguardedptr.h> class TmxCompendiumPreferencesWidget; -class KConfigBase; +class TDEConfigBase; class TQTimer; class TmxCompendium : public SearchEngine @@ -63,8 +63,8 @@ public: virtual bool isSearching() const; - virtual void saveSettings(KConfigBase *config); - virtual void readSettings(KConfigBase *config); + virtual void saveSettings(TDEConfigBase *config); + virtual void readSettings(TDEConfigBase *config); virtual PrefWidget *preferencesWidget(TQWidget *parent); diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp index 0c186b57..0f849e9c 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp @@ -83,7 +83,7 @@ bool TmxCompendiumData::load(const KURL& url, const TQString& language) TQString target; - if( KIO::NetAccess::download( url, target ) ) + if( TDEIO::NetAccess::download( url, target ) ) { TQFile f( target ); if ( !f.open( IO_ReadOnly ) ) @@ -96,7 +96,7 @@ bool TmxCompendiumData::load(const KURL& url, const TQString& language) _errorMsg = i18n( "Cannot parse XML data." ); } f.close(); - KIO::NetAccess::removeTempFile(target); + TDEIO::NetAccess::removeTempFile(target); } else { _error = true; _errorMsg = i18n( "Cannot open the file." ); diff --git a/kbabel/kbabeldict/searchengine.h b/kbabel/kbabeldict/searchengine.h index ace70b9c..ca729469 100644 --- a/kbabel/kbabeldict/searchengine.h +++ b/kbabel/kbabeldict/searchengine.h @@ -288,8 +288,8 @@ public: /** save the settings in the given config object */ - virtual void saveSettings(KConfigBase *config) = 0; - virtual void readSettings(KConfigBase *config) = 0; + virtual void saveSettings(TDEConfigBase *config) = 0; + virtual void readSettings(TDEConfigBase *config) = 0; /** @returns true, if it was initialized correctly */ virtual bool isReady() const =0; |