summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2016-02-06 02:10:55 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2016-02-06 02:10:55 +0000
commitc2156d87242ea14a7b570239220f46e2b19960da (patch)
treeca96f82b3ea0cbd490d0acb5119a31e92a5c8daa
parentRemove the need for ModelPartForDictionaryElement, ModelPartForStruct<Map::va... (diff)
downloadslicer-c2156d87242ea14a7b570239220f46e2b19960da.tar.bz2
slicer-c2156d87242ea14a7b570239220f46e2b19960da.tar.xz
slicer-c2156d87242ea14a7b570239220f46e2b19960da.zip
Remove no longer need model part pointer constructors
-rw-r--r--slicer/slicer/modelPartsTypes.h14
-rw-r--r--slicer/slicer/modelPartsTypes.impl.h51
2 files changed, 0 insertions, 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
@@ -67,12 +67,6 @@ namespace Slicer {
}
template<typename T>
- ModelPartForSimple<T>::ModelPartForSimple(T * h) :
- Member(*h)
- {
- }
-
- template<typename T>
void ModelPartForSimple<T>::SetValue(ValueSourcePtr s)
{
s->set(Member);
@@ -91,12 +85,6 @@ namespace Slicer {
{
}
- template<typename T, typename M, T M::* MV>
- ModelPartForConverted<T, M, MV>::ModelPartForConverted(T * h) :
- Member(*h)
- {
- }
-
// ModelPartForOptional
template<typename T>
ModelPartForOptional<T>::ModelPartForOptional(IceUtil::Optional< typename T::element_type > & h) :
@@ -108,15 +96,6 @@ namespace Slicer {
}
template<typename T>
- ModelPartForOptional<T>::ModelPartForOptional(IceUtil::Optional< typename T::element_type > * h) :
- OptionalMember(*h)
- {
- if (OptionalMember) {
- modelPart = new T(*OptionalMember);
- }
- }
-
- template<typename T>
void ModelPartForOptional<T>::OnEachChild(const ChildHandler & ch)
{
if (OptionalMember) {
@@ -248,12 +227,6 @@ namespace Slicer {
}
template<typename T>
- ModelPartForClass<T>::ModelPartForClass(T * h) :
- ModelObject(*h)
- {
- }
-
- template<typename T>
void ModelPartForClass<T>::Create()
{
ModelObject = new typename T::element_type();
@@ -295,12 +268,6 @@ namespace Slicer {
}
template<typename T>
- ModelPartForStruct<T>::ModelPartForStruct(T * o) :
- ModelObject(*o)
- {
- }
-
- template<typename T>
T * ModelPartForStruct<T>::GetModel()
{
return &ModelObject;
@@ -320,12 +287,6 @@ namespace Slicer {
}
template<typename T>
- ModelPartForEnum<T>::ModelPartForEnum(T * s) :
- modelPart(s)
- {
- }
-
- template<typename T>
const Metadata & ModelPartForEnum<T>::GetMetadata() const
{
return metadata;
@@ -339,12 +300,6 @@ namespace Slicer {
}
template<typename T>
- ModelPartForSequence<T>::ModelPartForSequence(T * s) :
- sequence(*s)
- {
- }
-
- template<typename T>
void ModelPartForSequence<T>::OnEachChild(const ChildHandler & ch)
{
for(auto & element : sequence) {
@@ -387,12 +342,6 @@ namespace Slicer {
}
template<typename T>
- ModelPartForDictionary<T>::ModelPartForDictionary(T * d) :
- dictionary(*d)
- {
- }
-
- template<typename T>
void ModelPartForDictionary<T>::OnEachChild(const ChildHandler & ch)
{
for (auto & pair : dictionary) {