diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:12:46 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:12:46 -0600 |
commit | 58a97ed3af5e4df6c4a58d043b0c267bd97056a9 (patch) | |
tree | 5a2fde6842fd422cae2d8670d382be965098cc32 /kmines | |
parent | 2ce15ee76fd2d9d18a63c035a0f5b00b94c60cdc (diff) | |
download | tdegames-58a97ed3af5e4df6c4a58d043b0c267bd97056a9.tar.gz tdegames-58a97ed3af5e4df6c4a58d043b0c267bd97056a9.zip |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kmines')
-rw-r--r-- | kmines/CHANGELOG | 4 | ||||
-rw-r--r-- | kmines/kzoommainwindow.cpp | 6 | ||||
-rw-r--r-- | kmines/kzoommainwindow.h | 8 | ||||
-rw-r--r-- | kmines/main.cpp | 22 | ||||
-rw-r--r-- | kmines/main.h | 14 |
5 files changed, 27 insertions, 27 deletions
diff --git a/kmines/CHANGELOG b/kmines/CHANGELOG index b8e0af2a..c48af9ae 100644 --- a/kmines/CHANGELOG +++ b/kmines/CHANGELOG @@ -154,7 +154,7 @@ * keyboard is disabled by default 2.0.6 (23 August 2000) - * use of KMainWindow (replace KTMainWindow) but this does not solve the + * use of TDEMainWindow (replace KTMainWindow) but this does not solve the resizing problems :( * pause game when high scores requested * custom game settings are saved [feature suggested by Toan Nguyen, @@ -190,7 +190,7 @@ * XMLify the GUI 2.0.1 (19 February 2000) - * KAction/KAccel integrated + * TDEAction/TDEAccel integrated * keyboard play * can choose case size (font is scaled) * less flicker in repainting (+ fixed a strange divide negative int by diff --git a/kmines/kzoommainwindow.cpp b/kmines/kzoommainwindow.cpp index 95b5b359..3bab5661 100644 --- a/kmines/kzoommainwindow.cpp +++ b/kmines/kzoommainwindow.cpp @@ -26,7 +26,7 @@ #include <kcmenumngr.h> KZoomMainWindow::KZoomMainWindow(uint min, uint max, uint step, const char *name) - : KMainWindow(0, name), _zoomStep(step), _minZoom(min), _maxZoom(max) + : TDEMainWindow(0, name), _zoomStep(step), _minZoom(min), _maxZoom(max) { installEventFilter(this); @@ -77,7 +77,7 @@ bool KZoomMainWindow::eventFilter(TQObject *o, TQEvent *e) setFixedSize(minimumSize()); // because K/TQMainWindow // does not manage fixed central widget // with hidden menubar... - return KMainWindow::eventFilter(o, e); + return TDEMainWindow::eventFilter(o, e); } void KZoomMainWindow::setZoom(uint zoom) @@ -111,5 +111,5 @@ void KZoomMainWindow::toggleMenubar() bool KZoomMainWindow::queryExit() { writeMenubarVisibleSetting(_menu->isChecked()); - return KMainWindow::queryExit(); + return TDEMainWindow::queryExit(); } diff --git a/kmines/kzoommainwindow.h b/kmines/kzoommainwindow.h index 43a23cee..38b857bc 100644 --- a/kmines/kzoommainwindow.h +++ b/kmines/kzoommainwindow.h @@ -22,7 +22,7 @@ #include <kmainwindow.h> -class KToggleAction; +class TDEToggleAction; /** * KZoomMainWindow is a main window of fixed size. Its size can be @@ -39,7 +39,7 @@ class KToggleAction; * This class also has a "show/hide menubar" action and allows the use * of a context popup menu (useful to restore the menubar when hidden). */ -class KZoomMainWindow : public KMainWindow +class KZoomMainWindow : public TDEMainWindow { Q_OBJECT @@ -117,8 +117,8 @@ private slots: private: uint _zoom, _zoomStep, _minZoom, _maxZoom; TQPtrList<TQWidget> _widgets; - KAction *_zoomInAction, *_zoomOutAction; - KToggleAction *_menu; + TDEAction *_zoomInAction, *_zoomOutAction; + TDEToggleAction *_menu; class KZoomMainWindowPrivate; KZoomMainWindowPrivate *d; diff --git a/kmines/main.cpp b/kmines/main.cpp index e4dd1081..335c4208 100644 --- a/kmines/main.cpp +++ b/kmines/main.cpp @@ -76,10 +76,10 @@ MainWidget::MainWidget() KStdGameAction::quit(TQT_TQOBJECT(tqApp), TQT_SLOT(quit()), actionCollection()); // keyboard - _keybCollection = new KActionCollection(this); + _keybCollection = new TDEActionCollection(this); for (uint i=0; i<NB_KEYS; i++) { const KeyData &d = KEY_DATA[i]; - (void)new KAction(i18n(d.label), d.keycode, TQT_TQOBJECT(_status), + (void)new TDEAction(i18n(d.label), d.keycode, TQT_TQOBJECT(_status), d.slot, _keybCollection, d.name); } @@ -103,24 +103,24 @@ MainWidget::MainWidget() _advise = KStdGameAction::hint(TQT_TQOBJECT(_status), TQT_SLOT(advise()), actionCollection()); _solve = KStdGameAction::solve(TQT_TQOBJECT(_status), TQT_SLOT(solve()), actionCollection()); - (void)new KAction(i18n("Solving Rate..."), 0, TQT_TQOBJECT(_status), TQT_SLOT(solveRate()), + (void)new TDEAction(i18n("Solving Rate..."), 0, TQT_TQOBJECT(_status), TQT_SLOT(solveRate()), actionCollection(), "solve_rate"); // Log - (void)new KAction(KGuiItem(i18n("View Log"), "viewmag"), 0, + (void)new TDEAction(KGuiItem(i18n("View Log"), "viewmag"), 0, TQT_TQOBJECT(_status), TQT_SLOT(viewLog()), actionCollection(), "log_view"); - (void)new KAction(KGuiItem(i18n("Replay Log"), "player_play"), + (void)new TDEAction(KGuiItem(i18n("Replay Log"), "player_play"), 0, TQT_TQOBJECT(_status), TQT_SLOT(replayLog()), actionCollection(), "log_replay"); - (void)new KAction(KGuiItem(i18n("Save Log..."), "filesave"), 0, + (void)new TDEAction(KGuiItem(i18n("Save Log..."), "filesave"), 0, TQT_TQOBJECT(_status), TQT_SLOT(saveLog()), actionCollection(), "log_save"); - (void)new KAction(KGuiItem(i18n("Load Log..."), "fileopen"), 0, + (void)new TDEAction(KGuiItem(i18n("Load Log..."), "fileopen"), 0, TQT_TQOBJECT(_status), TQT_SLOT(loadLog()), actionCollection(), "log_load"); - setupGUI( KMainWindow::Save | Create ); + setupGUI( TDEMainWindow::Save | Create ); readSettings(); setCentralWidget(_status); init("popup"); @@ -150,7 +150,7 @@ void MainWidget::focusOutEvent(TQFocusEvent *e) { if ( Settings::pauseFocus() && e->reason()==TQFocusEvent::ActiveWindow && _status->isPlaying() ) pause(); - KMainWindow::focusOutEvent(e); + TDEMainWindow::focusOutEvent(e); } void MainWidget::configureSettings() @@ -177,8 +177,8 @@ void MainWidget::configureHighscores() void MainWidget::settingsChanged() { bool enabled = Settings::keyboardGame(); - TQValueList<KAction *> list = _keybCollection->actions(); - TQValueList<KAction *>::Iterator it; + TQValueList<TDEAction *> list = _keybCollection->actions(); + TQValueList<TDEAction *>::Iterator it; for (it = list.begin(); it!=list.end(); ++it) (*it)->setEnabled(enabled); _status->settingsChanged(); diff --git a/kmines/main.h b/kmines/main.h index c8b74512..06100dc6 100644 --- a/kmines/main.h +++ b/kmines/main.h @@ -23,9 +23,9 @@ #include "defines.h" -class KAction; -class KToggleAction; -class KSelectAction; +class TDEAction; +class TDEToggleAction; +class TDESelectAction; class Status; class MainWidget : public KZoomMainWindow, public KMines @@ -51,10 +51,10 @@ class MainWidget : public KZoomMainWindow, public KMines private: Status *_status; - KToggleAction *_pause; - KSelectAction *_levels; - KAction *_advise, *_solve; - KActionCollection *_keybCollection; + TDEToggleAction *_pause; + TDESelectAction *_levels; + TDEAction *_advise, *_solve; + TDEActionCollection *_keybCollection; struct KeyData { const char *label, *name; |