From c2156d87242ea14a7b570239220f46e2b19960da Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sat, 6 Feb 2016 02:10:55 +0000 Subject: Remove no longer need model part pointer constructors --- slicer/slicer/modelPartsTypes.h | 14 ---------- slicer/slicer/modelPartsTypes.impl.h | 51 ------------------------------------ 2 files changed, 65 deletions(-) diff --git a/slicer/slicer/modelPartsTypes.h b/slicer/slicer/modelPartsTypes.h index 545f4cb..dad6215 100644 --- a/slicer/slicer/modelPartsTypes.h +++ b/slicer/slicer/modelPartsTypes.h @@ -21,8 +21,6 @@ namespace Slicer { ModelPartForSimple(T & h); - ModelPartForSimple(T * h); - virtual void SetValue(ValueSourcePtr s) override; virtual void GetValue(ValueTargetPtr s) override; @@ -47,7 +45,6 @@ namespace Slicer { ModelPartForConverted(T & h); - ModelPartForConverted(T * h); virtual void SetValue(ValueSourcePtr s) override; virtual void GetValue(ValueTargetPtr s) override; @@ -59,7 +56,6 @@ namespace Slicer { class ModelPartForOptional : public ModelPart { public: ModelPartForOptional(IceUtil::Optional< typename T::element_type > & h); - ModelPartForOptional(IceUtil::Optional< typename T::element_type > * h); virtual void OnEachChild(const ChildHandler & ch) override; virtual void Complete() override; virtual void Create() override; @@ -151,8 +147,6 @@ namespace Slicer { ModelPartForClass(T & h); - ModelPartForClass(T * h); - virtual void Create() override; typename T::element_type * GetModel() override; @@ -177,8 +171,6 @@ namespace Slicer { ModelPartForStruct(T & o); - ModelPartForStruct(T * o); - T * GetModel() override; virtual bool HasValue() const override; @@ -205,8 +197,6 @@ namespace Slicer { ModelPartForEnum(T & s); - ModelPartForEnum(T * s); - virtual const Metadata & GetMetadata() const override; virtual void SetValue(ValueSourcePtr s) override; @@ -233,8 +223,6 @@ namespace Slicer { ModelPartForSequence(T & s); - ModelPartForSequence(T * s); - virtual void OnEachChild(const ChildHandler & ch) override; ChildRefPtr GetAnonChildRef(const HookFilter &) override; @@ -278,8 +266,6 @@ namespace Slicer { ModelPartForDictionary(T & d); - ModelPartForDictionary(T * d); - virtual void OnEachChild(const ChildHandler & ch) override; ChildRefPtr GetAnonChildRef(const HookFilter &) override; diff --git a/slicer/slicer/modelPartsTypes.impl.h b/slicer/slicer/modelPartsTypes.impl.h index 71b6608..7f91508 100644 --- a/slicer/slicer/modelPartsTypes.impl.h +++ b/slicer/slicer/modelPartsTypes.impl.h @@ -66,12 +66,6 @@ namespace Slicer { { } - template - ModelPartForSimple::ModelPartForSimple(T * h) : - Member(*h) - { - } - template void ModelPartForSimple::SetValue(ValueSourcePtr s) { @@ -91,12 +85,6 @@ namespace Slicer { { } - template - ModelPartForConverted::ModelPartForConverted(T * h) : - Member(*h) - { - } - // ModelPartForOptional template ModelPartForOptional::ModelPartForOptional(IceUtil::Optional< typename T::element_type > & h) : @@ -107,15 +95,6 @@ namespace Slicer { } } - template - ModelPartForOptional::ModelPartForOptional(IceUtil::Optional< typename T::element_type > * h) : - OptionalMember(*h) - { - if (OptionalMember) { - modelPart = new T(*OptionalMember); - } - } - template void ModelPartForOptional::OnEachChild(const ChildHandler & ch) { @@ -247,12 +226,6 @@ namespace Slicer { { } - template - ModelPartForClass::ModelPartForClass(T * h) : - ModelObject(*h) - { - } - template void ModelPartForClass::Create() { @@ -294,12 +267,6 @@ namespace Slicer { { } - template - ModelPartForStruct::ModelPartForStruct(T * o) : - ModelObject(*o) - { - } - template T * ModelPartForStruct::GetModel() { @@ -319,12 +286,6 @@ namespace Slicer { { } - template - ModelPartForEnum::ModelPartForEnum(T * s) : - modelPart(s) - { - } - template const Metadata & ModelPartForEnum::GetMetadata() const { @@ -338,12 +299,6 @@ namespace Slicer { { } - template - ModelPartForSequence::ModelPartForSequence(T * s) : - sequence(*s) - { - } - template void ModelPartForSequence::OnEachChild(const ChildHandler & ch) { @@ -386,12 +341,6 @@ namespace Slicer { { } - template - ModelPartForDictionary::ModelPartForDictionary(T * d) : - dictionary(*d) - { - } - template void ModelPartForDictionary::OnEachChild(const ChildHandler & ch) { -- cgit v1.2.3