feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CppEditor: Clean up ModelManagerSupport creation

Browse Source 
No need for "providers" etc.

Change-Id: I4ae9e8ecd6b3554711e002f233c13fd7758f01e4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2022-08-01 17:43:43 +02:00
parent dd37abed6b
commit 240105f55f
10 changed files with 19 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/clangcodemodel/clangcodemodelplugin.cpp
View File

@@ -26,6 +26,7 @@
#include "clangcodemodelplugin.h"
#include "clangconstants.h"
#include "clangmodelmanagersupport.h"
#include "clangutils.h"
#ifdef WITH_TESTS
@@ -115,7 +116,8 @@ bool ClangCodeModelPlugin::initialize(const QStringList &arguments, QString *err
this,
&ClangCodeModelPlugin::maybeHandleBatchFileAndExit);
CppEditor::CppModelManager::instance()->activateClangCodeModel(&m_modelManagerSupportProvider);
CppEditor::CppModelManager::instance()->activateClangCodeModel(
std::make_unique<ClangModelManagerSupport>());
createCompilationDBButton();

2
src/plugins/clangcodemodel/clangcodemodelplugin.h
View File

@@ -25,7 +25,6 @@
#pragma once
#include "clangmodelmanagersupport.h"
#include "clangutils.h"
#include <extensionsystem/iplugin.h>
@@ -53,7 +52,6 @@ private:
void generateCompilationDB();
void createCompilationDBButton();
ClangModelManagerSupportProvider m_modelManagerSupportProvider;
Utils::ParameterAction *m_generateCompilationDBAction = nullptr;
QFutureWatcher<GenerateCompilationDbResult> m_generatorWatcher;
#ifdef WITH_TESTS

1
src/plugins/clangcodemodel/clangconstants.h
View File

@@ -28,7 +28,6 @@
namespace ClangCodeModel {
namespace Constants {
const char CLANG_MODELMANAGERSUPPORT_ID[] = "ClangCodeModel.ClangCodeModel";
const char GENERATE_COMPILATION_DB[] = "ClangCodeModel.GenerateCompilationDB";
const char CLANG_ERROR[] = "Clang.Error";
const char CLANG_WARNING[] = "Clang.Warning";

17
src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
View File

@@ -825,22 +825,5 @@ ClangModelManagerSupport *ClangModelManagerSupport::instance()
return m_instance;
}
QString ClangModelManagerSupportProvider::id() const
{
return QLatin1String(Constants::CLANG_MODELMANAGERSUPPORT_ID);
}
QString ClangModelManagerSupportProvider::displayName() const
{
//: Display name
return QCoreApplication::translate("ClangCodeModel::Internal::ModelManagerSupport",
"Clang");
}
CppEditor::ModelManagerSupport::Ptr ClangModelManagerSupportProvider::createModelManagerSupport()
{
return CppEditor::ModelManagerSupport::Ptr(new ClangModelManagerSupport);
}
} // Internal
} // ClangCodeModel

9
src/plugins/clangcodemodel/clangmodelmanagersupport.h
View File

@@ -123,14 +123,5 @@ private:
QHash<Utils::FilePath, QString> m_queuedShadowDocuments;
};
class ClangModelManagerSupportProvider : public CppEditor::ModelManagerSupportProvider
{
public:
QString id() const override;
QString displayName() const override;
CppEditor::ModelManagerSupport::Ptr createModelManagerSupport() override;
};
} // namespace Internal
} // namespace ClangCodeModel