diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-04-28 12:19:52 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-04-28 12:19:52 +0200 |
commit | a4ce2b2eda8a2fea4263017e6868c327f22f5e47 (patch) | |
tree | 448b51e6107c0e377f3a92103bf060d128496c35 /common/domainadaptor.h | |
parent | 6b8432a5c0647d8fbe3cda549574ae13e07bb2f4 (diff) | |
download | sink-a4ce2b2eda8a2fea4263017e6868c327f22f5e47.tar.gz sink-a4ce2b2eda8a2fea4263017e6868c327f22f5e47.zip |
Removed the template argument from the write property mapper
Diffstat (limited to 'common/domainadaptor.h')
-rw-r--r-- | common/domainadaptor.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/common/domainadaptor.h b/common/domainadaptor.h index 9182001..2a7924a 100644 --- a/common/domainadaptor.h +++ b/common/domainadaptor.h | |||
@@ -40,10 +40,10 @@ | |||
40 | */ | 40 | */ |
41 | template <class Builder, class Buffer> | 41 | template <class Builder, class Buffer> |
42 | flatbuffers::Offset<Buffer> | 42 | flatbuffers::Offset<Buffer> |
43 | createBufferPart(const Sink::ApplicationDomain::ApplicationDomainType &domainObject, flatbuffers::FlatBufferBuilder &fbb, const WritePropertyMapper<Builder> &mapper) | 43 | createBufferPart(const Sink::ApplicationDomain::ApplicationDomainType &domainObject, flatbuffers::FlatBufferBuilder &fbb, const WritePropertyMapper &mapper) |
44 | { | 44 | { |
45 | // First create a primitives such as strings using the mappings | 45 | // First create a primitives such as strings using the mappings |
46 | QList<std::function<void(Builder &)>> propertiesToAddToResource; | 46 | QList<std::function<void(void *builder)>> propertiesToAddToResource; |
47 | for (const auto &property : domainObject.changedProperties()) { | 47 | for (const auto &property : domainObject.changedProperties()) { |
48 | // SinkTrace() << "copying property " << property; | 48 | // SinkTrace() << "copying property " << property; |
49 | const auto value = domainObject.getProperty(property); | 49 | const auto value = domainObject.getProperty(property); |
@@ -57,7 +57,7 @@ createBufferPart(const Sink::ApplicationDomain::ApplicationDomainType &domainObj | |||
57 | // Then create all porperties using the above generated builderCalls | 57 | // Then create all porperties using the above generated builderCalls |
58 | Builder builder(fbb); | 58 | Builder builder(fbb); |
59 | for (auto propertyBuilder : propertiesToAddToResource) { | 59 | for (auto propertyBuilder : propertiesToAddToResource) { |
60 | propertyBuilder(builder); | 60 | propertyBuilder(&builder); |
61 | } | 61 | } |
62 | return builder.Finish(); | 62 | return builder.Finish(); |
63 | } | 63 | } |
@@ -68,7 +68,7 @@ createBufferPart(const Sink::ApplicationDomain::ApplicationDomainType &domainObj | |||
68 | * After this the buffer can be extracted from the FlatBufferBuilder object. | 68 | * After this the buffer can be extracted from the FlatBufferBuilder object. |
69 | */ | 69 | */ |
70 | template <typename Buffer, typename BufferBuilder> | 70 | template <typename Buffer, typename BufferBuilder> |
71 | static void createBufferPartBuffer(const Sink::ApplicationDomain::ApplicationDomainType &domainObject, flatbuffers::FlatBufferBuilder &fbb, WritePropertyMapper<BufferBuilder> &mapper) | 71 | static void createBufferPartBuffer(const Sink::ApplicationDomain::ApplicationDomainType &domainObject, flatbuffers::FlatBufferBuilder &fbb, WritePropertyMapper &mapper) |
72 | { | 72 | { |
73 | auto pos = createBufferPart<BufferBuilder, Buffer>(domainObject, fbb, mapper); | 73 | auto pos = createBufferPart<BufferBuilder, Buffer>(domainObject, fbb, mapper); |
74 | // Because we cannot template the following call | 74 | // Because we cannot template the following call |
@@ -178,8 +178,8 @@ public: | |||
178 | DomainTypeAdaptorFactory() | 178 | DomainTypeAdaptorFactory() |
179 | : mLocalMapper(QSharedPointer<ReadPropertyMapper>::create()), | 179 | : mLocalMapper(QSharedPointer<ReadPropertyMapper>::create()), |
180 | mResourceMapper(QSharedPointer<ReadPropertyMapper>::create()), | 180 | mResourceMapper(QSharedPointer<ReadPropertyMapper>::create()), |
181 | mLocalWriteMapper(QSharedPointer<WritePropertyMapper<LocalBuilder>>::create()), | 181 | mLocalWriteMapper(QSharedPointer<WritePropertyMapper>::create()), |
182 | mResourceWriteMapper(QSharedPointer<WritePropertyMapper<ResourceBuilder>>::create()), | 182 | mResourceWriteMapper(QSharedPointer<WritePropertyMapper>::create()), |
183 | mIndexMapper(QSharedPointer<IndexPropertyMapper>::create()) | 183 | mIndexMapper(QSharedPointer<IndexPropertyMapper>::create()) |
184 | { | 184 | { |
185 | Sink::ApplicationDomain::TypeImplementation<DomainType>::configure(*mLocalMapper); | 185 | Sink::ApplicationDomain::TypeImplementation<DomainType>::configure(*mLocalMapper); |
@@ -238,8 +238,8 @@ public: | |||
238 | protected: | 238 | protected: |
239 | QSharedPointer<ReadPropertyMapper> mLocalMapper; | 239 | QSharedPointer<ReadPropertyMapper> mLocalMapper; |
240 | QSharedPointer<ReadPropertyMapper> mResourceMapper; | 240 | QSharedPointer<ReadPropertyMapper> mResourceMapper; |
241 | QSharedPointer<WritePropertyMapper<LocalBuilder>> mLocalWriteMapper; | 241 | QSharedPointer<WritePropertyMapper> mLocalWriteMapper; |
242 | QSharedPointer<WritePropertyMapper<ResourceBuilder>> mResourceWriteMapper; | 242 | QSharedPointer<WritePropertyMapper> mResourceWriteMapper; |
243 | QSharedPointer<IndexPropertyMapper> mIndexMapper; | 243 | QSharedPointer<IndexPropertyMapper> mIndexMapper; |
244 | }; | 244 | }; |
245 | 245 | ||