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

This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab.

13 files changed, 32 insertions, 32 deletions

diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
index 6c37d9b4d..53295963e 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
@@ -35,7 +35,7 @@
 #include "FcEngine.h"
 #endif
 #include <tqapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
@@ -114,7 +114,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
         itsSplitter=new TQSplitter(this);
         fontsFrame=new TQFrame(itsSplitter),
         itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(itsSplitter), "kcmfontinst", "KParts::ReadOnlyPart");
-        itsSplitter->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+        itsSplitter->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
 
         TQValueList<int> sizes(itsConfig.readIntListEntry(CFG_SPLITTER_SIZES));
 
@@ -130,7 +130,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
     {
 #endif
         fontsFrame=new TQFrame(this);
-        fontsFrame->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+        fontsFrame->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
 #ifdef HAVE_XFT
     }
 #endif
@@ -141,7 +141,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
     bool        showBitmap(itsConfig.readBoolEntry(CFG_SHOW_BITMAP, false));
 
     fontsFrame->setLineWidth(0);
-    toolbar->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
+    toolbar->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
     toolbar->setMovingEnabled(false);
 
     TQString previousPath=itsConfig.readEntry(CFG_PATH);
@@ -152,12 +152,12 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
     itsDirOp->setMinimumSize(TQSize(96, 64));
     setMimeTypes(showBitmap);
     itsDirOp->dirLister()->setMainWindow(this);
-    itsDirOp->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    itsDirOp->tqsetSizePolicy(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->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+    button->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
     fontsLayout->addWidget(button, 1, 0);
     TQT_TQLAYOUT(fontsLayout)->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
 
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
index b4766c5c4..b1bb35e88 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()->itemRect(this);
+        TQRect r = listView()->tqitemRect(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 4bbd4836c..afd9fa204 100644
--- a/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "PrintDialog.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqframe.h>
 #include <tqlabel.h>
 #include <klocale.h>
diff --git a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp
index 20b77ec07..8b8a88167 100644
--- a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp
@@ -29,7 +29,7 @@
 #include "SettingsDialog.h"
 #include "KfiConstants.h"
 #include "Misc.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqvbox.h>
 #include <tqwhatsthis.h>
diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
index fa53b2369..112e3562b 100644
--- a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
+++ b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
@@ -29,7 +29,7 @@
 #include "KFileFont.h"
 #include "KfiConstants.h"
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <kgenericfactory.h>
 #include <kio/netaccess.h>
 
diff --git a/kcontrol/kfontinst/kfontinst/FontEngine.cpp b/kcontrol/kfontinst/kfontinst/FontEngine.cpp
index 4fe823c23..dffa60f2d 100644
--- a/kcontrol/kfontinst/kfontinst/FontEngine.cpp
+++ b/kcontrol/kfontinst/kfontinst/FontEngine.cpp
@@ -163,7 +163,7 @@ static void removeSymbols(TQString &str)
     TQChar space(' ');
 
     for(int c=0; c<len; ++c)
-        if(str[c].unicode()<0x20 || str[c].unicode()>0x7E)
+        if(str[c].tqunicode()<0x20 || str[c].tqunicode()>0x7E)
             str[c]=space;
 
     str=str.simplifyWhiteSpace();
diff --git a/kcontrol/kfontinst/kfontinst/Fontmap.cpp b/kcontrol/kfontinst/kfontinst/Fontmap.cpp
index 26e77c9e7..2c8b80201 100644
--- a/kcontrol/kfontinst/kfontinst/Fontmap.cpp
+++ b/kcontrol/kfontinst/kfontinst/Fontmap.cpp
@@ -32,7 +32,7 @@
 #include "FcEngine.h"
 #include "KfiConstants.h"
 #include <ksavefile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqdir.h>
 #include <ctype.h>
 #include <stdio.h>
diff --git a/kcontrol/kfontinst/kfontinst/XConfig.cpp b/kcontrol/kfontinst/kfontinst/XConfig.cpp
index b0773ae92..7572e3894 100644
--- a/kcontrol/kfontinst/kfontinst/XConfig.cpp
+++ b/kcontrol/kfontinst/kfontinst/XConfig.cpp
@@ -30,7 +30,7 @@
 #include "FontEngine.h"
 #include "kxftconfig.h"
 #include <ksavefile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <fstream>
 #include <string.h>
 #include <tqdir.h>
diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp
index 707970a20..96abb89db 100644
--- a/kcontrol/kfontinst/kio/KioFonts.cpp
+++ b/kcontrol/kfontinst/kio/KioFonts.cpp
@@ -49,7 +49,7 @@
 #include <kio/netaccess.h>
 #include <kio/slaveinterface.h>
 #include <kio/connection.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <kmimetype.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
@@ -76,7 +76,7 @@
 
 #ifdef KFI_FORCE_DEBUG_TO_STDERR
 
-#include <textstream.h>
+#include <tqtextstream.h>
 TQTextOStream ostr(stderr);
 #define KFI_DBUG ostr << "[" << (int)(getpid()) << "] "
 
@@ -136,7 +136,7 @@ static TQString removeMultipleExtension(const KURL &url)
     TQString fname(url.fileName());
     int     pos;
 
-    if(-1!=(pos=fname.findRev(TQString::fromLatin1(constMultipleExtension))))
+    if(-1!=(pos=fname.findRev(TQString::tqfromLatin1(constMultipleExtension))))
         fname=fname.left(pos);
 
     return fname;
@@ -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::fromLatin1(":/"));
+        TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::tqfromLatin1(":/"));
         return true;
     }
     else if (sys && !Misc::root())   // Default system fonts folder does not actually exist yet!
@@ -393,15 +393,15 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal
             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::fromLatin1(":/"));
+            TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::tqfromLatin1(":/"));
 
             if(!Misc::root())
             {
                 url+=sys ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER);
-                url+=TQString::fromLatin1("/");
+                url+=TQString::tqfromLatin1("/");
             }
             if(multiple)
-                url+=name+TQString::fromLatin1(constMultipleExtension);
+                url+=name+TQString::tqfromLatin1(constMultipleExtension);
             else
                 url+=Misc::getFile(path);
             addAtom(entry, KIO::UDS_URL, 0, url);
@@ -1185,7 +1185,7 @@ bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bo
 
     if (markPartial)
     {
-        TQString  destPart(destOrig+TQString::fromLatin1(".part"));
+        TQString  destPart(destOrig+TQString::tqfromLatin1(".part"));
         TQCString destPartC(TQFile::encodeName(destPart));
 
         dest = destPart;
@@ -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::fromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) ||
-           ds==TQString(TQChar('/')+TQString::fromLatin1(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('/')))
         {
             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/lib/FcEngine.cpp b/kcontrol/kfontinst/lib/FcEngine.cpp
index 4edfc3676..2b3d40737 100644
--- a/kcontrol/kfontinst/lib/FcEngine.cpp
+++ b/kcontrol/kfontinst/lib/FcEngine.cpp
@@ -2,7 +2,7 @@
 #include <tqpixmap.h>
 #include <tqfontmetrics.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <kurl.h>
 #include <kconfig.h>
 #include <kglobalsettings.h>
@@ -439,7 +439,7 @@ static bool hasStr(XftFont *font, TQString &str)
                  ch;
 
     for(ch=0; ch<slen; ++ch)
-        if(!FcCharSetHasChar(font->charset, str[ch].unicode()))
+        if(!FcCharSetHasChar(font->charset, str[ch].tqunicode()))
             return false;
     return true;
 }
diff --git a/kcontrol/kfontinst/viewpart/FontPreview.cpp b/kcontrol/kfontinst/viewpart/FontPreview.cpp
index 3679be252..4382f5feb 100644
--- a/kcontrol/kfontinst/viewpart/FontPreview.cpp
+++ b/kcontrol/kfontinst/viewpart/FontPreview.cpp
@@ -88,7 +88,7 @@ void CFontPreview::paintEvent(TQPaintEvent *)
     {
         if(!itsCurrentUrl.isEmpty())
         {
-            paint.setPen(kapp->palette().active().text());
+            paint.setPen(kapp->tqpalette().active().text());
             paint.drawText(rect(), AlignCenter, i18n(" No preview available"));
         }
     }
@@ -103,12 +103,12 @@ void CFontPreview::paintEvent(TQPaintEvent *)
     }
 }
 
-TQSize CFontPreview::sizeHint() const
+TQSize CFontPreview::tqsizeHint() const
 {
     return TQSize(132, 132);
 }
 
-TQSize CFontPreview::minimumSizeHint() const
+TQSize CFontPreview::tqminimumSizeHint() const
 {
     return TQSize(32, 32);
 }
diff --git a/kcontrol/kfontinst/viewpart/FontPreview.h b/kcontrol/kfontinst/viewpart/FontPreview.h
index 71916479e..f8f922b62 100644
--- a/kcontrol/kfontinst/viewpart/FontPreview.h
+++ b/kcontrol/kfontinst/viewpart/FontPreview.h
@@ -50,8 +50,8 @@ class CFontPreview : public TQWidget
     virtual ~CFontPreview() {}
 
     void        paintEvent(TQPaintEvent *);
-    TQSize       sizeHint() const;
-    TQSize       minimumSizeHint() const;
+    TQSize       tqsizeHint() const;
+    TQSize       tqminimumSizeHint() const;
 
     void        showFont(const KURL &url);
     void        showFont();
diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
index 5be019a22..6e19c4f7d 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
@@ -32,7 +32,7 @@
 #include "KfiConstants.h"
 #include "KfiPrint.h"
 #include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqframe.h>
 #include <tqfile.h>
@@ -88,7 +88,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
     setInstance(new KInstance("kfontview"));
 
     itsPreview=new CFontPreview(previewFrame, "FontViewPart::Preview");
-    itsPreview->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    itsPreview->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     itsFaceLabel=new TQLabel(i18n("Face:"), itsToolsFrame);
     itsFaceSelector=new KIntNumInput(1, itsToolsFrame);
     itsInstallButton=new TQPushButton(i18n("Install..."), itsToolsFrame, "button");