diff options
Diffstat (limited to 'khangman')
| -rw-r--r-- | khangman/khangman/khangman.cpp | 16 | ||||
| -rw-r--r-- | khangman/khangman/khangman.h | 14 |
2 files changed, 15 insertions, 15 deletions
diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp index 4b8075a6..61b04c85 100644 --- a/khangman/khangman/khangman.cpp +++ b/khangman/khangman/khangman.cpp @@ -45,7 +45,7 @@ KHangMan::KHangMan() - : KMainWindow( 0, "KHangMan" ), + : TDEMainWindow( 0, "KHangMan" ), m_view(new KHangManView(this)) { m_newStuff = 0; @@ -57,7 +57,7 @@ KHangMan::KHangMan() // Toolbar for special characters secondToolbar = toolBar("secondToolBar"); - secondToolbar->setBarPos(KToolBar::Bottom); + secondToolbar->setBarPos(TDEToolBar::Bottom); loadSettings(); setAccent(); loadLangToolBar(); @@ -74,21 +74,21 @@ KHangMan::~KHangMan() void KHangMan::setupActions() { // Game->New - KAction *action = new KAction(i18n("&New"), "filenew", CTRL+Key_N , TQT_TQOBJECT(m_view), TQT_SLOT(slotNewGame()), actionCollection(), "file_new"); + TDEAction *action = new TDEAction(i18n("&New"), "filenew", CTRL+Key_N , TQT_TQOBJECT(m_view), TQT_SLOT(slotNewGame()), actionCollection(), "file_new"); action->setToolTip(i18n( "Play with a new word" )); // Game->Get Words in New Language - new KAction( i18n("&Get Words in New Language..."), "knewstuff", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" ); + new TDEAction( i18n("&Get Words in New Language..."), "knewstuff", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" ); KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection()); - m_levelAction = new KSelectAction(i18n("Le&vel"), 0, actionCollection(), "combo_level"); + m_levelAction = new TDESelectAction(i18n("Le&vel"), 0, actionCollection(), "combo_level"); m_levelAction->setToolTip(i18n( "Choose the level" )); m_levelAction->setWhatsThis(i18n( "Choose the level of difficulty" )); connect(m_levelAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeLevel(int))); // Action for selecting language. - m_languageAction = new KSelectAction(i18n("&Language"), 0, actionCollection(), "languages"); + m_languageAction = new TDESelectAction(i18n("&Language"), 0, actionCollection(), "languages"); m_languageAction->setItems(m_languageNames); m_languageAction->setCurrentItem(m_languages.findIndex(Prefs::selectedLanguage())); connect(m_languageAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeLanguage(int))); @@ -97,7 +97,7 @@ void KHangMan::setupActions() // Mode. Currently hard coded into Sea and Desert themes. TQStringList modes; - m_modeAction = new KSelectAction(i18n("L&ook"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChangeMode()), actionCollection(), "combo_mode"); + m_modeAction = new TDESelectAction(i18n("L&ook"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChangeMode()), actionCollection(), "combo_mode"); modes += i18n("&Sea Theme"); modes += i18n("&Desert Theme"); m_modeAction->setItems(modes); @@ -473,7 +473,7 @@ void KHangMan::loadLangToolBar() void KHangMan::slotPasteChar() { - KToolBarButton *charBut = (KToolBarButton* ) sender(); + TDEToolBarButton *charBut = (TDEToolBarButton* ) sender(); m_view->enterLetter(m_allData[charBut->id()]); } diff --git a/khangman/khangman/khangman.h b/khangman/khangman/khangman.h index 7dd21980..9fddf835 100644 --- a/khangman/khangman/khangman.h +++ b/khangman/khangman/khangman.h @@ -30,8 +30,8 @@ #include "khangmanview.h" -class KSelectAction; -class KToggleAction; +class TDESelectAction; +class TDEToggleAction; class KHNewStuff; class advanced; @@ -48,7 +48,7 @@ const int IDS_HINT = 103; * @author Anne-Marie Mahfouf <annemarie.mahfouf@free.fr> * @version 0.1 */ -class KHangMan : public KMainWindow +class KHangMan : public TDEMainWindow { Q_OBJECT @@ -71,7 +71,7 @@ public: void changeStatusbar(const TQString& text, int id); ///Action that sets up the Language menu - KSelectAction *m_languageAction; + TDESelectAction *m_languageAction; ///Method to set the current language into the Statusbar and to pass it to KHangManView void setLanguages(); @@ -146,11 +146,11 @@ private: KHNewStuff *m_newStuff; // Actions in the Game menu - KSelectAction *m_levelAction; - KSelectAction *m_modeAction; + TDESelectAction *m_levelAction; + TDESelectAction *m_modeAction; ///Create the Special Characters Toolbar - KToolBar *secondToolbar; + TDEToolBar *secondToolbar; // True if the language has no special chars, such as en, it and nl. // FIXME: Reverse the bool. Negated bools are difficult to read. |