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

Debugger: Operate tooltips on TextEditorWidgets, not TextEditor

Browse Source 
Less indirection.

Change-Id: Ifbd7195e853d02bfd6562c817fc7f30079913faf
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-09-19 15:26:41 +02:00
parent 74f24c96e1
commit 970264a88e
19 changed files with 51 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/debugger/sourceutils.cpp
View File

@@ -313,17 +313,14 @@ bool getUninitializedVariables(const CPlusPlus::Snapshot &snapshot,
// Editor tooltip support
bool isCppEditor(Core::IEditor *editor)
bool isCppEditor(TextEditor::BaseTextEditorWidget *editorWidget)
{
const Core::IDocument *document= editor->document();
if (!document)
return false;
const TextEditor::BaseTextDocument *document = editorWidget->textDocument();
return CppTools::ProjectFile::classify(document->filePath()) != CppTools::ProjectFile::Unclassified;
}
// Return the Cpp expression, and, if desired, the function
QString cppExpressionAt(TextEditor::BaseTextEditor *editor, int pos,
QString cppExpressionAt(TextEditor::BaseTextEditorWidget *editorWidget, int pos,
int *line, int *column, QString *function /* = 0 */)
{
using namespace CppTools;
@@ -331,18 +328,12 @@ QString cppExpressionAt(TextEditor::BaseTextEditor *editor, int pos,
if (function)
function->clear();
const QPlainTextEdit *plaintext = qobject_cast<QPlainTextEdit*>(editor->widget());
if (!plaintext)
return QString();
QTextCursor tc = plaintext->textCursor();
QTextCursor tc = editorWidget->textCursor();
QString expr = tc.selectedText();
CppModelManager *modelManager = CppModelManager::instance();
if (expr.isEmpty() && modelManager) {
QTextDocument *doc = plaintext->document();
QTC_ASSERT(doc, return QString());
tc.setPosition(pos);
const QChar ch = doc->characterAt(pos);
const QChar ch = editorWidget->characterAt(pos);
if (ch.isLetterOrNumber() || ch == QLatin1Char('_'))
tc.movePosition(QTextCursor::EndOfWord);
@@ -357,10 +348,8 @@ QString cppExpressionAt(TextEditor::BaseTextEditor *editor, int pos,
}
if (function && !expr.isEmpty())
if (const Core::IDocument *document= editor->document())
if (modelManager)
*function = AbstractEditorSupport::functionAt(modelManager,
document->filePath(), *line, *column);
*function = AbstractEditorSupport::functionAt(modelManager,
editorWidget->textDocument()->filePath(), *line, *column);
return expr;
}