[FeatureBranch] Tinyxml2 cleanup

DeserializerApi.cpp

@@ -1,5 +1,4 @@
 #include "DeserializerApi.h"
-#include "Settings.h"
 
 #include <algorithm>
 #include <tinyxml2.h>
@@ -17,33 +16,33 @@ qualisys_cpp_sdk::DeserializerApi::DeserializerApi(const char* data)
     mPtr = mDocument->RootElement();
 }
 
-qualisys_cpp_sdk::DeserializerApi qualisys_cpp_sdk::DeserializerApi::FirstChildElement(const char* elementName) const
+qualisys_cpp_sdk::DeserializerApi qualisys_cpp_sdk::DeserializerApi::FindChild(const char* elementName) const
 {
     return {mDocument, mPtr->FirstChildElement(elementName)};
 }
 
-qualisys_cpp_sdk::DeserializerApi qualisys_cpp_sdk::DeserializerApi::NextSiblingElement(const char* elementName) const
+qualisys_cpp_sdk::DeserializerApi qualisys_cpp_sdk::DeserializerApi::FindNextSibling(const char* elementName) const
 {
     return {mDocument, mPtr->NextSiblingElement(elementName)};
 }
 
-double qualisys_cpp_sdk::DeserializerApi::DoubleAttribute(const char* attributeName, double defaultValue) const
+double qualisys_cpp_sdk::DeserializerApi::ReadAttributeDouble(const char* attributeName, double defaultValue) const
 {
     return mPtr->DoubleAttribute(attributeName, defaultValue);
 }
 
-std::uint32_t qualisys_cpp_sdk::DeserializerApi::UnsignedAttribute(const char* attributeName,
+std::uint32_t qualisys_cpp_sdk::DeserializerApi::ReadAttributeUnsignedInt(const char* attributeName,
                                                                 std::uint32_t defaultValue) const
 {
     return mPtr->UnsignedAttribute(attributeName, defaultValue);
 }
 
-std::int32_t qualisys_cpp_sdk::DeserializerApi::IntAttribute(const char* attributeName, std::int32_t defaultValue) const
+std::int32_t qualisys_cpp_sdk::DeserializerApi::ReadAttributeInt(const char* attributeName, std::int32_t defaultValue) const
 {
     return mPtr->IntAttribute(attributeName, defaultValue);
 }
 
-bool qualisys_cpp_sdk::DeserializerApi::BoolAttribute(const char* attributeName, bool defaultValue) const
+bool qualisys_cpp_sdk::DeserializerApi::ReadAttributeBool(const char* attributeName, bool defaultValue) const
 {
     return mPtr->BoolAttribute(attributeName, defaultValue);
 }
@@ -63,22 +62,22 @@ qualisys_cpp_sdk::DeserializerApi::operator bool() const
     return mPtr != nullptr;
 }
 
-int qualisys_cpp_sdk::DeserializerApi::IntText(std::int32_t defaultValue) const
+int qualisys_cpp_sdk::DeserializerApi::ReadInt(std::int32_t defaultValue) const
 {
     return mPtr->IntText(defaultValue);
 }
 
-unsigned int qualisys_cpp_sdk::DeserializerApi::UnsignedText(std::int32_t defaultValue) const
+unsigned int qualisys_cpp_sdk::DeserializerApi::ReadUnsignedInt(std::int32_t defaultValue) const
 {
     return mPtr->UnsignedText(defaultValue);
 }
 
-float qualisys_cpp_sdk::DeserializerApi::FloatText(float defaultValue) const
+float qualisys_cpp_sdk::DeserializerApi::ReadFloat(float defaultValue) const
 {
     return mPtr->FloatText(defaultValue);
 }
 
-std::string qualisys_cpp_sdk::DeserializerApi::Attribute(const char* name) const
+std::string qualisys_cpp_sdk::DeserializerApi::ReadAttributeString(const char* name) const
 {
     if (auto charPtr = mPtr->Attribute(name))
     {
@@ -88,12 +87,12 @@ std::string qualisys_cpp_sdk::DeserializerApi::Attribute(const char* name) const
     return {};
 }
 
-float qualisys_cpp_sdk::DeserializerApi::FloatAttribute(const char* name, float defaultValue) const
+float qualisys_cpp_sdk::DeserializerApi::ReadAttributeFloat(const char* name, float defaultValue) const
 {
     return mPtr->FloatAttribute(name, defaultValue);
 }
 
-std::string qualisys_cpp_sdk::DeserializerApi::GetText() const
+std::string qualisys_cpp_sdk::DeserializerApi::ReadString() const
 {
     if (auto charPtr = mPtr->GetText())
     {
@@ -106,41 +105,36 @@ std::string qualisys_cpp_sdk::DeserializerApi::GetText() const
 /// <summary>
 /// ChildElementRange
 /// </summary>
-qualisys_cpp_sdk::ChildElementRange::ChildElementRange(DeserializerApi& parent, const char* elementName) : parent(parent),
-    elementNameGenerator([elementName](auto& buff, std::size_t, std::size_t) { return elementName; })
+qualisys_cpp_sdk::ChildElementRange::ChildElementRange(DeserializerApi& parent, const char* elementName)
+    : mParent(parent), mElementName(elementName)
 {
 }
 
-qualisys_cpp_sdk::ChildElementRange::ChildElementRange(DeserializerApi& parent, TElementNameGenerator generator) :
-    parent(parent), elementNameGenerator(std::move(generator))
+qualisys_cpp_sdk::ChildElementRange::Iterator::Iterator(const ChildElementRange& range) : mCurrent(nullptr),
+    mChildElementRange(range)
 {
 }
 
-qualisys_cpp_sdk::ChildElementRange::Iterator::Iterator(const ChildElementRange& range) : buffer{}, current(nullptr),
-    range(range), index(std::numeric_limits<std::size_t>::max())
+qualisys_cpp_sdk::ChildElementRange::Iterator::Iterator(const ChildElementRange& range, std::size_t index)
+    : mCurrent(nullptr), mChildElementRange(range)
 {
-}
-
-qualisys_cpp_sdk::ChildElementRange::Iterator::Iterator(const ChildElementRange& range, std::size_t index) :
-    buffer{}, current(nullptr), range(range), index(index)
-{
-    current = range.parent.FirstChildElement(range.elementNameGenerator(buffer, buffSize, index++));
+    mCurrent = range.mParent.FindChild(mChildElementRange.mElementName);
 }
 
 qualisys_cpp_sdk::DeserializerApi qualisys_cpp_sdk::ChildElementRange::Iterator::operator*() const
 {
-    return current;
+    return mCurrent;
 }
 
 qualisys_cpp_sdk::ChildElementRange::Iterator& qualisys_cpp_sdk::ChildElementRange::Iterator::operator++()
 {
-    current = current.NextSiblingElement(range.elementNameGenerator(buffer, buffSize, index++));
+    mCurrent = mCurrent.FindNextSibling(mChildElementRange.mElementName);
     return *this;
 }
 
 bool qualisys_cpp_sdk::ChildElementRange::Iterator::operator!=(const Iterator& other) const
 {
-    return current != other.current;
+    return mCurrent != other.mCurrent;
 }
 
 qualisys_cpp_sdk::ChildElementRange::Iterator qualisys_cpp_sdk::ChildElementRange::begin() const
@@ -153,55 +147,42 @@ qualisys_cpp_sdk::ChildElementRange::Iterator qualisys_cpp_sdk::ChildElementRang
     return Iterator(*this);
 }
 
-
-/// <summary>
-/// Helper functions
-/// </summary>
-std::string qualisys_cpp_sdk::ToLowerXmlString(std::string str)
-{
-    std::transform(str.begin(), str.end(), str.begin(), [](unsigned char c)
-    {
-        return static_cast<unsigned char>(std::tolower(c));
-    });
-    return str;
-}
-
-bool qualisys_cpp_sdk::TryReadElementDouble(DeserializerApi& element, const char* elementName, double& output)
+bool qualisys_cpp_sdk::DeserializerApi::TryReadElementDouble(const char* elementName, double& output) const
 {
-    if (auto childElem = element.FirstChildElement(elementName))
+    if (auto childElem = FindChild(elementName))
     {
         return childElem.mPtr->QueryDoubleText(&output) == tinyxml2::XML_SUCCESS;
     }
 
     return false;
 }
 
-bool qualisys_cpp_sdk::TryReadElementFloat(DeserializerApi& element, const char* elementName, float& output)
+bool qualisys_cpp_sdk::DeserializerApi::TryReadElementFloat(const char* elementName, float& output) const
 {
-    if (auto childElem = element.FirstChildElement(elementName))
+    if (auto childElem = FindChild(elementName))
     {
         return childElem.mPtr->QueryFloatText(&output) == tinyxml2::XML_SUCCESS;
     }
 
     return false;
 }
 
-bool qualisys_cpp_sdk::TryReadElementUnsignedInt32(DeserializerApi& element, const char* elementName,
-                                                   std::uint32_t& output)
+bool qualisys_cpp_sdk::DeserializerApi::TryReadElementUnsignedInt32(const char* elementName,
+                                                   std::uint32_t& output) const
 {
-    if (auto childElem = element.FirstChildElement(elementName))
+    if (auto childElem = FindChild(elementName))
     {
         return childElem.mPtr->QueryUnsignedText(&output) == tinyxml2::XML_SUCCESS;
     }
 
     return false;
 }
 
-bool qualisys_cpp_sdk::TryReadElementString(DeserializerApi& element, const char* elementName, std::string& output)
+bool qualisys_cpp_sdk::DeserializerApi::TryReadElementString(const char* elementName, std::string& output) const
 {
     output.clear();
 
-    if (auto childElem = element.FirstChildElement(elementName))
+    if (auto childElem = FindChild(elementName))
     {
         if (auto charPtr = childElem.mPtr->GetText())
         {
@@ -228,9 +209,9 @@ namespace
     }
 }
 
-bool qualisys_cpp_sdk::ReadXmlBool(DeserializerApi xml, const std::string& element, bool& value)
+bool qualisys_cpp_sdk::DeserializerApi::TryReadElementBool(const std::string& element, bool& value) const
 {
-    auto xmlElem = xml.FirstChildElement(element.c_str());
+    auto xmlElem = FindChild(element.c_str());
     if (!xmlElem)
     {
         return false;
@@ -257,33 +238,15 @@ bool qualisys_cpp_sdk::ReadXmlBool(DeserializerApi xml, const std::string& eleme
     return true;
 }
 
-qualisys_cpp_sdk::SPosition qualisys_cpp_sdk::ReadSPosition(DeserializerApi& parentElem, const std::string& element)
-{
-    auto positionElem = parentElem.FirstChildElement(element.data());
-    if (positionElem)
-    {
-        return {
-            positionElem.DoubleAttribute("X"),
-            positionElem.DoubleAttribute("Y"),
-            positionElem.DoubleAttribute("Z"),
-        };
-    }
-
-    return {};
-}
-
-qualisys_cpp_sdk::SRotation qualisys_cpp_sdk::ReadSRotation(DeserializerApi& parentElem, const std::string& element)
+/// <summary>
+/// Helper functions
+/// </summary>
+/// names
+std::string qualisys_cpp_sdk::ToLowerXmlString(std::string& str)
 {
-    auto rotationElem = parentElem.FirstChildElement(element.data());
-    if (rotationElem)
-    {
-        return {
-            rotationElem.DoubleAttribute("X"),
-            rotationElem.DoubleAttribute("Y"),
-            rotationElem.DoubleAttribute("Z"),
-            rotationElem.DoubleAttribute("W")
-        };
-    }
-
-    return {};
+    std::transform(str.begin(), str.end(), str.begin(), [](unsigned char c)
+        {
+            return static_cast<unsigned char>(std::tolower(c));
+        });
+    return str;
 }

DeserializerApi.h

@@ -12,9 +12,6 @@ namespace tinyxml2
 
 namespace qualisys_cpp_sdk
 {
-    struct SPosition;
-    struct SRotation;
-
     struct DeserializerApi
     {
     private:
@@ -24,45 +21,46 @@ namespace qualisys_cpp_sdk
     public:
         tinyxml2::XMLElement* mPtr;
         DeserializerApi(const char* data);
-        DeserializerApi FirstChildElement(const char* elementName) const;
-        DeserializerApi NextSiblingElement(const char* elementName) const;
-        double DoubleAttribute(const char* attributeName, double defaultValue = 0) const;
-        std::uint32_t UnsignedAttribute(const char* attributeName, std::uint32_t defaultValue = 0) const;
-        std::int32_t IntAttribute(const char* attributeName, std::int32_t defaultValue = 0) const;
-        bool BoolAttribute(const char* attributeName, bool defaultValue = 0) const;
+
+        DeserializerApi FindChild(const char* elementName) const;
+        DeserializerApi FindNextSibling(const char* elementName) const;
+
+        bool TryReadElementDouble(const char* elementName, double& output)  const;
+        bool TryReadElementFloat(const char* elementName, float& output) const;
+        bool TryReadElementUnsignedInt32(const char* elementName, std::uint32_t& output) const ;
+        bool TryReadElementString(const char* elementName, std::string& output) const;
+        bool TryReadElementBool(const std::string& element, bool& value) const;
+
+        double ReadAttributeDouble(const char* attributeName, double defaultValue = 0) const;
+        std::uint32_t ReadAttributeUnsignedInt(const char* attributeName, std::uint32_t defaultValue = 0) const;
+        std::int32_t ReadAttributeInt(const char* attributeName, std::int32_t defaultValue = 0) const;
+        std::string ReadAttributeString(const char* name) const;
+        float ReadAttributeFloat(const char* name, float defaultValue = .0f) const;
+        bool ReadAttributeBool(const char* attributeName, bool defaultValue = 0) const;
+
+        std::string ReadString() const;
+        int ReadInt(std::int32_t defaultValue = 0) const;
+        unsigned int ReadUnsignedInt(std::int32_t defaultValue = 0) const;
+        float ReadFloat(float defaultValue = .0f) const;
+
         bool operator==(const DeserializerApi& other) const;
         bool operator!=(const DeserializerApi& other) const;
         explicit operator bool() const;
-        int IntText(std::int32_t defaultValue = 0) const;
-        unsigned int UnsignedText(std::int32_t defaultValue = 0) const;
-        float FloatText(float defaultValue = .0f) const;
-        std::string Attribute(const char* name) const;
-        float FloatAttribute(const char* name, float defaultValue = .0f) const;
-        std::string GetText() const;
     };
 
     struct ChildElementRange
     {
-        static constexpr std::size_t buffSize = 128;
-        using TElementNameGenerator = std::function<const char*(char (&buff)[buffSize], std::size_t bufferSize,
-                                                                std::size_t index)>;
-
     private:
-        DeserializerApi& parent;
-        TElementNameGenerator elementNameGenerator;
-
+        DeserializerApi& mParent;
+        const char* mElementName;
     public:
         ChildElementRange() = delete;
         ChildElementRange(DeserializerApi& parent, const char* elementName);
-        ChildElementRange(DeserializerApi& parent,
-                          TElementNameGenerator generator);
 
         struct Iterator
         {
-            char buffer[buffSize];
-            DeserializerApi current;
-            const ChildElementRange& range;
-            std::size_t index;
+            DeserializerApi mCurrent;
+            const ChildElementRange& mChildElementRange;
             explicit Iterator(const ChildElementRange& range);
             Iterator(const ChildElementRange& range, std::size_t index);
             DeserializerApi operator*() const;
@@ -74,12 +72,5 @@ namespace qualisys_cpp_sdk
         Iterator end() const;
     };
 
-    std::string ToLowerXmlString(std::string str);
-    bool TryReadElementDouble(DeserializerApi& element, const char* elementName, double& output);
-    bool TryReadElementFloat(DeserializerApi& element, const char* elementName, float& output);
-    bool TryReadElementUnsignedInt32(DeserializerApi& element, const char* elementName, std::uint32_t& output);
-    bool TryReadElementString(DeserializerApi& element, const char* elementName, std::string& output);
-    bool ReadXmlBool(DeserializerApi xml, const std::string& element, bool& value);
-    SPosition ReadSPosition(DeserializerApi& parentElem, const std::string& element);
-    SRotation ReadSRotation(DeserializerApi& parentElem, const std::string& element);
+    std::string ToLowerXmlString(std::string& str);
 }

RTProtocol.cpp

@@ -13,6 +13,7 @@
 #include <vector>
 #include <iterator>
 #include <functional>
+#include <cstring>
 
 #include "Network.h"
 #include "SettingsDeserializer.h"
@@ -683,7 +684,9 @@ bool CRTProtocol::GetCapture(const char* pFileName, bool bC3D)
                     }
                     else
                     {
-                        sprintf(mErrorStr, "No packet received. %s.", mErrorStr);
+                        char tmp[sizeof(mErrorStr)];
+                        std::memcpy(tmp, mErrorStr, sizeof(mErrorStr));
+                        (void)snprintf(mErrorStr, sizeof(mErrorStr), "No packet received. %s.", tmp);
                     }
                 }
                 else