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, 22 insertions, 22 deletions

diff --git a/kpackage/debAptInterface.cpp b/kpackage/debAptInterface.cpp
index 9139adf..d453726 100644
--- a/kpackage/debAptInterface.cpp
+++ b/kpackage/debAptInterface.cpp
@@ -100,19 +100,19 @@ bool DEBAPT::isType(char *, const TQString &)
 
 void DEBAPT::makeMenu(KActionCollection* act)
 {
-  updateM = new KAction( i18n("&Update"), TQString::null,
+  updateM = new KAction( i18n("&Update"), TQString(),
 			 0, this,
 			 TQT_SLOT(updateS()), act, "debapt_update");
 
-  upgradeM = new KAction( i18n("U&pgrade"), TQString::null,
+  upgradeM = new KAction( i18n("U&pgrade"), TQString(),
 			  0, this,
 			  TQT_SLOT(upgradeS()), act, "debapt_upgrade");
 
-  fixupM = new KAction( i18n("&Fixup"), TQString::null,
+  fixupM = new KAction( i18n("&Fixup"), TQString(),
 			 0, this,
 			 TQT_SLOT(fixupS()), act, "debapt_fixup");
 
-  fileM = new KAction( i18n("&Apt-File Update"), TQString::null,
+  fileM = new KAction( i18n("&Apt-File Update"), TQString(),
 			 0, this,
 			 TQT_SLOT(fileS()), act, "debapt_file");
 }
@@ -156,7 +156,7 @@ void DEBAPT::fileS()
       kprun->exec();
    } 
   } else {
-    KpMsg("Error",i18n("The %1 program needs to be installed").arg("apt-file"), TRUE);
+    KpMsg("Error",i18n("The %1 program needs to be installed").tqarg("apt-file"), TRUE);
   }
 }
 
@@ -185,13 +185,13 @@ void DEBAPT::listRPack(TQPtrList<packageInfo> *pki)
   packageInfo *p;
   TQStringList  plist;
 
-  kpackage->setStatus(i18n("Querying DEB APT remote package list: %1").arg(hostName));
+  kpackage->settqStatus(i18n("Querying DEB APT remote package list: %1").tqarg(hostName));
   kpackage->setPercent(0);
 
   TQString cmd = "cat " STATUS;
 
   TQStringList list = kpty->run(cmd);
-  kpackage->setStatus(i18n("Processing DEB APT remote package list: %1").arg(hostName));
+  kpackage->settqStatus(i18n("Processing DEB APT remote package list: %1").tqarg(hostName));
   //  kdDebug() << "P=" << list.count() <<"\n";
   kpackage->setPercent(50);
 
@@ -228,7 +228,7 @@ void DEBAPT::listRPack(TQPtrList<packageInfo> *pki)
   }
 
   list.clear();
-  kpackage->setStatus(i18n("DEB APT"));
+  kpackage->settqStatus(i18n("DEB APT"));
   kpackage->setPercent(100);
 }
 
@@ -241,16 +241,16 @@ void DEBAPT::listAvail(TQPtrList<packageInfo> *pki)
 
   //  kdDebug() << "H=" << hostName << "\n";
   if (hostName.isEmpty())
-    kpackage->setStatus(i18n("Querying DEB APT available list"));
+    kpackage->settqStatus(i18n("Querying DEB APT available list"));
   else
-    kpackage->setStatus(i18n("Querying DEB APT available list: %1").arg(hostName));
+    kpackage->settqStatus(i18n("Querying DEB APT available list: %1").tqarg(hostName));
   kpackage->setPercent(0);
 
   TQStringList list = kpty->run("apt-cache dumpavail");
   if (hostName.isEmpty())
-    kpackage->setStatus(i18n("Processing DEB APT available list"));
+    kpackage->settqStatus(i18n("Processing DEB APT available list"));
   else
-     kpackage->setStatus(i18n("Processing DEB APT available list: %1").arg(hostName));
+     kpackage->settqStatus(i18n("Processing DEB APT available list: %1").tqarg(hostName));
 
   //  kdDebug() << "A=" << list.count() <<"\n";
   kpackage->setPercent(50);
@@ -284,7 +284,7 @@ void DEBAPT::listAvail(TQPtrList<packageInfo> *pki)
   }
 
   list.clear();
-  kpackage->setStatus(i18n("DEB APT"));
+  kpackage->settqStatus(i18n("DEB APT"));
   kpackage->setPercent(100);
 }
 
@@ -318,7 +318,7 @@ TQStringList  DEBAPT::listInstalls(const TQStringList &packs, bool install, bool
   TQString packAll;
   for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) {
     //        kdDebug() << "M=" << *it << "\n";
-    if ((*it).find(match) >= 0 || extras) {
+    if ((*it).tqfind(match) >= 0 || extras) {
       if (extras) {
 	if ((*it)[0] == ' ') {
 	  packAll += *it;
@@ -351,21 +351,21 @@ TQStringList DEBAPT::FindFile(const TQString &name, bool searchAll)
       TQStringList filelist = kpty->run(s);
 
       for ( TQStringList::Iterator it = filelist.begin(); it != filelist.end(); ++it ) {
-       int p =  (*it).find(": ");
+       int p =  (*it).tqfind(": ");
         if( p !=-1 )
-          (*it).replace(p, 2, "\t");
+          (*it).tqreplace(p, 2, "\t");
       }
 
       if (filelist.count() == 1) {
        TQStringList::Iterator it = filelist.begin();
-        if ((*it).find("not found") >= 0) {
+        if ((*it).tqfind("not found") >= 0) {
 	 filelist.remove(it);
         }
       }
 
       return filelist;
     } else {
-      KpMsg("Error",i18n("The %1 program needs to be installed").arg("apt-file"), TRUE);
+      KpMsg("Error",i18n("The %1 program needs to be installed").tqarg("apt-file"), TRUE);
       TQStringList nill;
       return nill;
     }
@@ -514,10 +514,10 @@ void DEBAPT::writeApt(const TQStringList &list) {
   TQString cmd = "sh -c \"/bin/echo -e '";
   for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) {
     TQString s = *it;
-    s.replace("\""," ");
-    s.replace("'"," ");
-    s.replace("!"," ");
-    s.replace("`"," ");
+    s.tqreplace("\""," ");
+    s.tqreplace("'"," ");
+    s.tqreplace("!"," ");
+    s.tqreplace("`"," ");
     cmd += s;
     cmd += "\n";
   }