Rename a number of classes to enhance compatibility with KDE4

6 files changed, 63 insertions, 63 deletions

diff --git a/kolf/editor.cpp b/kolf/editor.cpp
index ae9cde32..422db798 100644
--- a/kolf/editor.cpp
+++ b/kolf/editor.cpp
@@ -19,7 +19,7 @@ Editor::Editor(ObjectList *list, TQWidget *parent, const char *name)
 
 	TQVBoxLayout *vlayout = new TQVBoxLayout(hlayout, KDialog::spacingHint());
 	vlayout->addWidget(new TQLabel(i18n("Add object:"), this));
-	listbox = new KListBox(this, "Listbox");
+	listbox = new TDEListBox(this, "Listbox");
 	vlayout->addWidget(listbox);
 	hlayout->setStretchFactor(vlayout, 2);
 
diff --git a/kolf/editor.h b/kolf/editor.h
index bf41645a..901cb71a 100644
--- a/kolf/editor.h
+++ b/kolf/editor.h
@@ -5,7 +5,7 @@
 
 #include "game.h"
 
-class KListBox;
+class TDEListBox;
 class TQHBoxLayout;
 class TQListBoxItem;
 class Config;
@@ -31,7 +31,7 @@ private slots:
 private:
 	ObjectList *list;
 	TQHBoxLayout *hlayout;
-	KListBox *listbox;
+	TDEListBox *listbox;
 	Config *config;
 };
 
diff --git a/kolf/kolf.cpp b/kolf/kolf.cpp
index b933c333..d51df8df 100644
--- a/kolf/kolf.cpp
+++ b/kolf/kolf.cpp
@@ -48,7 +48,7 @@
 #include "kolf.h"
 
 Kolf::Kolf()
-    : KMainWindow(0, "Kolf")
+    : TDEMainWindow(0, "Kolf")
 {
 	competition = false;
 	game = 0;
@@ -91,63 +91,63 @@ void Kolf::initGUI()
 	saveAsAction = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection(), "game_save_as");
 	saveAsAction->setText(i18n("Save &Course As..."));
 
-	saveGameAction = new KAction(i18n("&Save Game"), 0, TQT_TQOBJECT(this), TQT_SLOT(saveGame()), actionCollection(), "savegame");
-	saveGameAsAction = new KAction(i18n("&Save Game As..."), 0, TQT_TQOBJECT(this), TQT_SLOT(saveGameAs()), actionCollection(), "savegameas");
+	saveGameAction = new TDEAction(i18n("&Save Game"), 0, TQT_TQOBJECT(this), TQT_SLOT(saveGame()), actionCollection(), "savegame");
+	saveGameAsAction = new TDEAction(i18n("&Save Game As..."), 0, TQT_TQOBJECT(this), TQT_SLOT(saveGameAs()), actionCollection(), "savegameas");
 
 	loadGameAction = KStdGameAction::load(TQT_TQOBJECT(this), TQT_SLOT(loadGame()), actionCollection());
 	loadGameAction->setText(i18n("Load Saved Game..."));
 
 	highScoreAction = KStdGameAction::highscores(TQT_TQOBJECT(this), TQT_SLOT(showHighScores()), actionCollection());
 
-	editingAction = new KToggleAction(i18n("&Edit"), "pencil", CTRL+Key_E, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "editing");
-	newHoleAction = new KAction(i18n("&New"), "filenew", CTRL+SHIFT+Key_N, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "newhole");
-	clearHoleAction = new KAction(KStdGuiItem::clear().text(), "locationbar_erase", CTRL+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "clearhole");
-	resetHoleAction = new KAction(i18n("&Reset"), CTRL+Key_R, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "resethole");
+	editingAction = new TDEToggleAction(i18n("&Edit"), "pencil", CTRL+Key_E, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "editing");
+	newHoleAction = new TDEAction(i18n("&New"), "filenew", CTRL+SHIFT+Key_N, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "newhole");
+	clearHoleAction = new TDEAction(KStdGuiItem::clear().text(), "locationbar_erase", CTRL+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "clearhole");
+	resetHoleAction = new TDEAction(i18n("&Reset"), CTRL+Key_R, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "resethole");
 	undoShotAction = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "undoshot");
 	undoShotAction->setText(i18n("&Undo Shot"));
-	//replayShotAction = new KAction(i18n("&Replay Shot"), 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "replay");
+	//replayShotAction = new TDEAction(i18n("&Replay Shot"), 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "replay");
 
-	holeAction = new KListAction(i18n("Switch to Hole"), 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "switchhole");
-	nextAction = new KAction(i18n("&Next Hole"), "forward", KStdAccel::shortcut(KStdAccel::Forward), TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "nexthole");
-	prevAction = new KAction(i18n("&Previous Hole"), "back", KStdAccel::shortcut(KStdAccel::Back), TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "prevhole");
-	firstAction = new KAction(i18n("&First Hole"), "gohome", KStdAccel::shortcut(KStdAccel::Home), TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "firsthole");
-	lastAction = new KAction(i18n("&Last Hole"), CTRL+SHIFT+Key_End, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "lasthole");
-	randAction = new KAction(i18n("&Random Hole"), "goto", 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "randhole");
+	holeAction = new TDEListAction(i18n("Switch to Hole"), 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "switchhole");
+	nextAction = new TDEAction(i18n("&Next Hole"), "forward", TDEStdAccel::shortcut(TDEStdAccel::Forward), TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "nexthole");
+	prevAction = new TDEAction(i18n("&Previous Hole"), "back", TDEStdAccel::shortcut(TDEStdAccel::Back), TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "prevhole");
+	firstAction = new TDEAction(i18n("&First Hole"), "gohome", TDEStdAccel::shortcut(TDEStdAccel::Home), TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "firsthole");
+	lastAction = new TDEAction(i18n("&Last Hole"), CTRL+SHIFT+Key_End, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "lasthole");
+	randAction = new TDEAction(i18n("&Random Hole"), "goto", 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "randhole");
 
-	useMouseAction = new KToggleAction(i18n("Enable &Mouse for Moving Putter"), 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "usemouse");
+	useMouseAction = new TDEToggleAction(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)));
 	TDEConfig *config = kapp->config();
 	config->setGroup("Settings");
 	useMouseAction->setChecked(config->readBoolEntry("useMouse", true));
 
-	useAdvancedPuttingAction = new KToggleAction(i18n("Enable &Advanced Putting"), 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "useadvancedputting");
+	useAdvancedPuttingAction = new TDEToggleAction(i18n("Enable &Advanced Putting"), 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "useadvancedputting");
 	useAdvancedPuttingAction->setCheckedState(i18n("Disable &Advanced Putting"));
 	connect(useAdvancedPuttingAction, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(useAdvancedPuttingChanged(bool)));
 	useAdvancedPuttingAction->setChecked(config->readBoolEntry("useAdvancedPutting", false));
 
-	showInfoAction = new KToggleAction(i18n("Show &Info"), "info", CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "showinfo");
+	showInfoAction = new TDEToggleAction(i18n("Show &Info"), "info", CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "showinfo");
 	showInfoAction->setCheckedState(i18n("Hide &Info"));
 	connect(showInfoAction, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(showInfoChanged(bool)));
 	showInfoAction->setChecked(config->readBoolEntry("showInfo", false));
 
-	showGuideLineAction = new KToggleAction(i18n("Show Putter &Guideline"), 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "showguideline");
+	showGuideLineAction = new TDEToggleAction(i18n("Show Putter &Guideline"), 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "showguideline");
 	showGuideLineAction->setCheckedState(i18n("Hide Putter &Guideline"));
 	connect(showGuideLineAction, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(showGuideLineChanged(bool)));
 	showGuideLineAction->setChecked(config->readBoolEntry("showGuideLine", true));
 
-	KToggleAction *act=new KToggleAction(i18n("Enable All Dialog Boxes"), 0, TQT_TQOBJECT(this), TQT_SLOT(enableAllMessages()), actionCollection(), "enableAll");
+	TDEToggleAction *act=new TDEToggleAction(i18n("Enable All Dialog Boxes"), 0, TQT_TQOBJECT(this), TQT_SLOT(enableAllMessages()), actionCollection(), "enableAll");
 	act->setCheckedState(i18n("Disable All Dialog Boxes"));
 
-	soundAction = new KToggleAction(i18n("Play &Sounds"), 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "sound");
+	soundAction = new TDEToggleAction(i18n("Play &Sounds"), 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "sound");
 	connect(soundAction, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(soundChanged(bool)));
 	soundAction->setChecked(config->readBoolEntry("sound", true));
 
-	(void) new KAction(i18n("&Reload Plugins"), 0, TQT_TQOBJECT(this), TQT_SLOT(initPlugins()), actionCollection(), "reloadplugins");
-	(void) new KAction(i18n("Show &Plugins"), 0, TQT_TQOBJECT(this), TQT_SLOT(showPlugins()), actionCollection(), "showplugins");
+	(void) new TDEAction(i18n("&Reload Plugins"), 0, TQT_TQOBJECT(this), TQT_SLOT(initPlugins()), actionCollection(), "reloadplugins");
+	(void) new TDEAction(i18n("Show &Plugins"), 0, TQT_TQOBJECT(this), TQT_SLOT(showPlugins()), actionCollection(), "showplugins");
 
-	aboutAction = new KAction(i18n("&About Course"), 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "aboutcourse");
-	tutorialAction = new KAction(i18n("&Tutorial"), 0, TQT_TQOBJECT(this), TQT_SLOT(tutorial()), actionCollection(), "tutorial");
+	aboutAction = new TDEAction(i18n("&About Course"), 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "aboutcourse");
+	tutorialAction = new TDEAction(i18n("&Tutorial"), 0, TQT_TQOBJECT(this), TQT_SLOT(tutorial()), actionCollection(), "tutorial");
 
 	statusBar();
 	setupGUI();
@@ -808,7 +808,7 @@ void Kolf::setCurrentHole(int hole)
 {
 	if (!holeAction)
 		return;
-	// Golf is 1-based, KListAction is 0-based
+	// Golf is 1-based, TDEListAction is 0-based
 	holeAction->setCurrentItem(hole - 1);
 }
 
diff --git a/kolf/kolf.h b/kolf/kolf.h
index c8488876..987f710f 100644
--- a/kolf/kolf.h
+++ b/kolf/kolf.h
@@ -13,9 +13,9 @@
 #include "game.h"
 
 class KolfGame;
-class KToggleAction;
-class KListAction;
-class KAction;
+class TDEToggleAction;
+class TDEListAction;
+class TDEAction;
 class TQGridLayout;
 class ScoreBoard;
 class TQCloseEvent;
@@ -24,7 +24,7 @@ class Player;
 class TQWidget;
 class Editor;
 
-class KDE_EXPORT Kolf : public KMainWindow
+class KDE_EXPORT Kolf : public TDEMainWindow
 {
 	Q_OBJECT
   
@@ -90,34 +90,34 @@ private:
 	PlayerList spacerPlayers;
 	TQGridLayout *layout;
 	ScoreBoard *scoreboard;
-	KToggleAction *editingAction;
-	KAction *newHoleAction;
-	KAction *resetHoleAction;
-	KAction *undoShotAction;
-	//KAction *replayShotAction;
-	KAction *clearHoleAction;
-	KAction *tutorialAction;
-	KAction *newAction;
-	KAction *endAction;
-	KAction *printAction;
-	KAction *saveAction;
-	KAction *saveAsAction;
-	KAction *saveGameAction;
-	KAction *saveGameAsAction;
-	KAction *loadGameAction;
-	KAction *aboutAction;
-	KListAction *holeAction;
-	KAction *highScoreAction;
-	KAction *nextAction;
-	KAction *prevAction;
-	KAction *firstAction;
-	KAction *lastAction;
-	KAction *randAction;
-	KToggleAction *showInfoAction;
-	KToggleAction *useMouseAction;
-	KToggleAction *useAdvancedPuttingAction;
-	KToggleAction *showGuideLineAction;
-	KToggleAction *soundAction;
+	TDEToggleAction *editingAction;
+	TDEAction *newHoleAction;
+	TDEAction *resetHoleAction;
+	TDEAction *undoShotAction;
+	//TDEAction *replayShotAction;
+	TDEAction *clearHoleAction;
+	TDEAction *tutorialAction;
+	TDEAction *newAction;
+	TDEAction *endAction;
+	TDEAction *printAction;
+	TDEAction *saveAction;
+	TDEAction *saveAsAction;
+	TDEAction *saveGameAction;
+	TDEAction *saveGameAsAction;
+	TDEAction *loadGameAction;
+	TDEAction *aboutAction;
+	TDEListAction *holeAction;
+	TDEAction *highScoreAction;
+	TDEAction *nextAction;
+	TDEAction *prevAction;
+	TDEAction *firstAction;
+	TDEAction *lastAction;
+	TDEAction *randAction;
+	TDEToggleAction *showInfoAction;
+	TDEToggleAction *useMouseAction;
+	TDEToggleAction *useAdvancedPuttingAction;
+	TDEToggleAction *showGuideLineAction;
+	TDEToggleAction *soundAction;
 	void setHoleMovementEnabled(bool);
 	void setHoleOtherEnabled(bool);
 	inline void setEditingEnabled(bool);
diff --git a/kolf/newgame.cpp b/kolf/newgame.cpp
index 6ef8d95d..4fb92f4e 100644
--- a/kolf/newgame.cpp
+++ b/kolf/newgame.cpp
@@ -127,7 +127,7 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_
 		names.append(TQString());
 		nameList.append(newName);
 
-		courseList = new KListBox(coursePage);
+		courseList = new TDEListBox(coursePage);
 		hlayout->addWidget(courseList);
 		courseList->insertStringList(nameList);
 		courseList->setCurrentItem(curItem);
diff --git a/kolf/newgame.h b/kolf/newgame.h
index 93bc46bc..96dfb95b 100644
--- a/kolf/newgame.h
+++ b/kolf/newgame.h
@@ -21,7 +21,7 @@ class TQFrame;
 class TQVBoxLayout;
 class TQVBox;
 class TQPainter;
-class KListBox;
+class TDEListBox;
 class TQEvent;
 
 class PlayerEditor : public TQWidget
@@ -93,7 +93,7 @@ private:
 
 	TQStringList extraCourses;
 
-	KListBox *courseList;
+	TDEListBox *courseList;
 	TQLabel *name;
 	TQLabel *author;
 	TQLabel *par;