diff options
Diffstat (limited to 'khangman')
-rw-r--r-- | khangman/ChangeLog | 2 | ||||
-rw-r--r-- | khangman/khangman/advanced.ui | 2 | ||||
-rw-r--r-- | khangman/khangman/data/en/easy.kvtml | 4 | ||||
-rw-r--r-- | khangman/khangman/khangman.cpp | 14 | ||||
-rw-r--r-- | khangman/khangman/khangmanview.cpp | 20 | ||||
-rw-r--r-- | khangman/khangman/normal.ui | 2 | ||||
-rw-r--r-- | khangman/khangman/timerdlg.ui | 16 |
7 files changed, 30 insertions, 30 deletions
diff --git a/khangman/ChangeLog b/khangman/ChangeLog index 93419a47..337a55d6 100644 --- a/khangman/ChangeLog +++ b/khangman/ChangeLog @@ -1,5 +1,5 @@ June 23, 2005 -- add timers for KPassivePopup (Hint and Already Guessed) to allow young tqchildren to read (young tqchildren need more time) +- add timers for KPassivePopup (Hint and Already Guessed) to allow young children to read (young children need more time) - fixed hint position - tooltip if no Win dialog to say the game is finished (is displayed for 4 seconds) diff --git a/khangman/khangman/advanced.ui b/khangman/khangman/advanced.ui index 7910fab7..6290dd7c 100644 --- a/khangman/khangman/advanced.ui +++ b/khangman/khangman/advanced.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <vbox> <property name="name"> diff --git a/khangman/khangman/data/en/easy.kvtml b/khangman/khangman/data/en/easy.kvtml index 58338d21..8e2521aa 100644 --- a/khangman/khangman/data/en/easy.kvtml +++ b/khangman/khangman/data/en/easy.kvtml @@ -3,7 +3,7 @@ <kvtml encoding="UTF-8"> <e> <o>playtime</o> - <t>time assigned for tqchildren to play</t> + <t>time assigned for children to play</t> </e> <e> <o>furniture</o> @@ -134,7 +134,7 @@ <t>large group of persons</t> </e> <e> - <o>tqchildren</o> + <o>children</o> <t>young humans</t> </e> <e> diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp index 116d880b..9c3e54b4 100644 --- a/khangman/khangman/khangman.cpp +++ b/khangman/khangman/khangman.cpp @@ -228,7 +228,7 @@ void KHangMan::setLanguages() for (uint i=0; i<m_languages.count(); i++) { TQString tmp = m_languages[i]; if (!config->readEntry(tmp)) - config->writeEntry(tmp, TQString(TQDate::tqcurrentDate().toString(Qt::ISODate))); + config->writeEntry(tmp, TQString(TQDate::currentDate().toString(Qt::ISODate))); } // We look in $TDEDIR/share/locale/all_languages from @@ -420,22 +420,22 @@ void KHangMan::loadLangToolBar() m_allData.clear(); if (!m_noSpecialChars) { - TQString myString=TQString("khangman/%1.txt").tqarg(Prefs::selectedLanguage()); + TQString myString=TQString("khangman/%1.txt").arg(Prefs::selectedLanguage()); TQFile myFile; myFile.setName(locate("data", myString)); // Let's look in local TDEHOME dir then if (!myFile.exists()) { TQString myString=TQString("khangman/data/%1/%1.txt") - .tqarg(Prefs::selectedLanguage()) - .tqarg(Prefs::selectedLanguage()); + .arg(Prefs::selectedLanguage()) + .arg(Prefs::selectedLanguage()); myFile.setName(locate("data",myString)); kdDebug() << myString << endl; } if (!myFile.exists()) { TQString mString=i18n("File $TDEDIR/share/apps/khangman/%1.txt not found;\n" - "check your installation.").tqarg(Prefs::selectedLanguage()); + "check your installation.").arg(Prefs::selectedLanguage()); KMessageBox::sorry( this, mString, i18n("Error") ); kapp->quit(); @@ -457,7 +457,7 @@ void KHangMan::loadLangToolBar() secondToolbar->insertButton (charIcon(m_allData[i].at(0)), i, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotPasteChar()), true, - i18n("Inserts the character %1").tqarg(m_allData[i]), i+1 ); + i18n("Inserts the character %1").arg(m_allData[i]), i+1 ); } if (Prefs::showCharToolbar()) @@ -480,7 +480,7 @@ void KHangMan::slotPasteChar() TQString KHangMan::charIcon(const TQChar & c) { ///Create a name and path for the icon - TQString s = locateLocal("icon", "char" + TQString::number(c.tqunicode()) + ".png"); + TQString s = locateLocal("icon", "char" + TQString::number(c.unicode()) + ".png"); TQRect r(4, 4, 120, 120); diff --git a/khangman/khangman/khangmanview.cpp b/khangman/khangman/khangmanview.cpp index e3a646cf..3cf188e2 100644 --- a/khangman/khangman/khangmanview.cpp +++ b/khangman/khangman/khangmanview.cpp @@ -48,16 +48,16 @@ KHangManView::KHangManView(KHangMan*parent, const char *name) // The widget for entering letters. m_letterInput = new KLineEdit( this, "charWrite" ); - m_letterInput->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType) 1, + m_letterInput->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType) 1, (TQSizePolicy::SizeType) 0, 0, 0, m_letterInput->sizePolicy().hasHeightForWidth() ) ); m_letterInput->setMaxLength( 1 ); - m_letterInput->tqsetAlignment( int( TQLineEdit::AlignHCenter ) ); + m_letterInput->setAlignment( int( TQLineEdit::AlignHCenter ) ); // Press this button to enter a letter (or press enter) m_guessButton = new KPushButton( this, "guessButton" ); - m_guessButton->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType) 1, + m_guessButton->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType) 1, (TQSizePolicy::SizeType) 0, 0, 0, m_guessButton->sizePolicy().hasHeightForWidth() ) ); @@ -467,7 +467,7 @@ void KHangManView::slotTry() TQLabel *popLabel = new TQLabel( vb); popLabel->setFont(TQFont("Sans Serif", 14, TQFont::Normal)); - popLabel->setText(i18n("<qt>You lost!\nThe word was\n<b>%1</b></qt>").tqarg(m_word)); + popLabel->setText(i18n("<qt>You lost!\nThe word was\n<b>%1</b></qt>").arg(m_word)); popup->setView( vb ); TQPoint abspos = popup->pos(); @@ -586,15 +586,15 @@ void KHangManView::game() // Check if the data files are installed in the correct dir. TQString myString = TQString("khangman/data/%1/%2") - .tqarg(Prefs::selectedLanguage()) - .tqarg(Prefs::levelFile()); + .arg(Prefs::selectedLanguage()) + .arg(Prefs::levelFile()); TQFile myFile; myFile.setName(locate("data", myString)); if (!myFile.exists()) { TQString mString = i18n("File $TDEDIR/share/apps/khangman/data/%1/%2 not found!\n" "Check your installation, please!") - .tqarg(Prefs::selectedLanguage()) - .tqarg(Prefs::levelFile()); + .arg(Prefs::selectedLanguage()) + .arg(Prefs::levelFile()); KMessageBox::sorry( this, mString, i18n("Error") ); kapp->quit(); } @@ -666,7 +666,7 @@ void KHangManView::game() void KHangManView::readFile() { kdDebug() << "in read kvtml file " << endl; - TQString myString=TQString("khangman/data/%1/%2").tqarg(Prefs::selectedLanguage()).tqarg(Prefs::levelFile()); + TQString myString=TQString("khangman/data/%1/%2").arg(Prefs::selectedLanguage()).arg(Prefs::levelFile()); myString= locate("data", myString); KEduVocDataItemList verbs = KEduVocData::parse(myString); @@ -728,7 +728,7 @@ void KHangManView::loadAnimation() for (uint i = 0; i < 11; i++) { m_animationPics[i].load(locate( "data", TQString("khangman/pics/%1/animation%2.png") - .tqarg(m_themeName).tqarg(i) )); + .arg(m_themeName).arg(i) )); } } diff --git a/khangman/khangman/normal.ui b/khangman/khangman/normal.ui index b7d3df2e..99b31c4e 100644 --- a/khangman/khangman/normal.ui +++ b/khangman/khangman/normal.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> diff --git a/khangman/khangman/timerdlg.ui b/khangman/khangman/timerdlg.ui index dbd09dd7..fcea8d8b 100644 --- a/khangman/khangman/timerdlg.ui +++ b/khangman/khangman/timerdlg.ui @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -64,7 +64,7 @@ <string>Time during which the Hint is displayed</string> </property> <property name="whatsThis" stdset="0"> - <string>You can set the time for displaying the Hint tooltip. Default is 3 seconds but younger tqchildren might need longer time to be able to read the Hint.</string> + <string>You can set the time for displaying the Hint tooltip. Default is 3 seconds but younger children might need longer time to be able to read the Hint.</string> </property> </widget> <spacer row="2" column="0"> @@ -77,7 +77,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>295</width> <height>20</height> @@ -94,7 +94,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>25</width> <height>16</height> @@ -124,7 +124,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <grid> <property name="name"> @@ -178,7 +178,7 @@ <string>Time during which the Already Guessed tooltip is displayed</string> </property> <property name="whatsThis" stdset="0"> - <string>You can set the time for displaying the Already Guessed tooltip after you try a letter that was already guessed. Default is 3 seconds but younger tqchildren might need longer time to be able to understand they are trying a letter that was already guessed.</string> + <string>You can set the time for displaying the Already Guessed tooltip after you try a letter that was already guessed. Default is 3 seconds but younger children might need longer time to be able to understand they are trying a letter that was already guessed.</string> </property> </widget> <spacer row="3" column="1"> @@ -191,7 +191,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>25</width> <height>16</height> @@ -208,7 +208,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>295</width> <height>20</height> |