Merge pull request #18 from lgolouz/lgolouz_zxtr-17

Fixed [ZXTR-17] Unable to build the app using Qt 6

ZXTapeReviver.pro

@@ -1,6 +1,17 @@
-QT += quick gui quickcontrols2
+#*******************************************************************************
+# ZX Tape Reviver
+#-----------------
+#
+# Author: Leonid Golouz
+# E-mail: [email protected]
+# YouTube channel: https://www.youtube.com/channel/UCz_ktTqWVekT0P4zVW8Xgcg
+# YouTube channel e-mail: [email protected]
+#
+# Code modification and distribution of any kind is not allowed without direct
+# permission of the Author.
+#*******************************************************************************
 
-CONFIG += c++11
+QT += quick gui quickcontrols2
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings

qml/Frequency.qml

@@ -4,6 +4,11 @@
 //
 // Author: Leonid Golouz
 // E-mail: [email protected]
+// YouTube channel: https://www.youtube.com/channel/UCz_ktTqWVekT0P4zVW8Xgcg
+// YouTube channel e-mail: [email protected]
+//
+// Code modification and distribution of any kind is not allowed without direct
+// permission of the Author.
 //*******************************************************************************
 
 import QtQuick 2.3

qml/GoToAddress.qml

@@ -4,6 +4,11 @@
 //
 // Author: Leonid Golouz
 // E-mail: [email protected]
+// YouTube channel: https://www.youtube.com/channel/UCz_ktTqWVekT0P4zVW8Xgcg
+// YouTube channel e-mail: [email protected]
+//
+// Code modification and distribution of any kind is not allowed without direct
+// permission of the Author.
 //*******************************************************************************
 
 import QtQuick 2.3

qml/ParserSettings.qml

@@ -4,6 +4,11 @@
 //
 // Author: Leonid Golouz
 // E-mail: [email protected]
+// YouTube channel: https://www.youtube.com/channel/UCz_ktTqWVekT0P4zVW8Xgcg
+// YouTube channel e-mail: [email protected]
+//
+// Code modification and distribution of any kind is not allowed without direct
+// permission of the Author.
 //*******************************************************************************
 
 import QtQuick 2.3

qml/main.qml

@@ -4,6 +4,11 @@
 //
 // Author: Leonid Golouz
 // E-mail: [email protected]
+// YouTube channel: https://www.youtube.com/channel/UCz_ktTqWVekT0P4zVW8Xgcg
+// YouTube channel e-mail: [email protected]
+//
+// Code modification and distribution of any kind is not allowed without direct
+// permission of the Author.
 //*******************************************************************************
 
 import QtQuick 2.15

sources/controls/waveformcontrol.cpp

@@ -4,6 +4,11 @@
 //
 // Author: Leonid Golouz
 // E-mail: [email protected]
+// YouTube channel: https://www.youtube.com/channel/UCz_ktTqWVekT0P4zVW8Xgcg
+// YouTube channel e-mail: [email protected]
+//
+// Code modification and distribution of any kind is not allowed without direct
+// permission of the Author.
 //*******************************************************************************
 
 #include "waveformcontrol.h"

sources/controls/waveformcontrol.h

@@ -4,6 +4,11 @@
 //
 // Author: Leonid Golouz
 // E-mail: [email protected]
+// YouTube channel: https://www.youtube.com/channel/UCz_ktTqWVekT0P4zVW8Xgcg
+// YouTube channel e-mail: [email protected]
+//
+// Code modification and distribution of any kind is not allowed without direct
+// permission of the Author.
 //*******************************************************************************
 
 #ifndef WAVEFORMCONTROL_H

sources/core/waveformparser.cpp

@@ -4,13 +4,19 @@
 //
 // Author: Leonid Golouz
 // E-mail: [email protected]
+// YouTube channel: https://www.youtube.com/channel/UCz_ktTqWVekT0P4zVW8Xgcg
+// YouTube channel e-mail: [email protected]
+//
+// Code modification and distribution of any kind is not allowed without direct
+// permission of the Author.
 //*******************************************************************************
 
 #include "waveformparser.h"
 #include "sources/models/parsersettingsmodel.h"
 #include <QDebug>
 #include <QDateTime>
 #include <QByteArray>
+#include <algorithm>
 
 WaveformParser::WaveformParser(QObject* parent) :
     QObject(parent),
@@ -330,7 +336,16 @@ QVariantList WaveformParser::getParsedChannelData(uint chNum) const
             m.insert("blockSize", sizeText);
             QString nameText;
             if (blockType >= 0) {
-                for (auto idx = 2; idx < std::min(12, i.data.size()); ++idx) {
+                const auto loopRange { std::min(
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+                    (int)
+#else
+                    (qsizetype)
+#endif
+                    12, i.data.size())
+                };
+
+                for (auto idx = 2; idx < loopRange; ++idx) {
                     nameText += QChar(i.data.at(idx));
                 }
             }

sources/core/waveformparser.h

@@ -4,6 +4,11 @@
 //
 // Author: Leonid Golouz
 // E-mail: [email protected]
+// YouTube channel: https://www.youtube.com/channel/UCz_ktTqWVekT0P4zVW8Xgcg
+// YouTube channel e-mail: [email protected]
+//
+// Code modification and distribution of any kind is not allowed without direct
+// permission of the Author.
 //*******************************************************************************
 
 #ifndef WAVEFORMPARSER_H

sources/core/wavreader.cpp

@@ -4,6 +4,11 @@
 //
 // Author: Leonid Golouz
 // E-mail: [email protected]
+// YouTube channel: https://www.youtube.com/channel/UCz_ktTqWVekT0P4zVW8Xgcg
+// YouTube channel e-mail: [email protected]
+//
+// Code modification and distribution of any kind is not allowed without direct
+// permission of the Author.
 //*******************************************************************************
 
 #include "wavreader.h"

sources/core/wavreader.h

@@ -4,6 +4,11 @@
 //
 // Author: Leonid Golouz
 // E-mail: [email protected]
+// YouTube channel: https://www.youtube.com/channel/UCz_ktTqWVekT0P4zVW8Xgcg
+// YouTube channel e-mail: [email protected]
+//
+// Code modification and distribution of any kind is not allowed without direct
+// permission of the Author.
 //*******************************************************************************
 
 #ifndef WAVREADER_H

sources/defines.h

@@ -1,3 +1,16 @@
+//*******************************************************************************
+// ZX Tape Reviver
+//-----------------
+//
+// Author: Leonid Golouz
+// E-mail: [email protected]
+// YouTube channel: https://www.youtube.com/channel/UCz_ktTqWVekT0P4zVW8Xgcg
+// YouTube channel e-mail: [email protected]
+//
+// Code modification and distribution of any kind is not allowed without direct
+// permission of the Author.
+//*******************************************************************************
+
 #ifndef DEFINES_H
 #define DEFINES_H
 

sources/main.cpp

@@ -4,6 +4,11 @@
 //
 // Author: Leonid Golouz
 // E-mail: [email protected]
+// YouTube channel: https://www.youtube.com/channel/UCz_ktTqWVekT0P4zVW8Xgcg
+// YouTube channel e-mail: [email protected]
+//
+// Code modification and distribution of any kind is not allowed without direct
+// permission of the Author.
 //*******************************************************************************
 
 #include <QGuiApplication>

sources/models/fileworkermodel.cpp

@@ -4,6 +4,11 @@
 //
 // Author: Leonid Golouz
 // E-mail: [email protected]
+// YouTube channel: https://www.youtube.com/channel/UCz_ktTqWVekT0P4zVW8Xgcg
+// YouTube channel e-mail: [email protected]
+//
+// Code modification and distribution of any kind is not allowed without direct
+// permission of the Author.
 //*******************************************************************************
 
 #include "fileworkermodel.h"

sources/models/fileworkermodel.h

@@ -4,6 +4,11 @@
 //
 // Author: Leonid Golouz
 // E-mail: [email protected]
+// YouTube channel: https://www.youtube.com/channel/UCz_ktTqWVekT0P4zVW8Xgcg
+// YouTube channel e-mail: [email protected]
+//
+// Code modification and distribution of any kind is not allowed without direct
+// permission of the Author.
 //*******************************************************************************
 
 #ifndef FILEWORKERMODEL_H

sources/models/parsersettingsmodel.cpp

@@ -4,6 +4,11 @@
 //
 // Author: Leonid Golouz
 // E-mail: [email protected]
+// YouTube channel: https://www.youtube.com/channel/UCz_ktTqWVekT0P4zVW8Xgcg
+// YouTube channel e-mail: [email protected]
+//
+// Code modification and distribution of any kind is not allowed without direct
+// permission of the Author.
 //*******************************************************************************
 
 #include "parsersettingsmodel.h"

sources/models/parsersettingsmodel.h

@@ -4,6 +4,11 @@
 //
 // Author: Leonid Golouz
 // E-mail: [email protected]
+// YouTube channel: https://www.youtube.com/channel/UCz_ktTqWVekT0P4zVW8Xgcg
+// YouTube channel e-mail: [email protected]
+//
+// Code modification and distribution of any kind is not allowed without direct
+// permission of the Author.
 //*******************************************************************************
 
 #ifndef PARSERSETTINGSMODEL_H

sources/models/suspiciouspointsmodel.cpp

@@ -4,6 +4,11 @@
 //
 // Author: Leonid Golouz
 // E-mail: [email protected]
+// YouTube channel: https://www.youtube.com/channel/UCz_ktTqWVekT0P4zVW8Xgcg
+// YouTube channel e-mail: [email protected]
+//
+// Code modification and distribution of any kind is not allowed without direct
+// permission of the Author.
 //*******************************************************************************
 
 #include "suspiciouspointsmodel.h"

sources/models/suspiciouspointsmodel.h

@@ -4,6 +4,11 @@
 //
 // Author: Leonid Golouz
 // E-mail: [email protected]
+// YouTube channel: https://www.youtube.com/channel/UCz_ktTqWVekT0P4zVW8Xgcg
+// YouTube channel e-mail: [email protected]
+//
+// Code modification and distribution of any kind is not allowed without direct
+// permission of the Author.
 //*******************************************************************************
 
 #ifndef SUSPICIOUSPOINTSMODEL_H