changed TagModel api

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

14 files changed, 45 insertions, 42 deletions

diff --git a/src/plugins/Input/flac/flacmetadatamodel.cpp b/src/plugins/Input/flac/flacmetadatamodel.cpp
index 80957de30..baefc62ce 100644
--- a/src/plugins/Input/flac/flacmetadatamodel.cpp
+++ b/src/plugins/Input/flac/flacmetadatamodel.cpp
@@ -116,12 +116,12 @@ VorbisCommentModel::VorbisCommentModel(TagLib::Ogg::XiphComment *tag, TagLib::Fi
 VorbisCommentModel::~VorbisCommentModel()
 {}
 
-const QString VorbisCommentModel::name()
+QString VorbisCommentModel::name() const
 {
     return "Vorbis Comment";
 }
 
-const QString VorbisCommentModel::value(Qmmp::MetaData key)
+QString VorbisCommentModel::value(Qmmp::MetaData key) const
 {
     if(!m_tag)
         return QString();
diff --git a/src/plugins/Input/flac/flacmetadatamodel.h b/src/plugins/Input/flac/flacmetadatamodel.h
index 4116126a0..06b5f90a7 100644
--- a/src/plugins/Input/flac/flacmetadatamodel.h
+++ b/src/plugins/Input/flac/flacmetadatamodel.h
@@ -49,8 +49,8 @@ class VorbisCommentModel : public TagModel
 public:
     VorbisCommentModel(TagLib::Ogg::XiphComment *tag, TagLib::File *file);
     ~VorbisCommentModel();
-    const QString name();
-    const QString value(Qmmp::MetaData key);
+    QString name() const;
+    QString value(Qmmp::MetaData key) const;
     void setValue(Qmmp::MetaData key, const QString &value);
     void save();
 
diff --git a/src/plugins/Input/mpc/mpcmetadatamodel.cpp b/src/plugins/Input/mpc/mpcmetadatamodel.cpp
index 74daf0b86..a510a32b9 100644
--- a/src/plugins/Input/mpc/mpcmetadatamodel.cpp
+++ b/src/plugins/Input/mpc/mpcmetadatamodel.cpp
@@ -65,14 +65,14 @@ MPCFileTagModel::MPCFileTagModel(TagLib::MPC::File *file, TagLib::MPC::File::Tag
 MPCFileTagModel::~MPCFileTagModel()
 {}
 
-const QString MPCFileTagModel::name()
+QString MPCFileTagModel::name() const
 {
     if (m_tagType == TagLib::MPC::File::ID3v1)
         return "ID3v1";
     return "APE";
 }
 
-QList<Qmmp::MetaData> MPCFileTagModel::keys()
+QList<Qmmp::MetaData> MPCFileTagModel::keys() const
 {
     QList<Qmmp::MetaData> list = TagModel::keys();
     list.removeAll(Qmmp::DISCNUMBER);
@@ -84,7 +84,7 @@ QList<Qmmp::MetaData> MPCFileTagModel::keys()
     return list;
 }
 
-const QString MPCFileTagModel::value(Qmmp::MetaData key)
+QString MPCFileTagModel::value(Qmmp::MetaData key) const
 {
     if (m_tag)
     {
@@ -172,7 +172,7 @@ void MPCFileTagModel::setValue(Qmmp::MetaData key, const QString &value)
     }
 }
 
-bool MPCFileTagModel::exists()
+bool MPCFileTagModel::exists() const
 {
     return (m_tag != 0);
 }
diff --git a/src/plugins/Input/mpc/mpcmetadatamodel.h b/src/plugins/Input/mpc/mpcmetadatamodel.h
index 4bc01e6be..40efc48eb 100644
--- a/src/plugins/Input/mpc/mpcmetadatamodel.h
+++ b/src/plugins/Input/mpc/mpcmetadatamodel.h
@@ -47,11 +47,11 @@ class MPCFileTagModel : public TagModel
 public:
     MPCFileTagModel(TagLib::MPC::File *file, TagLib::MPC::File::TagTypes tagType);
     ~MPCFileTagModel();
-    const QString name();
-    QList<Qmmp::MetaData> keys();
-    const QString value(Qmmp::MetaData key);
+    QString name() const;
+    QList<Qmmp::MetaData> keys() const override;
+    QString value(Qmmp::MetaData key) const;
     void setValue(Qmmp::MetaData key, const QString &value);
-    bool exists();
+    bool exists() const override;
     void create();
     void remove();
     void save();
diff --git a/src/plugins/Input/mpeg/mpegmetadatamodel.cpp b/src/plugins/Input/mpeg/mpegmetadatamodel.cpp
index 187331df4..15712d0b5 100644
--- a/src/plugins/Input/mpeg/mpegmetadatamodel.cpp
+++ b/src/plugins/Input/mpeg/mpegmetadatamodel.cpp
@@ -155,7 +155,7 @@ MpegFileTagModel::MpegFileTagModel(bool using_rusxmms, TagLib::MPEG::File *file,
 MpegFileTagModel::~MpegFileTagModel()
 {}
 
-const QString MpegFileTagModel::name()
+QString MpegFileTagModel::name() const
 {
     if (m_tagType == TagLib::MPEG::File::ID3v1)
         return "ID3v1";
@@ -164,7 +164,7 @@ const QString MpegFileTagModel::name()
     return "APE";
 }
 
-QList<Qmmp::MetaData> MpegFileTagModel::keys()
+QList<Qmmp::MetaData> MpegFileTagModel::keys() const
 {
     QList<Qmmp::MetaData> list = TagModel::keys();
     if (m_tagType == TagLib::MPEG::File::ID3v2)
@@ -180,7 +180,7 @@ QList<Qmmp::MetaData> MpegFileTagModel::keys()
     return list;
 }
 
-const QString MpegFileTagModel::value(Qmmp::MetaData key)
+QString MpegFileTagModel::value(Qmmp::MetaData key) const
 {
     QTextCodec *codec = m_codec;
 
@@ -351,7 +351,7 @@ void MpegFileTagModel::setValue(Qmmp::MetaData key, const QString &value)
     }
 }
 
-bool MpegFileTagModel::exists()
+bool MpegFileTagModel::exists() const
 {
     return (m_tag != 0);
 }
diff --git a/src/plugins/Input/mpeg/mpegmetadatamodel.h b/src/plugins/Input/mpeg/mpegmetadatamodel.h
index 02d0a1cfb..0fb613169 100644
--- a/src/plugins/Input/mpeg/mpegmetadatamodel.h
+++ b/src/plugins/Input/mpeg/mpegmetadatamodel.h
@@ -48,11 +48,11 @@ class MpegFileTagModel : public TagModel
 public:
     MpegFileTagModel(bool using_rusxmms, TagLib::MPEG::File *file, TagLib::MPEG::File::TagTypes tagType);
     ~MpegFileTagModel();
-    const QString name();
-    QList<Qmmp::MetaData> keys();
-    const QString value(Qmmp::MetaData key);
+    QString name() const;
+    QList<Qmmp::MetaData> keys() const override;
+    QString value(Qmmp::MetaData key) const;
     void setValue(Qmmp::MetaData key, const QString &value);
-    bool exists();
+    bool exists() const override;
     void create();
     void remove();
     void save();
diff --git a/src/plugins/Input/opus/opusmetadatamodel.cpp b/src/plugins/Input/opus/opusmetadatamodel.cpp
index bf8196951..7cbc2f8d0 100644
--- a/src/plugins/Input/opus/opusmetadatamodel.cpp
+++ b/src/plugins/Input/opus/opusmetadatamodel.cpp
@@ -118,12 +118,12 @@ VorbisCommentModel::VorbisCommentModel(TagLib::Ogg::Opus::File *file) : TagModel
 VorbisCommentModel::~VorbisCommentModel()
 {}
 
-const QString VorbisCommentModel::name()
+QString VorbisCommentModel::name() const
 {
     return "Vorbis Comment";
 }
 
-const QString VorbisCommentModel::value(Qmmp::MetaData key)
+QString VorbisCommentModel::value(Qmmp::MetaData key) const
 {
     if(!m_tag)
         return QString();
diff --git a/src/plugins/Input/opus/opusmetadatamodel.h b/src/plugins/Input/opus/opusmetadatamodel.h
index 20b7b5cd3..8d6c1e8d6 100644
--- a/src/plugins/Input/opus/opusmetadatamodel.h
+++ b/src/plugins/Input/opus/opusmetadatamodel.h
@@ -49,8 +49,8 @@ class VorbisCommentModel : public TagModel
 public:
     VorbisCommentModel(TagLib::Ogg::Opus::File *file);
     ~VorbisCommentModel();
-    const QString name();
-    const QString value(Qmmp::MetaData key);
+    QString name() const;
+    QString value(Qmmp::MetaData key) const;
     void setValue(Qmmp::MetaData key, const QString &value);
     void save();
 
diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
index 67b7d0fb5..121711870 100644
--- a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
+++ b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
@@ -103,12 +103,12 @@ VorbisCommentModel::VorbisCommentModel(VorbisMetaDataModel *model) : TagModel(Ta
 VorbisCommentModel::~VorbisCommentModel()
 {}
 
-const QString VorbisCommentModel::name()
+QString VorbisCommentModel::name() const
 {
     return "Vorbis Comment";
 }
 
-const QString VorbisCommentModel::value(Qmmp::MetaData key)
+QString VorbisCommentModel::value(Qmmp::MetaData key) const
 {
     if(!m_model->m_tag || m_model->m_tag->isEmpty())
         return QString();
diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.h b/src/plugins/Input/vorbis/vorbismetadatamodel.h
index fc63a2cb3..e73c189d4 100644
--- a/src/plugins/Input/vorbis/vorbismetadatamodel.h
+++ b/src/plugins/Input/vorbis/vorbismetadatamodel.h
@@ -55,8 +55,8 @@ class VorbisCommentModel : public TagModel
 public:
     VorbisCommentModel(VorbisMetaDataModel *model);
     ~VorbisCommentModel();
-    const QString name();
-    const QString value(Qmmp::MetaData key);
+    QString name() const;
+    QString value(Qmmp::MetaData key) const;
     void setValue(Qmmp::MetaData key, const QString &value);
     void save();
 
diff --git a/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp b/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp
index 8d9e9ac22..634c4ae32 100644
--- a/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp
+++ b/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp
@@ -93,12 +93,12 @@ WavPackFileTagModel::WavPackFileTagModel(WavpackContext *ctx) : TagModel(TagMode
 WavPackFileTagModel::~WavPackFileTagModel()
 {}
 
-const QString WavPackFileTagModel::name()
+QString WavPackFileTagModel::name() const
 {
     return "ID3v1/APEv2";
 }
 
-const QString WavPackFileTagModel::value(Qmmp::MetaData key)
+QString WavPackFileTagModel::value(Qmmp::MetaData key) const
 {
     char value[200];
     memset(value,0,sizeof(value));
diff --git a/src/plugins/Input/wavpack/wavpackmetadatamodel.h b/src/plugins/Input/wavpack/wavpackmetadatamodel.h
index 8c28dfa4b..41de36c5c 100644
--- a/src/plugins/Input/wavpack/wavpackmetadatamodel.h
+++ b/src/plugins/Input/wavpack/wavpackmetadatamodel.h
@@ -47,8 +47,8 @@ class WavPackFileTagModel : public TagModel
 public:
     WavPackFileTagModel(WavpackContext *ctx);
     ~WavPackFileTagModel();
-    const QString name();
-    const QString value(Qmmp::MetaData key);
+    QString name() const;
+    QString value(Qmmp::MetaData key) const;
     void setValue(Qmmp::MetaData key, const QString &value);
     void save();
 
diff --git a/src/qmmp/tagmodel.cpp b/src/qmmp/tagmodel.cpp
index b02684117..0da91581f 100644
--- a/src/qmmp/tagmodel.cpp
+++ b/src/qmmp/tagmodel.cpp
@@ -20,7 +20,7 @@
 
 #include "tagmodel.h"
 
-TagModel::TagModel(int f)
+TagModel::TagModel(ModelCaps f)
 {
     m_f = f;
 }
@@ -33,7 +33,7 @@ void TagModel::setValue(Qmmp::MetaData key, int value)
     setValue(key, QString::number(value));
 }
 
-QList<Qmmp::MetaData> TagModel::keys()
+QList<Qmmp::MetaData> TagModel::keys() const
 {
     QList<Qmmp::MetaData> list;
     list << Qmmp::TITLE;
@@ -54,7 +54,7 @@ int TagModel::caps()
     return m_f;
 }
 
-bool TagModel::exists()
+bool TagModel::exists() const
 {
     return true;
 }
diff --git a/src/qmmp/tagmodel.h b/src/qmmp/tagmodel.h
index 2703d2394..4b7e20683 100644
--- a/src/qmmp/tagmodel.h
+++ b/src/qmmp/tagmodel.h
@@ -23,6 +23,7 @@
 
 #include <QString>
 #include <QList>
+#include <QFlags>
 #include "qmmp.h"
 
 /*! @brief The StateHandler class provides is the base interface class of tag editor.
@@ -34,17 +35,19 @@ public:
     /*!
      * This enum describes tag editor capabilities
      */
-    enum Caps
+    enum ModelCap
     {
         NoOptions = 0x0,    /*!< No capabilities */
         CreateRemove = 0x1, /*!< Can create/remove tag */
         Save = 0x2,         /*!< Can save changes */
+        DefaultCaps = CreateRemove | Save,
     };
+    Q_DECLARE_FLAGS(ModelCaps, ModelCap)
     /*!
      * Constructor.
      * @param f Capabilities.
      */
-    TagModel(int f = TagModel::CreateRemove | TagModel::Save);
+    TagModel(ModelCaps f = DefaultCaps);
     /*!
      * Destructor.
      */
@@ -53,16 +56,16 @@ public:
      * Returns tag name.
      * Subclass should reimplement this fucntion.
      */
-    virtual const QString name() = 0;
+    virtual QString name() const = 0;
     /*!
      * Returns available keys. Default implementations returns all possible keys.
      */
-    virtual QList<Qmmp::MetaData> keys();
+    virtual QList<Qmmp::MetaData> keys() const;
     /*!
      * Returns the metdata string associated with the given \b key.
      * Subclass should reimplement this fucntion.
      */
-    virtual const QString value(Qmmp::MetaData key) = 0;
+    virtual QString value(Qmmp::MetaData key) const = 0;
     /*!
      * Changes metadata string associated with the given \b key to \b value.
      * Subclass should reimplement this fucntion.
@@ -76,7 +79,7 @@ public:
     /*!
      * Returns \b true if this tag exists; otherwise returns \b false.
      */
-    virtual bool exists();
+    virtual bool exists() const;
     /*!
      * Creates tag.
      */
@@ -95,7 +98,7 @@ public:
     int caps();
 
 private:
-    int m_f;
+    ModelCaps m_f;
 };
 
 #endif // TAGMODEL_H