diff --git a/MessageBasic/componentinfo_access.cpp b/MessageBasic/componentinfo_access.cpp index f68b3e6..829ff5b 100644 --- a/MessageBasic/componentinfo_access.cpp +++ b/MessageBasic/componentinfo_access.cpp @@ -1,21 +1,21 @@ #include "componentinfo_access.h" -std::shared_ptr ComponentDatasQuery::newDefault() const +std::shared_ptr ComponentDatasQuery::newDefault() const { return std::make_shared(); } -std::shared_ptr ComponentDatasQueryResult::newDefault() const +std::shared_ptr ComponentDatasQueryResult::newDefault() const { return std::make_shared(); } -std::shared_ptr ProcedureSignatureQuery::newDefault() const +std::shared_ptr ProcedureSignatureQuery::newDefault() const { return std::make_shared(); } -std::shared_ptr ProcedureSignatureQueryResult::newDefault() const +std::shared_ptr ProcedureSignatureQueryResult::newDefault() const { return std::make_shared< ProcedureSignatureQueryResult>(); } diff --git a/MessageBasic/componentinfo_access.h b/MessageBasic/componentinfo_access.h index 9f01ce6..a34c151 100644 --- a/MessageBasic/componentinfo_access.h +++ b/MessageBasic/componentinfo_access.h @@ -7,7 +7,7 @@ struct MESSAGEBASIC_EXPORT ComponentDatasQuery : public AbstractMessage { ComponentDatasQuery(); - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; }; /// @@ -19,7 +19,7 @@ struct MESSAGEBASIC_EXPORT ComponentDatasQueryResult : public AbstractMessage { ComponentDatasQueryResult(); // 通过 WsMessage 继承 - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; }; @@ -30,7 +30,7 @@ struct MESSAGEBASIC_EXPORT ComponentDatasQueryResult : public AbstractMessage { struct MESSAGEBASIC_EXPORT ProcedureSignatureQuery : public AbstractMessage { ProcedureSignatureQuery(); - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; }; /// @@ -43,7 +43,7 @@ struct MESSAGEBASIC_EXPORT ProcedureSignatureQueryResult : public AbstractMessag ProcedureSignatureQueryResult(); // 通过 WsMessage 继承 - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; }; \ No newline at end of file diff --git a/MessageBasic/entity_operate.cpp b/MessageBasic/entity_operate.cpp index 636baaf..9d9e6ac 100644 --- a/MessageBasic/entity_operate.cpp +++ b/MessageBasic/entity_operate.cpp @@ -1,37 +1,37 @@ #include "entity_operate.h" -std::shared_ptr TypesQuery::newDefault() const +std::shared_ptr TypesQuery::newDefault() const { return std::make_shared(); } -std::shared_ptr TypesQueryResult::newDefault() const +std::shared_ptr TypesQueryResult::newDefault() const { return std::make_shared(); } -std::shared_ptr TempletOperate::newDefault() const +std::shared_ptr TempletOperate::newDefault() const { return std::make_shared(); } -std::shared_ptr EntityOperate::newDefault() const +std::shared_ptr EntityOperate::newDefault() const { return std::make_shared(); } -std::shared_ptr ComponentOperate::newDefault() const +std::shared_ptr ComponentOperate::newDefault() const { return std::make_shared(); } -std::shared_ptr EntityTotalGet::newDefault() const +std::shared_ptr EntityTotalGet::newDefault() const { return std::make_shared(); } -std::shared_ptr EntityTotalList::newDefault() const +std::shared_ptr EntityTotalList::newDefault() const { return std::make_shared(); } diff --git a/MessageBasic/entity_operate.h b/MessageBasic/entity_operate.h index 4e10538..2ba64c7 100644 --- a/MessageBasic/entity_operate.h +++ b/MessageBasic/entity_operate.h @@ -7,7 +7,7 @@ /// struct MESSAGEBASIC_EXPORT TypesQuery : public AbstractMessage { TypesQuery(); - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; }; /// @@ -19,7 +19,7 @@ struct MESSAGEBASIC_EXPORT TypesQueryResult : public AbstractMessage { TypesQueryResult(); // 通过 WsMessage 继承 - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; }; @@ -42,7 +42,7 @@ struct MESSAGEBASIC_EXPORT TempletOperate : public AbstractMessage { TempletOperate(); // 通过 WsMessage 继承 - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; }; @@ -59,7 +59,7 @@ struct MESSAGEBASIC_EXPORT EntityOperate : public AbstractMessage { EntityOperate(); // 通过 WsMessage 继承 - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; }; @@ -74,7 +74,7 @@ struct MESSAGEBASIC_EXPORT ComponentOperate : public AbstractMessage { ComponentOperate(); // 通过 WsMessage 继承 - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; }; @@ -84,7 +84,7 @@ struct MESSAGEBASIC_EXPORT ComponentOperate : public AbstractMessage { /// struct MESSAGEBASIC_EXPORT EntityTotalGet : public AbstractMessage { EntityTotalGet(); - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; }; /// @@ -96,7 +96,7 @@ struct MESSAGEBASIC_EXPORT EntityTotalList : public AbstractMessage { EntityTotalList(); // 通过 WsMessage 继承 - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; }; \ No newline at end of file diff --git a/MessageBasic/messagebasic.cpp b/MessageBasic/messagebasic.cpp index c3d7246..b2b4aa1 100644 --- a/MessageBasic/messagebasic.cpp +++ b/MessageBasic/messagebasic.cpp @@ -17,7 +17,7 @@ DeduceRequest::DeduceRequest() :AbstractMessage(NAME(DeduceRequest)) { } -std::shared_ptr DeduceRequest::newDefault() const +std::shared_ptr DeduceRequest::newDefault() const { return std::make_shared(); } @@ -27,7 +27,7 @@ SyncRequest::SyncRequest() _time_current(0) { } -std::shared_ptr SyncRequest::newDefault() const +std::shared_ptr SyncRequest::newDefault() const { return std::make_shared(); } @@ -49,7 +49,7 @@ RespondDefault::RespondDefault() _time_consume(0) { } -std::shared_ptr RespondDefault::newDefault() const +std::shared_ptr RespondDefault::newDefault() const { return std::make_shared(); } @@ -409,7 +409,7 @@ EntityInitialRequest::EntityInitialRequest() :AbstractMessage(NAME(EntityInitialRequest)) { } -std::shared_ptr EntityInitialRequest::newDefault() const +std::shared_ptr EntityInitialRequest::newDefault() const { return std::make_shared(); } @@ -418,7 +418,7 @@ EntityPreparedRequest::EntityPreparedRequest() :AbstractMessage(NAME(EntityPreparedRequest)) { } -std::shared_ptr EntityPreparedRequest::newDefault() const +std::shared_ptr EntityPreparedRequest::newDefault() const { return std::make_shared(); } diff --git a/MessageBasic/messagebasic.h b/MessageBasic/messagebasic.h index 4c9df50..a63abd1 100644 --- a/MessageBasic/messagebasic.h +++ b/MessageBasic/messagebasic.h @@ -48,7 +48,7 @@ struct MESSAGEBASIC_EXPORT SyncRequest : public AbstractMessage { SyncRequest(); // 通过 WsMessage 继承 - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; }; @@ -58,7 +58,7 @@ struct MESSAGEBASIC_EXPORT SyncRequest : public AbstractMessage { /// struct MESSAGEBASIC_EXPORT DeduceRequest : public AbstractMessage { DeduceRequest(); - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; }; /// @@ -72,7 +72,7 @@ struct MESSAGEBASIC_EXPORT RespondDefault : public AbstractMessage { RespondDefault(); // 通过 WsMessage 继承 - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; }; @@ -82,7 +82,7 @@ struct MESSAGEBASIC_EXPORT RespondDefault : public AbstractMessage { /// struct MESSAGEBASIC_EXPORT EntityInitialRequest : public AbstractMessage { EntityInitialRequest(); - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; }; /// @@ -90,5 +90,5 @@ struct MESSAGEBASIC_EXPORT EntityInitialRequest : public AbstractMessage { /// struct MESSAGEBASIC_EXPORT EntityPreparedRequest : public AbstractMessage{ EntityPreparedRequest(); - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; }; \ No newline at end of file diff --git a/MessageBasic/motion_access.cpp b/MessageBasic/motion_access.cpp index 5cea00c..4867db9 100644 --- a/MessageBasic/motion_access.cpp +++ b/MessageBasic/motion_access.cpp @@ -24,7 +24,7 @@ void NavigateWithRoute::saveTo(QJsonObject& obj) const UINT64_SAVE(_drive_mode); } -std::shared_ptr NavigateWithRoute::newDefault() const +std::shared_ptr NavigateWithRoute::newDefault() const { return std::make_shared(); } @@ -36,7 +36,7 @@ MotionSequencePreviewGet::MotionSequencePreviewGet() } -std::shared_ptr MotionSequencePreviewGet::newDefault() const +std::shared_ptr MotionSequencePreviewGet::newDefault() const { return std::make_shared(); } @@ -47,7 +47,7 @@ PlatformMotionSequence::PlatformMotionSequence() } -std::shared_ptr PlatformMotionSequence::newDefault() const +std::shared_ptr PlatformMotionSequence::newDefault() const { return std::shared_ptr(); } @@ -98,7 +98,7 @@ QVector3D StrightLineMotion::speedAtTimeSpan(double time) const return QVector3D(0, vspeed, 0); } -std::shared_ptr StrightLineMotion::newDefault() const +std::shared_ptr StrightLineMotion::newDefault() const { return std::make_shared(); } @@ -155,7 +155,7 @@ QVector3D HorizontalArcMotion::speedAtTimeSpan(double time) const return speed_nv.normalized() * _speed_motion; } -std::shared_ptr HorizontalArcMotion::newDefault() const +std::shared_ptr HorizontalArcMotion::newDefault() const { return std::make_shared(); } @@ -224,7 +224,7 @@ QVector3D VerticalArcMotion::speedAtTimeSpan(double time) const return speed_nv.normalized() * _speed_motion; } -std::shared_ptr VerticalArcMotion::newDefault() const +std::shared_ptr VerticalArcMotion::newDefault() const { return std::make_shared(); } @@ -259,7 +259,7 @@ MotionDeduceRequest::MotionDeduceRequest() : AbstractMessage(NAME(MotionDeduceRequest)) { } -std::shared_ptr MotionDeduceRequest::newDefault() const +std::shared_ptr MotionDeduceRequest::newDefault() const { return std::make_shared(); } diff --git a/MessageBasic/motion_access.h b/MessageBasic/motion_access.h index 0b7e687..4ee57d6 100644 --- a/MessageBasic/motion_access.h +++ b/MessageBasic/motion_access.h @@ -19,7 +19,7 @@ struct MESSAGEBASIC_EXPORT NavigateWithRoute : public AbstractMessage { NavigateWithRoute(); // Serializable - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; }; @@ -62,7 +62,7 @@ struct MESSAGEBASIC_EXPORT MotionDeduceRequest : public AbstractMessage { MotionDeduceRequest(); // Serializable - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; }; @@ -72,7 +72,7 @@ struct MESSAGEBASIC_EXPORT MotionDeduceRequest : public AbstractMessage { /// struct MESSAGEBASIC_EXPORT MotionSequencePreviewGet : public AbstractMessage { MotionSequencePreviewGet(); - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; }; /// @@ -84,7 +84,7 @@ struct MESSAGEBASIC_EXPORT PlatformMotionSequence : public AbstractMessage { PlatformMotionSequence(); // Serializable - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; }; @@ -120,7 +120,7 @@ struct MESSAGEBASIC_EXPORT StrightLineMotion : public PlatformMotionCommand { QVector3D posAtTimeSpan(double time) const override; QVector3D speedAtTimeSpan(double time) const override; - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; }; @@ -154,7 +154,7 @@ struct MESSAGEBASIC_EXPORT HorizontalArcMotion : public PlatformMotionCommand { QVector3D posAtTimeSpan(double time) const override; QVector3D speedAtTimeSpan(double time) const override; - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; }; @@ -187,7 +187,7 @@ struct MESSAGEBASIC_EXPORT VerticalArcMotion : public PlatformMotionCommand { QVector3D posAtTimeSpan(double time) const override; QVector3D speedAtTimeSpan(double time) const override; - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; }; \ No newline at end of file diff --git a/MessageBasic/route_access.cpp b/MessageBasic/route_access.cpp index 91928c7..b9de4cb 100644 --- a/MessageBasic/route_access.cpp +++ b/MessageBasic/route_access.cpp @@ -4,7 +4,7 @@ PlainRouteReset::PlainRouteReset() :AbstractMessage(NAME(PlainRouteReset)) { } -std::shared_ptr PlainRouteReset::newDefault() const +std::shared_ptr PlainRouteReset::newDefault() const { return std::make_shared(); } @@ -42,7 +42,7 @@ NewPlainRoute::NewPlainRoute() :AbstractMessage(NAME(NewPlainRoute)) { } -std::shared_ptr NewPlainRoute::newDefault() const +std::shared_ptr NewPlainRoute::newDefault() const { return std::make_shared(); } @@ -65,7 +65,7 @@ RemovePlainRoute::RemovePlainRoute() } -std::shared_ptr RemovePlainRoute::newDefault() const +std::shared_ptr RemovePlainRoute::newDefault() const { return std::make_shared(); } @@ -88,7 +88,7 @@ PlainRouteQuery::PlainRouteQuery() } -std::shared_ptr PlainRouteQuery::newDefault() const +std::shared_ptr PlainRouteQuery::newDefault() const { return std::make_shared(); } @@ -111,7 +111,7 @@ PlainRouteInfo::PlainRouteInfo() } -std::shared_ptr PlainRouteInfo::newDefault() const +std::shared_ptr PlainRouteInfo::newDefault() const { return std::make_shared(); } diff --git a/MessageBasic/route_access.h b/MessageBasic/route_access.h index 520a456..04b6ed3 100644 --- a/MessageBasic/route_access.h +++ b/MessageBasic/route_access.h @@ -11,7 +11,7 @@ struct MESSAGEBASIC_EXPORT NewPlainRoute : public AbstractMessage { NewPlainRoute(); // Serializable - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; }; @@ -25,7 +25,7 @@ struct MESSAGEBASIC_EXPORT RemovePlainRoute : public AbstractMessage { RemovePlainRoute(); // Serializable - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; }; @@ -40,7 +40,7 @@ struct MESSAGEBASIC_EXPORT PlainRouteReset : public AbstractMessage { PlainRouteReset(); // Serializable - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; }; @@ -54,7 +54,7 @@ struct MESSAGEBASIC_EXPORT PlainRouteQuery : public AbstractMessage { PlainRouteQuery(); // Serializable - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; }; @@ -69,7 +69,7 @@ struct MESSAGEBASIC_EXPORT PlainRouteInfo : public RespondDefault { PlainRouteInfo(); // Serializable - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; }; \ No newline at end of file diff --git a/MessageBasic/visiblecube_access.cpp b/MessageBasic/visiblecube_access.cpp index 7f4973c..d085e52 100644 --- a/MessageBasic/visiblecube_access.cpp +++ b/MessageBasic/visiblecube_access.cpp @@ -2,27 +2,27 @@ -std::shared_ptr Get3DBox::newDefault() const +std::shared_ptr Get3DBox::newDefault() const { return std::make_shared(); } -std::shared_ptr Box3DDesc::newDefault() const +std::shared_ptr Box3DDesc::newDefault() const { return std::make_shared(); } -std::shared_ptr Set3DBoxD3Data::newDefault() const +std::shared_ptr Set3DBoxD3Data::newDefault() const { return std::make_shared(); } -std::shared_ptr Set3DBoxPosture::newDefault() const +std::shared_ptr Set3DBoxPosture::newDefault() const { return std::make_shared(); } -std::shared_ptr Set3DBoxLLAPos::newDefault() const +std::shared_ptr Set3DBoxLLAPos::newDefault() const { return std::make_shared(); } diff --git a/MessageBasic/visiblecube_access.h b/MessageBasic/visiblecube_access.h index 652bb99..5d45240 100644 --- a/MessageBasic/visiblecube_access.h +++ b/MessageBasic/visiblecube_access.h @@ -9,7 +9,7 @@ /// struct MESSAGEBASIC_EXPORT Get3DBox : public AbstractMessage { Get3DBox(); - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; }; /// @@ -40,7 +40,7 @@ struct MESSAGEBASIC_EXPORT Box3DDesc : public AbstractMessage { Box3DDesc(); // 通过 WsMessage 继承 - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; }; @@ -54,7 +54,7 @@ struct MESSAGEBASIC_EXPORT Set3DBoxD3Data : public AbstractMessage { Set3DBoxD3Data(); // 通过 WsMessage 继承 - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; }; @@ -69,7 +69,7 @@ struct MESSAGEBASIC_EXPORT Set3DBoxPosture : public AbstractMessage Set3DBoxPosture(); // 通过 WsMessage 继承 - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; }; @@ -84,7 +84,7 @@ struct MESSAGEBASIC_EXPORT Set3DBoxLLAPos : public AbstractMessage Set3DBoxLLAPos(); // 通过 WsMessage 继承 - std::shared_ptr newDefault() const override; + std::shared_ptr newDefault() const override; void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; };