From 27edf28be2772229a7974a007313ea30d92c3ffd Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kfile-plugins/au/kfile_au.cpp | 4 ++-- kfile-plugins/au/kfile_au.h | 2 +- kfile-plugins/avi/kfile_avi.cpp | 4 ++-- kfile-plugins/avi/kfile_avi.h | 2 +- kfile-plugins/flac/kfile_flac.cpp | 10 +++++----- kfile-plugins/flac/kfile_flac.h | 4 ++-- kfile-plugins/m3u/kfile_m3u.cpp | 4 ++-- kfile-plugins/m3u/kfile_m3u.h | 2 +- kfile-plugins/mp3/kfile_mp3.cpp | 14 +++++++------- kfile-plugins/mp3/kfile_mp3.h | 4 ++-- kfile-plugins/mpc/kfile_mpc.cpp | 10 +++++----- kfile-plugins/mpc/kfile_mpc.h | 4 ++-- kfile-plugins/mpeg/kfile_mpeg.cpp | 4 ++-- kfile-plugins/mpeg/kfile_mpeg.h | 2 +- kfile-plugins/ogg/kfile_ogg.cpp | 8 ++++---- kfile-plugins/ogg/kfile_ogg.h | 4 ++-- kfile-plugins/sid/kfile_sid.cpp | 8 ++++---- kfile-plugins/sid/kfile_sid.h | 4 ++-- kfile-plugins/theora/kfile_theora.cpp | 4 ++-- kfile-plugins/theora/kfile_theora.h | 2 +- kfile-plugins/wav/kfile_wav.cpp | 4 ++-- kfile-plugins/wav/kfile_wav.h | 2 +- 22 files changed, 53 insertions(+), 53 deletions(-) (limited to 'kfile-plugins') diff --git a/kfile-plugins/au/kfile_au.cpp b/kfile-plugins/au/kfile_au.cpp index 1c6e3cfd..8a2108a9 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 *tqparent, const char *name, +KAuPlugin::KAuPlugin(TQObject *parent, const char *name, const TQStringList &args) - : KFilePlugin(tqparent, name, args) + : KFilePlugin(parent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "audio/basic" ); diff --git a/kfile-plugins/au/kfile_au.h b/kfile-plugins/au/kfile_au.h index d09ce2a7..062fcce6 100644 --- a/kfile-plugins/au/kfile_au.h +++ b/kfile-plugins/au/kfile_au.h @@ -30,7 +30,7 @@ class KAuPlugin: public KFilePlugin TQ_OBJECT public: - KAuPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); + KAuPlugin( TQObject *parent, 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 d8dd2f7b..131ae027 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 *tqparent, const char *name, +KAviPlugin::KAviPlugin(TQObject *parent, const char *name, const TQStringList &args) - : KFilePlugin(tqparent, name, args) + : KFilePlugin(parent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "video/x-msvideo" ); diff --git a/kfile-plugins/avi/kfile_avi.h b/kfile-plugins/avi/kfile_avi.h index da16a16b..bc22284c 100644 --- a/kfile-plugins/avi/kfile_avi.h +++ b/kfile-plugins/avi/kfile_avi.h @@ -40,7 +40,7 @@ class KAviPlugin: public KFilePlugin TQ_OBJECT public: - KAviPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); + KAviPlugin( TQObject *parent, const char *name, const TQStringList& args ); diff --git a/kfile-plugins/flac/kfile_flac.cpp b/kfile-plugins/flac/kfile_flac.cpp index be804ee1..c621f74c 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 *tqparent, const char *name, +KFlacPlugin::KFlacPlugin( TQObject *parent, const char *name, const TQStringList &args ) - : KFilePlugin( tqparent, name, args ) + : KFilePlugin( parent, name, args ) { kdDebug(7034) << "flac plugin\n"; @@ -269,14 +269,14 @@ bool KFlacPlugin::writeInfo(const KFileMetaInfo& info) const TQValidator* KFlacPlugin::createValidator( const TQString&, const TQString &group, const TQString &key, - TQObject* tqparent, const char* name) const + TQObject* parent, const char* name) const { if(key == "Tracknumber" || key == "Date") { - return new TQIntValidator(0, 9999, tqparent, name); + return new TQIntValidator(0, 9999, parent, name); } else - return new TQRegExpValidator(TQRegExp(".*"), tqparent, name); + return new TQRegExpValidator(TQRegExp(".*"), parent, name); } #include "kfile_flac.moc" diff --git a/kfile-plugins/flac/kfile_flac.h b/kfile-plugins/flac/kfile_flac.h index 8d60169c..d8019195 100644 --- a/kfile-plugins/flac/kfile_flac.h +++ b/kfile-plugins/flac/kfile_flac.h @@ -35,14 +35,14 @@ class KFlacPlugin: public KFilePlugin TQ_OBJECT public: - KFlacPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); + KFlacPlugin( TQObject *parent, 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* tqparent, const char* name) const; + TQObject* parent, 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 d366685f..12c3315c 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 *tqparent, const char *name, +KM3uPlugin::KM3uPlugin( TQObject *parent, const char *name, const TQStringList &preferredItems ) - : KFilePlugin( tqparent, name, preferredItems ) + : KFilePlugin( parent, name, preferredItems ) { kdDebug(7034) << "m3u plugin\n"; diff --git a/kfile-plugins/m3u/kfile_m3u.h b/kfile-plugins/m3u/kfile_m3u.h index a91d392d..b64999b9 100644 --- a/kfile-plugins/m3u/kfile_m3u.h +++ b/kfile-plugins/m3u/kfile_m3u.h @@ -32,7 +32,7 @@ class KM3uPlugin: public KFilePlugin TQ_OBJECT public: - KM3uPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); + KM3uPlugin( TQObject *parent, 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 8036cef8..f686147c 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 *tqparent, const char *name, const TQStringList &args) - : KFilePlugin(tqparent, name, args) +KMp3Plugin::KMp3Plugin(TQObject *parent, const char *name, const TQStringList &args) + : KFilePlugin(parent, name, args) { kdDebug(7034) << "mp3 plugin\n"; @@ -267,8 +267,8 @@ class ComboValidator : public KStringListValidator { public: ComboValidator(const TQStringList &list, bool rejecting, - bool fixupEnabled, TQObject *tqparent, const char *name) : - KStringListValidator(list, rejecting, fixupEnabled, tqparent, name) + bool fixupEnabled, TQObject *parent, const char *name) : + KStringListValidator(list, rejecting, fixupEnabled, parent, name) { } @@ -281,13 +281,13 @@ public: TQValidator *KMp3Plugin::createValidator(const TQString & /* mimetype */, const TQString &group, const TQString &key, - TQObject *tqparent, const char *name) const + TQObject *parent, const char *name) const { kdDebug(7034) << "making a validator for " << group << "/" << key << endl; if(key == "Tracknumber" || key == "Date") { - return new TQIntValidator(0, 9999, tqparent, name); + return new TQIntValidator(0, 9999, parent, name); } if(key == "Genre") @@ -298,7 +298,7 @@ TQValidator *KMp3Plugin::createValidator(const TQString & /* mimetype */, { l.append(TStringToQString((*it))); } - return new ComboValidator(l, false, true, tqparent, name); + return new ComboValidator(l, false, true, parent, name); } return 0; diff --git a/kfile-plugins/mp3/kfile_mp3.h b/kfile-plugins/mp3/kfile_mp3.h index 903a5804..3bccebe1 100644 --- a/kfile-plugins/mp3/kfile_mp3.h +++ b/kfile-plugins/mp3/kfile_mp3.h @@ -29,14 +29,14 @@ class KMp3Plugin: public KFilePlugin TQ_OBJECT public: - KMp3Plugin(TQObject *tqparent, const char *name, const TQStringList &args); + KMp3Plugin(TQObject *parent, 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 *tqparent, const char *name) const; + TQObject *parent, const char *name) const; }; #endif diff --git a/kfile-plugins/mpc/kfile_mpc.cpp b/kfile-plugins/mpc/kfile_mpc.cpp index a1bf5648..830feb54 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 *tqparent, const char *name, +KMpcPlugin::KMpcPlugin( TQObject *parent, const char *name, const TQStringList &args ) - : KFilePlugin( tqparent, name, args ) + : KFilePlugin( parent, name, args ) { kdDebug(7034) << "mpc plugin\n"; @@ -240,14 +240,14 @@ bool KMpcPlugin::writeInfo(const KFileMetaInfo& info) const TQValidator* KMpcPlugin::createValidator( const TQString&, const TQString &group, const TQString &key, - TQObject* tqparent, const char* name) const + TQObject* parent, const char* name) const { if(key == "Tracknumber" || key == "Date") { - return new TQIntValidator(0, 9999, tqparent, name); + return new TQIntValidator(0, 9999, parent, name); } else - return new TQRegExpValidator(TQRegExp(".*"), tqparent, name); + return new TQRegExpValidator(TQRegExp(".*"), parent, name); } #include "kfile_mpc.moc" diff --git a/kfile-plugins/mpc/kfile_mpc.h b/kfile-plugins/mpc/kfile_mpc.h index 380da446..ef747c50 100644 --- a/kfile-plugins/mpc/kfile_mpc.h +++ b/kfile-plugins/mpc/kfile_mpc.h @@ -35,14 +35,14 @@ class KMpcPlugin: public KFilePlugin TQ_OBJECT public: - KMpcPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); + KMpcPlugin( TQObject *parent, 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* tqparent, const char* name) const; + TQObject* parent, const char* name) const; }; diff --git a/kfile-plugins/mpeg/kfile_mpeg.cpp b/kfile-plugins/mpeg/kfile_mpeg.cpp index 71f5f7fa..4d51f64d 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 *tqparent, const char *name, +KMpegPlugin::KMpegPlugin(TQObject *parent, const char *name, const TQStringList &args) - : KFilePlugin(tqparent, name, args) + : KFilePlugin(parent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "video/mpeg" ); diff --git a/kfile-plugins/mpeg/kfile_mpeg.h b/kfile-plugins/mpeg/kfile_mpeg.h index e35b639e..6f6c9ddd 100644 --- a/kfile-plugins/mpeg/kfile_mpeg.h +++ b/kfile-plugins/mpeg/kfile_mpeg.h @@ -31,7 +31,7 @@ class KMpegPlugin: public KFilePlugin TQ_OBJECT public: - KMpegPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); + KMpegPlugin( TQObject *parent, 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 3964b814..30f96096 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 *tqparent, const char *name, +KOggPlugin::KOggPlugin( TQObject *parent, const char *name, const TQStringList &args ) - : KFilePlugin( tqparent, name, args ) + : KFilePlugin( parent, name, args ) { kdDebug(7034) << "ogg plugin\n"; @@ -350,8 +350,8 @@ bool KOggPlugin::writeInfo(const KFileMetaInfo& info) const TQValidator* KOggPlugin::createValidator( const TQString&, const TQString &, const TQString &, - TQObject* tqparent, const char* name) const { - return new TQRegExpValidator(TQRegExp(".*"), tqparent, name); + TQObject* parent, const char* name) const { + return new TQRegExpValidator(TQRegExp(".*"), parent, name); } #include "kfile_ogg.moc" diff --git a/kfile-plugins/ogg/kfile_ogg.h b/kfile-plugins/ogg/kfile_ogg.h index 47472c6d..08b9ad04 100644 --- a/kfile-plugins/ogg/kfile_ogg.h +++ b/kfile-plugins/ogg/kfile_ogg.h @@ -32,14 +32,14 @@ class KOggPlugin: public KFilePlugin TQ_OBJECT public: - KOggPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); + KOggPlugin( TQObject *parent, 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* tqparent, const char* name) const; + TQObject* parent, const char* name) const; }; diff --git a/kfile-plugins/sid/kfile_sid.cpp b/kfile-plugins/sid/kfile_sid.cpp index 3bdaf681..444e2ea8 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 *tqparent, const char *name, +KSidPlugin::KSidPlugin(TQObject *parent, const char *name, const TQStringList &args) - : KFilePlugin(tqparent, name, args) + : KFilePlugin(parent, 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* tqparent, + const TQString& /*key*/, TQObject* parent, 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}"), tqparent, name); + return new TQRegExpValidator(TQRegExp(".{,31}"), parent, 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 d042e57d..468f2b32 100644 --- a/kfile-plugins/sid/kfile_sid.h +++ b/kfile-plugins/sid/kfile_sid.h @@ -31,12 +31,12 @@ class KSidPlugin: public KFilePlugin TQ_OBJECT public: - KSidPlugin(TQObject *tqparent, const char *name, const TQStringList& args); + KSidPlugin(TQObject *parent, 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* tqparent, + const TQString& key, TQObject* parent, const char* name) const; }; diff --git a/kfile-plugins/theora/kfile_theora.cpp b/kfile-plugins/theora/kfile_theora.cpp index 0dbefbe7..aac38978 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 *tqparent, const char *name, +theoraPlugin::theoraPlugin(TQObject *parent, const char *name, const TQStringList &args) - : KFilePlugin(tqparent, name, args) + : KFilePlugin(parent, name, args) { // kdDebug(7034) << "theora plugin\n"; diff --git a/kfile-plugins/theora/kfile_theora.h b/kfile-plugins/theora/kfile_theora.h index 13c943c4..a1d05bfd 100644 --- a/kfile-plugins/theora/kfile_theora.h +++ b/kfile-plugins/theora/kfile_theora.h @@ -34,7 +34,7 @@ class theoraPlugin: public KFilePlugin TQ_OBJECT public: - theoraPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); + theoraPlugin( TQObject *parent, 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 917d8fca..50841d95 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 *tqparent, const char *name, +KWavPlugin::KWavPlugin(TQObject *parent, const char *name, const TQStringList &args) - : KFilePlugin(tqparent, name, args) + : KFilePlugin(parent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "audio/x-wav" ); diff --git a/kfile-plugins/wav/kfile_wav.h b/kfile-plugins/wav/kfile_wav.h index 9eb4d796..01117312 100644 --- a/kfile-plugins/wav/kfile_wav.h +++ b/kfile-plugins/wav/kfile_wav.h @@ -30,7 +30,7 @@ class KWavPlugin: public KFilePlugin TQ_OBJECT public: - KWavPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); + KWavPlugin( TQObject *parent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); }; -- cgit v1.2.1