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

CppEditor: Use BaseTextEditor{Widget} if possible

Browse Source 
Change-Id: I59c420c6469717e552469d176bbeac3a455f3bb0
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2014-05-22 11:04:57 -04:00
parent 4e8b1544b7
commit e828f60c90
13 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/cppeditor/cpphoverhandler.cpp
View File

@@ -29,10 +29,13 @@
#include "cpphoverhandler.h"
#include "cppeditor.h"
#include "cppeditorconstants.h"
#include "cppelementevaluator.h"
#include <coreplugin/helpmanager.h>
#include <texteditor/basetexteditor.h>
#include <utils/qtcassert.h>
#include <QTextCursor>
#include <QUrl>
@@ -48,25 +51,22 @@ CppHoverHandler::~CppHoverHandler()
bool CppHoverHandler::acceptEditor(IEditor *editor)
{
CPPEditor *cppEditor = qobject_cast<CPPEditor *>(editor);
if (cppEditor)
return true;
return false;
return editor->document()->id() == CppEditor::Constants::CPPEDITOR_ID;
}
void CppHoverHandler::identifyMatch(TextEditor::ITextEditor *editor, int pos)
{
CPPEditorWidget *cppEditor = qobject_cast<CPPEditorWidget *>(editor->widget());
if (!cppEditor)
return;
using namespace TextEditor;
BaseTextEditorWidget *textEditor = qobject_cast<BaseTextEditorWidget *>(editor->widget());
QTC_ASSERT(textEditor, return);
if (!cppEditor->extraSelectionTooltip(pos).isEmpty()) {
setToolTip(cppEditor->extraSelectionTooltip(pos));
if (!textEditor->extraSelectionTooltip(pos).isEmpty()) {
setToolTip(textEditor->extraSelectionTooltip(pos));
} else {
QTextCursor tc(cppEditor->document());
QTextCursor tc(textEditor->document());
tc.setPosition(pos);
CppElementEvaluator evaluator(cppEditor);
CppElementEvaluator evaluator(textEditor);
evaluator.setTextCursor(tc);
evaluator.execute();
if (evaluator.hasDiagnosis()) {