summaryrefslogtreecommitdiffstats
path: root/kspaceduel
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 15:12:46 -0600
committerTimothy Pearson <[email protected]>2013-02-01 15:12:46 -0600
commit58a97ed3af5e4df6c4a58d043b0c267bd97056a9 (patch)
tree5a2fde6842fd422cae2d8670d382be965098cc32 /kspaceduel
parent2ce15ee76fd2d9d18a63c035a0f5b00b94c60cdc (diff)
downloadtdegames-58a97ed3af5e4df6c4a58d043b0c267bd97056a9.tar.gz
tdegames-58a97ed3af5e4df6c4a58d043b0c267bd97056a9.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kspaceduel')
-rw-r--r--kspaceduel/mainview.cpp8
-rw-r--r--kspaceduel/mainview.h10
-rw-r--r--kspaceduel/topwidget.cpp28
-rw-r--r--kspaceduel/topwidget.h2
4 files changed, 24 insertions, 24 deletions
diff --git a/kspaceduel/mainview.cpp b/kspaceduel/mainview.cpp
index 09056ecc..16766d5b 100644
--- a/kspaceduel/mainview.cpp
+++ b/kspaceduel/mainview.cpp
@@ -16,7 +16,7 @@
#include "ai.h"
#include "options.h"
-KToggleAction *MyMainView::pauseAction = 0;
+TDEToggleAction *MyMainView::pauseAction = 0;
MyMainView::MyMainView(TQWidget *parent)
:TQWidget(parent),
@@ -103,7 +103,7 @@ MyMainView::~MyMainView()
writeConfig();
}
-void MyMainView::setActionCollection(KActionCollection *a)
+void MyMainView::setActionCollection(TDEActionCollection *a)
{
actionCollection = a;
}
@@ -492,7 +492,7 @@ void MyMainView::newRound()
field.update();
TQString str = i18n("Press %1 to start")
- .arg(KShortcut(GAME_START_SHORTCUT).toString());
+ .arg(TDEShortcut(GAME_START_SHORTCUT).toString());
emit(setStatusText(str,IDS_MAIN));
emit( setStatusText( "", IDS_PAUSE ) );
stop( );
@@ -557,7 +557,7 @@ void MyMainView::timerEvent(TQTimerEvent *event)
emit(wins(0,w));
}
TQString str = i18n("Press %1 for new round")
- .arg(KShortcut(GAME_START_SHORTCUT).toString());
+ .arg(TDEShortcut(GAME_START_SHORTCUT).toString());
emit(setStatusText(str,IDS_MAIN));
stop( );
}
diff --git a/kspaceduel/mainview.h b/kspaceduel/mainview.h
index 41622278..f39e3134 100644
--- a/kspaceduel/mainview.h
+++ b/kspaceduel/mainview.h
@@ -4,8 +4,8 @@
#include <tqwidget.h>
#include <tqimage.h>
-class KToggleAction;
-class KActionCollection;
+class TDEToggleAction;
+class TDEActionCollection;
#include <krandomsequence.h>
#include "sprites.h"
@@ -24,8 +24,8 @@ public:
MyMainView(TQWidget *parent=0);
~MyMainView();
- static KToggleAction *pauseAction;
- void setActionCollection(KActionCollection *a);
+ static TDEToggleAction *pauseAction;
+ void setActionCollection(TDEActionCollection *a);
public slots:
void newRound();
@@ -60,7 +60,7 @@ protected:
void calculatePowerups();
void collisions();
private:
- KActionCollection *actionCollection;
+ TDEActionCollection *actionCollection;
TQCanvas field;
TQCanvasView view;
diff --git a/kspaceduel/topwidget.cpp b/kspaceduel/topwidget.cpp
index 424b4ea6..b805447a 100644
--- a/kspaceduel/topwidget.cpp
+++ b/kspaceduel/topwidget.cpp
@@ -64,52 +64,52 @@ void MyTopLevelWidget::initActions( )
{
KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
KStdGameAction::gameNew(TQT_TQOBJECT(playfield), TQT_SLOT(newGame()), actionCollection());
- ( void )new KAction( i18n( "&New Round" ), "spnewround",
+ ( void )new TDEAction( i18n( "&New Round" ), "spnewround",
CTRL + Key_R, TQT_TQOBJECT(playfield), TQT_SLOT( newRound( ) ),
actionCollection( ), "new_round" );
MyMainView::pauseAction =
KStdGameAction::pause(TQT_TQOBJECT(playfield), TQT_SLOT(togglePause()), actionCollection());
MyMainView::pauseAction->setChecked( false );
- KAction* gameStart = new KAction( i18n( "Start" ), GAME_START_SHORTCUT,
+ TDEAction* gameStart = new TDEAction( i18n( "Start" ), GAME_START_SHORTCUT,
TQT_TQOBJECT(playfield), TQT_SLOT( start( ) ), actionCollection( ), "game_start" );
KStdAction::preferences(TQT_TQOBJECT(playfield), TQT_SLOT(gameSetup()), actionCollection());
- KAccel* acc = new KAccel(this);
+ TDEAccel* acc = new TDEAccel(this);
gameStart->plugAccel(acc);
// Default keys
actionCollection()->setAutoConnectShortcuts(false);
- KAction* ac;
- ac = new KAction(i18n("Player 1 Rotate Left"), Key_S, 0, 0,
+ TDEAction* ac;
+ ac = new TDEAction(i18n("Player 1 Rotate Left"), Key_S, 0, 0,
actionCollection(), "P1KeyLeft");
ac->setEnabled( false );
- ac = new KAction(i18n("Player 1 Rotate Right"), Key_F, 0, 0,
+ ac = new TDEAction(i18n("Player 1 Rotate Right"), Key_F, 0, 0,
actionCollection(), "P1KeyRight");
ac->setEnabled( false );
- ac = new KAction(i18n("Player 1 Accelerate"), Key_E, 0, 0,
+ ac = new TDEAction(i18n("Player 1 Accelerate"), Key_E, 0, 0,
actionCollection(), "P1KeyAcc");
ac->setEnabled( false );
- ac = new KAction(i18n("Player 1 Shot"), Key_D, 0, 0,
+ ac = new TDEAction(i18n("Player 1 Shot"), Key_D, 0, 0,
actionCollection(), "P1Shot");
ac->setEnabled( false );
- ac = new KAction(i18n("Player 1 Mine"), Key_A, 0, 0,
+ ac = new TDEAction(i18n("Player 1 Mine"), Key_A, 0, 0,
actionCollection(), "P1Mine");
ac->setEnabled( false );
- ac = new KAction(i18n("Player 2 Rotate Left"), Key_Left, 0, 0,
+ ac = new TDEAction(i18n("Player 2 Rotate Left"), Key_Left, 0, 0,
actionCollection(), "P2KeyLeft");
ac->setEnabled( false );
- ac = new KAction(i18n("Player 2 Rotate Right"), Key_Right, 0, 0,
+ ac = new TDEAction(i18n("Player 2 Rotate Right"), Key_Right, 0, 0,
actionCollection(), "P2KeyRight");
ac->setEnabled( false );
- ac = new KAction(i18n("Player 2 Accelerate"), Key_Up, 0, 0,
+ ac = new TDEAction(i18n("Player 2 Accelerate"), Key_Up, 0, 0,
actionCollection(), "P2KeyAcc");
ac->setEnabled( false );
- ac = new KAction(i18n("Player 2 Shot"), Key_Down, 0, 0,
+ ac = new TDEAction(i18n("Player 2 Shot"), Key_Down, 0, 0,
actionCollection(), "P2Shot");
ac->setEnabled( false );
- ac = new KAction(i18n("Player 2 Mine"), Key_Insert, 0, 0,
+ ac = new TDEAction(i18n("Player 2 Mine"), Key_Insert, 0, 0,
actionCollection(), "P2Mine");
ac->setEnabled( false );
diff --git a/kspaceduel/topwidget.h b/kspaceduel/topwidget.h
index c3b66d03..d0d020d5 100644
--- a/kspaceduel/topwidget.h
+++ b/kspaceduel/topwidget.h
@@ -6,7 +6,7 @@
class PlayerInfo;
class MyMainView;
-class MyTopLevelWidget:public KMainWindow
+class MyTopLevelWidget:public TDEMainWindow
{
Q_OBJECT