diff options
| author | John Fultz <jfultz@wolfram.com> | 2023-07-15 21:24:54 -0500 |
|---|---|---|
| committer | John Fultz <jfultz@wolfram.com> | 2023-07-16 09:02:22 -0500 |
| commit | e588b3c3a1052dfc063c9c058d361347329e7899 (patch) | |
| tree | f2b4df04526b071e7cada64c9e14e66ebb07dd3b /quacker/lister.cpp | |
| parent | 97b2ebe1b0d2bafb9d870bc9422ee721e08a6657 (diff) | |
Make UTF8-encoding of QTextStream work in Qt5 and 6.
QTextStream::setCodec() is no longer a thing in Qt6. Most of
our call are to set the codec to UTF-8, which happens to be the
default encoding in Qt6. So make a macro so this can compile
in both Qt5 and Qt6.
Diffstat (limited to 'quacker/lister.cpp')
| -rw-r--r-- | quacker/lister.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/quacker/lister.cpp b/quacker/lister.cpp index c3a4ea9..644dd90 100644 --- a/quacker/lister.cpp +++ b/quacker/lister.cpp @@ -22,6 +22,7 @@ using namespace std; #include <QtWidgets> #include <quackleio/dictfactory.h> +#include <quackleio/util.h> #include "lister.h" #include "customqsettings.h" @@ -233,7 +234,7 @@ void ListerDialog::openFile() if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { QTextStream stream(&file); - stream.setCodec(QTextCodec::codecForName("UTF-8")); + SET_QTEXTSTREAM_TO_UTF8(stream); QString line; while (!stream.atEnd()) { @@ -429,7 +430,7 @@ QString ListerDialog::writeList(bool alphagrams) } QTextStream stream(&file); - stream.setCodec(QTextCodec::codecForName("UTF-8")); + SET_QTEXTSTREAM_TO_UTF8(stream); QMap<QString, Dict::WordList> map(anagramMap()); |