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/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

18 files changed, 104 insertions, 104 deletions

diff --git a/kcontrol/kfontinst/ChangeLog b/kcontrol/kfontinst/ChangeLog
index fd6995a9c..b00a53f1e 100644
--- a/kcontrol/kfontinst/ChangeLog
+++ b/kcontrol/kfontinst/ChangeLog
@@ -5,7 +5,7 @@ KDE3.4 -> KDE3.5
 
     e.g. Times New Roman -> times.ttf
          Helvetica, Bold Oblique-> Hevetica, Bold Oblique.fonts.tar.gz
-                  Which tqcontains:
+                  Which contains:
                            75dpi_helvBO10.pcf.gz
                            75dpi_helvBO12.pcf.gz
                            100dpi_helvBO10.pcf.gz
@@ -336,9 +336,9 @@ KDE3.1 -> KDE3.2
 2. Rearranged this file!
 3. Removed command line interface - KDE2's command line stuff is way different!
 4. Re-created dialogs with Qt designer.
-5. Removed ProgressDialog, and tqreplaced with a progress bar on a new statusbar.
+5. Removed ProgressDialog, and replaced with a progress bar on a new statusbar.
 6. Modified configure script to check for FreeType & t1lib.
-7. If an encoding (not tqunicode) is selected, then the .enc file is copied to the X11 fonts directory.
+7. If an encoding (not unicode) is selected, then the .enc file is copied to the X11 fonts directory.
 8. As with the .enc files, the StarOffice .xpp files are also copied, and no longer just sym linked.
 9. Removed enabling/disabing of Configure System button.
 10. Fontmap.X11 is no longer created, instead the real Fontmap file itself is modified.
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
index 3e7c699e2..c525cd337 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
@@ -97,10 +97,10 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
     itsEmbeddedAdmin=Misc::root() && (NULL==appName || strcmp("kcontrol", appName) &&
                      KCmdLineArgs::parsedArgs()->isSet("embed"));
 
-    itstqStatusLabel = new TQLabel(this);
-    itstqStatusLabel->setFrameShape(TQFrame::Panel);
-    itstqStatusLabel->setFrameShadow(TQFrame::Sunken);
-    itstqStatusLabel->setLineWidth(1);
+    itsStatusLabel = new TQLabel(this);
+    itsStatusLabel->setFrameShape(TQFrame::Panel);
+    itsStatusLabel->setFrameShadow(TQFrame::Sunken);
+    itsStatusLabel->setLineWidth(1);
 
     itsConfig.setGroup(CFG_GROUP);
 
@@ -113,7 +113,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
         itsSplitter=new TQSplitter(this);
         fontsFrame=new TQFrame(itsSplitter),
         itsPreview=(KParts::ReadOnlyPart *)factory->create(itsSplitter, "kcmfontinst", "KParts::ReadOnlyPart");
-        itsSplitter->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+        itsSplitter->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
 
         TQValueList<int> sizes(itsConfig.readIntListEntry(CFG_SPLITTER_SIZES));
 
@@ -129,18 +129,18 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
     {
 #endif
         fontsFrame=new TQFrame(this);
-        fontsFrame->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+        fontsFrame->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
 #ifdef HAVE_XFT
     }
 #endif
 
     TQGridLayout *fontsLayout=new TQGridLayout(fontsFrame, 1, 1, 0, 1);
-    TQVBoxLayout *tqlayout=new TQVBoxLayout(this, 0, KDialog::spacingHint());
+    TQVBoxLayout *layout=new TQVBoxLayout(this, 0, KDialog::spacingHint());
     KToolBar    *toolbar=new KToolBar(this);
     bool        showBitmap(itsConfig.readBoolEntry(CFG_SHOW_BITMAP, false));
 
     fontsFrame->setLineWidth(0);
-    toolbar->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
+    toolbar->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
     toolbar->setMovingEnabled(false);
 
     TQString previousPath=itsConfig.readEntry(CFG_PATH);
@@ -151,22 +151,22 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
     itsDirOp->setMinimumSize(TQSize(96, 64));
     setMimeTypes(showBitmap);
     itsDirOp->dirLister()->setMainWindow(this);
-    itsDirOp->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    itsDirOp->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     fontsLayout->addMultiCellWidget(itsDirOp, 0, 0, 0, 1);
 
     KPushButton *button=new KPushButton(KGuiItem(i18n("Add Fonts..."), "newfont"), fontsFrame);
     connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addFonts()));
-    button->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+    button->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
     fontsLayout->addWidget(button, 1, 0);
     fontsLayout->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
 
-    tqlayout->addWidget(toolbar);
+    layout->addWidget(toolbar);
 #ifdef HAVE_XFT
-    tqlayout->addWidget(itsPreview ? itsSplitter : fontsFrame);
+    layout->addWidget(itsPreview ? itsSplitter : fontsFrame);
 #else
-    tqlayout->addWidget(fontsFrame);
+    layout->addWidget(fontsFrame);
 #endif
-    tqlayout->addWidget(itstqStatusLabel);
+    layout->addWidget(itsStatusLabel);
 
     setButtons(0);
     setRootOnlyMsg(i18n("<b>The fonts shown are your personal fonts.</b><br>To see (and install) "
@@ -390,7 +390,7 @@ void CKCmFontInst::fileHighlighted(const KFileItem *item)
                                              ? list->getFirst()
                                              : NULL;
 
-        if(previewItem && list && list->tqcontains(previewItem))  // OK, check its been selected - not deselected!!!
+        if(previewItem && list && list->contains(previewItem))  // OK, check its been selected - not deselected!!!
             itsPreview->openURL(previewItem->url());
     }
 #endif
@@ -545,7 +545,7 @@ void CKCmFontInst::dropped(const KFileItem *i, TQDropEvent *, const KURL::List &
 
 void CKCmFontInst::infoMessage(const TQString &msg)
 {
-    itstqStatusLabel->setText(msg);
+    itsStatusLabel->setText(msg);
 }
 
 static TQString family(const TQString &name)
@@ -582,7 +582,7 @@ void CKCmFontInst::updateInformation(int, int fonts)
     }
     text+=" - ";
     text+=i18n("One Family", "%n Families", families.count());
-    itstqStatusLabel->setText(text);
+    itsStatusLabel->setText(text);
 }
 
 void CKCmFontInst::delResult(KIO::Job *job)
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
index 8f655f2a4..b304e0a1a 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
@@ -108,7 +108,7 @@ class CKCmFontInst : public KCModule
     TQSplitter            *itsSplitter;
     KConfig              itsConfig;
     bool                 itsEmbeddedAdmin;
-    TQLabel               *itstqStatusLabel;
+    TQLabel               *itsStatusLabel;
 };
 
 }
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
index b1bb35e88..b4766c5c4 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
@@ -88,7 +88,7 @@ class CFontListViewItem : public KListViewItem
 
     TQRect rect() const
     {
-        TQRect r = listView()->tqitemRect(this);
+        TQRect r = listView()->itemRect(this);
 
         return TQRect(listView()->viewportToContents(r.topLeft()), TQSize(r.width(), r.height()));
     }
diff --git a/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp b/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp
index 11f1cdebe..afd9fa204 100644
--- a/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp
@@ -39,14 +39,14 @@ CPrintDialog::CPrintDialog(TQWidget *parent)
             : KDialogBase(Plain, i18n("Print Font Samples"), Ok|Cancel, Ok, parent, NULL, true, false)
 {
     TQFrame      *page=plainPage();
-    TQGridLayout *tqlayout=new TQGridLayout(page, 1, 1, 0, spacingHint());
+    TQGridLayout *layout=new TQGridLayout(page, 1, 1, 0, spacingHint());
 
-    tqlayout->addWidget(new TQLabel(i18n("Output:"), page), 0, 0);
+    layout->addWidget(new TQLabel(i18n("Output:"), page), 0, 0);
     itsOutput=new TQComboBox(page);
     itsOutput->insertItem(i18n("All Fonts"), 0);
     itsOutput->insertItem(i18n("Selected Fonts"), 1);
-    tqlayout->addWidget(itsOutput, 0, 1);
-    tqlayout->addWidget(new TQLabel(i18n("Font size:"), page), 1, 0);
+    layout->addWidget(itsOutput, 0, 1);
+    layout->addWidget(new TQLabel(i18n("Font size:"), page), 1, 0);
     itsSize=new TQComboBox(page);
     itsSize->insertItem(i18n("Waterfall"), 0);
     itsSize->insertItem(i18n("12pt"), 1);
@@ -54,8 +54,8 @@ CPrintDialog::CPrintDialog(TQWidget *parent)
     itsSize->insertItem(i18n("24pt"), 3);
     itsSize->insertItem(i18n("36pt"), 4);
     itsSize->insertItem(i18n("48pt"), 5);
-    tqlayout->addWidget(itsSize, 1, 1);
-    tqlayout->addItem(new TQSpacerItem(2, 2), 2, 1);
+    layout->addWidget(itsSize, 1, 1);
+    layout->addItem(new TQSpacerItem(2, 2), 2, 1);
 }
 
 bool CPrintDialog::exec(bool select, int size)
diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
index 55ab5773a..112e3562b 100644
--- a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
+++ b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
@@ -44,35 +44,35 @@ static int strToWeight(const TQString &str)
 {
     if(NULL==str)
         return FC_WEIGHT_MEDIUM;
-    else if(str.tqcontains("Bold", false))
+    else if(str.contains("Bold", false))
         return FC_WEIGHT_BOLD;
-    else if(str.tqcontains("Heavy", false)) 
+    else if(str.contains("Heavy", false)) 
         return FC_WEIGHT_HEAVY;
-    else if(str.tqcontains("Black", false))
+    else if(str.contains("Black", false))
         return FC_WEIGHT_BLACK;
-    else if(str.tqcontains("ExtraBold", false))
+    else if(str.contains("ExtraBold", false))
         return FC_WEIGHT_EXTRABOLD;
-    else if(str.tqcontains("UltraBold", false))
+    else if(str.contains("UltraBold", false))
         return FC_WEIGHT_ULTRABOLD;
-    else if(str.tqcontains("ExtraLight", false))
+    else if(str.contains("ExtraLight", false))
         return FC_WEIGHT_EXTRALIGHT;
-    else if(str.tqcontains("UltraLight", false))
+    else if(str.contains("UltraLight", false))
         return FC_WEIGHT_ULTRALIGHT;
-    else if(str.tqcontains("Light", false))
+    else if(str.contains("Light", false))
         return FC_WEIGHT_LIGHT;
-    else if(str.tqcontains("Medium", false) || str.tqcontains("Normal", false) || str.tqcontains("Roman", false))
+    else if(str.contains("Medium", false) || str.contains("Normal", false) || str.contains("Roman", false))
         return FC_WEIGHT_MEDIUM;
-    else if(str.tqcontains("Regular", false))
+    else if(str.contains("Regular", false))
         return FC_WEIGHT_REGULAR;
-    else if(str.tqcontains("SemiBold", false))
+    else if(str.contains("SemiBold", false))
         return FC_WEIGHT_SEMIBOLD;
-    else if(str.tqcontains("DemiBold", false))
+    else if(str.contains("DemiBold", false))
         return FC_WEIGHT_DEMIBOLD;
-    else if(str.tqcontains("Thin", false))
+    else if(str.contains("Thin", false))
         return FC_WEIGHT_THIN;
-    else if(str.tqcontains("Book", false))
+    else if(str.contains("Book", false))
         return FC_WEIGHT_NORMAL;
-    else if(str.tqcontains("Demi", false)) 
+    else if(str.contains("Demi", false)) 
         return FC_WEIGHT_NORMAL;
     else
         return FC_WEIGHT_MEDIUM;
@@ -83,21 +83,21 @@ static int strToWidth(const TQString &str)
 {   
     if(str.isEmpty())
         return FC_WIDTH_NORMAL;
-    else if(str.tqcontains("UltraCondensed", false))
+    else if(str.contains("UltraCondensed", false))
         return FC_WIDTH_ULTRACONDENSED;
-    else if(str.tqcontains("ExtraCondensed", false))
+    else if(str.contains("ExtraCondensed", false))
         return FC_WIDTH_EXTRACONDENSED;
-    else if(str.tqcontains("SemiCondensed", false))
+    else if(str.contains("SemiCondensed", false))
         return FC_WIDTH_SEMICONDENSED;
-    else if(str.tqcontains("Condensed", false))
+    else if(str.contains("Condensed", false))
         return FC_WIDTH_CONDENSED;
-    else if(str.tqcontains("SemiExpanded", false))
+    else if(str.contains("SemiExpanded", false))
         return FC_WIDTH_SEMIEXPANDED;
-    else if(str.tqcontains("UltraExpanded", false))
+    else if(str.contains("UltraExpanded", false))
         return FC_WIDTH_ULTRAEXPANDED;
-    else if(str.tqcontains("ExtraExpanded", false))
+    else if(str.contains("ExtraExpanded", false))
         return FC_WIDTH_EXTRAEXPANDED;
-    else if(str.tqcontains("Expanded", false))
+    else if(str.contains("Expanded", false))
         return FC_WIDTH_EXPANDED;
     else
         return FC_WIDTH_NORMAL;
@@ -372,7 +372,7 @@ bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what)
                                 const FoundryMap *entry;
 
                                 for(entry=map; NULL!=entry->foundry; entry++)
-                                    if(foundryAll.length()==entry->len && foundryAll.tqcontains(entry->foundry, false))
+                                    if(foundryAll.length()==entry->len && foundryAll.contains(entry->foundry, false))
                                     {
                                         foundryAll=entry->foundry;
                                         break;
diff --git a/kcontrol/kfontinst/kfontinst/FontEngine.cpp b/kcontrol/kfontinst/kfontinst/FontEngine.cpp
index 7f14d556f..4fe823c23 100644
--- a/kcontrol/kfontinst/kfontinst/FontEngine.cpp
+++ b/kcontrol/kfontinst/kfontinst/FontEngine.cpp
@@ -157,13 +157,13 @@ CFontEngine::EWeight CFontEngine::strToWeight(const char *str)
 
 static void removeSymbols(TQString &str)
 {
-    str.tqreplace(TQRegExp("[\\-\\[\\]()]"), " ");
+    str.replace(TQRegExp("[\\-\\[\\]()]"), " ");
 
     int   len=str.length();
     TQChar space(' ');
 
     for(int c=0; c<len; ++c)
-        if(str[c].tqunicode()<0x20 || str[c].tqunicode()>0x7E)
+        if(str[c].unicode()<0x20 || str[c].unicode()>0x7E)
             str[c]=space;
 
     str=str.simplifyWhiteSpace();
diff --git a/kcontrol/kfontinst/kfontinst/Fontmap.cpp b/kcontrol/kfontinst/kfontinst/Fontmap.cpp
index a63efeb5d..476b422bd 100644
--- a/kcontrol/kfontinst/kfontinst/Fontmap.cpp
+++ b/kcontrol/kfontinst/kfontinst/Fontmap.cpp
@@ -113,7 +113,7 @@ static TQString createX11PsName(const TQString &font)
     unsigned int  ch;
     bool          newWord=true;
 
-    newName.tqreplace(TQRegExp("\\-"), "_");
+    newName.replace(TQRegExp("\\-"), "_");
 
     for(ch=0; ch<newName.length(); ++ch)
     {
@@ -136,7 +136,7 @@ static TQString createX11PsName(const TQString &font)
         }
     }
 
-    newName.tqreplace(" ", TQString::null);
+    newName.replace(" ", TQString::null);
     return newName;
 }
 
diff --git a/kcontrol/kfontinst/kfontinst/GetPid.c b/kcontrol/kfontinst/kfontinst/GetPid.c
index 1251c030c..015ea7ce9 100644
--- a/kcontrol/kfontinst/kfontinst/GetPid.c
+++ b/kcontrol/kfontinst/kfontinst/GetPid.c
@@ -71,7 +71,7 @@
 
            gcc GetPid.c -DTEST_GETPID -DOS_Linux -o tst
 
-       ...tqreplace OS_Linux with your particular OS type: OS_FreeBSD, OS_NetBSD, OS_Irix, OS_Solaris,
+       ...replace OS_Linux with your particular OS type: OS_FreeBSD, OS_NetBSD, OS_Irix, OS_Solaris,
        OS_HPUX, or OS_AIX
 
     2. Start a program - such as "vi"
diff --git a/kcontrol/kfontinst/kfontinst/XConfig.cpp b/kcontrol/kfontinst/kfontinst/XConfig.cpp
index 6b0b54340..112ab3d3c 100644
--- a/kcontrol/kfontinst/kfontinst/XConfig.cpp
+++ b/kcontrol/kfontinst/kfontinst/XConfig.cpp
@@ -748,7 +748,7 @@ CXConfig::TPath::EType CXConfig::TPath::getType(const TQString &d)
 {
     TQString str(d);
 
-    str.tqreplace(TQRegExp("\\s*"), "");
+    str.replace(TQRegExp("\\s*"), "");
 
     return 0==str.find("unix/:")
                ? FONT_SERVER
diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp
index 4246afa66..ee1d2dc3c 100644
--- a/kcontrol/kfontinst/kio/KioFonts.cpp
+++ b/kcontrol/kfontinst/kio/KioFonts.cpp
@@ -136,7 +136,7 @@ static TQString removeMultipleExtension(const KURL &url)
     TQString fname(url.fileName());
     int     pos;
 
-    if(-1!=(pos=fname.findRev(TQString::tqfromLatin1(constMultipleExtension))))
+    if(-1!=(pos=fname.findRev(TQString::fromLatin1(constMultipleExtension))))
         fname=fname.left(pos);
 
     return fname;
@@ -158,7 +158,7 @@ static TQString modifyName(const TQString &fname)
     }
 
     for(int s=0; constSymbols[s]; ++s)
-        rv=rv.tqreplace(constSymbols[s], '_');
+        rv=rv.replace(constSymbols[s], '_');
 
     return rv;
 }
@@ -292,7 +292,7 @@ static bool createFolderUDSEntry(KIO::UDSEntry &entry, const TQString &name, con
                                                 ? KFI_KIO_FONTS_PROTOCOL"/system-folder" 
                                                 : KFI_KIO_FONTS_PROTOCOL"/folder");
         addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
-        TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::tqfromLatin1(":/"));
+        TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
         return true;
     }
     else if (sys && !Misc::root())   // Default system fonts folder does not actually exist yet!
@@ -390,18 +390,18 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal
             addAtom(entry, KIO::UDS_GROUP, 0, grp ? grp->gr_name : TQString::number(buff.st_gid).latin1());
 
             addAtom(entry, KIO::UDS_ACCESS_TIME, buff.st_atime);
-            addAtom(entry, KIO::UDS_MIME_TYPE, 0, KMimeType::tqfindByPath(path, 0, true)->name());
+            addAtom(entry, KIO::UDS_MIME_TYPE, 0, KMimeType::findByPath(path, 0, true)->name());
             addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
 
-            TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::tqfromLatin1(":/"));
+            TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
 
             if(!Misc::root())
             {
                 url+=sys ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER);
-                url+=TQString::tqfromLatin1("/");
+                url+=TQString::fromLatin1("/");
             }
             if(multiple)
-                url+=name+TQString::tqfromLatin1(constMultipleExtension);
+                url+=name+TQString::fromLatin1(constMultipleExtension);
             else
                 url+=Misc::getFile(path);
             addAtom(entry, KIO::UDS_URL, 0, url);
@@ -411,7 +411,7 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal
     return false;
 }
 
-enum EUrltqStatus
+enum EUrlStatus
 {
     BAD_URL,
     URL_OK,
@@ -427,7 +427,7 @@ static KURL getRedirect(const KURL &u)
             sect(CKioFonts::getSect(path));
 
     path.remove(sect);
-    path.tqreplace("//", "/");
+    path.replace("//", "/");
     redirect.setPath(path);
 
     KFI_DBUG << "Redirect from " << u.path() << " to " << redirect.path() << endl;
@@ -441,7 +441,7 @@ static bool nonRootSys(const KURL &u)
 
 static TQString getFontFolder(const TQString &defaultDir, const TQString &root, TQStringList &dirs)
 {
-    if(dirs.tqcontains(defaultDir))
+    if(dirs.contains(defaultDir))
         return defaultDir;
     else
     {
@@ -494,7 +494,7 @@ static bool isAAfm(const TQString &fname)
             {
                 line=stream.readLine();
 
-                if(line.tqcontains("StartFontMetrics"))
+                if(line.contains("StartFontMetrics"))
                 {
                     file.close();
                     return true;
@@ -650,7 +650,7 @@ static bool getFontList(const TQStringList &files, TQMap<TQString, TQString> &ma
 
         if(entry!=list.end())
         {
-            if(!(*entry).paths.tqcontains(path))
+            if(!(*entry).paths.contains(path))
                 (*entry).paths.append(path);
         }
         else
@@ -670,7 +670,7 @@ static bool getFontList(const TQStringList &files, TQMap<TQString, TQString> &ma
         if((*fIt).paths.count()>1)
         {
             // There's more than 1 file with the same name, but in a different locations
-            // therefore, take the unique part of the path, and tqreplace / with _
+            // therefore, take the unique part of the path, and replace / with _
             // e.g.
             //     /usr/X11R6/lib/X11/fonts/75dpi/times.pcf.gz
             //     /usr/X11R6/lib/X11/fonts/100dpi/times.pcf.gz
@@ -688,11 +688,11 @@ static bool getFontList(const TQStringList &files, TQMap<TQString, TQString> &ma
                     if((*pIt).orig[i]!=(*pBegin).orig[i])
                     {
                         (*pIt).modified=(*pIt).orig.mid(i);
-                        (*pIt).modified=(*pIt).modified.tqreplace('/', '_');
+                        (*pIt).modified=(*pIt).modified.replace('/', '_');
                         if((*pBegin).modified.isEmpty())
                         {
                             (*pBegin).modified=(*pBegin).orig.mid(i);
-                            (*pBegin).modified=(*pBegin).modified.tqreplace('/', '_');
+                            (*pBegin).modified=(*pBegin).modified.replace('/', '_');
                         }
                         break;
                     }
@@ -806,7 +806,7 @@ CKioFonts::CKioFonts(const TQCString &pool, const TQCString &app)
                 {
                     TQString str(paths[path]);
 
-                    str.tqreplace(TQRegExp("\\s*"), "");
+                    str.replace(TQRegExp("\\s*"), "");
 
                     if(0==str.find("unix/:"))
                         itsUsingXfsFpe=true;
@@ -1018,7 +1018,7 @@ void CKioFonts::get(const KURL &url)
             {
                 // Determine the mimetype of the file to be retrieved, and emit it.
                 // This is mandatory in all slaves (for KRun/BrowserRun to work).
-                emit mimeType(useMime.isEmpty() ? KMimeType::tqfindByPath(realPathC, buff.st_mode, true)->name() : useMime);
+                emit mimeType(useMime.isEmpty() ? KMimeType::findByPath(realPathC, buff.st_mode, true)->name() : useMime);
     
                 totalSize(buff.st_size);
     
@@ -1185,7 +1185,7 @@ bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bo
 
     if (markPartial)
     {
-        TQString  destPart(destOrig+TQString::tqfromLatin1(".part"));
+        TQString  destPart(destOrig+TQString::fromLatin1(".part"));
         TQCString destPartC(TQFile::encodeName(destPart));
 
         dest = destPart;
@@ -1751,9 +1751,9 @@ void CKioFonts::special(const TQByteArray &a)
                 finished();
                 break;
             case SPECIAL_RECONFIG:  // Only itended to be called from kcmfontinst - when a user has re-enabled doX or doGs
-                if(itsRoot && !itsFolders[FOLDER_SYS].modified.tqcontains(itsFolders[FOLDER_SYS].location))
+                if(itsRoot && !itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location))
                     itsFolders[FOLDER_SYS].modified.add(itsFolders[FOLDER_SYS].location);
-                else if(!itsRoot && !itsFolders[FOLDER_USER].modified.tqcontains(itsFolders[FOLDER_USER].location))
+                else if(!itsRoot && !itsFolders[FOLDER_USER].modified.contains(itsFolders[FOLDER_USER].location))
                     itsFolders[FOLDER_USER].modified.add(itsFolders[FOLDER_USER].location);
 
                 doModified();
@@ -1831,7 +1831,7 @@ void CKioFonts::doModified()
             //
             // If a non-default folder has been modified, always configure X
             if(NULL==strchr(itsKfiParams, 'x') && 
-               (itsFolders[FOLDER_SYS].modified.count()>1 || !itsFolders[FOLDER_SYS].modified.tqcontains(itsFolders[FOLDER_SYS].location)))
+               (itsFolders[FOLDER_SYS].modified.count()>1 || !itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location)))
             {
                 if(0==itsKfiParams[0])
                     strcpy(itsKfiParams, "-x");
@@ -1850,7 +1850,7 @@ void CKioFonts::doModified()
                     KFI_DBUG << "RUN(root): kfontinst " << itsKfiParams << ' ' << *it << endl;
                 }
 
-                if(itsFolders[FOLDER_SYS].modified.tqcontains(itsFolders[FOLDER_SYS].location))
+                if(itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location))
                 {
                     itsHasSys=true;
                     itsAddToSysFc=false;
@@ -1862,7 +1862,7 @@ void CKioFonts::doModified()
             TQCString cmd;
 
             createRootRefreshCmd(cmd, itsFolders[FOLDER_SYS].modified, false);
-            if(doRootCmd(cmd, false) && itsFolders[FOLDER_SYS].modified.tqcontains(itsFolders[FOLDER_SYS].location))
+            if(doRootCmd(cmd, false) && itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location))
             {
                 itsHasSys=true;
                 itsAddToSysFc=false;
@@ -2385,8 +2385,8 @@ bool CKioFonts::checkAllowed(const KURL &u)
 
         if(ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_USER)+TQChar('/')) ||
            ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')) ||
-           ds==TQString(TQChar('/')+TQString::tqfromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) ||
-           ds==TQString(TQChar('/')+TQString::tqfromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/')))
+           ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) ||
+           ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/')))
         {
             error(KIO::ERR_SLAVE_DEFINED, i18n("Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\".")
                   .arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS))); \
diff --git a/kcontrol/kfontinst/kio/KioFonts.h b/kcontrol/kfontinst/kio/KioFonts.h
index 802d16eaf..57dc8516a 100644
--- a/kcontrol/kfontinst/kio/KioFonts.h
+++ b/kcontrol/kfontinst/kio/KioFonts.h
@@ -82,7 +82,7 @@ class CKioFonts : public KIO::SlaveBase
         CDirList()                                      { }
         CDirList(const TQString &str) : TQStringList(str) { }
 
-        void add(const TQString &d)                      { if (!tqcontains(d)) append(d); }
+        void add(const TQString &d)                      { if (!contains(d)) append(d); }
     };
 
     struct TFolder
diff --git a/kcontrol/kfontinst/lib/FcEngine.cpp b/kcontrol/kfontinst/lib/FcEngine.cpp
index 2b3d40737..44d180fd2 100644
--- a/kcontrol/kfontinst/lib/FcEngine.cpp
+++ b/kcontrol/kfontinst/lib/FcEngine.cpp
@@ -439,7 +439,7 @@ static bool hasStr(XftFont *font, TQString &str)
                  ch;
 
     for(ch=0; ch<slen; ++ch)
-        if(!FcCharSetHasChar(font->charset, str[ch].tqunicode()))
+        if(!FcCharSetHasChar(font->charset, str[ch].unicode()))
             return false;
     return true;
 }
diff --git a/kcontrol/kfontinst/lib/Misc.cpp b/kcontrol/kfontinst/lib/Misc.cpp
index a3c77526a..1e779b514 100644
--- a/kcontrol/kfontinst/lib/Misc.cpp
+++ b/kcontrol/kfontinst/lib/Misc.cpp
@@ -65,7 +65,7 @@ TQString dirSyntax(const TQString &d)
     {
         TQString ds(d);
 
-        ds.tqreplace("//", "/");
+        ds.replace("//", "/");
 
         int slashPos=ds.findRev('/');
 
@@ -84,7 +84,7 @@ TQString xDirSyntax(const TQString &d)
     {
         TQString ds(d);
 
-        ds.tqreplace("//", "/");
+        ds.replace("//", "/");
 
         int slashPos=ds.findRev('/');
  
diff --git a/kcontrol/kfontinst/viewpart/FontPreview.cpp b/kcontrol/kfontinst/viewpart/FontPreview.cpp
index bded4fad4..3679be252 100644
--- a/kcontrol/kfontinst/viewpart/FontPreview.cpp
+++ b/kcontrol/kfontinst/viewpart/FontPreview.cpp
@@ -103,12 +103,12 @@ void CFontPreview::paintEvent(TQPaintEvent *)
     }
 }
 
-TQSize CFontPreview::tqsizeHint() const
+TQSize CFontPreview::sizeHint() const
 {
     return TQSize(132, 132);
 }
 
-TQSize CFontPreview::tqminimumSizeHint() const
+TQSize CFontPreview::minimumSizeHint() const
 {
     return TQSize(32, 32);
 }
diff --git a/kcontrol/kfontinst/viewpart/FontPreview.h b/kcontrol/kfontinst/viewpart/FontPreview.h
index 6ef34f5bc..a57e9b9c9 100644
--- a/kcontrol/kfontinst/viewpart/FontPreview.h
+++ b/kcontrol/kfontinst/viewpart/FontPreview.h
@@ -50,8 +50,8 @@ class CFontPreview : public QWidget
     virtual ~CFontPreview() {}
 
     void        paintEvent(TQPaintEvent *);
-    TQSize       tqsizeHint() const;
-    TQSize       tqminimumSizeHint() const;
+    TQSize       sizeHint() const;
+    TQSize       minimumSizeHint() const;
 
     void        showFont(const KURL &url);
     void        showFont();
diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
index a560d2968..14bda4024 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
@@ -76,7 +76,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
 
     itsToolsFrame=new TQFrame(itsFrame);
 
-    TQVBoxLayout *tqlayout=new TQVBoxLayout(itsFrame, kcm ? 0 : KDialog::marginHint(), kcm ? 0 : KDialog::spacingHint());
+    TQVBoxLayout *layout=new TQVBoxLayout(itsFrame, kcm ? 0 : KDialog::marginHint(), kcm ? 0 : KDialog::spacingHint());
     TQGridLayout *previewLayout=new TQGridLayout(previewFrame, 1, 1, 1, 1);
     TQHBoxLayout *toolsLayout=new TQHBoxLayout(itsToolsFrame, 0, KDialog::spacingHint());
 
@@ -88,14 +88,14 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
     setInstance(new KInstance("kfontview"));
 
     itsPreview=new CFontPreview(previewFrame, "FontViewPart::Preview");
-    itsPreview->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    itsPreview->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     itsFaceLabel=new TQLabel(i18n("Face:"), itsToolsFrame);
     itsFaceSelector=new KIntNumInput(1, itsToolsFrame);
     itsInstallButton=new TQPushButton(i18n("Install..."), itsToolsFrame, "button");
     itsInstallButton->hide();
     previewLayout->addWidget(itsPreview, 0, 0);
-    tqlayout->addWidget(previewFrame);
-    tqlayout->addWidget(itsToolsFrame);
+    layout->addWidget(previewFrame);
+    layout->addWidget(itsToolsFrame);
     toolsLayout->addWidget(itsFaceLabel);
     toolsLayout->addWidget(itsFaceSelector);
     itsFaceLabel->hide();
@@ -103,7 +103,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
     toolsLayout->addItem(new TQSpacerItem(5, 5, TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum));
     toolsLayout->addWidget(itsInstallButton);
     itsToolsFrame->hide();
-    connect(itsPreview, TQT_SIGNAL(status(bool)), TQT_SLOT(previewtqStatus(bool)));
+    connect(itsPreview, TQT_SIGNAL(status(bool)), TQT_SLOT(previewStatus(bool)));
     connect(itsInstallButton, TQT_SIGNAL(clicked()), TQT_SLOT(install()));
     connect(itsFaceSelector, TQT_SIGNAL(valueChanged(int)), itsPreview, TQT_SLOT(showFace(int)));
 
@@ -165,17 +165,17 @@ void CFontViewPart::timeout()
         if(Misc::root())
         {
             destUrl=TQString("fonts:/")+itsPreview->engine().getName(m_url);
-            itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget());
+            itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
         }
         else
         {
             destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url);
-            if(KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget()))
+            if(KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()))
                 itsShowInstallButton=false;
             else
             {
                 destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url);
-                itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget());
+                itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
             }
         }
     }
@@ -193,7 +193,7 @@ void CFontViewPart::timeout()
     itsToolsFrame->hide();
 }
 
-void CFontViewPart::previewtqStatus(bool st)
+void CFontViewPart::previewStatus(bool st)
 {
     itsInstallButton->setShown(st && itsShowInstallButton);
     itsToolsFrame->setShown(itsInstallButton->isShown()||itsFaceSelector->isShown());
@@ -220,7 +220,7 @@ void CFontViewPart::install()
     {
         KURL destUrl(getDest(m_url, KMessageBox::No==resp));
 
-        if(KIO::NetAccess::copy(m_url, destUrl, itsFrame->tqparentWidget()))
+        if(KIO::NetAccess::copy(m_url, destUrl, itsFrame->parentWidget()))
         {
             //
             // OK file copied, now look for any AFM or PFM file...
@@ -236,7 +236,7 @@ void CFontViewPart::install()
                 for(it=urls.begin(); it!=end; ++it)
                 {
                     destUrl=getDest(*it, KMessageBox::No==resp);
-                    KIO::NetAccess::copy(*it, destUrl, itsFrame->tqparentWidget());
+                    KIO::NetAccess::copy(*it, destUrl, itsFrame->parentWidget());
                 }
             }
 
@@ -274,7 +274,7 @@ void CFontViewPart::print()
 
     items.append(itsPreview->engine().getName(m_url));
 
-    Print::printItems(items, 0, itsFrame->tqparentWidget(), itsPreview->engine());
+    Print::printItems(items, 0, itsFrame->parentWidget(), itsPreview->engine());
 }
 
 }
diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.h b/kcontrol/kfontinst/viewpart/FontViewPart.h
index 79d5c4743..21de2e074 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPart.h
+++ b/kcontrol/kfontinst/viewpart/FontViewPart.h
@@ -60,7 +60,7 @@ class CFontViewPart : public KParts::ReadOnlyPart
 
     private slots:
 
-    void previewtqStatus(bool st);
+    void previewStatus(bool st);
     void timeout();
     void install();
     void changeText();