Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 22 insertions, 22 deletions

diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
index 31fbaa83e..112e3562b 100644
--- a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
+++ b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
@@ -28,19 +28,19 @@
 
 #include "KFileFont.h"
 #include "KfiConstants.h"
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
 #include <kgenericfactory.h>
 #include <kio/netaccess.h>
 
-static void addEntry(int face, QString &existing, const QString &add)
+static void addEntry(int face, TQString &existing, const TQString &add)
 {
     if(face>0)
         existing.append(", ");
     existing.append(add);
 }
 
-static int strToWeight(const QString &str)
+static int strToWeight(const TQString &str)
 {
     if(NULL==str)
         return FC_WEIGHT_MEDIUM;
@@ -79,7 +79,7 @@ static int strToWeight(const QString &str)
 }
 
 #ifndef KFI_FC_NO_WIDTHS
-static int strToWidth(const QString &str)
+static int strToWidth(const TQString &str)
 {   
     if(str.isEmpty())
         return FC_WIDTH_NORMAL;
@@ -171,13 +171,13 @@ static const char * getFoundry(const char *notice)
     return NULL;
 }
 
-static bool readAfm(const QString &file, QString &full, QString &family, QString &foundry, QString &weight,
+static bool readAfm(const TQString &file, TQString &full, TQString &family, TQString &foundry, TQString &weight,
 #ifndef KFI_FC_NO_WIDTHS
-                    QString &width,
+                    TQString &width,
 #endif
-                    QString &spacing, QString &slant)
+                    TQString &spacing, TQString &slant)
 {
-    QFile f(file);
+    TQFile f(file);
     bool  foundName=false,
           foundFamily=false;
     int   intSpacing=FC_PROPORTIONAL,
@@ -190,8 +190,8 @@ static bool readAfm(const QString &file, QString &full, QString &family, QString
 
     if(f.open(IO_ReadOnly))
     {
-        QTextStream stream(&f);
-        QString     line;
+        TQTextStream stream(&f);
+        TQString     line;
         bool        inMetrics=false;
 
         while(!stream.atEnd())
@@ -265,7 +265,7 @@ K_EXPORT_COMPONENT_FACTORY(kfile_font, KFileFontPluginFactory("kfontinst"))
 namespace KFI
 {
 
-KFileFontPlugin::KFileFontPlugin(QObject *parent, const char *name, const QStringList& args)
+KFileFontPlugin::KFileFontPlugin(TQObject *parent, const char *name, const TQStringList& args)
                : KFilePlugin(parent, name, args)
 {
     KGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
@@ -286,20 +286,20 @@ void KFileFontPlugin::addMimeType(const char *mime)
     KFileMimeTypeInfo            *info=addMimeTypeInfo(mime);
     KFileMimeTypeInfo::GroupInfo *group=addGroupInfo(info, "General", i18n("General"));
 
-    addItemInfo(group, "Full", i18n("Full Name"), QVariant::String);
-    addItemInfo(group, "Family", i18n("Family"), QVariant::String);
-    addItemInfo(group, "Foundry", i18n("Foundry"), QVariant::String);
-    addItemInfo(group, "Weight", i18n("Weight"),  QVariant::String);
+    addItemInfo(group, "Full", i18n("Full Name"), TQVariant::String);
+    addItemInfo(group, "Family", i18n("Family"), TQVariant::String);
+    addItemInfo(group, "Foundry", i18n("Foundry"), TQVariant::String);
+    addItemInfo(group, "Weight", i18n("Weight"),  TQVariant::String);
 #ifndef KFI_FC_NO_WIDTHS
-    addItemInfo(group, "Width", i18n("Width"), QVariant::String);
+    addItemInfo(group, "Width", i18n("Width"), TQVariant::String);
 #endif
-    addItemInfo(group, "Spacing", i18n("Spacing"),  QVariant::String);
-    addItemInfo(group, "Slant", i18n("Slant"), QVariant::String);
+    addItemInfo(group, "Spacing", i18n("Spacing"),  TQVariant::String);
+    addItemInfo(group, "Slant", i18n("Slant"), TQVariant::String);
 }
 
 bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what)
 {
-    QString full,
+    TQString full,
             lastFull,
             family,
             foundry,
@@ -319,7 +319,7 @@ bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what)
             spacingAll,
             slantAll;
     KURL    url(info.url());
-    QString fName;
+    TQString fName;
     bool    fontsProt  = KFI_KIO_FONTS_PROTOCOL == url.protocol(),
             fileProt   = "file"             == url.protocol(),
             downloaded = false,
diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.h b/kcontrol/kfontinst/kfile-plugin/KFileFont.h
index b06ab2a57..d33079e0b 100644
--- a/kcontrol/kfontinst/kfile-plugin/KFileFont.h
+++ b/kcontrol/kfontinst/kfile-plugin/KFileFont.h
@@ -39,7 +39,7 @@ class KFileFontPlugin : public KFilePlugin
 {
     public:
 
-    KFileFontPlugin(QObject *parent, const char *name, const QStringList& args);
+    KFileFontPlugin(TQObject *parent, const char *name, const TQStringList& args);
     virtual ~KFileFontPlugin() {}
 
     bool readInfo(KFileMetaInfo& info, uint what = KFileMetaInfo::Fastest);