From b3c5f416256c50610566b6341d4663ad196a14e3 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sun, 2 Oct 2022 12:31:03 +0200 Subject: [PATCH] Fix a few more windows warnings --- src/ChatPage.cpp | 2 +- src/MemberList.cpp | 7 ++++--- src/emoji/EmojiModel.cpp | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp index 9daf8d4d..457b301e 100644 --- a/src/ChatPage.cpp +++ b/src/ChatPage.cpp @@ -619,7 +619,7 @@ ChatPage::handleSyncResponse(const mtx::responses::Sync &res, const std::string nhlog::net()->warn("Duplicate sync, dropping"); return; } - } catch (const lmdb::error &e) { + } catch (const lmdb::error &) { nhlog::db()->warn("Logged out in the mean time, dropping sync"); return; } diff --git a/src/MemberList.cpp b/src/MemberList.cpp index 488ab731..b0030455 100644 --- a/src/MemberList.cpp +++ b/src/MemberList.cpp @@ -31,7 +31,7 @@ MemberListBackend::MemberListBackend(const QString &room_id, QObject *parent) // HACK: due to QTBUG-1020169, we'll load a big chunk to speed things up auto members = cache::getMembers(room_id_.toStdString(), 0, -1); addUsers(members); - numUsersLoaded_ = members.size(); + numUsersLoaded_ = (int)members.size(); } catch (const lmdb::error &e) { nhlog::db()->critical("Failed to retrieve members from cache: {}", e.what()); } @@ -40,7 +40,8 @@ MemberListBackend::MemberListBackend(const QString &room_id, QObject *parent) void MemberListBackend::addUsers(const std::vector &members) { - beginInsertRows(QModelIndex{}, m_memberList.count(), m_memberList.count() + members.size() - 1); + beginInsertRows( + QModelIndex{}, m_memberList.count(), m_memberList.count() + (int)members.size() - 1); for (const auto &member : members) m_memberList.push_back( @@ -113,7 +114,7 @@ MemberListBackend::fetchMore(const QModelIndex &) auto members = cache::getMembers(room_id_.toStdString(), rowCount()); addUsers(members); - numUsersLoaded_ += members.size(); + numUsersLoaded_ += (int)members.size(); emit numUsersLoadedChanged(); loadingMoreMembers_ = false; diff --git a/src/emoji/EmojiModel.cpp b/src/emoji/EmojiModel.cpp index 906b7fc2..5a00c43f 100644 --- a/src/emoji/EmojiModel.cpp +++ b/src/emoji/EmojiModel.cpp @@ -45,7 +45,7 @@ EmojiModel::roleNames() const int EmojiModel::rowCount(const QModelIndex &parent) const { - return parent == QModelIndex() ? (qsizetype)Provider::emoji.size() : 0; + return parent == QModelIndex() ? (int)Provider::emoji.size() : 0; } QVariant