diff options
Diffstat (limited to 'kwordquiz')
33 files changed, 134 insertions, 134 deletions
diff --git a/kwordquiz/src/Makefile.am b/kwordquiz/src/Makefile.am index a1f80bce..eb9ce2a0 100644 --- a/kwordquiz/src/Makefile.am +++ b/kwordquiz/src/Makefile.am @@ -58,7 +58,7 @@ rc_DATA = kwordquizui.rc eventsrc xdg_apps_DATA = kwordquiz.desktop messages: rc.cpp - LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \ + LIST=`find . -name \*.h -o -name \*.cpp`; \ if test -n "$$LIST"; then \ $(XGETTEXT) $$LIST -o $(podir)/kwordquiz.pot; \ fi diff --git a/kwordquiz/src/dlglanguage.h b/kwordquiz/src/dlglanguage.h index 4f9431ce..6c338bf7 100644 --- a/kwordquiz/src/dlglanguage.h +++ b/kwordquiz/src/dlglanguage.h @@ -27,7 +27,7 @@ class TDECompletion; @author Peter Hedlund */ class DlgLanguage : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: DlgLanguage(TQWidget *parent = 0, const char *name = 0, bool modal=true); diff --git a/kwordquiz/src/dlgrc.h b/kwordquiz/src/dlgrc.h index b6cb5e29..8bee9ac8 100644 --- a/kwordquiz/src/dlgrc.h +++ b/kwordquiz/src/dlgrc.h @@ -26,7 +26,7 @@ */ class DlgRC : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: DlgRC(TQWidget *parent = 0, const char *name = 0, bool modal=true); diff --git a/kwordquiz/src/dlgsort.h b/kwordquiz/src/dlgsort.h index 0be0b7db..a6de2768 100644 --- a/kwordquiz/src/dlgsort.h +++ b/kwordquiz/src/dlgsort.h @@ -26,7 +26,7 @@ */ class DlgSort : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kwordquiz/src/dlgspecchar.cpp b/kwordquiz/src/dlgspecchar.cpp index da993afc..697e6a16 100644 --- a/kwordquiz/src/dlgspecchar.cpp +++ b/kwordquiz/src/dlgspecchar.cpp @@ -41,7 +41,7 @@ void DlgSpecChar::initDialog(const TQChar &_chr, const TQString &_font, bool /*_ int t = (_chr.unicode()/256); charSelect = new KCharSelect( page, "", _font, _chr, t); - connect(charSelect, TQT_SIGNAL(doubleClicked()),this, TQT_SLOT(slotDoubleClicked())); + connect(charSelect, TQ_SIGNAL(doubleClicked()),this, TQ_SLOT(slotDoubleClicked())); charSelect->resize( charSelect->sizeHint() ); charSelect->enableFontCombo( false ); grid->addWidget( charSelect, 0, 0 ); diff --git a/kwordquiz/src/dlgspecchar.h b/kwordquiz/src/dlgspecchar.h index 45d38744..8cc79145 100644 --- a/kwordquiz/src/dlgspecchar.h +++ b/kwordquiz/src/dlgspecchar.h @@ -30,7 +30,7 @@ class KButtonBox; */ class DlgSpecChar : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: //constructor when you want to insert multi char diff --git a/kwordquiz/src/flashview.cpp b/kwordquiz/src/flashview.cpp index 3e150a34..b22b9275 100644 --- a/kwordquiz/src/flashview.cpp +++ b/kwordquiz/src/flashview.cpp @@ -30,7 +30,7 @@ FlashView::FlashView(TQWidget *parent, const char *name, WFlags f) { m_score = new WTQScore(); m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimer())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimer())); } diff --git a/kwordquiz/src/flashview.h b/kwordquiz/src/flashview.h index 8de031c1..02abcf41 100644 --- a/kwordquiz/src/flashview.h +++ b/kwordquiz/src/flashview.h @@ -30,7 +30,7 @@ class WQQuiz; */ class FlashView : public FlashViewBase { -Q_OBJECT +TQ_OBJECT public: FlashView(TQWidget *parent = 0, const char *name = 0, WFlags f = 0); diff --git a/kwordquiz/src/kvtmlwriter.cpp b/kwordquiz/src/kvtmlwriter.cpp index 4855dbf2..787cabab 100644 --- a/kwordquiz/src/kvtmlwriter.cpp +++ b/kwordquiz/src/kvtmlwriter.cpp @@ -21,7 +21,7 @@ KVTMLWriter::KVTMLWriter(TQFile *file) outputFile = file; if(outputFile->open(IO_WriteOnly)) { - outputStream.setDevice(TQT_TQIODEVICE(outputFile)); + outputStream.setDevice(outputFile); outputStream.setEncoding(TQTextStream::UnicodeUTF8); outputStream << "<?xml version=\"1.0\"?>" << endl; diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp index 6e64b6b6..92a20dd6 100644 --- a/kwordquiz/src/kwordquiz.cpp +++ b/kwordquiz/src/kwordquiz.cpp @@ -105,117 +105,117 @@ void KWordQuizApp::initActions() TDEAction* configNotifications; TDEAction* configApp; - fileNew = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection()); + fileNew = KStdAction::openNew(this, TQ_SLOT(slotFileNew()), actionCollection()); fileNew->setWhatsThis(i18n("Creates a new blank vocabulary document")); fileNew->setToolTip(fileNew->whatsThis()); - fileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); + fileOpen = KStdAction::open(this, TQ_SLOT(slotFileOpen()), actionCollection()); fileOpen->setWhatsThis(i18n("Opens an existing vocabulary document")); fileOpen->setToolTip(fileOpen->whatsThis()); - fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); + fileOpenRecent = KStdAction::openRecent(this, TQ_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); - fileGHNS = new TDEAction(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", this, TQ_SLOT(slotFileGHNS()), actionCollection(), "file_ghns"); fileGHNS->setWhatsThis(i18n("Downloads new vocabularies")); fileGHNS->setToolTip(fileGHNS->whatsThis()); - fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); + fileSave = KStdAction::save(this, TQ_SLOT(slotFileSave()), actionCollection()); fileSave->setWhatsThis(i18n("Saves the active vocabulary document")); fileSave->setToolTip(fileSave->whatsThis()); - fileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); + fileSaveAs = KStdAction::saveAs(this, TQ_SLOT(slotFileSaveAs()), actionCollection()); fileSaveAs->setWhatsThis(i18n("Saves the active vocabulary document with a different name")); fileSaveAs->setToolTip(fileSaveAs->whatsThis()); - fileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); + fileClose = KStdAction::close(this, TQ_SLOT(slotFileClose()), actionCollection()); fileClose->setWhatsThis(i18n("Closes the active vocabulary document")); fileClose->setToolTip(fileClose->whatsThis()); - filePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection()); + filePrint = KStdAction::print(this, TQ_SLOT(slotFilePrint()), actionCollection()); filePrint->setWhatsThis(i18n("Prints the active vocabulary document")); filePrint->setToolTip(filePrint->whatsThis()); - fileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); + fileQuit = KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection()); fileQuit->setWhatsThis(i18n("Quits KWordQuiz")); fileQuit->setToolTip(fileQuit->whatsThis()); - editUndo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotEditUndo()), actionCollection()); + editUndo = KStdAction::undo(this, TQ_SLOT(slotEditUndo()), actionCollection()); editUndo->setWhatsThis(i18n("Undoes the last command")); editUndo->setToolTip(editUndo->whatsThis()); - editCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection()); + editCut = KStdAction::cut(this, TQ_SLOT(slotEditCut()), actionCollection()); editCut->setWhatsThis(i18n("Cuts the text from the selected cells and places it on the clipboard")); editCut->setToolTip(editCut->whatsThis()); - editCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection()); + editCopy = KStdAction::copy(this, TQ_SLOT(slotEditCopy()), actionCollection()); editCopy->setWhatsThis(i18n("Copies the text from the selected cells and places it on the clipboard")); editCopy->setToolTip(editCopy->whatsThis()); - editPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection()); + editPaste = KStdAction::paste(this, TQ_SLOT(slotEditPaste()), actionCollection()); editPaste->setWhatsThis(i18n("Pastes previously cut or copied text from the clipboard into the selected cells")); editPaste->setToolTip(editPaste->whatsThis()); - editClear = KStdAction::clear(TQT_TQOBJECT(this), TQT_SLOT(slotEditClear()), actionCollection()); + editClear = KStdAction::clear(this, TQ_SLOT(slotEditClear()), actionCollection()); editClear->setWhatsThis(i18n("Clears the content of the selected cells")); editClear->setToolTip(editClear->whatsThis()); - editInsert = new TDEAction(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", this, TQ_SLOT(slotEditInsert()), actionCollection(),"edit_insert"); editInsert->setWhatsThis(i18n("Inserts a new row above the current row")); editInsert->setToolTip(editInsert->whatsThis()); - editDelete = new TDEAction(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", this, TQ_SLOT(slotEditDelete()), actionCollection(),"edit_delete"); editDelete->setWhatsThis(i18n("Deletes the selected row(s)")); editDelete->setToolTip(editDelete->whatsThis()); - editMarkBlank = new TDEAction(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", this, TQ_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 TDEAction(i18n("&Unmark Blanks"), "unmarkasblank", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditUnmarkBlank()), actionCollection(),"edit_unmark_blank"); + editUnmarkBlank = new TDEAction(i18n("&Unmark Blanks"), "unmarkasblank", 0, this, TQ_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()); + //@todo implement editFind = KStdAction::find(this, TQ_SLOT(slotEditFind()), actionCollection()); - vocabLanguages = new TDEAction(i18n("&Column Titles..."), "languages", "CTRL+L", TQT_TQOBJECT(this), TQT_SLOT(slotVocabLanguages()), actionCollection(),"vocab_languages"); + vocabLanguages = new TDEAction(i18n("&Column Titles..."), "languages", "CTRL+L", this, TQ_SLOT(slotVocabLanguages()), actionCollection(),"vocab_languages"); vocabLanguages->setWhatsThis(i18n("Defines the column titles for the active vocabulary")); vocabLanguages->setToolTip(vocabLanguages->whatsThis()); - vocabFont = new TDEAction(i18n("&Font..."), "fonts", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabFont()), actionCollection(),"vocab_font"); + vocabFont = new TDEAction(i18n("&Font..."), "fonts", 0, this, TQ_SLOT(slotVocabFont()), actionCollection(),"vocab_font"); vocabFont->setWhatsThis(i18n("Defines the font used by the editor")); vocabFont->setToolTip(vocabFont->whatsThis()); - //@todo implement vocabKeyboard = new TDEAction(i18n("&Keyboard..."), "kxkb", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabKeyboard()), actionCollection(),"vocab_keyboard"); + //@todo implement vocabKeyboard = new TDEAction(i18n("&Keyboard..."), "kxkb", 0, this, TQ_SLOT(slotVocabKeyboard()), actionCollection(),"vocab_keyboard"); - vocabRC = new TDEAction(i18n("&Rows/Columns..."), "rowcol", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabRC()), actionCollection(),"vocab_rc"); + vocabRC = new TDEAction(i18n("&Rows/Columns..."), "rowcol", 0, this, TQ_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 TDEAction(i18n("&Sort..."), "sort_incr", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabSort()), actionCollection(),"vocab_sort"); + vocabSort = new TDEAction(i18n("&Sort..."), "sort_incr", 0, this, TQ_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 TDEAction(i18n("Sh&uffle"), "shuffle", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabShuffle()), actionCollection(),"vocab_shuffle"); + vocabShuffle = new TDEAction(i18n("Sh&uffle"), "shuffle", 0, this, TQ_SLOT(slotVocabShuffle()), actionCollection(),"vocab_shuffle"); vocabShuffle->setWhatsThis(i18n("Shuffles the entries of the active vocabulary")); vocabShuffle->setToolTip(vocabShuffle->whatsThis()); - mode = new TDEToolBarPopupAction(i18n("Change Mode"), "mode1", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode0()), actionCollection(),"mode_0"); + mode = new TDEToolBarPopupAction(i18n("Change Mode"), "mode1", 0, this, TQ_SLOT(slotMode0()), actionCollection(),"mode_0"); mode->setWhatsThis(i18n("Changes the mode used in quiz sessions")); mode->setToolTip(mode->whatsThis()); TDEPopupMenu *popup = mode->popupMenu(); popup->clear(); - popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode1", TDEIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), 0, 0); - popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode2", TDEIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), 0, 1); - popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode3", TDEIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode3()), 0, 2); - popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode4", TDEIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode4()), 0, 3); - popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode5", TDEIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode5()), 0, 4); - - 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"); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode1", TDEIcon::Toolbar), "", this, TQ_SLOT(slotMode1()), 0, 0); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode2", TDEIcon::Toolbar), "", this, TQ_SLOT(slotMode2()), 0, 1); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode3", TDEIcon::Toolbar), "", this, TQ_SLOT(slotMode3()), 0, 2); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode4", TDEIcon::Toolbar), "", this, TQ_SLOT(slotMode4()), 0, 3); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode5", TDEIcon::Toolbar), "", this, TQ_SLOT(slotMode5()), 0, 4); + + mode1 = new TDEToggleAction("", "mode1", 0, this, TQ_SLOT(slotMode1()), actionCollection(),"mode_1"); + mode2 = new TDEToggleAction("", "mode2", 0, this, TQ_SLOT(slotMode2()), actionCollection(),"mode_2"); + mode3 = new TDEToggleAction("", "mode3", 0, this, TQ_SLOT(slotMode3()), actionCollection(),"mode_3"); + mode4 = new TDEToggleAction("", "mode4", 0, this, TQ_SLOT(slotMode4()), actionCollection(),"mode_4"); + mode5 = new TDEToggleAction("", "mode5", 0, this, TQ_SLOT(slotMode5()), actionCollection(),"mode_5"); mode1->setWhatsThis(i18n("Selects this mode")); mode2->setWhatsThis(i18n("Selects this mode")); mode3->setWhatsThis(i18n("Selects this mode")); @@ -227,66 +227,66 @@ void KWordQuizApp::initActions() mode4->setToolTip(mode4->whatsThis()); mode5->setToolTip(mode5->whatsThis()); - quizEditor = new TDEAction(i18n("&Editor"), "editor", "F6", TQT_TQOBJECT(this), TQT_SLOT(slotQuizEditor()), actionCollection(),"quiz_editor"); + quizEditor = new TDEAction(i18n("&Editor"), "editor", "F6", this, TQ_SLOT(slotQuizEditor()), actionCollection(),"quiz_editor"); quizEditor->setWhatsThis(i18n("Activates the vocabulary editor")); quizEditor->setToolTip(quizEditor->whatsThis()); - quizFlash = new TDEAction(i18n("&Flashcard"), "flash", "F7", TQT_TQOBJECT(this), TQT_SLOT(slotQuizFlash()), actionCollection(),"quiz_flash"); + quizFlash = new TDEAction(i18n("&Flashcard"), "flash", "F7", this, TQ_SLOT(slotQuizFlash()), actionCollection(),"quiz_flash"); quizFlash->setWhatsThis(i18n("Starts a flashcard session using the active vocabulary")); quizFlash->setToolTip(quizFlash->whatsThis()); - quizMultiple = new TDEAction(i18n("&Multiple Choice"), "multiple", "F8", TQT_TQOBJECT(this), TQT_SLOT(slotQuizMultiple()), actionCollection(),"quiz_multiple"); + quizMultiple = new TDEAction(i18n("&Multiple Choice"), "multiple", "F8", this, TQ_SLOT(slotQuizMultiple()), actionCollection(),"quiz_multiple"); quizMultiple->setWhatsThis(i18n("Starts a multiple choice session using the active vocabulary")); quizMultiple->setToolTip(quizMultiple->whatsThis()); - quizQA = new TDEAction(i18n("&Question && Answer"), "qa", "F9", TQT_TQOBJECT(this), TQT_SLOT(slotQuizQA()), actionCollection(),"quiz_qa"); + quizQA = new TDEAction(i18n("&Question && Answer"), "qa", "F9", this, TQ_SLOT(slotQuizQA()), actionCollection(),"quiz_qa"); quizQA->setWhatsThis(i18n("Starts a question and answer session using the active vocabulary")); quizQA->setToolTip(quizQA->whatsThis()); - quizCheck = new TDEAction(i18n("&Check"), "check", "Return", TQT_TQOBJECT(this), 0, actionCollection(),"quiz_check"); + quizCheck = new TDEAction(i18n("&Check"), "check", "Return", this, 0, actionCollection(),"quiz_check"); quizCheck->setWhatsThis(i18n("Checks your answer to this question")); quizCheck->setToolTip(quizCheck->whatsThis()); - flashKnow = new TDEAction(i18n("I &Know"), "know", "K", TQT_TQOBJECT(this), 0, actionCollection(),"flash_know"); + flashKnow = new TDEAction(i18n("I &Know"), "know", "K", this, 0, actionCollection(),"flash_know"); flashKnow->setWhatsThis(i18n("Counts this card as correct and shows the next card")); flashKnow->setToolTip(flashKnow->whatsThis()); - flashDontKnow = new TDEAction(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", 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 TDEAction(i18n("&Hint"), "hint", "CTRL+H", TQT_TQOBJECT(this), 0, actionCollection(),"qa_hint"); + qaHint = new TDEAction(i18n("&Hint"), "hint", "CTRL+H", this, 0, actionCollection(),"qa_hint"); qaHint->setWhatsThis(i18n("Gets the next correct letter of the answer")); qaHint->setToolTip(qaHint->whatsThis()); - quizRestart = new TDEAction(i18n("&Restart"), "restart.png", "CTRL+R", TQT_TQOBJECT(this), 0, actionCollection(), "quiz_restart"); + quizRestart = new TDEAction(i18n("&Restart"), "restart.png", "CTRL+R", this, 0, actionCollection(), "quiz_restart"); quizRestart->setWhatsThis(i18n("Restarts the quiz session from the beginning")); quizRestart->setToolTip(quizRestart->whatsThis()); - quizRepeatErrors = new TDEAction(i18n("Repeat &Errors"), "repeat", "CTRL+E", TQT_TQOBJECT(this), 0, actionCollection(),"quiz_repeat_errors"); + quizRepeatErrors = new TDEAction(i18n("Repeat &Errors"), "repeat", "CTRL+E", this, 0, actionCollection(),"quiz_repeat_errors"); quizRepeatErrors->setWhatsThis(i18n("Repeats all incorrectly answered questions")); quizRepeatErrors->setToolTip(quizRepeatErrors->whatsThis()); - configNotifications = KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureNotifications()), actionCollection()); + configNotifications = KStdAction::configureNotifications(this, TQ_SLOT(slotConfigureNotifications()), actionCollection()); configNotifications->setWhatsThis(i18n("Configures sound and other notifications for certain events")); configNotifications->setToolTip(configNotifications->whatsThis()); - configApp = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotConfigure()), actionCollection()); + configApp = KStdAction::preferences(this, TQ_SLOT( slotConfigure()), actionCollection()); configApp->setWhatsThis(i18n("Specifies preferences for the vocabulary editor and quiz sessions")); configApp->setToolTip(configApp->whatsThis()); - charMapper = new TQSignalMapper(TQT_TQOBJECT(this)); - connect(charMapper, TQT_SIGNAL(mapped(int)), TQT_TQOBJECT(this), TQT_SLOT(slotInsertChar(int))); + charMapper = new TQSignalMapper(this); + connect(charMapper, TQ_SIGNAL(mapped(int)), this, TQ_SLOT(slotInsertChar(int))); - 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") ; + specialChar1 = new TDEAction(i18n("Special Character 1"), "", "CTRL+1", charMapper, TQ_SLOT(map()), actionCollection(), "char_1") ; + specialChar2 = new TDEAction(i18n("Special Character 2"), 0, "CTRL+2", charMapper, TQ_SLOT(map()), actionCollection(), "char_2") ; + specialChar3 = new TDEAction(i18n("Special Character 3"), 0, "CTRL+3", charMapper, TQ_SLOT(map()), actionCollection(), "char_3") ; + specialChar4 = new TDEAction(i18n("Special Character 4"), 0, "CTRL+4", charMapper, TQ_SLOT(map()), actionCollection(), "char_4") ; + specialChar5 = new TDEAction(i18n("Special Character 5"), 0, "CTRL+5", charMapper, TQ_SLOT(map()), actionCollection(), "char_5") ; + specialChar6 = new TDEAction(i18n("Special Character 6"), 0, "CTRL+6", charMapper, TQ_SLOT(map()), actionCollection(), "char_6") ; + specialChar7 = new TDEAction(i18n("Special Character 7"), 0, "CTRL+7", charMapper, TQ_SLOT(map()), actionCollection(), "char_7") ; + specialChar8 = new TDEAction(i18n("Special Character 8"), 0, "CTRL+8", charMapper, TQ_SLOT(map()), actionCollection(), "char_8") ; + specialChar9 = new TDEAction(i18n("Special Character 9"), 0, "CTRL+9", charMapper, TQ_SLOT(map()), actionCollection(), "char_9") ; charMapper->setMapping(specialChar1, 1); charMapper->setMapping(specialChar2, 2); @@ -299,8 +299,8 @@ void KWordQuizApp::initActions() charMapper->setMapping(specialChar9, 9); actionCollection()->setHighlightingEnabled(true); - connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &))); - connect(actionCollection(), TQT_SIGNAL(actionHighlighted(TDEAction *, bool)), TQT_TQOBJECT(this), TQT_SLOT(slotActionHighlighted(TDEAction *, bool))); + connect(actionCollection(), TQ_SIGNAL(actionStatusText(const TQString &)), this, TQ_SLOT(slotStatusMsg(const TQString &))); + connect(actionCollection(), TQ_SIGNAL(actionHighlighted(TDEAction *, bool)), this, TQ_SLOT(slotActionHighlighted(TDEAction *, bool))); updateSpecialCharIcons(); if (!initialGeometrySet()) @@ -333,8 +333,8 @@ void KWordQuizApp::initView() setCentralWidget(m_editView); setCaption(doc->URL().fileName(),false); m_editView->setFont(Prefs::editorFont()); - connect(m_editView, TQT_SIGNAL(undoChange(const TQString&, bool )), TQT_TQOBJECT(this), TQT_SLOT(slotUndoChange(const TQString&, bool))); - connect(m_editView, TQT_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), TQT_TQOBJECT(this), TQT_SLOT(slotContextMenuRequested(int, int, const TQPoint& ))); + connect(m_editView, TQ_SIGNAL(undoChange(const TQString&, bool )), this, TQ_SLOT(slotUndoChange(const TQString&, bool))); + connect(m_editView, TQ_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), this, TQ_SLOT(slotContextMenuRequested(int, int, const TQPoint& ))); } void KWordQuizApp::openURL(const KURL& url) @@ -472,7 +472,7 @@ bool KWordQuizApp::queryExit() } ///////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATION +// SLOT IMPLEMENTATION ///////////////////////////////////////////////////////////////////// void KWordQuizApp::slotFileNew() @@ -956,7 +956,7 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) break; case WQQuiz::qtFlash: m_quiz = new WQQuiz(m_editView); - connect(m_quiz, TQT_SIGNAL(checkingAnswer(int )), m_editView, TQT_SLOT(slotCheckedAnswer(int ))); + connect(m_quiz, TQ_SIGNAL(checkingAnswer(int )), m_editView, TQ_SLOT(slotCheckedAnswer(int ))); m_quiz ->setQuizType(WQQuiz::qtFlash); m_quiz->setQuizMode(Prefs::mode()); if (m_quiz -> init()) @@ -964,12 +964,12 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) m_editView->saveCurrentSelection(true); m_editView->hide(); m_flashView = new FlashView(this); - connect(quizCheck, TQT_SIGNAL(activated()), m_flashView, TQT_SLOT(slotFlip())); - connect(flashKnow, TQT_SIGNAL(activated()), m_flashView, TQT_SLOT(slotKnow())); - connect(flashDontKnow, TQT_SIGNAL(activated()), m_flashView, TQT_SLOT(slotDontKnow())); - connect(quizRestart, TQT_SIGNAL(activated()), m_flashView, TQT_SLOT(slotRestart())); - connect(quizRepeatErrors, TQT_SIGNAL(activated()), m_flashView, TQT_SLOT(slotRepeat())); - connect(this, TQT_SIGNAL(settingsChanged()), m_flashView, TQT_SLOT(slotApplySettings())); + connect(quizCheck, TQ_SIGNAL(activated()), m_flashView, TQ_SLOT(slotFlip())); + connect(flashKnow, TQ_SIGNAL(activated()), m_flashView, TQ_SLOT(slotKnow())); + connect(flashDontKnow, TQ_SIGNAL(activated()), m_flashView, TQ_SLOT(slotDontKnow())); + connect(quizRestart, TQ_SIGNAL(activated()), m_flashView, TQ_SLOT(slotRestart())); + connect(quizRepeatErrors, TQ_SIGNAL(activated()), m_flashView, TQ_SLOT(slotRepeat())); + connect(this, TQ_SIGNAL(settingsChanged()), m_flashView, TQ_SLOT(slotApplySettings())); setCentralWidget(m_flashView); m_flashView -> setQuiz(m_quiz); @@ -984,7 +984,7 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) break; case WQQuiz::qtMultiple: m_quiz = new WQQuiz(m_editView); - connect(m_quiz, TQT_SIGNAL(checkingAnswer(int )), m_editView, TQT_SLOT(slotCheckedAnswer(int ))); + connect(m_quiz, TQ_SIGNAL(checkingAnswer(int )), m_editView, TQ_SLOT(slotCheckedAnswer(int ))); m_quiz ->setQuizType(WQQuiz::qtMultiple); m_quiz->setQuizMode(Prefs::mode()); if (m_quiz -> init()) @@ -992,10 +992,10 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) m_editView->saveCurrentSelection(true); m_editView->hide(); m_multipleView = new MultipleView(this); - connect(quizCheck, TQT_SIGNAL(activated()), m_multipleView, TQT_SLOT(slotCheck())); - connect(quizRestart, TQT_SIGNAL(activated()), m_multipleView, TQT_SLOT(slotRestart())); - connect(quizRepeatErrors, TQT_SIGNAL(activated()), m_multipleView, TQT_SLOT(slotRepeat())); - connect(this, TQT_SIGNAL(settingsChanged()), m_multipleView, TQT_SLOT(slotApplySettings())); + connect(quizCheck, TQ_SIGNAL(activated()), m_multipleView, TQ_SLOT(slotCheck())); + connect(quizRestart, TQ_SIGNAL(activated()), m_multipleView, TQ_SLOT(slotRestart())); + connect(quizRepeatErrors, TQ_SIGNAL(activated()), m_multipleView, TQ_SLOT(slotRepeat())); + connect(this, TQ_SIGNAL(settingsChanged()), m_multipleView, TQ_SLOT(slotApplySettings())); setCentralWidget(m_multipleView); @@ -1011,7 +1011,7 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) break; case WQQuiz::qtQA: m_quiz = new WQQuiz(m_editView); - connect(m_quiz, TQT_SIGNAL(checkingAnswer(int )), m_editView, TQT_SLOT(slotCheckedAnswer(int ))); + connect(m_quiz, TQ_SIGNAL(checkingAnswer(int )), m_editView, TQ_SLOT(slotCheckedAnswer(int ))); m_quiz ->setQuizType(WQQuiz::qtQA); m_quiz->setQuizMode(Prefs::mode()); if (m_quiz -> init()) @@ -1019,11 +1019,11 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) m_editView->saveCurrentSelection(true); m_editView->hide(); m_qaView = new QAView(this); - connect(quizCheck, TQT_SIGNAL(activated()), m_qaView, TQT_SLOT(slotCheck())); - connect(qaHint, TQT_SIGNAL(activated()), m_qaView, TQT_SLOT(slotHint())); - connect(quizRestart, TQT_SIGNAL(activated()), m_qaView, TQT_SLOT(slotRestart())); - connect(quizRepeatErrors, TQT_SIGNAL(activated()), m_qaView, TQT_SLOT(slotRepeat())); - connect(this, TQT_SIGNAL(settingsChanged()), m_qaView, TQT_SLOT(slotApplySettings())); + connect(quizCheck, TQ_SIGNAL(activated()), m_qaView, TQ_SLOT(slotCheck())); + connect(qaHint, TQ_SIGNAL(activated()), m_qaView, TQ_SLOT(slotHint())); + connect(quizRestart, TQ_SIGNAL(activated()), m_qaView, TQ_SLOT(slotRestart())); + connect(quizRepeatErrors, TQ_SIGNAL(activated()), m_qaView, TQ_SLOT(slotRepeat())); + connect(this, TQ_SIGNAL(settingsChanged()), m_qaView, TQ_SLOT(slotApplySettings())); setCentralWidget(m_qaView); @@ -1055,7 +1055,7 @@ void KWordQuizApp::slotConfigure() //TDEConfigDialog didn't find an instance of this dialog, so lets create it : KWordQuizPrefs* dialog = new KWordQuizPrefs( this, "settings", Prefs::self() ); - connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotApplyPreferences())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotApplyPreferences())); dialog->show(); } diff --git a/kwordquiz/src/kwordquiz.h b/kwordquiz/src/kwordquiz.h index fe8d4bc3..347a0529 100644 --- a/kwordquiz/src/kwordquiz.h +++ b/kwordquiz/src/kwordquiz.h @@ -59,7 +59,7 @@ class KWQNewStuff; */ class KWordQuizApp : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT friend class KWordQuizView; diff --git a/kwordquiz/src/kwordquiz.kcfg b/kwordquiz/src/kwordquiz.kcfg index 3eacdf76..5a300c63 100644 --- a/kwordquiz/src/kwordquiz.kcfg +++ b/kwordquiz/src/kwordquiz.kcfg @@ -74,15 +74,15 @@ </entry> <entry name="FrontTextColor" type="Color"> <label>Color used for text on front of flashcard</label> - <default code="true">Qt::black</default> + <default code="true">TQt::black</default> </entry> <entry name="FrontCardColor" type="Color"> <label>Color used for front of flashcard</label> - <default code="true">Qt::white</default> + <default code="true">TQt::white</default> </entry> <entry name="FrontFrameColor" type="Color"> <label>Color used for frame on front of flashcard</label> - <default code="true">Qt::red</default> + <default code="true">TQt::red</default> </entry> <entry name="BackFont" type="Font"> <label>Font used for back of flashcard</label> @@ -90,15 +90,15 @@ </entry> <entry name="BackTextColor" type="Color"> <label>Color used for text on back of flashcard</label> - <default code="true">Qt::black</default> + <default code="true">TQt::black</default> </entry> <entry name="BackCardColor" type="Color"> <label>Color used for back of flashcard</label> - <default code="true">Qt::white</default> + <default code="true">TQt::white</default> </entry> <entry name="BackFrameColor" type="Color"> <label>Color used for frame on back of flashcard</label> - <default code="true">Qt::blue</default> + <default code="true">TQt::blue</default> </entry> </group> <group name="TDENewStuff"> diff --git a/kwordquiz/src/kwordquizdoc.cpp b/kwordquiz/src/kwordquizdoc.cpp index abf26295..70fb3663 100644 --- a/kwordquiz/src/kwordquizdoc.cpp +++ b/kwordquiz/src/kwordquizdoc.cpp @@ -38,7 +38,7 @@ KWordQuizDoc::KWordQuizDoc(TQWidget *parent, const char *name) : TQObject(parent, name) { - connect(KDirWatch::self(), TQT_SIGNAL(dirty(const TQString& )), this, TQT_SLOT(slotModifiedOnDisk(const TQString& ))); + connect(KDirWatch::self(), TQ_SIGNAL(dirty(const TQString& )), this, TQ_SLOT(slotModifiedOnDisk(const TQString& ))); /* if(!pViewList) { pViewList = new TQPtrList<KWordQuizView>(); diff --git a/kwordquiz/src/kwordquizdoc.h b/kwordquiz/src/kwordquizdoc.h index 4ccd7dd7..8ab3b387 100644 --- a/kwordquiz/src/kwordquizdoc.h +++ b/kwordquiz/src/kwordquizdoc.h @@ -42,7 +42,7 @@ class KWordQuizView; */ class KWordQuizDoc : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** Constructor for the fileclass of the application */ diff --git a/kwordquiz/src/kwordquizprefs.cpp b/kwordquiz/src/kwordquizprefs.cpp index 0f8a13c7..2844ce48 100644 --- a/kwordquiz/src/kwordquizprefs.cpp +++ b/kwordquiz/src/kwordquizprefs.cpp @@ -60,8 +60,8 @@ KWordQuizPrefs::KWordQuizPrefs(TQWidget *parent, const char *name, TDEConfigSke m_dlgSpecChar = 0L; - connect(m_prefCharacter->lstCharacters, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCharListSelectionChanged())); - connect(m_prefCharacter->btnCharacter, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectSpecChar())); + connect(m_prefCharacter->lstCharacters, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotCharListSelectionChanged())); + connect(m_prefCharacter->btnCharacter, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectSpecChar())); KWordQuizApp *win=(KWordQuizApp *) parent; int i=0; @@ -96,8 +96,8 @@ void KWordQuizPrefs::slotSelectSpecChar( ) if (m_dlgSpecChar == 0) { m_dlgSpecChar = new DlgSpecChar( this, "insert special char", f, c, true ); - connect(m_dlgSpecChar, TQT_SIGNAL(insertChar(TQChar)), this, TQT_SLOT(slotSpecChar(TQChar))); - connect(m_dlgSpecChar, TQT_SIGNAL(finished()), this, TQT_SLOT(slotDlgSpecCharClosed())); + connect(m_dlgSpecChar, TQ_SIGNAL(insertChar(TQChar)), this, TQ_SLOT(slotSpecChar(TQChar))); + connect(m_dlgSpecChar, TQ_SIGNAL(finished()), this, TQ_SLOT(slotDlgSpecCharClosed())); } m_dlgSpecChar->show(); } @@ -106,8 +106,8 @@ void KWordQuizPrefs::slotDlgSpecCharClosed() { if ( m_dlgSpecChar ) { - disconnect(m_dlgSpecChar, TQT_SIGNAL(insertChar(TQChar)), this, TQT_SLOT(slotSpecChar(TQChar))); - disconnect(m_dlgSpecChar, TQT_SIGNAL(finished()), this, TQT_SLOT(slotDlgSpecCharClosed())); + disconnect(m_dlgSpecChar, TQ_SIGNAL(insertChar(TQChar)), this, TQ_SLOT(slotSpecChar(TQChar))); + disconnect(m_dlgSpecChar, TQ_SIGNAL(finished()), this, TQ_SLOT(slotDlgSpecCharClosed())); m_dlgSpecChar->deleteLater(); m_dlgSpecChar = 0L; } diff --git a/kwordquiz/src/kwordquizprefs.h b/kwordquiz/src/kwordquizprefs.h index 1a99bffe..6db9adac 100644 --- a/kwordquiz/src/kwordquizprefs.h +++ b/kwordquiz/src/kwordquizprefs.h @@ -32,7 +32,7 @@ class DlgSpecChar; class KWordQuizPrefs : public TDEConfigDialog { - Q_OBJECT + TQ_OBJECT public: KWordQuizPrefs(TQWidget *parent=0, const char *name=0, TDEConfigSkeleton *config=0, DialogType dialogType=IconList, diff --git a/kwordquiz/src/kwordquizview.cpp b/kwordquiz/src/kwordquizview.cpp index 5fbf5be6..b1b75b41 100644 --- a/kwordquiz/src/kwordquizview.cpp +++ b/kwordquiz/src/kwordquizview.cpp @@ -842,8 +842,8 @@ void KWordQuizView::doVocabSpecChar( ) if (dlgSpecChar==0) { dlgSpecChar = new DlgSpecChar( this, "insert special char", f, c, false ); - connect( dlgSpecChar, TQT_SIGNAL(insertChar(TQChar)), this, TQT_SLOT(slotSpecChar(TQChar))); - connect( dlgSpecChar, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDlgSpecCharClosed() ) ); + connect( dlgSpecChar, TQ_SIGNAL(insertChar(TQChar)), this, TQ_SLOT(slotSpecChar(TQChar))); + connect( dlgSpecChar, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDlgSpecCharClosed() ) ); } dlgSpecChar->show(); } @@ -852,8 +852,8 @@ void KWordQuizView::slotDlgSpecCharClosed( ) { if ( dlgSpecChar ) { - disconnect( dlgSpecChar, TQT_SIGNAL(insertChar(TQChar)), this, TQT_SLOT(slotSpecChar(TQChar))); - disconnect( dlgSpecChar, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDlgSpecCharClosed() ) ); + disconnect( dlgSpecChar, TQ_SIGNAL(insertChar(TQChar)), this, TQ_SLOT(slotSpecChar(TQChar))); + disconnect( dlgSpecChar, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDlgSpecCharClosed() ) ); dlgSpecChar->deleteLater(); dlgSpecChar = 0L; } @@ -1051,7 +1051,7 @@ void KWordQuizView::slotCheckedAnswer( int i ) bool KWordQuizView::eventFilter( TQObject * o, TQEvent * e ) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(cellEditor)) + if (o == cellEditor) { if ( e->type() == TQEvent::KeyPress ) { diff --git a/kwordquiz/src/kwordquizview.h b/kwordquiz/src/kwordquizview.h index 6dfec55a..c2056759 100644 --- a/kwordquiz/src/kwordquizview.h +++ b/kwordquiz/src/kwordquizview.h @@ -50,7 +50,7 @@ public: class KWordQuizView : public TQTable { - Q_OBJECT + TQ_OBJECT public: /** Constructor for the main view */ diff --git a/kwordquiz/src/kwqnewstuff.h b/kwordquiz/src/kwqnewstuff.h index a740459f..28178cf6 100644 --- a/kwordquiz/src/kwqnewstuff.h +++ b/kwordquiz/src/kwqnewstuff.h @@ -27,7 +27,7 @@ class KWordQuizApp; */ class KWQNewStuff : public TQObject, public TDENewStuff { -Q_OBJECT +TQ_OBJECT public: KWQNewStuff(TQWidget *parent = 0, const char *name = 0); diff --git a/kwordquiz/src/multipleview.h b/kwordquiz/src/multipleview.h index ac70aa55..b8bc454e 100644 --- a/kwordquiz/src/multipleview.h +++ b/kwordquiz/src/multipleview.h @@ -28,7 +28,7 @@ */ class MultipleView : public MultipleViewBase { -Q_OBJECT +TQ_OBJECT public: MultipleView(TQWidget *parent = 0, const char *name = 0, WFlags f = 0); diff --git a/kwordquiz/src/multipleviewbase.ui b/kwordquiz/src/multipleviewbase.ui index 3d848b83..4ad7b4ac 100644 --- a/kwordquiz/src/multipleviewbase.ui +++ b/kwordquiz/src/multipleviewbase.ui @@ -967,10 +967,10 @@ <slot>slotOpt3Clicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotOpt1Clicked()</slot> <slot>slotOpt2Clicked()</slot> <slot>slotOpt3Clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwordquiz/src/prefcardappearance.h b/kwordquiz/src/prefcardappearance.h index c2091eb6..a7263dfe 100644 --- a/kwordquiz/src/prefcardappearance.h +++ b/kwordquiz/src/prefcardappearance.h @@ -19,7 +19,7 @@ */ class PrefCardAppearance : public PrefCardAppearanceBase { -Q_OBJECT +TQ_OBJECT public: PrefCardAppearance(TQWidget *parent = 0, const char *name = 0); diff --git a/kwordquiz/src/prefcardappearancebase.ui b/kwordquiz/src/prefcardappearancebase.ui index 9a1af12b..125defe6 100644 --- a/kwordquiz/src/prefcardappearancebase.ui +++ b/kwordquiz/src/prefcardappearancebase.ui @@ -534,14 +534,14 @@ <tabstop>kcfg_FrontCardColor</tabstop> <tabstop>kcfg_FrontFrameColor</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotFlipButtonClicked()</slot> <slot>slotFontChanged(const TQFont &)</slot> <slot>slotTextColorChanged(const TQColor &)</slot> <slot>slotAboutToShowWidget(TQWidget *)</slot> <slot>slotFrameColorChanged(const TQColor &)</slot> <slot>slotCardColorChanged(const TQColor &)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kwordquiz/src/prefcharacter.h b/kwordquiz/src/prefcharacter.h index c9b5d168..162ee6a5 100644 --- a/kwordquiz/src/prefcharacter.h +++ b/kwordquiz/src/prefcharacter.h @@ -26,7 +26,7 @@ */ class PrefCharacter : public PrefCharacterBase { -Q_OBJECT +TQ_OBJECT public: PrefCharacter(TQWidget *parent = 0, const char *name = 0); diff --git a/kwordquiz/src/prefeditor.h b/kwordquiz/src/prefeditor.h index 922831a6..00e3a4ce 100644 --- a/kwordquiz/src/prefeditor.h +++ b/kwordquiz/src/prefeditor.h @@ -26,7 +26,7 @@ */ class PrefEditor : public PrefEditorBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kwordquiz/src/prefquiz.h b/kwordquiz/src/prefquiz.h index 0ae8227b..aa013380 100644 --- a/kwordquiz/src/prefquiz.h +++ b/kwordquiz/src/prefquiz.h @@ -26,7 +26,7 @@ */ class PrefQuiz : public PrefQuizBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kwordquiz/src/prefquizbase.ui b/kwordquiz/src/prefquizbase.ui index 89e0dffa..fe12e9cf 100644 --- a/kwordquiz/src/prefquizbase.ui +++ b/kwordquiz/src/prefquizbase.ui @@ -284,9 +284,9 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotAutoFlipClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">knuminput.h</include> diff --git a/kwordquiz/src/qaview.h b/kwordquiz/src/qaview.h index 1deb4049..9cf195a3 100644 --- a/kwordquiz/src/qaview.h +++ b/kwordquiz/src/qaview.h @@ -31,7 +31,7 @@ */ class QAView : public QAViewBase { -Q_OBJECT +TQ_OBJECT public: QAView(TQWidget *parent = 0, const char *name = 0, WFlags f = 0); diff --git a/kwordquiz/src/qaviewbase.ui b/kwordquiz/src/qaviewbase.ui index 9c5b3353..c82f4026 100644 --- a/kwordquiz/src/qaviewbase.ui +++ b/kwordquiz/src/qaviewbase.ui @@ -862,9 +862,9 @@ <slot>slotCheck()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="private">slotCheck()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kwordquiz/src/wqlwriter.cpp b/kwordquiz/src/wqlwriter.cpp index 2052c079..e5314201 100644 --- a/kwordquiz/src/wqlwriter.cpp +++ b/kwordquiz/src/wqlwriter.cpp @@ -22,7 +22,7 @@ WqlWriter::WqlWriter(TQFile *file) outputFile = file; if(outputFile->open(IO_WriteOnly)) { - outputStream.setDevice(TQT_TQIODEVICE(outputFile)); + outputStream.setDevice(outputFile); outputStream.setEncoding(TQTextStream::Latin1); outputStream << "WordQuiz" << winendl; diff --git a/kwordquiz/src/wqprintdialogpage.cpp b/kwordquiz/src/wqprintdialogpage.cpp index 148d298b..9ff03284 100644 --- a/kwordquiz/src/wqprintdialogpage.cpp +++ b/kwordquiz/src/wqprintdialogpage.cpp @@ -33,7 +33,7 @@ WQPrintDialogPage::WQPrintDialogPage(TQWidget *parent, const char *name ) TQGridLayout * l = new TQGridLayout( this, 1, 1, 11, 6); g = new TQButtonGroup(i18n("Select Type of Printout"), this ); - g->setColumnLayout(0, Qt::Vertical ); + g->setColumnLayout(0, TQt::Vertical ); g->layout()->setSpacing( 6 ); g->layout()->setMargin( 11 ); TQGridLayout * v = new TQGridLayout( g->layout() ); diff --git a/kwordquiz/src/wqprintdialogpage.h b/kwordquiz/src/wqprintdialogpage.h index b5d749f8..0ee89549 100644 --- a/kwordquiz/src/wqprintdialogpage.h +++ b/kwordquiz/src/wqprintdialogpage.h @@ -29,7 +29,7 @@ Print dialog page to provide specific print options for KWordQuiz */ class WQPrintDialogPage : public KPrintDialogPage { -Q_OBJECT +TQ_OBJECT public: WQPrintDialogPage( TQWidget *parent = 0, const char *name = 0 ); diff --git a/kwordquiz/src/wqquiz.h b/kwordquiz/src/wqquiz.h index a9bdc190..6f3337d4 100644 --- a/kwordquiz/src/wqquiz.h +++ b/kwordquiz/src/wqquiz.h @@ -32,7 +32,7 @@ typedef TQValueList<WTQListItem> QuizList; class WQQuiz : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum QuizType {qtEditor, qtFlash, qtMultiple, qtQA}; |