X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fhla%2FHLAVariantDataType.hxx;h=043fe25fd96c380fd594ebae945c708bf64e1a6f;hb=a563cfd0f2a5e68ad0eab1a371b141fab4ddd59e;hp=59b4aacdd02b9a43f79833153be3f3e953d04c64;hpb=baf511684119e219906fa37f3e7c7f43151bb435;p=simgear.git

diff --git a/simgear/hla/HLAVariantDataType.hxx b/simgear/hla/HLAVariantDataType.hxx
index 59b4aacd..043fe25f 100644
--- a/simgear/hla/HLAVariantDataType.hxx
+++ b/simgear/hla/HLAVariantDataType.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2009 - 2010  Mathias Froehlich - Mathias.Froehlich@web.de
+// Copyright (C) 2009 - 2012  Mathias Froehlich - Mathias.Froehlich@web.de
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public
@@ -18,84 +18,11 @@
 #ifndef HLAVariantDataType_hxx
 #define HLAVariantDataType_hxx
 
-#include <string>
-#include <vector>
-#include "simgear/structure/SGSharedPtr.hxx"
-#include "HLADataType.hxx"
-#include "HLAEnumeratedDataType.hxx"
+#include "HLAVariantRecordDataType.hxx"
 
 namespace simgear {
 
-class HLAAbstractVariantDataElement;
-
-class HLAVariantDataType : public HLADataType {
-public:
-    HLAVariantDataType(const std::string& name = "HLAVariantDataType");
-    virtual ~HLAVariantDataType();
-
-    virtual void accept(HLADataTypeVisitor& visitor) const;
-
-    virtual const HLAVariantDataType* toVariantDataType() const;
-
-    virtual bool decode(HLADecodeStream& stream, HLAAbstractVariantDataElement& value) const;
-    virtual bool encode(HLAEncodeStream& stream, const HLAAbstractVariantDataElement& value) const;
-
-    const HLAEnumeratedDataType* getEnumeratedDataType() const
-    { return _enumeratedDataType.get(); }
-    void setEnumeratedDataType(HLAEnumeratedDataType* dataType);
-
-    bool addAlternative(const std::string& name, const std::string& enumerator,
-                        const HLADataType* dataType, const std::string& semantics);
-
-    unsigned getNumAlternatives() const
-    { return _alternativeList.size(); }
-
-    unsigned getAlternativeIndex(const std::string& enumerator) const
-    {
-        if (!_enumeratedDataType.valid())
-            return ~unsigned(0);
-        return _enumeratedDataType->getIndex(enumerator);
-    }
-
-    const HLADataType* getAlternativeDataType(unsigned index) const
-    {
-        if (_alternativeList.size() <= index)
-            return 0;
-        return _alternativeList[index]._dataType.get();
-    }
-    const HLADataType* getAlternativeDataType(const std::string& enumerator) const
-    { return getAlternativeDataType(getAlternativeIndex(enumerator)); }
-
-    std::string getAlternativeName(unsigned index) const
-    {
-        if (_alternativeList.size() <= index)
-            return std::string();
-        return _alternativeList[index]._name;
-    }
-    std::string getAlternativeName(const std::string& enumerator) const
-    { return getAlternativeName(getAlternativeIndex(enumerator)); }
-
-    std::string getAlternativeSemantics(unsigned index) const
-    {
-        if (_alternativeList.size() <= index)
-            return std::string();
-        return _alternativeList[index]._semantics;
-    }
-    std::string getAlternativeSemantics(const std::string& enumerator) const
-    { return getAlternativeSemantics(getAlternativeIndex(enumerator)); }
-
-private:
-    SGSharedPtr<HLAEnumeratedDataType> _enumeratedDataType;
-
-    struct Alternative {
-        std::string _name;
-        SGSharedPtr<const HLADataType> _dataType;
-        std::string _semantics;
-    };
-
-    typedef std::vector<Alternative> AlternativeList;
-    AlternativeList _alternativeList;
-};
+typedef HLAVariantRecordDataType HLAVariantDataType;
 
 } // namespace simgear