Rename editor::engine to editor::engine_base (https://github.com/Xott…

…ab-DUTY/xray-16/issues/1)

src/Include/editor/engine.hpp

@@ -21,7 +21,7 @@ class property_holder_base;
 
 namespace editor
 {
-class engine
+class engine_base
 {
 public:
     virtual bool on_message(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT& result) = 0;

src/Include/editor/interfaces.hpp

@@ -12,9 +12,9 @@
 namespace editor
 {
 class ide_base;
-class engine;
+class engine_base;
 
-typedef void(__cdecl* initialize_function_ptr)(ide_base*&, engine*);
+typedef void(__cdecl* initialize_function_ptr)(ide_base*&, engine_base*);
 typedef void(__cdecl* finalize_function_ptr)(ide_base*&);
 
 } // namespace editor

src/editors/xrWeatherEditor/entry_point.cpp

@@ -13,7 +13,7 @@
 private ref class window_ide_final : public editor::window_ide
 {
 public:
-    window_ide_final(editor::ide_base*& ide, editor::engine* engine) : editor::window_ide(engine)
+    window_ide_final(editor::ide_base*& ide, editor::engine_base* engine) : editor::window_ide(engine)
     {
         m_ide = ide;
         Application::Idle += gcnew System::EventHandler(this, &window_ide_final::on_idle);
@@ -60,7 +60,7 @@ private ref class window_ide_final : public editor::window_ide
 
 ide_impl* g_ide = nullptr;
 
-static void initialize_impl(editor::ide_base*& ide, editor::engine* engine)
+static void initialize_impl(editor::ide_base*& ide, editor::engine_base* engine)
 {
     VERIFY(!g_ide);
     g_ide = new ide_impl(engine);
@@ -73,7 +73,7 @@ static void initialize_impl(editor::ide_base*& ide, editor::engine* engine)
 WINOLEAPI CoInitializeEx(IN LPVOID pvReserved, IN DWORD dwCoInit);
 #pragma comment(lib, "ole32.lib")
 
-extern "C" __declspec(dllexport) void initialize(editor::ide_base*& ide, editor::engine* engine)
+extern "C" __declspec(dllexport) void initialize(editor::ide_base*& ide, editor::engine_base* engine)
 {
     CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
     initialize_impl(ide, engine);

src/editors/xrWeatherEditor/ide_impl.cpp

@@ -20,7 +20,7 @@
 
 using editor::window_ide;
 
-ide_impl::ide_impl(editor::engine* engine) : m_engine(engine), m_window(nullptr), m_paused(false), m_in_idle(false) {}
+ide_impl::ide_impl(editor::engine_base* engine) : m_engine(engine), m_window(nullptr), m_paused(false), m_in_idle(false) {}
 ide_impl::~ide_impl() {}
 void ide_impl::window(window_ide ^ window) { m_window = window; }
 window_ide ^ ide_impl::window() { return (m_window); }

src/editors/xrWeatherEditor/ide_impl.hpp

@@ -21,7 +21,7 @@
 namespace editor
 {
 ref class window_ide;
-class engine;
+class engine_base;
 class property_holder_holder;
 } // namespace editor
 
@@ -32,7 +32,7 @@ class ide_impl : public editor::ide_base
     typedef XRay::Editor::property_holder_base property_holder;
 
 public:
-    ide_impl(editor::engine* engine);
+    ide_impl(editor::engine_base* engine);
     virtual ~ide_impl();
     void window(window_ide ^ window);
     window_ide ^ window();
@@ -59,7 +59,7 @@ class ide_impl : public editor::ide_base
         frames_size_getter_type const& frames_size_getter);
 
 private:
-    editor::engine* m_engine;
+    editor::engine_base* m_engine;
     gcroot<window_ide ^> m_window;
     bool m_paused;
     bool m_in_idle;

src/editors/xrWeatherEditor/property_file_name_value_shared_str.cpp

@@ -11,7 +11,7 @@
 
 using System::String;
 
-property_file_name_value_shared_str::property_file_name_value_shared_str(editor::engine* engine, shared_str& value,
+property_file_name_value_shared_str::property_file_name_value_shared_str(editor::engine_base* engine, shared_str& value,
     System::String ^ DefaultExt_, System::String ^ Filter_, System::String ^ InitialDirectory_, System::String ^ Title_,
     bool remove_extension)
     : inherited(engine, value), DefaultExt(DefaultExt_), Filter(Filter_), InitialDirectory(InitialDirectory_),

src/editors/xrWeatherEditor/property_file_name_value_shared_str.hpp

@@ -19,7 +19,7 @@ ref class property_file_name_value_shared_str : public property_string_shared_st
     typedef property_string_shared_str inherited;
 
 public:
-    property_file_name_value_shared_str(editor::engine* engine, shared_str& value, System::String ^ DefaultExt_,
+    property_file_name_value_shared_str(editor::engine_base* engine, shared_str& value, System::String ^ DefaultExt_,
         System::String ^ Filter_, System::String ^ InitialDirectory_, System::String ^ Title_, bool remove_extension);
 
     virtual System::String ^ default_extension();

src/editors/xrWeatherEditor/property_holder.cpp

@@ -13,12 +13,12 @@
 using Flobbster::Windows::Forms::PropertySpec;
 using System::String;
 using XRay::Editor::property_holder_collection;
-using editor::engine;
+using editor::engine_base;
 using XRay::Editor::property_holder_holder;
 
 typedef property_holder::collection_type collection_type;
 
-property_holder::property_holder(editor::engine* engine, LPCSTR display_name, property_holder_collection* collection,
+property_holder::property_holder(editor::engine_base* engine, LPCSTR display_name, property_holder_collection* collection,
     XRay::Editor::property_holder_holder* holder)
     : m_engine(engine), m_display_name(to_string(display_name)), m_collection(collection), m_holder(holder),
       m_disposing(false)
@@ -53,7 +53,7 @@ void property_holder::on_dispose()
 }
 
 property_container ^ property_holder::container() { return (m_container); }
-engine& property_holder::engine()
+engine_base& property_holder::engine()
 {
     VERIFY(m_engine);
     return (*m_engine);

src/editors/xrWeatherEditor/property_holder.hpp

@@ -17,20 +17,20 @@ ref class property_holder_converter;
 
 namespace editor
 {
-class engine;
+class engine_base;
 //class property_holder_collection;
 }
 
 
 class property_holder : public XRay::Editor::property_holder_base
 {
 public:
-    property_holder(editor::engine* engine, LPCSTR display_name, XRay::Editor::property_holder_collection* collection,
+    property_holder(editor::engine_base* engine, LPCSTR display_name, XRay::Editor::property_holder_collection* collection,
         XRay::Editor::property_holder_holder* holder);
     virtual ~property_holder();
     void on_dispose();
     property_container ^ container();
-    editor::engine& engine();
+    editor::engine_base& engine();
 
 public:
     virtual XRay::Editor::property_holder_holder* holder();
@@ -209,7 +209,7 @@ class property_holder : public XRay::Editor::property_holder_base
     gcroot<property_container ^> m_container;
     gcroot<System::String ^> m_display_name;
     collection_type* m_collection;
-    editor::engine* m_engine;
+    editor::engine_base* m_engine;
     XRay::Editor::property_holder_holder* m_holder;
     bool m_disposing;
 }; // class property_holder

src/editors/xrWeatherEditor/property_string_shared_str.cpp

@@ -10,7 +10,7 @@
 #include "property_string_shared_str.hpp"
 #include "engine_include.hpp"
 
-property_string_shared_str::property_string_shared_str(editor::engine* engine, shared_str& value)
+property_string_shared_str::property_string_shared_str(editor::engine_base* engine, shared_str& value)
     : m_engine(engine), m_value(&value)
 {
 }

src/editors/xrWeatherEditor/property_string_shared_str.hpp

@@ -13,21 +13,21 @@
 
 namespace editor
 {
-class engine;
+class engine_base;
 } // namespace editor
 
 public
 ref class property_string_shared_str : public XRay::SdkControls::IProperty
 {
 public:
-    property_string_shared_str(editor::engine* engine, shared_str& value);
+    property_string_shared_str(editor::engine_base* engine, shared_str& value);
     virtual ~property_string_shared_str();
     !property_string_shared_str();
     virtual System::Object ^ GetValue();
     virtual void SetValue(System::Object ^ object);
 
 private:
-    editor::engine* m_engine;
+    editor::engine_base* m_engine;
     shared_str* m_value;
 }; // ref class property_string_shared_str
 

src/editors/xrWeatherEditor/property_string_values_value_shared_str.cpp

@@ -10,7 +10,7 @@
 #include "property_string_values_value_shared_str.hpp"
 
 property_string_values_value_shared_str::property_string_values_value_shared_str(
-    editor::engine* engine, shared_str& value, LPCSTR const* values, u32 const& value_count)
+    editor::engine_base* engine, shared_str& value, LPCSTR const* values, u32 const& value_count)
     : inherited(engine, value), m_collection(gcnew collection_type())
 {
     for (u32 i = 0; i < value_count; ++i)

src/editors/xrWeatherEditor/property_string_values_value_shared_str.hpp

@@ -22,7 +22,7 @@ ref class property_string_values_value_shared_str : public property_string_share
 
 public:
     property_string_values_value_shared_str(
-        editor::engine* engine, shared_str& value, LPCSTR const* values, u32 const& value_count);
+        editor::engine_base* engine, shared_str& value, LPCSTR const* values, u32 const& value_count);
 
     virtual collection_type ^ values() { return m_collection; };
 

src/editors/xrWeatherEditor/property_string_values_value_shared_str_getter.cpp

@@ -11,7 +11,7 @@
 
 typedef property_string_values_value_shared_str_getter::collection_type collection_type;
 
-property_string_values_value_shared_str_getter::property_string_values_value_shared_str_getter(editor::engine* engine,
+property_string_values_value_shared_str_getter::property_string_values_value_shared_str_getter(editor::engine_base* engine,
     shared_str& value, string_collection_getter_type const& collection_getter,
     string_collection_size_getter_type const& collection_size_getter)
     : inherited(engine, value), m_collection_getter(new string_collection_getter_type(collection_getter)),

src/editors/xrWeatherEditor/property_string_values_value_shared_str_getter.hpp

@@ -27,7 +27,7 @@ ref class property_string_values_value_shared_str_getter : public property_strin
     typedef XRay::Editor::property_holder_base::string_collection_size_getter_type string_collection_size_getter_type;
 
 public:
-    property_string_values_value_shared_str_getter(editor::engine* engine, shared_str& value,
+    property_string_values_value_shared_str_getter(editor::engine_base* engine, shared_str& value,
         string_collection_getter_type const& collection_getter,
         string_collection_size_getter_type const& collection_size_getter);
     virtual ~property_string_values_value_shared_str_getter();

src/editors/xrWeatherEditor/window_ide.cpp

@@ -14,7 +14,7 @@ using editor::window_weather_editor;
 
 using VS2005Style::Extender;
 
-void window_ide::custom_init(editor::engine* engine)
+void window_ide::custom_init(editor::engine_base* engine)
 {
     SuspendLayout();
 
@@ -58,7 +58,7 @@ window_weather % window_ide::weather()
     return (*m_weather);
 }
 
-editor::engine& window_ide::engine()
+editor::engine_base& window_ide::engine()
 {
     VERIFY(m_engine);
     return (*m_engine);

src/editors/xrWeatherEditor/window_ide.h

@@ -22,7 +22,7 @@ interface class IDockContent;
 
 namespace editor
 {
-class engine;
+class engine_base;
 class ide_base;
 
 ref class window_view;
@@ -43,7 +43,7 @@ public
 ref class window_ide : public System::Windows::Forms::Form
 {
 public:
-    window_ide(editor::engine* engine)
+    window_ide(editor::engine_base* engine)
     {
         InitializeComponent();
         //
@@ -116,7 +116,7 @@ ref class window_ide : public System::Windows::Forms::Form
     }
 #pragma endregion
 protected:
-    editor::engine* m_engine;
+    editor::engine_base* m_engine;
 
 private:
     System::Drawing::Rectangle ^ m_window_rectangle;
@@ -133,7 +133,7 @@ ref class window_ide : public System::Windows::Forms::Form
 public:
     editor::ide_base& ide();
     window_view % view();
-    editor::engine& engine();
+    editor::engine_base& engine();
 
 public:
     window_levels % levels();
@@ -142,7 +142,7 @@ ref class window_ide : public System::Windows::Forms::Form
     Microsoft::Win32::RegistryKey ^ base_registry_key();
 
 private:
-    void custom_init(editor::engine* engine);
+    void custom_init(editor::engine_base* engine);
     void custom_finalize();
     void save_on_exit();
     void load_on_create();

src/editors/xrWeatherEditor/window_view.h

@@ -181,7 +181,7 @@ ref class window_view : public WeifenLuo::WinFormsUI::DockContent
 
 private:
     window_ide ^ m_ide;
-    editor::engine* m_engine;
+    editor::engine_base* m_engine;
     PropertyGrid ^ m_property_grid;
     Point m_previous_location;
     bool m_loaded;

src/editors/xrWeatherEditor/window_weather_editor.cpp

@@ -15,28 +15,28 @@ using Flobbster::Windows::Forms::PropertyBag;
 typedef PropertyBag::PropertySpecDescriptor PropertySpecDescriptor;
 
 using editor::window_weather_editor;
-using editor::engine;
+using editor::engine_base;
 
 using Microsoft::Win32::Registry;
 using Microsoft::Win32::RegistryKey;
 using Microsoft::Win32::RegistryValueKind;
 
 struct engine_pauser_guard
 {
-    engine& m_engine;
+    engine_base& m_engine;
     bool m_weather_paused;
 
     // Non-copyable
     engine_pauser_guard(const engine_pauser_guard&) = delete;
     engine_pauser_guard& operator=(const engine_pauser_guard&) = delete;
 
-    inline engine_pauser_guard(engine& engine, bool const& value)
+    inline engine_pauser_guard(engine_base& engine, bool const& value)
         : m_engine(engine), m_weather_paused(engine.weather_paused())
     {
         engine.weather_paused(value);
     }
 
-    inline engine_pauser_guard(engine& engine) : m_engine(engine), m_weather_paused(engine.weather_paused()) {}
+    inline engine_pauser_guard(engine_base& engine) : m_engine(engine), m_weather_paused(engine.weather_paused()) {}
     inline ~engine_pauser_guard() { m_engine.weather_paused(m_weather_paused); }
 }; // struct engine_pauser_guard
 

src/editors/xrWeatherEditor/window_weather_editor.h

@@ -11,7 +11,7 @@ using namespace System::Drawing;
 
 namespace editor
 {
-class engine;
+class engine_base;
 ref class window_ide;
 /// <summary>
 /// Summary for window_weather_editor
@@ -25,7 +25,7 @@ ref class window_ide;
 public ref class window_weather_editor : public WeifenLuo::WinFormsUI::DockContent
 {
 public:
-    window_weather_editor(window_ide ^ ide, engine* engine)
+    window_weather_editor(window_ide ^ ide, engine_base* engine)
         : m_ide(ide), m_engine(*engine), m_weathers_getter(0), m_weathers_size_getter(0), m_frames_getter(0),
           m_frames_size_getter(0), m_update_enabled(true), m_load_finished(false), m_mouse_down(false),
           m_update_frames_combo_box(false), m_update_frame_trackbar(false), m_update_text_value(false),
@@ -971,7 +971,7 @@ public ref class window_weather_editor : public WeifenLuo::WinFormsUI::DockConte
 
 private:
     window_ide ^ m_ide;
-    engine& m_engine;
+    engine_base& m_engine;
     weathers_getter_type* m_weathers_getter;
     weathers_size_getter_type* m_weathers_size_getter;
     frames_getter_type* m_frames_getter;

src/xrEngine/engine_impl.hpp

@@ -15,7 +15,7 @@
 
 class IInputReceiver;
 
-class engine_impl : public editor::engine
+class engine_impl : public editor::engine_base
 {
 public:
     engine_impl();