Migrates ./Lts/Viewer successfully to Qt6
This commit is contained in:
28 files changed
+250
-129
No files matched your search
@@ -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 &lifierGroup)
|
||||
@@ -208,7 +210,7 @@ void SidcBuilder::setAmplifierGroup(const AmplifierGroup &lifierGroup)
|
||||
|
||||
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:
|
||||
|
||||
Reference in new issue
Block a user