xrECore & xrEditor: restructure and cleanup

src/editors/xrECore/Props/GameType.cpp → src/editors/xrECore/Controls/GameType.cpp

@@ -2,11 +2,7 @@
 #include "GameType.h"
 #include "xrServerEntities/gametype_chooser.h"
 
-namespace XRay
-{
-namespace ECore
-{
-namespace Props
+namespace XRay::Editor::Controls
 {
 bool GameType::Run(pcstr title, GameTypeChooser* data)
 {
@@ -30,6 +26,4 @@ System::Void GameType::buttonOk_Click(System::Object^ sender, System::EventArgs^
     gameTypes->m_GameType.set(eGameIDArtefactHunt, checkAfHunt->Checked);
     gameTypes->m_GameType.set(eGameIDCaptureTheArtefact, checkCTA->Checked);
 }
-} // namespace Props
-} // namespace ECore
-} // namespace XRay
+} // namespace XRay::Editor::Controls

src/editors/xrECore/Props/GameType.h → src/editors/xrECore/Controls/GameType.h

@@ -2,9 +2,9 @@
 
 namespace XRay
 {
-namespace ECore
+namespace Editor
 {
-namespace Props
+namespace Controls
 {
 ref class GameType;
 }
@@ -15,9 +15,9 @@ struct GameTypeChooser;
 
 namespace XRay
 {
-namespace ECore
+namespace Editor
 {
-namespace Props
+namespace Controls
 {
 using namespace System;
 using namespace System::ComponentModel;
@@ -154,6 +154,6 @@ private: System::Windows::Forms::Panel^ panel1;
     }
 #pragma endregion
 };
-} // namespace Props
-} // namespace ECore
+} // namespace Controls
+} // namespace Editor
 } // namespace XRay

src/editors/xrECore/Props/ItemList.cpp → src/editors/xrECore/Controls/ItemList.cpp

@@ -5,11 +5,7 @@
 
 #include <sstream>
 
-namespace XRay
-{
-namespace ECore
-{
-namespace Props
+namespace XRay::Editor::Controls
 {
 void ItemList::AssignItems(ListItemsVec& newItems, bool fullExpand, bool fullSort /*= false*/)
 {
@@ -126,6 +122,4 @@ void ItemList::AssignItems(ListItemsVec& newItems, bool fullExpand, bool fullSor
 
     viewItems->EndUpdate();
 }
-} // namespace Props
-} // namespace ECore
-} // namespace XRay
+} // namespace XRay::Editor::Controls

src/editors/xrECore/Props/ItemList.h → src/editors/xrECore/Controls/ItemList.h

@@ -2,9 +2,9 @@
 
 namespace XRay
 {
-namespace ECore
+namespace Editor
 {
-namespace Props
+namespace Controls
 {
 ref class ItemList;
 }
@@ -16,9 +16,9 @@ using ListItemsVec = xr_vector<ListItem*>;
 
 namespace XRay
 {
-namespace ECore
+namespace Editor
 {
-namespace Props
+namespace Controls
 {
 using namespace System;
 using namespace System::ComponentModel;
@@ -125,6 +125,6 @@ private: System::ComponentModel::IContainer^ components;
     }
 #pragma endregion
 };
-} // namespace Props
-} // namespace ECore
+} // namespace Controls
+} // namespace Editor
 } // namespace XRay

src/editors/xrECore/Props/NumericVector.cpp → src/editors/xrECore/Controls/NumericVector.cpp

@@ -1,11 +1,7 @@
 #include "pch.hpp"
 #include "NumericVector.h"
 
-namespace XRay
-{
-namespace ECore
-{
-namespace Props
+namespace XRay::Editor::Controls
 {
 bool NumericVector::Run(pcstr title, Fvector* data, int decimal, Fvector* resetValue, Fvector* min, Fvector* max, int* X, int* Y)
 {
@@ -118,6 +114,4 @@ System::Void NumericVector::OnValueChanged(System::Object^ sender, System::Event
     if (checkImmediate->Checked)
         buttonApply_Click(sender, e);
 }
-} // namespace Props
-} // namespace ECore
-} // namespace XRay
+} // namespace XRay::Editor::Controls

src/editors/xrECore/Props/NumericVector.h → src/editors/xrECore/Controls/NumericVector.h

@@ -2,9 +2,9 @@
 
 namespace XRay
 {
-namespace ECore
+namespace Editor
 {
-namespace Props
+namespace Controls
 {
 ref class NumericVector;
 }
@@ -17,9 +17,9 @@ using Fvector = _vector3<float>;
 
 namespace XRay
 {
-namespace ECore
+namespace Editor
 {
-namespace Props
+namespace Controls
 {
 using namespace System;
 using namespace System::ComponentModel;
@@ -212,6 +212,6 @@ private: System::Windows::Forms::Label^ labelZ;
     }
 #pragma endregion
 };
-} // namespace Props
-} // namespace ECore
+} // namespace Controls
+} // namespace Editor
 } // namespace XRay

src/editors/xrECore/Props/PropertiesList.h → src/editors/xrECore/Controls/PropertiesList.h

@@ -2,9 +2,9 @@
 
 namespace XRay
 {
-namespace ECore
+namespace Editor
 {
-namespace Props
+namespace Controls
 {
 ref class PropertiesList;
 ref class ItemList;
@@ -14,9 +14,9 @@ ref class ItemList;
 
 namespace XRay
 {
-namespace ECore
+namespace Editor
 {
-namespace Props
+namespace Controls
 {
 using namespace System;
 using namespace System::ComponentModel;
@@ -62,6 +62,6 @@ private: ItemList^ itemList;
     }
 #pragma endregion
 };
-} // namespace Props
-} // namespace ECore
+} // namespace Controls
+} // namespace Editor
 } // namespace XRay

src/editors/xrECore/Props/SelectItem.h → src/editors/xrECore/Controls/SelectItem.h

@@ -2,28 +2,10 @@
 
 namespace XRay
 {
-namespace ECore
+namespace Editor
 {
-namespace Props
+namespace Controls
 {
-ref class SelectItem;
-}
-}
-}
-
-namespace XRay
-{
-namespace ECore
-{
-namespace Props
-{
-using namespace System;
-using namespace System::ComponentModel;
-using namespace System::Collections;
-using namespace System::Windows::Forms;
-using namespace System::Data;
-using namespace System::Drawing;
-
 public ref class SelectItem : public System::Windows::Forms::Form
 {
 public:
@@ -67,6 +49,6 @@ private: System::Windows::Forms::Panel^ panel1;
     }
 #pragma endregion
 };
-} // namespace Props
-} // namespace ECore
+} // namespace Controls
+} // namespace Editor
 } // namespace XRay

src/editors/xrECore/Props/ShaderFunction.cpp → src/editors/xrECore/Controls/ShaderFunction.cpp

@@ -15,11 +15,7 @@ xr_token function_token[] =
     { nullptr, 0 }
 };
 
-namespace XRay
-{
-namespace ECore
-{
-namespace Props
+namespace XRay::Editor::Controls
 {
 ShaderFunction::ShaderFunction(void)
 {
@@ -180,6 +176,4 @@ void ShaderFunction::DrawGraph()
 
     //pbDraw->Invalidate(); // Redraw everything just in case
 }
-} // namespace Props
-} // namespace ECore
-} // namespace XRay
+} // namespace XRay::Editor::Controls

src/editors/xrECore/Props/ShaderFunction.h → src/editors/xrECore/Controls/ShaderFunction.h

@@ -2,9 +2,9 @@
 
 namespace XRay
 {
-namespace ECore
+namespace Editor
 {
-namespace Props
+namespace Controls
 {
 ref class ShaderFunction;
 }
@@ -21,9 +21,9 @@ ref class Token;
 
 namespace XRay
 {
-namespace ECore
+namespace Editor
 {
-namespace Props
+namespace Controls
 {
 using namespace System;
 using namespace System::ComponentModel;
@@ -331,6 +331,6 @@ private: System::Windows::Forms::Button^ buttonCancel;
     }
 #pragma endregion
 };
-} // namespace Props
-} // namespace ECore
+} // namespace Controls
+} // namespace Editor
 } // namespace XRay

src/editors/xrECore/Props/TextEdit.cpp → src/editors/xrECore/Controls/TextEdit.cpp

@@ -1,12 +1,7 @@
 #include "pch.hpp"
-
 #include "TextEdit.h"
 
-namespace XRay
-{
-namespace ECore
-{
-namespace Props
+namespace XRay::Editor::Controls
 {
 System::Void TextEdit::buttonClear_Click(System::Object^ sender, System::EventArgs^ e)
 {
@@ -144,6 +139,4 @@ System::Void TextEdit::buttonSave_Click(System::Object^ sender, System::EventArg
         toolStripStatusLabel3->Text = "Error: can't save file";
 
 }
-} // namespace Props
-} // namespace ECore
-} // namespace XRay
+} // namespace XRay::Editor::Controls

src/editors/xrECore/Props/TextEdit.h → src/editors/xrECore/Controls/TextEdit.h

@@ -1,28 +1,15 @@
 #pragma once
-namespace XRay
-{
-namespace ECore
-{
-namespace Props
-{
-ref class TextEdit;
-}
-}
-}
 
 namespace XRay
 {
-namespace ECore
+namespace Editor
 {
-namespace Props
+namespace Controls
 {
 using namespace System;
-using namespace System::ComponentModel;
-using namespace System::Collections;
 using namespace System::Windows::Forms;
 using namespace System::Data;
 using namespace System::Drawing;
-
 public ref class TextEdit : public System::Windows::Forms::Form
 {
     using TOnApplyClick = fastdelegate::FastDelegate1<pcstr, bool>;
@@ -217,6 +204,6 @@ private: System::Windows::Forms::ToolStripStatusLabel^ toolStripStatusLabel3;
     }
 #pragma endregion
 };
-} // namespace Props
-} // namespace ECore
+} // namespace Controls
+} // namespace Editor
 } // namespace XRay

src/editors/xrECore/Core/ELog.cpp

@@ -1,10 +1,10 @@
 #include "pch.hpp"
 #include "ELog.h"
-#include "Props/WindowLog.h"
+#include "Windows/WindowLog.h"
 
 gcroot<EditorLog^> ELog;
 
-using namespace XRay::ECore::Props;
+using namespace XRay::Editor::Windows;
 
 XRECORE_API void ELogCallback(void* context, pcstr message)
 {

src/editors/xrECore/Props/WindowIDE.cpp → src/editors/xrECore/Windows/WindowIDE.cpp

@@ -2,9 +2,9 @@
 #include "WindowIDE.h"
 #include "WindowView.h"
 #include "WindowLog.h"
-#include "DockPanelSerializer.h"
+#include "Controls/DockPanelSerializer.h"
 
-namespace XRay::ECore::Props
+namespace XRay::Editor::Windows
 {
 void WindowIDE::Initialize()
 {
@@ -40,4 +40,4 @@ WeifenLuo::WinFormsUI::Docking::IDockContent^ WindowIDE::reloadContent(System::S
 
     return result;
 }
-} // namespace XRay::ECore::Props
+} // namespace XRay::Editor::Windows