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

TextEditors: Move document related function to document

Browse Source 
Change-Id: I9d0abacbd1b503390164934a1b833fd305ae3fbe
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Eike Ziller
2014-01-14 10:16:57 +01:00
parent b7ce718d4c
commit fc9a99fc02
6 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/projectexplorer/allprojectsfind.cpp
View File

@@ -82,7 +82,8 @@ Utils::FileIterator *AllProjectsFind::filesForProjects(const QStringList &nameFi
foreach (const QString &filter, nameFilters) {
filterRegs << QRegExp(filter, Qt::CaseInsensitive, QRegExp::Wildcard);
}
QMap<QString, QTextCodec *> openEditorEncodings = TextEditor::ITextEditor::openedTextDocumentEncodings();
QMap<QString, QTextCodec *> openEditorEncodings
= TextEditor::ITextEditorDocument::openedTextDocumentEncodings();
QMap<QString, QTextCodec *> encodings;
foreach (const Project *project, projects) {
QStringList projectFiles = project->files(Project::AllFiles);

4
src/plugins/texteditor/basefilefind.cpp
View File

@@ -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);

3
src/plugins/texteditor/findincurrentfile.cpp
View File

@@ -63,7 +63,8 @@ Utils::FileIterator *FindInCurrentFile::files(const QStringList &nameFilters,
{
Q_UNUSED(nameFilters)
QString fileName = additionalParameters.toString();
QMap<QString, QTextCodec *> openEditorEncodings = ITextEditor::openedTextDocumentEncodings();
QMap<QString, QTextCodec *> openEditorEncodings
= ITextEditorDocument::openedTextDocumentEncodings();
QTextCodec *codec = openEditorEncodings.value(fileName);
if (!codec)
codec = Core::EditorManager::defaultTextCodec();

3
src/plugins/texteditor/findinopenfiles.cpp
View File

@@ -63,7 +63,8 @@ Utils::FileIterator *FindInOpenFiles::files(const QStringList &nameFilters,
{
Q_UNUSED(nameFilters)
Q_UNUSED(additionalParameters)
QMap<QString, QTextCodec *> openEditorEncodings = ITextEditor::openedTextDocumentEncodings();
QMap<QString, QTextCodec *> openEditorEncodings
= ITextEditorDocument::openedTextDocumentEncodings();
QStringList fileNames;
QList<QTextCodec *> codecs;
foreach (Core::DocumentModel::Entry *entry,

4
src/plugins/texteditor/itexteditor.cpp
View File

@@ -38,7 +38,7 @@ ITextEditorDocument::ITextEditorDocument(QObject *parent)
{
}
QMap<QString, QString> ITextEditor::openedTextDocumentContents()
QMap<QString, QString> ITextEditorDocument::openedTextDocumentContents()
{
QMap<QString, QString> workingCopy;
foreach (Core::IDocument *document, Core::EditorManager::documentModel()->openedDocuments()) {
@@ -51,7 +51,7 @@ QMap<QString, QString> ITextEditor::openedTextDocumentContents()
return workingCopy;
}
QMap<QString, QTextCodec *> TextEditor::ITextEditor::openedTextDocumentEncodings()
QMap<QString, QTextCodec *> ITextEditorDocument::openedTextDocumentEncodings()
{
QMap<QString, QTextCodec *> workingCopy;
foreach (Core::IDocument *document, Core::EditorManager::documentModel()->openedDocuments()) {

6
src/plugins/texteditor/itexteditor.h
View File

@@ -87,6 +87,9 @@ public:
virtual ITextMarkable *markableInterface() const = 0;
static QMap<QString, QString> openedTextDocumentContents();
static QMap<QString, QTextCodec *> openedTextDocumentEncodings();
signals:
void contentsChanged();
};
@@ -133,9 +136,6 @@ public:
virtual const Utils::CommentDefinition* commentDefinition() const = 0;
static QMap<QString, QString> openedTextDocumentContents();
static QMap<QString, QTextCodec *> openedTextDocumentEncodings();
enum MarkRequestKind {
BreakpointRequest,
BookmarkRequest,