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

first edition of the new editor view, splitting still missing

Browse Source
This commit is contained in:
mae
2009-01-16 17:34:34 +01:00
parent aaf7c8bc89
commit c0c5342386
19 changed files with 734 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/perforce/perforceplugin.cpp
View File

@@ -895,7 +895,7 @@ void PerforcePlugin::p4Diff(const QStringList &files, QString diffname)
}
foreach (Core::IEditor *ed, m_coreInstance->editorManager()->openedEditors()) {
if (ed->property("originalFileName").toString() == fileName) {
if (ed->file()->property("originalFileName").toString() == fileName) {
existingEditor = ed;
displayInEditor = false;
break;
@@ -913,7 +913,7 @@ void PerforcePlugin::p4Diff(const QStringList &files, QString diffname)
if (files.count() == 1) {
if (displayInEditor && editor != 0) {
editor->setProperty("originalFileName", files.at(0));
editor->file()->setProperty("originalFileName", files.at(0));
} else if (!displayInEditor && existingEditor) {
if (existingEditor) {
existingEditor->createNew(result.stdOut);