[Spice-devel] [spice-gtk 06/11] Remove redundant use of const
Marc-André Lureau
marcandre.lureau at gmail.com
Thu Oct 30 06:03:04 PDT 2014
ack
On Thu, Oct 30, 2014 at 1:56 PM, Christophe Fergeau <cfergeau at redhat.com>
wrote:
> const guint16 const * has one extra 'const' which is removed by that
> commit
> ---
> gtk/spice-widget-priv.h | 2 +-
> gtk/vncdisplaykeymap.c | 6 +++---
> gtk/vncdisplaykeymap.h | 4 ++--
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/gtk/spice-widget-priv.h b/gtk/spice-widget-priv.h
> index 597ce10..8be0644 100644
> --- a/gtk/spice-widget-priv.h
> +++ b/gtk/spice-widget-priv.h
> @@ -104,7 +104,7 @@ struct _SpiceDisplayPrivate {
> bool keyboard_grab_active;
> bool keyboard_have_focus;
>
> - const guint16 const *keycode_map;
> + const guint16 *keycode_map;
> size_t keycode_maplen;
> uint32_t key_state[512 / 32];
> int key_delayed_scancode;
> diff --git a/gtk/vncdisplaykeymap.c b/gtk/vncdisplaykeymap.c
> index b2da5e5..340a86f 100644
> --- a/gtk/vncdisplaykeymap.c
> +++ b/gtk/vncdisplaykeymap.c
> @@ -158,8 +158,8 @@ static gboolean check_for_xquartz(GdkDisplay *dpy)
> }
> #endif
>
> -const guint16 const *vnc_display_keymap_gdk2xtkbd_table(GdkWindow *window,
> - size_t *maplen)
> +const guint16 *vnc_display_keymap_gdk2xtkbd_table(GdkWindow *window,
> + size_t *maplen)
> {
> #ifdef GDK_WINDOWING_X11
> if (GDK_IS_X11_WINDOW(window)) {
> @@ -262,7 +262,7 @@ const guint16 const
> *vnc_display_keymap_gdk2xtkbd_table(GdkWindow *window,
> return NULL;
> }
>
> -guint16 vnc_display_keymap_gdk2xtkbd(const guint16 const *keycode_map,
> +guint16 vnc_display_keymap_gdk2xtkbd(const guint16 *keycode_map,
> size_t keycode_maplen,
> guint16 keycode)
> {
> diff --git a/gtk/vncdisplaykeymap.h b/gtk/vncdisplaykeymap.h
> index 3cb2abb..3ec55d5 100644
> --- a/gtk/vncdisplaykeymap.h
> +++ b/gtk/vncdisplaykeymap.h
> @@ -24,8 +24,8 @@
>
> #include <glib.h>
>
> -const guint16 const *vnc_display_keymap_gdk2xtkbd_table(GdkWindow *window,
> - size_t *maplen);
> +const guint16 *vnc_display_keymap_gdk2xtkbd_table(GdkWindow *window,
> + size_t *maplen);
> guint16 vnc_display_keymap_gdk2xtkbd(const guint16 *keycode_map,
> size_t keycode_maplen,
> guint16 keycode);
> --
> 2.1.0
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
>
--
Marc-André Lureau
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/spice-devel/attachments/20141030/6f5fab97/attachment-0001.html>
More information about the Spice-devel
mailing list