diff options
Diffstat (limited to 'ksame')
-rw-r--r-- | ksame/KSameWidget.cpp | 30 | ||||
-rw-r--r-- | ksame/KSameWidget.h | 2 | ||||
-rw-r--r-- | ksame/StoneWidget.cpp | 10 | ||||
-rw-r--r-- | ksame/StoneWidget.h | 2 |
4 files changed, 22 insertions, 22 deletions
diff --git a/ksame/KSameWidget.cpp b/ksame/KSameWidget.cpp index 60fabc01..b875eb40 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), - 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::gameNew(this, TQ_SLOT(m_new()), actionCollection(), "game_new"); + restart = new TDEAction(i18n("&Restart This Board"), CTRL+Key_R, this, + TQ_SLOT(m_restart()), actionCollection(), "game_restart"); + KStdGameAction::highscores(this, TQ_SLOT(m_showhs()), actionCollection(), "game_highscores"); + KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection(), "game_quit"); + undo = KStdGameAction::undo(this, TQ_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, TQ_SLOT(showNumberRemainingToggled()), actionCollection(), "showNumberRemaining"); - KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(configureNotifications()), + KStdAction::configureNotifications(this, TQ_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, TQ_SIGNAL(s_gameover()), this, TQ_SLOT(gameover())); + connect( stone, TQ_SIGNAL(s_colors(int)), this, TQ_SLOT(setColors(int))); + connect( stone, TQ_SIGNAL(s_board(int)), this, TQ_SLOT(setBoard(int))); + connect( stone, TQ_SIGNAL(s_marked(int)), this, TQ_SLOT(setMarked(int))); + connect( stone, TQ_SIGNAL(s_score(int)), this, TQ_SLOT(setScore(int))); + connect( stone, TQ_SIGNAL(s_remove(int,int)), this, TQ_SLOT(stonesRemoved(int,int))); - connect(stone, TQT_SIGNAL(s_sizechanged()), TQT_TQOBJECT(this), TQT_SLOT(sizeChanged())); + connect(stone, TQ_SIGNAL(s_sizechanged()), this, TQ_SLOT(sizeChanged())); sizeChanged(); setCentralWidget(stone); diff --git a/ksame/KSameWidget.h b/ksame/KSameWidget.h index 8d2b2c6f..b2ecd182 100644 --- a/ksame/KSameWidget.h +++ b/ksame/KSameWidget.h @@ -27,7 +27,7 @@ class TDEToggleAction; class StoneWidget; class KSameWidget: public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksame/StoneWidget.cpp b/ksame/StoneWidget.cpp index c4fbb987..8ada4f44 100644 --- a/ksame/StoneWidget.cpp +++ b/ksame/StoneWidget.cpp @@ -72,8 +72,8 @@ StoneWidget::StoneWidget( TQWidget *parent, int x, int y ) for (int s = 0; s < maxslices; s++) { map[c][s].stone.resize(stone_width, stone_height); assert(!map[c][s].stone.isNull()); - bitBlt(TQT_TQPAINTDEVICE(&map[c][s].stone), 0, 0, - TQT_TQPAINTDEVICE(&stonemap), stone_width * s, + bitBlt(&map[c][s].stone, 0, 0, + &stonemap, stone_width * s, c*stone_height, stone_width,stone_height,CopyROP,false); TQImage im = map[c][s].stone.convertToImage(); @@ -102,7 +102,7 @@ StoneWidget::~StoneWidget() { delete [] map; setMouseTracking(false); - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); } unsigned int @@ -276,8 +276,8 @@ StoneWidget::paintEvent( TQPaintEvent *e ) { if (stone->color) { int tslice = stone->marked?slice:0; - bitBlt(TQT_TQPAINTDEVICE(this),cx,cy, - TQT_TQPAINTDEVICE(&map[stone->color-1][tslice].stone), + bitBlt(this,cx,cy, + &map[stone->color-1][tslice].stone, 0, 0, stone_width,stone_height,CopyROP,FALSE); diff --git a/ksame/StoneWidget.h b/ksame/StoneWidget.h index 720474ae..5522816e 100644 --- a/ksame/StoneWidget.h +++ b/ksame/StoneWidget.h @@ -27,7 +27,7 @@ struct StoneSlice; class StoneWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT int modified; |