summaryrefslogtreecommitdiffstats
path: root/kfile-plugins/mp3
diff options
context:
space:
mode:
Diffstat (limited to 'kfile-plugins/mp3')
-rw-r--r--kfile-plugins/mp3/kfile_mp3.cpp30
-rw-r--r--kfile-plugins/mp3/kfile_mp3.h5
2 files changed, 18 insertions, 17 deletions
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<KMp3Plugin> 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