delphi headers cleaning

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

4 files changed, 22 insertions, 23 deletions

diff --git a/include/delphi/m_clist.inc b/include/delphi/m_clist.inc
index 24e4062172..db69c8050b 100644
--- a/include/delphi/m_clist.inc
+++ b/include/delphi/m_clist.inc
@@ -262,7 +262,7 @@ const
 

   {

     wParam : HCONTACT

-    lParam : HDBEVENT

+    lParam : HANDLE

     Affect : Remove an event from the contact list queue

     Returns: 0 on success, [non zero] on failure

   }

diff --git a/include/delphi/m_core.inc b/include/delphi/m_core.inc
index cff99d5b69..7daa189ceb 100644
--- a/include/delphi/m_core.inc
+++ b/include/delphi/m_core.inc
@@ -53,7 +53,6 @@ const
   DBVTF_DENYUNICODE    = $10000;

 

 type

-  HDBEVENT = Integer;

   PDBVARIANT = ^TDBVARIANT;

   TDBVARIANT = record

     _type: Byte;

diff --git a/include/delphi/m_database.inc b/include/delphi/m_database.inc
index 11af089f1a..0cb6eeacb4 100644
--- a/include/delphi/m_database.inc
+++ b/include/delphi/m_database.inc
@@ -303,7 +303,7 @@ const
     lParam : Pointer to TDBEVENTINFO initialised with data

     affect : Add's an event to the contact's event list, the TDBEVENTINFO

              structure should be filled with the event of message -- see notes

-    returns: a handle to a DB event (HDBEVENT), or NULL on error

+    returns: a handle to a DB event (HANDLE), or NULL on error

     notes  : Triggers DB/Event/Added event just before it returns,

              Events are sorted chronologically as they are entered,

              so you cannot guarantee that the new hEvent is the last event in the chain,

@@ -321,7 +321,7 @@ const
 

   {

     wParam : Handle to the contact

-    lParam : HDBEVENT handle to delete

+    lParam : HANDLE handle to delete

     affects: Removes a single event from the database for the given contact

     returns: 0 on success, nonzero on failure

     notes  : Triggers DB/Event/Deleted just before the event *is* deleted

@@ -331,8 +331,8 @@ const
   {

     wParam : Handle to DB event

     lParam : 0

-    returns: Returns the space in bytes requried to store the blob in HDBEVENT

-             given by HDBEVENT(wParam) -- or -1 on error

+    returns: Returns the space in bytes requried to store the blob in HANDLE

+             given by HANDLE(wParam) -- or -1 on error

   }

   MS_DB_EVENT_GETBLOBSIZE:PAnsiChar = 'DB/Event/GetBlobSize';

 

@@ -398,19 +398,19 @@ const
 

   {

     wParam : HCONTACT

-    lParam : HDBEVENT

+    lParam : HANDLE

     affect : Changes the flag for an event to mark it as read

     Returns: Returns the entire flag DWORD for the event after the change, or -1

-             if HDBEVENT is invalid, see notes

+             if HANDLE is invalid, see notes

     notes  : This iss one of the database write operations that does not trigger

              an event, modules should not save flagss states for any length of time.

   }

   MS_DB_EVENT_MARKREAD:PAnsiChar = 'DB/Event/MarkRead';

 

   {

-    wParam : HDBEVENT

+    wParam : HANDLE

     lParam : 0

-    Affect : Returns a handle to a contact that owns the HDBEVENT,

+    Affect : Returns a handle to a contact that owns the HANDLE,

              see notes

     Returns: Returns a handle if successful or HDBEEVENT(-1) on failure

     notes  : This service is very slow, only use wheen you have no other choice

@@ -433,7 +433,7 @@ const
     lParam : 0

     Affect : Retrieves a handle to the first unreead event in a chain for a HCONTACT

              see notes

-    Returns: Returns a HDBEVENT handle or NULL(0) if the HCONTACT is invalid

+    Returns: Returns a HANDLE handle or NULL(0) if the HCONTACT is invalid

              or all it's events have beeen read.

     Notes  : Events in a chain are sorted chronologically automatically,

              but this does not necessarily mean that all events after

@@ -453,19 +453,19 @@ const
   MS_DB_EVENT_FINDLAST:PAnsiChar = 'DB/Event/FindLast';

 

   {

-    wParam : HDBEVENT

+    wParam : HANDLE

     lParam : 0

-    Affects: Retrieves a handle to the next event in a chain after HDBEVENT

-    Returns: A handle to the next DB event or NULL(0) if HDBEVENT is invalid

+    Affects: Retrieves a handle to the next event in a chain after HANDLE

+    Returns: A handle to the next DB event or NULL(0) if HANDLE is invalid

              or the last event in the chain.

   }

   MS_DB_EVENT_FINDNEXT:PAnsiChar = 'DB/Event/FindNext';

 

   {

-    wParam : HDBEVENT

+    wParam : HANDLE

     lParam : 0

-    Affects: Retrieves a handle to the previous event in a chain before HDBEVENT

-    Returns: A handle to the previous HDBEVENT or NULL(0) if HDBEVENT is invalid

+    Affects: Retrieves a handle to the previous event in a chain before HANDLE

+    Returns: A handle to the previous HANDLE or NULL(0) if HANDLE is invalid

              or is the first event in the chain

   }

   MS_DB_EVENT_FINDPREV:PAnsiChar = 'DB/Event/FindPrev';

@@ -628,7 +628,7 @@ const
 

   {

     wParam : HCONTACT

-    lParam : HDBEVENT

+    lParam : HANDLE

     Affect : Called when an event is about to be deleted from the event chain

              for a contact, see notes

     notes  : Returning non zero from your hook will NOT stop the deletion,

diff --git a/include/delphi/m_protosvc.inc b/include/delphi/m_protosvc.inc
index 4414323a44..549a10f08e 100644
--- a/include/delphi/m_protosvc.inc
+++ b/include/delphi/m_protosvc.inc
@@ -346,7 +346,7 @@ const
   PS_GETSTATUS = '/GetStatus';

 

   {

-    wParam : HDBEVENT

+    wParam : HANDLE

     lParam : 0

     Affect : allow 'somebody' to add the user to their contact list, see notes

     Returns: 0 on success, [non zero] on failure

@@ -356,13 +356,13 @@ const
              protocolSpecific: DWORD;

              nick, firstname, lastName, e-mail, requestReason: ASCIIZ;

              -

-             HDBEVENT musts be the handle of such an event, one or more

+             HANDLE musts be the handle of such an event, one or more

              fields may be empty if the protocol doesn't support them

   }

   PS_AUTHALLOW = '/Authorize';

 

   {

-    wParam : HDBEVENT

+    wParam : HANDLE

     lParam : TChar - Reason

     Affect : Deny an authorisation request

     Returns: 0 on success, [non zero] on failure

@@ -500,10 +500,10 @@ const
 

   {

     wParam : MAKEWPARAM(flags, iContact)

-    lParam : HDBEVENT

+    lParam : HANDLE

     Affects: Add a contact to the contact list given an auth/added/contacts events, see notes

     Returns: A HCONTACT or NULL(0) on failure

-    Notes  : HDBEVENT must be either EVENTTYPE_AUTHREQ or EVENTTYPE_ADDED

+    Notes  : HANDLE must be either EVENTTYPE_AUTHREQ or EVENTTYPE_ADDED

              flags are the same as PS_ADDTOLIST,

              -

              iContacts is only used for contacts vents, it is 0-based index