From 746abe84406ed1ec1a8dc68f29ce0ab8322ccc80 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:55:10 -0600 Subject: Remove additional unneeded tq method conversions --- klatin/klatin/data/vocab/en/I2L.kvtml | 2 +- klatin/klatin/klatinchoose.ui | 2 +- klatin/klatin/klatingrammar.cpp | 26 +++++++++++++------------- klatin/klatin/klatingrammarwidget.ui | 12 ++++++------ klatin/klatin/klatinresultsdialog.ui | 6 +++--- klatin/klatin/klatinsettings_vocabpage.ui | 2 +- klatin/klatin/klatinverbs.cpp | 14 +++++++------- klatin/klatin/klatinverbswidget.ui | 12 ++++++------ klatin/klatin/klatinvocabwidget.ui | 12 ++++++------ 9 files changed, 44 insertions(+), 44 deletions(-) (limited to 'klatin') diff --git a/klatin/klatin/data/vocab/en/I2L.kvtml b/klatin/klatin/data/vocab/en/I2L.kvtml index 99b30a78..367475ba 100644 --- a/klatin/klatin/data/vocab/en/I2L.kvtml +++ b/klatin/klatin/data/vocab/en/I2L.kvtml @@ -151,7 +151,7 @@ liberi (2) - tqchildren + children libero (1) diff --git a/klatin/klatin/klatinchoose.ui b/klatin/klatin/klatinchoose.ui index b93172c3..2a7a664b 100644 --- a/klatin/klatin/klatinchoose.ui +++ b/klatin/klatin/klatinchoose.ui @@ -46,7 +46,7 @@ Welcome to KLatin Please Choose Section of Revision - + AlignCenter diff --git a/klatin/klatin/klatingrammar.cpp b/klatin/klatin/klatingrammar.cpp index 8e666cab..0598547f 100644 --- a/klatin/klatin/klatingrammar.cpp +++ b/klatin/klatin/klatingrammar.cpp @@ -153,40 +153,40 @@ void KLatinGrammar::nextQuestion() // Question string... switch (m_grammarNumber) { case 1: - questionString = i18n("What is the nominative singular of %1?").tqarg(m_noun[0]); + questionString = i18n("What is the nominative singular of %1?").arg(m_noun[0]); break; case 2: - questionString = i18n("What is the vocative singular of %1?").tqarg(m_noun[0]); + questionString = i18n("What is the vocative singular of %1?").arg(m_noun[0]); break; case 3: - questionString = i18n("What is the accusative singular of %1?").tqarg(m_noun[0]); + questionString = i18n("What is the accusative singular of %1?").arg(m_noun[0]); break; case 4: - questionString = i18n("What is the genitive singular of %1?").tqarg(m_noun[0]); + questionString = i18n("What is the genitive singular of %1?").arg(m_noun[0]); break; case 5: - questionString = i18n("What is the dative singular of %1?").tqarg(m_noun[0]); + questionString = i18n("What is the dative singular of %1?").arg(m_noun[0]); break; case 6: - questionString = i18n("What is the ablative singular of %1?").tqarg(m_noun[0]); + questionString = i18n("What is the ablative singular of %1?").arg(m_noun[0]); break; case 7: - questionString = i18n("What is the nominative plural of %1?").tqarg(m_noun[0]); + questionString = i18n("What is the nominative plural of %1?").arg(m_noun[0]); break; case 8: - questionString = i18n("What is the vocative plural of %1?").tqarg(m_noun[0]); + questionString = i18n("What is the vocative plural of %1?").arg(m_noun[0]); break; case 9: - questionString = i18n("What is the accusative plural of %1?").tqarg(m_noun[0]); + questionString = i18n("What is the accusative plural of %1?").arg(m_noun[0]); break; case 10: - questionString = i18n("What is the genitive plural of %1?").tqarg(m_noun[0]); + questionString = i18n("What is the genitive plural of %1?").arg(m_noun[0]); break; case 11: - questionString = i18n("What is the dative plural of %1?").tqarg(m_noun[0]); + questionString = i18n("What is the dative plural of %1?").arg(m_noun[0]); break; case 12: - questionString = i18n("What is the ablative plural of %1?").tqarg(m_noun[0]); + questionString = i18n("What is the ablative plural of %1?").arg(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.").tqarg(m_noun[m_grammarNumber - 1]), i18n("Wrong")); + KMessageBox::information(this, i18n("The correct answer was %1.").arg(m_noun[m_grammarNumber - 1]), i18n("Wrong")); if (ChooseSection->currentItem()==0) loadDatabase(); else diff --git a/klatin/klatin/klatingrammarwidget.ui b/klatin/klatin/klatingrammarwidget.ui index 1ea323b0..256c2ad9 100644 --- a/klatin/klatin/klatingrammarwidget.ui +++ b/klatin/klatin/klatingrammarwidget.ui @@ -43,7 +43,7 @@ Grammar Section - + AlignCenter @@ -110,7 +110,7 @@ Line 2 Line 3 Line 4 - + WordBreak|AlignCenter @@ -187,7 +187,7 @@ Line 4 Score - + AlignCenter @@ -228,7 +228,7 @@ Line 4 0 - + AlignVCenter|AlignRight @@ -241,7 +241,7 @@ Line 4 / - + AlignCenter @@ -261,7 +261,7 @@ Line 4 PercentageLabel - + AlignCenter diff --git a/klatin/klatin/klatinresultsdialog.ui b/klatin/klatin/klatinresultsdialog.ui index 983ddc2f..4de8e7f9 100644 --- a/klatin/klatin/klatinresultsdialog.ui +++ b/klatin/klatin/klatinresultsdialog.ui @@ -31,7 +31,7 @@ <b>Your Results</b> - + WordBreak|AlignCenter @@ -119,7 +119,7 @@ - + AlignCenter @@ -150,7 +150,7 @@ - + AlignCenter diff --git a/klatin/klatin/klatinsettings_vocabpage.ui b/klatin/klatin/klatinsettings_vocabpage.ui index d659140d..bd35a37e 100644 --- a/klatin/klatin/klatinsettings_vocabpage.ui +++ b/klatin/klatin/klatinsettings_vocabpage.ui @@ -128,7 +128,7 @@ Number of questions: - + WordBreak|AlignVCenter diff --git a/klatin/klatin/klatinverbs.cpp b/klatin/klatin/klatinverbs.cpp index 3c0b6d52..70d42ed8 100644 --- a/klatin/klatin/klatinverbs.cpp +++ b/klatin/klatin/klatinverbs.cpp @@ -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?").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); + "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); 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.").tqarg(m_verb[m_verbNumber - 1]), i18n("Wrong")); + KMessageBox::information(this, i18n("The correct answer was %1.").arg(m_verb[m_verbNumber - 1]), i18n("Wrong")); nextQuestion(); } } else { diff --git a/klatin/klatin/klatinverbswidget.ui b/klatin/klatin/klatinverbswidget.ui index e866ba8f..415225ae 100644 --- a/klatin/klatin/klatinverbswidget.ui +++ b/klatin/klatin/klatinverbswidget.ui @@ -39,7 +39,7 @@ Verbs Section - + AlignCenter @@ -154,7 +154,7 @@ Line 2 Line 3 Line 4 - + WordBreak|AlignCenter @@ -231,7 +231,7 @@ Line 4 Score - + AlignCenter @@ -272,7 +272,7 @@ Line 4 0 - + AlignVCenter|AlignRight @@ -285,7 +285,7 @@ Line 4 / - + AlignCenter @@ -305,7 +305,7 @@ Line 4 PercentageLabel - + AlignCenter diff --git a/klatin/klatin/klatinvocabwidget.ui b/klatin/klatin/klatinvocabwidget.ui index 84b956ef..9b89d9e4 100644 --- a/klatin/klatin/klatinvocabwidget.ui +++ b/klatin/klatin/klatinvocabwidget.ui @@ -37,7 +37,7 @@ Vocabulary Section - + AlignCenter @@ -77,7 +77,7 @@ Question Word - + AlignCenter @@ -152,7 +152,7 @@ Score - + AlignCenter @@ -193,7 +193,7 @@ 0 - + AlignVCenter|AlignRight @@ -206,7 +206,7 @@ / - + AlignCenter @@ -226,7 +226,7 @@ PercentageLabel - + AlignCenter -- cgit v1.2.1