HCONTACT is not needed anymore

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

3 files changed, 22 insertions, 22 deletions

diff --git a/plugins/Clist_nicer/src/Include/clc.h b/plugins/Clist_nicer/src/Include/clc.h
index afb5a7ece5..9bec318541 100644
--- a/plugins/Clist_nicer/src/Include/clc.h
+++ b/plugins/Clist_nicer/src/Include/clc.h
@@ -103,7 +103,7 @@ typedef struct _OrderTreeData
 

 struct TExtraCache

 {

-	HCONTACT hContact;

+	MCONTACT hContact;

 	HANDLE   hTimeZone;

 	BYTE     valid;

 	TCHAR   *statusMsg;

@@ -121,7 +121,7 @@ struct ClcContact : public ClcContactBase
 	BOOL     bIsMeta;

 	BYTE     xStatus;

 	int      xStatusIcon;

-	HCONTACT hSubContact;

+	MCONTACT hSubContact;

 	char    *metaProto;

 	DWORD    codePage;

 	WORD     wStatus;

@@ -233,7 +233,7 @@ struct TCluiData {
 	HMENU hMenuNotify;

 	int iLastEventAdded;

 	int wNextMenuID;

-	HCONTACT hUpdateContact;

+	MCONTACT hUpdateContact;

 	DWORD sortTimer;

 	TCHAR *szNoEvents;

 	BOOL forceResize;

@@ -329,7 +329,7 @@ struct IconDesc {
 };

 

 struct NotifyMenuItemExData {

-	HCONTACT hContact;

+	MCONTACT hContact;

 	int iIcon;              // icon index in the image list

 	HICON hIcon;            // corresponding icon handle

 	HANDLE hDbEvent;

@@ -357,7 +357,7 @@ HANDLE ContactToItemHandle(ClcContact *contact, DWORD *nmFlags);
 

 //clcitems.c

 void RebuildEntireList(HWND hwnd, struct ClcData *dat);

-DWORD INTSORT_GetLastMsgTime(HCONTACT hContact);

+DWORD INTSORT_GetLastMsgTime(MCONTACT hContact);

 

 //clcmsgs.c

 LRESULT ProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPARAM wParam, LPARAM lParam);

@@ -409,10 +409,10 @@ void ConfigureEventArea(HWND hwnd);
 void ClearIcons(int mode);

 void SkinDrawBg(HWND hwnd, HDC hdc);

 int GetBasicFontID(ClcContact * contact);

-extern int __fastcall CLVM_GetContactHiddenStatus(HCONTACT hContact, char *szStatus, struct ClcData *dat);

+extern int __fastcall CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szStatus, struct ClcData *dat);

 void CreateViewModeFrame();

-int GetExtraCache(HCONTACT hContact, char *szProto);

-void ReloadExtraInfo(HCONTACT hContact);

+int GetExtraCache(MCONTACT hContact, char *szProto);

+void ReloadExtraInfo(MCONTACT hContact);

 void LoadAvatarForContact(ClcContact *p);

 void ApplyViewMode(const char *name);

 

@@ -425,7 +425,7 @@ void __inline PaintItem(HDC hdcMem, ClcGroup *group, ClcContact *contact, int in
 void Reload3dBevelColors();

 void ReloadThemedOptions();

 void SetButtonToSkinned();

-void RTL_DetectAndSet(ClcContact *contact, HCONTACT hContact);

+void RTL_DetectAndSet(ClcContact *contact, MCONTACT hContact);

 void RTL_DetectGroupName(ClcContact *group);

 void CLN_LoadAllIcons(BOOL mode);

 void ReloadSkinItemsToCache();

diff --git a/plugins/Clist_nicer/src/Include/clist.h b/plugins/Clist_nicer/src/Include/clist.h
index 51c769d031..6f85122933 100644
--- a/plugins/Clist_nicer/src/Include/clist.h
+++ b/plugins/Clist_nicer/src/Include/clist.h
@@ -23,8 +23,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 void LoadContactTree(void);

-int IconFromStatusMode(const char *szProto, int status, HCONTACT hContact, HICON *phIcon);

-HTREEITEM GetTreeItemByHContact(HCONTACT hContact);

+int IconFromStatusMode(const char *szProto, int status, MCONTACT hContact, HICON *phIcon);

+HTREEITEM GetTreeItemByHContact(MCONTACT hContact);

 void SortContacts(void);

 

 #define CLUIINTM_REDRAW (WM_USER+100)

diff --git a/plugins/Clist_nicer/src/Include/config.h b/plugins/Clist_nicer/src/Include/config.h
index e40a92d36c..30317670ec 100644
--- a/plugins/Clist_nicer/src/Include/config.h
+++ b/plugins/Clist_nicer/src/Include/config.h
@@ -52,34 +52,34 @@ class cfg
 public:

 	static void    init();

 

-   static DWORD   getDword(const HCONTACT hContact, const char *szModule, const char *szSetting, DWORD uDefault);

+   static DWORD   getDword(const MCONTACT hContact, const char *szModule, const char *szSetting, DWORD uDefault);

    static DWORD   getDword(const char *szModule, const char *szSetting, DWORD uDefault);

    static DWORD   getDword(const char *szSetting, DWORD uDefault);

 

-   static WORD    getWord(const HCONTACT hContact, const char *szModule, const char *szSetting, WORD uDefault);

+   static WORD    getWord(const MCONTACT hContact, const char *szModule, const char *szSetting, WORD uDefault);

    static WORD    getWord(const char *szModule, const char *szSetting, WORD uDefault);

    static WORD    getWord(const char *szSetting, WORD uDefault);

 

-   static int     getByte(const HCONTACT hContact, const char *szModule, const char *szSetting, int uDefault);

+   static int     getByte(const MCONTACT hContact, const char *szModule, const char *szSetting, int uDefault);

    static int     getByte(const char *szModule, const char *szSetting, int uDefault);

    static int     getByte(const char *szSetting, int uDefault);

 

-   static INT_PTR getTString(const HCONTACT hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv);

-   static INT_PTR getString(const HCONTACT hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv);

+   static INT_PTR getTString(const MCONTACT hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv);

+   static INT_PTR getString(const MCONTACT hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv);

 

-   static INT_PTR writeDword(const HCONTACT hContact, const char *szModule, const char *szSetting, DWORD value);

+   static INT_PTR writeDword(const MCONTACT hContact, const char *szModule, const char *szSetting, DWORD value);

    static INT_PTR writeDword(const char *szModule, const char *szSetting, DWORD value);

 

-   static INT_PTR writeWord(const HCONTACT hContact, const char *szModule, const char *szSetting, WORD value);

+   static INT_PTR writeWord(const MCONTACT hContact, const char *szModule, const char *szSetting, WORD value);

    static INT_PTR writeWord(const char *szModule, const char *szSetting, WORD value);

 

-   static INT_PTR writeByte(const HCONTACT hContact, const char *szModule, const char *szSetting, BYTE value);

+   static INT_PTR writeByte(const MCONTACT hContact, const char *szModule, const char *szSetting, BYTE value);

    static INT_PTR writeByte(const char *szModule, const char *szSetting, BYTE value);

 

-   static INT_PTR writeTString(const HCONTACT hContact, const char *szModule, const char *szSetting, const TCHAR *st);

-   static INT_PTR writeString(const HCONTACT hContact, const char *szModule, const char *szSetting, const char *st);

+   static INT_PTR writeTString(const MCONTACT hContact, const char *szModule, const char *szSetting, const TCHAR *st);

+   static INT_PTR writeString(const MCONTACT hContact, const char *szModule, const char *szSetting, const char *st);

 

-	static TExtraCache* getCache(const HCONTACT hContact, const char *szProto);

+	static TExtraCache* getCache(const MCONTACT hContact, const char *szProto);

 

 public:

    static TCluiData dat;