Move property_container_base into XRay::Editor namespace (https://github.com/Xottab-DUTY/xray-16/issues/1)

Author: Xottab-DUTY

src/Include/editor/engine.hpp

@@ -11,10 +11,16 @@
 
 class shared_str;
 
-namespace editor
+namespace XRay
+{
+namespace Editor
 {
 class property_holder_base;
+}
+}
 
+namespace editor
+{
 class engine
 {
 public:
@@ -44,9 +50,9 @@ class engine
     virtual void track_weather(float const& time) = 0;
     virtual float track_weather() = 0;
 
-    virtual property_holder_base* current_frame_property_holder() = 0;
-    virtual property_holder_base* blend_frame_property_holder() = 0;
-    virtual property_holder_base* target_frame_property_holder() = 0;
+    virtual XRay::Editor::property_holder_base* current_frame_property_holder() = 0;
+    virtual XRay::Editor::property_holder_base* blend_frame_property_holder() = 0;
+    virtual XRay::Editor::property_holder_base* target_frame_property_holder() = 0;
 
     virtual void weather_paused(bool const& value) = 0;
     virtual bool weather_paused() = 0;

src/Include/editor/ide.hpp

@@ -9,12 +9,18 @@
 #ifndef EDITOR_IDE_HPP_INCLUDED
 #define EDITOR_IDE_HPP_INCLUDED
 
-namespace editor
+namespace XRay
+{
+namespace Editor
 {
 class property_holder_base;
 class property_holder_collection;
 class property_holder_holder;
+}
+}
 
+namespace editor
+{
 class ide
 {
 public:
@@ -25,11 +31,11 @@ class ide
     virtual void pause() = 0;
 
 public:
-    virtual property_holder_base* create_property_holder(
-        LPCSTR display_name, property_holder_collection* collection = 0, property_holder_holder* holder = 0) = 0;
-    virtual void destroy(property_holder_base*& property_holder) = 0;
-    virtual void environment_levels(property_holder_base* property_holder) = 0;
-    virtual void environment_weathers(property_holder_base* property_holder) = 0;
+    virtual XRay::Editor::property_holder_base* create_property_holder(
+        LPCSTR display_name, XRay::Editor::property_holder_collection* collection = 0, XRay::Editor::property_holder_holder* holder = 0) = 0;
+    virtual void destroy(XRay::Editor::property_holder_base*& property_holder) = 0;
+    virtual void environment_levels(XRay::Editor::property_holder_base* property_holder) = 0;
+    virtual void environment_weathers(XRay::Editor::property_holder_base* property_holder) = 0;
 
 public:
     typedef fastdelegate::FastDelegate0<LPCSTR const*> weathers_getter_type;

src/Include/editor/property_holder_base.hpp

@@ -55,13 +55,13 @@ void ide_impl::on_load_finished()
 }
 
 void ide_impl::pause() { m_window->view().pause(); }
-editor::property_holder_base* ide_impl::create_property_holder(
-    LPCSTR display_name, editor::property_holder_collection* collection, editor::property_holder_holder* holder)
+XRay::Editor::property_holder_base* ide_impl::create_property_holder(
+    LPCSTR display_name, XRay::Editor::property_holder_collection* collection, XRay::Editor::property_holder_holder* holder)
 {
     return (new ::property_holder(m_engine, display_name, collection, holder));
 }
 
-void ide_impl::destroy(editor::property_holder_base*& property_holder)
+void ide_impl::destroy(property_holder*& property_holder)
 {
     delete (property_holder);
     property_holder = 0;

src/editors/xrWeatherEditor/ide_impl.cpp

@@ -11,7 +11,7 @@
 
 #pragma unmanaged
 #include <windows.h>
-#include "xrcore/fastdelegate.h"
+#include "xrCore/fastdelegate.h"
 #include <utility>
 #include "include/editor/ide.hpp"
 #pragma managed
@@ -29,7 +29,7 @@ class ide_impl : public editor::ide
 {
 public:
     typedef editor::window_ide window_ide;
-    typedef editor::property_holder_base property_holder;
+    typedef XRay::Editor::property_holder_base property_holder;
 
 public:
     ide_impl(editor::engine* engine);
@@ -50,7 +50,7 @@ class ide_impl : public editor::ide
 
 public:
     virtual property_holder* create_property_holder(
-        LPCSTR display_name, editor::property_holder_collection* collection, editor::property_holder_holder* holder);
+        LPCSTR display_name, XRay::Editor::property_holder_collection* collection, XRay::Editor::property_holder_holder* holder);
     virtual void destroy(property_holder*& property_holder);
     virtual void environment_levels(property_holder* property_holder);
     virtual void environment_weathers(property_holder* property_holder);

src/editors/xrWeatherEditor/ide_impl.hpp

@@ -16,8 +16,8 @@ public
 ref class property_boolean : public IProperty
 {
 public:
-    typedef editor::property_holder_base::boolean_getter_type boolean_getter_type;
-    typedef editor::property_holder_base::boolean_setter_type boolean_setter_type;
+    typedef XRay::Editor::property_holder_base::boolean_getter_type boolean_getter_type;
+    typedef XRay::Editor::property_holder_base::boolean_setter_type boolean_setter_type;
 
 public:
     property_boolean(boolean_getter_type const& getter, boolean_setter_type const& setter);

src/editors/xrWeatherEditor/property_boolean.hpp

@@ -15,8 +15,8 @@ public
 ref class property_boolean_values_value : public property_boolean
 {
 public:
-    typedef editor::property_holder_base::boolean_getter_type boolean_getter_type;
-    typedef editor::property_holder_base::boolean_setter_type boolean_setter_type;
+    typedef XRay::Editor::property_holder_base::boolean_getter_type boolean_getter_type;
+    typedef XRay::Editor::property_holder_base::boolean_setter_type boolean_setter_type;
 
 private:
     typedef property_boolean inherited;

src/editors/xrWeatherEditor/property_boolean_values_value.hpp

@@ -15,8 +15,8 @@ public
 ref class property_boolean_values_value_reference : public property_boolean_reference
 {
 public:
-    typedef editor::property_holder_base::boolean_getter_type boolean_getter_type;
-    typedef editor::property_holder_base::boolean_setter_type boolean_setter_type;
+    typedef XRay::Editor::property_holder_base::boolean_getter_type boolean_getter_type;
+    typedef XRay::Editor::property_holder_base::boolean_setter_type boolean_setter_type;
 
 private:
     typedef property_boolean_reference inherited;

src/editors/xrWeatherEditor/property_boolean_values_value_reference.hpp

@@ -25,7 +25,7 @@ void property_collection_base::CopyTo(Array ^ items, int index)
     collection_type* collection = this->collection();
     for (int i = index, n = collection->size(); i < n; ++i)
     {
-        editor::property_holder_base* holder_raw = collection->item(i);
+        XRay::Editor::property_holder_base* holder_raw = collection->item(i);
         ::property_holder* holder = dynamic_cast<::property_holder*>(holder_raw);
         VERIFY(holder);
         items->SetValue(holder->container(), i);
@@ -65,7 +65,7 @@ bool property_collection_base::IsFixedSize::get() { return (false); }
 bool property_collection_base::IsReadOnly::get() { return (false); }
 Object ^ property_collection_base::default ::get(int index)
 {
-    editor::property_holder_base* holder_raw = collection()->item(index);
+    XRay::Editor::property_holder_base* holder_raw = collection()->item(index);
     ::property_holder* holder = dynamic_cast<::property_holder*>(holder_raw);
     return (holder->container());
 }
@@ -78,7 +78,7 @@ void property_collection_base::default ::set(int index, Object ^ value)
 
 property_container ^ property_collection_base::create()
 {
-    editor::property_holder_base* holder_raw = collection()->create();
+    XRay::Editor::property_holder_base* holder_raw = collection()->create();
     ::property_holder* holder = dynamic_cast<::property_holder*>(holder_raw);
     return (holder->container());
 }

src/editors/xrWeatherEditor/property_collection_base.cpp

@@ -23,8 +23,8 @@ ref class property_collection_converter;
       public System::Collections::IList
 {
 public:
-    typedef editor::property_holder_collection collection_type;
-    typedef editor::property_holder_base property_holder;
+    typedef XRay::Editor::property_holder_collection collection_type;
+    typedef XRay::Editor::property_holder_base property_holder;
     typedef System::Collections::IEnumerator IEnumerator;
     typedef System::Array Array;
     typedef System::Object Object;