diff --git a/src/libs/utils/textfileformat.cpp b/src/libs/utils/textfileformat.cpp index c4b26695b3c..c175ce1f4dc 100644 --- a/src/libs/utils/textfileformat.cpp +++ b/src/libs/utils/textfileformat.cpp @@ -271,39 +271,6 @@ TextFileFormat::ReadResult return result; } -TextFileFormat::ReadResult TextFileFormat::readFileUTF8(const QString &fileName, - QByteArray *plainText, QString *errorString) -{ - QByteArray data; - try { - Utils::FileReader reader; - if (!reader.fetch(fileName, errorString)) - return TextFileFormat::ReadIOError; - data = reader.data(); - } catch (const std::bad_alloc &) { - *errorString = QCoreApplication::translate("Utils::TextFileFormat", "Out of memory."); - return TextFileFormat::ReadMemoryAllocationError; - } - - TextFileFormat format = TextFileFormat::detect(data); - if (!format.codec) - format.codec = QTextCodec::codecForLocale(); - if (format.codec->name() == "UTF-8") { - if (format.hasUtf8Bom) - data.remove(0, 3); - *plainText = data; - return TextFileFormat::ReadSuccess; - } - - QString target; - if (!format.decode(data, &target)) { - *errorString = QCoreApplication::translate("Utils::TextFileFormat", "An encoding error was encountered."); - return TextFileFormat::ReadEncodingError; - } - *plainText = target.toUtf8(); - return TextFileFormat::ReadSuccess; -} - TextFileFormat::ReadResult TextFileFormat::readFileUTF8(const QString &fileName, const QTextCodec *defaultCodec, QByteArray *plainText, QString *errorString) diff --git a/src/libs/utils/textfileformat.h b/src/libs/utils/textfileformat.h index 9ca55042e16..7d8e37810f2 100644 --- a/src/libs/utils/textfileformat.h +++ b/src/libs/utils/textfileformat.h @@ -76,8 +76,6 @@ public: static ReadResult readFile(const QString &fileName, const QTextCodec *defaultCodec, QString *plainText, TextFileFormat *format, QString *errorString, QByteArray *decodingErrorSample = 0); - static ReadResult readFileUTF8(const QString &fileName, QByteArray *plainText, - QString *errorString); // TODO: Remove this version. static ReadResult readFileUTF8(const QString &fileName, const QTextCodec *defaultCodec, QByteArray *plainText, QString *errorString);