Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


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

7 files changed, 110 insertions, 110 deletions

diff --git a/khangman/khangman/advanced.ui b/khangman/khangman/advanced.ui
index ef8e1b24..02845c1a 100644
--- a/khangman/khangman/advanced.ui
+++ b/khangman/khangman/advanced.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>advanced</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -18,7 +18,7 @@
         </property>
         <widget class="QLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -91,5 +91,5 @@ For example, in Catalan, if this is unchecked and you type "o", the o and ò wil
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp
index 8cff801a..0b14829e 100644
--- a/khangman/khangman/khangman.cpp
+++ b/khangman/khangman/khangman.cpp
@@ -52,7 +52,7 @@ KHangMan::KHangMan()
 
     setCentralWidget(m_view);
     setLanguages();
-    setuptqStatusbar();
+    setupStatusbar();
     setupActions();
 
     // Toolbar for special characters
@@ -109,7 +109,7 @@ void KHangMan::setupActions()
 }
 
 // Set up the status bar with 4 different fields.
-void KHangMan::setuptqStatusbar()
+void KHangMan::setupStatusbar()
 {
     // set up the status bar
     statusBar( )->insertItem("   ",IDS_LEVEL,   0);
@@ -120,7 +120,7 @@ void KHangMan::setuptqStatusbar()
 
 
 // FIXME: Make this into a slot?
-void KHangMan::changetqStatusbar(const TQString& text, int id)
+void KHangMan::changeStatusbar(const TQString& text, int id)
 {
     statusBar()->changeItem(text, id);
 }
@@ -141,16 +141,16 @@ void KHangMan::slotQuit()
 void KHangMan::slotChangeLevel(int index)
 {
     levelString = levels[index];
-    changetqStatusbar(levelString, IDS_LEVEL);
+    changeStatusbar(levelString, IDS_LEVEL);
 #if 0
     if (m_view->levelFile == "world_capitals.kvtml" 
 	|| m_view->levelFile == "departements.kvtml")
-        changetqStatusbar(i18n("First letter upper case"), IDS_ACCENTS);
+        changeStatusbar(i18n("First letter upper case"), IDS_ACCENTS);
     else
-        changetqStatusbar("", IDS_ACCENTS);
+        changeStatusbar("", IDS_ACCENTS);
 #endif
     Prefs::setCurrentLevel(index);
-	levelString.tqreplace(0, 1, levelString.left(1).lower());
+	levelString.replace(0, 1, levelString.left(1).lower());
     Prefs::setLevelFile(levelString +".kvtml");
     Prefs::writeConfig();
     m_view->slotNewGame();
@@ -164,7 +164,7 @@ void KHangMan::slotChangeLanguage(int index)
     Prefs::writeConfig();
     loadLevels();
     loadLangToolBar();
-    changetqStatusbar(m_languageNames[m_languages.findIndex(Prefs::selectedLanguage())], IDS_LANG);
+    changeStatusbar(m_languageNames[m_languages.findIndex(Prefs::selectedLanguage())], IDS_LANG);
     setAccent();
     setMessages();
     m_view->slotNewGame();   
@@ -209,7 +209,7 @@ void KHangMan::setLanguages()
 
     TQStringList temp_languages;
     for (uint i=0;  i<m_languages.count(); i++) {
-        if (m_languages.tqcontains(m_languages[i])>1) {
+        if (m_languages.contains(m_languages[i])>1) {
             temp_languages.append(m_languages[i]);
             m_languages.remove(m_languages[i]);
         }
@@ -224,11 +224,11 @@ void KHangMan::setLanguages()
 
     // Write the present languages in config so they cannot be downloaded.
     KConfig *config=kapp->config();
-    config->setGroup("KNewStufftqStatus");
+    config->setGroup("KNewStuffStatus");
     for (uint i=0;  i<m_languages.count(); i++) {
         TQString tmp = m_languages[i];
         if (!config->readEntry(tmp))
-            config->writeEntry(tmp, TQDate::tqcurrentDate().toString(Qt::ISODate));
+            config->writeEntry(tmp, TQDate::currentDate().toString(Qt::ISODate));
     }
 
     // We look in $KDEDIR/share/locale/all_languages from
@@ -261,7 +261,7 @@ void KHangMan::loadSettings()
     selectedLanguage = Prefs::selectedLanguage();
     if (m_languages.grep(selectedLanguage).isEmpty())
             selectedLanguage = "en";
-    changetqStatusbar(m_languageNames[m_languages.findIndex(Prefs::selectedLanguage())], IDS_LANG);
+    changeStatusbar(m_languageNames[m_languages.findIndex(Prefs::selectedLanguage())], IDS_LANG);
     // Show/hide characters toolbar
     if (Prefs::showCharToolbar())
         secondToolbar->show();
@@ -276,8 +276,8 @@ void KHangMan::setLevel()
     if (currentLevel > (uint) levels.count()) 
         currentLevel= 0;
     levelString = levels[currentLevel];
-    levelString.tqreplace(0, 1, levelString.left(1).lower());
-    levelString = levels[currentLevel].tqreplace(0, 1, levels[currentLevel].left(1).lower()) ;
+    levelString.replace(0, 1, levelString.left(1).lower());
+    levelString = levels[currentLevel].replace(0, 1, levels[currentLevel].left(1).lower()) ;
 }
 
 void KHangMan::loadLevels()
@@ -299,7 +299,7 @@ void KHangMan::loadLevels()
                 levelBool = true;
             mString = mString.left(mString.length()-6);
             //Put the first letter in Upper case
-            mString = mString.tqreplace(0, 1, mString.left(1).upper());
+            mString = mString.replace(0, 1, mString.left(1).upper());
         levels+=mString;
     }
     //TODO else tell no files had been found
@@ -307,13 +307,13 @@ void KHangMan::loadLevels()
 
     // Sort easy, medium, hard at bottom, with the other categories at the top
     levels.sort();
-    TQString tqreplace[3] = { "Easy", "Medium", "Hard" };
+    TQString replace[3] = { "Easy", "Medium", "Hard" };
     for ( int i = 0; i < 3; ++i )
     {
-        if ( levels.findIndex( tqreplace[i] ) > -1 )
+        if ( levels.findIndex( replace[i] ) > -1 )
         {
-            levels.remove( tqreplace[i] );
-            levels.append( tqreplace[i] );
+            levels.remove( replace[i] );
+            levels.append( replace[i] );
         }
     }
 
@@ -338,7 +338,7 @@ void KHangMan::loadLevels()
 
     if (levelBool == false)
     {
-        Prefs::setLevelFile(levels[0].tqreplace(0, 1, levels[0].left(1).lower())+".kvtml");
+        Prefs::setLevelFile(levels[0].replace(0, 1, levels[0].left(1).lower())+".kvtml");
         Prefs::setCurrentLevel(0);
         currentLevel =0;
         Prefs::writeConfig();
@@ -351,8 +351,8 @@ void KHangMan::loadLevels()
     
     setLevel();
     TQString m_lstring = translatedLevels[currentLevel].utf8();
-    m_lstring.tqreplace(0, 1, m_lstring.left(1).upper());
-    changetqStatusbar(m_lstring, IDS_LEVEL);
+    m_lstring.replace(0, 1, m_lstring.left(1).upper());
+    changeStatusbar(m_lstring, IDS_LEVEL);
 }
 
 
@@ -448,7 +448,7 @@ void KHangMan::loadLangToolBar()
 	TQTextStream readFileStr(&openFileStream);
 	readFileStr.setEncoding(TQTextStream::UnicodeUTF8);
 
-	// m_allData tqcontains all the words from the file
+	// m_allData contains all the words from the file
 	// FIXME: Better name
 	m_allData = TQStringList::split("\n", readFileStr.read(), true);
 	openFileStream.close();
@@ -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);
 
@@ -498,7 +498,7 @@ TQString KHangMan::charIcon(const TQChar & c)
     p.setPen(Qt::black);
     p.drawText(r, Qt::AlignCenter, (TQString) c);
 
-    ///Create transparency tqmask
+    ///Create transparency mask
     TQBitmap bm(128, 128);
     bm.fill(Qt::color0);
     TQPainter b(&bm);
@@ -531,17 +531,17 @@ void KHangMan::setMessages()
 {
     // Tell the user about if there is a hint.
     if (Prefs::hint() && m_view->hintExists())
-        changetqStatusbar(i18n("Hint on right-click"), IDS_HINT);
+        changeStatusbar(i18n("Hint on right-click"), IDS_HINT);
     else if (m_view->hintExists() && !Prefs::hint() )
-        changetqStatusbar(i18n("Hint available"), IDS_HINT);
+        changeStatusbar(i18n("Hint available"), IDS_HINT);
     else
-        changetqStatusbar("", IDS_HINT);
+        changeStatusbar("", IDS_HINT);
 
     // Tell the user about accented characters
     if (m_view->accentedLetters() && Prefs::accentedLetters())
-        changetqStatusbar(i18n("Type accented letters"), IDS_ACCENTS);
+        changeStatusbar(i18n("Type accented letters"), IDS_ACCENTS);
     else
-        changetqStatusbar("", IDS_ACCENTS);
+        changeStatusbar("", IDS_ACCENTS);
 }
 
 #include "khangman.moc"
diff --git a/khangman/khangman/khangman.h b/khangman/khangman/khangman.h
index 35eddc33..7c47711a 100644
--- a/khangman/khangman/khangman.h
+++ b/khangman/khangman/khangman.h
@@ -63,16 +63,16 @@ public:
     virtual ~KHangMan();
     
     /**
-    Update the text in the tqStatusbar
+    Update the text in the Statusbar
     @param text the text that will be written in the statusbar
     @param id the label in which the text will be written
     */
-    void changetqStatusbar(const TQString& text, int id);
+    void changeStatusbar(const TQString& text, int id);
 
     ///Action that sets up the Language menu
     KSelectAction *m_languageAction;
 
-    ///Method to set the current language into the tqStatusbar and to pass it to KHangManView
+    ///Method to set the current language into the Statusbar and to pass it to KHangManView
     void setLanguages();
 
     ///Translated names of languages
@@ -86,8 +86,8 @@ public:
  private:
     ///Create the actions
     void setupActions();
-    ///Create the tqStatusbar
-    void setuptqStatusbar();
+    ///Create the Statusbar
+    void setupStatusbar();
 
     ///Selected language
     TQString selectedLanguage;
diff --git a/khangman/khangman/khangmanview.cpp b/khangman/khangman/khangmanview.cpp
index e5b7bcf7..8fc5bcc5 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() ) );
@@ -92,7 +92,7 @@ KHangManView::~KHangManView()
 // Handle a guess of the letter in sChar.
 //
 
-void KHangManView::tqreplaceLetters(const TQString& sChar)
+void KHangManView::replaceLetters(const TQString& sChar)
 {
     int   index = 0;
     bool  b_end = false;
@@ -101,52 +101,52 @@ void KHangManView::tqreplaceLetters(const TQString& sChar)
 
     // Replace letter in the word
     if (Prefs::oneLetter()) {
-	// We just tqreplace the next instance.
-        for (int count=0; count < m_word.tqcontains(sChar, false); count++) {
+	// We just replace the next instance.
+        for (int count=0; count < m_word.contains(sChar, false); count++) {
 
             index = m_word.find(sChar, index, false);
             if (m_goodWord.at(2*index)=='_') {
-		m_goodWord.tqreplace((2*index), 1, m_word.at(index));
+		m_goodWord.replace((2*index), 1, m_word.at(index));
 
                 kdDebug() << "m_goodword " << m_goodWord << endl;
-                if (count == m_word.tqcontains(sChar, false)-1)
+                if (count == m_word.contains(sChar, false)-1)
 		    b_end = true;
                 break;
             }
 	    else
 		index++;
 
-	    if (count == m_word.tqcontains(sChar, false)-1)
+	    if (count == m_word.contains(sChar, false)-1)
 		b_end = true;
         }
     }
     else {
-        for (int count=0; count < m_word.tqcontains(sChar, false); count++) {
+        for (int count=0; count < m_word.contains(sChar, false); count++) {
             //searching for letter location
             index = m_word.find(sChar, index, false);
-            //we tqreplace it...
-            m_goodWord.tqreplace((2*index), 1,m_word.at(index));
+            //we replace it...
+            m_goodWord.replace((2*index), 1,m_word.at(index));
             index++;
 	}
     }
 
     if (m_accentedLetters && !Prefs::accentedLetters()) {
-        if (sChar=="i") tqreplaceLetters(TQString::fromUtf8("í"));
-        if (sChar=="a") tqreplaceLetters(TQString::fromUtf8("à"));
-        if (sChar=="a") tqreplaceLetters(TQString::fromUtf8("á"));
-        if (sChar=="a") tqreplaceLetters(TQString::fromUtf8("ã"));
-        if (sChar=="u") tqreplaceLetters(TQString::fromUtf8("ü"));
-        if (sChar=="o") tqreplaceLetters(TQString::fromUtf8("ò"));
-        if (sChar=="o") tqreplaceLetters(TQString::fromUtf8("ó"));
-        if (sChar=="o") tqreplaceLetters(TQString::fromUtf8("õ"));
-        if (sChar=="e") tqreplaceLetters(TQString::fromUtf8("è"));
-        if (sChar=="e") tqreplaceLetters(TQString::fromUtf8("é"));
-        if (sChar=="u") tqreplaceLetters(TQString::fromUtf8("ù"));
+        if (sChar=="i") replaceLetters(TQString::fromUtf8("í"));
+        if (sChar=="a") replaceLetters(TQString::fromUtf8("à"));
+        if (sChar=="a") replaceLetters(TQString::fromUtf8("á"));
+        if (sChar=="a") replaceLetters(TQString::fromUtf8("ã"));
+        if (sChar=="u") replaceLetters(TQString::fromUtf8("ü"));
+        if (sChar=="o") replaceLetters(TQString::fromUtf8("ò"));
+        if (sChar=="o") replaceLetters(TQString::fromUtf8("ó"));
+        if (sChar=="o") replaceLetters(TQString::fromUtf8("õ"));
+        if (sChar=="e") replaceLetters(TQString::fromUtf8("è"));
+        if (sChar=="e") replaceLetters(TQString::fromUtf8("é"));
+        if (sChar=="u") replaceLetters(TQString::fromUtf8("ù"));
     }
     if (!Prefs::oneLetter()) 
         m_guessedLetters << sChar; //appends the list only if not in One Letter only mode...
 
-    if (m_word.tqcontains(sChar, false) == 1) 
+    if (m_word.contains(sChar, false) == 1) 
         m_guessedLetters << sChar; //append if only one instance
 
     if (Prefs::oneLetter() && b_end) 
@@ -154,33 +154,33 @@ void KHangManView::tqreplaceLetters(const TQString& sChar)
 }
 
 
-bool KHangManView::tqcontainsChar(const TQString &sChar)
+bool KHangManView::containsChar(const TQString &sChar)
 {
     bool b = false;
     if (m_accentedLetters && !Prefs::accentedLetters()) {
         if (sChar=="i")
-	    b = m_word.tqcontains(TQString::fromUtf8("í"), false);
+	    b = m_word.contains(TQString::fromUtf8("í"), false);
 
         if (sChar=="a")
-	    b = m_word.tqcontains(TQString::fromUtf8("à"), false)
-		|| m_word.tqcontains(TQString::fromUtf8("á"), false)
-		|| m_word.tqcontains(TQString::fromUtf8("ã"), false);
+	    b = m_word.contains(TQString::fromUtf8("à"), false)
+		|| m_word.contains(TQString::fromUtf8("á"), false)
+		|| m_word.contains(TQString::fromUtf8("ã"), false);
 
         if (sChar=="u")
-	    b = m_word.tqcontains(TQString::fromUtf8("ü"), false)
-		|| m_word.tqcontains(TQString::fromUtf8("ù"), false);
+	    b = m_word.contains(TQString::fromUtf8("ü"), false)
+		|| m_word.contains(TQString::fromUtf8("ù"), false);
 
         if (sChar=="o")
-	    b = m_word.tqcontains(TQString::fromUtf8("ò"), false)
-		|| m_word.tqcontains(TQString::fromUtf8("ó"), false)
-		|| m_word.tqcontains(TQString::fromUtf8("õ"), false);
+	    b = m_word.contains(TQString::fromUtf8("ò"), false)
+		|| m_word.contains(TQString::fromUtf8("ó"), false)
+		|| m_word.contains(TQString::fromUtf8("õ"), false);
 
         if (sChar=="e")
-	    b = m_word.tqcontains(TQString::fromUtf8("è"), false)
-		|| m_word.tqcontains(TQString::fromUtf8("é"), false);
+	    b = m_word.contains(TQString::fromUtf8("è"), false)
+		|| m_word.contains(TQString::fromUtf8("é"), false);
     }
 
-    return (b || m_word.tqcontains(sChar, false));
+    return (b || m_word.contains(sChar, false));
 }
 
 
@@ -234,7 +234,7 @@ void KHangManView::setTheme()
 void KHangManView::paintEvent( TQPaintEvent * )
 {
     // This pixmap implements double buffering to remove all forms of
-    // flicker in the tqrepainting.
+    // flicker in the repainting.
     TQPixmap   buf(width(), height());
 
     // Repaint the contents of the khangman view into the pixmap.
@@ -379,21 +379,21 @@ void KHangManView::slotTry()
     }
 
     // Handle the guess.
-    if (!m_guessedLetters.tqcontains(guess.lower())) {
+    if (!m_guessedLetters.contains(guess.lower())) {
 	// The letter is not already guessed.
 	
-	if (tqcontainsChar(guess)) {
-	    tqreplaceLetters(guess);
+	if (containsChar(guess)) {
+	    replaceLetters(guess);
 
 	    // This is needed because of the white spaces.
 	    TQString  stripWord = m_goodWord;
 	    TQString  sword     = m_word;
 	    if (dd > 0)  {
-		stripWord.tqreplace(2*c,   1, "");
-		stripWord.tqreplace(2*c-1, 1, "");
+		stripWord.replace(2*c,   1, "");
+		stripWord.replace(2*c-1, 1, "");
 
-		stripWord.tqreplace(2*(dd-1),   1, "");
-		stripWord.tqreplace(2*(dd-1)-1, 1, "");
+		stripWord.replace(2*(dd-1),   1, "");
+		stripWord.replace(2*(dd-1)-1, 1, "");
 	    }
 
 	    TQStringList  rightChars = TQStringList::split(" ", stripWord, true);
@@ -442,7 +442,7 @@ void KHangManView::slotTry()
 
 	    m_guessedLetters << guess.lower();	
             m_guessedLetters << guess.upper();
-	    m_missedLetters = m_missedLetters.tqreplace((2 * m_numMissedLetters), 
+	    m_missedLetters = m_missedLetters.replace((2 * m_numMissedLetters), 
 						      1, guess.lower());
 	    m_numMissedLetters++;
 	    update();
@@ -496,7 +496,7 @@ void KHangManView::slotTry()
 
 	int  x = 0;
 	int  y = 0;
-	if (m_missedLetters.tqcontains(guess, false) > 0) {
+	if (m_missedLetters.contains(guess, false) > 0) {
 	    // FIXME: popup should be better placed.
 
 	    TQPoint abspos = popup->pos();
@@ -513,7 +513,7 @@ void KHangManView::slotTry()
 	    m_letterInput->setEnabled(false);
 	}
 
-	if (m_goodWord.tqcontains(guess, false) > 0) {
+	if (m_goodWord.contains(guess, false) > 0) {
 	    TQPoint abspos = popup->pos();
 
 	    if (Prefs::mode() == 0) {
@@ -605,7 +605,7 @@ void KHangManView::game()
     TQTextStream readFileStr(&openFileStream);
     readFileStr.setEncoding(TQTextStream::UnicodeUTF8);
 
-    // Alldata tqcontains all the words from the file
+    // Alldata contains all the words from the file
     TQStringList allData = TQStringList::split("\n", readFileStr.read(), true);
     openFileStream.close();
 
@@ -633,11 +633,11 @@ void KHangManView::game()
     // 1. Find dashes.
     int f = m_word.find( "-" );
     if (f>0) {
-        m_goodWord.tqreplace(2*f, 1, "-");
+        m_goodWord.replace(2*f, 1, "-");
 
         int g = m_word.find( "-", f+1);
         if (g>0) 
-	    m_goodWord.tqreplace(2*g, 3, "-");
+	    m_goodWord.replace(2*g, 3, "-");
         if (g>1)
 	    m_goodWord.append("_");
     }
@@ -645,21 +645,21 @@ void KHangManView::game()
     // 2. Find white space.
     c = m_word.find( " " );
     if (c > 0) {
-        m_goodWord.tqreplace(2*c, 1, " ");
+        m_goodWord.replace(2*c, 1, " ");
         dd = m_word.find( " ", c+1);
         if (dd > 0)
-	    m_goodWord.tqreplace(2*dd, c+1, " ");
+	    m_goodWord.replace(2*dd, c+1, " ");
     }
 
     // 3. Find ·
     int e = m_word.find( TQString::fromUtf8("·") );
     if (e>0)
-	m_goodWord.tqreplace(2*e, 1, TQString::fromUtf8("·") );
+	m_goodWord.replace(2*e, 1, TQString::fromUtf8("·") );
 
     // 4. Find '
     int h = m_word.find( "'" );
     if (h>0)
-	m_goodWord.tqreplace(2*h, 1, "'");
+	m_goodWord.replace(2*h, 1, "'");
 }
 
 
@@ -693,7 +693,7 @@ void KHangManView::readFile()
         m_hintExists = false;	// Hint does not exist.
 
 	// FIXME: Make this a signal instead.
-        khangman->changetqStatusbar("", 103);
+        khangman->changeStatusbar("", 103);
     }
     else {
         m_hintExists = true;
diff --git a/khangman/khangman/khangmanview.h b/khangman/khangman/khangmanview.h
index e20dcf29..7ffffcf2 100644
--- a/khangman/khangman/khangmanview.h
+++ b/khangman/khangman/khangmanview.h
@@ -115,10 +115,10 @@ private:
     /// Set the background pixmap to the TQPixmap argument.
     void setBackground(TQPixmap& );
 
-    /// Return true if the word tqcontains the char in the TQString.
-    bool  tqcontainsChar(const TQString &);
+    /// Return true if the word contains the char in the TQString.
+    bool  containsChar(const TQString &);
 
-    void  tqreplaceLetters(const TQString &);
+    void  replaceLetters(const TQString &);
 
 public slots:
     /// If you want to play with a new word
@@ -173,7 +173,7 @@ private:
     bool             m_hintExists;
     TQString          m_hint;
 
-    /// true if the language tqcontains accented letters.  
+    /// true if the language contains accented letters.  
     /// This is true for, among others, es, ca, pt or pt_BR
     bool             m_accentedLetters;
     
diff --git a/khangman/khangman/normal.ui b/khangman/khangman/normal.ui
index efdb6bad..f9673223 100644
--- a/khangman/khangman/normal.ui
+++ b/khangman/khangman/normal.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>normal</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -18,7 +18,7 @@
         </property>
         <widget class="QLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -35,7 +35,7 @@
                         <string>Check this if you do not want to display each instance of the same letter</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>If you check this box, only the first letter will be written if the letter is found in several places in the word. Then when you rechoose this letter, it will tqreplace the second instance in the word until there are no more instances of this letter.
+                        <string>If you check this box, only the first letter will be written if the letter is found in several places in the word. Then when you rechoose this letter, it will replace the second instance in the word until there are no more instances of this letter.
 For example, the word to guess is "potato". If this option is unchecked, when you try "o", the 2 "o" in the word will be discovered at the same time. If this is checked, you will need to try "o" twice.
 
 Default is that for one letter typed, all instances of that letter in the word are displayed.</string>
@@ -90,5 +90,5 @@ Default is no sound.</string>
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/khangman/khangman/timerdlg.ui b/khangman/khangman/timerdlg.ui
index efe6f570..facfaaa1 100644
--- a/khangman/khangman/timerdlg.ui
+++ b/khangman/khangman/timerdlg.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>timerdlg</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -29,7 +29,7 @@
                 </property>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -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="QLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -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>
@@ -221,7 +221,7 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
     <includehint>kactivelabel.h</includehint>