mirror/konsole
1
0
Fork 0
mirror of https://github.com/KDE/konsole.git synced 2026-05-06 05:36:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove leading white spaces in blank lines to make them really empty

Browse Source
This commit is contained in:
Jekyll Wu
2011-11-05 07:29:21 +08:00
parent 8cd63d9698
commit cf92cece2b
59 changed files with 385 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/TerminalCharacterDecoder.cpp
View File

@@ -1,8 +1,8 @@
/*
This file is part of Konsole, an X terminal.
Copyright 2006-2008 by Robert Knight <robertknight@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2 of the License, or
@@ -84,7 +84,7 @@ void PlainTextDecoder::decodeLine(const Character* const characters, int count,
//(since QTextStream always deals with QStrings internally anyway)
QString plainText;
plainText.reserve(count);
int outputCount = count;
// if inclusion of trailing whitespace is disabled then find the end of the
@@ -99,7 +99,7 @@ void PlainTextDecoder::decodeLine(const Character* const characters, int count,
outputCount--;
}
}
for (int i=0;i<outputCount;)
{
if (characters[i].rendition & RE_EXTENDED_CHAR)
@@ -128,7 +128,7 @@ HTMLDecoder::HTMLDecoder() :
,_innerSpanOpen(false)
,_lastRendition(DEFAULT_RENDITION)
{
}
void HTMLDecoder::begin(QTextStream* output)
@@ -166,7 +166,7 @@ void HTMLDecoder::decodeLine(const Character* const characters, int count, LineP
QString text;
int spaceCount = 0;
for (int i=0;i<count;i++)
{
//check if appearance of character is different from previous char
@@ -180,7 +180,7 @@ void HTMLDecoder::decodeLine(const Character* const characters, int count, LineP
_lastRendition = characters[i].rendition;
_lastForeColor = characters[i].foregroundColor;
_lastBackColor = characters[i].backgroundColor;
//build up style string
QString style;
@@ -190,13 +190,13 @@ void HTMLDecoder::decodeLine(const Character* const characters, int count, LineP
useBold = _lastRendition & RE_BOLD;
else
useBold = weight == ColorEntry::Bold;
if (useBold)
style.append("font-weight:bold;");
if ( _lastRendition & RE_UNDERLINE )
style.append("font-decoration:underline;");
//colours - a colour table must have been defined first
if ( _colorTable )
{
@@ -207,7 +207,7 @@ void HTMLDecoder::decodeLine(const Character* const characters, int count, LineP
style.append( QString("background-color:%1;").arg(_lastBackColor.color(_colorTable).name() ) );
}
}
//open the span with the current style
openSpan(text,style);
_innerSpanOpen = true;
@@ -218,7 +218,7 @@ void HTMLDecoder::decodeLine(const Character* const characters, int count, LineP
spaceCount++;
else
spaceCount = 0;
//output current character
if (spaceCount < 2)
@@ -248,7 +248,7 @@ void HTMLDecoder::decodeLine(const Character* const characters, int count, LineP
{
text.append("&nbsp;"); //HTML truncates multiple spaces, so use a space marker instead
}
}
//close any remaining open inner spans
@@ -257,7 +257,7 @@ void HTMLDecoder::decodeLine(const Character* const characters, int count, LineP
//start new line
text.append("<br>");
*_output << text;
}
void HTMLDecoder::openSpan(QString& text , const QString& style)