lovecraft/qmltermwidget
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use automatic string conversions

Browse Source 
* Disables automatic conversions from 8-bit strings (char *) to unicode
  QStrings.
* Disables automatic conversion from QString to 8-bit strings (char *).
* Disables automatic conversions from QByteArray to const char * or const
  void *.
* Disables automatic conversions from QString (or char *) to QUrl.
* Use QStringBuilder for more efficient string creation.

It make us aware of string and encoding conversions.
This commit is contained in:
Luís Pereira
2018-07-30 19:32:53 +01:00
committed by Chih-Hsuan Yen
parent e3adf1abe2
commit c6880070e9
15 changed files with 177 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/TerminalCharacterDecoder.cpp
+6 -6
View File
@@ -124,7 +124,7 @@ void HTMLDecoder::begin(QTextStream* output)
std::wstring text;
//open monospace span
openSpan(text,"font-family:monospace");
openSpan(text,QLatin1String("font-family:monospace"));
*output << QString::fromStdWString(text);
}
@@ -180,19 +180,19 @@ void HTMLDecoder::decodeLine(const Character* const characters, int count, LineP
useBold = weight == ColorEntry::Bold;
if (useBold)
style.append("font-weight:bold;");
style.append(QLatin1String("font-weight:bold;"));
if ( _lastRendition & RE_UNDERLINE )
style.append("font-decoration:underline;");
style.append(QLatin1String("font-decoration:underline;"));
//colours - a colour table must have been defined first
if ( _colorTable )
{
style.append( QString("color:%1;").arg(_lastForeColor.color(_colorTable).name() ) );
style.append( QString::fromLatin1("color:%1;").arg(_lastForeColor.color(_colorTable).name() ) );
if (!characters[i].isTransparent(_colorTable))
{
style.append( QString("background-color:%1;").arg(_lastBackColor.color(_colorTable).name() ) );
style.append( QString::fromLatin1("background-color:%1;").arg(_lastBackColor.color(_colorTable).name() ) );
}
}
@@ -237,7 +237,7 @@ void HTMLDecoder::decodeLine(const Character* const characters, int count, LineP
}
void HTMLDecoder::openSpan(std::wstring& text , const QString& style)
{
text.append( QString("<span style=\"%1\">").arg(style).toStdWString() );
text.append( QString(QLatin1String("<span style=\"%1\">")).arg(style).toStdWString() );
}
void HTMLDecoder::closeSpan(std::wstring& text)