summaryrefslogtreecommitdiffstats
path: root/kgoldrunner
diff options
context:
space:
mode:
Diffstat (limited to 'kgoldrunner')
-rw-r--r--kgoldrunner/src/kgoldrunner.h4
-rw-r--r--kgoldrunner/src/kgrcanvas.cpp8
-rw-r--r--kgoldrunner/src/kgrconsts.h2
-rw-r--r--kgoldrunner/src/kgrdialog.cpp6
-rw-r--r--kgoldrunner/src/kgrfigure.cpp14
-rw-r--r--kgoldrunner/src/kgrfigure.h6
-rw-r--r--kgoldrunner/src/kgrgame.cpp4
7 files changed, 22 insertions, 22 deletions
diff --git a/kgoldrunner/src/kgoldrunner.h b/kgoldrunner/src/kgoldrunner.h
index 2959b3d0..e346cce1 100644
--- a/kgoldrunner/src/kgoldrunner.h
+++ b/kgoldrunner/src/kgoldrunner.h
@@ -9,7 +9,7 @@
#include <config.h>
#endif
-// tqStatus bar
+// Status bar
const int ID_LIVES = 0; // Field IDs in KDE status bar.
const int ID_SCORE = 1;
const int ID_LEVEL = 2;
@@ -137,7 +137,7 @@ private slots:
void showLevel (int); // Show the current level number.
void showLives (long); // Show how many lives are remaining.
void showScore (long); // Show the player's score.
- void gameFreeze (bool); // tqStatus feedback on freeze/unfreeze.
+ void gameFreeze (bool); // Status feedback on freeze/unfreeze.
void adjustHintAction (bool); // Enable/disable "Hint" action.
void markRuleType (char ruleType); // Check game's rule type in the menu.
diff --git a/kgoldrunner/src/kgrcanvas.cpp b/kgoldrunner/src/kgrcanvas.cpp
index b56c2453..cd364d15 100644
--- a/kgoldrunner/src/kgrcanvas.cpp
+++ b/kgoldrunner/src/kgrcanvas.cpp
@@ -117,7 +117,7 @@ bool KGrCanvas::changeSize (int d)
return FALSE;
}
- TQWMatrix wm = tqworldMatrix();
+ TQWMatrix wm = worldMatrix();
double wmScale = 1.0;
// Set the scale back to 1:1 and calculate the new scale factor.
@@ -210,7 +210,7 @@ void KGrCanvas::makeTitle ()
title->setPaletteForegroundColor (textColor);
title->setFont (TQFont (fontInfo().family(),
(baseFontSize * scaleStep) / baseScale, TQFont::Bold));
- title->tqsetAlignment (TQt::AlignCenter);
+ title->setAlignment (TQt::AlignCenter);
title->raise();
title->show();
}
@@ -257,12 +257,12 @@ void KGrCanvas::makeHeroSprite (int i, int j, int startFrame)
i++; j++;
heroSprite->move (i * 4 * STEP, j * 4 * STEP, startFrame);
heroSprite->setZ (1);
- heroSprite->tqsetVisible (TRUE);
+ heroSprite->setVisible (TRUE);
}
void KGrCanvas::setHeroVisible (bool newState)
{
- heroSprite->tqsetVisible (newState); // Show or hide the hero.
+ heroSprite->setVisible (newState); // Show or hide the hero.
}
void KGrCanvas::makeEnemySprite (int i, int j, int startFrame)
diff --git a/kgoldrunner/src/kgrconsts.h b/kgoldrunner/src/kgrconsts.h
index ce5ada47..2006648a 100644
--- a/kgoldrunner/src/kgrconsts.h
+++ b/kgoldrunner/src/kgrconsts.h
@@ -70,7 +70,7 @@ enum Position {RIGHTWALK1,RIGHTWALK2,RIGHTWALK3,RIGHTWALK4,
LEFTCLIMB1,LEFTCLIMB2,LEFTCLIMB3,LEFTCLIMB4,
CLIMB1,CLIMB2,
FALL1,FALL2};
-enum tqStatus {STANDING,FALLING,WALKING,CLIMBING,CAPTIVE};
+enum Status {STANDING,FALLING,WALKING,CLIMBING,CAPTIVE};
enum Direction {RIGHT,LEFT,UP,DOWN,STAND};
enum SearchStrategy {LOW,MEDIUM,HIGH};
diff --git a/kgoldrunner/src/kgrdialog.cpp b/kgoldrunner/src/kgrdialog.cpp
index 9a5ecb44..862889c7 100644
--- a/kgoldrunner/src/kgrdialog.cpp
+++ b/kgoldrunner/src/kgrdialog.cpp
@@ -544,7 +544,7 @@ KGrNHDialog::KGrNHDialog(const TQString & levelName, const TQString & levelHint,
mle-> setMinimumSize ((FIELDWIDTH*c/2), (FIELDHEIGHT/2)*c);
// Configure the text box.
- mle-> tqsetAlignment (AlignLeft);
+ mle-> setAlignment (AlignLeft);
#ifndef QT3
mle-> setWordWrap (TQMultiLineEdit::WidgetWidth);
mle-> setFixedVisibleLines (9);
@@ -694,7 +694,7 @@ KGrECDialog::KGrECDialog (int action, int collnIndex,
}
// Configure the edit box.
- mle-> tqsetAlignment (AlignLeft);
+ mle-> setAlignment (AlignLeft);
#ifndef QT3
mle-> setWordWrap (TQMultiLineEdit::WidgetWidth);
mle-> setFixedVisibleLines (8);
@@ -950,7 +950,7 @@ void KGrMessage::wrapped (TQWidget * parent, TQString title, TQString contents)
OK-> setMaximumWidth (3*c);
mle-> setFrameStyle (TQFrame::NoFrame);
- mle-> tqsetAlignment (AlignLeft);
+ mle-> setAlignment (AlignLeft);
mle-> setReadOnly (TRUE);
mle-> setText (contents);
diff --git a/kgoldrunner/src/kgrfigure.cpp b/kgoldrunner/src/kgrfigure.cpp
index 7c640e88..272c571e 100644
--- a/kgoldrunner/src/kgrfigure.cpp
+++ b/kgoldrunner/src/kgrfigure.cpp
@@ -76,7 +76,7 @@ int KGrFigure::gety()
return absy;
}
-tqStatus KGrFigure::gettqStatus()
+Status KGrFigure::getStatus()
{
return status;
}
@@ -733,7 +733,7 @@ bool KGrHero::standOnEnemy()
(((absx - 16) < enemy->getx()) &&
((absx + 16) > enemy->getx()))) {
if (((absy + 12) == enemy->gety()) &&
- (enemy->gettqStatus() != FALLING)) {
+ (enemy->getStatus() != FALLING)) {
absy = absy - rely; // Bounce back from overlap, to avoid
rely = 0; // hero-enemy mid-cycle deadlock.
walkCounter = 1;
@@ -807,7 +807,7 @@ KGrEnemy :: KGrEnemy (KGrCanvas * view, int x, int y)
walkCounter = 1;
captiveCounter = 0;
- searchtqStatus = HORIZONTAL;
+ searchStatus = HORIZONTAL;
birthX=x;
birthY=y;
@@ -849,7 +849,7 @@ void KGrEnemy::showState(char option)
case 's': printf (" nuggets %02d status %d walk-ctr %d ",
nuggets, status, walkCounter);
printf ("dirn %d search %d capt-ctr %d\n",
- direction, searchtqStatus, captiveCounter);
+ direction, searchStatus, captiveCounter);
printf (" rel (%02d,%02d) abs (%03d,%03d)",
relx, rely, absx, absy);
printf (" pix %02d", actualPixmap);
@@ -907,7 +907,7 @@ void KGrEnemy::walkTimeDone ()
case RIGHT: walkRight (WALKDELAY, FALLDELAY); break;
case LEFT: walkLeft (WALKDELAY, FALLDELAY); break;
default: // Switch search direction in KGoldrunner search (only).
- searchtqStatus = (searchtqStatus==VERTIKAL) ?
+ searchStatus = (searchStatus==VERTIKAL) ?
HORIZONTAL : VERTIKAL;
// In KGoldrunner rules, if a hole opens under an enemy
@@ -942,7 +942,7 @@ void KGrEnemy::walkTimeDone ()
// In KGoldrunner rules, change the search strategy,
// to avoid enemy-enemy deadlock.
- searchtqStatus = (searchtqStatus==VERTIKAL) ? HORIZONTAL : VERTIKAL;
+ searchStatus = (searchStatus==VERTIKAL) ? HORIZONTAL : VERTIKAL;
dirn = searchbestway (x, y, herox, heroy);
if ((dirn != direction) && ((*playfield)[x][y]->whatIam() != USEDHOLE)) {
@@ -1221,7 +1221,7 @@ Direction KGrEnemy::searchbestway(int ew,int eh,int hw,int hh)
// KGoldrunner search strategy.
case MEDIUM:
case HIGH:
- if(searchtqStatus==VERTIKAL){
+ if(searchStatus==VERTIKAL){
if (eh > hh)
return searchupway(ew,eh);
if (eh < hh)
diff --git a/kgoldrunner/src/kgrfigure.h b/kgoldrunner/src/kgrfigure.h
index fd7de606..ab49ceb9 100644
--- a/kgoldrunner/src/kgrfigure.h
+++ b/kgoldrunner/src/kgrfigure.h
@@ -54,7 +54,7 @@ public:
// dependent on number of enemies.
int getx();
int gety();
- tqStatus gettqStatus();
+ Status getStatus();
int getnuggets();
void setNuggets(int n);
@@ -81,7 +81,7 @@ protected:
TQTimer *fallTimer;
KGrObject *(*playfield)[30][22];
- tqStatus status;
+ Status status;
Direction direction;
bool canWalkRight();
bool canWalkLeft();
@@ -185,7 +185,7 @@ public:
private:
KGrCanvas * enemyView;
int birthX, birthY;
- int searchtqStatus;
+ int searchStatus;
int captiveCounter;
TQTimer *captiveTimer;
bool canWalkUp();
diff --git a/kgoldrunner/src/kgrgame.cpp b/kgoldrunner/src/kgrgame.cpp
index a52abe01..4b0a18b8 100644
--- a/kgoldrunner/src/kgrgame.cpp
+++ b/kgoldrunner/src/kgrgame.cpp
@@ -778,7 +778,7 @@ void KGrGame::saveGame() // Save game ID, score and level.
"level, not as they are now."));
}
- TQDate today = TQDate::tqcurrentDate();
+ TQDate today = TQDate::currentDate();
TQTime now = TQTime::currentTime();
TQString saved;
TQString day;
@@ -1034,7 +1034,7 @@ void KGrGame::checkHighScore()
delete hsn;
- TQDate today = TQDate::tqcurrentDate();
+ TQDate today = TQDate::currentDate();
TQString hsDate;
#ifdef QT3
TQString day = today.shortDayName(today.dayOfWeek());
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-14 17:36:07 +0000