Rename editor::property_holder to editor::property_holder_base (https…

…://github.com/Xottab-DUTY/xray-16/issues/1)
OpenXRay · Nov 5, 2017 · 9b2cc69 · 9b2cc69
1 parent f4c16aa
commit 9b2cc69
Show file tree

Hide file tree

Showing 88 changed files with 291 additions and 290 deletions.
diff --git a/src/Include/editor/engine.hpp b/src/Include/editor/engine.hpp
@@ -13,7 +13,7 @@ class shared_str;
 
 namespace editor
 {
-class property_holder;
+class property_holder_base;
 
 class engine
 {
@@ -44,9 +44,9 @@ class engine
     virtual void track_weather(float const& time) = 0;
     virtual float track_weather() = 0;
 
-    virtual property_holder* current_frame_property_holder() = 0;
-    virtual property_holder* blend_frame_property_holder() = 0;
-    virtual property_holder* target_frame_property_holder() = 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 void weather_paused(bool const& value) = 0;
     virtual bool weather_paused() = 0;

diff --git a/src/Include/editor/ide.hpp b/src/Include/editor/ide.hpp
@@ -11,7 +11,7 @@
 
 namespace editor
 {
-class property_holder;
+class property_holder_base;
 class property_holder_collection;
 class property_holder_holder;
 
@@ -25,11 +25,11 @@ class ide
     virtual void pause() = 0;
 
 public:
-    virtual property_holder* create_property_holder(
+    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*& property_holder) = 0;
-    virtual void environment_levels(property_holder* property_holder) = 0;
-    virtual void environment_weathers(property_holder* property_holder) = 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;
 
 public:
     typedef fastdelegate::FastDelegate0<LPCSTR const*> weathers_getter_type;

diff --git a/src/Include/editor/property_holder.hpp → src/Include/editor/property_holder_base.hpp b/src/Include/editor/property_holder.hpp → src/Include/editor/property_holder_base.hpp
@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: property_holder.hpp
+//	Module 		: property_holder_base.hpp
 //	Created 	: 04.12.2007
 //  Modified 	: 04.12.2007
 //	Author		: Dmitriy Iassenev
@@ -25,32 +25,32 @@ struct vec3f
 };
 #pragma pack(pop)
 
-class property_holder;
+class property_holder_base;
 
 class property_holder_holder
 {
 public:
-    virtual property_holder* object() = 0;
+    virtual property_holder_base* object() = 0;
     virtual ~property_holder_holder() = 0 {}
 };
 
 class property_holder_collection
 {
 public:
     virtual void clear() = 0;
-    virtual void insert(property_holder* holder, u32 const& position) = 0;
+    virtual void insert(property_holder_base* holder, u32 const& position) = 0;
     virtual void erase(u32 const& position) = 0;
-    virtual int index(property_holder* holder) = 0;
-    virtual property_holder* item(u32 const& position) = 0;
+    virtual int index(property_holder_base* holder) = 0;
+    virtual property_holder_base* item(u32 const& position) = 0;
     virtual u32 size() = 0;
     virtual void display_name(u32 const& item_index, char* const& buffer, u32 const& buffer_size) = 0;
-    virtual property_holder* create() = 0;
-    virtual void destroy(property_holder* holder) = 0;
+    virtual property_holder_base* create() = 0;
+    virtual void destroy(property_holder_base* holder) = 0;
 }; // class propery_holder_collection
 
 class property_value;
 
-class property_holder
+class property_holder_base
 {
 public:
     typedef fastdelegate::FastDelegate0<bool> boolean_getter_type;
@@ -321,7 +321,7 @@ class property_holder
         notify_parent_on_change_enum const& notify_parent = do_not_notify_parent_on_change,
         password_char_enum const& password = no_password_char,
         refresh_grid_on_change_enum const& refresh_grid = do_not_refresh_grid_on_change) = 0;
-    virtual property_value* add_property(LPCSTR identifier, LPCSTR category, LPCSTR description, property_holder* value,
+    virtual property_value* add_property(LPCSTR identifier, LPCSTR category, LPCSTR description, property_holder_base* value,
         readonly_enum const& read_only = property_read_write,
         notify_parent_on_change_enum const& notify_parent = do_not_notify_parent_on_change,
         password_char_enum const& password = no_password_char,
@@ -337,15 +337,15 @@ class property_holder
         notify_parent_on_change_enum const& notify_parent = do_not_notify_parent_on_change,
         password_char_enum const& password = no_password_char,
         refresh_grid_on_change_enum const& refresh_grid = do_not_refresh_grid_on_change) = 0;
-}; // class property_holder
+}; // class property_holder_base
 
 class property_value
 {
 public:
-    virtual void attribute(property_holder::readonly_enum const& read_only) = 0;
-    virtual void attribute(property_holder::notify_parent_on_change_enum const& notify_parent) = 0;
-    virtual void attribute(property_holder::password_char_enum const& password_char) = 0;
-    virtual void attribute(property_holder::refresh_grid_on_change_enum const& refresh_grid) = 0;
+    virtual void attribute(property_holder_base::readonly_enum const& read_only) = 0;
+    virtual void attribute(property_holder_base::notify_parent_on_change_enum const& notify_parent) = 0;
+    virtual void attribute(property_holder_base::password_char_enum const& password_char) = 0;
+    virtual void attribute(property_holder_base::refresh_grid_on_change_enum const& refresh_grid) = 0;
 }; // class property_value
 
 } // namespace editor

diff --git a/src/editors/xrWeatherEditor/ide_impl.cpp b/src/editors/xrWeatherEditor/ide_impl.cpp
@@ -55,13 +55,13 @@ void ide_impl::on_load_finished()
 }
 
 void ide_impl::pause() { m_window->view().pause(); }
-editor::property_holder* ide_impl::create_property_holder(
+editor::property_holder_base* ide_impl::create_property_holder(
     LPCSTR display_name, editor::property_holder_collection* collection, editor::property_holder_holder* holder)
 {
     return (new ::property_holder(m_engine, display_name, collection, holder));
 }
 
-void ide_impl::destroy(editor::property_holder*& property_holder)
+void ide_impl::destroy(editor::property_holder_base*& property_holder)
 {
     delete (property_holder);
     property_holder = 0;

diff --git a/src/editors/xrWeatherEditor/ide_impl.hpp b/src/editors/xrWeatherEditor/ide_impl.hpp
@@ -29,7 +29,7 @@ class ide_impl : public editor::ide
 {
 public:
     typedef editor::window_ide window_ide;
-    typedef editor::property_holder property_holder;
+    typedef editor::property_holder_base property_holder;
 
 public:
     ide_impl(editor::engine* engine);

diff --git a/src/editors/xrWeatherEditor/property_boolean.hpp b/src/editors/xrWeatherEditor/property_boolean.hpp
@@ -16,8 +16,8 @@ public
 ref class property_boolean : public IProperty
 {
 public:
-    typedef editor::property_holder::boolean_getter_type boolean_getter_type;
-    typedef editor::property_holder::boolean_setter_type boolean_setter_type;
+    typedef editor::property_holder_base::boolean_getter_type boolean_getter_type;
+    typedef editor::property_holder_base::boolean_setter_type boolean_setter_type;
 
 public:
     property_boolean(boolean_getter_type const& getter, boolean_setter_type const& setter);

diff --git a/src/editors/xrWeatherEditor/property_boolean_values_value.hpp b/src/editors/xrWeatherEditor/property_boolean_values_value.hpp
@@ -15,8 +15,8 @@ public
 ref class property_boolean_values_value : public property_boolean
 {
 public:
-    typedef editor::property_holder::boolean_getter_type boolean_getter_type;
-    typedef editor::property_holder::boolean_setter_type boolean_setter_type;
+    typedef editor::property_holder_base::boolean_getter_type boolean_getter_type;
+    typedef editor::property_holder_base::boolean_setter_type boolean_setter_type;
 
 private:
     typedef property_boolean inherited;

diff --git a/src/editors/xrWeatherEditor/property_boolean_values_value_reference.hpp b/src/editors/xrWeatherEditor/property_boolean_values_value_reference.hpp
@@ -15,8 +15,8 @@ public
 ref class property_boolean_values_value_reference : public property_boolean_reference
 {
 public:
-    typedef editor::property_holder::boolean_getter_type boolean_getter_type;
-    typedef editor::property_holder::boolean_setter_type boolean_setter_type;
+    typedef editor::property_holder_base::boolean_getter_type boolean_getter_type;
+    typedef editor::property_holder_base::boolean_setter_type boolean_setter_type;
 
 private:
     typedef property_boolean_reference inherited;

diff --git a/src/editors/xrWeatherEditor/property_collection_base.cpp b/src/editors/xrWeatherEditor/property_collection_base.cpp
@@ -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* holder_raw = collection->item(i);
+        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* holder_raw = collection()->item(index);
+    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* holder_raw = collection()->create();
+    editor::property_holder_base* holder_raw = collection()->create();
     ::property_holder* holder = dynamic_cast<::property_holder*>(holder_raw);
     return (holder->container());
 }
diff --git a/src/editors/xrWeatherEditor/property_collection_base.hpp b/src/editors/xrWeatherEditor/property_collection_base.hpp
@@ -24,7 +24,7 @@ ref class property_collection_converter;
 {
 public:
     typedef editor::property_holder_collection collection_type;
-    typedef editor::property_holder property_holder;
+    typedef editor::property_holder_base property_holder;
     typedef System::Collections::IEnumerator IEnumerator;
     typedef System::Array Array;
     typedef System::Object Object;

diff --git a/src/editors/xrWeatherEditor/property_collection_enumerator.cpp b/src/editors/xrWeatherEditor/property_collection_enumerator.cpp
@@ -35,7 +35,7 @@ Object ^ property_collection_enumerator::Current::get()
     if (m_cursor >= (int)m_collection->size())
         throw(gcnew InvalidOperationException());
 
-    editor::property_holder* holder_raw = m_collection->item((u32)m_cursor);
+    editor::property_holder_base* holder_raw = m_collection->item((u32)m_cursor);
     property_holder* holder = dynamic_cast<property_holder*>(holder_raw);
     VERIFY(holder);
     return (holder->container());

diff --git a/src/editors/xrWeatherEditor/property_color.hpp b/src/editors/xrWeatherEditor/property_color.hpp
@@ -15,8 +15,8 @@ public
 ref class property_color : public property_color_base
 {
 public:
-    typedef editor::property_holder::color_getter_type color_getter_type;
-    typedef editor::property_holder::color_setter_type color_setter_type;
+    typedef editor::property_holder_base::color_getter_type color_getter_type;
+    typedef editor::property_holder_base::color_setter_type color_setter_type;
     typedef property_color_base inherited;
 
 public:

diff --git a/src/editors/xrWeatherEditor/property_color_base.cpp b/src/editors/xrWeatherEditor/property_color_base.cpp
@@ -43,8 +43,8 @@ property_color_base::property_color_base(editor::color const % color, array<Syst
 
     m_attributes[n] = gcnew System::ComponentModel::NotifyParentPropertyAttribute(true);
 
-    typedef editor::property_holder::float_getter_type float_getter_type;
-    typedef editor::property_holder::float_setter_type float_setter_type;
+    typedef editor::property_holder_base::float_getter_type float_getter_type;
+    typedef editor::property_holder_base::float_setter_type float_setter_type;
 
     float_getter_type getter;
     float_setter_type setter;

diff --git a/src/editors/xrWeatherEditor/property_editor_file_name.hpp b/src/editors/xrWeatherEditor/property_editor_file_name.hpp
@@ -23,8 +23,8 @@ public
 ref class property_editor_file_name : public System::Drawing::Design::UITypeEditor
 {
 public:
-    typedef editor::property_holder::string_getter_type string_getter_type;
-    typedef editor::property_holder::string_setter_type string_setter_type;
+    typedef editor::property_holder_base::string_getter_type string_getter_type;
+    typedef editor::property_holder_base::string_setter_type string_setter_type;
 
 private:
     typedef System::Drawing::Design::UITypeEditor inherited;

diff --git a/src/editors/xrWeatherEditor/property_file_name_value.hpp b/src/editors/xrWeatherEditor/property_file_name_value.hpp
@@ -19,8 +19,8 @@ ref class property_file_name_value : public property_string, public property_fil
     typedef property_string inherited;
 
 public:
-    typedef editor::property_holder::string_getter_type string_getter_type;
-    typedef editor::property_holder::string_setter_type string_setter_type;
+    typedef editor::property_holder_base::string_getter_type string_getter_type;
+    typedef editor::property_holder_base::string_setter_type string_setter_type;
 
 public:
     property_file_name_value(string_getter_type const& getter, string_setter_type const& setter,

diff --git a/src/editors/xrWeatherEditor/property_float.hpp b/src/editors/xrWeatherEditor/property_float.hpp
@@ -15,8 +15,8 @@ public
 ref class property_float : public XRay::SdkControls::IProperty, public XRay::SdkControls::IIncrementable
 {
 public:
-    typedef editor::property_holder::float_getter_type float_getter_type;
-    typedef editor::property_holder::float_setter_type float_setter_type;
+    typedef editor::property_holder_base::float_getter_type float_getter_type;
+    typedef editor::property_holder_base::float_setter_type float_setter_type;
 
 public:
     property_float(float_getter_type const& getter, float_setter_type const& setter, float const % increment_factor);

diff --git a/src/editors/xrWeatherEditor/property_float_enum_value.hpp b/src/editors/xrWeatherEditor/property_float_enum_value.hpp
@@ -15,8 +15,8 @@ public
 ref class property_float_enum_value : public property_float
 {
 public:
-    typedef editor::property_holder::float_getter_type float_getter_type;
-    typedef editor::property_holder::float_setter_type float_setter_type;
+    typedef editor::property_holder_base::float_getter_type float_getter_type;
+    typedef editor::property_holder_base::float_setter_type float_setter_type;
     typedef Pair<float, System::String ^> ValuePair;
 
 private:

diff --git a/src/editors/xrWeatherEditor/property_float_enum_value_reference.hpp b/src/editors/xrWeatherEditor/property_float_enum_value_reference.hpp
@@ -15,8 +15,8 @@ public
 ref class property_float_enum_value_reference : public property_float_reference
 {
 public:
-    typedef editor::property_holder::float_getter_type float_getter_type;
-    typedef editor::property_holder::float_setter_type float_setter_type;
+    typedef editor::property_holder_base::float_getter_type float_getter_type;
+    typedef editor::property_holder_base::float_setter_type float_setter_type;
     typedef Pair<float, System::String ^> ValuePair;
 
 private:

diff --git a/src/editors/xrWeatherEditor/property_holder.hpp b/src/editors/xrWeatherEditor/property_holder.hpp
@@ -20,7 +20,7 @@ class engine;
 class property_holder_collection;
 } // namespace editor
 
-class property_holder : public editor::property_holder
+class property_holder : public editor::property_holder_base
 {
 public:
     property_holder(editor::engine* engine, LPCSTR display_name, editor::property_holder_collection* collection,
@@ -185,7 +185,7 @@ class property_holder : public editor::property_holder
         notify_parent_on_change_enum const& notify_parent, password_char_enum const& password,
         refresh_grid_on_change_enum const& refresh_grid);
     virtual editor::property_value* add_property(LPCSTR identifier, LPCSTR category, LPCSTR description,
-        editor::property_holder* value, readonly_enum const& read_only,
+        editor::property_holder_base* value, readonly_enum const& read_only,
         notify_parent_on_change_enum const& notify_parent, password_char_enum const& password,
         refresh_grid_on_change_enum const& refresh_grid);
     virtual editor::property_value* add_property(LPCSTR identifier, LPCSTR category, LPCSTR description,

diff --git a/src/editors/xrWeatherEditor/property_holder_container.cpp b/src/editors/xrWeatherEditor/property_holder_container.cpp
@@ -14,7 +14,7 @@
 using Flobbster::Windows::Forms::PropertySpec;
 
 editor::property_value* property_holder::add_property(LPCSTR identifier, LPCSTR category, LPCSTR description,
-    editor::property_holder* value, readonly_enum const& read_only, notify_parent_on_change_enum const& notify_parent,
+    editor::property_holder_base* value, readonly_enum const& read_only, notify_parent_on_change_enum const& notify_parent,
     password_char_enum const& password, refresh_grid_on_change_enum const& refresh_grid)
 {
     property_holder* real_value = dynamic_cast<property_holder*>(value);

diff --git a/src/editors/xrWeatherEditor/property_holder_include.hpp b/src/editors/xrWeatherEditor/property_holder_include.hpp
@@ -11,9 +11,9 @@
 
 #pragma unmanaged
 #include "Common/Noncopyable.hpp"
-#include "xrcore/fastdelegate.h"
+#include "xrCore/fastdelegate.h"
 #include <utility>
-#include "include/editor/property_holder.hpp"
+#include "Include/editor/property_holder_base.hpp"
 #pragma managed
 
 generic<typename type0, typename type1> private ref struct Pair

diff --git a/src/editors/xrWeatherEditor/property_integer.hpp b/src/editors/xrWeatherEditor/property_integer.hpp
@@ -15,8 +15,8 @@ public
 ref class property_integer : public XRay::SdkControls::IProperty
 {
 public:
-    typedef editor::property_holder::integer_getter_type integer_getter_type;
-    typedef editor::property_holder::integer_setter_type integer_setter_type;
+    typedef editor::property_holder_base::integer_getter_type integer_getter_type;
+    typedef editor::property_holder_base::integer_setter_type integer_setter_type;
 
 public:
     property_integer(integer_getter_type const& getter, integer_setter_type const& setter);

diff --git a/src/editors/xrWeatherEditor/property_integer_enum_value.hpp b/src/editors/xrWeatherEditor/property_integer_enum_value.hpp
@@ -15,8 +15,8 @@ public
 ref class property_integer_enum_value : public property_integer
 {
 public:
-    typedef editor::property_holder::integer_getter_type integer_getter_type;
-    typedef editor::property_holder::integer_setter_type integer_setter_type;
+    typedef editor::property_holder_base::integer_getter_type integer_getter_type;
+    typedef editor::property_holder_base::integer_setter_type integer_setter_type;
     typedef Pair<int, System::String ^> ValuePair;
 
 private:

diff --git a/src/editors/xrWeatherEditor/property_integer_values_value.hpp b/src/editors/xrWeatherEditor/property_integer_values_value.hpp
@@ -16,8 +16,8 @@ public
 ref class property_integer_values_value : public property_integer, public property_integer_values_value_base
 {
 public:
-    typedef editor::property_holder::integer_getter_type integer_getter_type;
-    typedef editor::property_holder::integer_setter_type integer_setter_type;
+    typedef editor::property_holder_base::integer_getter_type integer_getter_type;
+    typedef editor::property_holder_base::integer_setter_type integer_setter_type;
 
 private:
     typedef property_integer inherited;

diff --git a/src/editors/xrWeatherEditor/property_integer_values_value_getter.hpp b/src/editors/xrWeatherEditor/property_integer_values_value_getter.hpp
@@ -16,7 +16,7 @@ public
 ref class property_integer_values_value_getter : public property_integer, public property_integer_values_value_base
 {
 public:
-    typedef editor::property_holder property_holder;
+    typedef editor::property_holder_base property_holder;
     typedef property_holder::integer_getter_type integer_getter_type;
     typedef property_holder::integer_setter_type integer_setter_type;
     typedef property_holder::string_collection_getter_type string_collection_getter_type;

diff --git a/src/editors/xrWeatherEditor/property_integer_values_value_reference_getter.hpp b/src/editors/xrWeatherEditor/property_integer_values_value_reference_getter.hpp
@@ -17,7 +17,7 @@ ref class property_integer_values_value_reference_getter : public property_integ
                                                            public property_integer_values_value_base
 {
 public:
-    typedef editor::property_holder property_holder;
+    typedef editor::property_holder_base property_holder;
     typedef property_holder::integer_getter_type integer_getter_type;
     typedef property_holder::integer_setter_type integer_setter_type;
     typedef property_holder::string_collection_getter_type string_collection_getter_type;