From a64bff6aabd5330b72bcf42a6473ea9f468864ab Mon Sep 17 00:00:00 2001 From: Dorota Czaplejewicz Date: Fri, 16 Aug 2019 17:59:43 +0000 Subject: [PATCH] button: Add const qualifiers where needed --- eek/eek-keyboard.h | 2 +- eek/eek-renderer.c | 6 +++--- src/layout.h | 2 +- src/layout.rs | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eek/eek-keyboard.h b/eek/eek-keyboard.h index bea57c8f..af4c68af 100644 --- a/eek/eek-keyboard.h +++ b/eek/eek-keyboard.h @@ -67,7 +67,7 @@ struct squeek_button *eek_keyboard_find_button_by_name(LevelKeyboard *keyboard, /// Represents the path to the button within a view struct button_place { struct squeek_row *row; - struct squeek_button *button; + const struct squeek_button *button; }; struct button_place eek_keyboard_get_button_by_state(struct squeek_view *view, diff --git a/eek/eek-renderer.c b/eek/eek-renderer.c index 28ef1daf..0e96056d 100644 --- a/eek/eek-renderer.c +++ b/eek/eek-renderer.c @@ -76,7 +76,7 @@ extern void _eek_rounded_polygon (cairo_t *cr, static void eek_renderer_real_render_button_label (EekRenderer *self, PangoLayout *layout, - struct squeek_button *button); + const struct squeek_button *button); static void invalidate (EekRenderer *renderer); static void render_button (EekRenderer *self, @@ -185,7 +185,7 @@ render_keyboard_surface (EekRenderer *renderer, struct squeek_view *view) static void render_button_outline (EekRenderer *renderer, cairo_t *cr, - struct squeek_button *button, + const struct squeek_button *button, gboolean active) { EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer); @@ -368,7 +368,7 @@ eek_renderer_apply_transformation_for_button (EekRenderer *self, static void eek_renderer_real_render_button_label (EekRenderer *self, PangoLayout *layout, - struct squeek_button *button) + const struct squeek_button *button) { EekRendererPrivate *priv = eek_renderer_get_instance_private (self); diff --git a/src/layout.h b/src/layout.h index 7a5c0807..dc2b9661 100644 --- a/src/layout.h +++ b/src/layout.h @@ -52,7 +52,7 @@ void squeek_button_set_bounds(struct squeek_button* button, EekBounds bounds); struct squeek_symbol *squeek_button_get_symbol ( const struct squeek_button *button); -struct squeek_key *squeek_button_get_key(struct squeek_button*); +struct squeek_key *squeek_button_get_key(const struct squeek_button*); uint32_t *squeek_button_has_key(const struct squeek_button* button, const struct squeek_key *key); void squeek_button_print(const struct squeek_button* button); diff --git a/src/layout.rs b/src/layout.rs index 2e7a0fe4..c112dd9a 100644 --- a/src/layout.rs +++ b/src/layout.rs @@ -263,9 +263,9 @@ pub mod c { #[no_mangle] pub extern "C" fn squeek_button_get_key( - button: *mut ::layout::Button + button: *const ::layout::Button ) -> ::keyboard::c::CKeyState { - let button = unsafe { &mut *button }; + let button = unsafe { &*button }; ::keyboard::c::CKeyState::wrap(button.state.clone()) }