diff --git a/lib/include/DOtherSide/DOtherSide.h b/lib/include/DOtherSide/DOtherSide.h index 34898c3..f0b9c9a 100644 --- a/lib/include/DOtherSide/DOtherSide.h +++ b/lib/include/DOtherSide/DOtherSide.h @@ -87,11 +87,11 @@ DOS_API void dos_qvariant_delete(void* vptr); DOS_API void dos_qvariant_assign(void* vptr, void* other); // QObjectFactory -DOS_API void dos_qmetaobjectfactory_create(void** vptr, - SignalDefinitions signalDefinitions, - SlotDefinitions slotDefinitions, - PropertyDefinitions propertyDefinitions); -DOS_API void dos_qmetaobjectfactory_delete(void* vptr); +DOS_API void dos_qmetaobject_create(void** vptr, + SignalDefinitions signalDefinitions, + SlotDefinitions slotDefinitions, + PropertyDefinitions propertyDefinitions); +DOS_API void dos_qmetaobject_delete(void* vptr); // QObject DOS_API void dos_qobject_create(void** vptr, void* dObjectPointer, diff --git a/lib/src/DOtherSide.cpp b/lib/src/DOtherSide.cpp index 24d0b86..7eb144d 100644 --- a/lib/src/DOtherSide.cpp +++ b/lib/src/DOtherSide.cpp @@ -527,7 +527,7 @@ void dos_qurl_to_string(void* vptr, char** result) convert_to_cstring(url->toString(), result); } -void dos_qmetaobjectfactory_create(void **vptr, +void dos_qmetaobject_create(void **vptr, SignalDefinitions signalDefinitions, SlotDefinitions slotDefinitions, PropertyDefinitions propertyDefinitions) @@ -537,7 +537,7 @@ void dos_qmetaobjectfactory_create(void **vptr, DOS::toVector(propertyDefinitions)); } -void dos_qmetaobjectfactory_delete(void *vptr) +void dos_qmetaobject_delete(void *vptr) { auto factory = reinterpret_cast(vptr); delete factory; diff --git a/lib/src/DynamicQObjectFactory.cpp b/lib/src/DynamicQObjectFactory.cpp index b5a42d3..1405615 100644 --- a/lib/src/DynamicQObjectFactory.cpp +++ b/lib/src/DynamicQObjectFactory.cpp @@ -26,8 +26,8 @@ namespace DOS { DynamicQObjectFactoryData::DynamicQObjectFactoryData(SignalDefinitions signalDefinitions, - SlotDefinitions slotDefinitions, - PropertyDefinitions propertyDefinitions) + SlotDefinitions slotDefinitions, + PropertyDefinitions propertyDefinitions) : m_metaObject(nullptr) { QMetaObjectBuilder builder; @@ -63,7 +63,7 @@ DynamicQObjectFactoryData::DynamicQObjectFactoryData(SignalDefinitions signalDef if (notifier == -1) propertyBuilder.setConstant(true); m_propertySlots[propertyBuilder.name()] = { methodIndexByName.value(property.readSlot, -1) - , methodIndexByName.value(property.writeSlot, -1)}; + , methodIndexByName.value(property.writeSlot, -1)}; } m_metaObject.reset(builder.toMetaObject());