From 43df82355afa91623dbecd8d83a498da2782575f Mon Sep 17 00:00:00 2001
From: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
Date: Wed, 31 Jul 2019 13:45:01 +0000
Subject: [PATCH] EekKey: Remove column and row fields

---
 eek/eek-key.c     | 46 ----------------------------------------------
 eek/eek-key.h     |  7 -------
 eek/eek-section.c |  2 --
 3 files changed, 55 deletions(-)

diff --git a/eek/eek-key.c b/eek/eek-key.c
index a2b33381..a730a9f3 100644
--- a/eek/eek-key.c
+++ b/eek/eek-key.c
@@ -38,8 +38,6 @@ enum {
     PROP_0,
     PROP_KEYCODE,
     PROP_SYMBOL_MATRIX,
-    PROP_COLUMN,
-    PROP_ROW,
     PROP_OREF,
     PROP_LAST
 };
@@ -105,8 +103,6 @@ eek_key_set_property (GObject      *object,
                       GParamSpec   *pspec)
 {
     EekSymbolMatrix *matrix;
-    gint column, row;
-
     switch (prop_id) {
     case PROP_KEYCODE:
         eek_key_set_keycode (EEK_KEY(object), g_value_get_uint (value));
@@ -115,14 +111,6 @@ eek_key_set_property (GObject      *object,
         matrix = g_value_get_boxed (value);
         eek_key_set_symbol_matrix (EEK_KEY(object), matrix);
         break;
-    case PROP_COLUMN:
-        eek_key_get_index (EEK_KEY(object), &column, &row);
-        eek_key_set_index (EEK_KEY(object), g_value_get_int (value), row);
-        break;
-    case PROP_ROW:
-        eek_key_get_index (EEK_KEY(object), &column, &row);
-        eek_key_set_index (EEK_KEY(object), column, g_value_get_int (value));
-        break;
     case PROP_OREF:
         eek_key_set_oref (EEK_KEY(object), g_value_get_uint (value));
         break;
@@ -138,8 +126,6 @@ eek_key_get_property (GObject    *object,
                       GValue     *value,
                       GParamSpec *pspec)
 {
-    gint column, row;
-
     switch (prop_id) {
     case PROP_KEYCODE:
         g_value_set_uint (value, eek_key_get_keycode (EEK_KEY(object)));
@@ -148,14 +134,6 @@ eek_key_get_property (GObject    *object,
         g_value_set_boxed (value,
                            eek_key_get_symbol_matrix (EEK_KEY(object)));
         break;
-    case PROP_COLUMN:
-        eek_key_get_index (EEK_KEY(object), &column, &row);
-        g_value_set_int (value, column);
-        break;
-    case PROP_ROW:
-        eek_key_get_index (EEK_KEY(object), &column, &row);
-        g_value_set_int (value, row);
-        break;
     case PROP_OREF:
         g_value_set_uint (value, eek_key_get_oref (EEK_KEY(object)));
         break;
@@ -203,30 +181,6 @@ eek_key_class_init (EekKeyClass *klass)
                                 G_PARAM_READWRITE);
     g_object_class_install_property (gobject_class, PROP_SYMBOL_MATRIX, pspec);
 
-    /**
-     * EekKey:column:
-     *
-     * The column index of #EekKey in the parent #EekSection.
-     */
-    pspec = g_param_spec_int ("column",
-                              "Column",
-                              "Column index of the key in section",
-                              -1, G_MAXINT, -1,
-                              G_PARAM_READWRITE);
-    g_object_class_install_property (gobject_class, PROP_COLUMN, pspec);
-
-    /**
-     * EekKey:row:
-     *
-     * The row index of #EekKey in the parent #EekSection.
-     */
-    pspec = g_param_spec_int ("row",
-                              "Row",
-                              "Row index of the key in section",
-                              -1, G_MAXINT, -1,
-                              G_PARAM_READWRITE);
-    g_object_class_install_property (gobject_class, PROP_ROW, pspec);
-
     /**
      * EekKey:oref:
      *
diff --git a/eek/eek-key.h b/eek/eek-key.h
index cd6ae4f0..fb82f889 100644
--- a/eek/eek-key.h
+++ b/eek/eek-key.h
@@ -73,13 +73,6 @@ EekSymbol       *eek_key_get_symbol_at_index (EekKey          *key,
                                               gint             fallback_group,
                                               gint             fallback_level);
 
-void             eek_key_set_index           (EekKey          *key,
-                                              gint             column,
-                                              gint             row);
-void             eek_key_get_index           (EekKey          *key,
-                                              gint            *column,
-                                              gint            *row);
-
 void             eek_key_set_oref            (EekKey          *key,
                                               guint            oref);
 guint            eek_key_get_oref            (EekKey          *key);
diff --git a/eek/eek-section.c b/eek/eek-section.c
index 1168eea3..0fdd9be1 100644
--- a/eek/eek-section.c
+++ b/eek/eek-section.c
@@ -143,8 +143,6 @@ eek_section_real_create_key (EekSection *self,
     key = g_object_new (EEK_TYPE_KEY,
                         "name", name,
                         "keycode", keycode,
-                        "column", column_index,
-                        "row", row_index,
                         NULL);
     g_return_val_if_fail (key, NULL);