QT/Serial-Studio
1
0
Fork 0
mirror of https://github.com/Serial-Studio/Serial-Studio.git synced 2025-01-31 17:42:55 +08:00
Code Issues Projects Releases Wiki Activity

Revert first-pass line ending parsing changes

Browse Source
This commit is contained in:
Peter S. Hollander 2024-08-06 20:45:43 -04:00
parent 14b1f5a51e
commit accb18d7f2
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/IO/Console.cpp
View File

@ -487,18 +487,8 @@ void IO::Console::append(const QString &string, const bool addTimestamp)
// Only use \n as line separator
auto data = string;
switch (lineEnding())
{
case LineEnding::BothNewLineAndCarriageReturn: // Expecting \r\n, but only need to render \n
case LineEnding::NoLineEnding: // Expecting nothing, but still render any \n for readability
case LineEnding::NewLine: // Since we're expecting \n, ignore any \r
data = data.remove("\r");
break;
case LineEnding::CarriageReturn: // Expecting \r, so ignore existing \n then convert any \r
data = data.remove("\n");
data = data.replace("\r", "\n");
break;
}
data = data.replace("\r\n", "\n");
data = data.replace("\r", "\n");
// Get timestamp
QString timestamp;