diff options
Diffstat (limited to 'kolf/game.cpp')
-rw-r--r-- | kolf/game.cpp | 400 |
1 files changed, 200 insertions, 200 deletions
diff --git a/kolf/game.cpp b/kolf/game.cpp index d76ec2bc..1a7bfe4d 100644 --- a/kolf/game.cpp +++ b/kolf/game.cpp @@ -58,12 +58,12 @@ inline TQString makeGroup(int id, int hole, TQString name, int x, int y) { - return TQString("%1-%2@%3,%4|%5").arg(hole).arg(name).arg(x).arg(y).arg(id); + return TQString("%1-%2@%3,%4|%5").tqarg(hole).tqarg(name).tqarg(x).tqarg(y).tqarg(id); } inline TQString makeStateGroup(int id, const TQString &name) { - return TQString("%1|%2").arg(name).arg(id); + return TQString("%1|%2").tqarg(name).tqarg(id); } ///////////////////////// @@ -101,13 +101,13 @@ void RectPoint::moveBy(double dx, double dy) rect->newSize(nw, nh); } -Config *RectPoint::config(TQWidget *parent) +Config *RectPoint::config(TQWidget *tqparent) { CanvasItem *citem = dynamic_cast<CanvasItem *>(rect); if (citem) - return citem->config(parent); + return citem->config(tqparent); else - return CanvasItem::config(parent); + return CanvasItem::config(tqparent); } ///////////////////////// @@ -144,9 +144,9 @@ void Arrow::setZ(double newz) void Arrow::setVisible(bool yes) { - TQCanvasLine::setVisible(yes); - line1->setVisible(yes); - line2->setVisible(yes); + TQCanvasLine::tqsetVisible(yes); + line1->tqsetVisible(yes); + line2->tqsetVisible(yes); } void Arrow::moveBy(double dx, double dy) @@ -192,28 +192,28 @@ void Arrow::updateSelf() ///////////////////////// -BridgeConfig::BridgeConfig(Bridge *bridge, TQWidget *parent) - : Config(parent) +BridgeConfig::BridgeConfig(Bridge *bridge, TQWidget *tqparent) + : Config(tqparent) { this->bridge = bridge; - m_vlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); - TQGridLayout *layout = new TQGridLayout(m_vlayout, 2, 3, spacingHint()); - layout->addWidget(new TQLabel(i18n("Walls on:"), this), 0, 0); + m_vtqlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); + TQGridLayout *tqlayout = new TQGridLayout(m_vtqlayout, 2, 3, spacingHint()); + tqlayout->addWidget(new TQLabel(i18n("Walls on:"), this), 0, 0); top = new TQCheckBox(i18n("&Top"), this); - layout->addWidget(top, 0, 1); + tqlayout->addWidget(top, 0, 1); connect(top, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(topWallChanged(bool))); top->setChecked(bridge->topWallVisible()); bot = new TQCheckBox(i18n("&Bottom"), this); - layout->addWidget(bot, 1, 1); + tqlayout->addWidget(bot, 1, 1); connect(bot, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(botWallChanged(bool))); bot->setChecked(bridge->botWallVisible()); left = new TQCheckBox(i18n("&Left"), this); - layout->addWidget(left, 1, 0); + tqlayout->addWidget(left, 1, 0); connect(left, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(leftWallChanged(bool))); left->setChecked(bridge->leftWallVisible()); right = new TQCheckBox(i18n("&Right"), this); - layout->addWidget(right, 1, 2); + tqlayout->addWidget(right, 1, 2); connect(right, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(rightWallChanged(bool))); right->setChecked(bridge->rightWallVisible()); } @@ -249,7 +249,7 @@ Bridge::Bridge(TQRect rect, TQCanvas *canvas) { TQColor color("#92772D"); setBrush(TQBrush(color)); - setPen(NoPen); + setPen(Qt::NoPen); setZ(998); topWall = new Wall(canvas); @@ -264,10 +264,10 @@ Bridge::Bridge(TQRect rect, TQCanvas *canvas) setWallZ(z() + 0.01); setWallColor(color); - topWall->setVisible(false); - botWall->setVisible(false); - leftWall->setVisible(false); - rightWall->setVisible(false); + topWall->tqsetVisible(false); + botWall->tqsetVisible(false); + leftWall->tqsetVisible(false); + rightWall->tqsetVisible(false); point = new RectPoint(color, this, canvas); editModeChanged(false); @@ -321,7 +321,7 @@ void Bridge::aboutToDie() void Bridge::editModeChanged(bool changed) { - point->setVisible(changed); + point->tqsetVisible(changed); moveBy(0, 0); } @@ -401,22 +401,22 @@ void Bridge::setSize(int width, int height) ///////////////////////// -WindmillConfig::WindmillConfig(Windmill *windmill, TQWidget *parent) - : BridgeConfig(windmill, parent) +WindmillConfig::WindmillConfig(Windmill *windmill, TQWidget *tqparent) + : BridgeConfig(windmill, tqparent) { this->windmill = windmill; - m_vlayout->addStretch(); + m_vtqlayout->addStretch(); TQCheckBox *check = new TQCheckBox(i18n("Windmill on bottom"), this); check->setChecked(windmill->bottom()); connect(check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(endChanged(bool))); - m_vlayout->addWidget(check); + m_vtqlayout->addWidget(check); - TQHBoxLayout *hlayout = new TQHBoxLayout(m_vlayout, spacingHint()); - hlayout->addWidget(new TQLabel(i18n("Slow"), this)); + TQHBoxLayout *htqlayout = new TQHBoxLayout(m_vtqlayout, spacingHint()); + htqlayout->addWidget(new TQLabel(i18n("Slow"), this)); TQSlider *slider = new TQSlider(1, 10, 1, windmill->curSpeed(), Qt::Horizontal, this); - hlayout->addWidget(slider); - hlayout->addWidget(new TQLabel(i18n("Fast"), this)); + htqlayout->addWidget(slider); + htqlayout->addWidget(new TQLabel(i18n("Fast"), this)); connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(speedChanged(int))); endChanged(check->isChecked()); @@ -454,7 +454,7 @@ Windmill::Windmill(TQRect rect, TQCanvas *canvas) { guard = new WindmillGuard(canvas); guard->setPen(TQPen(black, 5)); - guard->setVisible(true); + guard->tqsetVisible(true); guard->setAlwaysShow(true); setSpeed(5); guard->setZ(wallZ() + .1); @@ -467,8 +467,8 @@ Windmill::Windmill(TQRect rect, TQCanvas *canvas) right->setAlwaysShow(true); left->setZ(wallZ()); right->setZ(wallZ()); - left->setVisible(true); - right->setVisible(true); + left->tqsetVisible(true); + right->tqsetVisible(true); setTopWallVisible(false); setBotWallVisible(false); @@ -629,24 +629,24 @@ void Sign::draw(TQPainter &painter) TQSimpleRichText txt(m_text, kapp->font()); const int indent = wallPen().width() + 3; txt.setWidth(width() - 2*indent); - TQColorGroup colorGroup; - colorGroup.setColor(TQColorGroup::Foreground, black); - colorGroup.setColor(TQColorGroup::Text, black); - colorGroup.setColor(TQColorGroup::Background, black); - colorGroup.setColor(TQColorGroup::Base, black); - txt.draw(&painter, x() + indent, y(), TQRect(x() + indent, y(), width() - indent, height() - indent), colorGroup); + TQColorGroup tqcolorGroup; + tqcolorGroup.setColor(TQColorGroup::Foreground, black); + tqcolorGroup.setColor(TQColorGroup::Text, black); + tqcolorGroup.setColor(TQColorGroup::Background, black); + tqcolorGroup.setColor(TQColorGroup::Base, black); + txt.draw(&painter, x() + indent, y(), TQRect(x() + indent, y(), width() - indent, height() - indent), tqcolorGroup); } ///////////////////////// -SignConfig::SignConfig(Sign *sign, TQWidget *parent) - : BridgeConfig(sign, parent) +SignConfig::SignConfig(Sign *sign, TQWidget *tqparent) + : BridgeConfig(sign, tqparent) { this->sign = sign; - m_vlayout->addStretch(); - m_vlayout->addWidget(new TQLabel(i18n("Sign HTML:"), this)); + m_vtqlayout->addStretch(); + m_vtqlayout->addWidget(new TQLabel(i18n("Sign HTML:"), this)); KLineEdit *name = new KLineEdit(sign->text(), this); - m_vlayout->addWidget(name); + m_vtqlayout->addWidget(name); connect(name, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(textChanged(const TQString &))); } @@ -658,25 +658,25 @@ void SignConfig::textChanged(const TQString &text) ///////////////////////// -EllipseConfig::EllipseConfig(Ellipse *ellipse, TQWidget *parent) - : Config(parent), slow1(0), fast1(0), slow2(0), fast2(0), slider1(0), slider2(0) +EllipseConfig::EllipseConfig(Ellipse *ellipse, TQWidget *tqparent) + : Config(tqparent), slow1(0), fast1(0), slow2(0), fast2(0), slider1(0), slider2(0) { this->ellipse = ellipse; - m_vlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); + m_vtqlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); TQCheckBox *check = new TQCheckBox(i18n("Enable show/hide"), this); - m_vlayout->addWidget(check); + m_vtqlayout->addWidget(check); connect(check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(check1Changed(bool))); check->setChecked(ellipse->changeEnabled()); - TQHBoxLayout *hlayout = new TQHBoxLayout(m_vlayout, spacingHint()); + TQHBoxLayout *htqlayout = new TQHBoxLayout(m_vtqlayout, spacingHint()); slow1 = new TQLabel(i18n("Slow"), this); - hlayout->addWidget(slow1); + htqlayout->addWidget(slow1); slider1 = new TQSlider(1, 100, 5, 100 - ellipse->changeEvery(), Qt::Horizontal, this); - hlayout->addWidget(slider1); + htqlayout->addWidget(slider1); fast1 = new TQLabel(i18n("Fast"), this); - hlayout->addWidget(fast1); + htqlayout->addWidget(fast1); connect(slider1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(value1Changed(int))); @@ -684,7 +684,7 @@ EllipseConfig::EllipseConfig(Ellipse *ellipse, TQWidget *parent) // TODO add slider2 and friends and make it possible for ellipses to grow and contract - m_vlayout->addStretch(); + m_vtqlayout->addStretch(); } void EllipseConfig::value1Changed(int news) @@ -733,7 +733,7 @@ Ellipse::Ellipse(TQCanvas *canvas) setChangeEnabled(false); setChangeEvery(50); count = 0; - setVisible(true); + tqsetVisible(true); point = new RectPoint(black, this, canvas); point->setSizeFactor(2.0); @@ -750,7 +750,7 @@ void Ellipse::setChangeEnabled(bool changeEnabled) setAnimated(m_changeEnabled); if (!m_changeEnabled) - setVisible(true); + tqsetVisible(true); } TQPtrList<TQCanvasItem> Ellipse::moveableItems() const @@ -775,7 +775,7 @@ void Ellipse::moveBy(double dx, double dy) void Ellipse::editModeChanged(bool changed) { - point->setVisible(changed); + point->tqsetVisible(changed); moveBy(0, 0); } @@ -788,7 +788,7 @@ void Ellipse::advance(int phase) if (count > (m_changeEvery + 10) * 1.8) count = 0; if (count == 0) - setVisible(!isVisible()); + tqsetVisible(!isVisible()); count++; } @@ -812,14 +812,14 @@ void Ellipse::save(KConfig *cfg) cfg->writeEntry("height", height()); } -Config *Ellipse::config(TQWidget *parent) +Config *Ellipse::config(TQWidget *tqparent) { - return new EllipseConfig(this, parent); + return new EllipseConfig(this, tqparent); } void Ellipse::aboutToSave() { - setVisible(true); + tqsetVisible(true); dontHide = true; } @@ -838,7 +838,7 @@ Puddle::Puddle(TQCanvas *canvas) TQBrush brush; TQPixmap pic; - if (!TQPixmapCache::find("puddle", pic)) + if (!TQPixmapCache::tqfind("puddle", pic)) { pic.load(locate("appdata", "pics/puddle.png")); TQPixmapCache::insert("puddle", pic); @@ -860,7 +860,7 @@ bool Puddle::collision(Ball *ball, long int /*id*/) if (ball->isVisible()) { TQCanvasRectangle i(TQRect(ball->x(), ball->y(), 1, 1), canvas()); - i.setVisible(true); + i.tqsetVisible(true); // is center of ball in? if (i.collidesWith(this)/* && ball->curVector().magnitude() < 4*/) @@ -868,7 +868,7 @@ bool Puddle::collision(Ball *ball, long int /*id*/) playSound("puddle"); ball->setAddStroke(ball->addStroke() + 1); ball->setPlaceOnGround(true); - ball->setVisible(false); + ball->tqsetVisible(false); ball->setState(Stopped); ball->setVelocity(0, 0); if (game && game->curBall() == ball) @@ -891,7 +891,7 @@ Sand::Sand(TQCanvas *canvas) TQBrush brush; TQPixmap pic; - if (!TQPixmapCache::find("sand", pic)) + if (!TQPixmapCache::tqfind("sand", pic)) { pic.load(locate("appdata", "pics/sand.png")); TQPixmapCache::insert("sand", pic); @@ -911,7 +911,7 @@ Sand::Sand(TQCanvas *canvas) bool Sand::collision(Ball *ball, long int /*id*/) { TQCanvasRectangle i(TQRect(ball->x(), ball->y(), 1, 1), canvas()); - i.setVisible(true); + i.tqsetVisible(true); // is center of ball in? if (i.collidesWith(this)/* && ball->curVector().magnitude() < 4*/) @@ -954,12 +954,12 @@ Putter::Putter(TQCanvas *canvas) void Putter::showInfo() { - guideLine->setVisible(isVisible()); + guideLine->tqsetVisible(isVisible()); } void Putter::hideInfo() { - guideLine->setVisible(m_showGuideLine? isVisible() : false); + guideLine->tqsetVisible(m_showGuideLine? isVisible() : false); } void Putter::moveBy(double dx, double dy) @@ -976,8 +976,8 @@ void Putter::setShowGuideLine(bool yes) void Putter::setVisible(bool yes) { - TQCanvasLine::setVisible(yes); - guideLine->setVisible(m_showGuideLine? yes : false); + TQCanvasLine::tqsetVisible(yes); + guideLine->tqsetVisible(m_showGuideLine? yes : false); } void Putter::setOrigin(int _x, int _y) @@ -990,7 +990,7 @@ void Putter::setOrigin(int _x, int _y) void Putter::setAngle(Ball *ball) { - angle = angleMap.contains(ball)? angleMap[ball] : 0; + angle = angleMap.tqcontains(ball)? angleMap[ball] : 0; finishMe(); } @@ -1002,11 +1002,11 @@ void Putter::go(Direction d, Amount amount) { case Forwards: len -= 1; - guideLine->setVisible(false); + guideLine->tqsetVisible(false); break; case Backwards: len += 1; - guideLine->setVisible(false); + guideLine->tqsetVisible(false); break; case D_Left: angle += addition; @@ -1085,7 +1085,7 @@ void Bumper::moveBy(double dx, double dy) void Bumper::editModeChanged(bool changed) { - inside->setVisible(!changed); + inside->tqsetVisible(!changed); } void Bumper::advance(int phase) @@ -1166,7 +1166,7 @@ HoleResult Hole::result(TQPoint p, double s, bool * /*wasCenter*/) return Result_Miss; TQCanvasRectangle i(TQRect(p, TQSize(1, 1)), canvas()); - i.setVisible(true); + i.tqsetVisible(true); // is center of ball in cup? if (i.collidesWith(this)) @@ -1182,7 +1182,7 @@ HoleResult Hole::result(TQPoint p, double s, bool * /*wasCenter*/) Cup::Cup(TQCanvas *canvas) : Hole(TQColor("#808080"), canvas) { - if (!TQPixmapCache::find("cup", pixmap)) + if (!TQPixmapCache::tqfind("cup", pixmap)) { pixmap.load(locate("appdata", "pics/cup.png")); TQPixmapCache::insert("cup", pixmap); @@ -1222,7 +1222,7 @@ BlackHole::BlackHole(TQCanvas *canvas) m_maxSpeed = 5.0; runs = 0; - const TQColor myColor((QRgb)(kapp->random() % 0x01000000)); + const TQColor myColor((TQRgb)(kapp->random() % 0x01000000)); outside = new TQCanvasEllipse(canvas); outside->setZ(z() - .001); @@ -1238,7 +1238,7 @@ BlackHole::BlackHole(TQCanvas *canvas) setSize(width(), width() / .8); const float factor = 1.3; outside->setSize(width() * factor, height() * factor); - outside->setVisible(true); + outside->tqsetVisible(true); moveBy(0, 0); @@ -1249,7 +1249,7 @@ void BlackHole::showInfo() { delete infoLine; infoLine = new TQCanvasLine(canvas()); - infoLine->setVisible(true); + infoLine->tqsetVisible(true); infoLine->setPen(TQPen(exitItem->pen().color(), 2)); infoLine->setZ(10000); infoLine->setPoints(x(), y(), exitItem->x(), exitItem->y()); @@ -1277,7 +1277,7 @@ void BlackHole::updateInfo() { if (infoLine) { - infoLine->setVisible(true); + infoLine->tqsetVisible(true); infoLine->setPoints(x(), y(), exitItem->x(), exitItem->y()); exitItem->showInfo(); } @@ -1338,7 +1338,7 @@ bool BlackHole::place(Ball *ball, bool /*wasCenter*/) ball->setVelocity(0, 0); ball->setState(Stopped); - ball->setVisible(false); + ball->tqsetVisible(false); ball->setForceStillGoing(true); double magnitude = Vector(TQPoint(x(), y()), TQPoint(exitItem->x(), exitItem->y())).magnitude(); @@ -1367,7 +1367,7 @@ void BlackHole::eject(Ball *ball, double speed) ball->setVector(v); ball->setForceStillGoing(false); - ball->setVisible(true); + ball->tqsetVisible(true); ball->setState(Rolling); runs++; @@ -1418,7 +1418,7 @@ void BlackHole::finishMe() } exitItem->setPoints(start.x(), start.y(), end.x(), end.y()); - exitItem->setVisible(true); + exitItem->tqsetVisible(true); } void BlackHole::save(KConfig *cfg) @@ -1439,7 +1439,7 @@ BlackHoleExit::BlackHoleExit(BlackHole *blackHole, TQCanvas *canvas) setZ(blackHole->z()); arrow->setZ(z() - .00001); updateArrowLength(); - arrow->setVisible(false); + arrow->tqsetVisible(false); } void BlackHoleExit::aboutToDie() @@ -1484,49 +1484,49 @@ void BlackHoleExit::editModeChanged(bool editing) void BlackHoleExit::showInfo() { - arrow->setVisible(true); + arrow->tqsetVisible(true); } void BlackHoleExit::hideInfo() { - arrow->setVisible(false); + arrow->tqsetVisible(false); } -Config *BlackHoleExit::config(TQWidget *parent) +Config *BlackHoleExit::config(TQWidget *tqparent) { - return blackHole->config(parent); + return blackHole->config(tqparent); } ///////////////////////// -BlackHoleConfig::BlackHoleConfig(BlackHole *blackHole, TQWidget *parent) - : Config(parent) +BlackHoleConfig::BlackHoleConfig(BlackHole *blackHole, TQWidget *tqparent) + : Config(tqparent) { this->blackHole = blackHole; - TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint()); - layout->addWidget(new TQLabel(i18n("Exiting ball angle:"), this)); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); + tqlayout->addWidget(new TQLabel(i18n("Exiting ball angle:"), this)); TQSpinBox *deg = new TQSpinBox(0, 359, 10, this); deg->setSuffix(TQString(" ") + i18n("degrees")); deg->setValue(blackHole->curExitDeg()); deg->setWrapping(true); - layout->addWidget(deg); + tqlayout->addWidget(deg); connect(deg, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(degChanged(int))); - layout->addStretch(); + tqlayout->addStretch(); - TQHBoxLayout *hlayout = new TQHBoxLayout(layout, spacingHint()); - hlayout->addWidget(new TQLabel(i18n("Minimum exit speed:"), this)); + TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, spacingHint()); + htqlayout->addWidget(new TQLabel(i18n("Minimum exit speed:"), this)); KDoubleNumInput *min = new KDoubleNumInput(this); min->setRange(0, 8, 1, true); - hlayout->addWidget(min); + htqlayout->addWidget(min); connect(min, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(minChanged(double))); min->setValue(blackHole->minSpeed()); - hlayout = new TQHBoxLayout(layout, spacingHint()); - hlayout->addWidget(new TQLabel(i18n("Maximum:"), this)); + htqlayout = new TQHBoxLayout(tqlayout, spacingHint()); + htqlayout->addWidget(new TQLabel(i18n("Maximum:"), this)); KDoubleNumInput *max = new KDoubleNumInput(this); max->setRange(1, 10, 1, true); - hlayout->addWidget(max); + htqlayout->addWidget(max); connect(max, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(maxChanged(double))); max->setValue(blackHole->maxSpeed()); } @@ -1639,7 +1639,7 @@ void WallPoint::updateVisible() void WallPoint::editModeChanged(bool changed) { editing = changed; - setVisible(true); + tqsetVisible(true); if (!editing) updateVisible(); } @@ -1741,8 +1741,8 @@ Wall::Wall(TQCanvas *canvas) startItem = new WallPoint(true, this, canvas); endItem = new WallPoint(false, this, canvas); - startItem->setVisible(true); - endItem->setVisible(true); + startItem->tqsetVisible(true); + endItem->tqsetVisible(true); setPen(TQPen(darkRed, 3)); setPoints(-15, 10, 15, -5); @@ -1777,10 +1777,10 @@ void Wall::setAlwaysShow(bool yes) void Wall::setVisible(bool yes) { - TQCanvasLine::setVisible(yes); + TQCanvasLine::tqsetVisible(yes); - startItem->setVisible(yes); - endItem->setVisible(yes); + startItem->tqsetVisible(yes); + endItem->tqsetVisible(yes); startItem->updateVisible(); endItem->updateVisible(); } @@ -1859,7 +1859,7 @@ TQPointArray Wall::areaPoints() const // it's all squished because I don't want my // line counts to count code I didn't write! - TQPointArray p(4); const int xi = int(x()); const int yi = int(y()); const TQPoint start = startPoint(); const TQPoint end = endPoint(); const int x1 = start.x(); const int x2 = end.x(); const int y1 = start.y(); const int y2 = end.y(); const int dx = QABS(x1-x2); const int dy = QABS(y1-y2); if ( dx > dy ) { p[0] = TQPoint(x1+xi,y1+yi-1); p[1] = TQPoint(x2+xi,y2+yi-1); p[2] = TQPoint(x2+xi,y2+yi+1); p[3] = TQPoint(x1+xi,y1+yi+1); } else { p[0] = TQPoint(x1+xi-1,y1+yi); p[1] = TQPoint(x2+xi-1,y2+yi); p[2] = TQPoint(x2+xi+1,y2+yi); p[3] = TQPoint(x1+xi+1,y1+yi); } return p; + TQPointArray p(4); const int xi = int(x()); const int yi = int(y()); const TQPoint start = startPoint(); const TQPoint end = endPoint(); const int x1 = start.x(); const int x2 = end.x(); const int y1 = start.y(); const int y2 = end.y(); const int dx = TQABS(x1-x2); const int dy = TQABS(y1-y2); if ( dx > dy ) { p[0] = TQPoint(x1+xi,y1+yi-1); p[1] = TQPoint(x2+xi,y2+yi-1); p[2] = TQPoint(x2+xi,y2+yi+1); p[3] = TQPoint(x1+xi,y1+yi+1); } else { p[0] = TQPoint(x1+xi-1,y1+yi); p[1] = TQPoint(x2+xi-1,y2+yi); p[2] = TQPoint(x2+xi+1,y2+yi); p[3] = TQPoint(x1+xi+1,y1+yi); } return p; } void Wall::editModeChanged(bool changed) @@ -1954,47 +1954,47 @@ void Wall::save(KConfig *cfg) ///////////////////////// -HoleConfig::HoleConfig(HoleInfo *holeInfo, TQWidget *parent) - : Config(parent) +HoleConfig::HoleConfig(HoleInfo *holeInfo, TQWidget *tqparent) + : Config(tqparent) { this->holeInfo = holeInfo; - TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); - TQHBoxLayout *hlayout = new TQHBoxLayout(layout, spacingHint()); - hlayout->addWidget(new TQLabel(i18n("Course name: "), this)); + TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, spacingHint()); + htqlayout->addWidget(new TQLabel(i18n("Course name: "), this)); KLineEdit *nameEdit = new KLineEdit(holeInfo->untranslatedName(), this); - hlayout->addWidget(nameEdit); + htqlayout->addWidget(nameEdit); connect(nameEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(nameChanged(const TQString &))); - hlayout = new TQHBoxLayout(layout, spacingHint()); - hlayout->addWidget(new TQLabel(i18n("Course author: "), this)); + htqlayout = new TQHBoxLayout(tqlayout, spacingHint()); + htqlayout->addWidget(new TQLabel(i18n("Course author: "), this)); KLineEdit *authorEdit = new KLineEdit(holeInfo->author(), this); - hlayout->addWidget(authorEdit); + htqlayout->addWidget(authorEdit); connect(authorEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(authorChanged(const TQString &))); - layout->addStretch(); + tqlayout->addStretch(); - hlayout = new TQHBoxLayout(layout, spacingHint()); - hlayout->addWidget(new TQLabel(i18n("Par:"), this)); + htqlayout = new TQHBoxLayout(tqlayout, spacingHint()); + htqlayout->addWidget(new TQLabel(i18n("Par:"), this)); TQSpinBox *par = new TQSpinBox(1, 15, 1, this); par->setValue(holeInfo->par()); - hlayout->addWidget(par); + htqlayout->addWidget(par); connect(par, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(parChanged(int))); - hlayout->addStretch(); + htqlayout->addStretch(); - hlayout->addWidget(new TQLabel(i18n("Maximum:"), this)); + htqlayout->addWidget(new TQLabel(i18n("Maximum:"), this)); TQSpinBox *maxstrokes = new TQSpinBox(holeInfo->lowestMaxStrokes(), 30, 1, this); TQWhatsThis::add(maxstrokes, i18n("Maximum number of strokes player can take on this hole.")); TQToolTip::add(maxstrokes, i18n("Maximum number of strokes")); maxstrokes->setSpecialValueText(i18n("Unlimited")); maxstrokes->setValue(holeInfo->maxStrokes()); - hlayout->addWidget(maxstrokes); + htqlayout->addWidget(maxstrokes); connect(maxstrokes, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(maxStrokesChanged(int))); TQCheckBox *check = new TQCheckBox(i18n("Show border walls"), this); check->setChecked(holeInfo->borderWalls()); - layout->addWidget(check); + tqlayout->addWidget(check); connect(check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(borderWallsChanged(bool))); } @@ -2122,7 +2122,7 @@ void StrokeCircle::draw(TQPainter &p) length = al; } - p.setBrush(TQBrush(black, Qt::NoBrush)); + p.setBrush(TQBrush(black, TQt::NoBrush)); p.setPen(TQPen(white, ithickness / 2)); p.drawEllipse(x() + ithickness / 2, y() + ithickness / 2, iwidth - ithickness, iheight - ithickness); p.setPen(TQPen(TQColor((int)(0xff * dvalue) / dmax, 0, 0xff - (int)(0xff * dvalue) / dmax), ithickness)); @@ -2139,8 +2139,8 @@ void StrokeCircle::draw(TQPainter &p) ///////////////////////////////////////// -KolfGame::KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWidget *parent, const char *name ) - : TQCanvasView(parent, name) +KolfGame::KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWidget *tqparent, const char *name ) + : TQCanvasView(tqparent, name) { // for mouse control setMouseTracking(true); @@ -2197,22 +2197,22 @@ KolfGame::KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWi margin = 10; - setFocusPolicy(TQWidget::StrongFocus); + setFocusPolicy(TQ_StrongFocus); setFixedSize(width + 2 * margin, height + 2 * margin); setMargins(margin, margin, margin, margin); - course = new TQCanvas(this); + course = new TQCanvas(TQT_TQOBJECT(this)); course->setBackgroundColor(white); course->resize(width, height); TQPixmap pic; - if (!TQPixmapCache::find("grass", pic)) + if (!TQPixmapCache::tqfind("grass", pic)) { pic.load(locate("appdata", "pics/grass.png")); TQPixmapCache::insert("grass", pic); } - course->setBackgroundPixmap(pic); + course->tqsetBackgroundPixmap(pic); setCanvas(course); move(0, 0); @@ -2225,7 +2225,7 @@ KolfGame::KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWi highlighter = new TQCanvasRectangle(course); highlighter->setPen(TQPen(yellow, 1)); highlighter->setBrush(TQBrush(NoBrush)); - highlighter->setVisible(false); + highlighter->tqsetVisible(false); highlighter->setZ(10000); // shows some info about hole @@ -2237,14 +2237,14 @@ KolfGame::KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWi infoText->move(15, width/2); infoText->setZ(10001); infoText->setFont(font); - infoText->setVisible(false); + infoText->tqsetVisible(false); // create the advanced putting indicator strokeCircle = new StrokeCircle(course); strokeCircle->move(width - 90, height - 90); strokeCircle->setSize(80, 80); strokeCircle->setThickness(8); - strokeCircle->setVisible(false); + strokeCircle->tqsetVisible(false); strokeCircle->setValue(0); strokeCircle->setMaxValue(360); @@ -2252,7 +2252,7 @@ KolfGame::KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWi whiteBall = new Ball(course); whiteBall->setGame(this); whiteBall->setColor(white); - whiteBall->setVisible(false); + whiteBall->tqsetVisible(false); whiteBall->setDoDetect(false); int highestLog = 0; @@ -2311,7 +2311,7 @@ void KolfGame::startFirstHole(int hole) { for (; scoreboardHoles < curHole; ++scoreboardHoles) { - cfg->setGroup(TQString("%1-hole@-50,-50|0").arg(scoreboardHoles + 1)); + cfg->setGroup(TQString("%1-hole@-50,-50|0").tqarg(scoreboardHoles + 1)); emit newHole(cfg->readNumEntry("par", 3)); } @@ -2382,7 +2382,7 @@ void KolfGame::addBorderWall(TQPoint start, TQPoint end) { Wall *wall = new Wall(course); wall->setPoints(start.x(), start.y(), end.x(), end.y()); - wall->setVisible(true); + wall->tqsetVisible(true); wall->setGame(this); wall->setZ(998.7); borderWalls.append(wall); @@ -2420,7 +2420,7 @@ void KolfGame::handleMousePressEvent(TQMouseEvent *e) list.pop_front(); moving = false; - highlighter->setVisible(false); + highlighter->tqsetVisible(false); selectedItem = 0; movingItem = 0; @@ -2430,7 +2430,7 @@ void KolfGame::handleMousePressEvent(TQMouseEvent *e) return; } // only items we keep track of - if ((!(items.containsRef(list.first()) || list.first() == whiteBall || extraMoveable.containsRef(list.first())))) + if ((!(items.tqcontainsRef(list.first()) || list.first() == whiteBall || extraMoveable.tqcontainsRef(list.first())))) { emit newSelectedItem(&holeInfo); return; @@ -2446,7 +2446,7 @@ void KolfGame::handleMousePressEvent(TQMouseEvent *e) switch (e->button()) { // select AND move now :) - case LeftButton: + case Qt::LeftButton: { selectedItem = list.first(); movingItem = selectedItem; @@ -2458,7 +2458,7 @@ void KolfGame::handleMousePressEvent(TQMouseEvent *e) setCursor(KCursor::sizeAllCursor()); emit newSelectedItem(citem); - highlighter->setVisible(true); + highlighter->tqsetVisible(true); TQRect rect = selectedItem->boundingRect(); highlighter->move(rect.x() + 1, rect.y() + 1); highlighter->setSize(rect.width(), rect.height()); @@ -2473,9 +2473,9 @@ void KolfGame::handleMousePressEvent(TQMouseEvent *e) { if (m_useMouse) { - if (!inPlay && e->button() == LeftButton) + if (!inPlay && e->button() == Qt::LeftButton) puttPress(); - else if (e->button() == RightButton) + else if (e->button() == Qt::RightButton) toggleShowInfo(); } } @@ -2553,7 +2553,7 @@ void KolfGame::handleMouseMoveEvent(TQMouseEvent *e) highlighter->moveBy(-(double)moveX, -(double)moveY); movingItem->moveBy(-(double)moveX, -(double)moveY); TQRect brect = movingItem->boundingRect(); - emit newStatusText(TQString("%1x%2").arg(brect.x()).arg(brect.y())); + emit newStatusText(TQString("%1x%2").tqarg(brect.x()).tqarg(brect.y())); storedMousePos = mouse; } @@ -2574,7 +2574,7 @@ void KolfGame::handleMouseReleaseEvent(TQMouseEvent *e) if (editing) { - emit newStatusText(TQString::null); + emit newStatusText(TQString()); moving = false; } @@ -2583,9 +2583,9 @@ void KolfGame::handleMouseReleaseEvent(TQMouseEvent *e) if (!editing && m_useMouse) { - if (!inPlay && e->button() == LeftButton) + if (!inPlay && e->button() == Qt::LeftButton) puttRelease(); - else if (e->button() == RightButton) + else if (e->button() == Qt::RightButton) toggleShowInfo(); } @@ -2608,7 +2608,7 @@ void KolfGame::keyPressEvent(TQKeyEvent *e) putting = false; stroking = false; finishStroking = false; - strokeCircle->setVisible(false); + strokeCircle->tqsetVisible(false); putterTimer->stop(); putter->setOrigin((*curPlayer).ball()->x(), (*curPlayer).ball()->y()); break; @@ -2701,7 +2701,7 @@ void KolfGame::puttPress() strokeCircle->move(px + pw / 2 + 10, py + 10); else strokeCircle->move(px + pw / 2 + 10, py - 10 - strokeCircle->height()); - strokeCircle->setVisible(true); + strokeCircle->tqsetVisible(true); } putterTimer->start(putterTimerMsec); } @@ -2741,7 +2741,7 @@ void KolfGame::keyReleaseEvent(TQKeyEvent *e) { lastDelId = citem->curId(); - highlighter->setVisible(false); + highlighter->tqsetVisible(false); items.removeRef(item); citem->hideInfo(); citem->aboutToDelete(); @@ -2785,7 +2785,7 @@ void KolfGame::timeout() // later undo the shot for (PlayerList::Iterator it = players->begin(); it != players->end(); ++it) { - if (!course->rect().contains(TQPoint((*it).ball()->x(), (*it).ball()->y()))) + if (!course->rect().tqcontains(TQPoint((*it).ball()->x(), (*it).ball()->y()))) { (*it).ball()->setState(Stopped); @@ -2907,7 +2907,7 @@ void KolfGame::putterTimeout() { // aborted putting = false; - strokeCircle->setVisible(false); + strokeCircle->tqsetVisible(false); } else if (strength > maxStrength || puttReverse) { @@ -2950,7 +2950,7 @@ void KolfGame::putterTimeout() putter->go(Forwards); else { - strokeCircle->setVisible(false); + strokeCircle->tqsetVisible(false); finishStroking = false; putterTimer->stop(); putting = false; @@ -3084,7 +3084,7 @@ void KolfGame::loadStateList() if ((*curPlayer).id() == info.id) ballMoved(); else - player.ball()->setVisible(!info.beginningOfHole); + player.ball()->tqsetVisible(!info.beginningOfHole); player.setScoreForHole(info.score, curHole); player.ball()->setState(info.state); emit scoreChanged(info.id, curHole, info.score); @@ -3136,7 +3136,7 @@ void KolfGame::shotDone() const TQString placeOutside = i18n("Drop Outside of Hazard"); const TQString rehit = i18n("Rehit From Last Location"); options << placeOutside << rehit; - const TQString choice = KComboBoxDialog::getItem(i18n("What would you like to do for your next shot?"), i18n("%1 is in a Hazard").arg((*it).name()), options, placeOutside, "hazardOptions"); + const TQString choice = KComboBoxDialog::getItem(i18n("What would you like to do for your next shot?"), i18n("%1 is in a Hazard").tqarg((*it).name()), options, placeOutside, "hazardOptions"); if (choice == placeOutside) { @@ -3186,7 +3186,7 @@ void KolfGame::shotDone() } } - ball->setVisible(true); + ball->tqsetVisible(true); ball->setState(Stopped); (*it).ball()->setDoDetect(true); @@ -3207,7 +3207,7 @@ void KolfGame::shotDone() if (curStrokes >= holeInfo.maxStrokes() && holeInfo.hasMaxStrokes()) { ball->setState(Holed); - ball->setVisible(false); + ball->tqsetVisible(false); // move to center in case he/she hit out ball->move(width / 2, height / 2); @@ -3236,7 +3236,7 @@ void KolfGame::shotDone() emit newPlayersTurn(&(*curPlayer)); - (*curPlayer).ball()->setVisible(true); + (*curPlayer).ball()->tqsetVisible(true); putter->setAngle((*curPlayer).ball()); putter->setOrigin((*curPlayer).ball()->x(), (*curPlayer).ball()->y()); @@ -3256,7 +3256,7 @@ void KolfGame::startBall(const Vector &vector) playSound("hit"); emit inPlayStart(); - putter->setVisible(false); + putter->tqsetVisible(false); (*curPlayer).ball()->setState(Rolling); (*curPlayer).ball()->setVector(vector); @@ -3303,14 +3303,14 @@ void KolfGame::sayWhosGoing() { if (players->count() >= 2) { - KMessageBox::information(this, i18n("%1 will start off.").arg((*curPlayer).name()), i18n("New Hole"), "newHole"); + KMessageBox::information(this, i18n("%1 will start off.").tqarg((*curPlayer).name()), i18n("New Hole"), "newHole"); } } void KolfGame::holeDone() { for (PlayerList::Iterator it = players->begin(); it != players->end(); ++it) - (*it).ball()->setVisible(false); + (*it).ball()->tqsetVisible(false); startNextHole(); sayWhosGoing(); } @@ -3407,7 +3407,7 @@ void KolfGame::startNextHole() if ((int)(*it).scores().count() < curHole) (*it).addHole(); (*it).ball()->setVelocity(0, 0); - (*it).ball()->setVisible(false); + (*it).ball()->tqsetVisible(false); } emit newPlayersTurn(&(*curPlayer)); @@ -3429,7 +3429,7 @@ void KolfGame::startNextHole() for (; scoreboardHoles < curHole; ++scoreboardHoles) { - cfg->setGroup(TQString("%1-hole@-50,-50|0").arg(scoreboardHoles + 1)); + cfg->setGroup(TQString("%1-hole@-50,-50|0").tqarg(scoreboardHoles + 1)); emit newHole(cfg->readNumEntry("par", 3)); } @@ -3437,7 +3437,7 @@ void KolfGame::startNextHole() updateShowInfo(); // this is from shotDone() - (*curPlayer).ball()->setVisible(true); + (*curPlayer).ball()->tqsetVisible(true); putter->setOrigin((*curPlayer).ball()->x(), (*curPlayer).ball()->y()); updateMouse(); @@ -3451,31 +3451,31 @@ void KolfGame::startNextHole() void KolfGame::showInfo() { - TQString text = i18n("Hole %1: par %2, maximum %3 strokes").arg(curHole).arg(holeInfo.par()).arg(holeInfo.maxStrokes()); + TQString text = i18n("Hole %1: par %2, maximum %3 strokes").tqarg(curHole).tqarg(holeInfo.par()).tqarg(holeInfo.maxStrokes()); infoText->move((width - TQFontMetrics(infoText->font()).width(text)) / 2, infoText->y()); infoText->setText(text); // I hate this text! Let's not show it - //infoText->setVisible(true); + //infoText->tqsetVisible(true); emit newStatusText(text); } void KolfGame::showInfoDlg(bool addDontShowAgain) { - KMessageBox::information(parentWidget(), - i18n("Course name: %1").arg(holeInfo.name()) + TQString("\n") - + i18n("Created by %1").arg(holeInfo.author()) + TQString("\n") - + i18n("%1 holes").arg(highestHole), + KMessageBox::information(tqparentWidget(), + i18n("Course name: %1").tqarg(holeInfo.name()) + TQString("\n") + + i18n("Created by %1").tqarg(holeInfo.author()) + TQString("\n") + + i18n("%1 holes").tqarg(highestHole), i18n("Course Information"), - addDontShowAgain? holeInfo.name() + TQString(" ") + holeInfo.author() : TQString::null); + addDontShowAgain? holeInfo.name() + TQString(" ") + holeInfo.author() : TQString()); } void KolfGame::hideInfo() { infoText->setText(""); - infoText->setVisible(false); + infoText->tqsetVisible(false); - emit newStatusText(TQString::null); + emit newStatusText(TQString()); } void KolfGame::openFile() @@ -3514,7 +3514,7 @@ void KolfGame::openFile() holeInfo.setUntranslatedName(cfg->readEntryUntranslated("Name", holeInfo.untranslatedName())); emit titleChanged(holeInfo.name()); - cfg->setGroup(TQString("%1-hole@-50,-50|0").arg(curHole)); + cfg->setGroup(TQString("%1-hole@-50,-50|0").tqarg(curHole)); curPar = cfg->readNumEntry("par", 3); holeInfo.setPar(curPar); holeInfo.borderWallsChanged(cfg->readBoolEntry("borderWalls", holeInfo.borderWalls())); @@ -3533,12 +3533,12 @@ void KolfGame::openFile() cfg->setGroup(*it); const int len = (*it).length(); - const int dashIndex = (*it).find("-"); + const int dashIndex = (*it).tqfind("-"); const int holeNum = (*it).left(dashIndex).toInt(); if (holeNum > _highestHole) _highestHole = holeNum; - const int atIndex = (*it).find("@"); + const int atIndex = (*it).tqfind("@"); const TQString name = (*it).mid(dashIndex + 1, atIndex - (dashIndex + 1)); if (holeNum != curHole) @@ -3552,8 +3552,8 @@ void KolfGame::openFile() numItems++; - const int commaIndex = (*it).find(","); - const int pipeIndex = (*it).find("|"); + const int commaIndex = (*it).tqfind(","); + const int pipeIndex = (*it).tqfind("|"); const int x = (*it).mid(atIndex + 1, commaIndex - (atIndex + 1)).toInt(); const int y = (*it).mid(commaIndex + 1, pipeIndex - (commaIndex + 1)).toInt(); @@ -3593,7 +3593,7 @@ void KolfGame::openFile() newItem->move(x, y); canvasItem->firstMove(x, y); - newItem->setVisible(true); + newItem->tqsetVisible(true); // make things actually show if (!hasFinalLoad) @@ -3610,13 +3610,13 @@ void KolfGame::openFile() break; } - if (!loaded && name != "hole" && missingPlugins.contains(name) <= 0) + if (!loaded && name != "hole" && missingPlugins.tqcontains(name) <= 0) missingPlugins.append(name); } if (!missingPlugins.empty()) { - KMessageBox::informationList(this, TQString("<p><http://katzbrown.com/kolf/Plugins/></p><p>") + i18n("This hole uses the following plugins, which you do not have installed:") + TQString("</p>"), missingPlugins, TQString::null, TQString("%1 warning").arg(holeInfo.untranslatedName() + TQString::number(curHole))); + KMessageBox::informationList(this, TQString("<p><http://katzbrown.com/kolf/Plugins/></p><p>") + i18n("This hole uses the following plugins, which you do not have installed:") + TQString("</p>"), missingPlugins, TQString(), TQString("%1 warning").tqarg(holeInfo.untranslatedName() + TQString::number(curHole))); } lastDelId = -1; @@ -3634,7 +3634,7 @@ void KolfGame::openFile() clearHole(); setModified(false); for (PlayerList::Iterator it = players->begin(); it != players->end(); ++it) - (*it).ball()->setVisible(false); + (*it).ball()->tqsetVisible(false); return; } @@ -3719,7 +3719,7 @@ void KolfGame::addNewObject(Object *newObj) { TQCanvasItem *newItem = newObj->newObject(course); items.append(newItem); - newItem->setVisible(true); + newItem->tqsetVisible(true); CanvasItem *canvasItem = dynamic_cast<CanvasItem *>(newItem); if (!canvasItem) @@ -3826,11 +3826,11 @@ void KolfGame::addNewHole() // make sure even the current player isn't showing for (PlayerList::Iterator it = players->begin(); it != players->end(); ++it) - (*it).ball()->setVisible(false); + (*it).ball()->tqsetVisible(false); - whiteBall->setVisible(editing); - highlighter->setVisible(false); - putter->setVisible(!editing); + whiteBall->tqsetVisible(editing); + highlighter->tqsetVisible(false); + putter->tqsetVisible(!editing); inPlay = false; // add default objects @@ -3978,7 +3978,7 @@ void KolfGame::save() // wipe out all groups from this hole for (TQStringList::Iterator it = groups.begin(); it != groups.end(); ++it) { - int holeNum = (*it).left((*it).find("-")).toInt(); + int holeNum = (*it).left((*it).tqfind("-")).toInt(); if (holeNum == curHole) cfg->deleteGroup(*it); } @@ -3995,7 +3995,7 @@ void KolfGame::save() } // save where ball starts (whiteBall tells all) - cfg->setGroup(TQString("%1-ball@%2,%3").arg(curHole).arg((int)whiteBall->x()).arg((int)whiteBall->y())); + cfg->setGroup(TQString("%1-ball@%2,%3").tqarg(curHole).tqarg((int)whiteBall->x()).tqarg((int)whiteBall->y())); cfg->writeEntry("dummykey", true); cfg->setGroup("0-course@-50,-50"); @@ -4003,7 +4003,7 @@ void KolfGame::save() cfg->writeEntry("Name", holeInfo.untranslatedName()); // save hole info - cfg->setGroup(TQString("%1-hole@-50,-50|0").arg(curHole)); + cfg->setGroup(TQString("%1-hole@-50,-50|0").tqarg(curHole)); cfg->writeEntry("par", holeInfo.par()); cfg->writeEntry("maxstrokes", holeInfo.maxStrokes()); cfg->writeEntry("borderWalls", holeInfo.borderWalls()); @@ -4066,16 +4066,16 @@ void KolfGame::toggleEditMode() { // curplayer shouldn't be hidden no matter what if ((*it).ball()->beginningOfHole() && it != curPlayer) - (*it).ball()->setVisible(false); + (*it).ball()->tqsetVisible(false); else - (*it).ball()->setVisible(!editing); + (*it).ball()->tqsetVisible(!editing); } - whiteBall->setVisible(editing); - highlighter->setVisible(false); + whiteBall->tqsetVisible(editing); + highlighter->tqsetVisible(false); // shouldn't see putter whilst editing - putter->setVisible(!editing); + putter->tqsetVisible(!editing); if (editing) autoSaveTimer->start(autoSaveMsec); @@ -4103,7 +4103,7 @@ void KolfGame::playSound(TQString file, double vol) } } - file = soundDir + file + TQString::fromLatin1(".wav"); + file = soundDir + file + TQString::tqfromLatin1(".wav"); // not needed when all of the files are in the distribution //if (!TQFile::exists(file)) @@ -4160,7 +4160,7 @@ void KolfGame::print(KPrinter &pr) if (pr.option("kde-kolf-title") == "true") { - TQString text = i18n("%1 - Hole %2; by %3").arg(holeInfo.name()).arg(curHole).arg(holeInfo.author()); + TQString text = i18n("%1 - Hole %2; by %3").tqarg(holeInfo.name()).tqarg(curHole).tqarg(holeInfo.author()); TQFont font(kapp->font()); font.setPointSize(18); TQRect rect = TQFontMetrics(font).boundingRect(text); @@ -4183,7 +4183,7 @@ void KolfGame::setBorderWalls(bool showing) { Wall *wall = 0; for (wall = borderWalls.first(); wall; wall = borderWalls.next()) - wall->setVisible(showing); + wall->tqsetVisible(showing); } void KolfGame::setUseAdvancedPutting(bool yes) @@ -4219,7 +4219,7 @@ void KolfGame::courseInfo(CourseInfo &info, const TQString& filename) unsigned int par= 0; while (1) { - TQString group = TQString("%1-hole@-50,-50|0").arg(hole); + TQString group = TQString("%1-hole@-50,-50|0").tqarg(hole); if (!cfg.hasGroup(group)) { hole--; @@ -4283,7 +4283,7 @@ void KolfGame::saveScores(KConfig *config) { config->setGroup(TQString::number((*it).id())); config->writeEntry("Name", (*it).name()); - config->writeEntry("Color", (*it).ball()->color().name()); + config->writeEntry("Color", TQString((*it).ball()->color().name())); TQStringList scores; TQValueList<int> intscores = (*it).scores(); |