diff --git a/Src/Orbiter/Astro.h b/Src/Orbiter/Astro.h index ffe4e046f..ad7dac1b8 100644 --- a/Src/Orbiter/Astro.h +++ b/Src/Orbiter/Astro.h @@ -8,7 +8,7 @@ #define __ASTRO_H #include -#include "vecmat.h" +#include "Vecmat.h" #include "OrbiterAPI.h" const double iAU = 1.0/AU; diff --git a/Src/Orbiter/Celbody.h b/Src/Orbiter/Celbody.h index 98e3dfe7d..61d4b4feb 100644 --- a/Src/Orbiter/Celbody.h +++ b/Src/Orbiter/Celbody.h @@ -9,7 +9,7 @@ #ifndef __CELBODY_H #define __CELBODY_H -#include "RigidBody.h" +#include "Rigidbody.h" #include "OrbiterAPI.h" #include "PinesGrav.h" @@ -229,4 +229,4 @@ friend class CELBODY2; bool ephem_parentbary; // true if body calculates its state with respect to the parent barycentre, false if with respect to parent's true position }; -#endif \ No newline at end of file +#endif diff --git a/Src/Orbiter/Config.cpp b/Src/Orbiter/Config.cpp index e0f243ac2..34cbc3da2 100644 --- a/Src/Orbiter/Config.cpp +++ b/Src/Orbiter/Config.cpp @@ -10,6 +10,7 @@ #define __CONFIG_CPP #define STRICT 1 +#include #include #include #include @@ -1592,4 +1593,4 @@ GDIResources::~GDIResources () DeleteObject (dlgF1r); DeleteObject (dlgF1i); DeleteObject (dlgF2); -} \ No newline at end of file +} diff --git a/Src/Orbiter/D3dmath.cpp b/Src/Orbiter/D3dmath.cpp index 53d96c0b3..d174e8cac 100644 --- a/Src/Orbiter/D3dmath.cpp +++ b/Src/Orbiter/D3dmath.cpp @@ -15,7 +15,7 @@ #define STRICT #include #include -#include "D3DMath.h" +#include "D3dmath.h" VOID VMAT_rotx (D3DMATRIX &a, double r) { diff --git a/Src/Orbiter/DialogWin.cpp b/Src/Orbiter/DialogWin.cpp index b72fe5183..1e482be56 100644 --- a/Src/Orbiter/DialogWin.cpp +++ b/Src/Orbiter/DialogWin.cpp @@ -5,7 +5,7 @@ #include "DlgMgr.h" #include "OrbiterAPI.h" #include "Orbiter.h" -#include "Resource.h" +#include "resource.h" #include "Log.h" #define DLG_CAPTIONBUTTON (DLG_CAPTIONCLOSE|DLG_CAPTIONHELP) diff --git a/Src/Orbiter/Dialogs.cpp b/Src/Orbiter/Dialogs.cpp index 35b94e9b1..8782bbc70 100644 --- a/Src/Orbiter/Dialogs.cpp +++ b/Src/Orbiter/Dialogs.cpp @@ -15,7 +15,7 @@ #include "Camera.h" #include "Pane.h" #include "Nav.h" -#include "Resource.h" +#include "resource.h" #include "Dialogs.h" #include "DlgMgr.h" // to be removed diff --git a/Src/Orbiter/DlgCamera.cpp b/Src/Orbiter/DlgCamera.cpp index dec3b3d46..3f7822970 100644 --- a/Src/Orbiter/DlgCamera.cpp +++ b/Src/Orbiter/DlgCamera.cpp @@ -9,12 +9,12 @@ #include "DlgCamera.h" #include "DlgMgr.h" -#include "Resource.h" -#include "Resource2.h" +#include "resource.h" +#include "resource2.h" #include "Orbiter.h" #include "Psys.h" #include "Camera.h" -#include "Uxtheme.h" +#include #include "DlgCtrl.h" using std::min; diff --git a/Src/Orbiter/DlgCamera.h b/Src/Orbiter/DlgCamera.h index c66c58920..dd528f9ee 100644 --- a/Src/Orbiter/DlgCamera.h +++ b/Src/Orbiter/DlgCamera.h @@ -8,8 +8,9 @@ #ifndef __DLGCAMERA_H #define __DLGCAMERA_H +#include +#include #include "DialogWin.h" -#include "CommCtrl.h" #include "Celbody.h" #include "Camera.h" @@ -170,4 +171,4 @@ class TabPreset: public CameraTab { static INT_PTR CALLBACK DlgProc (HWND, UINT, WPARAM, LPARAM); }; -#endif // !__DLGCAMERA_H \ No newline at end of file +#endif // !__DLGCAMERA_H diff --git a/Src/Orbiter/DlgCapture.cpp b/Src/Orbiter/DlgCapture.cpp index c853c0cb5..7b5ab4c68 100644 --- a/Src/Orbiter/DlgCapture.cpp +++ b/Src/Orbiter/DlgCapture.cpp @@ -10,8 +10,8 @@ #include #include "DlgCapture.h" #include "Orbiter.h" -#include "Resource.h" -#include "Resource2.h" +#include "resource.h" +#include "resource2.h" #include extern Orbiter *g_pOrbiter; @@ -187,4 +187,4 @@ bool DlgCapture::AutoIncrement (HWND hDlg) return true; } return false; -} \ No newline at end of file +} diff --git a/Src/Orbiter/DlgFocus.cpp b/Src/Orbiter/DlgFocus.cpp index fc18e3c1c..a708f3df7 100644 --- a/Src/Orbiter/DlgFocus.cpp +++ b/Src/Orbiter/DlgFocus.cpp @@ -8,14 +8,14 @@ #define STRICT 1 #include "DlgFocus.h" -#include "Resource.h" +#include "resource.h" #include "Orbiter.h" #include "Psys.h" #include "SuperVessel.h" #include "Pane.h" #include "Camera.h" #include "Util.h" -#include "Uxtheme.h" +#include #include extern Orbiter *g_pOrbiter; @@ -572,4 +572,4 @@ HTREEITEM DlgFocus::FindItem (HWND hDlg, const char *str, HTREEITEM hti_first) hti_first = (HTREEITEM)SendDlgItemMessage (hDlg, IDC_TREE1, TVM_GETNEXTITEM, TVGN_NEXT, (LPARAM)hti_first); } while (hti_first); return NULL; -} \ No newline at end of file +} diff --git a/Src/Orbiter/DlgFocus.h b/Src/Orbiter/DlgFocus.h index 933a072d2..ab6b5943b 100644 --- a/Src/Orbiter/DlgFocus.h +++ b/Src/Orbiter/DlgFocus.h @@ -8,8 +8,10 @@ #ifndef __DLGFOCUS_H #define __DLGFOCUS_H +#include +#include + #include "DialogWin.h" -#include "CommCtrl.h" class DlgFocus: public DialogWin { public: @@ -46,4 +48,4 @@ class DlgFocus: public DialogWin { RECT rClient, rTab, rEdit, rTree, rAppl, rPrev, rHelp, rClse, rSldr, rLabl, rChck; }; -#endif // !__DLGFOCUS_H \ No newline at end of file +#endif // !__DLGFOCUS_H diff --git a/Src/Orbiter/DlgFunction.cpp b/Src/Orbiter/DlgFunction.cpp index bcff7a976..ac1327af9 100644 --- a/Src/Orbiter/DlgFunction.cpp +++ b/Src/Orbiter/DlgFunction.cpp @@ -9,8 +9,8 @@ #include "DlgFunction.h" #include "Orbiter.h" -#include "Resource.h" -#include "Resource2.h" +#include "resource.h" +#include "resource2.h" extern Orbiter *g_pOrbiter; extern HELPCONTEXT DefHelpContext; diff --git a/Src/Orbiter/DlgHelp.cpp b/Src/Orbiter/DlgHelp.cpp index 5da8fd73b..73246f051 100644 --- a/Src/Orbiter/DlgHelp.cpp +++ b/Src/Orbiter/DlgHelp.cpp @@ -10,7 +10,7 @@ #include "DlgHelp.h" #include "DlgMgr.h" #include "Orbiter.h" -#include "Resource.h" +#include "resource.h" #include #include diff --git a/Src/Orbiter/DlgInfo.cpp b/Src/Orbiter/DlgInfo.cpp index 87c574342..edfdaf237 100644 --- a/Src/Orbiter/DlgInfo.cpp +++ b/Src/Orbiter/DlgInfo.cpp @@ -12,7 +12,7 @@ #include #include "DlgInfo.h" #include "Dialogs.h" -#include "Resource.h" +#include "resource.h" #include "DlgMgr.h" // to be removed #include "Orbiter.h" #include "Vessel.h" @@ -21,7 +21,7 @@ #include "Celbody.h" #include #include -#include +#include #include "Element.h" extern Orbiter *g_pOrbiter; diff --git a/Src/Orbiter/DlgMap.cpp b/Src/Orbiter/DlgMap.cpp index e8b946e3e..d76f622b7 100644 --- a/Src/Orbiter/DlgMap.cpp +++ b/Src/Orbiter/DlgMap.cpp @@ -13,7 +13,7 @@ #include "Orbiter.h" #include "Psys.h" #include "Planet.h" -#include "Resource.h" +#include "resource.h" #include "DlgMgr.h" // to be removed #include "Pane.h" #include "Util.h" diff --git a/Src/Orbiter/DlgMenuCfg.cpp b/Src/Orbiter/DlgMenuCfg.cpp index 765c65f48..1fd973a29 100644 --- a/Src/Orbiter/DlgMenuCfg.cpp +++ b/Src/Orbiter/DlgMenuCfg.cpp @@ -11,8 +11,8 @@ #include "Pane.h" #include "MenuInfoBar.h" #include "DlgMenuCfg.h" -#include "Resource.h" -#include "Resource2.h" +#include "resource.h" +#include "resource2.h" #include "DlgCtrl.h" extern Orbiter *g_pOrbiter; diff --git a/Src/Orbiter/DlgMgr.cpp b/Src/Orbiter/DlgMgr.cpp index c4ae7e0bb..fc1df5c8e 100644 --- a/Src/Orbiter/DlgMgr.cpp +++ b/Src/Orbiter/DlgMgr.cpp @@ -4,7 +4,7 @@ #include #include "GraphicsAPI.h" #include "DlgMgr.h" -#include "Resource.h" +#include "resource.h" #include "Orbiter.h" #include "Log.h" diff --git a/Src/Orbiter/DlgOptions.cpp b/Src/Orbiter/DlgOptions.cpp index be8342a32..7bf6d049b 100644 --- a/Src/Orbiter/DlgOptions.cpp +++ b/Src/Orbiter/DlgOptions.cpp @@ -16,7 +16,7 @@ #include "Camera.h" #include "DlgCtrl.h" #include "resource.h" -#include "Uxtheme.h" +#include #include extern Orbiter* g_pOrbiter; diff --git a/Src/Orbiter/DlgRecorder.cpp b/Src/Orbiter/DlgRecorder.cpp index 068912f47..f28dd7eca 100644 --- a/Src/Orbiter/DlgRecorder.cpp +++ b/Src/Orbiter/DlgRecorder.cpp @@ -9,8 +9,8 @@ #include "DlgRecorder.h" #include "Orbiter.h" -#include "Resource.h" -#include "Resource2.h" +#include "resource.h" +#include "resource2.h" extern Orbiter *g_pOrbiter; extern Vessel *g_focusobj; diff --git a/Src/Orbiter/Launchpad.cpp b/Src/Orbiter/Launchpad.cpp index b5bbbcd93..ebddac35e 100644 --- a/Src/Orbiter/Launchpad.cpp +++ b/Src/Orbiter/Launchpad.cpp @@ -7,9 +7,9 @@ #include #include #include -#include "Uxtheme.h" +#include #include -#include "Resource.h" +#include "resource.h" #include "Orbiter.h" #include "Launchpad.h" #include "TabScenario.h" diff --git a/Src/Orbiter/Launchpad.h b/Src/Orbiter/Launchpad.h index 5771e796b..89e4d7aa3 100644 --- a/Src/Orbiter/Launchpad.h +++ b/Src/Orbiter/Launchpad.h @@ -4,7 +4,7 @@ #ifndef __LAUNCHPAD_H #define __LAUNCHPAD_H -#include +#include #include "OrbiterAPI.h" #include "Config.h" @@ -153,4 +153,4 @@ namespace orbiter { } -#endif // !__LAUNCHPAD_H \ No newline at end of file +#endif // !__LAUNCHPAD_H diff --git a/Src/Orbiter/MenuInfoBar.cpp b/Src/Orbiter/MenuInfoBar.cpp index 34f298d3b..84de0cf3b 100644 --- a/Src/Orbiter/MenuInfoBar.cpp +++ b/Src/Orbiter/MenuInfoBar.cpp @@ -4,7 +4,7 @@ #include "MenuInfoBar.h" #include "Pane.h" #include "Camera.h" -#include "Resource.h" +#include "resource.h" #include "Dialogs.h" #include "DlgMgr.h" #include "DlgMenuCfg.h" diff --git a/Src/Orbiter/MfdAlign.cpp b/Src/Orbiter/MfdAlign.cpp index d99a2a3d5..fe761e711 100644 --- a/Src/Orbiter/MfdAlign.cpp +++ b/Src/Orbiter/MfdAlign.cpp @@ -22,7 +22,7 @@ static const Body *last_target = 0; // ======================================================================= // class Instrument_OPlaneAlign -struct Instrument_OPlaneAlign::SavePrm Instrument_OPlaneAlign::saveprm = {0,0,0,0.0,0.0,false}; +struct Instrument_OPlaneAlign::SavePrm Instrument_OPlaneAlign::saveprm = {0,0,0,false,0.0,0.0}; Instrument_OPlaneAlign::Instrument_OPlaneAlign (Pane *_pane, INT_PTR _id, const Spec &spec, Vessel *_vessel, bool restore) : Instrument (_pane, _id, spec, _vessel) diff --git a/Src/Orbiter/OptionsPages.cpp b/Src/Orbiter/OptionsPages.cpp index bb22b42e1..7e39b58cb 100644 --- a/Src/Orbiter/OptionsPages.cpp +++ b/Src/Orbiter/OptionsPages.cpp @@ -13,7 +13,7 @@ #include "Psys.h" #include "Camera.h" #include "resource.h" -#include "Uxtheme.h" +#include using std::min; using std::max; diff --git a/Src/Orbiter/OptionsPages.h b/Src/Orbiter/OptionsPages.h index 8e44fb7eb..c4f64d1a8 100644 --- a/Src/Orbiter/OptionsPages.h +++ b/Src/Orbiter/OptionsPages.h @@ -14,7 +14,7 @@ #define __OPTIONSPAGES_H #include -#include +#include #include "CustomControls.h" #include "OrbiterAPI.h" @@ -458,4 +458,4 @@ class OptionsPage_Axes : public OptionsPage { BOOL OnHScroll(HWND hTab, WPARAM wParam, LPARAM lParam); }; -#endif // !__OPTIONSPAGES_H \ No newline at end of file +#endif // !__OPTIONSPAGES_H diff --git a/Src/Orbiter/PlaybackEd.cpp b/Src/Orbiter/PlaybackEd.cpp index 6290d6a95..499fcba8f 100644 --- a/Src/Orbiter/PlaybackEd.cpp +++ b/Src/Orbiter/PlaybackEd.cpp @@ -5,7 +5,7 @@ #include "DlgMgr.h" // remove #include "Camera.h" #include "Log.h" -#include "Resource.h" +#include "resource.h" using namespace std; diff --git a/Src/Orbiter/TabModule.cpp b/Src/Orbiter/TabModule.cpp index 145c18890..b9630177d 100644 --- a/Src/Orbiter/TabModule.cpp +++ b/Src/Orbiter/TabModule.cpp @@ -11,6 +11,8 @@ #include "TabModule.h" #include "resource.h" #include +#include + namespace fs = std::filesystem; using std::max; diff --git a/Src/Orbiter/TabScenario.h b/Src/Orbiter/TabScenario.h index 35415f119..463705861 100644 --- a/Src/Orbiter/TabScenario.h +++ b/Src/Orbiter/TabScenario.h @@ -9,7 +9,7 @@ #ifndef __TABSCENARIO_H #define __TABSCENARIO_H -#include +#include #include "LpadTab.h" #include "CustomControls.h" #include @@ -91,4 +91,4 @@ namespace orbiter { } -#endif // !__TABSCENARIO_H \ No newline at end of file +#endif // !__TABSCENARIO_H diff --git a/Src/Orbiter/TimeData.h b/Src/Orbiter/TimeData.h index 3768a50f7..a82ea2bb6 100644 --- a/Src/Orbiter/TimeData.h +++ b/Src/Orbiter/TimeData.h @@ -1,6 +1,7 @@ #ifndef TIMEDATA_H #define TIMEDATA_H +#include //----------------------------------------------------------------------------- // Name: class TimeData // Desc: stores timing information for current time step @@ -72,4 +73,4 @@ struct TimeJumpData { int mode; }; -#endif \ No newline at end of file +#endif diff --git a/Src/Orbiter/VectorMap.cpp b/Src/Orbiter/VectorMap.cpp index 257345325..c3a0fa767 100644 --- a/Src/Orbiter/VectorMap.cpp +++ b/Src/Orbiter/VectorMap.cpp @@ -8,7 +8,7 @@ #include "VectorMap.h" #include "Psys.h" -#include "MFD.h" +#include "Mfd.h" #include "Util.h" #define OUTLINE_COAST 1 @@ -1681,4 +1681,4 @@ void Groundtrack::Update () vupdt = (vupdt+1) % nvtx; } omega_updt = fabs (omega_updt); -} \ No newline at end of file +} diff --git a/Src/Orbiter/Vessel.cpp b/Src/Orbiter/Vessel.cpp index f1555c64d..ce832aabe 100644 --- a/Src/Orbiter/Vessel.cpp +++ b/Src/Orbiter/Vessel.cpp @@ -22,7 +22,7 @@ #include "Orbiter.h" #include "Vessel.h" -#include "Supervessel.h" +#include "SuperVessel.h" #include "Config.h" #include "Camera.h" #include "Pane.h" @@ -42,6 +42,7 @@ #include #include #include +#include #ifdef INLINEGRAPHICS #include "VVessel.h" diff --git a/Src/Orbiter/Vesselstatus.cpp b/Src/Orbiter/Vesselstatus.cpp index 30bd0a85b..d0b7b2e4d 100644 --- a/Src/Orbiter/Vesselstatus.cpp +++ b/Src/Orbiter/Vesselstatus.cpp @@ -8,8 +8,8 @@ #include "Orbiter.h" #include "Vessel.h" -#include "Supervessel.h" -#include "VVessel.h" +#include "SuperVessel.h" +#include "Vvessel.h" #include "Config.h" #include "Pane.h" #include "Element.h" diff --git a/Src/Orbiter/ZTreeMgr.cpp b/Src/Orbiter/ZTreeMgr.cpp index e58aaf330..1ba4534eb 100644 --- a/Src/Orbiter/ZTreeMgr.cpp +++ b/Src/Orbiter/ZTreeMgr.cpp @@ -3,7 +3,7 @@ #include "ZTreeMgr.h" #include "zlib.h" -#include "util.h" +#include "Util.h" // ======================================================================= // File header for compressed tree files diff --git a/Src/Orbiter/elevmgr.h b/Src/Orbiter/elevmgr.h index b6b94df9e..24c2bb5c4 100644 --- a/Src/Orbiter/elevmgr.h +++ b/Src/Orbiter/elevmgr.h @@ -5,7 +5,7 @@ #define __ELEVMGR_H #include "windows.h" -#include "vecmat.h" +#include "Vecmat.h" #include "ZTreeMgr.h" #include @@ -87,4 +87,4 @@ class ElevationManager { mutable std::vector *local_cache = nullptr; }; -#endif // !__ELEVMGR_H \ No newline at end of file +#endif // !__ELEVMGR_H