Fix naming for the GisView/GisWorld -> GisViewer merge

[grits] / src / gis-plugin.h

diff --git a/src/gis-plugin.h b/src/gis-plugin.h
index 7fd75a7b134bbce4abc1fab8d4e3334c01efb2cb..c142cdb8bf1b0b4414f414c55754d04c13757257 100644 (file)
--- a/src/gis-plugin.h
+++ b/src/gis-plugin.h
@@ -46,8 +46,7 @@ void       gis_plugin_expose(GisPlugin *self);
 GtkWidget *gis_plugin_get_config(GisPlugin *self);
 
 /* Plugins API */
-#include "gis-world.h"
-#include "gis-view.h"
+#include "gis-viewer.h"
 #include "gis-opengl.h"
 #include "gis-prefs.h"
 
@@ -56,13 +55,13 @@ struct _GisPlugins {
        GPtrArray *plugins;
 };
 
-typedef GisPlugin *(*GisPluginConstructor)(GisWorld *world, GisView *view, GisOpenGL *opengl, GisPrefs *prefs);
+typedef GisPlugin *(*GisPluginConstructor)(GisViewer *viewer, GisOpenGL *opengl, GisPrefs *prefs);
 
 GisPlugins *gis_plugins_new(gchar *dir);
 void        gis_plugins_free();
 GList      *gis_plugins_available(GisPlugins *plugins);
 GisPlugin  *gis_plugins_load(GisPlugins *plugins, const char *name,
-               GisWorld *world, GisView *view, GisOpenGL *opengl, GisPrefs *prefs);
+               GisViewer *viewer, GisOpenGL *opengl, GisPrefs *prefs);
 gboolean    gis_plugins_unload(GisPlugins *plugins, const char *name);
 void        gis_plugins_foreach(GisPlugins *plugins, GCallback callback, gpointer user_data);