Make the return value of minimumDataSize() signed.

Done to be able to report an error following the idea of
calculateDataSize(...). Fix stream operator implementation.
Adjust auto-test. Adjust minimumDataSize(...) to be able
to handle unknow minimum sizes for certain function codes.

Change-Id: I6dbbd7c5e609557f21dcd8a81609c863e6eb6747
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

1 files changed, 20 insertions, 20 deletions

diff --git a/tests/auto/qmodbuspdu/tst_qmodbuspdu.cpp b/tests/auto/qmodbuspdu/tst_qmodbuspdu.cpp
index e293224..5bf7d34 100644
--- a/tests/auto/qmodbuspdu/tst_qmodbuspdu.cpp
+++ b/tests/auto/qmodbuspdu/tst_qmodbuspdu.cpp
@@ -57,49 +57,49 @@ private:
     QtMessageHandler oldMessageHandler;
 };
 
-static quint8 minimumDataSize(QModbusPdu::FunctionCode code, bool request)
+static int minimumDataSize(QModbusPdu::FunctionCode code, bool request)
 {
     switch (code) {
-    case QModbusPdu::Invalid:
-    case QModbusPdu::UndefinedFunctionCode:
-        return 0u;
     case QModbusPdu::ReadCoils:
     case QModbusPdu::ReadDiscreteInputs:
-        return request ? 4u : 2u;
+        return request ? 4 : 2;
     case QModbusPdu::WriteSingleCoil:
     case QModbusPdu::WriteSingleRegister:
-        return 4u;
+        return 4;
     case QModbusPdu::ReadHoldingRegisters:
     case QModbusPdu::ReadInputRegisters:
-        return request ? 4u : 3u;
+        return request ? 4 : 3;
     case QModbusPdu::ReadExceptionStatus:
-        return request ? 0u : 1u;
+        return request ? 0 : 1;
     case QModbusPdu::Diagnostics:
-        return 4u;
+        return 4;
     case QModbusPdu::GetCommEventCounter:
-        return request ? 0u : 4u;
+        return request ? 0 : 4;
     case QModbusPdu::GetCommEventLog:
-        return request ? 0u : 8u;
+        return request ? 0 : 8;
     case QModbusPdu::WriteMultipleCoils:
-        return request ? 6u : 4u;
+        return request ? 6 : 4;
     case QModbusPdu::WriteMultipleRegisters:
-        return request ? 7u : 4u;
+        return request ? 7 : 4;
     case QModbusPdu::ReportServerId:
-        return request ? 0u : 4u;   // TODO: The spec is not really clear here.
+        return request ? 0 : 4;
     case QModbusPdu::ReadFileRecord:
-        return request ? 8u : 5u;
+        return request ? 8 : 5;
     case QModbusPdu::WriteFileRecord:
-        return 10u;
+        return 10;
     case QModbusPdu::MaskWriteRegister:
-        return 6u;
+        return 6;
     case QModbusPdu::ReadWriteMultipleRegisters:
-        return request ? 11u : 3u;
+        return request ? 11 : 3;
     case QModbusPdu::ReadFifoQueue:
-        return request ? 2u : 6u;
+        return request ? 2 : 6;
     case QModbusPdu::EncapsulatedInterfaceTransport:
         break; // TODO: The spec is not really clear here.
+    case QModbusPdu::Invalid:
+    case QModbusPdu::UndefinedFunctionCode:
+        return -1;
     }
-    return 0u;
+    return -1;
 }
 
 class tst_QModbusPdu : public QObject