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, 10 insertions, 9 deletions

diff --git a/kfile-plugins/ogg/kfile_ogg.cpp b/kfile-plugins/ogg/kfile_ogg.cpp
index dc4a8f3e..3964b814 100644
--- a/kfile-plugins/ogg/kfile_ogg.cpp
+++ b/kfile-plugins/ogg/kfile_ogg.cpp
@@ -61,9 +61,9 @@ static const char* const knownTranslations[] = {
 
 K_EXPORT_COMPONENT_FACTORY(kfile_ogg, KGenericFactory<KOggPlugin>("kfile_ogg"))
 
-KOggPlugin::KOggPlugin( TQObject *parent, const char *name,
+KOggPlugin::KOggPlugin( TQObject *tqparent, const char *name,
                         const TQStringList &args )
-    : KFilePlugin( parent, name, args )
+    : KFilePlugin( tqparent, name, args )
 {
     kdDebug(7034) << "ogg plugin\n";
     
@@ -176,7 +176,7 @@ bool KOggPlugin::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;
     }
 
@@ -184,7 +184,7 @@ bool KOggPlugin::readInfo( KFileMetaInfo& info, uint what )
 
     if (rc < 0) 
     {
-        kdDebug(7034) << "Unable to understand " << TQFile::encodeName(info.path())
+        kdDebug(7034) << "Unable to understand " << TQFile::encodeName(info.path()).data()
                       << ", errorcode=" << rc << endl;
         return false;
     }
@@ -319,7 +319,7 @@ bool KOggPlugin::writeInfo(const KFileMetaInfo& info) const
     else
         filename = info.path();
     
-    // nothing in Qt or KDE to get the mode as an int?
+    // nothing in TQt or KDE to get the mode as an int?
     struct stat s;
     stat(TQFile::encodeName(filename), &s);
     
@@ -350,8 +350,8 @@ bool KOggPlugin::writeInfo(const KFileMetaInfo& info) const
 
 TQValidator* KOggPlugin::createValidator( const TQString&, 
                                          const TQString &, const TQString &,
-                                         TQObject* parent, const char* name) const {
-	return new TQRegExpValidator(TQRegExp(".*"), parent, name);
+                                         TQObject* tqparent, const char* name) const {
+	return new TQRegExpValidator(TQRegExp(".*"), tqparent, name);
 }
 
 #include "kfile_ogg.moc"
diff --git a/kfile-plugins/ogg/kfile_ogg.h b/kfile-plugins/ogg/kfile_ogg.h
index 79130527..47472c6d 100644
--- a/kfile-plugins/ogg/kfile_ogg.h
+++ b/kfile-plugins/ogg/kfile_ogg.h
@@ -29,16 +29,17 @@ class TQStringList;
 class KOggPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    KOggPlugin( TQObject *parent, const char *name, const TQStringList& args );
+    KOggPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
     
     virtual bool readInfo( KFileMetaInfo& info, uint what);
     virtual bool writeInfo( const KFileMetaInfo& info ) const;
     virtual TQValidator* createValidator( const TQString& mimetype,
                                          const TQString &group,
                                          const TQString &key,
-                                         TQObject* parent, const char* name) const;
+                                         TQObject* tqparent, const char* name) const;
 };