ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename type because of conflict

Browse Source
This commit is contained in:
Tobias Fella
2021-09-24 12:42:05 +02:00
parent b3d9861d3d
commit d28279313d
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.cpp
View File

@@ -194,7 +194,7 @@ int main(int argc, char *argv[])
qmlRegisterType<SortFilterRoomListModel>("org.kde.neochat", 1, 0, "SortFilterRoomListModel"); qmlRegisterType<SortFilterRoomListModel>("org.kde.neochat", 1, 0, "SortFilterRoomListModel");
qmlRegisterType<DevicesModel>("org.kde.neochat", 1, 0, "DevicesModel"); qmlRegisterType<DevicesModel>("org.kde.neochat", 1, 0, "DevicesModel");
qmlRegisterUncreatableType<RoomMessageEvent>("org.kde.neochat", 1, 0, "RoomMessageEvent", "ENUM"); qmlRegisterUncreatableType<RoomMessageEvent>("org.kde.neochat", 1, 0, "RoomMessageEvent", "ENUM");
qmlRegisterUncreatableType<RoomType>("org.kde.neochat", 1, 0, "RoomType", "ENUM"); qmlRegisterUncreatableType<NeoChatRoomType>("org.kde.neochat", 1, 0, "NeoChatRoomType", "ENUM");
qmlRegisterUncreatableType<UserType>("org.kde.neochat", 1, 0, "UserType", "ENUM"); qmlRegisterUncreatableType<UserType>("org.kde.neochat", 1, 0, "UserType", "ENUM");
qRegisterMetaType<User *>("User*"); qRegisterMetaType<User *>("User*");

12
src/roomlistmodel.cpp
View File

@@ -342,26 +342,26 @@ QVariant RoomListModel::data(const QModelIndex &index, int role) const
} }
if (role == CategoryRole) { if (role == CategoryRole) {
if (room->joinState() == JoinState::Invite) { if (room->joinState() == JoinState::Invite) {
return RoomType::Invited; return NeoChatRoomType::Invited;
} }
if (room->isFavourite()) { if (room->isFavourite()) {
return RoomType::Favorite; return NeoChatRoomType::Favorite;
} }
if (room->isLowPriority()) { if (room->isLowPriority()) {
return RoomType::Deprioritized; return NeoChatRoomType::Deprioritized;
} }
if (room->isDirectChat()) { if (room->isDirectChat()) {
return RoomType::Direct; return NeoChatRoomType::Direct;
} }
const RoomCreateEvent *creationEvent = room->creation(); const RoomCreateEvent *creationEvent = room->creation();
QJsonObject contentJson = creationEvent->contentJson(); QJsonObject contentJson = creationEvent->contentJson();
QJsonObject::const_iterator typeIter = contentJson.find("type"); QJsonObject::const_iterator typeIter = contentJson.find("type");
if (typeIter != contentJson.end()) { if (typeIter != contentJson.end()) {
if (typeIter.value().toString() == "m.space") { if (typeIter.value().toString() == "m.space") {
return RoomType::Space; return NeoChatRoomType::Space;
} }
} }
return RoomType::Normal; return NeoChatRoomType::Normal;
} }
if (role == UnreadCountRole) { if (role == UnreadCountRole) {
return room->unreadCount(); return room->unreadCount();

2
src/roomlistmodel.h
View File

@@ -12,7 +12,7 @@
using namespace Quotient; using namespace Quotient;
class RoomType : public QObject class NeoChatRoomType : public QObject
{ {
Q_OBJECT Q_OBJECT

10
src/sortfilterroomlistmodel.cpp
View File

@@ -36,16 +36,16 @@ bool SortFilterRoomListModel::lessThan(const QModelIndex &source_left, const QMo
{ {
if (m_sortOrder == SortFilterRoomListModel::LastActivity) { if (m_sortOrder == SortFilterRoomListModel::LastActivity) {
// display favorite rooms always on top // display favorite rooms always on top
const auto categoryLeft = static_cast<RoomType::Types>(sourceModel()->data(source_left, RoomListModel::CategoryRole).toInt()); const auto categoryLeft = static_cast<NeoChatRoomType::Types>(sourceModel()->data(source_left, RoomListModel::CategoryRole).toInt());
const auto categoryRight = static_cast<RoomType::Types>(sourceModel()->data(source_right, RoomListModel::CategoryRole).toInt()); const auto categoryRight = static_cast<NeoChatRoomType::Types>(sourceModel()->data(source_right, RoomListModel::CategoryRole).toInt());
if (categoryLeft == RoomType::Types::Favorite && categoryRight == RoomType::Types::Favorite) { if (categoryLeft == NeoChatRoomType::Types::Favorite && categoryRight == NeoChatRoomType::Types::Favorite) {
return sourceModel()->data(source_left, RoomListModel::LastActiveTimeRole).toDateTime() return sourceModel()->data(source_left, RoomListModel::LastActiveTimeRole).toDateTime()
> sourceModel()->data(source_right, RoomListModel::LastActiveTimeRole).toDateTime(); > sourceModel()->data(source_right, RoomListModel::LastActiveTimeRole).toDateTime();
} }
if (categoryLeft == RoomType::Types::Favorite) { if (categoryLeft == NeoChatRoomType::Types::Favorite) {
return true; return true;
} else if (categoryRight == RoomType::Types::Favorite) { } else if (categoryRight == NeoChatRoomType::Types::Favorite) {
return false; return false;
} }