Refactor:core:For plugins, use term 'category' instead of 'type'.

Use the term 'category' for all plugins with the same API (GUI plugins,
map plugins etc.). This used to be called 'type', which was confusing,
because in the XML config, 'type' refers to what is called 'name' in the
code.

10 files changed, 23 insertions, 23 deletions

diff --git a/navit/graphics/android/graphics_android.c b/navit/graphics/android/graphics_android.c
index 41f441c96..0d6aa30d2 100644
--- a/navit/graphics/android/graphics_android.c
+++ b/navit/graphics/android/graphics_android.c
@@ -1198,6 +1198,6 @@ void
 plugin_init(void)
 {
 	dbg(lvl_debug,"enter\n");
-        plugin_register_graphics_type("android", graphics_android_new);
-	plugin_register_event_type("android", event_android_new);
+        plugin_register_category_graphics("android", graphics_android_new);
+	plugin_register_category_event("android", event_android_new);
 }
diff --git a/navit/graphics/gd/graphics_gd.c b/navit/graphics/gd/graphics_gd.c
index 908007a0e..3ef6c520b 100644
--- a/navit/graphics/gd/graphics_gd.c
+++ b/navit/graphics/gd/graphics_gd.c
@@ -826,7 +826,7 @@ overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct poin
 	dbg(lvl_debug,"enter\n");
 	ret=g_new0(struct graphics_priv, 1);
 	*meth=graphics_methods;
-        font_freetype_new=plugin_get_font_type("freetype");
+        font_freetype_new=plugin_get_category_font("freetype");
         if (!font_freetype_new)
                 return NULL;
         font_freetype_new(&ret->freetype_methods);
@@ -855,7 +855,7 @@ graphics_gd_new(struct navit *nav, struct graphics_methods *meth, struct attr **
 	struct font_priv * (*font_freetype_new)(void *meth);
 	struct graphics_priv *ret;
 	event_request_system("glib","graphics_gd_new");
-        font_freetype_new=plugin_get_font_type("freetype");
+        font_freetype_new=plugin_get_category_font("freetype");
         if (!font_freetype_new)
                 return NULL;
 	*meth=graphics_methods;
@@ -881,5 +881,5 @@ graphics_gd_new(struct navit *nav, struct graphics_methods *meth, struct attr **
 void
 plugin_init(void)
 {
-        plugin_register_graphics_type("gd", graphics_gd_new);
+        plugin_register_category_graphics("gd", graphics_gd_new);
 }
diff --git a/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c b/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
index 9d6dd998b..387003c40 100644
--- a/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
+++ b/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
@@ -1081,7 +1081,7 @@ static struct graphics_priv *
 graphics_gtk_drawing_area_new_helper(struct graphics_methods *meth)
 {
 	struct font_priv * (*font_freetype_new)(void *meth);
-	font_freetype_new=plugin_get_font_type("freetype");
+	font_freetype_new=plugin_get_category_font("freetype");
 	if (!font_freetype_new)
 		return NULL;
 	struct graphics_priv *this=g_new0(struct graphics_priv,1);
@@ -1150,5 +1150,5 @@ plugin_init(void)
 #ifdef HAVE_API_WIN32
 	setlocale(LC_NUMERIC, "C"); /* WIN32 gtk resets LC_NUMERIC */
 #endif
-	plugin_register_graphics_type("gtk_drawing_area", graphics_gtk_drawing_area_new);
+	plugin_register_category_graphics("gtk_drawing_area", graphics_gtk_drawing_area_new);
 }
diff --git a/navit/graphics/null/graphics_null.c b/navit/graphics/null/graphics_null.c
index ce4dc6de2..ecac7d528 100644
--- a/navit/graphics/null/graphics_null.c
+++ b/navit/graphics/null/graphics_null.c
@@ -354,6 +354,6 @@ event_null_new(struct event_methods *meth)
 void
 plugin_init(void)
 {
-        plugin_register_graphics_type("null", graphics_null_new);
-	plugin_register_event_type("null", event_null_new);
+        plugin_register_category_graphics("null", graphics_null_new);
+	plugin_register_category_event("null", event_null_new);
 }
diff --git a/navit/graphics/opengl/graphics_opengl.c b/navit/graphics/opengl/graphics_opengl.c
index da82cd107..98230f0dc 100644
--- a/navit/graphics/opengl/graphics_opengl.c
+++ b/navit/graphics/opengl/graphics_opengl.c
@@ -1440,7 +1440,7 @@ static struct graphics_priv *
 graphics_opengl_new_helper(struct graphics_methods *meth)
 {
 	struct font_priv *(*font_freetype_new) (void *meth);
-	font_freetype_new = plugin_get_font_type("freetype");
+	font_freetype_new = plugin_get_category_font("freetype");
 
 	if (!font_freetype_new) {
 		return NULL;
@@ -1817,6 +1817,6 @@ event_opengl_new(struct event_methods *meth)
 void
 plugin_init(void)
 {
-	plugin_register_graphics_type("opengl", graphics_opengl_new);
-	plugin_register_event_type("opengl", event_opengl_new);
+	plugin_register_category_graphics("opengl", graphics_opengl_new);
+	plugin_register_category_event("opengl", event_opengl_new);
 }
diff --git a/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp b/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp
index 3a7509b0d..65163ea9d 100644
--- a/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp
+++ b/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp
@@ -854,7 +854,7 @@ static struct graphics_priv * graphics_qt_qpainter_new(struct navit *nav, struct
 		return NULL;
 #endif
 #ifdef QT_QPAINTER_USE_FREETYPE
-	font_freetype_new=(struct font_priv *(*)(void *))plugin_get_font_type("freetype");
+	font_freetype_new=(struct font_priv *(*)(void *))plugin_get_category_font("freetype");
 	if (!font_freetype_new) {
 		dbg(lvl_error,"no freetype\n");
 		return NULL;
@@ -921,9 +921,9 @@ static struct graphics_priv * graphics_qt_qpainter_new(struct navit *nav, struct
 //##############################################################################################################
 void plugin_init(void)
 {
-        plugin_register_graphics_type("qt_qpainter", graphics_qt_qpainter_new);
+        plugin_register_category_graphics("qt_qpainter", graphics_qt_qpainter_new);
 #ifdef QT_QPAINTER_USE_EVENT_QT
-        plugin_register_event_type("qt", event_qt_new);
+        plugin_register_category_event("qt", event_qt_new);
 #endif
 }
 
diff --git a/navit/graphics/sdl/event.c b/navit/graphics/sdl/event.c
index cd4b81802..f96b079b3 100644
--- a/navit/graphics/sdl/event.c
+++ b/navit/graphics/sdl/event.c
@@ -377,5 +377,5 @@ event_sdl_new(struct event_methods* methods) {
 /* ---------- SDL Eventhandling ---------- */
 
 void sdl_event_init(void) {
-	plugin_register_event_type("sdl", event_sdl_new);
+	plugin_register_category_event("sdl", event_sdl_new);
 }
diff --git a/navit/graphics/sdl/event_sdl.c b/navit/graphics/sdl/event_sdl.c
index d640d5edb..28fe4fafb 100644
--- a/navit/graphics/sdl/event_sdl.c
+++ b/navit/graphics/sdl/event_sdl.c
@@ -339,5 +339,5 @@ event_sdl_new(struct event_methods* methods)
 void
 event_sdl_register(void)
 {
-   plugin_register_event_type("sdl", event_sdl_new);
+   plugin_register_category_event("sdl", event_sdl_new);
 }
diff --git a/navit/graphics/sdl/graphics_sdl.c b/navit/graphics/sdl/graphics_sdl.c
index b0cc66776..b1a9c17b9 100644
--- a/navit/graphics/sdl/graphics_sdl.c
+++ b/navit/graphics/sdl/graphics_sdl.c
@@ -986,7 +986,7 @@ overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct poin
 
 
     struct font_priv *(*font_freetype_new) (void *meth);
-    font_freetype_new = plugin_get_font_type ("freetype");
+    font_freetype_new = plugin_get_category_font ("freetype");
 
     if (!font_freetype_new)
     {
@@ -1407,7 +1407,7 @@ graphics_sdl_new(struct navit *nav, struct graphics_methods *meth, struct attr *
     this->cbl = cbl;
 
     /* initialize fonts */
-    font_freetype_new = plugin_get_font_type("freetype");
+    font_freetype_new = plugin_get_category_font("freetype");
 
 	if (!font_freetype_new) {
 			g_free(this);
@@ -1852,9 +1852,9 @@ void
 plugin_init(void)
 {
 #ifdef USE_WEBOS
-    plugin_register_event_type("sdl", event_sdl_new);
+    plugin_register_category_event("sdl", event_sdl_new);
 #endif
-    plugin_register_graphics_type("sdl", graphics_sdl_new);
+    plugin_register_category_graphics("sdl", graphics_sdl_new);
 }
 
 // vim: sw=4 ts=8
diff --git a/navit/graphics/win32/graphics_win32.c b/navit/graphics/win32/graphics_win32.c
index 609e61ce8..3d8fa351d 100644
--- a/navit/graphics/win32/graphics_win32.c
+++ b/navit/graphics/win32/graphics_win32.c
@@ -1845,6 +1845,6 @@ static struct event_priv *
 void
 plugin_init(void)
 {
-    plugin_register_graphics_type("win32", graphics_win32_new);
-    plugin_register_event_type("win32", event_win32_new);
+    plugin_register_category_graphics("win32", graphics_win32_new);
+    plugin_register_category_event("win32", event_win32_new);
 }