summaryrefslogtreecommitdiffstats
path: root/ksame
diff options
context:
space:
mode:
Diffstat (limited to 'ksame')
-rw-r--r--ksame/KSameWidget.cpp28
-rw-r--r--ksame/StoneWidget.cpp2
2 files changed, 15 insertions, 15 deletions
diff --git a/ksame/KSameWidget.cpp b/ksame/KSameWidget.cpp
index 60fabc01..4ac4eab2 100644
--- a/ksame/KSameWidget.cpp
+++ b/ksame/KSameWidget.cpp
@@ -48,17 +48,17 @@ static int default_colors=3;
KSameWidget::KSameWidget(TQWidget *parent, const char* name, WFlags fl) :
TDEMainWindow(parent,name,fl)
{
- KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(m_new()), actionCollection(), "game_new");
- restart = new TDEAction(i18n("&Restart This Board"), CTRL+Key_R, TQT_TQOBJECT(this),
+ KStdGameAction::gameNew(this, TQT_SLOT(m_new()), actionCollection(), "game_new");
+ restart = new TDEAction(i18n("&Restart This Board"), CTRL+Key_R, this,
TQT_SLOT(m_restart()), actionCollection(), "game_restart");
- KStdGameAction::highscores(TQT_TQOBJECT(this), TQT_SLOT(m_showhs()), actionCollection(), "game_highscores");
- KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "game_quit");
- undo = KStdGameAction::undo(TQT_TQOBJECT(this), TQT_SLOT(m_undo()), actionCollection(), "edit_undo");
+ KStdGameAction::highscores(this, TQT_SLOT(m_showhs()), actionCollection(), "game_highscores");
+ KStdGameAction::quit(this, TQT_SLOT(close()), actionCollection(), "game_quit");
+ undo = KStdGameAction::undo(this, TQT_SLOT(m_undo()), actionCollection(), "edit_undo");
random = new TDEToggleAction(i18n("&Random Board"), 0, 0, 0, actionCollection(), "random_board");
- showNumberRemaining = new TDEToggleAction(i18n("&Show Number Remaining"), 0, TQT_TQOBJECT(this), TQT_SLOT(showNumberRemainingToggled()), actionCollection(), "showNumberRemaining");
+ showNumberRemaining = new TDEToggleAction(i18n("&Show Number Remaining"), 0, this, TQT_SLOT(showNumberRemainingToggled()), actionCollection(), "showNumberRemaining");
- KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(configureNotifications()),
+ KStdAction::configureNotifications(this, TQT_SLOT(configureNotifications()),
actionCollection());
status=statusBar();
@@ -69,14 +69,14 @@ KSameWidget::KSameWidget(TQWidget *parent, const char* name, WFlags fl) :
stone = new StoneWidget(this,15,10);
- connect( stone, TQT_SIGNAL(s_gameover()), TQT_TQOBJECT(this), TQT_SLOT(gameover()));
- connect( stone, TQT_SIGNAL(s_colors(int)), TQT_TQOBJECT(this), TQT_SLOT(setColors(int)));
- connect( stone, TQT_SIGNAL(s_board(int)), TQT_TQOBJECT(this), TQT_SLOT(setBoard(int)));
- connect( stone, TQT_SIGNAL(s_marked(int)), TQT_TQOBJECT(this), TQT_SLOT(setMarked(int)));
- connect( stone, TQT_SIGNAL(s_score(int)), TQT_TQOBJECT(this), TQT_SLOT(setScore(int)));
- connect( stone, TQT_SIGNAL(s_remove(int,int)), TQT_TQOBJECT(this), TQT_SLOT(stonesRemoved(int,int)));
+ connect( stone, TQT_SIGNAL(s_gameover()), this, TQT_SLOT(gameover()));
+ connect( stone, TQT_SIGNAL(s_colors(int)), this, TQT_SLOT(setColors(int)));
+ connect( stone, TQT_SIGNAL(s_board(int)), this, TQT_SLOT(setBoard(int)));
+ connect( stone, TQT_SIGNAL(s_marked(int)), this, TQT_SLOT(setMarked(int)));
+ connect( stone, TQT_SIGNAL(s_score(int)), this, TQT_SLOT(setScore(int)));
+ connect( stone, TQT_SIGNAL(s_remove(int,int)), this, TQT_SLOT(stonesRemoved(int,int)));
- connect(stone, TQT_SIGNAL(s_sizechanged()), TQT_TQOBJECT(this), TQT_SLOT(sizeChanged()));
+ connect(stone, TQT_SIGNAL(s_sizechanged()), this, TQT_SLOT(sizeChanged()));
sizeChanged();
setCentralWidget(stone);
diff --git a/ksame/StoneWidget.cpp b/ksame/StoneWidget.cpp
index 5097ac78..8ada4f44 100644
--- a/ksame/StoneWidget.cpp
+++ b/ksame/StoneWidget.cpp
@@ -102,7 +102,7 @@ StoneWidget::~StoneWidget() {
delete [] map;
setMouseTracking(false);
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
}
unsigned int