Miranda API sync with small compilation fixes

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

1 files changed, 18 insertions, 18 deletions

diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index 8c6b089879..61d4d48e4c 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -133,7 +133,7 @@ type
     case boolean of

      false: (

        iImage:int;

-       hContact:THANDLE);

+       hContact:HCONTACT);

      true : (

        groupId:word;

        group  :pClcGroup;);

@@ -292,7 +292,7 @@ type
 type

   PClcCacheEntryBase = ^ClcCacheEntryBase;

   ClcCacheEntryBase = record

-    hContact:THANDLE;

+    hContact:HCONTACT;

     name    :TCHAR;

     group   :TCHAR;

     isHidden:int;

@@ -349,10 +349,10 @@ type
     pfnAddInfoItemToGroup      : function  (var group:ClcGroup; flags:int; pszText:TChar):int; cdecl;

     pfnAddItemToGroup          : function  (var group:ClcGroup; iAboveItem:int):int; cdecl;

     pfnAddContactToGroup       : function  (var dat:ClcData; var group:ClcGroup;

-                                 hContact:THANDLE):int; cdecl;

-    pfnAddContactToTree        : procedure (hwnd:HWND; var dat:ClcData; hContact:THANDLE;

+                                 hContact:HCONTACT):int; cdecl;

+    pfnAddContactToTree        : procedure (hwnd:HWND; var dat:ClcData; hContact:HCONTACT;

                                  updateTotalCount:int; checkHideOffline:int); cdecl;

-    pfnDeleteItemFromTree      : procedure (hwnd:HWND; hItem:THANDLE); cdecl;

+    pfnDeleteItemFromTree      : procedure (hwnd:HWND; hItem:HCONTACT); cdecl;

     pfnRebuildEntireList       : procedure (hwnd:HWND; var dat:ClcData); cdecl;

     pfnGetGroupContentsCount   : function  (var group:ClcGroup; visibleOnly:int):int; cdecl;

     pfnSortCLC                 : procedure (hwnd:HWND; var dat:ClcData; useInsertionSort:int); cdecl;

@@ -384,7 +384,7 @@ type
     pfnClcStatusToPf2             : function  (status:int):int; cdecl;

     pfnIsHiddenMode               : function  (var dat:ClcData; status:int):int; cdecl;

     pfnHideInfoTip                : procedure (hwnd:HWND; var dat:ClcData); cdecl;

-    pfnNotifyNewContact           : procedure (hwnd:HWND; hContact:THANDLE); cdecl;

+    pfnNotifyNewContact           : procedure (hwnd:HWND; hContact:HCONTACT); cdecl;

     pfnGetDefaultExStyle          : function  :DWORD; cdecl;

     pfnGetDefaultFontSetting      : procedure (i:int; var lf:LOGFONT; var colour:COLORREF); cdecl;

     pfnGetFontSetting             : procedure (i:int; var lf:LOGFONT; var colour:COLORREF); cdecl;

@@ -400,22 +400,22 @@ type
     pfnRowHitTest        : function (var dat:ClcData; y:int):int; cdecl;

 

   (* clistevents.c *)

-    pfnEventsProcessContactDoubleClick : function (hContact:THANDLE):int; cdecl;

+    pfnEventsProcessContactDoubleClick : function (hContact:HCONTACT):int; cdecl;

     pfnEventsProcessTrayDoubleClick    : function (_para1:int):int; cdecl;

 

   (* clistmod.c *)

-    pfnIconFromStatusMode       : function (szProto:PAnsiChar; status:int; hContact:THANDLE):int; cdecl;

+    pfnIconFromStatusMode       : function (szProto:PAnsiChar; status:int; hContact:HCONTACT):int; cdecl;

     pfnShowHide                 : function (_para1:WPARAM; _para2:LPARAM):int; cdecl;

     pfnGetStatusModeDescription : function (mode:int; flags:int):TChar; cdecl;

 

   (* clistsettings.c *)

-    pfnGetCacheEntry   : function (hContact:THANDLE):PClcCacheEntry; cdecl;

-    pfnCreateCacheItem : function (hContact:THANDLE):PClcCacheEntry; cdecl;

+    pfnGetCacheEntry   : function (hContact:HCONTACT):PClcCacheEntry; cdecl;

+    pfnCreateCacheItem : function (hContact:HCONTACT):PClcCacheEntry; cdecl;

     pfnCheckCacheItem  : procedure (_para1:PClcCacheEntry); cdecl;

     pfnFreeCacheItem   : procedure (_para1:PClcCacheEntry); cdecl;

 

-    pfnGetContactDisplayName           : function (hContact:THANDLE; mode:int):TChar; cdecl;

-    pfnInvalidateDisplayNameCacheEntry : procedure (hContact:THANDLE); cdecl;

+    pfnGetContactDisplayName           : function  (hContact:HCONTACT; mode:int):TChar; cdecl;

+    pfnInvalidateDisplayNameCacheEntry : procedure (hContact:HCONTACT); cdecl;

 

   (* clisttray.c *)

     pfnTrayIconUpdateWithImageList : procedure (iImage:int; szNewTip:TChar;

@@ -438,7 +438,7 @@ type
     pfnOnCreateClc               : procedure ; cdecl;

 

   (* contact.c *)

-    pfnChangeContactIcon : procedure (hContact:THANDLE; iIcon:int; add:int); cdecl;

+    pfnChangeContactIcon : procedure (hContact:HCONTACT; iIcon:int; add:int); cdecl;

     pfnLoadContactTree   : procedure ; cdecl;

     pfnCompareContacts   : function (var contact1:ClcContact; var contact2:ClcContact):int; cdecl;

     pfnSortContacts      : procedure ; cdecl;

@@ -467,9 +467,9 @@ type
     pfnFreeEvent   : procedure (_para1:PCListEvent); cdecl;

 

     pfnAddEvent : function (_para1:PCLISTEVENT):PCListEvent; cdecl;

-    pfnGetEvent : function (hContact:THANDLE; idx:int):PCLISTEVENT; cdecl;

+    pfnGetEvent : function (hContact:HCONTACT; idx:int):PCLISTEVENT; cdecl;

 

-    pfnRemoveEvent     : function (hContact:THANDLE; hDbEvent:THANDLE):int; cdecl;

+    pfnRemoveEvent     : function (hContact:HCONTACT; hDbEvent:THANDLE):int; cdecl;

     pfnGetImlIconIndex : function (hIcon:HICON):int; cdecl;

 

   (*************************************************************************************

@@ -510,7 +510,7 @@ type
     szTip             : TChar;

     bTrayMenuOnScreen : BOOL;

 

-    pfnGetIconFromStatusMode  : function  (hContact:THANDLE; szProto:PAnsiChar;

+    pfnGetIconFromStatusMode  : function  (hContact:HCONTACT; szProto:PAnsiChar;

                                 status:int):HICON; cdecl;

 

     pfnInitTray               : procedure ; cdecl;

@@ -541,13 +541,13 @@ type
 	 * version 7 additions (0.11.0.x) - extra images

 	 *************************************************************************************)

     pfnReloadExtraIcons: procedure; cdecl;

-    pfnSetAllExtraIcons: procedure(hContact:THANDLE); cdecl;

+    pfnSetAllExtraIcons: procedure(hContact:HCONTACT); cdecl;

 

 	(*************************************************************************************

 	 * Miranda NG additions

 	 *************************************************************************************)

 

-	  pfnGetContactIcon: function(hContact:THANDLE):int; cdecl;

+	  pfnGetContactIcon: function(hContact:HCONTACT):int; cdecl;

 	  pfnTrayCalcChanged:function(szChangedProto:pAnsiChar; averageMode:int; iProtoCount:int):int; cdecl;

     pfnGetAverageMode:function(pNetProtoCount:pint):int; cdecl;

   end;