Migrates AreaEffectSimulation to generated rtiddsgen API
Converts accessor calls to plain member access across aes service and plugin.
This commit is contained in:
102 files changed
+3307
-3313
No files matched your search
+12
-12
@@ -14,7 +14,7 @@ namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
HandlerBorderline::HandlerBorderline(MainHandler *mainHandler)
|
||||
: HandlerBaseTmpl<ObjectBorderline>(mainHandler, QStringLiteral("ExplosionArea"), s_areaCount[AesType::AtBorderline], s_areaCountCentral[AesType::AtBorderline])
|
||||
: HandlerBaseTmpl<ObjectBorderline>(mainHandler, QStringLiteral("ExplosionArea"), s_areaCount[static_cast<int>(AesType::AtBorderline)], s_areaCountCentral[static_cast<int>(AesType::AtBorderline)])
|
||||
, Interface::Fts::BorderlineModifyRequestHandler(mainHandler->dds()->fts())
|
||||
, Interface::Fts::BorderlineRemoveRequestHandler(mainHandler->dds()->fts())
|
||||
{
|
||||
@@ -49,7 +49,7 @@ bool HandlerBorderline::init()
|
||||
|
||||
for (const Database::AesBorderline &dbBorderline : qAsConst(borderlineVec))
|
||||
{
|
||||
if (dbBorderline.effectStateId == AesEffectState_def::EsRemoved)
|
||||
if (dbBorderline.effectStateId == AesEffectState::EsRemoved)
|
||||
continue;
|
||||
|
||||
dbBorderlineSegments.clear();
|
||||
@@ -83,7 +83,7 @@ void HandlerBorderline::onBorderlineModifyRequest(const rti::core::SampleIdentit
|
||||
const BorderlineModifyRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onBorderlineModifyRequest: " << request;
|
||||
Core::FunctionReplyObject ret = request.id() > 0 ? borderlineModifyRequest(request) : borderlineCreateRequest(request);
|
||||
Core::FunctionReplyObject ret = request.id > 0 ? borderlineModifyRequest(request) : borderlineCreateRequest(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
m_mainHandler->dds()->fts()->borderlineModifyReply(cookie, ret);
|
||||
@@ -94,14 +94,14 @@ Core::FunctionReplyObject HandlerBorderline::borderlineCreateRequest(const Borde
|
||||
{
|
||||
Database::AesBorderline newData;
|
||||
|
||||
newData.name = QString::fromStdString(request.name());
|
||||
newData.operatorId = request.operatorId() > 0 ? request.operatorId() : QVariant();
|
||||
newData.partyId = request.partyId();
|
||||
newData.name = QString::fromStdString(request.name);
|
||||
newData.operatorId = request.operatorId > 0 ? request.operatorId : QVariant();
|
||||
newData.partyId = request.partyId;
|
||||
|
||||
|
||||
ObjectBorderline *ifs(new ObjectBorderline(m_mainHandler, this));
|
||||
Core::FunctionReplyObject ret = ifs->createObject(newData,
|
||||
request.segments(),
|
||||
request.segments,
|
||||
QVector<Database::AesBorderlineSegment>());
|
||||
if (ret.error())
|
||||
{
|
||||
@@ -117,17 +117,17 @@ Core::FunctionReplyObject HandlerBorderline::borderlineCreateRequest(const Borde
|
||||
Core::FunctionReplyObject HandlerBorderline::borderlineModifyRequest(const BorderlineModifyRequest &request)
|
||||
{
|
||||
Core::FunctionReplyObject ret;
|
||||
ObjectBorderline *ifs = getObjectFromMap(m_objectMap, request.id(), ret);
|
||||
ObjectBorderline *ifs = getObjectFromMap(m_objectMap, request.id, ret);
|
||||
if (!ifs)
|
||||
return ret;
|
||||
|
||||
Database::AesBorderline newData;
|
||||
|
||||
newData.name = QString::fromStdString(request.name());
|
||||
newData.operatorId = request.operatorId() > 0 ? request.operatorId() : QVariant();
|
||||
newData.partyId = request.partyId();
|
||||
newData.name = QString::fromStdString(request.name);
|
||||
newData.operatorId = request.operatorId > 0 ? request.operatorId : QVariant();
|
||||
newData.partyId = request.partyId;
|
||||
|
||||
return ifs->updateObject(newData, request.segments());
|
||||
return ifs->updateObject(newData, request.segments);
|
||||
} // end of onBorderlineModifyRequest()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
|
||||
Reference in new issue
Block a user