diff --git a/src/plugins/projectexplorer/allprojectsfind.cpp b/src/plugins/projectexplorer/allprojectsfind.cpp index d248fd454c2..891480a6517 100644 --- a/src/plugins/projectexplorer/allprojectsfind.cpp +++ b/src/plugins/projectexplorer/allprojectsfind.cpp @@ -82,7 +82,8 @@ Utils::FileIterator *AllProjectsFind::filesForProjects(const QStringList &nameFi foreach (const QString &filter, nameFilters) { filterRegs << QRegExp(filter, Qt::CaseInsensitive, QRegExp::Wildcard); } - QMap openEditorEncodings = TextEditor::ITextEditor::openedTextDocumentEncodings(); + QMap openEditorEncodings + = TextEditor::ITextEditorDocument::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 d6ad2f18abc..6772d9a64b5 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/src/plugins/texteditor/basefilefind.cpp @@ -173,12 +173,12 @@ void BaseFileFind::runSearch(Core::SearchResult *search) watcher->setFuture(Utils::findInFilesRegExp(parameters.text, files(parameters.nameFilters, parameters.additionalParameters), textDocumentFlagsForFindFlags(parameters.flags), - ITextEditor::openedTextDocumentContents())); + ITextEditorDocument::openedTextDocumentContents())); } else { watcher->setFuture(Utils::findInFiles(parameters.text, files(parameters.nameFilters, parameters.additionalParameters), textDocumentFlagsForFindFlags(parameters.flags), - ITextEditor::openedTextDocumentContents())); + ITextEditorDocument::openedTextDocumentContents())); } FutureProgress *progress = ProgressManager::addTask(watcher->future(), tr("Search"), Constants::TASK_SEARCH); diff --git a/src/plugins/texteditor/findincurrentfile.cpp b/src/plugins/texteditor/findincurrentfile.cpp index def758770cb..a10c14a3ace 100644 --- a/src/plugins/texteditor/findincurrentfile.cpp +++ b/src/plugins/texteditor/findincurrentfile.cpp @@ -63,7 +63,8 @@ Utils::FileIterator *FindInCurrentFile::files(const QStringList &nameFilters, { Q_UNUSED(nameFilters) QString fileName = additionalParameters.toString(); - QMap openEditorEncodings = ITextEditor::openedTextDocumentEncodings(); + QMap openEditorEncodings + = ITextEditorDocument::openedTextDocumentEncodings(); QTextCodec *codec = openEditorEncodings.value(fileName); if (!codec) codec = Core::EditorManager::defaultTextCodec(); diff --git a/src/plugins/texteditor/findinopenfiles.cpp b/src/plugins/texteditor/findinopenfiles.cpp index f3fd8620814..84e76b35ca1 100644 --- a/src/plugins/texteditor/findinopenfiles.cpp +++ b/src/plugins/texteditor/findinopenfiles.cpp @@ -63,7 +63,8 @@ Utils::FileIterator *FindInOpenFiles::files(const QStringList &nameFilters, { Q_UNUSED(nameFilters) Q_UNUSED(additionalParameters) - QMap openEditorEncodings = ITextEditor::openedTextDocumentEncodings(); + QMap openEditorEncodings + = ITextEditorDocument::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 19b80327702..52ab1b2053b 100644 --- a/src/plugins/texteditor/itexteditor.cpp +++ b/src/plugins/texteditor/itexteditor.cpp @@ -38,7 +38,7 @@ ITextEditorDocument::ITextEditorDocument(QObject *parent) { } -QMap ITextEditor::openedTextDocumentContents() +QMap ITextEditorDocument::openedTextDocumentContents() { QMap workingCopy; foreach (Core::IDocument *document, Core::EditorManager::documentModel()->openedDocuments()) { @@ -51,7 +51,7 @@ QMap ITextEditor::openedTextDocumentContents() return workingCopy; } -QMap TextEditor::ITextEditor::openedTextDocumentEncodings() +QMap ITextEditorDocument::openedTextDocumentEncodings() { QMap workingCopy; foreach (Core::IDocument *document, Core::EditorManager::documentModel()->openedDocuments()) { diff --git a/src/plugins/texteditor/itexteditor.h b/src/plugins/texteditor/itexteditor.h index c75ba51d2c5..594efad15db 100644 --- a/src/plugins/texteditor/itexteditor.h +++ b/src/plugins/texteditor/itexteditor.h @@ -87,6 +87,9 @@ public: virtual ITextMarkable *markableInterface() const = 0; + static QMap openedTextDocumentContents(); + static QMap openedTextDocumentEncodings(); + signals: void contentsChanged(); }; @@ -133,9 +136,6 @@ public: virtual const Utils::CommentDefinition* commentDefinition() const = 0; - static QMap openedTextDocumentContents(); - static QMap openedTextDocumentEncodings(); - enum MarkRequestKind { BreakpointRequest, BookmarkRequest,