Tagged object macro refactor

Author: shnarda

inc/taggedjsonobjectmacros.h

@@ -10,16 +10,16 @@
 #define TAGGEDOBJECTMACRO_DECLARE_MEMBER(type, name) type name;
 #define TAGGEDOBJECTMACRO_DECLARE_MEMBER_UNPACK(pair) TAGGEDOBJECTMACRO_DECLARE_MEMBER pair
 
-#define TAGGEDOBJECTMACRO_INITIALIZE_MEMBER(type, name) name(val.take(#name), checkValues),
+#define TAGGEDOBJECTMACRO_INITIALIZE_MEMBER(type, name) name(val.take(#name), checkValues)
 #define TAGGEDOBJECTMACRO_INITIALIZE_MEMBER_UNPACK(pair) TAGGEDOBJECTMACRO_INITIALIZE_MEMBER pair
 
-#define TAGGEDOBJECTMACRO_INITIALIZE_MEMBER_VALUE(type, name) name(val[#name], checkValues),
+#define TAGGEDOBJECTMACRO_INITIALIZE_MEMBER_VALUE(type, name) name(val[#name], checkValues)
 #define TAGGEDOBJECTMACRO_INITIALIZE_MEMBER_VALUE_UNPACK(pair) TAGGEDOBJECTMACRO_INITIALIZE_MEMBER_VALUE pair
 
-#define TAGGEDOBJECTMACRO_LIST_MEMBERS(type, name) type name,
+#define TAGGEDOBJECTMACRO_LIST_MEMBERS(type, name) type name
 #define TAGGEDOBJECTMACRO_LIST_MEMBERS_UNPACK(pair) TAGGEDOBJECTMACRO_LIST_MEMBERS pair
 
-#define TAGGEDOBJECTMACRO_MOVE_PARAMETERS(type, name) name(std::move(name)),
+#define TAGGEDOBJECTMACRO_MOVE_PARAMETERS(type, name) name(std::move(name))
 #define TAGGEDOBJECTMACRO_MOVE_PARAMETERS_UNPACK(pair) TAGGEDOBJECTMACRO_MOVE_PARAMETERS pair
 
 
@@ -49,14 +49,12 @@ respective JSON data, a runtime error will be raised.
 #define TJO_DEFINE_JSON_TAGGED_OBJECT(CLASS_NAME, ...) \
 class CLASS_NAME{\
 public:\
-    explicit CLASS_NAME(QJsonObject val, const bool checkValues=true) : MAP(TAGGEDOBJECTMACRO_INITIALIZE_MEMBER_UNPACK, __VA_ARGS__) dummyVar(false) {}; \
-    explicit CLASS_NAME(QJsonValue val, const bool checkValues=true) : MAP(TAGGEDOBJECTMACRO_INITIALIZE_MEMBER_VALUE_UNPACK, __VA_ARGS__) dummyVar(false) {}; \
+    explicit CLASS_NAME(QJsonObject val, const bool checkValues=true) : MAP_LIST(TAGGEDOBJECTMACRO_INITIALIZE_MEMBER_UNPACK, __VA_ARGS__) {}; \
+    explicit CLASS_NAME(QJsonValue val, const bool checkValues=true) : MAP_LIST(TAGGEDOBJECTMACRO_INITIALIZE_MEMBER_VALUE_UNPACK, __VA_ARGS__) {}; \
     explicit CLASS_NAME(const QByteArray& json, const bool checkValues=true) : CLASS_NAME(TaggedObject::getJSONObjectFromJSONText(json), checkValues) {};\
     explicit CLASS_NAME(const QString& filePath, const bool checkValues=true) : CLASS_NAME(TaggedObject::getJSONObjectFromFile(filePath), checkValues) {};\
-    explicit CLASS_NAME(MAP(TAGGEDOBJECTMACRO_LIST_MEMBERS_UNPACK, __VA_ARGS__) const bool checkValues=true) : MAP(TAGGEDOBJECTMACRO_MOVE_PARAMETERS_UNPACK, __VA_ARGS__) dummyVar(false) {};\
+    explicit CLASS_NAME(MAP_LIST(TAGGEDOBJECTMACRO_LIST_MEMBERS_UNPACK, __VA_ARGS__), const bool checkValues=true) : MAP_LIST(TAGGEDOBJECTMACRO_MOVE_PARAMETERS_UNPACK, __VA_ARGS__) {};\
     MAP(TAGGEDOBJECTMACRO_DECLARE_MEMBER_UNPACK, __VA_ARGS__)\
-private:\
-    bool dummyVar;\
 };
 
 #endif // TAGGEDJSONOBJECTMACROS_H