From 58a97ed3af5e4df6c4a58d043b0c267bd97056a9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:12:46 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- ksnake/game.cpp | 12 ++++++------ ksnake/game.h | 6 +++--- ksnake/rattler.cpp | 2 +- ksnake/rattler.h | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'ksnake') diff --git a/ksnake/game.cpp b/ksnake/game.cpp index 1b92e741..8054a901 100644 --- a/ksnake/game.cpp +++ b/ksnake/game.cpp @@ -54,7 +54,7 @@ #define SCORE 1 #define LIVES 2 -Game::Game(TQWidget *parent, const char *name) : KMainWindow(parent,name) +Game::Game(TQWidget *parent, const char *name) : TDEMainWindow(parent,name) { // create statusbar statusBar()->insertItem(i18n("Score: 0"), SCORE); @@ -79,7 +79,7 @@ Game::Game(TQWidget *parent, const char *name) : KMainWindow(parent,name) setCentralWidget(view); createMenu(); - setupGUI(KMainWindow::Save | StatusBar | Create ); + setupGUI(TDEMainWindow::Save | StatusBar | Create ); } Game::~Game() @@ -113,10 +113,10 @@ void Game::showHighScores() void Game::createMenu() { actionCollection()->setAutoConnectShortcuts(false); - (void)new KAction(i18n("Move Up"), Key_Up, 0, 0, actionCollection(), "Pl1Up"); - (void)new KAction(i18n("Move Down"), Key_Down, 0, 0, actionCollection(), "Pl1Down"); - (void)new KAction(i18n("Move Right"), Key_Right, 0, 0, actionCollection(), "Pl1Right"); - (void)new KAction(i18n("Move Left"), Key_Left, 0, 0, actionCollection(), "Pl1Left"); + (void)new TDEAction(i18n("Move Up"), Key_Up, 0, 0, actionCollection(), "Pl1Up"); + (void)new TDEAction(i18n("Move Down"), Key_Down, 0, 0, actionCollection(), "Pl1Down"); + (void)new TDEAction(i18n("Move Right"), Key_Right, 0, 0, actionCollection(), "Pl1Right"); + (void)new TDEAction(i18n("Move Left"), Key_Left, 0, 0, actionCollection(), "Pl1Left"); actionCollection()->setAutoConnectShortcuts(true); rattler->setActionCollection(actionCollection()); diff --git a/ksnake/game.h b/ksnake/game.h index 719695ef..35e8cb38 100644 --- a/ksnake/game.h +++ b/ksnake/game.h @@ -28,12 +28,12 @@ #include -class KAction; +class TDEAction; class Rattler; class Levels; class View; -class Game : public KMainWindow { +class Game : public TDEMainWindow { Q_OBJECT @@ -56,7 +56,7 @@ private: View *view; Rattler *rattler; Levels *levels; - KAction *pause; + TDEAction *pause; void createMenu(); }; diff --git a/ksnake/rattler.cpp b/ksnake/rattler.cpp index 458c88bf..df9748ad 100644 --- a/ksnake/rattler.cpp +++ b/ksnake/rattler.cpp @@ -308,7 +308,7 @@ void Rattler::pause() gameState.setBit(Paused); stop(); - KAction* tempPauseAction = KStdGameAction::pause(); + TDEAction* tempPauseAction = KStdGameAction::pause(); label = new TQLabel(this); label->setFont( TQFont( "Times", 14, TQFont::Bold ) ); diff --git a/ksnake/rattler.h b/ksnake/rattler.h index 1f824621..bd61e871 100644 --- a/ksnake/rattler.h +++ b/ksnake/rattler.h @@ -48,7 +48,7 @@ class Rattler : public TQWidget public: Rattler ( TQWidget *parent=0, const char *name=0 ); ~Rattler(); - void setActionCollection(KActionCollection *a){ actionCollection = a;} + void setActionCollection(TDEActionCollection *a){ actionCollection = a;} void setBalls(int); @@ -108,7 +108,7 @@ protected: void mousePressEvent( TQMouseEvent * ); void focusOutEvent( TQFocusEvent * ) { ; } void focusInEvent( TQFocusEvent * ) { ; } - KActionCollection *actionCollection; + TDEActionCollection *actionCollection; private: Board *board; -- cgit v1.2.1