aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/cppeditor
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2024-02-02 14:55:06 +0100
committerhjk <hjk@qt.io>2024-02-22 16:18:56 +0000
commit0459d3dde75b287ed4a8b06341ebc7efb03db3be (patch)
tree3b51d85ec9b0832f69462db9be5682daa0c57432 /src/plugins/cppeditor
parent111795495039e6d479a77319828d8c946a4152a4 (diff)
CppEditor: Un-export CppProjectUpdater
Does not seem to be used outside. Change-Id: I9ed27e20ebb23ffd59b7f557b1ff56dbcadd6a2d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/cppeditor')
-rw-r--r--src/plugins/cppeditor/cppprojectupdater.cpp28
-rw-r--r--src/plugins/cppeditor/cppprojectupdater.h30
2 files changed, 23 insertions, 35 deletions
diff --git a/src/plugins/cppeditor/cppprojectupdater.cpp b/src/plugins/cppeditor/cppprojectupdater.cpp
index a4ddbd49f6..80ab1ad6cd 100644
--- a/src/plugins/cppeditor/cppprojectupdater.cpp
+++ b/src/plugins/cppeditor/cppprojectupdater.cpp
@@ -12,30 +12,45 @@
#include <projectexplorer/extracompiler.h>
#include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/projectupdater.h>
+#include <projectexplorer/rawprojectpart.h>
+
+#include <solutions/tasking/tasktreerunner.h>
#include <utils/algorithm.h>
#include <utils/async.h>
+#include <utils/futuresynchronizer.h>
#include <utils/qtcassert.h>
using namespace ProjectExplorer;
using namespace Tasking;
using namespace Utils;
-namespace CppEditor {
+namespace CppEditor::Internal {
+
+class CppProjectUpdater final : public ProjectUpdater
+{
+public:
+ void update(const ProjectUpdateInfo &projectUpdateInfo,
+ const QList<ExtraCompiler *> &extraCompilers) final;
+ void cancel() final;
+
+private:
+ FutureSynchronizer m_futureSynchronizer;
+ TaskTreeRunner m_taskTreeRunner;
+};
void CppProjectUpdater::update(const ProjectUpdateInfo &projectUpdateInfo,
- const QList<ProjectExplorer::ExtraCompiler *> &extraCompilers)
+ const QList<ExtraCompiler *> &extraCompilers)
{
// Stop previous update.
cancel();
- const QList<QPointer<ProjectExplorer::ExtraCompiler>> compilers =
+ const QList<QPointer<ExtraCompiler>> compilers =
Utils::transform(extraCompilers, [](ExtraCompiler *compiler) {
return QPointer<ExtraCompiler>(compiler);
});
- using namespace ProjectExplorer;
-
// Run the project info generator in a worker thread and continue if that one is finished.
const auto infoGenerator = [=](QPromise<ProjectInfo::ConstPtr> &promise) {
ProjectUpdateInfo fullProjectUpdateInfo = projectUpdateInfo;
@@ -45,7 +60,6 @@ void CppProjectUpdater::update(const ProjectUpdateInfo &projectUpdateInfo,
promise.addResult(generator.generate(promise));
};
- using namespace Tasking;
struct UpdateStorage {
ProjectInfo::ConstPtr projectInfo = nullptr;
};
@@ -112,4 +126,4 @@ void setupCppProjectUpdater()
static CppProjectUpdaterFactory theCppProjectUpdaterFactory;
}
-} // namespace CppEditor
+} // CppEditor::Internal
diff --git a/src/plugins/cppeditor/cppprojectupdater.h b/src/plugins/cppeditor/cppprojectupdater.h
index 1057feaed6..19c7c038e3 100644
--- a/src/plugins/cppeditor/cppprojectupdater.h
+++ b/src/plugins/cppeditor/cppprojectupdater.h
@@ -3,34 +3,8 @@
#pragma once
-#include "cppeditor_global.h"
-
-#include <projectexplorer/projectupdater.h>
-#include <projectexplorer/rawprojectpart.h>
-
-#include <solutions/tasking/tasktreerunner.h>
-
-#include <utils/futuresynchronizer.h>
-
-namespace ProjectExplorer { class ExtraCompiler; }
-
-namespace CppEditor {
-
-class CPPEDITOR_EXPORT CppProjectUpdater final
- : public QObject, public ProjectExplorer::ProjectUpdater
-{
- Q_OBJECT
-
-public:
- void update(const ProjectExplorer::ProjectUpdateInfo &projectUpdateInfo,
- const QList<ProjectExplorer::ExtraCompiler *> &extraCompilers) override;
- void cancel() override;
-
-private:
- Utils::FutureSynchronizer m_futureSynchronizer;
- Tasking::TaskTreeRunner m_taskTreeRunner;
-};
+namespace CppEditor::Internal {
void setupCppProjectUpdater();
-} // namespace CppEditor
+} // CppEditor::Internal