Cleanup TODO's

OpenXRay · Nov 12, 2017 · 24ec872 · 24ec872
1 parent e311ece
commit 24ec872
Show file tree

Hide file tree

Showing 24 changed files with 14 additions and 147 deletions.
diff --git a/src/Layers/xrAPI/stdafx.cpp b/src/Layers/xrAPI/stdafx.cpp
@@ -1,8 +1 @@
-// stdafx.cpp : source file that includes just the standard includes
-// xrAPI.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
 #include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
diff --git a/src/editors/ActorEditor/main.h b/src/editors/ActorEditor/main.h
@@ -69,7 +69,7 @@ class ECORE_API TfrmMain : public TForm
     __fastcall TfrmMain(TComponent* Owner);
     void __fastcall UpdateCaption();
 
-    __inline void SetHInst(HINSTANCE inst) { m_HInstance = inst; }
+    inline void SetHInst(HINSTANCE inst) { m_HInstance = inst; }
     bool IsFocused() { return D3DWindow->Focused(); }
 };
 

diff --git a/src/editors/ActorEditor/stdafx.h b/src/editors/ActorEditor/stdafx.h
@@ -1,9 +1,3 @@
-//----------------------------------------------------
-// file: stdafx.h
-//----------------------------------------------------
-#ifndef stdafxH
-#define stdafxH
-
 #pragma once
 
 #pragma warn - pck
@@ -182,9 +176,6 @@ DEFINE_VECTOR(shared_str, RStrVec, RStrVecIt);
 #define _omotions_ "$omotions$"
 #define _smotion_ "$smotion$"
 #define _detail_objects_ "$detail_objects$"
-#endif
 
 #define TEX_POINT_ATT "internal\\internal_light_attpoint"
 #define TEX_SPOT_ATT "internal\\internal_light_attclip"
-
-#pragma hdrstop
diff --git a/src/editors/ECore/stdafx.h b/src/editors/ECore/stdafx.h
@@ -1,8 +1,3 @@
-//----------------------------------------------------
-// file: stdafx.h
-//----------------------------------------------------
-#ifndef stdafxECOREH
-#define stdafxECOREH
 #pragma once
 
 #pragma warn - pck
@@ -29,7 +24,7 @@
 #include <process.h>
 #include <utime.h>
 
-// iseful macros
+// useful macros
 // MSC names for functions
 #ifdef _eof
 #undef _eof
@@ -170,9 +165,6 @@ DEFINE_VECTOR(shared_str, RStrVec, RStrVecIt);
 #define _omotions_ "$omotions$"
 #define _smotion_ "$smotion$"
 #define _detail_objects_ "$detail_objects$"
-#endif
 
 #define TEX_POINT_ATT "internal\\internal_light_attpoint"
 #define TEX_SPOT_ATT "internal\\internal_light_attclip"
-
-#pragma hdrstop
diff --git a/src/editors/LevelEditor/main.h b/src/editors/LevelEditor/main.h
@@ -69,7 +69,7 @@ class ECORE_API TfrmMain :
 public: // User declarations
     __fastcall TfrmMain(TComponent* Owner);
     void __fastcall UpdateCaption();
-    __inline void SetHInst(HINSTANCE inst) { m_HInstance = inst; }
+    inline void SetHInst(HINSTANCE inst) { m_HInstance = inst; }
     bool IsFocused() { return D3DWindow->Focused(); }
 };
 //---------------------------------------------------------------------------

diff --git a/src/editors/LevelEditor/stdafx.h b/src/editors/LevelEditor/stdafx.h
@@ -1,9 +1,3 @@
-//----------------------------------------------------
-// file: stdafx.h
-//----------------------------------------------------
-#ifndef stdafxH
-#define stdafxH
-
 #pragma once
 
 #pragma warn - pck
@@ -26,11 +20,11 @@
 #include <fastmath.h>
 #include <io.h>
 #include <fcntl.h>
-#include <sys\stat.h>
+#include <sys/*\*/stat.h>
 #include <process.h>
 #include <utime.h>
 
-// iseful macros
+// useful macros
 // MSC names for functions
 #ifdef _eof
 #undef _eof
@@ -59,7 +53,7 @@ __inline float modff(float a, float* b)
 }
 
 __inline float expf(float val) { return ::exp(val); }
-#include "xrCore/Platform.h"
+#include "Common/Platform.hpp"
 
 #ifdef _ECOREB
 #define ECORE_API XR_EXPORT
@@ -180,9 +174,6 @@ DEFINE_VECTOR(shared_str, RStrVec, RStrVecIt);
 #define _omotions_ "$omotions$"
 #define _smotion_ "$smotion$"
 #define _detail_objects_ "$detail_objects$"
-#endif
 
 #define TEX_POINT_ATT "internal\\internal_light_attpoint"
 #define TEX_SPOT_ATT "internal\\internal_light_attclip"
-
-#pragma hdrstop
diff --git a/src/editors/ParticleEditor/main.h b/src/editors/ParticleEditor/main.h
@@ -68,7 +68,7 @@ class ECORE_API TfrmMain : public TForm
     __fastcall TfrmMain(TComponent* Owner);
     void __fastcall UpdateCaption();
 
-    __inline void SetHInst(HINSTANCE inst) { m_HInstance = inst; }
+    inline void SetHInst(HINSTANCE inst) { m_HInstance = inst; }
     bool IsFocused() { return D3DWindow->Focused(); }
 };
 

diff --git a/src/editors/ShaderEditor/main.h b/src/editors/ShaderEditor/main.h
@@ -69,7 +69,7 @@ class ECORE_API TfrmMain :
 public: // User declarations
     __fastcall TfrmMain(TComponent* Owner);
     void __fastcall UpdateCaption();
-    __inline void SetHInst(HINSTANCE inst) { m_HInstance = inst; }
+    inline void SetHInst(HINSTANCE inst) { m_HInstance = inst; }
     bool IsFocused() { return D3DWindow->Focused(); }
 };
 //---------------------------------------------------------------------------

diff --git a/src/editors/ShaderEditor/stdafx.h b/src/editors/ShaderEditor/stdafx.h
@@ -1,9 +1,3 @@
-//----------------------------------------------------
-// file: stdafx.h
-//----------------------------------------------------
-#ifndef stdafxH
-#define stdafxH
-
 #pragma once
 
 #pragma warn - pck
@@ -26,11 +20,11 @@
 #include <fastmath.h>
 #include <io.h>
 #include <fcntl.h>
-#include <sys\stat.h>
+#include <sys/stat.h>
 #include <process.h>
 #include <utime.h>
 
-// iseful macros
+// useful macros
 // MSC names for functions
 #ifdef _eof
 #undef _eof
@@ -57,7 +51,7 @@ __inline float modff(float a, float* b)
     return float(y);
 }
 __inline float expf(float val) { return ::exp(val); }
-#include "xrCore/Platform.h"
+#include "Common/Platform.hpp"
 #ifdef _ECOREB
 #define ECORE_API XR_IMPORT
 #define ENGINE_API XR_EXPORT
@@ -88,7 +82,7 @@ DEFINE_VECTOR(ListItem*, ListItemsVec, ListItemsIt);
 
 #include "xrCDB/xrCDB.h"
 #include "xrSound/Sound.h"
-#include "PSystem.h"
+#include "xrParticles/psystem.h"
 
 // DirectX headers
 #include <d3d9.h>
@@ -166,9 +160,6 @@ DEFINE_VECTOR(shared_str, RStrVec, RStrVecIt);
 #define _omotions_ "$omotions$"
 #define _smotion_ "$smotion$"
 #define _detail_objects_ "$detail_objects$"
-#endif
 
 #define TEX_POINT_ATT "internal\\internal_light_attpoint"
 #define TEX_SPOT_ATT "internal\\internal_light_attclip"
-
-#pragma hdrstop
diff --git a/src/editors/xrEProps/stdafx.h b/src/editors/xrEProps/stdafx.h
@@ -1,9 +1,3 @@
-//----------------------------------------------------
-// file: stdafx.h
-//----------------------------------------------------
-#ifndef stdafxH
-#define stdafxH
-
 #pragma once
 
 #include <xrCore/xrCore.h>
@@ -20,7 +14,7 @@ class MODEL;
 
 #include "FolderLib.h"
 
-#include "xrCore/Platform.h"
+#include "Common/Platform.hpp"
 
 #define ENGINE_API
 #define DLL_API XR_IMPORT
@@ -32,5 +26,3 @@ class MODEL;
 #pragma comment(lib, "xrSoundB.lib")
 #pragma comment(lib, "xrCoreB.lib")
 #pragma comment(lib, "EToolsB.lib")
-
-#endif // stdafxH
diff --git a/src/utils/xrAI/StdAfx.cpp b/src/utils/xrAI/StdAfx.cpp
@@ -1,8 +1 @@
-// stdafx.cpp : source file that includes just the standard includes
-//	xrAI.pch will be the pre-compiled header
-//	stdafx.obj will contain the pre-compiled type information
-
 #include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
diff --git a/src/utils/xrDO_Light/StdAfx.cpp b/src/utils/xrDO_Light/StdAfx.cpp
@@ -1,8 +1 @@
-// stdafx.cpp : source file that includes just the standard includes
-//	xrAI.pch will be the pre-compiled header
-//	stdafx.obj will contain the pre-compiled type information
-
 #include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
diff --git a/src/utils/xrLC/StdAfx.cpp b/src/utils/xrLC/StdAfx.cpp
@@ -1,8 +1 @@
-// stdafx.cpp : source file that includes just the standard includes
-//	xrLBuilder.pch will be the pre-compiled header
-//	stdafx.obj will contain the pre-compiled type information
-
 #include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
diff --git a/src/utils/xrSE_Factory/stdafx.h b/src/utils/xrSE_Factory/stdafx.h
@@ -15,7 +15,6 @@
 #define ENGINE_API
 #define ECORE_API
 #define DLL_API XR_EXPORT
-#define TIXML_USE_STL
 
 #include "clsid_game.h"
 

diff --git a/src/xrCDB/ISpatial_q_ray.cpp b/src/xrCDB/ISpatial_q_ray.cpp
@@ -371,7 +371,7 @@ void ISpatial_DB::q_ray(
         }
     }
     else
-    { // XXX: delete this branch since we always have SSE feature
+    {
         if (_o & O_ONLYFIRST)
         {
             if (_o & O_ONLYNEAREST)

diff --git a/src/xrCDB/StdAfx.cpp b/src/xrCDB/StdAfx.cpp
@@ -1,18 +1,6 @@
-// stdafx.cpp : source file that includes just the standard includes
-//	xrCDB.pch will be the pre-compiled header
-//	stdafx.obj will contain the pre-compiled type information
-
 #include "stdafx.h"
-#pragma hdrstop
 
-#ifdef __BORLANDC__
-#pragma comment(lib, "xrCoreB.lib")
-#else
 #pragma comment(lib, "xrCore.lib")
 #pragma comment(lib, "xrApi.lib")
-#endif
 
 #pragma comment(lib, "winmm.lib")
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
diff --git a/src/xrCDB/StdAfx.h b/src/xrCDB/StdAfx.h
@@ -58,7 +58,5 @@ IC void cdelete(T*& ptr)
 #define ENGINE_API
 #include "OPCODE/Opcode.h"
 
-// TODO: reference additional headers your program requires here
-
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
diff --git a/src/xrCommon/inlining_macros.h b/src/xrCommon/inlining_macros.h
@@ -15,10 +15,6 @@
 #define __thread __declspec(thread)
 #endif
 
-// XXX: remove
-#define _inline inline
-#define __inline inline
-
 // XXX: remove IC/ICF/ICN
 #define IC inline
 #define ICF FORCE_INLINE

diff --git a/src/xrCore/stdafx.cpp b/src/xrCore/stdafx.cpp
@@ -1,8 +1 @@
-// stdafx.cpp : source file that includes just the standard includes
-// xrCore.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
 #include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
diff --git a/src/xrEngine/main.cpp b/src/xrEngine/main.cpp
@@ -19,8 +19,6 @@
 #endif
 
 // global variables
-// XXX: use g_dedicated_server from xrAPI
-ENGINE_API bool g_dedicated_server = false;
 ENGINE_API CApplication* pApp = nullptr;
 ENGINE_API CInifile* pGameIni = nullptr;
 ENGINE_API bool g_bBenchmark = false;

diff --git a/src/xrEngine/stdafx.cpp b/src/xrEngine/stdafx.cpp
@@ -1,4 +1 @@
-// stdafx.cpp : source file that includes just the standard includes
-// stdafx.obj will contain the pre-compiled type information
-
 #include "stdafx.h"
diff --git a/src/xrGameSpy/stdafx.cpp b/src/xrGameSpy/stdafx.cpp
@@ -1,8 +1 @@
-// stdafx.cpp : source file that includes just the standard includes
-// xrGameSpy.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
 #include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
diff --git a/src/xrPhysics/stdafx.cpp b/src/xrPhysics/stdafx.cpp
@@ -1,8 +1 @@
-// stdafx.cpp : source file that includes just the standard includes
-// xrPhysics.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
 #include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
diff --git a/src/xrSound/stdafx.cpp b/src/xrSound/stdafx.cpp
@@ -1,18 +1 @@
-// stdafx.cpp : source file that includes just the standard includes
-// xrSound.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
 #include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
-
-#ifdef __BORLANDC__
-#pragma comment(lib, "eaxB.lib")
-#pragma comment(lib, "vorbisfileB.lib")
-#pragma comment(lib, "xrCoreB.lib")
-#pragma comment(lib, "EToolsB.lib")
-#pragma comment(lib, "OpenAL32B.lib")
-#pragma comment(lib, "dsoundb.lib")
-//#pragma comment(lib, "xrAPI.lib")
-#endif