diff options
-rw-r--r-- | keduca/keducabuilder/kcontrolheader.cpp | 6 | ||||
-rw-r--r-- | kig/filters/kgeo-filter.cpp | 10 | ||||
-rw-r--r-- | kig/filters/kgeo-filter.h | 6 | ||||
-rw-r--r-- | kmplot/kmplot/MainDlg.cpp | 4 | ||||
-rw-r--r-- | kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp | 4 |
5 files changed, 15 insertions, 15 deletions
diff --git a/keduca/keducabuilder/kcontrolheader.cpp b/keduca/keducabuilder/kcontrolheader.cpp index d64d7f87..5d74b399 100644 --- a/keduca/keducabuilder/kcontrolheader.cpp +++ b/keduca/keducabuilder/kcontrolheader.cpp @@ -20,7 +20,7 @@ #include <tdelocale.h> #include <tdestandarddirs.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <klineedit.h> #include <kcombobox.h> @@ -267,7 +267,7 @@ void KControlHeader::loadCountryList(KLanguageCombo *combo) index = tag.findRev('.'); if (index != -1) tag.truncate(index); - KSimpleConfig entry(*it); + TDESimpleConfig entry(*it); entry.setGroup(TQString::fromLatin1("KCM Locale")); TQString name = entry.readEntry(TQString::fromLatin1("Name")); @@ -281,7 +281,7 @@ void KControlHeader::loadCountryList(KLanguageCombo *combo) for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) { - KSimpleConfig entry(*it); + TDESimpleConfig entry(*it); entry.setGroup(TQString::fromLatin1("KCM Locale")); TQString name = entry.readEntry(TQString::fromLatin1("Name")); TQString submenu = '-' + entry.readEntry(TQString::fromLatin1("Region")); diff --git a/kig/filters/kgeo-filter.cpp b/kig/filters/kgeo-filter.cpp index 8849256b..1b0900cf 100644 --- a/kig/filters/kgeo-filter.cpp +++ b/kig/filters/kgeo-filter.cpp @@ -42,7 +42,7 @@ #include "../objects/transform_types.h" #include "../objects/vector_type.h" -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <algorithm> #include <functional> @@ -54,14 +54,14 @@ bool KigFilterKGeo::supportMime( const TQString& mime ) KigDocument* KigFilterKGeo::load( const TQString& sFrom ) { - // kgeo uses a KSimpleConfig to save its contents... - KSimpleConfig config ( sFrom ); + // kgeo uses a TDESimpleConfig to save its contents... + TDESimpleConfig config ( sFrom ); loadMetrics ( &config ); return loadObjects ( sFrom, &config ); } -void KigFilterKGeo::loadMetrics(KSimpleConfig* c ) +void KigFilterKGeo::loadMetrics(TDESimpleConfig* c ) { c->setGroup("Main"); xMax = c->readNumEntry("XMax", 16); @@ -100,7 +100,7 @@ static std::vector<KGeoHierarchyElement> sortElems( const std::vector<KGeoHierar return ret; } -KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c ) +KigDocument* KigFilterKGeo::loadObjects( const TQString& file, TDESimpleConfig* c ) { KigDocument* ret = new KigDocument(); diff --git a/kig/filters/kgeo-filter.h b/kig/filters/kgeo-filter.h index 9bac9085..62fae04c 100644 --- a/kig/filters/kgeo-filter.h +++ b/kig/filters/kgeo-filter.h @@ -21,7 +21,7 @@ #include "filter.h" -class KSimpleConfig; +class TDESimpleConfig; /** * This is an import filter for files generated by the program KGeo, @@ -43,8 +43,8 @@ protected: KigFilterKGeo(); ~KigFilterKGeo(); - void loadMetrics ( KSimpleConfig* ); - KigDocument* loadObjects ( const TQString& file, KSimpleConfig* ); + void loadMetrics ( TDESimpleConfig* ); + KigDocument* loadObjects ( const TQString& file, TDESimpleConfig* ); int xMax; int yMax; diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp index 31c62e7f..f880d48b 100644 --- a/kmplot/kmplot/MainDlg.cpp +++ b/kmplot/kmplot/MainDlg.cpp @@ -611,7 +611,7 @@ void MainDlg::updateSettings() void MainDlg::loadConstants() { - KSimpleConfig conf ("kcalcrc"); + TDESimpleConfig conf ("kcalcrc"); conf.setGroup("UserConstants"); TQString tmp; TQString tmp_constant; @@ -674,7 +674,7 @@ void MainDlg::loadConstants() void MainDlg::saveConstants() { - KSimpleConfig conf ("kcalcrc"); + TDESimpleConfig conf ("kcalcrc"); conf.deleteGroup("Constants"); conf.setGroup("UserConstants"); TQString tmp; diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp index 8ceabdf8..b04f1b9e 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp @@ -1032,7 +1032,7 @@ void LanguageOptions::loadCountryData() index = tag.findRev('.'); if (index != -1) tag.truncate(index); - KSimpleConfig entry(*it); + TDESimpleConfig entry(*it); entry.setGroup(TQString::fromLatin1("KCM Locale")); TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); @@ -1045,7 +1045,7 @@ void LanguageOptions::loadCountryData() int idx = 0; for (TQStringList::ConstIterator sit = countrylist.begin(); sit != countrylist.end(); ++sit) { - KSimpleConfig entry(*sit); + TDESimpleConfig entry(*sit); entry.setGroup(TQString::fromLatin1("KCM Locale")); TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); TQString submenu = entry.readEntry(TQString::fromLatin1("Region")); |