summaryrefslogtreecommitdiff
path: root/plugins/Clist_modern
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Clist_modern')
-rw-r--r--plugins/Clist_modern/modern_aniavatars.cpp22
-rw-r--r--plugins/Clist_modern/modern_cachefuncs.cpp20
-rw-r--r--plugins/Clist_modern/modern_clc.cpp2
-rw-r--r--plugins/Clist_modern/modern_clcitems.cpp4
-rw-r--r--plugins/Clist_modern/modern_clcmsgs.cpp6
-rw-r--r--plugins/Clist_modern/modern_clistsettings.cpp10
-rw-r--r--plugins/Clist_modern/modern_commonheaders.cpp6
-rw-r--r--plugins/Clist_modern/modern_skinengine.cpp40
-rw-r--r--plugins/Clist_modern/modern_toolbar.cpp20
-rw-r--r--plugins/Clist_modern/modern_xptheme.cpp10
10 files changed, 70 insertions, 70 deletions
diff --git a/plugins/Clist_modern/modern_aniavatars.cpp b/plugins/Clist_modern/modern_aniavatars.cpp
index ae57520fa2..9c6dbdcb35 100644
--- a/plugins/Clist_modern/modern_aniavatars.cpp
+++ b/plugins/Clist_modern/modern_aniavatars.cpp
@@ -209,8 +209,8 @@ int AniAva_InitModule()
RegisterClassEx(&wc);
}
InitializeCriticalSection(&AniAva.CS);
- AniAva.Objects=li.List_Create(0,2);
- AniAva.AniAvatarList=li.List_Create(0,1);
+ AniAva.Objects=List_Create(0,2);
+ AniAva.AniAvatarList=List_Create(0,1);
AniAva.AniAvatarList->sortFunc=_AniAva_SortAvatarInfo;
AniAva.bModuleStarted=TRUE;
AniAva.hExitEvent=CreateEvent(NULL,FALSE,FALSE,NULL);
@@ -238,7 +238,7 @@ int AniAva_UnloadModule()
}
mir_free(AniAva.Objects->items[i]);
}
- li.List_Destroy(AniAva.Objects);
+ List_Destroy(AniAva.Objects);
mir_free(AniAva.Objects);
for (i=0; i<AniAva.AniAvatarList->realCount; i++)
@@ -248,7 +248,7 @@ int AniAva_UnloadModule()
if (aai->pFrameDelays) free(aai->pFrameDelays);
mir_free(aai);
}
- li.List_Destroy(AniAva.AniAvatarList);
+ List_Destroy(AniAva.AniAvatarList);
mir_free(AniAva.AniAvatarList);
_AniAva_RemoveAniAvaDC(&AniAva);
SetEvent(AniAva.hExitEvent);
@@ -328,7 +328,7 @@ int AniAva_AddAvatar(HANDLE hContact, TCHAR * szFilename, int width, int heigth)
pavi->hWindow = NULL;
pavi->hContact = hContact;
pavi->bInvalidPos = 0;
- li.List_Insert( AniAva.Objects, pavi, AniAva.Objects->realCount);
+ List_Insert( AniAva.Objects, pavi, AniAva.Objects->realCount);
}
//change avatar
pavi->bToBeDeleted=FALSE;
@@ -511,7 +511,7 @@ int AniAva_RemoveInvalidatedAvatars()
pai->hWindow=NULL;
if (!keepAvatar) _AniAva_RealRemoveAvatar(pai->dwAvatarUniqId);
mir_free(pai);
- li.List_Remove(AniAva.Objects,i);
+ List_Remove(AniAva.Objects,i);
i--;
}
}
@@ -635,7 +635,7 @@ static void _AniAva_RealRemoveAvatar(DWORD UniqueID)
#ifdef _DEBUG
__AniAva_DebugRenderStrip();
#endif
- li.List_Remove(AniAva.AniAvatarList, j);
+ List_Remove(AniAva.AniAvatarList, j);
mir_free(aai);
_AniAva_ResumePainting();
break;
@@ -671,7 +671,7 @@ static int _AniAva_LoadAvatarFromImage(TCHAR * szFileName, int width, int height
aai.FrameSize.cx=width;
aai.FrameSize.cy=height;
- if (!li.List_GetIndex(AniAva.AniAvatarList,(void*)&aai,&idx)) idx=-1;
+ if (!List_GetIndex(AniAva.AniAvatarList,(void*)&aai,&idx)) idx=-1;
if (idx==-1) //item not present in list
{
HBITMAP hBitmap=NULL;
@@ -749,8 +749,8 @@ static int _AniAva_LoadAvatarFromImage(TCHAR * szFileName, int width, int height
{
//add to list
int idx=AniAva.AniAvatarList->realCount;
- li.List_GetIndex(AniAva.AniAvatarList, paai,&idx);
- li.List_Insert(AniAva.AniAvatarList, (void*)paai, idx);
+ List_GetIndex(AniAva.AniAvatarList, paai,&idx);
+ List_Insert(AniAva.AniAvatarList, (void*)paai, idx);
}
return paai->dwAvatarUniqId;
}
@@ -1000,7 +1000,7 @@ static void _AniAva_ReduceAvatarImages(int startY, int dY, BOOL bDestroyWindow)
{
_AniAva_DestroyAvatarWindow(pai->hWindow);
mir_free(pai);
- li.List_Remove(AniAva.Objects,i);
+ List_Remove(AniAva.Objects,i);
i--;
}
}
diff --git a/plugins/Clist_modern/modern_cachefuncs.cpp b/plugins/Clist_modern/modern_cachefuncs.cpp
index 0a741adb90..444fef27d7 100644
--- a/plugins/Clist_modern/modern_cachefuncs.cpp
+++ b/plugins/Clist_modern/modern_cachefuncs.cpp
@@ -96,7 +96,7 @@ void CSmileyString::AddListeningToIcon(struct SHORTDATA *dat, PDNCE pdnce, TCHAR
int text_size = (int)_tcslen( szText );
- plText = li.List_Create( 0, 1 );
+ plText = List_Create( 0, 1 );
// Add Icon
{
@@ -126,7 +126,7 @@ void CSmileyString::AddListeningToIcon(struct SHORTDATA *dat, PDNCE pdnce, TCHAR
dat->text_smiley_height = max(piece->smiley_height, dat->text_smiley_height);
iMaxSmileyHeight = max(piece->smiley_height, iMaxSmileyHeight);
- li.List_Insert( plText, piece, plText->realCount);
+ List_Insert( plText, piece, plText->realCount);
}
// Add text
@@ -136,7 +136,7 @@ void CSmileyString::AddListeningToIcon(struct SHORTDATA *dat, PDNCE pdnce, TCHAR
piece->type = TEXT_PIECE_TYPE_TEXT;
piece->start_pos = 0;
piece->len = text_size;
- li.List_Insert( plText, piece, plText->realCount);
+ List_Insert( plText, piece, plText->realCount);
}
}
@@ -145,7 +145,7 @@ void CSmileyString::_CopySmileyList( SortedList *plInput )
// ASSERT( plText == NULL );
if ( !plInput || plInput->realCount == 0 ) return;
- plText=li.List_Create( 0, 1 );
+ plText=List_Create( 0, 1 );
for ( int i = 0; i < plInput->realCount; i++ )
{
ClcContactTextPiece *pieceFrom=(ClcContactTextPiece *) plInput->items[i];
@@ -155,7 +155,7 @@ void CSmileyString::_CopySmileyList( SortedList *plInput )
*piece=*pieceFrom;
if ( pieceFrom->type == TEXT_PIECE_TYPE_SMILEY)
piece->smiley = CopyIcon( pieceFrom->smiley );
- li.List_Insert( plText, piece, plText->realCount );
+ List_Insert( plText, piece, plText->realCount );
}
}
}
@@ -188,7 +188,7 @@ void CSmileyString::DestroySmileyList()
}
}
}
- li.List_Destroy( plText );
+ List_Destroy( plText );
}
mir_free(plText);
@@ -247,7 +247,7 @@ void CSmileyString::ReplaceSmileys(struct SHORTDATA *dat, PDNCE pdnce, TCHAR * s
}
// Lets add smileys
- plText = li.List_Create( 0, 1 );
+ plText = List_Create( 0, 1 );
for (unsigned i = 0; i < sp.numSmileys; ++i)
{
@@ -261,7 +261,7 @@ void CSmileyString::ReplaceSmileys(struct SHORTDATA *dat, PDNCE pdnce, TCHAR * s
piece->type = TEXT_PIECE_TYPE_TEXT;
piece->start_pos = last_pos ;//sp.str - text;
piece->len = spr[i].startChar - last_pos;
- li.List_Insert(plText, piece, plText->realCount);
+ List_Insert(plText, piece, plText->realCount);
}
// Add smiley
@@ -291,7 +291,7 @@ void CSmileyString::ReplaceSmileys(struct SHORTDATA *dat, PDNCE pdnce, TCHAR * s
dat->text_smiley_height = max( piece->smiley_height, dat->text_smiley_height );
iMaxSmileyHeight = max( piece->smiley_height, iMaxSmileyHeight );
- li.List_Insert(plText, piece, plText->realCount);
+ List_Insert(plText, piece, plText->realCount);
}
}
// Get next
@@ -308,7 +308,7 @@ void CSmileyString::ReplaceSmileys(struct SHORTDATA *dat, PDNCE pdnce, TCHAR * s
piece->start_pos = last_pos;
piece->len = text_size-last_pos;
- li.List_Insert(plText, piece, plText->realCount);
+ List_Insert(plText, piece, plText->realCount);
}
}
diff --git a/plugins/Clist_modern/modern_clc.cpp b/plugins/Clist_modern/modern_clc.cpp
index e4626ceb63..40cd285410 100644
--- a/plugins/Clist_modern/modern_clc.cpp
+++ b/plugins/Clist_modern/modern_clc.cpp
@@ -1781,7 +1781,7 @@ static LRESULT clcOnIntmIconChanged(struct ClcData *dat, HWND hwnd, UINT msg, WP
if (hSelItem) {
struct ClcGroup *selgroup;
if (pcli->pfnFindItem(hwnd, dat, hSelItem, &selcontact, &selgroup, NULL))
- dat->selection = pcli->pfnGetRowsPriorTo(&dat->list, selgroup, li.List_IndexOf(( SortedList* )&selgroup->cl, selcontact));
+ dat->selection = pcli->pfnGetRowsPriorTo(&dat->list, selgroup, List_IndexOf(( SortedList* )&selgroup->cl, selcontact));
else
dat->selection = -1;
}
diff --git a/plugins/Clist_modern/modern_clcitems.cpp b/plugins/Clist_modern/modern_clcitems.cpp
index 89e0395129..0ceff512f9 100644
--- a/plugins/Clist_modern/modern_clcitems.cpp
+++ b/plugins/Clist_modern/modern_clcitems.cpp
@@ -345,11 +345,11 @@ int RestoreSelection( struct ClcData *dat, HANDLE hSelected )
if ( !selcontact->isSubcontact )
{
- dat->selection = pcli->pfnGetRowsPriorTo( &dat->list, selgroup, li.List_IndexOf((SortedList*)&selgroup->cl, selcontact ));
+ dat->selection = pcli->pfnGetRowsPriorTo( &dat->list, selgroup, List_IndexOf((SortedList*)&selgroup->cl, selcontact ));
}
else
{
- dat->selection = pcli->pfnGetRowsPriorTo(&dat->list, selgroup, li.List_IndexOf((SortedList*)&selgroup->cl, selcontact->subcontacts ));
+ dat->selection = pcli->pfnGetRowsPriorTo(&dat->list, selgroup, List_IndexOf((SortedList*)&selgroup->cl, selcontact->subcontacts ));
if (dat->selection != -1 )
dat->selection += selcontact->isSubcontact;
diff --git a/plugins/Clist_modern/modern_clcmsgs.cpp b/plugins/Clist_modern/modern_clcmsgs.cpp
index 6a444d32ac..872b24c6c4 100644
--- a/plugins/Clist_modern/modern_clcmsgs.cpp
+++ b/plugins/Clist_modern/modern_clcmsgs.cpp
@@ -122,7 +122,7 @@ LRESULT cli_ProcessExternalMessages(HWND hwnd,struct ClcData *dat,UINT msg,WPARA
if (wParam != CLGN_ROOT) {
if (!pcli->pfnFindItem(hwnd, dat, (HANDLE) lParam, &contact, &group, NULL))
return (LRESULT) (HANDLE) NULL;
- i = li.List_IndexOf((SortedList*)&group->cl,contact);
+ i = List_IndexOf((SortedList*)&group->cl,contact);
if (i<0) return 0;
}
switch (wParam)
@@ -204,12 +204,12 @@ LRESULT cli_ProcessExternalMessages(HWND hwnd,struct ClcData *dat,UINT msg,WPARA
if (!contact->isSubcontact)
{
- index=li.List_IndexOf((SortedList*)&group->cl,contact);
+ index=List_IndexOf((SortedList*)&group->cl,contact);
mainindex=index;
}
else
{
- index=li.List_IndexOf((SortedList*)&group->cl,contact->subcontacts);
+ index=List_IndexOf((SortedList*)&group->cl,contact->subcontacts);
mainindex=index;
index+=contact->isSubcontact;
}
diff --git a/plugins/Clist_modern/modern_clistsettings.cpp b/plugins/Clist_modern/modern_clistsettings.cpp
index 759b1ed8e3..9a7bacff7a 100644
--- a/plugins/Clist_modern/modern_clistsettings.cpp
+++ b/plugins/Clist_modern/modern_clistsettings.cpp
@@ -68,7 +68,7 @@ void InitDisplayNameCache(void)
int i=0;
InitCacheAsync();
InitAwayMsgModule();
- clistCache = li.List_Create( 0, 50 );
+ clistCache = List_Create( 0, 50 );
clistCache->sortFunc = handleCompare;
}
void FreeDisplayNameCache()
@@ -82,7 +82,7 @@ void FreeDisplayNameCache()
mir_free_and_nill( clistCache->items[i] );
}
- li.List_Destroy( clistCache );
+ List_Destroy( clistCache );
mir_free_and_nill(clistCache);
clistCache = NULL;
}
@@ -94,9 +94,9 @@ ClcCacheEntryBase* cliGetCacheEntry(HANDLE hContact)
ClcCacheEntryBase* p;
int idx;
if (!clistCache) return NULL;
- if ( !li.List_GetIndex( clistCache, &hContact, &idx )) {
+ if ( !List_GetIndex( clistCache, &hContact, &idx )) {
if (( p = pcli->pfnCreateCacheItem( hContact )) != NULL ) {
- li.List_Insert( clistCache, p, idx );
+ List_Insert( clistCache, p, idx );
pcli->pfnInvalidateDisplayNameCacheEntry( hContact );
}
}
@@ -246,7 +246,7 @@ void FreeDisplayNameCache(SortedList *list)
FreeDisplayNameCacheItem(( pdisplayNameCacheEntry )list->items[i] );
mir_free_and_nill(list->items[i]);
}
- li.List_Destroy(list);
+ List_Destroy(list);
}
*/
diff --git a/plugins/Clist_modern/modern_commonheaders.cpp b/plugins/Clist_modern/modern_commonheaders.cpp
index eb78d351c7..4cf9009138 100644
--- a/plugins/Clist_modern/modern_commonheaders.cpp
+++ b/plugins/Clist_modern/modern_commonheaders.cpp
@@ -316,7 +316,7 @@ void li_ListDestruct(SortedList *pList, ItemDestuctor pItemDestructor)
int i=0;
if (!pList) return;
for (i=0; i<pList->realCount; i++) pItemDestructor(pList->items[i]);
- li.List_Destroy(pList);
+ List_Destroy(pList);
mir_free(pList);
}
@@ -325,13 +325,13 @@ void li_RemoveDestruct(SortedList *pList, int index, ItemDestuctor pItemDestruct
if (index>=0 && index<pList->realCount)
{
pItemDestructor(pList->items[index]);
- li.List_Remove(pList, index);
+ List_Remove(pList, index);
}
}
void li_RemovePtrDestruct(SortedList *pList, void * ptr, ItemDestuctor pItemDestructor)
{
- if (li.List_RemovePtr(pList, ptr))
+ if (List_RemovePtr(pList, ptr))
pItemDestructor(ptr);
}
diff --git a/plugins/Clist_modern/modern_skinengine.cpp b/plugins/Clist_modern/modern_skinengine.cpp
index 7753867a9f..b9b9f8dbaf 100644
--- a/plugins/Clist_modern/modern_skinengine.cpp
+++ b/plugins/Clist_modern/modern_skinengine.cpp
@@ -526,7 +526,7 @@ int SkinEngineUnloadModule()
EFFECTSSTACKITEM * effect=(EFFECTSSTACKITEM*)(pEffectStack->items[i]);
mir_free_and_nill(effect);
}
- li.List_Destroy(pEffectStack);
+ List_Destroy(pEffectStack);
mir_free_and_nill(pEffectStack);
}
if (g_pCachedWindow)
@@ -623,7 +623,7 @@ HDC ske_RequestBufferDC(HDC hdcOwner, int dcID, int width, int height, BOOL fCle
DCBUFFER * pBuf;
if (BufferList==NULL)
{
- BufferList=li.List_Create(0,2);
+ BufferList=List_Create(0,2);
BufferList->sortFunc=SortBufferList;
InitializeCriticalSection(&BufferListCS);
}
@@ -632,7 +632,7 @@ HDC ske_RequestBufferDC(HDC hdcOwner, int dcID, int width, int height, BOOL fCle
buf.hdcOwnedBy=hdcOwner;
buf.nUsageID=dcID;
buf.hDC=NULL;
- pBuf=(DCBUFFER*)li.List_Find(BufferList,(void*)&buf);
+ pBuf=(DCBUFFER*)List_Find(BufferList,(void*)&buf);
if (!pBuf)
{
//if not found - allocate it
@@ -644,7 +644,7 @@ HDC ske_RequestBufferDC(HDC hdcOwner, int dcID, int width, int height, BOOL fCle
pBuf->hDC=CreateCompatibleDC(hdcOwner);
pBuf->oldBitmap=(HBITMAP)SelectObject(pBuf->hDC,pBuf->hBitmap);
pBuf->dwDestroyAfterTime=0;
- li.List_InsertPtr(BufferList,pBuf);
+ List_InsertPtr(BufferList,pBuf);
}
else
{
@@ -690,7 +690,7 @@ int ske_ReleaseBufferDC(HDC hDC, int keepTime)
DeleteObject(pBuf->hBitmap);
DeleteDC(pBuf->hDC);
mir_free(pBuf);
- li.List_Remove(BufferList,i);
+ List_Remove(BufferList,i);
i--;
}
}
@@ -2191,13 +2191,13 @@ int ske_UnloadSkin(SKINOBJECTSLIST * Skin)
mir_free_and_nill(sf);
}
}
- li.List_Destroy(gl_plSkinFonts);
+ List_Destroy(gl_plSkinFonts);
mir_free_and_nill(gl_plSkinFonts);
}
}
if (Skin->szSkinPlace) mir_free_and_nill(Skin->szSkinPlace);
- if (Skin->pTextList) li.List_Destroy(Skin->pTextList);
+ if (Skin->pTextList) List_Destroy(Skin->pTextList);
mir_free_and_nill(Skin->pTextList);
ModernSkinButtonDeleteAll();
if (Skin->dwObjLPAlocated==0) { ske_UnlockSkin(); return 0;}
@@ -2229,7 +2229,7 @@ int ske_UnloadSkin(SKINOBJECTSLIST * Skin)
mir_free_and_nill(gt);
}
}
- li.List_Destroy(dt->plTextList);
+ List_Destroy(dt->plTextList);
mir_free_and_nill(dt->plTextList);
}
}
@@ -2328,10 +2328,10 @@ static void ske_LinkSkinObjects(SKINOBJECTSLIST * pObjectList)
{
if (!globj->plTextList)
{
- globj->plTextList=li.List_Create(0,1);
+ globj->plTextList=List_Create(0,1);
globj->plTextList->sortFunc=ske_SortTextGlyphObjectFunc;
}
- li.List_Insert(globj->plTextList,(void*)glText,globj->plTextList->realCount);
+ List_Insert(globj->plTextList,(void*)glText,globj->plTextList->realCount);
qsort(globj->plTextList->items,globj->plTextList->realCount,sizeof(void*),(int(*)(const void*, const void*))globj->plTextList->sortFunc);
pObjectList->pTextList->items[i]=NULL;
}
@@ -2348,7 +2348,7 @@ static void ske_LinkSkinObjects(SKINOBJECTSLIST * pObjectList)
}
}
}
- li.List_Destroy(pObjectList->pTextList);
+ List_Destroy(pObjectList->pTextList);
mir_free_and_nill(pObjectList->pTextList);
}
}
@@ -2754,7 +2754,7 @@ BOOL ske_ResetTextEffect(HDC hdc)
{
EFFECTSSTACKITEM * effect=(EFFECTSSTACKITEM*)(pEffectStack->items[i]);
mir_free_and_nill(effect);
- li.List_Remove(pEffectStack,i);
+ List_Remove(pEffectStack,i);
return TRUE;
}
return FALSE;
@@ -2766,7 +2766,7 @@ BOOL ske_SelectTextEffect(HDC hdc, BYTE EffectID, DWORD FirstColor, DWORD Second
if (EffectID==-1) return ske_ResetTextEffect(hdc);
if (!pEffectStack)
{
- pEffectStack=li.List_Create(0,1);
+ pEffectStack=List_Create(0,1);
}
{
int i;
@@ -2786,7 +2786,7 @@ BOOL ske_SelectTextEffect(HDC hdc, BYTE EffectID, DWORD FirstColor, DWORD Second
effect->EffectID=EffectID;
effect->FirstColor=FirstColor;
effect->SecondColor=SecondColor;
- li.List_Insert(pEffectStack, effect, 0);
+ List_Insert(pEffectStack, effect, 0);
return TRUE;
}
return FALSE;
@@ -4359,7 +4359,7 @@ static void OLDske_AddParseTextGlyphObject(char * szGlyphTextID,char * szDefineS
if (!globj->plTextList)
{
- globj->plTextList=li.List_Create(0,1);
+ globj->plTextList=List_Create(0,1);
globj->plTextList->sortFunc=ske_SortTextGlyphObjectFunc;
}
glText=(GLYPHTEXT*)mir_calloc(sizeof(GLYPHTEXT));
@@ -4387,7 +4387,7 @@ static void OLDske_AddParseTextGlyphObject(char * szGlyphTextID,char * szDefineS
glText->dwShadow=ske_HexToARGB(GetParamN(szDefineString,buf,sizeof(buf),8,',',TRUE));
glText->stValueText=mir_a2u(GetParamN(szDefineString,buf,sizeof(buf),9,',',TRUE));
glText->stText=ske_ParseText(glText->stValueText);
- li.List_Insert(globj->plTextList,(void*)glText,globj->plTextList->realCount);
+ List_Insert(globj->plTextList,(void*)glText,globj->plTextList->realCount);
qsort(globj->plTextList->items,globj->plTextList->realCount,sizeof(void*),(int(*)(const void*, const void*))globj->plTextList->sortFunc);
}
}
@@ -4428,8 +4428,8 @@ static void ske_AddParseTextGlyphObject(char * szGlyphTextID,char * szDefineStri
glText->stText=ske_ParseText(glText->stValueText);
if (!Skin->pTextList)
- Skin->pTextList=li.List_Create(0,1);
- li.List_InsertPtr(Skin->pTextList,glText);
+ Skin->pTextList=List_Create(0,1);
+ List_InsertPtr(Skin->pTextList,glText);
}
}
@@ -4477,10 +4477,10 @@ static void ske_AddParseSkinFont(char * szFontID,char * szDefineString,SKINOBJEC
{
sf->szFontID=mir_strdup(szFontID);
if (!gl_plSkinFonts)
- gl_plSkinFonts=li.List_Create(0,1);
+ gl_plSkinFonts=List_Create(0,1);
if (gl_plSkinFonts)
{
- li.List_Insert(gl_plSkinFonts,(void*)sf,gl_plSkinFonts->realCount);
+ List_Insert(gl_plSkinFonts,(void*)sf,gl_plSkinFonts->realCount);
}
}
diff --git a/plugins/Clist_modern/modern_toolbar.cpp b/plugins/Clist_modern/modern_toolbar.cpp
index 7720bae7fd..56078d03cc 100644
--- a/plugins/Clist_modern/modern_toolbar.cpp
+++ b/plugins/Clist_modern/modern_toolbar.cpp
@@ -192,7 +192,7 @@ HRESULT ToolbarLoadModule()
RegisterClass(&wndclass);
}
}
- tbdat.listOfButtons=li.List_Create(0,1);
+ tbdat.listOfButtons=List_Create(0,1);
InitializeCriticalSection(&tbdat.cs);
return S_OK;
}
@@ -322,7 +322,7 @@ static INT_PTR svcToolBarAddButton(WPARAM wParam, LPARAM lParam)
mtbi->bVisible = bVisible;
mtbi->bPanelID = bPanel;
- li.List_InsertPtr(tbdat.listOfButtons,mtbi);
+ List_InsertPtr(tbdat.listOfButtons,mtbi);
if (mtbi->bVisible)
result=(INT_PTR)ToolBar_AddButtonToBars(mtbi);
@@ -798,7 +798,7 @@ static LRESULT CALLBACK ToolBar_WndProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM
pMTBInfo->wLastHeight=Frame.height;
pMTBInfo->nLineCount = 1;
- pMTBInfo->pButtonList=li.List_Create(0,1);
+ pMTBInfo->pButtonList=List_Create(0,1);
Frame.name=(char*) lpcs->lpCreateParams;
hFrame=(HANDLE)CallService(MS_CLIST_FRAMES_ADDFRAME,(WPARAM)&Frame,(LPARAM)0);
@@ -879,7 +879,7 @@ static LRESULT CALLBACK ToolBar_WndProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM
xpt_FreeThemeForWindow(hwnd);
WindowList_Remove( tbdat.hToolBarWindowList, hwnd );
SendMessage(hwnd, MTBM_REMOVE_ALL_BUTTONS, 0, 0 );
- li.List_Destroy( pMTBInfo->pButtonList );
+ List_Destroy( pMTBInfo->pButtonList );
mir_free( pMTBInfo->pButtonList );
SetWindowLongPtr( hwnd, GWLP_USERDATA, 0 );
mir_free( pMTBInfo );
@@ -902,7 +902,7 @@ static LRESULT CALLBACK ToolBar_WndProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM
mtbi->hWindow=hwndButton;
mtbi->hwndToolBar=hwnd;
- li.List_Insert(pMTBInfo->pButtonList, mtbi, pMTBInfo->pButtonList->realCount); //just insert pointer. such object are managed in global tbbutton list
+ List_Insert(pMTBInfo->pButtonList, mtbi, pMTBInfo->pButtonList->realCount); //just insert pointer. such object are managed in global tbbutton list
if (hwndButton)
{
char * buttonId=(char *)_alloca(sizeof("ToolBar.")+strlen(mtbi->szButtonID)+2);
@@ -930,9 +930,9 @@ static LRESULT CALLBACK ToolBar_WndProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM
mtbi->hwndToolBar = NULL;
}
}
- li.List_Destroy( pMTBInfo->pButtonList );
+ List_Destroy( pMTBInfo->pButtonList );
mir_free( pMTBInfo->pButtonList );
- pMTBInfo->pButtonList=li.List_Create(0,1);
+ pMTBInfo->pButtonList=List_Create(0,1);
break;
}
case WM_SIZE:
@@ -1072,14 +1072,14 @@ static LRESULT CALLBACK ToolBar_WndProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM
mtbi=(MTB_BUTTONINFO*)pMTBInfo->pButtonList->items[i];
if (mtbi==(MTB_BUTTONINFO*)wParam)
{
- li.List_Remove(pMTBInfo->pButtonList,i);
+ List_Remove(pMTBInfo->pButtonList,i);
for (int j=0; j<tbdat.listOfButtons->realCount; j++)
if (mtbi==(MTB_BUTTONINFO*)tbdat.listOfButtons->items[j])
{
- li.List_Remove(tbdat.listOfButtons,j);
+ List_Remove(tbdat.listOfButtons,j);
break;
}
- li.List_RemovePtr(tbdat.listOfButtons,mtbi);
+ List_RemovePtr(tbdat.listOfButtons,mtbi);
delete_MTB_BUTTONINFO((void*)mtbi);
mtbi=NULL;
pcli->pfnInvalidateRect(hwnd, NULL, FALSE);
diff --git a/plugins/Clist_modern/modern_xptheme.cpp b/plugins/Clist_modern/modern_xptheme.cpp
index 599cb55010..53b9b7541e 100644
--- a/plugins/Clist_modern/modern_xptheme.cpp
+++ b/plugins/Clist_modern/modern_xptheme.cpp
@@ -87,7 +87,7 @@ HRESULT XPThemesLoadModule()
if (_xpt_ThemeSupport())
{
InitializeCriticalSection(&xptCS);
- xptObjectList=li.List_Create(0,1);
+ xptObjectList=List_Create(0,1);
xptModuleLoaded=TRUE;
}
return S_OK;
@@ -126,7 +126,7 @@ BOOL xpt_IsValidHandle(XPTHANDLE xptHandle)
if (!xptHandle) return FALSE;
xptlock();
{
- if (li.List_IndexOf(xptObjectList, (void*)xptHandle)!=-1)
+ if (List_IndexOf(xptObjectList, (void*)xptHandle)!=-1)
res=TRUE;
}
xptunlock();
@@ -143,7 +143,7 @@ XPTHANDLE xpt_AddThemeHandle(HWND hwnd, LPCWSTR className)
xptObject->lpcwClassObject=className;
xptObject->hOwnerWindow=hwnd;
_sttXptReloadThemeData(xptObject);
- li.List_InsertPtr(xptObjectList, (void*)xptObject);
+ List_InsertPtr(xptObjectList, (void*)xptObject);
res=(XPTHANDLE)xptObject;
}
xptunlock();
@@ -159,7 +159,7 @@ void xpt_FreeThemeHandle(XPTHANDLE xptHandle)
XPTObject* xptObject=(XPTObject*)xptHandle;
_sttXptCloseThemeData(xptObject);
_sttXptObjectDestructor((void *) xptHandle);
- li.List_Remove(xptObjectList, li.List_IndexOf(xptObjectList,(void *) xptHandle));
+ List_Remove(xptObjectList, List_IndexOf(xptObjectList,(void *) xptHandle));
}
xptunlock();
}
@@ -176,7 +176,7 @@ void xpt_FreeThemeForWindow(HWND hwnd)
{
_sttXptCloseThemeData(xptObject);
_sttXptObjectDestructor((void *) xptObject);
- li.List_Remove(xptObjectList, i);
+ List_Remove(xptObjectList, i);
}
else
i++;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 07:24:27 +0000