summaryrefslogtreecommitdiffstats
path: root/blinken/src
diff options
context:
space:
mode:
Diffstat (limited to 'blinken/src')
-rw-r--r--blinken/src/blinken.cpp38
-rw-r--r--blinken/src/blinken.h4
-rw-r--r--blinken/src/highscoredialog.cpp2
-rw-r--r--blinken/src/number.cpp24
4 files changed, 34 insertions, 34 deletions
diff --git a/blinken/src/blinken.cpp b/blinken/src/blinken.cpp
index 7e6bf230..202a9a99 100644
--- a/blinken/src/blinken.cpp
+++ b/blinken/src/blinken.cpp
@@ -209,7 +209,7 @@ void blinken::paintEvent(TQPaintEvent *)
if (m_highlighted & blinkenGame::red) p.drawPixmap(322, 16, *m_buttons[2] -> pixmap());
if (m_highlighted & blinkenGame::green) p.drawPixmap(322, 225, *m_buttons[3] -> pixmap());
- drawtqStatusText(p);
+ drawStatusText(p);
bitBlt(this, 0, 0, &buf);
@@ -289,13 +289,13 @@ void blinken::mousePressEvent(TQMouseEvent *e)
hsd->showLevel(1);
m_updateButtonHighlighting = true;
}
- else if (m_showPreferences && m_fontRect.tqcontains(e -> pos()) && !m_alwaysUseNonCoolFont)
+ else if (m_showPreferences && m_fontRect.contains(e -> pos()) && !m_alwaysUseNonCoolFont)
{
blinkenSettings::setCustomFont(!blinkenSettings::customFont());
blinkenSettings::writeConfig();
update();
}
- else if (m_showPreferences && m_soundRect.tqcontains(e -> pos()))
+ else if (m_showPreferences && m_soundRect.contains(e -> pos()))
{
blinkenSettings::setPlaySounds(!blinkenSettings::playSounds());
blinkenSettings::writeConfig();
@@ -316,9 +316,9 @@ void blinken::mousePressEvent(TQMouseEvent *e)
else if (m_game.phase() == blinkenGame::choosingLevel)
{
int level = 0;
- if (m_levelsRect[1].tqcontains(e -> pos())) level = 1;
- else if (m_levelsRect[0].tqcontains(e -> pos())) level = 2;
- else if (m_levelsRect[2].tqcontains(e -> pos())) level = 3;
+ if (m_levelsRect[1].contains(e -> pos())) level = 1;
+ else if (m_levelsRect[0].contains(e -> pos())) level = 2;
+ else if (m_levelsRect[2].contains(e -> pos())) level = 3;
if (level)
{
for(int i = 0; i < 3; i++) m_overLevels[i] = false;
@@ -544,7 +544,7 @@ void blinken::drawScoreAndCounter(TQPainter &p)
p.translate(-268, -110);
}
-void blinken::drawtqStatusText(TQPainter &p)
+void blinken::drawStatusText(TQPainter &p)
{
p.translate(25, 505);
p.rotate(-3.29);
@@ -665,7 +665,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p)
m_updateButtonHighlighting = false;
haveToUpdate = false;
- if (m_highscoreRect.tqcontains(p))
+ if (m_highscoreRect.contains(p))
{
if (!m_overHighscore)
{
@@ -679,7 +679,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p)
haveToUpdate = true;
}
- if (m_menuRect.tqcontains(p))
+ if (m_menuRect.contains(p))
{
if (!m_overMenu)
{
@@ -699,7 +699,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p)
}
else if (m_overMenu)
{
- if (m_aboutKDERect.tqcontains(p))
+ if (m_aboutKDERect.contains(p))
{
if (!m_overAboutKDE)
{
@@ -709,7 +709,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p)
haveToUpdate = true;
}
}
- else if (m_aboutBlinkenRect.tqcontains(p))
+ else if (m_aboutBlinkenRect.contains(p))
{
if (!m_overAboutBlinken)
{
@@ -719,7 +719,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p)
haveToUpdate = true;
}
}
- else if (m_manualRect.tqcontains(p))
+ else if (m_manualRect.contains(p))
{
if (!m_overManual)
{
@@ -739,7 +739,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p)
}
}
- if (!m_showPreferences && m_centralLettersRect.tqcontains(p))
+ if (!m_showPreferences && m_centralLettersRect.contains(p))
{
m_overCentralLetters = true;
haveToUpdate = true;
@@ -750,7 +750,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p)
haveToUpdate = true;
}
- if (m_showPreferences && m_soundRect.tqcontains(p))
+ if (m_showPreferences && m_soundRect.contains(p))
{
m_overSound = true;
haveToUpdate = true;
@@ -761,7 +761,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p)
haveToUpdate = true;
}
- if (m_showPreferences && m_fontRect.tqcontains(p) && !m_alwaysUseNonCoolFont)
+ if (m_showPreferences && m_fontRect.contains(p) && !m_alwaysUseNonCoolFont)
{
m_overFont = true;
haveToUpdate = true;
@@ -772,7 +772,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p)
haveToUpdate = true;
}
- if (m_counterRect.tqcontains(p))
+ if (m_counterRect.contains(p))
{
m_overCounter = true;
haveToUpdate = true;
@@ -783,7 +783,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p)
haveToUpdate = true;
}
- if (m_quitRect.tqcontains(p))
+ if (m_quitRect.contains(p))
{
if (!m_overQuit)
{
@@ -805,7 +805,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p)
case blinkenGame::waiting1:
case blinkenGame::learningTheSequence:
case blinkenGame::typingTheSequence:
- if (m_centralTextRect.tqcontains(p))
+ if (m_centralTextRect.contains(p))
{
if (!m_overCentralText)
{
@@ -823,7 +823,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p)
case blinkenGame::choosingLevel:
for (int i = 0; i < 3; i++)
{
- if (m_levelsRect[i].tqcontains(p))
+ if (m_levelsRect[i].contains(p))
{
if (!m_overLevels[i])
{
diff --git a/blinken/src/blinken.h b/blinken/src/blinken.h
index b5dc4c71..0c45c8a7 100644
--- a/blinken/src/blinken.h
+++ b/blinken/src/blinken.h
@@ -57,7 +57,7 @@ Q_OBJECT
void drawMenuQuit(TQPainter &p);
void drawScoreAndCounter(TQPainter &p);
- void drawtqStatusText(TQPainter &p);
+ void drawStatusText(TQPainter &p);
void drawLevel(TQPainter &p);
void drawText(TQPainter &p, const TQString &text, const TQPoint &center, bool withMargin, int xMargin, int yMargin, TQRect *rect, bool highlight, bool bold);
void updateButtonHighlighting(const TQPoint &p);
@@ -73,7 +73,7 @@ Q_OBJECT
// Preferences setting handling
bool m_showPreferences;
- // if should update the highlighting after the next tqrepaint
+ // if should update the highlighting after the next repaint
bool m_updateButtonHighlighting;
// use always the non-cool font?
diff --git a/blinken/src/highscoredialog.cpp b/blinken/src/highscoredialog.cpp
index 3cb0f5a3..9c5a5287 100644
--- a/blinken/src/highscoredialog.cpp
+++ b/blinken/src/highscoredialog.cpp
@@ -119,7 +119,7 @@ class myTabWidget : public QTabWidget
TQSize tabBarSizeHint() const
{
- return tabBar() -> tqsizeHint();
+ return tabBar() -> sizeHint();
}
};
diff --git a/blinken/src/number.cpp b/blinken/src/number.cpp
index 5316affa..2403f866 100644
--- a/blinken/src/number.cpp
+++ b/blinken/src/number.cpp
@@ -100,7 +100,7 @@ void number::paintDigit(TQPainter &p, int number) const
{
// make gcc happy
const int *n = m_number0;
- int tqshape;
+ int shape;
switch (number)
{
@@ -147,25 +147,25 @@ void number::paintDigit(TQPainter &p, int number) const
{
for (int j = 0; j < 4; j++)
{
- tqshape = n[j + i * 4];
- if (tqshape == 0)
+ shape = n[j + i * 4];
+ if (shape == 0)
{
p.fillRect(7 * (j-1), 7 * (i-1), 6, 6, Qt::red);
}
- else if (tqshape != 5)
+ else if (shape != 5)
{
- if (tqshape == 1) p.translate(7 * (j-1), 7 * (i-1));
- else if (tqshape == 2)
+ if (shape == 1) p.translate(7 * (j-1), 7 * (i-1));
+ else if (shape == 2)
{
p.translate(7 * j - 2, 7 * (i-1));
p.rotate(90);
}
- else if (tqshape == 3)
+ else if (shape == 3)
{
p.translate(7 * j - 2, 7 * i - 2);
p.rotate(180);
}
- else if (tqshape == 4)
+ else if (shape == 4)
{
p.translate(7 * (j-1), 7 * i - 2);
p.rotate(270);
@@ -173,19 +173,19 @@ void number::paintDigit(TQPainter &p, int number) const
p.drawPie(0, 0, 11, 11, 90 * 16, 16 * 90);
- if (tqshape == 1) p.translate(-7 * (j-1), -7 * (i-1));
- else if (tqshape == 2)
+ if (shape == 1) p.translate(-7 * (j-1), -7 * (i-1));
+ else if (shape == 2)
{
p.rotate(-90);
p.translate(-(7 * j - 2), -7 * (i-1));
}
- else if (tqshape == 3)
+ else if (shape == 3)
{
p.rotate(-180);
p.translate(-(7 * j - 2), -(7 * i - 2));
}
- else if (tqshape == 4)
+ else if (shape == 4)
{
p.rotate(-270);
p.translate(- (7 * (j-1)), -(7 * i - 2));