summaryrefslogtreecommitdiffstats
path: root/kfile-plugins/flac
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 06:00:15 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 06:00:15 +0000
commitb1057f437bf65300831a0ccb45b920787c6b318d (patch)
treef8a73db06ca1180d0da0ba6dfbe786197b4f4bc3 /kfile-plugins/flac
parent4ddfca384ced9ad654213aef9dc2c3973720b980 (diff)
downloadtdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.tar.gz
tdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.zip
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
Diffstat (limited to 'kfile-plugins/flac')
-rw-r--r--kfile-plugins/flac/kfile_flac.cpp24
-rw-r--r--kfile-plugins/flac/kfile_flac.h5
2 files changed, 15 insertions, 14 deletions
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<KFlacPlugin>("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);
};