summaryrefslogtreecommitdiff
path: root/src/libs/utils/textfileformat.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/utils/textfileformat.cpp')
-rw-r--r--src/libs/utils/textfileformat.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/libs/utils/textfileformat.cpp b/src/libs/utils/textfileformat.cpp
index bd6a992616..28a579f824 100644
--- a/src/libs/utils/textfileformat.cpp
+++ b/src/libs/utils/textfileformat.cpp
@@ -103,13 +103,12 @@ TextFileFormat TextFileFormat::detect(const QByteArray &data)
}
// end code taken from qtextstream
const int newLinePos = data.indexOf('\n');
- if (newLinePos == -1) {
+ if (newLinePos == -1)
result.lineTerminationMode = NativeLineTerminator;
- } else if (newLinePos == 0) {
+ else if (newLinePos == 0)
result.lineTerminationMode = LFLineTerminator;
- } else {
+ else
result.lineTerminationMode = data.at(newLinePos - 1) == '\r' ? CRLFLineTerminator : LFLineTerminator;
- }
return result;
}
@@ -286,11 +285,10 @@ bool TextFileFormat::writeFile(const QString &fileName, QString plainText, QStri
// let QFile do the work, else manually add.
QIODevice::OpenMode fileMode = QIODevice::NotOpen;
if (lineTerminationMode == CRLFLineTerminator) {
- if (NativeLineTerminator == CRLFLineTerminator) {
+ if (NativeLineTerminator == CRLFLineTerminator)
fileMode |= QIODevice::Text;
- } else {
+ else
plainText.replace(QLatin1Char('\n'), QLatin1String("\r\n"));
- }
}
Utils::FileSaver saver(fileName, fileMode);