Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 69e4de2f4cee257151ca13b207dc677b2d958fed)

7 files changed, 85 insertions, 85 deletions

diff --git a/kiten/configdictionaries.cpp b/kiten/configdictionaries.cpp
index c7edcc80..b1f7fcce 100644
--- a/kiten/configdictionaries.cpp
+++ b/kiten/configdictionaries.cpp
@@ -31,10 +31,10 @@ ConfigDictionaries::ConfigDictionaries(TQWidget *parent, const char* name, WFlag
 {
 	changed = false;
 	config = Config::self();
-	connect(delSelEdictButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelSelEdict()));
-	connect(addEdictButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddEdict()));
-	connect(delSelKanjidicButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelSelKanjidic()));
-	connect(addKanjidicButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddKanjidic()));
+	connect(delSelEdictButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotDelSelEdict()));
+	connect(addEdictButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddEdict()));
+	connect(delSelKanjidicButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotDelSelKanjidic()));
+	connect(addKanjidicButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddKanjidic()));
 }
 
 void ConfigDictionaries::updateWidgets()
diff --git a/kiten/kiten.cpp b/kiten/kiten.cpp
index daaee931..781f684b 100644
--- a/kiten/kiten.cpp
+++ b/kiten/kiten.cpp
@@ -55,42 +55,42 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) : TDEMainWindow(parent, n
 	config = Config::self();
 	config->readConfig();
 	Accel = new TDEGlobalAccel(this);
-	(void) Accel->insert("Lookup Kanji (Kanjidic)", i18n("Lookup Kanji (Kanjidic)"), i18n("Gives detailed information about Kanji currently on clipboard."), CTRL + ALT + Key_K, CTRL + ALT + Key_K, this, TQT_SLOT(kanjiSearchAccel()));
-	(void) Accel->insert("Lookup English/Japanese word", i18n("Lookup English/Japanese Word"), i18n("Looks up current text on clipboard in the same way as if you used Kiten's regular search."), CTRL + ALT + Key_S, CTRL + ALT + Key_S, this, TQT_SLOT(searchAccel()));
+	(void) Accel->insert("Lookup Kanji (Kanjidic)", i18n("Lookup Kanji (Kanjidic)"), i18n("Gives detailed information about Kanji currently on clipboard."), CTRL + ALT + Key_K, CTRL + ALT + Key_K, this, TQ_SLOT(kanjiSearchAccel()));
+	(void) Accel->insert("Lookup English/Japanese word", i18n("Lookup English/Japanese Word"), i18n("Looks up current text on clipboard in the same way as if you used Kiten's regular search."), CTRL + ALT + Key_S, CTRL + ALT + Key_S, this, TQ_SLOT(searchAccel()));
 	Accel->readSettings(TDEGlobal::config());
 	Accel->updateConnections();
 
 	_ResultView = new ResultView(true, this, "_ResultView");
 	setCentralWidget(_ResultView);
 
-	(void) KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
-	(void) KStdAction::print(this, TQT_SLOT(print()), actionCollection());
-	(void) KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actionCollection());
-	KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
-	(void) new TDEAction(i18n("&Learn"), "pencil", CTRL+Key_L, this, TQT_SLOT(createLearn()), actionCollection(), "file_learn");
-	(void) new TDEAction(i18n("&Dictionary Editor..."), "edit", 0, this, TQT_SLOT(createEEdit()), actionCollection(), "dict_editor");
-	(void) new TDEAction(i18n("Ra&dical Search..."), "gear", CTRL+Key_R, this, TQT_SLOT(radicalSearch()), actionCollection(), "search_radical");
-	Edit = new EditAction(i18n("Search Edit"), 0, this, TQT_SLOT(search()), actionCollection(), "search_edit");
-	(void) new TDEAction(i18n("&Clear Search Bar"), BarIcon("locationbar_erase", 16), CTRL+Key_N, Edit, TQT_SLOT(clear()), actionCollection(), "clear_search");
-	(void) new TDEAction(i18n("S&earch"), "key_enter", 0, this, TQT_SLOT(search()), actionCollection(), "search");
-	(void) new TDEAction(i18n("Search with &Beginning of Word"), 0, this, TQT_SLOT(searchBeginning()), actionCollection(), "search_beginning");
-	(void) new TDEAction(i18n("Search &Anywhere"), 0, this, TQT_SLOT(searchAnywhere()), actionCollection(), "search_anywhere");
-	(void) new TDEAction(i18n("Stro&kes"), "paintbrush", CTRL+Key_S, this, TQT_SLOT(strokeSearch()), actionCollection(), "search_stroke");
-	(void) new TDEAction(i18n("&Grade"), "format-justify-left", CTRL+Key_G, this, TQT_SLOT(gradeSearch()), actionCollection(), "search_grade");
-	kanjiCB = new TDEToggleAction(i18n("&Kanjidic"), "kanjidic", CTRL+Key_K, this, TQT_SLOT(kanjiDictChange()), actionCollection(), "kanji_toggle");
-	deinfCB = new TDEToggleAction(i18n("&Deinflect Verbs in Regular Search"), 0, this, TQT_SLOT(kanjiDictChange()), actionCollection(), "deinf_toggle");
-	comCB = new TDEToggleAction(i18n("&Filter Rare"), "filter", CTRL+Key_F, this, TQT_SLOT(toggleCom()), actionCollection(), "common");
-	autoSearchToggle = new TDEToggleAction(i18n("&Automatically Search Clipboard Selections"), "edit-find", 0, this, TQT_SLOT(kanjiDictChange()), actionCollection(), "autosearch_toggle");
-	irAction =  new TDEAction(i18n("Search &in Results"), "edit-find", CTRL+Key_I, this, TQT_SLOT(resultSearch()), actionCollection(), "search_in_results");
-	(void) KStdAction::configureToolbars(this, TQT_SLOT(configureToolBars()), actionCollection());
-	addAction = new TDEAction(i18n("Add &Kanji to Learning List"), 0, this, TQT_SLOT(addToList()), actionCollection(), "add");
+	(void) KStdAction::quit(this, TQ_SLOT(close()), actionCollection());
+	(void) KStdAction::print(this, TQ_SLOT(print()), actionCollection());
+	(void) KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actionCollection());
+	KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection());
+	(void) new TDEAction(i18n("&Learn"), "pencil", CTRL+Key_L, this, TQ_SLOT(createLearn()), actionCollection(), "file_learn");
+	(void) new TDEAction(i18n("&Dictionary Editor..."), "edit", 0, this, TQ_SLOT(createEEdit()), actionCollection(), "dict_editor");
+	(void) new TDEAction(i18n("Ra&dical Search..."), "gear", CTRL+Key_R, this, TQ_SLOT(radicalSearch()), actionCollection(), "search_radical");
+	Edit = new EditAction(i18n("Search Edit"), 0, this, TQ_SLOT(search()), actionCollection(), "search_edit");
+	(void) new TDEAction(i18n("&Clear Search Bar"), BarIcon("locationbar_erase", 16), CTRL+Key_N, Edit, TQ_SLOT(clear()), actionCollection(), "clear_search");
+	(void) new TDEAction(i18n("S&earch"), "key_enter", 0, this, TQ_SLOT(search()), actionCollection(), "search");
+	(void) new TDEAction(i18n("Search with &Beginning of Word"), 0, this, TQ_SLOT(searchBeginning()), actionCollection(), "search_beginning");
+	(void) new TDEAction(i18n("Search &Anywhere"), 0, this, TQ_SLOT(searchAnywhere()), actionCollection(), "search_anywhere");
+	(void) new TDEAction(i18n("Stro&kes"), "paintbrush", CTRL+Key_S, this, TQ_SLOT(strokeSearch()), actionCollection(), "search_stroke");
+	(void) new TDEAction(i18n("&Grade"), "format-justify-left", CTRL+Key_G, this, TQ_SLOT(gradeSearch()), actionCollection(), "search_grade");
+	kanjiCB = new TDEToggleAction(i18n("&Kanjidic"), "kanjidic", CTRL+Key_K, this, TQ_SLOT(kanjiDictChange()), actionCollection(), "kanji_toggle");
+	deinfCB = new TDEToggleAction(i18n("&Deinflect Verbs in Regular Search"), 0, this, TQ_SLOT(kanjiDictChange()), actionCollection(), "deinf_toggle");
+	comCB = new TDEToggleAction(i18n("&Filter Rare"), "filter", CTRL+Key_F, this, TQ_SLOT(toggleCom()), actionCollection(), "common");
+	autoSearchToggle = new TDEToggleAction(i18n("&Automatically Search Clipboard Selections"), "edit-find", 0, this, TQ_SLOT(kanjiDictChange()), actionCollection(), "autosearch_toggle");
+	irAction =  new TDEAction(i18n("Search &in Results"), "edit-find", CTRL+Key_I, this, TQ_SLOT(resultSearch()), actionCollection(), "search_in_results");
+	(void) KStdAction::configureToolbars(this, TQ_SLOT(configureToolBars()), actionCollection());
+	addAction = new TDEAction(i18n("Add &Kanji to Learning List"), 0, this, TQ_SLOT(addToList()), actionCollection(), "add");
 	addAction->setEnabled(false);
-	(void) new TDEAction(i18n("Configure &Global Shortcuts..."), "configure_shortcuts", 0, this, TQT_SLOT(configureGlobalKeys()), actionCollection(), "options_configure_keybinding");
+	(void) new TDEAction(i18n("Configure &Global Shortcuts..."), "configure_shortcuts", 0, this, TQ_SLOT(configureGlobalKeys()), actionCollection(), "options_configure_keybinding");
 
 	historyAction = new TDEListAction(i18n("&History"), 0, 0, 0, actionCollection(), "history");
-	connect(historyAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(goInHistory(int)));
-	backAction = KStdAction::back(this, TQT_SLOT(back()), actionCollection());
-	forwardAction = KStdAction::forward(this, TQT_SLOT(forward()), actionCollection());
+	connect(historyAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(goInHistory(int)));
+	backAction = KStdAction::back(this, TQ_SLOT(back()), actionCollection());
+	forwardAction = KStdAction::forward(this, TQ_SLOT(forward()), actionCollection());
 	backAction->setEnabled(false);
 	forwardAction->setEnabled(false);
 	currentResult = resultHistory.end();
@@ -114,10 +114,10 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) : TDEMainWindow(parent, n
 	resize(600, 400);
 	applyMainWindowSettings(TDEGlobal::config(), "TopLevelWindow");
 
-	connect(_ResultView, TQT_SIGNAL(linkClicked(const TQString &)), TQT_SLOT(ressearch(const TQString &)));
-	connect(kapp->clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(autoSearch()));
+	connect(_ResultView, TQ_SIGNAL(linkClicked(const TQString &)), TQ_SLOT(ressearch(const TQString &)));
+	connect(kapp->clipboard(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(autoSearch()));
 
-	TQTimer::singleShot(10, this, TQT_SLOT(finishInit()));
+	TQTimer::singleShot(10, this, TQ_SLOT(finishInit()));
 }
 
 TopLevel::~TopLevel()
@@ -609,9 +609,9 @@ void TopLevel::slotConfigure()
 	
 	//ConfigureDialog didn't find an instance of this dialog, so lets create it :
 	optionDialog = new ConfigureDialog(this, "settings");
-	connect(optionDialog, TQT_SIGNAL(hidden()),this,TQT_SLOT(slotConfigureHide()));
-	connect(optionDialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotConfigurationChanged()));
-	connect(optionDialog, TQT_SIGNAL(valueChanged()), this, TQT_SIGNAL(quizConfChanged()));
+	connect(optionDialog, TQ_SIGNAL(hidden()),this,TQ_SLOT(slotConfigureHide()));
+	connect(optionDialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotConfigurationChanged()));
+	connect(optionDialog, TQ_SIGNAL(valueChanged()), this, TQ_SIGNAL(quizConfChanged()));
 	optionDialog->show();
 
 	return;
@@ -625,7 +625,7 @@ void TopLevel::slotLearnConfigure()
 
 void TopLevel::slotConfigureHide()
 {
-	TQTimer::singleShot(0, this, TQT_SLOT(slotConfigureDestroy()));
+	TQTimer::singleShot(0, this, TQ_SLOT(slotConfigureDestroy()));
 }
 
 void TopLevel::slotConfigureDestroy()
@@ -641,11 +641,11 @@ void TopLevel::createLearn()
 {
 	Learn *_Learn = new Learn(_Asyndeta.retrieveIndex(), 0);
 
-	connect(_Learn, TQT_SIGNAL(destroyed(Learn *)), this, TQT_SLOT(learnDestroyed(Learn *)));
-	connect(_Learn, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(ressearch(const TQString &)));
-	connect(_Learn, TQT_SIGNAL(configureLearn()), this, TQT_SLOT(slotLearnConfigure()));
-	connect(this, TQT_SIGNAL(quizConfChanged()), _Learn, TQT_SLOT(updateQuizConfiguration()));
-	connect(this, TQT_SIGNAL(add(Dict::Entry)), _Learn, TQT_SLOT(add(Dict::Entry)));
+	connect(_Learn, TQ_SIGNAL(destroyed(Learn *)), this, TQ_SLOT(learnDestroyed(Learn *)));
+	connect(_Learn, TQ_SIGNAL(linkClicked(const TQString &)), this, TQ_SLOT(ressearch(const TQString &)));
+	connect(_Learn, TQ_SIGNAL(configureLearn()), this, TQ_SLOT(slotLearnConfigure()));
+	connect(this, TQ_SIGNAL(quizConfChanged()), _Learn, TQ_SLOT(updateQuizConfiguration()));
+	connect(this, TQ_SIGNAL(add(Dict::Entry)), _Learn, TQ_SLOT(add(Dict::Entry)));
 
 	learnList.append(_Learn);
 
@@ -730,7 +730,7 @@ void TopLevel::configureToolBars()
 {
 	saveMainWindowSettings(TDEGlobal::config(), "TopLevelWindow");
 	KEditToolbar dlg(actionCollection(), "kitenui.rc");
-	connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolBarConfig()));
+	connect(&dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(newToolBarConfig()));
 	dlg.exec();
 }
 
@@ -743,7 +743,7 @@ void TopLevel::newToolBarConfig()
 RadWidget *TopLevel::radicalSearch()
 {
 	RadWidget *rw = new RadWidget(&_Rad, 0, "rw");
-	connect(rw, TQT_SIGNAL(set(const TQStringList &, unsigned int, unsigned int)), this, TQT_SLOT(radSearch(const TQStringList &, unsigned int, unsigned int)));
+	connect(rw, TQ_SIGNAL(set(const TQStringList &, unsigned int, unsigned int)), this, TQ_SLOT(radSearch(const TQStringList &, unsigned int, unsigned int)));
 	rw->show();
 	return rw;
 }
diff --git a/kiten/kromajiedit.cpp b/kiten/kromajiedit.cpp
index 6eda1d32..ceaa7a23 100644
--- a/kiten/kromajiedit.cpp
+++ b/kiten/kromajiedit.cpp
@@ -265,7 +265,7 @@ TQPopupMenu *KRomajiEdit::createPopupMenu()
     else if (kana == "hiragana")
 		popup->setItemChecked(1, true);
 
-    connect(popup, TQT_SIGNAL(activated(int)), TQT_SLOT(setKana(int)));
+    connect(popup, TQ_SIGNAL(activated(int)), TQ_SLOT(setKana(int)));
 
     emit aboutToShowContextMenu(popup);
     return popup;
diff --git a/kiten/learn.cpp b/kiten/learn.cpp
index 0d42f89d..c9c58435 100644
--- a/kiten/learn.cpp
+++ b/kiten/learn.cpp
@@ -70,7 +70,7 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name)
 
 	TQVBoxLayout *veryTop = new TQVBoxLayout(dummy, 0, KDialog::spacingHint());
 	Tabs = new TQTabWidget(dummy);
-	connect(Tabs, TQT_SIGNAL(currentChanged(TQWidget *)), TQT_SLOT(tabChanged(TQWidget *)));
+	connect(Tabs, TQ_SIGNAL(currentChanged(TQWidget *)), TQ_SLOT(tabChanged(TQWidget *)));
 	veryTop->addWidget(Tabs);
 
 	listTop = new TQSplitter(Tabs);
@@ -81,7 +81,7 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name)
 
 	View = new ResultView(true, listTop, "View");
 	View->setBasicMode(true);
-	connect(View, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SIGNAL(linkClicked(const TQString &)));
+	connect(View, TQ_SIGNAL(linkClicked(const TQString &)), this, TQ_SIGNAL(linkClicked(const TQString &)));
 
 	List = new TDEListView(listTop);
 
@@ -101,8 +101,8 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name)
 	List->setSorting(4);
 	List->setSelectionModeExt(TDEListView::Extended);
 
-	connect(List, TQT_SIGNAL(executed(TQListViewItem *)), TQT_SLOT(showKanji(TQListViewItem *)));
-	connect(List, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(itemSelectionChanged()));
+	connect(List, TQ_SIGNAL(executed(TQListViewItem *)), TQ_SLOT(showKanji(TQListViewItem *)));
+	connect(List, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(itemSelectionChanged()));
 
 	TQStringList grades(i18n("Grade 1"));
 	grades.append(i18n("Grade 2"));
@@ -113,25 +113,25 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name)
 	grades.append(i18n("Others in Jouyou"));
 	grades.append(i18n("Jinmeiyou"));
 
-	/*TDEAction *closeAction = */(void) KStdAction::close(this, TQT_SLOT(close()), actionCollection());
-	printAct = KStdAction::print(this, TQT_SLOT(print()), actionCollection());
-	forwardAct = KStdAction::forward(this, TQT_SLOT(next()), actionCollection());
+	/*TDEAction *closeAction = */(void) KStdAction::close(this, TQ_SLOT(close()), actionCollection());
+	printAct = KStdAction::print(this, TQ_SLOT(print()), actionCollection());
+	forwardAct = KStdAction::forward(this, TQ_SLOT(next()), actionCollection());
 	forwardAct->plug(toolBar());
-	backAct = KStdAction::back(this, TQT_SLOT(prev()), actionCollection());
+	backAct = KStdAction::back(this, TQ_SLOT(prev()), actionCollection());
 	backAct->plug(toolBar());
-	cheatAct = new TDEAction(i18n("&Cheat"), CTRL + Key_C, this, TQT_SLOT(cheat()), actionCollection(), "cheat");
-	randomAct = new TDEAction(i18n("&Random"), "goto", CTRL + Key_R, this, TQT_SLOT(random()), actionCollection(), "random");
+	cheatAct = new TDEAction(i18n("&Cheat"), CTRL + Key_C, this, TQ_SLOT(cheat()), actionCollection(), "cheat");
+	randomAct = new TDEAction(i18n("&Random"), "goto", CTRL + Key_R, this, TQ_SLOT(random()), actionCollection(), "random");
 	gradeAct = new TDEListAction(i18n("Grade"), 0, 0, 0, actionCollection(), "grade");
 	gradeAct->setItems(grades);
-	connect(gradeAct, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(updateGrade()));
-	removeAct = new TDEAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, this, TQT_SLOT(del()), actionCollection(), "del");
-	addAct = new TDEAction(i18n("&Add"), "edit_add", CTRL + Key_A, this, TQT_SLOT(add()), actionCollection(), "add");
-	addAllAct = new TDEAction(i18n("Add A&ll"), 0, this, TQT_SLOT(addAll()), actionCollection(), "addall");
-	newAct = KStdAction::openNew(this, TQT_SLOT(openNew()), actionCollection());
-	openAct = KStdAction::open(this, TQT_SLOT(open()), actionCollection());
-	saveAct = KStdAction::save(this, TQT_SLOT(save()), actionCollection());
-	saveAsAct = KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection());
-	(void) KStdAction::preferences(this, TQT_SIGNAL(configureLearn()), actionCollection());
+	connect(gradeAct, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(updateGrade()));
+	removeAct = new TDEAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, this, TQ_SLOT(del()), actionCollection(), "del");
+	addAct = new TDEAction(i18n("&Add"), "edit_add", CTRL + Key_A, this, TQ_SLOT(add()), actionCollection(), "add");
+	addAllAct = new TDEAction(i18n("Add A&ll"), 0, this, TQ_SLOT(addAll()), actionCollection(), "addall");
+	newAct = KStdAction::openNew(this, TQ_SLOT(openNew()), actionCollection());
+	openAct = KStdAction::open(this, TQ_SLOT(open()), actionCollection());
+	saveAct = KStdAction::save(this, TQ_SLOT(save()), actionCollection());
+	saveAsAct = KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection());
+	(void) KStdAction::preferences(this, TQ_SIGNAL(configureLearn()), actionCollection());
 
 	removeAct->setEnabled(false);
 
@@ -140,7 +140,7 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name)
 	quizLayout->addStretch();
 	TQHBoxLayout *hlayout = new TQHBoxLayout(quizLayout);
 	qKanji = new TQPushButton(quizTop);
-	connect(qKanji, TQT_SIGNAL(clicked()), this, TQT_SLOT(qKanjiClicked()));
+	connect(qKanji, TQ_SIGNAL(clicked()), this, TQ_SLOT(qKanjiClicked()));
 	hlayout->addStretch();
 	hlayout->addWidget(qKanji);
 	hlayout->addStretch();
@@ -151,7 +151,7 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name)
 		answers->insert(new KPushButton(answers), i);
 	quizLayout->addWidget(answers);
 	quizLayout->addStretch();
-	connect(answers, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(answerClicked(int)));
+	connect(answers, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(answerClicked(int)));
 
 	createGUI("learnui.rc");
 	//closeAction->plug(toolBar());
@@ -164,7 +164,7 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name)
 	nogood = false;
 
 	// this is so learn doesn't take so long to show itself
-	TQTimer::singleShot(200, this, TQT_SLOT(finishCtor()));
+	TQTimer::singleShot(200, this, TQ_SLOT(finishCtor()));
 }
 
 void Learn::finishCtor()
diff --git a/kiten/optiondialog.cpp b/kiten/optiondialog.cpp
index 0a3fba44..b9cc258d 100644
--- a/kiten/optiondialog.cpp
+++ b/kiten/optiondialog.cpp
@@ -43,7 +43,7 @@
 ConfigureDialog::ConfigureDialog(TQWidget *parent, const char *name) : TDEConfigDialog(parent, name, Config::self())
 {
 	configDic = new ConfigDictionaries(0, "dictionaries_page");
-	connect(configDic, TQT_SIGNAL(widgetChanged()), this, TQT_SLOT(updateButtons()));
+	connect(configDic, TQ_SIGNAL(widgetChanged()), this, TQ_SLOT(updateButtons()));
 	addPage(configDic, i18n("Dictionaries"), "contents");
 	addPage(new ConfigSearching(0, "searching_page"), i18n("Searching"), "edit-find");
 	addPage(new ConfigLearn(0, "learn_page"), i18n("Learn"), "pencil");
diff --git a/kiten/rad.cpp b/kiten/rad.cpp
index a39ea152..a77afd16 100644
--- a/kiten/rad.cpp
+++ b/kiten/rad.cpp
@@ -244,12 +244,12 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p
 
 		hotlistGroup->insert(new KPushButton(*hotlist.at(i), hotlistGroup), i);
 	}
-	connect(hotlistGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(hotlistClicked(int)));
+	connect(hotlistGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(hotlistClicked(int)));
 
 	TQVBoxLayout *layout = new TQVBoxLayout(vlayout, KDialog::spacingHint());
 
 	totalStrokes = new TQCheckBox(i18n("Search by total strokes"), this);
-	connect(totalStrokes, TQT_SIGNAL(clicked()), this, TQT_SLOT(totalClicked()));
+	connect(totalStrokes, TQ_SIGNAL(clicked()), this, TQ_SLOT(totalClicked()));
 	layout->addWidget(totalStrokes);
 
 	TQHBoxLayout *strokesLayout = new TQHBoxLayout(layout, KDialog::spacingHint());
@@ -263,11 +263,11 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p
 
 	ok = new KPushButton(i18n("&Look Up"), this);
 	ok->setEnabled(false);
-	connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(apply()));
+	connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(apply()));
 	layout->addWidget(ok);
 	cancel = new KPushButton( KStdGuiItem::cancel(), this );
 
-	connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(close()));
+	connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(close()));
 	layout->addWidget(cancel);
 
 	TQVBoxLayout *middlevLayout = new TQVBoxLayout(hlayout, KDialog::spacingHint());
@@ -278,22 +278,22 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p
 
 	List = new TDEListBox(this);
 	middlevLayout->addWidget(List);
-	connect(List, TQT_SIGNAL(executed(TQListBoxItem *)), this, TQT_SLOT(executed(TQListBoxItem *)));
-	connect(strokesSpin, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateList(int)));
+	connect(List, TQ_SIGNAL(executed(TQListBoxItem *)), this, TQ_SLOT(executed(TQListBoxItem *)));
+	connect(strokesSpin, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateList(int)));
 
 	TQVBoxLayout *rightvlayout = new TQVBoxLayout(hlayout, KDialog::spacingHint());
 	selectedList = new TDEListBox(this);
 	rightvlayout->addWidget(selectedList);
-	connect(selectedList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged()));
+	connect(selectedList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(selectionChanged()));
 
 	remove = new KPushButton(i18n("&Remove"), this);
 	rightvlayout->addWidget(remove);
-	connect(remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeSelected()));
+	connect(remove, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeSelected()));
 	remove->setEnabled(false);
 
 	clear = new KPushButton(KStdGuiItem::clear(), this);
 	rightvlayout->addWidget(clear);
-	connect(clear, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearSelected()));
+	connect(clear, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearSelected()));
 	clear->setEnabled(false);
 
 	setCaption(kapp->makeStdCaption(i18n("Radical Selector")));
diff --git a/kiten/widgets.cpp b/kiten/widgets.cpp
index 8c1d6ade..bbfbab6f 100644
--- a/kiten/widgets.cpp
+++ b/kiten/widgets.cpp
@@ -317,11 +317,11 @@ eEdit::eEdit(const TQString &_filename, TQWidget *parent, const char *name)
 	List->setMultiSelection(true);
 	List->setDragEnabled(true);
 
-	saveAct = KStdAction::save(this, TQT_SLOT(save()), actionCollection());
-	removeAct = new TDEAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, this, TQT_SLOT(del()), actionCollection(), "del");
-	(void) new TDEAction(i18n("&Disable Dictionary"), 0, this, TQT_SLOT(disable()), actionCollection(), "disable");
-	addAct = new TDEAction(i18n("&Add"), "edit_add", CTRL + Key_A, this, TQT_SLOT(add()), actionCollection(), "add");
-	(void) KStdAction::close(this, TQT_SLOT(close()), actionCollection());
+	saveAct = KStdAction::save(this, TQ_SLOT(save()), actionCollection());
+	removeAct = new TDEAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, this, TQ_SLOT(del()), actionCollection(), "del");
+	(void) new TDEAction(i18n("&Disable Dictionary"), 0, this, TQ_SLOT(disable()), actionCollection(), "disable");
+	addAct = new TDEAction(i18n("&Add"), "edit_add", CTRL + Key_A, this, TQ_SLOT(add()), actionCollection(), "add");
+	(void) KStdAction::close(this, TQ_SLOT(close()), actionCollection());
 
 	createGUI("eeditui.rc");
 	//closeAction->plug(toolBar());
@@ -458,11 +458,11 @@ int EditAction::plug( TQWidget *w, int index )
 
 	KRomajiEdit *comboBox = new KRomajiEdit(toolBar, "search edit");
 	toolBar->insertWidget( id, 70, comboBox, index );
-	connect( comboBox, TQT_SIGNAL( returnPressed()), m_receiver, m_member );
+	connect( comboBox, TQ_SIGNAL( returnPressed()), m_receiver, m_member );
 
 	addContainer(toolBar, id);
 
-	connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+	connect( toolBar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
 	toolBar->setItemAutoSized( id, true );