TQt4 port kdemultimedia

This enables compilation under both Qt3 and Qt4


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

2 files changed, 7 insertions, 6 deletions

diff --git a/kfile-plugins/sid/kfile_sid.cpp b/kfile-plugins/sid/kfile_sid.cpp
index 444e2ea8..3bdaf681 100644
--- a/kfile-plugins/sid/kfile_sid.cpp
+++ b/kfile-plugins/sid/kfile_sid.cpp
@@ -36,10 +36,10 @@ typedef KGenericFactory<KSidPlugin> SidFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_sid, SidFactory("kfile_sid"))
 
-KSidPlugin::KSidPlugin(TQObject *parent, const char *name,
+KSidPlugin::KSidPlugin(TQObject *tqparent, const char *name,
                        const TQStringList &args)
     
-    : KFilePlugin(parent, name, args)
+    : KFilePlugin(tqparent, name, args)
 {
     kdDebug(7034) << "sid plugin\n";
     
@@ -211,13 +211,13 @@ failure:
 
 TQValidator*
 KSidPlugin::createValidator(const TQString& /*mimetype*/, const TQString& group,
-                            const TQString& /*key*/, TQObject* parent,
+                            const TQString& /*key*/, TQObject* tqparent,
                             const char* name) const
 {
     kdDebug(7034) << k_funcinfo << endl;
     // all items in "General" group are strings of max lenght 31
     if (group == "General")
-        return new TQRegExpValidator(TQRegExp(".{,31}"), parent, name);
+        return new TQRegExpValidator(TQRegExp(".{,31}"), tqparent, name);
     // all others are read-only
     return 0;
 }
diff --git a/kfile-plugins/sid/kfile_sid.h b/kfile-plugins/sid/kfile_sid.h
index eb809c56..d042e57d 100644
--- a/kfile-plugins/sid/kfile_sid.h
+++ b/kfile-plugins/sid/kfile_sid.h
@@ -28,14 +28,15 @@ class TQStringList;
 class KSidPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    KSidPlugin(TQObject *parent, const char *name, const TQStringList& args);
+    KSidPlugin(TQObject *tqparent, const char *name, const TQStringList& args);
     
     virtual bool readInfo(KFileMetaInfo& info, uint what);
     virtual bool writeInfo(const KFileMetaInfo& info) const;
     TQValidator* createValidator(const TQString& mimetype, const TQString& group,
-                                const TQString& key, TQObject* parent,
+                                const TQString& key, TQObject* tqparent,
                                 const char* name) const;
 };