Skip to content

Commit 58e998c

Browse files
Xottab-DUTYXottab-DUTY
committed
Fix xrWeatherEditor compilation
Can't compile because of namespace conflict
1 parent b66390d commit 58e998c

19 files changed

+131
-143
lines changed

‎src/editors/xrWeatherEditor/AssemblyInfo.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include "pch.hpp"
22

3-
using namespace System;
43
using namespace System::Reflection;
54
using namespace System::Runtime::CompilerServices;
65
using namespace System::Runtime::InteropServices;
@@ -35,6 +34,6 @@ using namespace System::Security::Permissions;
3534

3635
[assembly:ComVisible(false)];
3736

38-
[assembly:CLSCompliantAttribute(true)];
37+
[assembly:System::CLSCompliantAttribute(true)];
3938

4039
[assembly:SecurityPermission(SecurityAction::RequestMinimum, UnmanagedCode = true)];

‎src/editors/xrWeatherEditor/entry_point.cpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
#include "pch.hpp"
22

3-
#pragma unmanaged
4-
#include <windows.h>
5-
#include "Common/xr_impexp_macros.h"
3+
#pragma managed(push, off)
64
#include "Include/editor/engine.hpp"
75
#include "ide_impl.hpp"
8-
#pragma managed
6+
#pragma managed(pop)
97

108
#include "window_ide.h"
119

@@ -21,18 +19,18 @@ private ref class window_ide_final : public editor::window_ide
2119
window_ide_final(ide_base*& ide, engine_base* engine) : editor::window_ide(engine)
2220
{
2321
m_ide = ide;
24-
Application::Idle += gcnew System::EventHandler(this, &window_ide_final::on_idle);
22+
System::Windows::Forms::Application::Idle += gcnew System::EventHandler(this, &window_ide_final::on_idle);
2523
}
2624

2725
~window_ide_final()
2826
{
29-
Application::Idle -= gcnew System::EventHandler(this, &window_ide_final::on_idle);
27+
System::Windows::Forms::Application::Idle -= gcnew System::EventHandler(this, &window_ide_final::on_idle);
3028
m_engine = nullptr;
3129
m_ide = nullptr;
3230
}
3331

3432
protected:
35-
virtual void WndProc(Message % m) override
33+
virtual void WndProc(System::Windows::Forms::Message % m) override
3634
{
3735
LONG_PTR result;
3836
#ifdef XR_X64

‎src/editors/xrWeatherEditor/ide_impl.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#define IDE_IMPL_HPP_INCLUDED
1111

1212
#pragma unmanaged
13-
#include <windows.h>
1413
#include "xrCore/fastdelegate.h"
1514
#include <utility>
1615
#include "include/editor/ide.hpp"

‎src/editors/xrWeatherEditor/pch.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88

99
#pragma once
1010

11+
#pragma managed(push, off)
1112
#include "Common/Platform.hpp"
1213
#include "xrCommon/inlining_macros.h"
14+
#pragma managed(pop)
1315

1416
#ifdef DEBUG
1517
#define VERIFY(expression) \
@@ -35,9 +37,9 @@ typedef unsigned int u32;
3537
typedef char const* LPCSTR;
3638
typedef char* LPSTR;
3739

38-
#pragma unmanaged
40+
#pragma managed(push, off)
3941
#include <malloc.h>
40-
#pragma managed
42+
#pragma managed(pop)
4143

4244
#include <stdlib.h>
4345
#include <vcclr.h>

‎src/editors/xrWeatherEditor/property_collection_editor.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@ property_collection_editor::CollectionForm ^ property_collection_editor::CreateC
7373
return (m_collection_form);
7474
}
7575

76-
Object ^
77-
property_collection_editor::EditValue(ITypeDescriptorContext ^ context, IServiceProvider ^ provider, Object ^ value)
76+
Object^ property_collection_editor::EditValue(ITypeDescriptorContext ^ context, System::IServiceProvider ^ provider, Object ^ value)
7877
{
7978
if (!m_collection_form || !m_collection_form->Visible)
8079
return (inherited::EditValue(context, provider, value));

‎src/editors/xrWeatherEditor/property_collection_editor.hpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
// Description : collection property editor implementation class
77
////////////////////////////////////////////////////////////////////////////
88

9-
#ifndef PROPERTY_COLLECTION_EDITOR_HPP_INCLUDED
10-
#define PROPERTY_COLLECTION_EDITOR_HPP_INCLUDED
9+
#pragma once
1110

1211
ref class property_collection;
1312
ref class property_container;
@@ -25,7 +24,7 @@ public ref class property_collection_editor : public System::ComponentModel::Des
2524

2625
public:
2726
property_collection_editor(Type ^ type);
28-
virtual Object ^ EditValue(ITypeDescriptorContext ^ context, IServiceProvider ^ provider, Object ^ value) override;
27+
virtual Object ^ EditValue(ITypeDescriptorContext ^ context, System::IServiceProvider ^ provider, Object ^ value) override;
2928

3029
protected:
3130
virtual Type ^ CreateCollectionItemType() override;
@@ -39,5 +38,3 @@ public ref class property_collection_editor : public System::ComponentModel::Des
3938
private:
4039
CollectionForm ^ m_collection_form;
4140
}; // ref class property_collection_editor
42-
43-
#endif // ifndef PROPERTY_COLLECTION_EDITOR_HPP_INCLUDED

‎src/editors/xrWeatherEditor/window_ide.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,18 @@ window_weather_editor % window_ide::weather_editor()
7070
return (*m_weather_editor);
7171
}
7272

73-
Void window_ide::window_ide_SizeChanged(System::Object ^ sender, System::EventArgs ^ e)
73+
System::Void window_ide::window_ide_SizeChanged(System::Object ^ sender, System::EventArgs ^ e)
7474
{
7575
if (WindowState == System::Windows::Forms::FormWindowState::Maximized)
7676
return;
7777

7878
if (WindowState == System::Windows::Forms::FormWindowState::Minimized)
7979
return;
8080

81-
m_window_rectangle = gcnew Drawing::Rectangle(Location, Size);
81+
m_window_rectangle = gcnew System::Drawing::Rectangle(Location, Size);
8282
}
8383

84-
Void window_ide::window_ide_LocationChanged(System::Object ^ sender, System::EventArgs ^ e)
84+
System::Void window_ide::window_ide_LocationChanged(System::Object ^ sender, System::EventArgs ^ e)
8585
{
8686
m_view->window_view_LocationChanged(sender, e);
8787

@@ -91,20 +91,20 @@ Void window_ide::window_ide_LocationChanged(System::Object ^ sender, System::Eve
9191
if (WindowState == System::Windows::Forms::FormWindowState::Minimized)
9292
return;
9393

94-
m_window_rectangle = gcnew Drawing::Rectangle(Location, Size);
94+
m_window_rectangle = gcnew System::Drawing::Rectangle(Location, Size);
9595
}
9696

97-
Void window_ide::window_ide_Activated(System::Object ^ sender, System::EventArgs ^ e)
97+
System::Void window_ide::window_ide_Activated(System::Object ^ sender, System::EventArgs ^ e)
9898
{
9999
m_view->window_view_Activated(sender, e);
100100
}
101101

102-
Void window_ide::window_ide_Deactivate(System::Object ^ sender, System::EventArgs ^ e)
102+
System::Void window_ide::window_ide_Deactivate(System::Object ^ sender, System::EventArgs ^ e)
103103
{
104104
m_view->window_view_Deactivate(sender, e);
105105
}
106106

107-
Void window_ide::window_ide_FormClosing(System::Object ^ sender, System::Windows::Forms::FormClosingEventArgs ^ e)
107+
System::Void window_ide::window_ide_FormClosing(System::Object ^ sender, System::Windows::Forms::FormClosingEventArgs ^ e)
108108
{
109109
e->Cancel = true;
110110
save_on_exit();

‎src/editors/xrWeatherEditor/window_ide.h

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#pragma once
22

3-
using namespace System;
43
using namespace System::ComponentModel;
54
using namespace System::Collections;
6-
using namespace System::Windows::Forms;
5+
//using namespace System::Windows::Forms;
76
using namespace System::Data;
87
using namespace System::Drawing;
98

@@ -156,10 +155,10 @@ public ref class window_ide : public System::Windows::Forms::Form
156155
WeifenLuo::WinFormsUI::IDockContent ^ reload_content(System::String ^ persist_string);
157156

158157
private:
159-
Void window_ide_SizeChanged(System::Object ^ sender, System::EventArgs ^ e);
160-
Void window_ide_LocationChanged(System::Object ^ sender, System::EventArgs ^ e);
161-
Void window_ide_FormClosing(System::Object ^ sender, System::Windows::Forms::FormClosingEventArgs ^ e);
162-
Void window_ide_Activated(System::Object ^ sender, System::EventArgs ^ e);
163-
Void window_ide_Deactivate(System::Object ^ sender, System::EventArgs ^ e);
158+
System::Void window_ide_SizeChanged(System::Object ^ sender, System::EventArgs ^ e);
159+
System::Void window_ide_LocationChanged(System::Object ^ sender, System::EventArgs ^ e);
160+
System::Void window_ide_FormClosing(System::Object ^ sender, System::Windows::Forms::FormClosingEventArgs ^ e);
161+
System::Void window_ide_Activated(System::Object ^ sender, System::EventArgs ^ e);
162+
System::Void window_ide_Deactivate(System::Object ^ sender, System::EventArgs ^ e);
164163
};
165164
}

‎src/editors/xrWeatherEditor/window_ide_serialize.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ using Microsoft::Win32::RegistryValueKind;
1919
#define PRODUCT_NAME "S.T.A.L.K.E.R.: CLear Sky"
2020

2121
template <typename T>
22-
inline static T registry_value(RegistryKey ^ key, String ^ value_id, const T& default_value)
22+
inline static T registry_value(RegistryKey ^ key, System::String ^ value_id, const T& default_value)
2323
{
24-
array<String ^> ^ names = key->GetValueNames();
24+
array<System::String ^> ^ names = key->GetValueNames();
2525
if (names->IndexOf(names, value_id) >= 0)
2626
return ((T)key->GetValue(value_id));
2727

@@ -116,7 +116,7 @@ void window_ide::load_on_create()
116116
Width = 800;
117117
Height = 600;
118118

119-
m_window_rectangle = gcnew Drawing::Rectangle(Location, Size);
119+
m_window_rectangle = gcnew System::Drawing::Rectangle(Location, Size);
120120

121121
RegistryKey ^ product = base_registry_key();
122122
VERIFY(product);
@@ -139,7 +139,7 @@ void window_ide::load_on_create()
139139
position->Close();
140140
}
141141

142-
m_window_rectangle = gcnew Drawing::Rectangle(Location, Size);
142+
m_window_rectangle = gcnew System::Drawing::Rectangle(Location, Size);
143143

144144
switch ((int)registry_value(ide, "window_state", 2))
145145
{

‎src/editors/xrWeatherEditor/window_levels.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
using editor::window_levels;
77

8-
Void window_levels::window_levels_Leave(System::Object ^ sender, System::EventArgs ^ e)
8+
System::Void window_levels::window_levels_Leave(System::Object ^ sender, System::EventArgs ^ e)
99
{
1010
m_ide->view().property_grid(PropertyGrid);
1111
}

‎src/editors/xrWeatherEditor/window_levels.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#pragma once
22

3-
using namespace System;
43
using namespace System::ComponentModel;
54
using namespace System::Collections;
65
using namespace System::Windows::Forms;
@@ -99,7 +98,7 @@ ref class window_levels : public WeifenLuo::WinFormsUI::DockContent
9998
public:
10099
inline ::PropertyGrid ^ property_grid() { return this->PropertyGrid; }
101100

102-
private : Void window_levels_Leave(System::Object ^ sender, System::EventArgs ^ e);
101+
private : System::Void window_levels_Leave(System::Object ^ sender, System::EventArgs ^ e);
103102
}; // ref class window_levels
104103

105104
} // namespace editor

‎src/editors/xrWeatherEditor/window_tree_values.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ref class NodeSorter : public IComparer
2929
}
3030
}; // ref class NodeSorter
3131

32-
void window_tree_values::values(property_string_values_value_base::collection_type ^ values, String ^ current_value)
32+
void window_tree_values::values(property_string_values_value_base::collection_type ^ values, System::String ^ current_value)
3333
{
3434
TextBox->Text = current_value;
3535
Result = current_value;

‎src/editors/xrWeatherEditor/window_tree_values.h

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
#include "property_string_values_value_base.hpp"
44

5-
using namespace System;
65
using namespace System::ComponentModel;
76
using namespace System::Collections;
87
using namespace System::Windows::Forms;
@@ -297,15 +296,15 @@ ref class window_tree_values : public System::Windows::Forms::Form
297296
typedef property_string_values_value_base::collection_type collection_type;
298297

299298
public:
300-
void values(collection_type ^ values, String ^ current_value);
299+
void values(collection_type ^ values, System::String ^ current_value);
301300

302301
public:
303302
System::String ^ Result;
304303

305304
private:
306-
Void TreeView_AfterCollapse(Object ^ sender, TreeViewEventArgs ^ e);
307-
Void TreeView_AfterExpand(Object ^ sender, TreeViewEventArgs ^ e);
308-
Void TreeView_MouseClick(Object ^ sender, MouseEventArgs ^ e);
309-
Void TreeView_MouseDoubleClick(Object ^ sender, MouseEventArgs ^ e);
305+
System::Void TreeView_AfterCollapse(Object ^ sender, TreeViewEventArgs ^ e);
306+
System::Void TreeView_AfterExpand(Object ^ sender, TreeViewEventArgs ^ e);
307+
System::Void TreeView_MouseClick(Object ^ sender, MouseEventArgs ^ e);
308+
System::Void TreeView_MouseDoubleClick(Object ^ sender, MouseEventArgs ^ e);
310309
};
311310
}

0 commit comments

Comments
 (0)