fixed build regression

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

6 files changed, 16 insertions, 16 deletions

diff --git a/src/plugins/Input/flac/flacmetadatamodel.cpp b/src/plugins/Input/flac/flacmetadatamodel.cpp
index 54c15b006..ca06512b9 100644
--- a/src/plugins/Input/flac/flacmetadatamodel.cpp
+++ b/src/plugins/Input/flac/flacmetadatamodel.cpp
@@ -32,7 +32,7 @@
 #include "flacmetadatamodel.h"
 
 FLACMetaDataModel::FLACMetaDataModel(const QString &path, bool readOnly)
-#ifdef IS_COVER_EDITABLE
+#ifdef HAS_PICTURE_LIST
     : MetaDataModel(true, MetaDataModel::IS_COVER_EDITABLE)
 #else
     : MetaDataModel(true)
@@ -94,7 +94,7 @@ QList<TagModel* > FLACMetaDataModel::tags() const
 
 QPixmap FLACMetaDataModel::cover() const
 {
-#ifdef IS_COVER_EDITABLE
+#ifdef HAS_PICTURE_LIST
     if(!m_tag || m_tag->isEmpty())
         return QPixmap();
 
@@ -132,7 +132,7 @@ QString FLACMetaDataModel::coverPath() const
     return MetaDataManager::instance()->findCoverFile(m_path);
 }
 
-#ifdef IS_COVER_EDITABLE
+#ifdef HAS_PICTURE_LIST
 void FLACMetaDataModel::setCover(const QPixmap &pix)
 {
     removeCover();
diff --git a/src/plugins/Input/flac/flacmetadatamodel.h b/src/plugins/Input/flac/flacmetadatamodel.h
index 09270d436..66ed03164 100644
--- a/src/plugins/Input/flac/flacmetadatamodel.h
+++ b/src/plugins/Input/flac/flacmetadatamodel.h
@@ -28,7 +28,7 @@
 #include <qmmp/metadatamodel.h>
 
 #if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 11))
-#define IS_COVER_EDITABLE
+#define HAS_PICTURE_LIST
 #endif
 
 class FLACMetaDataModel : public MetaDataModel
@@ -39,7 +39,7 @@ public:
     QList<TagModel* > tags() const;
     QPixmap cover() const;
     QString coverPath() const;
-#ifdef IS_COVER_EDITABLE
+#ifdef HAS_PICTURE_LIST
     void setCover(const QPixmap &pix);
     void removeCover();
 #endif
diff --git a/src/plugins/Input/opus/opusmetadatamodel.cpp b/src/plugins/Input/opus/opusmetadatamodel.cpp
index 56edfb9da..4cea1422e 100644
--- a/src/plugins/Input/opus/opusmetadatamodel.cpp
+++ b/src/plugins/Input/opus/opusmetadatamodel.cpp
@@ -29,7 +29,7 @@
 #include "opusmetadatamodel.h"
 
 OpusMetaDataModel::OpusMetaDataModel(const QString &path, bool readOnly)
-#ifdef IS_COVER_EDITABLE
+#ifdef HAS_PICTURE_LIST
     : MetaDataModel(readOnly, MetaDataModel::IS_COVER_EDITABLE)
 #else
     : MetaDataModel(readOnly)
@@ -75,7 +75,7 @@ QPixmap OpusMetaDataModel::cover() const
     if(!tag || tag->isEmpty())
         return QPixmap();
 
-#ifdef IS_COVER_EDITABLE
+#ifdef HAS_PICTURE_LIST
     TagLib::List<TagLib::FLAC::Picture *> list = tag->pictureList();
     for(uint i = 0; i < list.size(); ++i)
     {
@@ -104,7 +104,7 @@ QPixmap OpusMetaDataModel::cover() const
     return QPixmap();
 }
 
-#ifdef IS_COVER_EDITABLE
+#ifdef HAS_PICTURE_LIST
 void OpusMetaDataModel::setCover(const QPixmap &pix)
 {
     removeCover();
diff --git a/src/plugins/Input/opus/opusmetadatamodel.h b/src/plugins/Input/opus/opusmetadatamodel.h
index fc0cfa705..44afc88a5 100644
--- a/src/plugins/Input/opus/opusmetadatamodel.h
+++ b/src/plugins/Input/opus/opusmetadatamodel.h
@@ -27,7 +27,7 @@
 #include <qmmp/metadatamodel.h>
 
 #if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 11))
-#define IS_COVER_EDITABLE
+#define HAS_PICTURE_LIST
 #endif
 
 class OpusMetaDataModel : public MetaDataModel
@@ -39,7 +39,7 @@ public:
     QList<MetaDataItem> extraProperties() const;
     QList<TagModel* > tags() const;
     QPixmap cover() const;
-#ifdef IS_COVER_EDITABLE
+#ifdef HAS_PICTURE_LIST
     void setCover(const QPixmap &pix);
     void removeCover();
 #endif
diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
index 79334d157..e800eb045 100644
--- a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
+++ b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009-2016 by Ilya Kotov                                 *
+ *   Copyright (C) 2009-2018 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -29,7 +29,7 @@
 #include "vorbismetadatamodel.h"
 
 VorbisMetaDataModel::VorbisMetaDataModel(const QString &path, bool readOnly)
-#ifdef IS_COVER_EDITABLE
+#ifdef HAS_PICTURE_LIST
     : MetaDataModel(readOnly, MetaDataModel::IS_COVER_EDITABLE)
 #else
     : MetaDataModel(readOnly)
@@ -61,7 +61,7 @@ QPixmap VorbisMetaDataModel::cover() const
     if(!m_tag || m_tag->isEmpty())
         return QPixmap();
 
-#ifdef IS_COVER_EDITABLE
+#ifdef HAS_PICTURE_LIST
     TagLib::List<TagLib::FLAC::Picture *> list = m_tag->pictureList();
     for(uint i = 0; i < list.size(); ++i)
     {
@@ -91,7 +91,7 @@ QPixmap VorbisMetaDataModel::cover() const
     return QPixmap();
 }
 
-#ifdef IS_COVER_EDITABLE
+#ifdef HAS_PICTURE_LIST
 void VorbisMetaDataModel::setCover(const QPixmap &pix)
 {
     removeCover();
diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.h b/src/plugins/Input/vorbis/vorbismetadatamodel.h
index e2636a514..2f87e9b3e 100644
--- a/src/plugins/Input/vorbis/vorbismetadatamodel.h
+++ b/src/plugins/Input/vorbis/vorbismetadatamodel.h
@@ -28,7 +28,7 @@
 #include <taglib/tfilestream.h>
 
 #if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 11))
-#define IS_COVER_EDITABLE
+#define HAS_PICTURE_LIST
 #endif
 
 class VorbisCommentModel;
@@ -42,7 +42,7 @@ public:
 
     QList<TagModel* > tags() const;
     QPixmap cover() const;
-#ifdef IS_COVER_EDITABLE
+#ifdef HAS_PICTURE_LIST
     void setCover(const QPixmap &pix);
     void removeCover();
 #endif