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/theora/kfile_theora.cpp b/kfile-plugins/theora/kfile_theora.cpp
index d426cc7f..0dbefbe7 100644
--- a/kfile-plugins/theora/kfile_theora.cpp
+++ b/kfile-plugins/theora/kfile_theora.cpp
@@ -56,9 +56,9 @@ typedef KGenericFactory<theoraPlugin> theoraFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_theora, theoraFactory( "kfile_theora" ))
 
-theoraPlugin::theoraPlugin(TQObject *parent, const char *name,
+theoraPlugin::theoraPlugin(TQObject *tqparent, const char *name,
                            const TQStringList &args)
-        : KFilePlugin(parent, name, args)
+        : KFilePlugin(tqparent, name, args)
 {
 //  kdDebug(7034) << "theora plugin\n";
 
@@ -136,7 +136,7 @@ bool theoraPlugin::readInfo( KFileMetaInfo& info, uint what)
     fp = fopen(TQFile::encodeName(info.path()),"rb");
     if (!fp)
     {
-        kdDebug(7034) << "Unable to open " << TQFile::encodeName(info.path()) << endl;
+        kdDebug(7034) << "Unable to open " << TQFile::encodeName(info.path()).data() << endl;
         return false;
     }
 
diff --git a/kfile-plugins/theora/kfile_theora.h b/kfile-plugins/theora/kfile_theora.h
index 740dea2b..13c943c4 100644
--- a/kfile-plugins/theora/kfile_theora.h
+++ b/kfile-plugins/theora/kfile_theora.h
@@ -31,9 +31,10 @@ class TQStringList;
 class theoraPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    theoraPlugin( TQObject *parent, const char *name, const TQStringList& args );
+    theoraPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
     
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 };