Rename map.{c,h} to keymap.{c,h}

Seeing as we don't like "map" anymore.

Signed-off-by: Ran Benita <ran234@gmail.com>

diff --git a/Makefile.am b/Makefile.am
index 7d1bffe..3ccba90 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,8 +76,8 @@ libxkbcommon_la_SOURCES = \
        src/keysym.h \
        src/keysym-utf.c \
        src/list.h \
-       src/map.c \
-       src/map.h \
+       src/keymap.c \
+       src/keymap.h \
        src/state.c \
        src/text.c \
        src/text.h \

diff --git a/src/keymap-dump.c b/src/keymap-dump.c
index 42b125b..fae1aa5 100644 (file)
--- a/src/keymap-dump.c
+++ b/src/keymap-dump.c
@@ -49,7 +49,7 @@
  * Author: Daniel Stone <daniel@fooishbar.org>
  */
 
-#include "map.h"
+#include "keymap.h"
 #include "text.h"
 
 #define VMOD_HIDE_VALUE    0

diff --git a/src/map.c b/src/keymap.c
similarity index 99%
rename from src/map.c
rename to src/keymap.c
index 6a533e7..442dfff 100644 (file)
--- a/src/map.c
+++ b/src/keymap.c
@@ -50,7 +50,7 @@
  *
  * ********************************************************/
 
-#include "map.h"
+#include "keymap.h"
 #include "text.h"
 
 struct xkb_keymap *

diff --git a/src/map.h b/src/keymap.h
similarity index 100%
rename from src/map.h
rename to src/keymap.h

diff --git a/src/state.c b/src/state.c
index 58f74f1..3da01a1 100644 (file)
--- a/src/state.c
+++ b/src/state.c
@@ -59,7 +59,7 @@
  *   - messages (very unlikely)
  */
 
-#include "map.h"
+#include "keymap.h"
 
 struct xkb_filter {
     union xkb_action action;

diff --git a/src/text.c b/src/text.c
index eb38314..f0322fa 100644 (file)
--- a/src/text.c
+++ b/src/text.c
@@ -24,7 +24,7 @@
  *
  ********************************************************/
 
-#include "map.h"
+#include "keymap.h"
 #include "text.h"
 
 bool

diff --git a/src/xkbcomp/xkbcomp-priv.h b/src/xkbcomp/xkbcomp-priv.h
index a06b4d4..dd2e4df 100644 (file)
--- a/src/xkbcomp/xkbcomp-priv.h
+++ b/src/xkbcomp/xkbcomp-priv.h
@@ -27,7 +27,7 @@
 #ifndef XKBCOMP_PRIV_H
 #define XKBCOMP_PRIV_H
 
-#include "map.h"
+#include "keymap.h"
 #include "ast.h"
 
 struct xkb_component_names {