diff options
-rw-r--r-- | katomic/feld.cpp | 4 | ||||
-rw-r--r-- | katomic/feld.h | 4 | ||||
-rw-r--r-- | katomic/gamewidget.cpp | 4 | ||||
-rw-r--r-- | katomic/molek.cpp | 4 | ||||
-rw-r--r-- | katomic/molek.h | 4 | ||||
-rw-r--r-- | katomic/toplevel.cpp | 2 | ||||
-rw-r--r-- | kjumpingcube/kjumpingcube.cpp | 4 | ||||
-rw-r--r-- | kolf/pluginloader.cpp | 4 | ||||
-rw-r--r-- | libtdegames/highscore/khighscore.cpp | 2 | ||||
-rw-r--r-- | libtdegames/highscore/khighscore.h | 2 | ||||
-rw-r--r-- | libtdegames/highscore/tdeconfigrawbackend.h | 6 | ||||
-rw-r--r-- | libtdegames/kcarddialog.cpp | 14 |
12 files changed, 27 insertions, 27 deletions
diff --git a/katomic/feld.cpp b/katomic/feld.cpp index e8af79eb..bb8f40d1 100644 --- a/katomic/feld.cpp +++ b/katomic/feld.cpp @@ -15,7 +15,7 @@ #include <kiconloader.h> #include <tdeglobal.h> #include <tdestandarddirs.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include "molek.h" #include "feld.h" #include "settings.h" @@ -67,7 +67,7 @@ void Feld::resetValidDirs() } } -void Feld::load (const KSimpleConfig& config) +void Feld::load (const TDESimpleConfig& config) { if(moving) this->killTimers(); diff --git a/katomic/feld.h b/katomic/feld.h index 5f8d5cc4..3af0aa6c 100644 --- a/katomic/feld.h +++ b/katomic/feld.h @@ -22,7 +22,7 @@ #define MAX_UNDO (100) -class KSimpleConfig; +class TDESimpleConfig; class Molek; #define FIELD_SIZE 15 @@ -45,7 +45,7 @@ public: void startAnimation (Direction dir); void done (); - void load (const KSimpleConfig& config); + void load (const TDESimpleConfig& config); void setMolek(Molek *_mol) { mol = _mol; } diff --git a/katomic/gamewidget.cpp b/katomic/gamewidget.cpp index 5266e079..0be6a43b 100644 --- a/katomic/gamewidget.cpp +++ b/katomic/gamewidget.cpp @@ -35,7 +35,7 @@ #include <tdelocale.h> #include <tdestandarddirs.h> #include <tdeglobal.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeglobalsettings.h> Options settings; @@ -143,7 +143,7 @@ void GameWidget::updateLevel (int l) return updateLevel(1); } - KSimpleConfig cfg(levelFile, true); + TDESimpleConfig cfg(levelFile, true); cfg.setGroup("Level"); feld->load(cfg); diff --git a/katomic/molek.cpp b/katomic/molek.cpp index bc3d89ad..d59fd37c 100644 --- a/katomic/molek.cpp +++ b/katomic/molek.cpp @@ -18,7 +18,7 @@ #include <kiconloader.h> #include <tdeglobal.h> #include <tdestandarddirs.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdelocale.h> #include <kdebug.h> @@ -47,7 +47,7 @@ const atom& Molek::getAtom(uint index) const return *atoms.at(index - 1); } -void Molek::load (const KSimpleConfig& config) +void Molek::load (const TDESimpleConfig& config) { atoms.clear(); TQString key; diff --git a/katomic/molek.h b/katomic/molek.h index b019595c..14386e08 100644 --- a/katomic/molek.h +++ b/katomic/molek.h @@ -16,7 +16,7 @@ #include "atom.h" #include <tqvaluelist.h> -class KSimpleConfig; +class TDESimpleConfig; #define MOLEK_SIZE 15 @@ -29,7 +29,7 @@ public: Molek (TQWidget *parent=0, const char *name=0); ~Molek (); - void load(const KSimpleConfig& config); + void load(const TDESimpleConfig& config); const atom& getAtom(uint index) const; int atomSize() const { return atoms.count(); } diff --git a/katomic/toplevel.cpp b/katomic/toplevel.cpp index 40566fc8..4449a5df 100644 --- a/katomic/toplevel.cpp +++ b/katomic/toplevel.cpp @@ -23,7 +23,7 @@ #include <tdeglobal.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <tdeapplication.h> diff --git a/kjumpingcube/kjumpingcube.cpp b/kjumpingcube/kjumpingcube.cpp index dc5ba705..38840680 100644 --- a/kjumpingcube/kjumpingcube.cpp +++ b/kjumpingcube/kjumpingcube.cpp @@ -136,7 +136,7 @@ void KJumpingCube::saveGame(bool saveAs) KTempFile tempFile; tempFile.setAutoDelete(true); - KSimpleConfig config(tempFile.name()); + TDESimpleConfig config(tempFile.name()); config.setGroup("KJumpingCube"); config.writeEntry("Version",KJC_VERSION); @@ -178,7 +178,7 @@ void KJumpingCube::openGame() TQString tempFile; if( TDEIO::NetAccess::download( url, tempFile, this ) ) { - KSimpleConfig config(tempFile,true); + TDESimpleConfig config(tempFile,true); config.setGroup("KJumpingCube"); if(!config.hasKey("Version")) { diff --git a/kolf/pluginloader.cpp b/kolf/pluginloader.cpp index 7df00ab0..63e773fa 100644 --- a/kolf/pluginloader.cpp +++ b/kolf/pluginloader.cpp @@ -7,7 +7,7 @@ #include <kdebug.h> #include <tdeglobal.h> #include <tdestandarddirs.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <klibloader.h> #include "pluginloader.h" @@ -21,7 +21,7 @@ ObjectList *PluginLoader::loadAll() for (TQStringList::Iterator it = files.begin(); it != files.end(); ++it) { - KSimpleConfig cfg(*it); + TDESimpleConfig cfg(*it); TQString filename(cfg.readEntry("Filename", "")); libs.append(filename); diff --git a/libtdegames/highscore/khighscore.cpp b/libtdegames/highscore/khighscore.cpp index 35503301..bdc82845 100644 --- a/libtdegames/highscore/khighscore.cpp +++ b/libtdegames/highscore/khighscore.cpp @@ -27,7 +27,7 @@ #include <sys/file.h> #include <tdeapplication.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeglobal.h> #include <kstdguiitem.h> #include <tdelocale.h> diff --git a/libtdegames/highscore/khighscore.h b/libtdegames/highscore/khighscore.h index b313ac9f..f3b3473e 100644 --- a/libtdegames/highscore/khighscore.h +++ b/libtdegames/highscore/khighscore.h @@ -295,7 +295,7 @@ protected: /** * @return A pointer to the TDEConfig object to be used. This is - * either tdeApp->config() (default) or a KSimpleConfig object for + * either tdeApp->config() (default) or a TDESimpleConfig object for * a system-wide highscore file. **/ TDEConfig* config() const; diff --git a/libtdegames/highscore/tdeconfigrawbackend.h b/libtdegames/highscore/tdeconfigrawbackend.h index fdaeb88a..4ae90f8f 100644 --- a/libtdegames/highscore/tdeconfigrawbackend.h +++ b/libtdegames/highscore/tdeconfigrawbackend.h @@ -23,7 +23,7 @@ #include <tqfile.h> #include <tdeconfigbackend.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> class TDEConfigRawBackEnd : public TDEConfigINIBackEnd @@ -45,13 +45,13 @@ private: TDEConfigRawBackEndPrivate *d; }; -class KRawConfig : public KSimpleConfig +class KRawConfig : public TDESimpleConfig { TQ_OBJECT public: KRawConfig(int fd, bool readOnly) - : KSimpleConfig(new TDEConfigRawBackEnd(this, fd), readOnly) {} + : TDESimpleConfig(new TDEConfigRawBackEnd(this, fd), readOnly) {} }; diff --git a/libtdegames/kcarddialog.cpp b/libtdegames/kcarddialog.cpp index 3a7e98cf..e3735fec 100644 --- a/libtdegames/kcarddialog.cpp +++ b/libtdegames/kcarddialog.cpp @@ -35,7 +35,7 @@ #include <tdelocale.h> #include <tdestandarddirs.h> #include <kiconview.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include "kcarddialog.h" #include <tqpushbutton.h> @@ -464,7 +464,7 @@ void KCardDialog::insertCardIcons() for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { - KSimpleConfig cfg(*it); + TDESimpleConfig cfg(*it); cfg.setGroup(TQString::fromLatin1("KDE Backdeck")); TQString path = (*it).left((*it).findRev('/') + 1); assert(path[path.length() - 1] == '/'); @@ -500,7 +500,7 @@ void KCardDialog::insertDeckIcons() for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { - KSimpleConfig cfg(*it); + TDESimpleConfig cfg(*it); TQPixmap pixmap(getDeckName(*it)); if (pixmap.isNull()) continue; @@ -742,7 +742,7 @@ void KCardDialog::saveConfig(TDEConfig* conf) void KCardDialog::slotSetGlobalDeck() { - KSimpleConfig* conf = new KSimpleConfig(TQString::fromLatin1("kdeglobals"), false); + TDESimpleConfig* conf = new TDESimpleConfig(TQString::fromLatin1("kdeglobals"), false); conf->setGroup(CONF_GLOBAL_GROUP); conf->writeEntry(CONF_GLOBAL_DECK, deck()); @@ -753,7 +753,7 @@ void KCardDialog::slotSetGlobalDeck() void KCardDialog::slotSetGlobalCardDir() { - KSimpleConfig* conf = new KSimpleConfig(TQString::fromLatin1("kdeglobals"), false); + TDESimpleConfig* conf = new TDESimpleConfig(TQString::fromLatin1("kdeglobals"), false); conf->setGroup(CONF_GLOBAL_GROUP); conf->writePathEntry(CONF_GLOBAL_CARDDIR, cardDir()); @@ -764,7 +764,7 @@ void KCardDialog::slotSetGlobalCardDir() void KCardDialog::getGlobalDeck(TQString& deck, bool& random) { - KSimpleConfig* conf = new KSimpleConfig(TQString::fromLatin1("kdeglobals"), true); + TDESimpleConfig* conf = new TDESimpleConfig(TQString::fromLatin1("kdeglobals"), true); conf->setGroup(CONF_GLOBAL_GROUP); if (!conf->hasKey(CONF_GLOBAL_DECK) || conf->readBoolEntry(CONF_GLOBAL_RANDOMDECK, false)) { @@ -780,7 +780,7 @@ void KCardDialog::getGlobalDeck(TQString& deck, bool& random) void KCardDialog::getGlobalCardDir(TQString& dir, bool& random) { - KSimpleConfig* conf = new KSimpleConfig(TQString::fromLatin1("kdeglobals"), true); + TDESimpleConfig* conf = new TDESimpleConfig(TQString::fromLatin1("kdeglobals"), true); conf->setGroup(CONF_GLOBAL_GROUP); if (!conf->hasKey(CONF_GLOBAL_CARDDIR) || conf->readBoolEntry(CONF_GLOBAL_RANDOMCARDDIR, false)) { |