diff --git a/src/Cache.cpp b/src/Cache.cpp index b14f7414e128cba334717ae684806164a6eb25e5..e841a9dcc5a25faecd4f73ed89344cde41f259a5 100644 --- a/src/Cache.cpp +++ b/src/Cache.cpp @@ -3873,9 +3873,10 @@ Cache::spaces() std::string_view room_data; if (roomsDb_.get(txn, space_id, room_data)) { RoomInfo tmp = nlohmann::json::parse(std::move(room_data)).get<RoomInfo>(); - ret.insert(QString::fromUtf8(space_id.data(), space_id.size()), tmp); + ret.insert(QString::fromUtf8(space_id.data(), (qsizetype)space_id.size()), tmp); } else { - ret.insert(QString::fromUtf8(space_id.data(), space_id.size()), std::nullopt); + ret.insert(QString::fromUtf8(space_id.data(), (qsizetype)space_id.size()), + std::nullopt); } } } diff --git a/src/Cache_p.h b/src/Cache_p.h index 2d6df140d9c235ac718d2e7f9412eb8529145274..a12cb43ac0a19d24ed54b6be6bd554c2ca2a6902 100644 --- a/src/Cache_p.h +++ b/src/Cache_p.h @@ -490,13 +490,13 @@ private: if (!eventsDb.get( txn, nlohmann::json::parse(data)["id"].get<std::string>(), value)) return std::nullopt; - } catch (std::exception &e) { + } catch (std::exception &) { return std::nullopt; } } return nlohmann::json::parse(value).get<mtx::events::StateEvent<T>>(); - } catch (std::exception &e) { + } catch (std::exception &) { return std::nullopt; } } diff --git a/src/MemberList.h b/src/MemberList.h index 1fbccc63736ee88bb819e99a80f974360b886594..eb70ddbf6c713b69dd0cbd83cc942c9b0606360c 100644 --- a/src/MemberList.h +++ b/src/MemberList.h @@ -44,7 +44,7 @@ public: QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; QString roomName() const { return QString::fromStdString(info_.name); } - int memberCount() const { return info_.member_count; } + int memberCount() const { return (int)info_.member_count; } QString avatarUrl() const { return QString::fromStdString(info_.avatar_url); } QString roomId() const { return room_id_; } int numUsersLoaded() const { return numUsersLoaded_; } diff --git a/src/ui/RoomSummary.h b/src/ui/RoomSummary.h index f50850544c377e4a440fdb82b796e4b84589c8a2..fd19f4c27bafcbf7702f304d35abc899c651e482 100644 --- a/src/ui/RoomSummary.h +++ b/src/ui/RoomSummary.h @@ -59,7 +59,7 @@ public: return room && room->membership == mtx::events::state::Membership::Invite; } bool isSpace() const { return room && room->room_type == mtx::events::state::room_type::space; } - int memberCount() const { return room ? room->num_joined_members : 0; } + int memberCount() const { return room ? (int)room->num_joined_members : 0; } bool isKnockOnly() const { return room && (room->join_rule == mtx::events::state::JoinRule::Knock ||