Skip to content

ConfigObject: guard QTextStream::setCodec behind Qt version check #4399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
uklotzde merged 1 commit into from
Oct 13, 2021
Merged

ConfigObject: guard QTextStream::setCodec behind Qt version check #4399

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/preferences/configobject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,11 @@ template <class ValueType> bool ConfigObject<ValueType>::parse() {
int group = 0;
QString groupStr, line;
QTextStream text(&configfile);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
DEBUG_ASSERT(text.encoding() == QStringConverter::Utf8);
#else
text.setCodec("UTF-8");
#endif

while (!text.atEnd()) {
line = text.readLine().trimmed();
Expand Down Expand Up @@ -213,7 +217,12 @@ bool ConfigObject<ValueType>::save() {
return false;
}
QTextStream stream(&tmpFile);
// UTF-8 is the default in Qt6.
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
DEBUG_ASSERT(stream.encoding() == QStringConverter::Utf8);
#else
stream.setCodec("UTF-8");
Comment thread
Be-ing marked this conversation as resolved.
#endif

QString group = "";

Expand Down