Skip to content

Commit 9b2cc69

Browse files
Xottab-DUTYXottab-DUTY
committed
Rename editor::property_holder to editor::property_holder_base (https://github.com/Xottab-DUTY/xray-16/issues/1)
1 parent f4c16aa commit 9b2cc69

File tree

88 files changed

+291
-290
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+291
-290
lines changed

‎src/Include/editor/engine.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class shared_str;
1313

1414
namespace editor
1515
{
16-
class property_holder;
16+
class property_holder_base;
1717

1818
class engine
1919
{
@@ -44,9 +44,9 @@ class engine
4444
virtual void track_weather(float const& time) = 0;
4545
virtual float track_weather() = 0;
4646

47-
virtual property_holder* current_frame_property_holder() = 0;
48-
virtual property_holder* blend_frame_property_holder() = 0;
49-
virtual property_holder* target_frame_property_holder() = 0;
47+
virtual property_holder_base* current_frame_property_holder() = 0;
48+
virtual property_holder_base* blend_frame_property_holder() = 0;
49+
virtual property_holder_base* target_frame_property_holder() = 0;
5050

5151
virtual void weather_paused(bool const& value) = 0;
5252
virtual bool weather_paused() = 0;

‎src/Include/editor/ide.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace editor
1313
{
14-
class property_holder;
14+
class property_holder_base;
1515
class property_holder_collection;
1616
class property_holder_holder;
1717

@@ -25,11 +25,11 @@ class ide
2525
virtual void pause() = 0;
2626

2727
public:
28-
virtual property_holder* create_property_holder(
28+
virtual property_holder_base* create_property_holder(
2929
LPCSTR display_name, property_holder_collection* collection = 0, property_holder_holder* holder = 0) = 0;
30-
virtual void destroy(property_holder*& property_holder) = 0;
31-
virtual void environment_levels(property_holder* property_holder) = 0;
32-
virtual void environment_weathers(property_holder* property_holder) = 0;
30+
virtual void destroy(property_holder_base*& property_holder) = 0;
31+
virtual void environment_levels(property_holder_base* property_holder) = 0;
32+
virtual void environment_weathers(property_holder_base* property_holder) = 0;
3333

3434
public:
3535
typedef fastdelegate::FastDelegate0<LPCSTR const*> weathers_getter_type;

‎src/Include/editor/property_holder.hpp renamed to ‎src/Include/editor/property_holder_base.hpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
////////////////////////////////////////////////////////////////////////////
2-
// Module : property_holder.hpp
2+
// Module : property_holder_base.hpp
33
// Created : 04.12.2007
44
// Modified : 04.12.2007
55
// Author : Dmitriy Iassenev
@@ -25,32 +25,32 @@ struct vec3f
2525
};
2626
#pragma pack(pop)
2727

28-
class property_holder;
28+
class property_holder_base;
2929

3030
class property_holder_holder
3131
{
3232
public:
33-
virtual property_holder* object() = 0;
33+
virtual property_holder_base* object() = 0;
3434
virtual ~property_holder_holder() = 0 {}
3535
};
3636

3737
class property_holder_collection
3838
{
3939
public:
4040
virtual void clear() = 0;
41-
virtual void insert(property_holder* holder, u32 const& position) = 0;
41+
virtual void insert(property_holder_base* holder, u32 const& position) = 0;
4242
virtual void erase(u32 const& position) = 0;
43-
virtual int index(property_holder* holder) = 0;
44-
virtual property_holder* item(u32 const& position) = 0;
43+
virtual int index(property_holder_base* holder) = 0;
44+
virtual property_holder_base* item(u32 const& position) = 0;
4545
virtual u32 size() = 0;
4646
virtual void display_name(u32 const& item_index, char* const& buffer, u32 const& buffer_size) = 0;
47-
virtual property_holder* create() = 0;
48-
virtual void destroy(property_holder* holder) = 0;
47+
virtual property_holder_base* create() = 0;
48+
virtual void destroy(property_holder_base* holder) = 0;
4949
}; // class propery_holder_collection
5050

5151
class property_value;
5252

53-
class property_holder
53+
class property_holder_base
5454
{
5555
public:
5656
typedef fastdelegate::FastDelegate0<bool> boolean_getter_type;
@@ -321,7 +321,7 @@ class property_holder
321321
notify_parent_on_change_enum const& notify_parent = do_not_notify_parent_on_change,
322322
password_char_enum const& password = no_password_char,
323323
refresh_grid_on_change_enum const& refresh_grid = do_not_refresh_grid_on_change) = 0;
324-
virtual property_value* add_property(LPCSTR identifier, LPCSTR category, LPCSTR description, property_holder* value,
324+
virtual property_value* add_property(LPCSTR identifier, LPCSTR category, LPCSTR description, property_holder_base* value,
325325
readonly_enum const& read_only = property_read_write,
326326
notify_parent_on_change_enum const& notify_parent = do_not_notify_parent_on_change,
327327
password_char_enum const& password = no_password_char,
@@ -337,15 +337,15 @@ class property_holder
337337
notify_parent_on_change_enum const& notify_parent = do_not_notify_parent_on_change,
338338
password_char_enum const& password = no_password_char,
339339
refresh_grid_on_change_enum const& refresh_grid = do_not_refresh_grid_on_change) = 0;
340-
}; // class property_holder
340+
}; // class property_holder_base
341341

342342
class property_value
343343
{
344344
public:
345-
virtual void attribute(property_holder::readonly_enum const& read_only) = 0;
346-
virtual void attribute(property_holder::notify_parent_on_change_enum const& notify_parent) = 0;
347-
virtual void attribute(property_holder::password_char_enum const& password_char) = 0;
348-
virtual void attribute(property_holder::refresh_grid_on_change_enum const& refresh_grid) = 0;
345+
virtual void attribute(property_holder_base::readonly_enum const& read_only) = 0;
346+
virtual void attribute(property_holder_base::notify_parent_on_change_enum const& notify_parent) = 0;
347+
virtual void attribute(property_holder_base::password_char_enum const& password_char) = 0;
348+
virtual void attribute(property_holder_base::refresh_grid_on_change_enum const& refresh_grid) = 0;
349349
}; // class property_value
350350

351351
} // namespace editor

‎src/editors/xrWeatherEditor/ide_impl.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ void ide_impl::on_load_finished()
5555
}
5656

5757
void ide_impl::pause() { m_window->view().pause(); }
58-
editor::property_holder* ide_impl::create_property_holder(
58+
editor::property_holder_base* ide_impl::create_property_holder(
5959
LPCSTR display_name, editor::property_holder_collection* collection, editor::property_holder_holder* holder)
6060
{
6161
return (new ::property_holder(m_engine, display_name, collection, holder));
6262
}
6363

64-
void ide_impl::destroy(editor::property_holder*& property_holder)
64+
void ide_impl::destroy(editor::property_holder_base*& property_holder)
6565
{
6666
delete (property_holder);
6767
property_holder = 0;

‎src/editors/xrWeatherEditor/ide_impl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class ide_impl : public editor::ide
2929
{
3030
public:
3131
typedef editor::window_ide window_ide;
32-
typedef editor::property_holder property_holder;
32+
typedef editor::property_holder_base property_holder;
3333

3434
public:
3535
ide_impl(editor::engine* engine);

‎src/editors/xrWeatherEditor/property_boolean.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ public
1616
ref class property_boolean : public IProperty
1717
{
1818
public:
19-
typedef editor::property_holder::boolean_getter_type boolean_getter_type;
20-
typedef editor::property_holder::boolean_setter_type boolean_setter_type;
19+
typedef editor::property_holder_base::boolean_getter_type boolean_getter_type;
20+
typedef editor::property_holder_base::boolean_setter_type boolean_setter_type;
2121

2222
public:
2323
property_boolean(boolean_getter_type const& getter, boolean_setter_type const& setter);

‎src/editors/xrWeatherEditor/property_boolean_values_value.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public
1515
ref class property_boolean_values_value : public property_boolean
1616
{
1717
public:
18-
typedef editor::property_holder::boolean_getter_type boolean_getter_type;
19-
typedef editor::property_holder::boolean_setter_type boolean_setter_type;
18+
typedef editor::property_holder_base::boolean_getter_type boolean_getter_type;
19+
typedef editor::property_holder_base::boolean_setter_type boolean_setter_type;
2020

2121
private:
2222
typedef property_boolean inherited;

‎src/editors/xrWeatherEditor/property_boolean_values_value_reference.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public
1515
ref class property_boolean_values_value_reference : public property_boolean_reference
1616
{
1717
public:
18-
typedef editor::property_holder::boolean_getter_type boolean_getter_type;
19-
typedef editor::property_holder::boolean_setter_type boolean_setter_type;
18+
typedef editor::property_holder_base::boolean_getter_type boolean_getter_type;
19+
typedef editor::property_holder_base::boolean_setter_type boolean_setter_type;
2020

2121
private:
2222
typedef property_boolean_reference inherited;

‎src/editors/xrWeatherEditor/property_collection_base.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ void property_collection_base::CopyTo(Array ^ items, int index)
2525
collection_type* collection = this->collection();
2626
for (int i = index, n = collection->size(); i < n; ++i)
2727
{
28-
editor::property_holder* holder_raw = collection->item(i);
28+
editor::property_holder_base* holder_raw = collection->item(i);
2929
::property_holder* holder = dynamic_cast<::property_holder*>(holder_raw);
3030
VERIFY(holder);
3131
items->SetValue(holder->container(), i);
@@ -65,7 +65,7 @@ bool property_collection_base::IsFixedSize::get() { return (false); }
6565
bool property_collection_base::IsReadOnly::get() { return (false); }
6666
Object ^ property_collection_base::default ::get(int index)
6767
{
68-
editor::property_holder* holder_raw = collection()->item(index);
68+
editor::property_holder_base* holder_raw = collection()->item(index);
6969
::property_holder* holder = dynamic_cast<::property_holder*>(holder_raw);
7070
return (holder->container());
7171
}
@@ -78,7 +78,7 @@ void property_collection_base::default ::set(int index, Object ^ value)
7878

7979
property_container ^ property_collection_base::create()
8080
{
81-
editor::property_holder* holder_raw = collection()->create();
81+
editor::property_holder_base* holder_raw = collection()->create();
8282
::property_holder* holder = dynamic_cast<::property_holder*>(holder_raw);
8383
return (holder->container());
8484
}

‎src/editors/xrWeatherEditor/property_collection_base.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ref class property_collection_converter;
2424
{
2525
public:
2626
typedef editor::property_holder_collection collection_type;
27-
typedef editor::property_holder property_holder;
27+
typedef editor::property_holder_base property_holder;
2828
typedef System::Collections::IEnumerator IEnumerator;
2929
typedef System::Array Array;
3030
typedef System::Object Object;

‎src/editors/xrWeatherEditor/property_collection_enumerator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Object ^ property_collection_enumerator::Current::get()
3535
if (m_cursor >= (int)m_collection->size())
3636
throw(gcnew InvalidOperationException());
3737

38-
editor::property_holder* holder_raw = m_collection->item((u32)m_cursor);
38+
editor::property_holder_base* holder_raw = m_collection->item((u32)m_cursor);
3939
property_holder* holder = dynamic_cast<property_holder*>(holder_raw);
4040
VERIFY(holder);
4141
return (holder->container());

‎src/editors/xrWeatherEditor/property_color.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public
1515
ref class property_color : public property_color_base
1616
{
1717
public:
18-
typedef editor::property_holder::color_getter_type color_getter_type;
19-
typedef editor::property_holder::color_setter_type color_setter_type;
18+
typedef editor::property_holder_base::color_getter_type color_getter_type;
19+
typedef editor::property_holder_base::color_setter_type color_setter_type;
2020
typedef property_color_base inherited;
2121

2222
public:

‎src/editors/xrWeatherEditor/property_color_base.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ property_color_base::property_color_base(editor::color const % color, array<Syst
4343

4444
m_attributes[n] = gcnew System::ComponentModel::NotifyParentPropertyAttribute(true);
4545

46-
typedef editor::property_holder::float_getter_type float_getter_type;
47-
typedef editor::property_holder::float_setter_type float_setter_type;
46+
typedef editor::property_holder_base::float_getter_type float_getter_type;
47+
typedef editor::property_holder_base::float_setter_type float_setter_type;
4848

4949
float_getter_type getter;
5050
float_setter_type setter;

‎src/editors/xrWeatherEditor/property_editor_file_name.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ public
2323
ref class property_editor_file_name : public System::Drawing::Design::UITypeEditor
2424
{
2525
public:
26-
typedef editor::property_holder::string_getter_type string_getter_type;
27-
typedef editor::property_holder::string_setter_type string_setter_type;
26+
typedef editor::property_holder_base::string_getter_type string_getter_type;
27+
typedef editor::property_holder_base::string_setter_type string_setter_type;
2828

2929
private:
3030
typedef System::Drawing::Design::UITypeEditor inherited;

‎src/editors/xrWeatherEditor/property_file_name_value.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ ref class property_file_name_value : public property_string, public property_fil
1919
typedef property_string inherited;
2020

2121
public:
22-
typedef editor::property_holder::string_getter_type string_getter_type;
23-
typedef editor::property_holder::string_setter_type string_setter_type;
22+
typedef editor::property_holder_base::string_getter_type string_getter_type;
23+
typedef editor::property_holder_base::string_setter_type string_setter_type;
2424

2525
public:
2626
property_file_name_value(string_getter_type const& getter, string_setter_type const& setter,

‎src/editors/xrWeatherEditor/property_float.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public
1515
ref class property_float : public XRay::SdkControls::IProperty, public XRay::SdkControls::IIncrementable
1616
{
1717
public:
18-
typedef editor::property_holder::float_getter_type float_getter_type;
19-
typedef editor::property_holder::float_setter_type float_setter_type;
18+
typedef editor::property_holder_base::float_getter_type float_getter_type;
19+
typedef editor::property_holder_base::float_setter_type float_setter_type;
2020

2121
public:
2222
property_float(float_getter_type const& getter, float_setter_type const& setter, float const % increment_factor);

‎src/editors/xrWeatherEditor/property_float_enum_value.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public
1515
ref class property_float_enum_value : public property_float
1616
{
1717
public:
18-
typedef editor::property_holder::float_getter_type float_getter_type;
19-
typedef editor::property_holder::float_setter_type float_setter_type;
18+
typedef editor::property_holder_base::float_getter_type float_getter_type;
19+
typedef editor::property_holder_base::float_setter_type float_setter_type;
2020
typedef Pair<float, System::String ^> ValuePair;
2121

2222
private:

‎src/editors/xrWeatherEditor/property_float_enum_value_reference.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public
1515
ref class property_float_enum_value_reference : public property_float_reference
1616
{
1717
public:
18-
typedef editor::property_holder::float_getter_type float_getter_type;
19-
typedef editor::property_holder::float_setter_type float_setter_type;
18+
typedef editor::property_holder_base::float_getter_type float_getter_type;
19+
typedef editor::property_holder_base::float_setter_type float_setter_type;
2020
typedef Pair<float, System::String ^> ValuePair;
2121

2222
private:

‎src/editors/xrWeatherEditor/property_holder.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class engine;
2020
class property_holder_collection;
2121
} // namespace editor
2222

23-
class property_holder : public editor::property_holder
23+
class property_holder : public editor::property_holder_base
2424
{
2525
public:
2626
property_holder(editor::engine* engine, LPCSTR display_name, editor::property_holder_collection* collection,
@@ -185,7 +185,7 @@ class property_holder : public editor::property_holder
185185
notify_parent_on_change_enum const& notify_parent, password_char_enum const& password,
186186
refresh_grid_on_change_enum const& refresh_grid);
187187
virtual editor::property_value* add_property(LPCSTR identifier, LPCSTR category, LPCSTR description,
188-
editor::property_holder* value, readonly_enum const& read_only,
188+
editor::property_holder_base* value, readonly_enum const& read_only,
189189
notify_parent_on_change_enum const& notify_parent, password_char_enum const& password,
190190
refresh_grid_on_change_enum const& refresh_grid);
191191
virtual editor::property_value* add_property(LPCSTR identifier, LPCSTR category, LPCSTR description,

‎src/editors/xrWeatherEditor/property_holder_container.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
using Flobbster::Windows::Forms::PropertySpec;
1515

1616
editor::property_value* property_holder::add_property(LPCSTR identifier, LPCSTR category, LPCSTR description,
17-
editor::property_holder* value, readonly_enum const& read_only, notify_parent_on_change_enum const& notify_parent,
17+
editor::property_holder_base* value, readonly_enum const& read_only, notify_parent_on_change_enum const& notify_parent,
1818
password_char_enum const& password, refresh_grid_on_change_enum const& refresh_grid)
1919
{
2020
property_holder* real_value = dynamic_cast<property_holder*>(value);

‎src/editors/xrWeatherEditor/property_holder_include.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
#pragma unmanaged
1313
#include "Common/Noncopyable.hpp"
14-
#include "xrcore/fastdelegate.h"
14+
#include "xrCore/fastdelegate.h"
1515
#include <utility>
16-
#include "include/editor/property_holder.hpp"
16+
#include "Include/editor/property_holder_base.hpp"
1717
#pragma managed
1818

1919
generic<typename type0, typename type1> private ref struct Pair

‎src/editors/xrWeatherEditor/property_integer.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public
1515
ref class property_integer : public XRay::SdkControls::IProperty
1616
{
1717
public:
18-
typedef editor::property_holder::integer_getter_type integer_getter_type;
19-
typedef editor::property_holder::integer_setter_type integer_setter_type;
18+
typedef editor::property_holder_base::integer_getter_type integer_getter_type;
19+
typedef editor::property_holder_base::integer_setter_type integer_setter_type;
2020

2121
public:
2222
property_integer(integer_getter_type const& getter, integer_setter_type const& setter);

‎src/editors/xrWeatherEditor/property_integer_enum_value.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public
1515
ref class property_integer_enum_value : public property_integer
1616
{
1717
public:
18-
typedef editor::property_holder::integer_getter_type integer_getter_type;
19-
typedef editor::property_holder::integer_setter_type integer_setter_type;
18+
typedef editor::property_holder_base::integer_getter_type integer_getter_type;
19+
typedef editor::property_holder_base::integer_setter_type integer_setter_type;
2020
typedef Pair<int, System::String ^> ValuePair;
2121

2222
private:

‎src/editors/xrWeatherEditor/property_integer_values_value.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ public
1616
ref class property_integer_values_value : public property_integer, public property_integer_values_value_base
1717
{
1818
public:
19-
typedef editor::property_holder::integer_getter_type integer_getter_type;
20-
typedef editor::property_holder::integer_setter_type integer_setter_type;
19+
typedef editor::property_holder_base::integer_getter_type integer_getter_type;
20+
typedef editor::property_holder_base::integer_setter_type integer_setter_type;
2121

2222
private:
2323
typedef property_integer inherited;

‎src/editors/xrWeatherEditor/property_integer_values_value_getter.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public
1616
ref class property_integer_values_value_getter : public property_integer, public property_integer_values_value_base
1717
{
1818
public:
19-
typedef editor::property_holder property_holder;
19+
typedef editor::property_holder_base property_holder;
2020
typedef property_holder::integer_getter_type integer_getter_type;
2121
typedef property_holder::integer_setter_type integer_setter_type;
2222
typedef property_holder::string_collection_getter_type string_collection_getter_type;

‎src/editors/xrWeatherEditor/property_integer_values_value_reference_getter.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ref class property_integer_values_value_reference_getter : public property_integ
1717
public property_integer_values_value_base
1818
{
1919
public:
20-
typedef editor::property_holder property_holder;
20+
typedef editor::property_holder_base property_holder;
2121
typedef property_holder::integer_getter_type integer_getter_type;
2222
typedef property_holder::integer_setter_type integer_setter_type;
2323
typedef property_holder::string_collection_getter_type string_collection_getter_type;

0 commit comments

Comments
 (0)