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

diff --git a/ksysv/IOCore.cpp b/ksysv/IOCore.cpp
index 434d051..3535317 100644
--- a/ksysv/IOCore.cpp
+++ b/ksysv/IOCore.cpp
@@ -49,23 +49,23 @@ void ksv::IO::removeFile (const TQFileInfo& info, TQDir& dir, TQString& rich, TQ
   if (!dir.remove(info.fileName(), FALSE))
 	{
 	  rich = (i18n ("<error>FAILED</error> to remove <cmd>%1</cmd> from <cmd>%2</cmd>: \"%3\"<br/>")
-			  .arg(info.fileName())
-			  .arg(dir.path())
-			  .arg(strerror(errno)));
+			  .tqarg(info.fileName())
+			  .tqarg(dir.path())
+			  .tqarg(strerror(errno)));
 	  plain = (i18n ("FAILED to remove %1 from %2: \"%3\"\n")
-               .arg(info.fileName())
-               .arg(dir.path())
-               .arg(strerror(errno)));
+               .tqarg(info.fileName())
+               .tqarg(dir.path())
+               .tqarg(strerror(errno)));
 	}
   else
 	{
 	  rich = i18n("removed <cmd>%1</cmd> from <cmd>%2</cmd><br/>")
-		.arg(info.fileName())
-		.arg(dir.path());
+		.tqarg(info.fileName())
+		.tqarg(dir.path());
 	  
 	  plain = i18n("removed %1 from %2\n")
-		.arg(info.fileName())
-		.arg(dir.path());
+		.tqarg(info.fileName())
+		.tqarg(dir.path());
 	}
 }
 
@@ -80,8 +80,8 @@ void ksv::IO::dissectFilename (const TQString& file, TQString& base, int& nr)
 void ksv::IO::makeSymlink (const KSVData& data, int runlevel, bool start,
                            TQString& rich, TQString& plain)
 {
-  const TQString symName = TQString("%1%2%3").arg(start ? "S" : "K").arg(data.numberString()).arg(data.label());
-  const TQString symPath = TQString("%1/rc%2.d/").arg(KSVConfig::self()->runlevelPath()).arg(runlevel);
+  const TQString symName = TQString("%1%2%3").tqarg(start ? "S" : "K").tqarg(data.numberString()).tqarg(data.label());
+  const TQString symPath = TQString("%1/rc%2.d/").tqarg(KSVConfig::self()->runlevelPath()).tqarg(runlevel);
 
   const TQString symbol = symPath + symName;
   TQString target = data.filename();
@@ -92,27 +92,27 @@ void ksv::IO::makeSymlink (const KSVData& data, int runlevel, bool start,
 
   if (symlink(target.local8Bit(), symbol.local8Bit()) == 0)
 	{
-	  rich = i18n("created <cmd>%1</cmd> in <cmd>%2</cmd><br/>").arg(symName).arg(symPath);
-	  plain = i18n("created %1 in %2\n").arg(symName).arg(symPath);
+	  rich = i18n("created <cmd>%1</cmd> in <cmd>%2</cmd><br/>").tqarg(symName).tqarg(symPath);
+	  plain = i18n("created %1 in %2\n").tqarg(symName).tqarg(symPath);
 	}
   else
 	{
 	  rich = i18n("<error>FAILED</error> to create <cmd>%1</cmd> in <cmd>%2</cmd>: \"%3\"<br/>")
-		.arg(symName)
-		.arg(symPath)
-		.arg(strerror(errno));
+		.tqarg(symName)
+		.tqarg(symPath)
+		.tqarg(strerror(errno));
       
 	  plain = i18n("FAILED to create %1 in %2: \"%3\"\n")
-		.arg(symName)
-		.arg(symPath)
-		.arg(strerror(errno));
+		.tqarg(symName)
+		.tqarg(symPath)
+		.tqarg(strerror(errno));
 	}
 }
 
 TQString ksv::IO::makeRelativePath (const TQString& from, const TQString& to)
 {
   if (TQDir::isRelativePath(from) || TQDir::isRelativePath(to))
-    return TQString::null;
+    return TQString();
   
   int pos = 0;
   const int f_length = from.length();
@@ -121,7 +121,7 @@ TQString ksv::IO::makeRelativePath (const TQString& from, const TQString& to)
   while (pos > -1)
     {
       const int old = pos + 1;
-      const int res = from.find('/', old);
+      const int res = from.tqfind('/', old);
       
       int length = 0;
 
@@ -143,7 +143,7 @@ TQString ksv::IO::makeRelativePath (const TQString& from, const TQString& to)
   while (pos > -1)
     {
       const int old = pos + 1;
-      const int res = to.find('/', old);
+      const int res = to.tqfind('/', old);
       
       int length = 0;
       
@@ -184,7 +184,7 @@ bool ksv::IO::loadSavedConfiguration (TQDataStream& s,
   if (magic != "KSysV")
     return false;
   
-  Q_INT32 version = 0;
+  TQ_INT32 version = 0;
   s >> version;
 
   if (version != 3)
@@ -201,13 +201,13 @@ bool ksv::IO::loadSavedConfiguration (TQDataStream& s,
       s >> rlMagic;
       s >> section;
 
-      if (rlMagic != TQString::fromLatin1("RUNLEVEL %1").arg(i))
+      if (rlMagic != TQString::tqfromLatin1("RUNLEVEL %1").tqarg(i))
         return false;
       
       if (section != "START")
         return false;
 
-      Q_INT32 numberOfItems;
+      TQ_INT32 numberOfItems;
       s >> numberOfItems;
       
       KSVData data;
@@ -236,18 +236,18 @@ bool ksv::IO::saveConfiguration (TQDataStream& s,
                                  KSVDragList** start,
                                  KSVDragList** stop)
 {
-  Q_INT32 version = 3;
+  TQ_INT32 version = 3;
 
   s << TQCString("KSysV")
     << version
-    << TQDateTime::currentDateTime(); // save date
+    << TQDateTime::tqcurrentDateTime(); // save date
 
   for (int i = 0; i < ksv::runlevelNumber; ++i)
     {
-      Q_INT32 numberOfItems = start[i]->childCount();
+      TQ_INT32 numberOfItems = start[i]->childCount();
 
-      s << TQString::fromLatin1 ("RUNLEVEL %1").arg (i)
-        << TQString::fromLatin1 ("START")
+      s << TQString::tqfromLatin1 ("RUNLEVEL %1").arg (i)
+        << TQString::tqfromLatin1 ("START")
         << numberOfItems;
       
       for (TQListViewItemIterator it (start[i]); 
@@ -259,7 +259,7 @@ bool ksv::IO::saveConfiguration (TQDataStream& s,
 
       numberOfItems = stop[i]->childCount();
 
-      s << TQString::fromLatin1 ("STOP")
+      s << TQString::tqfromLatin1 ("STOP")
         << numberOfItems;
 
       for (TQListViewItemIterator it (stop[i]);