summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-11-29 06:43:44 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-11-29 06:43:44 +0000
commit830858b9f72fef55d3617bda439d5b3999b4a0b0 (patch)
treef55cf33f095a3ad23b7cd5f94a13cabcb7b5e7db /legacy
parent4c78e106c3705abd30d87ad3a6307eb2190b4107 (diff)
Ecore: more __UNUSED__ fixes
SVN revision: 79812
Diffstat (limited to 'legacy')
-rw-r--r--legacy/ecore/src/lib/ecore_wayland/ecore_wl_private.h10
-rw-r--r--legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_data_object.cpp12
-rw-r--r--legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_source.cpp2
-rw-r--r--legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_target.cpp2
-rw-r--r--legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_private.h10
5 files changed, 18 insertions, 18 deletions
diff --git a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_private.h b/legacy/ecore/src/lib/ecore_wayland/ecore_wl_private.h
index 7f59ae9bcd..ecd7a110b3 100644
--- a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_private.h
+++ b/legacy/ecore/src/lib/ecore_wayland/ecore_wl_private.h
@@ -92,11 +92,11 @@ void _ecore_wl_input_pointer_xy_get(int *x, int *y);
92void _ecore_wl_input_set_selection(Ecore_Wl_Input *input, struct wl_data_source *source); 92void _ecore_wl_input_set_selection(Ecore_Wl_Input *input, struct wl_data_source *source);
93 93
94void _ecore_wl_dnd_add(Ecore_Wl_Input *input, struct wl_data_device *data_device, struct wl_data_offer *offer); 94void _ecore_wl_dnd_add(Ecore_Wl_Input *input, struct wl_data_device *data_device, struct wl_data_offer *offer);
95void _ecore_wl_dnd_enter(void *data, struct wl_data_device *data_device __UNUSED__, unsigned int timestamp __UNUSED__, struct wl_surface *surface, int x, int y, struct wl_data_offer *offer); 95void _ecore_wl_dnd_enter(void *data, struct wl_data_device *data_device, unsigned int timestamp, struct wl_surface *surface, int x, int y, struct wl_data_offer *offer);
96void _ecore_wl_dnd_leave(void *data, struct wl_data_device *data_device __UNUSED__); 96void _ecore_wl_dnd_leave(void *data, struct wl_data_device *data_device);
97void _ecore_wl_dnd_motion(void *data, struct wl_data_device *data_device __UNUSED__, unsigned int timestamp __UNUSED__, int x, int y); 97void _ecore_wl_dnd_motion(void *data, struct wl_data_device *data_device, unsigned int timestamp, int x, int y);
98void _ecore_wl_dnd_drop(void *data, struct wl_data_device *data_device __UNUSED__); 98void _ecore_wl_dnd_drop(void *data, struct wl_data_device *data_device);
99void _ecore_wl_dnd_selection(void *data, struct wl_data_device *data_device __UNUSED__, struct wl_data_offer *offer); 99void _ecore_wl_dnd_selection(void *data, struct wl_data_device *data_device, struct wl_data_offer *offer);
100void _ecore_wl_dnd_del(Ecore_Wl_Dnd_Source *source); 100void _ecore_wl_dnd_del(Ecore_Wl_Dnd_Source *source);
101 101
102struct wl_data_source *_ecore_wl_create_data_source(Ecore_Wl_Display *ewd); 102struct wl_data_source *_ecore_wl_create_data_source(Ecore_Wl_Display *ewd);
diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_data_object.cpp b/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_data_object.cpp
index 75e26f5c90..213197780b 100644
--- a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_data_object.cpp
+++ b/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_data_object.cpp
@@ -119,7 +119,7 @@ HRESULT DataObject::GetData(FORMATETC *pFormatEtc, STGMEDIUM *pMedium)
119 return S_OK; 119 return S_OK;
120} 120}
121 121
122HRESULT DataObject::GetDataHere(FORMATETC *pFormatEtc __UNUSED__, STGMEDIUM *pmedium __UNUSED__) 122HRESULT DataObject::GetDataHere(FORMATETC *pFormatEtc EINA_UNUSED, STGMEDIUM *pmedium EINA_UNUSED)
123{ 123{
124 return DATA_E_FORMATETC; 124 return DATA_E_FORMATETC;
125} 125}
@@ -129,14 +129,14 @@ HRESULT DataObject::QueryGetData(FORMATETC *pFormatEtc)
129 return (lookup_format_etc(pFormatEtc) == -1) ? DV_E_FORMATETC : S_OK; 129 return (lookup_format_etc(pFormatEtc) == -1) ? DV_E_FORMATETC : S_OK;
130} 130}
131 131
132HRESULT DataObject::GetCanonicalFormatEtc(FORMATETC *pFormatEct __UNUSED__, FORMATETC *pFormatEtcOut) 132HRESULT DataObject::GetCanonicalFormatEtc(FORMATETC *pFormatEct EINA_UNUSED, FORMATETC *pFormatEtcOut)
133{ 133{
134 // Apparently we have to set this field to NULL even though we don't do anything else 134 // Apparently we have to set this field to NULL even though we don't do anything else
135 pFormatEtcOut->ptd = NULL; 135 pFormatEtcOut->ptd = NULL;
136 return E_NOTIMPL; 136 return E_NOTIMPL;
137} 137}
138 138
139HRESULT DataObject::SetData(FORMATETC *pFormatEtc __UNUSED__, STGMEDIUM *pMedium __UNUSED__, BOOL fRelease __UNUSED__) 139HRESULT DataObject::SetData(FORMATETC *pFormatEtc EINA_UNUSED, STGMEDIUM *pMedium EINA_UNUSED, BOOL fRelease EINA_UNUSED)
140{ 140{
141 return E_NOTIMPL; 141 return E_NOTIMPL;
142} 142}
@@ -157,17 +157,17 @@ HRESULT DataObject::EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC **ppEnumForm
157 } 157 }
158} 158}
159 159
160HRESULT DataObject::DAdvise(FORMATETC *pFormatEtc __UNUSED__, DWORD advf __UNUSED__, IAdviseSink *, DWORD *) 160HRESULT DataObject::DAdvise(FORMATETC *pFormatEtc EINA_UNUSED, DWORD advf EINA_UNUSED, IAdviseSink *, DWORD *)
161{ 161{
162 return OLE_E_ADVISENOTSUPPORTED; 162 return OLE_E_ADVISENOTSUPPORTED;
163} 163}
164 164
165HRESULT DataObject::DUnadvise(DWORD dwConnection __UNUSED__) 165HRESULT DataObject::DUnadvise(DWORD dwConnection EINA_UNUSED)
166{ 166{
167 return OLE_E_ADVISENOTSUPPORTED; 167 return OLE_E_ADVISENOTSUPPORTED;
168} 168}
169 169
170HRESULT DataObject::EnumDAdvise(IEnumSTATDATA **ppEnumAdvise __UNUSED__) 170HRESULT DataObject::EnumDAdvise(IEnumSTATDATA **ppEnumAdvise EINA_UNUSED)
171{ 171{
172 return OLE_E_ADVISENOTSUPPORTED; 172 return OLE_E_ADVISENOTSUPPORTED;
173} 173}
diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_source.cpp b/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_source.cpp
index bea7736b7d..a3a8bb1865 100644
--- a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_source.cpp
+++ b/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_source.cpp
@@ -67,7 +67,7 @@ HRESULT DropSource::QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState)
67 return S_OK; 67 return S_OK;
68} 68}
69 69
70HRESULT DropSource::GiveFeedback(DWORD dwEffect __UNUSED__) 70HRESULT DropSource::GiveFeedback(DWORD dwEffect EINA_UNUSED)
71{ 71{
72 return DRAGDROP_S_USEDEFAULTCURSORS; 72 return DRAGDROP_S_USEDEFAULTCURSORS;
73} 73}
diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_target.cpp b/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_target.cpp
index e19fb5d242..2f2da1af65 100644
--- a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_target.cpp
+++ b/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_target.cpp
@@ -152,7 +152,7 @@ HRESULT DropTarget::Drop(IDataObject *pDataObject, DWORD grfKeyState, POINTL pt,
152 152
153// internal helper function 153// internal helper function
154 154
155DWORD DropTarget::DropEffect(DWORD grfKeyState, POINTL pt __UNUSED__, DWORD dwAllowed) 155DWORD DropTarget::DropEffect(DWORD grfKeyState, POINTL pt EINA_UNUSED, DWORD dwAllowed)
156{ 156{
157 DWORD dwEffect = 0; 157 DWORD dwEffect = 0;
158 158
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_private.h b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_private.h
index dfb5fbc70d..240210ca0d 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_private.h
+++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_private.h
@@ -417,7 +417,7 @@ void _ecore_xcb_input_shutdown(void);
417# ifdef ECORE_XCB_XINPUT 417# ifdef ECORE_XCB_XINPUT
418void _ecore_xcb_input_handle_event(xcb_generic_event_t *event); 418void _ecore_xcb_input_handle_event(xcb_generic_event_t *event);
419# else 419# else
420void _ecore_xcb_input_handle_event(xcb_generic_event_t *event __UNUSED__); 420void _ecore_xcb_input_handle_event(xcb_generic_event_t *event);
421# endif 421# endif
422 422
423void _ecore_xcb_dri_init(void); 423void _ecore_xcb_dri_init(void);
@@ -439,10 +439,10 @@ void _ecore_xcb_window_grab_allow_events(Ecore_X_Window event_win,
439 void *event, 439 void *event,
440 Ecore_X_Time timestamp); 440 Ecore_X_Time timestamp);
441 441
442int _ecore_xcb_netwm_startup_info_begin(Ecore_X_Window win __UNUSED__, 442int _ecore_xcb_netwm_startup_info_begin(Ecore_X_Window win,
443 uint8_t data __UNUSED__); 443 uint8_t data);
444int _ecore_xcb_netwm_startup_info(Ecore_X_Window win __UNUSED__, 444int _ecore_xcb_netwm_startup_info(Ecore_X_Window win,
445 uint8_t data __UNUSED__); 445 uint8_t data);
446Ecore_X_Window_State _ecore_xcb_netwm_window_state_get(Ecore_X_Atom atom); 446Ecore_X_Window_State _ecore_xcb_netwm_window_state_get(Ecore_X_Atom atom);
447 447
448int _ecore_xcb_error_handle(xcb_generic_error_t *err); 448int _ecore_xcb_error_handle(xcb_generic_error_t *err);