s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

button: Add const qualifiers where needed

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2019-08-16 17:59:43 +00:00
parent 4e9a8e4afe
commit a64bff6aab
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eek/eek-keyboard.h
View File

@ -67,7 +67,7 @@ struct squeek_button *eek_keyboard_find_button_by_name(LevelKeyboard *keyboard,
/// Represents the path to the button within a view /// Represents the path to the button within a view
struct button_place { struct button_place {
struct squeek_row *row; 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, struct button_place eek_keyboard_get_button_by_state(struct squeek_view *view,

6
eek/eek-renderer.c
View File

@ -76,7 +76,7 @@ extern void _eek_rounded_polygon (cairo_t *cr,
static void eek_renderer_real_render_button_label (EekRenderer *self, static void eek_renderer_real_render_button_label (EekRenderer *self,
PangoLayout *layout, PangoLayout *layout,
struct squeek_button *button); const struct squeek_button *button);
static void invalidate (EekRenderer *renderer); static void invalidate (EekRenderer *renderer);
static void render_button (EekRenderer *self, static void render_button (EekRenderer *self,
@ -185,7 +185,7 @@ render_keyboard_surface (EekRenderer *renderer, struct squeek_view *view)
static void static void
render_button_outline (EekRenderer *renderer, render_button_outline (EekRenderer *renderer,
cairo_t *cr, cairo_t *cr,
struct squeek_button *button, const struct squeek_button *button,
gboolean active) gboolean active)
{ {
EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer); EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
@ -368,7 +368,7 @@ eek_renderer_apply_transformation_for_button (EekRenderer *self,
static void static void
eek_renderer_real_render_button_label (EekRenderer *self, eek_renderer_real_render_button_label (EekRenderer *self,
PangoLayout *layout, PangoLayout *layout,
struct squeek_button *button) const struct squeek_button *button)
{ {
EekRendererPrivate *priv = eek_renderer_get_instance_private (self); EekRendererPrivate *priv = eek_renderer_get_instance_private (self);

2
src/layout.h
View File

@ -52,7 +52,7 @@ void squeek_button_set_bounds(struct squeek_button* button, EekBounds bounds);
struct squeek_symbol *squeek_button_get_symbol ( struct squeek_symbol *squeek_button_get_symbol (
const struct squeek_button *button); 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, uint32_t *squeek_button_has_key(const struct squeek_button* button,
const struct squeek_key *key); const struct squeek_key *key);
void squeek_button_print(const struct squeek_button* button); void squeek_button_print(const struct squeek_button* button);

4
src/layout.rs
View File

@ -263,9 +263,9 @@ pub mod c {
#[no_mangle] #[no_mangle]
pub extern "C" pub extern "C"
fn squeek_button_get_key( fn squeek_button_get_key(
button: *mut ::layout::Button button: *const ::layout::Button
) -> ::keyboard::c::CKeyState { ) -> ::keyboard::c::CKeyState {
let button = unsafe { &mut *button }; let button = unsafe { &*button };
::keyboard::c::CKeyState::wrap(button.state.clone()) ::keyboard::c::CKeyState::wrap(button.state.clone())
} }