From 31482a71ab968f1214a1cba600921c9f493f183b Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Fri, 14 Sep 2018 16:36:55 +0900 Subject: Rename dispatchPropertyChangeEvent API Stop overload and devide 2 APIs * dispatchSurfacePropChangeEvent * dispatchLayerPropChangeEvent Change-Id: Ibe5fb58d0dd06bcc0aa4e5e6063b57d05715656e Signed-off-by: Kazumasa Mitsunari --- src/wm_layer_control.cpp | 8 ++++---- src/wm_layer_control.hpp | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/wm_layer_control.cpp b/src/wm_layer_control.cpp index bb3bfc2..0028fca 100644 --- a/src/wm_layer_control.cpp +++ b/src/wm_layer_control.cpp @@ -46,14 +46,14 @@ static void surfaceCallback_static(t_ilm_surface surface, struct ilmSurfaceProperties* surface_prop, t_ilm_notification_mask mask) { - g_lc_ctxt->dispatchPropertyChangeEvent(surface, surface_prop, mask); + g_lc_ctxt->dispatchSurfacePropChangeEvent(surface, surface_prop, mask); } static void layerCallback_static(t_ilm_layer layer, struct ilmLayerProperties* layer_prop, t_ilm_notification_mask mask) { - g_lc_ctxt->dispatchPropertyChangeEvent(layer, layer_prop, mask); + g_lc_ctxt->dispatchLayerPropChangeEvent(layer, layer_prop, mask); } LayerControl::LayerControl(const std::string& root) @@ -470,7 +470,7 @@ void LayerControl::dispatchCreateEvent(ilmObjectType object, unsigned id, bool c } } -void LayerControl::dispatchPropertyChangeEvent(unsigned id, +void LayerControl::dispatchSurfacePropChangeEvent(unsigned id, struct ilmSurfaceProperties* sprop, t_ilm_notification_mask mask) { @@ -502,7 +502,7 @@ void LayerControl::dispatchPropertyChangeEvent(unsigned id, } } -void LayerControl::dispatchPropertyChangeEvent(unsigned id, +void LayerControl::dispatchLayerPropChangeEvent(unsigned id, struct ilmLayerProperties* lprop, t_ilm_notification_mask mask) { diff --git a/src/wm_layer_control.hpp b/src/wm_layer_control.hpp index a458f2f..7a283b9 100644 --- a/src/wm_layer_control.hpp +++ b/src/wm_layer_control.hpp @@ -84,8 +84,9 @@ class LayerControl // Don't use this function. void dispatchCreateEvent(ilmObjectType object, unsigned id, bool created); - void dispatchPropertyChangeEvent(unsigned id, struct ilmSurfaceProperties*, t_ilm_notification_mask); - void dispatchPropertyChangeEvent(unsigned id, struct ilmLayerProperties*, t_ilm_notification_mask); + void dispatchSurfacePropChangeEvent(unsigned id, struct ilmSurfaceProperties*, t_ilm_notification_mask); + void dispatchLayerPropChangeEvent(unsigned id, struct ilmLayerProperties*, t_ilm_notification_mask); + private: WMError makeVisible(const std::shared_ptr client); WMError makeInvisible(const std::shared_ptr client); -- cgit 1.2.3-korg