diff --git a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp index 5788947ba98..0133292703d 100644 --- a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp +++ b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp @@ -56,8 +56,8 @@ private: } const FilePath filePath = editorWidget->textDocument()->filePath(); const QStringList fallback = identifierWordsUnderCursor(tc); - if (evaluator.identifiedCppElement()) { - const std::shared_ptr &cppElement = evaluator.cppElement(); + const std::shared_ptr &cppElement = evaluator.cppElement(); + if (cppElement) { const QStringList candidates = cppElement->helpIdCandidates; const HelpItem helpItem(candidates + fallback, filePath, diff --git a/src/plugins/cppeditor/cppelementevaluator.cpp b/src/plugins/cppeditor/cppelementevaluator.cpp index bb0ee710993..df2ee98c2ac 100644 --- a/src/plugins/cppeditor/cppelementevaluator.cpp +++ b/src/plugins/cppeditor/cppelementevaluator.cpp @@ -672,11 +672,6 @@ void CppElementEvaluator::execute() exec(std::ref(d->m_functor), std::bind(&FromGuiFunctor::syncExec, &d->m_functor, _1, _2, _3), false); } -bool CppElementEvaluator::identifiedCppElement() const -{ - return bool(d->m_functor.m_element); -} - const std::shared_ptr &CppElementEvaluator::cppElement() const { return d->m_functor.m_element; diff --git a/src/plugins/cppeditor/cppelementevaluator.h b/src/plugins/cppeditor/cppelementevaluator.h index af6d9cc07b3..568ff8a509d 100644 --- a/src/plugins/cppeditor/cppelementevaluator.h +++ b/src/plugins/cppeditor/cppelementevaluator.h @@ -41,7 +41,6 @@ public: static QFuture> asyncExecute(TextEditor::TextEditorWidget *editor); static QFuture> asyncExecute(const QString &expression, const Utils::FilePath &filePath); - bool identifiedCppElement() const; const std::shared_ptr &cppElement() const; bool hasDiagnosis() const; const QString &diagnosis() const;