diff --git a/autotests/timelinemessagemodeltest.cpp b/autotests/timelinemessagemodeltest.cpp index 80e1db4fb..6a9f2dd8f 100644 --- a/autotests/timelinemessagemodeltest.cpp +++ b/autotests/timelinemessagemodeltest.cpp @@ -208,7 +208,7 @@ void TimelineMessageModelTest::idToRow() auto room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, u"test-min-sync.json"_s); model->setRoom(room); - QCOMPARE(model->indexforEventId(u"$153456789:example.org"_s).row(), 0); + QCOMPARE(model->indexForEventId(u"$153456789:example.org"_s).row(), 0); } void TimelineMessageModelTest::cleanup() diff --git a/src/timeline/TimelineView.qml b/src/timeline/TimelineView.qml index cc0b720c3..5b5db5b49 100644 --- a/src/timeline/TimelineView.qml +++ b/src/timeline/TimelineView.qml @@ -40,7 +40,7 @@ QQC2.ScrollView { * @brief Shift the view to the given event ID. */ function goToEvent(eventId) { - const index = messageListView.model.indexforEventId(eventId) + const index = messageListView.model.indexForEventId(eventId) if (!index.valid) { messageListView.positionViewAtEnd(); return; diff --git a/src/timeline/models/messagefiltermodel.cpp b/src/timeline/models/messagefiltermodel.cpp index 655e8c6bf..a19d8fdcb 100644 --- a/src/timeline/models/messagefiltermodel.cpp +++ b/src/timeline/models/messagefiltermodel.cpp @@ -125,7 +125,7 @@ QHash MessageFilterModel::roleNames() const return roles; } -QModelIndex MessageFilterModel::indexforEventId(const QString &eventId) const +QModelIndex MessageFilterModel::indexForEventId(const QString &eventId) const { // Check if sourceModel is a message model. auto messageModel = dynamic_cast(sourceModel()); @@ -141,7 +141,7 @@ QModelIndex MessageFilterModel::indexforEventId(const QString &eventId) const } } - auto eventIndex = messageModel->indexforEventId(eventId); + auto eventIndex = messageModel->indexForEventId(eventId); if (!eventIndex.isValid()) { return {}; } diff --git a/src/timeline/models/messagefiltermodel.h b/src/timeline/models/messagefiltermodel.h index 63de09bc9..b049bec6f 100644 --- a/src/timeline/models/messagefiltermodel.h +++ b/src/timeline/models/messagefiltermodel.h @@ -68,6 +68,7 @@ public: * @brief Get the QModelIndex the given event ID in the model. */ Q_INVOKABLE QModelIndex indexforEventId(const QString &eventId) const; + Q_INVOKABLE QModelIndex indexForEventId(const QString &eventId) const; static void setShowAllEvents(bool enabled); static void setShowDeletedMessages(bool enabled); diff --git a/src/timeline/models/messagemodel.cpp b/src/timeline/models/messagemodel.cpp index b79ebc0b7..d6149a7ac 100644 --- a/src/timeline/models/messagemodel.cpp +++ b/src/timeline/models/messagemodel.cpp @@ -349,7 +349,7 @@ QHash MessageModel::roleNames() const return roles; } -QModelIndex MessageModel::indexforEventId(const QString &eventId) const +QModelIndex MessageModel::indexForEventId(const QString &eventId) const { if (m_room == nullptr) { return {}; diff --git a/src/timeline/models/messagemodel.h b/src/timeline/models/messagemodel.h index 00fa5c930..f2cf92a71 100644 --- a/src/timeline/models/messagemodel.h +++ b/src/timeline/models/messagemodel.h @@ -113,9 +113,10 @@ public: [[nodiscard]] QHash roleNames() const override; /** - * @brief Get the QModelIndex of the given event ID in the model. + * @brief Get the QModelIndex of the given event ID in the model, returning an invalid QModelIndex if no matches were found. */ Q_INVOKABLE QModelIndex indexforEventId(const QString &eventId) const; + Q_INVOKABLE QModelIndex indexForEventId(const QString &eventId) const; static void setHiddenFilter(std::function hiddenFilter);