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

Fix crash when doing "Move into file" refacoring action.

Browse Source 
Change-Id: I0b42953b7bce6b594387777691aca4c2683a5828
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
This commit is contained in:
Erik Verbruggen
2012-01-18 16:31:16 +01:00
parent 6efd36a790
commit ea27d72d19
1 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/plugins/texteditor/refactoringchanges.cpp
View File

@@ -96,43 +96,33 @@ bool RefactoringChanges::createFile(const QString &fileName, const QString &cont
if (QFile::exists(fileName))
return false;
BaseTextEditorWidget *editor = editorForFile(fileName);
if (!editor && openEditor) {
editor = this->openEditor(fileName, false, -1, -1);
// Create a text document for the new file:
QTextDocument *document = new QTextDocument;
QTextCursor cursor(document);
cursor.beginEditBlock();
cursor.insertText(contents);
// Reindent the contents:
if (reindent) {
cursor.select(QTextCursor::Document);
m_data->indentSelection(cursor, fileName, 0);
}
cursor.endEditBlock();
QTextDocument *document;
if (editor)
document = editor->document();
else
document = new QTextDocument;
{
QTextCursor cursor(document);
cursor.beginEditBlock();
cursor.insertText(contents);
if (reindent) {
cursor.select(QTextCursor::Document);
m_data->indentSelection(cursor, fileName, editor);
}
cursor.endEditBlock();
}
if (!editor) {
Utils::TextFileFormat format;
format.codec = Core::EditorManager::instance()->defaultTextCodec();
QString error;
bool saveOk = format.writeFile(fileName, document->toPlainText(), &error);
delete document;
if (!saveOk)
return false;
}
// Write the file to disk:
Utils::TextFileFormat format;
format.codec = Core::EditorManager::instance()->defaultTextCodec();
QString error;
bool saveOk = format.writeFile(fileName, document->toPlainText(), &error);
delete document;
if (!saveOk)
return false;
m_data->fileChanged(fileName);
if (openEditor)
this->openEditor(fileName, /*bool activate =*/ false, -1, -1);
return true;
}
@@ -157,7 +147,11 @@ BaseTextEditorWidget *RefactoringChanges::openEditor(const QString &fileName, bo
}
Core::IEditor *editor = BaseTextEditorWidget::openEditorAt(
fileName, line, column, Core::Id(), flags);
return qobject_cast<BaseTextEditorWidget *>(editor->widget());
if (editor)
return qobject_cast<BaseTextEditorWidget *>(editor->widget());
else
return 0;
}
RefactoringFilePtr RefactoringChanges::file(BaseTextEditorWidget *editor)