code cleaning

3 files changed, 7 insertions, 7 deletions

diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h
index 36eb72eac1..9231e8cc18 100644
--- a/src/mir_app/src/clc.h
+++ b/src/mir_app/src/clc.h
@@ -56,9 +56,10 @@ ClcContact* fnFindItem(uint32_t dwItem, ClcContact *contact);
 ClcGroup* fnAddGroup(HWND hwnd, ClcData *dat, const wchar_t *szName, uint32_t flags, int groupId, int calcTotalMembers);

 

 ClcContact* fnAddInfoItemToGroup(ClcGroup *group, int flags, const wchar_t *pszText);

-ClcContact* fnAddItemToGroup(ClcGroup *group, int iAboveItem);

 ClcContact* fnAddContactToGroup(ClcData *dat, ClcGroup *group, MCONTACT hContact);

 

+ClcContact* Clist_AddItemToGroup(ClcGroup *group, int iAboveItem);

+

 void fnFreeContact(ClcContact *p);

 

 void FreeGroup(ClcGroup *group);

diff --git a/src/mir_app/src/clcitems.cpp b/src/mir_app/src/clcitems.cpp
index bbae7dd65b..78402b8aa4 100644
--- a/src/mir_app/src/clcitems.cpp
+++ b/src/mir_app/src/clcitems.cpp
@@ -29,7 +29,7 @@ static ClcCacheEntry nullpce = {};
 

 // routines for managing adding/removal of items in the list, including sorting

 

-ClcContact* fnAddItemToGroup(ClcGroup *group, int iAboveItem)

+ClcContact* Clist_AddItemToGroup(ClcGroup *group, int iAboveItem)

 {

 	ClcContact* newItem = g_clistApi.pfnCreateClcContact();

 	newItem->type = CLCIT_DIVIDER;

@@ -87,7 +87,7 @@ ClcGroup* fnAddGroup(HWND hwnd, ClcData *dat, const wchar_t *szName, uint32_t fl
 			if (groupId == 0)

 				return nullptr;

 

-			ClcContact *cc = g_clistApi.pfnAddItemToGroup(group, i);

+			ClcContact *cc = Clist_AddItemToGroup(group, i);

 			cc->type = CLCIT_GROUP;

 			mir_wstrncpy(cc->szText, pThisField, _countof(cc->szText));

 			cc->groupId = (uint16_t)(pNextField ? 0 : groupId);

@@ -155,7 +155,7 @@ ClcContact* fnAddInfoItemToGroup(ClcGroup *group, int flags, const wchar_t *pszT
 			if (group->cl[i]->type != CLCIT_INFO)

 				break;

 

-	ClcContact *cc = g_clistApi.pfnAddItemToGroup(group, i);

+	ClcContact *cc = Clist_AddItemToGroup(group, i);

 	iInfoItemUniqueHandle = LOWORD(iInfoItemUniqueHandle + 1);

 	if (iInfoItemUniqueHandle == 0)

 		++iInfoItemUniqueHandle;

@@ -186,7 +186,7 @@ ClcContact* fnAddContactToGroup(ClcData *dat, ClcGroup *group, MCONTACT hContact
 	ClcCacheEntry *pce = Clist_GetCacheEntry(hContact);

 	replaceStrW(pce->tszGroup, nullptr);

 

-	ClcContact *cc = g_clistApi.pfnAddItemToGroup(group, index + 1);

+	ClcContact *cc = Clist_AddItemToGroup(group, index + 1);

 	cc->type = CLCIT_CONTACT;

 	cc->iImage = Clist_GetContactIcon(hContact);

 	cc->hContact = hContact;

@@ -539,7 +539,7 @@ static void SortGroup(ClcData *dat, ClcGroup *group, int useInsertionSort)
 				prevContactOnline = 1;

 			else {

 				if (prevContactOnline) {

-					ClcContact *cc = g_clistApi.pfnAddItemToGroup(group, i);

+					ClcContact *cc = Clist_AddItemToGroup(group, i);

 					cc->type = CLCIT_DIVIDER;

 					mir_wstrcpy(cc->szText, TranslateT("Offline"));

 				}

diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp
index 7e39e2aec2..dd396d1b25 100644
--- a/src/mir_app/src/clistcore.cpp
+++ b/src/mir_app/src/clistcore.cpp
@@ -73,7 +73,6 @@ void InitClistCore()
 	g_clistApi.pfnGetContactHiddenStatus = fnGetContactHiddenStatus;

 

 	g_clistApi.pfnAddGroup = fnAddGroup;

-	g_clistApi.pfnAddItemToGroup = fnAddItemToGroup;

 	g_clistApi.pfnCreateClcContact = fnCreateClcContact;

 	

 	g_clistApi.pfnFreeContact = fnFreeContact;