feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

3rdparty/syntax-highlighting: Adapt HtmlHighlighter to Qt6 codec use

Browse Source 
Change-Id: Ifb784b02b01f4cfe89879eae7e2866b694f45581
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2020-07-14 14:55:21 +02:00
parent ec7e9e649b
commit d47bd61e0c
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/3rdparty/syntax-highlighting/src/lib/htmlhighlighter.cpp vendored
View File

@@ -61,13 +61,21 @@ void HtmlHighlighter::setOutputFile(const QString &fileName)
return; return;
} }
d->out.reset(new QTextStream(d->file.get())); d->out.reset(new QTextStream(d->file.get()));
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
d->out->setEncoding(QStringConverter::Utf8);
#else
d->out->setCodec("UTF-8"); d->out->setCodec("UTF-8");
#endif
} }
void HtmlHighlighter::setOutputFile(FILE *fileHandle) void HtmlHighlighter::setOutputFile(FILE *fileHandle)
{ {
d->out.reset(new QTextStream(fileHandle, QIODevice::WriteOnly)); d->out.reset(new QTextStream(fileHandle, QIODevice::WriteOnly));
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
d->out->setEncoding(QStringConverter::Utf8);
#else
d->out->setCodec("UTF-8"); d->out->setCodec("UTF-8");
#endif
} }
void HtmlHighlighter::highlightFile(const QString &fileName, const QString &title) void HtmlHighlighter::highlightFile(const QString &fileName, const QString &title)
@@ -110,7 +118,11 @@ void HtmlHighlighter::highlightData(QIODevice *dev, const QString &title)
*d->out << "><pre>\n"; *d->out << "><pre>\n";
QTextStream in(dev); QTextStream in(dev);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
in.setEncoding(QStringConverter::Utf8);
#else
in.setCodec("UTF-8"); in.setCodec("UTF-8");
#endif
while (!in.atEnd()) { while (!in.atEnd()) {
d->currentLine = in.readLine(); d->currentLine = in.readLine();
state = highlightLine(d->currentLine, state); state = highlightLine(d->currentLine, state);