Don't use deprecated API especially if we don't even need QChar

QChar is for unicode chars and this fixes the warnings below.
Going forward we store the value as uint or int and ensure that we
stay within the limits of ascii. The test case has been extended
to cover additional corner cases.

qmodbusserver.cpp: In member function ‘virtual QVariant QModbusServer::value(int) const’:
qmodbusserver.cpp:203:63: warning: ‘constexpr QChar::QChar(char)’ is deprecated (declared at /home/ablasche/dev/qt/qt56/qtbase/include/QtCore/../../src/corelib/tools/qchar.h:85) [-Wdeprecated-declarations]
             return d->m_serverOptions.value(option, QChar('\n'));
                                                               ^
qmodbusserver.cpp: In member function ‘QModbusResponse QModbusServerPrivate::processDiagnosticsRequest(const QModbusRequest&)’:
qmodbusserver.cpp:844:77: warning: ‘constexpr QChar::QChar(char)’ is deprecated (declared at /home/ablasche/dev/qt/qt56/qtbase/include/QtCore/../../src/corelib/tools/qchar.h:85) [-Wdeprecated-declarations]
         q_func()->setValue(QModbusServer::AsciiInputDelimiter, QChar(data[0]));
                                                                             ^

Change-Id: I6113bcbd275d58141fa7df82e8ae6cccbae178cf
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>

1 files changed, 13 insertions, 3 deletions

diff --git a/tests/auto/qmodbusserver/tst_qmodbusserver.cpp b/tests/auto/qmodbusserver/tst_qmodbusserver.cpp
index 6ab535f..ed846b6 100644
--- a/tests/auto/qmodbusserver/tst_qmodbusserver.cpp
+++ b/tests/auto/qmodbusserver/tst_qmodbusserver.cpp
@@ -1159,10 +1159,20 @@ private slots:
         // TODO: Add a local class implementation to test value()/setValue with a different backing
         // store. That's not only related to AsciiInputDelimiter, rather to all enum values there.
 
-        QCOMPARE(server.value(QModbusServer::AsciiInputDelimiter).toChar(), QChar('\n'));
+        QCOMPARE(server.value(QModbusServer::AsciiInputDelimiter).toInt(), int('\n'));
         QCOMPARE(server.setValue(QModbusServer::AsciiInputDelimiter, "Test"), false);
-        QCOMPARE(server.setValue(QModbusServer::AsciiInputDelimiter, QChar('@')), true);
-        QCOMPARE(server.value(QModbusServer::AsciiInputDelimiter).toChar(), QChar('@'));
+        QCOMPARE(server.setValue(QModbusServer::AsciiInputDelimiter, '@'), true);
+        QCOMPARE(server.value(QModbusServer::AsciiInputDelimiter).toInt(), int('@'));
+
+        QVERIFY(server.setValue(QModbusServer::AsciiInputDelimiter, 'j'));
+        QCOMPARE(server.value(QModbusServer::AsciiInputDelimiter).toInt(), int('j'));
+        QVERIFY(server.setValue(QModbusServer::AsciiInputDelimiter, 0x6a));
+        QCOMPARE(server.value(QModbusServer::AsciiInputDelimiter).toInt(), int('j'));
+        QVERIFY(server.setValue(QModbusServer::AsciiInputDelimiter, 0x6a));
+        QCOMPARE(server.value(QModbusServer::AsciiInputDelimiter).toInt(), int('j'));
+        QVERIFY(!server.setValue(QModbusServer::AsciiInputDelimiter, 0x100));
+        QCOMPARE(server.value(QModbusServer::AsciiInputDelimiter).toInt(), int('j'));
+        QVERIFY(!server.setValue(QModbusServer::AsciiInputDelimiter, -1));
     }
 };