[QA] Replace specific code by GObject macro

[andy/viking.git] / src / vikmapsource.h

diff --git a/src/vikmapsource.h b/src/vikmapsource.h
index c0b80f3c65bd6f2143332563b1ec57bc1f804f58..7088c56eed3e5a0d8973921425e0c3725159d305 100644 (file)
--- a/src/vikmapsource.h
+++ b/src/vikmapsource.h
@@ -25,6 +25,7 @@
 #include "vikviewport.h"
 #include "vikcoord.h"
 #include "mapcoord.h"
 #include "vikviewport.h"
 #include "vikcoord.h"
 #include "mapcoord.h"

+#include "bbox.h"

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 


@@ -43,15 +44,17 @@ struct _VikMapSourceClass
        GObjectClass parent_class;
 
        /* Legal info */
        GObjectClass parent_class;
 
        /* Legal info */

-       const gchar *(* get_copyright) (VikMapSource * self);
+       void (* get_copyright) (VikMapSource * self, LatLonBBox bbox, gdouble zoom, void (*fct)(VikViewport*,const gchar*), void *data);

        const gchar *(* get_license) (VikMapSource * self);
        const gchar *(* get_license_url) (VikMapSource * self);
        const gchar *(* get_license) (VikMapSource * self);
        const gchar *(* get_license_url) (VikMapSource * self);

+       const GdkPixbuf *(* get_logo) (VikMapSource * self);

 
        guint8 (* get_uniq_id) (VikMapSource * self);
        const gchar * (* get_label) (VikMapSource * self);
        guint16 (* get_tilesize_x) (VikMapSource * self);
        guint16 (* get_tilesize_y) (VikMapSource * self);
        VikViewportDrawMode (* get_drawmode) (VikMapSource * self);
 
        guint8 (* get_uniq_id) (VikMapSource * self);
        const gchar * (* get_label) (VikMapSource * self);
        guint16 (* get_tilesize_x) (VikMapSource * self);
        guint16 (* get_tilesize_y) (VikMapSource * self);
        VikViewportDrawMode (* get_drawmode) (VikMapSource * self);

+       gboolean (* is_direct_file_access) (VikMapSource * self);

        gboolean (* supports_download_only_new) (VikMapSource * self);
        gboolean (* coord_to_mapcoord) (VikMapSource * self, const VikCoord * src, gdouble xzoom, gdouble yzoom, MapCoord * dest);
        void (* mapcoord_to_center_coord) (VikMapSource * self, MapCoord * src, VikCoord * dest);
        gboolean (* supports_download_only_new) (VikMapSource * self);
        gboolean (* coord_to_mapcoord) (VikMapSource * self, const VikCoord * src, gdouble xzoom, gdouble yzoom, MapCoord * dest);
        void (* mapcoord_to_center_coord) (VikMapSource * self, MapCoord * src, VikCoord * dest);


@@ -67,15 +70,17 @@ struct _VikMapSource
 
 GType vik_map_source_get_type (void) G_GNUC_CONST;
 
 
 GType vik_map_source_get_type (void) G_GNUC_CONST;
 

-const gchar *vik_map_source_get_copyright (VikMapSource * self);
+void vik_map_source_get_copyright (VikMapSource * self, LatLonBBox bbox, gdouble zoom, void (*fct)(VikViewport*,const gchar*), void *data);

 const gchar *vik_map_source_get_license (VikMapSource * self);
 const gchar *vik_map_source_get_license_url (VikMapSource * self);
 const gchar *vik_map_source_get_license (VikMapSource * self);
 const gchar *vik_map_source_get_license_url (VikMapSource * self);

+const GdkPixbuf *vik_map_source_get_logo (VikMapSource * self);

 
 guint8 vik_map_source_get_uniq_id (VikMapSource * self);
 const gchar *vik_map_source_get_label (VikMapSource * self);
 guint16 vik_map_source_get_tilesize_x (VikMapSource * self);
 guint16 vik_map_source_get_tilesize_y (VikMapSource * self);
 VikViewportDrawMode vik_map_source_get_drawmode (VikMapSource * self);
 
 guint8 vik_map_source_get_uniq_id (VikMapSource * self);
 const gchar *vik_map_source_get_label (VikMapSource * self);
 guint16 vik_map_source_get_tilesize_x (VikMapSource * self);
 guint16 vik_map_source_get_tilesize_y (VikMapSource * self);
 VikViewportDrawMode vik_map_source_get_drawmode (VikMapSource * self);

+gboolean vik_map_source_is_direct_file_access (VikMapSource * self);

 gboolean vik_map_source_supports_download_only_new (VikMapSource * self);
 gboolean vik_map_source_coord_to_mapcoord (VikMapSource * self, const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest );
 void vik_map_source_mapcoord_to_center_coord (VikMapSource * self, MapCoord *src, VikCoord *dest);
 gboolean vik_map_source_supports_download_only_new (VikMapSource * self);
 gboolean vik_map_source_coord_to_mapcoord (VikMapSource * self, const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest );
 void vik_map_source_mapcoord_to_center_coord (VikMapSource * self, MapCoord *src, VikCoord *dest);