Clist Modern own extra icons support removed

git-svn-id: http://svn.miranda-ng.org/main/trunk@2138 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 7 insertions, 23 deletions

diff --git a/plugins/Clist_modern/src/hdr/modern_clist.h b/plugins/Clist_modern/src/hdr/modern_clist.h
index 82f473d390..512b19509c 100644
--- a/plugins/Clist_modern/src/hdr/modern_clist.h
+++ b/plugins/Clist_modern/src/hdr/modern_clist.h
@@ -2,8 +2,8 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2008 Miranda ICQ/IM project, 

-all portions of this codebase are copyrighted to the people 

+Copyright 2000-2008 Miranda ICQ/IM project,

+all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

 This program is free software; you can redistribute it and/or

@@ -43,14 +43,14 @@ extern pfnMyGetMonitorInfo MyGetMonitorInfo;
 ///////////////////////////////////////////////////////////////////////////////

 

 class CSmileyString

-{	 

+{

 public:

 	SortedList*	plText;

 	int			iMaxSmileyHeight;

 

 	CSmileyString()   : plText( NULL ), iMaxSmileyHeight( 0 ) {};

 	CSmileyString( const CSmileyString& ssIn )

-	{	

+	{

 		_CopySmileyList( ssIn.plText );

 		iMaxSmileyHeight = ssIn.iMaxSmileyHeight;

 	}

@@ -70,7 +70,7 @@ public:
 

 	void ReplaceSmileys(struct SHORTDATA *dat, struct ClcCacheEntry *pdnce, TCHAR *szText, BOOL replace_smileys);

 

-	/**	Destroy smiley list */ 

+	/**	Destroy smiley list */

 	void DestroySmileyList();

 	/**  Copy Smiley List */

 	void _CopySmileyList( SortedList *plInput );

@@ -114,18 +114,6 @@ typedef ClcCacheEntry *pClcCacheEntry, *PDNCE;
 

 ///////////////////////////////////////////////////////////////////////////////

 

-typedef struct tagEXTRASLOTINFO

-{

-    union

-    {

-        TCHAR * ptszSlotName;   // one of this string should be given

-        char  * pszSlotName;

-    };

-    char * pszSlotID;

-    BOOL fUnicode;

-    BYTE iSlot;               // the slot 10-16 are available, do not use

-} EXTRASLOTINFO;

-

 #define CLVM_FILTER_PROTOS			1

 #define CLVM_FILTER_GROUPS			2

 #define CLVM_FILTER_STATUS			4

@@ -160,6 +148,6 @@ typedef struct tagEXTRASLOTINFO
 #define CLVM_MODULE "CLVM"

 #endif

 

-#define GROUPF_SHOWOFFLINE 0x40   

+#define GROUPF_SHOWOFFLINE 0x40

 

-#endif
\ No newline at end of file
+#endif

diff --git a/plugins/Clist_modern/src/hdr/modern_clui.h b/plugins/Clist_modern/src/hdr/modern_clui.h
index eb353f4609..75d348e547 100644
--- a/plugins/Clist_modern/src/hdr/modern_clui.h
+++ b/plugins/Clist_modern/src/hdr/modern_clui.h
@@ -52,7 +52,6 @@ public:
 

 	EVENTHOOK( OnEvent_ModulesLoaded );

 	EVENTHOOK( OnEvent_ContactMenuPreBuild );

-	EVENTHOOK( OnEvent_DBSettingChanging );

 	EVENTHOOK( OnEvent_FontReload );

 	

 	SERVICE( Service_ShowMainMenu );

diff --git a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
index a0238b6d6d..120457fcab 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
@@ -230,7 +230,6 @@ int     GetStatusForContact(HANDLE hContact,char *szProto);
 int     InitCustomMenus(void);                                                //clistmenus.c

 int     InitFramesMenus(void);                                                //framesmenus.c

 int     LoadMoveToGroup();                                                   //movetogroup.c

-int     LoadPositionsFromDB(BYTE * OrderPos);                                    //clistopts.c

 int     LoadStatusBarData();                                                //modern_statusbar.c

 int     MenuModulesLoaded(WPARAM wParam,LPARAM lParam);                              //clistmenu.c

 int     MenuModulesShutdown(WPARAM wParam,LPARAM lParam);                           //clistmenu.c

@@ -258,7 +257,6 @@ void    FreeRowCell();                                                      //Ro
 void    InitGdiPlus();                                                      //gdiplus.cpp

 void    InitTray();                                                         //clisttray.c

 void    InvalidateDNCEbyPointer(HANDLE hContact,pClcCacheEntry pdnce,int SettingType);  //clistsettings.c

-void    ReAssignExtraIcons();                                                //extraimage.c

 void    ShutdownGdiPlus();                                                   //gdiplus.cpp

 void    TextOutWithGDIp(HDC hDestDC, int x, int y, LPCTSTR lpString, int nCount);         //gdiplus.cpp

 void    UninitCustomMenus();                                                //clistmenus.c

@@ -269,7 +267,6 @@ void    UpdateAllAvatars(struct ClcData *dat);
 //cluiframes.c

 void    gtaRenewText(HANDLE hContact);

 int     ExtraImage_ExtraIDToColumnNum(int extra);

-int     ExtraImage_ColumnNumToExtraID(int column);

 

 int     LoadSkinButtonModule();

 void    UninitSkinHotKeys();