aqhome-apps: all apps now work again.
This commit is contained in:
@@ -50,24 +50,24 @@ static void _readProxyFromXml(GWEN_XMLNODE *xmlNode,
|
||||
static int _readInputPortsFromXml(AQHREACT_UNIT *unit, GWEN_XMLNODE *xmlNode);
|
||||
static int _readOutputPortsFromXml(AQHREACT_UNIT *unit, GWEN_XMLNODE *xmlNode);
|
||||
static int _finishParams(AQHREACT_UNIT *unit);
|
||||
static void _readUnitsFromXml(AQHOME_REACT *aqh, AQHREACT_UNIT *unit, GWEN_XMLNODE *xmlNode);
|
||||
static AQHREACT_UNIT *_readOneUnitFromXml(AQHOME_REACT *aqh, GWEN_XMLNODE *xmlNode);
|
||||
static void _readUnitsFromXml(AQH_OBJECT *aqh, AQHREACT_UNIT *unit, GWEN_XMLNODE *xmlNode);
|
||||
static AQHREACT_UNIT *_readOneUnitFromXml(AQH_OBJECT *aqh, GWEN_XMLNODE *xmlNode);
|
||||
static int _readParamsFromXml(AQHREACT_UNIT *unit, GWEN_XMLNODE *xmlNodeUnit, const char *mainGroupName);
|
||||
static int _readParamFromXml(AQHREACT_UNIT *unit, GWEN_XMLNODE *paramNode);
|
||||
static int _setParamDataFromString(AQHREACT_PARAM *param, const char *value);
|
||||
static int _readLinksFromXml(AQHOME_REACT *aqh, AQHREACT_UNIT *unit, GWEN_XMLNODE *xmlNode);
|
||||
static int _readLinkFromXml(AQHOME_REACT *aqh, AQHREACT_UNIT *unit, GWEN_XMLNODE *linkNode);
|
||||
static int _linkFromThisModulesInput(AQHOME_REACT *aqh,
|
||||
static int _readLinksFromXml(AQH_OBJECT *aqh, AQHREACT_UNIT *unit, GWEN_XMLNODE *xmlNode);
|
||||
static int _readLinkFromXml(AQH_OBJECT *aqh, AQHREACT_UNIT *unit, GWEN_XMLNODE *linkNode);
|
||||
static int _linkFromThisModulesInput(AQH_OBJECT *aqh,
|
||||
AQHREACT_UNIT *unit,
|
||||
const char *emittingPortName,
|
||||
const char *receivingUnitName,
|
||||
const char *receivingPortName);
|
||||
static int _linkToThisModulesOutput(AQHOME_REACT *aqh,
|
||||
static int _linkToThisModulesOutput(AQH_OBJECT *aqh,
|
||||
AQHREACT_UNIT *unit,
|
||||
const char *emittingUnitName,
|
||||
const char *emittingPortName,
|
||||
const char *receivingPortName);
|
||||
static int _linkBetweenUnits(AQHOME_REACT *aqh,
|
||||
static int _linkBetweenUnits(AQH_OBJECT *aqh,
|
||||
AQHREACT_UNIT *unit,
|
||||
const char *emittingUnitName,
|
||||
const char *emittingPortName,
|
||||
@@ -140,7 +140,7 @@ MODULE_PROXY_DESCR *ModuleProxyDescr_List_FindByName(const MODULE_PROXY_DESCR_LI
|
||||
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
*/
|
||||
|
||||
AQHREACT_UNIT *AqHomeReact_UnitModule_new(AQHOME_REACT *aqh)
|
||||
AQHREACT_UNIT *AqHomeReact_UnitModule_new(AQH_OBJECT *aqh)
|
||||
{
|
||||
AQHREACT_UNIT *unit;
|
||||
AQHREACT_UNIT_MODULE *xunit;
|
||||
@@ -176,7 +176,7 @@ void _freeData(GWEN_UNUSED void *bp, void *p)
|
||||
|
||||
|
||||
|
||||
AQHREACT_UNIT *AqHomeReact_UnitModule_fromXml(AQHOME_REACT *aqh, GWEN_XMLNODE *xmlNode)
|
||||
AQHREACT_UNIT *AqHomeReact_UnitModule_fromXml(AQH_OBJECT *aqh, GWEN_XMLNODE *xmlNode)
|
||||
{
|
||||
AQHREACT_UNIT *unit;
|
||||
AQHREACT_UNIT_MODULE *xunit;
|
||||
@@ -452,7 +452,7 @@ int _finishParams(AQHREACT_UNIT *unit)
|
||||
|
||||
|
||||
|
||||
void _readUnitsFromXml(AQHOME_REACT *aqh, AQHREACT_UNIT *unit, GWEN_XMLNODE *xmlNode)
|
||||
void _readUnitsFromXml(AQH_OBJECT *aqh, AQHREACT_UNIT *unit, GWEN_XMLNODE *xmlNode)
|
||||
{
|
||||
GWEN_XMLNODE *nGroup;
|
||||
AQHREACT_UNIT_MODULE *xunit;
|
||||
@@ -481,7 +481,7 @@ void _readUnitsFromXml(AQHOME_REACT *aqh, AQHREACT_UNIT *unit, GWEN_XMLNODE *xml
|
||||
|
||||
|
||||
|
||||
AQHREACT_UNIT *_readOneUnitFromXml(AQHOME_REACT *aqh, GWEN_XMLNODE *xmlNode)
|
||||
AQHREACT_UNIT *_readOneUnitFromXml(AQH_OBJECT *aqh, GWEN_XMLNODE *xmlNode)
|
||||
{
|
||||
const char *id;
|
||||
const char *t;
|
||||
@@ -495,7 +495,7 @@ AQHREACT_UNIT *_readOneUnitFromXml(AQHOME_REACT *aqh, GWEN_XMLNODE *xmlNode)
|
||||
AQHREACT_UNIT *subUnit;
|
||||
int rv;
|
||||
|
||||
subUnit=AqHomeReact_CreateUnitByName(aqh, t);
|
||||
subUnit=AQH_ReactServer_CreateUnitByName(aqh, t);
|
||||
if (subUnit==NULL) {
|
||||
DBG_INFO(NULL, "Could not create unit of type \"%s\"", t);
|
||||
return NULL;
|
||||
@@ -610,7 +610,7 @@ int _setParamDataFromString(AQHREACT_PARAM *param, const char *value)
|
||||
|
||||
|
||||
|
||||
int _readLinksFromXml(AQHOME_REACT *aqh, AQHREACT_UNIT *unit, GWEN_XMLNODE *xmlNode)
|
||||
int _readLinksFromXml(AQH_OBJECT *aqh, AQHREACT_UNIT *unit, GWEN_XMLNODE *xmlNode)
|
||||
{
|
||||
GWEN_XMLNODE *nGroup;
|
||||
|
||||
@@ -635,7 +635,7 @@ int _readLinksFromXml(AQHOME_REACT *aqh, AQHREACT_UNIT *unit, GWEN_XMLNODE *xmlN
|
||||
|
||||
|
||||
|
||||
int _readLinkFromXml(AQHOME_REACT *aqh, AQHREACT_UNIT *unit, GWEN_XMLNODE *linkNode)
|
||||
int _readLinkFromXml(AQH_OBJECT *aqh, AQHREACT_UNIT *unit, GWEN_XMLNODE *linkNode)
|
||||
{
|
||||
const char *emittingUnitName;
|
||||
const char *emittingPortName;
|
||||
@@ -673,7 +673,7 @@ int _readLinkFromXml(AQHOME_REACT *aqh, AQHREACT_UNIT *unit, GWEN_XMLNODE *linkN
|
||||
|
||||
|
||||
|
||||
int _linkFromThisModulesInput(AQHOME_REACT *aqh,
|
||||
int _linkFromThisModulesInput(AQH_OBJECT *aqh,
|
||||
AQHREACT_UNIT *unit,
|
||||
const char *emittingPortName,
|
||||
const char *receivingUnitName,
|
||||
@@ -689,7 +689,7 @@ int _linkFromThisModulesInput(AQHOME_REACT *aqh,
|
||||
|
||||
receivingUnit=AQHREACT_Unit_List_GetById(xunit->unitList, receivingUnitName);
|
||||
if (receivingUnit==NULL)
|
||||
receivingUnit=AqHomeReact_FindUnitByUnitId(aqh, receivingUnitName);
|
||||
receivingUnit=AQH_ReactServer_FindUnitByUnitId(aqh, receivingUnitName);
|
||||
if (receivingUnit==NULL) {
|
||||
DBG_ERROR(NULL, "Target unit \"%s\" not found", receivingUnitName);
|
||||
return GWEN_ERROR_NOT_FOUND;
|
||||
@@ -718,7 +718,7 @@ int _linkFromThisModulesInput(AQHOME_REACT *aqh,
|
||||
|
||||
|
||||
|
||||
int _linkToThisModulesOutput(AQHOME_REACT *aqh,
|
||||
int _linkToThisModulesOutput(AQH_OBJECT *aqh,
|
||||
AQHREACT_UNIT *unit,
|
||||
const char *emittingUnitName,
|
||||
const char *emittingPortName,
|
||||
@@ -735,7 +735,7 @@ int _linkToThisModulesOutput(AQHOME_REACT *aqh,
|
||||
|
||||
emittingUnit=AQHREACT_Unit_List_GetById(xunit->unitList, emittingUnitName);
|
||||
if (emittingUnit==NULL)
|
||||
emittingUnit=AqHomeReact_FindUnitByUnitId(aqh, emittingUnitName);
|
||||
emittingUnit=AQH_ReactServer_FindUnitByUnitId(aqh, emittingUnitName);
|
||||
if (emittingUnit==NULL) {
|
||||
DBG_ERROR(NULL, "Source unit \"%s\" not found", emittingUnitName);
|
||||
return GWEN_ERROR_NOT_FOUND;
|
||||
@@ -764,7 +764,7 @@ int _linkToThisModulesOutput(AQHOME_REACT *aqh,
|
||||
|
||||
|
||||
|
||||
int _linkBetweenUnits(AQHOME_REACT *aqh,
|
||||
int _linkBetweenUnits(AQH_OBJECT *aqh,
|
||||
AQHREACT_UNIT *unit,
|
||||
const char *emittingUnitName,
|
||||
const char *emittingPortName,
|
||||
@@ -782,7 +782,7 @@ int _linkBetweenUnits(AQHOME_REACT *aqh,
|
||||
|
||||
emittingUnit=AQHREACT_Unit_List_GetById(xunit->unitList, emittingUnitName);
|
||||
if (emittingUnit==NULL)
|
||||
emittingUnit=AqHomeReact_FindUnitByUnitId(aqh, emittingUnitName);
|
||||
emittingUnit=AQH_ReactServer_FindUnitByUnitId(aqh, emittingUnitName);
|
||||
if (emittingUnit==NULL) {
|
||||
DBG_ERROR(NULL, "Source unit \"%s\" not found", emittingUnitName);
|
||||
return GWEN_ERROR_NOT_FOUND;
|
||||
@@ -790,7 +790,7 @@ int _linkBetweenUnits(AQHOME_REACT *aqh,
|
||||
|
||||
receivingUnit=AQHREACT_Unit_List_GetById(xunit->unitList, receivingUnitName);
|
||||
if (receivingUnit==NULL)
|
||||
receivingUnit=AqHomeReact_FindUnitByUnitId(aqh, receivingUnitName);
|
||||
receivingUnit=AQH_ReactServer_FindUnitByUnitId(aqh, receivingUnitName);
|
||||
if (receivingUnit==NULL) {
|
||||
DBG_ERROR(NULL, "Target unit \"%s\" not found", receivingUnitName);
|
||||
return GWEN_ERROR_NOT_FOUND;
|
||||
|
||||
Reference in New Issue
Block a user