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 <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>

src/plugins/clangcodemodel/clangdlocatorfilters.cpp

@@ -13,7 +13,7 @@
 #include <cppeditor/cppmodelmanager.h>
 #include <cppeditor/indexitem.h>
 #include <extensionsystem/pluginmanager.h>
-#include <languageclient/currentdocumentsymbolsrequesttask.h>
+#include <languageclient/currentdocumentsymbolsrequest.h>
 #include <languageclient/languageclientmanager.h>
 #include <languageclient/languageclientutils.h>
 #include <languageclient/locatorfilter.h>
@@ -436,10 +436,10 @@ LocatorMatcherTask currentDocumentMatcher()
     TreeStorage<LocatorStorage> storage;
     TreeStorage<CurrentDocumentSymbolsData> 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<void>(onFilterSetup)
     };
     return {root, storage};

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

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()

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<CurrentDocumentSymbolsRequestTask>
+    : public Utils::Tasking::TaskAdapter<CurrentDocumentSymbolsRequest>
 {
 public:
     CurrentDocumentSymbolsRequestTaskAdapter();
@@ -48,5 +48,5 @@ public:
 
 } // namespace LanguageClient
 
-QTC_DECLARE_CUSTOM_TASK(CurrentDocumentSymbolsRequest,
+QTC_DECLARE_CUSTOM_TASK(CurrentDocumentSymbolsRequestTask,
                         LanguageClient::CurrentDocumentSymbolsRequestTaskAdapter);

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",

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<LocatorStorage> storage;
     TreeStorage<CurrentDocumentSymbolsData> 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<void>(onFilterSetup)
     };
     return {root, storage};