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

Adapt to new libQuotient API changes

Browse Source 
postPlainText is gone
This commit is contained in:
Joshua Goins
2025-01-15 15:51:05 -05:00
parent 54596e3fe6
commit a8f22003cb
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
autotests/timelinemessagemodeltest.cpp
View File

@@ -137,7 +137,11 @@ void TimelineMessageModelTest::pendingEvent()
model->setRoom(room); model->setRoom(room);
QCOMPARE(model->rowCount(), 0); QCOMPARE(model->rowCount(), 0);
#if Quotient_VERSION_MINOR > 9
auto txnId = room->postText("New plain message"_L1);
#else
auto txnId = room->postPlainText("New plain message"_L1); auto txnId = room->postPlainText("New plain message"_L1);
#endif
QCOMPARE(model->rowCount(), 1); QCOMPARE(model->rowCount(), 1);
QCOMPARE(spyInsert.count(), 1); QCOMPARE(spyInsert.count(), 1);
@@ -145,7 +149,11 @@ void TimelineMessageModelTest::pendingEvent()
QCOMPARE(model->rowCount(), 0); QCOMPARE(model->rowCount(), 0);
QCOMPARE(spyRemove.count(), 1); QCOMPARE(spyRemove.count(), 1);
#if Quotient_VERSION_MINOR > 9
txnId = room->postText("New plain message"_L1);
#else
txnId = room->postPlainText("New plain message"_L1); txnId = room->postPlainText("New plain message"_L1);
#endif
QCOMPARE(model->rowCount(), 1); QCOMPARE(model->rowCount(), 1);
QCOMPARE(spyInsert.count(), 2); QCOMPARE(spyInsert.count(), 2);

4
src/models/actionsmodel.cpp
View File

@@ -136,7 +136,11 @@ QList<ActionsModel::Action> actions{
Action{ Action{
u"plain"_s, u"plain"_s,
[](const QString &text, NeoChatRoom *room, ChatBarCache *) { [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
#if Quotient_VERSION_MINOR > 9
room->postText(text.toHtmlEscaped());
#else
room->postPlainText(text.toHtmlEscaped()); room->postPlainText(text.toHtmlEscaped());
#endif
return QString(); return QString();
}, },
std::nullopt, std::nullopt,