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

Merge remote-tracking branch 'origin/4.6'

Browse Source 
Change-Id: I49e8b8442e2b5edffbea19cb2bba97443ebc3d2a
This commit is contained in:
Eike Ziller
2018-01-23 17:06:59 +01:00
parent a5935cb27a a40f11e071
commit 437590a999
195 changed files with 3478 additions and 2854 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/clangrefactoring/clangqueryhoverhandler.cpp
View File

@@ -30,6 +30,7 @@
#include <dynamicastmatcherdiagnosticmessagecontainer.h>
#include <texteditor/texteditor.h>
#include <utils/executeondestruction.h>
namespace ClangRefactoring {
@@ -38,8 +39,12 @@ ClangQueryHoverHandler::ClangQueryHoverHandler(ClangQueryHighlighter *highligher
{
}
void ClangQueryHoverHandler::identifyMatch(TextEditor::TextEditorWidget *editorWidget, int position)
void ClangQueryHoverHandler::identifyMatch(TextEditor::TextEditorWidget *editorWidget,
int position,
ReportPriority report)
{
Utils::ExecuteOnDestruction reportPriority([this, report](){ report(priority()); });
using Messages = ClangBackEnd::DynamicASTMatcherDiagnosticMessageContainers;
using Contexts = ClangBackEnd::DynamicASTMatcherDiagnosticContextContainers;

4
src/plugins/clangrefactoring/clangqueryhoverhandler.h
View File

@@ -37,7 +37,9 @@ public:
ClangQueryHoverHandler(ClangQueryHighlighter *highligher);
protected:
void identifyMatch(TextEditor::TextEditorWidget *editorWidget, int position) override;
void identifyMatch(TextEditor::TextEditorWidget *editorWidget,
int position,
ReportPriority report) override;
private:
ClangQueryHighlighter *m_highligher;