From 6e58ba0abc25d4737036c3efe8ac80ee74ea5c4b Mon Sep 17 00:00:00 2001
From: Sergey Magidovich <mgsergio@mapswithme.com>
Date: Thu, 28 Apr 2016 16:28:01 +0300
Subject: Make editor a field of Framework.

---
 indexer/osm_editor.hpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'indexer/osm_editor.hpp')

diff --git a/indexer/osm_editor.hpp b/indexer/osm_editor.hpp
index 62c71ddf07..c1738912e2 100644
--- a/indexer/osm_editor.hpp
+++ b/indexer/osm_editor.hpp
@@ -24,8 +24,6 @@ namespace osm
 {
 class Editor final
 {
-  Editor();
-
 public:
   using TFeatureTypeFn = function<void(FeatureType &)>;  // Mimics Framework::TFeatureTypeFn.
 
@@ -52,7 +50,10 @@ public:
     Created
   };
 
+  Editor();
+
   static Editor & Instance();
+  static void SetInstance(Editor * editor);
 
   void SetMwmIdByNameAndVersionFn(TMwmIdByMapNameFn const & fn) { m_mwmIdByMapNameFn = fn; }
   void SetInvalidateFn(TInvalidateFn const & fn) { m_invalidateFn = fn; }
@@ -202,6 +203,8 @@ private:
 
   /// Notes to be sent to osm.
   shared_ptr<editor::Notes> m_notes;
+
+  static Editor * s_instance;
 };  // class Editor
 
 string DebugPrint(Editor::FeatureStatus fs);
-- 
cgit v1.2.3