diff --git a/src/model/danboorupostmodel.cpp b/src/model/danboorupostmodel.cpp index be94af6..3139f50 100644 --- a/src/model/danboorupostmodel.cpp +++ b/src/model/danboorupostmodel.cpp @@ -81,46 +81,34 @@ QVariant DanbooruPostModel::data(const QModelIndex &index, int role) const return QVariant(); } - if (role == Qt::DisplayRole) { + switch(role) { + case Qt::DisplayRole: + { + QVariant variant; + variant.setValue(post); - QVariant variant; - variant.setValue(post); + return variant; + } - return variant; - } - - if (role == Qt::DecorationRole) { - const QPixmap pixmap = post->pixmap(); - return pixmap; - } - - if (role == Qt::ToolTipRole) { - return post->fileUrl().fileName(); - } - - if (role == DanbooruPostModel::PixmapRole) { - QPixmap pixmap = post->pixmap(); - return pixmap; - } - - if (role == FileUrlRole) { - return post->fileUrl(); - } - - if (role == ThumbUrlRole) { - return post->thumbnailUrl(); - } - - if (role == SizeRole) { - return post->size(); - } - - if (role == ResolutionRole) { - return QSize(post->width(), post->height()); - } - - if (role == RatingRole) { - return post->rating(); + case Qt::DecorationRole: + { + const QPixmap pixmap = post->pixmap(); + return pixmap; + } + case Qt::ToolTipRole: + return post->fileUrl().fileName(); + case FileUrlRole: + return post->fileUrl(); + case ThumbUrlRole: + return post->thumbnailUrl(); + case SizeRole: + return post->size(); + case ResolutionRole: + return QSize(post->width(), post->height()); + case RatingRole: + return post->rating(); + default: + return QVariant(); } return QVariant(); @@ -143,7 +131,7 @@ void DanbooruPostModel::clear() QHash< int, QByteArray > DanbooruPostModel::roleNames() const { QHash roles; - roles[PixmapRole] = "thumbPix"; + roles[Qt::DecorationRole] = "thumbPix"; roles[FileUrlRole] = "fileUrl"; roles[ThumbUrlRole] = "thumbnailUrl"; roles[RatingRole] = "rating"; diff --git a/src/model/danboorupostmodel.h b/src/model/danboorupostmodel.h index de1649e..5ac6daa 100644 --- a/src/model/danboorupostmodel.h +++ b/src/model/danboorupostmodel.h @@ -62,7 +62,6 @@ public: QHash roleNames() const; enum PostRoles { - PixmapRole = Qt::UserRole + 1000, FileUrlRole = Qt::UserRole + 1001, ThumbUrlRole = Qt::UserRole + 1002, SizeRole = Qt::UserRole + 1003,