Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

4 files changed, 28 insertions, 28 deletions

diff --git a/klatin/klatin/klatin.cpp b/klatin/klatin/klatin.cpp
index f226b69d..3375603d 100644
--- a/klatin/klatin/klatin.cpp
+++ b/klatin/klatin/klatin.cpp
@@ -53,12 +53,12 @@ KLatin::~KLatin()
 void KLatin::setupActions()
 {
 	// Setup various menu actions
-	KStdAction::preferences(this, TQT_SLOT(loadSettings()), actionCollection());
-	m_loadVocab = new TDEAction(i18n("Load &Vocabulary"), 0, this, TQT_SLOT(loadVocab()),  actionCollection(), "go_vocab");
-	m_loadGrammar = new TDEAction(i18n("Load &Grammar"), 0, this, TQT_SLOT(loadGrammar()),  actionCollection(), "go_grammar");
-	m_loadVerbs = new TDEAction(i18n("Load V&erbs"), 0, this, TQT_SLOT(loadVerbs()),  actionCollection(), "go_verbs");
-	m_loadRevision = new TDEAction(i18n("Load &Revision"), 0, this, TQT_SLOT(loadRevision()),  actionCollection(), "go_revision");
-	KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
+	KStdAction::preferences(this, TQ_SLOT(loadSettings()), actionCollection());
+	m_loadVocab = new TDEAction(i18n("Load &Vocabulary"), 0, this, TQ_SLOT(loadVocab()),  actionCollection(), "go_vocab");
+	m_loadGrammar = new TDEAction(i18n("Load &Grammar"), 0, this, TQ_SLOT(loadGrammar()),  actionCollection(), "go_grammar");
+	m_loadVerbs = new TDEAction(i18n("Load V&erbs"), 0, this, TQ_SLOT(loadVerbs()),  actionCollection(), "go_verbs");
+	m_loadRevision = new TDEAction(i18n("Load &Revision"), 0, this, TQ_SLOT(loadRevision()),  actionCollection(), "go_revision");
+	KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
 }
 
 void KLatin::startClicked()
@@ -91,7 +91,7 @@ void KLatin::loadVocab()
 	
 	// When the child emits the signal exitted(),
 	// then reset the GUI to go back to the menu
-	connect(klatinvocabsection, TQT_SIGNAL(exited()), this, TQT_SLOT(resetGUI()));
+	connect(klatinvocabsection, TQ_SIGNAL(exited()), this, TQ_SLOT(resetGUI()));
 
 	// Set the section variable
 	m_section = 1;
@@ -114,8 +114,8 @@ void KLatin::loadGrammar()
 
 	// When the child emits the signal exited(),
 	// then reset the GUI to go back to the menu
-	connect(klatingrammarsection, TQT_SIGNAL(exited()), this, TQT_SLOT(resetGUI()));
-	connect(klatingrammarsection, TQT_SIGNAL(statusMsg(const TQString&)), this, TQT_SLOT(slotWriteMsg(const TQString&)));
+	connect(klatingrammarsection, TQ_SIGNAL(exited()), this, TQ_SLOT(resetGUI()));
+	connect(klatingrammarsection, TQ_SIGNAL(statusMsg(const TQString&)), this, TQ_SLOT(slotWriteMsg(const TQString&)));
 	// Set the section variable
 	m_section = 2;
 }
@@ -142,8 +142,8 @@ void KLatin::loadVerbs()
 
 	// When the child emits the signal exited(),
 	// then reset the GUI to go back to the menu
-	connect(klatinverbssection, TQT_SIGNAL(exited()), this, TQT_SLOT(resetGUI()));
-	connect(klatinverbssection, TQT_SIGNAL(statusMsg(const TQString&)), this, TQT_SLOT(slotWriteMsg(const TQString&)));
+	connect(klatinverbssection, TQ_SIGNAL(exited()), this, TQ_SLOT(resetGUI()));
+	connect(klatinverbssection, TQ_SIGNAL(statusMsg(const TQString&)), this, TQ_SLOT(slotWriteMsg(const TQString&)));
 
 	// Set the section variable
 	m_section = 3;
@@ -166,7 +166,7 @@ void KLatin::loadSettings()
 	vocabPage->kcfg_DefaultFile->setFilter("*.kvtml");
 	vocabPage->kcfg_DefaultFile->setCaption(i18n("Load Vocabulary File"));
 	dialog->addPage(vocabPage, i18n("Vocabulary"), "kdict"); 
-	connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChanged())); 
+	connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(settingsChanged())); 
 	dialog->show();
 }
 
@@ -189,9 +189,9 @@ void KLatin::resetGUI()
 	setCentralWidget(klatinchoose);
 
 	// Connect the "Start" button to slot StartPressed()
-	connect(klatinchoose->StartButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(startClicked()));
+	connect(klatinchoose->StartButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(startClicked()));
 	// Make the quit button quit the application :)
-	connect(klatinchoose->QuitButton, TQT_SIGNAL(clicked()), kapp, TQT_SLOT(quit()));
+	connect(klatinchoose->QuitButton, TQ_SIGNAL(clicked()), kapp, TQ_SLOT(quit()));
 	
 	// Enable all the menu entries under Section/
 	updateSection(TRUE);
diff --git a/klatin/klatin/klatingrammar.cpp b/klatin/klatin/klatingrammar.cpp
index e4f3f2a5..c9a67814 100644
--- a/klatin/klatin/klatingrammar.cpp
+++ b/klatin/klatin/klatingrammar.cpp
@@ -42,10 +42,10 @@ KLatinGrammar::KLatinGrammar(TQWidget* parent, const char *name)
 	BackButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("back", TDEIcon::Small));
 
 	// Set connections
-	connect(BackButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(goBack()));
-	connect(OKButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAnswer()));
-	connect(AnswerBox, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(checkAnswer()));
-	connect(ChooseSection, TQT_SIGNAL(activated(int)), this, TQT_SLOT(loadDatabase()));
+	connect(BackButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(goBack()));
+	connect(OKButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAnswer()));
+	connect(AnswerBox, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(checkAnswer()));
+	connect(ChooseSection, TQ_SIGNAL(activated(int)), this, TQ_SLOT(loadDatabase()));
 
 	// Insert the various declensions
 	ChooseSection->insertItem(i18n("All Declensions"));
diff --git a/klatin/klatin/klatinverbs.cpp b/klatin/klatin/klatinverbs.cpp
index 64dd13fa..f1a3880d 100644
--- a/klatin/klatin/klatinverbs.cpp
+++ b/klatin/klatin/klatinverbs.cpp
@@ -81,11 +81,11 @@ KLatinVerbs::KLatinVerbs(TQWidget* parent, const char *name)
 	question.tense.push_back(I18N_NOOP("pluperfect"));
 	question.tense.push_back(I18N_NOOP("future perfect"));
 	
-	connect(ChooseConjugation, TQT_SIGNAL(activated(int)), this, TQT_SLOT(conjugationActivated(int)));
-	connect(BackButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(goBack()));
-	connect(ChangeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadDatabase()));
-	connect(AnswerBox, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(checkAnswer()));
-	connect(OKButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAnswer()));
+	connect(ChooseConjugation, TQ_SIGNAL(activated(int)), this, TQ_SLOT(conjugationActivated(int)));
+	connect(BackButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(goBack()));
+	connect(ChangeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(loadDatabase()));
+	connect(AnswerBox, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(checkAnswer()));
+	connect(OKButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAnswer()));
 
 	loadDatabase();
 
diff --git a/klatin/klatin/klatinvocab.cpp b/klatin/klatin/klatinvocab.cpp
index 6d04bcef..8181d7af 100644
--- a/klatin/klatin/klatinvocab.cpp
+++ b/klatin/klatin/klatinvocab.cpp
@@ -40,7 +40,7 @@ KLatinVocab::KLatinVocab(TQWidget* parent, const char *name)
 	m_vocabFile = TQString();
 	
 	// Goes back to the last dialog
-	connect(BackButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(goBack()));
+	connect(BackButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(goBack()));
 
 	// Set default settings
 	m_numberOfQuestions = Settings::numOfQuestions();
@@ -53,10 +53,10 @@ KLatinVocab::KLatinVocab(TQWidget* parent, const char *name)
 	parseVocab();
 
 	// Connect the multiple choice buttons to the various slots
-	connect(Answer1, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAnswerOne()));
-	connect(Answer2, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAnswerTwo()));
-	connect(Answer3, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAnswerThree()));
-	connect(Answer4, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAnswerFour()));
+	connect(Answer1, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAnswerOne()));
+	connect(Answer2, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAnswerTwo()));
+	connect(Answer3, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAnswerThree()));
+	connect(Answer4, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAnswerFour()));
 }
 
 KLatinVocab::~KLatinVocab()