summaryrefslogtreecommitdiffstats
path: root/katomic
diff options
context:
space:
mode:
Diffstat (limited to 'katomic')
-rw-r--r--katomic/configbox.cpp2
-rw-r--r--katomic/feld.cpp10
-rw-r--r--katomic/feld.h2
-rw-r--r--katomic/gamewidget.cpp30
-rw-r--r--katomic/molek.cpp8
-rw-r--r--katomic/toplevel.cpp2
6 files changed, 27 insertions, 27 deletions
diff --git a/katomic/configbox.cpp b/katomic/configbox.cpp
index ad524023..dedcaf59 100644
--- a/katomic/configbox.cpp
+++ b/katomic/configbox.cpp
@@ -8,7 +8,7 @@
#include <klocale.h>
#include <kglobal.h>
#include <kconfig.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqgroupbox.h>
#include <tqslider.h>
diff --git a/katomic/feld.cpp b/katomic/feld.cpp
index dcddf606..b18f78ae 100644
--- a/katomic/feld.cpp
+++ b/katomic/feld.cpp
@@ -124,7 +124,7 @@ void Feld::mousePressEvent (TQMouseEvent *e)
resetValidDirs();
chosen = false;
}
- emittqStatus();
+ emitStatus();
}
const atom& Feld::getAtom(uint index) const
@@ -154,7 +154,7 @@ void Feld::nextAtom()
xpos = x; ypos = y;
chosen = true;
resetValidDirs();
- emittqStatus();
+ emitStatus();
return;
}
}
@@ -187,7 +187,7 @@ void Feld::previousAtom()
xpos = x; ypos = y;
chosen = true;
resetValidDirs();
- emittqStatus();
+ emitStatus();
return;
}
}
@@ -198,7 +198,7 @@ void Feld::previousAtom()
}
-void Feld::emittqStatus()
+void Feld::emitStatus()
{
if (!chosen || moving) {}
else {
@@ -231,7 +231,7 @@ void Feld::done ()
if (moving)
return;
- emittqStatus();
+ emitStatus();
if (checkDone())
emit gameOver(moves);
diff --git a/katomic/feld.h b/katomic/feld.h
index 66b1499d..668dbdf2 100644
--- a/katomic/feld.h
+++ b/katomic/feld.h
@@ -65,7 +65,7 @@ protected:
void paintMovingAtom();
void mousePressEvent (TQMouseEvent *);
void mouseMoveEvent (TQMouseEvent *);
- void emittqStatus();
+ void emitStatus();
protected:
struct UndoInfo {
diff --git a/katomic/gamewidget.cpp b/katomic/gamewidget.cpp
index 064037ef..e99f28f8 100644
--- a/katomic/gamewidget.cpp
+++ b/katomic/gamewidget.cpp
@@ -25,7 +25,7 @@
#include <tqscrollbar.h>
#include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvbox.h>
#include <tqlabel.h>
@@ -95,11 +95,11 @@ void GameWidget::doRedo ()
}
void GameWidget::gameOver(int moves) {
- KMessageBox::information(this, i18n("You solved level %1 with %2 moves!").tqarg(level).tqarg(moves), i18n("Congratulations"));
+ KMessageBox::information(this, i18n("You solved level %1 with %2 moves!").arg(level).arg(moves), i18n("Congratulations"));
KScoreDialog high(KScoreDialog::Name | KScoreDialog::Score, this);
- high.setCaption(i18n("Level %1 Highscores").tqarg(level));
- high.setConfigGroup(TQString("Highscores Level %1").tqarg(level));
+ high.setCaption(i18n("Level %1 Highscores").arg(level));
+ high.setConfigGroup(TQString("Highscores Level %1").arg(level));
KScoreDialog::FieldInfo scoreInfo;
@@ -118,8 +118,8 @@ void GameWidget::getMoves(int moves)
void GameWidget::mergeHighScores(int l)
{
- KConfigGroup oldConfig(kapp->config(), TQString("High Scores Level %1").tqarg(l).utf8());
- KConfigGroup newConfig(kapp->config(), TQString("Highscores Level %1").tqarg(l).utf8());
+ KConfigGroup oldConfig(kapp->config(), TQString("High Scores Level %1").arg(l).utf8());
+ KConfigGroup newConfig(kapp->config(), TQString("Highscores Level %1").arg(l).utf8());
newConfig.writeEntry("LastPlayer", oldConfig.readEntry("LastPlayer"));
@@ -138,7 +138,7 @@ void GameWidget::mergeHighScores(int l)
void GameWidget::updateLevel (int l)
{
level=l;
- TQString levelFile = locate("appdata", TQString("levels/level_%1").tqarg(l));
+ TQString levelFile = locate("appdata", TQString("levels/level_%1").arg(l));
if (levelFile.isNull()) {
return updateLevel(1);
}
@@ -147,11 +147,11 @@ void GameWidget::updateLevel (int l)
cfg.setGroup("Level");
feld->load(cfg);
- if (!kapp->config()->hasGroup(TQString("Highscores Level %1").tqarg(level)) &&
- kapp->config()->hasGroup(TQString("High Scores Level %1").tqarg(level)))
+ if (!kapp->config()->hasGroup(TQString("Highscores Level %1").arg(level)) &&
+ kapp->config()->hasGroup(TQString("High Scores Level %1").arg(level)))
mergeHighScores(level);
- highScore->setConfigGroup(TQString("Highscores Level %1").tqarg(level));
+ highScore->setConfigGroup(TQString("Highscores Level %1").arg(level));
highest.setNum(highScore->highScore());
if (highest != "0" ) hs->setText(highest);
@@ -159,7 +159,7 @@ void GameWidget::updateLevel (int l)
ys->setText("0");
scrl->setValue(level);
- feld->tqrepaint();
+ feld->repaint();
}
void GameWidget::restartLevel()
@@ -214,7 +214,7 @@ GameWidget::GameWidget ( TQWidget *parent, const char* name )
headerFont.setBold(true);
hs = new TQLabel (highest, bg);
- hs->tqsetAlignment(TQt::AlignRight);
+ hs->setAlignment(TQt::AlignRight);
hs->setFont(headerFont);
slay->addWidget(hs);
@@ -223,7 +223,7 @@ GameWidget::GameWidget ( TQWidget *parent, const char* name )
slay->addWidget(new TQLabel(i18n("Your score so far:"), bg));
ys = new TQLabel (current, bg);
- ys->tqsetAlignment(TQt::AlignRight);
+ ys->setAlignment(TQt::AlignRight);
ys->setFont(headerFont);
slay->addWidget(ys);
@@ -245,8 +245,8 @@ GameWidget::~GameWidget()
void GameWidget::showHighscores ()
{
KScoreDialog high(KScoreDialog::Name | KScoreDialog::Score, this);
- high.setCaption(i18n("Level %1 Highscores").tqarg(level));
- high.setConfigGroup(TQString("Highscores Level %1").tqarg(level));
+ high.setCaption(i18n("Level %1 Highscores").arg(level));
+ high.setConfigGroup(TQString("Highscores Level %1").arg(level));
high.exec();
}
diff --git a/katomic/molek.cpp b/katomic/molek.cpp
index 6731962f..4a0562c2 100644
--- a/katomic/molek.cpp
+++ b/katomic/molek.cpp
@@ -62,7 +62,7 @@ void Molek::load (const KSimpleConfig& config)
if (value.isEmpty())
break;
- current.obj = value.tqat(0).latin1();
+ current.obj = value.at(0).latin1();
value = value.mid(2);
if (value.isNull())
value = "";
@@ -82,7 +82,7 @@ void Molek::load (const KSimpleConfig& config)
line = config.readEntry(key);
for (int i = 0; i < MOLEK_SIZE; i++)
- molek[i][j] = atom2int(line.tqat(i).latin1());
+ molek[i][j] = atom2int(line.at(i).latin1());
}
mname = i18n(config.readEntry("Name", I18N_NOOP("Noname")).latin1());
@@ -103,12 +103,12 @@ void Molek::load (const KSimpleConfig& config)
height++;
width++;
- tqrepaint ();
+ repaint ();
}
void Molek::paintEvent( TQPaintEvent * )
{
- TQString st = i18n("Level: %1").tqarg(level);
+ TQString st = i18n("Level: %1").arg(level);
TQPainter paint (this);
paint.setPen (TQColor (190, 190, 190));
diff --git a/katomic/toplevel.cpp b/katomic/toplevel.cpp
index e2d9e745..273410f0 100644
--- a/katomic/toplevel.cpp
+++ b/katomic/toplevel.cpp
@@ -19,7 +19,7 @@
*/
#include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kglobal.h>
#include <klocale.h>