Fix build after QStringRef removal

Change-Id: Ic38a711951f7f62386c68793bc545f854eb01368
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

3 files changed, 11 insertions, 9 deletions

diff --git a/src/knx/dpt/qknxdatapointtype.cpp b/src/knx/dpt/qknxdatapointtype.cpp
index 7ee6368..53d3f43 100644
--- a/src/knx/dpt/qknxdatapointtype.cpp
+++ b/src/knx/dpt/qknxdatapointtype.cpp
@@ -689,17 +689,18 @@ QKnxDatapointType::~QKnxDatapointType()
 QKnxDatapointType::QKnxDatapointType(Type type, int size)
     : d_ptr(new QKnxDatapointTypePrivate)
 {
-    auto number = QString::number(int(type));
-    if (number.size() < 6)
+    const auto num = QString::number(int(type));
+    if (num.size() < 6)
         return;
 
     bool okMain = false, okSub = false;
+    const auto number = QStringView{ num };
 
     // Datapoint Type shall be identified by a 16 bit main number separated
     // by a dot from a 16 bit sub number. The assumption being made is that
     // QKnxDatapointType::Type is encoded in that way while omitting the dot.
-    quint16 mainType = number.leftRef(number.size() - 5).toUShort(&okMain);
-    quint16 subType = number.rightRef(5).toUShort(&okSub);
+    quint16 mainType = number.left(number.size() - 5).toUShort(&okMain);
+    quint16 subType = number.right(5).toUShort(&okSub);
 
     if (okMain && okSub)
         d_ptr->setup(mainType, subType, quint32(type), size);
diff --git a/src/knx/dpt/qknxdatapointtypefactory.cpp b/src/knx/dpt/qknxdatapointtypefactory.cpp
index 184e843..a963f9a 100644
--- a/src/knx/dpt/qknxdatapointtypefactory.cpp
+++ b/src/knx/dpt/qknxdatapointtypefactory.cpp
@@ -129,17 +129,18 @@ QKnxDatapointType *QKnxDatapointTypeFactory::createType(int mainType, int subTyp
 */
 QKnxDatapointType *QKnxDatapointTypeFactory::createType(QKnxDatapointType::Type type) const
 {
-    auto number = QString::number(int(type));
-    if (number.size() < 6)
+    const auto num = QString::number(int(type));
+    if (num.size() < 6)
         return nullptr;
 
     bool okMain = false, okSub = false;
+    const auto number = QStringView{ num };
 
     // Datapoint Type shall be identified by a 16 bit main number separated by a dot from a 16 bit
     // sub number. The assumption being made is that QKnxDatapointType::Type is encoded in that way
     // while omitting the dot.
-    int mainType = number.leftRef(number.size() - 5).toInt(&okMain);
-    int subType = number.rightRef(5).toInt(&okSub);
+    int mainType = number.left(number.size() - 5).toInt(&okMain);
+    int subType = number.right(5).toInt(&okSub);
 
     if (okMain && okSub)
         return createType(mainType, subType);
diff --git a/src/knx/knxproj/qzip.cpp b/src/knx/knxproj/qzip.cpp
index 4d8bd62..e2e8e13 100644
--- a/src/knx/knxproj/qzip.cpp
+++ b/src/knx/knxproj/qzip.cpp
@@ -499,7 +499,7 @@ QZipReader::FileInfo QZipPrivate::fillFileInfo(int index) const
 
     // fix the file path, if broken (convert separators, eat leading and trailing ones)
     fileInfo.filePath = QDir::fromNativeSeparators(fileInfo.filePath);
-    QStringRef filePathRef(&fileInfo.filePath);
+    QStringView filePathRef(fileInfo.filePath);
     while (filePathRef.startsWith(QLatin1Char('.')) || filePathRef.startsWith(QLatin1Char('/')))
         filePathRef = filePathRef.mid(1);
     while (filePathRef.endsWith(QLatin1Char('/')))