Skip to content

Commit a149793

Browse files
committed
xrEProps: fixed includes and formatted code
1 parent 7ee425c commit a149793

File tree

10 files changed

+24
-21
lines changed

10 files changed

+24
-21
lines changed

src/editors/xrEProps/EditorChooseEvents.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
#define EditorChooseEventsH
33

44
#include "ChooseTypes.h"
5-
#include "../../Layers/xrRender/SkeletonAnimated.h"
6-
#include "../../Layers/xrRender/ResourceManager.h"
5+
#include "Layers/xrRender/SkeletonAnimated.h"
6+
#include "Layers/xrRender/ResourceManager.h"
77

8-
#include "../../Layers/xrRender/ParticleEffect.h"
9-
#include "../../Layers/xrRender/ParticleGroup.h"
8+
#include "Layers/xrRender/ParticleEffect.h"
9+
#include "Layers/xrRender/ParticleGroup.h"
1010

1111
ref_sound* choose_snd;
1212

src/editors/xrEProps/FolderLib.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#pragma hdrstop
33

44
#include "FolderLib.h"
5-
#include "../../xrServerEntities/PropertiesListHelper.h"
5+
#include "xrServerEntities/PropertiesListHelper.h"
66

77
//---------------------------------------------------------------------------
88
#pragma package(smart_init)

src/editors/xrEProps/GameTypeForm.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#pragma hdrstop
33

44
#include "GameTypeForm.h"
5-
#include "../../xrServerEntities/gametype_chooser.h"
5+
#include "xrServerEntities/gametype_chooser.h"
66
//---------------------------------------------------------------------------
77
#pragma package(smart_init)
88
#pragma link "ExtBtn"

src/editors/xrEProps/ItemList.h

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

2020
#include "ItemListHelper.h"
2121
#include "FolderLib.h"
22-
#include "../../xrServerEntities/PropertiesListTypes.h"
22+
#include "xrServerEntities/PropertiesListTypes.h"
2323

2424
class XR_EPROPS_API TItemList: public TForm
2525
{

src/editors/xrEProps/ItemListHelper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#ifndef ItemListHelperH
33
#define ItemListHelperH
44

5-
#include "ItemListTypes.h"
5+
#include "xrServerEntities/ItemListTypes.h"
66
#include "FolderLib.h"
77

88
//---------------------------------------------------------------------------

src/editors/xrEProps/PropertiesList.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "ElTreeAdvEdit.hpp"
1818
#include <Mask.hpp>
1919

20-
#include "../../xrServerEntities/PropertiesListHelper.h"
20+
#include "xrServerEntities/PropertiesListHelper.h"
2121
#include "RenderWindow.hpp"
2222
#include "MxShortcut.hpp"
2323
#include "ExtBtn.hpp"

src/editors/xrEProps/PropertiesListHelper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "stdafx.h"
22
#pragma hdrstop
33

4-
#include "../../xrServerEntities/PropertiesListHelper.h"
4+
#include "xrServerEntities/PropertiesListHelper.h"
55
#include "ItemListHelper.h"
66
#include "ChoseForm.h"
77
//---------------------------------------------------------------------------

src/editors/xrEProps/PropertiesListTypes.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "stdafx.h"
22
#pragma hdrstop
33

4-
#include "../../xrServerEntities/PropertiesListTypes.h"
4+
#include "xrServerEntities/PropertiesListTypes.h"
55
#include "MxShortcut.hpp"
66
//------------------------------------------------------------------------------
77

src/editors/xrEProps/stdafx.h

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,32 @@
66

77
#pragma once
88

9-
#include <xrCore.h>
9+
#include <xrCore/xrCore.h>
1010

1111
#define smart_cast dynamic_cast
1212

1313
//refs
14-
namespace CDB{
15-
class MODEL;
14+
namespace CDB
15+
{
16+
class MODEL;
1617
};
1718

18-
#include "../../xrServerEntities/xrEProps.h"
19+
#include "xrServerEntities/xrEProps.h"
1920

2021
#include "FolderLib.h"
2122

23+
#include "xrCore/Platform.h"
24+
2225
#define ENGINE_API
23-
#define DLL_API __declspec(dllimport)
24-
#define ECORE_API __declspec(dllexport)
26+
#define DLL_API XR_IMPORT
27+
#define ECORE_API XR_EXPORT
2528

2629
#include "Defines.h"
2730

2831
// libs
29-
#pragma comment (lib,"xrSoundB.lib")
30-
#pragma comment (lib,"xrCoreB.lib")
31-
#pragma comment (lib,"EToolsB.lib")
32+
#pragma comment (lib,"xrSoundB.lib")
33+
#pragma comment (lib,"xrCoreB.lib")
34+
#pragma comment (lib,"EToolsB.lib")
3235

3336
#endif //stdafxH
3437

src/editors/xrEProps/xrEProps.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "stdafx.h"
22
#pragma hdrstop
33

4-
#include "../../xrServerEntities/xrEProps.h"
4+
#include "xrServerEntities/xrEProps.h"
55

66
USEFORM("ChoseForm.cpp", frmChoseItem);
77
USEFORM("ItemDialog.cpp", frmItemDialog);

0 commit comments

Comments
 (0)