From a374efce3a207b39514be3c52264091400ce297e Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Jun 2011 04:44:41 +0000 Subject: TQt4 port kdeedu This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236073 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- klatin/klatin/data/vocab/en/I2L.kvtml | 4 +- klatin/klatin/data/vocab/pl/A.kvtml | 2 +- klatin/klatin/data/vocab/pl/V.kvtml | 2 +- klatin/klatin/data/vocab/sk/A.kvtml | 2 +- klatin/klatin/data/vocab/sk/BC.kvtml | 2 +- klatin/klatin/data/vocab/sk/GHI1.kvtml | 2 +- klatin/klatin/data/vocab/sk/M.kvtml | 2 +- klatin/klatin/data/vocab/sk/P2.kvtml | 2 +- klatin/klatin/data/vocab/sk/QR.kvtml | 4 +- klatin/klatin/data/vocab/sk/TU.kvtml | 4 +- klatin/klatin/klatin.cpp | 30 ++++++------- klatin/klatin/klatin.h | 3 +- klatin/klatin/klatin.kcfg | 12 +++--- klatin/klatin/klatinchoose.ui | 40 +++++++++--------- klatin/klatin/klatingrammar.cpp | 30 ++++++------- klatin/klatin/klatingrammar.h | 3 +- klatin/klatin/klatingrammarwidget.ui | 70 +++++++++++++++---------------- klatin/klatin/klatinresultsdialog.ui | 34 +++++++-------- klatin/klatin/klatinsettings_vocabpage.ui | 34 +++++++-------- klatin/klatin/klatinverbs.cpp | 18 ++++---- klatin/klatin/klatinverbs.h | 3 +- klatin/klatin/klatinverbswidget.ui | 68 +++++++++++++++--------------- klatin/klatin/klatinvocab.cpp | 12 +++--- klatin/klatin/klatinvocab.h | 9 ++-- klatin/klatin/klatinvocabwidget.ui | 70 +++++++++++++++---------------- klatin/klatin/settings.kcfgc | 2 +- 26 files changed, 234 insertions(+), 230 deletions(-) (limited to 'klatin') diff --git a/klatin/klatin/data/vocab/en/I2L.kvtml b/klatin/klatin/data/vocab/en/I2L.kvtml index 367475ba..50057535 100644 --- a/klatin/klatin/data/vocab/en/I2L.kvtml +++ b/klatin/klatin/data/vocab/en/I2L.kvtml @@ -35,7 +35,7 @@ invenio (3) - find + tqfind invito (1) @@ -151,7 +151,7 @@ liberi (2) - children + tqchildren libero (1) diff --git a/klatin/klatin/data/vocab/pl/A.kvtml b/klatin/klatin/data/vocab/pl/A.kvtml index 3ccf4856..61e8c134 100644 --- a/klatin/klatin/data/vocab/pl/A.kvtml +++ b/klatin/klatin/data/vocab/pl/A.kvtml @@ -187,6 +187,6 @@ auxilium (2) - pomoc + potqmoc diff --git a/klatin/klatin/data/vocab/pl/V.kvtml b/klatin/klatin/data/vocab/pl/V.kvtml index 6ace2e9a..d793ed8a 100644 --- a/klatin/klatin/data/vocab/pl/V.kvtml +++ b/klatin/klatin/data/vocab/pl/V.kvtml @@ -3,7 +3,7 @@ valde - bardzo, mocno, gwałtownie + bardzo, tqmocno, gwałtownie vale diff --git a/klatin/klatin/data/vocab/sk/A.kvtml b/klatin/klatin/data/vocab/sk/A.kvtml index f8cbd879..56c5f2f2 100644 --- a/klatin/klatin/data/vocab/sk/A.kvtml +++ b/klatin/klatin/data/vocab/sk/A.kvtml @@ -187,6 +187,6 @@ auxilium (2) - podpora, pomoc + podpora, potqmoc diff --git a/klatin/klatin/data/vocab/sk/BC.kvtml b/klatin/klatin/data/vocab/sk/BC.kvtml index fc4da165..0d31ad31 100644 --- a/klatin/klatin/data/vocab/sk/BC.kvtml +++ b/klatin/klatin/data/vocab/sk/BC.kvtml @@ -39,7 +39,7 @@ capio (3) - brať, uchopiť, chápať, zmocniť sa + brať, uchopiť, chápať, ztqmocniť sa captivus (2) diff --git a/klatin/klatin/data/vocab/sk/GHI1.kvtml b/klatin/klatin/data/vocab/sk/GHI1.kvtml index 3a37603c..17d88b20 100644 --- a/klatin/klatin/data/vocab/sk/GHI1.kvtml +++ b/klatin/klatin/data/vocab/sk/GHI1.kvtml @@ -127,7 +127,7 @@ imperium (2) - vláda, zvrchovaná moc, rozkaz + vláda, zvrchovaná tqmoc, rozkaz impero (1) diff --git a/klatin/klatin/data/vocab/sk/M.kvtml b/klatin/klatin/data/vocab/sk/M.kvtml index ea61fd1d..e18e12c0 100644 --- a/klatin/klatin/data/vocab/sk/M.kvtml +++ b/klatin/klatin/data/vocab/sk/M.kvtml @@ -3,7 +3,7 @@ magnopere - veľmi, moc + veľmi, tqmoc magnus diff --git a/klatin/klatin/data/vocab/sk/P2.kvtml b/klatin/klatin/data/vocab/sk/P2.kvtml index 9b2cf3aa..15c91231 100644 --- a/klatin/klatin/data/vocab/sk/P2.kvtml +++ b/klatin/klatin/data/vocab/sk/P2.kvtml @@ -47,7 +47,7 @@ possum (irreg) - môcť, byť schopný, mať moc, dokázať + môcť, byť schopný, mať tqmoc, dokázať post + acc diff --git a/klatin/klatin/data/vocab/sk/QR.kvtml b/klatin/klatin/data/vocab/sk/QR.kvtml index 7db08854..0517ac99 100644 --- a/klatin/klatin/data/vocab/sk/QR.kvtml +++ b/klatin/klatin/data/vocab/sk/QR.kvtml @@ -67,7 +67,7 @@ rapio (3) - uchvátiť, zmocniť sa + uchvátiť, ztqmocniť sa re- @@ -95,7 +95,7 @@ regnum (2) - najvyššia moc, kráľovstvo, majetok + najvyššia tqmoc, kráľovstvo, majetok regredior (3) diff --git a/klatin/klatin/data/vocab/sk/TU.kvtml b/klatin/klatin/data/vocab/sk/TU.kvtml index a9d9c264..3f5bf6ce 100644 --- a/klatin/klatin/data/vocab/sk/TU.kvtml +++ b/klatin/klatin/data/vocab/sk/TU.kvtml @@ -27,7 +27,7 @@ tantus - tak veľký, len toľko, mocný, slávny + tak veľký, len toľko, tqmocný, slávny templum (2) @@ -43,7 +43,7 @@ teneo (2) - držať, mať v moci + držať, mať v tqmoci terra (1) diff --git a/klatin/klatin/klatin.cpp b/klatin/klatin/klatin.cpp index 09a8a426..3caed219 100644 --- a/klatin/klatin/klatin.cpp +++ b/klatin/klatin/klatin.cpp @@ -32,8 +32,8 @@ #include "klatin.h" #include "settings.h" -KLatin::KLatin(TQWidget* parent, const char *name) - : KMainWindow(parent, name) +KLatin::KLatin(TQWidget* tqparent, const char *name) + : KMainWindow(tqparent, name) { m_section = 0; @@ -53,12 +53,12 @@ KLatin::~KLatin() void KLatin::setupActions() { // Setup various menu actions - 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()); + KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(loadSettings()), actionCollection()); + m_loadVocab = new KAction(i18n("Load &Vocabulary"), 0, TQT_TQOBJECT(this), TQT_SLOT(loadVocab()), actionCollection(), "go_vocab"); + m_loadGrammar = new KAction(i18n("Load &Grammar"), 0, TQT_TQOBJECT(this), TQT_SLOT(loadGrammar()), actionCollection(), "go_grammar"); + m_loadVerbs = new KAction(i18n("Load V&erbs"), 0, TQT_TQOBJECT(this), TQT_SLOT(loadVerbs()), actionCollection(), "go_verbs"); + m_loadRevision = new KAction(i18n("Load &Revision"), 0, TQT_TQOBJECT(this), TQT_SLOT(loadRevision()), actionCollection(), "go_revision"); + KStdAction::quit(TQT_TQOBJECT(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, TQT_SIGNAL(exited()), this, TQT_SLOT(resetGUI())); + connect(klatinvocabsection, TQT_SIGNAL(exited()), TQT_TQOBJECT(this), TQT_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, TQT_SIGNAL(exited()), TQT_TQOBJECT(this), TQT_SLOT(resetGUI())); + connect(klatingrammarsection, TQT_SIGNAL(statusMsg(const TQString&)), TQT_TQOBJECT(this), TQT_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, TQT_SIGNAL(exited()), TQT_TQOBJECT(this), TQT_SLOT(resetGUI())); + connect(klatinverbssection, TQT_SIGNAL(statusMsg(const TQString&)), TQT_TQOBJECT(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, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChanged())); + connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(settingsChanged())); dialog->show(); } @@ -189,7 +189,7 @@ 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, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(startClicked())); // Make the quit button quit the application :) connect(klatinchoose->QuitButton, TQT_SIGNAL(clicked()), kapp, TQT_SLOT(quit())); diff --git a/klatin/klatin/klatin.h b/klatin/klatin/klatin.h index 91db4488..5b505bf7 100644 --- a/klatin/klatin/klatin.h +++ b/klatin/klatin/klatin.h @@ -36,8 +36,9 @@ class KLatin : public KMainWindow { Q_OBJECT + TQ_OBJECT public: - KLatin(TQWidget* parent=0, const char *name=0); + KLatin(TQWidget* tqparent=0, const char *name=0); ~KLatin(); void setupActions(); diff --git a/klatin/klatin/klatin.kcfg b/klatin/klatin/klatin.kcfg index 407f47a2..ec8fa52f 100644 --- a/klatin/klatin/klatin.kcfg +++ b/klatin/klatin/klatin.kcfg @@ -10,12 +10,12 @@ KConfigBase *globalConf = KGlobal::config(); globalConf->setGroup("Locale"); - QString m_language = globalConf->readEntry("Language", "en"); + TQString m_language = globalConf->readEntry("Language", "en"); //keep only the first 2 characters m_language = m_language.left(2); - QString filename = locate("data", "klatin/data/vocabs/"); + TQString filename = locate("data", "klatin/data/vocabs/"); filename += m_language; - QDir check(filename); + TQDir check(filename); if (check.exists() == FALSE) { m_language = "en"; @@ -37,12 +37,12 @@ - QString fileDir = locate("data", "klatin/data/vocabs/"); + TQString fileDir = locate("data", "klatin/data/vocabs/"); fileDir += m_language; - QDir vocabDirectory(fileDir, "*.kvtml"); + TQDir vocabDirectory(fileDir, "*.kvtml"); kdDebug()<< m_language <<endl; - QString defaultFile = (fileDir + "/" + vocabDirectory[0]); + TQString defaultFile = (fileDir + "/" + vocabDirectory[0]); kdDebug()<< defaultFile <<endl; defaultFile diff --git a/klatin/klatin/klatinchoose.ui b/klatin/klatin/klatinchoose.ui index 98115187..ceb618a6 100644 --- a/klatin/klatin/klatinchoose.ui +++ b/klatin/klatin/klatinchoose.ui @@ -1,10 +1,10 @@ KLatinChoose - + KLatinChoose - + 0 0 @@ -24,15 +24,15 @@ unnamed - + - layout81 + tqlayout81 unnamed - + WelcomeLabel @@ -46,19 +46,19 @@ Welcome to KLatin Please Choose Section of Revision - + AlignCenter - + - layout80 + tqlayout80 unnamed - + Options @@ -87,14 +87,14 @@ Please Choose Section of Revision Expanding - + 20 21 - + VocabOption @@ -111,7 +111,7 @@ Please Choose Section of Revision Multiple choice vocabulary test - + GrammarOption @@ -128,7 +128,7 @@ Please Choose Section of Revision Test on common nouns and endings - + VerbsOption @@ -142,7 +142,7 @@ Please Choose Section of Revision Test on common verbs and endings - + RevisionOption @@ -167,7 +167,7 @@ verb and noun tables Expanding - + 20 31 @@ -176,9 +176,9 @@ verb and noun tables - + - layout79 + tqlayout79 @@ -194,7 +194,7 @@ verb and noun tables Expanding - + 20 34 @@ -239,7 +239,7 @@ verb and noun tables Expanding - + 20 33 @@ -256,7 +256,7 @@ verb and noun tables - + kpushbutton.h kpushbutton.h diff --git a/klatin/klatin/klatingrammar.cpp b/klatin/klatin/klatingrammar.cpp index 0598547f..5c7e30e6 100644 --- a/klatin/klatin/klatingrammar.cpp +++ b/klatin/klatin/klatingrammar.cpp @@ -30,8 +30,8 @@ #include "klatingrammar.h" -KLatinGrammar::KLatinGrammar(TQWidget* parent, const char *name) - : KLatinGrammarWidget(parent, name) +KLatinGrammar::KLatinGrammar(TQWidget* tqparent, const char *name) + : KLatinGrammarWidget(tqparent, name) { // Set defaults m_total = 0; @@ -153,40 +153,40 @@ void KLatinGrammar::nextQuestion() // Question string... switch (m_grammarNumber) { case 1: - questionString = i18n("What is the nominative singular of %1?").arg(m_noun[0]); + questionString = i18n("What is the nominative singular of %1?").tqarg(m_noun[0]); break; case 2: - questionString = i18n("What is the vocative singular of %1?").arg(m_noun[0]); + questionString = i18n("What is the vocative singular of %1?").tqarg(m_noun[0]); break; case 3: - questionString = i18n("What is the accusative singular of %1?").arg(m_noun[0]); + questionString = i18n("What is the accusative singular of %1?").tqarg(m_noun[0]); break; case 4: - questionString = i18n("What is the genitive singular of %1?").arg(m_noun[0]); + questionString = i18n("What is the genitive singular of %1?").tqarg(m_noun[0]); break; case 5: - questionString = i18n("What is the dative singular of %1?").arg(m_noun[0]); + questionString = i18n("What is the dative singular of %1?").tqarg(m_noun[0]); break; case 6: - questionString = i18n("What is the ablative singular of %1?").arg(m_noun[0]); + questionString = i18n("What is the ablative singular of %1?").tqarg(m_noun[0]); break; case 7: - questionString = i18n("What is the nominative plural of %1?").arg(m_noun[0]); + questionString = i18n("What is the nominative plural of %1?").tqarg(m_noun[0]); break; case 8: - questionString = i18n("What is the vocative plural of %1?").arg(m_noun[0]); + questionString = i18n("What is the vocative plural of %1?").tqarg(m_noun[0]); break; case 9: - questionString = i18n("What is the accusative plural of %1?").arg(m_noun[0]); + questionString = i18n("What is the accusative plural of %1?").tqarg(m_noun[0]); break; case 10: - questionString = i18n("What is the genitive plural of %1?").arg(m_noun[0]); + questionString = i18n("What is the genitive plural of %1?").tqarg(m_noun[0]); break; case 11: - questionString = i18n("What is the dative plural of %1?").arg(m_noun[0]); + questionString = i18n("What is the dative plural of %1?").tqarg(m_noun[0]); break; case 12: - questionString = i18n("What is the ablative plural of %1?").arg(m_noun[0]); + questionString = i18n("What is the ablative plural of %1?").tqarg(m_noun[0]); break; } @@ -202,7 +202,7 @@ void KLatinGrammar::checkAnswer() // Allow a tolerance of 1 retry if (m_numWrong == 2) { m_numWrong = 0; - KMessageBox::information(this, i18n("The correct answer was %1.").arg(m_noun[m_grammarNumber - 1]), i18n("Wrong")); + KMessageBox::information(this, i18n("The correct answer was %1.").tqarg(m_noun[m_grammarNumber - 1]), i18n("Wrong")); if (ChooseSection->currentItem()==0) loadDatabase(); else diff --git a/klatin/klatin/klatingrammar.h b/klatin/klatin/klatingrammar.h index c36a3612..11723c85 100644 --- a/klatin/klatin/klatingrammar.h +++ b/klatin/klatin/klatingrammar.h @@ -27,8 +27,9 @@ class KLatinGrammar : public KLatinGrammarWidget { Q_OBJECT + TQ_OBJECT public: - KLatinGrammar(TQWidget* parent=0, const char *name=0); + KLatinGrammar(TQWidget* tqparent=0, const char *name=0); ~KLatinGrammar(); /// Load next question diff --git a/klatin/klatin/klatingrammarwidget.ui b/klatin/klatin/klatingrammarwidget.ui index 2e8046fb..b1ff6908 100644 --- a/klatin/klatin/klatingrammarwidget.ui +++ b/klatin/klatin/klatingrammarwidget.ui @@ -1,10 +1,10 @@ KLatinGrammarWidget - + KLatinGrammarWidget - + 0 0 @@ -12,7 +12,7 @@ 320 - + 0 0 @@ -25,11 +25,11 @@ unnamed - + TitleGrammar - + 0 0 @@ -43,15 +43,15 @@ Grammar Section - + AlignCenter - + - layout39 + tqlayout39 @@ -67,15 +67,15 @@ - + - layout40 + tqlayout40 unnamed - + QuestionLabel @@ -87,7 +87,7 @@ 0 - + 0 0 @@ -110,7 +110,7 @@ Line 2 Line 3 Line 4 - + WordBreak|AlignCenter @@ -121,7 +121,7 @@ Line 4 - + Frame10 @@ -133,13 +133,13 @@ Line 4 0 - + 0 0 - + 32767 32767 @@ -161,7 +161,7 @@ Line 4 6 - + Layout41_2 @@ -175,7 +175,7 @@ Line 4 6 - + ScoreLabel @@ -187,13 +187,13 @@ Line 4 Score - + AlignCenter - + Layout40_2 @@ -207,7 +207,7 @@ Line 4 6 - + Layout39 @@ -221,33 +221,33 @@ Line 4 6 - + Score1Label 0 - + AlignVCenter|AlignRight - + SeparatorLabel / - + AlignCenter - + Score2Label @@ -257,11 +257,11 @@ Line 4 - + PercentageLabel - + AlignCenter @@ -278,15 +278,15 @@ Line 4 - + - layout37 + tqlayout37 unnamed - + AnswerLabel @@ -324,9 +324,9 @@ Line 4 - + - layout21 + tqlayout21 @@ -342,7 +342,7 @@ Line 4 Expanding - + 294 20 @@ -375,7 +375,7 @@ Line 4 BackButton ChooseSection - + klineedit.h diff --git a/klatin/klatin/klatinresultsdialog.ui b/klatin/klatin/klatinresultsdialog.ui index f81f0bc2..6ea3a4f3 100644 --- a/klatin/klatin/klatinresultsdialog.ui +++ b/klatin/klatin/klatinresultsdialog.ui @@ -1,10 +1,10 @@ KLatinResultsDialog - + KLatinResultsDialog - + 0 0 @@ -19,7 +19,7 @@ unnamed - + ResultsLabel @@ -31,11 +31,11 @@ <b>Your Results</b> - + WordBreak|AlignCenter - + Question @@ -90,15 +90,15 @@ Table of results - + - layout83 + tqlayout83 unnamed - + PercentageLabel @@ -112,14 +112,14 @@ This shows the percentage of the questions you answered correctly out of those attempted. - + PercentageValue - + AlignCenter @@ -129,7 +129,7 @@ This shows the percentage of the questions you answered correctly out of those attempted. - + AttemptedLabel @@ -143,14 +143,14 @@ This shows the number of questions you answered. - + AttemptedValue - + AlignCenter @@ -162,9 +162,9 @@ - + - layout70 + tqlayout70 @@ -180,7 +180,7 @@ Expanding - + 291 20 @@ -216,7 +216,7 @@ close() - + kpushbutton.h diff --git a/klatin/klatin/klatinsettings_vocabpage.ui b/klatin/klatin/klatinsettings_vocabpage.ui index 7db9e38a..affa58e8 100644 --- a/klatin/klatin/klatinsettings_vocabpage.ui +++ b/klatin/klatin/klatinsettings_vocabpage.ui @@ -1,10 +1,10 @@ VocabPage - + VocabPage - + 0 0 @@ -19,7 +19,7 @@ unnamed - + ButtonGroup @@ -30,23 +30,23 @@ unnamed - + - layout24 + tqlayout24 unnamed - + - layout10 + tqlayout10 unnamed - + kcfg_LatinToLang @@ -63,7 +63,7 @@ Choose to be tested from your language to Latin, which means the word will be displayed in your language and you will have to choose from 4 Latin translations. - + kcfg_LangToLatin @@ -83,7 +83,7 @@ - + MiscGroup @@ -94,9 +94,9 @@ unnamed - + - layout6 + tqlayout6 @@ -113,22 +113,22 @@ You can change the file you are tested on for the vocabulary section - + - layout6 + tqlayout6 unnamed - + QuestionsLabel Number of questions: - + WordBreak|AlignVCenter @@ -171,7 +171,7 @@ - + kurlrequester.h klineedit.h diff --git a/klatin/klatin/klatinverbs.cpp b/klatin/klatin/klatinverbs.cpp index 70d42ed8..e5be5ff2 100644 --- a/klatin/klatin/klatinverbs.cpp +++ b/klatin/klatin/klatinverbs.cpp @@ -30,8 +30,8 @@ #include "klatinverbs.h" -KLatinVerbs::KLatinVerbs(TQWidget* parent, const char *name) - : KLatinVerbsWidget(parent, name) +KLatinVerbs::KLatinVerbs(TQWidget* tqparent, const char *name) + : KLatinVerbsWidget(tqparent, name) { OKButton->setIconSet(KGlobal::iconLoader()->loadIconSet("button_ok", KIcon::Small)); BackButton->setIconSet(KGlobal::iconLoader()->loadIconSet("back", KIcon::Small)); @@ -202,12 +202,12 @@ void KLatinVerbs::nextQuestion() "ARGUMENT %5 is the voice of the verb (Active, Passive). " "ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and should not be translated. " "The output string in English is something like: What is the first person singular present indicative active of amo?", - "What is the %1 person %2 %3 %4 %5 of %6?").arg(i18n(question.person[person])) - .arg(i18n(question.number[number])) - .arg(i18n(question.tense[tense])) - .arg(i18n(verbparts.mood[ChooseMood->currentItem()])) - .arg(i18n(verbparts.voice[ChooseVoice->currentItem()])) - .arg(m_currentVerb); + "What is the %1 person %2 %3 %4 %5 of %6?").tqarg(i18n(question.person[person])) + .tqarg(i18n(question.number[number])) + .tqarg(i18n(question.tense[tense])) + .tqarg(i18n(verbparts.mood[ChooseMood->currentItem()])) + .tqarg(i18n(verbparts.voice[ChooseVoice->currentItem()])) + .tqarg(m_currentVerb); QuestionLabel->setText(QuestionString); } @@ -226,7 +226,7 @@ void KLatinVerbs::checkAnswer() // Retry tolerance... if (m_numWrong == 2) { m_numWrong = 0; - KMessageBox::information(this, i18n("The correct answer was %1.").arg(m_verb[m_verbNumber - 1]), i18n("Wrong")); + KMessageBox::information(this, i18n("The correct answer was %1.").tqarg(m_verb[m_verbNumber - 1]), i18n("Wrong")); nextQuestion(); } } else { diff --git a/klatin/klatin/klatinverbs.h b/klatin/klatin/klatinverbs.h index 03b5b649..af6f9ba0 100644 --- a/klatin/klatin/klatinverbs.h +++ b/klatin/klatin/klatinverbs.h @@ -41,8 +41,9 @@ struct questionparts { class KLatinVerbs : public KLatinVerbsWidget { Q_OBJECT + TQ_OBJECT public: - KLatinVerbs(TQWidget* parent=0, const char *name=0); + KLatinVerbs(TQWidget* tqparent=0, const char *name=0); ~KLatinVerbs(); /// Load next question diff --git a/klatin/klatin/klatinverbswidget.ui b/klatin/klatin/klatinverbswidget.ui index a00b72f0..a4eeafbe 100644 --- a/klatin/klatin/klatinverbswidget.ui +++ b/klatin/klatin/klatinverbswidget.ui @@ -1,10 +1,10 @@ KLatinVerbsWidget - + KLatinVerbsWidget - + 0 0 @@ -19,7 +19,7 @@ unnamed - + TitleVerbs @@ -39,15 +39,15 @@ Verbs Section - + AlignCenter - + - layout29 + tqlayout29 @@ -69,7 +69,7 @@ tested on ChooseVoice - + 120 0 @@ -99,7 +99,7 @@ tested on ChangeButton - + 25 32767 @@ -117,15 +117,15 @@ tested on - + - layout11 + tqlayout11 unnamed - + QuestionLabel @@ -154,7 +154,7 @@ Line 2 Line 3 Line 4 - + WordBreak|AlignCenter @@ -165,7 +165,7 @@ Line 4 - + Frame10 @@ -177,13 +177,13 @@ Line 4 0 - + 0 0 - + 32767 32767 @@ -205,7 +205,7 @@ Line 4 6 - + Layout41_2 @@ -219,7 +219,7 @@ Line 4 6 - + ScoreLabel @@ -231,13 +231,13 @@ Line 4 Score - + AlignCenter - + Layout40_2 @@ -251,7 +251,7 @@ Line 4 6 - + Layout39 @@ -265,33 +265,33 @@ Line 4 6 - + Score1Label 0 - + AlignVCenter|AlignRight - + SeparatorLabel / - + AlignCenter - + Score2Label @@ -301,11 +301,11 @@ Line 4 - + PercentageLabel - + AlignCenter @@ -322,15 +322,15 @@ Line 4 - + - layout9 + tqlayout9 unnamed - + AnswerLabel @@ -365,9 +365,9 @@ Line 4 - + - layout29 + tqlayout29 @@ -383,7 +383,7 @@ Line 4 Expanding - + 297 20 @@ -419,7 +419,7 @@ Line 4 ChooseMood ChangeButton - + klineedit.h diff --git a/klatin/klatin/klatinvocab.cpp b/klatin/klatin/klatinvocab.cpp index b1b10ccf..08cc0249 100644 --- a/klatin/klatin/klatinvocab.cpp +++ b/klatin/klatin/klatinvocab.cpp @@ -32,12 +32,12 @@ #include "klatinvocab.h" #include "settings.h" -KLatinVocab::KLatinVocab(TQWidget* parent, const char *name) - : KLatinVocabWidget(parent, name) +KLatinVocab::KLatinVocab(TQWidget* tqparent, const char *name) + : KLatinVocabWidget(tqparent, name) { BackButton->setIconSet(KGlobal::iconLoader()->loadIconSet("back", KIcon::Small)); - m_vocabFile = TQString::null; + m_vocabFile = TQString(); // Goes back to the last dialog connect(BackButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(goBack())); @@ -120,12 +120,12 @@ void KLatinVocab::parseVocab(TQString customFile) int it = 0; - // Start parsing file and allocating words to the TQValueList + // Start parsing file and allocating words to the TQValueList for(KEduVocDataItemList::Iterator dataIt = vocabulary.begin(); dataIt != vocabulary.end(); ++dataIt) { if (Settings::langToLatin()) { - m_texts.append(qMakePair(vocabulary[it].originalText(), vocabulary[it].translatedText())); + m_texts.append(tqMakePair(vocabulary[it].originalText(), vocabulary[it].translatedText())); } else { - m_texts.append(qMakePair(vocabulary[it].translatedText(), vocabulary[it].originalText())); + m_texts.append(tqMakePair(vocabulary[it].translatedText(), vocabulary[it].originalText())); } it++; } diff --git a/klatin/klatin/klatinvocab.h b/klatin/klatin/klatinvocab.h index 6980fe24..83ada419 100644 --- a/klatin/klatin/klatinvocab.h +++ b/klatin/klatin/klatinvocab.h @@ -31,12 +31,13 @@ class KLatinVocab : public KLatinVocabWidget { Q_OBJECT + TQ_OBJECT public: - KLatinVocab(TQWidget* parent=0, const char *name=0); + KLatinVocab(TQWidget* tqparent=0, const char *name=0); ~KLatinVocab(); /// Load vocabulary from file @p customFile - void parseVocab(TQString customFile = TQString::null); + void parseVocab(TQString customFile = TQString()); /// Generate a new question void newQuestion(); /// Update the scores of the test so far @@ -66,8 +67,8 @@ signals: void exited(); private: /// The list in which the native language and Latin words are assigned - typedef QPair QStringPair; - TQValueList m_texts; + typedef TQPair TQStringPair; + TQValueList m_texts; TQString m_fileDir; /// The filename of the vocabulary file being tested on diff --git a/klatin/klatin/klatinvocabwidget.ui b/klatin/klatin/klatinvocabwidget.ui index db6ad834..91993658 100644 --- a/klatin/klatin/klatinvocabwidget.ui +++ b/klatin/klatin/klatinvocabwidget.ui @@ -1,10 +1,10 @@ KLatinVocabWidget - + KLatinVocabWidget - + 0 0 @@ -19,11 +19,11 @@ unnamed - + TitleLabel - + 500 0 @@ -37,21 +37,21 @@ Vocabulary Section - + AlignCenter - + - layout52 + tqlayout52 unnamed - + QuestionLabel @@ -77,7 +77,7 @@ Question Word - + AlignCenter @@ -86,7 +86,7 @@ The question word will appear here - + Frame10 @@ -98,7 +98,7 @@ 0 - + 32767 32767 @@ -126,7 +126,7 @@ 6 - + Layout41 @@ -140,7 +140,7 @@ 6 - + ScoreLabel @@ -152,13 +152,13 @@ Score - + AlignCenter - + Layout40 @@ -172,7 +172,7 @@ 6 - + Layout39 @@ -186,33 +186,33 @@ 6 - + Score1Label 0 - + AlignVCenter|AlignRight - + Separator / - + AlignCenter - + Score2Label @@ -222,11 +222,11 @@ - + PercentageLabel - + AlignCenter @@ -243,9 +243,9 @@ - + - layout53 + tqlayout53 @@ -255,7 +255,7 @@ Answer1 - + 150 40 @@ -272,7 +272,7 @@ Answer2 - + 150 40 @@ -287,9 +287,9 @@ - + - layout64 + tqlayout64 @@ -299,7 +299,7 @@ Answer3 - + 150 40 @@ -316,7 +316,7 @@ Answer4 - + 150 40 @@ -331,9 +331,9 @@ - + - layout18 + tqlayout18 @@ -349,7 +349,7 @@ Expanding - + 326 20 @@ -381,7 +381,7 @@ Answer4 BackButton - + kpushbutton.h kpushbutton.h diff --git a/klatin/klatin/settings.kcfgc b/klatin/klatin/settings.kcfgc index f9475d28..a58324de 100644 --- a/klatin/klatin/settings.kcfgc +++ b/klatin/klatin/settings.kcfgc @@ -1,5 +1,5 @@ File=klatin.kcfg ClassName=Settings -IncludeFiles=kstandarddirs.h,qdir.h,klocale.h,kdebug.h +IncludeFiles=kstandarddirs.h,tqdir.h,klocale.h,kdebug.h Singleton=true Mutators=true \ No newline at end of file -- cgit v1.2.1