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

Cache the UTF-8 encoded contents of the text editors, and some cleanup in updateEditorSelections().

Browse Source
This commit is contained in:
Roberto Raggi
2009-03-02 16:30:25 +01:00
parent a8cfda0ddb
commit b74fcb7702
4 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -662,7 +662,7 @@ QMap<QString, QByteArray> CppModelManager::buildWorkingCopyList()
TextEditor::ITextEditor *textEditor = it.key();
CppEditorSupport *editorSupport = it.value();
QString fileName = textEditor->file()->fileName();
workingCopy[fileName] = editorSupport->contents().toUtf8();
workingCopy[fileName] = editorSupport->contents();
}
// add the project configuration file
@@ -846,12 +846,12 @@ void CppModelManager::onDocumentUpdated(Document::Ptr doc)
QList<Editor> todo;
foreach (const Editor &e, todo) {
if (e.widget != ed)
if (e.textEditor != textEditor)
todo.append(e);
}
Editor e;
e.widget = ed;
e.textEditor = textEditor;
e.selections = selections;
e.ifdefedOutBlocks = blockRanges;
todo.append(e);
@@ -870,16 +870,22 @@ void CppModelManager::postEditorUpdate()
void CppModelManager::updateEditorSelections()
{
foreach (const Editor &ed, m_todo) {
if (! ed.widget)
if (! ed.textEditor)
continue;
ed.widget->setExtraSelections(TextEditor::BaseTextEditor::CodeWarningsSelection,
ed.selections);
TextEditor::ITextEditor *textEditor = ed.textEditor;
TextEditor::BaseTextEditor *editor = qobject_cast<TextEditor::BaseTextEditor *>(textEditor->widget());
if (! editor)
continue;
ed.widget->setIfdefedOutBlocks(ed.ifdefedOutBlocks);
editor->setExtraSelections(TextEditor::BaseTextEditor::CodeWarningsSelection,
ed.selections);
editor->setIfdefedOutBlocks(ed.ifdefedOutBlocks);
}
m_todo.clear();
}
void CppModelManager::onProjectAdded(ProjectExplorer::Project *)