From b1057f437bf65300831a0ccb45b920787c6b318d Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Jun 2011 06:00:15 +0000 Subject: 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 --- kfile-plugins/au/kfile_au.cpp | 6 +++--- kfile-plugins/au/kfile_au.h | 3 ++- kfile-plugins/avi/kfile_avi.cpp | 6 +++--- kfile-plugins/avi/kfile_avi.h | 3 ++- kfile-plugins/flac/kfile_flac.cpp | 24 ++++++++++++------------ kfile-plugins/flac/kfile_flac.h | 5 +++-- kfile-plugins/m3u/kfile_m3u.cpp | 6 +++--- kfile-plugins/m3u/kfile_m3u.h | 3 ++- kfile-plugins/mp3/kfile_mp3.cpp | 30 +++++++++++++++--------------- kfile-plugins/mp3/kfile_mp3.h | 5 +++-- kfile-plugins/mpc/kfile_mpc.cpp | 24 ++++++++++++------------ kfile-plugins/mpc/kfile_mpc.h | 5 +++-- kfile-plugins/mpeg/kfile_mpeg.cpp | 8 ++++---- kfile-plugins/mpeg/kfile_mpeg.h | 3 ++- kfile-plugins/ogg/kfile_ogg.cpp | 14 +++++++------- kfile-plugins/ogg/kfile_ogg.h | 5 +++-- kfile-plugins/sid/kfile_sid.cpp | 8 ++++---- kfile-plugins/sid/kfile_sid.h | 5 +++-- kfile-plugins/theora/kfile_theora.cpp | 6 +++--- kfile-plugins/theora/kfile_theora.h | 3 ++- kfile-plugins/wav/kfile_wav.cpp | 6 +++--- kfile-plugins/wav/kfile_wav.h | 3 ++- 22 files changed, 96 insertions(+), 85 deletions(-) (limited to 'kfile-plugins') diff --git a/kfile-plugins/au/kfile_au.cpp b/kfile-plugins/au/kfile_au.cpp index ae1b4614..1c6e3cfd 100644 --- a/kfile-plugins/au/kfile_au.cpp +++ b/kfile-plugins/au/kfile_au.cpp @@ -43,10 +43,10 @@ typedef KGenericFactory AuFactory; K_EXPORT_COMPONENT_FACTORY(kfile_au, AuFactory( "kfile_au" )) -KAuPlugin::KAuPlugin(TQObject *parent, const char *name, +KAuPlugin::KAuPlugin(TQObject *tqparent, const char *name, const TQStringList &args) - : KFilePlugin(parent, name, args) + : KFilePlugin(tqparent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "audio/basic" ); @@ -90,7 +90,7 @@ bool KAuPlugin::readInfo( KFileMetaInfo& info, uint what) 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/au/kfile_au.h b/kfile-plugins/au/kfile_au.h index 7968d87c..d09ce2a7 100644 --- a/kfile-plugins/au/kfile_au.h +++ b/kfile-plugins/au/kfile_au.h @@ -27,9 +27,10 @@ class TQStringList; class KAuPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KAuPlugin( TQObject *parent, const char *name, const TQStringList& args ); + KAuPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); }; 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 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 ); diff --git a/kfile-plugins/flac/kfile_flac.cpp b/kfile-plugins/flac/kfile_flac.cpp index 6462c917..be804ee1 100644 --- a/kfile-plugins/flac/kfile_flac.cpp +++ b/kfile-plugins/flac/kfile_flac.cpp @@ -56,9 +56,9 @@ K_EXPORT_COMPONENT_FACTORY(kfile_flac, KGenericFactory("kfile_flac")) -KFlacPlugin::KFlacPlugin( TQObject *parent, const char *name, +KFlacPlugin::KFlacPlugin( TQObject *tqparent, const char *name, const TQStringList &args ) - : KFilePlugin( parent, name, args ) + : KFilePlugin( tqparent, name, args ) { kdDebug(7034) << "flac plugin\n"; @@ -178,16 +178,16 @@ bool KFlacPlugin::readInfo( KFileMetaInfo& info, uint what ) { KFileMetaInfoGroup commentgroup = appendGroup(info, "Comment"); - TQString date = file->tag()->year() > 0 ? TQString::number(file->tag()->year()) : TQString::null; - TQString track = file->tag()->track() > 0 ? TQString::number(file->tag()->track()) : TQString::null; + TQString date = file->tag()->year() > 0 ? TQString::number(file->tag()->year()) : TQString(); + TQString track = file->tag()->track() > 0 ? TQString::number(file->tag()->track()) : TQString(); - appendItem(commentgroup, "Title", TStringToQString(file->tag()->title()).stripWhiteSpace()); - appendItem(commentgroup, "Artist", TStringToQString(file->tag()->artist()).stripWhiteSpace()); - appendItem(commentgroup, "Album", TStringToQString(file->tag()->album()).stripWhiteSpace()); + appendItem(commentgroup, "Title", TQString(TStringToQString(file->tag()->title())).stripWhiteSpace()); + appendItem(commentgroup, "Artist", TQString(TStringToQString(file->tag()->artist())).stripWhiteSpace()); + appendItem(commentgroup, "Album", TQString(TStringToQString(file->tag()->album())).stripWhiteSpace()); appendItem(commentgroup, "Date", date); - appendItem(commentgroup, "Comment", TStringToQString(file->tag()->comment()).stripWhiteSpace()); + appendItem(commentgroup, "Comment", TQString(TStringToQString(file->tag()->comment())).stripWhiteSpace()); appendItem(commentgroup, "Tracknumber", track); - appendItem(commentgroup, "Genre", TStringToQString(file->tag()->genre()).stripWhiteSpace()); + appendItem(commentgroup, "Genre", TQString(TStringToQString(file->tag()->genre())).stripWhiteSpace()); } if (readTech && file->audioProperties()) @@ -269,14 +269,14 @@ bool KFlacPlugin::writeInfo(const KFileMetaInfo& info) const TQValidator* KFlacPlugin::createValidator( const TQString&, const TQString &group, const TQString &key, - TQObject* parent, const char* name) const + TQObject* tqparent, const char* name) const { if(key == "Tracknumber" || key == "Date") { - return new TQIntValidator(0, 9999, parent, name); + return new TQIntValidator(0, 9999, tqparent, name); } else - return new TQRegExpValidator(TQRegExp(".*"), parent, name); + return new TQRegExpValidator(TQRegExp(".*"), tqparent, name); } #include "kfile_flac.moc" diff --git a/kfile-plugins/flac/kfile_flac.h b/kfile-plugins/flac/kfile_flac.h index b08e2136..8d60169c 100644 --- a/kfile-plugins/flac/kfile_flac.h +++ b/kfile-plugins/flac/kfile_flac.h @@ -32,16 +32,17 @@ class TQStringList; class KFlacPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KFlacPlugin( TQObject *parent, const char *name, const TQStringList& args ); + KFlacPlugin( 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; protected: virtual void makeMimeTypeInfo(const TQString& mimeType); }; diff --git a/kfile-plugins/m3u/kfile_m3u.cpp b/kfile-plugins/m3u/kfile_m3u.cpp index 5fff1a08..d366685f 100644 --- a/kfile-plugins/m3u/kfile_m3u.cpp +++ b/kfile-plugins/m3u/kfile_m3u.cpp @@ -37,9 +37,9 @@ typedef KGenericFactory M3uFactory; K_EXPORT_COMPONENT_FACTORY( kfile_m3u, M3uFactory( "kfile_m3u" ) ) -KM3uPlugin::KM3uPlugin( TQObject *parent, const char *name, +KM3uPlugin::KM3uPlugin( TQObject *tqparent, const char *name, const TQStringList &preferredItems ) - : KFilePlugin( parent, name, preferredItems ) + : KFilePlugin( tqparent, name, preferredItems ) { kdDebug(7034) << "m3u plugin\n"; @@ -75,7 +75,7 @@ bool KM3uPlugin::readInfo( KFileMetaInfo& info, uint ) if (s.endsWith("\n")) s.truncate(s.length()-1); if (!s.stripWhiteSpace().isEmpty()) { - appendItem(group, i18n("Track %1").arg(num, 3), s); + appendItem(group, i18n("Track %1").tqarg(num, 3), s); num++; } } diff --git a/kfile-plugins/m3u/kfile_m3u.h b/kfile-plugins/m3u/kfile_m3u.h index 2787c81b..a91d392d 100644 --- a/kfile-plugins/m3u/kfile_m3u.h +++ b/kfile-plugins/m3u/kfile_m3u.h @@ -29,9 +29,10 @@ class TQStringList; class KM3uPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KM3uPlugin( TQObject *parent, const char *name, const TQStringList& args ); + KM3uPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what ); }; diff --git a/kfile-plugins/mp3/kfile_mp3.cpp b/kfile-plugins/mp3/kfile_mp3.cpp index c6317946..8036cef8 100644 --- a/kfile-plugins/mp3/kfile_mp3.cpp +++ b/kfile-plugins/mp3/kfile_mp3.cpp @@ -44,8 +44,8 @@ typedef KGenericFactory Mp3Factory; K_EXPORT_COMPONENT_FACTORY(kfile_mp3, Mp3Factory( "kfile_mp3" )) -KMp3Plugin::KMp3Plugin(TQObject *parent, const char *name, const TQStringList &args) - : KFilePlugin(parent, name, args) +KMp3Plugin::KMp3Plugin(TQObject *tqparent, const char *name, const TQStringList &args) + : KFilePlugin(tqparent, name, args) { kdDebug(7034) << "mp3 plugin\n"; @@ -151,24 +151,24 @@ bool KMp3Plugin::readInfo(KFileMetaInfo &info, uint what) { KFileMetaInfoGroup id3group = appendGroup(info, "id3"); - TQString date = file.tag()->year() > 0 ? TQString::number(file.tag()->year()) : TQString::null; - TQString track = file.tag()->track() > 0 ? TQString::number(file.tag()->track()) : TQString::null; + TQString date = file.tag()->year() > 0 ? TQString::number(file.tag()->year()) : TQString(); + TQString track = file.tag()->track() > 0 ? TQString::number(file.tag()->track()) : TQString(); - TQString title = TStringToQString(file.tag()->title()).stripWhiteSpace(); + TQString title = TQString(TStringToQString(file.tag()->title())).stripWhiteSpace(); if (!title.isEmpty()) appendItem(id3group, "Title", title); - TQString artist = TStringToQString(file.tag()->artist()).stripWhiteSpace(); + TQString artist = TQString(TStringToQString(file.tag()->artist())).stripWhiteSpace(); if (!artist.isEmpty()) appendItem(id3group, "Artist", artist); - TQString album = TStringToQString(file.tag()->album()).stripWhiteSpace(); + TQString album = TQString(TStringToQString(file.tag()->album())).stripWhiteSpace(); if (!album.isEmpty()) appendItem(id3group, "Album", album); appendItem(id3group, "Date", date); - TQString comment = TStringToQString(file.tag()->comment()).stripWhiteSpace(); + TQString comment = TQString(TStringToQString(file.tag()->comment())).stripWhiteSpace(); if (!comment.isEmpty()) appendItem(id3group, "Comment", comment); appendItem(id3group, "Tracknumber", track); - TQString genre = TStringToQString(file.tag()->genre()).stripWhiteSpace(); + TQString genre = TQString(TStringToQString(file.tag()->genre())).stripWhiteSpace(); if (!genre.isEmpty()) appendItem(id3group, "Genre", genre); } @@ -191,7 +191,7 @@ bool KMp3Plugin::readInfo(KFileMetaInfo &info, uint what) break; } - static const int dummy = 0; // QVariant's bool constructor requires a dummy int value. + static const int dummy = 0; // TQVariant's bool constructor requires a dummy int value. // CRC and Emphasis aren't yet implemented in TagLib (not that I think anyone cares) @@ -267,8 +267,8 @@ class ComboValidator : public KStringListValidator { public: ComboValidator(const TQStringList &list, bool rejecting, - bool fixupEnabled, TQObject *parent, const char *name) : - KStringListValidator(list, rejecting, fixupEnabled, parent, name) + bool fixupEnabled, TQObject *tqparent, const char *name) : + KStringListValidator(list, rejecting, fixupEnabled, tqparent, name) { } @@ -281,13 +281,13 @@ public: TQValidator *KMp3Plugin::createValidator(const TQString & /* mimetype */, const TQString &group, const TQString &key, - TQObject *parent, const char *name) const + TQObject *tqparent, const char *name) const { kdDebug(7034) << "making a validator for " << group << "/" << key << endl; if(key == "Tracknumber" || key == "Date") { - return new TQIntValidator(0, 9999, parent, name); + return new TQIntValidator(0, 9999, tqparent, name); } if(key == "Genre") @@ -298,7 +298,7 @@ TQValidator *KMp3Plugin::createValidator(const TQString & /* mimetype */, { l.append(TStringToQString((*it))); } - return new ComboValidator(l, false, true, parent, name); + return new ComboValidator(l, false, true, tqparent, name); } return 0; diff --git a/kfile-plugins/mp3/kfile_mp3.h b/kfile-plugins/mp3/kfile_mp3.h index 6f3fc44c..903a5804 100644 --- a/kfile-plugins/mp3/kfile_mp3.h +++ b/kfile-plugins/mp3/kfile_mp3.h @@ -26,16 +26,17 @@ class TQStringList; class KMp3Plugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KMp3Plugin(TQObject *parent, const char *name, const TQStringList &args); + KMp3Plugin(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; }; #endif diff --git a/kfile-plugins/mpc/kfile_mpc.cpp b/kfile-plugins/mpc/kfile_mpc.cpp index 4b6800df..a1bf5648 100644 --- a/kfile-plugins/mpc/kfile_mpc.cpp +++ b/kfile-plugins/mpc/kfile_mpc.cpp @@ -48,9 +48,9 @@ K_EXPORT_COMPONENT_FACTORY(kfile_mpc, KGenericFactory("kfile_mpc")) -KMpcPlugin::KMpcPlugin( TQObject *parent, const char *name, +KMpcPlugin::KMpcPlugin( TQObject *tqparent, const char *name, const TQStringList &args ) - : KFilePlugin( parent, name, args ) + : KFilePlugin( tqparent, name, args ) { kdDebug(7034) << "mpc plugin\n"; @@ -154,16 +154,16 @@ bool KMpcPlugin::readInfo( KFileMetaInfo& info, uint what ) { KFileMetaInfoGroup commentgroup = appendGroup(info, "Comment"); - TQString date = file->tag()->year() > 0 ? TQString::number(file->tag()->year()) : TQString::null; - TQString track = file->tag()->track() > 0 ? TQString::number(file->tag()->track()) : TQString::null; + TQString date = file->tag()->year() > 0 ? TQString::number(file->tag()->year()) : TQString(); + TQString track = file->tag()->track() > 0 ? TQString::number(file->tag()->track()) : TQString(); - appendItem(commentgroup, "Title", TStringToQString(file->tag()->title()).stripWhiteSpace()); - appendItem(commentgroup, "Artist", TStringToQString(file->tag()->artist()).stripWhiteSpace()); - appendItem(commentgroup, "Album", TStringToQString(file->tag()->album()).stripWhiteSpace()); + appendItem(commentgroup, "Title", TQString(TStringToQString(file->tag()->title())).stripWhiteSpace()); + appendItem(commentgroup, "Artist", TQString(TStringToQString(file->tag()->artist())).stripWhiteSpace()); + appendItem(commentgroup, "Album", TQString(TStringToQString(file->tag()->album())).stripWhiteSpace()); appendItem(commentgroup, "Date", date); - appendItem(commentgroup, "Comment", TStringToQString(file->tag()->comment()).stripWhiteSpace()); + appendItem(commentgroup, "Comment", TQString(TStringToQString(file->tag()->comment())).stripWhiteSpace()); appendItem(commentgroup, "Tracknumber", track); - appendItem(commentgroup, "Genre", TStringToQString(file->tag()->genre()).stripWhiteSpace()); + appendItem(commentgroup, "Genre", TQString(TStringToQString(file->tag()->genre())).stripWhiteSpace()); } if (readTech) @@ -240,14 +240,14 @@ bool KMpcPlugin::writeInfo(const KFileMetaInfo& info) const TQValidator* KMpcPlugin::createValidator( const TQString&, const TQString &group, const TQString &key, - TQObject* parent, const char* name) const + TQObject* tqparent, const char* name) const { if(key == "Tracknumber" || key == "Date") { - return new TQIntValidator(0, 9999, parent, name); + return new TQIntValidator(0, 9999, tqparent, name); } else - return new TQRegExpValidator(TQRegExp(".*"), parent, name); + return new TQRegExpValidator(TQRegExp(".*"), tqparent, name); } #include "kfile_mpc.moc" diff --git a/kfile-plugins/mpc/kfile_mpc.h b/kfile-plugins/mpc/kfile_mpc.h index 9deb7d71..380da446 100644 --- a/kfile-plugins/mpc/kfile_mpc.h +++ b/kfile-plugins/mpc/kfile_mpc.h @@ -32,16 +32,17 @@ class TQStringList; class KMpcPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KMpcPlugin( TQObject *parent, const char *name, const TQStringList& args ); + KMpcPlugin( 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; }; 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 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); 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("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; }; 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 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; }; 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 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); }; diff --git a/kfile-plugins/wav/kfile_wav.cpp b/kfile-plugins/wav/kfile_wav.cpp index 09e2c2cc..917d8fca 100644 --- a/kfile-plugins/wav/kfile_wav.cpp +++ b/kfile-plugins/wav/kfile_wav.cpp @@ -43,10 +43,10 @@ typedef KGenericFactory WavFactory; K_EXPORT_COMPONENT_FACTORY(kfile_wav, WavFactory( "kfile_wav" )) -KWavPlugin::KWavPlugin(TQObject *parent, const char *name, +KWavPlugin::KWavPlugin(TQObject *tqparent, const char *name, const TQStringList &args) - : KFilePlugin(parent, name, args) + : KFilePlugin(tqparent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "audio/x-wav" ); @@ -99,7 +99,7 @@ bool KWavPlugin::readInfo( KFileMetaInfo& info, uint /*what*/) 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/wav/kfile_wav.h b/kfile-plugins/wav/kfile_wav.h index a2f8ae40..9eb4d796 100644 --- a/kfile-plugins/wav/kfile_wav.h +++ b/kfile-plugins/wav/kfile_wav.h @@ -27,9 +27,10 @@ class TQStringList; class KWavPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KWavPlugin( TQObject *parent, const char *name, const TQStringList& args ); + KWavPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); }; -- cgit v1.2.1