removed obsolete members

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1619 90c681e8-e032-0410-971d-27865f9a5e38

3 files changed, 14 insertions, 14 deletions

diff --git a/src/plugins/Input/vorbis/decoder_vorbis.cpp b/src/plugins/Input/vorbis/decoder_vorbis.cpp
index c1d563963..59fefb79f 100644
--- a/src/plugins/Input/vorbis/decoder_vorbis.cpp
+++ b/src/plugins/Input/vorbis/decoder_vorbis.cpp
@@ -135,8 +135,8 @@ bool DecoderVorbis::initialize()
         chan = ogginfo->channels;
     }
     configure(freq, chan, Qmmp::PCM_S16LE);
-    inited = TRUE;
-    return TRUE;
+    inited = true;
+    return true;
 }
 
 
diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.cpp b/src/plugins/Input/vorbis/decodervorbisfactory.cpp
index 6326a92f7..a2b8d3474 100644
--- a/src/plugins/Input/vorbis/decodervorbisfactory.cpp
+++ b/src/plugins/Input/vorbis/decodervorbisfactory.cpp
@@ -39,7 +39,7 @@ bool DecoderVorbisFactory::canDecode(QIODevice *input) const
     char buf[36];
     if (input->peek(buf, 36) == 36 && !memcmp(buf, "OggS", 4)
             && !memcmp(buf + 29, "vorbis", 6))
-        return TRUE;
+        return true;
 
     return FALSE;
 }
@@ -52,7 +52,7 @@ const DecoderProperties DecoderVorbisFactory::properties() const
     properties.filter = "*.ogg";
     properties.description = tr("Ogg Vorbis Files");
     properties.contentType = "application/ogg;audio/x-vorbis+ogg";
-    properties.hasAbout = TRUE;
+    properties.hasAbout = true;
     properties.hasSettings = FALSE;
     properties.noInput = FALSE;
     return properties;
@@ -84,15 +84,15 @@ QList<FileInfo *> DecoderVorbisFactory::createPlayList(const QString &fileName,
     if (tag && !tag->isEmpty())
     {
         info->setMetaData(Qmmp::ALBUM,
-                          QString::fromUtf8(tag->album().toCString(TRUE)).trimmed());
+                          QString::fromUtf8(tag->album().toCString(true)).trimmed());
         info->setMetaData(Qmmp::ARTIST,
-                          QString::fromUtf8(tag->artist().toCString(TRUE)).trimmed());
+                          QString::fromUtf8(tag->artist().toCString(true)).trimmed());
         info->setMetaData(Qmmp::COMMENT,
-                          QString::fromUtf8(tag->comment().toCString(TRUE)).trimmed());
+                          QString::fromUtf8(tag->comment().toCString(true)).trimmed());
         info->setMetaData(Qmmp::GENRE,
-                          QString::fromUtf8(tag->genre().toCString(TRUE)).trimmed());
+                          QString::fromUtf8(tag->genre().toCString(true)).trimmed());
         info->setMetaData(Qmmp::TITLE,
-                          QString::fromUtf8(tag->title().toCString(TRUE)).trimmed());
+                          QString::fromUtf8(tag->title().toCString(true)).trimmed());
         info->setMetaData(Qmmp::YEAR, tag->year());
         info->setMetaData(Qmmp::TRACK, tag->track());
     }
@@ -105,10 +105,10 @@ QList<FileInfo *> DecoderVorbisFactory::createPlayList(const QString &fileName,
         TagLib::StringList fld;
         if(!(fld = tag->fieldListMap()["COMPOSER"]).isEmpty())
             info->setMetaData(Qmmp::COMPOSER,
-                              QString::fromUtf8(fld.toString().toCString(TRUE)).trimmed());
+                              QString::fromUtf8(fld.toString().toCString(true)).trimmed());
         if(!(fld = tag->fieldListMap()["DISCNUMBER"]).isEmpty())
             info->setMetaData(Qmmp::DISCNUMBER,
-                              QString::fromUtf8(fld.toString().toCString(TRUE)).trimmed());
+                              QString::fromUtf8(fld.toString().toCString(true)).trimmed());
     }
 
     QList <FileInfo*> list;
diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
index 0ef036402..a7751b30d 100644
--- a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
+++ b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
@@ -26,7 +26,7 @@
 #include "vorbismetadatamodel.h"
 
 #define QStringToTString_qt4(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8)
-#define TStringToQString_qt4(s) QString::fromUtf8(s.toCString(TRUE)).trimmed()
+#define TStringToQString_qt4(s) QString::fromUtf8(s.toCString(true)).trimmed()
 
 VorbisMetaDataModel::VorbisMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent)
 {
@@ -183,7 +183,7 @@ void VorbisCommentModel::setValue(Qmmp::MetaData key, const QString &value)
     case Qmmp::COMPOSER:
         value.isEmpty() ?
         m_tag->removeField("COMPOSER"):
-        m_tag->addField("COMPOSER", str, TRUE);
+        m_tag->addField("COMPOSER", str, true);
         return;
     case Qmmp::TRACK:
         m_tag->setTrack(value.toInt());
@@ -194,7 +194,7 @@ void VorbisCommentModel::setValue(Qmmp::MetaData key, const QString &value)
     case Qmmp::DISCNUMBER:
         value == "0" ?
         m_tag->removeField("DISCNUMBER"):
-        m_tag->addField("DISCNUMBER", str, TRUE);
+        m_tag->addField("DISCNUMBER", str, true);
     }
 }