Migrates residual Lts sources to generated rtiddsgen API
Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
This commit is contained in:
1 parent
5485a90385
commit
881d44f4dd
512 files changed
+6887
-6426
No files matched your search
+4
-4
@@ -115,7 +115,7 @@ Core::FunctionReplyObject ObjectEffectShow::updateObject(const EffectShowManagem
|
||||
m_data.areaDepth = data.areaDepth;
|
||||
m_data.areaWidth = data.areaWidth;
|
||||
m_data.areaRotation = data.areaRotation;
|
||||
m_data.orderConfirmation = data.orderConfirmation;
|
||||
m_data.orderConfirmation = static_cast<qint32>(data.orderConfirmation);
|
||||
m_data.answerText = QString::fromStdString((data.answerText));
|
||||
|
||||
if (!m_mainHandler->db()->update(m_data))
|
||||
@@ -135,7 +135,7 @@ bool ObjectEffectShow::updateObject(const ConvertFromTab::OrderConfirmation_t &d
|
||||
<< "\n orderConfirmation " << m_data.orderConfirmation << " new: " << data.confirmation
|
||||
<< "\n answerText " << m_data.answerText << " new: " << data.answerText;
|
||||
|
||||
m_data.orderConfirmation = data.confirmation;
|
||||
m_data.orderConfirmation = static_cast<qint32>(data.confirmation);
|
||||
m_data.answerText = data.answerText;
|
||||
|
||||
if (!m_mainHandler->db()->update(m_data))
|
||||
@@ -190,7 +190,7 @@ bool ObjectEffectShow::updateObject(const Database::EsmEffectShow &data)
|
||||
//=============================================================================
|
||||
bool ObjectEffectShow::resetOrderConfirmation()
|
||||
{
|
||||
m_data.orderConfirmation = EffectShowManagement::OrderConfirmation_e::WaitingForAcceptance;
|
||||
m_data.orderConfirmation = static_cast<int>(EffectShowManagement::OrderConfirmation_e::WaitingForAcceptance);
|
||||
m_data.answerText.clear();
|
||||
|
||||
if (!m_mainHandler->db()->update(m_data))
|
||||
@@ -282,7 +282,7 @@ void ObjectEffectShow::onPublishData()
|
||||
ddsData.areaRotation = m_data.areaRotation;
|
||||
ddsData.typeOfAmmunition = m_data.typeOfAmmunition;
|
||||
|
||||
ddsData.orderConfirmation = EffectShowManagement::OrderConfirmation_e::inner_enum(m_data.orderConfirmation);
|
||||
ddsData.orderConfirmation = static_cast<EffectShowManagement::OrderConfirmation_e>(m_data.orderConfirmation);
|
||||
ddsData.answerText = m_data.answerText.toStdString();
|
||||
ddsData.isDeleted = false;
|
||||
ddsData.isUsed = false;
|
||||
|
||||
Reference in new issue
Block a user