Merge pull request #204 from SylvainCorlay/xregistry_split

Split xregistry

CMakeLists.txt

@@ -139,6 +139,7 @@ set(XWIDGETS_SOURCES
     ${XWIDGETS_SOURCE_DIR}/xpassword.cpp
     ${XWIDGETS_SOURCE_DIR}/xplay.cpp
     ${XWIDGETS_SOURCE_DIR}/xprogress.cpp
+    ${XWIDGETS_SOURCE_DIR}/xregistry.cpp
     ${XWIDGETS_SOURCE_DIR}/xselect.cpp
     ${XWIDGETS_SOURCE_DIR}/xslider.cpp
     ${XWIDGETS_SOURCE_DIR}/xselectionslider.cpp

include/xwidgets/xholder.hpp

@@ -132,20 +132,16 @@ namespace xw
         template <class D>
         void register_owning(xtransport<D>&& model);
 
-        void unregister(xeus::xguid id);
+        XWIDGETS_API void unregister(xeus::xguid id);
 
-        typename storage_type::mapped_type& find(xeus::xguid id);
+        XWIDGETS_API typename storage_type::mapped_type& find(xeus::xguid id);
 
     private:
 
         storage_type m_storage;
     };
 
-    inline xregistry& get_transport_registry()
-    {
-        static xregistry instance;
-        return instance;
-    }
+    XWIDGETS_API xregistry& get_transport_registry();
 
     /**************************
      * holder implementations *
@@ -502,21 +498,6 @@ namespace xw
         m_storage[model.id()] = make_owning_holder(std::move(model));
     }
 
-    inline void xregistry::unregister(xeus::xguid id)
-    {
-        m_storage.erase(id);
-    }
-
-    inline auto xregistry::find(xeus::xguid id) -> typename storage_type::mapped_type&
-    {
-        auto it = m_storage.find(id);
-        if (it == m_storage.end())
-        {
-            throw std::runtime_error("Could not find specified id in transport registry");
-        }
-        return it->second;
-    }
-
     /*****************************
      * xholder_id implementation *
      *****************************/

src/xregistry.cpp

@@ -0,0 +1,26 @@
+#include "xwidgets/xholder.hpp"
+// TODO: separate xregistry declaration in own header
+
+namespace xw
+{
+    void xregistry::unregister(xeus::xguid id)
+    {
+        m_storage.erase(id);
+    }
+
+    auto xregistry::find(xeus::xguid id) -> typename storage_type::mapped_type&
+    {
+        auto it = m_storage.find(id);
+        if (it == m_storage.end())
+        {
+            throw std::runtime_error("Could not find specified id in transport registry");
+        }
+        return it->second;
+    }
+
+    xregistry& get_transport_registry()
+    {
+        static xregistry instance;
+        return instance;
+    }
+}