diff options
Diffstat (limited to 'kbounce')
| -rw-r--r-- | kbounce/game.cpp | 16 | ||||
| -rw-r--r-- | kbounce/game.h | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/kbounce/game.cpp b/kbounce/game.cpp index 84cfae2f..065b2657 100644 --- a/kbounce/game.cpp +++ b/kbounce/game.cpp @@ -136,8 +136,8 @@ bool Ball::collide( double dx, double dy ) /*************************************************************************/ -Wall::Wall( JezzField *field, int x, int y, Direction dir, int tile, TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), m_dir( dir ), m_field( field ), m_startX( x ), m_startY( y ), +Wall::Wall( JezzField *field, int x, int y, Direction dir, int tile, TQObject *parent, const char *name ) + : TQObject( parent, name ), m_dir( dir ), m_field( field ), m_startX( x ), m_startY( y ), m_tile( tile ), m_delay( MS2TICKS(WALL_DELAY)/2 ), m_active( true ) { //kdDebug(12008) << "Wall::Wall" << endl; @@ -236,8 +236,8 @@ void Wall::fill( bool black ) /*************************************************************************/ -JezzField::JezzField( const TQPixmap &tiles, const TQPixmap &background, TQObject* tqparent, const char* name ) - : TQCanvas( tqparent, name ), m_tiles( tiles ) +JezzField::JezzField( const TQPixmap &tiles, const TQPixmap &background, TQObject* parent, const char* name ) + : TQCanvas( parent, name ), m_tiles( tiles ) { setPixmaps( tiles, background ); } @@ -314,8 +314,8 @@ void JezzField::setPixmaps( const TQPixmap &tiles, const TQPixmap &background ) /*************************************************************************/ -JezzView::JezzView(TQCanvas* viewing, TQWidget* tqparent, const char* name, WFlags f) - : TQCanvasView( viewing, tqparent, name, f ), m_vertical( false ) +JezzView::JezzView(TQCanvas* viewing, TQWidget* parent, const char* name, WFlags f) + : TQCanvasView( viewing, parent, name, f ), m_vertical( false ) { setResizePolicy( AutoOne ); setHScrollBarMode( AlwaysOff ); @@ -340,8 +340,8 @@ void JezzView::viewportMouseReleaseEvent( TQMouseEvent *ev ) /*************************************************************************/ -JezzGame::JezzGame( const TQPixmap &background, int ballNum, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), m_wall1( 0 ), m_wall2( 0 ), +JezzGame::JezzGame( const TQPixmap &background, int ballNum, TQWidget *parent, const char *name ) + : TQWidget( parent, name ), m_wall1( 0 ), m_wall2( 0 ), m_text( 0 ), m_running( false ), m_percent( 0 ), m_pictured( false ) { TQString path = kapp->dirs()->findResourceDir( "data", "kbounce/pics/ball0000.png" ) + "kbounce/pics/"; diff --git a/kbounce/game.h b/kbounce/game.h index d07516de..7cdd1c39 100644 --- a/kbounce/game.h +++ b/kbounce/game.h @@ -58,7 +58,7 @@ public: enum Direction { Up, Down, Left, Right }; Wall( JezzField *field, int x, int y, Direction dir, int tile, - TQObject *tqparent=0, const char *name=0 ); + TQObject *parent=0, const char *name=0 ); void finish(); void fill( bool black ); @@ -89,7 +89,7 @@ class JezzField : public TQCanvas Q_OBJECT TQ_OBJECT public: - JezzField( const TQPixmap &tiles, const TQPixmap &background, TQObject* tqparent = 0, const char* name = 0 ); + JezzField( const TQPixmap &tiles, const TQPixmap &background, TQObject* parent = 0, const char* name = 0 ); void setGameTile( int x, int y, bool black ); void setBackground( const TQPixmap &background ); @@ -115,7 +115,7 @@ class JezzView : public TQCanvasView Q_OBJECT TQ_OBJECT public: - JezzView(TQCanvas* viewing=0, TQWidget* tqparent=0, const char* name=0, WFlags f=0); + JezzView(TQCanvas* viewing=0, TQWidget* parent=0, const char* name=0, WFlags f=0); signals: void buildWall( int x, int y, bool vertical ); @@ -134,7 +134,7 @@ class JezzGame : public TQWidget TQ_OBJECT public: - JezzGame( const TQPixmap &background, int ballNum, TQWidget *tqparent=0, const char *name=0 ); + JezzGame( const TQPixmap &background, int ballNum, TQWidget *parent=0, const char *name=0 ); ~JezzGame(); int percent(); |