Renamed map ADT to kmap

3 files changed, 15 insertions, 15 deletions

diff --git a/maps/map_en.h b/maps/map_en.h
index 93b9db7..56fd895 100644
--- a/maps/map_en.h
+++ b/maps/map_en.h
@@ -8,13 +8,13 @@
 
 
 // Shift map
-#define EVS_SHIFT_BIND(KEY, VALUE)	khm_insert(shm, (KEY), (VALUE))
+#define EVS_SHIFT_BIND(KEY, VALUE)	kmap_insert(skm, (KEY), (VALUE))
 
-static struct khashmap *shm;
+static struct kmap *skm;
 
 static void init_shiftmap(void)
 {
-	shm = khm_create();
+	skm = kmap_create();
 	EVS_SHIFT_BIND(KEY_1, "!");
 	EVS_SHIFT_BIND(KEY_2, "@");
 	EVS_SHIFT_BIND(KEY_3, "#");
@@ -41,7 +41,7 @@ static void init_shiftmap(void)
 
 static inline void exit_shiftmap(void)
 {
-	khm_destroy(shm);
+	kmap_destroy(skm);
 }
 
 static char map[] = {
diff --git a/maps/map_es.h b/maps/map_es.h
index 1b0946f..b20f120 100644
--- a/maps/map_es.h
+++ b/maps/map_es.h
@@ -9,13 +9,13 @@
 
 // Right Alt (ALTGR) map
 #define EVS_ALTGR_ENABLED
-#define EVS_ALTGR_BIND(KEY, VALUE)	khm_insert(ahm, (KEY), (VALUE))
+#define EVS_ALTGR_BIND(KEY, VALUE)	kmap_insert(akm, (KEY), (VALUE))
 
-static struct khashmap *ahm;
+static struct kmap *akm;
 
 static void init_altgrmap(void)
 {
-	ahm = khm_create();
+	akm = kmap_create();
 	EVS_ALTGR_BIND(KEY_1, "|");
 	EVS_ALTGR_BIND(KEY_2, "@");
 	EVS_ALTGR_BIND(KEY_3, "#");
@@ -41,17 +41,17 @@ static void init_altgrmap(void)
 
 static inline void exit_altgrmap(void)
 {
-	khm_destroy(ahm);
+	kmap_destroy(akm);
 }
 
 // Shift map
-#define EVS_SHIFT_BIND(KEY, VALUE)	khm_insert(shm, (KEY), (VALUE))
+#define EVS_SHIFT_BIND(KEY, VALUE)	kmap_insert(skm, (KEY), (VALUE))
 
-static struct khashmap *shm;
+static struct kmap *skm;
 
 static void init_shiftmap(void)
 {
-	shm = khm_create();
+	skm = kmap_create();
 	EVS_SHIFT_BIND(KEY_1, "!");
 	EVS_SHIFT_BIND(KEY_2, "\"");
 	EVS_SHIFT_BIND(KEY_4, "$");
@@ -75,7 +75,7 @@ static void init_shiftmap(void)
 
 static inline void exit_shiftmap(void)
 {
-	khm_destroy(shm);
+	kmap_destroy(skm);
 }
 
 static char map[] = {
diff --git a/maps/maps.h b/maps/maps.h
index c6e3095..969dc6f 100644
--- a/maps/maps.h
+++ b/maps/maps.h
@@ -11,13 +11,13 @@
  * position is the key value associated with the event code (index). It also
  * defines a function called init_shiftmap that can register any number of shift
  * keys to be parsed when shift or capslock has been pressed, and exit_shiftmap,
- * that cleans up the map (by default, it just destroys the hashmap used by the
+ * that cleans up the map (by default, it just destroys the map used by the
  * previous function).
  *
  * For example,
  * 		EVS_SHIFT(KEY_7, "/");
  * associates the key of number 7 to the slash character when shift is pressed.
- * Yeah, the character associated is a string: this is because of the hashmap
+ * Yeah, the character associated is a string: this is because of the map (kmap)
  * implementation, [int -> (void *)].
  *
  * From version 0.3 up, you can also define how evspy should register AltGr-key
@@ -34,7 +34,7 @@
 #define __EVS_MAPS
 
 #include <linux/input.h>
-#include "../khm/khm.h"
+#include "../kmap/kmap.h"
 
 
 // Load the map associated with the given keyboard layout