diff options
Diffstat (limited to 'kmines')
| -rw-r--r-- | kmines/kzoommainwindow.cpp | 6 | ||||
| -rw-r--r-- | kmines/main.cpp | 34 | ||||
| -rw-r--r-- | kmines/status.cpp | 2 |
3 files changed, 21 insertions, 21 deletions
diff --git a/kmines/kzoommainwindow.cpp b/kmines/kzoommainwindow.cpp index 758d73d6..c0c7fc92 100644 --- a/kmines/kzoommainwindow.cpp +++ b/kmines/kzoommainwindow.cpp @@ -30,11 +30,11 @@ KZoomMainWindow::KZoomMainWindow(uint min, uint max, uint step, const char *name { installEventFilter(this); - _zoomInAction = KStdAction::zoomIn(TQT_TQOBJECT(this), TQT_SLOT(zoomIn()), actionCollection()); + _zoomInAction = KStdAction::zoomIn(this, TQT_SLOT(zoomIn()), actionCollection()); _zoomOutAction = - KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT(zoomOut()), actionCollection()); + KStdAction::zoomOut(this, TQT_SLOT(zoomOut()), actionCollection()); _menu = - KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(toggleMenubar()), actionCollection()); + KStdAction::showMenubar(this, TQT_SLOT(toggleMenubar()), actionCollection()); } void KZoomMainWindow::init(const char *popupName) diff --git a/kmines/main.cpp b/kmines/main.cpp index fe39f052..f4dd0210 100644 --- a/kmines/main.cpp +++ b/kmines/main.cpp @@ -68,28 +68,28 @@ MainWidget::MainWidget() connect(_status, TQT_SIGNAL(pause()), TQT_SLOT(pause())); // Game & Popup - KStdGameAction::gameNew(TQT_TQOBJECT(_status), TQT_SLOT(restartGame()), actionCollection()); - _pause = KStdGameAction::pause(TQT_TQOBJECT(_status), TQT_SLOT(pauseGame()), + KStdGameAction::gameNew(_status, TQT_SLOT(restartGame()), actionCollection()); + _pause = KStdGameAction::pause(_status, TQT_SLOT(pauseGame()), actionCollection()); - KStdGameAction::highscores(TQT_TQOBJECT(this), TQT_SLOT(showHighscores()), + KStdGameAction::highscores(this, TQT_SLOT(showHighscores()), actionCollection()); - KStdGameAction::quit(TQT_TQOBJECT(tqApp), TQT_SLOT(quit()), actionCollection()); + KStdGameAction::quit(tqApp, TQT_SLOT(quit()), actionCollection()); // keyboard _keybCollection = new TDEActionCollection(this); for (uint i=0; i<NB_KEYS; i++) { const KeyData &d = KEY_DATA[i]; - (void)new TDEAction(i18n(d.label), d.keycode, TQT_TQOBJECT(_status), + (void)new TDEAction(i18n(d.label), d.keycode, _status, d.slot, _keybCollection, d.name); } // Settings - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configureSettings()), + KStdAction::preferences(this, TQT_SLOT(configureSettings()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureKeys()), actionCollection()); - KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(configureNotifications()), + KStdAction::keyBindings(this, TQT_SLOT(configureKeys()), actionCollection()); + KStdAction::configureNotifications(this, TQT_SLOT(configureNotifications()), actionCollection()); - KStdGameAction::configureHighscores(TQT_TQOBJECT(this), TQT_SLOT(configureHighscores()), + KStdGameAction::configureHighscores(this, TQT_SLOT(configureHighscores()), actionCollection()); // Levels _levels = KStdGameAction::chooseGameType(0, 0, actionCollection()); @@ -97,27 +97,27 @@ MainWidget::MainWidget() for (uint i=0; i<=Level::NB_TYPES; i++) list += i18n(Level::LABELS[i]); _levels->setItems(list); - connect(_levels, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(_status), TQT_SLOT(newGame(int))); + connect(_levels, TQT_SIGNAL(activated(int)), _status, TQT_SLOT(newGame(int))); // Adviser _advise = - KStdGameAction::hint(TQT_TQOBJECT(_status), TQT_SLOT(advise()), actionCollection()); - _solve = KStdGameAction::solve(TQT_TQOBJECT(_status), TQT_SLOT(solve()), actionCollection()); - (void)new TDEAction(i18n("Solving Rate..."), 0, TQT_TQOBJECT(_status), TQT_SLOT(solveRate()), + KStdGameAction::hint(_status, TQT_SLOT(advise()), actionCollection()); + _solve = KStdGameAction::solve(_status, TQT_SLOT(solve()), actionCollection()); + (void)new TDEAction(i18n("Solving Rate..."), 0, _status, TQT_SLOT(solveRate()), actionCollection(), "solve_rate"); // Log (void)new TDEAction(KGuiItem(i18n("View Log"), "viewmag"), 0, - TQT_TQOBJECT(_status), TQT_SLOT(viewLog()), + _status, TQT_SLOT(viewLog()), actionCollection(), "log_view"); (void)new TDEAction(KGuiItem(i18n("Replay Log"), "media-playback-start"), - 0, TQT_TQOBJECT(_status), TQT_SLOT(replayLog()), + 0, _status, TQT_SLOT(replayLog()), actionCollection(), "log_replay"); (void)new TDEAction(KGuiItem(i18n("Save Log..."), "document-save"), 0, - TQT_TQOBJECT(_status), TQT_SLOT(saveLog()), + _status, TQT_SLOT(saveLog()), actionCollection(), "log_save"); (void)new TDEAction(KGuiItem(i18n("Load Log..."), "document-open"), 0, - TQT_TQOBJECT(_status), TQT_SLOT(loadLog()), + _status, TQT_SLOT(loadLog()), actionCollection(), "log_load"); setupGUI( TDEMainWindow::Save | Create ); diff --git a/kmines/status.cpp b/kmines/status.cpp index 0cc7da39..5272e68b 100644 --- a/kmines/status.cpp +++ b/kmines/status.cpp @@ -51,7 +51,7 @@ Status::Status(TQWidget *parent) _timer = new TQTimer(this); connect(_timer, TQT_SIGNAL(timeout()), TQT_SLOT(replayStep())); - _solver = new Solver(TQT_TQOBJECT(this)); + _solver = new Solver(this); connect(_solver, TQT_SIGNAL(solvingDone(bool)), TQT_SLOT(solvingDone(bool))); // top layout |