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

Fix merge issues

Browse Source
This commit is contained in:
James Graham
2026-01-25 19:29:32 +00:00
parent 289c6c4f20
commit 007ebbc003
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
autotests/modeltest.cpp
View File

@@ -179,8 +179,8 @@ void ModelTest::testRoomTreeModel()
void ModelTest::testMessageContentModel()
{
auto contentModel = std::make_unique<MessageContentModel>(room, nullptr, eventId);
auto tester = new QAbstractItemModelTester(contentModel.get(), contentModel.get());
auto contentModel = new MessageContentModel(room, eventId);
auto tester = new QAbstractItemModelTester(contentModel);
tester->setUseFetchMore(true);
}
@@ -399,8 +399,12 @@ void ModelTest::testCompletionModel()
tester->setUseFetchMore(true);
model->setRoom(room);
model->setAutoCompletionType(CompletionModel::Room);
<<<<<<< HEAD
model->setText(u"foo"_s, u"#foo"_s);
auto roomListModel = new RoomListModel(this);
=======
auto roomListModel = new RoomListModel();
>>>>>>> da60b8068 (Fix merge issues)
roomListModel->setConnection(connection);
model->setRoomListModel(roomListModel);
}