Fixes: Diff editors don't get correct name.

They were no longer showing e.g. the file name of the diffed file.
Also separate editor id and editor context a bit.
This commit is contained in:
con
2010-01-11 16:52:38 +01:00
parent 033a094a2e
commit a24738ffab
26 changed files with 32 additions and 41 deletions

View File

@@ -217,7 +217,7 @@ FormEditorW::FormEditorW() :
m_fwm = qobject_cast<qdesigner_internal::QDesignerFormWindowManager*>(m_formeditor->formWindowManager());
QTC_ASSERT(m_fwm, return);
const int uid = m_core->uniqueIDManager()->uniqueIdentifier(QLatin1String(C_FORMEDITOR_ID));
const int uid = m_core->uniqueIDManager()->uniqueIdentifier(QLatin1String(C_FORMEDITOR));
m_context << uid;
setupActions();
@@ -705,7 +705,7 @@ void FormEditorW::currentEditorChanged(Core::IEditor *editor)
qDebug() << Q_FUNC_INFO << editor << " of " << m_fwm->formWindowCount();
// Deactivate Designer if a non-form is being edited
if (editor && editor->id() == QLatin1String(Constants::C_FORMEDITOR_ID)) {
if (editor && editor->id() == QLatin1String(Constants::FORMEDITOR_ID)) {
FormWindowEditor *fw = qobject_cast<FormWindowEditor *>(editor);
QTC_ASSERT(fw, return);
fw->activate();