TQt4 port kdeaddons

This enables compilation under both Qt3 and Qt4


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

6 files changed, 27 insertions, 25 deletions

diff --git a/kfile-plugins/lnk/kfile_lnk.cpp b/kfile-plugins/lnk/kfile_lnk.cpp
index eb9e106..46e8b9d 100644
--- a/kfile-plugins/lnk/kfile_lnk.cpp
+++ b/kfile-plugins/lnk/kfile_lnk.cpp
@@ -35,9 +35,9 @@ K_EXPORT_COMPONENT_FACTORY(kfile_lnk, lnkFactory( "kfile_lnk" ))
 
 //--------------------------------------------------------------------------------
 
-lnkPlugin::lnkPlugin(TQObject *parent, const char *name,
+lnkPlugin::lnkPlugin(TQObject *tqparent, const char *name,
                        const TQStringList &args)
-    : KFilePlugin(parent, name, args)
+    : KFilePlugin(tqparent, name, args)
 {
   KFileMimeTypeInfo* info = addMimeTypeInfo( "application/x-win-lnk" );
 
@@ -75,8 +75,8 @@ bool lnkPlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
 
   if ( ! lnkInfo.isNetworkPath )
   {
-    appendItem(group, "Where", i18n("on Windows disk: %1").arg(lnkInfo.volumeName));  // volume label
-    appendItem(group, "PointsTo", TQString("%1%2").arg(lnkInfo.driveName).arg(lnkInfo.path));
+    appendItem(group, "Where", i18n("on Windows disk: %1").tqarg(lnkInfo.volumeName));  // volume label
+    appendItem(group, "PointsTo", TQString("%1%2").tqarg(lnkInfo.driveName).tqarg(lnkInfo.path));
   }
   else
   {
diff --git a/kfile-plugins/lnk/kfile_lnk.h b/kfile-plugins/lnk/kfile_lnk.h
index 3bb7a8f..bc8b832 100644
--- a/kfile-plugins/lnk/kfile_lnk.h
+++ b/kfile-plugins/lnk/kfile_lnk.h
@@ -35,9 +35,10 @@ class TQStringList;
 class lnkPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    lnkPlugin( TQObject *parent, const char *name, const TQStringList& args );
+    lnkPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
     
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 };
diff --git a/kfile-plugins/lnk/lnkforward.cpp b/kfile-plugins/lnk/lnkforward.cpp
index af4492b..9eb6af0 100644
--- a/kfile-plugins/lnk/lnkforward.cpp
+++ b/kfile-plugins/lnk/lnkforward.cpp
@@ -72,7 +72,7 @@ int LNKForwarder::run(KCmdLineArgs *args)
   bool ret = readLNK(args->arg(0), info);
   if ( ! ret ) return 1;
 
-  info.path.replace(TQChar('\\'), TQChar('/'));
+  info.path.tqreplace(TQChar('\\'), TQChar('/'));
 
   TQString path;
 
diff --git a/kfile-plugins/lnk/lnkforward.h b/kfile-plugins/lnk/lnkforward.h
index 8810902..9d0a510 100644
--- a/kfile-plugins/lnk/lnkforward.h
+++ b/kfile-plugins/lnk/lnkforward.h
@@ -31,6 +31,7 @@
 class LNKForwarder : public KApplication
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     int run(KCmdLineArgs *args);
diff --git a/kfile-plugins/lnk/read_lnk.cpp b/kfile-plugins/lnk/read_lnk.cpp
index f65b657..645486e 100644
--- a/kfile-plugins/lnk/read_lnk.cpp
+++ b/kfile-plugins/lnk/read_lnk.cpp
@@ -33,27 +33,27 @@ struct LNKHeader
 {
    char magic[4];
    char GUID[16];
-   Q_UINT32 flags;
-   Q_UINT32 attributes;
+   TQ_UINT32 flags;
+   TQ_UINT32 attributes;
    char time1[8];
    char time2[8];
    char time3[8];
-   Q_UINT32 length;
-   Q_UINT32 iconNum;
-   Q_UINT32 showWnd;
-   Q_UINT32 hotKey;
+   TQ_UINT32 length;
+   TQ_UINT32 iconNum;
+   TQ_UINT32 showWnd;
+   TQ_UINT32 hotKey;
    char filler[8];
 };
 
 struct LNKFileLocation
 {
-  Q_UINT32 totalLen;
-  Q_UINT32 ptr;
-  Q_UINT32 flags;
-  Q_UINT32 localVolume;
-  Q_UINT32 basePath;
-  Q_UINT32 netVolume;
-  Q_UINT32 pathname;
+  TQ_UINT32 totalLen;
+  TQ_UINT32 ptr;
+  TQ_UINT32 flags;
+  TQ_UINT32 localVolume;
+  TQ_UINT32 basePath;
+  TQ_UINT32 netVolume;
+  TQ_UINT32 pathname;
 };
 
 //--------------------------------------------------------------------------------
@@ -97,7 +97,7 @@ bool readLNK(const KURL &url, LNKInfo &info)
 
   if ( header.flags & 0x1 )  // the shell item id list is present
   {
-    Q_UINT16 len;
+    TQ_UINT16 len;
 
     // skip that list
     if ( (fread(&len, sizeof(len), 1, fd) != 1) || (fseek(fd, len, SEEK_CUR) != 0) )
@@ -156,7 +156,7 @@ bool readLNK(const KURL &url, LNKInfo &info)
     {
       info.volumeName = (start + loc.localVolume + 0x10);  // volume label
 
-      info.path = TQString::null;
+      info.path = TQString();
 
       if ( *(start + loc.basePath) )
       {
@@ -182,8 +182,8 @@ bool readLNK(const KURL &url, LNKInfo &info)
     else  // network path
     {
       info.path = TQString("%1\\%2")
-                          .arg(start + loc.netVolume + 0x14)  // network share name
-                          .arg(start + loc.pathname);
+                          .tqarg(start + loc.netVolume + 0x14)  // network share name
+                          .tqarg(start + loc.pathname);
     }
 
     delete [] data;
@@ -191,7 +191,7 @@ bool readLNK(const KURL &url, LNKInfo &info)
 
     if ( header.flags & 0x4 )   // has description string
     {
-      Q_UINT16 len;
+      TQ_UINT16 len;
 
       if ( fread(&len, sizeof(len), 1, fd) != 1 )
       {
diff --git a/kfile-plugins/lnk/read_lnk.h b/kfile-plugins/lnk/read_lnk.h
index ff8fe63..96f3226 100644
--- a/kfile-plugins/lnk/read_lnk.h
+++ b/kfile-plugins/lnk/read_lnk.h
@@ -31,7 +31,7 @@ struct LNKInfo
 {
   LNKInfo() : fileSize(0), isNetworkPath(false), isDirectory(false), isFileOrDir(false) {}
 
-  Q_UINT32 fileSize;
+  TQ_UINT32 fileSize;
   bool isNetworkPath;
   bool isDirectory;
   bool isFileOrDir;