From 9a07ea69d678515d88068b7453afe378704abfc2 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Wed, 23 Apr 2014 11:03:28 -0700
Subject: Again to fix compilation after
 b0afad8f0b6a3be7ab3a23e063b0201cd68ada95

Commit 125bb81bef7729d182f533989ffdf53685abbe31 wasn't enough. Let's
just make it simpler and use a regular function.

Change-Id: I9627dedaa87873b4b138224afd182e4fd9a55265
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
---
 tests/auto/corelib/codecs/utf8/tst_utf8.cpp | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/corelib/codecs/utf8/tst_utf8.cpp b/tests/auto/corelib/codecs/utf8/tst_utf8.cpp
index b00fd0dfd4..8755e65d0c 100644
--- a/tests/auto/corelib/codecs/utf8/tst_utf8.cpp
+++ b/tests/auto/corelib/codecs/utf8/tst_utf8.cpp
@@ -53,11 +53,7 @@ public:
     // test data:
     QTextCodec *codec;
     QString (*from8BitPtr)(const char *, int);
-#ifdef Q_COMPILER_REF_QUALIFIERS
-    QByteArray (QString:: *to8Bit)() const &;
-#else
-    QByteArray (QString:: *to8Bit)() const;
-#endif
+    static QByteArray to8Bit(const QString &);
 
     inline QString from8Bit(const QByteArray &ba)
     { return from8BitPtr(ba.constData(), ba.length()); }
@@ -97,14 +93,21 @@ void tst_Utf8::init()
     if (useLocale) {
         codec = QTextCodec::codecForLocale();
         from8BitPtr = &QString::fromLocal8Bit;
-        to8Bit = &QString::toLocal8Bit;
     } else {
         codec = QTextCodec::codecForMib(106);
         from8BitPtr = &QString::fromUtf8;
-        to8Bit = &QString::toUtf8;
     }
 }
 
+QByteArray tst_Utf8::to8Bit(const QString &s)
+{
+    QFETCH_GLOBAL(bool, useLocale);
+    if (useLocale)
+        return s.toLocal8Bit();
+    else
+        return s.toUtf8();
+}
+
 void tst_Utf8::roundTrip_data()
 {
     QTest::addColumn<QByteArray>("utf8");
@@ -161,11 +164,11 @@ void tst_Utf8::roundTrip()
     QFETCH(QByteArray, utf8);
     QFETCH(QString, utf16);
 
-    QCOMPARE((utf16.*to8Bit)(), utf8);
+    QCOMPARE(to8Bit(utf16), utf8);
     QCOMPARE(from8Bit(utf8), utf16);
 
-    QCOMPARE((from8Bit(utf8).*to8Bit)(), utf8);
-    QCOMPARE(from8Bit((utf16.*to8Bit)()), utf16);
+    QCOMPARE(to8Bit(from8Bit(utf8)), utf8);
+    QCOMPARE(from8Bit(to8Bit(utf16)), utf16);
 }
 
 void tst_Utf8::charByChar_data()
-- 
cgit v1.2.3