diff options
author | David Schulz <david.schulz@qt.io> | 2022-06-13 13:38:30 +0200 |
---|---|---|
committer | David Schulz <david.schulz@qt.io> | 2022-06-13 12:11:24 +0000 |
commit | 9c13db448b91af947113e7e559bcececb0fade3e (patch) | |
tree | 45a8532075aa15bf4bb4422b6fd65c49020c53a7 | |
parent | a1bb539c50a70eb194ce76125fde70ca87160fd0 (diff) |
CppEditor: remove unused function hint provider
Since we removed the libclang based backend both implementations of
ModelManagerSupport::functionHintAssistProvider returned a nullptr.
Change-Id: I113c5a08cf604eb1bb2a64a851f022ecd5c908d6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | src/plugins/clangcodemodel/clangmodelmanagersupport.cpp | 5 | ||||
-rw-r--r-- | src/plugins/clangcodemodel/clangmodelmanagersupport.h | 1 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp | 5 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppbuiltinmodelmanagersupport.h | 1 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppeditordocument.cpp | 13 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppeditordocument.h | 3 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppmodelmanager.cpp | 5 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppmodelmanager.h | 1 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppmodelmanagersupport.h | 1 |
9 files changed, 0 insertions, 35 deletions
diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp index 66ff519725..a33d286356 100644 --- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp +++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp @@ -185,11 +185,6 @@ CppEditor::CppCompletionAssistProvider *ClangModelManagerSupport::completionAssi return nullptr; } -CppEditor::CppCompletionAssistProvider *ClangModelManagerSupport::functionHintAssistProvider() -{ - return nullptr; -} - void ClangModelManagerSupport::followSymbol(const CppEditor::CursorInEditor &data, const Utils::LinkHandler &processLinkCallback, bool resolveTarget, bool inNextSplit) diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.h b/src/plugins/clangcodemodel/clangmodelmanagersupport.h index 01a4d7429c..64db859d38 100644 --- a/src/plugins/clangcodemodel/clangmodelmanagersupport.h +++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.h @@ -63,7 +63,6 @@ public: ~ClangModelManagerSupport() override; CppEditor::CppCompletionAssistProvider *completionAssistProvider() override; - CppEditor::CppCompletionAssistProvider *functionHintAssistProvider() override; TextEditor::BaseHoverHandler *createHoverHandler() override { return nullptr; } CppEditor::BaseEditorDocumentProcessor *createEditorDocumentProcessor( TextEditor::TextDocument *baseTextDocument) override; diff --git a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp index 50e8387a23..425ff3f657 100644 --- a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp +++ b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp @@ -124,11 +124,6 @@ CppCompletionAssistProvider *BuiltinModelManagerSupport::completionAssistProvide } -CppCompletionAssistProvider *BuiltinModelManagerSupport::functionHintAssistProvider() -{ - return nullptr; -} - TextEditor::BaseHoverHandler *BuiltinModelManagerSupport::createHoverHandler() { return new CppHoverHandler; diff --git a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.h b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.h index e6583cb09a..fed35cf89c 100644 --- a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.h +++ b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.h @@ -42,7 +42,6 @@ public: ~BuiltinModelManagerSupport() override; CppCompletionAssistProvider *completionAssistProvider() final; - CppCompletionAssistProvider *functionHintAssistProvider() override; TextEditor::BaseHoverHandler *createHoverHandler() final; BaseEditorDocumentProcessor *createEditorDocumentProcessor( TextEditor::TextDocument *baseTextDocument) final; diff --git a/src/plugins/cppeditor/cppeditordocument.cpp b/src/plugins/cppeditor/cppeditordocument.cpp index edd776f537..e203bd3cdb 100644 --- a/src/plugins/cppeditor/cppeditordocument.cpp +++ b/src/plugins/cppeditor/cppeditordocument.cpp @@ -150,24 +150,12 @@ void CppEditorDocument::setCompletionAssistProvider(TextEditor::CompletionAssist m_completionAssistProvider = nullptr; } -void CppEditorDocument::setFunctionHintAssistProvider(TextEditor::CompletionAssistProvider *provider) -{ - TextDocument::setFunctionHintAssistProvider(provider); - m_functionHintAssistProvider = nullptr; -} - CompletionAssistProvider *CppEditorDocument::completionAssistProvider() const { return m_completionAssistProvider ? m_completionAssistProvider : TextDocument::completionAssistProvider(); } -CompletionAssistProvider *CppEditorDocument::functionHintAssistProvider() const -{ - return m_functionHintAssistProvider - ? m_functionHintAssistProvider : TextDocument::functionHintAssistProvider(); -} - TextEditor::IAssistProvider *CppEditorDocument::quickFixAssistProvider() const { if (const auto baseProvider = TextDocument::quickFixAssistProvider()) @@ -223,7 +211,6 @@ void CppEditorDocument::onMimeTypeChanged() m_isObjCEnabled = (mt == QLatin1String(Constants::OBJECTIVE_C_SOURCE_MIMETYPE) || mt == QLatin1String(Constants::OBJECTIVE_CPP_SOURCE_MIMETYPE)); m_completionAssistProvider = mm()->completionAssistProvider(); - m_functionHintAssistProvider = mm()->functionHintAssistProvider(); initializeTimer(); } diff --git a/src/plugins/cppeditor/cppeditordocument.h b/src/plugins/cppeditor/cppeditordocument.h index 471ba99c9b..54009a04eb 100644 --- a/src/plugins/cppeditor/cppeditordocument.h +++ b/src/plugins/cppeditor/cppeditordocument.h @@ -51,9 +51,7 @@ public: bool isObjCEnabled() const; void setCompletionAssistProvider(TextEditor::CompletionAssistProvider *provider) override; - void setFunctionHintAssistProvider(TextEditor::CompletionAssistProvider *provider) override; TextEditor::CompletionAssistProvider *completionAssistProvider() const override; - TextEditor::CompletionAssistProvider *functionHintAssistProvider() const override; TextEditor::IAssistProvider *quickFixAssistProvider() const override; void recalculateSemanticInfoDetached(); @@ -128,7 +126,6 @@ private: QScopedPointer<BaseEditorDocumentProcessor> m_processor; CppCompletionAssistProvider *m_completionAssistProvider = nullptr; - CppCompletionAssistProvider *m_functionHintAssistProvider = nullptr; // (Un)Registration in CppModelManager QScopedPointer<CppEditorDocumentHandle> m_editorDocumentHandle; diff --git a/src/plugins/cppeditor/cppmodelmanager.cpp b/src/plugins/cppeditor/cppmodelmanager.cpp index 6afbe669e6..f646631a90 100644 --- a/src/plugins/cppeditor/cppmodelmanager.cpp +++ b/src/plugins/cppeditor/cppmodelmanager.cpp @@ -1620,11 +1620,6 @@ CppCompletionAssistProvider *CppModelManager::completionAssistProvider() const return d->m_builtinModelManagerSupport->completionAssistProvider(); } -CppCompletionAssistProvider *CppModelManager::functionHintAssistProvider() const -{ - return d->m_builtinModelManagerSupport->functionHintAssistProvider(); -} - TextEditor::BaseHoverHandler *CppModelManager::createHoverHandler() const { return d->m_builtinModelManagerSupport->createHoverHandler(); diff --git a/src/plugins/cppeditor/cppmodelmanager.h b/src/plugins/cppeditor/cppmodelmanager.h index 0177d43d5b..3526bb5fbe 100644 --- a/src/plugins/cppeditor/cppmodelmanager.h +++ b/src/plugins/cppeditor/cppmodelmanager.h @@ -162,7 +162,6 @@ public: void activateClangCodeModel(ModelManagerSupportProvider *modelManagerSupportProvider); CppCompletionAssistProvider *completionAssistProvider() const; - CppCompletionAssistProvider *functionHintAssistProvider() const; BaseEditorDocumentProcessor *createEditorDocumentProcessor( TextEditor::TextDocument *baseTextDocument) const; TextEditor::BaseHoverHandler *createHoverHandler() const; diff --git a/src/plugins/cppeditor/cppmodelmanagersupport.h b/src/plugins/cppeditor/cppmodelmanagersupport.h index 5be236c5d5..2889cf7b67 100644 --- a/src/plugins/cppeditor/cppmodelmanagersupport.h +++ b/src/plugins/cppeditor/cppmodelmanagersupport.h @@ -57,7 +57,6 @@ public: virtual ~ModelManagerSupport() = 0; virtual CppCompletionAssistProvider *completionAssistProvider() = 0; - virtual CppCompletionAssistProvider *functionHintAssistProvider() = 0; virtual TextEditor::BaseHoverHandler *createHoverHandler() = 0; virtual BaseEditorDocumentProcessor *createEditorDocumentProcessor( TextEditor::TextDocument *baseTextDocument) = 0; |