Jacek Caban : mshtml: Rename call_event to fire_event.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: aa6ee29e0147f7a8abfe500e3320df72022f7430
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=aa6ee29e0147f7a8abfe500e33...

Author: Jacek Caban 
Date:   Tue Aug  2 11:07:12 2011 +0200

mshtml: Rename call_event to fire_event.

---

dlls/mshtml/htmlelem.c       |    2 +-
 dlls/mshtml/htmlevent.c      |    6 +++---
 dlls/mshtml/htmlevent.h      |    2 +-
 dlls/mshtml/htmlinput.c      |    4 ++--
 dlls/mshtml/mshtml_private.h |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c
index 40c8ff5..c4e0f0a 100644
--- a/dlls/mshtml/htmlelem.c
+++ b/dlls/mshtml/htmlelem.c
@@ -1371,7 +1371,7 @@ static HRESULT WINAPI HTMLElement_click(IHTMLElement *iface)

TRACE("(%p)\n", This);

-    return call_event(&This->node, EVENTID_CLICK);
+    return call_fire_event(&This->node, EVENTID_CLICK);
 }

static HRESULT WINAPI HTMLElement_get_filters(IHTMLElement *iface,
diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c
index f638b9a..49349b0 100644
--- a/dlls/mshtml/htmlevent.c
+++ b/dlls/mshtml/htmlevent.c
@@ -1088,14 +1088,14 @@ HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *even
     return S_OK;
 }

-HRESULT call_event(HTMLDOMNode *node, eventid_t eid)
+HRESULT call_fire_event(HTMLDOMNode *node, eventid_t eid)
 {
     HRESULT hres;

-    if(node->vtbl->call_event) {
+    if(node->vtbl->fire_event) {
         BOOL handled = FALSE;

-        hres = node->vtbl->call_event(node, eid, &handled);
+        hres = node->vtbl->fire_event(node, eid, &handled);
         if(handled)
             return hres;
     }
diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h
index f48afee..1501a56 100644
--- a/dlls/mshtml/htmlevent.h
+++ b/dlls/mshtml/htmlevent.h
@@ -51,7 +51,7 @@ HRESULT get_event_handler(event_target_t**,eventid_t,VARIANT*) DECLSPEC_HIDDEN;
 HRESULT attach_event(event_target_t**,nsIDOMNode*,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*) DECLSPEC_HIDDEN;
 HRESULT detach_event(event_target_t*,HTMLDocument*,BSTR,IDispatch*) DECLSPEC_HIDDEN;
 HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPEC_HIDDEN;
-HRESULT call_event(HTMLDOMNode*,eventid_t) DECLSPEC_HIDDEN;
+HRESULT call_fire_event(HTMLDOMNode*,eventid_t) DECLSPEC_HIDDEN;
 void update_cp_events(HTMLWindow*,event_target_t**,cp_static_data_t*,nsIDOMNode*) DECLSPEC_HIDDEN;

static inline event_target_t **get_node_event_target(HTMLDOMNode *node)
diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c
index 0775436..2428120 100644
--- a/dlls/mshtml/htmlinput.c
+++ b/dlls/mshtml/htmlinput.c
@@ -1150,7 +1150,7 @@ static void HTMLInputElement_destructor(HTMLDOMNode *iface)
     HTMLElement_destructor(&This->element.node);
 }

-static HRESULT HTMLInputElementImpl_call_event(HTMLDOMNode *iface, eventid_t eid, BOOL *handled)
+static HRESULT HTMLInputElementImpl_fire_event(HTMLDOMNode *iface, eventid_t eid, BOOL *handled)
 {
     HTMLInputElement *This = impl_from_HTMLDOMNode(iface);

@@ -1186,7 +1186,7 @@ static const NodeImplVtbl HTMLInputElementImplVtbl = {
     HTMLInputElement_destructor,
     HTMLElement_clone,
     NULL,
-    HTMLInputElementImpl_call_event,
+    HTMLInputElementImpl_fire_event,
     HTMLInputElementImpl_put_disabled,
     HTMLInputElementImpl_get_disabled,
 };
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index 35b9349..c3d648d 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -498,7 +498,7 @@ typedef struct {
     void (*destructor)(HTMLDOMNode*);
     HRESULT (*clone)(HTMLDOMNode*,nsIDOMNode*,HTMLDOMNode**);
     event_target_t **(*get_event_target)(HTMLDOMNode*);
-    HRESULT (*call_event)(HTMLDOMNode*,DWORD,BOOL*);
+    HRESULT (*fire_event)(HTMLDOMNode*,DWORD,BOOL*);
     HRESULT (*put_disabled)(HTMLDOMNode*,VARIANT_BOOL);
     HRESULT (*get_disabled)(HTMLDOMNode*,VARIANT_BOOL*);
     HRESULT (*get_document)(HTMLDOMNode*,IDispatch**);