diff options
Diffstat (limited to 'katomic')
-rw-r--r-- | katomic/configbox.cpp | 4 | ||||
-rw-r--r-- | katomic/configbox.h | 2 | ||||
-rw-r--r-- | katomic/feld.cpp | 8 | ||||
-rw-r--r-- | katomic/feld.h | 2 | ||||
-rw-r--r-- | katomic/gamewidget.cpp | 24 | ||||
-rw-r--r-- | katomic/gamewidget.h | 2 | ||||
-rw-r--r-- | katomic/molek.cpp | 2 | ||||
-rw-r--r-- | katomic/molek.h | 2 | ||||
-rw-r--r-- | katomic/toplevel.cpp | 30 | ||||
-rw-r--r-- | katomic/toplevel.h | 2 |
10 files changed, 39 insertions, 39 deletions
diff --git a/katomic/configbox.cpp b/katomic/configbox.cpp index c8a9fcd5..5b482ec8 100644 --- a/katomic/configbox.cpp +++ b/katomic/configbox.cpp @@ -33,10 +33,10 @@ ConfigBox::ConfigBox ( TQWidget *parent, const char *name) glay->addWidget(disp, 1, 2); disp->display(1); - speed = new TQSlider(1, 10, 1, 1, Qt::Horizontal, page); + speed = new TQSlider(1, 10, 1, 1, TQt::Horizontal, page); glay->addMultiCellWidget(speed, 2, 2, 2, 3); - connect(speed, TQT_SIGNAL(valueChanged(int)), disp, TQT_SLOT(display(int))); + connect(speed, TQ_SIGNAL(valueChanged(int)), disp, TQ_SLOT(display(int))); speed->setValue(settings.anim_speed); incInitialSize(TQSize(20,20), true); diff --git a/katomic/configbox.h b/katomic/configbox.h index c65f7ce0..ee3d0f47 100644 --- a/katomic/configbox.h +++ b/katomic/configbox.h @@ -15,7 +15,7 @@ class ConfigBox : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/katomic/feld.cpp b/katomic/feld.cpp index 3411b7fb..e8af79eb 100644 --- a/katomic/feld.cpp +++ b/katomic/feld.cpp @@ -14,7 +14,7 @@ #include <kiconloader.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ksimpleconfig.h> #include "molek.h" #include "feld.h" @@ -45,7 +45,7 @@ Feld::Feld( TQWidget *parent, const char *name ) : setMouseTracking(true); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setBackgroundColor( TQColor( 0, 0, 0) ); setFixedSize(15 * 30, 15 * 30); @@ -70,7 +70,7 @@ void Feld::resetValidDirs() void Feld::load (const KSimpleConfig& config) { if(moving) - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); mol->load(config); @@ -492,7 +492,7 @@ void Feld::timerEvent (TQTimerEvent *) if (frames <= 0) { moving = false; - TQT_TQOBJECT(this)->killTimers (); + this->killTimers (); done(); dir = None; } diff --git a/katomic/feld.h b/katomic/feld.h index 715aea52..5f8d5cc4 100644 --- a/katomic/feld.h +++ b/katomic/feld.h @@ -29,7 +29,7 @@ class Molek; class Feld : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/katomic/gamewidget.cpp b/katomic/gamewidget.cpp index 9d0ddf1a..5266e079 100644 --- a/katomic/gamewidget.cpp +++ b/katomic/gamewidget.cpp @@ -33,7 +33,7 @@ #include <highscore/kscoredialog.h> #include <tdemessagebox.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <ksimpleconfig.h> #include <tdeglobalsettings.h> @@ -118,8 +118,8 @@ void GameWidget::getMoves(int moves) void GameWidget::mergeHighScores(int l) { - TDEConfigGroup oldConfig(kapp->config(), TQString("High Scores Level %1").arg(l).utf8()); - TDEConfigGroup newConfig(kapp->config(), TQString("Highscores Level %1").arg(l).utf8()); + TDEConfigGroup oldConfig(tdeApp->config(), TQString("High Scores Level %1").arg(l).utf8()); + TDEConfigGroup newConfig(tdeApp->config(), TQString("Highscores Level %1").arg(l).utf8()); newConfig.writeEntry("LastPlayer", oldConfig.readEntry("LastPlayer")); @@ -132,7 +132,7 @@ void GameWidget::mergeHighScores(int l) key = "Pos" + num + "Score"; newConfig.writeEntry(key, oldConfig.readEntry(key, "-")); } - kapp->config()->sync(); + tdeApp->config()->sync(); } void GameWidget::updateLevel (int l) @@ -147,8 +147,8 @@ void GameWidget::updateLevel (int l) cfg.setGroup("Level"); feld->load(cfg); - if (!kapp->config()->hasGroup(TQString("Highscores Level %1").arg(level)) && - kapp->config()->hasGroup(TQString("High Scores Level %1").arg(level))) + if (!tdeApp->config()->hasGroup(TQString("Highscores Level %1").arg(level)) && + tdeApp->config()->hasGroup(TQString("High Scores Level %1").arg(level))) mergeHighScores(level); highScore->setConfigGroup(TQString("Highscores Level %1").arg(level)); @@ -188,17 +188,17 @@ GameWidget::GameWidget ( TQWidget *parent, const char* name ) // scrollbar scrl = new TQScrollBar(1, nlevels, 1, - 5, 1, Qt::Horizontal, vb, "scrl" ); - connect (scrl, TQT_SIGNAL (valueChanged (int)), TQT_SLOT (updateLevel (int))); + 5, 1, TQt::Horizontal, vb, "scrl" ); + connect (scrl, TQ_SIGNAL (valueChanged (int)), TQ_SLOT (updateLevel (int))); // molek�l molek = new Molek (vb, "molek"); feld->setMolek(molek); - 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))); + connect (feld, TQ_SIGNAL (gameOver(int)), TQ_SLOT(gameOver(int))); + connect (feld, TQ_SIGNAL (sendMoves(int)), TQ_SLOT(getMoves(int))); + connect (feld, TQ_SIGNAL (enableRedo(bool)), TQ_SIGNAL(enableRedo(bool))); + connect (feld, TQ_SIGNAL (enableUndo(bool)), TQ_SIGNAL(enableUndo(bool))); highScore = new KScoreDialog(KScoreDialog::Name | KScoreDialog::Score, this); diff --git a/katomic/gamewidget.h b/katomic/gamewidget.h index ec6722ff..039f433d 100644 --- a/katomic/gamewidget.h +++ b/katomic/gamewidget.h @@ -12,7 +12,7 @@ class KScoreDialog; class GameWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/katomic/molek.cpp b/katomic/molek.cpp index 711ece5f..bc3d89ad 100644 --- a/katomic/molek.cpp +++ b/katomic/molek.cpp @@ -17,7 +17,7 @@ #include "molek.moc" #include <kiconloader.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ksimpleconfig.h> #include <tdelocale.h> #include <kdebug.h> diff --git a/katomic/molek.h b/katomic/molek.h index 561f1e0e..b019595c 100644 --- a/katomic/molek.h +++ b/katomic/molek.h @@ -22,7 +22,7 @@ class KSimpleConfig; class Molek : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/katomic/toplevel.cpp b/katomic/toplevel.cpp index 5603f505..40566fc8 100644 --- a/katomic/toplevel.cpp +++ b/katomic/toplevel.cpp @@ -24,7 +24,7 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include "gamewidget.h" @@ -40,27 +40,27 @@ extern Options settings; void AtomTopLevel::createMenu() { - TDEAction *act = KStdGameAction::highscores(TQT_TQOBJECT(main), TQT_SLOT(showHighscores()), actionCollection()); + TDEAction *act = KStdGameAction::highscores(main, TQ_SLOT(showHighscores()), actionCollection()); act->setText(i18n("Show &Highscores")); - KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - KStdGameAction::restart(TQT_TQOBJECT(main), TQT_SLOT(restartLevel()), actionCollection()); + KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection()); + KStdGameAction::restart(main, TQ_SLOT(restartLevel()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configopts()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(configopts()), actionCollection()); - undoAction = KStdGameAction::undo (TQT_TQOBJECT(main), TQT_SLOT(doUndo()), actionCollection()); - redoAction = KStdGameAction::redo (TQT_TQOBJECT(main), TQT_SLOT(doRedo()), actionCollection()); + undoAction = KStdGameAction::undo (main, TQ_SLOT(doUndo()), actionCollection()); + redoAction = KStdGameAction::redo (main, TQ_SLOT(doRedo()), actionCollection()); undoAction->setEnabled(false); redoAction->setEnabled(false); - connect (main, TQT_SIGNAL (enableRedo(bool)), TQT_SLOT(enableRedo(bool))); - connect (main, TQT_SIGNAL (enableUndo(bool)), TQT_SLOT(enableUndo(bool))); + connect (main, TQ_SIGNAL (enableRedo(bool)), TQ_SLOT(enableRedo(bool))); + connect (main, TQ_SIGNAL (enableUndo(bool)), TQ_SLOT(enableUndo(bool))); - new TDEAction(i18n("Atom Up"), Key_Up, TQT_TQOBJECT(main), TQT_SLOT(moveUp()), actionCollection(), "atom_up"); - new TDEAction(i18n("Atom Down"), Key_Down, TQT_TQOBJECT(main), TQT_SLOT(moveDown()), actionCollection(), "atom_down"); - new TDEAction(i18n("Atom Left"), Key_Left, TQT_TQOBJECT(main), TQT_SLOT(moveLeft()), actionCollection(), "atom_left"); - new TDEAction(i18n("Atom Right"), Key_Right, TQT_TQOBJECT(main), TQT_SLOT(moveRight()), actionCollection(), "atom_right"); + new TDEAction(i18n("Atom Up"), Key_Up, main, TQ_SLOT(moveUp()), actionCollection(), "atom_up"); + new TDEAction(i18n("Atom Down"), Key_Down, main, TQ_SLOT(moveDown()), actionCollection(), "atom_down"); + new TDEAction(i18n("Atom Left"), Key_Left, main, TQ_SLOT(moveLeft()), actionCollection(), "atom_left"); + new TDEAction(i18n("Atom Right"), Key_Right, main, TQ_SLOT(moveRight()), actionCollection(), "atom_right"); - new TDEAction(i18n("Next Atom"), Key_Tab, TQT_TQOBJECT(main), TQT_SLOT(nextAtom()), actionCollection(), "next_atom"); - new TDEAction(i18n("Previous Atom"), SHIFT+Key_Tab, TQT_TQOBJECT(main), TQT_SLOT(previousAtom()), actionCollection(), "prev_atom"); + new TDEAction(i18n("Next Atom"), Key_Tab, main, TQ_SLOT(nextAtom()), actionCollection(), "next_atom"); + new TDEAction(i18n("Previous Atom"), SHIFT+Key_Tab, main, TQ_SLOT(previousAtom()), actionCollection(), "prev_atom"); } void AtomTopLevel::configopts() diff --git a/katomic/toplevel.h b/katomic/toplevel.h index 5d997004..e57c02cc 100644 --- a/katomic/toplevel.h +++ b/katomic/toplevel.h @@ -23,7 +23,7 @@ class TDEConfig; class AtomTopLevel : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: |