diff options
Diffstat (limited to 'kolf')
| -rw-r--r-- | kolf/ball.cpp | 6 | ||||
| -rw-r--r-- | kolf/game.cpp | 2 | ||||
| -rw-r--r-- | kolf/game.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kolf/ball.cpp b/kolf/ball.cpp index 569a5ba2..0e25422b 100644 --- a/kolf/ball.cpp +++ b/kolf/ball.cpp @@ -308,10 +308,10 @@ void Ball::collisionDetect(double oldx, double oldy) for (iterpoint = points.first(); iterpoint; iterpoint = points.next()) { //kdDebug(12007) << "-----\n"; - const Wall *tqparentWall = iterpoint->tqparentWall(); - const TQPoint qp(iterpoint->x() + tqparentWall->x(), iterpoint->y() + tqparentWall->y()); + const Wall *parentWall = iterpoint->parentWall(); + const TQPoint qp(iterpoint->x() + parentWall->x(), iterpoint->y() + parentWall->y()); const Point p(qp.x(), qp.y()); - const TQPoint qother = TQPoint(tqparentWall->startPoint() == qp? tqparentWall->endPoint() : tqparentWall->startPoint()) + TQPoint(tqparentWall->x(), tqparentWall->y()); + const TQPoint qother = TQPoint(parentWall->startPoint() == qp? parentWall->endPoint() : parentWall->startPoint()) + TQPoint(parentWall->x(), parentWall->y()); const Point other(qother.x(), qother.y()); // vector of wall diff --git a/kolf/game.cpp b/kolf/game.cpp index 1a7bfe4d..a6f02a79 100644 --- a/kolf/game.cpp +++ b/kolf/game.cpp @@ -3462,7 +3462,7 @@ void KolfGame::showInfo() void KolfGame::showInfoDlg(bool addDontShowAgain) { - KMessageBox::information(tqparentWidget(), + KMessageBox::information(parentWidget(), i18n("Course name: %1").tqarg(holeInfo.name()) + TQString("\n") + i18n("Created by %1").tqarg(holeInfo.author()) + TQString("\n") + i18n("%1 holes").tqarg(highestHole), diff --git a/kolf/game.h b/kolf/game.h index 3bcaaaf5..ec986c52 100644 --- a/kolf/game.h +++ b/kolf/game.h @@ -483,7 +483,7 @@ public: void dontMove() { dontmove = true; }; void updateVisible(); - Wall *tqparentWall() { return wall; } + Wall *parentWall() { return wall; } protected: Wall *wall; |