TQt4 port kdeadmin

This enables compilation under both Qt3 and Qt4


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

4 files changed, 14 insertions, 12 deletions

diff --git a/kfile-plugins/deb/kfile_deb.cpp b/kfile-plugins/deb/kfile_deb.cpp
index 3839764..fdd16f2 100644
--- a/kfile-plugins/deb/kfile_deb.cpp
+++ b/kfile-plugins/deb/kfile_deb.cpp
@@ -43,10 +43,10 @@ typedef KGenericFactory<KDebPlugin> DebFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_deb, DebFactory( "kfile_deb" ))
 
-KDebPlugin::KDebPlugin(TQObject *parent, const char *name,
+KDebPlugin::KDebPlugin(TQObject *tqparent, const char *name,
                        const TQStringList &args)
     
-    : KFilePlugin(parent, name, args)
+    : KFilePlugin(tqparent, name, args)
 {
     KFileMimeTypeInfo* info = addMimeTypeInfo( "application/x-deb" );
     KFileMimeTypeInfo::GroupInfo* group = 0L;
@@ -64,7 +64,7 @@ bool KDebPlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
     KAr debfile (info.path());
   
     if ( !debfile.open( IO_ReadOnly ) ) {
-        kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl;
+        kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()).data() << endl;
         return false;    
     }
 
@@ -104,7 +104,7 @@ bool KDebPlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
             char linebuf[100];
             controldev.readLine(linebuf, sizeof( linebuf ));
             TQString line(linebuf);
-            int fieldstart = line.find(TQRegExp(":"), 0) + 2;
+            int fieldstart = line.tqfind(TQRegExp(":"), 0) + 2;
             if (fieldstart == 1) break;
             TQString fieldname = line.mid(0, fieldstart - 2);
             TQString fielddata = line.mid(fieldstart, line.length() - fieldstart - 1);
diff --git a/kfile-plugins/deb/kfile_deb.h b/kfile-plugins/deb/kfile_deb.h
index 8b374b9..14b80a9 100644
--- a/kfile-plugins/deb/kfile_deb.h
+++ b/kfile-plugins/deb/kfile_deb.h
@@ -27,9 +27,10 @@ class TQStringList;
 class KDebPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    KDebPlugin( TQObject *parent, const char *name, const TQStringList& args );
+    KDebPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
     
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 
diff --git a/kfile-plugins/rpm/kfile_rpm.cpp b/kfile-plugins/rpm/kfile_rpm.cpp
index 9089b4b..ed98acd 100644
--- a/kfile-plugins/rpm/kfile_rpm.cpp
+++ b/kfile-plugins/rpm/kfile_rpm.cpp
@@ -36,10 +36,10 @@ typedef KGenericFactory<KRpmPlugin> RpmFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_rpm, RpmFactory( "kfile_rpm" ))
 
-KRpmPlugin::KRpmPlugin(TQObject *parent, const char *name,
+KRpmPlugin::KRpmPlugin(TQObject *tqparent, const char *name,
                        const TQStringList &args)
     
-    : KFilePlugin(parent, name, args)
+    : KFilePlugin(tqparent, name, args)
 {
     KFileMimeTypeInfo* info = addMimeTypeInfo( "application/x-rpm" );
     KFileMimeTypeInfo::GroupInfo* group = 0L;
@@ -72,7 +72,7 @@ bool KRpmPlugin::readInfo( KFileMetaInfo& info, uint what)
 
     if (!file.open(IO_ReadOnly))
     {
-        kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl;
+        kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()).data() << endl;
         return false;
     }
 
@@ -126,18 +126,18 @@ bool KRpmPlugin::readInfo( KFileMetaInfo& info, uint what)
 				case RPM_INT32_TYPE:	uint32_t int32tag;
 							dstream >> int32tag;
 							if ( !tagname.isEmpty() ) appendItem(general, tagname, int(int32tag));
-							if ( all.isValid() ) appendItem(all, TQString("%1").arg( tag ), TQString("%1").arg( int32tag ));
+							if ( all.isValid() ) appendItem(all, TQString("%1").tqarg( tag ), TQString("%1").tqarg( int32tag ));
 							break;
 				case RPM_INT16_TYPE:	uint16_t int16tag;
 							dstream >> int16tag;
 							if ( !tagname.isEmpty() ) appendItem(general, tagname, int(int16tag));
-							if ( all.isValid() ) appendItem(all, TQString("%1").arg( tag ), TQString("%1").arg( int16tag ));
+							if ( all.isValid() ) appendItem(all, TQString("%1").tqarg( tag ), TQString("%1").tqarg( int16tag ));
 							break;
 				case RPM_I18NSTRING_TYPE: // Fallthru
 				case RPM_STRING_TYPE:   TQString strtag; char in;
 							while ( ( in = file.getch() ) != '\0' ) strtag += in;
 							if ( !tagname.isEmpty() ) appendItem(general, tagname, strtag);
-							if( all.isValid() ) appendItem(all, TQString("%1").arg( tag ), strtag);
+							if( all.isValid() ) appendItem(all, TQString("%1").tqarg( tag ), strtag);
 							break;
 			}
 			file.at(oldPos); // Restore old position
diff --git a/kfile-plugins/rpm/kfile_rpm.h b/kfile-plugins/rpm/kfile_rpm.h
index 80b5c2f..86dca89 100644
--- a/kfile-plugins/rpm/kfile_rpm.h
+++ b/kfile-plugins/rpm/kfile_rpm.h
@@ -27,9 +27,10 @@ class TQStringList;
 class KRpmPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    KRpmPlugin( TQObject *parent, const char *name, const TQStringList& args );
+    KRpmPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
     
     virtual bool readInfo( KFileMetaInfo& info, uint what);