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, 5 insertions, 4 deletions

diff --git a/kfile-plugins/avi/kfile_avi.cpp b/kfile-plugins/avi/kfile_avi.cpp
index a7c2bc31..d8dd2f7b 100644
--- a/kfile-plugins/avi/kfile_avi.cpp
+++ b/kfile-plugins/avi/kfile_avi.cpp
@@ -45,10 +45,10 @@ typedef KGenericFactory<KAviPlugin> AviFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_avi, AviFactory( "kfile_avi" ))
 
-KAviPlugin::KAviPlugin(TQObject *parent, const char *name,
+KAviPlugin::KAviPlugin(TQObject *tqparent, const char *name,
                        const TQStringList &args)
 
-    : KFilePlugin(parent, name, args)
+    : KFilePlugin(tqparent, name, args)
 {
     KFileMimeTypeInfo* info = addMimeTypeInfo( "video/x-msvideo" );
 
@@ -486,7 +486,7 @@ bool KAviPlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
     // open file, set up stream and set endianness
     if (!f.open(IO_ReadOnly))
     {
-        kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl;
+        kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()).data() << endl;
         return false;
     }
     //TQDataStream dstream(&file);
diff --git a/kfile-plugins/avi/kfile_avi.h b/kfile-plugins/avi/kfile_avi.h
index 43bc72e0..da16a16b 100644
--- a/kfile-plugins/avi/kfile_avi.h
+++ b/kfile-plugins/avi/kfile_avi.h
@@ -37,9 +37,10 @@ class TQStringList;
 class KAviPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    KAviPlugin( TQObject *parent, const char *name, const TQStringList& args );
+    KAviPlugin( TQObject *tqparent, const char *name, const TQStringList& args );