1 files changed, 19 insertions, 19 deletions

diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp
index 4d378ee6..39394d4b 100644
--- a/klettres/klettres/klettres.cpp
+++ b/klettres/klettres/klettres.cpp
@@ -66,7 +66,7 @@ KLettres::KLettres()
     Prefs::writeConfig();
     //MainWindow GUI: menus, tolbars and statusbar
     setupActions();
-    setupStatusbar();
+    setuptqStatusbar();
     setupToolbars();
     //Load Settings
     loadSettings();
@@ -107,7 +107,7 @@ void KLettres::findLanguages()
     TQStringList temp_languages;
     for (uint i=0;  i<m_languages.count(); i++)
     {
-        if (m_languages.contains(m_languages[i])>1) {
+        if (m_languages.tqcontains(m_languages[i])>1) {
             temp_languages.append(m_languages[i]);
             m_languages.remove(m_languages[i]);
         }
@@ -122,12 +122,12 @@ void KLettres::findLanguages()
     m_languages.sort();
     //write the present languages in config so they cannot be downloaded
     KConfig *config=kapp->config();
-    config->setGroup("KNewStuffStatus");
+    config->setGroup("KNewStufftqStatus");
     for (uint i=0;  i<m_languages.count(); i++)
     {
         TQString tmp = m_languages[i];
         if (!config->readEntry(tmp))
-            config->writeEntry(tmp, TQDate::currentDate().toString());
+            config->writeEntry(tmp, TQDate::tqcurrentDate().toString());
     }
     //we look in $KDEDIR/share/locale/all_languages from /kdelibs/kdecore/all_languages
     //to find the name of the country
@@ -156,7 +156,7 @@ TQString Prefs::defaultLanguage()
 	if (!defaultLanguages.isEmpty()) {
 	//scan to see if defaultLanguages[0] belongs to m_languages. If not, en is default.
 	int i = Prefs::self()->m_languages.findIndex(defaultLanguages[0]);
-		if (Prefs::self()->m_languages.contains(Prefs::language()))
+		if (Prefs::self()->m_languages.tqcontains(Prefs::language()))
 			return Prefs::language(); //the last language played
 		else if (i<1)
 			return "en"; //if no other
@@ -167,11 +167,11 @@ TQString Prefs::defaultLanguage()
 }
 
 
-bool KLettres::loadLayout(TQDomDocument &layoutDocument)
+bool KLettres::loadLayout(TQDomDocument &tqlayoutDocument)
 {
-    TQFile layoutFile(locate("data", "klettres/"+Prefs::language()+"/sounds.xml"));
+    TQFile tqlayoutFile(locate("data", "klettres/"+Prefs::language()+"/sounds.xml"));
     //if xml file is not found, program exits
-    if (!layoutFile.exists())
+    if (!tqlayoutFile.exists())
     {
         kdWarning() << "sounds.xml file not found in $KDEDIR/share/apps/klettres/"+Prefs::language() << endl;
         TQString mString=i18n("The file sounds.xml was not found in\n"
@@ -180,15 +180,15 @@ bool KLettres::loadLayout(TQDomDocument &layoutDocument)
         KMessageBox::information( this, mString,"KLettres - Error" );
         kapp->quit();//exit(1);
     }
-    if (!layoutFile.open(IO_ReadOnly))
+    if (!tqlayoutFile.open(IO_ReadOnly))
         return false;
     //Check if document is well-formed
-    if (!layoutDocument.setContent(&layoutFile))
+    if (!tqlayoutDocument.setContent(&tqlayoutFile))
     {
-        layoutFile.close();
+        tqlayoutFile.close();
         return false;
     }
-    layoutFile.close();
+    tqlayoutFile.close();
 
     return true;
 }
@@ -244,7 +244,7 @@ void KLettres::setupActions()
     setupGUI();
 }
 
-void KLettres::setupStatusbar()
+void KLettres::setuptqStatusbar()
 {
     KStatusBar *st=statusBar();
     m_langLabel = new TQLabel(st);
@@ -284,7 +284,7 @@ void KLettres::loadSettings()
     //m_view->selectedLanguage = selectedLanguage;
     m_languageAction->setCurrentItem(Prefs::languageNumber());
     TQString langString = m_languageNames[Prefs::languageNumber()];
-    langString.replace("&", TQString::null);
+    langString.tqreplace("&", TQString::null);
     m_langLabel->setText(i18n("Current language is %1").arg(langString));
     loadLangToolBar();
     // load default level
@@ -368,11 +368,11 @@ void KLettres::slotChangeLanguage(int newLanguage)
     Prefs::writeConfig();
     // Update the StatusBar
     TQString langString = m_languageNames[newLanguage];
-    langString.replace("&", TQString::null);
+    langString.tqreplace("&", TQString::null);
     m_langLabel->setText(i18n("Current language is %1").arg(langString));
     loadLangToolBar();
     // Change language effectively
-    bool ok = loadLayout(soundFactory->m_layoutsDocument);
+    bool ok = loadLayout(soundFactory->m_tqlayoutsDocument);
     if (ok)
         soundFactory->change(Prefs::language());
     m_view->game();
@@ -470,7 +470,7 @@ void KLettres::loadLangToolBar()
         openFileStream.open(IO_ReadOnly);
         TQTextStream readFileStr(&openFileStream);
         readFileStr.setEncoding(TQTextStream::UnicodeUTF8);
-        //allData contains all the words from the file
+        //allData tqcontains all the words from the file
         allData = TQStringList::split("\n", readFileStr.read(), true);
         openFileStream.close();
         for (int i=0; i<(int) allData.count(); i++) {
@@ -489,7 +489,7 @@ void KLettres::slotPasteChar()
 TQString KLettres::charIcon(const TQChar & c)
 {
     ///Create a name and path for the icon
-    TQString s = locateLocal("icon", "char" + TQString::number(c.unicode()) + ".png");
+    TQString s = locateLocal("icon", "char" + TQString::number(c.tqunicode()) + ".png");
 
     TQRect r(4, 4, 120, 120);
 
@@ -507,7 +507,7 @@ TQString KLettres::charIcon(const TQChar & c)
     p.setPen(Qt::black);
     p.drawText(r, Qt::AlignCenter, (TQString) c);
 
-    ///Create transparency mask
+    ///Create transparency tqmask
     TQBitmap bm(128, 128);
     bm.fill(Qt::color0);
     TQPainter b(&bm);