status-im
/
dotherside
mirror of https://github.com/status-im/dotherside.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Started the QMetaObject inheritance

This commit is contained in:
Filippo Cucchetto 2016-01-06 15:42:21 +01:00
parent db5ee9d75a
commit d0e0079fcf
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/include/DOtherSide/DOtherSide.h
View File

@ -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,

4
lib/src/DOtherSide.cpp
View File

@ -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<DOS::DynamicQObjectFactory*>(vptr);
delete factory;

6
lib/src/DynamicQObjectFactory.cpp
View File

@ -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());