Rename a number of old tq methods that are no longer tq specific

21 files changed, 88 insertions, 88 deletions

diff --git a/kmouth/configwizard.cpp b/kmouth/configwizard.cpp
index 3ca0b5c..1fc70a0 100644
--- a/kmouth/configwizard.cpp
+++ b/kmouth/configwizard.cpp
@@ -17,7 +17,7 @@
 
 
 #include "configwizard.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klistview.h>
 #include <klocale.h>
diff --git a/kmouth/kmouth.h b/kmouth/kmouth.h
index fe610a6..b8d791d 100644
--- a/kmouth/kmouth.h
+++ b/kmouth/kmouth.h
@@ -79,7 +79,7 @@ class KMouthApp : public KMainWindow
     void enableMenuEntries(bool existSelectedEntries, bool existDeselectedEntries);
 
   protected:
-    /** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration
+    /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration
      * file
      */
     void saveOptions();
diff --git a/kmouth/optionsdialog.cpp b/kmouth/optionsdialog.cpp
index a32eb6e..89842a3 100644
--- a/kmouth/optionsdialog.cpp
+++ b/kmouth/optionsdialog.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
 #include <tqgrid.h>
@@ -125,11 +125,11 @@ OptionsDialog::OptionsDialog (TQWidget *parent)
    tabCtl = new TQTabWidget (pageGeneral, "general");
 
    behaviourWidget = new PreferencesWidget (tabCtl, "prefPage");
-   behaviourWidget->tqlayout()->setMargin(KDialog::marginHint());
+   behaviourWidget->layout()->setMargin(KDialog::marginHint());
    tabCtl->addTab (behaviourWidget, i18n("&Preferences"));
    
    commandWidget = new TextToSpeechConfigurationWidget (tabCtl, "ttsTab");
-   commandWidget->tqlayout()->setMargin(KDialog::marginHint());
+   commandWidget->layout()->setMargin(KDialog::marginHint());
    tabCtl->addTab (commandWidget, i18n("&Text-to-Speech"));
    
    TQPixmap iconCompletion = KGlobal::iconLoader()->loadIcon("keyboard", KIcon::NoGroup, KIcon::SizeMedium);
diff --git a/kmouth/phrasebook/phrasebook.cpp b/kmouth/phrasebook/phrasebook.cpp
index 2332ee6..ffa3ff2 100644
--- a/kmouth/phrasebook/phrasebook.cpp
+++ b/kmouth/phrasebook/phrasebook.cpp
@@ -151,7 +151,7 @@ TQCString encodeString (const TQString str) {
    TQCString res = "";
    for (int i = 0; i < (int)str.length(); i++) {
       TQChar ch = str.at(i);
-      ushort uc = ch.tqunicode();
+      ushort uc = ch.unicode();
       TQCString number; number.setNum(uc);
       if ((uc>127) || (uc<32) || (ch=='<') || (ch=='>') || (ch=='&') || (ch==';'))
          res = res + "&#" + number + ";";
@@ -274,8 +274,8 @@ int PhraseBook::save (TQWidget *parent, const TQString &title, KURL &url, bool p
    }
 
    if (KIO::NetAccess::exists(url)) {
-      if (KMessageBox::warningContinueCancel(0,TQString("<qt>%1</qt>").tqarg(i18n("The file %1 already exists. "
-                                                       "Do you want to overwrite it?").tqarg(url.url())),i18n("File Exists"),i18n("&Overwrite"))==KMessageBox::Cancel) {
+      if (KMessageBox::warningContinueCancel(0,TQString("<qt>%1</qt>").arg(i18n("The file %1 already exists. "
+                                                       "Do you want to overwrite it?").arg(url.url())),i18n("File Exists"),i18n("&Overwrite"))==KMessageBox::Cancel) {
          return 0;
       }
    }
@@ -286,8 +286,8 @@ int PhraseBook::save (TQWidget *parent, const TQString &title, KURL &url, bool p
          url.setFileName (url.fileName(false) + ".phrasebook");
       }
       else if (url.fileName (false).right (11).contains (".phrasebook", false) == 0) {
-         int filetype = KMessageBox::questionYesNoCancel (0,TQString("<qt>%1</qt>").tqarg(i18n("Your chosen filename <i>%1</i> has a different extension than <i>.phrasebook</i>. "
-                                                           "Do you wish to add <i>.phrasebook</i> to the filename?").tqarg(url.filename())),i18n("File Extension"),i18n("Add"),i18n("Do Not Add"));
+         int filetype = KMessageBox::questionYesNoCancel (0,TQString("<qt>%1</qt>").arg(i18n("Your chosen filename <i>%1</i> has a different extension than <i>.phrasebook</i>. "
+                                                           "Do you wish to add <i>.phrasebook</i> to the filename?").arg(url.filename())),i18n("File Extension"),i18n("Add"),i18n("Do Not Add"));
          if (filetype == KMessageBox::Cancel) {
             return 0;
          }
@@ -302,8 +302,8 @@ int PhraseBook::save (TQWidget *parent, const TQString &title, KURL &url, bool p
          result = save (url, false);
       }
       else {
-         int filetype = KMessageBox::questionYesNoCancel (0,TQString("<qt>%1</qt>").tqarg(i18n("Your chosen filename <i>%1</i> has the extension <i>.phrasebook</i>. "
-                                                           "Do you wish to save in phrasebook format?").tqarg(url.filename())),i18n("File Extension"),i18n("As Phrasebook"),i18n("As Plain Text"));
+         int filetype = KMessageBox::questionYesNoCancel (0,TQString("<qt>%1</qt>").arg(i18n("Your chosen filename <i>%1</i> has the extension <i>.phrasebook</i>. "
+                                                           "Do you wish to save in phrasebook format?").arg(url.filename())),i18n("File Extension"),i18n("As Phrasebook"),i18n("As Plain Text"));
          if (filetype == KMessageBox::Cancel) {
             return 0;
          }
@@ -477,15 +477,15 @@ const char *PhraseBookDrag::format (int i) const {
       return xmlphrasebook.format(i/3);
 }
 
-TQByteArray PhraseBookDrag::tqencodedData (const char* mime) const {
+TQByteArray PhraseBookDrag::encodedData (const char* mime) const {
    TQCString m(mime);
    m = m.lower();
    if (m.contains("xml-phrasebook"))
-      return xmlphrasebook.tqencodedData(mime);
+      return xmlphrasebook.encodedData(mime);
    else if (m.contains("xml"))
-      return xml.tqencodedData(mime);
+      return xml.encodedData(mime);
    else
-      return plain.tqencodedData(mime);
+      return plain.encodedData(mime);
 }
 
 bool PhraseBookDrag::canDecode (const TQMimeSource* e) {
diff --git a/kmouth/phrasebook/phrasebook.h b/kmouth/phrasebook/phrasebook.h
index 200bbae..25f1d37 100644
--- a/kmouth/phrasebook/phrasebook.h
+++ b/kmouth/phrasebook/phrasebook.h
@@ -157,7 +157,7 @@ public:
    virtual void setBook (PhraseBook *book);
 
    const char *format (int i) const;
-   virtual TQByteArray tqencodedData (const char *) const;
+   virtual TQByteArray encodedData (const char *) const;
 
    static bool canDecode (const TQMimeSource *e);
    static bool decode (const TQMimeSource *e, PhraseBook *book);
diff --git a/kmouth/phrasebook/phrasebookdialog.cpp b/kmouth/phrasebook/phrasebookdialog.cpp
index 3cfe25b..50a5b05 100644
--- a/kmouth/phrasebook/phrasebookdialog.cpp
+++ b/kmouth/phrasebook/phrasebookdialog.cpp
@@ -17,8 +17,8 @@
 
 // include files for QT
 #include <tqapplication.h>
-#include <tqlayout.h>
-#include <tqclipboard.h>
+#include <layout.h>
+#include <clipboard.h>
 #include <tqradiobutton.h>
 #include <tqevent.h>
 #include <tqpainter.h>
@@ -132,7 +132,7 @@ void CheckBookItem::childChange (int numberDiff, int selDiff) {
       ((CheckBookItem*)parent)->childChange (numberDiff, selDiff);
 
    TQString text = i18n(" (%1 of %2 books selected)");
-   text = text.tqarg(selectedBooks).tqarg(numberOfBooks);
+   text = text.arg(selectedBooks).arg(numberOfBooks);
    setText(0, this->text(PhraseBookPrivate::name)+text);
 }
 
@@ -597,7 +597,7 @@ void PhraseBookDialog::setShortcut( const KShortcut& cut ) {
       {
          TQString s = i18n("In order to use the '%1' key as a shortcut, "
                           "it must be combined with the "
-                          "Win, Alt, Ctrl, and/or Shift keys.").tqarg(TQChar(key.sym()));
+                          "Win, Alt, Ctrl, and/or Shift keys.").arg(TQChar(key.sym()));
          KMessageBox::sorry( this, s, i18n("Invalid Shortcut Key") );
          return;
       }
@@ -667,12 +667,12 @@ void PhraseBookDialog::slotCut () {
 void PhraseBookDialog::slotCopy () {
    PhraseBook book;
    treeView->fillBook (&book, true);
-   TQApplication::tqclipboard()->setData(new PhraseBookDrag(&book));
+   TQApplication::clipboard()->setData(new PhraseBookDrag(&book));
 }
 
 void PhraseBookDialog::slotPaste () {
    PhraseBook book;
-   if (PhraseBookDrag::decode(TQApplication::tqclipboard()->data(), &book)) {
+   if (PhraseBookDrag::decode(TQApplication::clipboard()->data(), &book)) {
       addBook (treeView->currentItem(), &book);
    }
 }
@@ -731,7 +731,7 @@ void PhraseBookDialog::slotImportPhrasebook (const KURL &url) {
       if (book.open (url))
          addBook(treeView->currentItem(), &book);
       else
-         KMessageBox::sorry(this,i18n("There was an error loading file\n%1").tqarg( url.url() ));
+         KMessageBox::sorry(this,i18n("There was an error loading file\n%1").arg( url.url() ));
    }
 }
 
@@ -741,7 +741,7 @@ void PhraseBookDialog::slotExportPhrasebook () {
    
    KURL url;
    if (book.save (this, i18n("Export Phrase Book"), url) == -1)
-      KMessageBox::sorry(this,i18n("There was an error saving file\n%1").tqarg( url.url() ));
+      KMessageBox::sorry(this,i18n("There was an error saving file\n%1").arg( url.url() ));
 }
 
 void PhraseBookDialog::slotPrint()
diff --git a/kmouth/phrasebook/phrasetree.cpp b/kmouth/phrasebook/phrasetree.cpp
index e4adde1..27735c5 100644
--- a/kmouth/phrasebook/phrasetree.cpp
+++ b/kmouth/phrasebook/phrasetree.cpp
@@ -470,7 +470,7 @@ void PhraseTree::_warning (const KKeySequence& cut, TQString sAction, TQString s
        i18n("The '%1' key combination has already been allocated "
        "to %2.\n"
        "Please choose a unique key combination.").
-       tqarg(cut.toString()).tqarg(sAction);
+       arg(cut.toString()).arg(sAction);
 
    KMessageBox::sorry( this, s, sTitle );
 }
@@ -485,7 +485,7 @@ bool PhraseTree::isStdAccelPresent (const KShortcut& cut, bool warnUser) {
       {
          if (warnUser)
             _warning (cut.seq(iSeq),
-                      i18n("the standard \"%1\" action").tqarg(KStdAccel::label(id)),
+                      i18n("the standard \"%1\" action").arg(KStdAccel::label(id)),
                       i18n("Conflict with Standard Application Shortcut"));
          return true;
       }
@@ -501,7 +501,7 @@ bool PhraseTree::isGlobalKeyPresent (const KShortcut& cut, bool warnUser) {
       if (iSeq > -1) {
          if (warnUser)
             _warning (cut.seq(iSeq),
-                      i18n("the global \"%1\" action").tqarg(it.key()),
+                      i18n("the global \"%1\" action").arg(it.key()),
                       i18n("Conflict with Global Shortcuts"));
          return true;
       }
diff --git a/kmouth/phraselist.cpp b/kmouth/phraselist.cpp
index 3cbd9d4..08fc6b9 100644
--- a/kmouth/phraselist.cpp
+++ b/kmouth/phraselist.cpp
@@ -18,10 +18,10 @@
 // include files for TQt
 #include <tqprinter.h>
 #include <tqpainter.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 #include <tqpopupmenu.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 // include files for KDE
 #include <klistbox.h>
@@ -48,16 +48,16 @@
 PhraseList::PhraseList(TQWidget *parent, const char *name) : TQWidget(parent,name) {
    isInSlot = false;
    setBackgroundMode(PaletteBase);
-   TQVBoxLayout *tqlayout = new TQVBoxLayout (this);
+   TQVBoxLayout *layout = new TQVBoxLayout (this);
 
    listBox = new KListBox (this);
    listBox->setFocusPolicy(TQ_NoFocus);
    listBox->setSelectionMode (TQListBox::Extended);
    TQWhatsThis::add (listBox, i18n("This list contains the history of spoken sentences. You can select sentences and press the speak button for re-speaking."));
-   tqlayout->addWidget(listBox);
+   layout->addWidget(listBox);
 
    TQHBoxLayout *rowLayout = new TQHBoxLayout ();
-   tqlayout->addLayout(rowLayout);
+   layout->addLayout(rowLayout);
 
    completion = new WordCompletion();
 
@@ -271,7 +271,7 @@ void PhraseList::cutListSelection () {
 }
 
 void PhraseList::copyListSelection () {
-   TQApplication::tqclipboard()->setText (getListSelection().join ("\n"));
+   TQApplication::clipboard()->setText (getListSelection().join ("\n"));
 }
 
 void PhraseList::lineEntered (const TQString &phrase) {
@@ -446,7 +446,7 @@ void PhraseList::save () {
 
    KURL url;
    if (book.save (this, i18n("Save As"), url, false) == -1)
-      KMessageBox::sorry(this,i18n("There was an error saving file\n%1").tqarg( url.url() ));
+      KMessageBox::sorry(this,i18n("There was an error saving file\n%1").arg( url.url() ));
 }
 
 void PhraseList::open () {
@@ -472,7 +472,7 @@ void PhraseList::open (KURL url) {
          insertIntoPhraseList (*it, false);
    }
    else
-      KMessageBox::sorry(this,i18n("There was an error loading file\n%1").tqarg( url.url() ));
+      KMessageBox::sorry(this,i18n("There was an error loading file\n%1").arg( url.url() ));
 }
 
 #include "phraselist.moc"
diff --git a/kmouth/phraselistitem.cpp b/kmouth/phraselistitem.cpp
index 6e902f3..0574d2b 100644
--- a/kmouth/phraselistitem.cpp
+++ b/kmouth/phraselistitem.cpp
@@ -47,6 +47,6 @@ void PhraseListItem::paint (TQPainter *p) {
    if (drawCursor()) {
       TQRect r (0, 0, listBox()->maxItemWidth(), height (listBox()));
       listBox()->tqstyle().tqdrawPrimitive (TQStyle::PE_FocusRect, p, r,
-                                        listBox()->tqcolorGroup());
+                                        listBox()->colorGroup());
    }
 }
diff --git a/kmouth/speech.cpp b/kmouth/speech.cpp
index 81ed650..b682a47 100644
--- a/kmouth/speech.cpp
+++ b/kmouth/speech.cpp
@@ -21,7 +21,7 @@
 #include <tqvaluestack.h>
 #include <tqstringlist.h>
 #include <tqregexp.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqfile.h>
 #include <kdebug.h>
 
@@ -225,10 +225,10 @@ void Speech::speak(TQString command, bool stdIn, const TQString &text, const TQS
 }
 
 void Speech::receivedStdout (KProcess *, char *buffer, int buflen) {
-   kdDebug() << TQString::tqfromLatin1(buffer, buflen) + "\n";
+   kdDebug() << TQString::fromLatin1(buffer, buflen) + "\n";
 }
 void Speech::receivedStderr (KProcess *, char *buffer, int buflen) {
-   kdDebug() << TQString::tqfromLatin1(buffer, buflen) + "\n";
+   kdDebug() << TQString::fromLatin1(buffer, buflen) + "\n";
 }
 
 void Speech::wroteStdin(KProcess *) {
diff --git a/kmouth/texttospeechconfigurationwidget.cpp b/kmouth/texttospeechconfigurationwidget.cpp
index f7fe16a..cd4b6c7 100644
--- a/kmouth/texttospeechconfigurationwidget.cpp
+++ b/kmouth/texttospeechconfigurationwidget.cpp
@@ -18,9 +18,9 @@
 
 #include "texttospeechconfigurationwidget.h"
 #include <kconfig.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqptrlist.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 #include <kcombobox.h>
 #include <klocale.h>
diff --git a/kmouth/texttospeechsystem.cpp b/kmouth/texttospeechsystem.cpp
index f7f9515..c8c32d3 100644
--- a/kmouth/texttospeechsystem.cpp
+++ b/kmouth/texttospeechsystem.cpp
@@ -18,7 +18,7 @@
 
 #include "texttospeechsystem.h"
 #include <tqregexp.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqptrlist.h>
 #include <stdlib.h>
 
diff --git a/kmouth/wordcompletion/creationsourcedetailsui.ui.h b/kmouth/wordcompletion/creationsourcedetailsui.ui.h
index f3ed793..12869aa 100644
--- a/kmouth/wordcompletion/creationsourcedetailsui.ui.h
+++ b/kmouth/wordcompletion/creationsourcedetailsui.ui.h
@@ -15,7 +15,7 @@ void CreationSourceDetailsUI::init() {
     TQWhatsThis::add (languageButton, i18n("With this combo box you decide which language should be associated with the new dictionary."));
     
     loadLanguageList(languageButton);
-    languageButton->insertLanguage("??", i18n("Other"), TQString::tqfromLatin1("l10n/"), TQString());
+    languageButton->insertLanguage("??", i18n("Other"), TQString::fromLatin1("l10n/"), TQString());
     
    connect (languageButton, TQT_SIGNAL(activated(int)), this, TQT_SLOT(languageButton_activated(int)));
 }
@@ -28,7 +28,7 @@ void CreationSourceDetailsUI::languageButton_activated (int) {
         languageButton->setCurrentItem(customLanguage);
      }
      else {
-        languageButton->insertLanguage(customLanguage, i18n("without name"), TQString::tqfromLatin1("l10n/"), TQString());
+        languageButton->insertLanguage(customLanguage, i18n("without name"), TQString::fromLatin1("l10n/"), TQString());
         languageButton->setCurrentItem(customLanguage);
      }
    }
diff --git a/kmouth/wordcompletion/creationsourceui.ui b/kmouth/wordcompletion/creationsourceui.ui
index 49af73d..0efac9c 100644
--- a/kmouth/wordcompletion/creationsourceui.ui
+++ b/kmouth/wordcompletion/creationsourceui.ui
@@ -120,7 +120,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/kmouth/wordcompletion/dictionarycreationwizard.cpp b/kmouth/wordcompletion/dictionarycreationwizard.cpp
index 5108845..957c89c 100644
--- a/kmouth/wordcompletion/dictionarycreationwizard.cpp
+++ b/kmouth/wordcompletion/dictionarycreationwizard.cpp
@@ -15,13 +15,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 #include <tqlineedit.h>
 #include <tqcombobox.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqwhatsthis.h>
 
 #include <klistview.h>
@@ -221,7 +221,7 @@ TQString DictionaryCreationWizard::createDictionary() {
    TQString dictionaryFile;
    do {
       dictnumber++;
-      filename = TQString("wordcompletion%1.dict").tqarg(dictnumber);
+      filename = TQString("wordcompletion%1.dict").arg(dictnumber);
       dictionaryFile = KApplication::kApplication()->dirs()->findResource("appdata", filename);
    }
    while (KStandardDirs::exists(dictionaryFile));
@@ -283,10 +283,10 @@ MergeWidget::MergeWidget(KWizard *parent, const char *name,
 
    TQWidget *contents = new TQWidget(viewport());
    addChild(contents);
-   TQGridLayout *tqlayout = new TQGridLayout (contents);
+   TQGridLayout *layout = new TQGridLayout (contents);
    setResizePolicy (TQScrollView::AutoOneFit);
-   tqlayout->setColStretch (0, 0);
-   tqlayout->setColStretch (1, 1);
+   layout->setColStretch (0, 0);
+   layout->setColStretch (1, 1);
 
    int row = 0;
    TQStringList::Iterator nIt = dictionaryNames.begin();
@@ -295,8 +295,8 @@ MergeWidget::MergeWidget(KWizard *parent, const char *name,
    for (; nIt != dictionaryNames.end(); ++nIt, ++fIt, ++lIt) {
       TQCheckBox *checkbox = new TQCheckBox(*nIt, contents);
       KIntNumInput *numInput = new KIntNumInput(contents);
-      tqlayout->addWidget (checkbox, row, 0);
-      tqlayout->addWidget (numInput, row, 1);
+      layout->addWidget (checkbox, row, 0);
+      layout->addWidget (numInput, row, 1);
       
       checkbox->setChecked (true);
       numInput->setRange (1, 100, 10, true);
diff --git a/kmouth/wordcompletion/klanguagebutton.cpp b/kmouth/wordcompletion/klanguagebutton.cpp
index 51d2066..ffb6715 100644
--- a/kmouth/wordcompletion/klanguagebutton.cpp
+++ b/kmouth/wordcompletion/klanguagebutton.cpp
@@ -132,12 +132,12 @@ void KLanguageButton::insertSubmenu( const TQString &text, const TQString &tag,
 void KLanguageButton::insertLanguage( const TQString& path, const TQString& name,
                         const TQString& sub, const TQString &submenu, int index )
 {
-  TQString output = name + TQString::tqfromLatin1( " (" ) + path +
-                   TQString::tqfromLatin1( ")" );
+  TQString output = name + TQString::fromLatin1( " (" ) + path +
+                   TQString::fromLatin1( ")" );
 #if 0
   // Nooooo ! Country != language
   TQPixmap flag( locate( "locale", sub + path +
-                TQString::tqfromLatin1( "/flag.png" ) ) );
+                TQString::fromLatin1( "/flag.png" ) ) );
 #endif
   insertItem( output, path, submenu, index );
 }
@@ -182,8 +182,8 @@ void KLanguageButton::clear()
 {
   if ( i < 0 || i >= count() )
     return;
-  TQString output = name + TQString::tqfromLatin1( " (" ) + tag( i ) +
-                   TQString::tqfromLatin1( ")" );
+  TQString output = name + TQString::fromLatin1( " (" ) + tag( i ) +
+                   TQString::fromLatin1( ")" );
   changeItem( output, i );
 }*/
 
diff --git a/kmouth/wordcompletion/klanguagebuttonhelper.cpp b/kmouth/wordcompletion/klanguagebuttonhelper.cpp
index 19bb721..91f2966 100644
--- a/kmouth/wordcompletion/klanguagebuttonhelper.cpp
+++ b/kmouth/wordcompletion/klanguagebuttonhelper.cpp
@@ -31,18 +31,18 @@
 
 TQString languageName (TQString languageCode) {
    TQString filename = KGlobal::dirs()->findResource("locale",
-			languageCode + TQString::tqfromLatin1("/entry.desktop"));
+			languageCode + TQString::fromLatin1("/entry.desktop"));
       
    KSimpleConfig entry(filename);
-   entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
-   return entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name"));
+   entry.setGroup(TQString::fromLatin1("KCM Locale"));
+   return entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
 }
 
 void loadLanguageList(KLanguageButton *combo)
 // This function was taken from tdebase/kcontrol/kdm/kdm-appear.cpp
 {
   TQStringList langlist = KGlobal::dirs()->findAllResources("locale",
-			TQString::tqfromLatin1("*/entry.desktop"));
+			TQString::fromLatin1("*/entry.desktop"));
   langlist.sort();
   for ( TQStringList::ConstIterator it = langlist.begin();
 	it != langlist.end(); ++it )
@@ -52,9 +52,9 @@ void loadLanguageList(KLanguageButton *combo)
     TQString nid = fpath.mid(index + 1);
 
     KSimpleConfig entry(*it);
-    entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
-    TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name"));
-    combo->insertLanguage(nid, name, TQString::tqfromLatin1("l10n/"), TQString());
+    entry.setGroup(TQString::fromLatin1("KCM Locale"));
+    TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
+    combo->insertLanguage(nid, name, TQString::fromLatin1("l10n/"), TQString());
   }
   
   if (KGlobal::locale())
diff --git a/kmouth/wordcompletion/wordcompletionui.ui b/kmouth/wordcompletion/wordcompletionui.ui
index 5e8227e..03bccf7 100644
--- a/kmouth/wordcompletion/wordcompletionui.ui
+++ b/kmouth/wordcompletion/wordcompletionui.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -141,7 +141,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>240</height>
@@ -152,7 +152,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/kmouth/wordcompletion/wordcompletionui.ui.h b/kmouth/wordcompletion/wordcompletionui.ui.h
index d74137e..6ce5e75 100644
--- a/kmouth/wordcompletion/wordcompletionui.ui.h
+++ b/kmouth/wordcompletion/wordcompletionui.ui.h
@@ -15,7 +15,7 @@ void WordCompletionUI::init() {
     TQWhatsThis::add (languageButton, i18n("With this combo box you select the language associated with the selected dictionary."));
     
     loadLanguageList(languageButton);
-    languageButton->insertLanguage("??", i18n("Other"), TQString::tqfromLatin1("l10n/"), TQString());
+    languageButton->insertLanguage("??", i18n("Other"), TQString::fromLatin1("l10n/"), TQString());
     
    connect (languageButton, TQT_SIGNAL(activated(int)), this, TQT_SLOT(languageButton_activated(int)));
 }
@@ -28,7 +28,7 @@ void WordCompletionUI::languageButton_activated (int) {
         languageButton->setCurrentItem(customLanguage);
      }
      else {
-        languageButton->insertLanguage(customLanguage, i18n("without name"), TQString::tqfromLatin1("l10n/"), TQString());
+        languageButton->insertLanguage(customLanguage, i18n("without name"), TQString::fromLatin1("l10n/"), TQString());
         languageButton->setCurrentItem(customLanguage);
      }
    }
diff --git a/kmouth/wordcompletion/wordcompletionwidget.cpp b/kmouth/wordcompletion/wordcompletionwidget.cpp
index 2403faf..c68a967 100644
--- a/kmouth/wordcompletion/wordcompletionwidget.cpp
+++ b/kmouth/wordcompletion/wordcompletionwidget.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqlineedit.h>
@@ -71,11 +71,11 @@ public:
 
    void setLanguage (TQString languageCode) {
       TQString filename = KGlobal::dirs()->findResource("locale",
-			languageCode + TQString::tqfromLatin1("/entry.desktop"));
+			languageCode + TQString::fromLatin1("/entry.desktop"));
 
       KSimpleConfig entry(filename);
-      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"));
       setLanguage (name + " (" + languageCode + ")", languageCode);
    }
 
@@ -136,7 +136,7 @@ void WordCompletionWidget::load() {
                                         config->readEntry("Name"),
                                         languageTag);
          if (!languageButton->containsTag(languageTag))
-            languageButton->insertLanguage(languageTag, i18n("without name"), TQString::tqfromLatin1("l10n/"), TQString());
+            languageButton->insertLanguage(languageTag, i18n("without name"), TQString::fromLatin1("l10n/"), TQString());
       }
 
    // Clean up disc space
@@ -159,7 +159,7 @@ void WordCompletionWidget::save() {
    while (it.current()) {
       DictionaryListItem *item = dynamic_cast<DictionaryListItem*>(it.current());
       if (item != 0) {
-         config->setGroup(TQString("Dictionary %1").tqarg(number));
+         config->setGroup(TQString("Dictionary %1").arg(number));
          config->writeEntry ("Filename", item->filename());
          config->writeEntry ("Name",     item->text (0));
          config->writeEntry ("Language", item->languageCode());
@@ -200,7 +200,7 @@ void WordCompletionWidget::addDictionary() {
       newDictionaryFiles += filename;
       TQString languageTag = wizard->language();
       if (!languageButton->containsTag(languageTag)) {
-         languageButton->insertLanguage(languageTag, i18n("without name"), TQString::tqfromLatin1("l10n/"), TQString());
+         languageButton->insertLanguage(languageTag, i18n("without name"), TQString::fromLatin1("l10n/"), TQString());
       }
       KListViewItem *item = new DictionaryListItem (dictionaryList,
                       filename, wizard->name(), languageTag);
@@ -251,8 +251,8 @@ void WordCompletionWidget::exportDictionary() {
          return;
 
       if (KIO::NetAccess::exists(url, false, this)) {
-         if (KMessageBox::warningContinueCancel(0,TQString("<qt>%1</qt>").tqarg(i18n("The file %1 already exists. "
-                                                          "Do you want to overwrite it?").tqarg(url.url())),i18n("File Exists"),i18n("&Overwrite"))==KMessageBox::Cancel) {
+         if (KMessageBox::warningContinueCancel(0,TQString("<qt>%1</qt>").arg(i18n("The file %1 already exists. "
+                                                          "Do you want to overwrite it?").arg(url.url())),i18n("File Exists"),i18n("&Overwrite"))==KMessageBox::Cancel) {
             return;
          }
       }
diff --git a/kmouth/wordcompletion/wordlist.cpp b/kmouth/wordcompletion/wordlist.cpp
index 11a15a1..2e88852 100644
--- a/kmouth/wordcompletion/wordlist.cpp
+++ b/kmouth/wordcompletion/wordlist.cpp
@@ -228,7 +228,7 @@ WordMap parseFiles (TQStringList files, TQTextStream::Encoding encoding, TQTextC
       if (steps != 0 && progress*100/steps > percent) {
          percent = progress*100/steps;
          pdlg->progressBar()->setProgress(percent);
-         tqApp->tqprocessEvents (20);
+         tqApp->processEvents (20);
       }
    }
    return map;
@@ -237,7 +237,7 @@ WordMap parseFiles (TQStringList files, TQTextStream::Encoding encoding, TQTextC
 WordMap mergeFiles  (TQMap<TQString,int> files, KProgressDialog *pdlg) {
    pdlg->setLabel (i18n("Merging dictionaries..."));
    pdlg->show();
-   tqApp->tqprocessEvents (20);
+   tqApp->processEvents (20);
    
    int progress = 0;
    int steps = files.count();
@@ -269,7 +269,7 @@ WordMap mergeFiles  (TQMap<TQString,int> files, KProgressDialog *pdlg) {
       if (steps != 0 && progress*100/steps > percent) {
          percent = progress*100/steps;
          pdlg->progressBar()->setProgress(percent);
-         tqApp->tqprocessEvents (20);
+         tqApp->processEvents (20);
       }
    }
    
@@ -290,7 +290,7 @@ WordMap mergeFiles  (TQMap<TQString,int> files, KProgressDialog *pdlg) {
 WordMap parseKDEDoc (TQString language, KProgressDialog *pdlg) {
    pdlg->setLabel (i18n("Parsing the KDE documentation..."));
    pdlg->show();
-   tqApp->tqprocessEvents (20);
+   tqApp->processEvents (20);
    
    TQStringList files = KApplication::kApplication()->dirs()->findAllResources ("html", language + "/*.docbook", true, true);
    if ((files.count() == 0) && (language.length() == 5)) {
@@ -304,7 +304,7 @@ WordMap parseKDEDoc (TQString language, KProgressDialog *pdlg) {
 WordMap parseFile (TQString filename, TQTextStream::Encoding encoding, TQTextCodec *codec, KProgressDialog *pdlg) {
    pdlg->setLabel (i18n("Parsing file..."));
    pdlg->show();
-   tqApp->tqprocessEvents (20);
+   tqApp->processEvents (20);
    
    TQStringList files = filename;
 
@@ -314,7 +314,7 @@ WordMap parseFile (TQString filename, TQTextStream::Encoding encoding, TQTextCod
 WordMap parseDir (TQString directory, TQTextStream::Encoding encoding, TQTextCodec *codec, KProgressDialog *pdlg) {
    pdlg->setLabel (i18n("Parsing directory..."));
    pdlg->show();
-   tqApp->tqprocessEvents (20);
+   tqApp->processEvents (20);
    
    TQStringList directories;
    directories += directory;
@@ -504,7 +504,7 @@ WordMap spellCheck  (WordMap map, TQString dictionary, KProgressDialog *pdlg) {
       pdlg->setLabel (i18n("Performing spell check..."));
       pdlg->progressBar()->setTotalSteps(100);
       pdlg->progressBar()->setProgress(0);
-      tqApp->tqprocessEvents (20);
+      tqApp->processEvents (20);
       int progress = 0;
       int steps = 0;
       int percent = 0;
@@ -535,7 +535,7 @@ WordMap spellCheck  (WordMap map, TQString dictionary, KProgressDialog *pdlg) {
             if (steps != 0 && progress*100/steps > percent) {
                percent = progress*100/steps;
                pdlg->progressBar()->setProgress(percent);
-               tqApp->tqprocessEvents (20);
+               tqApp->processEvents (20);
             }
          }
       }