electron-rare/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove extra header define checks (#27851)

Browse Source
This commit is contained in:
Louis Gombert
2026-02-25 22:46:40 -06:00
committed by GitHub
parent b6c8e68eda
commit 0df693e204
34 changed files with 33 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App/ApplicationPy.h
+1 -4
View File
@@ -21,8 +21,7 @@
* *
**************************************************************************/
#ifndef APP_APPLICATIONPY_H
#define APP_APPLICATIONPY_H
#pragma once
#include <Base/PyObjectBase.h>
@@ -90,5 +89,3 @@ public:
};
}
#endif // APP_APPLICATIONPY_H
src/App/Range.h
+1 -3
View File
@@ -26,9 +26,7 @@
#include <string>
#include <Base/Bitmask.h>
#ifndef FC_GLOBAL_H
#include <FCGlobal.h>
#endif
namespace App
{
@@ -264,4 +262,4 @@ private:
} // namespace App
ENABLE_BITMASK_OPERATORS(App::CellAddress::Cell)
ENABLE_BITMASK_OPERATORS(App::CellAddress::Cell)
src/Base/Builder3D.h
+1 -3
View File
@@ -31,9 +31,7 @@
#include <vector>
#include <cstdint>
#include <Base/Tools3D.h>
#ifndef FC_GLOBAL_H
# include <FCGlobal.h>
#endif
#include <FCGlobal.h>
#include "Placement.h"
src/Base/Debugger.h
+1 -3
View File
@@ -27,9 +27,7 @@
#include <QEventLoop>
#include <QObject>
#ifndef FC_GLOBAL_H
# include <FCGlobal.h>
#endif
#include <FCGlobal.h>
namespace Base
{
src/Base/Factory.h
+1 -3
View File
@@ -29,9 +29,7 @@
#include <list>
#include <map>
#include <string>
#ifndef FC_GLOBAL_H
# include <FCGlobal.h>
#endif
#include <FCGlobal.h>
namespace Base
src/Base/Handle.h
+1 -3
View File
@@ -26,9 +26,7 @@
#pragma once
#ifndef FC_GLOBAL_H
# include <FCGlobal.h>
#endif
#include <FCGlobal.h>
class QAtomicInt;
src/Base/InputSource.h
+1 -3
View File
@@ -29,9 +29,7 @@
#include <xercesc/util/BinInputStream.hpp>
#include <xercesc/sax/InputSource.hpp>
#ifndef FC_GLOBAL_H
# include <FCGlobal.h>
#endif
#include <FCGlobal.h>
namespace XERCES_CPP_NAMESPACE
{
src/Base/Matrix.h
+1 -3
View File
@@ -30,9 +30,7 @@
#include <string>
#include "Vector3D.h"
#ifndef FC_GLOBAL_H
# include <FCGlobal.h>
#endif
#include <FCGlobal.h>
namespace Base
src/Base/PyTools.h
-2
View File
@@ -73,9 +73,7 @@ extern "C" { /* a C library, but callable from C++ */
# undef _POSIX_C_SOURCE
#endif // (re-)defined in pyconfig.h
#include <Python.h>
#ifndef FC_GLOBAL_H
#include <FCGlobal.h>
#endif
extern int PP_RELOAD; /* 1=reload py modules when attributes referenced */
extern int PP_DEBUG; /* 1=start debugger when string/function/member run */
src/Base/Rotation.h
+1 -3
View File
@@ -26,9 +26,7 @@
#pragma once
#include "Vector3D.h"
#ifndef FC_GLOBAL_H
# include <FCGlobal.h>
#endif
#include <FCGlobal.h>
namespace Base
{
src/Base/StackWalker.h
-2
View File
@@ -45,9 +45,7 @@
#pragma once
#include <Windows.h>
#ifndef FC_GLOBAL_H
#include <FCGlobal.h>
#endif
// special defines for VC5/6 (if no actual PSDK is installed):
#if _MSC_VER < 1300
src/Base/Tools.h
+1 -3
View File
@@ -25,9 +25,7 @@
#pragma once
#ifndef FC_GLOBAL_H
# include <FCGlobal.h>
#endif
#include <FCGlobal.h>
#include <algorithm>
#include <cmath>
#include <numbers>
src/Base/Tools2D.h
+1 -3
View File
@@ -30,9 +30,7 @@
#include <list>
#include <vector>
#ifndef FC_GLOBAL_H
# include <FCGlobal.h>
#endif
#include <FCGlobal.h>
namespace Base
src/Base/Tools3D.h
+1 -3
View File
@@ -25,9 +25,7 @@
#pragma once
#ifndef FC_GLOBAL_H
# include <FCGlobal.h>
#endif
#include <FCGlobal.h>
#include <cmath>
#include <vector>
src/Base/Translate.h
+1 -3
View File
@@ -29,9 +29,7 @@
#include <QTranslator>
#include <memory>
#include <list>
#ifndef FC_GLOBAL_H
# include <FCGlobal.h>
#endif
#include <FCGlobal.h>
namespace Py
{
src/Base/Type.h
+1 -3
View File
@@ -31,9 +31,7 @@
#include <map>
#include <set>
#include <vector>
#ifndef FC_GLOBAL_H
# include <FCGlobal.h>
#endif
#include <FCGlobal.h>
namespace Base
{
src/Base/UniqueNameManager.h
+1 -3
View File
@@ -24,9 +24,7 @@
#pragma once
#ifndef FC_GLOBAL_H
# include <FCGlobal.h>
#endif
#include <FCGlobal.h>
#include <vector>
#include <string>
#include <set>
src/Base/UnlimitedUnsigned.h
+1 -3
View File
@@ -24,9 +24,7 @@
#pragma once
#ifndef FC_GLOBAL_H
# include <FCGlobal.h>
#endif
#include <FCGlobal.h>
#include <vector>
#include <string>
#include <stdexcept>
src/Base/Uuid.h
+1 -3
View File
@@ -28,9 +28,7 @@
// Std. configurations
#include <string>
#ifndef FC_GLOBAL_H
# include <FCGlobal.h>
#endif
#include <FCGlobal.h>
namespace Base
{
src/Mod/Assembly/Gui/Commands.h
+1 -4
View File
@@ -21,8 +21,7 @@
* *
***************************************************************************/
#ifndef ASSEMBLYGUI_COMMANDS_H
#define ASSEMBLYGUI_COMMANDS_H
#pragma once
#include <Mod/Assembly/App/AssemblyObject.h>
@@ -32,5 +31,3 @@ namespace AssemblyGui
void CreateAssemblyCommands();
} // namespace AssemblyGui
#endif // ASSEMBLYGUI_COMMANDS_H
src/Mod/CAM/PathSimulator/AppGL/ViewCAMSimulator.h
+1 -4
View File
@@ -22,8 +22,7 @@
* *
***************************************************************************/
#ifndef PATHSIMULATOR_VIEWCAMSIMULATOR_H
#define PATHSIMULATOR_VIEWCAMSIMULATOR_H
#pragma once
#include <Gui/MDIView.h>
@@ -49,5 +48,3 @@ protected:
};
} // namespace CAMSimulator
#endif /* PATHSIMULATOR_VIEWCAMSIMULATOR_H */
src/Mod/Mesh/App/Core/Approximation.h
+2 -3
View File
@@ -25,9 +25,8 @@
#pragma once
#include <Mod/Mesh/App/WildMagic4/Wm4QuadricSurface.h>
#ifndef MESH_GLOBAL_H
# include <Mod/Mesh/MeshGlobal.h>
#endif
#include <Mod/Mesh/MeshGlobal.h>
#include <algorithm>
#include <limits>
#include <list>
src/Mod/Mesh/App/Core/Definitions.h
+1 -3
View File
@@ -24,9 +24,7 @@
#pragma once
#ifndef MESH_GLOBAL_H
# include <Mod/Mesh/MeshGlobal.h>
#endif
#include <Mod/Mesh/MeshGlobal.h>
#include <limits>
src/Mod/Mesh/App/FeatureMeshExport.h
+1 -3
View File
@@ -27,9 +27,7 @@
#include <App/DocumentObject.h>
#include <App/PropertyLinks.h>
#ifndef MESH_GLOBAL_H
# include <Mod/Mesh/MeshGlobal.h>
#endif
#include <Mod/Mesh/MeshGlobal.h>
namespace Mesh
{
src/Mod/Mesh/App/MeshPoint.h
+1 -3
View File
@@ -29,9 +29,7 @@
#include <Base/Vector3D.h>
#include <Base/Handle.h>
#ifndef MESH_GLOBAL_H
# include <Mod/Mesh/MeshGlobal.h>
#endif
#include <Mod/Mesh/MeshGlobal.h>
using Base::Vector3d;
src/Mod/Mesh/Gui/DlgSettingsImportExportImp.h
+1 -3
View File
@@ -24,9 +24,7 @@
#pragma once
#ifndef MESH_GLOBAL_H
# include <Mod/Mesh/MeshGlobal.h>
#endif
#include <Mod/Mesh/MeshGlobal.h>
#include <Gui/PropertyPage.h>
src/Mod/Mesh/Gui/DlgSettingsMeshView.h
+1 -3
View File
@@ -24,9 +24,7 @@
#pragma once
#ifndef MESH_GLOBAL_H
# include <Mod/Mesh/MeshGlobal.h>
#endif
#include <Mod/Mesh/MeshGlobal.h>
#include <memory>
#include <Gui/PropertyPage.h>
src/Mod/Mesh/Gui/DlgSmoothing.h
+1 -3
View File
@@ -29,9 +29,7 @@
#include <Gui/TaskView/TaskDialog.h>
#include <Gui/TaskView/TaskView.h>
#ifndef MESH_GLOBAL_H
# include <Mod/Mesh/MeshGlobal.h>
#endif
#include <Mod/Mesh/MeshGlobal.h>
class QButtonGroup;
src/Mod/Mesh/Gui/MeshSelection.h
+1 -3
View File
@@ -29,9 +29,7 @@
#include <Gui/Selection/SelectionObject.h>
#include <Inventor/nodes/SoEventCallback.h>
#ifndef MESH_GLOBAL_H
# include <Mod/Mesh/MeshGlobal.h>
#endif
#include <Mod/Mesh/MeshGlobal.h>
namespace Gui
src/Mod/Mesh/Gui/PropertyEditorMesh.h
+1 -4
View File
@@ -25,10 +25,7 @@
#pragma once
#include <Gui/propertyeditor/PropertyItem.h>
#ifndef MESH_GLOBAL_H
# include <Mod/Mesh/MeshGlobal.h>
#endif
#include <Mod/Mesh/MeshGlobal.h>
namespace MeshGui
{
src/Mod/Mesh/Gui/Segmentation.h
+1 -3
View File
@@ -28,9 +28,7 @@
#include <Gui/TaskView/TaskDialog.h>
#include <Gui/TaskView/TaskView.h>
#ifndef MESH_GLOBAL_H
# include <Mod/Mesh/MeshGlobal.h>
#endif
#include <Mod/Mesh/MeshGlobal.h>
// forward declarations
src/Mod/Mesh/Gui/SoFCIndexedFaceSet.h
+1 -3
View File
@@ -29,9 +29,7 @@
#include <Inventor/fields/SoSFBool.h>
#include <Inventor/nodes/SoIndexedFaceSet.h>
#include <vector>
#ifndef MESH_GLOBAL_H
# include <Mod/Mesh/MeshGlobal.h>
#endif
#include <Mod/Mesh/MeshGlobal.h>
class SoGLCoordinateElement;
src/Mod/Mesh/Gui/SoPolygon.h
+1 -3
View File
@@ -28,9 +28,7 @@
#include <Inventor/fields/SoSFBool.h>
#include <Inventor/fields/SoSFInt32.h>
#include <Inventor/nodes/SoShape.h>
#ifndef MESH_GLOBAL_H
# include <Mod/Mesh/MeshGlobal.h>
#endif
#include <Mod/Mesh/MeshGlobal.h>
namespace MeshGui
src/Mod/Mesh/Gui/Workbench.h
+1 -3
View File
@@ -25,9 +25,7 @@
#pragma once
#include <Gui/Workbench.h>
#ifndef MESH_GLOBAL_H
# include <Mod/Mesh/MeshGlobal.h>
#endif
#include <Mod/Mesh/MeshGlobal.h>
namespace MeshGui