Migrates remaining services and plugins to generated rtiddsgen API
Converts accessor calls to plain member access across the residual service set.
This commit is contained in:
104 files changed
+2424
-2430
No files matched your search
+38
-38
@@ -98,25 +98,25 @@ void PreTests::tryCreate()
|
||||
m_presentationId = -1;
|
||||
PresentationModifyRequest request;
|
||||
|
||||
request.name("Test Presentation");
|
||||
request.description("Description Presentation");
|
||||
request.operatorId(100);
|
||||
request.lastModified(QDateTime(QDate(2017,2,14), QTime(9,34)).toMSecsSinceEpoch());
|
||||
request.name = "Test Presentation";
|
||||
request.description = "Description Presentation";
|
||||
request.operatorId = 100;
|
||||
request.lastModified = QDateTime(QDate(2017,2,14), QTime(9,34)).toMSecsSinceEpoch();
|
||||
|
||||
std::vector<PresentationContent> vectorPc;
|
||||
|
||||
vectorPc.resize(2);
|
||||
vectorPc[0].presentationTopicType("pdf");
|
||||
vectorPc[0].channel("1V");
|
||||
vectorPc[0].duration(30);
|
||||
vectorPc[0].startTime(QDateTime(QDate(2017,2,13), QTime(12,34)).toMSecsSinceEpoch());
|
||||
vectorPc[0].presentationTopicType = "pdf";
|
||||
vectorPc[0].channel = "1V";
|
||||
vectorPc[0].duration = 30;
|
||||
vectorPc[0].startTime = QDateTime(QDate(2017,2,13), QTime(12,34)).toMSecsSinceEpoch();
|
||||
|
||||
vectorPc[1].presentationTopicType("text");
|
||||
vectorPc[1].channel("2V");
|
||||
vectorPc[1].duration(30);
|
||||
vectorPc[1].startTime(QDateTime(QDate(2017,2,14), QTime(9,45)).toMSecsSinceEpoch());
|
||||
vectorPc[1].presentationTopicType = "text";
|
||||
vectorPc[1].channel = "2V";
|
||||
vectorPc[1].duration = 30;
|
||||
vectorPc[1].startTime = QDateTime(QDate(2017,2,14), QTime(9,45)).toMSecsSinceEpoch();
|
||||
|
||||
request.content(vectorPc);
|
||||
request.content = vectorPc;
|
||||
|
||||
if (!m_ftc->presentationModifyRequest(request, this))
|
||||
{
|
||||
@@ -132,24 +132,24 @@ void PreTests::tryModify()
|
||||
{
|
||||
PresentationModifyRequest request;
|
||||
|
||||
request.id(m_presentationId);
|
||||
request.name("Presentation Modify");
|
||||
request.description("Description Presentation Modify");
|
||||
request.operatorId(102);
|
||||
request.lastModified(QDateTime(QDate(2017,2,16), QTime(10,34)).toMSecsSinceEpoch());
|
||||
request.id = m_presentationId;
|
||||
request.name = "Presentation Modify";
|
||||
request.description = "Description Presentation Modify";
|
||||
request.operatorId = 102;
|
||||
request.lastModified = QDateTime(QDate(2017,2,16), QTime(10,34)).toMSecsSinceEpoch();
|
||||
|
||||
std::vector<PresentationContent> &vectorPc = request.content();
|
||||
std::vector<PresentationContent> &vectorPc = request.content;
|
||||
|
||||
vectorPc.resize(2);
|
||||
vectorPc[0].presentationTopicType("pdf");
|
||||
vectorPc[0].channel("1V2");
|
||||
vectorPc[0].duration(60);
|
||||
vectorPc[0].startTime(QDateTime(QDate(2017,2,13), QTime(12,34)).toMSecsSinceEpoch());
|
||||
vectorPc[0].presentationTopicType = "pdf";
|
||||
vectorPc[0].channel = "1V2";
|
||||
vectorPc[0].duration = 60;
|
||||
vectorPc[0].startTime = QDateTime(QDate(2017,2,13), QTime(12,34)).toMSecsSinceEpoch();
|
||||
|
||||
vectorPc[1].presentationTopicType("text");
|
||||
vectorPc[1].channel("2V");
|
||||
vectorPc[1].duration(60);
|
||||
vectorPc[1].startTime(QDateTime(QDate(2017,2,14), QTime(9,45)).toMSecsSinceEpoch());
|
||||
vectorPc[1].presentationTopicType = "text";
|
||||
vectorPc[1].channel = "2V";
|
||||
vectorPc[1].duration = 60;
|
||||
vectorPc[1].startTime = QDateTime(QDate(2017,2,14), QTime(9,45)).toMSecsSinceEpoch();
|
||||
|
||||
INFO_LOG(m_logger) << "trying to send modify request for presentation Id = " << m_presentationId;
|
||||
if (!m_ftc->presentationModifyRequest(request, this))
|
||||
@@ -166,7 +166,7 @@ void PreTests::tryDelete()
|
||||
{
|
||||
PresentationRemoveRequest request;
|
||||
|
||||
request.id(m_presentationId);
|
||||
request.id = m_presentationId;
|
||||
|
||||
INFO_LOG(m_logger) << "trying to send delete request for presentation Id = " << m_presentationId;
|
||||
if (!m_ftc->presentationRemoveRequest(request, this))
|
||||
@@ -181,7 +181,7 @@ void PreTests::tryGetContent()
|
||||
{
|
||||
GetPresentationContentRequest request;
|
||||
|
||||
request.presentationId(m_presentationId);
|
||||
request.presentationId = m_presentationId;
|
||||
INFO_LOG(m_logger) << "trying to send content request for presentation Id = " << m_presentationId;
|
||||
|
||||
if (!m_ftc->getPresentationContentRequest(request, this))
|
||||
@@ -198,10 +198,10 @@ void PreTests::tryChangeStatus()
|
||||
{
|
||||
PresentationChangeStatusRequest request;
|
||||
|
||||
request.id(m_presentationId);
|
||||
request.operatorId(101);
|
||||
request.lastModified(QDateTime::currentMSecsSinceEpoch());
|
||||
request.fileStatus(FileStatus::Deleted);
|
||||
request.id = m_presentationId;
|
||||
request.operatorId = 101;
|
||||
request.lastModified = QDateTime::currentMSecsSinceEpoch();
|
||||
request.fileStatus = FileStatus::Deleted;
|
||||
|
||||
INFO_LOG(m_logger) << "trying to send change status request for presentation Id = " << m_presentationId;
|
||||
if (!m_ftc->presentationChangeStatusRequest(request, this))
|
||||
@@ -310,16 +310,16 @@ void PreTests::onGetPresentationContentReply(const GetPresentationContentReply &
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "END (onGetPresentationContentReply)";
|
||||
|
||||
if (replyObject.errorString().size() > 0)
|
||||
if (replyObject.errorString.size() > 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Got onGetPresentationContentReply error: " << replyObject.errorString();
|
||||
ERROR_LOG(m_logger) << "Got onGetPresentationContentReply error: " << replyObject.errorString;
|
||||
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
|
||||
return;
|
||||
}
|
||||
|
||||
INFO_LOG(m_logger) << "Got reply with id " << replyObject.id()
|
||||
<< " and errorString " << replyObject.errorString()
|
||||
<< " and content size " << replyObject.content().size();
|
||||
INFO_LOG(m_logger) << "Got reply with id " << replyObject.id
|
||||
<< " and errorString " << replyObject.errorString
|
||||
<< " and content size " << replyObject.content.size();
|
||||
|
||||
if(m_testId == 0)
|
||||
QTimer::singleShot(0, this, &PreTests::tryDelete);
|
||||
|
||||
Reference in new issue
Block a user