Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1157642 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

9 files changed, 99 insertions, 99 deletions

diff --git a/klatin/klatin/keduvocdata.h b/klatin/klatin/keduvocdata.h
index eede664a..22ce39e1 100644
--- a/klatin/klatin/keduvocdata.h
+++ b/klatin/klatin/keduvocdata.h
@@ -19,31 +19,31 @@
 #ifndef KEDUVOCDATA_H
 #define KEDUVOCDATA_H
 
-#include <qdom.h>
+#include <tqdom.h>
 
 class KEduVocDataItem
 {
 public:
     KEduVocDataItem();
-    KEduVocDataItem(QDomElement &entry);
+    KEduVocDataItem(TQDomElement &entry);
     virtual ~KEduVocDataItem();
 
-    QString originalText() const;
-    QString translatedText() const;
+    TQString originalText() const;
+    TQString translatedText() const;
 
 protected:
-    QString getText(const QString &tagName) const;
+    TQString getText(const TQString &tagName) const;
 
 private:
-    QDomElement domElement;
+    TQDomElement domElement;
 };
 
-typedef QValueList<KEduVocDataItem> KEduVocDataItemList;
+typedef TQValueList<KEduVocDataItem> KEduVocDataItemList;
 
 class KEduVocData
 {
 public:
-    static KEduVocDataItemList parse(const QString &fileName);
+    static KEduVocDataItemList parse(const TQString &fileName);
 };
 
 #endif // KEDUVOCDATA_H
diff --git a/klatin/klatin/klatin.cpp b/klatin/klatin/klatin.cpp
index 118c89a1..09a8a426 100644
--- a/klatin/klatin/klatin.cpp
+++ b/klatin/klatin/klatin.cpp
@@ -13,7 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qradiobutton.h>
+#include <tqradiobutton.h>
 
 #include <kapplication.h>
 #include <kconfigdialog.h>
@@ -32,7 +32,7 @@
 #include "klatin.h"
 #include "settings.h"
 
-KLatin::KLatin(QWidget* parent, const char *name)
+KLatin::KLatin(TQWidget* parent, const char *name)
 	: KMainWindow(parent, name)
 {
 	m_section = 0;
@@ -53,12 +53,12 @@ KLatin::~KLatin()
 void KLatin::setupActions()
 {
 	// Setup various menu actions
-	KStdAction::preferences(this, SLOT(loadSettings()), actionCollection());
-	m_loadVocab = new KAction(i18n("Load &Vocabulary"), 0, this, SLOT(loadVocab()),  actionCollection(), "go_vocab");
-	m_loadGrammar = new KAction(i18n("Load &Grammar"), 0, this, SLOT(loadGrammar()),  actionCollection(), "go_grammar");
-	m_loadVerbs = new KAction(i18n("Load V&erbs"), 0, this, SLOT(loadVerbs()),  actionCollection(), "go_verbs");
-	m_loadRevision = new KAction(i18n("Load &Revision"), 0, this, SLOT(loadRevision()),  actionCollection(), "go_revision");
-	KStdAction::quit(kapp, SLOT(quit()), actionCollection());
+	KStdAction::preferences(this, TQT_SLOT(loadSettings()), actionCollection());
+	m_loadVocab = new KAction(i18n("Load &Vocabulary"), 0, this, TQT_SLOT(loadVocab()),  actionCollection(), "go_vocab");
+	m_loadGrammar = new KAction(i18n("Load &Grammar"), 0, this, TQT_SLOT(loadGrammar()),  actionCollection(), "go_grammar");
+	m_loadVerbs = new KAction(i18n("Load V&erbs"), 0, this, TQT_SLOT(loadVerbs()),  actionCollection(), "go_verbs");
+	m_loadRevision = new KAction(i18n("Load &Revision"), 0, this, TQT_SLOT(loadRevision()),  actionCollection(), "go_revision");
+	KStdAction::quit(kapp, TQT_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, SIGNAL(exited()), this, SLOT(resetGUI()));
+	connect(klatinvocabsection, TQT_SIGNAL(exited()), this, TQT_SLOT(resetGUI()));
 
 	// Set the section variable
 	m_section = 1;
@@ -114,13 +114,13 @@ void KLatin::loadGrammar()
 
 	// When the child emits the signal exited(),
 	// then reset the GUI to go back to the menu
-	connect(klatingrammarsection, SIGNAL(exited()), this, SLOT(resetGUI()));
-	connect(klatingrammarsection, SIGNAL(statusMsg(const QString&)), this, SLOT(slotWriteMsg(const QString&)));
+	connect(klatingrammarsection, TQT_SIGNAL(exited()), this, TQT_SLOT(resetGUI()));
+	connect(klatingrammarsection, TQT_SIGNAL(statusMsg(const TQString&)), this, TQT_SLOT(slotWriteMsg(const TQString&)));
 	// Set the section variable
 	m_section = 2;
 }
 
-void KLatin::slotWriteMsg(const QString& message)
+void KLatin::slotWriteMsg(const TQString& message)
 {
 	statusBar()->message(message);
 }
@@ -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, SIGNAL(exited()), this, SLOT(resetGUI()));
-	connect(klatinverbssection, SIGNAL(statusMsg(const QString&)), this, SLOT(slotWriteMsg(const QString&)));
+	connect(klatinverbssection, TQT_SIGNAL(exited()), this, TQT_SLOT(resetGUI()));
+	connect(klatinverbssection, TQT_SIGNAL(statusMsg(const TQString&)), this, TQT_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, SIGNAL(settingsChanged()), this, SLOT(settingsChanged())); 
+	connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChanged())); 
 	dialog->show();
 }
 
@@ -189,9 +189,9 @@ void KLatin::resetGUI()
 	setCentralWidget(klatinchoose);
 
 	// Connect the "Start" button to slot StartPressed()
-	connect(klatinchoose->StartButton, SIGNAL(clicked()), this, SLOT(startClicked()));
+	connect(klatinchoose->StartButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(startClicked()));
 	// Make the quit button quit the application :)
-	connect(klatinchoose->QuitButton, SIGNAL(clicked()), kapp, SLOT(quit()));
+	connect(klatinchoose->QuitButton, TQT_SIGNAL(clicked()), kapp, TQT_SLOT(quit()));
 	
 	// Enable all the menu entries under Section/
 	updateSection(TRUE);
diff --git a/klatin/klatin/klatin.h b/klatin/klatin/klatin.h
index 8adb2cbe..91db4488 100644
--- a/klatin/klatin/klatin.h
+++ b/klatin/klatin/klatin.h
@@ -37,7 +37,7 @@ class KLatin : public KMainWindow
 {
 	Q_OBJECT
 public:
-	KLatin(QWidget* parent=0, const char *name=0);
+	KLatin(TQWidget* parent=0, const char *name=0);
 	~KLatin();
 
 	void setupActions();
@@ -63,7 +63,7 @@ private slots:
 	/// Slot for when settings are changed in the KConfig XT dialog
 	void settingsChanged();
 	
-	void slotWriteMsg(const QString&);
+	void slotWriteMsg(const TQString&);
 	
 private:
 
diff --git a/klatin/klatin/klatingrammar.cpp b/klatin/klatin/klatingrammar.cpp
index f320fd5b..0598547f 100644
--- a/klatin/klatin/klatingrammar.cpp
+++ b/klatin/klatin/klatingrammar.cpp
@@ -13,8 +13,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qfile.h>
-#include <qlabel.h>
+#include <tqfile.h>
+#include <tqlabel.h>
 
 #include <kapplication.h>
 #include <kcombobox.h>
@@ -30,7 +30,7 @@
 
 #include "klatingrammar.h"
 
-KLatinGrammar::KLatinGrammar(QWidget* parent, const char *name)
+KLatinGrammar::KLatinGrammar(TQWidget* parent, const char *name)
 	: KLatinGrammarWidget(parent, name)
 {
 	// Set defaults
@@ -42,10 +42,10 @@ KLatinGrammar::KLatinGrammar(QWidget* parent, const char *name)
 	BackButton->setIconSet(KGlobal::iconLoader()->loadIconSet("back", KIcon::Small));
 
 	// Set connections
-	connect(BackButton, SIGNAL(clicked()), this, SLOT(goBack()));
-	connect(OKButton, SIGNAL(clicked()), this, SLOT(checkAnswer()));
-	connect(AnswerBox, SIGNAL(returnPressed()), this, SLOT(checkAnswer()));
-	connect(ChooseSection, SIGNAL(activated(int)), this, SLOT(loadDatabase()));
+	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()));
 
 	// Insert the various declensions
 	ChooseSection->insertItem(i18n("All Declensions"));
@@ -83,7 +83,7 @@ void KLatinGrammar::loadDatabase()
 	}
 
 	// Various files that are used for each declension
-	QString file = "klatin/data/grammar/";
+	TQString file = "klatin/data/grammar/";
 	switch (curitem) {
 		case 0:
 			file += "puella.klat";
@@ -115,7 +115,7 @@ void KLatinGrammar::loadDatabase()
 
 	// Check whether the file actually exists
 	// If not - warn user.
-	if (QFile::exists(locate("data", file)) == FALSE) {
+	if (TQFile::exists(locate("data", file)) == FALSE) {
 		KMessageBox::error(this, i18n("Could not load grammar-definition file, check KLatin installation."), i18n("Error with KLatin"));
 		QuestionLabel->setText(i18n("Error."));
 		return;
@@ -148,7 +148,7 @@ void KLatinGrammar::nextQuestion()
 
 	m_grammarNumber = (random() % 12) + 1;
 
-	QString questionString;
+	TQString questionString;
 	
 	// Question string...
 	switch (m_grammarNumber) {
@@ -237,7 +237,7 @@ void KLatinGrammar::updateScores()
 	Score2Label->setNum(m_total);
 
 	// Set percentage
-	PercentageLabel->setText(QString::number(int(double(m_totalCorrect) / m_total * 100))+QString("%"));
+	PercentageLabel->setText(TQString::number(int(double(m_totalCorrect) / m_total * 100))+TQString("%"));
 }
 
 #include "klatingrammar.moc"
diff --git a/klatin/klatin/klatingrammar.h b/klatin/klatin/klatingrammar.h
index 5c00d6b7..c36a3612 100644
--- a/klatin/klatin/klatingrammar.h
+++ b/klatin/klatin/klatingrammar.h
@@ -28,7 +28,7 @@ class KLatinGrammar : public KLatinGrammarWidget
 {
 	Q_OBJECT
 public:
-	KLatinGrammar(QWidget* parent=0, const char *name=0);
+	KLatinGrammar(TQWidget* parent=0, const char *name=0);
 	~KLatinGrammar();
 
 	/// Load next question
@@ -45,10 +45,10 @@ public slots:
 signals:
 	/// Signal that is emitted when the widget is closed
 	void exited();
-	void statusMsg(const QString&);
+	void statusMsg(const TQString&);
 private:
 	/// Array that holds the 12 cases of a noun
-	QString m_noun[12];
+	TQString m_noun[12];
 	/// The case of the noun being tested
 	int m_grammarNumber;
 	/// Total number of questions attempted that are wrong
diff --git a/klatin/klatin/klatinverbs.cpp b/klatin/klatin/klatinverbs.cpp
index 8b6f956c..70d42ed8 100644
--- a/klatin/klatin/klatinverbs.cpp
+++ b/klatin/klatin/klatinverbs.cpp
@@ -13,8 +13,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qfile.h>
-#include <qlabel.h>
+#include <tqfile.h>
+#include <tqlabel.h>
 
 #include <kapplication.h>
 #include <kcombobox.h>
@@ -30,7 +30,7 @@
 
 #include "klatinverbs.h"
 
-KLatinVerbs::KLatinVerbs(QWidget* parent, const char *name)
+KLatinVerbs::KLatinVerbs(TQWidget* parent, const char *name)
 	: KLatinVerbsWidget(parent, name)
 {
 	OKButton->setIconSet(KGlobal::iconLoader()->loadIconSet("button_ok", KIcon::Small));
@@ -81,11 +81,11 @@ KLatinVerbs::KLatinVerbs(QWidget* parent, const char *name)
 	question.tense.push_back(I18N_NOOP("pluperfect"));
 	question.tense.push_back(I18N_NOOP("future perfect"));
 	
-	connect(ChooseConjugation, SIGNAL(activated(int)), this, SLOT(conjugationActivated(int)));
-	connect(BackButton, SIGNAL(clicked()), this, SLOT(goBack()));
-	connect(ChangeButton, SIGNAL(clicked()), this, SLOT(loadDatabase()));
-	connect(AnswerBox, SIGNAL(returnPressed()), this, SLOT(checkAnswer()));
-	connect(OKButton, SIGNAL(clicked()), this, SLOT(checkAnswer()));
+	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()));
 
 	loadDatabase();
 
@@ -98,14 +98,14 @@ KLatinVerbs::~KLatinVerbs()
 
 void KLatinVerbs::loadDatabase()
 {
-	QString databaseFile = verbparts.declension[ChooseConjugation->currentItem()];
+	TQString databaseFile = verbparts.declension[ChooseConjugation->currentItem()];
 	m_currentVerb = databaseFile;
-	databaseFile += "-" + QString(verbparts.mood[ChooseMood->currentItem()]);
-	databaseFile += "-" + QString(verbparts.voice[ChooseVoice->currentItem()]) + ".klat";
+	databaseFile += "-" + TQString(verbparts.mood[ChooseMood->currentItem()]);
+	databaseFile += "-" + TQString(verbparts.voice[ChooseVoice->currentItem()]) + ".klat";
 	
-	QString fileName = "klatin/data/verbs/" + databaseFile;
+	TQString fileName = "klatin/data/verbs/" + databaseFile;
 
-	if (QFile::exists(locate("data", fileName)) == FALSE) {
+	if (TQFile::exists(locate("data", fileName)) == FALSE) {
 		KMessageBox::error(this, i18n("Could not load verb-definition file, check KLatin installation."), i18n("Error with KLatin"));
 		goBack();
 	}
@@ -134,7 +134,7 @@ void KLatinVerbs::nextQuestion()
 	if (ChooseMood->currentText() == i18n("Subjunctive"))
 		m_verbNumber = (random() % 23) + 1;
 
-	QString QuestionString;
+	TQString QuestionString;
 
 	int person = 0, number = 0, tense = 0;
 	
@@ -260,7 +260,7 @@ void KLatinVerbs::updateScores()
 	Score2Label->setNum(m_total);
 
 	// Set percentage
-	PercentageLabel->setText(QString::number(int(double(m_totalCorrect) / m_total * 100))+QString("%"));
+	PercentageLabel->setText(TQString::number(int(double(m_totalCorrect) / m_total * 100))+TQString("%"));
 }
 
 void KLatinVerbs::goBack()
diff --git a/klatin/klatin/klatinverbs.h b/klatin/klatin/klatinverbs.h
index b389102e..03b5b649 100644
--- a/klatin/klatin/klatinverbs.h
+++ b/klatin/klatin/klatinverbs.h
@@ -26,7 +26,7 @@
 #include "klatinverbswidget.h"
 
 struct fileparts {
-	std::vector<QString> declension;
+	std::vector<TQString> declension;
 	std::vector<const char*> mood;
 	std::vector<const char*> voice;
 };
@@ -42,7 +42,7 @@ class KLatinVerbs : public KLatinVerbsWidget
 {
 	Q_OBJECT
 public:
-	KLatinVerbs(QWidget* parent=0, const char *name=0);
+	KLatinVerbs(TQWidget* parent=0, const char *name=0);
 	~KLatinVerbs();
 
 	/// Load next question
@@ -62,14 +62,14 @@ public slots:
 signals:
 	/// Signal that is emitted when the widget wishes to terminate
 	void exited();
-	void statusMsg(const QString&);
+	void statusMsg(const TQString&);
 private:
 	/// These are structs containing information required to generate a question
 	struct fileparts verbparts;
 	struct questionparts question;
 	/// String array for the various verbs
-	QString m_verb[36];
-	QString m_currentVerb;
+	TQString m_verb[36];
+	TQString m_currentVerb;
 	/// Number to reference the verb form given
 	int m_verbNumber;
 	/// Total number of wrong answers given
diff --git a/klatin/klatin/klatinvocab.cpp b/klatin/klatin/klatinvocab.cpp
index 27c2481c..b1b10ccf 100644
--- a/klatin/klatin/klatinvocab.cpp
+++ b/klatin/klatin/klatinvocab.cpp
@@ -13,9 +13,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qdir.h>
-#include <qlabel.h>
-#include <qlistview.h>
+#include <tqdir.h>
+#include <tqlabel.h>
+#include <tqlistview.h>
 
 #include <kapplication.h>
 #include <kcombobox.h>
@@ -32,15 +32,15 @@
 #include "klatinvocab.h"
 #include "settings.h"
 
-KLatinVocab::KLatinVocab(QWidget* parent, const char *name)
+KLatinVocab::KLatinVocab(TQWidget* parent, const char *name)
 	: KLatinVocabWidget(parent, name)
 {
 	BackButton->setIconSet(KGlobal::iconLoader()->loadIconSet("back", KIcon::Small));
 
-	m_vocabFile = QString::null;
+	m_vocabFile = TQString::null;
 	
 	// Goes back to the last dialog
-	connect(BackButton, SIGNAL(clicked()), this, SLOT(goBack()));
+	connect(BackButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(goBack()));
 
 	// Set default settings
 	m_numberOfQuestions = Settings::numOfQuestions();
@@ -53,23 +53,23 @@ KLatinVocab::KLatinVocab(QWidget* parent, const char *name)
 	parseVocab();
 
 	// Connect the multiple choice buttons to the various slots
-	connect(Answer1, SIGNAL(clicked()), this, SLOT(checkAnswerOne()));
-	connect(Answer2, SIGNAL(clicked()), this, SLOT(checkAnswerTwo()));
-	connect(Answer3, SIGNAL(clicked()), this, SLOT(checkAnswerThree()));
-	connect(Answer4, SIGNAL(clicked()), this, SLOT(checkAnswerFour()));
+	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()));
 }
 
 KLatinVocab::~KLatinVocab()
 {
 }
 
-void KLatinVocab::parseVocab(QString customFile)
+void KLatinVocab::parseVocab(TQString customFile)
 {
 	m_vocabFile = customFile;
 	
 	m_texts.clear();
 	
-	QString fileName;
+	TQString fileName;
 	
 	// Load all the config variables
 	if (Settings::numOfQuestions() != 0) {
@@ -86,27 +86,27 @@ void KLatinVocab::parseVocab(QString customFile)
 	
 	// Check whether file exists or not
 	// If not then regenerate working default
-	if (QFile::exists(fileName) == FALSE) {
+	if (TQFile::exists(fileName) == FALSE) {
 		KConfigBase *globalConf = KGlobal::config();
 		globalConf->setGroup("Locale");
 		
-		QString language = globalConf->readEntry("Language", "en");
+		TQString language = globalConf->readEntry("Language", "en");
 		language = language.left(2);
 		
-		QString fileNameLang = locate("data", "klatin/data/vocabs/");
+		TQString fileNameLang = locate("data", "klatin/data/vocabs/");
 		fileNameLang += language;
 		
-		QDir checkLang(fileNameLang);
+		TQDir checkLang(fileNameLang);
 		
 		if (checkLang.exists() == FALSE) {
 			language = "en";
 		}
 		
-		QDir vocabDirectory(fileNameLang, "*.kvtml");
+		TQDir vocabDirectory(fileNameLang, "*.kvtml");
 		
-		QString defaultFile = (fileNameLang + "/" + vocabDirectory[0]);
+		TQString defaultFile = (fileNameLang + "/" + vocabDirectory[0]);
 		
-		if (QFile::exists(defaultFile) == FALSE) {
+		if (TQFile::exists(defaultFile) == FALSE) {
 			KMessageBox::error(this, i18n("Could not load vocabulary file; there is a problem with your KLatin installation."), i18n("Error with KLatin"));
 			kapp->quit();
 		} else {
@@ -120,7 +120,7 @@ void KLatinVocab::parseVocab(QString customFile)
 	
 	int it = 0;
 	
-	// Start parsing file and allocating words to the QValueList<QStringPair>
+	// Start parsing file and allocating words to the TQValueList<QStringPair>
 	for(KEduVocDataItemList::Iterator dataIt = vocabulary.begin(); dataIt != vocabulary.end(); ++dataIt) {
 		if (Settings::langToLatin()) {
 			m_texts.append(qMakePair(vocabulary[it].originalText(), vocabulary[it].translatedText()));
@@ -341,7 +341,7 @@ void KLatinVocab::updateScores()
 	Score2Label->setNum(m_total);
 
 	// Set percentage
-	PercentageLabel->setText(QString::number(int(double(m_totalCorrect) / m_total * 100))+QString("%"));
+	PercentageLabel->setText(TQString::number(int(double(m_totalCorrect) / m_total * 100))+TQString("%"));
 }
 
 void KLatinVocab::resultsDialog()
@@ -356,7 +356,7 @@ void KLatinVocab::resultsDialog()
 	// Set the lists
 	for (int i = 0 ; i < temp; i++) {
 		if (m_previousAnswer[i] != 0)
-			new QListViewItem(results->ResultsView, m_previousQuestion[i], m_previousAnswer[i], m_correctAnswer[i]);
+			new TQListViewItem(results->ResultsView, m_previousQuestion[i], m_previousAnswer[i], m_correctAnswer[i]);
 	}
 
 	// Set the scores
@@ -364,7 +364,7 @@ void KLatinVocab::resultsDialog()
 	results->AttemptedValue->setText(Score2Label->text());
 
 	results->show();
-	results->resize(QSize(420, 280));
+	results->resize(TQSize(420, 280));
 
 	// Set some variables.
 	m_dialogShown = true;
@@ -372,7 +372,7 @@ void KLatinVocab::resultsDialog()
 	changeVocab(Settings::defaultFile());
 }
 
-void KLatinVocab::changeVocab(const QString &filename)
+void KLatinVocab::changeVocab(const TQString &filename)
 {
 	// Reset to defaults
 	m_total = 0;
diff --git a/klatin/klatin/klatinvocab.h b/klatin/klatin/klatinvocab.h
index c33081df..6980fe24 100644
--- a/klatin/klatin/klatinvocab.h
+++ b/klatin/klatin/klatinvocab.h
@@ -21,8 +21,8 @@
 #include <config.h>
 #endif
 
-#include <qdir.h>
-#include <qpair.h>
+#include <tqdir.h>
+#include <tqpair.h>
 
 #include "keduvocdata.h"
 #include "klatinresultsdialog.h"
@@ -32,11 +32,11 @@ class KLatinVocab : public KLatinVocabWidget
 {
     Q_OBJECT
 public:
-	KLatinVocab(QWidget* parent=0, const char *name=0);
+	KLatinVocab(TQWidget* parent=0, const char *name=0);
 	~KLatinVocab();
 
 	/// Load vocabulary from file @p customFile
-	void parseVocab(QString customFile = QString::null);
+	void parseVocab(TQString customFile = TQString::null);
 	/// Generate a new question
 	void newQuestion();
 	/// Update the scores of the test so far
@@ -60,28 +60,28 @@ private slots:
 	void checkAnswerFour();
 public slots:
 	/// Load a different vocabulary file in the standard install
-	void changeVocab(const QString &filename);
+	void changeVocab(const TQString &filename);
 signals:
 	/// Emitted when goBack() is called
 	void exited();
 private:
 	/// The list in which the native language and Latin words are assigned
-	typedef QPair<QString, QString> QStringPair;
-	QValueList<QStringPair> m_texts;
+	typedef QPair<TQString, TQString> QStringPair;
+	TQValueList<QStringPair> m_texts;
 	
-	QString m_fileDir;
+	TQString m_fileDir;
 	/// The filename of the vocabulary file being tested on
-	QString m_vocabFile;
+	TQString m_vocabFile;
 	/// A list of the 4 words used for assigning to the 4 multiple choice buttons
-	QStringList m_choiceWords;
+	TQStringList m_choiceWords;
 	/// The previous question's answer
-	QStringList m_correctAnswer;
+	TQStringList m_correctAnswer;
 	/// The user's answer to the previous question
-	QStringList m_previousAnswer;
+	TQStringList m_previousAnswer;
 	/// The previous question asked
-	QStringList m_previousQuestion;
+	TQStringList m_previousQuestion;
 	
-	QDir m_vocabDirectory;
+	TQDir m_vocabDirectory;
 
 	/// The question number in this session
 	int m_questionNumber;