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

TextEditor: Merge ITextEditor and BaseTextEditor

Browse Source 
Adjust all callers, de-export BaseTextEditorAnimator

Change-Id: I2329d976c1398e2449844bb480a4d4ed29859506
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
hjk
2014-07-23 19:10:38 +02:00
parent 15421995ab
commit bf5e43be94
70 changed files with 557 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -54,6 +54,7 @@
#include <utils/qtcassert.h>
#include <texteditor/basetextdocument.h>
#include <texteditor/basetexteditor.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/helpmanager.h>
#include <coreplugin/icore.h>
@@ -341,9 +342,9 @@ QmlEngine::~QmlEngine()
{
QList<Core::IEditor *> editorsToClose;
QHash<QString, QWeakPointer<TextEditor::ITextEditor> >::iterator iter;
QHash<QString, QWeakPointer<TextEditor::BaseTextEditor> >::iterator iter;
for (iter = m_sourceEditors.begin(); iter != m_sourceEditors.end(); ++iter) {
QWeakPointer<TextEditor::ITextEditor> textEditPtr = iter.value();
QWeakPointer<TextEditor::BaseTextEditor> textEditPtr = iter.value();
if (textEditPtr)
editorsToClose << textEditPtr.data();
}
@@ -983,7 +984,7 @@ void QmlEngine::requestModuleSymbols(const QString &moduleName)
//
//////////////////////////////////////////////////////////////////////
bool QmlEngine::setToolTipExpression(TextEditor::ITextEditor *editor,
bool QmlEngine::setToolTipExpression(TextEditor::BaseTextEditor *editor,
const DebuggerToolTipContext &ctx)
{
// This is processed by QML inspector, which has dependencies to