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

Utils: Tr::tr

Browse Source 
Change-Id: Ic03e20993f05fb5b49a12c891d86afb2c8e18e08
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Alessandro Portale
2023-01-24 16:49:41 +01:00
parent 17b28909a9
commit 4d6827dde9
65 changed files with 486 additions and 1964 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/utils/textfileformat.cpp
View File

@@ -5,6 +5,7 @@
#include "fileutils.h"
#include "qtcassert.h"
#include "utilstr.h"
#include <QDebug>
#include <QTextCodec>
@@ -190,7 +191,7 @@ TextFileFormat::ReadResult readTextFile(const FilePath &filePath, const QTextCod
return TextFileFormat::ReadIOError;
data = reader.data();
} catch (const std::bad_alloc &) {
*errorString = QCoreApplication::translate("Utils::TextFileFormat", "Out of memory.");
*errorString = Tr::tr("Out of memory.");
return TextFileFormat::ReadMemoryAllocationError;
}
@@ -201,7 +202,7 @@ TextFileFormat::ReadResult readTextFile(const FilePath &filePath, const QTextCod
format->codec = defaultCodec ? defaultCodec : QTextCodec::codecForLocale();
if (!format->decode(data, target)) {
*errorString = QCoreApplication::translate("Utils::TextFileFormat", "An encoding error was encountered.");
*errorString = Tr::tr("An encoding error was encountered.");
if (decodingErrorSampleIn)
*decodingErrorSampleIn = TextFileFormat::decodingErrorSample(data);
return TextFileFormat::ReadEncodingError;
@@ -256,7 +257,7 @@ TextFileFormat::ReadResult TextFileFormat::readFileUTF8(const FilePath &filePath
return TextFileFormat::ReadIOError;
data = reader.data();
} catch (const std::bad_alloc &) {
*errorString = QCoreApplication::translate("Utils::TextFileFormat", "Out of memory.");
*errorString = Tr::tr("Out of memory.");
return TextFileFormat::ReadMemoryAllocationError;
}