summaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
Diffstat (limited to 'core/src')
-rw-r--r--core/src/Model/Assets.cpp14
-rw-r--r--core/src/Model/Assets.hpp4
-rw-r--r--core/src/Utils/IO/DataStream.hpp20
-rw-r--r--core/src/Utils/IO/fwd.hpp6
4 files changed, 22 insertions, 22 deletions
diff --git a/core/src/Model/Assets.cpp b/core/src/Model/Assets.cpp
index 1987aa9..ed8009e 100644
--- a/core/src/Model/Assets.cpp
+++ b/core/src/Model/Assets.cpp
@@ -16,16 +16,16 @@
using namespace std::literals::string_view_literals;
namespace fs = std::filesystem;
-template <class TAdapter>
-void SavedAsset::OperateIOAdapter(TAdapter& adapter)
+template <class TProxy>
+void SavedAsset::OperateIOProxy(TProxy& proxy)
{
- adapter.ObjectAdapted(Name, DataStreamAdapters::String{});
- adapter.ObjectAdapted(Uuid, DataStreamAdapters::Uuid{});
- adapter.Value(Payload);
+ proxy.ObjectAdapted(Name, DataStreamAdapters::String{});
+ proxy.ObjectAdapted(Uuid, DataStreamAdapters::Uuid{});
+ proxy.Value(Payload);
}
-template void SavedAsset::OperateIOAdapter(SerializationAdapter& adapter);
-template void SavedAsset::OperateIOAdapter(DeserializationAdapter& adapter);
+template void SavedAsset::OperateIOProxy(SerializationStreamProxy& adapter);
+template void SavedAsset::OperateIOProxy(DeserializationStreamProxy& adapter);
Asset::Asset()
{
diff --git a/core/src/Model/Assets.hpp b/core/src/Model/Assets.hpp
index 850175f..3b38dff 100644
--- a/core/src/Model/Assets.hpp
+++ b/core/src/Model/Assets.hpp
@@ -20,8 +20,8 @@ struct SavedAsset
/// Extra data to be used by the AssetList/Asset implementation.
uint64_t Payload;
- template <class TAdapter>
- void OperateIOAdapter(TAdapter& adapter);
+ template <class TProxy>
+ void OperateIOProxy(TProxy& proxy);
};
class Asset
diff --git a/core/src/Utils/IO/DataStream.hpp b/core/src/Utils/IO/DataStream.hpp
index fb55f42..a88fe07 100644
--- a/core/src/Utils/IO/DataStream.hpp
+++ b/core/src/Utils/IO/DataStream.hpp
@@ -6,7 +6,7 @@
#include <cstdint>
#include <span>
-class SerializationAdapter
+class SerializationStreamProxy
{
public:
static constexpr bool IsSerializer()
@@ -42,7 +42,7 @@ public:
}
};
-class DeserializationAdapter
+class DeserializationStreamProxy
{
public:
static constexpr bool IsSerializer()
@@ -90,8 +90,8 @@ concept HasMember = requires(T t)
template <class T>
concept HasIOAdapterMember = requires(T t)
{
- t.OperateIOAdapter(std::declval<SerializationAdapter>());
- t.OperateIOAdapter(std::declval<DeserializationAdapter>());
+ t.OperateIOProxy(std::declval<SerializationStreamProxy>());
+ t.OperateIOProxy(std::declval<DeserializationStreamProxy>());
};
} // namespace DataStreamTraits
@@ -177,9 +177,9 @@ public:
using namespace DataStreamTraits;
if constexpr (requires(TObject t) { t.ReadFromDataStream(std::declval<DataStream>()); }) {
obj.ReadFromDataStream(*this);
- } else if constexpr (requires(TObject t) { t.OperateIOAdapter(std::declval<DeserializationAdapter>()); }) {
- DeserializationAdapter adapter{ this };
- obj.OperateIOAdapter(adapter);
+ } else if constexpr (requires(TObject t) { t.OperateIOProxy(std::declval<DeserializationStreamProxy>()); }) {
+ DeserializationStreamProxy adapter{ this };
+ obj.OperateIOProxy(adapter);
} else {
static_assert(false && sizeof(TObject), "This type does not have integration with DataStream.");
}
@@ -197,9 +197,9 @@ public:
using namespace DataStreamTraits;
if constexpr (requires(TObject t) { t.WriteToDataStream(std::declval<DataStream>()); }) {
obj.WriteToDataStream(*this);
- } else if constexpr (requires(TObject t) { t.OperateIOAdapter(std::declval<SerializationAdapter>()); }) {
- SerializationAdapter adapter{ this };
- obj.OperateIOAdapter(adapter);
+ } else if constexpr (requires(TObject t) { t.OperateIOProxy(std::declval<SerializationStreamProxy>()); }) {
+ SerializationStreamProxy adapter{ this };
+ obj.OperateIOProxy(adapter);
} else {
static_assert(false && sizeof(TObject), "This type does not have integration with DataStream.");
}
diff --git a/core/src/Utils/IO/fwd.hpp b/core/src/Utils/IO/fwd.hpp
index 755d94f..848c78f 100644
--- a/core/src/Utils/IO/fwd.hpp
+++ b/core/src/Utils/IO/fwd.hpp
@@ -1,6 +1,6 @@
-#pragma onceDeserializationAdapter
+#pragma once
// DataStream.hpp
-class SerializationAdapter;
-class DeserializationAdapter;
+class SerializationStreamProxy;
+class DeserializationStreamProxy;
class DataStream;