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

diff --git a/kfile-plugins/mpeg/kfile_mpeg.cpp b/kfile-plugins/mpeg/kfile_mpeg.cpp
index f532318e..a94ce15a 100644
--- a/kfile-plugins/mpeg/kfile_mpeg.cpp
+++ b/kfile-plugins/mpeg/kfile_mpeg.cpp
@@ -46,10 +46,10 @@ typedef KGenericFactory<KMpegPlugin> MpegFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_mpeg, MpegFactory( "kfile_mpeg" ))
 
-KMpegPlugin::KMpegPlugin(TQObject *parent, const char *name,
+KMpegPlugin::KMpegPlugin(TQObject *tqparent, const char *name,
                        const TQStringList &args)
 
-    : KFilePlugin(parent, name, args)
+    : KFilePlugin(tqparent, name, args)
 {
     KFileMimeTypeInfo* info = addMimeTypeInfo( "video/mpeg" );
 
@@ -329,7 +329,7 @@ bool KMpegPlugin::read_mpeg()
         skimmed++;
         searched++;
         if (video_len > 0) video_len--;
-        // Use a fast state machine to find 00 00 01 sync code
+        // Use a fast state machine to tqfind 00 00 01 sync code
         switch (state) {
             case 0:
                 if (byte == 0)
@@ -502,7 +502,7 @@ bool KMpegPlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
     // open file, set up stream and set endianness
     if (!file.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;
     }
 
diff --git a/kfile-plugins/mpeg/kfile_mpeg.h b/kfile-plugins/mpeg/kfile_mpeg.h
index 2aa313d2..e35b639e 100644
--- a/kfile-plugins/mpeg/kfile_mpeg.h
+++ b/kfile-plugins/mpeg/kfile_mpeg.h
@@ -28,9 +28,10 @@ class TQStringList;
 class KMpegPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KMpegPlugin( TQObject *parent, const char *name, const TQStringList& args );
+    KMpegPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
 
     virtual bool readInfo( KFileMetaInfo& info, uint what);