mirror/konsole
1
0
Fork 0
mirror of https://github.com/KDE/konsole.git synced 2026-06-11 23:45:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

readability fixes - braces

Browse Source
This commit is contained in:
Kurt Hindenburg
2018-01-02 21:19:00 -05:00
parent bf9c0c407d
commit 2e2208d051
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/TerminalCharacterDecoder.cpp
View File

@@ -57,8 +57,9 @@ bool PlainTextDecoder::trailingWhitespace() const
void PlainTextDecoder::begin(QTextStream* output)
{
_output = output;
if (!_linePositions.isEmpty())
if (!_linePositions.isEmpty()) {
_linePositions.clear();
}
}
void PlainTextDecoder::end()
{
@@ -111,10 +112,11 @@ void PlainTextDecoder::decodeLine(const Character* const characters, int count,
// line
if (!_includeTrailingWhitespace) {
for (int i = count - 1 ; i >= start ; i--) {
if (!characters[i].isSpace())
if (!characters[i].isSpace()) {
break;
else
} else {
outputCount--;
}
}
}
@@ -223,11 +225,13 @@ void HTMLDecoder::decodeLine(const Character* const characters, int count, LineP
//colors - a color table must have been defined first
if (_colorTable != nullptr) {
bool useBold = (_lastRendition & RE_BOLD) != 0;
if (useBold)
if (useBold) {
style.append(QLatin1String("font-weight:bold;"));
}
if ((_lastRendition & RE_UNDERLINE) != 0)
if ((_lastRendition & RE_UNDERLINE) != 0) {
style.append(QLatin1String("font-decoration:underline;"));
}
style.append(QStringLiteral("color:%1;").arg(_lastForeColor.color(_colorTable).name()));
@@ -240,10 +244,11 @@ void HTMLDecoder::decodeLine(const Character* const characters, int count, LineP
}
//handle whitespace
if (characters[i].isSpace())
if (characters[i].isSpace()) {
spaceCount++;
else
} else {
spaceCount = 0;
}
//output current character
if (spaceCount < 2) {
@@ -256,12 +261,13 @@ void HTMLDecoder::decodeLine(const Character* const characters, int count, LineP
} else {
//escape HTML tag characters and just display others as they are
const QChar ch = characters[i].character;
if (ch == QLatin1Char('<'))
if (ch == QLatin1Char('<')) {
text.append(QLatin1String("&lt;"));
else if (ch == QLatin1Char('>'))
} else if (ch == QLatin1Char('>')) {
text.append(QLatin1String("&gt;"));
else
} else {
text.append(ch);
}
}
} else {
// HTML truncates multiple spaces, so use a space marker instead