diff options
Diffstat (limited to 'katomic')
-rw-r--r-- | katomic/configbox.cpp | 22 | ||||
-rw-r--r-- | katomic/configbox.h | 12 | ||||
-rw-r--r-- | katomic/feld.cpp | 30 | ||||
-rw-r--r-- | katomic/feld.h | 26 | ||||
-rw-r--r-- | katomic/gamewidget.cpp | 66 | ||||
-rw-r--r-- | katomic/gamewidget.h | 10 | ||||
-rw-r--r-- | katomic/main.cpp | 2 | ||||
-rw-r--r-- | katomic/molek.cpp | 18 | ||||
-rw-r--r-- | katomic/molek.h | 24 | ||||
-rw-r--r-- | katomic/settings.h | 2 | ||||
-rw-r--r-- | katomic/toplevel.cpp | 32 |
11 files changed, 122 insertions, 122 deletions
diff --git a/katomic/configbox.cpp b/katomic/configbox.cpp index ea546d89..d6fcde23 100644 --- a/katomic/configbox.cpp +++ b/katomic/configbox.cpp @@ -8,38 +8,38 @@ #include <klocale.h> #include <kglobal.h> #include <kconfig.h> -#include <qlayout.h> -#include <qgroupbox.h> -#include <qslider.h> +#include <tqlayout.h> +#include <tqgroupbox.h> +#include <tqslider.h> #include "settings.h" extern Options settings; -ConfigBox::ConfigBox ( QWidget *parent, const char *name) +ConfigBox::ConfigBox ( TQWidget *parent, const char *name) : KDialogBase ( parent, name, true, i18n("Configure"), Ok | Cancel, Ok, true ) { - QWidget *page = makeMainWidget(); + TQWidget *page = makeMainWidget(); - QGridLayout *glay = new QGridLayout (page, 4, 5, 0, spacingHint()); + TQGridLayout *glay = new TQGridLayout (page, 4, 5, 0, spacingHint()); glay->setRowStretch(0, 1); glay->setRowStretch(3, 1); glay->setColStretch(0, 1); glay->setColStretch(4, 1); - glay->addWidget(new QLabel(i18n("Animation speed:"),page), 2, 1); + glay->addWidget(new TQLabel(i18n("Animation speed:"),page), 2, 1); - disp = new QLCDNumber(page); + disp = new TQLCDNumber(page); glay->addWidget(disp, 1, 2); disp->display(1); - speed = new QSlider(1, 10, 1, 1, QSlider::Horizontal, page); + speed = new TQSlider(1, 10, 1, 1, TQSlider::Horizontal, page); glay->addMultiCellWidget(speed, 2, 2, 2, 3); - connect(speed, SIGNAL(valueChanged(int)), disp, SLOT(display(int))); + connect(speed, TQT_SIGNAL(valueChanged(int)), disp, TQT_SLOT(display(int))); speed->setValue(settings.anim_speed); - incInitialSize(QSize(20,20), true); + incInitialSize(TQSize(20,20), true); } void ConfigBox::slotOk() diff --git a/katomic/configbox.h b/katomic/configbox.h index 0acdfd0d..b3d8dfe2 100644 --- a/katomic/configbox.h +++ b/katomic/configbox.h @@ -7,9 +7,9 @@ #ifndef CONFIGBOX_H #define CONFIGBOX_H -#include <qlabel.h> -#include <qslider.h> -#include <qlcdnumber.h> +#include <tqlabel.h> +#include <tqslider.h> +#include <tqlcdnumber.h> #include <kdialogbase.h> @@ -18,7 +18,7 @@ class ConfigBox : public KDialogBase Q_OBJECT public: - ConfigBox ( QWidget *, const char* name ); + ConfigBox ( TQWidget *, const char* name ); ~ConfigBox(); protected slots: @@ -28,8 +28,8 @@ signals: void speedChanged(); private: - QSlider *speed; - QLCDNumber *disp; + TQSlider *speed; + TQLCDNumber *disp; }; #endif diff --git a/katomic/feld.cpp b/katomic/feld.cpp index 47af46d5..e01060cb 100644 --- a/katomic/feld.cpp +++ b/katomic/feld.cpp @@ -26,27 +26,27 @@ extern Options settings; -Feld::Feld( QWidget *parent, const char *name ) : - QWidget( parent, name ), +Feld::Feld( TQWidget *parent, const char *name ) : + TQWidget( parent, name ), data(locate("appdata", "pics/abilder.png")), undoBegin (0), undoSize (0), redoSize (0) { anim = false; dir = None; - sprite = QPixmap (30, 30); + sprite = TQPixmap (30, 30); cx = -1; cy = -1; - point = new QPoint [1]; + point = new TQPoint [1]; moving = false; chosen = false; setMouseTracking(true); - setFocusPolicy(QWidget::StrongFocus); - setBackgroundColor( QColor( 0, 0, 0) ); + setFocusPolicy(TQWidget::StrongFocus); + setBackgroundColor( TQColor( 0, 0, 0) ); setFixedSize(15 * 30, 15 * 30); } @@ -74,12 +74,12 @@ void Feld::load (const KSimpleConfig& config) mol->load(config); - QString key; + TQString key; for (int j = 0; j < FIELD_SIZE; j++) { key.sprintf("feld_%02d", j); - QString line = config.readEntry(key); + TQString line = config.readEntry(key); for (int i = 0; i < FIELD_SIZE; i++) feld[i][j] = atom2int(line[i].latin1()); @@ -98,7 +98,7 @@ void Feld::load (const KSimpleConfig& config) nextAtom(); } -void Feld::mousePressEvent (QMouseEvent *e) +void Feld::mousePressEvent (TQMouseEvent *e) { if (moving) return; @@ -406,7 +406,7 @@ void Feld::doRedo () bitBlt (&sprite, 0, 0, this, cx, cy, 30, 30, CopyROP); } -void Feld::mouseMoveEvent (QMouseEvent *e) +void Feld::mouseMoveEvent (TQMouseEvent *e) { // warning: mouseMoveEvents can report positions upto 1 pixel outside // of the field widget, so we must be sure handle this case @@ -450,7 +450,7 @@ bool Feld::checkDone () int mx = 0; int my = j - 1; - QRect extent(0, 0, FIELD_SIZE - molecWidth + 1, FIELD_SIZE - molecHeight + 1); + TQRect extent(0, 0, FIELD_SIZE - molecWidth + 1, FIELD_SIZE - molecHeight + 1); extent.moveBy(0, my); // find first atom in playing field @@ -486,7 +486,7 @@ bool Feld::checkDone () } -void Feld::timerEvent (QTimerEvent *) +void Feld::timerEvent (TQTimerEvent *) { // animation beenden if (frames <= 0) @@ -510,7 +510,7 @@ void Feld::paintMovingAtom() { int a = settings.anim_speed; - QPainter paint(this); + TQPainter paint(this); switch(dir) { @@ -554,11 +554,11 @@ void Feld::putNonAtom (int x, int y, Direction which, bool brick) bitBlt(this, x * 30, y * 30, &data, xarr, yarr, 30, 30, CopyROP); } -void Feld::paintEvent( QPaintEvent * ) +void Feld::paintEvent( TQPaintEvent * ) { int i, j, x, y; - QPainter paint ( this ); + TQPainter paint ( this ); paint.setPen (black); diff --git a/katomic/feld.h b/katomic/feld.h index 6a1cf761..b48ebf39 100644 --- a/katomic/feld.h +++ b/katomic/feld.h @@ -10,11 +10,11 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <qwidget.h> -#include <qpoint.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qmessagebox.h> +#include <tqwidget.h> +#include <tqpoint.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqmessagebox.h> #include <kscoredialog.h> @@ -32,7 +32,7 @@ class Feld : public QWidget Q_OBJECT public: - Feld (QWidget *parent=0, const char *name=0); + Feld (TQWidget *parent=0, const char *name=0); ~Feld (); enum Direction { None = 0, @@ -59,11 +59,11 @@ signals: protected: bool checkDone(); - void timerEvent (QTimerEvent *); - void paintEvent( QPaintEvent * ); + void timerEvent (TQTimerEvent *); + void paintEvent( TQPaintEvent * ); void paintMovingAtom(); - void mousePressEvent (QMouseEvent *); - void mouseMoveEvent (QMouseEvent *); + void mousePressEvent (TQMouseEvent *); + void mouseMoveEvent (TQMouseEvent *); void emitStatus(); protected: @@ -84,9 +84,9 @@ private: void putNonAtom(int, int, Direction, bool brick = false); - QPoint *point; - QPixmap data; - QPixmap sprite; + TQPoint *point; + TQPixmap data; + TQPixmap sprite; Molek *mol; diff --git a/katomic/gamewidget.cpp b/katomic/gamewidget.cpp index 165e55c0..2c9ccf0a 100644 --- a/katomic/gamewidget.cpp +++ b/katomic/gamewidget.cpp @@ -23,11 +23,11 @@ #include "feld.h" #include "molek.h" -#include <qscrollbar.h> -#include <qgroupbox.h> -#include <qlayout.h> -#include <qvbox.h> -#include <qlabel.h> +#include <tqscrollbar.h> +#include <tqgroupbox.h> +#include <tqlayout.h> +#include <tqvbox.h> +#include <tqlabel.h> #include <kapplication.h> #include <kscoredialog.h> @@ -99,7 +99,7 @@ void GameWidget::gameOver(int moves) { KScoreDialog high(KScoreDialog::Name | KScoreDialog::Score, this); high.setCaption(i18n("Level %1 Highscores").arg(level)); - high.setConfigGroup(QString("Highscores Level %1").arg(level)); + high.setConfigGroup(TQString("Highscores Level %1").arg(level)); KScoreDialog::FieldInfo scoreInfo; @@ -118,16 +118,16 @@ void GameWidget::getMoves(int moves) void GameWidget::mergeHighScores(int l) { - KConfigGroup oldConfig(kapp->config(), QString("High Scores Level %1").arg(l).utf8()); - KConfigGroup newConfig(kapp->config(), QString("Highscores Level %1").arg(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")); - QString num; + TQString num; for (int i = 1; i <= 10; ++i) { num.setNum(i); - QString key = "Pos" + num + "Name"; + TQString key = "Pos" + num + "Name"; newConfig.writeEntry(key, oldConfig.readEntry(key, "-")); key = "Pos" + num + "Score"; newConfig.writeEntry(key, oldConfig.readEntry(key, "-")); @@ -138,7 +138,7 @@ void GameWidget::mergeHighScores(int l) void GameWidget::updateLevel (int l) { level=l; - QString levelFile = locate("appdata", QString("levels/level_%1").arg(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(QString("Highscores Level %1").arg(level)) && - kapp->config()->hasGroup(QString("High Scores Level %1").arg(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(QString("Highscores Level %1").arg(level)); + highScore->setConfigGroup(TQString("Highscores Level %1").arg(level)); highest.setNum(highScore->highScore()); if (highest != "0" ) hs->setText(highest); @@ -167,14 +167,14 @@ void GameWidget::restartLevel() updateLevel(level); } -GameWidget::GameWidget ( QWidget *parent, const char* name ) - : QWidget( parent, name ) +GameWidget::GameWidget ( TQWidget *parent, const char* name ) + : TQWidget( parent, name ) { level = 1; nlevels = KGlobal::dirs()->findAllResources("appdata", "levels/level_*", false, true).count(); - QHBoxLayout *top = new QHBoxLayout(this, 10); + TQHBoxLayout *top = new TQHBoxLayout(this, 10); // spielfeld feld = new Feld (this, "feld"); @@ -182,47 +182,47 @@ GameWidget::GameWidget ( QWidget *parent, const char* name ) top->addWidget(feld); - QVBox *vb = new QVBox(this); + TQVBox *vb = new TQVBox(this); vb->setSpacing(20); top->addWidget(vb); // scrollbar - scrl = new QScrollBar(1, nlevels, 1, - 5, 1, QScrollBar::Horizontal, vb, "scrl" ); - connect (scrl, SIGNAL (valueChanged (int)), SLOT (updateLevel (int))); + scrl = new TQScrollBar(1, nlevels, 1, + 5, 1, TQScrollBar::Horizontal, vb, "scrl" ); + connect (scrl, TQT_SIGNAL (valueChanged (int)), TQT_SLOT (updateLevel (int))); // molekül molek = new Molek (vb, "molek"); feld->setMolek(molek); - connect (feld, SIGNAL (gameOver(int)), SLOT(gameOver(int))); - connect (feld, SIGNAL (sendMoves(int)), SLOT(getMoves(int))); - connect (feld, SIGNAL (enableRedo(bool)), SIGNAL(enableRedo(bool))); - connect (feld, SIGNAL (enableUndo(bool)), SIGNAL(enableUndo(bool))); + connect (feld, TQT_SIGNAL (gameOver(int)), TQT_SLOT(gameOver(int))); + connect (feld, TQT_SIGNAL (sendMoves(int)), TQT_SLOT(getMoves(int))); + connect (feld, TQT_SIGNAL (enableRedo(bool)), TQT_SIGNAL(enableRedo(bool))); + connect (feld, TQT_SIGNAL (enableUndo(bool)), TQT_SIGNAL(enableUndo(bool))); highScore = new KScoreDialog(KScoreDialog::Name | KScoreDialog::Score, this); // the score group - QGroupBox *bg = new QGroupBox (i18n("Score"), vb, "bg"); - QBoxLayout *slay = new QVBoxLayout (bg, 10); + TQGroupBox *bg = new TQGroupBox (i18n("Score"), vb, "bg"); + TQBoxLayout *slay = new TQVBoxLayout (bg, 10); slay->addSpacing(10); - slay->addWidget(new QLabel(i18n("Highscore:"), bg)); + slay->addWidget(new TQLabel(i18n("Highscore:"), bg)); - QFont headerFont = KGlobalSettings::generalFont(); + TQFont headerFont = KGlobalSettings::generalFont(); headerFont.setBold(true); - hs = new QLabel (highest, bg); + hs = new TQLabel (highest, bg); hs->setAlignment(Qt::AlignRight); hs->setFont(headerFont); slay->addWidget(hs); slay->addSpacing(10); - slay->addWidget(new QLabel(i18n("Your score so far:"), bg)); + slay->addWidget(new TQLabel(i18n("Your score so far:"), bg)); - ys = new QLabel (current, bg); + ys = new TQLabel (current, bg); ys->setAlignment(Qt::AlignRight); ys->setFont(headerFont); slay->addWidget(ys); @@ -246,7 +246,7 @@ void GameWidget::showHighscores () { KScoreDialog high(KScoreDialog::Name | KScoreDialog::Score, this); high.setCaption(i18n("Level %1 Highscores").arg(level)); - high.setConfigGroup(QString("Highscores Level %1").arg(level)); + high.setConfigGroup(TQString("Highscores Level %1").arg(level)); high.exec(); } diff --git a/katomic/gamewidget.h b/katomic/gamewidget.h index 00e95376..c68965fd 100644 --- a/katomic/gamewidget.h +++ b/katomic/gamewidget.h @@ -8,7 +8,7 @@ class QScrollBar; class QLabel; class KScoreDialog; -#include <qwidget.h> +#include <tqwidget.h> class GameWidget : public QWidget { @@ -16,7 +16,7 @@ class GameWidget : public QWidget public: - GameWidget ( QWidget *parent, const char *name=0 ); + GameWidget ( TQWidget *parent, const char *name=0 ); ~GameWidget(); @@ -63,11 +63,11 @@ class GameWidget : public QWidget Molek *molek; // scorllbar zur levelwahl - QScrollBar *scrl; + TQScrollBar *scrl; // important labels : highest and current scores - QLabel *hs, *ys; - QString highest, current; + TQLabel *hs, *ys; + TQString highest, current; int nlevels; diff --git a/katomic/main.cpp b/katomic/main.cpp index 91072a8b..6d358bda 100644 --- a/katomic/main.cpp +++ b/katomic/main.cpp @@ -52,7 +52,7 @@ int main(int argc, char **argv) KCmdLineArgs::init( argc, argv, &aboutData ); - QApplication::setColorSpec(QApplication::ManyColor); + TQApplication::setColorSpec(TQApplication::ManyColor); KApplication a; KGlobal::locale()->insertCatalogue("libkdegames"); diff --git a/katomic/molek.cpp b/katomic/molek.cpp index 3425ffe1..26cbcbf6 100644 --- a/katomic/molek.cpp +++ b/katomic/molek.cpp @@ -26,10 +26,10 @@ extern int level; -Molek::Molek( QWidget *parent, const char *name ) : QWidget( parent, name ), +Molek::Molek( TQWidget *parent, const char *name ) : TQWidget( parent, name ), data(locate("appdata", "pics/molek.png")) { - setBackgroundColor (QColor (0, 0, 0)); + setBackgroundColor (TQColor (0, 0, 0)); setMinimumSize(240, 200); } @@ -50,12 +50,12 @@ const atom& Molek::getAtom(uint index) const void Molek::load (const KSimpleConfig& config) { atoms.clear(); - QString key; + TQString key; atom current; int atom_index = 1; - QString value; + TQString value; while (true) { key.sprintf("atom_%c", int2atom(atom_index)); value = config.readEntry(key); @@ -74,7 +74,7 @@ void Molek::load (const KSimpleConfig& config) atom_index++; } - QString line; + TQString line; for (int j = 0; j < MOLEK_SIZE; j++) { @@ -106,12 +106,12 @@ void Molek::load (const KSimpleConfig& config) repaint (); } -void Molek::paintEvent( QPaintEvent * ) +void Molek::paintEvent( TQPaintEvent * ) { - QString st = i18n("Level: %1").arg(level); + TQString st = i18n("Level: %1").arg(level); - QPainter paint (this); - paint.setPen (QColor (190, 190, 190)); + TQPainter paint (this); + paint.setPen (TQColor (190, 190, 190)); paint.drawText (7, height() - 36, mname); paint.drawText (7, height() - 18, st); // spielfeld gleich zeichnen diff --git a/katomic/molek.h b/katomic/molek.h index 6189e4e8..354cf49b 100644 --- a/katomic/molek.h +++ b/katomic/molek.h @@ -9,12 +9,12 @@ #include <stdio.h> #include <stdlib.h> -#include <qwidget.h> -#include <qpoint.h> -#include <qpainter.h> -#include <qpixmap.h> +#include <tqwidget.h> +#include <tqpoint.h> +#include <tqpainter.h> +#include <tqpixmap.h> #include "atom.h" -#include <qvaluelist.h> +#include <tqvaluelist.h> class KSimpleConfig; @@ -25,7 +25,7 @@ class Molek : public QWidget Q_OBJECT public: - Molek (QWidget *parent=0, const char *name=0); + Molek (TQWidget *parent=0, const char *name=0); ~Molek (); void load(const KSimpleConfig& config); @@ -33,18 +33,18 @@ public: const atom& getAtom(uint index) const; int atomSize() const { return atoms.count(); } - QSize molecSize() const { return _size; } + TQSize molecSize() const { return _size; } uint getAtom(int x, int y) const { return molek[x][y]; } protected: - void paintEvent( QPaintEvent * ); + void paintEvent( TQPaintEvent * ); private: - QPixmap data; + TQPixmap data; uint molek[MOLEK_SIZE][MOLEK_SIZE]; // the indexes within atoms - QValueList<atom> atoms; - QString mname; - QSize _size; + TQValueList<atom> atoms; + TQString mname; + TQSize _size; }; diff --git a/katomic/settings.h b/katomic/settings.h index e43471c2..a8396e12 100644 --- a/katomic/settings.h +++ b/katomic/settings.h @@ -21,7 +21,7 @@ #ifndef SETTINGS_H #define SETTINGS_H -#include <qstring.h> +#include <tqstring.h> #define MAX_SPEED 10 diff --git a/katomic/toplevel.cpp b/katomic/toplevel.cpp index ca4de920..bb9613f2 100644 --- a/katomic/toplevel.cpp +++ b/katomic/toplevel.cpp @@ -18,8 +18,8 @@ */ -#include <qgroupbox.h> -#include <qlayout.h> +#include <tqgroupbox.h> +#include <tqlayout.h> #include <kglobal.h> #include <klocale.h> @@ -40,27 +40,27 @@ extern Options settings; void AtomTopLevel::createMenu() { - KAction *act = KStdGameAction::highscores(main, SLOT(showHighscores()), actionCollection()); + KAction *act = KStdGameAction::highscores(main, TQT_SLOT(showHighscores()), actionCollection()); act->setText(i18n("Show &Highscores")); - KStdGameAction::quit(this, SLOT(close()), actionCollection()); - KStdGameAction::restart(main, SLOT(restartLevel()), actionCollection()); + KStdGameAction::quit(this, TQT_SLOT(close()), actionCollection()); + KStdGameAction::restart(main, TQT_SLOT(restartLevel()), actionCollection()); - KStdAction::preferences(this, SLOT(configopts()), actionCollection()); + KStdAction::preferences(this, TQT_SLOT(configopts()), actionCollection()); - undoAction = KStdGameAction::undo (main, SLOT(doUndo()), actionCollection()); - redoAction = KStdGameAction::redo (main, SLOT(doRedo()), actionCollection()); + undoAction = KStdGameAction::undo (main, TQT_SLOT(doUndo()), actionCollection()); + redoAction = KStdGameAction::redo (main, TQT_SLOT(doRedo()), actionCollection()); undoAction->setEnabled(false); redoAction->setEnabled(false); - connect (main, SIGNAL (enableRedo(bool)), SLOT(enableRedo(bool))); - connect (main, SIGNAL (enableUndo(bool)), SLOT(enableUndo(bool))); + connect (main, TQT_SIGNAL (enableRedo(bool)), TQT_SLOT(enableRedo(bool))); + connect (main, TQT_SIGNAL (enableUndo(bool)), TQT_SLOT(enableUndo(bool))); - new KAction(i18n("Atom Up"), Key_Up, main, SLOT(moveUp()), actionCollection(), "atom_up"); - new KAction(i18n("Atom Down"), Key_Down, main, SLOT(moveDown()), actionCollection(), "atom_down"); - new KAction(i18n("Atom Left"), Key_Left, main, SLOT(moveLeft()), actionCollection(), "atom_left"); - new KAction(i18n("Atom Right"), Key_Right, main, SLOT(moveRight()), actionCollection(), "atom_right"); + new KAction(i18n("Atom Up"), Key_Up, main, TQT_SLOT(moveUp()), actionCollection(), "atom_up"); + new KAction(i18n("Atom Down"), Key_Down, main, TQT_SLOT(moveDown()), actionCollection(), "atom_down"); + new KAction(i18n("Atom Left"), Key_Left, main, TQT_SLOT(moveLeft()), actionCollection(), "atom_left"); + new KAction(i18n("Atom Right"), Key_Right, main, TQT_SLOT(moveRight()), actionCollection(), "atom_right"); - new KAction(i18n("Next Atom"), Key_Tab, main, SLOT(nextAtom()), actionCollection(), "next_atom"); - new KAction(i18n("Previous Atom"), SHIFT+Key_Tab, main, SLOT(previousAtom()), actionCollection(), "prev_atom"); + new KAction(i18n("Next Atom"), Key_Tab, main, TQT_SLOT(nextAtom()), actionCollection(), "next_atom"); + new KAction(i18n("Previous Atom"), SHIFT+Key_Tab, main, TQT_SLOT(previousAtom()), actionCollection(), "prev_atom"); } void AtomTopLevel::configopts() |