Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

16 files changed, 80 insertions, 80 deletions

diff --git a/kolf/canvasitem.cpp b/kolf/canvasitem.cpp
index e8f199e3..2da0ee8c 100644
--- a/kolf/canvasitem.cpp
+++ b/kolf/canvasitem.cpp
@@ -35,7 +35,7 @@ TQCanvasRectangle *CanvasItem::onVStrut()
 	return aboveVStrut && ritem? ritem : 0;
 }
 
-void CanvasItem::save(KConfig *cfg)
+void CanvasItem::save(TDEConfig *cfg)
 {
 	cfg->writeEntry("dummykey", true);
 }
diff --git a/kolf/canvasitem.h b/kolf/canvasitem.h
index 6b789dfa..2b1bd1b4 100644
--- a/kolf/canvasitem.h
+++ b/kolf/canvasitem.h
@@ -6,7 +6,7 @@
 #include "config.h"
 
 class Ball;
-class KConfig;
+class TDEConfig;
 class StateDB;
 class KolfGame;
 
@@ -16,9 +16,9 @@ public:
 	CanvasItem() { game = 0; }
 	virtual ~CanvasItem() {}
 	/**
-	 * load your settings from the KConfig, which represents a course.
+	 * load your settings from the TDEConfig, which represents a course.
 	 */
-	virtual void load(KConfig *) {}
+	virtual void load(TDEConfig *) {}
 	/**
 	 * load a point if you wish. Rarely necessary.
 	 */
@@ -38,7 +38,7 @@ public:
 	/**
 	 * save your settings.
 	 */
-	virtual void save(KConfig *cfg);
+	virtual void save(TDEConfig *cfg);
 	/**
 	 * save a point if you wish. Rarely necessary.
 	 */
diff --git a/kolf/floater.cpp b/kolf/floater.cpp
index ff42398a..f0103595 100644
--- a/kolf/floater.cpp
+++ b/kolf/floater.cpp
@@ -220,7 +220,7 @@ void Floater::loadState(StateDB *db)
 	move(moveTo.x(), moveTo.y());
 }
 
-void Floater::save(KConfig *cfg)
+void Floater::save(TDEConfig *cfg)
 {
 	cfg->writeEntry("speed", speed);
 	cfg->writeEntry("startPoint", TQPoint(wall->startPoint().x() + wall->x(), wall->startPoint().y() + wall->y()));
@@ -229,7 +229,7 @@ void Floater::save(KConfig *cfg)
 	doSave(cfg);
 }
 
-void Floater::load(KConfig *cfg)
+void Floater::load(TDEConfig *cfg)
 {
 	move(firstPoint.x(), firstPoint.y());
 
diff --git a/kolf/floater.h b/kolf/floater.h
index 0f70c60c..07cc1842 100644
--- a/kolf/floater.h
+++ b/kolf/floater.h
@@ -41,8 +41,8 @@ public:
 	virtual bool collision(Ball *ball, long int id) { Bridge::collision(ball, id); return false; }
 	virtual void saveState(StateDB *db);
 	virtual void loadState(StateDB *db);
-	virtual void save(KConfig *cfg);
-	virtual void load(KConfig *cfg);
+	virtual void save(TDEConfig *cfg);
+	virtual void load(TDEConfig *cfg);
 	virtual bool loadLast() const { return true; }
 	virtual void firstMove(int x, int y);
 	virtual void aboutToSave();
diff --git a/kolf/game.cpp b/kolf/game.cpp
index 80ede233..e3d455cd 100644
--- a/kolf/game.cpp
+++ b/kolf/game.cpp
@@ -346,12 +346,12 @@ void Bridge::moveBy(double dx, double dy)
 	}
 }
 
-void Bridge::load(KConfig *cfg)
+void Bridge::load(TDEConfig *cfg)
 {
 	doLoad(cfg);
 }
 
-void Bridge::doLoad(KConfig *cfg)
+void Bridge::doLoad(TDEConfig *cfg)
 {
 	newSize(cfg->readNumEntry("width", width()), cfg->readNumEntry("height", height()));
 	setTopWallVisible(cfg->readBoolEntry("topWallVisible", topWallVisible()));
@@ -360,12 +360,12 @@ void Bridge::doLoad(KConfig *cfg)
 	setRightWallVisible(cfg->readBoolEntry("rightWallVisible", rightWallVisible()));
 }
 
-void Bridge::save(KConfig *cfg)
+void Bridge::save(TDEConfig *cfg)
 {
 	doSave(cfg);
 }
 
-void Bridge::doSave(KConfig *cfg)
+void Bridge::doSave(TDEConfig *cfg)
 {
 	cfg->writeEntry("width", width());
 	cfg->writeEntry("height", height());
@@ -506,7 +506,7 @@ void Windmill::setGame(KolfGame *game)
 	right->setGame(game);
 }
 
-void Windmill::save(KConfig *cfg)
+void Windmill::save(TDEConfig *cfg)
 {
 	cfg->writeEntry("speed", speed);
 	cfg->writeEntry("bottom", m_bottom);
@@ -514,7 +514,7 @@ void Windmill::save(KConfig *cfg)
 	doSave(cfg);
 }
 
-void Windmill::load(KConfig *cfg)
+void Windmill::load(TDEConfig *cfg)
 {
 	setSpeed(cfg->readNumEntry("speed", -1));
 
@@ -598,7 +598,7 @@ Sign::Sign(TQCanvas *canvas)
 	setRightWallVisible(true);
 }
 
-void Sign::load(KConfig *cfg)
+void Sign::load(TDEConfig *cfg)
 {
 	m_text = cfg->readEntry("Comment", m_text);
 	m_untranslatedText = cfg->readEntryUntranslated("Comment", m_untranslatedText);
@@ -606,7 +606,7 @@ void Sign::load(KConfig *cfg)
 	doLoad(cfg);
 }
 
-void Sign::save(KConfig *cfg)
+void Sign::save(TDEConfig *cfg)
 {
 	cfg->writeEntry("Comment", m_untranslatedText);
 
@@ -794,7 +794,7 @@ void Ellipse::advance(int phase)
 	}
 }
 
-void Ellipse::load(KConfig *cfg)
+void Ellipse::load(TDEConfig *cfg)
 {
 	setChangeEnabled(cfg->readBoolEntry("changeEnabled", changeEnabled()));
 	setChangeEvery(cfg->readNumEntry("changeEvery", changeEvery()));
@@ -804,7 +804,7 @@ void Ellipse::load(KConfig *cfg)
 	newSize(newWidth, newHeight);
 }
 
-void Ellipse::save(KConfig *cfg)
+void Ellipse::save(TDEConfig *cfg)
 {
 	cfg->writeEntry("changeEvery", changeEvery());
 	cfg->writeEntry("changeEnabled", changeEnabled());
@@ -1207,7 +1207,7 @@ bool Cup::place(Ball *ball, bool /*wasCenter*/)
 	return true;
 }
 
-void Cup::save(KConfig *cfg)
+void Cup::save(TDEConfig *cfg)
 {
 	cfg->writeEntry("dummykey", true);
 }
@@ -1380,7 +1380,7 @@ void BlackHole::halfway()
 	playSound("blackhole");
 }
 
-void BlackHole::load(KConfig *cfg)
+void BlackHole::load(TDEConfig *cfg)
 {
 	TQPoint exit = cfg->readPointEntry("exit", &exit);
 	exitItem->setX(exit.x());
@@ -1421,7 +1421,7 @@ void BlackHole::finishMe()
 	exitItem->setVisible(true);
 }
 
-void BlackHole::save(KConfig *cfg)
+void BlackHole::save(TDEConfig *cfg)
 {
 	cfg->writeEntry("exit", TQPoint(exitItem->x(), exitItem->y()));
 	cfg->writeEntry("exitDeg", exitDeg);
@@ -1932,7 +1932,7 @@ bool Wall::collision(Ball *ball, long int id)
 	return false;
 }
 
-void Wall::load(KConfig *cfg)
+void Wall::load(TDEConfig *cfg)
 {
 	TQPoint start(startPoint());
 	start = cfg->readPointEntry("startPoint", &start);
@@ -1946,7 +1946,7 @@ void Wall::load(KConfig *cfg)
 	endItem->move(end.x(), end.y());
 }
 
-void Wall::save(KConfig *cfg)
+void Wall::save(TDEConfig *cfg)
 {
 	cfg->writeEntry("startPoint", TQPoint(startItem->x(), startItem->y()));
 	cfg->writeEntry("endPoint", TQPoint(endItem->x(), endItem->y()));
@@ -2334,7 +2334,7 @@ void KolfGame::setFilename(const TQString &filename)
 {
 	this->filename = filename;
 	delete cfg;
-	cfg = new KConfig(filename, false, false);
+	cfg = new TDEConfig(filename, false, false);
 }
 
 KolfGame::~KolfGame()
@@ -4209,7 +4209,7 @@ void KolfGame::setSound(bool yes)
 
 void KolfGame::courseInfo(CourseInfo &info, const TQString& filename)
 {
-	KConfig cfg(filename);
+	TDEConfig cfg(filename);
 	cfg.setGroup("0-course@-50,-50");
 	info.author = cfg.readEntry("author", info.author);
 	info.name = cfg.readEntry("Name", cfg.readEntry("name", info.name));
@@ -4236,7 +4236,7 @@ void KolfGame::courseInfo(CourseInfo &info, const TQString& filename)
 	info.holes = hole;
 }
 
-void KolfGame::scoresFromSaved(KConfig *config, PlayerList &players)
+void KolfGame::scoresFromSaved(TDEConfig *config, PlayerList &players)
 {
 	config->setGroup("0 Saved Game");
 	int numPlayers = config->readNumEntry("Players", 0);
@@ -4261,7 +4261,7 @@ void KolfGame::scoresFromSaved(KConfig *config, PlayerList &players)
 	}
 }
 
-void KolfGame::saveScores(KConfig *config)
+void KolfGame::saveScores(TDEConfig *config)
 {
 	// wipe out old player info
 	TQStringList groups = config->groupList();
diff --git a/kolf/game.h b/kolf/game.h
index da5c0beb..ee940802 100644
--- a/kolf/game.h
+++ b/kolf/game.h
@@ -38,7 +38,7 @@ class TQTimer;
 class TQKeyEvent;
 class TQMouseEvent;
 class TQPainter;
-class KConfig;
+class TDEConfig;
 class KPrinter;
 class KolfGame;
 
@@ -51,8 +51,8 @@ class Player;
 class BallStateInfo
 {
 public:
-	void saveState(KConfig *cfg);
-	void loadState(KConfig *cfg);
+	void saveState(TDEConfig *cfg);
+	void loadState(TDEConfig *cfg);
 
 	int id;
 	TQPoint spot;
@@ -178,8 +178,8 @@ public:
 
 	virtual void editModeChanged(bool changed);
 
-	virtual void save(KConfig *cfg);
-	virtual void load(KConfig *cfg);
+	virtual void save(TDEConfig *cfg);
+	virtual void load(TDEConfig *cfg);
 
 	virtual Config *config(TQWidget *parent);
 
@@ -300,7 +300,7 @@ class Cup : public Hole
 public:
 	Cup(TQCanvas *canvas);
 	virtual bool place(Ball *ball, bool wasCenter);
-	virtual void save(KConfig *cfg);
+	virtual void save(TDEConfig *cfg);
 	virtual bool canBeMovedByOthers() const { return true; }
 	virtual void draw(TQPainter &painter);
 
@@ -384,8 +384,8 @@ public:
 	virtual void showInfo();
 	virtual void hideInfo();
 	virtual bool place(Ball *ball, bool wasCenter);
-	virtual void save(KConfig *cfg);
-	virtual void load(KConfig *cfg);
+	virtual void save(TDEConfig *cfg);
+	virtual void load(TDEConfig *cfg);
 	virtual Config *config(TQWidget *parent) { return new BlackHoleConfig(this, parent); }
 	virtual TQPtrList<TQCanvasItem> moveableItems() const;
 	double minSpeed() const { return m_minSpeed; }
@@ -438,8 +438,8 @@ public:
 	virtual void setZ(double newz);
 	virtual void setPen(TQPen p);
 	virtual bool collision(Ball *ball, long int id);
-	virtual void save(KConfig *cfg);
-	virtual void load(KConfig *cfg);
+	virtual void save(TDEConfig *cfg);
+	virtual void load(TDEConfig *cfg);
 	virtual void selectedItem(TQCanvasItem *item);
 	virtual void editModeChanged(bool changed);
 	virtual void moveBy(double dx, double dy);
@@ -574,11 +574,11 @@ public:
 	virtual void aboutToDie();
 	virtual void editModeChanged(bool changed);
 	virtual void moveBy(double dx, double dy);
-	virtual void load(KConfig *cfg);
-	virtual void save(KConfig *cfg);
+	virtual void load(TDEConfig *cfg);
+	virtual void save(TDEConfig *cfg);
 	virtual bool vStrut() const { return true; }
-	void doLoad(KConfig *cfg);
-	void doSave(KConfig *cfg);
+	void doLoad(TDEConfig *cfg);
+	void doSave(TDEConfig *cfg);
 	virtual void newSize(int width, int height);
 	virtual void setGame(KolfGame *game);
 	virtual Config *config(TQWidget *parent) { return new BridgeConfig(this, parent); }
@@ -638,8 +638,8 @@ public:
 	virtual void draw(TQPainter &painter);
 	virtual bool vStrut() const { return false; }
 	virtual Config *config(TQWidget *parent) { return new SignConfig(this, parent); }
-	virtual void save(KConfig *cfg);
-	virtual void load(KConfig *cfg);
+	virtual void save(TDEConfig *cfg);
+	virtual void load(TDEConfig *cfg);
 
 protected:
 	TQString m_text;
@@ -685,8 +685,8 @@ public:
 	Windmill(TQRect rect, TQCanvas *canvas);
 	virtual void aboutToDie();
 	virtual void newSize(int width, int height);
-	virtual void save(KConfig *cfg);
-	virtual void load(KConfig *cfg);
+	virtual void save(TDEConfig *cfg);
+	virtual void load(TDEConfig *cfg);
 	virtual void setGame(KolfGame *game);
 	virtual Config *config(TQWidget *parent) { return new WindmillConfig(this, parent); }
 	void setSize(int width, int height);
@@ -834,7 +834,7 @@ public:
 	void hidePutter() { putter->setVisible(false); }
 	void ignoreEvents(bool ignore) { m_ignoreEvents = ignore; }
 
-	static void scoresFromSaved(KConfig *, PlayerList &players);
+	static void scoresFromSaved(TDEConfig *, PlayerList &players);
 	static void courseInfo(CourseInfo &info, const TQString &filename);
 
 public slots:
@@ -866,7 +866,7 @@ public slots:
 	void setSound(bool yes);
 	void undoShot();
 	void timeout();
-	void saveScores(KConfig *);
+	void saveScores(TDEConfig *);
 	void startFirstHole(int hole);
 	void sayWhosGoing();
 
@@ -1013,7 +1013,7 @@ private:
 
 	bool infoShown;
 
-	KConfig *cfg;
+	TDEConfig *cfg;
 
 	inline void addBorderWall(TQPoint start, TQPoint end);
 	void shotStart();
diff --git a/kolf/kcomboboxdialog.cpp b/kolf/kcomboboxdialog.cpp
index a6e45373..b567e74e 100644
--- a/kolf/kcomboboxdialog.cpp
+++ b/kolf/kcomboboxdialog.cpp
@@ -86,7 +86,7 @@ TQString KComboBoxDialog::getItem( const TQString &_text, const TQString &_capti
 	TQString prevAnswer;
 	if ( !dontAskAgainName.isEmpty() )
 	{
-		KConfig *config = TDEGlobal::config();
+		TDEConfig *config = TDEGlobal::config();
 		config->setGroup( "Notification Messages" );
 		prevAnswer = config->readEntry( dontAskAgainName );
 		if ( !prevAnswer.isEmpty() )
@@ -106,7 +106,7 @@ TQString KComboBoxDialog::getItem( const TQString &_text, const TQString &_capti
 	{
 		if ( !dontAskAgainName.isEmpty() && !text.isEmpty() )
 		{
-			KConfig *config = TDEGlobal::config();
+			TDEConfig *config = TDEGlobal::config();
 			config->setGroup ( "Notification Messages" );
 			config->writeEntry( dontAskAgainName, text );
 		}
@@ -115,7 +115,7 @@ TQString KComboBoxDialog::getItem( const TQString &_text, const TQString &_capti
 	return text;
 }
 
-TQString KComboBoxDialog::getText(const TQString &_caption, const TQString &_text, const TQString &_value, bool *ok, TQWidget *parent, const TQString &configName, KConfig *config)
+TQString KComboBoxDialog::getText(const TQString &_caption, const TQString &_text, const TQString &_value, bool *ok, TQWidget *parent, const TQString &configName, TDEConfig *config)
 {
 	KComboBoxDialog dlg(_text, TQStringList(), _value, false, parent);
 	if ( !_caption.isNull() )
diff --git a/kolf/kcomboboxdialog.h b/kolf/kcomboboxdialog.h
index 61b7ff2e..b55d68d1 100644
--- a/kolf/kcomboboxdialog.h
+++ b/kolf/kcomboboxdialog.h
@@ -98,13 +98,13 @@ public:
 	 * @param ok               Variable to store whether the user hit OK
 	 * @param parent           Parent widget for the dialog
 	 * @param configName       Name of the dialog for saving the completion and history
-	 * @parma config           KConfig for saving the completion and history
+	 * @parma config           TDEConfig for saving the completion and history
 	 */
 	static TQString getText(const TQString &_caption, const TQString &_text,
 	                       const TQString &_value = TQString(),
 	                       bool *ok = 0, TQWidget *parent = 0,
 	                       const TQString &configName = TQString(),
-	                       KConfig *config = TDEGlobal::config());
+	                       TDEConfig *config = TDEGlobal::config());
 
 protected:
 	KHistoryCombo *combo;
diff --git a/kolf/kolf.cpp b/kolf/kolf.cpp
index f40c3f5d..99d7bbfc 100644
--- a/kolf/kolf.cpp
+++ b/kolf/kolf.cpp
@@ -117,7 +117,7 @@ void Kolf::initGUI()
 	useMouseAction = new KToggleAction(i18n("Enable &Mouse for Moving Putter"), 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "usemouse");
 	useMouseAction->setCheckedState(i18n("Disable &Mouse for Moving Putter"));
 	connect(useMouseAction, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(useMouseChanged(bool)));
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	config->setGroup("Settings");
 	useMouseAction->setChecked(config->readBoolEntry("useMouse", true));
 
@@ -196,7 +196,7 @@ void Kolf::startNewGame()
 	}
 	else
 	{
-		KConfig config(loadedGame);
+		TDEConfig config(loadedGame);
 		config.setGroup("0 Saved Game");
 
 		if (isTutorial)
@@ -524,7 +524,7 @@ void Kolf::saveGame()
 		return;
 	}
 
-	KConfig config(loadedGame);
+	TDEConfig config(loadedGame);
 	config.setGroup("0 Saved Game");
 
 	config.writeEntry("Competition", competition);
@@ -550,7 +550,7 @@ void Kolf::loadGame()
 void Kolf::openURL(KURL url)
 {
 	TQString target;
-	if (KIO::NetAccess::download(url, target, this))
+	if (TDEIO::NetAccess::download(url, target, this))
 	{
 		isTutorial = false;
 		TQString mimeType = KMimeType::findByPath(target)->name();
@@ -719,27 +719,27 @@ void Kolf::titleChanged(const TQString &newTitle)
 
 void Kolf::useMouseChanged(bool yes)
 {
-	KConfig *config = kapp->config(); config->setGroup("Settings"); config->writeEntry("useMouse", yes); config->sync();
+	TDEConfig *config = kapp->config(); config->setGroup("Settings"); config->writeEntry("useMouse", yes); config->sync();
 }
 
 void Kolf::useAdvancedPuttingChanged(bool yes)
 {
-	KConfig *config = kapp->config(); config->setGroup("Settings"); config->writeEntry("useAdvancedPutting", yes); config->sync();
+	TDEConfig *config = kapp->config(); config->setGroup("Settings"); config->writeEntry("useAdvancedPutting", yes); config->sync();
 }
 
 void Kolf::showInfoChanged(bool yes)
 {
-	KConfig *config = kapp->config(); config->setGroup("Settings"); config->writeEntry("showInfo", yes); config->sync();
+	TDEConfig *config = kapp->config(); config->setGroup("Settings"); config->writeEntry("showInfo", yes); config->sync();
 }
 
 void Kolf::showGuideLineChanged(bool yes)
 {
-	KConfig *config = kapp->config(); config->setGroup("Settings"); config->writeEntry("showGuideLine", yes); config->sync();
+	TDEConfig *config = kapp->config(); config->setGroup("Settings"); config->writeEntry("showGuideLine", yes); config->sync();
 }
 
 void Kolf::soundChanged(bool yes)
 {
-	KConfig *config = kapp->config(); config->setGroup("Settings"); config->writeEntry("sound", yes); config->sync();
+	TDEConfig *config = kapp->config(); config->setGroup("Settings"); config->writeEntry("sound", yes); config->sync();
 }
 
 void Kolf::initPlugins()
diff --git a/kolf/newgame.cpp b/kolf/newgame.cpp
index a617fc1f..e4c653e1 100644
--- a/kolf/newgame.cpp
+++ b/kolf/newgame.cpp
@@ -41,7 +41,7 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_
 	this->enableCourses = enableCourses;
 
 	editors.setAutoDelete(true);
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 
 	// lots o' colors :)
 	startColors << yellow << blue << red << lightGray << cyan << darkBlue << magenta << darkGray << darkMagenta << darkYellow;
@@ -183,7 +183,7 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_
 
 void NewGameDialog::slotOk()
 {
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 
 	config->setGroup("New Game Dialog Mode");
 	config->writeEntry("competition", mode->isChecked());
diff --git a/kolf/objects/poolball/poolball.cpp b/kolf/objects/poolball/poolball.cpp
index c2fe0718..a87dd301 100644
--- a/kolf/objects/poolball/poolball.cpp
+++ b/kolf/objects/poolball/poolball.cpp
@@ -26,7 +26,7 @@ PoolBall::PoolBall(TQCanvas *canvas)
 	m_number = 1;
 }
 
-void PoolBall::save(KConfig *cfg)
+void PoolBall::save(TDEConfig *cfg)
 {
 	cfg->writeEntry("number", number());
 }
@@ -36,7 +36,7 @@ void PoolBall::saveState(StateDB *db)
 	db->setPoint(TQPoint(x(), y()));
 }
 
-void PoolBall::load(KConfig *cfg)
+void PoolBall::load(TDEConfig *cfg)
 {
 	setNumber(cfg->readNumEntry("number", 1));
 }
diff --git a/kolf/objects/poolball/poolball.h b/kolf/objects/poolball/poolball.h
index ca2ffa80..e6ac0e8a 100644
--- a/kolf/objects/poolball/poolball.h
+++ b/kolf/objects/poolball/poolball.h
@@ -13,7 +13,7 @@
 #include <kolf/object.h>
 
 class StateDB;
-class KConfig;
+class TDEConfig;
 
 class PoolBallFactory : KLibFactory {
     Q_OBJECT
@@ -32,9 +32,9 @@ public:
 
 	virtual Config *config(TQWidget *parent);
 	virtual void saveState(StateDB *);
-	virtual void save(KConfig *cfg);
+	virtual void save(TDEConfig *cfg);
 	virtual void loadState(StateDB *);
-	virtual void load(KConfig *cfg);
+	virtual void load(TDEConfig *cfg);
 	virtual void draw(TQPainter &);
 	virtual bool fastAdvance() const { return true; }
 
diff --git a/kolf/objects/test/test.cpp b/kolf/objects/test/test.cpp
index eabc2e7e..331975fc 100644
--- a/kolf/objects/test/test.cpp
+++ b/kolf/objects/test/test.cpp
@@ -52,14 +52,14 @@ void Test::advance(int phase)
 	}
 }
 
-void Test::save(KConfig *cfg)
+void Test::save(TDEConfig *cfg)
 {
 	// save our option from the course
-	// (courses are represented as KConfig files)
+	// (courses are represented as TDEConfig files)
 	cfg->writeEntry("switchEvery", switchEvery());
 }
 
-void Test::load(KConfig *cfg)
+void Test::load(TDEConfig *cfg)
 {
 	// load our option
 	setSwitchEvery(cfg->readNumEntry("switchEvery", 50));
diff --git a/kolf/objects/test/test.h b/kolf/objects/test/test.h
index b7aa0be5..db4a6205 100644
--- a/kolf/objects/test/test.h
+++ b/kolf/objects/test/test.h
@@ -9,7 +9,7 @@
 #include <kolf/canvasitem.h>
 #include <kolf/object.h>
 
-class KConfig;
+class TDEConfig;
 
 class TestFactory : KLibFactory {
     Q_OBJECT
@@ -25,8 +25,8 @@ public:
 	Test(TQCanvas *canvas);
 
 	virtual Config *config(TQWidget *parent);
-	virtual void save(KConfig *cfg);
-	virtual void load(KConfig *cfg);
+	virtual void save(TDEConfig *cfg);
+	virtual void load(TDEConfig *cfg);
 
 	virtual void advance(int phase);
 
diff --git a/kolf/slope.cpp b/kolf/slope.cpp
index a6a1abf1..b01385bf 100644
--- a/kolf/slope.cpp
+++ b/kolf/slope.cpp
@@ -207,7 +207,7 @@ void Slope::updateZ(TQCanvasRectangle *vStrut)
 	setZ(((double)1 / (area == 0? 1 : area)) + newZ);
 }
 
-void Slope::load(KConfig *cfg)
+void Slope::load(TDEConfig *cfg)
 {
 	stuckOnGround = cfg->readBoolEntry("stuckOnGround", stuckOnGround);
 	grade = cfg->readDoubleNumEntry("grade", grade);
@@ -221,7 +221,7 @@ void Slope::load(KConfig *cfg)
 	setGradient(gradientType);
 }
 
-void Slope::save(KConfig *cfg)
+void Slope::save(TDEConfig *cfg)
 {
 	cfg->writeEntry("reversed", reversed);
 	cfg->writeEntry("width", width());
diff --git a/kolf/slope.h b/kolf/slope.h
index 1b31ab99..6a967f5d 100644
--- a/kolf/slope.h
+++ b/kolf/slope.h
@@ -57,8 +57,8 @@ public:
 	bool isStuckOnGround() const { return stuckOnGround; }
 	void setStuckOnGround(bool yes) { stuckOnGround = yes; updateZ(); }
 
-	virtual void load(KConfig *cfg);
-	virtual void save(KConfig *cfg);
+	virtual void load(TDEConfig *cfg);
+	virtual void save(TDEConfig *cfg);
 
 	virtual bool collision(Ball *ball, long int id);
 	virtual bool terrainCollisions() const;