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

Use the encoding settings when doing multi-file searches.

Browse Source 
Task-number: QTCREATORBUG-65
This commit is contained in:
con
2010-10-11 11:34:17 +02:00
parent 38d3090a4a
commit d2a91ed1a0
9 changed files with 161 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,7 @@
**************************************************************************/
#include "findincurrentfile.h"
#include "itexteditor.h"
#include <coreplugin/icore.h>
#include <coreplugin/editormanager/editormanager.h>
@@ -40,6 +41,7 @@
#include <QtGui/QVBoxLayout>
using namespace Find;
using namespace TextEditor;
using namespace TextEditor::Internal;
FindInCurrentFile::FindInCurrentFile(SearchResultWindow *resultWindow)
@@ -64,10 +66,13 @@ QString FindInCurrentFile::displayName() const
Utils::FileIterator *FindInCurrentFile::files() const
{
QStringList fileList;
if (isEnabled())
fileList << m_currentFile->fileName();
return new Utils::FileIterator(fileList);
Q_ASSERT(isEnabled());
QString fileName = m_currentFile->fileName();
QMap<QString, QTextCodec *> openEditorEncodings = ITextEditor::openedTextEditorsEncodings();
QTextCodec *codec = openEditorEncodings.value(fileName);
if (!codec)
codec = Core::EditorManager::instance()->defaultTextEncoding();
return new Utils::FileIterator(QStringList() << fileName, QList<QTextCodec *>() << codec);
}
bool FindInCurrentFile::isEnabled() const