From e588b3c3a1052dfc063c9c058d361347329e7899 Mon Sep 17 00:00:00 2001 From: John Fultz Date: Sat, 15 Jul 2023 21:24:54 -0500 Subject: 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. --- quackleio/flexiblealphabet.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'quackleio/flexiblealphabet.cpp') diff --git a/quackleio/flexiblealphabet.cpp b/quackleio/flexiblealphabet.cpp index 011e59b..91d339e 100644 --- a/quackleio/flexiblealphabet.cpp +++ b/quackleio/flexiblealphabet.cpp @@ -44,7 +44,7 @@ bool FlexibleAlphabetParameters::load(const QString &filename) } QTextStream stream(&file); - stream.setCodec(QTextCodec::codecForName("UTF-8")); + SET_QTEXTSTREAM_TO_UTF8(stream); QString line; Quackle::Letter letter = QUACKLE_FIRST_LETTER; -- cgit v1.2.3