Migrates ./Lts/Viewer successfully to Qt6

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/sidc_builder.cpp

@@ -10,6 +10,8 @@
 #include "sidc_builder.h"
 #include "sidc_codec.h"
 
+#include <QStringView>
+
 
 //                                                     1234567890
 qint32 AdvancedSymbology::SidcBuilder::_smallest     = 1000000000;
@@ -73,7 +75,7 @@ void SidcBuilder::setStandardIdentity(const SidcDefinitions::StandardIdentity &s
 
 SidcDefinitions::Context SidcBuilder::context() const
 {
-  return static_cast<Context>(QStringRef(&m_first10_mil2525D, 2, 1).toInt());
+  return static_cast<Context>(QStringView(m_first10_mil2525D).slice(2, 1).toInt());
 }
 void SidcBuilder::setContext(SidcDefinitions::Context context)
 {
@@ -81,7 +83,7 @@ void SidcBuilder::setContext(SidcDefinitions::Context context)
 }
 SidcDefinitions::Identity SidcBuilder::identity() const
 {
-  return static_cast<Identity>(QStringRef(&m_first10_mil2525D, 3, 1).toInt());
+  return static_cast<Identity>(QStringView(m_first10_mil2525D).slice(3, 1).toInt());
 }
 
 void SidcBuilder::setIdentity(SidcDefinitions::Identity identity)
@@ -110,7 +112,7 @@ bool SidcBuilder::isIdentityAssumed() const
 
 SidcDefinitions::SymbolSet SidcBuilder::symbolSet() const
 {
-  SymbolSet sset = static_cast<SymbolSet>(QStringRef(&m_first10_mil2525D, 4, 2).toString().toInt());
+  SymbolSet sset = static_cast<SymbolSet>(QStringView(m_first10_mil2525D).slice(4, 2).toString().toInt());
   return sset;
 }
 void SidcBuilder::setSymbolSet(const SymbolSet &symbolSet)
@@ -121,7 +123,7 @@ void SidcBuilder::setSymbolSet(const SymbolSet &symbolSet)
 
 SidcDefinitions::Status SidcBuilder::status() const
 {
-  Status status = static_cast<Status>(QStringRef(&m_first10_mil2525D, 6, 1).toInt());
+  Status status = static_cast<Status>(QStringView(m_first10_mil2525D).slice(6, 1).toInt());
   return status;
 }
 
@@ -154,7 +156,7 @@ void SidcBuilder::setSymbolEntityCode(const QString &entityCode)
 
 SidcDefinitions::HQTFDummy SidcBuilder::hqTfFd() const
 {
-  HQTFDummy hdtffd = static_cast<HQTFDummy>(QStringRef(&m_first10_mil2525D, 7, 1).toInt());
+  HQTFDummy hdtffd = static_cast<HQTFDummy>(QStringView(m_first10_mil2525D).slice(7, 1).toInt());
   return hdtffd;
 }
 
@@ -198,7 +200,7 @@ bool SidcBuilder::feintDummy() const
 
 SidcDefinitions::AmplifierGroup SidcBuilder::amplifierGroup() const
 {
-  AmplifierGroup amplifierGroup = static_cast<AmplifierGroup>(QStringRef(&m_first10_mil2525D, 8, 1).toInt());
+  AmplifierGroup amplifierGroup = static_cast<AmplifierGroup>(QStringView(m_first10_mil2525D).slice(8, 1).toInt());
   return amplifierGroup;
 }
 void SidcBuilder::setAmplifierGroup(const AmplifierGroup &amplifierGroup)
@@ -208,7 +210,7 @@ void SidcBuilder::setAmplifierGroup(const AmplifierGroup &amplifierGroup)
 
 unsigned int SidcBuilder::amplifier2ndDigit() const
 {
-  return QStringRef(&m_first10_mil2525D, 9, 1).toUInt();
+  return QStringView(m_first10_mil2525D).slice(9, 1).toUInt();
 } // unsigned int SidcBuilder::amplifier2ndDigit() const
 
 
@@ -220,13 +222,13 @@ void SidcBuilder::setAmplifier2ndDigit(unsigned int amplifierSecondDigit)
 
 unsigned int SidcBuilder::sectorModifier1Digit()
 {
-  return QStringRef(&m_second10_mil2525D, 6, 2).toUInt();
+  return QStringView(m_second10_mil2525D).slice(6, 2).toUInt();
 } // unsigned int SidcBuilder::sectorModifier1Digit()
 
 
 unsigned int SidcBuilder::sectorModifier2Digit()
 {
-  return QStringRef(&m_second10_mil2525D, 8, 2).toUInt();
+  return QStringView(m_second10_mil2525D).slice(8, 2).toUInt();
 } // unsigned int SidcBuilder::sectorModifier2Digit()
 
 
@@ -311,7 +313,7 @@ bool SidcBuilder::initFromSymbologyType(SymbologyType symbologyType, const QStri
   }
 
   // check version
-  if (QStringRef(&rawSidc, 0, 2) != QLatin1String("10"))
+  if (QStringView(rawSidc).slice(0, 2) != QLatin1String("10"))
   {
     ERROR_LOG(m_logger) << LOGFUNCTION
                         << " sidc='" << sidc << "'"
@@ -369,7 +371,7 @@ bool SidcBuilder::initFromSymbologyTypeBaseSymbolCode(SymbologyType symbologyTyp
   init();
 
   // set SymbolSet:
-  SymbolSet sSet = static_cast<SymbolSet>(QStringRef(&rawBaseSymbolCode, 0, 2).toInt());
+  SymbolSet sSet = static_cast<SymbolSet>(QStringView(rawBaseSymbolCode).slice(0, 2).toInt());
   this->setSymbolSet(sSet);
 
   // set Entity:

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/sidc_builder_base.cpp

@@ -16,6 +16,7 @@
 // Qt
 #include <QtCore/QDebug>
 #include <QtCore/QRegularExpression>
+#include <QStringView>
 
 
 namespace AdvancedSymbology
@@ -162,8 +163,8 @@ QString SidcBuilderBase::concreteSidcToBaseSymbolCode(const QString &sidcCodec)
         return QString();
 
       QString baseSymbolCode(
-        QStringRef(&rawSidc, 4, 2).toString() +
-        QStringRef(&rawSidc, 10, 6).toString());
+        QStringView(rawSidc).slice(4, 2).toString() +
+        QStringView(rawSidc).slice(10, 6).toString());
       return SidcCodec::encodeBaseSymbolCode(symbologyType, baseSymbolCode);
     } break;
 

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/sidc_codec.cpp

@@ -39,7 +39,7 @@ QString encode(SymbologyType symbologyType)
   return QLatin1String("EROR");
 }
 
-SymbologyType decodeSymbology(const QStringRef &symbologyTypeStr)
+SymbologyType decodeSymbology(const QStringView &symbologyTypeStr)
 {
   SymbologyType symbologyType = SymbologyType::None;
   if (symbologyTypeStr.compare(QLatin1String("NONE")) == 0) symbologyType = SymbologyType::None;
@@ -63,7 +63,7 @@ QString encode(SidcCodec::SidcType sidcType)
   return QLatin1String("EROR");
 }
 
-SidcCodec::SidcType decodeSidc(const QStringRef &sidcTypeStr)
+SidcCodec::SidcType decodeSidc(const QStringView &sidcTypeStr)
 {
   SidcCodec::SidcType symbologyType = SidcCodec::SidcType::None;
   if (     sidcTypeStr.compare(QLatin1String("NONE")) == 0) symbologyType = SidcCodec::SidcType::None;
@@ -92,9 +92,9 @@ bool SidcCodec::checkSidcSyntax(const QString &encodedSidc)
 {
   if (!isEncoded(encodedSidc)) return false;
 
-  SidcCodec::SidcType sidcType = SidcCodecHelper::decodeSidc(QStringRef(&encodedSidc, 5, 4));
+  SidcCodec::SidcType sidcType = SidcCodecHelper::decodeSidc(QStringView(encodedSidc).slice(5, 4));
 
-  const QStringRef symbologyTypeStr(&encodedSidc, 0, 4);
+  const QStringView symbologyTypeStr = QStringView(encodedSidc).slice(0, 4);
 
   if (symbologyTypeStr.compare(QLatin1String("NONE")) == 0)      return true;
   else if (symbologyTypeStr.compare(QLatin1String("AP6B")) == 0) return true;
@@ -156,18 +156,18 @@ int SidcCodec::decodeCivilXml(const QString &civilSidc)
 //
 // DECODE
 //
-// QStringRef(const QString *string, int position, int size);
+// QStringView(const QString &string, int position, int size);
 // QString mid(int position, int n = -1) const Q_REQUIRED_RESULT;
 //
 
 SymbologyType SidcCodec::decodeSymbologyType(const QString &encodedSidc)
 {
-  return SidcCodecHelper::decodeSymbology(QStringRef(&encodedSidc, 0, 4));
+  return SidcCodecHelper::decodeSymbology(QStringView(encodedSidc).slice(0, 4));
 }
 
 SidcCodec::SidcType SidcCodec::decodeSidcType(const QString &encodedSidc)
 {
-  return SidcCodecHelper::decodeSidc(QStringRef(&encodedSidc, 5, 4));
+  return SidcCodecHelper::decodeSidc(QStringView(encodedSidc).slice(5, 4));
 }
 
 QString SidcCodec::decodeRawSidc(const QString &encodedSidc)
@@ -202,19 +202,19 @@ QString SidcCodec::extractCivilXmlBaseSidc( const QString &sidc )
 //
 // Some convenience functions
 
-QString SidcCodec::encodeBaseSymbolCode(SymbologyType symbologyType, const QStringRef  &baseSymboCodeSidc) { return encodeBaseSymbolCode(symbologyType, *baseSymboCodeSidc.string()); }
+QString SidcCodec::encodeBaseSymbolCode(SymbologyType symbologyType, const QStringView  &baseSymboCodeSidc) { return encodeBaseSymbolCode(symbologyType, baseSymboCodeSidc.toString()); }
 QString SidcCodec::encodeBaseSymbolCode(SymbologyType symbologyType, const std::string &baseSymboCodeSidc) { return encodeBaseSymbolCode(symbologyType, QString::fromStdString(baseSymboCodeSidc));}
 QString SidcCodec::encodeBaseSymbolCode(SymbologyType symbologyType, const char        *baseSymboCodeSidc) { return encodeBaseSymbolCode(symbologyType, QString::fromLatin1(baseSymboCodeSidc));}
 
-QString SidcCodec::encodeComplete(SymbologyType symbologyType, const QStringRef  &completeSidc)            { return encodeComplete(symbologyType, *completeSidc.string());}
+QString SidcCodec::encodeComplete(SymbologyType symbologyType, const QStringView  &completeSidc)            { return encodeComplete(symbologyType, completeSidc.toString());}
 QString SidcCodec::encodeComplete(SymbologyType symbologyType, const std::string &completeSidc)            { return encodeComplete(symbologyType, QString::fromStdString(completeSidc)); }
 QString SidcCodec::encodeComplete(SymbologyType symbologyType, const char        *completeSidc)            { return encodeComplete(symbologyType, QString::fromLatin1(completeSidc)); }
 
-QString SidcCodec::encodeCivilEts(const QStringRef  &civilSidc)                                            { return encodeCivilEts(*civilSidc.string());}
+QString SidcCodec::encodeCivilEts(const QStringView  &civilSidc)                                            { return encodeCivilEts(civilSidc.toString());}
 QString SidcCodec::encodeCivilEts(const std::string &civilSidc)                                            { return encodeCivilEts(QString::fromStdString(civilSidc)); }
 QString SidcCodec::encodeCivilEts(const char        *civilSidc)                                            { return encodeCivilEts(QString::fromLatin1(civilSidc)); }
 
-QString SidcCodec::encodeCivilXml(const QStringRef  &civilSidc)                                            { return encodeCivilXml(*civilSidc.string());}
+QString SidcCodec::encodeCivilXml(const QStringView  &civilSidc)                                            { return encodeCivilXml(civilSidc.toString());}
 QString SidcCodec::encodeCivilXml(const std::string &civilSidc)                                            { return encodeCivilXml(QString::fromStdString(civilSidc)); }
 QString SidcCodec::encodeCivilXml(const char        *civilSidc)                                            { return encodeCivilXml(QString::fromLatin1(civilSidc)); }
 

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/sidc_codec.h

@@ -16,7 +16,7 @@
 // Qt
 #include <QtCore/QHash>
 #include <QtCore/QString>
-#include <QStringRef>
+#include <QStringView>
 
 namespace AdvancedSymbology
 {
@@ -121,10 +121,10 @@ ADVANCED_SYMBOLOGY_EXPORT int           decodeCivilXml(const QString &civilSidc)
   * Some convience functions ...
   * @{
   */
-ADVANCED_SYMBOLOGY_EXPORT QString encodeBaseSymbolCode(SymbologyType symbologyType, const QStringRef &baseSymboCodeSidc);
-ADVANCED_SYMBOLOGY_EXPORT QString encodeComplete(SymbologyType symbologyType, const QStringRef &completeSidc);
-ADVANCED_SYMBOLOGY_EXPORT QString encodeCivilEts(const QStringRef &civilSidc);
-ADVANCED_SYMBOLOGY_EXPORT QString encodeCivilXml(const QStringRef &civilSidc);
+ADVANCED_SYMBOLOGY_EXPORT QString encodeBaseSymbolCode(SymbologyType symbologyType, const QStringView &baseSymboCodeSidc);
+ADVANCED_SYMBOLOGY_EXPORT QString encodeComplete(SymbologyType symbologyType, const QStringView &completeSidc);
+ADVANCED_SYMBOLOGY_EXPORT QString encodeCivilEts(const QStringView &civilSidc);
+ADVANCED_SYMBOLOGY_EXPORT QString encodeCivilXml(const QStringView &civilSidc);
 
 ADVANCED_SYMBOLOGY_EXPORT QString encodeBaseSymbolCode(SymbologyType symbologyType, const std::string &baseSymboCodeSidc);
 ADVANCED_SYMBOLOGY_EXPORT QString encodeComplete(SymbologyType symbologyType, const std::string &completeSidc);

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_properties.cpp

@@ -15,7 +15,7 @@
 
 
 // Qt
-#include <QStringRef>
+#include <QStringView>
 
 
 namespace AdvancedSymbology
@@ -117,20 +117,20 @@ void SymbolProperties::setOriginalKey(const QString &originalKey)
 
 QString SymbolProperties::key_SymbolSet() const
 {
-  if (m_key.count() < 8)
+  if (m_key.size() < 8)
     return QString();
-  return QStringRef(&m_key, 0, 2).toString();
+  return QStringView(m_key).slice(0, 2).toString();
 }
 QString SymbolProperties::key_Entity() const
 {
-  if (m_key.count() < 8)
+  if (m_key.size() < 8)
     return QString();
-  return QStringRef(&m_key, 2, 6).toString();
+  return QStringView(m_key).slice(2, 6).toString();
 }
 
 QString SymbolProperties::key_SymbolSetEntity() const
 {
-  if (m_key.count() < 8)
+  if (m_key.size() < 8)
     return QString();
 
   return key_SymbolSet() + key_Entity();