diff --git a/src/CombinedImagePackModel.cpp b/src/CombinedImagePackModel.cpp
index 341a34ec..9a52f810 100644
--- a/src/CombinedImagePackModel.cpp
+++ b/src/CombinedImagePackModel.cpp
@@ -13,65 +13,65 @@ CombinedImagePackModel::CombinedImagePackModel(const std::string &roomId,
: QAbstractListModel(parent)
, room_id(roomId)
{
- auto packs = cache::client()->getImagePacks(room_id, stickers);
+ auto packs = cache::client()->getImagePacks(room_id, stickers);
- for (const auto &pack : packs) {
- QString packname =
- pack.pack.pack ? QString::fromStdString(pack.pack.pack->display_name) : "";
+ for (const auto &pack : packs) {
+ QString packname =
+ pack.pack.pack ? QString::fromStdString(pack.pack.pack->display_name) : "";
- for (const auto &img : pack.pack.images) {
- ImageDesc i{};
- i.shortcode = QString::fromStdString(img.first);
- i.packname = packname;
- i.image = img.second;
- images.push_back(std::move(i));
- }
+ for (const auto &img : pack.pack.images) {
+ ImageDesc i{};
+ i.shortcode = QString::fromStdString(img.first);
+ i.packname = packname;
+ i.image = img.second;
+ images.push_back(std::move(i));
}
+ }
}
int
CombinedImagePackModel::rowCount(const QModelIndex &) const
{
- return (int)images.size();
+ return (int)images.size();
}
QHash<int, QByteArray>
CombinedImagePackModel::roleNames() const
{
- return {
- {CompletionModel::CompletionRole, "completionRole"},
- {CompletionModel::SearchRole, "searchRole"},
- {CompletionModel::SearchRole2, "searchRole2"},
- {Roles::Url, "url"},
- {Roles::ShortCode, "shortcode"},
- {Roles::Body, "body"},
- {Roles::PackName, "packname"},
- {Roles::OriginalRow, "originalRow"},
- };
+ return {
+ {CompletionModel::CompletionRole, "completionRole"},
+ {CompletionModel::SearchRole, "searchRole"},
+ {CompletionModel::SearchRole2, "searchRole2"},
+ {Roles::Url, "url"},
+ {Roles::ShortCode, "shortcode"},
+ {Roles::Body, "body"},
+ {Roles::PackName, "packname"},
+ {Roles::OriginalRow, "originalRow"},
+ };
}
QVariant
CombinedImagePackModel::data(const QModelIndex &index, int role) const
{
- if (hasIndex(index.row(), index.column(), index.parent())) {
- switch (role) {
- case CompletionModel::CompletionRole:
- return QString::fromStdString(images[index.row()].image.url);
- case Roles::Url:
- return QString::fromStdString(images[index.row()].image.url);
- case CompletionModel::SearchRole:
- case Roles::ShortCode:
- return images[index.row()].shortcode;
- case CompletionModel::SearchRole2:
- case Roles::Body:
- return QString::fromStdString(images[index.row()].image.body);
- case Roles::PackName:
- return images[index.row()].packname;
- case Roles::OriginalRow:
- return index.row();
- default:
- return {};
- }
+ if (hasIndex(index.row(), index.column(), index.parent())) {
+ switch (role) {
+ case CompletionModel::CompletionRole:
+ return QString::fromStdString(images[index.row()].image.url);
+ case Roles::Url:
+ return QString::fromStdString(images[index.row()].image.url);
+ case CompletionModel::SearchRole:
+ case Roles::ShortCode:
+ return images[index.row()].shortcode;
+ case CompletionModel::SearchRole2:
+ case Roles::Body:
+ return QString::fromStdString(images[index.row()].image.body);
+ case Roles::PackName:
+ return images[index.row()].packname;
+ case Roles::OriginalRow:
+ return index.row();
+ default:
+ return {};
}
- return {};
+ }
+ return {};
}
|
