Rename a number of classes to enhance compatibility with KDE4

2 files changed, 16 insertions, 16 deletions

diff --git a/kbattleship/kbattleship/kbattleship.cpp b/kbattleship/kbattleship/kbattleship.cpp
index a1aee315..9a3c141a 100644
--- a/kbattleship/kbattleship/kbattleship.cpp
+++ b/kbattleship/kbattleship/kbattleship.cpp
@@ -36,7 +36,7 @@
 
 extern const char *clientVersion;
 
-KBattleshipWindow::KBattleshipWindow() : KMainWindow()
+KBattleshipWindow::KBattleshipWindow() : TDEMainWindow()
 {
 	shift = false;
 	m_connection = 0;
@@ -93,20 +93,20 @@ void KBattleshipWindow::initStatusBar()
 void KBattleshipWindow::initActions()
 {
 	KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureNotifications()), actionCollection());
-	m_gameServerConnect = new KAction(i18n("&Connect to Server..."), "connect_no", Key_F2, TQT_TQOBJECT(this), TQT_SLOT(slotServerConnect()), actionCollection(), "game_serverconnect");
-	m_gameNewServer = new KAction(i18n("&Start Server..."), "network", Key_F3, TQT_TQOBJECT(this), TQT_SLOT(slotNewServer()), actionCollection(), "game_newserver");
-	m_gameSingle = new KAction(i18n("S&ingle Player..."), "gear", Key_F4, TQT_TQOBJECT(this), TQT_SLOT(slotSinglePlayer()), actionCollection(), "game_singleplayer");
+	m_gameServerConnect = new TDEAction(i18n("&Connect to Server..."), "connect_no", Key_F2, TQT_TQOBJECT(this), TQT_SLOT(slotServerConnect()), actionCollection(), "game_serverconnect");
+	m_gameNewServer = new TDEAction(i18n("&Start Server..."), "network", Key_F3, TQT_TQOBJECT(this), TQT_SLOT(slotNewServer()), actionCollection(), "game_newserver");
+	m_gameSingle = new TDEAction(i18n("S&ingle Player..."), "gear", Key_F4, TQT_TQOBJECT(this), TQT_SLOT(slotSinglePlayer()), actionCollection(), "game_singleplayer");
 	m_gameQuit = KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
 	KStdGameAction::highscores(TQT_TQOBJECT(this), TQT_SLOT(slotHighscore()), actionCollection());
-	m_gameEnemyInfo = new KAction(i18n("&Enemy Info"), "view_text", Key_F11, TQT_TQOBJECT(this), TQT_SLOT(slotEnemyClientInfo()), actionCollection(), "game_enemyinfo");
+	m_gameEnemyInfo = new TDEAction(i18n("&Enemy Info"), "view_text", Key_F11, TQT_TQOBJECT(this), TQT_SLOT(slotEnemyClientInfo()), actionCollection(), "game_enemyinfo");
 
-	m_configSound = new KToggleAction(i18n("&Play Sounds"), 0, actionCollection(), "options_configure_sound");
-	m_configGrid = new KToggleAction(i18n("&Show Grid"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowGrid()), actionCollection(), "options_show_grid");
+	m_configSound = new TDEToggleAction(i18n("&Play Sounds"), 0, actionCollection(), "options_configure_sound");
+	m_configGrid = new TDEToggleAction(i18n("&Show Grid"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowGrid()), actionCollection(), "options_show_grid");
 	m_configGrid->setCheckedState(i18n("Hide Grid"));
 
 	m_gameEnemyInfo->setEnabled(false);
 
-	setupGUI( KMainWindow::Save | StatusBar | Keys | Create );
+	setupGUI( TDEMainWindow::Save | StatusBar | Keys | Create );
 }
 
 void KBattleshipWindow::initChat()
diff --git a/kbattleship/kbattleship/kbattleship.h b/kbattleship/kbattleship/kbattleship.h
index d24abdc5..47a2f4d7 100644
--- a/kbattleship/kbattleship/kbattleship.h
+++ b/kbattleship/kbattleship/kbattleship.h
@@ -44,7 +44,7 @@
 #include "kshiplist.h"
 #include "kstatdialog.h"
 
-class KBattleshipWindow : public KMainWindow
+class KBattleshipWindow : public TDEMainWindow
 {
 	Q_OBJECT
   
@@ -145,13 +145,13 @@ private:
 	KChatWidget *m_chat;
 	KStatDialog *m_stat;
 	KBattleshipView *m_view;
-	KAction *m_gameServerConnect;
-	KAction *m_gameNewServer;
-	KAction *m_gameQuit;
-	KAction *m_gameEnemyInfo;
-	KAction *m_gameSingle;
-	KToggleAction *m_configSound;
-	KToggleAction *m_configGrid;
+	TDEAction *m_gameServerConnect;
+	TDEAction *m_gameNewServer;
+	TDEAction *m_gameQuit;
+	TDEAction *m_gameEnemyInfo;
+	TDEAction *m_gameSingle;
+	TDEToggleAction *m_configSound;
+	TDEToggleAction *m_configGrid;
 	KClientDialog *m_client;
 	TDEServerDialog *m_server;
 	KShipList *m_ownshiplist;