Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

1 files changed, 22 insertions, 22 deletions

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()