diff options
Diffstat (limited to 'kfile-plugins/mpc')
| -rw-r--r-- | kfile-plugins/mpc/kfile_mpc.cpp | 24 | ||||
| -rw-r--r-- | kfile-plugins/mpc/kfile_mpc.h | 5 |
2 files changed, 15 insertions, 14 deletions
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<KMpcPlugin>("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; }; |