From b3a595fcfe1c0beeb1ecca8b4cb4e96bcbc60ce4 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 3 May 2023 15:26:12 +0200 Subject: [PATCH] Tasking::CurrentDocumentSymbolsRequest: Rename CurrentDocumentSymbolsRequest -> CurrentDocumentSymbolsRequestTask CurrentDocumentSymbolsRequestTask -> CurrentDocumentSymbolsRequest currentdocumentsymbolsrequesttask.{cpp,h} -> currentdocumentsymbolsrequest.{cpp,h} Task-number: QTCREATORBUG-29102 Change-Id: I5a0b0edf67babf6880682a30a2fd973f849b1880 Reviewed-by: Qt CI Bot Reviewed-by: David Schulz --- src/plugins/clangcodemodel/clangdlocatorfilters.cpp | 8 ++++---- src/plugins/languageclient/CMakeLists.txt | 2 +- ...questtask.cpp => currentdocumentsymbolsrequest.cpp} | 10 +++++----- ...lsrequesttask.h => currentdocumentsymbolsrequest.h} | 6 +++--- src/plugins/languageclient/languageclient.qbs | 4 ++-- src/plugins/languageclient/locatorfilter.cpp | 8 ++++---- 6 files changed, 19 insertions(+), 19 deletions(-) rename src/plugins/languageclient/{currentdocumentsymbolsrequesttask.cpp => currentdocumentsymbolsrequest.cpp} (88%) rename src/plugins/languageclient/{currentdocumentsymbolsrequesttask.h => currentdocumentsymbolsrequest.h} (89%) diff --git a/src/plugins/clangcodemodel/clangdlocatorfilters.cpp b/src/plugins/clangcodemodel/clangdlocatorfilters.cpp index a925f001fa4..e81e3bfebf1 100644 --- a/src/plugins/clangcodemodel/clangdlocatorfilters.cpp +++ b/src/plugins/clangcodemodel/clangdlocatorfilters.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -436,10 +436,10 @@ LocatorMatcherTask currentDocumentMatcher() TreeStorage storage; TreeStorage resultStorage; - const auto onQuerySetup = [=](CurrentDocumentSymbolsRequestTask &request) { + const auto onQuerySetup = [=](CurrentDocumentSymbolsRequest &request) { Q_UNUSED(request) }; - const auto onQueryDone = [resultStorage](const CurrentDocumentSymbolsRequestTask &request) { + const auto onQueryDone = [resultStorage](const CurrentDocumentSymbolsRequest &request) { *resultStorage = request.currentDocumentSymbolsData(); }; @@ -451,7 +451,7 @@ LocatorMatcherTask currentDocumentMatcher() const Group root { Storage(resultStorage), - CurrentDocumentSymbolsRequest(onQuerySetup, onQueryDone), + CurrentDocumentSymbolsRequestTask(onQuerySetup, onQueryDone), AsyncTask(onFilterSetup) }; return {root, storage}; diff --git a/src/plugins/languageclient/CMakeLists.txt b/src/plugins/languageclient/CMakeLists.txt index ab195c3d764..5af221f7f86 100644 --- a/src/plugins/languageclient/CMakeLists.txt +++ b/src/plugins/languageclient/CMakeLists.txt @@ -11,7 +11,7 @@ add_qtc_plugin(LanguageClient callhierarchy.cpp callhierarchy.h client.cpp client.h clientrequesttask.cpp clientrequesttask.h - currentdocumentsymbolsrequesttask.cpp currentdocumentsymbolsrequesttask.h + currentdocumentsymbolsrequest.cpp currentdocumentsymbolsrequest.h diagnosticmanager.cpp diagnosticmanager.h documentsymbolcache.cpp documentsymbolcache.h dynamiccapabilities.cpp dynamiccapabilities.h diff --git a/src/plugins/languageclient/currentdocumentsymbolsrequesttask.cpp b/src/plugins/languageclient/currentdocumentsymbolsrequest.cpp similarity index 88% rename from src/plugins/languageclient/currentdocumentsymbolsrequesttask.cpp rename to src/plugins/languageclient/currentdocumentsymbolsrequest.cpp index 9221d65c17c..2d272a72161 100644 --- a/src/plugins/languageclient/currentdocumentsymbolsrequesttask.cpp +++ b/src/plugins/languageclient/currentdocumentsymbolsrequest.cpp @@ -1,7 +1,7 @@ // Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#include "currentdocumentsymbolsrequesttask.h" +#include "currentdocumentsymbolsrequest.h" #include "documentsymbolcache.h" #include "languageclientmanager.h" @@ -15,7 +15,7 @@ using namespace Utils; namespace LanguageClient { -void CurrentDocumentSymbolsRequestTask::start() +void CurrentDocumentSymbolsRequest::start() { QTC_ASSERT(!isRunning(), return); @@ -58,12 +58,12 @@ void CurrentDocumentSymbolsRequestTask::start() symbolCache->requestSymbols(currentUri, Schedule::Now); } -bool CurrentDocumentSymbolsRequestTask::isRunning() const +bool CurrentDocumentSymbolsRequest::isRunning() const { return !m_connections.isEmpty(); } -void CurrentDocumentSymbolsRequestTask::clearConnections() +void CurrentDocumentSymbolsRequest::clearConnections() { for (const QMetaObject::Connection &connection : std::as_const(m_connections)) disconnect(connection); @@ -72,7 +72,7 @@ void CurrentDocumentSymbolsRequestTask::clearConnections() CurrentDocumentSymbolsRequestTaskAdapter::CurrentDocumentSymbolsRequestTaskAdapter() { - connect(task(), &CurrentDocumentSymbolsRequestTask::done, this, &TaskInterface::done); + connect(task(), &CurrentDocumentSymbolsRequest::done, this, &TaskInterface::done); } void CurrentDocumentSymbolsRequestTaskAdapter::start() diff --git a/src/plugins/languageclient/currentdocumentsymbolsrequesttask.h b/src/plugins/languageclient/currentdocumentsymbolsrequest.h similarity index 89% rename from src/plugins/languageclient/currentdocumentsymbolsrequesttask.h rename to src/plugins/languageclient/currentdocumentsymbolsrequest.h index 2c10b239689..f0e3fdccdac 100644 --- a/src/plugins/languageclient/currentdocumentsymbolsrequesttask.h +++ b/src/plugins/languageclient/currentdocumentsymbolsrequest.h @@ -19,7 +19,7 @@ public: LanguageServerProtocol::DocumentSymbolsResult m_symbols; }; -class LANGUAGECLIENT_EXPORT CurrentDocumentSymbolsRequestTask : public QObject +class LANGUAGECLIENT_EXPORT CurrentDocumentSymbolsRequest : public QObject { Q_OBJECT @@ -39,7 +39,7 @@ private: }; class LANGUAGECLIENT_EXPORT CurrentDocumentSymbolsRequestTaskAdapter - : public Utils::Tasking::TaskAdapter + : public Utils::Tasking::TaskAdapter { public: CurrentDocumentSymbolsRequestTaskAdapter(); @@ -48,5 +48,5 @@ public: } // namespace LanguageClient -QTC_DECLARE_CUSTOM_TASK(CurrentDocumentSymbolsRequest, +QTC_DECLARE_CUSTOM_TASK(CurrentDocumentSymbolsRequestTask, LanguageClient::CurrentDocumentSymbolsRequestTaskAdapter); diff --git a/src/plugins/languageclient/languageclient.qbs b/src/plugins/languageclient/languageclient.qbs index e0de5f6fb1b..286f319a3cc 100644 --- a/src/plugins/languageclient/languageclient.qbs +++ b/src/plugins/languageclient/languageclient.qbs @@ -26,8 +26,8 @@ QtcPlugin { "client.h", "clientrequesttask.cpp", "clientrequesttask.h", - "currentdocumentsymbolsrequesttask.cpp", - "currentdocumentsymbolsrequesttask.h", + "currentdocumentsymbolsrequest.cpp", + "currentdocumentsymbolsrequest.h", "diagnosticmanager.cpp", "diagnosticmanager.h", "documentsymbolcache.cpp", diff --git a/src/plugins/languageclient/locatorfilter.cpp b/src/plugins/languageclient/locatorfilter.cpp index adf0952d6c5..7ac85c165ba 100644 --- a/src/plugins/languageclient/locatorfilter.cpp +++ b/src/plugins/languageclient/locatorfilter.cpp @@ -4,7 +4,7 @@ #include "locatorfilter.h" #include "clientrequesttask.h" -#include "currentdocumentsymbolsrequesttask.h" +#include "currentdocumentsymbolsrequest.h" #include "documentsymbolcache.h" #include "languageclient_global.h" #include "languageclientmanager.h" @@ -131,10 +131,10 @@ LocatorMatcherTask currentDocumentMatcher() TreeStorage storage; TreeStorage resultStorage; - const auto onQuerySetup = [=](CurrentDocumentSymbolsRequestTask &request) { + const auto onQuerySetup = [=](CurrentDocumentSymbolsRequest &request) { Q_UNUSED(request) }; - const auto onQueryDone = [resultStorage](const CurrentDocumentSymbolsRequestTask &request) { + const auto onQueryDone = [resultStorage](const CurrentDocumentSymbolsRequest &request) { *resultStorage = request.currentDocumentSymbolsData(); }; @@ -145,7 +145,7 @@ LocatorMatcherTask currentDocumentMatcher() const Group root { Storage(resultStorage), - CurrentDocumentSymbolsRequest(onQuerySetup, onQueryDone), + CurrentDocumentSymbolsRequestTask(onQuerySetup, onQueryDone), AsyncTask(onFilterSetup) }; return {root, storage};