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

1 files changed, 15 insertions, 15 deletions

diff --git a/kpackage/pkgInterface.cpp b/kpackage/pkgInterface.cpp
index 7382ff5..b59901d 100644
--- a/kpackage/pkgInterface.cpp
+++ b/kpackage/pkgInterface.cpp
@@ -142,7 +142,7 @@ void pkgInterface::listDir(TQPtrList<packageInfo> *pki, const TQString &fname, c
   packageInfo *p;
 
   TQString sline( queryMsg + fname );
-  kpackage->setStatus(sline);
+  kpackage->settqStatus(sline);
 
   kdDebug() << "listDir fn=" << fname << " dir=" << dir << endl;
 
@@ -156,21 +156,21 @@ void pkgInterface::listDir(TQPtrList<packageInfo> *pki, const TQString &fname, c
   if (d.exists()) {
     if ( d.isReadable() ) {
       TQString pn;
-      const QFileInfoList *list = d.entryInfoList();
-      QFileInfoListIterator it( *list );      // create list iterator
+      const TQFileInfoList *list = d.entryInfoList();
+      TQFileInfoListIterator it( *list );      // create list iterator
       TQFileInfo *fi;                          // pointer for traversing
 
       while ( (fi=it.current()) ) {           // for each entry...
 	if ( fi->isDir() ) {
 	  // entry is a subdir
-	  if ( fi->fileName() != TQString::fromLatin1(".") &&
-	       fi->fileName() != TQString::fromLatin1("..") )
+	  if ( fi->fileName() != TQString::tqfromLatin1(".") &&
+	       fi->fileName() != TQString::tqfromLatin1("..") )
 	    {
-	      // not current dir and not parent dir
+	      // not current dir and not tqparent dir
 	      // -> recursive call:
 	      listDir( pki, dir + "/" + fi->fileName(), dir + "/" + fi->fileName(), subdirs );
 	    } else {
-	      // current dir or parent dir
+	      // current dir or tqparent dir
 	      // -> notihng to do
 	      ;
 	    }
@@ -197,7 +197,7 @@ void pkgInterface::listDir(TQPtrList<packageInfo> *pki, const TQString &fname, c
       }
     } else {
       // directory is not readable
-      kdDebug() << TQString("WARNING: directory '%1' not readable (will be ignored) !\n").arg(d.absPath() ) << endl;
+      kdDebug() << TQString("WARNING: directory '%1' not readable (will be ignored) !\n").tqarg(d.absPath() ) << endl;
     }
   } else {
       TQFile f(fname);
@@ -257,12 +257,12 @@ TQString pkgInterface::getPackList(cacheObj *cp)
 
     unlink(TQFile::encodeName(tmpf));
     if (kpkg)
-      kpackage->setStatus(i18n("Starting Kio"));
+      kpackage->settqStatus(i18n("Starting Kio"));
 
     Kio kio;
     if (kio.download(url, tmpf)) {
       if (kpkg)
-	kpackage->setStatus(i18n("Kio finished"));
+	kpackage->settqStatus(i18n("Kio finished"));
       TQFileInfo f(tmpf);
       if (!(f.exists() && f.size() > 0)) {
 	unlink(TQFile::encodeName(tmpf));
@@ -272,7 +272,7 @@ TQString pkgInterface::getPackList(cacheObj *cp)
       }
     } else {
       if (kpkg)
-	kpackage->setStatus(i18n("Kio failed"));
+	kpackage->settqStatus(i18n("Kio failed"));
       return "";
     }
   } else {
@@ -287,7 +287,7 @@ TQString pkgInterface::getDir(cacheObj *cp) {
 
   if ((res = cacheObj::newDCache(url, cp->cacheFile, tmpDir))) {
     if (res < 0)
-      return TQString::null;
+      return TQString();
 
     Kiod kiod;
     if (kiod.listDir(url,tmpDir, cp->subdirs)) {
@@ -297,9 +297,9 @@ TQString pkgInterface::getDir(cacheObj *cp) {
       cl.write();
       return tmpDir;
     } else {
-      KpMsgE(i18n("Cannot read folder %1").arg(url),FALSE);
+      KpMsgE(i18n("Cannot read folder %1").tqarg(url),FALSE);
       unlink(tmpDir.ascii());
-      return TQString::null;
+      return TQString();
     }
   } else {
       return tmpDir;
@@ -327,7 +327,7 @@ TQStringList pkgInterface::verify(packageInfo *, const TQStringList &files)
 
     uint step = (files.count() / 100) + 1;
 
-    kpackage->setStatus(i18n("Verifying"));
+    kpackage->settqStatus(i18n("Verifying"));
     kpackage->setPercent(0);
 
     for( TQStringList::ConstIterator it = files.begin();