X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/b529dc9c00bbafad3671e76e719277d4deecddbc..db43cfa4df71667eeb27da8db6a48d3ab63e2fea:/src/vikslippymapsource.h?ds=inline diff --git a/src/vikslippymapsource.h b/src/vikslippymapsource.h index 0e975a19..9ec2b05f 100644 --- a/src/vikslippymapsource.h +++ b/src/vikslippymapsource.h @@ -1,11 +1,11 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ /* * viking - * Copyright (C) Guilhem Bonnefille 2009 + * Copyright (C) 2009, Guilhem Bonnefille * * viking is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or + * Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * viking is distributed in the hope that it will be useful, but @@ -20,10 +20,11 @@ #ifndef _VIK_SLIPPY_MAP_SOURCE_H #define _VIK_SLIPPY_MAP_SOURCE_H +#include + #include "vikcoord.h" #include "mapcoord.h" #include "vikmapsourcedefault.h" -#include "download.h" G_BEGIN_DECLS @@ -40,10 +41,6 @@ typedef struct _VikSlippyMapSource VikSlippyMapSource; struct _VikSlippyMapSourceClass { VikMapSourceDefaultClass parent_class; - - gchar * (*get_uri) ( VikSlippyMapSource *self, MapCoord *src ); - gchar * (*get_hostname) ( VikSlippyMapSource *self ); - DownloadMapOptions * (*get_download_options) ( VikSlippyMapSource *self ); }; struct _VikSlippyMapSource @@ -53,11 +50,7 @@ struct _VikSlippyMapSource GType vik_slippy_map_source_get_type (void) G_GNUC_CONST; -VikSlippyMapSource * vik_slippy_map_source_new_with_id (guint8 id, const gchar *label, const gchar *hostname, const gchar *url); - -gchar * vik_slippy_map_source_get_uri( VikSlippyMapSource *self, MapCoord *src ); -gchar * vik_slippy_map_source_get_hostname( VikSlippyMapSource *self ); -DownloadMapOptions * vik_slippy_map_source_get_download_options( VikSlippyMapSource *self ); +VikSlippyMapSource * vik_slippy_map_source_new_with_id (guint16 id, const gchar *label, const gchar *hostname, const gchar *url); G_END_DECLS