[libchamplainmm] MapSourceFactory: Remove old methods
- From: Juan R. Garcia Blanco <juanrgar src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libchamplainmm] MapSourceFactory: Remove old methods
- Date: Wed, 26 Feb 2014 19:04:29 +0000 (UTC)
commit 40fc3406d87283a5970107595896a59f33b4f29e
Author: Juan R. GarcĂa Blanco <juanrgar gmail com>
Date: Mon Feb 24 00:43:35 2014 +0100
MapSourceFactory: Remove old methods
* Remove register_source() object method
* Remove get_list() object method
libchamplain/src/map-source-factory.ccg | 29 -----------------------------
libchamplain/src/map-source-factory.hg | 15 +++------------
2 files changed, 3 insertions(+), 41 deletions(-)
---
diff --git a/libchamplain/src/map-source-factory.ccg b/libchamplain/src/map-source-factory.ccg
index aacb3e4..7acff57 100644
--- a/libchamplain/src/map-source-factory.ccg
+++ b/libchamplain/src/map-source-factory.ccg
@@ -18,33 +18,4 @@
namespace Champlain
{
-
-static ChamplainMapSource *
-SignalProxy_MapSourceConstructor_champlain_callback(
- ChamplainMapSourceDesc * desc,
- void * data)
-{
- SlotMapSourceConstructor * const slot_map_source_constructor
- = static_cast<SlotMapSourceConstructor*>(data);
-
- Glib::RefPtr<MapSource> source = (*slot_map_source_constructor)(
- Glib::wrap(desc, false));
- return source->gobj();
-}
-
-bool
-MapSourceFactory::register_source(const MapSourceDesc & desc,
- const SlotMapSourceConstructor & slot)
-{
- MapSourceDesc * const desc_copy = new MapSourceDesc(desc);
- SlotMapSourceConstructor * const slot_copy
- = new SlotMapSourceConstructor(slot);
-
- return champlain_map_source_factory_register(
- gobj(),
- desc_copy->gobj(),
- SignalProxy_MapSourceConstructor_champlain_callback,
- slot_copy);
-}
-
} // namespace Champlain
diff --git a/libchamplain/src/map-source-factory.hg b/libchamplain/src/map-source-factory.hg
index 6013714..1333b34 100644
--- a/libchamplain/src/map-source-factory.hg
+++ b/libchamplain/src/map-source-factory.hg
@@ -22,19 +22,14 @@
_DEFS(libchamplainmm,libchamplain)
-_CC_INCLUDE(champlain/champlain.h)
-_CC_INCLUDE(libchamplainmm/map-source-desc.h)
+#include<champlain/champlain.h>
+#include<libchamplainmm/map-source-desc.h>
+#include<libchamplainmm/map-source.h>
_PINCLUDE(glibmm/private/object_p.h)
namespace Champlain
{
-class MapSource;
-class MapSourceDesc;
-
-typedef sigc::slot<Glib::RefPtr<MapSource>, const MapSourceDesc &>
- SlotMapSourceConstructor;
-
class MapSourceFactory :
public Glib::Object
{
@@ -47,15 +42,11 @@ public:
champlain_map_source_factory_dup_default, refreturn)
_IGNORE(champlain_map_source_factory_get_default)
- _WRAP_METHOD(Glib::SListHandle<const MapSourceDesc *> get_list() const,
- champlain_map_source_factory_dup_list)
_IGNORE(champlain_map_source_factory_get_list)
_WRAP_METHOD(Glib::RefPtr<MapSource> create(const std::string & id),
champlain_map_source_factory_create)
- bool register_source(const MapSourceDesc & desc,
- const SlotMapSourceConstructor & slot);
_IGNORE(champlain_map_source_factory_register)
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]