diff options
author | Timothy Pearson <[email protected]> | 2013-02-01 15:12:46 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-01 15:12:46 -0600 |
commit | 58a97ed3af5e4df6c4a58d043b0c267bd97056a9 (patch) | |
tree | 5a2fde6842fd422cae2d8670d382be965098cc32 /ktron | |
parent | 2ce15ee76fd2d9d18a63c035a0f5b00b94c60cdc (diff) | |
download | tdegames-58a97ed3af5e4df6c4a58d043b0c267bd97056a9.tar.gz tdegames-58a97ed3af5e4df6c4a58d043b0c267bd97056a9.zip |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'ktron')
-rw-r--r-- | ktron/ktron.cpp | 26 | ||||
-rw-r--r-- | ktron/ktron.h | 8 | ||||
-rw-r--r-- | ktron/tron.cpp | 2 | ||||
-rw-r--r-- | ktron/tron.h | 6 |
4 files changed, 21 insertions, 21 deletions
diff --git a/ktron/ktron.cpp b/ktron/ktron.cpp index 6ef3c4e1..19786300 100644 --- a/ktron/ktron.cpp +++ b/ktron/ktron.cpp @@ -42,7 +42,7 @@ /** * Constuctor */ -KTron::KTron(TQWidget *parent, const char *name) : KMainWindow(parent, name) { +KTron::KTron(TQWidget *parent, const char *name) : TDEMainWindow(parent, name) { playerPoints[0]=playerPoints[1]=0; tron=new Tron(this, "Tron"); @@ -56,27 +56,27 @@ KTron::KTron(TQWidget *parent, const char *name) : KMainWindow(parent, name) { // We match up keyboard events ourselves in Tron::keyPressEvent() // We must disable the actions, otherwise we don't get the keyPressEvent's - KAction *act; - act = new KAction(i18n("Player 1 Up"), Key_R, 0, 0, actionCollection(), "Pl1Up"); + TDEAction *act; + act = new TDEAction(i18n("Player 1 Up"), Key_R, 0, 0, actionCollection(), "Pl1Up"); act->setEnabled(false); - act = new KAction(i18n("Player 1 Down"), Key_F, 0, 0, actionCollection(), "Pl1Down"); + act = new TDEAction(i18n("Player 1 Down"), Key_F, 0, 0, actionCollection(), "Pl1Down"); act->setEnabled(false); - act = new KAction(i18n("Player 1 Right"), Key_G, 0, 0, actionCollection(), "Pl1Right"); + act = new TDEAction(i18n("Player 1 Right"), Key_G, 0, 0, actionCollection(), "Pl1Right"); act->setEnabled(false); - act = new KAction(i18n("Player 1 Left"), Key_D, 0, 0, actionCollection(), "Pl1Left"); + act = new TDEAction(i18n("Player 1 Left"), Key_D, 0, 0, actionCollection(), "Pl1Left"); act->setEnabled(false); - act = new KAction(i18n("Player 1 Accelerator"), Key_A, 0, 0, actionCollection(), "Pl1Ac"); + act = new TDEAction(i18n("Player 1 Accelerator"), Key_A, 0, 0, actionCollection(), "Pl1Ac"); act->setEnabled(false); - act = new KAction(i18n("Player 2 Up"), Key_Up, 0, 0, actionCollection(), "Pl2Up"); + act = new TDEAction(i18n("Player 2 Up"), Key_Up, 0, 0, actionCollection(), "Pl2Up"); act->setEnabled(false); - act = new KAction(i18n("Player 2 Down"), Key_Down, 0, 0, actionCollection(), "Pl2Down"); + act = new TDEAction(i18n("Player 2 Down"), Key_Down, 0, 0, actionCollection(), "Pl2Down"); act->setEnabled(false); - act = new KAction(i18n("Player 2 Right"), Key_Right, 0, 0, actionCollection(), "Pl2Right"); + act = new TDEAction(i18n("Player 2 Right"), Key_Right, 0, 0, actionCollection(), "Pl2Right"); act->setEnabled(false); - act = new KAction(i18n("Player 2 Left"), Key_Left, 0, 0, actionCollection(), "Pl2Left"); + act = new TDEAction(i18n("Player 2 Left"), Key_Left, 0, 0, actionCollection(), "Pl2Left"); act->setEnabled(false); - act = new KAction(i18n("Player 2 Accelerator"), Key_0, 0, 0, actionCollection(), "Pl2Ac"); + act = new TDEAction(i18n("Player 2 Accelerator"), Key_0, 0, 0, actionCollection(), "Pl2Ac"); act->setEnabled(false); tron->setActionCollection(actionCollection()); @@ -86,7 +86,7 @@ KTron::KTron(TQWidget *parent, const char *name) : KMainWindow(parent, name) { KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection()); KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection()); - setupGUI( KMainWindow::Keys | StatusBar | Save | Create); + setupGUI( TDEMainWindow::Keys | StatusBar | Save | Create); loadSettings(); } diff --git a/ktron/ktron.h b/ktron/ktron.h index d063b792..262d56ef 100644 --- a/ktron/ktron.h +++ b/ktron/ktron.h @@ -29,14 +29,14 @@ #include <kmainwindow.h> #include "tron.h" -class KAccel; -class KSelectAction; +class TDEAccel; +class TDESelectAction; class Tron; /** * @short The main window of KTron */ -class KTron : public KMainWindow { +class KTron : public TDEMainWindow { Q_OBJECT @@ -45,7 +45,7 @@ public: KTron(TQWidget *parent=0, const char *name=0); private: - KAccel *accel; + TDEAccel *accel; Tron *tron; TQString playerName[2]; int playerPoints[2]; diff --git a/ktron/tron.cpp b/ktron/tron.cpp index 585aedd0..ae219a7d 100644 --- a/ktron/tron.cpp +++ b/ktron/tron.cpp @@ -422,7 +422,7 @@ void Tron::drawRect(TQPainter & p, int x, int y) ** config functions ** ** *************************************************************** */ -void Tron::setActionCollection(KActionCollection *a) +void Tron::setActionCollection(TDEActionCollection *a) { actionCollection = a; } diff --git a/ktron/tron.h b/ktron/tron.h index 821beddb..eeeab068 100644 --- a/ktron/tron.h +++ b/ktron/tron.h @@ -32,7 +32,7 @@ #include <math.h> #include <krandomsequence.h> -class KActionCollection; +class TDEActionCollection; #include "player.h" @@ -51,7 +51,7 @@ class Tron : public TQWidget public: Tron(TQWidget *parent=0, const char *name=0); ~Tron(); - void setActionCollection(KActionCollection*); + void setActionCollection(TDEActionCollection*); void updatePixmap(); void setBackgroundPix(TQPixmap); void setComputerplayer(Player player, bool); @@ -91,7 +91,7 @@ protected: private: /** Stores key shortcuts */ - KActionCollection* actionCollection; + TDEActionCollection* actionCollection; /** Drawing buffer */ TQPixmap *pixmap; /** The playingfield */ |