1 files changed, 27 insertions, 27 deletions

diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
index d0715a1d..f3568543 100644
--- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
@@ -689,7 +689,7 @@ LanguageOptions::LanguageOptions(LangSet & langset, TQWidget* parent, const char
   connect(d_shortName, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotShortActivated(const TQString&)));
   connect(e_langLong, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotLangChanged(const TQString&)));
   connect(e_shortName2, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotShort2Changed(const TQString&)));
-  connect(d_kbtqlayout, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotKeyboardLayoutChanged(const TQString&)));
+  connect(d_kblayout, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotKeyboardLayoutChanged(const TQString&)));
 
   // Load the languages first, then the countries and create the
   // menus for the languages last, so they will have flags
@@ -768,13 +768,13 @@ void LanguageOptions::slotDeleteClicked()
   enableLangWidgets();
 
   // doesn't work yet
-  if (d_shortName->count() != 0 && d_kbtqlayout->isEnabled())
+  if (d_shortName->count() != 0 && d_kblayout->isEnabled())
   {
-    for (int i = 0; i < d_kbtqlayout->count(); i++)
+    for (int i = 0; i < d_kblayout->count(); i++)
     {
-      if (d_kbtqlayout->text(i) == m_langSet.keyboardLayout(d_shortName->currentItem()))
+      if (d_kblayout->text(i) == m_langSet.keyboardLayout(d_shortName->currentItem()))
       {
-        d_kbtqlayout->setCurrentItem(i);
+        d_kblayout->setCurrentItem(i);
         break;
       }
     }
@@ -782,9 +782,9 @@ void LanguageOptions::slotDeleteClicked()
 }
 
 
-void LanguageOptions::slotKeyboardLayoutChanged(const TQString& tqlayout)
+void LanguageOptions::slotKeyboardLayoutChanged(const TQString& layout)
 {
-  m_langSet.setKeyboardLayout(tqlayout, d_shortName->currentItem());
+  m_langSet.setKeyboardLayout(layout, d_shortName->currentItem());
   emit widgetModified();
   m_hasChanged = true;
 }
@@ -818,16 +818,16 @@ void LanguageOptions::enableLangWidgets()
         TQDataStream stream(replyData, IO_ReadOnly);
         stream >> layouts;
         layouts.prepend(TQString());
-        d_kbtqlayout->clear();
-        d_kbtqlayout->insertStringList(layouts);
+        d_kblayout->clear();
+        d_kblayout->insertStringList(layouts);
       }
     }
   }
   else
   {
     //kdDebug() << "kxkb not enabled" << endl;
-    d_kbtqlayout->clear();
-    d_kbtqlayout->setEnabled(false);
+    d_kblayout->clear();
+    d_kblayout->setEnabled(false);
   }
 }
 
@@ -898,22 +898,22 @@ void LanguageOptions::slotShortActivated(const TQString& _id)
      else
        b_langPixmap->setText (i18n("No Picture Selected"));
 
-     TQString tqlayout = m_langSet.keyboardLayout(d_shortName->currentItem());
+     TQString layout = m_langSet.keyboardLayout(d_shortName->currentItem());
 
-     //kdDebug() << "tqlayout to select " << tqlayout << endl;
+     //kdDebug() << "layout to select " << layout << endl;
 
-     for (int i = 0; i < d_kbtqlayout->count(); i++)
+     for (int i = 0; i < d_kblayout->count(); i++)
      {
-      if (d_kbtqlayout->text(i) == tqlayout)
+      if (d_kblayout->text(i) == layout)
        {
-        d_kbtqlayout->setCurrentItem(i);
+        d_kblayout->setCurrentItem(i);
         break;
        }
      }
      // not found
-     if (d_kbtqlayout->currentText() != tqlayout)
+     if (d_kblayout->currentText() != layout)
      {
-       d_kbtqlayout->setCurrentItem(0);
+       d_kblayout->setCurrentItem(0);
      }
    }
 }
@@ -1015,8 +1015,8 @@ void LanguageOptions::loadCountryData()
   locale.setLanguage(curr_lang);
   KGlobal::_locale = &locale;
 
-  TQString sub = TQString::tqfromLatin1("l10n/");
-  TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*.desktop"));
+  TQString sub = TQString::fromLatin1("l10n/");
+  TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop"));
   regionlist.sort();
 
   TQMap<TQString, Region>  regions;
@@ -1033,22 +1033,22 @@ void LanguageOptions::loadCountryData()
     if (index != -1) tag.truncate(index);
 
     KSimpleConfig entry(*it);
-    entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
-    TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name"));
+    entry.setGroup(TQString::fromLatin1("KCM Locale"));
+    TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
 
     regions.insert(tag, Region(name));
   }
 
   // add all languages to the list
-  TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*/entry.desktop"));
+  TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*/entry.desktop"));
 
   int idx = 0;
   for (TQStringList::ConstIterator sit = countrylist.begin(); sit != countrylist.end(); ++sit)
   {
     KSimpleConfig entry(*sit);
-    entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
-    TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name"));
-    TQString submenu = entry.readEntry(TQString::tqfromLatin1("Region"));
+    entry.setGroup(TQString::fromLatin1("KCM Locale"));
+    TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
+    TQString submenu = entry.readEntry(TQString::fromLatin1("Region"));
 
     TQString tag = *sit;
     int index = tag.findRev('/');
@@ -1059,7 +1059,7 @@ void LanguageOptions::loadCountryData()
     if (tag == "C")
       continue;
 
-    TQStringList all_langs = TQStringList::split(",", entry.readEntry(TQString::tqfromLatin1("Languages")));
+    TQStringList all_langs = TQStringList::split(",", entry.readEntry(TQString::fromLatin1("Languages")));
     TQValueList<int> langs;
 
     TQString pixmap = *sit;