diff options
Diffstat (limited to 'kwordquiz/src')
| -rw-r--r-- | kwordquiz/src/flashview.h | 10 | ||||
| -rw-r--r-- | kwordquiz/src/kwordquiz.cpp | 100 | ||||
| -rw-r--r-- | kwordquiz/src/kwordquiz.h | 128 | ||||
| -rw-r--r-- | kwordquiz/src/kwordquizdoc.h | 2 | ||||
| -rw-r--r-- | kwordquiz/src/prefcardappearancebase.ui | 4 | ||||
| -rw-r--r-- | kwordquiz/src/qaview.h | 8 |
6 files changed, 126 insertions, 126 deletions
diff --git a/kwordquiz/src/flashview.h b/kwordquiz/src/flashview.h index c1f8c02f..8de031c1 100644 --- a/kwordquiz/src/flashview.h +++ b/kwordquiz/src/flashview.h @@ -55,11 +55,11 @@ private: WQQuiz *m_quiz; WTQScore *m_score; - KAction* actFlip; - KAction* actKnow; - KAction* actDontKnow; - KAction* actRepeat; - KAction* actRestart; + TDEAction* actFlip; + TDEAction* actKnow; + TDEAction* actDontKnow; + TDEAction* actRepeat; + TDEAction* actRestart; TQTimer* m_timer; diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp index 8dc0c2ef..a55ea93e 100644 --- a/kwordquiz/src/kwordquiz.cpp +++ b/kwordquiz/src/kwordquiz.cpp @@ -54,7 +54,7 @@ #define ID_MENU_QUIZ 1001 -KWordQuizApp::KWordQuizApp(TQWidget* , const char* name):KMainWindow(0, name) +KWordQuizApp::KWordQuizApp(TQWidget* , const char* name):TDEMainWindow(0, name) { /////////////////////////////////////////////////////////////////// @@ -101,9 +101,9 @@ KWordQuizApp::~KWordQuizApp() void KWordQuizApp::initActions() { - KAction* configToolbar; - KAction* configNotifications; - KAction* configApp; + TDEAction* configToolbar; + TDEAction* configNotifications; + TDEAction* configApp; fileNew = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection()); fileNew->setWhatsThis(i18n("Creates a new blank vocabulary document")); @@ -115,7 +115,7 @@ void KWordQuizApp::initActions() fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); - fileGHNS = new KAction(i18n("&Get New Vocabularies..."), "knewstuff", "CTRL+G", TQT_TQOBJECT(this), TQT_SLOT(slotFileGHNS()), actionCollection(), "file_ghns"); + fileGHNS = new TDEAction(i18n("&Get New Vocabularies..."), "knewstuff", "CTRL+G", TQT_TQOBJECT(this), TQT_SLOT(slotFileGHNS()), actionCollection(), "file_ghns"); fileGHNS->setWhatsThis(i18n("Downloads new vocabularies")); fileGHNS->setToolTip(fileGHNS->whatsThis()); @@ -159,51 +159,51 @@ void KWordQuizApp::initActions() editClear->setWhatsThis(i18n("Clears the content of the selected cells")); editClear->setToolTip(editClear->whatsThis()); - editInsert = new KAction(i18n("&Insert Row"), "insert_table_row", "CTRL+I", TQT_TQOBJECT(this), TQT_SLOT(slotEditInsert()), actionCollection(),"edit_insert"); + editInsert = new TDEAction(i18n("&Insert Row"), "insert_table_row", "CTRL+I", TQT_TQOBJECT(this), TQT_SLOT(slotEditInsert()), actionCollection(),"edit_insert"); editInsert->setWhatsThis(i18n("Inserts a new row above the current row")); editInsert->setToolTip(editInsert->whatsThis()); - editDelete = new KAction(i18n("&Delete Row"), "delete_table_row", "CTRL+K", TQT_TQOBJECT(this), TQT_SLOT(slotEditDelete()), actionCollection(),"edit_delete"); + editDelete = new TDEAction(i18n("&Delete Row"), "delete_table_row", "CTRL+K", TQT_TQOBJECT(this), TQT_SLOT(slotEditDelete()), actionCollection(),"edit_delete"); editDelete->setWhatsThis(i18n("Deletes the selected row(s)")); editDelete->setToolTip(editDelete->whatsThis()); - editMarkBlank = new KAction(i18n("&Mark as Blank"), "markasblank", "CTRL+M", TQT_TQOBJECT(this), TQT_SLOT(slotEditMarkBlank()), actionCollection(),"edit_mark_blank"); + editMarkBlank = new TDEAction(i18n("&Mark as Blank"), "markasblank", "CTRL+M", TQT_TQOBJECT(this), TQT_SLOT(slotEditMarkBlank()), actionCollection(),"edit_mark_blank"); editMarkBlank->setWhatsThis(i18n("Marks the current or selected word as a blank for Fill-in-the-blank")); editMarkBlank->setToolTip(editMarkBlank->whatsThis()); - editUnmarkBlank = new KAction(i18n("&Unmark Blanks"), "unmarkasblank", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditUnmarkBlank()), actionCollection(),"edit_unmark_blank"); + editUnmarkBlank = new TDEAction(i18n("&Unmark Blanks"), "unmarkasblank", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditUnmarkBlank()), actionCollection(),"edit_unmark_blank"); editUnmarkBlank->setWhatsThis(i18n("Removes blanks from the current or selected word")); editUnmarkBlank->setToolTip(editUnmarkBlank->whatsThis()); //@todo implement editFind = KStdAction::find(this, TQT_SLOT(slotEditFind()), actionCollection()); - vocabLanguages = new KAction(i18n("&Column Titles..."), "languages", "CTRL+L", TQT_TQOBJECT(this), TQT_SLOT(slotVocabLanguages()), actionCollection(),"vocab_languages"); + vocabLanguages = new TDEAction(i18n("&Column Titles..."), "languages", "CTRL+L", TQT_TQOBJECT(this), TQT_SLOT(slotVocabLanguages()), actionCollection(),"vocab_languages"); vocabLanguages->setWhatsThis(i18n("Defines the column titles for the active vocabulary")); vocabLanguages->setToolTip(vocabLanguages->whatsThis()); - vocabFont = new KAction(i18n("&Font..."), "fonts", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabFont()), actionCollection(),"vocab_font"); + vocabFont = new TDEAction(i18n("&Font..."), "fonts", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabFont()), actionCollection(),"vocab_font"); vocabFont->setWhatsThis(i18n("Defines the font used by the editor")); vocabFont->setToolTip(vocabFont->whatsThis()); - //@todo implement vocabKeyboard = new KAction(i18n("&Keyboard..."), "kxkb", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabKeyboard()), actionCollection(),"vocab_keyboard"); + //@todo implement vocabKeyboard = new TDEAction(i18n("&Keyboard..."), "kxkb", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabKeyboard()), actionCollection(),"vocab_keyboard"); - vocabRC = new KAction(i18n("&Rows/Columns..."), "rowcol", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabRC()), actionCollection(),"vocab_rc"); + vocabRC = new TDEAction(i18n("&Rows/Columns..."), "rowcol", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabRC()), actionCollection(),"vocab_rc"); vocabRC->setWhatsThis(i18n("Defines the number of rows, row heights, and column widths for the active vocabulary")); vocabRC->setToolTip(vocabRC->whatsThis()); - vocabSort = new KAction(i18n("&Sort..."), "sort_incr", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabSort()), actionCollection(),"vocab_sort"); + vocabSort = new TDEAction(i18n("&Sort..."), "sort_incr", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabSort()), actionCollection(),"vocab_sort"); vocabSort->setWhatsThis(i18n("Sorts the vocabulary in ascending or descending order based on the left or right column")); vocabSort->setToolTip(vocabSort->whatsThis()); - vocabShuffle = new KAction(i18n("Sh&uffle"), "shuffle", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabShuffle()), actionCollection(),"vocab_shuffle"); + vocabShuffle = new TDEAction(i18n("Sh&uffle"), "shuffle", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabShuffle()), actionCollection(),"vocab_shuffle"); vocabShuffle->setWhatsThis(i18n("Shuffles the entries of the active vocabulary")); vocabShuffle->setToolTip(vocabShuffle->whatsThis()); - mode = new KToolBarPopupAction(i18n("Change Mode"), "mode1", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode0()), actionCollection(),"mode_0"); + mode = new TDEToolBarPopupAction(i18n("Change Mode"), "mode1", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode0()), actionCollection(),"mode_0"); mode->setWhatsThis(i18n("Changes the mode used in quiz sessions")); mode->setToolTip(mode->whatsThis()); - KPopupMenu *popup = mode->popupMenu(); + TDEPopupMenu *popup = mode->popupMenu(); popup->clear(); popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode1", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), 0, 0); popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode2", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), 0, 1); @@ -211,11 +211,11 @@ void KWordQuizApp::initActions() popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode4", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode4()), 0, 3); popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode5", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode5()), 0, 4); - mode1 = new KToggleAction("", "mode1", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), actionCollection(),"mode_1"); - mode2 = new KToggleAction("", "mode2", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), actionCollection(),"mode_2"); - mode3 = new KToggleAction("", "mode3", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode3()), actionCollection(),"mode_3"); - mode4 = new KToggleAction("", "mode4", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode4()), actionCollection(),"mode_4"); - mode5 = new KToggleAction("", "mode5", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode5()), actionCollection(),"mode_5"); + mode1 = new TDEToggleAction("", "mode1", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), actionCollection(),"mode_1"); + mode2 = new TDEToggleAction("", "mode2", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), actionCollection(),"mode_2"); + mode3 = new TDEToggleAction("", "mode3", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode3()), actionCollection(),"mode_3"); + mode4 = new TDEToggleAction("", "mode4", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode4()), actionCollection(),"mode_4"); + mode5 = new TDEToggleAction("", "mode5", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode5()), actionCollection(),"mode_5"); mode1->setWhatsThis(i18n("Selects this mode")); mode2->setWhatsThis(i18n("Selects this mode")); mode3->setWhatsThis(i18n("Selects this mode")); @@ -227,43 +227,43 @@ void KWordQuizApp::initActions() mode4->setToolTip(mode4->whatsThis()); mode5->setToolTip(mode5->whatsThis()); - quizEditor = new KAction(i18n("&Editor"), "editor", "F6", TQT_TQOBJECT(this), TQT_SLOT(slotQuizEditor()), actionCollection(),"quiz_editor"); + quizEditor = new TDEAction(i18n("&Editor"), "editor", "F6", TQT_TQOBJECT(this), TQT_SLOT(slotQuizEditor()), actionCollection(),"quiz_editor"); quizEditor->setWhatsThis(i18n("Activates the vocabulary editor")); quizEditor->setToolTip(quizEditor->whatsThis()); - quizFlash = new KAction(i18n("&Flashcard"), "flash", "F7", TQT_TQOBJECT(this), TQT_SLOT(slotQuizFlash()), actionCollection(),"quiz_flash"); + quizFlash = new TDEAction(i18n("&Flashcard"), "flash", "F7", TQT_TQOBJECT(this), TQT_SLOT(slotQuizFlash()), actionCollection(),"quiz_flash"); quizFlash->setWhatsThis(i18n("Starts a flashcard session using the active vocabulary")); quizFlash->setToolTip(quizFlash->whatsThis()); - quizMultiple = new KAction(i18n("&Multiple Choice"), "multiple", "F8", TQT_TQOBJECT(this), TQT_SLOT(slotQuizMultiple()), actionCollection(),"quiz_multiple"); + quizMultiple = new TDEAction(i18n("&Multiple Choice"), "multiple", "F8", TQT_TQOBJECT(this), TQT_SLOT(slotQuizMultiple()), actionCollection(),"quiz_multiple"); quizMultiple->setWhatsThis(i18n("Starts a multiple choice session using the active vocabulary")); quizMultiple->setToolTip(quizMultiple->whatsThis()); - quizQA = new KAction(i18n("&Question && Answer"), "qa", "F9", TQT_TQOBJECT(this), TQT_SLOT(slotQuizQA()), actionCollection(),"quiz_qa"); + quizQA = new TDEAction(i18n("&Question && Answer"), "qa", "F9", TQT_TQOBJECT(this), TQT_SLOT(slotQuizQA()), actionCollection(),"quiz_qa"); quizQA->setWhatsThis(i18n("Starts a question and answer session using the active vocabulary")); quizQA->setToolTip(quizQA->whatsThis()); - quizCheck = new KAction(i18n("&Check"), "check", "Return", TQT_TQOBJECT(this), 0, actionCollection(),"quiz_check"); + quizCheck = new TDEAction(i18n("&Check"), "check", "Return", TQT_TQOBJECT(this), 0, actionCollection(),"quiz_check"); quizCheck->setWhatsThis(i18n("Checks your answer to this question")); quizCheck->setToolTip(quizCheck->whatsThis()); - flashKnow = new KAction(i18n("I &Know"), "know", "K", TQT_TQOBJECT(this), 0, actionCollection(),"flash_know"); + flashKnow = new TDEAction(i18n("I &Know"), "know", "K", TQT_TQOBJECT(this), 0, actionCollection(),"flash_know"); flashKnow->setWhatsThis(i18n("Counts this card as correct and shows the next card")); flashKnow->setToolTip(flashKnow->whatsThis()); - flashDontKnow = new KAction(i18n("I &Do Not Know"), "dontknow", "D", TQT_TQOBJECT(this), 0, actionCollection(),"flash_dont_know"); + flashDontKnow = new TDEAction(i18n("I &Do Not Know"), "dontknow", "D", TQT_TQOBJECT(this), 0, actionCollection(),"flash_dont_know"); flashDontKnow->setWhatsThis(i18n("Counts this card as incorrect and shows the next card")); flashDontKnow->setToolTip(flashDontKnow->whatsThis()); - qaHint = new KAction(i18n("&Hint"), "hint", "CTRL+H", TQT_TQOBJECT(this), 0, actionCollection(),"qa_hint"); + qaHint = new TDEAction(i18n("&Hint"), "hint", "CTRL+H", TQT_TQOBJECT(this), 0, actionCollection(),"qa_hint"); qaHint->setWhatsThis(i18n("Gets the next correct letter of the answer")); qaHint->setToolTip(qaHint->whatsThis()); - quizRestart = new KAction(i18n("&Restart"), "restart.png", "CTRL+R", TQT_TQOBJECT(this), 0, actionCollection(), "quiz_restart"); + quizRestart = new TDEAction(i18n("&Restart"), "restart.png", "CTRL+R", TQT_TQOBJECT(this), 0, actionCollection(), "quiz_restart"); quizRestart->setWhatsThis(i18n("Restarts the quiz session from the beginning")); quizRestart->setToolTip(quizRestart->whatsThis()); - quizRepeatErrors = new KAction(i18n("Repeat &Errors"), "repeat", "CTRL+E", TQT_TQOBJECT(this), 0, actionCollection(),"quiz_repeat_errors"); + quizRepeatErrors = new TDEAction(i18n("Repeat &Errors"), "repeat", "CTRL+E", TQT_TQOBJECT(this), 0, actionCollection(),"quiz_repeat_errors"); quizRepeatErrors->setWhatsThis(i18n("Repeats all incorrectly answered questions")); quizRepeatErrors->setToolTip(quizRepeatErrors->whatsThis()); @@ -278,15 +278,15 @@ void KWordQuizApp::initActions() charMapper = new TQSignalMapper(TQT_TQOBJECT(this)); connect(charMapper, TQT_SIGNAL(mapped(int)), TQT_TQOBJECT(this), TQT_SLOT(slotInsertChar(int))); - specialChar1 = new KAction(i18n("Special Character 1"), "", "CTRL+1", charMapper, TQT_SLOT(map()), actionCollection(), "char_1") ; - specialChar2 = new KAction(i18n("Special Character 2"), 0, "CTRL+2", charMapper, TQT_SLOT(map()), actionCollection(), "char_2") ; - specialChar3 = new KAction(i18n("Special Character 3"), 0, "CTRL+3", charMapper, TQT_SLOT(map()), actionCollection(), "char_3") ; - specialChar4 = new KAction(i18n("Special Character 4"), 0, "CTRL+4", charMapper, TQT_SLOT(map()), actionCollection(), "char_4") ; - specialChar5 = new KAction(i18n("Special Character 5"), 0, "CTRL+5", charMapper, TQT_SLOT(map()), actionCollection(), "char_5") ; - specialChar6 = new KAction(i18n("Special Character 6"), 0, "CTRL+6", charMapper, TQT_SLOT(map()), actionCollection(), "char_6") ; - specialChar7 = new KAction(i18n("Special Character 7"), 0, "CTRL+7", charMapper, TQT_SLOT(map()), actionCollection(), "char_7") ; - specialChar8 = new KAction(i18n("Special Character 8"), 0, "CTRL+8", charMapper, TQT_SLOT(map()), actionCollection(), "char_8") ; - specialChar9 = new KAction(i18n("Special Character 9"), 0, "CTRL+9", charMapper, TQT_SLOT(map()), actionCollection(), "char_9") ; + specialChar1 = new TDEAction(i18n("Special Character 1"), "", "CTRL+1", charMapper, TQT_SLOT(map()), actionCollection(), "char_1") ; + specialChar2 = new TDEAction(i18n("Special Character 2"), 0, "CTRL+2", charMapper, TQT_SLOT(map()), actionCollection(), "char_2") ; + specialChar3 = new TDEAction(i18n("Special Character 3"), 0, "CTRL+3", charMapper, TQT_SLOT(map()), actionCollection(), "char_3") ; + specialChar4 = new TDEAction(i18n("Special Character 4"), 0, "CTRL+4", charMapper, TQT_SLOT(map()), actionCollection(), "char_4") ; + specialChar5 = new TDEAction(i18n("Special Character 5"), 0, "CTRL+5", charMapper, TQT_SLOT(map()), actionCollection(), "char_5") ; + specialChar6 = new TDEAction(i18n("Special Character 6"), 0, "CTRL+6", charMapper, TQT_SLOT(map()), actionCollection(), "char_6") ; + specialChar7 = new TDEAction(i18n("Special Character 7"), 0, "CTRL+7", charMapper, TQT_SLOT(map()), actionCollection(), "char_7") ; + specialChar8 = new TDEAction(i18n("Special Character 8"), 0, "CTRL+8", charMapper, TQT_SLOT(map()), actionCollection(), "char_8") ; + specialChar9 = new TDEAction(i18n("Special Character 9"), 0, "CTRL+9", charMapper, TQT_SLOT(map()), actionCollection(), "char_9") ; charMapper->setMapping(specialChar1, 1); charMapper->setMapping(specialChar2, 2); @@ -300,7 +300,7 @@ void KWordQuizApp::initActions() actionCollection()->setHighlightingEnabled(true); connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &))); - connect(actionCollection(), TQT_SIGNAL(actionHighlighted(KAction *, bool)), TQT_TQOBJECT(this), TQT_SLOT(slotActionHighlighted(KAction *, bool))); + connect(actionCollection(), TQT_SIGNAL(actionHighlighted(TDEAction *, bool)), TQT_TQOBJECT(this), TQT_SLOT(slotActionHighlighted(TDEAction *, bool))); updateSpecialCharIcons(); if (!initialGeometrySet()) @@ -342,7 +342,7 @@ void KWordQuizApp::openURL(const KURL& url) if(!url.isEmpty()) { if (m_dirWatch->contains(url.path())) { - KMainWindow* w; + TDEMainWindow* w; if(memberList) { for(w=memberList->first(); w!=0; w=memberList->next()) @@ -678,7 +678,7 @@ void KWordQuizApp::slotFileQuit() saveOptions(); // close the first window, the list makes the next one the first again. // This ensures that queryClose() is called on each window to ask for closing - KMainWindow* w; + TDEMainWindow* w; if(memberList) { for(w=memberList->first(); w!=0; w=memberList->next()) @@ -787,10 +787,10 @@ void KWordQuizApp::slotVocabLanguages() void KWordQuizApp::slotVocabFont() { slotStatusMsg(i18n("Setting the font of the vocabulary...")); - KFontDialog* dlg; - dlg = new KFontDialog(this, "dlg_font", false, true); + TDEFontDialog* dlg; + dlg = new TDEFontDialog(this, "dlg_font", false, true); dlg->setFont(m_editView -> font()); - if (dlg->exec() == KFontDialog::Accepted) + if (dlg->exec() == TDEFontDialog::Accepted) { m_editView ->setFont(dlg->font()); Prefs::setEditorFont(dlg->font()); @@ -1072,7 +1072,7 @@ void KWordQuizApp::slotApplyPreferences() void KWordQuizApp::updateSpecialCharIcons( ) { for (int i = 0; i < 9; i++){ - KAction * act = actionCollection()->action(TQString("char_" + TQString::number(i + 1)).latin1()); + TDEAction * act = actionCollection()->action(TQString("char_" + TQString::number(i + 1)).latin1()); act->setIcon(charIcon(Prefs::specialCharacters()[i])); act->setToolTip(i18n("Inserts the character %1").arg(Prefs::specialCharacters()[i])); } @@ -1157,7 +1157,7 @@ void KWordQuizApp::updateMode(int m) mode4->setChecked(Prefs::mode() == 4); mode5->setChecked(Prefs::mode() == 5); - KPopupMenu *popup = mode->popupMenu(); + TDEPopupMenu *popup = mode->popupMenu(); popup->setItemChecked(0, Prefs::mode() == 1); popup->setItemChecked(1, Prefs::mode() == 2); popup->setItemChecked(2, Prefs::mode() == 3); @@ -1204,7 +1204,7 @@ void KWordQuizApp::slotInsertChar( int i ) m_editView->slotSpecChar(Prefs::specialCharacters()[i - 1]); } -void KWordQuizApp::slotActionHighlighted( KAction * action, bool hl) +void KWordQuizApp::slotActionHighlighted( TDEAction * action, bool hl) { if (!hl) slotStatusMsg(i18n("Ready")); diff --git a/kwordquiz/src/kwordquiz.h b/kwordquiz/src/kwordquiz.h index c04cd92f..86d4772b 100644 --- a/kwordquiz/src/kwordquiz.h +++ b/kwordquiz/src/kwordquiz.h @@ -48,16 +48,16 @@ class KWQNewStuff; * window and reads the config file as well as providing a menubar, toolbar * and statusbar. An instance of KWordQuizView creates your center view, which is connected * to the window's Doc object. - * KWordQuizApp reimplements the methods that KMainWindow provides for main window handling and supports - * full session management as well as using KActions. - * @see KMainWindow + * KWordQuizApp reimplements the methods that TDEMainWindow provides for main window handling and supports + * full session management as well as using TDEActions. + * @see TDEMainWindow * @see TDEApplication * @see TDEConfig * * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team. * @version KDevelop version 1.2 code generation */ -class KWordQuizApp : public KMainWindow +class KWordQuizApp : public TDEMainWindow { Q_OBJECT @@ -86,7 +86,7 @@ class KWordQuizApp : public KMainWindow /** read general Options again and initialize all variables like the recent file list */ void readOptions(); - /** initializes the KActions of the application */ + /** initializes the TDEActions of the application */ void initActions(); /** sets up the statusbar for the main window by initialzing a statuslabel. @@ -222,7 +222,7 @@ class KWordQuizApp : public KMainWindow void slotInsertChar(int i); - void slotActionHighlighted(KAction *, bool); + void slotActionHighlighted(TDEAction *, bool); void slotContextMenuRequested(int, int, const TQPoint &); private: @@ -248,66 +248,66 @@ class KWordQuizApp : public KMainWindow */ KWordQuizDoc *doc; - // KAction pointers to enable/disable actions - KAction* fileNew; - KAction* fileOpen; - KRecentFilesAction* fileOpenRecent; - KAction* fileGHNS; - KAction* fileSave; - KAction* fileSaveAs; - KAction* fileClose; - KAction* filePrint; - KAction* fileQuit; - - KAction* editUndo; - KAction* editCut; - KAction* editCopy; - KAction* editPaste; - KAction* editClear; - KAction* editInsert; - KAction* editDelete; - KAction* editMarkBlank; - KAction* editUnmarkBlank; - //KAction* editFind; - - KAction* vocabLanguages; - KAction* vocabFont; - //KAction* vocabKeyboard; - KAction* vocabRC; - KAction* vocabSort; - KAction* vocabShuffle; - - KToolBarPopupAction* mode; - KToggleAction* mode1; - KToggleAction* mode2; - KToggleAction* mode3; - KToggleAction* mode4; - KToggleAction* mode5; - - KAction* quizEditor; - KAction* quizFlash; - KAction* quizMultiple; - KAction* quizQA; - - KAction* quizCheck; - KAction* quizRestart; - KAction* quizRepeatErrors; - - KAction* flashKnow; - KAction* flashDontKnow; - - KAction* qaHint; + // TDEAction pointers to enable/disable actions + TDEAction* fileNew; + TDEAction* fileOpen; + TDERecentFilesAction* fileOpenRecent; + TDEAction* fileGHNS; + TDEAction* fileSave; + TDEAction* fileSaveAs; + TDEAction* fileClose; + TDEAction* filePrint; + TDEAction* fileQuit; + + TDEAction* editUndo; + TDEAction* editCut; + TDEAction* editCopy; + TDEAction* editPaste; + TDEAction* editClear; + TDEAction* editInsert; + TDEAction* editDelete; + TDEAction* editMarkBlank; + TDEAction* editUnmarkBlank; + //TDEAction* editFind; + + TDEAction* vocabLanguages; + TDEAction* vocabFont; + //TDEAction* vocabKeyboard; + TDEAction* vocabRC; + TDEAction* vocabSort; + TDEAction* vocabShuffle; + + TDEToolBarPopupAction* mode; + TDEToggleAction* mode1; + TDEToggleAction* mode2; + TDEToggleAction* mode3; + TDEToggleAction* mode4; + TDEToggleAction* mode5; + + TDEAction* quizEditor; + TDEAction* quizFlash; + TDEAction* quizMultiple; + TDEAction* quizQA; + + TDEAction* quizCheck; + TDEAction* quizRestart; + TDEAction* quizRepeatErrors; + + TDEAction* flashKnow; + TDEAction* flashDontKnow; + + TDEAction* qaHint; TQSignalMapper* charMapper; - KAction* specialChar1; - KAction* specialChar2; - KAction* specialChar3; - KAction* specialChar4; - KAction* specialChar5; - KAction* specialChar6; - KAction* specialChar7; - KAction* specialChar8; - KAction* specialChar9; + TDEAction* specialChar1; + TDEAction* specialChar2; + TDEAction* specialChar3; + TDEAction* specialChar4; + TDEAction* specialChar5; + TDEAction* specialChar6; + TDEAction* specialChar7; + TDEAction* specialChar8; + TDEAction* specialChar9; KDirWatch * m_dirWatch; KWQNewStuff * m_newStuff; diff --git a/kwordquiz/src/kwordquizdoc.h b/kwordquiz/src/kwordquizdoc.h index 07fbf3f5..b1f30a0e 100644 --- a/kwordquiz/src/kwordquizdoc.h +++ b/kwordquiz/src/kwordquizdoc.h @@ -33,7 +33,7 @@ class KWordQuizView; /** KWordQuizDoc provides a document object for a document-view model. * * The KWordQuizDoc class provides a document object that can be used in conjunction with the classes KWordQuizApp and KWordQuizView - * to create a document-view model for standard TDE applications based on TDEApplication and KMainWindow. Thereby, the document object + * to create a document-view model for standard TDE applications based on TDEApplication and TDEMainWindow. Thereby, the document object * is created by the KWordQuizApp instance and contains the document structure with the according methods for manipulation of the document * data by KWordQuizView objects. Also, KWordQuizDoc contains the methods for serialization of the document data from and to files. * diff --git a/kwordquiz/src/prefcardappearancebase.ui b/kwordquiz/src/prefcardappearancebase.ui index a051b9de..257c246a 100644 --- a/kwordquiz/src/prefcardappearancebase.ui +++ b/kwordquiz/src/prefcardappearancebase.ui @@ -317,7 +317,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="KFontRequester" row="0" column="0"> + <widget class="TDEFontRequester" row="0" column="0"> <property name="name"> <cstring>kcfg_BackFont</cstring> </property> @@ -400,7 +400,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="KFontRequester" row="0" column="0"> + <widget class="TDEFontRequester" row="0" column="0"> <property name="name"> <cstring>kcfg_FrontFont</cstring> </property> diff --git a/kwordquiz/src/qaview.h b/kwordquiz/src/qaview.h index b747c13c..0b293a72 100644 --- a/kwordquiz/src/qaview.h +++ b/kwordquiz/src/qaview.h @@ -53,10 +53,10 @@ private: WQQuiz *m_quiz; WTQScore *m_score; - KAction* actCheck; - KAction* actHint; - KAction* actRepeat; - KAction* actRestart; + TDEAction* actCheck; + TDEAction* actHint; + TDEAction* actRepeat; + TDEAction* actRestart; int m_question; int m_error; |