From e8c9fd3c802c8c2b9aa47381b1dc54c03c65b595 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 8 Jul 2012 10:40:33 +0000 Subject: structure copying replaced with the inheritance git-svn-id: http://svn.miranda-ng.org/main/trunk@842 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/hdr/modern_clist.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'plugins/Clist_modern/hdr/modern_clist.h') diff --git a/plugins/Clist_modern/hdr/modern_clist.h b/plugins/Clist_modern/hdr/modern_clist.h index f82e4c75bd..527bf18b64 100644 --- a/plugins/Clist_modern/hdr/modern_clist.h +++ b/plugins/Clist_modern/hdr/modern_clist.h @@ -40,6 +40,8 @@ extern pfnMyMonitorFromWindow MyMonitorFromWindow; typedef BOOL(WINAPI *pfnMyGetMonitorInfo) (HMONITOR, LPMONITORINFO); extern pfnMyGetMonitorInfo MyGetMonitorInfo; +/////////////////////////////////////////////////////////////////////////////// + class CSmileyString { public: @@ -66,23 +68,20 @@ public: DestroySmileyList(); } - void ReplaceSmileys(struct SHORTDATA *dat, struct tag_DNCE * pdnce, TCHAR *szText, BOOL replace_smileys); + void ReplaceSmileys(struct SHORTDATA *dat, struct displayNameCacheEntry *pdnce, TCHAR *szText, BOOL replace_smileys); /** Destroy smiley list */ void DestroySmileyList(); /** Copy Smiley List */ void _CopySmileyList( SortedList *plInput ); - void AddListeningToIcon(struct SHORTDATA *dat, struct tag_DNCE * pdnce, TCHAR *szText, BOOL replace_smileys); + void AddListeningToIcon(struct SHORTDATA *dat, struct displayNameCacheEntry *pdnce, TCHAR *szText, BOOL replace_smileys); }; -struct tag_DNCE -{ - HANDLE m_cache_hContact; - TCHAR* m_cache_tcsName; +/////////////////////////////////////////////////////////////////////////////// - TCHAR* m_cache_tcsGroup; - int m_cache_nHidden; +struct displayNameCacheEntry : public ClcCacheEntryBase +{ int m_cache_nNoHiddenOffline; char* m_cache_cszProto; @@ -111,7 +110,9 @@ struct tag_DNCE void freeName(void); }; -typedef tag_DNCE displayNameCacheEntry,*pdisplayNameCacheEntry, *PDNCE; +typedef displayNameCacheEntry *pdisplayNameCacheEntry, *PDNCE; + +/////////////////////////////////////////////////////////////////////////////// typedef struct tagEXTRASLOTINFO { -- cgit v1.2.3