From 2d7d007b2165a8e2ff3bbb330bc032a383bb13c0 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Thu, 12 May 2022 20:06:22 +0200 Subject: [PATCH] Fix build error from Qt version. --- linphone-app/src/app/proxyModel/ProxyAbstractMapModel.hpp | 2 +- linphone-app/src/components/content/ContentListModel.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/linphone-app/src/app/proxyModel/ProxyAbstractMapModel.hpp b/linphone-app/src/app/proxyModel/ProxyAbstractMapModel.hpp index e14686cc9..3e8ffc2a0 100644 --- a/linphone-app/src/app/proxyModel/ProxyAbstractMapModel.hpp +++ b/linphone-app/src/app/proxyModel/ProxyAbstractMapModel.hpp @@ -101,7 +101,7 @@ public: return true; } */ - virtual void resetData(){ + virtual void resetData() override{ beginResetModel(); mMappedList.clear(); endResetModel(); diff --git a/linphone-app/src/components/content/ContentListModel.cpp b/linphone-app/src/components/content/ContentListModel.cpp index e15214ab8..e86941bcb 100644 --- a/linphone-app/src/components/content/ContentListModel.cpp +++ b/linphone-app/src/components/content/ContentListModel.cpp @@ -151,7 +151,11 @@ void ContentListModel::updateContents(ChatMessageModel * messageModel){ while( c < mList.size() && mList.at(c).objectCast()->getContent() != content) ++c; if( c < mList.size()){// Found => swap position +#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) + mList.swap(count, c); +#else mList.swapItemsAt(count, c); +#endif }else{// content is new mList.insert(count, QSharedPointer::create(content, messageModel)); }