From 3ab93592c35c4bb9f87be809ce858e6ba48003c1 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 9 Mar 2021 13:53:34 +0100 Subject: CppLocatorData: Don't use recursive mutex Don't use recursive mutex in CppLocatorData class, as this is more expensive to construct than simple QMutex. Refactor the code so that every call to flushPendingDocument() is done with already locked m_pendingDocumentsMutex. This eliminates the need for recursive mutex. Remove unused allIndexItems() method. Change-Id: Ic7cb45bc3301d83768e69ee52f84ae159cb731a5 Reviewed-by: Eike Ziller --- src/plugins/cpptools/cpplocatordata.cpp | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/plugins/cpptools/cpplocatordata.cpp') diff --git a/src/plugins/cpptools/cpplocatordata.cpp b/src/plugins/cpptools/cpplocatordata.cpp index be2b948a96..3154f66ddb 100644 --- a/src/plugins/cpptools/cpplocatordata.cpp +++ b/src/plugins/cpptools/cpplocatordata.cpp @@ -86,7 +86,6 @@ void CppLocatorData::onAboutToRemoveFiles(const QStringList &files) void CppLocatorData::flushPendingDocument(bool force) const { // TODO: move this off the UI thread and into a future. - QMutexLocker locker(&m_pendingDocumentsMutex); if (!force && m_pendingDocuments.size() < MaxPendingDocuments) return; if (m_pendingDocuments.isEmpty()) @@ -98,12 +97,3 @@ void CppLocatorData::flushPendingDocument(bool force) const m_pendingDocuments.clear(); m_pendingDocuments.reserve(MaxPendingDocuments); } - -QList CppLocatorData::allIndexItems( - const QHash> &items) const -{ - QList result; - for (const QList &subItems : items) - result.append(subItems); - return result; -} -- cgit v1.2.1