diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:58:43 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:58:43 -0600 |
commit | 2d7b541a4e0095d40e37aaefbf9c4a9b9d149302 (patch) | |
tree | 628c1676b27475e583cfd0c2105bb41b646654bf /klatin | |
parent | 6c3f7a55fb7888efc80a7350ef0c2f46ee02baa3 (diff) | |
download | tdeedu-2d7b541a4e0095d40e37aaefbf9c4a9b9d149302.tar.gz tdeedu-2d7b541a4e0095d40e37aaefbf9c4a9b9d149302.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 6c3f7a55fb7888efc80a7350ef0c2f46ee02baa3.
Diffstat (limited to 'klatin')
-rw-r--r-- | klatin/klatin/data/vocab/en/I2L.kvtml | 2 | ||||
-rw-r--r-- | klatin/klatin/klatinchoose.ui | 16 | ||||
-rw-r--r-- | klatin/klatin/klatingrammar.cpp | 26 | ||||
-rw-r--r-- | klatin/klatin/klatingrammarwidget.ui | 32 | ||||
-rw-r--r-- | klatin/klatin/klatinresultsdialog.ui | 12 | ||||
-rw-r--r-- | klatin/klatin/klatinsettings_vocabpage.ui | 10 | ||||
-rw-r--r-- | klatin/klatin/klatinverbs.cpp | 14 | ||||
-rw-r--r-- | klatin/klatin/klatinverbswidget.ui | 30 | ||||
-rw-r--r-- | klatin/klatin/klatinvocabwidget.ui | 34 |
9 files changed, 88 insertions, 88 deletions
diff --git a/klatin/klatin/data/vocab/en/I2L.kvtml b/klatin/klatin/data/vocab/en/I2L.kvtml index 367475ba..99b30a78 100644 --- a/klatin/klatin/data/vocab/en/I2L.kvtml +++ b/klatin/klatin/data/vocab/en/I2L.kvtml @@ -151,7 +151,7 @@ </e> <e> <o>liberi (2)</o> - <t>children</t> + <t>tqchildren</t> </e> <e> <o>libero (1)</o> diff --git a/klatin/klatin/klatinchoose.ui b/klatin/klatin/klatinchoose.ui index 36f0a6da..684ebc5a 100644 --- a/klatin/klatin/klatinchoose.ui +++ b/klatin/klatin/klatinchoose.ui @@ -26,7 +26,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout81</cstring> + <cstring>tqlayout81</cstring> </property> <vbox> <property name="name"> @@ -46,13 +46,13 @@ <string>Welcome to KLatin Please Choose Section of Revision</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout80</cstring> + <cstring>tqlayout80</cstring> </property> <hbox> <property name="name"> @@ -87,7 +87,7 @@ Please Choose Section of Revision</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -167,7 +167,7 @@ verb and noun tables</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> @@ -178,7 +178,7 @@ verb and noun tables</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout79</cstring> + <cstring>tqlayout79</cstring> </property> <vbox> <property name="name"> @@ -194,7 +194,7 @@ verb and noun tables</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>34</height> @@ -239,7 +239,7 @@ verb and noun tables</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>33</height> diff --git a/klatin/klatin/klatingrammar.cpp b/klatin/klatin/klatingrammar.cpp index 0598547f..8e666cab 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?").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/klatingrammarwidget.ui b/klatin/klatin/klatingrammarwidget.ui index 04dc1ca9..850945ed 100644 --- a/klatin/klatin/klatingrammarwidget.ui +++ b/klatin/klatin/klatingrammarwidget.ui @@ -12,7 +12,7 @@ <height>320</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -29,7 +29,7 @@ <property name="name"> <cstring>TitleGrammar</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -43,7 +43,7 @@ <property name="text"> <string>Grammar Section</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -51,7 +51,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout39</cstring> + <cstring>tqlayout39</cstring> </property> <hbox> <property name="name"> @@ -69,7 +69,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout40</cstring> + <cstring>tqlayout40</cstring> </property> <hbox> <property name="name"> @@ -87,7 +87,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -110,7 +110,7 @@ Line 2 Line 3 Line 4</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -133,13 +133,13 @@ Line 4</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -187,7 +187,7 @@ Line 4</string> <property name="text"> <string>Score</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -228,7 +228,7 @@ Line 4</string> <property name="text"> <string>0</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -241,7 +241,7 @@ Line 4</string> <property name="text"> <string>/</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -261,7 +261,7 @@ Line 4</string> <property name="name"> <cstring>PercentageLabel</cstring> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -280,7 +280,7 @@ Line 4</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout37</cstring> + <cstring>tqlayout37</cstring> </property> <hbox> <property name="name"> @@ -326,7 +326,7 @@ Line 4</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout21</cstring> + <cstring>tqlayout21</cstring> </property> <hbox> <property name="name"> @@ -342,7 +342,7 @@ Line 4</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>294</width> <height>20</height> diff --git a/klatin/klatin/klatinresultsdialog.ui b/klatin/klatin/klatinresultsdialog.ui index 4de14db7..84d15eec 100644 --- a/klatin/klatin/klatinresultsdialog.ui +++ b/klatin/klatin/klatinresultsdialog.ui @@ -31,7 +31,7 @@ <property name="text"> <string><b>Your Results</b></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -92,7 +92,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout83</cstring> + <cstring>tqlayout83</cstring> </property> <hbox> <property name="name"> @@ -119,7 +119,7 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="toolTip" stdset="0"> @@ -150,7 +150,7 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="toolTip" stdset="0"> @@ -164,7 +164,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout70</cstring> + <cstring>tqlayout70</cstring> </property> <hbox> <property name="name"> @@ -180,7 +180,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>291</width> <height>20</height> diff --git a/klatin/klatin/klatinsettings_vocabpage.ui b/klatin/klatin/klatinsettings_vocabpage.ui index 45642614..d659140d 100644 --- a/klatin/klatin/klatinsettings_vocabpage.ui +++ b/klatin/klatin/klatinsettings_vocabpage.ui @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout24</cstring> + <cstring>tqlayout24</cstring> </property> <hbox> <property name="name"> @@ -40,7 +40,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <vbox> <property name="name"> @@ -96,7 +96,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <vbox> <property name="name"> @@ -115,7 +115,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -128,7 +128,7 @@ <property name="text"> <string>Number of questions:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> <property name="toolTip" stdset="0"> diff --git a/klatin/klatin/klatinverbs.cpp b/klatin/klatin/klatinverbs.cpp index 70d42ed8..3c0b6d52 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?").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/klatinverbswidget.ui b/klatin/klatin/klatinverbswidget.ui index 4cfd546e..46492b5d 100644 --- a/klatin/klatin/klatinverbswidget.ui +++ b/klatin/klatin/klatinverbswidget.ui @@ -39,7 +39,7 @@ <property name="text"> <string>Verbs Section</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -47,7 +47,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout29</cstring> + <cstring>tqlayout29</cstring> </property> <hbox> <property name="name"> @@ -69,7 +69,7 @@ tested on</string> <property name="name"> <cstring>ChooseVoice</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>120</width> <height>0</height> @@ -99,7 +99,7 @@ tested on</string> <property name="name"> <cstring>ChangeButton</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>25</width> <height>32767</height> @@ -119,7 +119,7 @@ tested on</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> @@ -154,7 +154,7 @@ Line 2 Line 3 Line 4</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -177,13 +177,13 @@ Line 4</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -231,7 +231,7 @@ Line 4</string> <property name="text"> <string>Score</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -272,7 +272,7 @@ Line 4</string> <property name="text"> <string>0</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -285,7 +285,7 @@ Line 4</string> <property name="text"> <string>/</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -305,7 +305,7 @@ Line 4</string> <property name="name"> <cstring>PercentageLabel</cstring> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -324,7 +324,7 @@ Line 4</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> @@ -367,7 +367,7 @@ Line 4</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout29</cstring> + <cstring>tqlayout29</cstring> </property> <hbox> <property name="name"> @@ -383,7 +383,7 @@ Line 4</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>297</width> <height>20</height> diff --git a/klatin/klatin/klatinvocabwidget.ui b/klatin/klatin/klatinvocabwidget.ui index 6fd39ff2..6b1840f5 100644 --- a/klatin/klatin/klatinvocabwidget.ui +++ b/klatin/klatin/klatinvocabwidget.ui @@ -23,7 +23,7 @@ <property name="name"> <cstring>TitleLabel</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>500</width> <height>0</height> @@ -37,7 +37,7 @@ <property name="text"> <string>Vocabulary Section</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -45,7 +45,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout52</cstring> + <cstring>tqlayout52</cstring> </property> <hbox> <property name="name"> @@ -77,7 +77,7 @@ <property name="text"> <string>Question Word</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -98,7 +98,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -152,7 +152,7 @@ <property name="text"> <string>Score</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -193,7 +193,7 @@ <property name="text"> <string>0</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -206,7 +206,7 @@ <property name="text"> <string>/</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -226,7 +226,7 @@ <property name="name"> <cstring>PercentageLabel</cstring> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -245,7 +245,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout53</cstring> + <cstring>tqlayout53</cstring> </property> <hbox> <property name="name"> @@ -255,7 +255,7 @@ <property name="name"> <cstring>Answer1</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>40</height> @@ -272,7 +272,7 @@ <property name="name"> <cstring>Answer2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>40</height> @@ -289,7 +289,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout64</cstring> + <cstring>tqlayout64</cstring> </property> <hbox> <property name="name"> @@ -299,7 +299,7 @@ <property name="name"> <cstring>Answer3</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>40</height> @@ -316,7 +316,7 @@ <property name="name"> <cstring>Answer4</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>40</height> @@ -333,7 +333,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <hbox> <property name="name"> @@ -349,7 +349,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>326</width> <height>20</height> |