diff --git a/common/OLD_uipriv.h b/common/OLD_uipriv.h index 453871d7..64d82ad1 100644 --- a/common/OLD_uipriv.h +++ b/common/OLD_uipriv.h @@ -1,9 +1,4 @@ -extern void *uiAlloc(size_t, const char *); -#define uiNew(T) ((T *) uiAlloc(sizeof (T), #T)) -extern void *uiRealloc(void *, size_t, const char *); -extern void uiFree(void *); - // ugh, this was only introduced in MSVC 2015... #ifdef _MSC_VER #define __func__ __FUNCTION__ diff --git a/common/attribute.c b/common/attribute.c index 5054d1c1..4a8f0160 100644 --- a/common/attribute.c +++ b/common/attribute.c @@ -85,7 +85,7 @@ uiAttribute *uiNewFamilyAttribute(const char *family) uiAttribute *a; a = newAttribute(uiAttributeTypeFamily); - a->u.family = (char *) uiAlloc((strlen(family) + 1) * sizeof (char), "char[] (uiAttribute)"); + a->u.family = (char *) uiprivAlloc((strlen(family) + 1) * sizeof (char), "char[] (uiAttribute)"); strcpy(a->u.family, family); return a; } diff --git a/common/attrstr.h b/common/attrstr.h index 2f4e42b4..54e43feb 100644 --- a/common/attrstr.h +++ b/common/attrstr.h @@ -1,11 +1,5 @@ // 19 february 2018 -// TODO remove when done migrating these functions -#define uiprivNew(x) uiNew(x) -#define uiprivAlloc(x, y) uiAlloc(x, y) -#define uiprivRealloc(x, y, z) uiRealloc(x, y, z) -#define uiprivFree(x) uiFree(x) - // attribute.c extern uiAttribute *uiprivAttributeRetain(uiAttribute *a); extern void uiprivAttributeRelease(uiAttribute *a); diff --git a/common/control.c b/common/control.c index 28066461..e46e322c 100644 --- a/common/control.c +++ b/common/control.c @@ -63,7 +63,7 @@ uiControl *uiAllocControl(size_t size, uint32_t OSsig, uint32_t typesig, const c { uiControl *c; - c = (uiControl *) uiAlloc(size, typenamestr); + c = (uiControl *) uiprivAlloc(size, typenamestr); c->Signature = uiControlSignature; c->OSSignature = OSsig; c->TypeSignature = typesig; @@ -74,7 +74,7 @@ void uiFreeControl(uiControl *c) { if (uiControlParent(c) != NULL) userbug("You cannot destroy a uiControl while it still has a parent. (control: %p)", c); - uiFree(c); + uiprivFree(c); } void uiControlVerifySetParent(uiControl *c, uiControl *parent) diff --git a/common/uipriv.h b/common/uipriv.h index 5f0f287d..69062c87 100644 --- a/common/uipriv.h +++ b/common/uipriv.h @@ -10,10 +10,10 @@ extern "C" { extern uiInitOptions uiprivOptions; -extern void *uiAlloc(size_t, const char *); -#define uiNew(T) ((T *) uiAlloc(sizeof (T), #T)) -extern void *uiRealloc(void *, size_t, const char *); -extern void uiFree(void *); +extern void *uiprivAlloc(size_t, const char *); +#define uiprivNew(T) ((T *) uiprivAlloc(sizeof (T), #T)) +extern void *uiprivRealloc(void *, size_t, const char *); +extern void uiprivFree(void *); // ugh, this was only introduced in MSVC 2015... #ifdef _MSC_VER