Skip to content

Commit b1b2982

Browse files
committed
xrECore & xrEditor: restructure and cleanup
1 parent e70f89b commit b1b2982

Some content is hidden

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

43 files changed

+243
-324
lines changed
File renamed without changes.

src/editors/xrECore/Props/GameType.cpp renamed to src/editors/xrECore/Controls/GameType.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
#include "GameType.h"
33
#include "xrServerEntities/gametype_chooser.h"
44

5-
namespace XRay
6-
{
7-
namespace ECore
8-
{
9-
namespace Props
5+
namespace XRay::Editor::Controls
106
{
117
bool GameType::Run(pcstr title, GameTypeChooser* data)
128
{
@@ -30,6 +26,4 @@ System::Void GameType::buttonOk_Click(System::Object^ sender, System::EventArgs^
3026
gameTypes->m_GameType.set(eGameIDArtefactHunt, checkAfHunt->Checked);
3127
gameTypes->m_GameType.set(eGameIDCaptureTheArtefact, checkCTA->Checked);
3228
}
33-
} // namespace Props
34-
} // namespace ECore
35-
} // namespace XRay
29+
} // namespace XRay::Editor::Controls

src/editors/xrECore/Props/GameType.h renamed to src/editors/xrECore/Controls/GameType.h

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

33
namespace XRay
44
{
5-
namespace ECore
5+
namespace Editor
66
{
7-
namespace Props
7+
namespace Controls
88
{
99
ref class GameType;
1010
}
@@ -15,9 +15,9 @@ struct GameTypeChooser;
1515

1616
namespace XRay
1717
{
18-
namespace ECore
18+
namespace Editor
1919
{
20-
namespace Props
20+
namespace Controls
2121
{
2222
using namespace System;
2323
using namespace System::ComponentModel;
@@ -154,6 +154,6 @@ private: System::Windows::Forms::Panel^ panel1;
154154
}
155155
#pragma endregion
156156
};
157-
} // namespace Props
158-
} // namespace ECore
157+
} // namespace Controls
158+
} // namespace Editor
159159
} // namespace XRay

src/editors/xrECore/Props/ItemList.cpp renamed to src/editors/xrECore/Controls/ItemList.cpp

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

66
#include <sstream>
77

8-
namespace XRay
9-
{
10-
namespace ECore
11-
{
12-
namespace Props
8+
namespace XRay::Editor::Controls
139
{
1410
void ItemList::AssignItems(ListItemsVec& newItems, bool fullExpand, bool fullSort /*= false*/)
1511
{
@@ -126,6 +122,4 @@ void ItemList::AssignItems(ListItemsVec& newItems, bool fullExpand, bool fullSor
126122

127123
viewItems->EndUpdate();
128124
}
129-
} // namespace Props
130-
} // namespace ECore
131-
} // namespace XRay
125+
} // namespace XRay::Editor::Controls

src/editors/xrECore/Props/ItemList.h renamed to src/editors/xrECore/Controls/ItemList.h

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

33
namespace XRay
44
{
5-
namespace ECore
5+
namespace Editor
66
{
7-
namespace Props
7+
namespace Controls
88
{
99
ref class ItemList;
1010
}
@@ -16,9 +16,9 @@ using ListItemsVec = xr_vector<ListItem*>;
1616

1717
namespace XRay
1818
{
19-
namespace ECore
19+
namespace Editor
2020
{
21-
namespace Props
21+
namespace Controls
2222
{
2323
using namespace System;
2424
using namespace System::ComponentModel;
@@ -125,6 +125,6 @@ private: System::ComponentModel::IContainer^ components;
125125
}
126126
#pragma endregion
127127
};
128-
} // namespace Props
129-
} // namespace ECore
128+
} // namespace Controls
129+
} // namespace Editor
130130
} // namespace XRay

0 commit comments

Comments
 (0)