diff options
author | dt <[email protected]> | 2010-09-14 15:15:57 +0200 |
---|---|---|
committer | dt <[email protected]> | 2010-09-14 15:23:11 +0200 |
commit | 08ccda586254de7ff4c66ccdb98d9843847080be (patch) | |
tree | f5a2f84c816c92f5beeb71712bc4abacc0f93520 /src/plugins/debugger/debuggeragents.cpp | |
parent | f068e1159615ee2e1140008359e998ed95c778fd (diff) |
EditorManager: Change openEditor/activateEditor to not do mode switching
Also introduce a indirection, modes have now types, edit and debug have
the same type, and editors do have a prefered type of modes instead of a
prefered mode.
That fixes the bug that if the prefered qml editing mode was set to
design, then in switching between qml editors would
- in Edit Mode: stay in edit mode
- in Debug Mode: switch to debug mode
Diffstat (limited to 'src/plugins/debugger/debuggeragents.cpp')
-rw-r--r-- | src/plugins/debugger/debuggeragents.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/debugger/debuggeragents.cpp b/src/plugins/debugger/debuggeragents.cpp index 8130f278866..aeb703e647a 100644 --- a/src/plugins/debugger/debuggeragents.cpp +++ b/src/plugins/debugger/debuggeragents.cpp @@ -129,7 +129,7 @@ void MemoryViewAgent::createBinEditor(quint64 addr) SIGNAL(endOfFileRequested(Core::IEditor *)), SLOT(handleEndOfFileRequested(Core::IEditor*))); m_editors << editor; - editorManager->activateEditor(editor, EditorManager::NoModeSwitch); + editorManager->activateEditor(editor); QMetaObject::invokeMethod(editor->widget(), "setNewWindowRequestAllowed"); QMetaObject::invokeMethod(editor->widget(), "setLazyData", Q_ARG(quint64, addr), Q_ARG(int, DataRange), Q_ARG(int, BinBlockSize)); @@ -153,7 +153,7 @@ void MemoryViewAgent::addLazyData(QObject *editorToken, quint64 addr, { IEditor *editor = qobject_cast<IEditor *>(editorToken); if (editor && editor->widget()) { - EditorManager::instance()->activateEditor(editor, EditorManager::NoModeSwitch); + Core::EditorManager::instance()->activateEditor(editor); QMetaObject::invokeMethod(editor->widget(), "addLazyData", Q_ARG(quint64, addr / BinBlockSize), Q_ARG(QByteArray, ba)); } @@ -349,7 +349,7 @@ void DisassemblerViewAgent::setContents(const QString &contents) d->configureMimeType(); } - editorManager->activateEditor(d->editor, EditorManager::NoModeSwitch); + editorManager->activateEditor(d->editor); plainTextEdit = qobject_cast<QPlainTextEdit *>(d->editor->widget()); if (plainTextEdit) { |