From 515c31d90fd9d4688eb5635814ac09e4fa72780b Mon Sep 17 00:00:00 2001 From: "kevin.larke" Date: Tue, 21 Apr 2020 17:56:38 -0400 Subject: [PATCH] cwUi.cpp,cwUiTest.cpp : Change attribute 'class' to 'className'. --- cwUi.cpp | 6 +++--- cwUiTest.cpp | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cwUi.cpp b/cwUi.cpp index 3786410..293a881 100644 --- a/cwUi.cpp +++ b/cwUi.cpp @@ -298,7 +298,7 @@ namespace cw // form the create json message string //unsigned i = snprintf( p->buf, p->bufN, "{ \"op\":\"create\", \"parent\":\"%s\", \"children\":{ \"%s\":{ \"eleName\":\"%s\", \"appId\":%i, \"uuId\":%i, \"class\":\"%s\", \"title\":\"%s\" ", parentEleName, eleTypeStr, eleName, appId, newEle->uuId, clas, title ); - unsigned i = snprintf( p->buf, p->bufN, "{ \"op\":\"create\", \"parentUuId\":\"%i\", \"type\":\"%s\", \"eleName\":\"%s\", \"appId\":\"%i\", \"uuId\":%i, \"class\":\"%s\", \"title\":\"%s\" ", parentEle->uuId, eleTypeStr, eleName, appId, newEle->uuId, clas, title ); + unsigned i = snprintf( p->buf, p->bufN, "{ \"op\":\"create\", \"parentUuId\":\"%i\", \"type\":\"%s\", \"eleName\":\"%s\", \"appId\":\"%i\", \"uuId\":%i, \"className\":\"%s\", \"title\":\"%s\" ", parentEle->uuId, eleTypeStr, eleName, appId, newEle->uuId, clas, title ); // add the UI specific attributes @@ -763,7 +763,7 @@ cw::rc_t cw::ui::createFromObject( handle_t h, const object_t* o, unsigned wsS if( eleName != nullptr ) if((o = o->find(eleName)) == nullptr ) { - rc = cwLogError(kSyntaxErrorRC,"Unable to locate the 'engine' sub-configuration."); + rc = cwLogError(kSyntaxErrorRC,"Unable to locate the '%s' sub-configuration.",cwStringNullGuard(eleName)); goto errLabel; } @@ -773,7 +773,7 @@ cw::rc_t cw::ui::createFromObject( handle_t h, const object_t* o, unsigned wsS errLabel: if(rc != kOkRC ) - rc = cwLogError(rc,"UI instantiation from object failed.", cwStringNullGuard(fn)); + rc = cwLogError(rc,"UI instantiation from object failed."); return rc; } diff --git a/cwUiTest.cpp b/cwUiTest.cpp index 24ea9eb..d9f8360 100644 --- a/cwUiTest.cpp +++ b/cwUiTest.cpp @@ -4,6 +4,7 @@ #include "cwMem.h" #include "cwThread.h" #include "cwWebSock.h" +#include "cwObject.h" #include "cwUi.h" #include "cwUiTest.h"