summaryrefslogtreecommitdiff
path: root/src/plugins/clangcodemodel/clanghoverhandler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/clangcodemodel/clanghoverhandler.cpp')
-rw-r--r--src/plugins/clangcodemodel/clanghoverhandler.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/plugins/clangcodemodel/clanghoverhandler.cpp b/src/plugins/clangcodemodel/clanghoverhandler.cpp
index 6610b555c2..5903b18246 100644
--- a/src/plugins/clangcodemodel/clanghoverhandler.cpp
+++ b/src/plugins/clangcodemodel/clanghoverhandler.cpp
@@ -102,17 +102,16 @@ static QFuture<CppTools::ToolTipInfo> editorDocumentHandlesToolTipInfo(
ClangHoverHandler::ClangHoverHandler()
{
- setIsAsyncHandler(true);
}
ClangHoverHandler::~ClangHoverHandler()
{
- cancelAsyncCheck();
+ abort();
}
-void ClangHoverHandler::identifyMatchAsync(TextEditorWidget *editorWidget,
- int pos,
- BaseHoverHandler::ReportPriority report)
+void ClangHoverHandler::identifyMatch(TextEditorWidget *editorWidget,
+ int pos,
+ BaseHoverHandler::ReportPriority report)
{
// Reset
m_futureWatcher.reset();
@@ -143,10 +142,12 @@ void ClangHoverHandler::identifyMatchAsync(TextEditorWidget *editorWidget,
report(Priority_None); // Ops, something went wrong.
}
-void ClangHoverHandler::cancelAsyncCheck()
+void ClangHoverHandler::abort()
{
- if (m_futureWatcher)
+ if (m_futureWatcher) {
m_futureWatcher->cancel();
+ m_futureWatcher.reset();
+ }
}
#define RETURN_TEXT_FOR_CASE(enumValue) case TextEditor::HelpItem::enumValue: return #enumValue