diff --git a/src/plugins/projectexplorer/allprojectsfind.cpp b/src/plugins/projectexplorer/allprojectsfind.cpp index 2e7a7c57880b105c9ef8cff27ac681c164fc5310..78615aa4b0db925698cd5d46a03eea898ea29d23 100644 --- a/src/plugins/projectexplorer/allprojectsfind.cpp +++ b/src/plugins/projectexplorer/allprojectsfind.cpp @@ -85,7 +85,7 @@ Utils::FileIterator *AllProjectsFind::filesForProjects(const QStringList &nameFi foreach (const QString &filter, nameFilters) { filterRegs << QRegExp(filter, Qt::CaseInsensitive, QRegExp::Wildcard); } - QMap openEditorEncodings = TextEditor::ITextEditor::openedTextEditorsEncodings(); + QMap openEditorEncodings = TextEditor::ITextEditor::openedTextDocumentEncodings(); QMap encodings; foreach (const Project *project, projects) { QStringList projectFiles = project->files(Project::AllFiles); diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index 250eae2ddcc0132a9ded5c8f81d139e9936d3dd8..8535baffa7a0e6c99c110c6ea14910e42d25da67 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/src/plugins/texteditor/basefilefind.cpp @@ -173,12 +173,12 @@ void BaseFileFind::runSearch(Find::SearchResult *search) watcher->setFuture(Utils::findInFilesRegExp(parameters.text, files(parameters.nameFilters, parameters.additionalParameters), textDocumentFlagsForFindFlags(parameters.flags), - ITextEditor::openedTextEditorsContents())); + ITextEditor::openedTextDocumentContents())); } else { watcher->setFuture(Utils::findInFiles(parameters.text, files(parameters.nameFilters, parameters.additionalParameters), textDocumentFlagsForFindFlags(parameters.flags), - ITextEditor::openedTextEditorsContents())); + ITextEditor::openedTextDocumentContents())); } Core::FutureProgress *progress = Core::ICore::progressManager()->addTask(watcher->future(), diff --git a/src/plugins/texteditor/findincurrentfile.cpp b/src/plugins/texteditor/findincurrentfile.cpp index 4ca1267794c39b3da487591484a8685a4d01d96a..a01144fd3ef0f1cdeeb3ee66de8eec5209ddc613 100644 --- a/src/plugins/texteditor/findincurrentfile.cpp +++ b/src/plugins/texteditor/findincurrentfile.cpp @@ -64,7 +64,7 @@ Utils::FileIterator *FindInCurrentFile::files(const QStringList &nameFilters, { Q_UNUSED(nameFilters) QString fileName = additionalParameters.toString(); - QMap openEditorEncodings = ITextEditor::openedTextEditorsEncodings(); + QMap openEditorEncodings = ITextEditor::openedTextDocumentEncodings(); QTextCodec *codec = openEditorEncodings.value(fileName); if (!codec) codec = Core::EditorManager::instance()->defaultTextCodec(); diff --git a/src/plugins/texteditor/findinopenfiles.cpp b/src/plugins/texteditor/findinopenfiles.cpp index 64f278d472620d5f25cb48e6c0bc8c3172cc08ac..8f3d2584653f819ca09ff148a33e36bbed56656b 100644 --- a/src/plugins/texteditor/findinopenfiles.cpp +++ b/src/plugins/texteditor/findinopenfiles.cpp @@ -64,7 +64,7 @@ Utils::FileIterator *FindInOpenFiles::files(const QStringList &nameFilters, { Q_UNUSED(nameFilters) Q_UNUSED(additionalParameters) - QMap openEditorEncodings = ITextEditor::openedTextEditorsEncodings(); + QMap openEditorEncodings = ITextEditor::openedTextDocumentEncodings(); QStringList fileNames; QList codecs; foreach (Core::DocumentModel::Entry *entry, diff --git a/src/plugins/texteditor/itexteditor.cpp b/src/plugins/texteditor/itexteditor.cpp index 789380a10c465edd523eb7a9f84ffd09d188c3bc..ab2b80b9b28aaa92550439e9fbe265821491d871 100644 --- a/src/plugins/texteditor/itexteditor.cpp +++ b/src/plugins/texteditor/itexteditor.cpp @@ -38,28 +38,28 @@ ITextEditorDocument::ITextEditorDocument(QObject *parent) { } -QMap ITextEditor::openedTextEditorsContents() +QMap ITextEditor::openedTextDocumentContents() { QMap workingCopy; - foreach (Core::IEditor *editor, Core::EditorManager::instance()->openedEditors()) { - ITextEditor *textEditor = qobject_cast(editor); - if (!textEditor) + foreach (Core::IDocument *document, Core::EditorManager::documentModel()->openedDocuments()) { + ITextEditorDocument *textEditorDocument = qobject_cast(document); + if (!textEditorDocument) continue; - QString fileName = textEditor->document()->filePath(); - workingCopy[fileName] = textEditor->textDocument()->contents(); + QString fileName = textEditorDocument->filePath(); + workingCopy[fileName] = textEditorDocument->contents(); } return workingCopy; } -QMap TextEditor::ITextEditor::openedTextEditorsEncodings() +QMap TextEditor::ITextEditor::openedTextDocumentEncodings() { QMap workingCopy; - foreach (Core::IEditor *editor, Core::EditorManager::instance()->openedEditors()) { - ITextEditor *textEditor = qobject_cast(editor); - if (!textEditor) + foreach (Core::IDocument *document, Core::EditorManager::documentModel()->openedDocuments()) { + ITextEditorDocument *textEditorDocument = qobject_cast(document); + if (!textEditorDocument) continue; - QString fileName = textEditor->document()->filePath(); - workingCopy[fileName] = const_cast(textEditor->textDocument()->codec()); + QString fileName = textEditorDocument->filePath(); + workingCopy[fileName] = const_cast(textEditorDocument->codec()); } return workingCopy; } diff --git a/src/plugins/texteditor/itexteditor.h b/src/plugins/texteditor/itexteditor.h index ffc5f945162d431d50de00ad33f5c1f710176288..6761254819675fe0b0eecc58dedcd2be37450891 100644 --- a/src/plugins/texteditor/itexteditor.h +++ b/src/plugins/texteditor/itexteditor.h @@ -111,8 +111,8 @@ public: virtual const Utils::CommentDefinition* commentDefinition() const = 0; - static QMap openedTextEditorsContents(); - static QMap openedTextEditorsEncodings(); + static QMap openedTextDocumentContents(); + static QMap openedTextDocumentEncodings(); enum MarkRequestKind { BreakpointRequest,