From 216266f2ad3b8ff5d5afd3e1d0dc3e20308e01d6 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Tue, 12 Jun 2018 23:21:23 +0200
Subject: Replace all deprecated gdk_keymap_get_default() with
 Gdk::Display::get_default()->get_keymap().

---
 src/ui/tool/event-utils.cpp             | 3 ++-
 src/ui/tools/tool-base.cpp              | 7 ++++---
 src/ui/widget/font-selector-toolbar.cpp | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tool/event-utils.cpp b/src/ui/tool/event-utils.cpp
index 6b8d5f0dc..7793c9d4d 100644
--- a/src/ui/tool/event-utils.cpp
+++ b/src/ui/tool/event-utils.cpp
@@ -11,6 +11,7 @@
 #include <cstring>
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
+#include <gdkmm/display.h>
 #include "display/sp-canvas.h"
 #include "ui/tool/event-utils.h"
 
@@ -22,7 +23,7 @@ guint shortcut_key(GdkEventKey const &event)
 {
     guint shortcut_key = 0;
     gdk_keymap_translate_keyboard_state(
-            gdk_keymap_get_for_display(gdk_display_get_default()),
+            Gdk::Display::get_default()->get_keymap(),
             event.hardware_keycode,
             (GdkModifierType) event.state,
             0   /*event->key.group*/,
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 587788e39..ce319009b 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -19,6 +19,7 @@
 #endif
 
 #include <gdk/gdkkeysyms.h>
+#include <gdkmm/display.h>
 #include <glibmm/i18n.h>
 
 #include "shortcuts.h"
@@ -1170,7 +1171,7 @@ static void update_latin_keys_group() {
     gint n_keys;
 
     latin_keys_group_valid = FALSE;
-    if (gdk_keymap_get_entries_for_keyval(gdk_keymap_get_default(), GDK_KEY_a, &keys, &n_keys)) {
+    if (gdk_keymap_get_entries_for_keyval(Gdk::Display::get_default()->get_keymap(), GDK_KEY_a, &keys, &n_keys)) {
         for (gint i = 0; i < n_keys; i++) {
             if (!latin_keys_group_valid || keys[i].group < latin_keys_group) {
                 latin_keys_group = keys[i].group;
@@ -1185,7 +1186,7 @@ static void update_latin_keys_group() {
  * Initialize Latin keys group handling.
  */
 void init_latin_keys_group() {
-    g_signal_connect(G_OBJECT(gdk_keymap_get_default()),
+    g_signal_connect(G_OBJECT(Gdk::Display::get_default()->get_keymap()),
             "keys-changed", G_CALLBACK(update_latin_keys_group), NULL);
     update_latin_keys_group();
 }
@@ -1202,7 +1203,7 @@ guint get_latin_keyval(GdkEventKey const *event, guint *consumed_modifiers /*= N
     gint group = latin_keys_group_valid ? latin_keys_group : event->group;
 
     gdk_keymap_translate_keyboard_state(
-            gdk_keymap_get_for_display(gdk_display_get_default()),
+            Gdk::Display::get_default()->get_keymap(),
             event->hardware_keycode, (GdkModifierType) event->state, group,
             &keyval, NULL, NULL, &modifiers);
 
diff --git a/src/ui/widget/font-selector-toolbar.cpp b/src/ui/widget/font-selector-toolbar.cpp
index c997e0920..4f951fa62 100644
--- a/src/ui/widget/font-selector-toolbar.cpp
+++ b/src/ui/widget/font-selector-toolbar.cpp
@@ -13,6 +13,7 @@
 
 #include <glibmm/i18n.h>
 #include <glibmm/regex.h>
+#include <gdkmm/display.h>
 
 #include "font-selector-toolbar.h"
 
@@ -259,7 +260,7 @@ FontSelectorToolbar::on_key_press_event (GdkEventKey* key_event)
     bool consumed = false;
 
     unsigned int key = 0;
-    gdk_keymap_translate_keyboard_state( gdk_keymap_get_for_display( gdk_display_get_default() ),
+    gdk_keymap_translate_keyboard_state( Gdk::Display::get_default()->get_keymap(),
                                          key_event->hardware_keycode,
                                          (GdkModifierType)key_event->state,
                                          0, &key, 0, 0, 0 );
-- 
cgit v1.2.3