Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 69e4de2f4cee257151ca13b207dc677b2d958fed)

6 files changed, 91 insertions, 91 deletions

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/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/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp
index 6652915f..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(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(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(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", 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(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(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(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(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(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(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(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(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(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(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", 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", 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", 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, 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", 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, 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, 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, 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, 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, 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, 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), "", this, TQT_SLOT(slotMode1()), 0, 0);
-  popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode2", TDEIcon::Toolbar), "", this, TQT_SLOT(slotMode2()), 0, 1);
-  popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode3", TDEIcon::Toolbar), "", this, TQT_SLOT(slotMode3()), 0, 2);
-  popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode4", TDEIcon::Toolbar), "", this, TQT_SLOT(slotMode4()), 0, 3);
-  popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode5", TDEIcon::Toolbar), "", this, TQT_SLOT(slotMode5()), 0, 4);
-
-  mode1 = new TDEToggleAction("", "mode1", 0, this, TQT_SLOT(slotMode1()), actionCollection(),"mode_1");
-  mode2 = new TDEToggleAction("", "mode2", 0, this, TQT_SLOT(slotMode2()), actionCollection(),"mode_2");
-  mode3 = new TDEToggleAction("", "mode3", 0, this, TQT_SLOT(slotMode3()), actionCollection(),"mode_3");
-  mode4 = new TDEToggleAction("", "mode4", 0, this, TQT_SLOT(slotMode4()), actionCollection(),"mode_4");
-  mode5 = new TDEToggleAction("", "mode5", 0, 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,19 +227,19 @@ void KWordQuizApp::initActions()
   mode4->setToolTip(mode4->whatsThis());
   mode5->setToolTip(mode5->whatsThis());
 
-  quizEditor = new TDEAction(i18n("&Editor"), "editor", "F6", 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", 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", 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", 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());
 
@@ -267,26 +267,26 @@ void KWordQuizApp::initActions()
   quizRepeatErrors->setWhatsThis(i18n("Repeats all incorrectly answered questions"));
   quizRepeatErrors->setToolTip(quizRepeatErrors->whatsThis());
 
-  configNotifications = KStdAction::configureNotifications(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(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(this);
-  connect(charMapper, TQT_SIGNAL(mapped(int)), this, TQT_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") ;
+  connect(charMapper, TQ_SIGNAL(mapped(int)), this, TQ_SLOT(slotInsertChar(int)));
+
+  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 &)), this, TQT_SLOT(slotStatusMsg(const TQString &)));
-  connect(actionCollection(), TQT_SIGNAL(actionHighlighted(TDEAction *, bool)), 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 )), this, TQT_SLOT(slotUndoChange(const TQString&, bool)));
-  connect(m_editView, TQT_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), 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()), this, TQT_SLOT(slotApplyPreferences()));
+  connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotApplyPreferences()));
   dialog->show();
 }
 
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/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/kwordquizview.cpp b/kwordquiz/src/kwordquizview.cpp
index 6d875c87..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;
   }