diff --git a/src/App/Annotation.h b/src/App/Annotation.h index b04f575694..847ddd5b66 100644 --- a/src/App/Annotation.h +++ b/src/App/Annotation.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_ANNOTATION_H -#define APP_ANNOTATION_H +#pragma once #include "DocumentObject.h" #include "PropertyGeo.h" @@ -74,6 +73,3 @@ public: }; } // namespace App - - -#endif // APP_ANNOTATION_H diff --git a/src/App/Application.h b/src/App/Application.h index 065760c4d3..27245d6a38 100644 --- a/src/App/Application.h +++ b/src/App/Application.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef SRC_APP_APPLICATION_H_ -#define SRC_APP_APPLICATION_H_ +#pragma once #include #include @@ -1035,6 +1034,3 @@ inline App::Application &GetApplication(){ } } // namespace App - - -#endif // SRC_APP_APPLICATION_H_ diff --git a/src/App/ApplicationDirectories.h b/src/App/ApplicationDirectories.h index 7a5a8d7137..32310ec3d1 100644 --- a/src/App/ApplicationDirectories.h +++ b/src/App/ApplicationDirectories.h @@ -20,8 +20,7 @@ * * **************************************************************************************************/ -#ifndef SRC_APP_APPLICATIONDIRECTORIES_H_ -#define SRC_APP_APPLICATIONDIRECTORIES_H_ +#pragma once #include "FCConfig.h" #include "FCGlobal.h" @@ -257,5 +256,3 @@ namespace App { }; } // App - -#endif //SRC_APP_APPLICATIONDIRECTORIES_H_ diff --git a/src/App/AutoTransaction.h b/src/App/AutoTransaction.h index 94b63316e4..d2cdd703f4 100644 --- a/src/App/AutoTransaction.h +++ b/src/App/AutoTransaction.h @@ -22,8 +22,7 @@ * * ****************************************************************************/ -#ifndef APP_AUTOTRANSACTION_H -#define APP_AUTOTRANSACTION_H +#pragma once #include #include @@ -157,6 +156,4 @@ private: bool active; }; -} // namespace App - -#endif // APP_AUTOTRANSACTION_H +} // namespace App \ No newline at end of file diff --git a/src/App/Branding.h b/src/App/Branding.h index b87b0539bd..aacb10588a 100644 --- a/src/App/Branding.h +++ b/src/App/Branding.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_BRANDING_H -#define APP_BRANDING_H +#pragma once #include #include @@ -54,5 +53,3 @@ private: }; } // namespace App - -#endif // APP_BRANDING_H diff --git a/src/App/CleanupProcess.h b/src/App/CleanupProcess.h index fcc2631840..6c0dc485f5 100644 --- a/src/App/CleanupProcess.h +++ b/src/App/CleanupProcess.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef APP_CLEANUPPROCESS_H -#define APP_CLEANUPPROCESS_H +#pragma once #include #include @@ -52,6 +51,4 @@ public: static void callCleanup(); }; -} // namespace App - -#endif // APP_CLEANUPPROCESS_H +} // namespace App \ No newline at end of file diff --git a/src/App/ColorModel.h b/src/App/ColorModel.h index e432a45978..8f1190ac4d 100644 --- a/src/App/ColorModel.h +++ b/src/App/ColorModel.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_COLORMODEL_H -#define APP_COLORMODEL_H +#pragma once #include "Material.h" #include @@ -702,6 +701,4 @@ inline const ColorModel& ColorGradient::getColorModel() const return currentModelPack.totalModel; } -} // namespace App - -#endif // APP_COLORMODEL_H +} // namespace App \ No newline at end of file diff --git a/src/App/ComplexGeoData.h b/src/App/ComplexGeoData.h index ade8839d18..a33c470fbc 100644 --- a/src/App/ComplexGeoData.h +++ b/src/App/ComplexGeoData.h @@ -25,8 +25,7 @@ ***************************************************************************/ -#ifndef APP_COMPLEX_GEO_DATA_H -#define APP_COMPLEX_GEO_DATA_H +#pragma once #include #include @@ -749,4 +748,3 @@ protected: } // namespace Data ENABLE_BITMASK_OPERATORS(Data::SearchOption) -#endif diff --git a/src/App/Datums.h b/src/App/Datums.h index 67966ca446..b253a70187 100644 --- a/src/App/Datums.h +++ b/src/App/Datums.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef DATUMS_H -#define DATUMS_H +#pragma once #include "GeoFeature.h" #include "GeoFeatureGroupExtension.h" @@ -254,5 +253,3 @@ private: }; } // namespace App - -#endif /* end of include guard: DATUMS_H */ diff --git a/src/App/Document.h b/src/App/Document.h index 8dd59b3023..c64ee69c1b 100644 --- a/src/App/Document.h +++ b/src/App/Document.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SRC_APP_DOCUMENT_H_ -#define SRC_APP_DOCUMENT_H_ +#pragma once #include #include @@ -1470,5 +1469,3 @@ T* Document::addObject(const char* pObjectName, bool isNew, const char* viewType } } // namespace App - -#endif // SRC_APP_DOCUMENT_H_ diff --git a/src/App/DocumentObject.h b/src/App/DocumentObject.h index 6b0ac2bc9c..1d0b79ee72 100644 --- a/src/App/DocumentObject.h +++ b/src/App/DocumentObject.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef SRC_APP_DOCUMENTOBJECT_H_ -#define SRC_APP_DOCUMENTOBJECT_H_ +#pragma once #include #include @@ -1365,5 +1364,3 @@ private: }; } // namespace App - -#endif // SRC_APP_DOCUMENTOBJECT_H_ diff --git a/src/App/DocumentObjectExtension.h b/src/App/DocumentObjectExtension.h index f8030db4d8..4ad9dae654 100644 --- a/src/App/DocumentObjectExtension.h +++ b/src/App/DocumentObjectExtension.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_DOCUMENTOBJECTEXTENSION_H -#define APP_DOCUMENTOBJECTEXTENSION_H +#pragma once #include "Extension.h" @@ -144,5 +143,3 @@ public: }; } // namespace App - -#endif // APP_DOCUMENTOBJECTEXTENSION_H diff --git a/src/App/DocumentObjectFileIncluded.h b/src/App/DocumentObjectFileIncluded.h index 50d4788760..be376df37c 100644 --- a/src/App/DocumentObjectFileIncluded.h +++ b/src/App/DocumentObjectFileIncluded.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_DOCUMENTOBJECTFILEINCLUDED_H -#define APP_DOCUMENTOBJECTFILEINCLUDED_H +#pragma once #include "DocumentObject.h" #include "PropertyFile.h" @@ -54,6 +53,3 @@ public: }; } // namespace App - - -#endif // APP_DOCUMENTOBJECTFILEINCLUDED_H diff --git a/src/App/DocumentObjectGroup.h b/src/App/DocumentObjectGroup.h index a0b1c7e657..74eeecfd84 100644 --- a/src/App/DocumentObjectGroup.h +++ b/src/App/DocumentObjectGroup.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_DOCUMENTOBJECTGROUP_H -#define APP_DOCUMENTOBJECTGROUP_H +#pragma once #include "DocumentObject.h" #include "FeaturePython.h" @@ -57,6 +56,3 @@ using DocumentObjectGroupPython = App::FeaturePythonT; } // namespace App - - -#endif // APP_DOCUMENTOBJECTGROUP_H diff --git a/src/App/DocumentObserver.h b/src/App/DocumentObserver.h index bffaf12425..83d8b7ece5 100644 --- a/src/App/DocumentObserver.h +++ b/src/App/DocumentObserver.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_DOCUMENTOBSERVER_H -#define APP_DOCUMENTOBSERVER_H +#pragma once #include #include @@ -628,5 +627,3 @@ struct std::hash }; ENABLE_BITMASK_OPERATORS(App::SubObjectT::NormalizeOption) - -#endif // APP_DOCUMENTOBSERVER_H diff --git a/src/App/DocumentObserverPython.h b/src/App/DocumentObserverPython.h index 38818e2b6a..5751f95ef8 100644 --- a/src/App/DocumentObserverPython.h +++ b/src/App/DocumentObserverPython.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_DOCUMENTOBSERVERPYTHON_H -#define APP_DOCUMENTOBSERVERPYTHON_H +#pragma once #include #include @@ -165,5 +164,3 @@ private: }; } // namespace App - -#endif // APP_DOCUMENTOBSERVERPYTHON_H diff --git a/src/App/DynamicProperty.h b/src/App/DynamicProperty.h index ab31ab9787..0b43d323f8 100644 --- a/src/App/DynamicProperty.h +++ b/src/App/DynamicProperty.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SRC_APP_DYNAMICPROPERTY_H_ -#define SRC_APP_DYNAMICPROPERTY_H_ +#pragma once #include #include @@ -199,6 +198,4 @@ private: std::unique_ptr impl; }; -} // namespace App - -#endif // SRC_APP_DYNAMICPROPERTY_H_ +} // namespace App \ No newline at end of file diff --git a/src/App/ElementMap.h b/src/App/ElementMap.h index f1a3f0154f..1f1b067938 100644 --- a/src/App/ElementMap.h +++ b/src/App/ElementMap.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef DATA_ELEMENTMAP_H -#define DATA_ELEMENTMAP_H +#pragma once #include "FCGlobal.h" @@ -423,5 +422,3 @@ public: } // namespace Data - -#endif // DATA_ELEMENTMAP_H diff --git a/src/App/ElementNamingUtils.h b/src/App/ElementNamingUtils.h index c0484c55b6..9728aab195 100644 --- a/src/App/ElementNamingUtils.h +++ b/src/App/ElementNamingUtils.h @@ -1,7 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#ifndef ELEMENT_NAMING_UTILS_H -#define ELEMENT_NAMING_UTILS_H +#pragma once #include #include @@ -122,5 +121,3 @@ AppExport const std::string indexSuffix(int index, const char *label=ELEMENT_MAP } // namespace Data // clang-format on - -#endif // ELEMENT_NAMING_UTILS_H diff --git a/src/App/Enumeration.h b/src/App/Enumeration.h index 80d8e91edf..9423275d59 100644 --- a/src/App/Enumeration.h +++ b/src/App/Enumeration.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_ENUMERATION_H -#define BASE_ENUMERATION_H +#pragma once #include #include @@ -194,5 +193,3 @@ private: friend class PropertyEnumeration; }; // class Enumeration } // namespace App - -#endif // #ifndef BASE_ENUMERATION_H diff --git a/src/App/ExportInfo.h b/src/App/ExportInfo.h index 69eb903b4b..61df177595 100644 --- a/src/App/ExportInfo.h +++ b/src/App/ExportInfo.h @@ -1,7 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#ifndef SRC_APP_EXPORTINFO_H_ -#define SRC_APP_EXPORTINFO_H_ +#pragma once #include "DocumentObject.h" @@ -23,5 +22,3 @@ struct ExportInfo { }; } - -#endif diff --git a/src/App/Expression.h b/src/App/Expression.h index 75faab5875..f0bc2b6dbd 100644 --- a/src/App/Expression.h +++ b/src/App/Expression.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef EXPRESSION_H -#define EXPRESSION_H +#pragma once #include #include @@ -580,6 +579,4 @@ public: // clang-format on }; -} - -#endif // EXPRESSION_H +} \ No newline at end of file diff --git a/src/App/Expression.tab.h b/src/App/Expression.tab.h index 73b5f02ece..13218088e0 100644 --- a/src/App/Expression.tab.h +++ b/src/App/Expression.tab.h @@ -37,8 +37,7 @@ especially those whose name start with YY_ or yy_. They are private implementation details that can be changed or removed. */ -#ifndef YY_YY_EXPRESSION_TAB_H_INCLUDED -# define YY_YY_EXPRESSION_TAB_H_INCLUDED +#pragma once /* Debug traces. */ #ifndef YYDEBUG # define YYDEBUG 0 @@ -91,6 +90,3 @@ extern YYSTYPE yylval; int yyparse (void); - - -#endif /* !YY_YY_EXPRESSION_TAB_H_INCLUDED */ diff --git a/src/App/ExpressionParser.h b/src/App/ExpressionParser.h index 584e16b76d..f0266c2c85 100644 --- a/src/App/ExpressionParser.h +++ b/src/App/ExpressionParser.h @@ -24,8 +24,7 @@ ****************************************************************************/ -#ifndef EXPRESSION_PARSER_H -#define EXPRESSION_PARSER_H +#pragma once #include "Expression.h" #include @@ -689,6 +688,4 @@ public: #undef YYSTYPE_ISDECLARED } // namespace ExpressionParser -} // namespace App - -#endif // EXPRESSION_PARSER_H +} // namespace App \ No newline at end of file diff --git a/src/App/ExpressionTokenizer.h b/src/App/ExpressionTokenizer.h index dfb5cc107a..24fabb0415 100644 --- a/src/App/ExpressionTokenizer.h +++ b/src/App/ExpressionTokenizer.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef EXPRESSIONTOKENIZER_H -#define EXPRESSIONTOKENIZER_H +#pragma once #include #include @@ -53,5 +52,3 @@ private: }; } // namespace App - -#endif // EXPRESSIONTOKENIZER_H diff --git a/src/App/ExpressionVisitors.h b/src/App/ExpressionVisitors.h index 43ffc990f6..8b48bc8ef5 100644 --- a/src/App/ExpressionVisitors.h +++ b/src/App/ExpressionVisitors.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef RENAMEOBJECTIDENTIFIEREXPRESSIONVISITOR_H -#define RENAMEOBJECTIDENTIFIEREXPRESSIONVISITOR_H +#pragma once #include "Expression.h" @@ -146,5 +145,3 @@ private: }; } // namespace App - -#endif // RENAMEOBJECTIDENTIFIEREXPRESSIONVISITOR_H diff --git a/src/App/Extension.h b/src/App/Extension.h index 6cafc87a81..875631892d 100644 --- a/src/App/Extension.h +++ b/src/App/Extension.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SRC_APP_EXTENSION_H_ -#define SRC_APP_EXTENSION_H_ +#pragma once #include #include @@ -367,5 +366,3 @@ private: } // namespace App - -#endif // SRC_APP_EXTENSION_H_ diff --git a/src/App/ExtensionContainer.h b/src/App/ExtensionContainer.h index e3e902552c..580fbdfcfb 100644 --- a/src/App/ExtensionContainer.h +++ b/src/App/ExtensionContainer.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SRC_APP_EXTENSIONCONTAINER_H_ -#define SRC_APP_EXTENSIONCONTAINER_H_ +#pragma once #include #include @@ -352,5 +351,3 @@ private: PROPERTY_SOURCE_ABSTRACT(_class_, _parentclass_) } // namespace App - -#endif // SRC_APP_EXTENSIONCONTAINER_H_ diff --git a/src/App/ExtensionPython.h b/src/App/ExtensionPython.h index 96abf4e45c..19fe81869d 100644 --- a/src/App/ExtensionPython.h +++ b/src/App/ExtensionPython.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_EXTENSIONPYTHON_H -#define APP_EXTENSIONPYTHON_H +#pragma once #include #include "Extension.h" @@ -121,5 +120,3 @@ using ExtensionPython = ExtensionPythonT; }; } // namespace App - -#endif // APP_EXTENSIONPYTHON_H diff --git a/src/App/FeatureCustom.h b/src/App/FeatureCustom.h index dcb3a943b6..098d583988 100644 --- a/src/App/FeatureCustom.h +++ b/src/App/FeatureCustom.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_FEATURECUSTOM_H -#define APP_FEATURECUSTOM_H +#pragma once #include @@ -104,5 +103,3 @@ public: }; } // namespace App - -#endif // APP_FEATURECUSTOM_H diff --git a/src/App/FeaturePython.h b/src/App/FeaturePython.h index 5a0f60b659..c3b07d1e02 100644 --- a/src/App/FeaturePython.h +++ b/src/App/FeaturePython.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_FEATUREPYTHON_H -#define APP_FEATUREPYTHON_H +#pragma once #include #include @@ -460,5 +459,3 @@ using FeaturePython = FeaturePythonT; using GeometryPython = FeaturePythonT; } // namespace App - -#endif // APP_FEATUREPYTHON_H diff --git a/src/App/FeaturePythonPyImp.h b/src/App/FeaturePythonPyImp.h index c6a2bf6678..613f584cb0 100644 --- a/src/App/FeaturePythonPyImp.h +++ b/src/App/FeaturePythonPyImp.h @@ -23,8 +23,7 @@ ***************************************************************************/ // clang-format off -#ifndef APP_FEATUREPYTHONPYIMP_H -#define APP_FEATUREPYTHONPYIMP_H +#pragma once #include #include @@ -118,5 +117,4 @@ private: # pragma GCC diagnostic pop #endif -#endif // APP_FEATUREPYTHONPYIMP_H // clang-format on diff --git a/src/App/FeatureTest.h b/src/App/FeatureTest.h index a1a0e44a23..89b76c3bcc 100644 --- a/src/App/FeatureTest.h +++ b/src/App/FeatureTest.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_FEATURETEST_H -#define APP_FEATURETEST_H +#pragma once #include "DocumentObject.h" #include "PropertyGeo.h" @@ -222,5 +221,3 @@ public: } // namespace App - -#endif // APP_FEATURETEST_H diff --git a/src/App/GeoFeature.h b/src/App/GeoFeature.h index 93a94ecbd8..7f2b6343d6 100644 --- a/src/App/GeoFeature.h +++ b/src/App/GeoFeature.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_GEOFEATURE_H -#define APP_GEOFEATURE_H +#pragma once #include "DocumentObject.h" #include "PropertyGeo.h" @@ -216,6 +215,3 @@ protected: }; } // namespace App - - -#endif // APP_GEOFEATURE_H diff --git a/src/App/GeoFeatureGroupExtension.h b/src/App/GeoFeatureGroupExtension.h index b1278c9b1b..87c84ec689 100644 --- a/src/App/GeoFeatureGroupExtension.h +++ b/src/App/GeoFeatureGroupExtension.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef APP_GeoFeatureGroup_H -#define APP_GeoFeatureGroup_H +#pragma once #include #include "DocumentObject.h" @@ -159,6 +158,3 @@ using GeoFeatureGroupExtensionPython = } // namespace App - - -#endif // APP_GeoFeatureGroup_H diff --git a/src/App/GroupExtension.h b/src/App/GroupExtension.h index c192ff3bd7..7ec44fcbbf 100644 --- a/src/App/GroupExtension.h +++ b/src/App/GroupExtension.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_GROUPEXTENSION_H -#define APP_GROUPEXTENSION_H +#pragma once #include #include @@ -195,6 +194,3 @@ public: using GroupExtensionPython = ExtensionPythonT>; } // namespace App - - -#endif // APP_GROUPEXTENSION_H diff --git a/src/App/ImagePlane.h b/src/App/ImagePlane.h index b9766595a0..558fe8ac20 100644 --- a/src/App/ImagePlane.h +++ b/src/App/ImagePlane.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef App_ImagePlane_H -#define App_ImagePlane_H +#pragma once #include #include @@ -61,6 +60,3 @@ public: }; } // namespace Image - - -#endif // App_ImagePlane_H diff --git a/src/App/IndexedName.h b/src/App/IndexedName.h index b7af45260d..6841d4f40e 100644 --- a/src/App/IndexedName.h +++ b/src/App/IndexedName.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef APP_INDEXEDNAME_H -#define APP_INDEXEDNAME_H +#pragma once #include #include @@ -467,5 +466,3 @@ struct ByteArrayHasher }; } // namespace Data - -#endif // APP_INDEXEDNAME_H diff --git a/src/App/InventorObject.h b/src/App/InventorObject.h index a2ee6410f2..de1493cb64 100644 --- a/src/App/InventorObject.h +++ b/src/App/InventorObject.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_INVENTOROBJECT_H -#define APP_INVENTOROBJECT_H +#pragma once #include "GeoFeature.h" #include "PropertyStandard.h" @@ -59,6 +58,3 @@ public: }; } // namespace App - - -#endif // APP_INVENTOROBJECT_H diff --git a/src/App/License.h b/src/App/License.h index 4fb628eee5..936821c372 100644 --- a/src/App/License.h +++ b/src/App/License.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef APP_LICENSE_H -#define APP_LICENSE_H +#pragma once #include #include @@ -80,5 +79,3 @@ int constexpr findLicense(const char* identifier) return -1; } } // namespace App - -#endif // APP_LICENSE_H diff --git a/src/App/Link.h b/src/App/Link.h index 1d4643df75..4d0be41911 100644 --- a/src/App/Link.h +++ b/src/App/Link.h @@ -22,8 +22,7 @@ * * ****************************************************************************/ -#ifndef APP_LINK_H -#define APP_LINK_H +#pragma once #include #include @@ -1214,5 +1213,3 @@ public: #if defined(__clang__) #pragma clang diagnostic pop #endif - -#endif // APP_LINK_H diff --git a/src/App/MappedElement.h b/src/App/MappedElement.h index 72d8943c61..02dcc8d91a 100644 --- a/src/App/MappedElement.h +++ b/src/App/MappedElement.h @@ -20,8 +20,7 @@ * * **************************************************************************************************/ -#ifndef APP_MAPPED_ELEMENT_H -#define APP_MAPPED_ELEMENT_H +#pragma once #include "IndexedName.h" #include "MappedName.h" @@ -149,6 +148,3 @@ struct AppExport ElementNameComparator }; } // namespace Data - - -#endif // APP_MAPPED_ELEMENT_H diff --git a/src/App/MappedName.h b/src/App/MappedName.h index b68c5f854a..01a1853fc4 100644 --- a/src/App/MappedName.h +++ b/src/App/MappedName.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef APP_MAPPED_NAME_H -#define APP_MAPPED_NAME_H +#pragma once #include #include @@ -1246,6 +1245,3 @@ struct MappedNameRef } // namespace Data - - -#endif // APP_MAPPED_NAME_H diff --git a/src/App/Material.h b/src/App/Material.h index db9fa09a57..813244b300 100644 --- a/src/App/Material.h +++ b/src/App/Material.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_MATERIAL_H -#define APP_MATERIAL_H +#pragma once #include @@ -169,5 +168,3 @@ private: }; } // namespace App - -#endif // APP_MATERIAL_H diff --git a/src/App/MaterialObject.h b/src/App/MaterialObject.h index 96de307152..175e380353 100644 --- a/src/App/MaterialObject.h +++ b/src/App/MaterialObject.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_MaterialObject_H -#define APP_MaterialObject_H +#pragma once #include "DocumentObject.h" #include "FeaturePython.h" @@ -54,7 +53,4 @@ public: using MaterialObjectPython = App::FeaturePythonT; -} // namespace App - - -#endif // APP_MaterialObject_H +} // namespace App \ No newline at end of file diff --git a/src/App/MeasureManager.h b/src/App/MeasureManager.h index 0dd93976d0..1f6494524f 100644 --- a/src/App/MeasureManager.h +++ b/src/App/MeasureManager.h @@ -22,8 +22,7 @@ * * **************************************************************************/ -#ifndef MEASUREMANAGER_H -#define MEASUREMANAGER_H +#pragma once #include @@ -128,6 +127,4 @@ private: }; -} // namespace App - -#endif // MEASUREMANAGER_H +} // namespace App \ No newline at end of file diff --git a/src/App/MergeDocuments.h b/src/App/MergeDocuments.h index 085300eff3..36657da3fd 100644 --- a/src/App/MergeDocuments.h +++ b/src/App/MergeDocuments.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_MERGEDOCUMENTS_H -#define APP_MERGEDOCUMENTS_H +#pragma once #include #include @@ -78,5 +77,3 @@ private: }; } // namespace App - -#endif // APP_MERGEDOCUMENTS_H diff --git a/src/App/Metadata.h b/src/App/Metadata.h index 1317a5d182..939cac1d26 100644 --- a/src/App/Metadata.h +++ b/src/App/Metadata.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef BASE_METADATAREADER_H -#define BASE_METADATAREADER_H +#pragma once #include "FCConfig.h" @@ -402,5 +401,3 @@ private: }; } // namespace App - -#endif diff --git a/src/App/ObjectIdentifier.h b/src/App/ObjectIdentifier.h index e2b49be7f1..7cd9ae6dd8 100644 --- a/src/App/ObjectIdentifier.h +++ b/src/App/ObjectIdentifier.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_PATH_H -#define APP_PATH_H +#pragma once #include #include @@ -1643,5 +1642,3 @@ struct hash } }; } // namespace std - -#endif diff --git a/src/App/Origin.h b/src/App/Origin.h index b751a58ca4..4df140b961 100644 --- a/src/App/Origin.h +++ b/src/App/Origin.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef APP_Origin_H -#define APP_Origin_H +#pragma once #include "Datums.h" @@ -56,6 +55,4 @@ public: } }; -} // namespace App - -#endif // APP_Origin_H +} // namespace App \ No newline at end of file diff --git a/src/App/OriginGroupExtension.h b/src/App/OriginGroupExtension.h index 8820112846..4cb58b9693 100644 --- a/src/App/OriginGroupExtension.h +++ b/src/App/OriginGroupExtension.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef ORIGINGROUP_H_QHTU73IF -#define ORIGINGROUP_H_QHTU73IF +#pragma once #include "GeoFeatureGroupExtension.h" #include "QCoreApplication" @@ -96,6 +95,4 @@ private: using OriginGroupExtensionPython = ExtensionPythonT>; -} // namespace App - -#endif /* end of include guard: ORIGINGROUP_H_QHTU73IF */ +} // namespace App \ No newline at end of file diff --git a/src/App/Part.h b/src/App/Part.h index 0374f4b902..4760657133 100644 --- a/src/App/Part.h +++ b/src/App/Part.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_Part_H -#define APP_Part_H +#pragma once #include "GeoFeature.h" #include "OriginGroupExtension.h" @@ -106,6 +105,3 @@ public: // using PartPython = App::FeaturePythonT; } // namespace App - - -#endif // APP_Part_H diff --git a/src/App/Path.h b/src/App/Path.h index 5eb6eb2c51..f06b8ac088 100644 --- a/src/App/Path.h +++ b/src/App/Path.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_Path_H -#define APP_Path_H +#pragma once #include #include @@ -54,6 +53,3 @@ public: }; } // namespace App - - -#endif // APP_Path_H diff --git a/src/App/Placement.h b/src/App/Placement.h index e32c26b4cf..d56c46cbf0 100644 --- a/src/App/Placement.h +++ b/src/App/Placement.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef _AppPlacement_h_ -#define _AppPlacement_h_ +#pragma once #include "FeaturePython.h" @@ -53,6 +52,3 @@ using PlacementPython = App::FeaturePythonT; } // namespace App - - -#endif diff --git a/src/App/PreCompiled.h b/src/App/PreCompiled.h index 973723687d..01dcc01fa7 100644 --- a/src/App/PreCompiled.h +++ b/src/App/PreCompiled.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef APP_PRECOMPILED_H -#define APP_PRECOMPILED_H +#pragma once #include @@ -92,5 +91,3 @@ #include #include #include - -#endif // APP_PRECOMPILED_H diff --git a/src/App/ProgramOptionsUtilities.h b/src/App/ProgramOptionsUtilities.h index 3235fd57ea..6fd97f6b16 100644 --- a/src/App/ProgramOptionsUtilities.h +++ b/src/App/ProgramOptionsUtilities.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef PROGRAMOPTIONSUTILITIES_H -#define PROGRAMOPTIONSUTILITIES_H +#pragma once #include @@ -91,4 +90,3 @@ std::pair customSyntax(std::string_view strIn) } } // namespace App::Util -#endif // PROGRAMOPTIONSUTILITIES_H diff --git a/src/App/ProjectFile.h b/src/App/ProjectFile.h index a9c160f721..abad3cf7ba 100644 --- a/src/App/ProjectFile.h +++ b/src/App/ProjectFile.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef APP_PROJECTFILE_H -#define APP_PROJECTFILE_H +#pragma once #include #include @@ -206,5 +205,3 @@ private: } // namespace App - -#endif // APP_PROJECTFILE_H diff --git a/src/App/Property.h b/src/App/Property.h index f2f6487d27..deae8c02d6 100644 --- a/src/App/Property.h +++ b/src/App/Property.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_PROPERTY_H -#define APP_PROPERTY_H +#pragma once #include #include @@ -1134,5 +1133,3 @@ protected: }; } // namespace App - -#endif // APP_PROPERTY_H diff --git a/src/App/PropertyContainer.h b/src/App/PropertyContainer.h index 86f1b560ed..72bbeeca0b 100644 --- a/src/App/PropertyContainer.h +++ b/src/App/PropertyContainer.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SRC_APP_PROPERTYCONTAINER_H_ -#define SRC_APP_PROPERTYCONTAINER_H_ +#pragma once #include #include @@ -851,5 +850,3 @@ template<> void _class_::init(void){\ // clang-format on } // namespace App - -#endif // SRC_APP_PROPERTYCONTAINER_H_ diff --git a/src/App/PropertyExpressionEngine.h b/src/App/PropertyExpressionEngine.h index 2cfbddec2c..f827fa565c 100644 --- a/src/App/PropertyExpressionEngine.h +++ b/src/App/PropertyExpressionEngine.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef EXPRESSIONENGINE_H -#define EXPRESSIONENGINE_H +#pragma once #include #include @@ -375,5 +374,3 @@ private: }; } // namespace App - -#endif // EXPRESSIONENGINE_H diff --git a/src/App/PropertyFile.h b/src/App/PropertyFile.h index e50f2ce3cb..fbb5ba3887 100644 --- a/src/App/PropertyFile.h +++ b/src/App/PropertyFile.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_PROPERTFILE_H -#define APP_PROPERTFILE_H +#pragma once #include @@ -149,5 +148,3 @@ private: } // namespace App - -#endif // APP_PROPERTFILE_H diff --git a/src/App/PropertyGeo.h b/src/App/PropertyGeo.h index 24bf917c42..44411ebe42 100644 --- a/src/App/PropertyGeo.h +++ b/src/App/PropertyGeo.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_PROPERTYGEO_H -#define APP_PROPERTYGEO_H +#pragma once #include #include @@ -579,6 +578,3 @@ public: }; } // namespace App - - -#endif // APP_PROPERTYGEO_H diff --git a/src/App/PropertyLinks.h b/src/App/PropertyLinks.h index 9ca0ea549d..9f94cbf27d 100644 --- a/src/App/PropertyLinks.h +++ b/src/App/PropertyLinks.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_PROPERTYLINKS_H -#define APP_PROPERTYLINKS_H +#pragma once #include #include @@ -1657,6 +1656,3 @@ private: }; } // namespace App - - -#endif // APP_PROPERTYLINKS_H diff --git a/src/App/PropertyOverrides.h b/src/App/PropertyOverrides.h index c1f985e2ad..336426df98 100644 --- a/src/App/PropertyOverrides.h +++ b/src/App/PropertyOverrides.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef FREECAD_PROPERTYOVERRIDES_H -#define FREECAD_PROPERTYOVERRIDES_H +#pragma once #include #include @@ -292,4 +291,3 @@ private: std::vector> _guards; }; } // namespace App -#endif // FREECAD_PROPERTYOVERRIDES_H diff --git a/src/App/PropertyPythonObject.h b/src/App/PropertyPythonObject.h index 8c9c35856c..c01dd10bac 100644 --- a/src/App/PropertyPythonObject.h +++ b/src/App/PropertyPythonObject.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_PROPERTYPYTHONOBJECT_H -#define APP_PROPERTYPYTHONOBJECT_H +#pragma once #include #include @@ -83,6 +82,4 @@ private: }; -} // namespace App - -#endif // APP_PROPERTYPYTHONOBJECT_H +} // namespace App \ No newline at end of file diff --git a/src/App/PropertyStandard.h b/src/App/PropertyStandard.h index 3eff182e84..f5c4f3e99f 100644 --- a/src/App/PropertyStandard.h +++ b/src/App/PropertyStandard.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_PROPERTYSTANDARD_H -#define APP_PROPERTYSTANDARD_H +#pragma once #include #include @@ -1343,5 +1342,3 @@ protected: }; } // namespace App - -#endif // APP_PROPERTYSTANDARD_H diff --git a/src/App/PropertyUnits.h b/src/App/PropertyUnits.h index ad62e72f1d..6a5decfe08 100644 --- a/src/App/PropertyUnits.h +++ b/src/App/PropertyUnits.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef APP_PROPERTYUNITS_H -#define APP_PROPERTYUNITS_H +#pragma once #include #include @@ -925,6 +924,3 @@ public: }; } // namespace App - -#endif // APP_PROPERTYUNITS_H - diff --git a/src/App/Range.h b/src/App/Range.h index 99a36d8aee..e839f7cd0d 100644 --- a/src/App/Range.h +++ b/src/App/Range.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef RANGE_H -#define RANGE_H +#pragma once #include #include @@ -265,6 +264,4 @@ private: } // namespace App -ENABLE_BITMASK_OPERATORS(App::CellAddress::Cell) - -#endif // RANGE_H +ENABLE_BITMASK_OPERATORS(App::CellAddress::Cell) \ No newline at end of file diff --git a/src/App/Services.h b/src/App/Services.h index a3bd0a961e..0ef3e71d73 100644 --- a/src/App/Services.h +++ b/src/App/Services.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef APP_SERVICES_H -#define APP_SERVICES_H +#pragma once #include "DocumentObject.h" @@ -71,7 +70,4 @@ public: bool supports(DocumentObject* object) const override; }; -} - - -#endif // APP_SERVICES_H +} \ No newline at end of file diff --git a/src/App/StringHasher.h b/src/App/StringHasher.h index bc4491d02b..1681d9ff65 100644 --- a/src/App/StringHasher.h +++ b/src/App/StringHasher.h @@ -20,8 +20,7 @@ * * **************************************************************************************************/ -#ifndef APP_STRING_ID_H -#define APP_STRING_ID_H +#pragma once #include @@ -829,6 +828,4 @@ inline void StringID::setPersistent(bool enable) { _flags.setFlag(Flag::Persistent, enable); } -} // namespace App - -#endif // APP_STRING_ID_H +} // namespace App \ No newline at end of file diff --git a/src/App/SuppressibleExtension.h b/src/App/SuppressibleExtension.h index 3dc40178d7..0d20b039be 100644 --- a/src/App/SuppressibleExtension.h +++ b/src/App/SuppressibleExtension.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SUPPRESSIBLEEXTENSION_H -#define SUPPRESSIBLEEXTENSION_H +#pragma once #include #include @@ -62,5 +61,3 @@ using SuppressibleExtensionPython = ExtensionPythonT>; } // namespace App - -#endif // SUPPRESSIBLEEXTENSION_H diff --git a/src/App/TextDocument.h b/src/App/TextDocument.h index 2e90c7d19f..f209b80f4e 100644 --- a/src/App/TextDocument.h +++ b/src/App/TextDocument.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_TEXTDOCUMENT_H -#define APP_TEXTDOCUMENT_H +#pragma once #include "DocumentObject.h" #include "PropertyStandard.h" @@ -58,6 +57,3 @@ private: }; } // namespace App - - -#endif diff --git a/src/App/TransactionalObject.h b/src/App/TransactionalObject.h index e87475ca70..21544c56d2 100644 --- a/src/App/TransactionalObject.h +++ b/src/App/TransactionalObject.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_TRANSACTIONALOBJECT_H -#define APP_TRANSACTIONALOBJECT_H +#pragma once #include @@ -72,6 +71,3 @@ protected: }; } // namespace App - - -#endif // APP_TRANSACTIONALOBJECT_H diff --git a/src/App/Transactions.h b/src/App/Transactions.h index 4a47895ea2..738fb6b025 100644 --- a/src/App/Transactions.h +++ b/src/App/Transactions.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef APP_TRANSACTION_H -#define APP_TRANSACTION_H +#pragma once #include #include @@ -346,5 +345,3 @@ public: }; } // namespace App - -#endif // APP_TRANSACTION_H diff --git a/src/App/VRMLObject.h b/src/App/VRMLObject.h index 4d8b6ab689..22a4151456 100644 --- a/src/App/VRMLObject.h +++ b/src/App/VRMLObject.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_VRMLOROBJECT_H -#define APP_VRMLOROBJECT_H +#pragma once #include "GeoFeature.h" #include "PropertyFile.h" @@ -81,6 +80,3 @@ private: }; } // namespace App - - -#endif // APP_INVENTOROBJECT_H diff --git a/src/App/VarSet.h b/src/App/VarSet.h index e2d500abbf..1d1eecfae0 100644 --- a/src/App/VarSet.h +++ b/src/App/VarSet.h @@ -22,8 +22,7 @@ * * ****************************************************************************/ -#ifndef APP_VARSET_H -#define APP_VARSET_H +#pragma once #include "DocumentObject.h" @@ -44,4 +43,3 @@ public: }; } // namespace App -#endif diff --git a/src/App/private/DocumentP.h b/src/App/private/DocumentP.h index fa7afd4005..66fe180a0d 100644 --- a/src/App/private/DocumentP.h +++ b/src/App/private/DocumentP.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SRC_APP_PRIVATE_DOCUMENTP_H_ -#define SRC_APP_PRIVATE_DOCUMENTP_H_ +#pragma once #ifdef _MSC_VER #pragma warning(disable : 4834) @@ -172,5 +171,3 @@ struct DocumentP }; } // namespace App - -#endif // SRC_APP_PRIVATE_DOCUMENTP_H_ diff --git a/src/Base/Axis.h b/src/Base/Axis.h index c7ee5c1356..2940819a36 100644 --- a/src/Base/Axis.h +++ b/src/Base/Axis.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_AXIS_H -#define BASE_AXIS_H +#pragma once #include @@ -85,5 +84,3 @@ private: }; } // namespace Base - -#endif // BASE_AXIS_H diff --git a/src/Base/Base64.h b/src/Base/Base64.h index 6153fe5064..1be4cc7efa 100644 --- a/src/Base/Base64.h +++ b/src/Base/Base64.h @@ -30,8 +30,7 @@ NOTICE: The source code here has been altered from the original to use a provide rather than returning a new string for each call. These modifications are Copyright (c) 2019 Zheng Lei (realthunder.dev@gmail.com) */ -#ifndef BASE_BASE64_H -#define BASE_BASE64_H +#pragma once #include #include @@ -161,5 +160,3 @@ inline std::string base64_decode(std::string const& str) // NOLINTEND(cppcoreguidelines-pro-bounds-pointer-arithmetic, // cppcoreguidelines-pro-bounds-constant-array-index, cppcoreguidelines-avoid-magic-numbers, // readability-magic-numbers) - -#endif diff --git a/src/Base/Base64Filter.h b/src/Base/Base64Filter.h index 306630ce68..690a40ea31 100644 --- a/src/Base/Base64Filter.h +++ b/src/Base/Base64Filter.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef FREECAD_BASE_BASE64FILTER_H -#define FREECAD_BASE_BASE64FILTER_H +#pragma once #include "Base64.h" @@ -346,5 +345,3 @@ inline std::unique_ptr create_base64_decoder( // NOLINTEND(cppcoreguidelines-pro-bounds-pointer-arithmetic, // cppcoreguidelines-pro-bounds-constant-array-index, cppcoreguidelines-avoid-magic-numbers, // readability-magic-numbers) - -#endif // FREECAD_BASE_BASE64FILTER_H diff --git a/src/Base/BaseClass.h b/src/Base/BaseClass.h index 3ba1d92a0e..6f04c9c2f9 100644 --- a/src/Base/BaseClass.h +++ b/src/Base/BaseClass.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_BASECLASS_H -#define BASE_BASECLASS_H +#pragma once #include "Type.h" @@ -240,5 +239,3 @@ const U* freecad_cast(const Base::BaseClass* type) // of the important freecad_cast. In that case the name is prefixed with freecad so there is no // chance of symbols collision. using Base::freecad_cast; - -#endif // BASE_BASECLASS_H diff --git a/src/Base/BindingManager.h b/src/Base/BindingManager.h index 816537cdee..29ad247ebf 100644 --- a/src/Base/BindingManager.h +++ b/src/Base/BindingManager.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_BINDINGMANAGER_H -#define BASE_BINDINGMANAGER_H +#pragma once #include #include @@ -60,5 +59,3 @@ private: }; } // namespace Base - -#endif // BASE_BINDINGMANAGER_H diff --git a/src/Base/Bitmask.h b/src/Base/Bitmask.h index 850cb95877..60286a5b21 100644 --- a/src/Base/Bitmask.h +++ b/src/Base/Bitmask.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_BITMASK_H -#define BASE_BITMASK_H +#pragma once #include @@ -177,5 +176,3 @@ public: } // clang-format on // NOLINTEND - -#endif diff --git a/src/Base/BoundBox.h b/src/Base/BoundBox.h index 1da2c8ebfb..fb2ff963bf 100644 --- a/src/Base/BoundBox.h +++ b/src/Base/BoundBox.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_BOUNDBOX_H -#define BASE_BOUNDBOX_H +#pragma once #include #include @@ -1173,5 +1172,3 @@ using BoundBox3f = BoundBox3; using BoundBox3d = BoundBox3; } // namespace Base - -#endif // BASE_BOUNDBOX_H diff --git a/src/Base/Builder3D.h b/src/Base/Builder3D.h index 0323bac366..5729bbc13d 100644 --- a/src/Base/Builder3D.h +++ b/src/Base/Builder3D.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_BUILDER3D_H -#define BASE_BUILDER3D_H +#pragma once // Std. configurations @@ -865,5 +864,3 @@ BaseExport Base::Vector3f stringToVector(std::string); BaseExport std::string vectorToString(Vector3f); } // namespace Base - -#endif // BASE_BUILDER3D_H diff --git a/src/Base/Color.h b/src/Base/Color.h index 7913260ce3..abebb46d87 100644 --- a/src/Base/Color.h +++ b/src/Base/Color.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_COLOR_H -#define APP_COLOR_H +#pragma once #ifdef __GNUC__ # include @@ -322,5 +321,3 @@ private: } // namespace Base // NOLINTEND(readability-magic-numbers) - -#endif // APP_COLOR_H diff --git a/src/Base/Console.h b/src/Base/Console.h index cb6df0b161..a19a27f869 100644 --- a/src/Base/Console.h +++ b/src/Base/Console.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef BASE_CONSOLE_H -#define BASE_CONSOLE_H +#pragma once // Std. configurations #include @@ -1231,5 +1230,3 @@ void Base::ConsoleSingleton::notify(const std::string& notifiername, const std:: #if defined(__clang__) # pragma clang diagnostic pop #endif - -#endif // BASE_CONSOLE_H diff --git a/src/Base/ConsoleObserver.h b/src/Base/ConsoleObserver.h index 84d2b4df8e..037f112508 100644 --- a/src/Base/ConsoleObserver.h +++ b/src/Base/ConsoleObserver.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef BASE_CONSOLEOBSERVER_H -#define BASE_CONSOLEOBSERVER_H +#pragma once #include #include @@ -192,5 +191,3 @@ private: } // namespace Base - -#endif // BASE_CONSOLEOBSERVER_H diff --git a/src/Base/Converter.h b/src/Base/Converter.h index 0e5e798f20..d3cb51e3ac 100644 --- a/src/Base/Converter.h +++ b/src/Base/Converter.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_CONVERTER_H -#define BASE_CONVERTER_H +#pragma once #include #include "Rotation.h" @@ -133,5 +132,3 @@ inline Vec1 convertTo(const Vec2& vec) } } // namespace Base - -#endif // BASE_CONVERTER_H diff --git a/src/Base/CoordinateSystem.h b/src/Base/CoordinateSystem.h index 132eda55fa..76cb84f81d 100644 --- a/src/Base/CoordinateSystem.h +++ b/src/Base/CoordinateSystem.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_COORDINATESYSTEM_H -#define BASE_COORDINATESYSTEM_H +#pragma once #include "Axis.h" @@ -122,5 +121,3 @@ private: }; } // namespace Base - -#endif // BASE_COORDINATESYSTEM_H diff --git a/src/Base/Debugger.h b/src/Base/Debugger.h index 8353c99de2..ffa1d289ec 100644 --- a/src/Base/Debugger.h +++ b/src/Base/Debugger.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_DEBUGGER_H -#define BASE_DEBUGGER_H +#pragma once #include #include @@ -83,5 +82,3 @@ private: }; } // namespace Base - -#endif // BASE_DEBUGGER_H diff --git a/src/Base/DualNumber.h b/src/Base/DualNumber.h index 521a2d4788..cfa8214461 100644 --- a/src/Base/DualNumber.h +++ b/src/Base/DualNumber.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef FREECAD_BASE_DUAL_NUMBER_H -#define FREECAD_BASE_DUAL_NUMBER_H +#pragma once #include @@ -111,6 +110,3 @@ inline DualNumber pow(DualNumber a, double pw) } } // namespace Base // NOLINTEND(readability-identifier-length) - - -#endif diff --git a/src/Base/DualQuaternion.h b/src/Base/DualQuaternion.h index ab8cc929a1..90b3fbc953 100644 --- a/src/Base/DualQuaternion.h +++ b/src/Base/DualQuaternion.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef FREECAD_BASE_DUAL_QUATERNION_H -#define FREECAD_BASE_DUAL_QUATERNION_H +#pragma once #include "DualNumber.h" #include @@ -149,5 +148,3 @@ BaseExport DualQuat operator*(DualNumber a, DualQuat b); } // namespace Base // NOLINTEND(readability-identifier-length) - -#endif diff --git a/src/Base/Exception.h b/src/Base/Exception.h index d7e48d329b..69c07efe6c 100644 --- a/src/Base/Exception.h +++ b/src/Base/Exception.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef BASE_EXCEPTION_H -#define BASE_EXCEPTION_H +#pragma once #include @@ -567,5 +566,3 @@ private: #endif } // namespace Base - -#endif // BASE_EXCEPTION_H diff --git a/src/Base/ExceptionFactory.h b/src/Base/ExceptionFactory.h index b0ba8d8d14..77dda7e181 100644 --- a/src/Base/ExceptionFactory.h +++ b/src/Base/ExceptionFactory.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_EXCEPTIONFACTORY_H -#define BASE_EXCEPTIONFACTORY_H +#pragma once #include "Factory.h" @@ -113,6 +112,3 @@ private: }; } // namespace Base - - -#endif diff --git a/src/Base/Factory.h b/src/Base/Factory.h index 7f96ad8a78..cc7c813f85 100644 --- a/src/Base/Factory.h +++ b/src/Base/Factory.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef BASE_FACTORY_H -#define BASE_FACTORY_H +#pragma once #include #include @@ -139,6 +138,3 @@ private: }; } // namespace Base - - -#endif diff --git a/src/Base/FileInfo.h b/src/Base/FileInfo.h index e9796aef21..ef85b85125 100644 --- a/src/Base/FileInfo.h +++ b/src/Base/FileInfo.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef BASE_FILEINFO_H -#define BASE_FILEINFO_H +#pragma once #include #include @@ -178,6 +177,3 @@ private: }; } // namespace Base - - -#endif // BASE_FILEINFO_H diff --git a/src/Base/FutureWatcherProgress.h b/src/Base/FutureWatcherProgress.h index 34e82cf833..d99bf74c71 100644 --- a/src/Base/FutureWatcherProgress.h +++ b/src/Base/FutureWatcherProgress.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_FUTUREWATCHER_H -#define BASE_FUTUREWATCHER_H +#pragma once #include #include @@ -54,5 +53,3 @@ private: unsigned int steps, current {0}; }; } // namespace Base - -#endif // BASE_FUTUREWATCHER_H diff --git a/src/Base/GeometryPyCXX.h b/src/Base/GeometryPyCXX.h index 5b8165d442..10a15968fe 100644 --- a/src/Base/GeometryPyCXX.h +++ b/src/Base/GeometryPyCXX.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PY_GEOMETRYPY_H -#define PY_GEOMETRYPY_H +#pragma once #include #include @@ -290,5 +289,3 @@ using Rotation = GeometryT; } // namespace Py - -#endif // PY_GEOMETRYPY_H diff --git a/src/Base/Handle.h b/src/Base/Handle.h index 107e735aa5..39998915a6 100644 --- a/src/Base/Handle.h +++ b/src/Base/Handle.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef BASE_HANDLE_H -#define BASE_HANDLE_H +#pragma once #ifndef FC_GLOBAL_H # include @@ -190,5 +189,3 @@ private: }; } // namespace Base - -#endif // BASE_HANDLE_H diff --git a/src/Base/InputSource.h b/src/Base/InputSource.h index c7afa8d897..6d700c15a3 100644 --- a/src/Base/InputSource.h +++ b/src/Base/InputSource.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef BASE_IINPUTSOURCE_H -#define BASE_IINPUTSOURCE_H +#pragma once #include #include @@ -108,5 +107,3 @@ private: }; } // namespace Base - -#endif // BASE_IINPUTSOURCE_H diff --git a/src/Base/Interpreter.h b/src/Base/Interpreter.h index 555f60f9c4..1494689e75 100644 --- a/src/Base/Interpreter.h +++ b/src/Base/Interpreter.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef BASE_INTERPRETER_H -#define BASE_INTERPRETER_H +#pragma once #if defined(_POSIX_C_SOURCE) # undef _POSIX_C_SOURCE @@ -387,5 +386,3 @@ inline InterpreterSingleton& Interpreter() } } // namespace Base - -#endif // BASE_INTERPRETER_H diff --git a/src/Base/Matrix.h b/src/Base/Matrix.h index 6a95d2a64e..c1694f7e38 100644 --- a/src/Base/Matrix.h +++ b/src/Base/Matrix.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_MATRIX_H -#define BASE_MATRIX_H +#pragma once #include #include @@ -445,6 +444,3 @@ inline void Matrix4D::setDiagonal(const Vector3d& vec) } } // namespace Base - - -#endif // BASE_MATRIX_H diff --git a/src/Base/Observer.h b/src/Base/Observer.h index b378853510..0fa95c4e68 100644 --- a/src/Base/Observer.h +++ b/src/Base/Observer.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef BASE_OBSERVER_H -#define BASE_OBSERVER_H +#pragma once #include #include @@ -261,6 +260,3 @@ extern template class Base_EXPORT Subject; #endif } // namespace Base - - -#endif // BASE_OBSERVER_H diff --git a/src/Base/Parameter.h b/src/Base/Parameter.h index 0070c8552f..294e452caf 100644 --- a/src/Base/Parameter.h +++ b/src/Base/Parameter.h @@ -31,8 +31,7 @@ * 3rd party Xerces-C++ XML parser is used to parse and write the XML. */ -#ifndef BASE_PARAMETER_H -#define BASE_PARAMETER_H +#pragma once // Python stuff using PyObject = struct _object; @@ -629,6 +628,3 @@ public: /** python wrapper function */ BaseExport PyObject* GetPyObject(const Base::Reference& hcParamGrp); - - -#endif // BASE_PARAMETER_H diff --git a/src/Base/Persistence.h b/src/Base/Persistence.h index a3cc915009..06276a151e 100644 --- a/src/Base/Persistence.h +++ b/src/Base/Persistence.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef APP_PERSISTENCE_H -#define APP_PERSISTENCE_H +#pragma once #include "BaseClass.h" @@ -169,6 +168,3 @@ private: }; } // namespace Base - - -#endif // APP_PERSISTENCE_H diff --git a/src/Base/Placement.h b/src/Base/Placement.h index e805bbb46f..e670fac53b 100644 --- a/src/Base/Placement.h +++ b/src/Base/Placement.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef BASE_PLACEMENT_H -#define BASE_PLACEMENT_H +#pragma once #include @@ -120,6 +119,3 @@ private: }; } // namespace Base - - -#endif // BASE_PLACEMENT_H diff --git a/src/Base/PreCompiled.h b/src/Base/PreCompiled.h index 5dad791b45..8031f0f653 100644 --- a/src/Base/PreCompiled.h +++ b/src/Base/PreCompiled.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_PRECOMPILED_H -#define BASE_PRECOMPILED_H +#pragma once #include @@ -135,5 +134,3 @@ #include #include #include - -#endif // BASE_PRECOMPILED_H diff --git a/src/Base/Precision.h b/src/Base/Precision.h index 9ba8f96d3c..780d4fb556 100644 --- a/src/Base/Precision.h +++ b/src/Base/Precision.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_PRECISION_H -#define BASE_PRECISION_H +#pragma once #include @@ -228,5 +227,3 @@ public: }; } // namespace Base - -#endif // BASE_PRECISION_H diff --git a/src/Base/ProgramVersion.h b/src/Base/ProgramVersion.h index 4f23f52588..f18ec2e62c 100644 --- a/src/Base/ProgramVersion.h +++ b/src/Base/ProgramVersion.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef BASE_PROGRAM_VERSION_H -#define BASE_PROGRAM_VERSION_H +#pragma once #include #include @@ -80,5 +79,3 @@ inline Version getVersion(std::string_view str) } } // namespace Base - -#endif // BASE_PROGRAM_VERSION_H diff --git a/src/Base/ProgressIndicator.h b/src/Base/ProgressIndicator.h index 3d700a4d3a..2259817612 100644 --- a/src/Base/ProgressIndicator.h +++ b/src/Base/ProgressIndicator.h @@ -20,8 +20,7 @@ * * **************************************************************************/ -#ifndef BASE_PROGRESSINDICATOR_H -#define BASE_PROGRESSINDICATOR_H +#pragma once #include "FCGlobal.h" @@ -92,5 +91,3 @@ public: }; } // namespace Base - -#endif diff --git a/src/Base/ProgressIndicatorPy.h b/src/Base/ProgressIndicatorPy.h index 198c37e855..e61205c6d9 100644 --- a/src/Base/ProgressIndicatorPy.h +++ b/src/Base/ProgressIndicatorPy.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_PROGRESSINDICATORPY_H -#define BASE_PROGRESSINDICATORPY_H +#pragma once #include #include @@ -58,5 +57,3 @@ private: }; } // namespace Base - -#endif // BASE_PROGRESSINDICATORPY_H diff --git a/src/Base/PyExport.h b/src/Base/PyExport.h index f7bdc21f82..39f319420b 100644 --- a/src/Base/PyExport.h +++ b/src/Base/PyExport.h @@ -30,8 +30,7 @@ * \date 5.2001 */ -#ifndef BASE_PYEXPORT_H -#define BASE_PYEXPORT_H +#pragma once // (re-)defined in pyconfig.h #if defined(_POSIX_C_SOURCE) @@ -257,5 +256,3 @@ private: } // namespace Base - -#endif // BASE_PYEXPORT_H diff --git a/src/Base/PyObjectBase.h b/src/Base/PyObjectBase.h index 1fe64f3bf5..9c007d3bd8 100644 --- a/src/Base/PyObjectBase.h +++ b/src/Base/PyObjectBase.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef BASE_PYOBJECTBASE_H -#define BASE_PYOBJECTBASE_H +#pragma once // clang-format off // NOLINTBEGIN(cppcoreguidelines-macro-usage) @@ -572,5 +571,3 @@ void PyRegisterEnum(PyObject* module, const char* name, const std::map #include @@ -69,5 +68,3 @@ bool Wrapped_ParseTupleAndKeywords( } } // namespace Base - -#endif // FREECAD_PYWRAPPARSETUPLEANDKEYWORDS_H diff --git a/src/Base/PythonTypeExt.h b/src/Base/PythonTypeExt.h index f1f69d5aaa..38e6c8f4b1 100644 --- a/src/Base/PythonTypeExt.h +++ b/src/Base/PythonTypeExt.h @@ -22,8 +22,7 @@ * * **************************************************************************/ -#ifndef BASE_PYTHONTYPEEXT_H -#define BASE_PYTHONTYPEEXT_H +#pragma once #include @@ -55,5 +54,3 @@ private: }; } // namespace Base - -#endif // BASE_PYTHONTYPEEXT_H diff --git a/src/Base/Quantity.h b/src/Base/Quantity.h index 6f21392006..22cf722f08 100644 --- a/src/Base/Quantity.h +++ b/src/Base/Quantity.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_Quantity_H -#define BASE_Quantity_H +#pragma once #include "Unit.h" #include @@ -350,5 +349,3 @@ private: }; } // namespace Base - -#endif // BASE_Quantity_H diff --git a/src/Base/Reader.h b/src/Base/Reader.h index 2e7717ed7e..a5636c84d3 100644 --- a/src/Base/Reader.h +++ b/src/Base/Reader.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SRC_BASE_READER_H_ -#define SRC_BASE_READER_H_ +#pragma once #include #include @@ -418,6 +417,3 @@ private: }; } // namespace Base - - -#endif // SRC_BASE_READER_H_ diff --git a/src/Base/Rotation.h b/src/Base/Rotation.h index d1659cf80d..0934956a55 100644 --- a/src/Base/Rotation.h +++ b/src/Base/Rotation.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_ROTATION_H -#define BASE_ROTATION_H +#pragma once #include "Vector3D.h" #ifndef FC_GLOBAL_H @@ -199,5 +198,3 @@ private: }; } // namespace Base - -#endif // BASE_ROTATION_H diff --git a/src/Base/Sequencer.h b/src/Base/Sequencer.h index 02796de6c3..b5f4dc87f2 100644 --- a/src/Base/Sequencer.h +++ b/src/Base/Sequencer.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_SEQUENCER_H -#define BASE_SEQUENCER_H +#pragma once #include @@ -392,5 +391,3 @@ inline SequencerBase& Sequencer() } } // namespace Base - -#endif // BASE_SEQUENCER_H diff --git a/src/Base/ServiceProvider.h b/src/Base/ServiceProvider.h index d3caf040f8..c60aac869e 100644 --- a/src/Base/ServiceProvider.h +++ b/src/Base/ServiceProvider.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef APP_SERVICE_PROVIDER_H -#define APP_SERVICE_PROVIDER_H +#pragma once #include @@ -199,6 +198,3 @@ void registerServiceImplementation(T* implementation) } } // namespace Base - - -#endif // APP_SERVICE_PROVIDER_H diff --git a/src/Base/SmartPtrPy.h b/src/Base/SmartPtrPy.h index 83a28e6faf..3d881ba5be 100644 --- a/src/Base/SmartPtrPy.h +++ b/src/Base/SmartPtrPy.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PY_SMARTPTRPY_H -#define PY_SMARTPTRPY_H +#pragma once #include @@ -88,5 +87,3 @@ public: BaseExport PyObject* new_reference_to(const SmartPtr&); } // namespace Py - -#endif // PY_SMARTPTRPY_H diff --git a/src/Base/StackWalker.h b/src/Base/StackWalker.h index d703c3dfe1..90604362fd 100644 --- a/src/Base/StackWalker.h +++ b/src/Base/StackWalker.h @@ -2,8 +2,7 @@ // clang-format off // NOLINTBEGIN -#ifndef __STACKWALKER_H__ -#define __STACKWALKER_H__ +#pragma once #if defined(_MSC_VER) @@ -261,21 +260,20 @@ protected: __asm mov c.Esp, esp \ } while (0) // clang-format on -# endif - -# else - -// The following is defined for x86 (XP and higher), x64 and IA64: -# define GET_CURRENT_CONTEXT_STACKWALKER_CODEPLEX(c, contextFlags) \ - do { \ - memset(&c, 0, sizeof(CONTEXT)); \ - c.ContextFlags = contextFlags; \ - RtlCaptureContext(&c); \ - } while (0); # endif -# endif // defined(_MSC_VER) +# else + +// The following is defined for x86 (XP and higher), x64 and IA64: +# define GET_CURRENT_CONTEXT_STACKWALKER_CODEPLEX(c, contextFlags) \ + do { \ + memset(&c, 0, sizeof(CONTEXT)); \ + c.ContextFlags = contextFlags; \ + RtlCaptureContext(&c); \ + } while (0); +# endif + +#endif // defined(_MSC_VER) -#endif // __STACKWALKER_H__ // NOLINTEND // clang-format on diff --git a/src/Base/Stream.h b/src/Base/Stream.h index 122ffe2ade..078f194af4 100644 --- a/src/Base/Stream.h +++ b/src/Base/Stream.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_STREAM_H -#define BASE_STREAM_H +#pragma once #ifdef __GNUC__ # include @@ -655,5 +654,3 @@ public: }; } // namespace Base - -#endif // BASE_STREAM_H diff --git a/src/Base/Swap.h b/src/Base/Swap.h index 1b4db48c6e..ed0c244f5f 100644 --- a/src/Base/Swap.h +++ b/src/Base/Swap.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_SWAP_H -#define BASE_SWAP_H +#pragma once #define LOW_ENDIAN (unsigned short)0x4949 #define HIGH_ENDIAN (unsigned short)0x4D4D @@ -63,6 +62,3 @@ void SwapEndian(T& v) } } // namespace Base - - -#endif // BASE_SWAP_H diff --git a/src/Base/TimeInfo.h b/src/Base/TimeInfo.h index a44bd122d5..b98dcb8fba 100644 --- a/src/Base/TimeInfo.h +++ b/src/Base/TimeInfo.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef BASE_TIMEINFO_H -#define BASE_TIMEINFO_H +#pragma once #include @@ -200,5 +199,3 @@ private: }; } // namespace Base - -#endif // BASE_TIMEINFO_H diff --git a/src/Base/Tools.h b/src/Base/Tools.h index 69897df5e9..7ca034ba18 100644 --- a/src/Base/Tools.h +++ b/src/Base/Tools.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SRC_BASE_TOOLS_H_ -#define SRC_BASE_TOOLS_H_ +#pragma once #ifndef FC_GLOBAL_H # include @@ -428,6 +427,3 @@ template Overloads(Ts...) -> Overloads; } // namespace Base - - -#endif // SRC_BASE_TOOLS_H_ diff --git a/src/Base/Tools2D.h b/src/Base/Tools2D.h index 72bc272a05..aae37b6b20 100644 --- a/src/Base/Tools2D.h +++ b/src/Base/Tools2D.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef BASE_TOOLS2D_H -#define BASE_TOOLS2D_H +#pragma once #include #include @@ -533,5 +532,3 @@ inline void BoundBox2d::Add(const Vector2d& v) } } // namespace Base - -#endif // BASE_TOOLS2D_H diff --git a/src/Base/Tools3D.h b/src/Base/Tools3D.h index a5a5a1fe3c..ae169de529 100644 --- a/src/Base/Tools3D.h +++ b/src/Base/Tools3D.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_TOOLS3D_H -#define BASE_TOOLS3D_H +#pragma once #ifndef FC_GLOBAL_H # include @@ -148,5 +147,3 @@ using Polygon3f = Polygon3; using Polygon3d = Polygon3; } // namespace Base - -#endif // BASE_TOOLS3D_H diff --git a/src/Base/Translate.h b/src/Base/Translate.h index b7c6d4c09b..6bc22ec934 100644 --- a/src/Base/Translate.h +++ b/src/Base/Translate.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_TRANSLATE_H -#define BASE_TRANSLATE_H +#pragma once #include #include @@ -62,5 +61,3 @@ private: }; } // namespace Base - -#endif // BASE_TRANSLATE_H diff --git a/src/Base/Type.h b/src/Base/Type.h index 75f0e2375d..4ed04a9056 100644 --- a/src/Base/Type.h +++ b/src/Base/Type.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_TYPE_H -#define BASE_TYPE_H +#pragma once // Std. configurations @@ -202,6 +201,3 @@ inline bool Type::isBad() const } } // namespace Base - - -#endif // BASE_TYPE_H diff --git a/src/Base/UniqueNameManager.h b/src/Base/UniqueNameManager.h index 99b0f6680e..81ecdf0ee4 100644 --- a/src/Base/UniqueNameManager.h +++ b/src/Base/UniqueNameManager.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef SRC_BASE_UNIQUENAMEMANAGER_H_ -#define SRC_BASE_UNIQUENAMEMANAGER_H_ +#pragma once #ifndef FC_GLOBAL_H # include @@ -245,5 +244,3 @@ public: } }; } // namespace Base - -#endif // SRC_BASE_UNIQUENAMEMANAGER_H_ diff --git a/src/Base/Unit.h b/src/Base/Unit.h index 1716d3cb41..fe9bba79fd 100644 --- a/src/Base/Unit.h +++ b/src/Base/Unit.h @@ -19,8 +19,7 @@ * * ***************************************************************************/ -#ifndef BASE_Unit_H -#define BASE_Unit_H +#pragma once #include #include @@ -177,5 +176,3 @@ public: }; } // namespace Base - -#endif // BASE_Unit_H diff --git a/src/Base/UnitsApi.h b/src/Base/UnitsApi.h index 077f4d5210..f9a6fa8313 100644 --- a/src/Base/UnitsApi.h +++ b/src/Base/UnitsApi.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef BASE_UNITSAPI_H -#define BASE_UNITSAPI_H +#pragma once #include "UnitsSchema.h" #include "UnitsSchemas.h" @@ -90,5 +89,3 @@ protected: }; } // namespace Base - -#endif // BASE_UNITSAPI_H diff --git a/src/Base/UnitsConvData.h b/src/Base/UnitsConvData.h index 6f27162b90..fbb8aab10d 100644 --- a/src/Base/UnitsConvData.h +++ b/src/Base/UnitsConvData.h @@ -21,8 +21,7 @@ * * ************************************************************************/ -#ifndef BASE_UNITSCONVDATA_H -#define BASE_UNITSCONVDATA_H +#pragma once namespace Base::UnitsConvData { @@ -36,5 +35,3 @@ constexpr auto lbf {9.80665 * lb}; constexpr auto psi {lbf / (in * in) * 1000}; } // namespace Base::UnitsConvData - -#endif diff --git a/src/Base/UnitsSchema.h b/src/Base/UnitsSchema.h index e1583826a0..e68bb98f00 100644 --- a/src/Base/UnitsSchema.h +++ b/src/Base/UnitsSchema.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef BASE_UNITSSCHEMA_H -#define BASE_UNITSSCHEMA_H +#pragma once #include #include @@ -66,4 +65,3 @@ private: } // namespace Base -#endif // BASE_UNITSSCHEMA_H diff --git a/src/Base/UnitsSchemas.h b/src/Base/UnitsSchemas.h index a01dde2c2c..8cd9f59ffc 100644 --- a/src/Base/UnitsSchemas.h +++ b/src/Base/UnitsSchemas.h @@ -21,8 +21,7 @@ * * ************************************************************************/ -#ifndef SRC_BASE_UNITSSCHEMAS_H -#define SRC_BASE_UNITSSCHEMAS_H +#pragma once #include #include @@ -75,4 +74,3 @@ private: } // namespace Base -#endif // SRC_BASE_UNITSSCHEMAS_H diff --git a/src/Base/UnitsSchemasData.h b/src/Base/UnitsSchemasData.h index 99a7fdf13c..d5a9a441bf 100644 --- a/src/Base/UnitsSchemasData.h +++ b/src/Base/UnitsSchemasData.h @@ -21,8 +21,7 @@ * * ************************************************************************/ -#ifndef BASE_UNITSSCHEMASDATA_H -#define BASE_UNITSSCHEMASDATA_H +#pragma once #include #include @@ -795,4 +794,3 @@ inline const UnitsSchemasDataPack unitSchemasDataPack {schemaSpecs, defDecimals, } // namespace Base::UnitsSchemasData -#endif // BASE_UNITSSCHEMASDATA_H diff --git a/src/Base/UnitsSchemasSpecs.h b/src/Base/UnitsSchemasSpecs.h index 2299719312..40b2893512 100644 --- a/src/Base/UnitsSchemasSpecs.h +++ b/src/Base/UnitsSchemasSpecs.h @@ -21,8 +21,7 @@ * * ************************************************************************/ -#ifndef UNITSCHEMASPECS_H -#define UNITSCHEMASPECS_H +#pragma once #include #include @@ -68,4 +67,3 @@ struct UnitsSchemasDataPack } // namespace Base -#endif // UNITSCHEMASPECS_H diff --git a/src/Base/UnlimitedUnsigned.h b/src/Base/UnlimitedUnsigned.h index 33a78b81a3..7945e9f238 100644 --- a/src/Base/UnlimitedUnsigned.h +++ b/src/Base/UnlimitedUnsigned.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef SRC_BASE_UNLIMITEDUNSIGNED_H_ -#define SRC_BASE_UNLIMITEDUNSIGNED_H_ +#pragma once #ifndef FC_GLOBAL_H # include @@ -236,5 +235,3 @@ private: std::vector parts; }; } // namespace Base - -#endif // SRC_BASE_UNLIMITEDUNSIGNED_H_ diff --git a/src/Base/Uuid.h b/src/Base/Uuid.h index fb4da3d410..3eb99ff7cb 100644 --- a/src/Base/Uuid.h +++ b/src/Base/Uuid.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_UUID_H -#define BASE_UUID_H +#pragma once // Std. configurations @@ -70,5 +69,3 @@ private: }; } // namespace Base - -#endif // BASE_UUID_H diff --git a/src/Base/Vector3D.h b/src/Base/Vector3D.h index 61cdaee86d..1580f2de83 100644 --- a/src/Base/Vector3D.h +++ b/src/Base/Vector3D.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_VECTOR3D_H -#define BASE_VECTOR3D_H +#pragma once #include #include @@ -287,5 +286,3 @@ using Vector3f = Vector3; using Vector3d = Vector3; } // namespace Base - -#endif // BASE_VECTOR3D_H diff --git a/src/Base/ViewProj.h b/src/Base/ViewProj.h index 336ba549fb..56eb16166b 100644 --- a/src/Base/ViewProj.h +++ b/src/Base/ViewProj.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef BASE_VIEWPROJ_H -#define BASE_VIEWPROJ_H +#pragma once #include "Matrix.h" @@ -122,5 +121,3 @@ private: }; } // namespace Base - -#endif // BASE_VIEWPROJ_H diff --git a/src/Base/Writer.h b/src/Base/Writer.h index 9fb6823f1c..7ab8197bbf 100644 --- a/src/Base/Writer.h +++ b/src/Base/Writer.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SRC_BASE_WRITER_H_ -#define SRC_BASE_WRITER_H_ +#pragma once #include @@ -330,6 +329,3 @@ protected: } // namespace Base - - -#endif // SRC_BASE_WRITER_H_ diff --git a/src/Base/XMLTools.h b/src/Base/XMLTools.h index 5cb77f8a4c..d997df145d 100644 --- a/src/Base/XMLTools.h +++ b/src/Base/XMLTools.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef BASE_XMLTOOLS_H -#define BASE_XMLTOOLS_H +#pragma once #include #include @@ -257,5 +256,3 @@ inline const XMLCh* XUTF8Str::unicodeForm() const { return str.c_str(); } - -#endif // BASE_XMLTOOLS_H diff --git a/src/Base/ZipHeader.h b/src/Base/ZipHeader.h index c2d2d9aaba..ee32eea25c 100644 --- a/src/Base/ZipHeader.h +++ b/src/Base/ZipHeader.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef ZIPIOS_ZIP_HEADER_H -#define ZIPIOS_ZIP_HEADER_H +#pragma once #include #include @@ -78,6 +77,3 @@ private: }; } // namespace zipios - - -#endif // ZIPIOS_ZIP_HEADER_H diff --git a/src/FCConfig.h b/src/FCConfig.h index c5238daaa9..2503da4bf4 100644 --- a/src/FCConfig.h +++ b/src/FCConfig.h @@ -27,10 +27,8 @@ * This file keeps the makefiles and project files cleaner. */ - -#ifndef FC_CONFIG_H -#define FC_CONFIG_H - +#pragma once + //************************************************************************** // switching the operating systems @@ -277,5 +275,3 @@ typedef unsigned __int64 uint64_t; #endif #endif - -#endif //FC_CONFIG_H diff --git a/src/FCGlobal.h b/src/FCGlobal.h index b69ea786da..0f6b78e527 100644 --- a/src/FCGlobal.h +++ b/src/FCGlobal.h @@ -24,9 +24,7 @@ * \brief Include export or import macros. */ - -#ifndef FC_GLOBAL_H -#define FC_GLOBAL_H +#pragma once #if defined(WIN64) || defined(_WIN64) || defined(__WIN64__) || defined(__CYGWIN__) @@ -90,5 +88,3 @@ #ifndef HAVE_Q_DISABLE_COPY_MOVE #define Q_DISABLE_COPY_MOVE FC_DEFAULT_COPY_MOVE #endif - -#endif //FC_GLOBAL_H diff --git a/src/Gui/3Dconnexion/GuiAbstractNativeEvent.h b/src/Gui/3Dconnexion/GuiAbstractNativeEvent.h index abc572073a..fe512a1eca 100644 --- a/src/Gui/3Dconnexion/GuiAbstractNativeEvent.h +++ b/src/Gui/3Dconnexion/GuiAbstractNativeEvent.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUIABSTRACTNATIVEEVENT_H -#define GUIABSTRACTNATIVEEVENT_H +#pragma once #include #include @@ -50,6 +49,3 @@ protected: static std::vector motionDataArray; }; } // namespace Gui - - -#endif // GUIABSTRACTNATIVEEVENT_H diff --git a/src/Gui/3Dconnexion/GuiNativeEventLinux.h b/src/Gui/3Dconnexion/GuiNativeEventLinux.h index d82ee12b24..adcb4a4929 100644 --- a/src/Gui/3Dconnexion/GuiNativeEventLinux.h +++ b/src/Gui/3Dconnexion/GuiNativeEventLinux.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUINATIVEEVENT_H -#define GUINATIVEEVENT_H +#pragma once #include "GuiAbstractNativeEvent.h" @@ -47,5 +46,3 @@ private Q_SLOTS: void pollSpacenav(); }; } // namespace Gui - -#endif // GUINATIVEEVENT_H diff --git a/src/Gui/3Dconnexion/GuiNativeEventLinuxX11.h b/src/Gui/3Dconnexion/GuiNativeEventLinuxX11.h index 925b729a25..dac2e646f0 100644 --- a/src/Gui/3Dconnexion/GuiNativeEventLinuxX11.h +++ b/src/Gui/3Dconnexion/GuiNativeEventLinuxX11.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUINATIVEEVENT_H -#define GUINATIVEEVENT_H +#pragma once #include "GuiAbstractNativeEvent.h" #include @@ -54,5 +53,3 @@ public: static bool xcbEventFilter(void* message, long* result); }; } // namespace Gui - -#endif // GUINATIVEEVENT_H diff --git a/src/Gui/3Dconnexion/GuiNativeEventMac.h b/src/Gui/3Dconnexion/GuiNativeEventMac.h index b43d8bf6e8..d2dfa06296 100644 --- a/src/Gui/3Dconnexion/GuiNativeEventMac.h +++ b/src/Gui/3Dconnexion/GuiNativeEventMac.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUINATIVEEVENT_H -#define GUINATIVEEVENT_H +#pragma once #include "GuiAbstractNativeEvent.h" @@ -78,5 +77,3 @@ private: static void tdx_drv_handler(io_connect_t connection, natural_t messageType, void* messageArgument); }; } // namespace Gui - -#endif // GUINATIVEEVENT_H diff --git a/src/Gui/3Dconnexion/GuiNativeEventWin32.h b/src/Gui/3Dconnexion/GuiNativeEventWin32.h index f1030388c4..5779dcf5a4 100644 --- a/src/Gui/3Dconnexion/GuiNativeEventWin32.h +++ b/src/Gui/3Dconnexion/GuiNativeEventWin32.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUINATIVEEVENT_H -#define GUINATIVEEVENT_H +#pragma once #include "GuiAbstractNativeEvent.h" @@ -109,5 +108,3 @@ private: static Gui::GuiNativeEvent* gMouseInput; }; } // namespace Gui - -#endif // GUINATIVEEVENT_H diff --git a/src/Gui/3Dconnexion/GuiRawInputEventFilter.h b/src/Gui/3Dconnexion/GuiRawInputEventFilter.h index c80ca0e830..aa2796d03e 100644 --- a/src/Gui/3Dconnexion/GuiRawInputEventFilter.h +++ b/src/Gui/3Dconnexion/GuiRawInputEventFilter.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUIRAWNATIVEINPUTEVENTFILTER_H -#define GUIRAWNATIVEINPUTEVENTFILTER_H +#pragma once #include @@ -57,5 +56,3 @@ private: EventFilter eventFilter; }; } // namespace Gui - -#endif // GUIRAWNATIVEINPUTEVENTFILTER_H diff --git a/src/Gui/3Dconnexion/I3dMouseParams.h b/src/Gui/3Dconnexion/I3dMouseParams.h index 07eb3a6776..f94a0adc45 100644 --- a/src/Gui/3Dconnexion/I3dMouseParams.h +++ b/src/Gui/3Dconnexion/I3dMouseParams.h @@ -4,8 +4,7 @@ Development tools and related technology provided under license from 3Dconnexion (c) 1992 - 2012 3Dconnexion. All rights reserved */ -#ifndef I3D_MOUSE_PARAMS_H -#define I3D_MOUSE_PARAMS_H +#pragma once /* Parameters for the 3D mouse based on the SDK from 3Dconnexion @@ -84,5 +83,3 @@ public: virtual ~I3dMouseParam() {} }; - -#endif // I3D_MOUSE_PARAMS_H diff --git a/src/Gui/3Dconnexion/MouseParameters.h b/src/Gui/3Dconnexion/MouseParameters.h index b52764c5d4..0a28b3690a 100644 --- a/src/Gui/3Dconnexion/MouseParameters.h +++ b/src/Gui/3Dconnexion/MouseParameters.h @@ -5,8 +5,7 @@ Development tools and related technology provided under license from 3Dconnexion */ -#ifndef T3D_MOUSE_PARAMS_H -#define T3D_MOUSE_PARAMS_H +#pragma once #include "I3dMouseParams.h" @@ -50,5 +49,3 @@ private: bool fIsRotate; ESpeed fSpeed; }; - -#endif // T3D_MOUSE_PARAMS_H diff --git a/src/Gui/Action.h b/src/Gui/Action.h index b52ab61076..391b0450aa 100644 --- a/src/Gui/Action.h +++ b/src/Gui/Action.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_ACTION_H -#define GUI_ACTION_H +#pragma once #include #include @@ -422,5 +421,3 @@ private: }; } // namespace Gui - -#endif // GUI_ACTION_H diff --git a/src/Gui/ActionFunction.h b/src/Gui/ActionFunction.h index 0e8a8b5665..3f8442e444 100644 --- a/src/Gui/ActionFunction.h +++ b/src/Gui/ActionFunction.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_ACTIONFUNCTION_H -#define GUI_ACTIONFUNCTION_H +#pragma once #include #include @@ -115,6 +114,3 @@ private: }; } // namespace Gui - - -#endif // GUI_ACTIONFUNCTION_H diff --git a/src/Gui/ActiveObjectList.h b/src/Gui/ActiveObjectList.h index b34b0d6f05..00611c544f 100644 --- a/src/Gui/ActiveObjectList.h +++ b/src/Gui/ActiveObjectList.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef GUI_ActiveObjectList_H -#define GUI_ActiveObjectList_H +#pragma once #include #include @@ -107,5 +106,3 @@ private: static const char PDBODYKEY[] = "pdbody"; static const char PARTKEY[] = "part"; static const char ASSEMBLYKEY[] = "assembly"; - -#endif diff --git a/src/Gui/Application.h b/src/Gui/Application.h index eff1ac8854..c9dfd9cf00 100644 --- a/src/Gui/Application.h +++ b/src/Gui/Application.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef APPLICATION_H -#define APPLICATION_H +#pragma once #include #include @@ -343,5 +342,3 @@ private: }; } // namespace Gui - -#endif diff --git a/src/Gui/ApplicationPy.h b/src/Gui/ApplicationPy.h index 203c346b51..233d40e337 100644 --- a/src/Gui/ApplicationPy.h +++ b/src/Gui/ApplicationPy.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_APPLICATIONPY_H -#define GUI_APPLICATIONPY_H +#pragma once #include @@ -120,5 +119,3 @@ public: }; } // namespace Gui - -#endif diff --git a/src/Gui/ArcEngine.h b/src/Gui/ArcEngine.h index b5f7ff4bf6..b4c169b240 100644 --- a/src/Gui/ArcEngine.h +++ b/src/Gui/ArcEngine.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_ARCENGINE_H -#define GUI_ARCENGINE_H +#pragma once #include #include @@ -73,5 +72,3 @@ private: }; } // namespace Gui - -#endif // GUI_ARCENGINE_H diff --git a/src/Gui/Assistant.h b/src/Gui/Assistant.h index 60b381cf8c..b3f431af29 100644 --- a/src/Gui/Assistant.h +++ b/src/Gui/Assistant.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_ASSISTANT_H -#define GUI_ASSISTANT_H +#pragma once #include @@ -50,5 +49,3 @@ private: }; } // namespace Gui - -#endif // GUI_ASSISTANT_H diff --git a/src/Gui/AutoSaver.h b/src/Gui/AutoSaver.h index 62054130db..ce8d392b2f 100644 --- a/src/Gui/AutoSaver.h +++ b/src/Gui/AutoSaver.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_AUTOSAVER_H -#define GUI_AUTOSAVER_H +#pragma once #include @@ -119,6 +118,3 @@ private: }; } // namespace Gui - - -#endif // GUI_AUTOSAVER_H diff --git a/src/Gui/AxisOrigin.h b/src/Gui/AxisOrigin.h index 5e05b1005d..7a959b36b8 100644 --- a/src/Gui/AxisOrigin.h +++ b/src/Gui/AxisOrigin.h @@ -20,8 +20,7 @@ * * ****************************************************************************/ -#ifndef GUI_AxisOrigin_H -#define GUI_AxisOrigin_H +#pragma once #include "ViewProvider.h" @@ -125,5 +124,3 @@ private: }; } // namespace Gui - -#endif // GUI_AxisOrigin_H diff --git a/src/Gui/BitmapFactory.h b/src/Gui/BitmapFactory.h index 34219f5f34..013aeed21e 100644 --- a/src/Gui/BitmapFactory.h +++ b/src/Gui/BitmapFactory.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_BITMAPFACTORY_H -#define GUI_BITMAPFACTORY_H +#pragma once #include #include @@ -178,5 +177,3 @@ inline BitmapFactoryInst& BitmapFactory() } } // namespace Gui - -#endif // GUI_BITMAPFACTORY_H diff --git a/src/Gui/CallTips.h b/src/Gui/CallTips.h index 6ab336f4aa..461e403c6a 100644 --- a/src/Gui/CallTips.h +++ b/src/Gui/CallTips.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_CALLTIPS_H -#define GUI_CALLTIPS_H +#pragma once #include @@ -98,5 +97,3 @@ private: }; } // namespace Gui - -#endif // GUI_CALLTIPS_H diff --git a/src/Gui/Camera.h b/src/Gui/Camera.h index 4907b90e19..df490a1d87 100644 --- a/src/Gui/Camera.h +++ b/src/Gui/Camera.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef GUI_CAMERA_H -#define GUI_CAMERA_H +#pragma once #include #include @@ -64,5 +63,3 @@ public: }; } // namespace Gui - -#endif // GUI_CAMERA_H diff --git a/src/Gui/Clipping.h b/src/Gui/Clipping.h index 17142e3be1..323d258d3f 100644 --- a/src/Gui/Clipping.h +++ b/src/Gui/Clipping.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_CLIPPING_H -#define GUI_DIALOG_CLIPPING_H +#pragma once #include #include @@ -74,5 +73,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_CLIPPING_H diff --git a/src/Gui/CoinRiftWidget.h b/src/Gui/CoinRiftWidget.h index baa2d379ba..2d5e7a2343 100644 --- a/src/Gui/CoinRiftWidget.h +++ b/src/Gui/CoinRiftWidget.h @@ -31,8 +31,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * \****************************************************************************/ -#ifndef GUI_CoinRiftWidget -#define GUI_CoinRiftWidget +#pragma once #if BUILD_VR @@ -116,5 +115,3 @@ protected: #endif // BUILD_VR - -#endif // GUI_CoinRiftWidget diff --git a/src/Gui/ComboLinks.h b/src/Gui/ComboLinks.h index c5a30af315..8cd36cbfe8 100644 --- a/src/Gui/ComboLinks.h +++ b/src/Gui/ComboLinks.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_COMBOLINKS_H -#define GUI_COMBOLINKS_H +#pragma once #include #include @@ -176,5 +175,3 @@ private: }; } // namespace Gui - -#endif // GUI_COMBOLINKS_H diff --git a/src/Gui/ComboView.h b/src/Gui/ComboView.h index 452b2e2eae..ea79767bed 100644 --- a/src/Gui/ComboView.h +++ b/src/Gui/ComboView.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_DOCKWND_COMBOVIEW_H -#define GUI_DOCKWND_COMBOVIEW_H +#pragma once #include "DockWindow.h" @@ -92,5 +91,3 @@ private: } // namespace DockWnd } // namespace Gui - -#endif // GUI_DOCKWND_SELECTIONVIEW_H diff --git a/src/Gui/Command.h b/src/Gui/Command.h index f060a3dd86..939d8c78d2 100644 --- a/src/Gui/Command.h +++ b/src/Gui/Command.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_COMMAND_H -#define GUI_COMMAND_H +#pragma once #include #include @@ -1287,5 +1286,3 @@ private: X& operator=(const X&) = delete; \ X& operator=(X&&) = delete; \ }; - -#endif // GUI_COMMAND_H diff --git a/src/Gui/CommandActionPy.h b/src/Gui/CommandActionPy.h index 5ddacb620a..c3c636b33b 100644 --- a/src/Gui/CommandActionPy.h +++ b/src/Gui/CommandActionPy.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef GUI_COMMANDACTIONPY_H -#define GUI_COMMANDACTIONPY_H +#pragma once #include @@ -56,5 +55,3 @@ private: }; } // namespace Gui - -#endif // GUI_COMMANDACTIONPY_H diff --git a/src/Gui/CommandCompleter.h b/src/Gui/CommandCompleter.h index 77311b2465..eba74a39ff 100644 --- a/src/Gui/CommandCompleter.h +++ b/src/Gui/CommandCompleter.h @@ -20,8 +20,7 @@ * * ****************************************************************************/ -#ifndef GUI_COMMAND_COMPLETER_H -#define GUI_COMMAND_COMPLETER_H +#pragma once #include #include @@ -57,5 +56,3 @@ protected: }; } // namespace Gui - -#endif diff --git a/src/Gui/CommandT.h b/src/Gui/CommandT.h index e1bd0b60d4..09edd8b5dd 100644 --- a/src/Gui/CommandT.h +++ b/src/Gui/CommandT.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_COMMAND_T_H -#define GUI_COMMAND_T_H +#pragma once #include #include @@ -544,5 +543,3 @@ void copyVisualT(Args&&... args) //@} }; // namespace Gui - -#endif // GUI_COMMAND_T_H diff --git a/src/Gui/Control.h b/src/Gui/Control.h index 796aa01a7c..faf9d0457a 100644 --- a/src/Gui/Control.h +++ b/src/Gui/Control.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_CONTROL_H -#define GUI_CONTROL_H +#pragma once // Std. configurations @@ -136,5 +135,3 @@ inline ControlSingleton& Control() } } // namespace Gui - -#endif // GUI_CONTROL_H diff --git a/src/Gui/CornerCrossLetters.h b/src/Gui/CornerCrossLetters.h index 997d22cefc..0a6f0c00ae 100644 --- a/src/Gui/CornerCrossLetters.h +++ b/src/Gui/CornerCrossLetters.h @@ -1,5 +1,4 @@ -#ifndef GUI_CORNERCROSSLETTERS_H -#define GUI_CORNERCROSSLETTERS_H +#pragma once namespace Gui { @@ -435,5 +434,3 @@ static const unsigned char ZPM_pixel_mask[21 * 27 * 4 + 1] "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"); } // namespace Gui - -#endif // GUI_CORNERCROSSLETTERS_H diff --git a/src/Gui/DAGView/DAGModel.h b/src/Gui/DAGView/DAGModel.h index 4d318c9044..3f4b1b0afe 100644 --- a/src/Gui/DAGView/DAGModel.h +++ b/src/Gui/DAGView/DAGModel.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef DAGMODEL_H -#define DAGMODEL_H +#pragma once #include #include @@ -169,5 +168,3 @@ private: }; } // namespace DAG } // namespace Gui - -#endif // DAGMODEL_H diff --git a/src/Gui/DAGView/DAGModelGraph.h b/src/Gui/DAGView/DAGModelGraph.h index fde5a621fc..61845a1a81 100644 --- a/src/Gui/DAGView/DAGModelGraph.h +++ b/src/Gui/DAGView/DAGModelGraph.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef DAGMODELGRAPH_H -#define DAGMODELGRAPH_H +#pragma once #include #include @@ -318,5 +317,3 @@ const GraphLinkRecord& findRecord(const std::string& stringIn, const GraphLinkCo void eraseRecord(const Gui::ViewProviderDocumentObject* VPDObjectIn, GraphLinkContainer& containerIn); } // namespace DAG } // namespace Gui - -#endif // DAGMODELGRAPH_H diff --git a/src/Gui/DAGView/DAGRectItem.h b/src/Gui/DAGView/DAGRectItem.h index 844bc8908c..4389b84035 100644 --- a/src/Gui/DAGView/DAGRectItem.h +++ b/src/Gui/DAGView/DAGRectItem.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef DAGRECTITEM_H -#define DAGRECTITEM_H +#pragma once #include #include @@ -97,5 +96,3 @@ private: }; } // namespace DAG } // namespace Gui - -#endif // DAGRECTITEM_H diff --git a/src/Gui/DAGView/DAGView.h b/src/Gui/DAGView/DAGView.h index ab9964fe27..ef1a35b45e 100644 --- a/src/Gui/DAGView/DAGView.h +++ b/src/Gui/DAGView/DAGView.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef DAGVIEW_H -#define DAGVIEW_H +#pragma once #include #include @@ -75,5 +74,3 @@ private: }; } // namespace DAG } // namespace Gui - -#endif // DAGVIEW_H diff --git a/src/Gui/DemoMode.h b/src/Gui/DemoMode.h index f3dad33b2d..4309795bef 100644 --- a/src/Gui/DemoMode.h +++ b/src/Gui/DemoMode.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_DIALOG_DEMOMODE_H -#define GUI_DIALOG_DEMOMODE_H +#pragma once #include #include @@ -89,5 +88,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DEMOMODE_H diff --git a/src/Gui/Dialogs/DlgAbout.h b/src/Gui/Dialogs/DlgAbout.h index 3ca1188ea5..d3109e35ed 100644 --- a/src/Gui/Dialogs/DlgAbout.h +++ b/src/Gui/Dialogs/DlgAbout.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_DLG_ABOUT_H -#define GUI_DLG_ABOUT_H +#pragma once #include #include @@ -104,5 +103,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DLG_ABOUT_H diff --git a/src/Gui/Dialogs/DlgActionsImp.h b/src/Gui/Dialogs/DlgActionsImp.h index 7a9f8ef99b..e26ca7d6b7 100644 --- a/src/Gui/Dialogs/DlgActionsImp.h +++ b/src/Gui/Dialogs/DlgActionsImp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGACTIONS_IMP_H -#define GUI_DIALOG_DLGACTIONS_IMP_H +#pragma once #include #include "PropertyPage.h" @@ -140,5 +139,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGACTIONS_IMP_H diff --git a/src/Gui/Dialogs/DlgActivateWindowImp.h b/src/Gui/Dialogs/DlgActivateWindowImp.h index d342f8fb2d..b12db03ef1 100644 --- a/src/Gui/Dialogs/DlgActivateWindowImp.h +++ b/src/Gui/Dialogs/DlgActivateWindowImp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGACTIVATEWINDOW_IMP_H -#define GUI_DIALOG_DLGACTIVATEWINDOW_IMP_H +#pragma once #include @@ -56,5 +55,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGACTIVATEWINDOW_IMP_H diff --git a/src/Gui/Dialogs/DlgAddProperty.h b/src/Gui/Dialogs/DlgAddProperty.h index e2156b1244..d6ecbbb72d 100644 --- a/src/Gui/Dialogs/DlgAddProperty.h +++ b/src/Gui/Dialogs/DlgAddProperty.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_DIALOG_DLG_ADD_PROPERTY_H -#define GUI_DIALOG_DLG_ADD_PROPERTY_H +#pragma once #include @@ -247,5 +246,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLG_ADD_PROPERTY_H diff --git a/src/Gui/Dialogs/DlgCheckableMessageBox.h b/src/Gui/Dialogs/DlgCheckableMessageBox.h index 9c2684f3d1..6d05eba66d 100644 --- a/src/Gui/Dialogs/DlgCheckableMessageBox.h +++ b/src/Gui/Dialogs/DlgCheckableMessageBox.h @@ -29,8 +29,7 @@ ** **************************************************************************/ -#ifndef CHECKABLEMESSAGEBOX_H -#define CHECKABLEMESSAGEBOX_H +#pragma once #include #include @@ -150,5 +149,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // CHECKABLEMESSAGEBOX_H diff --git a/src/Gui/Dialogs/DlgCreateNewPreferencePackImp.h b/src/Gui/Dialogs/DlgCreateNewPreferencePackImp.h index 6e9dd1e7e4..1df357d498 100644 --- a/src/Gui/Dialogs/DlgCreateNewPreferencePackImp.h +++ b/src/Gui/Dialogs/DlgCreateNewPreferencePackImp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGCREATENEWTHEMEIMP_H -#define GUI_DIALOG_DLGCREATENEWTHEMEIMP_H +#pragma once #include #include @@ -87,5 +86,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGCREATENEWTHEMEIMP_H diff --git a/src/Gui/Dialogs/DlgCustomizeImp.h b/src/Gui/Dialogs/DlgCustomizeImp.h index bd189dc02e..709aca6b95 100644 --- a/src/Gui/Dialogs/DlgCustomizeImp.h +++ b/src/Gui/Dialogs/DlgCustomizeImp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGCUSTOMIZE_IMP_H -#define GUI_DIALOG_DLGCUSTOMIZE_IMP_H +#pragma once #include @@ -83,5 +82,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGCUSTOMIZE_IMP_H diff --git a/src/Gui/Dialogs/DlgCustomizeSpNavSettings.h b/src/Gui/Dialogs/DlgCustomizeSpNavSettings.h index 540d8b03d3..5a2642ca9e 100644 --- a/src/Gui/Dialogs/DlgCustomizeSpNavSettings.h +++ b/src/Gui/Dialogs/DlgCustomizeSpNavSettings.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef DLGCUSTOMIZESPNAVSETTINGS_H -#define DLGCUSTOMIZESPNAVSETTINGS_H +#pragma once #include "PropertyPage.h" #include @@ -91,5 +90,3 @@ private: }; } // namespace Dialog } // namespace Gui - -#endif // DLGCUSTOMIZESPNAVSETTINGS_H diff --git a/src/Gui/Dialogs/DlgCustomizeSpaceball.h b/src/Gui/Dialogs/DlgCustomizeSpaceball.h index bc9f9bf736..d8f730af09 100644 --- a/src/Gui/Dialogs/DlgCustomizeSpaceball.h +++ b/src/Gui/Dialogs/DlgCustomizeSpaceball.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_DIALOG_DLGCUSTOMIZESPACEBALL_H -#define GUI_DIALOG_DLGCUSTOMIZESPACEBALL_H +#pragma once #include #include @@ -187,5 +186,3 @@ private: }; } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGCUSTOMIZESPACEBALL_H diff --git a/src/Gui/Dialogs/DlgEditFileIncludePropertyExternal.h b/src/Gui/Dialogs/DlgEditFileIncludePropertyExternal.h index 568f59235c..fab96f8a4c 100644 --- a/src/Gui/Dialogs/DlgEditFileIncludePropertyExternal.h +++ b/src/Gui/Dialogs/DlgEditFileIncludePropertyExternal.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DlgEditFileIncludePropertyExternal_H -#define GUI_DIALOG_DlgEditFileIncludePropertyExternal_H +#pragma once #include "Dialogs/DlgRunExternal.h" #include @@ -58,5 +57,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DlgEditFileIncludePropertyExternal_H diff --git a/src/Gui/Dialogs/DlgExpressionInput.h b/src/Gui/Dialogs/DlgExpressionInput.h index f49be1b123..bf5430cab3 100644 --- a/src/Gui/Dialogs/DlgExpressionInput.h +++ b/src/Gui/Dialogs/DlgExpressionInput.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_DIALOG_DLGEXPRESSIONINPUT_H -#define GUI_DIALOG_DLGEXPRESSIONINPUT_H +#pragma once #include #include @@ -159,6 +158,3 @@ private: }; } // namespace Gui::Dialog - - -#endif // GUI_DIALOG_EXPRESSIONINPUT_H diff --git a/src/Gui/Dialogs/DlgInputDialogImp.h b/src/Gui/Dialogs/DlgInputDialogImp.h index a4c4426671..b066c0cb83 100644 --- a/src/Gui/Dialogs/DlgInputDialogImp.h +++ b/src/Gui/Dialogs/DlgInputDialogImp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGINPUTDIALOGIMP_H -#define GUI_DIALOG_DLGINPUTDIALOGIMP_H +#pragma once #include #include @@ -89,5 +88,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGINPUTDIALOGIMP_H diff --git a/src/Gui/Dialogs/DlgKeyboardImp.h b/src/Gui/Dialogs/DlgKeyboardImp.h index 6bc174357c..fbc3e90aca 100644 --- a/src/Gui/Dialogs/DlgKeyboardImp.h +++ b/src/Gui/Dialogs/DlgKeyboardImp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGKEYBOARD_IMP_H -#define GUI_DIALOG_DLGKEYBOARD_IMP_H +#pragma once #include #include @@ -137,5 +136,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGKEYBOARD_IMP_H diff --git a/src/Gui/Dialogs/DlgMacroExecuteImp.h b/src/Gui/Dialogs/DlgMacroExecuteImp.h index 3589aad1d3..3c4cb7a74a 100644 --- a/src/Gui/Dialogs/DlgMacroExecuteImp.h +++ b/src/Gui/Dialogs/DlgMacroExecuteImp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGMACROEXECUTEIMP_H -#define GUI_DIALOG_DLGMACROEXECUTEIMP_H +#pragma once #include #include @@ -87,5 +86,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGMACROEXECUTEIMP_H diff --git a/src/Gui/Dialogs/DlgMacroRecordImp.h b/src/Gui/Dialogs/DlgMacroRecordImp.h index f0a8a95878..39128e8406 100644 --- a/src/Gui/Dialogs/DlgMacroRecordImp.h +++ b/src/Gui/Dialogs/DlgMacroRecordImp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGMACRORECORDIMP_H -#define GUI_DIALOG_DLGMACRORECORDIMP_H +#pragma once #include #include @@ -66,5 +65,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGMACRORECORDIMP_H diff --git a/src/Gui/Dialogs/DlgMaterialPropertiesImp.h b/src/Gui/Dialogs/DlgMaterialPropertiesImp.h index a1cee29d93..e250026bbf 100644 --- a/src/Gui/Dialogs/DlgMaterialPropertiesImp.h +++ b/src/Gui/Dialogs/DlgMaterialPropertiesImp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGMATERIALPROPERTIES_IMP_H -#define GUI_DIALOG_DLGMATERIALPROPERTIES_IMP_H +#pragma once #include #include @@ -81,5 +80,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGMATERIALPROPERTIES_IMP_H diff --git a/src/Gui/Dialogs/DlgObjectSelection.h b/src/Gui/Dialogs/DlgObjectSelection.h index 9ac1d51f73..cad5f7a98a 100644 --- a/src/Gui/Dialogs/DlgObjectSelection.h +++ b/src/Gui/Dialogs/DlgObjectSelection.h @@ -21,8 +21,7 @@ * Suite 330, Boston, MA 02111-1307, USA * * * ****************************************************************************/ -#ifndef GUI_DLGOBJECTSELECTION_H -#define GUI_DLGOBJECTSELECTION_H +#pragma once #include #include @@ -152,5 +151,3 @@ private: } // namespace Gui ENABLE_BITMASK_OPERATORS(Gui::DlgObjectSelection::SelectionOptions); - -#endif // GUI_DLGOBJECTSELECTION_H diff --git a/src/Gui/Dialogs/DlgOnlineHelpImp.h b/src/Gui/Dialogs/DlgOnlineHelpImp.h index 8a7c7227fb..f88b20d067 100644 --- a/src/Gui/Dialogs/DlgOnlineHelpImp.h +++ b/src/Gui/Dialogs/DlgOnlineHelpImp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGONLINEHELP_IMP_H -#define GUI_DIALOG_DLGONLINEHELP_IMP_H +#pragma once #include "PropertyPage.h" #include @@ -65,5 +64,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGONLINEHELP_IMP_H diff --git a/src/Gui/Dialogs/DlgParameterFind.h b/src/Gui/Dialogs/DlgParameterFind.h index b650b82056..fcfdc6048a 100644 --- a/src/Gui/Dialogs/DlgParameterFind.h +++ b/src/Gui/Dialogs/DlgParameterFind.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGPARAMETERFIND_H -#define GUI_DIALOG_DLGPARAMETERFIND_H +#pragma once #include #include @@ -76,5 +75,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGPARAMETERFIND_H diff --git a/src/Gui/Dialogs/DlgParameterImp.h b/src/Gui/Dialogs/DlgParameterImp.h index 02d5350444..7f9da645ae 100644 --- a/src/Gui/Dialogs/DlgParameterImp.h +++ b/src/Gui/Dialogs/DlgParameterImp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGPARAMETER_H -#define GUI_DIALOG_DLGPARAMETER_H +#pragma once #include @@ -384,5 +383,3 @@ protected: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGPARAMETER_H diff --git a/src/Gui/Dialogs/DlgPreferencePackManagementImp.h b/src/Gui/Dialogs/DlgPreferencePackManagementImp.h index 05956de75e..c165dc2b82 100644 --- a/src/Gui/Dialogs/DlgPreferencePackManagementImp.h +++ b/src/Gui/Dialogs/DlgPreferencePackManagementImp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGPREFERENCEPACKMANAGEMENTIMP_H -#define GUI_DIALOG_DLGPREFERENCEPACKMANAGEMENTIMP_H +#pragma once #include #include @@ -87,5 +86,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGPREFERENCEPACKMANAGEMENTIMP_H diff --git a/src/Gui/Dialogs/DlgPreferencesImp.h b/src/Gui/Dialogs/DlgPreferencesImp.h index c095435c43..dd8e5fefea 100644 --- a/src/Gui/Dialogs/DlgPreferencesImp.h +++ b/src/Gui/Dialogs/DlgPreferencesImp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGPREFERENCESIMP_H -#define GUI_DIALOG_DLGPREFERENCESIMP_H +#pragma once #include #include @@ -374,5 +373,3 @@ private: }; } // namespace Gui::Dialog - -#endif // GUI_DIALOG_DLGPREFERENCESIMP_H diff --git a/src/Gui/Dialogs/DlgProjectInformationImp.h b/src/Gui/Dialogs/DlgProjectInformationImp.h index 07557cc99f..c9eed3eeb6 100644 --- a/src/Gui/Dialogs/DlgProjectInformationImp.h +++ b/src/Gui/Dialogs/DlgProjectInformationImp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGPROJECTINFORMATIONIMP_H -#define GUI_DIALOG_DLGPROJECTINFORMATIONIMP_H +#pragma once #include @@ -64,6 +63,3 @@ private: } // namespace Dialog } // namespace Gui - - -#endif // GUI_DIALOG_DLGPROJECTINFORMATIONIMP_H diff --git a/src/Gui/Dialogs/DlgProjectUtility.h b/src/Gui/Dialogs/DlgProjectUtility.h index 3307ad0104..19707fbe45 100644 --- a/src/Gui/Dialogs/DlgProjectUtility.h +++ b/src/Gui/Dialogs/DlgProjectUtility.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGPROJECTUTILITY_H -#define GUI_DIALOG_DLGPROJECTUTILITY_H +#pragma once #include #include @@ -56,6 +55,3 @@ protected: } // namespace Dialog } // namespace Gui - - -#endif // GUI_DIALOG_DLGPROJECTUTILITY_H diff --git a/src/Gui/Dialogs/DlgPropertyLink.h b/src/Gui/Dialogs/DlgPropertyLink.h index e0142136cb..3252f8c179 100644 --- a/src/Gui/Dialogs/DlgPropertyLink.h +++ b/src/Gui/Dialogs/DlgPropertyLink.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_DIALOG_DLGPROPERTYLINK_H -#define GUI_DIALOG_DLGPROPERTYLINK_H +#pragma once #include #include @@ -135,6 +134,3 @@ private: } // namespace Dialog } // namespace Gui - - -#endif // GUI_DIALOG_DLGPROPERTYLINK_H diff --git a/src/Gui/Dialogs/DlgRevertToBackupConfigImp.h b/src/Gui/Dialogs/DlgRevertToBackupConfigImp.h index ce073dea7b..0109807871 100644 --- a/src/Gui/Dialogs/DlgRevertToBackupConfigImp.h +++ b/src/Gui/Dialogs/DlgRevertToBackupConfigImp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLG_REVERT_TO_BACKUP_CONFIG_IMP -#define GUI_DIALOG_DLG_REVERT_TO_BACKUP_CONFIG_IMP +#pragma once #include #include @@ -60,5 +59,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLG_REVERT_TO_BACKUP_CONFIG_IMP diff --git a/src/Gui/Dialogs/DlgRunExternal.h b/src/Gui/Dialogs/DlgRunExternal.h index 2a6e0a844e..4ec76e7b95 100644 --- a/src/Gui/Dialogs/DlgRunExternal.h +++ b/src/Gui/Dialogs/DlgRunExternal.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_DIALOG_DlgRunExternal_H -#define GUI_DIALOG_DlgRunExternal_H +#pragma once #include #include @@ -70,5 +69,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DlgRunExternal_H diff --git a/src/Gui/Dialogs/DlgSettingsColorGradientImp.h b/src/Gui/Dialogs/DlgSettingsColorGradientImp.h index d654897d1b..3b78f86781 100644 --- a/src/Gui/Dialogs/DlgSettingsColorGradientImp.h +++ b/src/Gui/Dialogs/DlgSettingsColorGradientImp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGSETTINGSCOLORGRADIENT_IMP_H -#define GUI_DIALOG_DLGSETTINGSCOLORGRADIENT_IMP_H +#pragma once #include #include @@ -107,5 +106,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGSETTINGSCOLORGRADIENT_IMP_H diff --git a/src/Gui/Dialogs/DlgSettingsImageImp.h b/src/Gui/Dialogs/DlgSettingsImageImp.h index 0a5140efa2..6c2886e4c6 100644 --- a/src/Gui/Dialogs/DlgSettingsImageImp.h +++ b/src/Gui/Dialogs/DlgSettingsImageImp.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_DIALOG_DLGSETTINGSIMAGE_IMP_H -#define GUI_DIALOG_DLGSETTINGSIMAGE_IMP_H +#pragma once #include #include @@ -96,5 +95,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGSETTINGSIMAGE_IMP_H diff --git a/src/Gui/Dialogs/DlgThemeEditor.h b/src/Gui/Dialogs/DlgThemeEditor.h index 4989eca631..5c3580a628 100644 --- a/src/Gui/Dialogs/DlgThemeEditor.h +++ b/src/Gui/Dialogs/DlgThemeEditor.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef DLGTHEMEEDITOR_H -#define DLGTHEMEEDITOR_H +#pragma once #include "StyleParameters/ParameterManager.h" @@ -153,5 +152,3 @@ private: std::unique_ptr model; }; } // namespace Gui - -#endif // DLGTHEMEEDITOR_H diff --git a/src/Gui/Dialogs/DlgToolbarsImp.h b/src/Gui/Dialogs/DlgToolbarsImp.h index 885a5db57c..cba5d289ea 100644 --- a/src/Gui/Dialogs/DlgToolbarsImp.h +++ b/src/Gui/Dialogs/DlgToolbarsImp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGTOOLBARS_IMP_H -#define GUI_DIALOG_DLGTOOLBARS_IMP_H +#pragma once #include #include "PropertyPage.h" @@ -156,5 +155,3 @@ protected: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGTOOLBARS_IMP_H diff --git a/src/Gui/Dialogs/DlgUndoRedo.h b/src/Gui/Dialogs/DlgUndoRedo.h index b4aa7cba9a..9405887b7b 100644 --- a/src/Gui/Dialogs/DlgUndoRedo.h +++ b/src/Gui/Dialogs/DlgUndoRedo.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGUNDOREDO_H -#define GUI_DIALOG_DLGUNDOREDO_H +#pragma once #include @@ -67,5 +66,3 @@ protected Q_SLOTS: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGUNDOREDO_H diff --git a/src/Gui/Dialogs/DlgUnitsCalculatorImp.h b/src/Gui/Dialogs/DlgUnitsCalculatorImp.h index 6898ecbcee..8de95533c5 100644 --- a/src/Gui/Dialogs/DlgUnitsCalculatorImp.h +++ b/src/Gui/Dialogs/DlgUnitsCalculatorImp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DlgActivateWindowImp_H -#define GUI_DIALOG_DlgActivateWindowImp_H +#pragma once #include #include @@ -73,5 +72,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DlgActivateWindowImp_H diff --git a/src/Gui/Dialogs/DlgVersionMigrator.h b/src/Gui/Dialogs/DlgVersionMigrator.h index 665269bf0a..1098452c97 100644 --- a/src/Gui/Dialogs/DlgVersionMigrator.h +++ b/src/Gui/Dialogs/DlgVersionMigrator.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef GUI_DIALOG_VERSIONMIGRATOR_H -#define GUI_DIALOG_VERSIONMIGRATOR_H +#pragma once #include #include @@ -127,5 +126,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_VERSIONMIGRATOR_H diff --git a/src/Gui/DockWindow.h b/src/Gui/DockWindow.h index 92d6763588..c0fa244505 100644 --- a/src/Gui/DockWindow.h +++ b/src/Gui/DockWindow.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_DOCKWINDOW_H -#define GUI_DOCKWINDOW_H +#pragma once #include #include @@ -94,5 +93,3 @@ Q_SIGNALS: }; } // namespace Gui - -#endif // GUI_DOCKWINDOW_H diff --git a/src/Gui/DockWindowManager.h b/src/Gui/DockWindowManager.h index d6dae97bca..1edf9491c1 100644 --- a/src/Gui/DockWindowManager.h +++ b/src/Gui/DockWindowManager.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_DOCKWINDOWMANAGER_H -#define GUI_DOCKWINDOWMANAGER_H +#pragma once #include #include @@ -141,5 +140,3 @@ private: } // namespace Gui ENABLE_BITMASK_OPERATORS(Gui::DockWindowOption) - -#endif // GUI_DOCKWINDOWMANAGER_H diff --git a/src/Gui/Document.h b/src/Gui/Document.h index 892dc96eb1..aa18d7d2e6 100644 --- a/src/Gui/Document.h +++ b/src/Gui/Document.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_DOCUMENT_H -#define GUI_DOCUMENT_H +#pragma once #include #include @@ -372,6 +371,3 @@ private: }; } // namespace Gui - - -#endif // GUI_DOCUMENT_H diff --git a/src/Gui/DocumentModel.h b/src/Gui/DocumentModel.h index 0772e75ca2..e2335efddc 100644 --- a/src/Gui/DocumentModel.h +++ b/src/Gui/DocumentModel.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_DOCUMENTMODEL_H -#define GUI_DOCUMENTMODEL_H +#pragma once #include #include @@ -84,6 +83,3 @@ private: }; } // namespace Gui - - -#endif // GUI_DOCUMENTMODEL_H diff --git a/src/Gui/DocumentObserver.h b/src/Gui/DocumentObserver.h index b323e555cb..395d667c98 100644 --- a/src/Gui/DocumentObserver.h +++ b/src/Gui/DocumentObserver.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_DOCUMENTOBSERVER_H -#define GUI_DOCUMENTOBSERVER_H +#pragma once #include #include @@ -388,5 +387,3 @@ private: #endif } // namespace Gui - -#endif // GUI_DOCUMENTOBSERVER_H diff --git a/src/Gui/DocumentObserverPython.h b/src/Gui/DocumentObserverPython.h index 364b908bdf..a7d6c8f67c 100644 --- a/src/Gui/DocumentObserverPython.h +++ b/src/Gui/DocumentObserverPython.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_DOCUMENTOBSERVERPYTHON_H -#define GUI_DOCUMENTOBSERVERPYTHON_H +#pragma once #include #include @@ -111,5 +110,3 @@ private: }; } // namespace Gui - -#endif // GUI_DOCUMENTOBSERVERPYTHON_H diff --git a/src/Gui/DocumentRecovery.h b/src/Gui/DocumentRecovery.h index f52c0ba51d..974957d7ba 100644 --- a/src/Gui/DocumentRecovery.h +++ b/src/Gui/DocumentRecovery.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DOCUMENTRECOVERY_H -#define GUI_DIALOG_DOCUMENTRECOVERY_H +#pragma once #include #include @@ -109,6 +108,3 @@ private: } // namespace Dialog } // namespace Gui - - -#endif // GUI_DIALOG_DOCUMENTRECOVERY_H diff --git a/src/Gui/DownloadItem.h b/src/Gui/DownloadItem.h index d348f67494..830698ac5b 100644 --- a/src/Gui/DownloadItem.h +++ b/src/Gui/DownloadItem.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_DIALOG_DOWNLOADITEM_H -#define GUI_DIALOG_DOWNLOADITEM_H +#pragma once #include #include @@ -160,5 +159,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DOWNLOADITEM_H diff --git a/src/Gui/DownloadManager.h b/src/Gui/DownloadManager.h index bd77bbfd86..3ab4c76d7f 100644 --- a/src/Gui/DownloadManager.h +++ b/src/Gui/DownloadManager.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DOWNLOADMANAGER_H -#define GUI_DIALOG_DOWNLOADMANAGER_H +#pragma once #include #include @@ -127,5 +126,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DOWNLOADMANAGER_H diff --git a/src/Gui/EditableDatumLabel.h b/src/Gui/EditableDatumLabel.h index 32e12556f6..05dd83b7bb 100644 --- a/src/Gui/EditableDatumLabel.h +++ b/src/Gui/EditableDatumLabel.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_EDITABLEDATUMLABEL_H -#define GUI_EDITABLEDATUMLABEL_H +#pragma once #include #include @@ -133,6 +132,3 @@ private: }; } // namespace Gui - - -#endif // GUI_EDITABLEDATUMLABEL_H diff --git a/src/Gui/EditorView.h b/src/Gui/EditorView.h index 5f88a9b10b..a34ef19985 100644 --- a/src/Gui/EditorView.h +++ b/src/Gui/EditorView.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_EDITORVIEW_H -#define GUI_EDITORVIEW_H +#pragma once #include "MDIView.h" #include "Window.h" @@ -189,5 +188,3 @@ private: }; } // namespace Gui - -#endif // GUI_EDITORVIEW_H diff --git a/src/Gui/ElideCheckBox.h b/src/Gui/ElideCheckBox.h index efbc141624..f4c50be910 100644 --- a/src/Gui/ElideCheckBox.h +++ b/src/Gui/ElideCheckBox.h @@ -23,8 +23,7 @@ // This custom widget adds the missing ellipsize functionality in QT5 -#ifndef ELIDECHECKBOX_H -#define ELIDECHECKBOX_H +#pragma once #include #include @@ -51,5 +50,3 @@ protected: }; } // namespace Gui - -#endif // ELIDECHECKBOX_H diff --git a/src/Gui/ElideLabel.h b/src/Gui/ElideLabel.h index 1888dddf2c..e80cd8ee85 100644 --- a/src/Gui/ElideLabel.h +++ b/src/Gui/ElideLabel.h @@ -23,8 +23,7 @@ // This custom widget adds the missing ellipsize functionality in QT5 -#ifndef ELIDELABEL_H -#define ELIDELABEL_H +#pragma once #include #include @@ -50,5 +49,3 @@ protected: }; } // namespace Gui - -#endif // ELIDELABEL_H diff --git a/src/Gui/ExpressionBinding.h b/src/Gui/ExpressionBinding.h index d34b0b763c..931e355ac0 100644 --- a/src/Gui/ExpressionBinding.h +++ b/src/Gui/ExpressionBinding.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef EXPRESSIONBINDING_H -#define EXPRESSIONBINDING_H +#pragma once #include #include @@ -111,5 +110,3 @@ protected: }; } // namespace Gui - -#endif // EXPRESSIONBINDING_H diff --git a/src/Gui/ExpressionBindingPy.h b/src/Gui/ExpressionBindingPy.h index 2e8bfece97..e28304fa5c 100644 --- a/src/Gui/ExpressionBindingPy.h +++ b/src/Gui/ExpressionBindingPy.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef EXPRESSIONBINDINGPY_H -#define EXPRESSIONBINDINGPY_H +#pragma once #include @@ -55,5 +54,3 @@ private: }; } // namespace Gui - -#endif // EXPRESSIONBINDING_H diff --git a/src/Gui/ExpressionCompleter.h b/src/Gui/ExpressionCompleter.h index 3294aac78e..87e3bf4741 100644 --- a/src/Gui/ExpressionCompleter.h +++ b/src/Gui/ExpressionCompleter.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef EXPRESSIONCOMPLETER_H -#define EXPRESSIONCOMPLETER_H +#pragma once #include #include @@ -184,5 +183,3 @@ public: }; } // namespace Gui - -#endif // EXPRESSIONCOMPLETER_H diff --git a/src/Gui/FileDialog.h b/src/Gui/FileDialog.h index 783a2e61a5..d5df74a3f2 100644 --- a/src/Gui/FileDialog.h +++ b/src/Gui/FileDialog.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_FILEDIALOG_H -#define GUI_FILEDIALOG_H +#pragma once #include #include @@ -315,5 +314,3 @@ private: }; } // namespace Gui - -#endif // GUI_FILEDIALOG_H diff --git a/src/Gui/FileHandler.h b/src/Gui/FileHandler.h index 47be45115a..af64af4835 100644 --- a/src/Gui/FileHandler.h +++ b/src/Gui/FileHandler.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef GUI_FILE_HANDLER_H -#define GUI_FILE_HANDLER_H +#pragma once #include #include @@ -61,5 +60,3 @@ private: }; } // namespace Gui - -#endif // GUI_FILE_HANDLER_H diff --git a/src/Gui/Flag.h b/src/Gui/Flag.h index 7078ac1d6e..649a71f15f 100644 --- a/src/Gui/Flag.h +++ b/src/Gui/Flag.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_FLAG_H -#define GUI_FLAG_H +#pragma once #include #include @@ -144,6 +143,3 @@ private: }; } // namespace Gui - - -#endif // GUI_FLAG_H diff --git a/src/Gui/FontScaledSVG.h b/src/Gui/FontScaledSVG.h index a0b9396d15..988e00572e 100644 --- a/src/Gui/FontScaledSVG.h +++ b/src/Gui/FontScaledSVG.h @@ -23,8 +23,7 @@ // This custom widget scales an svg according to fonts -#ifndef FONTSCALEDSVG_H -#define FONTSCALEDSVG_H +#pragma once #include #include @@ -55,5 +54,3 @@ private: }; } // namespace Gui - -#endif // FONTSCALEDSVG_H diff --git a/src/Gui/FreeCADStyle.h b/src/Gui/FreeCADStyle.h index d795a295b1..ada3f58c62 100644 --- a/src/Gui/FreeCADStyle.h +++ b/src/Gui/FreeCADStyle.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FREECAD_FREECADSTYLE_H -#define FREECAD_FREECADSTYLE_H +#pragma once #include #include @@ -46,5 +45,3 @@ protected: }; } // namespace Gui - -#endif // FREECAD_FREECADSTYLE_H diff --git a/src/Gui/GLBuffer.h b/src/Gui/GLBuffer.h index 0fa5ac76d7..53c69c5e4b 100644 --- a/src/Gui/GLBuffer.h +++ b/src/Gui/GLBuffer.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_GLBUFFER_H -#define GUI_GLBUFFER_H +#pragma once #include #include @@ -92,5 +91,3 @@ private: }; } // namespace Gui - -#endif // GUI_GLBUFFER_H diff --git a/src/Gui/GLPainter.h b/src/Gui/GLPainter.h index ca015238fc..051dc88f4b 100644 --- a/src/Gui/GLPainter.h +++ b/src/Gui/GLPainter.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_GLPAINTER_H -#define GUI_GLPAINTER_H +#pragma once #include @@ -141,5 +140,3 @@ public: }; } // namespace Gui - -#endif // GUI_GLPAINTER_H diff --git a/src/Gui/GraphicsViewZoom.h b/src/Gui/GraphicsViewZoom.h index 53167435b1..c77fc376d8 100644 --- a/src/Gui/GraphicsViewZoom.h +++ b/src/Gui/GraphicsViewZoom.h @@ -30,8 +30,7 @@ * */ -#ifndef GRAPHICSVIEWZOOM_H -#define GRAPHICSVIEWZOOM_H +#pragma once #include #include @@ -91,5 +90,3 @@ private: QPointF target_scene_pos, target_viewport_pos; bool eventFilter(QObject* object, QEvent* event) override; }; - -#endif // GRAPHICSVIEWZOOM_H diff --git a/src/Gui/GraphvizView.h b/src/Gui/GraphvizView.h index e50a0f85b4..7a8e22906f 100644 --- a/src/Gui/GraphvizView.h +++ b/src/Gui/GraphvizView.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_GRAPHVIZVIEW_H -#define GUI_GRAPHVIZVIEW_H +#pragma once #include @@ -89,5 +88,3 @@ private: }; } // namespace Gui - -#endif // GUI_GRAPHVIZVIEW_H diff --git a/src/Gui/GuiApplication.h b/src/Gui/GuiApplication.h index d4ee11c600..453d32ed18 100644 --- a/src/Gui/GuiApplication.h +++ b/src/Gui/GuiApplication.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_APPLICATION_H -#define GUI_APPLICATION_H +#pragma once #include "GuiApplicationNativeEventAware.h" #include // For Base::SystemExitException @@ -94,5 +93,3 @@ public: }; } // namespace Gui - -#endif // GUI_APPLICATION_H diff --git a/src/Gui/GuiApplicationNativeEventAware.h b/src/Gui/GuiApplicationNativeEventAware.h index 2bc2fc835e..d0522dca7e 100644 --- a/src/Gui/GuiApplicationNativeEventAware.h +++ b/src/Gui/GuiApplicationNativeEventAware.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUIAPPLICATIONNATIVEEVENTAWARE_H -#define GUIAPPLICATIONNATIVEEVENTAWARE_H +#pragma once #include #include @@ -62,5 +61,3 @@ private: #endif }; // end class GUIApplicationNativeEventAware } // end namespace Gui - -#endif // GUIAPPLICATIONNATIVEEVENTAWARE_H diff --git a/src/Gui/GuiConsole.h b/src/Gui/GuiConsole.h index 6d860fd11f..d3675020f2 100644 --- a/src/Gui/GuiConsole.h +++ b/src/Gui/GuiConsole.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_GUICONSOLE_H -#define GUI_GUICONSOLE_H +#pragma once #include @@ -66,5 +65,3 @@ protected: }; } // namespace Gui - -#endif // GUI_GUICONSOLE_H diff --git a/src/Gui/ImageView.h b/src/Gui/ImageView.h index 357a40031c..d0b2a405fc 100644 --- a/src/Gui/ImageView.h +++ b/src/Gui/ImageView.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef GUI_IMAGE_VIEW_H -#define GUI_IMAGE_VIEW_H +#pragma once #include @@ -98,5 +97,3 @@ private: }; } // namespace Gui - -#endif // GUI_IMAGE_VIEW_H diff --git a/src/Gui/InputField.h b/src/Gui/InputField.h index 21009635c4..7bb8b24fb1 100644 --- a/src/Gui/InputField.h +++ b/src/Gui/InputField.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_INPUTFIELD_H -#define GUI_INPUTFIELD_H +#pragma once #include #include @@ -245,5 +244,3 @@ private: }; } // namespace Gui - -#endif // GUI_INPUTFIELD_H diff --git a/src/Gui/InputHint.h b/src/Gui/InputHint.h index 8d7788a537..72b9e64865 100644 --- a/src/Gui/InputHint.h +++ b/src/Gui/InputHint.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_INPUTHINT_H -#define GUI_INPUTHINT_H +#pragma once #include "FCGlobal.h" @@ -322,5 +321,3 @@ static std::list lookupHints( } } // namespace Gui - -#endif // GUI_INPUTHINT_H diff --git a/src/Gui/InputHintPy.h b/src/Gui/InputHintPy.h index 23c5bc74eb..033b75de04 100644 --- a/src/Gui/InputHintPy.h +++ b/src/Gui/InputHintPy.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef INPUTHINTPY_H -#define INPUTHINTPY_H +#pragma once #include @@ -30,5 +29,3 @@ namespace Gui { void registerUserInputEnumInPython(PyObject* module); } // Namespace Gui - -#endif // INPUTHINTPY_H diff --git a/src/Gui/InputHintWidget.h b/src/Gui/InputHintWidget.h index 19eb1f8f68..3cb44d89ad 100644 --- a/src/Gui/InputHintWidget.h +++ b/src/Gui/InputHintWidget.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef INPUTHINTWIDGET_H -#define INPUTHINTWIDGET_H +#pragma once #include @@ -50,4 +49,3 @@ private: }; } // Namespace Gui -#endif // INPUTHINTWIDGET_H diff --git a/src/Gui/InputVector.h b/src/Gui/InputVector.h index 355ba1a29d..b0bd1483e9 100644 --- a/src/Gui/InputVector.h +++ b/src/Gui/InputVector.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_INPUTVECTOR_H -#define GUI_INPUTVECTOR_H +#pragma once #include #include @@ -615,5 +614,3 @@ protected: }; } // namespace Gui - -#endif // GUI_INPUTVECTOR_H diff --git a/src/Gui/Inventor/Draggers/Gizmo.h b/src/Gui/Inventor/Draggers/Gizmo.h index 4b63878840..4320a61612 100644 --- a/src/Gui/Inventor/Draggers/Gizmo.h +++ b/src/Gui/Inventor/Draggers/Gizmo.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_GIZMO_H -#define GUI_GIZMO_H +#pragma once #include #include @@ -257,5 +256,3 @@ private: }; } // namespace Gui - -#endif /* GUI_GIZMO_H */ diff --git a/src/Gui/Inventor/Draggers/GizmoStyleParameters.h b/src/Gui/Inventor/Draggers/GizmoStyleParameters.h index eda90ebb50..84ed921284 100644 --- a/src/Gui/Inventor/Draggers/GizmoStyleParameters.h +++ b/src/Gui/Inventor/Draggers/GizmoStyleParameters.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_GIZMO_STYLE_PARAMETERS_H -#define GUI_GIZMO_STYLE_PARAMETERS_H +#pragma once #include #include @@ -37,5 +36,3 @@ DEFINE_STYLE_PARAMETER(RotationGizmoActiveColor, Base::Color(1.0F, 1.0F, 0.0F)); DEFINE_STYLE_PARAMETER(DimensionVisualizerColor, Base::Color(0.214F, 0.560F, 0.930F)); } // namespace Gui::StyleParameters - -#endif /* GUI_GIZMO_STYLE_PARAMETERS_H */ diff --git a/src/Gui/Inventor/Draggers/SoLinearDragger.h b/src/Gui/Inventor/Draggers/SoLinearDragger.h index a1678c9c78..d77ccfb458 100644 --- a/src/Gui/Inventor/Draggers/SoLinearDragger.h +++ b/src/Gui/Inventor/Draggers/SoLinearDragger.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_LINEAR_DRAGGER_H -#define GUI_LINEAR_DRAGGER_H +#pragma once #include #include @@ -136,5 +135,3 @@ private: }; } // namespace Gui - -#endif /* GUI_LINEAR_DRAGGER_H */ diff --git a/src/Gui/Inventor/Draggers/SoLinearDraggerGeometry.h b/src/Gui/Inventor/Draggers/SoLinearDraggerGeometry.h index 3595b4dbb4..e790a393f1 100644 --- a/src/Gui/Inventor/Draggers/SoLinearDraggerGeometry.h +++ b/src/Gui/Inventor/Draggers/SoLinearDraggerGeometry.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_LINEAR_DRAGGER_GEOMETRY_H -#define GUI_LINEAR_DRAGGER_GEOMETRY_H +#pragma once #include #include @@ -132,5 +131,3 @@ private: }; } // namespace Gui - -#endif /* GUI_LINEAR_DRAGGER_GEOMETRY_H */ diff --git a/src/Gui/Inventor/Draggers/SoPlanarDragger.h b/src/Gui/Inventor/Draggers/SoPlanarDragger.h index 665470bbdf..220ea0917e 100644 --- a/src/Gui/Inventor/Draggers/SoPlanarDragger.h +++ b/src/Gui/Inventor/Draggers/SoPlanarDragger.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_PLANAR_DRAGGER_H -#define GUI_PLANAR_DRAGGER_H +#pragma once #include #include @@ -90,5 +89,3 @@ private: }; } // namespace Gui - -#endif /* GUI_PLANAR_DRAGGER_H */ diff --git a/src/Gui/Inventor/Draggers/SoRotationDragger.h b/src/Gui/Inventor/Draggers/SoRotationDragger.h index 512f17e552..8a307ee54f 100644 --- a/src/Gui/Inventor/Draggers/SoRotationDragger.h +++ b/src/Gui/Inventor/Draggers/SoRotationDragger.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_ROTATION_DRAGGER_H -#define GUI_ROTATION_DRAGGER_H +#pragma once #include #include @@ -128,5 +127,3 @@ private: }; } // namespace Gui - -#endif /* GUI_ROTATION_DRAGGER_H */ diff --git a/src/Gui/Inventor/Draggers/SoRotationDraggerGeometry.h b/src/Gui/Inventor/Draggers/SoRotationDraggerGeometry.h index 2727649b23..2b0e78b43a 100644 --- a/src/Gui/Inventor/Draggers/SoRotationDraggerGeometry.h +++ b/src/Gui/Inventor/Draggers/SoRotationDraggerGeometry.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_ROTATION_DRAGGER_GEOMETRY_H -#define GUI_ROTATION_DRAGGER_GEOMETRY_H +#pragma once #include #include @@ -211,5 +210,3 @@ private: }; } // namespace Gui - -#endif /* GUI_ROTATION_DRAGGER_GEOMETRY_H */ diff --git a/src/Gui/Inventor/Draggers/SoTransformDragger.h b/src/Gui/Inventor/Draggers/SoTransformDragger.h index a732d4a033..c67f6b21d7 100644 --- a/src/Gui/Inventor/Draggers/SoTransformDragger.h +++ b/src/Gui/Inventor/Draggers/SoTransformDragger.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_TRANSFORM_DRAGGER_H -#define GUI_TRANSFORM_DRAGGER_H +#pragma once #include #include @@ -203,5 +202,3 @@ private: }; } // namespace Gui - -#endif /* GUI_TRANSFORM_DRAGGER_H */ diff --git a/src/Gui/Inventor/MarkerBitmaps.h b/src/Gui/Inventor/MarkerBitmaps.h index 1fe87f46e3..fc9b240339 100644 --- a/src/Gui/Inventor/MarkerBitmaps.h +++ b/src/Gui/Inventor/MarkerBitmaps.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_INVENTOR_MARKERBITMAPS_H -#define GUI_INVENTOR_MARKERBITMAPS_H +#pragma once #include #include @@ -55,5 +54,3 @@ private: } // namespace Inventor } // namespace Gui - -#endif // GUI_INVENTOR_MARKERBITMAPS_H diff --git a/src/Gui/Inventor/SmSwitchboard.h b/src/Gui/Inventor/SmSwitchboard.h index 3bce360cba..32f8951487 100644 --- a/src/Gui/Inventor/SmSwitchboard.h +++ b/src/Gui/Inventor/SmSwitchboard.h @@ -1,7 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause -#ifndef SMALLCHANGE_SWITCHBOARD_H -#define SMALLCHANGE_SWITCHBOARD_H +#pragma once /**************************************************************************\ * Copyright (c) Kongsberg Oil & Gas Technologies AS @@ -64,5 +63,3 @@ public: protected: ~SmSwitchboard() override; }; - -#endif // !SMALLCHANGE_SWITCHBOARD_H diff --git a/src/Gui/Inventor/So3DAnnotation.h b/src/Gui/Inventor/So3DAnnotation.h index de494779a3..2b1440d6c0 100644 --- a/src/Gui/Inventor/So3DAnnotation.h +++ b/src/Gui/Inventor/So3DAnnotation.h @@ -21,8 +21,7 @@ * Suite 330, Boston, MA 02111-1307, USA * * * ***************************************************************************/ -#ifndef GUI_SO3DANNOTATION_H -#define GUI_SO3DANNOTATION_H +#pragma once #include #include @@ -125,5 +124,3 @@ protected: }; } // namespace Gui - -#endif // GUI_SO3DANNOTATION_H diff --git a/src/Gui/Inventor/SoAutoZoomTranslation.h b/src/Gui/Inventor/SoAutoZoomTranslation.h index 8087ecf46f..4a5c1853dc 100644 --- a/src/Gui/Inventor/SoAutoZoomTranslation.h +++ b/src/Gui/Inventor/SoAutoZoomTranslation.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_SOAUTOZOOMTRANSLATION_H -#define GUI_SOAUTOZOOMTRANSLATION_H +#pragma once #include #include @@ -60,4 +59,3 @@ private: }; } // namespace Gui -#endif // GUI_SOAUTOZOOMTRANSLATION_H diff --git a/src/Gui/Inventor/SoAxisCrossKit.h b/src/Gui/Inventor/SoAxisCrossKit.h index b3ce9e6293..5b2ecbbd74 100644 --- a/src/Gui/Inventor/SoAxisCrossKit.h +++ b/src/Gui/Inventor/SoAxisCrossKit.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_SOSHAPESCALE_H -#define GUI_SOSHAPESCALE_H +#pragma once #include #include @@ -122,5 +121,3 @@ private: }; } // namespace Gui - -#endif // GUI_SOSHAPESCALE_H diff --git a/src/Gui/Inventor/SoDrawingGrid.h b/src/Gui/Inventor/SoDrawingGrid.h index fa3a164bb2..6c88c954c8 100644 --- a/src/Gui/Inventor/SoDrawingGrid.h +++ b/src/Gui/Inventor/SoDrawingGrid.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_INVENTOR_SODRAWINGGRID_H -#define GUI_INVENTOR_SODRAWINGGRID_H +#pragma once #include #include @@ -60,5 +59,3 @@ private: } // namespace Inventor } // namespace Gui - -#endif // GUI_INVENTOR_SODRAWINGGRID_H diff --git a/src/Gui/Inventor/SoFCBackgroundGradient.h b/src/Gui/Inventor/SoFCBackgroundGradient.h index c0d23887a4..7038cebc57 100644 --- a/src/Gui/Inventor/SoFCBackgroundGradient.h +++ b/src/Gui/Inventor/SoFCBackgroundGradient.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_SOFCBACKGROUNDGRADIENT_H -#define GUI_SOFCBACKGROUNDGRADIENT_H +#pragma once #include #include @@ -69,6 +68,3 @@ protected: }; } // namespace Gui - - -#endif // GUI_SOFCBACKGROUNDGRADIENT_H diff --git a/src/Gui/Inventor/SoFCBoundingBox.h b/src/Gui/Inventor/SoFCBoundingBox.h index 84aea44955..110db40e88 100644 --- a/src/Gui/Inventor/SoFCBoundingBox.h +++ b/src/Gui/Inventor/SoFCBoundingBox.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef COIN_SOFCBOUNDINGBOX_H -#define COIN_SOFCBOUNDINGBOX_H +#pragma once #include #include @@ -109,6 +108,3 @@ protected: }; } // namespace Gui - - -#endif // COIN_SOFCBOUNDINGBOX_H diff --git a/src/Gui/Inventor/SoFCPlacementIndicatorKit.h b/src/Gui/Inventor/SoFCPlacementIndicatorKit.h index e232d9ea6a..3c3a39c206 100644 --- a/src/Gui/Inventor/SoFCPlacementIndicatorKit.h +++ b/src/Gui/Inventor/SoFCPlacementIndicatorKit.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef SOFCPLACEMENTINDICATORKIT_H -#define SOFCPLACEMENTINDICATORKIT_H +#pragma once #include @@ -106,5 +105,3 @@ private: }; } // namespace Gui - -#endif // SOFCPLACEMENTINDICATORKIT_H diff --git a/src/Gui/Inventor/SoFCTransform.h b/src/Gui/Inventor/SoFCTransform.h index 98e9c1d9cd..8091d32b58 100644 --- a/src/Gui/Inventor/SoFCTransform.h +++ b/src/Gui/Inventor/SoFCTransform.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef GUI_INVENTOR_SOFCTRANSFORM_H -#define GUI_INVENTOR_SOFCTRANSFORM_H +#pragma once #include #include @@ -61,5 +60,3 @@ protected: }; } // namespace Gui - -#endif // GUI_INVENTOR_SOFCTRANSFORM_H diff --git a/src/Gui/Inventor/SoMouseWheelEvent.h b/src/Gui/Inventor/SoMouseWheelEvent.h index d311ffeb4d..717f83ad34 100644 --- a/src/Gui/Inventor/SoMouseWheelEvent.h +++ b/src/Gui/Inventor/SoMouseWheelEvent.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SOMOUSEWHEELEVENT_H_FC -#define SOMOUSEWHEELEVENT_H_FC +#pragma once #include @@ -65,5 +64,3 @@ public: // methods private: // data int delta; }; - -#endif diff --git a/src/Gui/Inventor/SoToggleSwitch.h b/src/Gui/Inventor/SoToggleSwitch.h index 33a4344bf0..01d84cf331 100644 --- a/src/Gui/Inventor/SoToggleSwitch.h +++ b/src/Gui/Inventor/SoToggleSwitch.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef SO_TOGGLE_SWITCH -#define SO_TOGGLE_SWITCH +#pragma once #include @@ -55,5 +54,3 @@ protected: private: using inherited = SoSwitch; }; - -#endif /* SO_TOGGLE_SWITCH */ diff --git a/src/Gui/Language/Translator.h b/src/Gui/Language/Translator.h index 40813c5255..502caf31cc 100644 --- a/src/Gui/Language/Translator.h +++ b/src/Gui/Language/Translator.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_TRANSLATOR_H -#define GUI_TRANSLATOR_H +#pragma once #include #include @@ -110,5 +109,3 @@ private: }; } // namespace Gui - -#endif // GUI_TRANSLATOR_H diff --git a/src/Gui/MDIView.h b/src/Gui/MDIView.h index 03a881b85b..6e4d7dd77a 100644 --- a/src/Gui/MDIView.h +++ b/src/Gui/MDIView.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_MDIVIEW_H -#define GUI_MDIVIEW_H +#pragma once #include #include @@ -214,5 +213,3 @@ private: }; } // namespace Gui - -#endif // GUI_MDIVIEW_H diff --git a/src/Gui/MDIViewPy.h b/src/Gui/MDIViewPy.h index 702f15d4a1..102a968413 100644 --- a/src/Gui/MDIViewPy.h +++ b/src/Gui/MDIViewPy.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_MDIVIEWPY_H -#define GUI_MDIVIEWPY_H +#pragma once #include #include @@ -79,5 +78,3 @@ private: }; } // namespace Gui - -#endif // GUI_MDIVIEWPY_H diff --git a/src/Gui/MDIViewPyWrap.h b/src/Gui/MDIViewPyWrap.h index f9a3267d49..3a26246ede 100644 --- a/src/Gui/MDIViewPyWrap.h +++ b/src/Gui/MDIViewPyWrap.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_MDIVIEWPYWRAP_H -#define GUI_MDIVIEWPYWRAP_H +#pragma once #include #include @@ -87,5 +86,3 @@ private: }; } // namespace Gui - -#endif // GUI_MDIVIEWPYWRAP_H diff --git a/src/Gui/Macro.h b/src/Gui/Macro.h index 632e084f58..1d2bc90a60 100644 --- a/src/Gui/Macro.h +++ b/src/Gui/Macro.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_MACRO_H -#define GUI_MACRO_H +#pragma once #include #include @@ -238,6 +237,3 @@ private: }; } // namespace Gui - - -#endif // GUI_MACRO_H diff --git a/src/Gui/MainWindow.h b/src/Gui/MainWindow.h index 933d29e7ed..9a25dd58c3 100644 --- a/src/Gui/MainWindow.h +++ b/src/Gui/MainWindow.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_MAINWINDOW_H -#define GUI_MAINWINDOW_H +#pragma once #include #include @@ -464,5 +463,3 @@ private: }; } // namespace Gui - -#endif // GUI_MAINWINDOW_H diff --git a/src/Gui/MainWindowPy.h b/src/Gui/MainWindowPy.h index 111f20d589..d17f37b106 100644 --- a/src/Gui/MainWindowPy.h +++ b/src/Gui/MainWindowPy.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_MAINWINDOWPY_H -#define GUI_MAINWINDOWPY_H +#pragma once #include #include @@ -63,5 +62,3 @@ private: }; } // namespace Gui - -#endif // GUI_MAINWINDOWPY_H diff --git a/src/Gui/ManualAlignment.h b/src/Gui/ManualAlignment.h index 5c28bd9c66..4cc9ba5b09 100644 --- a/src/Gui/ManualAlignment.h +++ b/src/Gui/ManualAlignment.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_MANUALALIGNMENT_H -#define GUI_MANUALALIGNMENT_H +#pragma once #include #include @@ -283,6 +282,3 @@ private: }; } // namespace Gui - - -#endif // GUI_MANUALALIGNMENT_H diff --git a/src/Gui/MenuManager.h b/src/Gui/MenuManager.h index df1f1e9107..b27d5a4fef 100644 --- a/src/Gui/MenuManager.h +++ b/src/Gui/MenuManager.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_MENUMANAGER_H -#define GUI_MENUMANAGER_H +#pragma once #include #include @@ -105,6 +104,3 @@ private: }; } // namespace Gui - - -#endif // GUI_MENUMANAGER_H diff --git a/src/Gui/MergeDocuments.h b/src/Gui/MergeDocuments.h index cf3d5c7383..953faa62ba 100644 --- a/src/Gui/MergeDocuments.h +++ b/src/Gui/MergeDocuments.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_MERGEDOCUMENTS_H -#define GUI_MERGEDOCUMENTS_H +#pragma once #include #include @@ -68,5 +67,3 @@ private: }; } // namespace Gui - -#endif // GUI_MERGEDOCUMENTS_H diff --git a/src/Gui/MetaTypes.h b/src/Gui/MetaTypes.h index 254ab2cd3d..8dc608af2b 100644 --- a/src/Gui/MetaTypes.h +++ b/src/Gui/MetaTypes.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_METATYPES_H -#define GUI_METATYPES_H +#pragma once #include #include @@ -43,5 +42,3 @@ Q_DECLARE_METATYPE(QList) Q_DECLARE_METATYPE(App::SubObjectT) Q_DECLARE_METATYPE(QList) // NOLINTEND - -#endif // GUI_METATYPES_H diff --git a/src/Gui/ModuleIO.h b/src/Gui/ModuleIO.h index 4010be3e84..8922ed0ed4 100644 --- a/src/Gui/ModuleIO.h +++ b/src/Gui/ModuleIO.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef GUI_MODULE_IO_H -#define GUI_MODULE_IO_H +#pragma once #include #include @@ -69,5 +68,3 @@ public: }; } // namespace Gui - -#endif // GUI_MODULE_IO_H diff --git a/src/Gui/MouseSelection.h b/src/Gui/MouseSelection.h index 2e7d48ec49..62a268bf40 100644 --- a/src/Gui/MouseSelection.h +++ b/src/Gui/MouseSelection.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef MOUSESELECTION_H -#define MOUSESELECTION_H +#pragma once #include #include @@ -270,5 +269,3 @@ public: }; } // namespace Gui - -#endif // MOUSESELECTION_H diff --git a/src/Gui/Multisample.h b/src/Gui/Multisample.h index f8ff425fdf..161050a040 100644 --- a/src/Gui/Multisample.h +++ b/src/Gui/Multisample.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef GUI_MULTISAMPLE_H -#define GUI_MULTISAMPLE_H +#pragma once #include #include @@ -70,5 +69,3 @@ private: }; } // namespace Gui - -#endif // GUI_MULTISAMPLE_H diff --git a/src/Gui/Namespace.h b/src/Gui/Namespace.h index dadaf51583..5f9efb43f9 100644 --- a/src/Gui/Namespace.h +++ b/src/Gui/Namespace.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_NAMESPACE_H -#define GUI_NAMESPACE_H +#pragma once namespace Gui @@ -40,5 +39,3 @@ enum SelectionRole }; } // namespace Gui - -#endif // GUI_NAMESPACE_H diff --git a/src/Gui/NaviCube.h b/src/Gui/NaviCube.h index 9b960063b9..85fc8f1928 100644 --- a/src/Gui/NaviCube.h +++ b/src/Gui/NaviCube.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef SRC_GUI_NAVICUBE_H_ -#define SRC_GUI_NAVICUBE_H_ +#pragma once #include #include @@ -78,5 +77,3 @@ public: private: NaviCubeImplementation* m_NaviCubeImplementation; }; - -#endif /* SRC_GUI_NAVICUBE_H_ */ diff --git a/src/Gui/Navigation/GestureNavigationStyle.h b/src/Gui/Navigation/GestureNavigationStyle.h index 45430c24d2..6b559cabad 100644 --- a/src/Gui/Navigation/GestureNavigationStyle.h +++ b/src/Gui/Navigation/GestureNavigationStyle.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GESTURENAVIGATIONSTYLE2_H -#define GESTURENAVIGATIONSTYLE2_H +#pragma once #include "Navigation/NavigationStyle.h" @@ -120,4 +119,3 @@ public: // gesture reactions }; } // namespace Gui -#endif // GESTURENAVIGATIONSTYLE2_H diff --git a/src/Gui/Navigation/NavigationAnimation.h b/src/Gui/Navigation/NavigationAnimation.h index bbc9e3fc87..8b8d1e9da5 100644 --- a/src/Gui/Navigation/NavigationAnimation.h +++ b/src/Gui/Navigation/NavigationAnimation.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_NAVIGATIONANIMATION_H -#define GUI_NAVIGATIONANIMATION_H +#pragma once #include "Navigation/NavigationStyle.h" #include @@ -101,5 +100,3 @@ private: }; } // namespace Gui - -#endif // GUI_NAVIGATIONANIMATION_H diff --git a/src/Gui/Navigation/NavigationAnimator.h b/src/Gui/Navigation/NavigationAnimator.h index 09a820f9aa..f208561a01 100644 --- a/src/Gui/Navigation/NavigationAnimator.h +++ b/src/Gui/Navigation/NavigationAnimator.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_NAVIGATIONANIMATOR_H -#define GUI_NAVIGATIONANIMATOR_H +#pragma once #include "Navigation/NavigationStyle.h" #include @@ -49,5 +48,3 @@ private: }; } // namespace Gui - -#endif // GUI_NAVIGATIONANIMATOR_H diff --git a/src/Gui/Navigation/NavigationStateChart.h b/src/Gui/Navigation/NavigationStateChart.h index 61ffe8afe8..f17e9d4ccd 100644 --- a/src/Gui/Navigation/NavigationStateChart.h +++ b/src/Gui/Navigation/NavigationStateChart.h @@ -22,8 +22,7 @@ **************************************************************************/ -#ifndef GUI_NAVIGATIONSTATECHART_H -#define GUI_NAVIGATIONSTATECHART_H +#pragma once #include #include @@ -148,5 +147,3 @@ private: } // namespace Gui // NOLINTEND(cppcoreguidelines-avoid*, readability-avoid-const-params-in-decls) - -#endif // GUI_NAVIGATIONSTATECHART_H diff --git a/src/Gui/Navigation/NavigationStyle.h b/src/Gui/Navigation/NavigationStyle.h index 7ac76f33ef..c2a822db13 100644 --- a/src/Gui/Navigation/NavigationStyle.h +++ b/src/Gui/Navigation/NavigationStyle.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef GUI_NAVIGATIONSTYLE_H -#define GUI_NAVIGATIONSTYLE_H +#pragma once #include #include @@ -560,5 +559,3 @@ protected: // NOLINTEND(cppcoreguidelines-avoid*, readability-avoid-const-params-in-decls) Q_DECLARE_OPERATORS_FOR_FLAGS(Gui::NavigationStyle::RotationCenterModes) - -#endif // GUI_NAVIGATIONSTYLE_H diff --git a/src/Gui/Navigation/SiemensNXNavigationStyle.h b/src/Gui/Navigation/SiemensNXNavigationStyle.h index 439ac1eeae..a9ed75ba94 100644 --- a/src/Gui/Navigation/SiemensNXNavigationStyle.h +++ b/src/Gui/Navigation/SiemensNXNavigationStyle.h @@ -22,8 +22,7 @@ **************************************************************************/ -#ifndef GUI_SIEMENSNXNAVIGATIONSTYLE_H -#define GUI_SIEMENSNXNAVIGATIONSTYLE_H +#pragma once #include @@ -60,5 +59,3 @@ private: } // namespace Gui // NOLINTEND(cppcoreguidelines-avoid*, readability-avoid-const-params-in-decls) - -#endif // GUI_SIEMENSNXNAVIGATIONSTYLE_H diff --git a/src/Gui/NetworkRetriever.h b/src/Gui/NetworkRetriever.h index 6466f0804a..fdced9b62e 100644 --- a/src/Gui/NetworkRetriever.h +++ b/src/Gui/NetworkRetriever.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_NETWORKRETRIEVER_H -#define GUI_NETWORKRETRIEVER_H +#pragma once #include @@ -102,5 +101,3 @@ private: }; } // namespace Gui - -#endif // GUI_NETWORKRETRIEVER_H diff --git a/src/Gui/NotificationArea.h b/src/Gui/NotificationArea.h index a11de7b46f..075f3d4673 100644 --- a/src/Gui/NotificationArea.h +++ b/src/Gui/NotificationArea.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_NOTIFICATIONAREA_H -#define GUI_NOTIFICATIONAREA_H +#pragma once #include #include @@ -89,5 +88,3 @@ private: } // namespace Gui - -#endif // GUI_NOTIFICATIONAREA_H diff --git a/src/Gui/NotificationBox.h b/src/Gui/NotificationBox.h index b9b7df988c..65b701aaf1 100644 --- a/src/Gui/NotificationBox.h +++ b/src/Gui/NotificationBox.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_NOTIFICATIONBOX_H -#define GUI_NOTIFICATIONBOX_H +#pragma once #include @@ -129,5 +128,3 @@ inline bool operator&(NotificationBox::Options lhs, NotificationBox::Options rhs } } // namespace Gui - -#endif // GUI_NOTIFICATIONBOX_H diff --git a/src/Gui/Notifications.h b/src/Gui/Notifications.h index c77042e6f9..1b69f6c090 100644 --- a/src/Gui/Notifications.h +++ b/src/Gui/Notifications.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_NOTIFICATIONS_H -#define GUI_NOTIFICATIONS_H +#pragma once #include #include @@ -425,5 +424,3 @@ inline void Gui::Notification(TNotifier&& notifier, TCaption&& caption, TMessage std::forward(message) ); } - -#endif // GUI_NOTIFICATIONS_H diff --git a/src/Gui/OnlineDocumentation.h b/src/Gui/OnlineDocumentation.h index e56597fa6e..d546ce388b 100644 --- a/src/Gui/OnlineDocumentation.h +++ b/src/Gui/OnlineDocumentation.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_ONLINEDOCUMENTATION_H -#define GUI_ONLINEDOCUMENTATION_H +#pragma once #include #include @@ -105,5 +104,3 @@ private: }; } // namespace Gui - -#endif // GUI_ONLINEDOCUMENTATION_H diff --git a/src/Gui/OverlayManager.h b/src/Gui/OverlayManager.h index 9e2392acd7..fd622785b1 100644 --- a/src/Gui/OverlayManager.h +++ b/src/Gui/OverlayManager.h @@ -20,8 +20,7 @@ * * ****************************************************************************/ -#ifndef FC_OVERLAYMANAGER_H -#define FC_OVERLAYMANAGER_H +#pragma once #include #include @@ -198,5 +197,3 @@ private: }; } // namespace Gui - -#endif // FC_OVERLAYMANAGER_H diff --git a/src/Gui/OverlayParams.h b/src/Gui/OverlayParams.h index 132710800a..1b3bdbcd35 100644 --- a/src/Gui/OverlayParams.h +++ b/src/Gui/OverlayParams.h @@ -20,8 +20,7 @@ * * ****************************************************************************/ -#ifndef GUI_OVERLAY_PARAMS_H -#define GUI_OVERLAY_PARAMS_H +#pragma once /*[[[cog import OverlayParams @@ -409,5 +408,3 @@ public: }; // class OverlayParams } // namespace Gui //[[[end]]] - -#endif // GUI_OVERLAY_PARAMS_H diff --git a/src/Gui/OverlayWidgets.h b/src/Gui/OverlayWidgets.h index 9b9108d2c5..1d72b6ea83 100644 --- a/src/Gui/OverlayWidgets.h +++ b/src/Gui/OverlayWidgets.h @@ -20,8 +20,7 @@ * * ****************************************************************************/ -#ifndef FC_OVERLAYWIDGETS_H -#define FC_OVERLAYWIDGETS_H +#pragma once #include #include @@ -747,5 +746,3 @@ private: }; } // namespace Gui - -#endif // FC_OVERLAYWIDGETS_H diff --git a/src/Gui/ParamHandler.h b/src/Gui/ParamHandler.h index 2426c12eb5..69247f09a7 100644 --- a/src/Gui/ParamHandler.h +++ b/src/Gui/ParamHandler.h @@ -19,8 +19,7 @@ * * ***************************************************************************/ -#ifndef GUI_PARAM_HANDLER_H -#define GUI_PARAM_HANDLER_H +#pragma once #include #include @@ -266,5 +265,3 @@ protected: }; } // namespace Gui - -#endif // GUI_PARAM_HANDLER_H diff --git a/src/Gui/Placement.h b/src/Gui/Placement.h index 2be324e7ec..9713ee09df 100644 --- a/src/Gui/Placement.h +++ b/src/Gui/Placement.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_PLACEMENT_H -#define GUI_PLACEMENT_H +#pragma once #include #include @@ -277,5 +276,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_PLACEMENT_H diff --git a/src/Gui/PreCompiled.h b/src/Gui/PreCompiled.h index 62b9ccee9e..08d6fdb722 100644 --- a/src/Gui/PreCompiled.h +++ b/src/Gui/PreCompiled.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_PRECOMPILED_H -#define GUI_PRECOMPILED_H +#pragma once #include @@ -90,5 +89,3 @@ #if defined(FC_OS_WIN32) # include #endif - -#endif // GUI_PRECOMPILED_H diff --git a/src/Gui/PrefWidgets.h b/src/Gui/PrefWidgets.h index d497f44009..08f4bd0f3b 100644 --- a/src/Gui/PrefWidgets.h +++ b/src/Gui/PrefWidgets.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_PREFWIDGETS_H -#define GUI_PREFWIDGETS_H +#pragma once #include #include @@ -512,5 +511,3 @@ protected: }; } // namespace Gui - -#endif // GUI_PREFWIDGETS_H diff --git a/src/Gui/PreferencePackManager.h b/src/Gui/PreferencePackManager.h index b71326177d..8d2cc56834 100644 --- a/src/Gui/PreferencePackManager.h +++ b/src/Gui/PreferencePackManager.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef BASE_PREFERENCEPACKMANAGER_H -#define BASE_PREFERENCEPACKMANAGER_H +#pragma once #include #include @@ -238,6 +237,3 @@ private: } // namespace Gui Q_DECLARE_METATYPE(Gui::PreferencePackManager::TemplateFile) // So it can be used with QVariant - - -#endif diff --git a/src/Gui/PreferencePages/DlgSettings3DViewImp.h b/src/Gui/PreferencePages/DlgSettings3DViewImp.h index 0e7b9becb1..e97f1c81d8 100644 --- a/src/Gui/PreferencePages/DlgSettings3DViewImp.h +++ b/src/Gui/PreferencePages/DlgSettings3DViewImp.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGSETTINGS3DVIEWIMP_H -#define GUI_DIALOG_DLGSETTINGS3DVIEWIMP_H +#pragma once #include #include @@ -75,5 +74,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGSETTINGS3DVIEWIMP_H diff --git a/src/Gui/PreferencePages/DlgSettingsAdvanced.h b/src/Gui/PreferencePages/DlgSettingsAdvanced.h index 2779aad036..a74e1bba4d 100644 --- a/src/Gui/PreferencePages/DlgSettingsAdvanced.h +++ b/src/Gui/PreferencePages/DlgSettingsAdvanced.h @@ -20,8 +20,7 @@ * * ****************************************************************************/ -#ifndef GUI_DIALOG_DLGSETTINGSADVANCED_H -#define GUI_DIALOG_DLGSETTINGSADVANCED_H +#pragma once class QTimer; class QPropertyAnimation; @@ -143,4 +142,3 @@ private: } // namespace Dialog } // namespace Gui //[[[end]]] -#endif // GUI_DIALOG_DLGSETTINGSADVANCED_H diff --git a/src/Gui/PreferencePages/DlgSettingsCacheDirectory.h b/src/Gui/PreferencePages/DlgSettingsCacheDirectory.h index 00cb45c306..37497220f1 100644 --- a/src/Gui/PreferencePages/DlgSettingsCacheDirectory.h +++ b/src/Gui/PreferencePages/DlgSettingsCacheDirectory.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGSETTINGSCACHEDIRECTORY_H -#define GUI_DIALOG_DLGSETTINGSCACHEDIRECTORY_H +#pragma once #include #include @@ -109,5 +108,3 @@ public: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGSETTINGSCACHEDIRECTORY_H diff --git a/src/Gui/PreferencePages/DlgSettingsDocumentImp.h b/src/Gui/PreferencePages/DlgSettingsDocumentImp.h index 6e5b2209e3..7a2aaa4570 100644 --- a/src/Gui/PreferencePages/DlgSettingsDocumentImp.h +++ b/src/Gui/PreferencePages/DlgSettingsDocumentImp.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGSETTINGSDOCUMENT_IMP_H -#define GUI_DIALOG_DLGSETTINGSDOCUMENT_IMP_H +#pragma once #include #include @@ -62,5 +61,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGSETTINGSDOCUMENT_IMP_H diff --git a/src/Gui/PreferencePages/DlgSettingsEditor.h b/src/Gui/PreferencePages/DlgSettingsEditor.h index 484462d2e1..03f6095a33 100644 --- a/src/Gui/PreferencePages/DlgSettingsEditor.h +++ b/src/Gui/PreferencePages/DlgSettingsEditor.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGSETTINGSEDITOR_H -#define GUI_DIALOG_DLGSETTINGSEDITOR_H +#pragma once #include #include @@ -77,5 +76,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGSETTINGSEDITOR_H diff --git a/src/Gui/PreferencePages/DlgSettingsGeneral.h b/src/Gui/PreferencePages/DlgSettingsGeneral.h index 33c49819b5..97d59c710f 100644 --- a/src/Gui/PreferencePages/DlgSettingsGeneral.h +++ b/src/Gui/PreferencePages/DlgSettingsGeneral.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGSETTINGSGENERAL_H -#define GUI_DIALOG_DLGSETTINGSGENERAL_H +#pragma once #include #include @@ -103,5 +102,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGSETTINGSGENERAL_H diff --git a/src/Gui/PreferencePages/DlgSettingsLightSources.h b/src/Gui/PreferencePages/DlgSettingsLightSources.h index 437fbc1494..c5b495e7ad 100644 --- a/src/Gui/PreferencePages/DlgSettingsLightSources.h +++ b/src/Gui/PreferencePages/DlgSettingsLightSources.h @@ -22,8 +22,7 @@ **************************************************************************/ -#ifndef GUI_DIALOG_DLGSETTINGSLIGHTSOURCES_H -#define GUI_DIALOG_DLGSETTINGSLIGHTSOURCES_H +#pragma once #include #include @@ -91,5 +90,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGSETTINGSLIGHTSOURCES_H diff --git a/src/Gui/PreferencePages/DlgSettingsMacroImp.h b/src/Gui/PreferencePages/DlgSettingsMacroImp.h index 7f51d5d8fa..ad844c30c6 100644 --- a/src/Gui/PreferencePages/DlgSettingsMacroImp.h +++ b/src/Gui/PreferencePages/DlgSettingsMacroImp.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGSETTINGSMACROIMP_H -#define GUI_DIALOG_DLGSETTINGSMACROIMP_H +#pragma once #include #include @@ -60,5 +59,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGSETTINGSMACROIMP_H diff --git a/src/Gui/PreferencePages/DlgSettingsNavigation.h b/src/Gui/PreferencePages/DlgSettingsNavigation.h index fe20a083e1..debdb4f729 100644 --- a/src/Gui/PreferencePages/DlgSettingsNavigation.h +++ b/src/Gui/PreferencePages/DlgSettingsNavigation.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGSETTINGSNAVIGATION_H -#define GUI_DIALOG_DLGSETTINGSNAVIGATION_H +#pragma once #include #include "PropertyPage.h" @@ -91,5 +90,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGSETTINGSNAVIGATION_H diff --git a/src/Gui/PreferencePages/DlgSettingsNotificationArea.h b/src/Gui/PreferencePages/DlgSettingsNotificationArea.h index bdea1b7825..3863dde540 100644 --- a/src/Gui/PreferencePages/DlgSettingsNotificationArea.h +++ b/src/Gui/PreferencePages/DlgSettingsNotificationArea.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGSETTINGSNOTIFICATIONAREA_H -#define GUI_DIALOG_DLGSETTINGSNOTIFICATIONAREA_H +#pragma once #include #include @@ -57,5 +56,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGSETTINGSNOTIFICATIONAREA_H diff --git a/src/Gui/PreferencePages/DlgSettingsPDF.h b/src/Gui/PreferencePages/DlgSettingsPDF.h index 773eeaa2cc..f101618352 100644 --- a/src/Gui/PreferencePages/DlgSettingsPDF.h +++ b/src/Gui/PreferencePages/DlgSettingsPDF.h @@ -1,5 +1,4 @@ -#ifndef GUI_DIALOG_DLGSETTINGSPDF_H -#define GUI_DIALOG_DLGSETTINGSPDF_H +#pragma once #include #include @@ -40,5 +39,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGSETTINGSPDF_H diff --git a/src/Gui/PreferencePages/DlgSettingsPythonConsole.h b/src/Gui/PreferencePages/DlgSettingsPythonConsole.h index 8bc1ff8eb2..f322e9ea21 100644 --- a/src/Gui/PreferencePages/DlgSettingsPythonConsole.h +++ b/src/Gui/PreferencePages/DlgSettingsPythonConsole.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGSETTINGSPYTHONCONSOLE_H -#define GUI_DIALOG_DLGSETTINGSPYTHONCONSOLE_H +#pragma once #include #include @@ -58,5 +57,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGSETTINGSPYTHONCONSOLE_H diff --git a/src/Gui/PreferencePages/DlgSettingsReportView.h b/src/Gui/PreferencePages/DlgSettingsReportView.h index 2e2a483ae3..b0a87fa1af 100644 --- a/src/Gui/PreferencePages/DlgSettingsReportView.h +++ b/src/Gui/PreferencePages/DlgSettingsReportView.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLG_SETTINGS_REPORT_VIEW -#define GUI_DIALOG_DLG_SETTINGS_REPORT_VIEW +#pragma once #include #include @@ -57,5 +56,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLG_SETTINGS_REPORT_VIEW diff --git a/src/Gui/PreferencePages/DlgSettingsSelection.h b/src/Gui/PreferencePages/DlgSettingsSelection.h index dec06f4458..676a18e037 100644 --- a/src/Gui/PreferencePages/DlgSettingsSelection.h +++ b/src/Gui/PreferencePages/DlgSettingsSelection.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGSETTINGSSELECTION_H -#define GUI_DIALOG_DLGSETTINGSSELECTION_H +#pragma once #include #include @@ -60,5 +59,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGSETTINGSSELECTION_H diff --git a/src/Gui/PreferencePages/DlgSettingsUI.h b/src/Gui/PreferencePages/DlgSettingsUI.h index 75110945b3..1228f1b98c 100644 --- a/src/Gui/PreferencePages/DlgSettingsUI.h +++ b/src/Gui/PreferencePages/DlgSettingsUI.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DlgSettingsUI_H -#define GUI_DIALOG_DlgSettingsUI_H +#pragma once #include #include @@ -72,5 +71,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DlgSettingsUI_H diff --git a/src/Gui/PreferencePages/DlgSettingsViewColor.h b/src/Gui/PreferencePages/DlgSettingsViewColor.h index 1bb334e05c..0c2847ab48 100644 --- a/src/Gui/PreferencePages/DlgSettingsViewColor.h +++ b/src/Gui/PreferencePages/DlgSettingsViewColor.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGSETTINGSVIEWCOLOR_H -#define GUI_DIALOG_DLGSETTINGSVIEWCOLOR_H +#pragma once #include #include @@ -68,5 +67,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGSETTINGSVIEWCOLOR_H diff --git a/src/Gui/PreferencePages/DlgSettingsWorkbenchesImp.h b/src/Gui/PreferencePages/DlgSettingsWorkbenchesImp.h index 439ac02e94..061ed99ff8 100644 --- a/src/Gui/PreferencePages/DlgSettingsWorkbenchesImp.h +++ b/src/Gui/PreferencePages/DlgSettingsWorkbenchesImp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGSETTINGSWORKBENCHES_IMP_H -#define GUI_DIALOG_DLGSETTINGSWORKBENCHES_IMP_H +#pragma once #include #include @@ -84,5 +83,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_DLGSETTINGSWORKBENCHES_IMP_H diff --git a/src/Gui/PreferencePages/ListWidgetDragBugFix.h b/src/Gui/PreferencePages/ListWidgetDragBugFix.h index 53574fe17d..c9e25100db 100644 --- a/src/Gui/PreferencePages/ListWidgetDragBugFix.h +++ b/src/Gui/PreferencePages/ListWidgetDragBugFix.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef QLISTWIDGETDRAGBUGFIX_HPP -#define QLISTWIDGETDRAGBUGFIX_HPP +#pragma once #include #include @@ -47,5 +46,3 @@ public: protected: void dragMoveEvent(QDragMoveEvent* e) override; }; - -#endif diff --git a/src/Gui/ProgressBar.h b/src/Gui/ProgressBar.h index dd16390013..f6135de8be 100644 --- a/src/Gui/ProgressBar.h +++ b/src/Gui/ProgressBar.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_PROGRESSBAR_H -#define GUI_PROGRESSBAR_H +#pragma once #include #ifdef QT_WINEXTRAS_LIB @@ -208,5 +207,3 @@ private: }; } // namespace Gui - -#endif // GUI_PROGRESSBAR_H diff --git a/src/Gui/ProgressDialog.h b/src/Gui/ProgressDialog.h index a3a5dff533..a4ccad6c12 100644 --- a/src/Gui/ProgressDialog.h +++ b/src/Gui/ProgressDialog.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_PROGRESSDIALOG_H -#define GUI_PROGRESSDIALOG_H +#pragma once #include #include @@ -116,5 +115,3 @@ private: }; } // namespace Gui - -#endif // GUI_PROGRESSDIALOG_H diff --git a/src/Gui/PropertyPage.h b/src/Gui/PropertyPage.h index 0013f2685b..42634c7355 100644 --- a/src/Gui/PropertyPage.h +++ b/src/Gui/PropertyPage.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_PROPERTYPAGE_H -#define GUI_DIALOG_PROPERTYPAGE_H +#pragma once #include #include @@ -149,5 +148,3 @@ protected Q_SLOTS: } // namespace Dialog } // namespace Gui - -#endif // GUI_DIALOG_PROPERTYPAGE_H diff --git a/src/Gui/PropertyView.h b/src/Gui/PropertyView.h index 5099b2df49..43cceaa055 100644 --- a/src/Gui/PropertyView.h +++ b/src/Gui/PropertyView.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_DOCKWND_PROPERTYVIEW_H -#define GUI_DOCKWND_PROPERTYVIEW_H +#pragma once #include "DockWindow.h" #include "Selection.h" @@ -134,5 +133,3 @@ public: } // namespace DockWnd } // namespace Gui - -#endif // GUI_DOCKWND_PROPERTYVIEW_H diff --git a/src/Gui/PythonConsole.h b/src/Gui/PythonConsole.h index 1a88282342..ce8af7ad69 100644 --- a/src/Gui/PythonConsole.h +++ b/src/Gui/PythonConsole.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_PYTHONCONSOLE_H -#define GUI_PYTHONCONSOLE_H +#pragma once #include #include @@ -193,5 +192,3 @@ protected: }; } // namespace Gui - -#endif // GUI_PYTHONCONSOLE_H diff --git a/src/Gui/PythonConsolePy.h b/src/Gui/PythonConsolePy.h index 7843643b8a..11abe1b5d8 100644 --- a/src/Gui/PythonConsolePy.h +++ b/src/Gui/PythonConsolePy.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_PYTHONCONSOLE_PY_H -#define GUI_PYTHONCONSOLE_PY_H +#pragma once #include @@ -151,5 +150,3 @@ public: }; } // namespace Gui - -#endif // GUI_PYTHONCONSOLE_PY_H diff --git a/src/Gui/PythonDebugger.h b/src/Gui/PythonDebugger.h index 73c9e72fc3..bedb0737d8 100644 --- a/src/Gui/PythonDebugger.h +++ b/src/Gui/PythonDebugger.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_PYTHONDEBUG_H -#define GUI_PYTHONDEBUG_H +#pragma once #include #include @@ -186,5 +185,3 @@ private: }; } // namespace Gui - -#endif // GUI_PYTHONDEBUG_H diff --git a/src/Gui/PythonEditor.h b/src/Gui/PythonEditor.h index 89a091a10d..f53f944893 100644 --- a/src/Gui/PythonEditor.h +++ b/src/Gui/PythonEditor.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_PYTHONEDITOR_H -#define GUI_PYTHONEDITOR_H +#pragma once #include "SyntaxHighlighter.h" #include "TextEdit.h" @@ -93,5 +92,3 @@ private: }; } // namespace Gui - -#endif // GUI_PYTHONEDITOR_H diff --git a/src/Gui/PythonTracing.h b/src/Gui/PythonTracing.h index f0eda8a9ca..306fc6df6e 100644 --- a/src/Gui/PythonTracing.h +++ b/src/Gui/PythonTracing.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef GUI_PYTHONTRACING_H -#define GUI_PYTHONTRACING_H +#pragma once #include #include @@ -150,5 +149,3 @@ private: }; } // namespace Gui - -#endif // GUI_PYTHONTRACING_H diff --git a/src/Gui/PythonWrapper.h b/src/Gui/PythonWrapper.h index 6e59769b4f..0835866b3b 100644 --- a/src/Gui/PythonWrapper.h +++ b/src/Gui/PythonWrapper.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_PYTHONWRAPPER_H -#define GUI_PYTHONWRAPPER_H +#pragma once #include "qglobal.h" #include @@ -88,5 +87,3 @@ private: }; } // namespace Gui - -#endif // GUI_PYTHONWRAPPER_H diff --git a/src/Gui/QSint/actionpanel/actionbox.h b/src/Gui/QSint/actionpanel/actionbox.h index 03fa48bb31..52eb9ba840 100644 --- a/src/Gui/QSint/actionpanel/actionbox.h +++ b/src/Gui/QSint/actionpanel/actionbox.h @@ -6,8 +6,7 @@ * * ***************************************************************************/ -#ifndef ACTIONBOX_H -#define ACTIONBOX_H +#pragma once #include "actionlabel.h" @@ -156,5 +155,3 @@ protected: ActionLabel *headerLabel; ///< Label for the header. }; } // namespace - -#endif // ACTIONBOX_H diff --git a/src/Gui/QSint/actionpanel/actiongroup.h b/src/Gui/QSint/actionpanel/actiongroup.h index ce264936fd..2405c92270 100644 --- a/src/Gui/QSint/actionpanel/actiongroup.h +++ b/src/Gui/QSint/actionpanel/actiongroup.h @@ -6,8 +6,7 @@ * * ***************************************************************************/ -#ifndef ACTIONGROUP_H -#define ACTIONGROUP_H +#pragma once #include #include @@ -203,5 +202,3 @@ private: const int separatorHeight = 1; }; } // namespace QSint - -#endif // ACTIONGROUP_H diff --git a/src/Gui/QSint/actionpanel/actionlabel.h b/src/Gui/QSint/actionpanel/actionlabel.h index 37e0f4aa71..1df8560aa1 100644 --- a/src/Gui/QSint/actionpanel/actionlabel.h +++ b/src/Gui/QSint/actionpanel/actionlabel.h @@ -6,8 +6,7 @@ * * ***************************************************************************/ -#ifndef ACTIONLABEL_H -#define ACTIONLABEL_H +#pragma once #include #include "qsint_global.h" @@ -68,5 +67,3 @@ protected: }; } // namespace - -#endif // ACTIONLABEL_H diff --git a/src/Gui/QSint/actionpanel/actionpanel.h b/src/Gui/QSint/actionpanel/actionpanel.h index 1ffeb44d92..7b4f42a3f9 100644 --- a/src/Gui/QSint/actionpanel/actionpanel.h +++ b/src/Gui/QSint/actionpanel/actionpanel.h @@ -6,8 +6,7 @@ * * ***************************************************************************/ -#ifndef ACTIONPANEL_H -#define ACTIONPANEL_H +#pragma once #include #include @@ -105,5 +104,3 @@ protected: }; } // namespace - -#endif // ACTIONPANEL_H diff --git a/src/Gui/QSint/actionpanel/actionpanelscheme.h b/src/Gui/QSint/actionpanel/actionpanelscheme.h index 05465d33d3..21cb4abd6c 100644 --- a/src/Gui/QSint/actionpanel/actionpanelscheme.h +++ b/src/Gui/QSint/actionpanel/actionpanelscheme.h @@ -6,8 +6,7 @@ * * ***************************************************************************/ -#ifndef ACTIONPANELSCHEME_H -#define ACTIONPANELSCHEME_H +#pragma once #include "qsint_global.h" @@ -137,5 +136,3 @@ private: }; } // namespace QSint - -#endif // ACTIONPANELSCHEME_H diff --git a/src/Gui/QSint/actionpanel/qsint_global.h b/src/Gui/QSint/actionpanel/qsint_global.h index 9e332c3dbd..35d83bcd33 100644 --- a/src/Gui/QSint/actionpanel/qsint_global.h +++ b/src/Gui/QSint/actionpanel/qsint_global.h @@ -6,8 +6,7 @@ * * ***************************************************************************/ -#ifndef QSINT_GLOBAL_H -#define QSINT_GLOBAL_H +#pragma once #include @@ -21,5 +20,3 @@ # define QSINT_EXPORT Q_DECL_IMPORT # endif #endif - -#endif // QSINT_GLOBAL_H diff --git a/src/Gui/QSint/actionpanel/taskgroup_p.h b/src/Gui/QSint/actionpanel/taskgroup_p.h index beedf37356..6bc3e6c709 100644 --- a/src/Gui/QSint/actionpanel/taskgroup_p.h +++ b/src/Gui/QSint/actionpanel/taskgroup_p.h @@ -6,8 +6,7 @@ * * ***************************************************************************/ -#ifndef TASKGROUP_P_H -#define TASKGROUP_P_H +#pragma once #include "actionlabel.h" #include "actionpanelscheme.h" @@ -50,5 +49,3 @@ protected: } - -#endif // TASKGROUP_P_H diff --git a/src/Gui/QSint/actionpanel/taskheader_p.h b/src/Gui/QSint/actionpanel/taskheader_p.h index 8fa97a4b0d..1bfb1f7858 100644 --- a/src/Gui/QSint/actionpanel/taskheader_p.h +++ b/src/Gui/QSint/actionpanel/taskheader_p.h @@ -6,8 +6,7 @@ * * ***************************************************************************/ -#ifndef TASKHEADER_P_H -#define TASKHEADER_P_H +#pragma once #include "actionlabel.h" #include "actionpanelscheme.h" @@ -64,5 +63,3 @@ protected: } - -#endif // TASKHEADER_P_H diff --git a/src/Gui/QuantitySpinBox.h b/src/Gui/QuantitySpinBox.h index fe9a7c6728..2f38a8f41b 100644 --- a/src/Gui/QuantitySpinBox.h +++ b/src/Gui/QuantitySpinBox.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_QUANTITYSPINBOX_H -#define GUI_QUANTITYSPINBOX_H +#pragma once #include #include @@ -216,5 +215,3 @@ private: }; } // namespace Gui - -#endif // GUI_QUANTITYSPINBOX_H diff --git a/src/Gui/QuantitySpinBox_p.h b/src/Gui/QuantitySpinBox_p.h index 334099ebbf..f2c010a4a6 100644 --- a/src/Gui/QuantitySpinBox_p.h +++ b/src/Gui/QuantitySpinBox_p.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef QUANTITYSPINBOX_P_H -#define QUANTITYSPINBOX_P_H +#pragma once #include #include @@ -71,5 +70,3 @@ private: const QString genericExpressionEditorTooltip = tr("Enter expression… (=)"); const QString expressionEditorTooltipPrefix = tr("Expression:") + QStringLiteral(" "); }; - -#endif // QUANTITYSPINBOX_P_H diff --git a/src/Gui/Quarter/Basic.h b/src/Gui/Quarter/Basic.h index ab7a97d576..b478e34427 100644 --- a/src/Gui/Quarter/Basic.h +++ b/src/Gui/Quarter/Basic.h @@ -1,5 +1,4 @@ -#ifndef QUARTER_BASIC_H -#define QUARTER_BASIC_H +#pragma once /**************************************************************************\ * Copyright (c) Kongsberg Oil & Gas Technologies AS @@ -73,5 +72,3 @@ #ifndef QUARTER_DLL_API # define QUARTER_DLL_API #endif // !QUARTER_DLL_API - -#endif // !QUARTER_BASIC_H diff --git a/src/Gui/Quarter/ContextMenu.h b/src/Gui/Quarter/ContextMenu.h index a4f8ff9d4f..6c5aaa1cc0 100644 --- a/src/Gui/Quarter/ContextMenu.h +++ b/src/Gui/Quarter/ContextMenu.h @@ -30,8 +30,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \**************************************************************************/ -#ifndef QUARTER_CONTEXTMENUHANDLERP_H -#define QUARTER_CONTEXTMENUHANDLERP_H +#pragma once #include @@ -66,5 +65,3 @@ private: }; }}} // namespace - -#endif // QUARTER_CONTEXTMENUHANDLERP_H diff --git a/src/Gui/Quarter/ImageReader.h b/src/Gui/Quarter/ImageReader.h index 078a43babd..161149f130 100644 --- a/src/Gui/Quarter/ImageReader.h +++ b/src/Gui/Quarter/ImageReader.h @@ -1,5 +1,4 @@ -#ifndef QUARTER_IMAGELOADER_H -#define QUARTER_IMAGELOADER_H +#pragma once /**************************************************************************\ * Copyright (c) Kongsberg Oil & Gas Technologies AS @@ -51,6 +50,4 @@ private: static SbBool readImageCB(const SbString & filename, SbImage * image, void * closure); }; -}}} // namespace - -#endif // QUARTER_IMAGELOADER_H +}}} // namespace \ No newline at end of file diff --git a/src/Gui/Quarter/InteractionMode.h b/src/Gui/Quarter/InteractionMode.h index d0444d9a33..19d60cdd0d 100644 --- a/src/Gui/Quarter/InteractionMode.h +++ b/src/Gui/Quarter/InteractionMode.h @@ -1,5 +1,4 @@ -#ifndef QUARTER_INTERACTIONMODE_H -#define QUARTER_INTERACTIONMODE_H +#pragma once /**************************************************************************\ * Copyright (c) Kongsberg Oil & Gas Technologies AS @@ -77,5 +76,3 @@ private: }; }}} // namespace - -#endif // QUARTER_INTERACTIONMODE_H diff --git a/src/Gui/Quarter/KeyboardP.h b/src/Gui/Quarter/KeyboardP.h index 654bc9f009..ae834d1f8f 100644 --- a/src/Gui/Quarter/KeyboardP.h +++ b/src/Gui/Quarter/KeyboardP.h @@ -1,5 +1,4 @@ -#ifndef QUARTER_KEYBOARDHANDLERP_H -#define QUARTER_KEYBOARDHANDLERP_H +#pragma once /**************************************************************************\ * Copyright (c) Kongsberg Oil & Gas Technologies AS @@ -62,5 +61,3 @@ public: }; }}} // namespace - -#endif // QUARTER_KEYBOARDHANDLERP_H diff --git a/src/Gui/Quarter/NativeEvent.h b/src/Gui/Quarter/NativeEvent.h index 165b8c965a..55c15f9fe1 100644 --- a/src/Gui/Quarter/NativeEvent.h +++ b/src/Gui/Quarter/NativeEvent.h @@ -1,5 +1,4 @@ -#ifndef QUARTER_NATIVEEVENT_H -#define QUARTER_NATIVEEVENT_H +#pragma once /**************************************************************************\ * Copyright (c) Kongsberg Oil & Gas Technologies AS @@ -57,5 +56,3 @@ private: }; }}} - -#endif // !QUARTER_NATIVEEVENT_H diff --git a/src/Gui/Quarter/QtCoinCompatibility.h b/src/Gui/Quarter/QtCoinCompatibility.h index 501c8d4a17..ca84105346 100644 --- a/src/Gui/Quarter/QtCoinCompatibility.h +++ b/src/Gui/Quarter/QtCoinCompatibility.h @@ -1,5 +1,4 @@ -#ifndef QUARTER_QTCOINCOMPATIBILITY_H -#define QUARTER_QTCOINCOMPATIBILITY_H +#pragma once /**************************************************************************\ * Copyright (c) Kongsberg Oil & Gas Technologies AS @@ -47,5 +46,3 @@ namespace QtCoinCompatibility { } }}} // namespace - -#endif // QUARTER_QTCOINCOMPATIBILITY_H diff --git a/src/Gui/Quarter/Quarter.h b/src/Gui/Quarter/Quarter.h index 4c4d827aa7..5cd14faef2 100644 --- a/src/Gui/Quarter/Quarter.h +++ b/src/Gui/Quarter/Quarter.h @@ -1,5 +1,4 @@ -#ifndef QUARTER_QUARTER_H -#define QUARTER_QUARTER_H +#pragma once /**************************************************************************\ * Copyright (c) Kongsberg Oil & Gas Technologies AS @@ -44,5 +43,3 @@ namespace Quarter { } }}} // namespace - -#endif // QUARTER_QUARTER_H diff --git a/src/Gui/Quarter/QuarterP.h b/src/Gui/Quarter/QuarterP.h index 8569978d50..31860a679a 100644 --- a/src/Gui/Quarter/QuarterP.h +++ b/src/Gui/Quarter/QuarterP.h @@ -30,8 +30,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \**************************************************************************/ -#ifndef QUARTER_QUARTERP_H -#define QUARTER_QUARTERP_H +#pragma once #include #include #ifndef _MSC_VER @@ -67,5 +66,3 @@ class QuarterP { #define COMPILE_ONLY_BEFORE(MAJOR,MINOR,MICRO,REASON) \ COIN_CT_ASSERT( (QUARTER_MAJOR_VERSION < MAJOR) || (QUARTER_MAJOR_VERSION == MAJOR && ((QUARTER_MINOR_VERSION < MINOR) || ( QUARTER_MINOR_VERSION == MINOR && (QUARTER_MICRO_VERSION < MICRO ))))) - -#endif //QUARTER_QUARTERP_H diff --git a/src/Gui/Quarter/QuarterWidget.h b/src/Gui/Quarter/QuarterWidget.h index 0e9b806745..e51fa28fd1 100644 --- a/src/Gui/Quarter/QuarterWidget.h +++ b/src/Gui/Quarter/QuarterWidget.h @@ -1,5 +1,4 @@ -#ifndef QUARTER_QUARTERWIDGET_H -#define QUARTER_QUARTERWIDGET_H +#pragma once /**************************************************************************\ * Copyright (c) Kongsberg Oil & Gas Technologies AS @@ -212,5 +211,3 @@ private: }; }}} // namespace - -#endif // QUARTER_QUARTERWIDGET_H diff --git a/src/Gui/Quarter/QuarterWidgetP.h b/src/Gui/Quarter/QuarterWidgetP.h index 80f16fd2a8..74fb11d57b 100644 --- a/src/Gui/Quarter/QuarterWidgetP.h +++ b/src/Gui/Quarter/QuarterWidgetP.h @@ -1,5 +1,4 @@ -#ifndef QUARTER_QUARTERWIDGETP_H -#define QUARTER_QUARTERWIDGETP_H +#pragma once /**************************************************************************\ * Copyright (c) Kongsberg Oil & Gas Technologies AS @@ -116,6 +115,4 @@ public: static void removeFromCacheContext(QuarterWidgetP_cachecontext * context, const QOpenGLWidget * widget); }; -#endif // QUARTER_QUARTERWIDGETP_H - }}} // namespace diff --git a/src/Gui/Quarter/SensorManager.h b/src/Gui/Quarter/SensorManager.h index 8ab8f422e8..5bfdfb319c 100644 --- a/src/Gui/Quarter/SensorManager.h +++ b/src/Gui/Quarter/SensorManager.h @@ -1,5 +1,4 @@ -#ifndef QUARTER_SENSORMANAGER_H -#define QUARTER_SENSORMANAGER_H +#pragma once /**************************************************************************\ * Copyright (c) Kongsberg Oil & Gas Technologies AS @@ -66,5 +65,3 @@ private: }; }}} // namespace - -#endif // QUARTER_SENSORMANAGER_H diff --git a/src/Gui/Quarter/SignalThread.h b/src/Gui/Quarter/SignalThread.h index f96f2245ae..16c7059275 100644 --- a/src/Gui/Quarter/SignalThread.h +++ b/src/Gui/Quarter/SignalThread.h @@ -1,5 +1,4 @@ -#ifndef QUARTER_SIGNALTHREAD_H -#define QUARTER_SIGNALTHREAD_H +#pragma once /**************************************************************************\ * Copyright (c) Kongsberg Oil & Gas Technologies AS @@ -63,5 +62,3 @@ private: }; }}} // namespace - -#endif // QUARTER_SIGNALTHREAD_H diff --git a/src/Gui/Quarter/SoQTQuarterAdaptor.h b/src/Gui/Quarter/SoQTQuarterAdaptor.h index f2ac4f6b65..6825900178 100644 --- a/src/Gui/Quarter/SoQTQuarterAdaptor.h +++ b/src/Gui/Quarter/SoQTQuarterAdaptor.h @@ -18,8 +18,7 @@ * */ -#ifndef SIM_COIN3D_SOQTQUARTERADAPTOR_H -#define SIM_COIN3D_SOQTQUARTERADAPTOR_H +#pragma once #include #include @@ -163,5 +162,3 @@ protected: } //Quarter } //Coin3D } // - -#endif // SIM_COIN3D_SOQTQUARTERADAPTOR_H diff --git a/src/Gui/Quarter/devices/InputDevice.h b/src/Gui/Quarter/devices/InputDevice.h index 76c9a1e0da..2b5877ab43 100644 --- a/src/Gui/Quarter/devices/InputDevice.h +++ b/src/Gui/Quarter/devices/InputDevice.h @@ -1,5 +1,4 @@ -#ifndef QUARTER_INPUTDEVICE_H -#define QUARTER_INPUTDEVICE_H +#pragma once /**************************************************************************\ * Copyright (c) Kongsberg Oil & Gas Technologies AS @@ -66,5 +65,3 @@ protected: }; }}} // namespace - -#endif // QUARTER_INPUTDEVICE_H diff --git a/src/Gui/Quarter/devices/Keyboard.h b/src/Gui/Quarter/devices/Keyboard.h index 808965ffea..ce7f1bb1bb 100644 --- a/src/Gui/Quarter/devices/Keyboard.h +++ b/src/Gui/Quarter/devices/Keyboard.h @@ -1,5 +1,4 @@ -#ifndef QUARTER_KEYBOARD_H -#define QUARTER_KEYBOARD_H +#pragma once /**************************************************************************\ * Copyright (c) Kongsberg Oil & Gas Technologies AS @@ -54,5 +53,3 @@ private: }; }}} // namespace - -#endif // QUARTER_KEYBOARD_H diff --git a/src/Gui/Quarter/devices/Mouse.h b/src/Gui/Quarter/devices/Mouse.h index 08e22f939e..200c1be8ec 100644 --- a/src/Gui/Quarter/devices/Mouse.h +++ b/src/Gui/Quarter/devices/Mouse.h @@ -1,5 +1,4 @@ -#ifndef QUARTER_MOUSE_H -#define QUARTER_MOUSE_H +#pragma once /**************************************************************************\ * Copyright (c) Kongsberg Oil & Gas Technologies AS @@ -54,5 +53,3 @@ private: }; }}} // namespace - -#endif // QUARTER_MOUSEHANDLER_H diff --git a/src/Gui/Quarter/devices/SpaceNavigatorDevice.h b/src/Gui/Quarter/devices/SpaceNavigatorDevice.h index aa16e2a93b..28ef663417 100644 --- a/src/Gui/Quarter/devices/SpaceNavigatorDevice.h +++ b/src/Gui/Quarter/devices/SpaceNavigatorDevice.h @@ -1,5 +1,4 @@ -#ifndef QUARTER_SPACENAVIGATORDEVICE_H -#define QUARTER_SPACENAVIGATORDEVICE_H +#pragma once /**************************************************************************\ * Copyright (c) Kongsberg Oil & Gas Technologies AS @@ -52,4 +51,3 @@ class QUARTER_DLL_API SpaceNavigatorDevice : public InputDevice { }; }}} -#endif // !QUARTER_SPACENAVIGATORDEVICE_H diff --git a/src/Gui/Quarter/eventhandlers/DragDropHandler.h b/src/Gui/Quarter/eventhandlers/DragDropHandler.h index e8f9bde73f..180c58379f 100644 --- a/src/Gui/Quarter/eventhandlers/DragDropHandler.h +++ b/src/Gui/Quarter/eventhandlers/DragDropHandler.h @@ -1,5 +1,4 @@ -#ifndef QUARTER_DRAGDROPHANDLER_H -#define QUARTER_DRAGDROPHANDLER_H +#pragma once /**************************************************************************\ * Copyright (c) Kongsberg Oil & Gas Technologies AS @@ -58,5 +57,3 @@ private: }; }}} // namespace - -#endif // QUARTER_DRAGDROPHANDLER_H diff --git a/src/Gui/Quarter/eventhandlers/EventFilter.h b/src/Gui/Quarter/eventhandlers/EventFilter.h index 0311051474..b6e7f93f2b 100644 --- a/src/Gui/Quarter/eventhandlers/EventFilter.h +++ b/src/Gui/Quarter/eventhandlers/EventFilter.h @@ -1,5 +1,4 @@ -#ifndef QUARTER_EVENTFILTER_H -#define QUARTER_EVENTFILTER_H +#pragma once /**************************************************************************\ * Copyright (c) Kongsberg Oil & Gas Technologies AS @@ -63,5 +62,3 @@ private: }; }}} // namespace - -#endif // QUARTER_EVENTFILTER_H diff --git a/src/Gui/Quarter/eventhandlers/FocusHandler.h b/src/Gui/Quarter/eventhandlers/FocusHandler.h index a002b676ca..4c766c2a95 100644 --- a/src/Gui/Quarter/eventhandlers/FocusHandler.h +++ b/src/Gui/Quarter/eventhandlers/FocusHandler.h @@ -1,5 +1,4 @@ -#ifndef QUARTER_FOCUSHANDLER_H -#define QUARTER_FOCUSHANDLER_H +#pragma once /**************************************************************************\ * Copyright (c) Kongsberg Oil & Gas Technologies AS @@ -57,5 +56,3 @@ private: }; }}} // namespace - -#endif // QUARTER_FOCUSHANDLER_H diff --git a/src/Gui/ReportView.h b/src/Gui/ReportView.h index dbcd639f26..24b263c684 100644 --- a/src/Gui/ReportView.h +++ b/src/Gui/ReportView.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_DOCKWND_REPORTVIEW_H -#define GUI_DOCKWND_REPORTVIEW_H +#pragma once #include #include @@ -242,5 +241,3 @@ protected: } // namespace DockWnd } // namespace Gui - -#endif // GUI_DOCKWND_REPORTVIEW_H diff --git a/src/Gui/SceneInspector.h b/src/Gui/SceneInspector.h index 07e22d75ae..610b98ee19 100644 --- a/src/Gui/SceneInspector.h +++ b/src/Gui/SceneInspector.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_SCENEINSPECTOR_H -#define GUI_SCENEINSPECTOR_H +#pragma once #include #include @@ -97,5 +96,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_SCENEINSPECTOR_H diff --git a/src/Gui/Selection/Selection.h b/src/Gui/Selection/Selection.h index a653758016..21f22a91e8 100644 --- a/src/Gui/Selection/Selection.h +++ b/src/Gui/Selection/Selection.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_SELECTION_H -#define GUI_SELECTION_H +#pragma once #include #include @@ -904,5 +903,3 @@ private: }; } // namespace Gui - -#endif // GUI_SELECTION_H diff --git a/src/Gui/Selection/SelectionFilter.h b/src/Gui/Selection/SelectionFilter.h index 210b0bef01..f87429a657 100644 --- a/src/Gui/Selection/SelectionFilter.h +++ b/src/Gui/Selection/SelectionFilter.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef GUI_SelectionFilter_H -#define GUI_SelectionFilter_H +#pragma once #include #include @@ -218,6 +217,3 @@ struct Node_Block } // namespace Gui - - -#endif // GUI_SelectionFilter_H diff --git a/src/Gui/Selection/SelectionFilterPy.h b/src/Gui/Selection/SelectionFilterPy.h index f6be6d80b9..8c66cf27bb 100644 --- a/src/Gui/Selection/SelectionFilterPy.h +++ b/src/Gui/Selection/SelectionFilterPy.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_SELECTIONFILTERPY_H -#define GUI_SELECTIONFILTERPY_H +#pragma once #include @@ -66,5 +65,3 @@ public: }; } // namespace Gui - -#endif // GUI_SELECTIONFILTERPY_H diff --git a/src/Gui/Selection/SelectionObject.h b/src/Gui/Selection/SelectionObject.h index 1a1006cca7..37630d162f 100644 --- a/src/Gui/Selection/SelectionObject.h +++ b/src/Gui/Selection/SelectionObject.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef GUI_SelectionObject_H -#define GUI_SelectionObject_H +#pragma once #include #include @@ -130,6 +129,3 @@ private: } // namespace Gui - - -#endif // GUI_SelectionObject_H diff --git a/src/Gui/Selection/SelectionObserverPython.h b/src/Gui/Selection/SelectionObserverPython.h index a7a3bdc72f..671a0e6da5 100644 --- a/src/Gui/Selection/SelectionObserverPython.h +++ b/src/Gui/Selection/SelectionObserverPython.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_SELECTIONOBSERVERPYTHON_H -#define GUI_SELECTIONOBSERVERPYTHON_H +#pragma once #include #include "Selection.h" @@ -98,5 +97,3 @@ private: }; } // namespace Gui - -#endif // GUI_SELECTIONOBSERVERPYTHON_H diff --git a/src/Gui/Selection/SelectionView.h b/src/Gui/Selection/SelectionView.h index 8f5bf3833b..cc7aaa868b 100644 --- a/src/Gui/Selection/SelectionView.h +++ b/src/Gui/Selection/SelectionView.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_DOCKWND_SELECTIONVIEW_H -#define GUI_DOCKWND_SELECTIONVIEW_H +#pragma once #include "DockWindow.h" #include "Selection.h" @@ -208,5 +207,3 @@ private: }; } // namespace Gui - -#endif // GUI_DOCKWND_SELECTIONVIEW_H diff --git a/src/Gui/Selection/SoFCSelection.h b/src/Gui/Selection/SoFCSelection.h index 6e8cd42297..0ca51b7c81 100644 --- a/src/Gui/Selection/SoFCSelection.h +++ b/src/Gui/Selection/SoFCSelection.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_SOFCSELECTION_H -#define GUI_SOFCSELECTION_H +#pragma once #include @@ -153,5 +152,3 @@ private: } // namespace Gui - -#endif // !GUI_SOFCSELECTION_H diff --git a/src/Gui/Selection/SoFCSelectionAction.h b/src/Gui/Selection/SoFCSelectionAction.h index 32bd025afb..278fe478fa 100644 --- a/src/Gui/Selection/SoFCSelectionAction.h +++ b/src/Gui/Selection/SoFCSelectionAction.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef _SoFCSelectionAction_h -#define _SoFCSelectionAction_h +#pragma once #include #include @@ -376,6 +375,3 @@ private: }; } // namespace Gui - - -#endif // _SoFCSelectionAction_h diff --git a/src/Gui/Selection/SoFCSelectionContext.h b/src/Gui/Selection/SoFCSelectionContext.h index 66ada2efe1..9cda4cdfd0 100644 --- a/src/Gui/Selection/SoFCSelectionContext.h +++ b/src/Gui/Selection/SoFCSelectionContext.h @@ -21,8 +21,7 @@ * * ****************************************************************************/ -#ifndef GUI_SOFCSELECTIONCONTEXT_H -#define GUI_SOFCSELECTIONCONTEXT_H +#pragma once #include #include @@ -155,4 +154,3 @@ protected: }; } // namespace Gui -#endif // GUI_SOFCSELECTIONCONTEXT_H diff --git a/src/Gui/Selection/SoFCUnifiedSelection.h b/src/Gui/Selection/SoFCUnifiedSelection.h index abac639d13..ffd23da46c 100644 --- a/src/Gui/Selection/SoFCUnifiedSelection.h +++ b/src/Gui/Selection/SoFCUnifiedSelection.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_SOFCUNIFIEDSELECTION_H -#define GUI_SOFCUNIFIEDSELECTION_H +#pragma once #include #include @@ -554,5 +553,3 @@ private: } // namespace Gui - -#endif // !GUI_SOFCUNIFIEDSELECTION_H diff --git a/src/Gui/ShortcutManager.h b/src/Gui/ShortcutManager.h index 304d15ed99..944135cc10 100644 --- a/src/Gui/ShortcutManager.h +++ b/src/Gui/ShortcutManager.h @@ -20,8 +20,7 @@ * * ****************************************************************************/ -#ifndef GUI_SHORTCUT_MANAGER_H -#define GUI_SHORTCUT_MANAGER_H +#pragma once #include @@ -172,5 +171,3 @@ private: }; } // namespace Gui - -#endif // GUI_SHORTCUT_MANAGER_H diff --git a/src/Gui/SoDatumLabel.h b/src/Gui/SoDatumLabel.h index 3bad066cc8..fdea007121 100644 --- a/src/Gui/SoDatumLabel.h +++ b/src/Gui/SoDatumLabel.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_SODATUMLABEL_H -#define GUI_SODATUMLABEL_H +#pragma once #include #include @@ -239,6 +238,3 @@ private: }; } // namespace Gui - - -#endif // GUI_SODATUMLABEL_H diff --git a/src/Gui/SoDevicePixelRatioElement.h b/src/Gui/SoDevicePixelRatioElement.h index 2c1be22b6b..88d0625703 100644 --- a/src/Gui/SoDevicePixelRatioElement.h +++ b/src/Gui/SoDevicePixelRatioElement.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef SO_DEVICE_PIXEL_RATIO_ELEMENT_H -#define SO_DEVICE_PIXEL_RATIO_ELEMENT_H +#pragma once #include @@ -48,5 +47,3 @@ public: protected: virtual ~SoDevicePixelRatioElement(); }; - -#endif // SO_DEVICE_PIXEL_RATIO_ELEMENT_H diff --git a/src/Gui/SoFCColorBar.h b/src/Gui/SoFCColorBar.h index a56152320f..373f1f980c 100644 --- a/src/Gui/SoFCColorBar.h +++ b/src/Gui/SoFCColorBar.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_SOFCCOLORBAR_H -#define GUI_SOFCCOLORBAR_H +#pragma once #include #include @@ -249,6 +248,3 @@ private: }; } // namespace Gui - - -#endif // GUI_SOFCCOLORBAR_H diff --git a/src/Gui/SoFCColorBarNotifier.h b/src/Gui/SoFCColorBarNotifier.h index 0495a02f29..8a589e87fb 100644 --- a/src/Gui/SoFCColorBarNotifier.h +++ b/src/Gui/SoFCColorBarNotifier.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef GUI_SOFCCOLORBARNOTIFIER_H -#define GUI_SOFCCOLORBARNOTIFIER_H +#pragma once #include #include @@ -52,6 +51,3 @@ private: }; } // namespace Gui - - -#endif // GUI_SOFCCOLORBARNOTIFIER_H diff --git a/src/Gui/SoFCColorGradient.h b/src/Gui/SoFCColorGradient.h index eb777ca7fb..2b5ab04e03 100644 --- a/src/Gui/SoFCColorGradient.h +++ b/src/Gui/SoFCColorGradient.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_SOFCCOLORGRADIENT_H -#define GUI_SOFCCOLORGRADIENT_H +#pragma once #include #include @@ -135,6 +134,3 @@ private: }; } // namespace Gui - - -#endif // GUI_SOFCCOLORGRADIENT_H diff --git a/src/Gui/SoFCColorLegend.h b/src/Gui/SoFCColorLegend.h index 253cb204bd..38f23da568 100644 --- a/src/Gui/SoFCColorLegend.h +++ b/src/Gui/SoFCColorLegend.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_SOFCCOLORLEGEND_H -#define GUI_SOFCCOLORLEGEND_H +#pragma once #include #include @@ -116,6 +115,3 @@ private: }; } // namespace Gui - - -#endif // GUI_SOFCCOLORLEGEND_H diff --git a/src/Gui/SoFCDB.h b/src/Gui/SoFCDB.h index 736a5df8fb..dc1f73569e 100644 --- a/src/Gui/SoFCDB.h +++ b/src/Gui/SoFCDB.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_SOFCDB_H -#define GUI_SOFCDB_H +#pragma once #include #include @@ -81,5 +80,3 @@ private: }; } // namespace Gui - -#endif // GUI_SOFCDB_H diff --git a/src/Gui/SoFCInteractiveElement.h b/src/Gui/SoFCInteractiveElement.h index 539362616d..8550f72bda 100644 --- a/src/Gui/SoFCInteractiveElement.h +++ b/src/Gui/SoFCInteractiveElement.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_SOFCINTERACTIVEELEMENT_H -#define GUI_SOFCINTERACTIVEELEMENT_H +#pragma once #include #include @@ -158,5 +157,3 @@ protected: }; } // namespace Gui - -#endif // GUI_SOFCINTERACTIVEELEMENT_H diff --git a/src/Gui/SoFCOffscreenRenderer.h b/src/Gui/SoFCOffscreenRenderer.h index f8b6cf778a..cd6c515ad9 100644 --- a/src/Gui/SoFCOffscreenRenderer.h +++ b/src/Gui/SoFCOffscreenRenderer.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_SOFCOFFSCREENRENDERER_H -#define GUI_SOFCOFFSCREENRENDERER_H +#pragma once #include #include @@ -168,6 +167,3 @@ private: }; } // namespace Gui - - -#endif // GUI_SOFCOFFSCREENRENDERER_H diff --git a/src/Gui/SoFCVectorizeSVGAction.h b/src/Gui/SoFCVectorizeSVGAction.h index 98768d9a66..22ca105402 100644 --- a/src/Gui/SoFCVectorizeSVGAction.h +++ b/src/Gui/SoFCVectorizeSVGAction.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_SOFCVECTORIZESVGACTION_H -#define GUI_SOFCVECTORIZESVGACTION_H +#pragma once #include #include @@ -105,5 +104,3 @@ private: }; } // namespace Gui - -#endif // GUI_SOFCVECTORIZESVGACTION_H diff --git a/src/Gui/SoFCVectorizeU3DAction.h b/src/Gui/SoFCVectorizeU3DAction.h index 2a3f59b55e..d18c47c2c1 100644 --- a/src/Gui/SoFCVectorizeU3DAction.h +++ b/src/Gui/SoFCVectorizeU3DAction.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_SOFCVECTORIZEU3DACTION_H -#define GUI_SOFCVECTORIZEU3DACTION_H +#pragma once #include @@ -82,5 +81,3 @@ private: }; } // namespace Gui - -#endif // GUI_SOFCVECTORIZEU3DACTION_H diff --git a/src/Gui/SoQtOffscreenRendererPy.h b/src/Gui/SoQtOffscreenRendererPy.h index 878bddf83d..f7037eece7 100644 --- a/src/Gui/SoQtOffscreenRendererPy.h +++ b/src/Gui/SoQtOffscreenRendererPy.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_SOQTOFFSCREENRENDERERPY_H -#define GUI_SOQTOFFSCREENRENDERERPY_H +#pragma once #include @@ -63,5 +62,3 @@ private: }; } // namespace Gui - -#endif // GUI_SOQTOFFSCREENRENDERERPY_H diff --git a/src/Gui/SoTextLabel.h b/src/Gui/SoTextLabel.h index e1240e13fb..0422a02d0c 100644 --- a/src/Gui/SoTextLabel.h +++ b/src/Gui/SoTextLabel.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_SOTEXTLABEL_H -#define GUI_SOTEXTLABEL_H +#pragma once #include #include @@ -156,5 +155,3 @@ private: }; } // namespace Gui - -#endif // GUI_SOTEXTLABEL_H diff --git a/src/Gui/SoTouchEvents.h b/src/Gui/SoTouchEvents.h index 80af47814e..04c5483cf1 100644 --- a/src/Gui/SoTouchEvents.h +++ b/src/Gui/SoTouchEvents.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef SOTOUCHEVENTS_H -#define SOTOUCHEVENTS_H +#pragma once #include #include @@ -141,5 +140,3 @@ public: protected: QWidget* widget; }; - -#endif // SOTOUCHEVENTS_H diff --git a/src/Gui/SpaceballEvent.h b/src/Gui/SpaceballEvent.h index 12fd18b7dc..35c370a375 100644 --- a/src/Gui/SpaceballEvent.h +++ b/src/Gui/SpaceballEvent.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef SPACEBALLEVENT_H -#define SPACEBALLEVENT_H +#pragma once #include @@ -116,4 +115,3 @@ private: int button; }; } // namespace Spaceball -#endif // SPACEBALLEVENT_H diff --git a/src/Gui/SpinBox.h b/src/Gui/SpinBox.h index a0124926b6..fe8e5612c5 100644 --- a/src/Gui/SpinBox.h +++ b/src/Gui/SpinBox.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_SPINBOX_H -#define GUI_SPINBOX_H +#pragma once #include #include @@ -212,5 +211,3 @@ public: }; } // namespace Gui - -#endif // GUI_SPINBOX_H diff --git a/src/Gui/SplashScreen.h b/src/Gui/SplashScreen.h index 4310abebbc..e839beb3aa 100644 --- a/src/Gui/SplashScreen.h +++ b/src/Gui/SplashScreen.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_SPLASHSCREEN_H -#define GUI_SPLASHSCREEN_H +#pragma once #include @@ -54,5 +53,3 @@ private: }; } // namespace Gui - -#endif // GUI_SPLASHSCREEN_H diff --git a/src/Gui/SplitButton.h b/src/Gui/SplitButton.h index afe4d66437..94561b23f6 100644 --- a/src/Gui/SplitButton.h +++ b/src/Gui/SplitButton.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FREECAD_FCSPLITBUTTON_H -#define FREECAD_FCSPLITBUTTON_H +#pragma once #include #include @@ -65,5 +64,3 @@ private: }; } // namespace Gui - -#endif // FREECAD_FCSPLITBUTTON_H diff --git a/src/Gui/SplitView3DInventor.h b/src/Gui/SplitView3DInventor.h index 8854573576..76652fd115 100644 --- a/src/Gui/SplitView3DInventor.h +++ b/src/Gui/SplitView3DInventor.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_SPLITVIEW3DINVENTOR_H -#define GUI_SPLITVIEW3DINVENTOR_H +#pragma once #include "MDIView.h" #include "MDIViewPy.h" @@ -129,5 +128,3 @@ public: }; } // namespace Gui - -#endif // GUI_SPLITVIEW3DINVENTOR_H diff --git a/src/Gui/StartupProcess.h b/src/Gui/StartupProcess.h index b5298cd73a..a9649a6479 100644 --- a/src/Gui/StartupProcess.h +++ b/src/Gui/StartupProcess.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef GUI_STARTUPPROCESS_H -#define GUI_STARTUPPROCESS_H +#pragma once #include #include @@ -90,5 +89,3 @@ private: } // namespace Gui - -#endif // GUI_STARTUPPROCESS_H diff --git a/src/Gui/StatusBarLabel.h b/src/Gui/StatusBarLabel.h index 18524d70a4..5f2023ccbf 100644 --- a/src/Gui/StatusBarLabel.h +++ b/src/Gui/StatusBarLabel.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef STATUSBARLABEL_H -#define STATUSBARLABEL_H +#pragma once #include @@ -62,4 +61,3 @@ private: }; } // Namespace Gui -#endif // STATUSBARLABEL_H diff --git a/src/Gui/StyleParameters/ParameterManager.h b/src/Gui/StyleParameters/ParameterManager.h index ddebc31ede..547a1cabae 100644 --- a/src/Gui/StyleParameters/ParameterManager.h +++ b/src/Gui/StyleParameters/ParameterManager.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef STYLEPARAMETERS_PARAMETERMANAGER_H -#define STYLEPARAMETERS_PARAMETERMANAGER_H +#pragma once #include #include @@ -557,5 +556,3 @@ public: } // namespace Gui::StyleParameters ENABLE_BITMASK_OPERATORS(Gui::StyleParameters::ParameterSourceOption); - -#endif // STYLEPARAMETERS_PARAMETERMANAGER_H diff --git a/src/Gui/StyleParameters/Parser.h b/src/Gui/StyleParameters/Parser.h index f962ac52f9..971aef8af0 100644 --- a/src/Gui/StyleParameters/Parser.h +++ b/src/Gui/StyleParameters/Parser.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef STYLEPARAMETERS_PARSER_H -#define STYLEPARAMETERS_PARSER_H +#pragma once #include #include @@ -166,5 +165,3 @@ private: }; } // namespace Gui::StyleParameters - -#endif // STYLEPARAMETERS_PARSER_H diff --git a/src/Gui/SyntaxHighlighter.h b/src/Gui/SyntaxHighlighter.h index 17fb728d93..9b6bcca277 100644 --- a/src/Gui/SyntaxHighlighter.h +++ b/src/Gui/SyntaxHighlighter.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_SYNTAXHIGHLIGHTER_H -#define GUI_SYNTAXHIGHLIGHTER_H +#pragma once #include #include @@ -74,5 +73,3 @@ private: }; } // namespace Gui - -#endif // GUI_SYNTAXHIGHLIGHTER_H diff --git a/src/Gui/TaskDlgRelocation.h b/src/Gui/TaskDlgRelocation.h index bbd712eeef..2f3805a19a 100644 --- a/src/Gui/TaskDlgRelocation.h +++ b/src/Gui/TaskDlgRelocation.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_TASKDLGRELOCATE_H -#define GUI_TASKDLGRELOCATE_H +#pragma once #include #include @@ -102,5 +101,3 @@ protected: } // namespace Gui - -#endif // ROBOTGUI_TASKDLGSIMULATE_H diff --git a/src/Gui/TaskElementColors.h b/src/Gui/TaskElementColors.h index 3cad829145..1cb902e7ef 100644 --- a/src/Gui/TaskElementColors.h +++ b/src/Gui/TaskElementColors.h @@ -20,8 +20,7 @@ * * ****************************************************************************/ -#ifndef GUI_TASKELEMENTCOLORS_H -#define GUI_TASKELEMENTCOLORS_H +#pragma once #include #include "TaskView/TaskDialog.h" @@ -94,5 +93,3 @@ private: }; } // namespace Gui - -#endif // GUI_TASKELEMENTCOLORS_H diff --git a/src/Gui/TaskTransform.h b/src/Gui/TaskTransform.h index ea4e1f58b5..94ff80b7f7 100644 --- a/src/Gui/TaskTransform.h +++ b/src/Gui/TaskTransform.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef TASK_TRANSFORM_DRAGGER_H -#define TASK_TRANSFORM_DRAGGER_H +#pragma once #include "TaskView/TaskDialog.h" #include "TaskView/TaskView.h" @@ -196,5 +195,3 @@ private: TaskTransform* transform; }; } // namespace Gui - -#endif // TASK_TRANSFORM_DRAGGER_H diff --git a/src/Gui/TaskView/TaskAppearance.h b/src/Gui/TaskView/TaskAppearance.h index 76da6e7da7..1393eec6a1 100644 --- a/src/Gui/TaskView/TaskAppearance.h +++ b/src/Gui/TaskView/TaskAppearance.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef GUI_TASKVIEW_TASKAPPERANCE_H -#define GUI_TASKVIEW_TASKAPPERANCE_H +#pragma once #include #include "TaskView.h" @@ -84,5 +83,3 @@ private: } // namespace TaskView } // namespace Gui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Gui/TaskView/TaskDialog.h b/src/Gui/TaskView/TaskDialog.h index 9c05f68776..f6fd9970a2 100644 --- a/src/Gui/TaskView/TaskDialog.h +++ b/src/Gui/TaskView/TaskDialog.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef GUI_TASKVIEW_TASKDIALOG_H -#define GUI_TASKVIEW_TASKDIALOG_H +#pragma once #include #include @@ -253,5 +252,3 @@ private: } // namespace TaskView } // namespace Gui - -#endif // GUI_TASKVIEW_TASKDIALOG_H diff --git a/src/Gui/TaskView/TaskDialogPython.h b/src/Gui/TaskView/TaskDialogPython.h index 158f47168f..07dbb12207 100644 --- a/src/Gui/TaskView/TaskDialogPython.h +++ b/src/Gui/TaskView/TaskDialogPython.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef GUI_TASKVIEW_TASKDIALOGPYTHON_H -#define GUI_TASKVIEW_TASKDIALOGPYTHON_H +#pragma once #include "TaskDialog.h" #include "TaskWatcher.h" @@ -196,5 +195,3 @@ private: } // namespace TaskView } // namespace Gui - -#endif // GUI_TASKVIEW_TASKDIALOGPYTHON_H diff --git a/src/Gui/TaskView/TaskEditControl.h b/src/Gui/TaskView/TaskEditControl.h index f38ae6c93f..a9e0feb3f0 100644 --- a/src/Gui/TaskView/TaskEditControl.h +++ b/src/Gui/TaskView/TaskEditControl.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef GUI_TASKVIEW_TASKEDITCONTROL_H -#define GUI_TASKVIEW_TASKEDITCONTROL_H +#pragma once #include "TaskView.h" @@ -61,5 +60,3 @@ protected: } // namespace TaskView } // namespace Gui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Gui/TaskView/TaskImage.h b/src/Gui/TaskView/TaskImage.h index 8f0c0d6540..5c5bf7ccd9 100644 --- a/src/Gui/TaskView/TaskImage.h +++ b/src/Gui/TaskView/TaskImage.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef GUI_TASKIMAGE_H -#define GUI_TASKIMAGE_H +#pragma once #include #include @@ -152,5 +151,3 @@ private: }; } // namespace Gui - -#endif // GUI_TASKIMAGE_H diff --git a/src/Gui/TaskView/TaskOrientation.h b/src/Gui/TaskView/TaskOrientation.h index 414ceb2b9f..c40f222789 100644 --- a/src/Gui/TaskView/TaskOrientation.h +++ b/src/Gui/TaskView/TaskOrientation.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef GUI_TASKORIENTATION_H -#define GUI_TASKORIENTATION_H +#pragma once #include #include @@ -78,5 +77,3 @@ private: }; } // namespace Gui - -#endif // GUI_TASKORIENTATION_H diff --git a/src/Gui/TaskView/TaskSelectLinkProperty.h b/src/Gui/TaskView/TaskSelectLinkProperty.h index 88d17c47d2..7aa9d58c76 100644 --- a/src/Gui/TaskView/TaskSelectLinkProperty.h +++ b/src/Gui/TaskView/TaskSelectLinkProperty.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskSelectLinkProperty_H -#define GUI_TASKVIEW_TaskSelectLinkProperty_H +#pragma once #include "TaskView.h" #include @@ -121,5 +120,3 @@ private: } // namespace TaskView } // namespace Gui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Gui/TaskView/TaskSolverMessages.h b/src/Gui/TaskView/TaskSolverMessages.h index fe3a54105b..cab927cfa5 100644 --- a/src/Gui/TaskView/TaskSolverMessages.h +++ b/src/Gui/TaskView/TaskSolverMessages.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskSolverMessages_H -#define GUI_TASKVIEW_TaskSolverMessages_H +#pragma once #include @@ -69,5 +68,3 @@ private: }; } // namespace Gui - -#endif // GUI_TASKVIEW_TaskSolverMessages_H diff --git a/src/Gui/TaskView/TaskView.h b/src/Gui/TaskView/TaskView.h index 5b3e540e79..f20e710fde 100644 --- a/src/Gui/TaskView/TaskView.h +++ b/src/Gui/TaskView/TaskView.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef GUI_TASKVIEW_TASKVIEW_H -#define GUI_TASKVIEW_TASKVIEW_H +#pragma once #include #include @@ -243,5 +242,3 @@ protected: } // namespace TaskView } // namespace Gui - -#endif // GUI_TASKVIEW_TASKVIEW_H diff --git a/src/Gui/TaskView/TaskWatcher.h b/src/Gui/TaskView/TaskWatcher.h index 34fd48d52b..b83a5d46b6 100644 --- a/src/Gui/TaskView/TaskWatcher.h +++ b/src/Gui/TaskView/TaskWatcher.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef GUI_TASKVIEW_TASKWATCHER_H -#define GUI_TASKVIEW_TASKWATCHER_H +#pragma once #include #include @@ -116,5 +115,3 @@ public: } // namespace TaskView } // namespace Gui - -#endif // GUI_TASKVIEW_TASKWATCHER_H diff --git a/src/Gui/TextDocumentEditorView.h b/src/Gui/TextDocumentEditorView.h index 1bf6342463..9b48c3d7cb 100644 --- a/src/Gui/TextDocumentEditorView.h +++ b/src/Gui/TextDocumentEditorView.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_TEXTDOCUMENTEDITORVIEW_H -#define GUI_TEXTDOCUMENTEDITORVIEW_H +#pragma once #include @@ -81,5 +80,3 @@ private: }; } // namespace Gui - -#endif diff --git a/src/Gui/TextEdit.h b/src/Gui/TextEdit.h index 204421e521..49ef1bd4f8 100644 --- a/src/Gui/TextEdit.h +++ b/src/Gui/TextEdit.h @@ -22,8 +22,7 @@ /* Text completion mechanism */ -#ifndef GUI_TEXTEDIT_H -#define GUI_TEXTEDIT_H +#pragma once #include #include @@ -214,5 +213,3 @@ private: }; } // namespace Gui - -#endif // GUI_TEXTEDIT_H diff --git a/src/Gui/TextureMapping.h b/src/Gui/TextureMapping.h index dc893b0d44..93fd7dee7f 100644 --- a/src/Gui/TextureMapping.h +++ b/src/Gui/TextureMapping.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_TEXTUREMAPPING_H -#define GUI_TEXTUREMAPPING_H +#pragma once #include #include @@ -86,5 +85,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_TEXTUREMAPPING_H diff --git a/src/Gui/Thumbnail.h b/src/Gui/Thumbnail.h index 6b057458c2..f5b6a77876 100644 --- a/src/Gui/Thumbnail.h +++ b/src/Gui/Thumbnail.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_THUMBNAIL_H -#define GUI_THUMBNAIL_H +#pragma once #include #include @@ -63,5 +62,3 @@ private: }; } // namespace Gui - -#endif // GUI_THUMBNAIL_H diff --git a/src/Gui/ToolBarAreaWidget.h b/src/Gui/ToolBarAreaWidget.h index fd543a186e..dd1be27ead 100644 --- a/src/Gui/ToolBarAreaWidget.h +++ b/src/Gui/ToolBarAreaWidget.h @@ -19,8 +19,7 @@ * * ***************************************************************************/ -#ifndef GUI_TOOLBARAREAWIDGET_H -#define GUI_TOOLBARAREAWIDGET_H +#pragma once #include #include @@ -115,5 +114,3 @@ private: }; } // namespace Gui - -#endif // GUI_TOOLBARAREAWIDGET_H diff --git a/src/Gui/ToolBarManager.h b/src/Gui/ToolBarManager.h index f000b4e310..b84451d8f7 100644 --- a/src/Gui/ToolBarManager.h +++ b/src/Gui/ToolBarManager.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_TOOLBARMANAGER_H -#define GUI_TOOLBARMANAGER_H +#pragma once #include #include @@ -243,6 +242,3 @@ private: }; } // namespace Gui - - -#endif // GUI_TOOLBARMANAGER_H diff --git a/src/Gui/ToolBox.h b/src/Gui/ToolBox.h index 087873a4ce..4d6ba3ebdb 100644 --- a/src/Gui/ToolBox.h +++ b/src/Gui/ToolBox.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_DOCKWND_TOOLBOX_H -#define GUI_DOCKWND_TOOLBOX_H +#pragma once #include #include @@ -110,5 +109,3 @@ private: } // namespace DockWnd } // namespace Gui - -#endif // GUI_DOCKWND_TOOLBOX_H diff --git a/src/Gui/ToolBoxManager.h b/src/Gui/ToolBoxManager.h index 7aa1b4c1f2..ae1126dcd9 100644 --- a/src/Gui/ToolBoxManager.h +++ b/src/Gui/ToolBoxManager.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_TOOLBOXMANAGER_H -#define GUI_TOOLBOXMANAGER_H +#pragma once #include @@ -65,6 +64,3 @@ private: }; } // namespace Gui - - -#endif // GUI_TOOLBOXMANAGER_H diff --git a/src/Gui/ToolHandler.h b/src/Gui/ToolHandler.h index 33985ec732..c647c7ff6d 100644 --- a/src/Gui/ToolHandler.h +++ b/src/Gui/ToolHandler.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_ToolHandler_H -#define GUI_ToolHandler_H +#pragma once #include #include @@ -128,6 +127,3 @@ protected: } // namespace Gui - - -#endif // GUI_ToolHandler_H diff --git a/src/Gui/Tools.h b/src/Gui/Tools.h index e6ed5060f1..9ce36a56b9 100644 --- a/src/Gui/Tools.h +++ b/src/Gui/Tools.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_TOOLS_H -#define GUI_TOOLS_H +#pragma once #include #include @@ -122,5 +121,3 @@ T valueOr(const QVariant& variant, const T& defaultValue) } } // namespace Gui::QtTools - -#endif // GUI_TOOLS_H diff --git a/src/Gui/TransactionObject.h b/src/Gui/TransactionObject.h index cc302f024a..d540ce4b20 100644 --- a/src/Gui/TransactionObject.h +++ b/src/Gui/TransactionObject.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_TRANSACTIONOBJECT_H -#define GUI_TRANSACTIONOBJECT_H +#pragma once #include @@ -41,6 +40,3 @@ public: }; } // namespace Gui - - -#endif // GUI_TRANSACTIONOBJECT_H diff --git a/src/Gui/Transform.h b/src/Gui/Transform.h index eb69afee8b..e9538998b7 100644 --- a/src/Gui/Transform.h +++ b/src/Gui/Transform.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_TRANSFORM_H -#define GUI_TRANSFORM_H +#pragma once #include #include @@ -124,5 +123,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_TRANSFORM_H diff --git a/src/Gui/Tree.h b/src/Gui/Tree.h index 247f039b71..41397a27dc 100644 --- a/src/Gui/Tree.h +++ b/src/Gui/Tree.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_TREE_H -#define GUI_TREE_H +#pragma once #include #include @@ -575,5 +574,3 @@ public: }; } // namespace Gui - -#endif // GUI_TREE_H diff --git a/src/Gui/TreeItemMode.h b/src/Gui/TreeItemMode.h index 6504bbf431..5ee98c629c 100644 --- a/src/Gui/TreeItemMode.h +++ b/src/Gui/TreeItemMode.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_TREEITEMMODE_H -#define GUI_TREEITEMMODE_H +#pragma once namespace Gui { @@ -49,5 +48,3 @@ enum class TreeItemMode ToggleItem }; } // namespace Gui - -#endif // GUI_TREEITEMMODE_H diff --git a/src/Gui/TreeParams.h b/src/Gui/TreeParams.h index 4ac814a2f2..642a5ceaad 100644 --- a/src/Gui/TreeParams.h +++ b/src/Gui/TreeParams.h @@ -20,8 +20,7 @@ * * ****************************************************************************/ -#ifndef GUI_TREE_PARAMS_H -#define GUI_TREE_PARAMS_H +#pragma once /*[[[cog import TreeParams @@ -508,5 +507,3 @@ public: }; // class TreeParams } // namespace Gui //[[[end]]] - -#endif // GUI_TREE_PARAMS_H diff --git a/src/Gui/TreeView.h b/src/Gui/TreeView.h index 3c53de1237..571d24939b 100644 --- a/src/Gui/TreeView.h +++ b/src/Gui/TreeView.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_TREEVIEW_H -#define GUI_TREEVIEW_H +#pragma once #include #include @@ -44,6 +43,3 @@ protected: }; } // namespace Gui - - -#endif // GUI_TREEVIEW_H diff --git a/src/Gui/UiLoader.h b/src/Gui/UiLoader.h index 5df1d283ff..d533ce827f 100644 --- a/src/Gui/UiLoader.h +++ b/src/Gui/UiLoader.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_UILOADER_H -#define GUI_UILOADER_H +#pragma once #if !defined(__MINGW32__) # define HAVE_QT_UI_TOOLS @@ -187,5 +186,3 @@ private: }; } // namespace Gui - -#endif // GUI_UILOADER_H diff --git a/src/Gui/Utilities.h b/src/Gui/Utilities.h index 957ea4c7ea..74ddb935e5 100644 --- a/src/Gui/Utilities.h +++ b/src/Gui/Utilities.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_UTILITIES_H -#define GUI_UTILITIES_H +#pragma once #include #include @@ -543,5 +542,3 @@ struct TransformComponents } } // namespace Gui - -#endif // GUI_UTILITIES_H diff --git a/src/Gui/VectorListEditor.h b/src/Gui/VectorListEditor.h index 573ea6aa39..a3996cb5a5 100644 --- a/src/Gui/VectorListEditor.h +++ b/src/Gui/VectorListEditor.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_VECTORLISTEDITOR_H -#define GUI_VECTORLISTEDITOR_H +#pragma once #include #include @@ -118,5 +117,3 @@ private: }; } // namespace Gui - -#endif // GUI_VECTORLISTEDITOR_H diff --git a/src/Gui/View.h b/src/Gui/View.h index 4cf70dc3f3..d4f84e33e8 100644 --- a/src/Gui/View.h +++ b/src/Gui/View.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_VIEW_H -#define GUI_VIEW_H +#pragma once #include #include @@ -124,5 +123,3 @@ protected: }; } // namespace Gui - -#endif // GUI_VIEW_H diff --git a/src/Gui/View3DInventor.h b/src/Gui/View3DInventor.h index c3afe5fdee..93e12248c7 100644 --- a/src/Gui/View3DInventor.h +++ b/src/Gui/View3DInventor.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_VIEW3DINVENTOR_H -#define GUI_VIEW3DINVENTOR_H +#pragma once #include #include @@ -171,5 +170,3 @@ private: }; } // namespace Gui - -#endif // GUI_VIEW3DINVENTOR_H diff --git a/src/Gui/View3DInventorRiftViewer.h b/src/Gui/View3DInventorRiftViewer.h index 2357319153..47b38092c3 100644 --- a/src/Gui/View3DInventorRiftViewer.h +++ b/src/Gui/View3DInventorRiftViewer.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_View3DInventorRiftViewer_H -#define GUI_View3DInventorRiftViewer_H +#pragma once #if BUILD_VR @@ -53,5 +52,3 @@ protected: } // namespace Gui #endif // BUILD_VR - -#endif // GUI_View3DInventorRiftViewer_H diff --git a/src/Gui/View3DInventorSelection.h b/src/Gui/View3DInventorSelection.h index 229b6270d5..877df9708e 100644 --- a/src/Gui/View3DInventorSelection.h +++ b/src/Gui/View3DInventorSelection.h @@ -20,8 +20,7 @@ * * ****************************************************************************/ -#ifndef GUI_VIEW3DINVENTORSELECTION_H -#define GUI_VIEW3DINVENTORSELECTION_H +#pragma once #include #include @@ -66,5 +65,3 @@ private: }; } // namespace Gui - -#endif // GUI_VIEW3DINVENTORSELECTION_H diff --git a/src/Gui/View3DInventorViewer.h b/src/Gui/View3DInventorViewer.h index edbeefb847..13377d9852 100644 --- a/src/Gui/View3DInventorViewer.h +++ b/src/Gui/View3DInventorViewer.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_VIEW3DINVENTORVIEWER_H -#define GUI_VIEW3DINVENTORVIEWER_H +#pragma once #include #include @@ -634,5 +633,3 @@ private: }; } // namespace Gui - -#endif // GUI_VIEW3DINVENTORVIEWER_H diff --git a/src/Gui/View3DPy.h b/src/Gui/View3DPy.h index a1673530ed..3cec22261d 100644 --- a/src/Gui/View3DPy.h +++ b/src/Gui/View3DPy.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_VIEW3DPY_H -#define GUI_VIEW3DPY_H +#pragma once #include "MDIView.h" #include "MDIViewPy.h" @@ -145,5 +144,3 @@ private: }; } // namespace Gui - -#endif // GUI_VIEW3DPY_H diff --git a/src/Gui/View3DSettings.h b/src/Gui/View3DSettings.h index d9e563fc23..2be7715d32 100644 --- a/src/Gui/View3DSettings.h +++ b/src/Gui/View3DSettings.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_VIEW3DSETTINGS_H -#define GUI_VIEW3DSETTINGS_H +#pragma once #include #include @@ -76,5 +75,3 @@ private: }; } // namespace Gui - -#endif // GUI_VIEW3DSETTINGS_H diff --git a/src/Gui/View3DViewerPy.h b/src/Gui/View3DViewerPy.h index 0d78b1be04..c182a964e5 100644 --- a/src/Gui/View3DViewerPy.h +++ b/src/Gui/View3DViewerPy.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_VIEW3DVIEWERPY_H -#define GUI_VIEW3DVIEWERPY_H +#pragma once #include #include @@ -96,5 +95,3 @@ private: }; } // namespace Gui - -#endif // GUI_VIEW3DPY_H diff --git a/src/Gui/ViewParams.h b/src/Gui/ViewParams.h index ed561d1060..d87dfb5cac 100644 --- a/src/Gui/ViewParams.h +++ b/src/Gui/ViewParams.h @@ -20,8 +20,7 @@ * * ****************************************************************************/ -#ifndef GUI_VIEW_PARAMS_H -#define GUI_VIEW_PARAMS_H +#pragma once #include @@ -103,5 +102,3 @@ private: #undef FC_VIEW_PARAM } // namespace Gui - -#endif // GUI_VIEW_PARAMS_H diff --git a/src/Gui/ViewProvider.h b/src/Gui/ViewProvider.h index 4f13d15edb..4bc8179c73 100644 --- a/src/Gui/ViewProvider.h +++ b/src/Gui/ViewProvider.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_VIEWPROVIDER_H -#define GUI_VIEWPROVIDER_H +#pragma once #include #include @@ -729,5 +728,3 @@ private: }; } // namespace Gui - -#endif // GUI_VIEWPROVIDER_H diff --git a/src/Gui/ViewProviderAnnotation.h b/src/Gui/ViewProviderAnnotation.h index f5965f8aad..2ef95e07a8 100644 --- a/src/Gui/ViewProviderAnnotation.h +++ b/src/Gui/ViewProviderAnnotation.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_VIEWPROVIDERANNOTATION_H -#define GUI_VIEWPROVIDERANNOTATION_H +#pragma once #include "ViewProviderDocumentObject.h" #include @@ -127,6 +126,3 @@ private: }; } // namespace Gui - - -#endif // GUI_VIEWPROVIDERANNOTATION_H diff --git a/src/Gui/ViewProviderBuilder.h b/src/Gui/ViewProviderBuilder.h index 5464d68299..2fae3b1cc6 100644 --- a/src/Gui/ViewProviderBuilder.h +++ b/src/Gui/ViewProviderBuilder.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_VIEWPROVIDERBUILDER_H -#define GUI_VIEWPROVIDERBUILDER_H +#pragma once #include #include @@ -66,6 +65,3 @@ public: }; } // namespace Gui - - -#endif // GUI_VIEWPROVIDERBUILDER_H diff --git a/src/Gui/ViewProviderCoordinateSystem.h b/src/Gui/ViewProviderCoordinateSystem.h index bdb6ac0de1..019559c80f 100644 --- a/src/Gui/ViewProviderCoordinateSystem.h +++ b/src/Gui/ViewProviderCoordinateSystem.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_VIEWPROVIDER_ViewProviderOrigin_H -#define GUI_VIEWPROVIDER_ViewProviderOrigin_H +#pragma once #include #include @@ -120,5 +119,3 @@ private: } // namespace Gui ENABLE_BITMASK_OPERATORS(Gui::DatumElement) - -#endif // GUI_VIEWPROVIDER_ViewProviderOrigin_H diff --git a/src/Gui/ViewProviderDatum.h b/src/Gui/ViewProviderDatum.h index 188bf7f88a..f4c07c5612 100644 --- a/src/Gui/ViewProviderDatum.h +++ b/src/Gui/ViewProviderDatum.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef VIEWPROVIDEDATUM_H_BYJRZNDL -#define VIEWPROVIDEDATUM_H_BYJRZNDL +#pragma once #include "ViewProviderGeometryObject.h" @@ -77,5 +76,3 @@ protected: }; } // namespace Gui - -#endif /* end of include guard: VIEWPROVIDEDATUM_H_BYJRZNDL */ diff --git a/src/Gui/ViewProviderDocumentObject.h b/src/Gui/ViewProviderDocumentObject.h index 54d8b7bf1d..5736f89854 100644 --- a/src/Gui/ViewProviderDocumentObject.h +++ b/src/Gui/ViewProviderDocumentObject.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_VIEWPROVIDER_DOCUMENTOBJECT_H -#define GUI_VIEWPROVIDER_DOCUMENTOBJECT_H +#pragma once #include @@ -270,5 +269,3 @@ private: } // namespace Gui - -#endif // GUI_VIEWPROVIDER_DOCUMENTOBJECT_H diff --git a/src/Gui/ViewProviderDocumentObjectGroup.h b/src/Gui/ViewProviderDocumentObjectGroup.h index 9f8153ab44..b6f11a0cbb 100644 --- a/src/Gui/ViewProviderDocumentObjectGroup.h +++ b/src/Gui/ViewProviderDocumentObjectGroup.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_VIEWPROVIDER_DOCUMENTOBJECTGROUP_H -#define GUI_VIEWPROVIDER_DOCUMENTOBJECTGROUP_H +#pragma once #include "ViewProviderDocumentObject.h" #include "ViewProviderGroupExtension.h" @@ -69,5 +68,3 @@ using ViewProviderDocumentObjectGroupPython = ViewProviderFeaturePythonT; } // namespace Gui - -#endif // GUI_VIEWPROVIDER_DOCUMENTOBJECTGROUP_H diff --git a/src/Gui/ViewProviderDragger.h b/src/Gui/ViewProviderDragger.h index 416492c240..d8b5933c94 100644 --- a/src/Gui/ViewProviderDragger.h +++ b/src/Gui/ViewProviderDragger.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_VIEWPROVIDER_DRAGGER_H -#define GUI_VIEWPROVIDER_DRAGGER_H +#pragma once #include "ViewProviderDocumentObject.h" #include @@ -162,5 +161,3 @@ private: } // namespace Gui ENABLE_BITMASK_OPERATORS(Gui::ViewProviderDragger::DraggerComponent) - -#endif // GUI_VIEWPROVIDER_DRAGGER_H diff --git a/src/Gui/ViewProviderExtension.h b/src/Gui/ViewProviderExtension.h index 8d6778e3d3..af59aa88e1 100644 --- a/src/Gui/ViewProviderExtension.h +++ b/src/Gui/ViewProviderExtension.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_VIEWPROVIDEREXTENSION_H -#define GUI_VIEWPROVIDEREXTENSION_H +#pragma once #include #include @@ -201,5 +200,3 @@ private: }; } // namespace Gui - -#endif // GUI_VIEWPROVIDEREXTENSION_H diff --git a/src/Gui/ViewProviderExtensionPython.h b/src/Gui/ViewProviderExtensionPython.h index e28163e6f2..80f4fa7c7d 100644 --- a/src/Gui/ViewProviderExtensionPython.h +++ b/src/Gui/ViewProviderExtensionPython.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_VIEWPROVIDEREXTENSIONPYTHON_H -#define GUI_VIEWPROVIDEREXTENSIONPYTHON_H +#pragma once #include "ViewProviderExtension.h" #include @@ -58,5 +57,3 @@ public: using ViewProviderExtensionPython = ViewProviderExtensionPythonT; } // namespace Gui - -#endif // GUI_VIEWPROVIDEREXTENSIONPYTHON_H diff --git a/src/Gui/ViewProviderExtern.h b/src/Gui/ViewProviderExtern.h index 284c404e0a..86fb88395a 100644 --- a/src/Gui/ViewProviderExtern.h +++ b/src/Gui/ViewProviderExtern.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_VIEWPROVIDER_EXTERN_H -#define GUI_VIEWPROVIDER_EXTERN_H +#pragma once #include "ViewProvider.h" @@ -63,5 +62,3 @@ protected: }; } // namespace Gui - -#endif // GUI_VIEWPROVIDER_EXTERN_H diff --git a/src/Gui/ViewProviderFeature.h b/src/Gui/ViewProviderFeature.h index 19715ee185..6041fa039f 100644 --- a/src/Gui/ViewProviderFeature.h +++ b/src/Gui/ViewProviderFeature.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_VIEWPROVIDER_FEATURE_H -#define GUI_VIEWPROVIDER_FEATURE_H +#pragma once #include "ViewProviderDocumentObject.h" @@ -53,5 +52,3 @@ public: }; } // namespace Gui - -#endif // GUI_VIEWPROVIDER_FEATURE_H diff --git a/src/Gui/ViewProviderFeaturePython.h b/src/Gui/ViewProviderFeaturePython.h index 16570bbf9c..f828611560 100644 --- a/src/Gui/ViewProviderFeaturePython.h +++ b/src/Gui/ViewProviderFeaturePython.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_VIEWPROVIDERFEATUREPYTHON_H -#define GUI_VIEWPROVIDERFEATUREPYTHON_H +#pragma once #include #include @@ -753,5 +752,3 @@ using ViewProviderFeaturePython = ViewProviderFeaturePythonT; } // namespace Gui - -#endif // GUI_VIEWPROVIDERFEATUREPYTHON_H diff --git a/src/Gui/ViewProviderGeoFeatureGroup.h b/src/Gui/ViewProviderGeoFeatureGroup.h index 2be0f08a92..d5034b3ba5 100644 --- a/src/Gui/ViewProviderGeoFeatureGroup.h +++ b/src/Gui/ViewProviderGeoFeatureGroup.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef GUI_VIEWPROVIDER_ViewProviderGeoFeatureGroup_H -#define GUI_VIEWPROVIDER_ViewProviderGeoFeatureGroup_H +#pragma once #include "ViewProviderDocumentObject.h" @@ -48,5 +47,3 @@ public: using ViewProviderGeoFeatureGroupPython = ViewProviderFeaturePythonT; } // namespace Gui - -#endif // GUI_VIEWPROVIDER_ViewProviderGeoFeatureGroup_H diff --git a/src/Gui/ViewProviderGeoFeatureGroupExtension.h b/src/Gui/ViewProviderGeoFeatureGroupExtension.h index 72cd7fc5d1..d0886d4792 100644 --- a/src/Gui/ViewProviderGeoFeatureGroupExtension.h +++ b/src/Gui/ViewProviderGeoFeatureGroupExtension.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_VIEWPROVIDERGEOFEATUREGROUPEXTENSION_H -#define GUI_VIEWPROVIDERGEOFEATUREGROUPEXTENSION_H +#pragma once #include "ViewProviderGroupExtension.h" @@ -82,5 +81,3 @@ using ViewProviderGeoFeatureGroupExtensionPython = ViewProviderExtensionPythonT; } // namespace Gui - -#endif // GUI_VIEWPROVIDERGEOFEATUREGROUPEXTENSION_H diff --git a/src/Gui/ViewProviderGeometryObject.h b/src/Gui/ViewProviderGeometryObject.h index bba4d6aa18..a29f11dd68 100644 --- a/src/Gui/ViewProviderGeometryObject.h +++ b/src/Gui/ViewProviderGeometryObject.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_VIEWPROVIDER_GEOMETRYOBJECT_H -#define GUI_VIEWPROVIDER_GEOMETRYOBJECT_H +#pragma once #include "ViewProviderDragger.h" #include @@ -127,6 +126,3 @@ protected: }; } // namespace Gui - - -#endif // GUI_VIEWPROVIDER_GEOMETRYOBJECT_H diff --git a/src/Gui/ViewProviderGroupExtension.h b/src/Gui/ViewProviderGroupExtension.h index 1da81d2be3..8150df8310 100644 --- a/src/Gui/ViewProviderGroupExtension.h +++ b/src/Gui/ViewProviderGroupExtension.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_VIEWPROVIDERGROUPEXTENSION_H -#define GUI_VIEWPROVIDERGROUPEXTENSION_H +#pragma once #include "ViewProviderExtensionPython.h" @@ -59,5 +58,3 @@ private: using ViewProviderGroupExtensionPython = ViewProviderExtensionPythonT; } // namespace Gui - -#endif // GUI_VIEWPROVIDERGROUPEXTENSION_H diff --git a/src/Gui/ViewProviderImagePlane.h b/src/Gui/ViewProviderImagePlane.h index c8c2b45332..941ed52442 100644 --- a/src/Gui/ViewProviderImagePlane.h +++ b/src/Gui/ViewProviderImagePlane.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_ViewProviderImagePlane_H -#define GUI_ViewProviderImagePlane_H +#pragma once #include @@ -76,6 +75,3 @@ private: }; } // namespace Gui - - -#endif // GUI_ViewProviderImagePlane_H diff --git a/src/Gui/ViewProviderInventorObject.h b/src/Gui/ViewProviderInventorObject.h index e6f487b145..d8d6eb0fe7 100644 --- a/src/Gui/ViewProviderInventorObject.h +++ b/src/Gui/ViewProviderInventorObject.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_VIEWPROVIDER_INVENTOROBJECT_H -#define GUI_VIEWPROVIDER_INVENTOROBJECT_H +#pragma once #include "ViewProviderDocumentObject.h" @@ -59,6 +58,3 @@ protected: }; } // namespace Gui - - -#endif // GUI_VIEWPROVIDER_INVENTOROBJECT_H diff --git a/src/Gui/ViewProviderLine.h b/src/Gui/ViewProviderLine.h index ea946ce861..7fee973462 100644 --- a/src/Gui/ViewProviderLine.h +++ b/src/Gui/ViewProviderLine.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef GUI_ViewProviderLine_H -#define GUI_ViewProviderLine_H +#pragma once #include "ViewProviderDatum.h" @@ -63,6 +62,3 @@ protected: }; } // namespace Gui - - -#endif // GUI_ViewProviderLine_H diff --git a/src/Gui/ViewProviderLink.h b/src/Gui/ViewProviderLink.h index 780cd4e5d9..8f70970cf2 100644 --- a/src/Gui/ViewProviderLink.h +++ b/src/Gui/ViewProviderLink.h @@ -20,8 +20,7 @@ * * ****************************************************************************/ -#ifndef SRC_GUI_VIEWPROVIDER_LINK_H_ -#define SRC_GUI_VIEWPROVIDER_LINK_H_ +#pragma once #include #include @@ -392,6 +391,3 @@ private: using ViewProviderLinkPython = ViewProviderFeaturePythonT; } // namespace Gui - - -#endif // SRC_GUI_VIEWPROVIDER_LINK_H_ diff --git a/src/Gui/ViewProviderMaterialObject.h b/src/Gui/ViewProviderMaterialObject.h index 562d1e01f8..e4b039da29 100644 --- a/src/Gui/ViewProviderMaterialObject.h +++ b/src/Gui/ViewProviderMaterialObject.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_ViewProviderMaterialObject_H -#define GUI_ViewProviderMaterialObject_H +#pragma once #include "ViewProviderDocumentObject.h" @@ -55,5 +54,3 @@ public: using ViewProviderMaterialObjectPython = ViewProviderFeaturePythonT; } // namespace Gui - -#endif // GUI_ViewProviderMaterialObject_H diff --git a/src/Gui/ViewProviderOriginGroup.h b/src/Gui/ViewProviderOriginGroup.h index f02ed2badc..d7626dc3df 100644 --- a/src/Gui/ViewProviderOriginGroup.h +++ b/src/Gui/ViewProviderOriginGroup.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef VIEWPROVIDERORIGINGROUP_H -#define VIEWPROVIDERORIGINGROUP_H +#pragma once #include "ViewProviderOriginGroupExtension.h" @@ -39,6 +38,3 @@ public: }; } // namespace Gui - - -#endif /* end of include guard: VIEWPROVIDERORIGINGROUP_H */ diff --git a/src/Gui/ViewProviderOriginGroupExtension.h b/src/Gui/ViewProviderOriginGroupExtension.h index 74d0d89a9b..4af05b28e0 100644 --- a/src/Gui/ViewProviderOriginGroupExtension.h +++ b/src/Gui/ViewProviderOriginGroupExtension.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_VIEWPROVIDERORIGINGROUPEXTENSION_H -#define GUI_VIEWPROVIDERORIGINGROUPEXTENSION_H +#pragma once #include "ViewProviderGeoFeatureGroup.h" @@ -52,5 +51,3 @@ using ViewProviderOriginGroupExtensionPython = ViewProviderExtensionPythonT; } // namespace Gui - -#endif // GUI_VIEWPROVIDERORIGINGROUPEXTENSION_H diff --git a/src/Gui/ViewProviderPart.h b/src/Gui/ViewProviderPart.h index 336d2fd105..240fb31310 100644 --- a/src/Gui/ViewProviderPart.h +++ b/src/Gui/ViewProviderPart.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_VIEWPROVIDER_ViewProviderPart_H -#define GUI_VIEWPROVIDER_ViewProviderPart_H +#pragma once #include "ActiveObjectList.h" #include "ViewProviderGeometryObject.h" @@ -68,5 +67,3 @@ protected: using ViewProviderPartPython = ViewProviderFeaturePythonT; } // namespace Gui - -#endif // GUI_VIEWPROVIDER_ViewProviderPart_H diff --git a/src/Gui/ViewProviderPlacement.h b/src/Gui/ViewProviderPlacement.h index a94ef3ab5c..2c913d43bb 100644 --- a/src/Gui/ViewProviderPlacement.h +++ b/src/Gui/ViewProviderPlacement.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_ViewProviderPlacement_H -#define GUI_ViewProviderPlacement_H +#pragma once #include "AxisOrigin.h" #include "ViewProviderGeometryObject.h" @@ -72,6 +71,3 @@ protected: using ViewProviderPlacementPython = ViewProviderFeaturePythonT; } // namespace Gui - - -#endif // GUI_ViewProviderPlacement_H diff --git a/src/Gui/ViewProviderPlane.h b/src/Gui/ViewProviderPlane.h index bc51ce58f0..f2aad4d2b3 100644 --- a/src/Gui/ViewProviderPlane.h +++ b/src/Gui/ViewProviderPlane.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef GUI_ViewProviderPlane_H -#define GUI_ViewProviderPlane_H +#pragma once #include "ViewProviderDatum.h" @@ -72,6 +71,3 @@ private: }; } // namespace Gui - - -#endif // GUI_ViewProviderPlane_H diff --git a/src/Gui/ViewProviderPoint.h b/src/Gui/ViewProviderPoint.h index bf8b871a19..a47737bca8 100644 --- a/src/Gui/ViewProviderPoint.h +++ b/src/Gui/ViewProviderPoint.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef GUI_ViewProviderPoint_H -#define GUI_ViewProviderPoint_H +#pragma once #include "ViewProviderDatum.h" @@ -43,6 +42,3 @@ public: }; } // namespace Gui - - -#endif // GUI_ViewProviderPoint_H diff --git a/src/Gui/ViewProviderSuppressibleExtension.h b/src/Gui/ViewProviderSuppressibleExtension.h index acefd86646..d0e8147f07 100644 --- a/src/Gui/ViewProviderSuppressibleExtension.h +++ b/src/Gui/ViewProviderSuppressibleExtension.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef VIEWPROVIDERSUPPRESSIBLEEXTENSION_H -#define VIEWPROVIDERSUPPRESSIBLEEXTENSION_H +#pragma once #include "ViewProviderExtensionPython.h" @@ -51,5 +50,3 @@ using ViewProviderSuppressibleExtensionPython = ViewProviderExtensionPythonT; } // namespace Gui - -#endif // VIEWPROVIDERSUPPRESSIBLEEXTENSION_H diff --git a/src/Gui/ViewProviderTextDocument.h b/src/Gui/ViewProviderTextDocument.h index eedaac452d..5649a906b2 100644 --- a/src/Gui/ViewProviderTextDocument.h +++ b/src/Gui/ViewProviderTextDocument.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_ViewProviderTextDocument_H -#define GUI_ViewProviderTextDocument_H +#pragma once #include #include "ViewProviderDocumentObject.h" @@ -65,5 +64,3 @@ private: }; } // namespace Gui - -#endif diff --git a/src/Gui/ViewProviderTextureExtension.h b/src/Gui/ViewProviderTextureExtension.h index 75a7cde3e6..cef65fd5be 100644 --- a/src/Gui/ViewProviderTextureExtension.h +++ b/src/Gui/ViewProviderTextureExtension.h @@ -22,8 +22,7 @@ **************************************************************************/ -#ifndef GUI_VIEWPROVIDERTEXTUREEXT_H -#define GUI_VIEWPROVIDERTEXTUREEXT_H +#pragma once #include @@ -94,6 +93,3 @@ private: }; } // namespace Gui - - -#endif // GUI_VIEWPROVIDERTEXTUREEXT_H diff --git a/src/Gui/ViewProviderVRMLObject.h b/src/Gui/ViewProviderVRMLObject.h index 715e8787a2..dfed7525ff 100644 --- a/src/Gui/ViewProviderVRMLObject.h +++ b/src/Gui/ViewProviderVRMLObject.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_VIEWPROVIDER_VRMLOROBJECT_H -#define GUI_VIEWPROVIDER_VRMLOROBJECT_H +#pragma once #include "ViewProviderDocumentObject.h" @@ -57,6 +56,3 @@ protected: }; } // namespace Gui - - -#endif // GUI_VIEWPROVIDER_INVENTOROBJECT_H diff --git a/src/Gui/ViewProviderVarSet.h b/src/Gui/ViewProviderVarSet.h index 05cb938425..4d1620aa4c 100644 --- a/src/Gui/ViewProviderVarSet.h +++ b/src/Gui/ViewProviderVarSet.h @@ -20,8 +20,7 @@ * * ****************************************************************************/ -#ifndef GUI_ViewProviderVarSet_H -#define GUI_ViewProviderVarSet_H +#pragma once #include "ViewProviderDocumentObject.h" #include "Dialogs/DlgAddProperty.h" @@ -53,5 +52,3 @@ private: }; } // namespace Gui - -#endif diff --git a/src/Gui/WaitCursor.h b/src/Gui/WaitCursor.h index 95602d9032..3ed136629b 100644 --- a/src/Gui/WaitCursor.h +++ b/src/Gui/WaitCursor.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_WAIT_CURSOR_H -#define GUI_WAIT_CURSOR_H +#pragma once #include @@ -97,5 +96,3 @@ private: }; } // namespace Gui - -#endif // GUI_WAIT_CURSOR_H diff --git a/src/Gui/WhatsThis.h b/src/Gui/WhatsThis.h index 15ecdea18d..7ccd7fdb68 100644 --- a/src/Gui/WhatsThis.h +++ b/src/Gui/WhatsThis.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_WHATSTHIS_H -#define GUI_WHATSTHIS_H +#pragma once #include #include "Command.h" @@ -54,5 +53,3 @@ private: }; } // namespace Gui - -#endif // GUI_WHATSTHIS_H diff --git a/src/Gui/WidgetFactory.h b/src/Gui/WidgetFactory.h index f1705f4a2e..b0639d1eb1 100644 --- a/src/Gui/WidgetFactory.h +++ b/src/Gui/WidgetFactory.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_WIDGETFACTORY_H -#define GUI_WIDGETFACTORY_H +#pragma once #include @@ -403,5 +402,3 @@ private: } // namespace Dialog } // namespace Gui - -#endif // GUI_WIDGETFACTORY_H diff --git a/src/Gui/Widgets.h b/src/Gui/Widgets.h index 2873a387fd..26f522dc65 100644 --- a/src/Gui/Widgets.h +++ b/src/Gui/Widgets.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_WIDGETS_H -#define GUI_WIDGETS_H +#pragma once #include #include @@ -656,5 +655,3 @@ private: void adjustDialogPosition(QDialog* dialog); } // namespace Gui - -#endif // GUI_WIDGETS_H diff --git a/src/Gui/Window.h b/src/Gui/Window.h index c73f696f6c..0b361f6897 100644 --- a/src/Gui/Window.h +++ b/src/Gui/Window.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_WINDOW_H -#define GUI_WINDOW_H +#pragma once #include #include @@ -71,5 +70,3 @@ inline void WindowParameter::setSlotParamChanged(S slot, T* obsPtr) } } // namespace Gui - -#endif // GUI_WINDOW_H diff --git a/src/Gui/Workbench.h b/src/Gui/Workbench.h index e3152bdce8..b25c5abe86 100644 --- a/src/Gui/Workbench.h +++ b/src/Gui/Workbench.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_WORKBENCH_H -#define GUI_WORKBENCH_H +#pragma once #include #include @@ -335,6 +334,3 @@ protected: }; } // namespace Gui - - -#endif // GUI_WORKBENCH_H diff --git a/src/Gui/WorkbenchFactory.h b/src/Gui/WorkbenchFactory.h index 4084d5c10b..5881f222aa 100644 --- a/src/Gui/WorkbenchFactory.h +++ b/src/Gui/WorkbenchFactory.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_WORKBENCHFACTORY_H -#define GUI_WORKBENCHFACTORY_H +#pragma once #include #include @@ -88,5 +87,3 @@ public: }; } // namespace Gui - -#endif // GUI_WORKBENCHFACTORY_H diff --git a/src/Gui/WorkbenchManager.h b/src/Gui/WorkbenchManager.h index a20fdf9892..f0c949991e 100644 --- a/src/Gui/WorkbenchManager.h +++ b/src/Gui/WorkbenchManager.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef GUI_WORKBENCHMANAGER_H -#define GUI_WORKBENCHMANAGER_H +#pragma once #include #include @@ -78,6 +77,3 @@ private: }; } // namespace Gui - - -#endif // GUI_WORKBENCHMANAGER_H diff --git a/src/Gui/WorkbenchManipulator.h b/src/Gui/WorkbenchManipulator.h index 1ceef23a6d..71f228ec08 100644 --- a/src/Gui/WorkbenchManipulator.h +++ b/src/Gui/WorkbenchManipulator.h @@ -22,8 +22,7 @@ **************************************************************************/ -#ifndef GUI_WORKBENCHMANIPULATOR_H -#define GUI_WORKBENCHMANIPULATOR_H +#pragma once #include #include @@ -131,6 +130,3 @@ private: }; } // namespace Gui - - -#endif // GUI_WORKBENCHMANIPULATOR_H diff --git a/src/Gui/WorkbenchManipulatorPython.h b/src/Gui/WorkbenchManipulatorPython.h index c8dfe1ec45..73a14b1ce6 100644 --- a/src/Gui/WorkbenchManipulatorPython.h +++ b/src/Gui/WorkbenchManipulatorPython.h @@ -22,8 +22,7 @@ **************************************************************************/ -#ifndef GUI_WORKBENCHMANIPULATOR_PYTHON_H -#define GUI_WORKBENCHMANIPULATOR_PYTHON_H +#pragma once #include #include @@ -87,6 +86,3 @@ private: }; } // namespace Gui - - -#endif // GUI_WORKBENCHMANIPULATOR_PYTHON_H diff --git a/src/Gui/WorkbenchSelector.h b/src/Gui/WorkbenchSelector.h index 84930b1a3b..c6ec163b3d 100644 --- a/src/Gui/WorkbenchSelector.h +++ b/src/Gui/WorkbenchSelector.h @@ -20,8 +20,7 @@ ***************************************************************************/ -#ifndef GUI_WORKBENCHSELECTOR_H -#define GUI_WORKBENCHSELECTOR_H +#pragma once #include #include @@ -207,5 +206,3 @@ private: } // namespace Gui - -#endif // GUI_WORKBENCHSELECTOR_H diff --git a/src/Gui/cet_lut.hpp b/src/Gui/cet_lut.hpp index 033072bc85..b63634697e 100644 --- a/src/Gui/cet_lut.hpp +++ b/src/Gui/cet_lut.hpp @@ -30,10 +30,8 @@ /*************************************************************************************/ #pragma once -#ifndef _CET_LUT_HPP_ -# define _CET_LUT_HPP_ -# include +#include // 8 bit CET luts as {R,G,B,R,G,B,...} // see https://colorcet.com/gallery.html for more details @@ -2652,5 +2650,3 @@ static constexpr std::array CBD1 = { 0x1a, 0xab, 0x92, 0x17, 0xaa, 0x92, 0x14, 0xa9, 0x91, 0x11, 0xa8, 0x90, 0x0d, 0xa8, 0x90, 0x08 }; } // namespace CET - -#endif //_CET_LUT_HPP_ diff --git a/src/Gui/propertyeditor/PropertyEditor.h b/src/Gui/propertyeditor/PropertyEditor.h index 210b89e7a4..e51b2e82e0 100644 --- a/src/Gui/propertyeditor/PropertyEditor.h +++ b/src/Gui/propertyeditor/PropertyEditor.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef PROPERTYEDITOR_H -#define PROPERTYEDITOR_H +#pragma once #include @@ -192,5 +191,3 @@ private: } // namespace PropertyEditor } // namespace Gui - -#endif // PROPERTYEDITOR_H diff --git a/src/Gui/propertyeditor/PropertyItem.h b/src/Gui/propertyeditor/PropertyItem.h index ce25a5ef15..3c561622e1 100644 --- a/src/Gui/propertyeditor/PropertyItem.h +++ b/src/Gui/propertyeditor/PropertyItem.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef PROPERTYEDITORITEM_H -#define PROPERTYEDITORITEM_H +#pragma once #include #include @@ -1426,5 +1425,3 @@ public: } // namespace PropertyEditor } // namespace Gui - -#endif // PROPERTYEDITORITEM_H diff --git a/src/Gui/propertyeditor/PropertyItemDelegate.h b/src/Gui/propertyeditor/PropertyItemDelegate.h index f975e12cc3..2450a6ebd3 100644 --- a/src/Gui/propertyeditor/PropertyItemDelegate.h +++ b/src/Gui/propertyeditor/PropertyItemDelegate.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef PROPERTYITEMDELEGATE_H -#define PROPERTYITEMDELEGATE_H +#pragma once #include #include @@ -70,5 +69,3 @@ private: } // namespace PropertyEditor } // namespace Gui - -#endif // PROPERTYITEMDELEGATE_H diff --git a/src/Gui/propertyeditor/PropertyModel.h b/src/Gui/propertyeditor/PropertyModel.h index 683ce0931a..7b301bd2cb 100644 --- a/src/Gui/propertyeditor/PropertyModel.h +++ b/src/Gui/propertyeditor/PropertyModel.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef PROPERTYMODEL_H -#define PROPERTYMODEL_H +#pragma once #include #include @@ -105,6 +104,3 @@ private: } // namespace PropertyEditor } // namespace Gui - - -#endif // PROPERTYMODEL_H diff --git a/src/LibraryVersions.h.cmake b/src/LibraryVersions.h.cmake index eee40ce231..bb9d6f0e0f 100644 --- a/src/LibraryVersions.h.cmake +++ b/src/LibraryVersions.h.cmake @@ -1,7 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#ifndef LIBRARY_VERSIONS_H -#define LIBRARY_VERSIONS_H +#pragma once /* LibraryVersions.h. Generated from LibraryVersions.h.cmake by cmake. */ @@ -59,5 +58,3 @@ constexpr const char * fcXercescVersion = "${XercesC_VERSION}"; // Pivy constexpr const char * fcPivyVersion = "${PIVY_VERSION}"; - -#endif // LIBRARY_VERSIONS_H diff --git a/src/Mod/Assembly/App/AssemblyLink.h b/src/Mod/Assembly/App/AssemblyLink.h index 26d80abae5..affe30e2d4 100644 --- a/src/Mod/Assembly/App/AssemblyLink.h +++ b/src/Mod/Assembly/App/AssemblyLink.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef ASSEMBLY_AssemblyLink_H -#define ASSEMBLY_AssemblyLink_H +#pragma once #include @@ -102,6 +101,3 @@ protected: } // namespace Assembly - - -#endif // ASSEMBLY_AssemblyLink_H diff --git a/src/Mod/Assembly/App/AssemblyObject.h b/src/Mod/Assembly/App/AssemblyObject.h index 74bc8e64d5..d00e52b605 100644 --- a/src/Mod/Assembly/App/AssemblyObject.h +++ b/src/Mod/Assembly/App/AssemblyObject.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef ASSEMBLY_AssemblyObject_H -#define ASSEMBLY_AssemblyObject_H +#pragma once #include @@ -284,6 +283,3 @@ private: }; } // namespace Assembly - - -#endif // ASSEMBLY_AssemblyObject_H diff --git a/src/Mod/Assembly/App/AssemblyUtils.h b/src/Mod/Assembly/App/AssemblyUtils.h index f4f73d3e25..57fb25ce03 100644 --- a/src/Mod/Assembly/App/AssemblyUtils.h +++ b/src/Mod/Assembly/App/AssemblyUtils.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef ASSEMBLY_AssemblyUtils_H -#define ASSEMBLY_AssemblyUtils_H +#pragma once #include #include @@ -191,6 +190,3 @@ AssemblyExport std::vector getSubAsList( AssemblyExport void syncPlacements(App::DocumentObject* src, App::DocumentObject* to); } // namespace Assembly - - -#endif // ASSEMBLY_AssemblyUtils_H diff --git a/src/Mod/Assembly/App/BomGroup.h b/src/Mod/Assembly/App/BomGroup.h index 0eb492129e..e0bac22d0d 100644 --- a/src/Mod/Assembly/App/BomGroup.h +++ b/src/Mod/Assembly/App/BomGroup.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef ASSEMBLY_BomGroup_H -#define ASSEMBLY_BomGroup_H +#pragma once #include @@ -53,6 +52,3 @@ public: } // namespace Assembly - - -#endif // ASSEMBLY_BomGroup_H diff --git a/src/Mod/Assembly/App/BomObject.h b/src/Mod/Assembly/App/BomObject.h index 3d18954898..fac73bb78f 100644 --- a/src/Mod/Assembly/App/BomObject.h +++ b/src/Mod/Assembly/App/BomObject.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef ASSEMBLY_BomObject_H -#define ASSEMBLY_BomObject_H +#pragma once #include @@ -104,6 +103,3 @@ private: } // namespace Assembly - - -#endif // ASSEMBLY_BomObject_H diff --git a/src/Mod/Assembly/App/JointGroup.h b/src/Mod/Assembly/App/JointGroup.h index 8f4611815c..a560429ab2 100644 --- a/src/Mod/Assembly/App/JointGroup.h +++ b/src/Mod/Assembly/App/JointGroup.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef ASSEMBLY_JointGroup_H -#define ASSEMBLY_JointGroup_H +#pragma once #include @@ -55,6 +54,3 @@ public: } // namespace Assembly - - -#endif // ASSEMBLY_JointGroup_H diff --git a/src/Mod/Assembly/App/PreCompiled.h b/src/Mod/Assembly/App/PreCompiled.h index 7d20eaf595..d6ed14292e 100644 --- a/src/Mod/Assembly/App/PreCompiled.h +++ b/src/Mod/Assembly/App/PreCompiled.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef ASSEMBLY_PRECOMPILED_H -#define ASSEMBLY_PRECOMPILED_H +#pragma once #include @@ -45,5 +44,3 @@ #include #include #include - -#endif // ASSEMBLY_PRECOMPILED_H diff --git a/src/Mod/Assembly/App/SimulationGroup.h b/src/Mod/Assembly/App/SimulationGroup.h index 279305524c..76276fb5f3 100644 --- a/src/Mod/Assembly/App/SimulationGroup.h +++ b/src/Mod/Assembly/App/SimulationGroup.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef ASSEMBLY_SimulationGroup_H -#define ASSEMBLY_SimulationGroup_H +#pragma once #include @@ -53,6 +52,3 @@ public: } // namespace Assembly - - -#endif // ASSEMBLY_SimulationGroup_H diff --git a/src/Mod/Assembly/App/ViewGroup.h b/src/Mod/Assembly/App/ViewGroup.h index 0a90e35091..1f6e883dc6 100644 --- a/src/Mod/Assembly/App/ViewGroup.h +++ b/src/Mod/Assembly/App/ViewGroup.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef ASSEMBLY_ViewGroup_H -#define ASSEMBLY_ViewGroup_H +#pragma once #include @@ -53,6 +52,3 @@ public: } // namespace Assembly - - -#endif // ASSEMBLY_ViewGroup_H diff --git a/src/Mod/Assembly/AssemblyGlobal.h b/src/Mod/Assembly/AssemblyGlobal.h index d4d2f7967b..0b22489d41 100644 --- a/src/Mod/Assembly/AssemblyGlobal.h +++ b/src/Mod/Assembly/AssemblyGlobal.h @@ -23,26 +23,23 @@ #include -#ifndef ASSEMBLY_GLOBAL_H -# define ASSEMBLY_GLOBAL_H +#pragma once // Assembly -# ifndef AssemblyExport -# ifdef Assembly_EXPORTS -# define AssemblyExport FREECAD_DECL_EXPORT -# else -# define AssemblyExport FREECAD_DECL_IMPORT -# endif +#ifndef AssemblyExport +# ifdef Assembly_EXPORTS +# define AssemblyExport FREECAD_DECL_EXPORT +# else +# define AssemblyExport FREECAD_DECL_IMPORT # endif +#endif // AssemblyGui -# ifndef AssemblyGuiExport -# ifdef AssemblyGui_EXPORTS -# define AssemblyGuiExport FREECAD_DECL_EXPORT -# else -# define AssemblyGuiExport FREECAD_DECL_IMPORT -# endif +#ifndef AssemblyGuiExport +# ifdef AssemblyGui_EXPORTS +# define AssemblyGuiExport FREECAD_DECL_EXPORT +# else +# define AssemblyGuiExport FREECAD_DECL_IMPORT # endif - -#endif // ASSEMBLY_GLOBAL_H +#endif diff --git a/src/Mod/Assembly/Gui/PreCompiled.h b/src/Mod/Assembly/Gui/PreCompiled.h index 90b02a0fdd..0dc78983c4 100644 --- a/src/Mod/Assembly/Gui/PreCompiled.h +++ b/src/Mod/Assembly/Gui/PreCompiled.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef ASSEMBLYGUI_PRECOMPILED_H -#define ASSEMBLYGUI_PRECOMPILED_H +#pragma once #include @@ -46,6 +45,3 @@ // all of Inventor #include - - -#endif // ASSEMBLYGUI_PRECOMPILED_H diff --git a/src/Mod/Assembly/Gui/TaskAssemblyMessages.h b/src/Mod/Assembly/Gui/TaskAssemblyMessages.h index ae95138c0d..4d99392aaa 100644 --- a/src/Mod/Assembly/Gui/TaskAssemblyMessages.h +++ b/src/Mod/Assembly/Gui/TaskAssemblyMessages.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskAssemblyMessages_H -#define GUI_TASKVIEW_TaskAssemblyMessages_H +#pragma once #include @@ -51,5 +50,3 @@ protected: }; } // namespace AssemblyGui - -#endif // GUI_TASKVIEW_TaskAssemblyMessages_H diff --git a/src/Mod/Assembly/Gui/ViewProviderAssembly.h b/src/Mod/Assembly/Gui/ViewProviderAssembly.h index a750fdc7f6..0de002f16a 100644 --- a/src/Mod/Assembly/Gui/ViewProviderAssembly.h +++ b/src/Mod/Assembly/Gui/ViewProviderAssembly.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef ASSEMBLYGUI_VIEWPROVIDER_ViewProviderAssembly_H -#define ASSEMBLYGUI_VIEWPROVIDER_ViewProviderAssembly_H +#pragma once #include #include @@ -300,5 +299,3 @@ private: }; } // namespace AssemblyGui - -#endif // ASSEMBLYGUI_VIEWPROVIDER_ViewProviderAssembly_H diff --git a/src/Mod/Assembly/Gui/ViewProviderAssemblyLink.h b/src/Mod/Assembly/Gui/ViewProviderAssemblyLink.h index 190deb32b4..948b806f0f 100644 --- a/src/Mod/Assembly/Gui/ViewProviderAssemblyLink.h +++ b/src/Mod/Assembly/Gui/ViewProviderAssemblyLink.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef ASSEMBLYGUI_VIEWPROVIDER_ViewProviderAssemblyLink_H -#define ASSEMBLYGUI_VIEWPROVIDER_ViewProviderAssemblyLink_H +#pragma once #include @@ -77,5 +76,3 @@ public: }; } // namespace AssemblyGui - -#endif // ASSEMBLYGUI_VIEWPROVIDER_ViewProviderAssemblyLink_H diff --git a/src/Mod/Assembly/Gui/ViewProviderBom.h b/src/Mod/Assembly/Gui/ViewProviderBom.h index eb5cc8db8f..6d7d968603 100644 --- a/src/Mod/Assembly/Gui/ViewProviderBom.h +++ b/src/Mod/Assembly/Gui/ViewProviderBom.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef ASSEMBLYGUI_VIEWPROVIDER_ViewProviderBom_H -#define ASSEMBLYGUI_VIEWPROVIDER_ViewProviderBom_H +#pragma once #include @@ -47,5 +46,3 @@ public: }; } // namespace AssemblyGui - -#endif // ASSEMBLYGUI_VIEWPROVIDER_ViewProviderBom_H diff --git a/src/Mod/Assembly/Gui/ViewProviderBomGroup.h b/src/Mod/Assembly/Gui/ViewProviderBomGroup.h index 74448bda33..27c2485cbb 100644 --- a/src/Mod/Assembly/Gui/ViewProviderBomGroup.h +++ b/src/Mod/Assembly/Gui/ViewProviderBomGroup.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef ASSEMBLYGUI_VIEWPROVIDER_ViewProviderBomGroup_H -#define ASSEMBLYGUI_VIEWPROVIDER_ViewProviderBomGroup_H +#pragma once #include @@ -63,5 +62,3 @@ public: }; } // namespace AssemblyGui - -#endif // ASSEMBLYGUI_VIEWPROVIDER_ViewProviderBomGroup_H diff --git a/src/Mod/Assembly/Gui/ViewProviderJointGroup.h b/src/Mod/Assembly/Gui/ViewProviderJointGroup.h index 96ccbc4850..80f0c3a059 100644 --- a/src/Mod/Assembly/Gui/ViewProviderJointGroup.h +++ b/src/Mod/Assembly/Gui/ViewProviderJointGroup.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef ASSEMBLYGUI_VIEWPROVIDER_ViewProviderJointGroup_H -#define ASSEMBLYGUI_VIEWPROVIDER_ViewProviderJointGroup_H +#pragma once #include @@ -69,5 +68,3 @@ public: }; } // namespace AssemblyGui - -#endif // ASSEMBLYGUI_VIEWPROVIDER_ViewProviderJointGroup_H diff --git a/src/Mod/Assembly/Gui/ViewProviderSimulationGroup.h b/src/Mod/Assembly/Gui/ViewProviderSimulationGroup.h index 949e51ee74..4d80df8810 100644 --- a/src/Mod/Assembly/Gui/ViewProviderSimulationGroup.h +++ b/src/Mod/Assembly/Gui/ViewProviderSimulationGroup.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef ASSEMBLYGUI_VIEWPROVIDER_ViewProviderSimulationGroup_H -#define ASSEMBLYGUI_VIEWPROVIDER_ViewProviderSimulationGroup_H +#pragma once #include @@ -59,5 +58,3 @@ public: }; } // namespace AssemblyGui - -#endif // ASSEMBLYGUI_VIEWPROVIDER_ViewProviderSimulationGroup_H diff --git a/src/Mod/Assembly/Gui/ViewProviderViewGroup.h b/src/Mod/Assembly/Gui/ViewProviderViewGroup.h index c48e89aed7..fe3779e6e3 100644 --- a/src/Mod/Assembly/Gui/ViewProviderViewGroup.h +++ b/src/Mod/Assembly/Gui/ViewProviderViewGroup.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef ASSEMBLYGUI_VIEWPROVIDER_ViewProviderViewGroup_H -#define ASSEMBLYGUI_VIEWPROVIDER_ViewProviderViewGroup_H +#pragma once #include @@ -63,5 +62,3 @@ public: }; } // namespace AssemblyGui - -#endif // ASSEMBLYGUI_VIEWPROVIDER_ViewProviderViewGroup_H diff --git a/src/Mod/CAM/App/Area.h b/src/Mod/CAM/App/Area.h index 64fe5336ec..4ba2009a8b 100644 --- a/src/Mod/CAM/App/Area.h +++ b/src/Mod/CAM/App/Area.h @@ -21,8 +21,7 @@ * * ****************************************************************************/ -#ifndef PATH_AREA_H -#define PATH_AREA_H +#pragma once #include #include @@ -446,5 +445,3 @@ public: }; } // namespace Path - -#endif // PATH_AREA_H diff --git a/src/Mod/CAM/App/AreaParams.h b/src/Mod/CAM/App/AreaParams.h index 9c24371ffe..a1c472bfb4 100644 --- a/src/Mod/CAM/App/AreaParams.h +++ b/src/Mod/CAM/App/AreaParams.h @@ -21,8 +21,7 @@ * * ****************************************************************************/ -#ifndef PATH_AreaParams_H -#define PATH_AreaParams_H +#pragma once // define this to enable offset algo selection // #define AREA_OFFSET_ALGO @@ -437,5 +436,3 @@ AREA_PARAMS_OPCODE #define AREA_PARAMS_STATIC_CONF AREA_PARAMS_CONF - -#endif // PATH_AreaParam_H diff --git a/src/Mod/CAM/App/Command.h b/src/Mod/CAM/App/Command.h index f93ca2fbab..9c4fe85bfa 100644 --- a/src/Mod/CAM/App/Command.h +++ b/src/Mod/CAM/App/Command.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef PATH_COMMAND_H -#define PATH_COMMAND_H +#pragma once #include #include @@ -111,5 +110,3 @@ public: }; } // namespace Path - -#endif // PATH_COMMAND_H diff --git a/src/Mod/CAM/App/FeatureArea.h b/src/Mod/CAM/App/FeatureArea.h index 3b2d3fb6ac..7490fa08b1 100644 --- a/src/Mod/CAM/App/FeatureArea.h +++ b/src/Mod/CAM/App/FeatureArea.h @@ -21,8 +21,7 @@ * * ****************************************************************************/ -#ifndef PATH_FeatureArea_H -#define PATH_FeatureArea_H +#pragma once #include #include @@ -99,6 +98,3 @@ public: using FeatureAreaViewPython = App::FeaturePythonT; } // namespace Path - - -#endif // PATH_FeaturePath_H diff --git a/src/Mod/CAM/App/FeaturePath.h b/src/Mod/CAM/App/FeaturePath.h index 79ffee8c6f..c52d78403c 100644 --- a/src/Mod/CAM/App/FeaturePath.h +++ b/src/Mod/CAM/App/FeaturePath.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef PATH_FeaturePath_H -#define PATH_FeaturePath_H +#pragma once #include #include @@ -66,6 +65,3 @@ protected: using FeaturePython = App::FeaturePythonT; } // namespace Path - - -#endif // PATH_FeaturePath_H diff --git a/src/Mod/CAM/App/FeaturePathCompound.h b/src/Mod/CAM/App/FeaturePathCompound.h index c4bd00a81d..fdbf558ff6 100644 --- a/src/Mod/CAM/App/FeaturePathCompound.h +++ b/src/Mod/CAM/App/FeaturePathCompound.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef PATH_FeatureCompound_H -#define PATH_FeatureCompound_H +#pragma once #include @@ -63,6 +62,3 @@ public: using FeatureCompoundPython = App::FeaturePythonT; } // namespace Path - - -#endif // PATH_FeatureCompound_H diff --git a/src/Mod/CAM/App/FeaturePathShape.h b/src/Mod/CAM/App/FeaturePathShape.h index 4ebc611a30..479eef675c 100644 --- a/src/Mod/CAM/App/FeaturePathShape.h +++ b/src/Mod/CAM/App/FeaturePathShape.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PATH_FeaturePathShape_H -#define PATH_FeaturePathShape_H +#pragma once #include #include @@ -70,6 +69,3 @@ protected: using FeatureShapePython = App::FeaturePythonT; } // namespace Path - - -#endif // PATH_FeaturePathShape_H diff --git a/src/Mod/CAM/App/ParamsHelper.h b/src/Mod/CAM/App/ParamsHelper.h index 8fac1612ba..0779130b47 100644 --- a/src/Mod/CAM/App/ParamsHelper.h +++ b/src/Mod/CAM/App/ParamsHelper.h @@ -21,8 +21,7 @@ * * ****************************************************************************/ -#ifndef PARAMS_HELPER_H -#define PARAMS_HELPER_H +#pragma once /** \page ParamPage Parameter helper macros * \ingroup PATH @@ -1032,5 +1031,3 @@ * \ingroup ParamProperty */ #define PARAM_PROP_TOUCHED(_seq) PARAM_FOREACH(PARAM_PROP_TOUCHED_, _seq) - -#endif // PARAMS_HELPER_H diff --git a/src/Mod/CAM/App/Path.h b/src/Mod/CAM/App/Path.h index 4aabd6c688..acfb46ac2f 100644 --- a/src/Mod/CAM/App/Path.h +++ b/src/Mod/CAM/App/Path.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef PATH_Path_H -#define PATH_Path_H +#pragma once #include #include @@ -113,6 +112,3 @@ protected: }; } // namespace Path - - -#endif // PATH_Path_H diff --git a/src/Mod/CAM/App/PathSegmentWalker.h b/src/Mod/CAM/App/PathSegmentWalker.h index 99d68a4251..381c058920 100644 --- a/src/Mod/CAM/App/PathSegmentWalker.h +++ b/src/Mod/CAM/App/PathSegmentWalker.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef PATHSEGMENTWALKER_H -#define PATHSEGMENTWALKER_H +#pragma once #include @@ -94,5 +93,3 @@ private: } // namespace Path - -#endif // PATHSEGMENTWALKER_H diff --git a/src/Mod/CAM/App/PreCompiled.h b/src/Mod/CAM/App/PreCompiled.h index 7d33de6702..c361e4e8f3 100644 --- a/src/Mod/CAM/App/PreCompiled.h +++ b/src/Mod/CAM/App/PreCompiled.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef PATH_PRECOMPILED_H -#define PATH_PRECOMPILED_H +#pragma once #include @@ -84,5 +83,3 @@ #include #include #include - -#endif diff --git a/src/Mod/CAM/App/PropertyPath.h b/src/Mod/CAM/App/PropertyPath.h index fc63579d51..fa326ae1e1 100644 --- a/src/Mod/CAM/App/PropertyPath.h +++ b/src/Mod/CAM/App/PropertyPath.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef PROPERTYPATH_H -#define PROPERTYPATH_H +#pragma once #include @@ -73,6 +72,3 @@ private: } // namespace Path - - -#endif // PROPERTYPATH_H diff --git a/src/Mod/CAM/App/Voronoi.h b/src/Mod/CAM/App/Voronoi.h index 6b07e0d9ce..958a8d7f54 100644 --- a/src/Mod/CAM/App/Voronoi.h +++ b/src/Mod/CAM/App/Voronoi.h @@ -20,8 +20,7 @@ * Suite 330, Boston, MA 02111-1307, USA * * * ***************************************************************************/ -#ifndef PATH_VORONOI_H -#define PATH_VORONOI_H +#pragma once #include #include @@ -133,5 +132,3 @@ private: }; } // namespace Path - -#endif // PATH_VORONOI_H diff --git a/src/Mod/CAM/App/VoronoiCell.h b/src/Mod/CAM/App/VoronoiCell.h index c83e7aa882..73d13c8314 100644 --- a/src/Mod/CAM/App/VoronoiCell.h +++ b/src/Mod/CAM/App/VoronoiCell.h @@ -20,8 +20,7 @@ * Suite 330, Boston, MA 02111-1307, USA * * * ***************************************************************************/ -#ifndef PATH_VORONOICELL_H -#define PATH_VORONOICELL_H +#pragma once #include #include "Voronoi.h" @@ -51,4 +50,3 @@ public: }; } // namespace Path -#endif diff --git a/src/Mod/CAM/App/VoronoiEdge.h b/src/Mod/CAM/App/VoronoiEdge.h index ec1ef228fc..ee0a7e9479 100644 --- a/src/Mod/CAM/App/VoronoiEdge.h +++ b/src/Mod/CAM/App/VoronoiEdge.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef PATH_VORONOIEDGE_H -#define PATH_VORONOIEDGE_H +#pragma once #include #include "Voronoi.h" @@ -50,4 +49,3 @@ public: }; } // namespace Path -#endif diff --git a/src/Mod/CAM/App/VoronoiVertex.h b/src/Mod/CAM/App/VoronoiVertex.h index f647c17f06..c78c464eec 100644 --- a/src/Mod/CAM/App/VoronoiVertex.h +++ b/src/Mod/CAM/App/VoronoiVertex.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef PATH_VORONOIVERTEX_H -#define PATH_VORONOIVERTEX_H +#pragma once #include #include "Voronoi.h" @@ -50,4 +49,3 @@ public: }; } // namespace Path -#endif diff --git a/src/Mod/CAM/Gui/DlgProcessorChooser.h b/src/Mod/CAM/Gui/DlgProcessorChooser.h index 9d693e6d52..b047ea16f7 100644 --- a/src/Mod/CAM/Gui/DlgProcessorChooser.h +++ b/src/Mod/CAM/Gui/DlgProcessorChooser.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PATH_DlgProcessorChooser_H -#define PATH_DlgProcessorChooser_H +#pragma once #include @@ -54,5 +53,3 @@ private: }; } // namespace PathGui - -#endif // PATH_DlgProcessorChooser_H diff --git a/src/Mod/CAM/Gui/DlgSettingsPathColor.h b/src/Mod/CAM/Gui/DlgSettingsPathColor.h index 24b8937a6e..15bbb29874 100644 --- a/src/Mod/CAM/Gui/DlgSettingsPathColor.h +++ b/src/Mod/CAM/Gui/DlgSettingsPathColor.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PATHGUI_DIALOG_DLGSETTINGSPATHCOLOR_H -#define PATHGUI_DIALOG_DLGSETTINGSPATHCOLOR_H +#pragma once #include #include @@ -52,5 +51,3 @@ private: }; } // namespace PathGui - -#endif // PATHGUI_DIALOG_DLGSETTINGSPATHCOLOR_H diff --git a/src/Mod/CAM/Gui/PreCompiled.h b/src/Mod/CAM/Gui/PreCompiled.h index 5faf209733..5b40443bef 100644 --- a/src/Mod/CAM/Gui/PreCompiled.h +++ b/src/Mod/CAM/Gui/PreCompiled.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PATHGUI_PRECOMPILED_H -#define PATHGUI_PRECOMPILED_H +#pragma once #include @@ -51,5 +50,3 @@ #include #include #include - -#endif // PATHGUI_PRECOMPILED_H diff --git a/src/Mod/CAM/Gui/TaskDlgPathCompound.h b/src/Mod/CAM/Gui/TaskDlgPathCompound.h index a2dc7ade1a..34c0160a6b 100644 --- a/src/Mod/CAM/Gui/TaskDlgPathCompound.h +++ b/src/Mod/CAM/Gui/TaskDlgPathCompound.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PATHGUI_TaskDlgPathCompound_H -#define PATHGUI_TaskDlgPathCompound_H +#pragma once #include #include @@ -90,5 +89,3 @@ protected: } // namespace PathGui - -#endif // PATHGUI_TASKDLGPATHCOMPOUND_H diff --git a/src/Mod/CAM/Gui/ViewProviderArea.h b/src/Mod/CAM/Gui/ViewProviderArea.h index d18650d33d..bf15d82eef 100644 --- a/src/Mod/CAM/Gui/ViewProviderArea.h +++ b/src/Mod/CAM/Gui/ViewProviderArea.h @@ -22,8 +22,7 @@ * * ****************************************************************************/ -#ifndef PATH_ViewProviderArea_H -#define PATH_ViewProviderArea_H +#pragma once #include #include @@ -80,6 +79,3 @@ public: using ViewProviderAreaViewPython = Gui::ViewProviderFeaturePythonT; } // namespace PathGui - - -#endif // PATH_ViewProviderArea_H diff --git a/src/Mod/CAM/Gui/ViewProviderPath.h b/src/Mod/CAM/Gui/ViewProviderPath.h index c8e0a61e5b..b3de4e805d 100644 --- a/src/Mod/CAM/Gui/ViewProviderPath.h +++ b/src/Mod/CAM/Gui/ViewProviderPath.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PATH_ViewProviderPath_H -#define PATH_ViewProviderPath_H +#pragma once #include #include @@ -129,6 +128,3 @@ protected: using ViewProviderPathPython = Gui::ViewProviderFeaturePythonT; } // namespace PathGui - - -#endif // PATH_VIEWPROVIDERPATH_H diff --git a/src/Mod/CAM/Gui/ViewProviderPathCompound.h b/src/Mod/CAM/Gui/ViewProviderPathCompound.h index 863ba60a42..c9c4a10872 100644 --- a/src/Mod/CAM/Gui/ViewProviderPathCompound.h +++ b/src/Mod/CAM/Gui/ViewProviderPathCompound.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PATH_ViewProviderPathCompound_H -#define PATH_ViewProviderPathCompound_H +#pragma once #include "ViewProviderPath.h" @@ -51,6 +50,3 @@ protected: using ViewProviderPathCompoundPython = Gui::ViewProviderFeaturePythonT; } // namespace PathGui - - -#endif // PATH_ViewProviderPathCompound_H diff --git a/src/Mod/CAM/Gui/ViewProviderPathShape.h b/src/Mod/CAM/Gui/ViewProviderPathShape.h index f331ffb233..c0e5ba980f 100644 --- a/src/Mod/CAM/Gui/ViewProviderPathShape.h +++ b/src/Mod/CAM/Gui/ViewProviderPathShape.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PATH_ViewProviderPathShape_H -#define PATH_ViewProviderPathShape_H +#pragma once #include "ViewProviderPath.h" @@ -53,6 +52,3 @@ public: }; } // namespace PathGui - - -#endif // PATH_ViewProviderPathShape_H diff --git a/src/Mod/CAM/PathGlobal.h b/src/Mod/CAM/PathGlobal.h index aa9ea1413a..6214becc12 100644 --- a/src/Mod/CAM/PathGlobal.h +++ b/src/Mod/CAM/PathGlobal.h @@ -24,44 +24,41 @@ #include -#ifndef PATH_GLOBAL_H -# define PATH_GLOBAL_H +#pragma once // Path -# ifndef PathExport -# ifdef Path_EXPORTS -# define PathExport FREECAD_DECL_EXPORT -# else -# define PathExport FREECAD_DECL_IMPORT -# endif +#ifndef PathExport +# ifdef Path_EXPORTS +# define PathExport FREECAD_DECL_EXPORT +# else +# define PathExport FREECAD_DECL_IMPORT # endif +#endif // PathGui -# ifndef PathGuiExport -# ifdef PathGui_EXPORTS -# define PathGuiExport FREECAD_DECL_EXPORT -# else -# define PathGuiExport FREECAD_DECL_IMPORT -# endif +#ifndef PathGuiExport +# ifdef PathGui_EXPORTS +# define PathGuiExport FREECAD_DECL_EXPORT +# else +# define PathGuiExport FREECAD_DECL_IMPORT # endif +#endif // PathSimulator -# ifndef PathSimulatorExport -# ifdef PathSimulator_EXPORTS -# define PathSimulatorExport FREECAD_DECL_EXPORT -# else -# define PathSimulatorExport FREECAD_DECL_IMPORT -# endif +#ifndef PathSimulatorExport +# ifdef PathSimulator_EXPORTS +# define PathSimulatorExport FREECAD_DECL_EXPORT +# else +# define PathSimulatorExport FREECAD_DECL_IMPORT # endif +#endif // CAMSimulator (new GL simulator) -# ifndef CAMSimulatorExport -# ifdef CAMSimulator_EXPORTS -# define CAMSimulatorExport FREECAD_DECL_EXPORT -# else -# define CAMSimulatorExport FREECAD_DECL_IMPORT -# endif +#ifndef CAMSimulatorExport +# ifdef CAMSimulator_EXPORTS +# define CAMSimulatorExport FREECAD_DECL_EXPORT +# else +# define CAMSimulatorExport FREECAD_DECL_IMPORT # endif - -#endif // PATH_GLOBAL_H +#endif diff --git a/src/Mod/CAM/PathSimulator/App/PathSim.h b/src/Mod/CAM/PathSimulator/App/PathSim.h index 71095409f8..3778434f70 100644 --- a/src/Mod/CAM/PathSimulator/App/PathSim.h +++ b/src/Mod/CAM/PathSimulator/App/PathSim.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PATHSIMULATOR_PathSim_H -#define PATHSIMULATOR_PathSim_H +#pragma once #include #include @@ -60,6 +59,3 @@ public: }; } // namespace PathSimulator - - -#endif // PATHSIMULATOR_PathSim_H diff --git a/src/Mod/CAM/PathSimulator/App/PreCompiled.h b/src/Mod/CAM/PathSimulator/App/PreCompiled.h index c19cdc747f..903416b25a 100644 --- a/src/Mod/CAM/PathSimulator/App/PreCompiled.h +++ b/src/Mod/CAM/PathSimulator/App/PreCompiled.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PATH_SIMULATOR_APP_PRECOMPILED_H -#define PATH_SIMULATOR_APP_PRECOMPILED_H +#pragma once #include @@ -50,5 +49,3 @@ // Xerces #include - -#endif diff --git a/src/Mod/CAM/PathSimulator/App/VolSim.h b/src/Mod/CAM/PathSimulator/App/VolSim.h index 39950d0c2d..b4d310be26 100644 --- a/src/Mod/CAM/PathSimulator/App/VolSim.h +++ b/src/Mod/CAM/PathSimulator/App/VolSim.h @@ -24,8 +24,7 @@ * Volumetric Path simulation engine * ***************************************************************************/ -#ifndef PATHSIMULATOR_VolSim_H -#define PATHSIMULATOR_VolSim_H +#pragma once #include @@ -270,5 +269,3 @@ public: private: cStock* stock; }; - -#endif // PATHSIMULATOR_VolSim_H diff --git a/src/Mod/CAM/PathSimulator/AppGL/CAMSim.h b/src/Mod/CAM/PathSimulator/AppGL/CAMSim.h index 4efdf6eeaf..d4560e2b1a 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/CAMSim.h +++ b/src/Mod/CAM/PathSimulator/AppGL/CAMSim.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef CAMSimulator_CAMSim_H -#define CAMSimulator_CAMSim_H +#pragma once #include #include @@ -72,6 +71,3 @@ public: }; } // namespace CAMSimulator - - -#endif // CAMSimulator_CAMSim_H diff --git a/src/Mod/CAM/PathSimulator/AppGL/DlgCAMSimulator.h b/src/Mod/CAM/PathSimulator/AppGL/DlgCAMSimulator.h index 0f57b55165..02bf29d139 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/DlgCAMSimulator.h +++ b/src/Mod/CAM/PathSimulator/AppGL/DlgCAMSimulator.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PATHSIMULATOR_CAMSimulatorGui_H -#define PATHSIMULATOR_CAMSimulatorGui_H +#pragma once #ifdef _MSC_VER # pragma warning(disable : 4251) @@ -140,5 +139,3 @@ private: }; } // namespace CAMSimulator - -#endif // PATHSIMULATOR_PathSim_H diff --git a/src/Mod/CAM/PathSimulator/AppGL/EndMill.h b/src/Mod/CAM/PathSimulator/AppGL/EndMill.h index 1d2af58a97..8c1c1bb4de 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/EndMill.h +++ b/src/Mod/CAM/PathSimulator/AppGL/EndMill.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef __end_mill_h__ -#define __end_mill_h__ +#pragma once #include "SimShapes.h" #include @@ -57,5 +56,3 @@ protected: void MirrorPointBuffer(); }; } // namespace MillSim - -#endif diff --git a/src/Mod/CAM/PathSimulator/AppGL/GCodeParser.h b/src/Mod/CAM/PathSimulator/AppGL/GCodeParser.h index 321bd21f58..5009e15580 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/GCodeParser.h +++ b/src/Mod/CAM/PathSimulator/AppGL/GCodeParser.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef __csgcodeparser_h__ -#define __csgcodeparser_h__ +#pragma once #include "MillMotion.h" #include @@ -58,4 +57,3 @@ protected: int lastTool = -1; }; } // namespace MillSim -#endif diff --git a/src/Mod/CAM/PathSimulator/AppGL/GlUtils.h b/src/Mod/CAM/PathSimulator/AppGL/GlUtils.h index c4e4f41920..16e43d0464 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/GlUtils.h +++ b/src/Mod/CAM/PathSimulator/AppGL/GlUtils.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef __glutils_h__ -#define __glutils_h__ +#pragma once #include "OpenGlWrapper.h" #include "linmath.h" @@ -68,5 +67,3 @@ void GLClearError(); bool GLLogError(); } // namespace MillSim - -#endif // !__glutils_h__ diff --git a/src/Mod/CAM/PathSimulator/AppGL/GuiDisplay.h b/src/Mod/CAM/PathSimulator/AppGL/GuiDisplay.h index eefdcd56e5..c9070a3d1a 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/GuiDisplay.h +++ b/src/Mod/CAM/PathSimulator/AppGL/GuiDisplay.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef __guidisplay_t__ -#define __guidisplay_t__ +#pragma once #include "OpenGlWrapper.h" #include "Texture.h" #include "Shader.h" @@ -153,5 +152,3 @@ private: }; } // namespace MillSim - -#endif // __guidisplay_t__ diff --git a/src/Mod/CAM/PathSimulator/AppGL/MillMotion.h b/src/Mod/CAM/PathSimulator/AppGL/MillMotion.h index f6b13a9d62..0fc38b2322 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/MillMotion.h +++ b/src/Mod/CAM/PathSimulator/AppGL/MillMotion.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef __mill_operation_h__ -#define __mill_operation_h__ +#pragma once #include "EndMill.h" #include "linmath.h" @@ -66,4 +65,3 @@ static inline void MotionPosToVec(vec3 vec, const MillMotion* motion) vec[2] = motion->z; } } // namespace MillSim -#endif diff --git a/src/Mod/CAM/PathSimulator/AppGL/MillPathLine.h b/src/Mod/CAM/PathSimulator/AppGL/MillPathLine.h index 92527fd689..9f785ec4de 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/MillPathLine.h +++ b/src/Mod/CAM/PathSimulator/AppGL/MillPathLine.h @@ -1,7 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#ifndef __millpathline_h__ -#define __millpathline_h__ +#pragma once #include namespace MillSim @@ -31,5 +30,3 @@ protected: }; } // namespace MillSim - -#endif // !__millpathline_h__ diff --git a/src/Mod/CAM/PathSimulator/AppGL/MillPathSegment.h b/src/Mod/CAM/PathSimulator/AppGL/MillPathSegment.h index 6c216384f4..bed6acf7b8 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/MillPathSegment.h +++ b/src/Mod/CAM/PathSimulator/AppGL/MillPathSegment.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef __mill_path_segment_h__ -#define __mill_path_segment_h__ +#pragma once #include "MillMotion.h" @@ -97,5 +96,3 @@ protected: MotionType mMotionType; }; } // namespace MillSim - -#endif diff --git a/src/Mod/CAM/PathSimulator/AppGL/MillSimulation.h b/src/Mod/CAM/PathSimulator/AppGL/MillSimulation.h index 96cd9d94ae..3ab644d751 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/MillSimulation.h +++ b/src/Mod/CAM/PathSimulator/AppGL/MillSimulation.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef __millsimulation__h__ -#define __millsimulation__h__ +#pragma once #include "MillMotion.h" #include "GCodeParser.h" @@ -150,5 +149,3 @@ protected: }; } // namespace MillSim - -#endif diff --git a/src/Mod/CAM/PathSimulator/AppGL/OpenGlWrapper.h b/src/Mod/CAM/PathSimulator/AppGL/OpenGlWrapper.h index 0f27fff1d3..e6472cebc9 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/OpenGlWrapper.h +++ b/src/Mod/CAM/PathSimulator/AppGL/OpenGlWrapper.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef __openglwrapper_h__ -#define __openglwrapper_h__ +#pragma once #include "DlgCAMSimulator.h" #define gSimWindow CAMSimulator::DlgCAMSimulator::instance() @@ -89,5 +88,3 @@ #define glLineWidth gSimWindow->glLineWidth #define glGetShaderiv gSimWindow->glGetShaderiv #define glGetShaderInfoLog gSimWindow->glGetShaderInfoLog - -#endif // !__openglwrapper_h__ diff --git a/src/Mod/CAM/PathSimulator/AppGL/PreCompiled.h b/src/Mod/CAM/PathSimulator/AppGL/PreCompiled.h index cfde7dc275..d6a9537400 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/PreCompiled.h +++ b/src/Mod/CAM/PathSimulator/AppGL/PreCompiled.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PATH_SIMULATOR_APPGL_PRECOMPILED_H -#define PATH_SIMULATOR_APPGL_PRECOMPILED_H +#pragma once #include @@ -49,5 +48,3 @@ // Xerces #include - -#endif diff --git a/src/Mod/CAM/PathSimulator/AppGL/Shader.h b/src/Mod/CAM/PathSimulator/AppGL/Shader.h index 706cf6b7df..3cb1f956cb 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/Shader.h +++ b/src/Mod/CAM/PathSimulator/AppGL/Shader.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef __shader_h__ -#define __shader_h__ +#pragma once #include "OpenGlWrapper.h" #include "linmath.h" @@ -114,4 +113,3 @@ extern const char* FragShader3DLine; } // namespace MillSim -#endif // !__shader_h__ diff --git a/src/Mod/CAM/PathSimulator/AppGL/SimDisplay.h b/src/Mod/CAM/PathSimulator/AppGL/SimDisplay.h index 1cc95520bd..8c41271369 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/SimDisplay.h +++ b/src/Mod/CAM/PathSimulator/AppGL/SimDisplay.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef __simdisplay_h__ -#define __simdisplay_h__ +#pragma once #include "GlUtils.h" #include "Shader.h" @@ -141,5 +140,3 @@ protected: }; } // namespace MillSim - -#endif // !__simdisplay_h__ diff --git a/src/Mod/CAM/PathSimulator/AppGL/SimShapes.h b/src/Mod/CAM/PathSimulator/AppGL/SimShapes.h index 0a96849de5..3216eda802 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/SimShapes.h +++ b/src/Mod/CAM/PathSimulator/AppGL/SimShapes.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef __sim_shapes_h__ -#define __sim_shapes_h__ +#pragma once #include "OpenGlWrapper.h" #include "linmath.h" @@ -135,4 +134,3 @@ protected: }; } // namespace MillSim -#endif diff --git a/src/Mod/CAM/PathSimulator/AppGL/SolidObject.h b/src/Mod/CAM/PathSimulator/AppGL/SolidObject.h index a419d630cc..e518e7718a 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/SolidObject.h +++ b/src/Mod/CAM/PathSimulator/AppGL/SolidObject.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef __solid_object_h__ -#define __solid_object_h__ +#pragma once #include "SimShapes.h" #include "linmath.h" #include @@ -51,5 +50,3 @@ protected: mat4x4 mModelMat; }; } // namespace MillSim - -#endif diff --git a/src/Mod/CAM/PathSimulator/AppGL/StockObject.h b/src/Mod/CAM/PathSimulator/AppGL/StockObject.h index 93e84b2ac8..80ec2f0c1d 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/StockObject.h +++ b/src/Mod/CAM/PathSimulator/AppGL/StockObject.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef __stock_object_h__ -#define __stock_object_h__ +#pragma once #include "SolidObject.h" #include "linmath.h" @@ -41,5 +40,3 @@ private: float mProfile[8] = {}; }; } // namespace MillSim - -#endif diff --git a/src/Mod/CAM/PathSimulator/AppGL/Texture.h b/src/Mod/CAM/PathSimulator/AppGL/Texture.h index 7679b082fd..cfb618ad1c 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/Texture.h +++ b/src/Mod/CAM/PathSimulator/AppGL/Texture.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef __texture_h__ -#define __texture_h__ +#pragma once #include "OpenGlWrapper.h" namespace MillSim @@ -59,5 +58,3 @@ protected: } // namespace MillSim - -#endif // !__texture_h__ diff --git a/src/Mod/CAM/PathSimulator/AppGL/TextureLoader.h b/src/Mod/CAM/PathSimulator/AppGL/TextureLoader.h index 0200531091..0c867caa86 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/TextureLoader.h +++ b/src/Mod/CAM/PathSimulator/AppGL/TextureLoader.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef __texture_loader_h__ -#define __texture_loader_h__ +#pragma once #include #include #include @@ -54,4 +53,3 @@ protected: }; } // namespace MillSim -#endif // !__texture_loader_h__ diff --git a/src/Mod/CAM/PathSimulator/AppGL/linmath.h b/src/Mod/CAM/PathSimulator/AppGL/linmath.h index 5ca94e2e68..430db65013 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/linmath.h +++ b/src/Mod/CAM/PathSimulator/AppGL/linmath.h @@ -3,8 +3,7 @@ //************************************************************************************************* //* Taken from https://github.com/datenwolf/linmath.h under 'Do whatever you want' license * //************************************************************************************************* -#ifndef LINMATH_H -#define LINMATH_H +#pragma once #include #include @@ -631,4 +630,3 @@ LINMATH_H_FUNC void mat4x4_arcball(mat4x4 R, mat4x4 const M, vec2 const _a, vec2 float const angle = acosf(vec3_mul_inner(a_, b_)) * s; mat4x4_rotate(R, M, c_[0], c_[1], c_[2], angle); } -#endif diff --git a/src/Mod/CAM/libarea/Adaptive.hpp b/src/Mod/CAM/libarea/Adaptive.hpp index bb80d56ff2..94578a473f 100644 --- a/src/Mod/CAM/libarea/Adaptive.hpp +++ b/src/Mod/CAM/libarea/Adaptive.hpp @@ -27,20 +27,19 @@ #include #include -#ifndef ADAPTIVE_HPP -# define ADAPTIVE_HPP +#pragma once -# ifndef __DBL_MAX__ -# define __DBL_MAX__ 1.7976931348623158e+308 -# endif +#ifndef __DBL_MAX__ +# define __DBL_MAX__ 1.7976931348623158e+308 +#endif -# ifndef __LONG_MAX__ -# define __LONG_MAX__ 2147483647 -# endif +#ifndef __LONG_MAX__ +# define __LONG_MAX__ 2147483647 +#endif // #define DEV_MODE -# define NTOL 1.0e-7 // numeric tolerance +#define NTOL 1.0e-7 // numeric tolerance namespace AdaptivePath { @@ -103,12 +102,12 @@ public: std::function progressCallbackFn ); -# ifdef DEV_MODE +#ifdef DEV_MODE /*for debugging*/ std::function DrawCircleFn; std::function DrawPathFn; std::function ClearScreenFn; -# endif +#endif private: std::list results; @@ -267,4 +266,3 @@ private: const clock_t PROGRESS_TICKS = CLOCKS_PER_SEC / 10; // progress report interval }; } // namespace AdaptivePath -#endif diff --git a/src/Mod/CAM/libarea/Area.h b/src/Mod/CAM/libarea/Area.h index 7eb2ed82ad..c1ff3a86c8 100644 --- a/src/Mod/CAM/libarea/Area.h +++ b/src/Mod/CAM/libarea/Area.h @@ -5,8 +5,7 @@ // This program is released under the BSD license. See the file COPYING for details. // repository now moved to github -#ifndef AREA_HEADER -#define AREA_HEADER +#pragma once #include "Curve.h" #include "clipper.hpp" @@ -142,5 +141,3 @@ eOverlapType GetOverlapType(const CCurve& c1, const CCurve& c2); eOverlapType GetOverlapType(const CArea& a1, const CArea& a2); bool IsInside(const Point& p, const CCurve& c); bool IsInside(const Point& p, const CArea& a); - -#endif // #define AREA_HEADER diff --git a/src/Mod/CAM/libarea/clipper.hpp b/src/Mod/CAM/libarea/clipper.hpp index 5e934dd784..ba2a97a5a3 100644 --- a/src/Mod/CAM/libarea/clipper.hpp +++ b/src/Mod/CAM/libarea/clipper.hpp @@ -33,8 +33,7 @@ * * *******************************************************************************/ -#ifndef clipper_hpp -#define clipper_hpp +#pragma once #define CLIPPER_VERSION "6.4.2" @@ -500,5 +499,3 @@ private: //------------------------------------------------------------------------------ } // namespace ClipperLib - -#endif // clipper_hpp diff --git a/src/Mod/Cloud/App/PreCompiled.h b/src/Mod/Cloud/App/PreCompiled.h index ef7a851177..e9e2630cf1 100644 --- a/src/Mod/Cloud/App/PreCompiled.h +++ b/src/Mod/Cloud/App/PreCompiled.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef CLOUD_APP_PRECOMPILED_H -#define CLOUD_APP_PRECOMPILED_H +#pragma once #include @@ -47,5 +46,3 @@ // Xerces #include - -#endif diff --git a/src/Mod/Cloud/CloudGlobal.h b/src/Mod/Cloud/CloudGlobal.h index c98cb95bd1..c6a4d4d1b2 100644 --- a/src/Mod/Cloud/CloudGlobal.h +++ b/src/Mod/Cloud/CloudGlobal.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef CLOUD_GLOBAL_H -#define CLOUD_GLOBAL_H +#pragma once #include @@ -43,6 +42,3 @@ # define CloudGuiExport FREECAD_DECL_IMPORT # endif #endif - - -#endif // CLOUD_GLOBAL_H diff --git a/src/Mod/Cloud/Gui/PreCompiled.h b/src/Mod/Cloud/Gui/PreCompiled.h index 6911745401..cf7b713ca8 100644 --- a/src/Mod/Cloud/Gui/PreCompiled.h +++ b/src/Mod/Cloud/Gui/PreCompiled.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef CLOUD_GUI_PRECOMPILED_H -#define CLOUD_GUI_PRECOMPILED_H +#pragma once #include @@ -49,5 +48,3 @@ // Qt Toolkit #include - -#endif // GUI_PRECOMPILED_H diff --git a/src/Mod/Cloud/Gui/Workbench.h b/src/Mod/Cloud/Gui/Workbench.h index 96b7fd44f4..55a6e522b0 100644 --- a/src/Mod/Cloud/Gui/Workbench.h +++ b/src/Mod/Cloud/Gui/Workbench.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef Cloud_WORKBENCH_H -#define Cloud_WORKBENCH_H +#pragma once #include @@ -44,6 +43,3 @@ protected: }; } // namespace CloudGui - - -#endif // Cloud_WORKBENCH_H diff --git a/src/Mod/Draft/App/PreCompiled.h b/src/Mod/Draft/App/PreCompiled.h index fa15c8f4dc..e904b06519 100644 --- a/src/Mod/Draft/App/PreCompiled.h +++ b/src/Mod/Draft/App/PreCompiled.h @@ -22,9 +22,6 @@ * * ***************************************************************************/ -#ifndef DRAFTUTILS_PRECOMPILED_H -#define DRAFTUTILS_PRECOMPILED_H +#pragma once #include - -#endif diff --git a/src/Mod/Draft/DraftGlobal.h b/src/Mod/Draft/DraftGlobal.h index 2bb8fa5a90..d24cf6b858 100644 --- a/src/Mod/Draft/DraftGlobal.h +++ b/src/Mod/Draft/DraftGlobal.h @@ -24,17 +24,14 @@ #include -#ifndef DRAFT_GLOBAL_H -# define DRAFT_GLOBAL_H +#pragma once // Draft -# ifndef DraftUtilsExport -# ifdef DraftUtils_EXPORTS -# define DraftUtilsExport FREECAD_DECL_EXPORT -# else -# define DraftUtilsExport FREECAD_DECL_IMPORT -# endif +#ifndef DraftUtilsExport +# ifdef DraftUtils_EXPORTS +# define DraftUtilsExport FREECAD_DECL_EXPORT +# else +# define DraftUtilsExport FREECAD_DECL_IMPORT # endif - -#endif // DRAFT_GLOBAL_H +#endif diff --git a/src/Mod/Fem/App/FemAnalysis.h b/src/Mod/Fem/App/FemAnalysis.h index de2be925a4..1da84d39ec 100644 --- a/src/Mod/Fem/App/FemAnalysis.h +++ b/src/Mod/Fem/App/FemAnalysis.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef Fem_FemAnalysis_H -#define Fem_FemAnalysis_H +#pragma once #include #include @@ -102,6 +101,3 @@ using FeaturePython = App::FeaturePythonT; } // namespace Fem - - -#endif // Fem_FemAnalysis_H diff --git a/src/Mod/Fem/App/FemConstraint.h b/src/Mod/Fem/App/FemConstraint.h index 1c440f3e1c..85ac10a039 100644 --- a/src/Mod/Fem/App/FemConstraint.h +++ b/src/Mod/Fem/App/FemConstraint.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FEM_CONSTRAINT_H -#define FEM_CONSTRAINT_H +#pragma once #include #include @@ -238,6 +237,3 @@ using ConstraintPython = App::FeaturePythonT; } // namespace Fem - - -#endif // FEM_CONSTRAINT_H diff --git a/src/Mod/Fem/App/FemConstraintBearing.h b/src/Mod/Fem/App/FemConstraintBearing.h index d02fc0e62b..5d9581bc54 100644 --- a/src/Mod/Fem/App/FemConstraintBearing.h +++ b/src/Mod/Fem/App/FemConstraintBearing.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FEM_CONSTRAINTBEARING_H -#define FEM_CONSTRAINTBEARING_H +#pragma once #include #include @@ -67,6 +66,3 @@ protected: }; } // namespace Fem - - -#endif // FEM_CONSTRAINTBEARING_H diff --git a/src/Mod/Fem/App/FemConstraintContact.h b/src/Mod/Fem/App/FemConstraintContact.h index 66dbb4a5a4..89c9d5b5e8 100644 --- a/src/Mod/Fem/App/FemConstraintContact.h +++ b/src/Mod/Fem/App/FemConstraintContact.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef FEM_CONSTRAINTCONTACT_H -#define FEM_CONSTRAINTCONTACT_H +#pragma once #include "FemConstraint.h" @@ -74,6 +73,3 @@ protected: }; } // namespace Fem - - -#endif // FEM_CONSTRAINTCONTACT_H diff --git a/src/Mod/Fem/App/FemConstraintDisplacement.h b/src/Mod/Fem/App/FemConstraintDisplacement.h index 0b1d9e85be..49b0be2d08 100644 --- a/src/Mod/Fem/App/FemConstraintDisplacement.h +++ b/src/Mod/Fem/App/FemConstraintDisplacement.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef FEM_CONSTRAINTDISPLACEMENT_H -#define FEM_CONSTRAINTDISPLACEMENT_H +#pragma once #include "FemConstraint.h" @@ -80,6 +79,3 @@ protected: }; } // namespace Fem - - -#endif // FEM_CONSTRAINTDISPLACEMENT_H diff --git a/src/Mod/Fem/App/FemConstraintFixed.h b/src/Mod/Fem/App/FemConstraintFixed.h index 26a203971b..5af227a93f 100644 --- a/src/Mod/Fem/App/FemConstraintFixed.h +++ b/src/Mod/Fem/App/FemConstraintFixed.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FEM_CONSTRAINTFIXED_H -#define FEM_CONSTRAINTFIXED_H +#pragma once #include "FemConstraint.h" @@ -52,6 +51,3 @@ protected: }; } // namespace Fem - - -#endif // FEM_CONSTRAINTFIXED_H diff --git a/src/Mod/Fem/App/FemConstraintFluidBoundary.h b/src/Mod/Fem/App/FemConstraintFluidBoundary.h index b2904bbba7..6f9fcc1538 100644 --- a/src/Mod/Fem/App/FemConstraintFluidBoundary.h +++ b/src/Mod/Fem/App/FemConstraintFluidBoundary.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FEM_FLUIDBOUNDARY_H -#define FEM_FLUIDBOUNDARY_H +#pragma once #include "FemConstraint.h" @@ -73,6 +72,3 @@ private: }; } // namespace Fem - - -#endif // FEM_FLUIDBOUNDARY_H diff --git a/src/Mod/Fem/App/FemConstraintForce.h b/src/Mod/Fem/App/FemConstraintForce.h index 6cef35e974..3a99314c91 100644 --- a/src/Mod/Fem/App/FemConstraintForce.h +++ b/src/Mod/Fem/App/FemConstraintForce.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FEM_CONSTRAINTFORCE_H -#define FEM_CONSTRAINTFORCE_H +#pragma once #include "FemConstraint.h" @@ -67,6 +66,3 @@ private: }; } // namespace Fem - - -#endif // FEM_CONSTRAINTFORCE_H diff --git a/src/Mod/Fem/App/FemConstraintGear.h b/src/Mod/Fem/App/FemConstraintGear.h index ed86237105..3f9f2233b3 100644 --- a/src/Mod/Fem/App/FemConstraintGear.h +++ b/src/Mod/Fem/App/FemConstraintGear.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FEM_CONSTRAINTGear_H -#define FEM_CONSTRAINTGear_H +#pragma once #include "FemConstraintBearing.h" @@ -63,6 +62,3 @@ private: }; } // namespace Fem - - -#endif // FEM_CONSTRAINTGear_H diff --git a/src/Mod/Fem/App/FemConstraintHeatflux.h b/src/Mod/Fem/App/FemConstraintHeatflux.h index 875760b57d..acc78a1058 100644 --- a/src/Mod/Fem/App/FemConstraintHeatflux.h +++ b/src/Mod/Fem/App/FemConstraintHeatflux.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef FEM_CONSTRAINTHEATFLUX_H -#define FEM_CONSTRAINTHEATFLUX_H +#pragma once #include "FemConstraint.h" @@ -67,5 +66,3 @@ protected: }; } // namespace Fem - -#endif // FEM_CONSTRAINTHEATFLUX_H diff --git a/src/Mod/Fem/App/FemConstraintInitialTemperature.h b/src/Mod/Fem/App/FemConstraintInitialTemperature.h index d36ea709fb..75bfddb597 100644 --- a/src/Mod/Fem/App/FemConstraintInitialTemperature.h +++ b/src/Mod/Fem/App/FemConstraintInitialTemperature.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef FEM_CONSTRAINTINITIALTEMPERATURE_H -#define FEM_CONSTRAINTINITIALTEMPERATURE_H +#pragma once #include "FemConstraint.h" @@ -64,6 +63,3 @@ protected: }; } // namespace Fem - - -#endif // FEM_CONSTRAINTINITIALTEMPERATURE_H diff --git a/src/Mod/Fem/App/FemConstraintPlaneRotation.h b/src/Mod/Fem/App/FemConstraintPlaneRotation.h index 5ef2e0471e..8398b2c003 100644 --- a/src/Mod/Fem/App/FemConstraintPlaneRotation.h +++ b/src/Mod/Fem/App/FemConstraintPlaneRotation.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef FEM_CONSTRAINTPLANEROTATION_H -#define FEM_CONSTRAINTPLANEROTATION_H +#pragma once #include "FemConstraint.h" @@ -49,6 +48,3 @@ protected: }; } // namespace Fem - - -#endif // FEM_CONSTRAINTPLANEROTATION_H diff --git a/src/Mod/Fem/App/FemConstraintPressure.h b/src/Mod/Fem/App/FemConstraintPressure.h index b297a47ac9..9cbd733677 100644 --- a/src/Mod/Fem/App/FemConstraintPressure.h +++ b/src/Mod/Fem/App/FemConstraintPressure.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef FEM_CONSTRAINTPRESSURE_H -#define FEM_CONSTRAINTPRESSURE_H +#pragma once #include "FemConstraint.h" @@ -57,5 +56,3 @@ protected: }; } // namespace Fem - -#endif // FEM_CONSTRAINTPRESSURE_H diff --git a/src/Mod/Fem/App/FemConstraintPulley.h b/src/Mod/Fem/App/FemConstraintPulley.h index 61df7b8183..1a5d3e3ae5 100644 --- a/src/Mod/Fem/App/FemConstraintPulley.h +++ b/src/Mod/Fem/App/FemConstraintPulley.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FEM_CONSTRAINTPulley_H -#define FEM_CONSTRAINTPulley_H +#pragma once #include "FemConstraintGear.h" @@ -65,6 +64,3 @@ protected: }; } // namespace Fem - - -#endif // FEM_CONSTRAINTPulley_H diff --git a/src/Mod/Fem/App/FemConstraintRigidBody.h b/src/Mod/Fem/App/FemConstraintRigidBody.h index 21517fcdf6..51adba431f 100644 --- a/src/Mod/Fem/App/FemConstraintRigidBody.h +++ b/src/Mod/Fem/App/FemConstraintRigidBody.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef FEM_CONSTRAINTRIGIDBODY_H -#define FEM_CONSTRAINTRIGIDBODY_H +#pragma once #include "FemConstraint.h" @@ -74,6 +73,3 @@ private: }; } // namespace Fem - - -#endif // FEM_CONSTRAINTRIGIDBODY_H diff --git a/src/Mod/Fem/App/FemConstraintSpring.h b/src/Mod/Fem/App/FemConstraintSpring.h index 427dffab0a..a79868ef45 100644 --- a/src/Mod/Fem/App/FemConstraintSpring.h +++ b/src/Mod/Fem/App/FemConstraintSpring.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef FEM_CONSTRAINTPSPRING_H -#define FEM_CONSTRAINTPSPRING_H +#pragma once #include "FemConstraint.h" @@ -52,5 +51,3 @@ protected: }; } // namespace Fem - -#endif // FEM_CONSTRAINTPSPRING_H diff --git a/src/Mod/Fem/App/FemConstraintTemperature.h b/src/Mod/Fem/App/FemConstraintTemperature.h index a165f080e1..55dad237d5 100644 --- a/src/Mod/Fem/App/FemConstraintTemperature.h +++ b/src/Mod/Fem/App/FemConstraintTemperature.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef FEM_CONSTRAINTTEMPERATURE_H -#define FEM_CONSTRAINTTEMPERATURE_H +#pragma once #include "FemConstraint.h" @@ -65,6 +64,3 @@ protected: }; } // namespace Fem - - -#endif // FEM_CONSTRAINTTEMPERATURE_H diff --git a/src/Mod/Fem/App/FemConstraintTransform.h b/src/Mod/Fem/App/FemConstraintTransform.h index 9d07ed5e62..79e03b5b9b 100644 --- a/src/Mod/Fem/App/FemConstraintTransform.h +++ b/src/Mod/Fem/App/FemConstraintTransform.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FEM_CONSTRAINTTransform_H -#define FEM_CONSTRAINTTransform_H +#pragma once #include "FemConstraint.h" @@ -62,6 +61,3 @@ protected: }; } // namespace Fem - - -#endif // FEM_CONSTRAINTTransform_H diff --git a/src/Mod/Fem/App/FemMesh.h b/src/Mod/Fem/App/FemMesh.h index ee1cab6751..0d0abc696d 100644 --- a/src/Mod/Fem/App/FemMesh.h +++ b/src/Mod/Fem/App/FemMesh.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef FEM_FEMMESH_H -#define FEM_FEMMESH_H +#pragma once #include #include @@ -253,6 +252,3 @@ inline SMESH_HypothesisPtr FemMesh::createHypothesis(int hypId) } } // namespace Fem - - -#endif // FEM_FEMMESH_H diff --git a/src/Mod/Fem/App/FemMeshObject.h b/src/Mod/Fem/App/FemMeshObject.h index 02ec4d7c38..14ff4b856d 100644 --- a/src/Mod/Fem/App/FemMeshObject.h +++ b/src/Mod/Fem/App/FemMeshObject.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef Fem_FemMeshObject_H -#define Fem_FemMeshObject_H +#pragma once #include #include @@ -73,6 +72,3 @@ using FemMeshObjectPython = App::FeaturePythonT; } // namespace Fem - - -#endif // Fem_FemMeshObject_H diff --git a/src/Mod/Fem/App/FemMeshProperty.h b/src/Mod/Fem/App/FemMeshProperty.h index 84bdb8ff80..1904816a4d 100644 --- a/src/Mod/Fem/App/FemMeshProperty.h +++ b/src/Mod/Fem/App/FemMeshProperty.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef Fem_PropertyFemMesh_H -#define Fem_PropertyFemMesh_H +#pragma once #include "FemMesh.h" #include @@ -96,6 +95,3 @@ private: } // namespace Fem - - -#endif // PROPERTYTOPOSHAPE_H diff --git a/src/Mod/Fem/App/FemMeshShapeNetgenObject.h b/src/Mod/Fem/App/FemMeshShapeNetgenObject.h index b8db150610..f29f9550d3 100644 --- a/src/Mod/Fem/App/FemMeshShapeNetgenObject.h +++ b/src/Mod/Fem/App/FemMeshShapeNetgenObject.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef Fem_FemMeshShapeNetgenObject_H -#define Fem_FemMeshShapeNetgenObject_H +#pragma once #include "FemMeshShapeObject.h" #include @@ -65,6 +64,3 @@ protected: }; } // namespace Fem - - -#endif // Fem_FemMeshShapeNetgenObject_H diff --git a/src/Mod/Fem/App/FemMeshShapeObject.h b/src/Mod/Fem/App/FemMeshShapeObject.h index a9afb94a76..1ba82a3480 100644 --- a/src/Mod/Fem/App/FemMeshShapeObject.h +++ b/src/Mod/Fem/App/FemMeshShapeObject.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef Fem_FemMeshShapeObject_H -#define Fem_FemMeshShapeObject_H +#pragma once #include "FemMeshObject.h" @@ -77,6 +76,3 @@ protected: using FemMeshShapeBaseObjectPython = App::FeaturePythonT; } // namespace Fem - - -#endif // Fem_FemMeshShapeObject_H diff --git a/src/Mod/Fem/App/FemPostBranchFilter.h b/src/Mod/Fem/App/FemPostBranchFilter.h index f07f0dd3f8..4c86227a81 100644 --- a/src/Mod/Fem/App/FemPostBranchFilter.h +++ b/src/Mod/Fem/App/FemPostBranchFilter.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef Fem_FemPostBranchFilter_H -#define Fem_FemPostBranchFilter_H +#pragma once #include "FemPostFilter.h" @@ -71,6 +70,3 @@ private: }; } // namespace Fem - - -#endif // Fem_FemPostBranchFilter_H diff --git a/src/Mod/Fem/App/FemPostFilter.h b/src/Mod/Fem/App/FemPostFilter.h index 2c6be7d745..4ba6fe4099 100644 --- a/src/Mod/Fem/App/FemPostFilter.h +++ b/src/Mod/Fem/App/FemPostFilter.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef Fem_FemPostFilter_H -#define Fem_FemPostFilter_H +#pragma once #include #include @@ -426,6 +425,3 @@ private: }; } // namespace Fem - - -#endif // Fem_FemPostFilter_H diff --git a/src/Mod/Fem/App/FemPostFunction.h b/src/Mod/Fem/App/FemPostFunction.h index e320f1ad35..3d0f4bee9e 100644 --- a/src/Mod/Fem/App/FemPostFunction.h +++ b/src/Mod/Fem/App/FemPostFunction.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef Fem_FemPostFunction_H -#define Fem_FemPostFunction_H +#pragma once #include #include @@ -205,6 +204,3 @@ protected: }; } // namespace Fem - - -#endif // Fem_FemPostFunction_H diff --git a/src/Mod/Fem/App/FemPostGroupExtension.h b/src/Mod/Fem/App/FemPostGroupExtension.h index e7aafc277a..bd0896eed8 100644 --- a/src/Mod/Fem/App/FemPostGroupExtension.h +++ b/src/Mod/Fem/App/FemPostGroupExtension.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef Fem_FemPostGroup_H -#define Fem_FemPostGroup_H +#pragma once #include "Base/Unit.h" #include "App/GroupExtension.h" @@ -74,6 +73,3 @@ private: }; } // namespace Fem - - -#endif // Fem_FemPostGroup_H diff --git a/src/Mod/Fem/App/FemPostObject.h b/src/Mod/Fem/App/FemPostObject.h index 7144b00b95..e2e4ce3f82 100644 --- a/src/Mod/Fem/App/FemPostObject.h +++ b/src/Mod/Fem/App/FemPostObject.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef Fem_FemPostObject_H -#define Fem_FemPostObject_H +#pragma once #include "PropertyPostDataObject.h" #include @@ -71,6 +70,3 @@ protected: }; } // namespace Fem - - -#endif // Fem_FemPostObject_H diff --git a/src/Mod/Fem/App/FemPostPipeline.h b/src/Mod/Fem/App/FemPostPipeline.h index 424fc1d826..90b8792b09 100644 --- a/src/Mod/Fem/App/FemPostPipeline.h +++ b/src/Mod/Fem/App/FemPostPipeline.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef Fem_FemPostPipeline_H -#define Fem_FemPostPipeline_H +#pragma once #include "Base/Unit.h" #include "FemPostGroupExtension.h" @@ -141,6 +140,3 @@ private: }; } // namespace Fem - - -#endif // Fem_FemPostPipeline_H diff --git a/src/Mod/Fem/App/FemResultObject.h b/src/Mod/Fem/App/FemResultObject.h index 5104d0a752..f5f72514b8 100644 --- a/src/Mod/Fem/App/FemResultObject.h +++ b/src/Mod/Fem/App/FemResultObject.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef Fem_FemResultObject_H -#define Fem_FemResultObject_H +#pragma once #include #include @@ -66,6 +65,3 @@ using FemResultObjectPython = App::FeaturePythonT; } // namespace Fem - - -#endif // Fem_FemResultObject_H diff --git a/src/Mod/Fem/App/FemSetElementNodesObject.h b/src/Mod/Fem/App/FemSetElementNodesObject.h index c016d0eec0..5fd170e0b0 100644 --- a/src/Mod/Fem/App/FemSetElementNodesObject.h +++ b/src/Mod/Fem/App/FemSetElementNodesObject.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef Fem_FemSetElementNodesObject_H -#define Fem_FemSetElementNodesObject_H +#pragma once #include "FemSetObject.h" #include @@ -60,6 +59,3 @@ public: }; } // namespace Fem - - -#endif // Fem_FemSetElementNodesObject_H diff --git a/src/Mod/Fem/App/FemSetElementsObject.h b/src/Mod/Fem/App/FemSetElementsObject.h index 4a021166d4..0b5957c874 100644 --- a/src/Mod/Fem/App/FemSetElementsObject.h +++ b/src/Mod/Fem/App/FemSetElementsObject.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef Fem_FemSetElementsObjec_H -#define Fem_FemSetElementsObjec_H +#pragma once #include "FemSetObject.h" #include @@ -53,6 +52,3 @@ public: }; } // namespace Fem - - -#endif // Fem_FemSetElementsObjec_H diff --git a/src/Mod/Fem/App/FemSetFacesObject.h b/src/Mod/Fem/App/FemSetFacesObject.h index 8d921e4e32..a718660850 100644 --- a/src/Mod/Fem/App/FemSetFacesObject.h +++ b/src/Mod/Fem/App/FemSetFacesObject.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef Fem_FemSetFacesObject_H -#define Fem_FemSetFacesObject_H +#pragma once #include "FemSetObject.h" #include @@ -53,6 +52,3 @@ public: }; } // namespace Fem - - -#endif // Fem_FemSetFacesObject_H diff --git a/src/Mod/Fem/App/FemSetGeometryObject.h b/src/Mod/Fem/App/FemSetGeometryObject.h index a9de42bba6..41759ec415 100644 --- a/src/Mod/Fem/App/FemSetGeometryObject.h +++ b/src/Mod/Fem/App/FemSetGeometryObject.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef Fem_FemSetGeometryObject_H -#define Fem_FemSetGeometryObject_H +#pragma once #include "FemSetObject.h" #include @@ -53,6 +52,3 @@ public: }; } // namespace Fem - - -#endif // Fem_FemSetGeometryObject_H diff --git a/src/Mod/Fem/App/FemSetNodesObject.h b/src/Mod/Fem/App/FemSetNodesObject.h index d9b292f7aa..d0bad6fb8c 100644 --- a/src/Mod/Fem/App/FemSetNodesObject.h +++ b/src/Mod/Fem/App/FemSetNodesObject.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef Fem_FemSetNodesObject_H -#define Fem_FemSetNodesObject_H +#pragma once #include "FemSetObject.h" #include @@ -56,6 +55,3 @@ public: }; } // namespace Fem - - -#endif // Fem_FemSetNodesObject_H diff --git a/src/Mod/Fem/App/FemSetObject.h b/src/Mod/Fem/App/FemSetObject.h index 0df495fdca..87e805ba11 100644 --- a/src/Mod/Fem/App/FemSetObject.h +++ b/src/Mod/Fem/App/FemSetObject.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef Fem_FemSetObject_H -#define Fem_FemSetObject_H +#pragma once #include #include @@ -51,6 +50,3 @@ public: }; } // namespace Fem - - -#endif // Fem_FemSetObject_H diff --git a/src/Mod/Fem/App/FemSolverObject.h b/src/Mod/Fem/App/FemSolverObject.h index fc03e6652c..296c487b8e 100644 --- a/src/Mod/Fem/App/FemSolverObject.h +++ b/src/Mod/Fem/App/FemSolverObject.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef Fem_FemSolverObject_H -#define Fem_FemSolverObject_H +#pragma once #include #include @@ -62,6 +61,3 @@ public: using FemSolverObjectPython = App::FeaturePythonT; } // namespace Fem - - -#endif // Fem_FemSolverObject_H diff --git a/src/Mod/Fem/App/FemTools.h b/src/Mod/Fem/App/FemTools.h index 81e8626841..6772759316 100644 --- a/src/Mod/Fem/App/FemTools.h +++ b/src/Mod/Fem/App/FemTools.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef FEM_TOOLS_H -#define FEM_TOOLS_H +#pragma once #include #include @@ -109,6 +108,3 @@ public: }; } // namespace Fem - - -#endif // FEM_TOOLS_H diff --git a/src/Mod/Fem/App/FemVTKTools.h b/src/Mod/Fem/App/FemVTKTools.h index 17143dea5e..248313fc0e 100644 --- a/src/Mod/Fem/App/FemVTKTools.h +++ b/src/Mod/Fem/App/FemVTKTools.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef FEM_VTK_TOOLS_H -#define FEM_VTK_TOOLS_H +#pragma once #include #include @@ -74,5 +73,3 @@ public: static void frdToVTK(const char* filename, bool binary = true); }; } // namespace Fem - -#endif // FEM_VTK_TOOLS_H diff --git a/src/Mod/Fem/App/HypothesisPy.h b/src/Mod/Fem/App/HypothesisPy.h index 56f2e47740..c6e93f4987 100644 --- a/src/Mod/Fem/App/HypothesisPy.h +++ b/src/Mod/Fem/App/HypothesisPy.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef FEM_HYPOTHESISPY_H -#define FEM_HYPOTHESISPY_H +#pragma once #include #include // needed for SMESH_VERSION_MAJOR @@ -728,5 +727,3 @@ public: #endif } // namespace Fem - -#endif // FEM_HYPOTHESISPY_H diff --git a/src/Mod/Fem/App/PreCompiled.h b/src/Mod/Fem/App/PreCompiled.h index fe5d767cbf..50772ce242 100644 --- a/src/Mod/Fem/App/PreCompiled.h +++ b/src/Mod/Fem/App/PreCompiled.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef FEM_PRECOMPILED_H -#define FEM_PRECOMPILED_H +#pragma once #include @@ -209,5 +208,3 @@ # include # include #endif - -#endif diff --git a/src/Mod/Fem/App/PropertyPostDataObject.h b/src/Mod/Fem/App/PropertyPostDataObject.h index afd8b0b8fb..3c1108c6e1 100644 --- a/src/Mod/Fem/App/PropertyPostDataObject.h +++ b/src/Mod/Fem/App/PropertyPostDataObject.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef FEM_PROPERTYPOSTDATASET_H -#define FEM_PROPERTYPOSTDATASET_H +#pragma once #include #include @@ -89,6 +88,3 @@ protected: }; } // namespace Fem - - -#endif // FEM_PROPERTYPOSTDATASET_H diff --git a/src/Mod/Fem/App/VTKExtensions/vtkCleanUnstructuredGrid.h b/src/Mod/Fem/App/VTKExtensions/vtkCleanUnstructuredGrid.h index db40380601..f650686ef1 100644 --- a/src/Mod/Fem/App/VTKExtensions/vtkCleanUnstructuredGrid.h +++ b/src/Mod/Fem/App/VTKExtensions/vtkCleanUnstructuredGrid.h @@ -16,12 +16,11 @@ */ -#ifndef vtkCleanUnstructuredGrid_h -# define vtkCleanUnstructuredGrid_h +#pragma once -# include "vtkFiltersGeneralModule.h" // For export macro -# include "vtkSmartPointer.h" -# include "vtkUnstructuredGridAlgorithm.h" +#include "vtkFiltersGeneralModule.h" // For export macro +#include "vtkSmartPointer.h" +#include "vtkUnstructuredGridAlgorithm.h" /*VTK_ABI_NAMESPACE_BEGIN*/ @@ -149,5 +148,4 @@ private: void operator=(const vtkCleanUnstructuredGrid&) = delete; }; /*VTK_ABI_NAMESPACE_END*/ -#endif // VTK-HeaderTest-Exclude: vtkCleanUnstructuredGrid.h diff --git a/src/Mod/Fem/App/VTKExtensions/vtkFemFrameSourceAlgorithm.h b/src/Mod/Fem/App/VTKExtensions/vtkFemFrameSourceAlgorithm.h index ea7f338573..20bcbe50a9 100644 --- a/src/Mod/Fem/App/VTKExtensions/vtkFemFrameSourceAlgorithm.h +++ b/src/Mod/Fem/App/VTKExtensions/vtkFemFrameSourceAlgorithm.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef Fem_VTK_vtkFemFrameSourceAlgorithm_H -#define Fem_VTK_vtkFemFrameSourceAlgorithm_H +#pragma once #include #include @@ -65,6 +64,3 @@ protected: }; } // namespace Fem - - -#endif // Fem_VTK_vtkFemFrameSourceAlgorithm_H diff --git a/src/Mod/Fem/App/VTKExtensions/vtkSMPTools.h b/src/Mod/Fem/App/VTKExtensions/vtkSMPTools.h index f7534c0275..9a5a17b6bc 100644 --- a/src/Mod/Fem/App/VTKExtensions/vtkSMPTools.h +++ b/src/Mod/Fem/App/VTKExtensions/vtkSMPTools.h @@ -27,20 +27,19 @@ * vtkSMPThreadLocalObject */ -#ifndef vtkSMPTools_h -# define vtkSMPTools_h +#pragma once -# include "vtkCommonCoreModule.h" // For export macro -# include "vtkObject.h" +#include "vtkCommonCoreModule.h" // For export macro +#include "vtkObject.h" -# include "SMP/Common/vtkSMPToolsAPI.h" -# include "vtkSMPThreadLocal.h" // For Initialized +#include "SMP/Common/vtkSMPToolsAPI.h" +#include "vtkSMPThreadLocal.h" // For Initialized -# include // For std::function -# include // For std::iterator -# include // For std:::enable_if +#include // For std::function +#include // For std::iterator +#include // For std:::enable_if -# ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef DOXYGEN_SHOULD_SKIP_THIS namespace vtk { namespace detail @@ -228,7 +227,7 @@ using resolvedNotInt = typename std::enable_if::value, void } // namespace smp } // namespace detail } // namespace vtk -# endif // DOXYGEN_SHOULD_SKIP_THIS +#endif // DOXYGEN_SHOULD_SKIP_THIS class VTKCOMMONCORE_EXPORT vtkSMPTools { @@ -481,13 +480,13 @@ public: , Backend(backend) , NestedParallelism(nestedParallelism) {} -# ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef DOXYGEN_SHOULD_SKIP_THIS Config(vtk::detail::smp::vtkSMPToolsAPI& API) : MaxNumberOfThreads(API.GetInternalDesiredNumberOfThread()) , Backend(API.GetBackend()) , NestedParallelism(API.GetNestedParallelism()) {} -# endif // DOXYGEN_SHOULD_SKIP_THIS +#endif // DOXYGEN_SHOULD_SKIP_THIS }; /** @@ -606,5 +605,4 @@ public: } }; -#endif // VTK-HeaderTest-Exclude: vtkSMPTools.h diff --git a/src/Mod/Fem/FemGlobal.h b/src/Mod/Fem/FemGlobal.h index bc95b73e26..22cb115192 100644 --- a/src/Mod/Fem/FemGlobal.h +++ b/src/Mod/Fem/FemGlobal.h @@ -22,26 +22,23 @@ #include -#ifndef FEM_GLOBAL_H -# define FEM_GLOBAL_H +#pragma once // Fem -# ifndef FemExport -# ifdef Fem_EXPORTS -# define FemExport FREECAD_DECL_EXPORT -# else -# define FemExport FREECAD_DECL_IMPORT -# endif +#ifndef FemExport +# ifdef Fem_EXPORTS +# define FemExport FREECAD_DECL_EXPORT +# else +# define FemExport FREECAD_DECL_IMPORT # endif +#endif // FemGui -# ifndef FemGuiExport -# ifdef FemGui_EXPORTS -# define FemGuiExport FREECAD_DECL_EXPORT -# else -# define FemGuiExport FREECAD_DECL_IMPORT -# endif +#ifndef FemGuiExport +# ifdef FemGui_EXPORTS +# define FemGuiExport FREECAD_DECL_EXPORT +# else +# define FemGuiExport FREECAD_DECL_IMPORT # endif - -#endif // FEM_GLOBAL_H +#endif diff --git a/src/Mod/Fem/Gui/AbaqusHighlighter.h b/src/Mod/Fem/Gui/AbaqusHighlighter.h index 26e7d6b4a1..2998f105a3 100644 --- a/src/Mod/Fem/Gui/AbaqusHighlighter.h +++ b/src/Mod/Fem/Gui/AbaqusHighlighter.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef FEMGUI_ABAQUSHIGHLIGHTER_H -#define FEMGUI_ABAQUSHIGHLIGHTER_H +#pragma once #include @@ -44,5 +43,3 @@ protected: }; } // namespace FemGui - -#endif // FEMGUI_ABAQUSHIGHLIGHTER_H diff --git a/src/Mod/Fem/Gui/ActiveAnalysisObserver.h b/src/Mod/Fem/Gui/ActiveAnalysisObserver.h index 8715cf1112..2e27f05cd4 100644 --- a/src/Mod/Fem/Gui/ActiveAnalysisObserver.h +++ b/src/Mod/Fem/Gui/ActiveAnalysisObserver.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef FEMGUI_ACTIVEANALYSISOBSERVER_H -#define FEMGUI_ACTIVEANALYSISOBSERVER_H +#pragma once #include #include @@ -66,5 +65,3 @@ private: }; } // namespace FemGui - -#endif // FEMGUI_ACTIVEANALYSISOBSERVER_H diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.h b/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.h index 048183c4eb..b52d894e98 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.h +++ b/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef FEMGUI_DLGSETTINGSFEMCCXIMP_H -#define FEMGUI_DLGSETTINGSFEMCCXIMP_H +#pragma once #include #include @@ -54,5 +53,3 @@ private: }; } // namespace FemGui - -#endif // FEMGUI_DLGSETTINGSFEMCCXIMP_H diff --git a/src/Mod/Fem/Gui/DlgSettingsFemElmerImp.h b/src/Mod/Fem/Gui/DlgSettingsFemElmerImp.h index 8521089136..c6f21f070a 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemElmerImp.h +++ b/src/Mod/Fem/Gui/DlgSettingsFemElmerImp.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef FEMGUI_DLGSETTINGSFEMELMERIMP_H -#define FEMGUI_DLGSETTINGSFEMELMERIMP_H +#pragma once #include #include @@ -53,5 +52,3 @@ private: }; } // namespace FemGui - -#endif // FEMGUI_DLGSETTINGSFEMELMERIMP_H diff --git a/src/Mod/Fem/Gui/DlgSettingsFemExportAbaqusImp.h b/src/Mod/Fem/Gui/DlgSettingsFemExportAbaqusImp.h index 7a70486224..6d8fbffe41 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemExportAbaqusImp.h +++ b/src/Mod/Fem/Gui/DlgSettingsFemExportAbaqusImp.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef FEMGUI_DLGSETTINGSFEMEXPORTABAQUSIMP_H -#define FEMGUI_DLGSETTINGSFEMEXPORTABAQUSIMP_H +#pragma once #include @@ -52,5 +51,3 @@ private: }; } // namespace FemGui - -#endif // FEMGUI_DLGSETTINGSFEMEXPORTABAQUSIMP_H diff --git a/src/Mod/Fem/Gui/DlgSettingsFemGeneralImp.h b/src/Mod/Fem/Gui/DlgSettingsFemGeneralImp.h index df5fc3678a..a86f96cf3e 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemGeneralImp.h +++ b/src/Mod/Fem/Gui/DlgSettingsFemGeneralImp.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef FEMGUI_DLGSETTINGSFEMGENERALIMP_H -#define FEMGUI_DLGSETTINGSFEMGENERALIMP_H +#pragma once #include #include @@ -50,5 +49,3 @@ private: }; } // namespace FemGui - -#endif // FEMGUI_DLGSETTINGSFEMGENERALIMP_H diff --git a/src/Mod/Fem/Gui/DlgSettingsFemGmshImp.h b/src/Mod/Fem/Gui/DlgSettingsFemGmshImp.h index a9e3cd5843..da846eb88c 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemGmshImp.h +++ b/src/Mod/Fem/Gui/DlgSettingsFemGmshImp.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef FEMGUI_DLGSETTINGSFEMGMSHIMP_H -#define FEMGUI_DLGSETTINGSFEMGMSHIMP_H +#pragma once #include #include @@ -54,5 +53,3 @@ private: }; } // namespace FemGui - -#endif // FEMGUI_DLGSETTINGSFEMGMSHIMP_H diff --git a/src/Mod/Fem/Gui/DlgSettingsFemInOutVtkImp.h b/src/Mod/Fem/Gui/DlgSettingsFemInOutVtkImp.h index d3502efc56..b9b99e953e 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemInOutVtkImp.h +++ b/src/Mod/Fem/Gui/DlgSettingsFemInOutVtkImp.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef FEMGUI_DLGSETTINGSFEMINOUTVTKIMP_H -#define FEMGUI_DLGSETTINGSFEMINOUTVTKIMP_H +#pragma once #include @@ -53,5 +52,3 @@ private: }; } // namespace FemGui - -#endif // FEMGUI_DLGSETTINGSFEMINOUTVTKIMP_H diff --git a/src/Mod/Fem/Gui/DlgSettingsFemMystranImp.h b/src/Mod/Fem/Gui/DlgSettingsFemMystranImp.h index 08a1a2d96c..48f1dba4dd 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemMystranImp.h +++ b/src/Mod/Fem/Gui/DlgSettingsFemMystranImp.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef FEMGUI_DLGSETTINGSFEMMYSTRANIMP_H -#define FEMGUI_DLGSETTINGSFEMMYSTRANIMP_H +#pragma once #include #include @@ -54,5 +53,3 @@ private: }; } // namespace FemGui - -#endif // FEMGUI_DLGSETTINGSFEMMYSTRANIMP_H diff --git a/src/Mod/Fem/Gui/DlgSettingsFemZ88Imp.h b/src/Mod/Fem/Gui/DlgSettingsFemZ88Imp.h index 3cef1bea80..49d17c70c7 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemZ88Imp.h +++ b/src/Mod/Fem/Gui/DlgSettingsFemZ88Imp.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef FEMGUI_DLGSETTINGSFEMZ88IMP_H -#define FEMGUI_DLGSETTINGSFEMZ88IMP_H +#pragma once #include #include @@ -54,5 +53,3 @@ private: }; } // namespace FemGui - -#endif // FEMGUI_DLGSETTINGSFEMZ88IMP_H diff --git a/src/Mod/Fem/Gui/FemGuiTools.h b/src/Mod/Fem/Gui/FemGuiTools.h index 3863ef3cb1..23b953c975 100644 --- a/src/Mod/Fem/Gui/FemGuiTools.h +++ b/src/Mod/Fem/Gui/FemGuiTools.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FEM_GUI_TOOLS_H -#define FEM_GUI_TOOLS_H +#pragma once #include #include @@ -70,6 +69,3 @@ void updateFixed( } // namespace GuiTools } // namespace FemGui - - -#endif // FEM_GUI_TOOLS_H diff --git a/src/Mod/Fem/Gui/FemSelectionGate.h b/src/Mod/Fem/Gui/FemSelectionGate.h index 7048ccecf7..eceaf2c3d2 100644 --- a/src/Mod/Fem/Gui/FemSelectionGate.h +++ b/src/Mod/Fem/Gui/FemSelectionGate.h @@ -20,8 +20,7 @@ ******************************************************************************/ -#ifndef GUI_FemSelectionGate_H -#define GUI_FemSelectionGate_H +#pragma once #include @@ -51,5 +50,3 @@ public: }; } // namespace FemGui - -#endif // GUI_FemSelectionGate_H diff --git a/src/Mod/Fem/Gui/FemSettings.h b/src/Mod/Fem/Gui/FemSettings.h index ffa0498c29..a3b70022e0 100644 --- a/src/Mod/Fem/Gui/FemSettings.h +++ b/src/Mod/Fem/Gui/FemSettings.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef FEMGUI_SETTINGS_H -#define FEMGUI_SETTINGS_H +#pragma once #include @@ -41,5 +40,3 @@ private: }; } // namespace FemGui - -#endif // FEMGUI_SETTINGS_H diff --git a/src/Mod/Fem/Gui/PreCompiled.h b/src/Mod/Fem/Gui/PreCompiled.h index 79a22da635..ef59e6ca3e 100644 --- a/src/Mod/Fem/Gui/PreCompiled.h +++ b/src/Mod/Fem/Gui/PreCompiled.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef FEMGUI_PRECOMPILED_H -#define FEMGUI_PRECOMPILED_H +#pragma once #include @@ -156,5 +155,3 @@ #include #include #include - -#endif // FEMGUI_PRECOMPILED_H diff --git a/src/Mod/Fem/Gui/PropertyFemMeshItem.h b/src/Mod/Fem/Gui/PropertyFemMeshItem.h index 83ba37f44c..b7269fb751 100644 --- a/src/Mod/Fem/Gui/PropertyFemMeshItem.h +++ b/src/Mod/Fem/Gui/PropertyFemMeshItem.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef FEMGUI_PROPERTY_FEMMESH_ITEM_H -#define FEMGUI_PROPERTY_FEMMESH_ITEM_H +#pragma once #include @@ -82,6 +81,3 @@ private: }; } // namespace FemGui - - -#endif // FEMGUI_PROPERTY_FEMMESH_ITEM_H diff --git a/src/Mod/Fem/Gui/TaskAnalysisInfo.h b/src/Mod/Fem/Gui/TaskAnalysisInfo.h index 485ae0dc6f..49222ce596 100644 --- a/src/Mod/Fem/Gui/TaskAnalysisInfo.h +++ b/src/Mod/Fem/Gui/TaskAnalysisInfo.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef FEMGUI_TaskAnalysisInfo_H -#define FEMGUI_TaskAnalysisInfo_H +#pragma once #include @@ -72,5 +71,3 @@ private: }; } // namespace FemGui - -#endif // GUI_TASKVIEW_TaskAnalysisInfo_H diff --git a/src/Mod/Fem/Gui/TaskCreateElementSet.h b/src/Mod/Fem/Gui/TaskCreateElementSet.h index 44dc5f937a..b19a9650b7 100644 --- a/src/Mod/Fem/Gui/TaskCreateElementSet.h +++ b/src/Mod/Fem/Gui/TaskCreateElementSet.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef FemGui_TaskCreateElementSet_H -#define FemGui_TaskCreateElementSet_H +#pragma once #include #include @@ -88,5 +87,3 @@ private: }; } // namespace FemGui - -#endif // FemGui_TaskCreateElementSet_H diff --git a/src/Mod/Fem/Gui/TaskCreateNodeSet.h b/src/Mod/Fem/Gui/TaskCreateNodeSet.h index c1057fd9b5..e111f9126f 100644 --- a/src/Mod/Fem/Gui/TaskCreateNodeSet.h +++ b/src/Mod/Fem/Gui/TaskCreateNodeSet.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskCreateNodeSet_H -#define GUI_TASKVIEW_TaskCreateNodeSet_H +#pragma once #include #include @@ -86,5 +85,3 @@ private: }; } // namespace FemGui - -#endif // GUI_TASKVIEW_TaskCreateNodeSet_H diff --git a/src/Mod/Fem/Gui/TaskDlgAnalysis.h b/src/Mod/Fem/Gui/TaskDlgAnalysis.h index cc8eb0f697..18f8631621 100644 --- a/src/Mod/Fem/Gui/TaskDlgAnalysis.h +++ b/src/Mod/Fem/Gui/TaskDlgAnalysis.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef FEMGUI_TaskDlgAnalysis_H -#define FEMGUI_TaskDlgAnalysis_H +#pragma once #include @@ -71,5 +70,3 @@ protected: } // namespace FemGui - -#endif // FEMGUI_TaskDlgAnalysis_H diff --git a/src/Mod/Fem/Gui/TaskDlgCreateElementSet.h b/src/Mod/Fem/Gui/TaskDlgCreateElementSet.h index 8bb85f08b7..61faa15bdc 100644 --- a/src/Mod/Fem/Gui/TaskDlgCreateElementSet.h +++ b/src/Mod/Fem/Gui/TaskDlgCreateElementSet.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef FemGui_TaskDlgCreateElementSet_H -#define FemGui_TaskDlgCreateElementSet_H +#pragma once #include #include @@ -80,5 +79,3 @@ protected: } // namespace FemGui - -#endif // FemGui_TaskDlgCreateElementSet_H diff --git a/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.h b/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.h index 9a01e222ec..a6e38bbc0a 100644 --- a/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.h +++ b/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef ROBOTGUI_TaskDlgCreateNodeSet_H -#define ROBOTGUI_TaskDlgCreateNodeSet_H +#pragma once #include #include @@ -78,5 +77,3 @@ protected: } // namespace FemGui - -#endif // ROBOTGUI_TASKDLGSIMULATE_H diff --git a/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.h b/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.h index 58be0b6211..37868db8d1 100644 --- a/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.h +++ b/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef FEMGUI_TaskDlgMeshShapeNetgen_H -#define FEMGUI_TaskDlgMeshShapeNetgen_H +#pragma once #include @@ -74,5 +73,3 @@ protected: } // namespace FemGui - -#endif // FEMGUI_TaskDlgMeshShapeNetgen_H diff --git a/src/Mod/Fem/Gui/TaskDriver.h b/src/Mod/Fem/Gui/TaskDriver.h index cdcb8e03ca..d74c860fe3 100644 --- a/src/Mod/Fem/Gui/TaskDriver.h +++ b/src/Mod/Fem/Gui/TaskDriver.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef FEMGUI_TaskDriver_H -#define FEMGUI_TaskDriver_H +#pragma once #include @@ -70,5 +69,3 @@ private: }; } // namespace FemGui - -#endif // FEMGUI_TaskDriver_H diff --git a/src/Mod/Fem/Gui/TaskFemConstraint.h b/src/Mod/Fem/Gui/TaskFemConstraint.h index 36783cbd2b..40efd3eb34 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraint.h +++ b/src/Mod/Fem/Gui/TaskFemConstraint.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskFemConstraint_H -#define GUI_TASKVIEW_TaskFemConstraint_H +#pragma once #include #include @@ -134,5 +133,3 @@ protected: }; } // namespace FemGui - -#endif // GUI_TASKVIEW_TaskFemConstraint_H diff --git a/src/Mod/Fem/Gui/TaskFemConstraintBearing.h b/src/Mod/Fem/Gui/TaskFemConstraintBearing.h index 6debe62394..bf6acf5259 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintBearing.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintBearing.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskFemConstraintBearing_H -#define GUI_TASKVIEW_TaskFemConstraintBearing_H +#pragma once #include #include @@ -92,5 +91,3 @@ public: }; } // namespace FemGui - -#endif // GUI_TASKVIEW_TaskFemConstraintBearing_H diff --git a/src/Mod/Fem/Gui/TaskFemConstraintContact.h b/src/Mod/Fem/Gui/TaskFemConstraintContact.h index a39831ba8e..4505ea7d0f 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintContact.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintContact.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskFemConstraintContact_H -#define GUI_TASKVIEW_TaskFemConstraintContact_H +#pragma once #include #include @@ -81,5 +80,3 @@ public: }; } // namespace FemGui - -#endif // GUI_TASKVIEW_TaskFemConstraintContact_H diff --git a/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.h b/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.h index 45c411bd42..45e040a058 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskFemConstraintDisplacement_H -#define GUI_TASKVIEW_TaskFemConstraintDisplacement_H +#pragma once #include #include @@ -105,5 +104,3 @@ public: }; } // namespace FemGui - -#endif // GUI_TASKVIEW_TaskFemConstraintDisplacement_H diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFixed.h b/src/Mod/Fem/Gui/TaskFemConstraintFixed.h index 9f3dedfca0..5032584257 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintFixed.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintFixed.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskFemConstraintFixed_H -#define GUI_TASKVIEW_TaskFemConstraintFixed_H +#pragma once #include #include @@ -71,5 +70,3 @@ public: }; } // namespace FemGui - -#endif // GUI_TASKVIEW_TaskFemConstraintFixed_H diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.h b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.h index a7701193fd..fefb8e68f1 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskFemConstraintFluidBoundary_H -#define GUI_TASKVIEW_TaskFemConstraintFluidBoundary_H +#pragma once #include #include @@ -124,5 +123,3 @@ public: }; } // namespace FemGui - -#endif // GUI_TASKVIEW_TaskFemConstraintFluidBoundary_H diff --git a/src/Mod/Fem/Gui/TaskFemConstraintForce.h b/src/Mod/Fem/Gui/TaskFemConstraintForce.h index 6b70d7e66c..1322ee8709 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintForce.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintForce.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskFemConstraintForce_H -#define GUI_TASKVIEW_TaskFemConstraintForce_H +#pragma once #include #include @@ -97,5 +96,3 @@ public: }; } // namespace FemGui - -#endif // GUI_TASKVIEW_TaskFemConstraintForce_H diff --git a/src/Mod/Fem/Gui/TaskFemConstraintGear.h b/src/Mod/Fem/Gui/TaskFemConstraintGear.h index 8678a3eadd..6679409fec 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintGear.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintGear.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskFemConstraintGear_H -#define GUI_TASKVIEW_TaskFemConstraintGear_H +#pragma once #include "TaskFemConstraintBearing.h" #include "ViewProviderFemConstraintGear.h" @@ -74,5 +73,3 @@ public: }; } // namespace FemGui - -#endif // GUI_TASKVIEW_TaskFemConstraintGear_H diff --git a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.h b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.h index f8cfe1b6dc..b98e13ab44 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskFemConstraintHeatflux_H -#define GUI_TASKVIEW_TaskFemConstraintHeatflux_H +#pragma once #include #include @@ -88,5 +87,3 @@ public: }; } // namespace FemGui - -#endif // GUI_TASKVIEW_TaskFemConstraintHeatflux_H diff --git a/src/Mod/Fem/Gui/TaskFemConstraintInitialTemperature.h b/src/Mod/Fem/Gui/TaskFemConstraintInitialTemperature.h index a479150eb1..34e5f739c0 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintInitialTemperature.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintInitialTemperature.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskFemConstraintInitialTemperature_H -#define GUI_TASKVIEW_TaskFemConstraintInitialTemperature_H +#pragma once #include #include @@ -68,5 +67,3 @@ public: }; } // namespace FemGui - -#endif // GUI_TASKVIEW_TaskFemConstraintInitialTemperature_H diff --git a/src/Mod/Fem/Gui/TaskFemConstraintOnBoundary.h b/src/Mod/Fem/Gui/TaskFemConstraintOnBoundary.h index d690873032..d251d1eaf1 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintOnBoundary.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintOnBoundary.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskFemConstraintOnBoundary_H -#define GUI_TASKVIEW_TaskFemConstraintOnBoundary_H +#pragma once #include @@ -76,5 +75,3 @@ protected: }; } // namespace FemGui - -#endif // GUI_TASKVIEW_TaskFemConstraintOnBoundary_H diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.h b/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.h index c5c5084856..dc66940b8d 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskFemConstraintPlaneRotation_H -#define GUI_TASKVIEW_TaskFemConstraintPlaneRotation_H +#pragma once #include #include @@ -72,5 +71,3 @@ public: }; } // namespace FemGui - -#endif // GUI_TASKVIEW_TaskFemConstraintPlaneRotation_H diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPressure.h b/src/Mod/Fem/Gui/TaskFemConstraintPressure.h index ceb98e170e..a4c9ecf560 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintPressure.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintPressure.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskFemConstraintPressure_H -#define GUI_TASKVIEW_TaskFemConstraintPressure_H +#pragma once #include #include @@ -76,5 +75,3 @@ public: }; } // namespace FemGui - -#endif // GUI_TASKVIEW_TaskFemConstraintPressure_H diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPulley.h b/src/Mod/Fem/Gui/TaskFemConstraintPulley.h index c9ce4fbdb2..d0f4e6c871 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintPulley.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintPulley.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskFemConstraintPulley_H -#define GUI_TASKVIEW_TaskFemConstraintPulley_H +#pragma once #include "TaskFemConstraintGear.h" #include "ViewProviderFemConstraintPulley.h" @@ -69,5 +68,3 @@ public: }; } // namespace FemGui - -#endif // GUI_TASKVIEW_TaskFemConstraintPulley_H diff --git a/src/Mod/Fem/Gui/TaskFemConstraintRigidBody.h b/src/Mod/Fem/Gui/TaskFemConstraintRigidBody.h index f48677b9ac..6de30aa395 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintRigidBody.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintRigidBody.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskFemConstraintRigidBody_H -#define GUI_TASKVIEW_TaskFemConstraintRigidBody_H +#pragma once #include @@ -86,5 +85,3 @@ public: }; } // namespace FemGui - -#endif // GUI_TASKVIEW_TaskFemConstraintRigidBody_H diff --git a/src/Mod/Fem/Gui/TaskFemConstraintSpring.h b/src/Mod/Fem/Gui/TaskFemConstraintSpring.h index d9e399dc37..30cc24e123 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintSpring.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintSpring.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskFemConstraintSpring_H -#define GUI_TASKVIEW_TaskFemConstraintSpring_H +#pragma once #include #include @@ -74,5 +73,3 @@ public: }; } // namespace FemGui - -#endif // GUI_TASKVIEW_TaskFemConstraintSpring_H diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTemperature.h b/src/Mod/Fem/Gui/TaskFemConstraintTemperature.h index 06430cd576..151c8ed3f3 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintTemperature.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintTemperature.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskFemConstraintTemperature_H -#define GUI_TASKVIEW_TaskFemConstraintTemperature_H +#pragma once #include #include @@ -82,5 +81,3 @@ public: }; } // namespace FemGui - -#endif // GUI_TASKVIEW_TaskFemConstraintTemperature_H diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTransform.h b/src/Mod/Fem/Gui/TaskFemConstraintTransform.h index 125fc1080f..23ae15b9e1 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintTransform.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintTransform.h @@ -24,8 +24,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskFemConstraintTransform_H -#define GUI_TASKVIEW_TaskFemConstraintTransform_H +#pragma once #include #include @@ -83,5 +82,3 @@ public: }; } // namespace FemGui - -#endif // GUI_TASKVIEW_TaskFemConstraintTransform_H diff --git a/src/Mod/Fem/Gui/TaskObjectName.h b/src/Mod/Fem/Gui/TaskObjectName.h index 17b087dc54..2f3ff7bac6 100644 --- a/src/Mod/Fem/Gui/TaskObjectName.h +++ b/src/Mod/Fem/Gui/TaskObjectName.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskObjectName_H -#define GUI_TASKVIEW_TaskObjectName_H +#pragma once #include @@ -67,5 +66,3 @@ private: }; } // namespace FemGui - -#endif // GUI_TASKVIEW_TaskObjectName_H diff --git a/src/Mod/Fem/Gui/TaskPostBoxes.h b/src/Mod/Fem/Gui/TaskPostBoxes.h index ec84ed0f21..8b1d2aa881 100644 --- a/src/Mod/Fem/Gui/TaskPostBoxes.h +++ b/src/Mod/Fem/Gui/TaskPostBoxes.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskPostDisplay_H -#define GUI_TASKVIEW_TaskPostDisplay_H +#pragma once #include #include @@ -594,5 +593,3 @@ private: }; } // namespace FemGui - -#endif // GUI_TASKVIEW_TaskPostDisplay_H diff --git a/src/Mod/Fem/Gui/TaskPostExtraction.h b/src/Mod/Fem/Gui/TaskPostExtraction.h index 5fe2518760..f0773ded0f 100644 --- a/src/Mod/Fem/Gui/TaskPostExtraction.h +++ b/src/Mod/Fem/Gui/TaskPostExtraction.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskPostExtraction_H -#define GUI_TASKVIEW_TaskPostExtraction_H +#pragma once #include #include @@ -64,5 +63,3 @@ private: } // namespace FemGui - -#endif // GUI_TASKVIEW_TaskPostExtraction_H diff --git a/src/Mod/Fem/Gui/TaskTetParameter.h b/src/Mod/Fem/Gui/TaskTetParameter.h index 4f10781e1a..315eea5256 100644 --- a/src/Mod/Fem/Gui/TaskTetParameter.h +++ b/src/Mod/Fem/Gui/TaskTetParameter.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef FEMGUI_TaskTetParameter_H -#define FEMGUI_TaskTetParameter_H +#pragma once #include @@ -85,5 +84,3 @@ private: }; } // namespace FemGui - -#endif // FEMGUI_TaskTetParameter_H diff --git a/src/Mod/Fem/Gui/ViewProviderAnalysis.h b/src/Mod/Fem/Gui/ViewProviderAnalysis.h index 605e60648d..dc85fa76d2 100644 --- a/src/Mod/Fem/Gui/ViewProviderAnalysis.h +++ b/src/Mod/Fem/Gui/ViewProviderAnalysis.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef FEM_ViewProviderAnalysis_H -#define FEM_ViewProviderAnalysis_H +#pragma once #include #include @@ -120,6 +119,3 @@ private: using ViewProviderFemAnalysisPython = Gui::ViewProviderFeaturePythonT; } // namespace FemGui - - -#endif // FEM_ViewProviderAnalysis_H diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraint.h b/src/Mod/Fem/Gui/ViewProviderFemConstraint.h index 012e5e599a..3b9b52ba9a 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraint.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraint.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_VIEWPROVIDERFEMCONSTRAINT_H -#define GUI_VIEWPROVIDERFEMCONSTRAINT_H +#pragma once #include #include @@ -140,6 +139,3 @@ using ViewProviderFemConstraintPython = Gui::ViewProviderFeaturePythonT #include @@ -196,6 +195,3 @@ using ViewProviderFemMeshPython = Gui::ViewProviderFeaturePythonT @@ -61,6 +60,3 @@ using ViewProviderFemMeshShapeBasePython = Gui::ViewProviderFeaturePythonT; } // namespace FemGui - - -#endif // FEM_ViewProviderFemMeshShape_H diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.h b/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.h index b41ce2dc67..cd022b3a3c 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.h +++ b/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef FEM_ViewProviderFemMeshShapeNetgen_H -#define FEM_ViewProviderFemMeshShapeNetgen_H +#pragma once #include "ViewProviderFemMeshShape.h" @@ -47,6 +46,3 @@ protected: }; } // namespace FemGui - - -#endif // FEM_ViewProviderFemMeshShapeNetgen_H diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostBranchFilter.h b/src/Mod/Fem/Gui/ViewProviderFemPostBranchFilter.h index e54f51c252..1b9e88260a 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostBranchFilter.h +++ b/src/Mod/Fem/Gui/ViewProviderFemPostBranchFilter.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef FEM_VIEWPROVIDERFEMPOSTBRANCHFILTER_H -#define FEM_VIEWPROVIDERFEMPOSTBRANCHFILTER_H +#pragma once #include "ViewProviderFemPostObject.h" #include @@ -60,6 +59,3 @@ protected: }; } // namespace FemGui - - -#endif // FEM_VIEWPROVIDERFEMPOSTBRANCHFILTER_H diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFilter.h b/src/Mod/Fem/Gui/ViewProviderFemPostFilter.h index 948089d961..a4e3355e3c 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostFilter.h +++ b/src/Mod/Fem/Gui/ViewProviderFemPostFilter.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef FEM_VIEWPROVIDERFEMPOSTFILTER_H -#define FEM_VIEWPROVIDERFEMPOSTFILTER_H +#pragma once #include #include "ViewProviderFemPostObject.h" @@ -198,6 +197,3 @@ protected: }; } // namespace FemGui - - -#endif // FEM_VIEWPROVIDERFEMPOSTFILTER_H diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h index c9e6ce015d..0454499c55 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h +++ b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef FEM_VIEWPROVIDERFEMPOSTFUNCTION_H -#define FEM_VIEWPROVIDERFEMPOSTFUNCTION_H +#pragma once #include #include @@ -355,6 +354,3 @@ SoGroup* postSphere(); } // namespace ShapeNodes } // namespace FemGui - - -#endif // FEM_VIEWPROVIDERFEMPOSTFUNCTION_H diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostObject.h b/src/Mod/Fem/Gui/ViewProviderFemPostObject.h index 1d6340d93d..28afc030d4 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostObject.h +++ b/src/Mod/Fem/Gui/ViewProviderFemPostObject.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef FEM_VIEWPROVIDERFEMPOSTOBJECT_H -#define FEM_VIEWPROVIDERFEMPOSTOBJECT_H +#pragma once #include #include @@ -171,6 +170,3 @@ private: }; } // namespace FemGui - - -#endif // FEM_VIEWPROVIDERFEMPOSTOBJECT_H diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h b/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h index d55fb6184d..a7f327e752 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h +++ b/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef FEM_VIEWPROVIDERFEMPOSTPIPELINE_H -#define FEM_VIEWPROVIDERFEMPOSTPIPELINE_H +#pragma once #include #include @@ -67,6 +66,3 @@ protected: }; } // namespace FemGui - - -#endif // FEM_VIEWPROVIDERFEMPOSTPIPELINE_H diff --git a/src/Mod/Fem/Gui/ViewProviderResult.h b/src/Mod/Fem/Gui/ViewProviderResult.h index b6e68f159c..eee9c39059 100644 --- a/src/Mod/Fem/Gui/ViewProviderResult.h +++ b/src/Mod/Fem/Gui/ViewProviderResult.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef FEM_ViewProviderResult_H -#define FEM_ViewProviderResult_H +#pragma once #include #include @@ -52,6 +51,3 @@ public: using ViewProviderResultPython = Gui::ViewProviderFeaturePythonT; } // namespace FemGui - - -#endif // FEM_ViewProviderResult_H diff --git a/src/Mod/Fem/Gui/ViewProviderSetElementNodes.h b/src/Mod/Fem/Gui/ViewProviderSetElementNodes.h index 46a173fde9..2ddeaac535 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetElementNodes.h +++ b/src/Mod/Fem/Gui/ViewProviderSetElementNodes.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef FEM_ViewProviderSetElementNodes_H -#define FEM_ViewProviderSetElementNodes_H +#pragma once #include @@ -43,6 +42,3 @@ protected: }; } // namespace FemGui - - -#endif // FEM_ViewProviderSetElementNodes_H diff --git a/src/Mod/Fem/Gui/ViewProviderSetElements.h b/src/Mod/Fem/Gui/ViewProviderSetElements.h index 98a95bf70c..bcaeb637f3 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetElements.h +++ b/src/Mod/Fem/Gui/ViewProviderSetElements.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef FEM_ViewProviderSetElements_H -#define FEM_ViewProviderSetElements_H +#pragma once #include @@ -42,6 +41,3 @@ protected: }; } // namespace FemGui - - -#endif // FEM_ViewProviderSetElements_H diff --git a/src/Mod/Fem/Gui/ViewProviderSetFaces.h b/src/Mod/Fem/Gui/ViewProviderSetFaces.h index 4987020563..0dc97c4706 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetFaces.h +++ b/src/Mod/Fem/Gui/ViewProviderSetFaces.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef FEM_ViewProviderSetFaces_H -#define FEM_ViewProviderSetFaces_H +#pragma once #include @@ -42,6 +41,3 @@ protected: }; } // namespace FemGui - - -#endif // FEM_ViewProviderSetFaces_H diff --git a/src/Mod/Fem/Gui/ViewProviderSetGeometry.h b/src/Mod/Fem/Gui/ViewProviderSetGeometry.h index 8788448be9..a10afb1a55 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetGeometry.h +++ b/src/Mod/Fem/Gui/ViewProviderSetGeometry.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef FEM_ViewProviderSetGeometry_H -#define FEM_ViewProviderSetGeometry_H +#pragma once #include @@ -42,6 +41,3 @@ protected: }; } // namespace FemGui - - -#endif // FEM_ViewProviderSetGeometry_H diff --git a/src/Mod/Fem/Gui/ViewProviderSetNodes.h b/src/Mod/Fem/Gui/ViewProviderSetNodes.h index 7ac667b073..63e17fff1d 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetNodes.h +++ b/src/Mod/Fem/Gui/ViewProviderSetNodes.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef FEM_ViewProviderSetNodes_H -#define FEM_ViewProviderSetNodes_H +#pragma once #include @@ -42,6 +41,3 @@ protected: }; } // namespace FemGui - - -#endif // FEM_ViewProviderSetNodes_H diff --git a/src/Mod/Fem/Gui/ViewProviderSolver.h b/src/Mod/Fem/Gui/ViewProviderSolver.h index 0027bb2c93..83adc7ec26 100644 --- a/src/Mod/Fem/Gui/ViewProviderSolver.h +++ b/src/Mod/Fem/Gui/ViewProviderSolver.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef FEM_ViewProviderSolver_H -#define FEM_ViewProviderSolver_H +#pragma once #include #include @@ -64,6 +63,3 @@ public: using ViewProviderSolverPython = Gui::ViewProviderFeaturePythonT; } // namespace FemGui - - -#endif // FEM_ViewProviderSolver_H diff --git a/src/Mod/Fem/Gui/Workbench.h b/src/Mod/Fem/Gui/Workbench.h index 558c0dd12f..183baa9e5c 100644 --- a/src/Mod/Fem/Gui/Workbench.h +++ b/src/Mod/Fem/Gui/Workbench.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef FEM_WORKBENCH_H -#define FEM_WORKBENCH_H +#pragma once #include #include @@ -48,6 +47,3 @@ protected: }; } // namespace FemGui - - -#endif // FEM_WORKBENCH_H diff --git a/src/Mod/Import/App/ExportOCAF.h b/src/Mod/Import/App/ExportOCAF.h index 5afa69f1b8..451e0c6b03 100644 --- a/src/Mod/Import/App/ExportOCAF.h +++ b/src/Mod/Import/App/ExportOCAF.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef IMPORT_EXPORTOCAF_H -#define IMPORT_EXPORTOCAF_H +#pragma once #include #include @@ -137,5 +136,3 @@ private: } // namespace Import - -#endif // IMPORT_EXPORTOCAF_H diff --git a/src/Mod/Import/App/ExportOCAF2.h b/src/Mod/Import/App/ExportOCAF2.h index 4f9861580d..356ad50280 100644 --- a/src/Mod/Import/App/ExportOCAF2.h +++ b/src/Mod/Import/App/ExportOCAF2.h @@ -22,8 +22,7 @@ * * ****************************************************************************/ -#ifndef IMPORT_EXPORTOCAF2_H -#define IMPORT_EXPORTOCAF2_H +#pragma once #include #include @@ -118,5 +117,3 @@ private: }; } // namespace Import - -#endif // IMPORT_EXPORTOCAF2_H diff --git a/src/Mod/Import/App/ImportOCAF.h b/src/Mod/Import/App/ImportOCAF.h index 548b54497e..3dbdc15e8e 100644 --- a/src/Mod/Import/App/ImportOCAF.h +++ b/src/Mod/Import/App/ImportOCAF.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef IMPORT_IMPORTOCAF_H -#define IMPORT_IMPORTOCAF_H +#pragma once #include #include @@ -147,5 +146,3 @@ private: }; } // namespace Import - -#endif // IMPORT_IMPORTOCAF_H diff --git a/src/Mod/Import/App/ImportOCAF2.h b/src/Mod/Import/App/ImportOCAF2.h index a67d10744b..80572bbec6 100644 --- a/src/Mod/Import/App/ImportOCAF2.h +++ b/src/Mod/Import/App/ImportOCAF2.h @@ -22,8 +22,7 @@ * * ****************************************************************************/ -#ifndef IMPORT_IMPORTOCAF2_H -#define IMPORT_IMPORTOCAF2_H +#pragma once #include #include @@ -297,5 +296,3 @@ private: }; } // namespace Import - -#endif // IMPORT_IMPORTOCAF2_H diff --git a/src/Mod/Import/App/ImportOCAFAssembly.h b/src/Mod/Import/App/ImportOCAFAssembly.h index 0a04fa7210..9f551da207 100644 --- a/src/Mod/Import/App/ImportOCAFAssembly.h +++ b/src/Mod/Import/App/ImportOCAFAssembly.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef IMPORT_ImportOCAFAssembly_H -#define IMPORT_ImportOCAFAssembly_H +#pragma once #include #include @@ -95,5 +94,3 @@ private: } // namespace Import - -#endif // IMPORT_ImportOCAFAssembly_H diff --git a/src/Mod/Import/App/PreCompiled.h b/src/Mod/Import/App/PreCompiled.h index f9a9f76261..72907ad4d9 100644 --- a/src/Mod/Import/App/PreCompiled.h +++ b/src/Mod/Import/App/PreCompiled.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef IMPORT_APP_PRECOMPILED_H -#define IMPORT_APP_PRECOMPILED_H +#pragma once #include @@ -44,5 +43,3 @@ // OpenCasCade ===================================================================================== // Base #include - -#endif diff --git a/src/Mod/Import/App/ReaderGltf.h b/src/Mod/Import/App/ReaderGltf.h index 55fb246922..429c46b509 100644 --- a/src/Mod/Import/App/ReaderGltf.h +++ b/src/Mod/Import/App/ReaderGltf.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef IMPORT_READER_GLTF_H -#define IMPORT_READER_GLTF_H +#pragma once #include #include @@ -53,5 +52,3 @@ private: }; } // namespace Import - -#endif // IMPORT_READER_GLTF_H diff --git a/src/Mod/Import/App/ReaderIges.h b/src/Mod/Import/App/ReaderIges.h index 7e6cddf37b..cf73d52627 100644 --- a/src/Mod/Import/App/ReaderIges.h +++ b/src/Mod/Import/App/ReaderIges.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef IMPORT_READER_IGES_H -#define IMPORT_READER_IGES_H +#pragma once #include #include @@ -43,5 +42,3 @@ private: }; } // namespace Import - -#endif // IMPORT_READER_IGES_H diff --git a/src/Mod/Import/App/ReaderStep.h b/src/Mod/Import/App/ReaderStep.h index 05d97f017f..c57c6cc26b 100644 --- a/src/Mod/Import/App/ReaderStep.h +++ b/src/Mod/Import/App/ReaderStep.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef IMPORT_READER_STEP_H -#define IMPORT_READER_STEP_H +#pragma once #include #include @@ -50,5 +49,3 @@ private: }; } // namespace Import - -#endif // IMPORT_READER_STEP_H diff --git a/src/Mod/Import/App/StepShape.h b/src/Mod/Import/App/StepShape.h index ee1e4e5fdb..4f707cc099 100644 --- a/src/Mod/Import/App/StepShape.h +++ b/src/Mod/Import/App/StepShape.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef IMPORT_STEPSHAPE_H -#define IMPORT_STEPSHAPE_H +#pragma once #include @@ -46,6 +45,3 @@ public: }; } // namespace Import - - -#endif // IMPORT_STEPSHAPE_H diff --git a/src/Mod/Import/App/Tools.h b/src/Mod/Import/App/Tools.h index 821787d4fc..37d6b008c3 100644 --- a/src/Mod/Import/App/Tools.h +++ b/src/Mod/Import/App/Tools.h @@ -22,8 +22,7 @@ * * ****************************************************************************/ -#ifndef IMPORT_TOOLS_H -#define IMPORT_TOOLS_H +#pragma once #include @@ -83,5 +82,3 @@ struct Tools }; } // namespace Import - -#endif // IMPORT_IMPORTOCAF2_H diff --git a/src/Mod/Import/App/WriterGltf.h b/src/Mod/Import/App/WriterGltf.h index d7ebcf89ea..be23fde482 100644 --- a/src/Mod/Import/App/WriterGltf.h +++ b/src/Mod/Import/App/WriterGltf.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef IMPORT_WRITER_GLTF_H -#define IMPORT_WRITER_GLTF_H +#pragma once #include #include @@ -42,5 +41,3 @@ private: Base::FileInfo file; }; } // namespace Import - -#endif // IMPORT_WRITER_GLTF_H diff --git a/src/Mod/Import/App/WriterIges.h b/src/Mod/Import/App/WriterIges.h index 4b485eafee..984d2978b5 100644 --- a/src/Mod/Import/App/WriterIges.h +++ b/src/Mod/Import/App/WriterIges.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef IMPORT_WRITER_IGES_H -#define IMPORT_WRITER_IGES_H +#pragma once #include #include @@ -42,5 +41,3 @@ private: Base::FileInfo file; }; } // namespace Import - -#endif // IMPORT_WRITER_IGES_H diff --git a/src/Mod/Import/App/WriterStep.h b/src/Mod/Import/App/WriterStep.h index 1e7c32d258..8e87054b05 100644 --- a/src/Mod/Import/App/WriterStep.h +++ b/src/Mod/Import/App/WriterStep.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef IMPORT_WRITER_STEP_H -#define IMPORT_WRITER_STEP_H +#pragma once #include #include @@ -42,5 +41,3 @@ private: Base::FileInfo file; }; } // namespace Import - -#endif // IMPORT_WRITER_GLTF_H diff --git a/src/Mod/Import/App/dxf/ImpExpDxf.h b/src/Mod/Import/App/dxf/ImpExpDxf.h index 2f67de578d..92e7590ff2 100644 --- a/src/Mod/Import/App/dxf/ImpExpDxf.h +++ b/src/Mod/Import/App/dxf/ImpExpDxf.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef IMPEXPDXF_H -#define IMPEXPDXF_H +#pragma once #include #include @@ -583,5 +582,3 @@ protected: }; } // namespace Import - -#endif // IMPEXPDXFGUI_H diff --git a/src/Mod/Import/App/dxf/dxf.h b/src/Mod/Import/App/dxf/dxf.h index 9f3913ffd3..89a30f1c76 100644 --- a/src/Mod/Import/App/dxf/dxf.h +++ b/src/Mod/Import/App/dxf/dxf.h @@ -5,8 +5,7 @@ // This program is released under the BSD license. See the file COPYING for details. // modified 2018 wandererfan -#ifndef Included_dxf_h_ -#define Included_dxf_h_ +#pragma once #ifdef _MSC_VER # pragma warning(disable : 4251) @@ -1012,4 +1011,3 @@ protected: } #endif }; -#endif diff --git a/src/Mod/Import/Gui/ExportOCAFGui.h b/src/Mod/Import/Gui/ExportOCAFGui.h index 70585b2497..1c59b59e47 100644 --- a/src/Mod/Import/Gui/ExportOCAFGui.h +++ b/src/Mod/Import/Gui/ExportOCAFGui.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef IMPORT_EXPORTOCAFGUI_H -#define IMPORT_EXPORTOCAFGUI_H +#pragma once #include @@ -37,5 +36,3 @@ public: }; } // namespace ImportGui - -#endif // IMPORT_EXPORTOCAFGUI_H diff --git a/src/Mod/Import/Gui/ImportOCAFGui.h b/src/Mod/Import/Gui/ImportOCAFGui.h index a606b00061..cf866b7eb1 100644 --- a/src/Mod/Import/Gui/ImportOCAFGui.h +++ b/src/Mod/Import/Gui/ImportOCAFGui.h @@ -22,8 +22,7 @@ * * **************************************************************************/ -#ifndef IMPORT_IMPORTOCAFGUI_H -#define IMPORT_IMPORTOCAFGUI_H +#pragma once #include @@ -46,5 +45,3 @@ private: }; } // namespace ImportGui - -#endif // IMPORT_IMPORTOCAFGUI_H diff --git a/src/Mod/Import/Gui/OCAFBrowser.h b/src/Mod/Import/Gui/OCAFBrowser.h index c6b498a1b9..4fa0787fb8 100644 --- a/src/Mod/Import/Gui/OCAFBrowser.h +++ b/src/Mod/Import/Gui/OCAFBrowser.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef IMPORT_OCAFBROWSER_H -#define IMPORT_OCAFBROWSER_H +#pragma once #include #include @@ -59,5 +58,3 @@ private: }; } // namespace ImportGui - -#endif // IMPORT_OCAFBROWSER_H diff --git a/src/Mod/Import/Gui/PreCompiled.h b/src/Mod/Import/Gui/PreCompiled.h index 9bac7510fb..5d5eb19744 100644 --- a/src/Mod/Import/Gui/PreCompiled.h +++ b/src/Mod/Import/Gui/PreCompiled.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef IMPORT_GUI_PRECOMPILED_H -#define IMPORT_GUI_PRECOMPILED_H +#pragma once #include @@ -75,5 +74,3 @@ // Qt Toolkit #include - -#endif // __PRECOMPILED_GUI__ diff --git a/src/Mod/Import/Gui/Workbench.h b/src/Mod/Import/Gui/Workbench.h index bbfc310085..c851a9d621 100644 --- a/src/Mod/Import/Gui/Workbench.h +++ b/src/Mod/Import/Gui/Workbench.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef IMPORT_WORKBENCH_H -#define IMPORT_WORKBENCH_H +#pragma once #include @@ -48,6 +47,3 @@ protected: }; } // namespace ImportGui - - -#endif // IMPORT_WORKBENCH_H diff --git a/src/Mod/Import/Gui/dxf/ImpExpDxfGui.h b/src/Mod/Import/Gui/dxf/ImpExpDxfGui.h index 8fecc20daa..12226188d3 100644 --- a/src/Mod/Import/Gui/dxf/ImpExpDxfGui.h +++ b/src/Mod/Import/Gui/dxf/ImpExpDxfGui.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef IMPEXPDXFGUI_H -#define IMPEXPDXFGUI_H +#pragma once #include @@ -51,5 +50,3 @@ private: int GetDrawStyle() const; }; } // namespace ImportGui - -#endif // IMPEXPDXFGUI_H diff --git a/src/Mod/Import/ImportGlobal.h b/src/Mod/Import/ImportGlobal.h index 1a628faedf..fcec8ec211 100644 --- a/src/Mod/Import/ImportGlobal.h +++ b/src/Mod/Import/ImportGlobal.h @@ -24,26 +24,23 @@ #include -#ifndef IMPORT_GLOBAL_H -# define IMPORT_GLOBAL_H +#pragma once // Import -# ifndef ImportExport -# ifdef Import_EXPORTS -# define ImportExport FREECAD_DECL_EXPORT -# else -# define ImportExport FREECAD_DECL_IMPORT -# endif +#ifndef ImportExport +# ifdef Import_EXPORTS +# define ImportExport FREECAD_DECL_EXPORT +# else +# define ImportExport FREECAD_DECL_IMPORT # endif +#endif // ImportGui -# ifndef ImportGuiExport -# ifdef ImportGui_EXPORTS -# define ImportGuiExport FREECAD_DECL_EXPORT -# else -# define ImportGuiExport FREECAD_DECL_IMPORT -# endif +#ifndef ImportGuiExport +# ifdef ImportGui_EXPORTS +# define ImportGuiExport FREECAD_DECL_EXPORT +# else +# define ImportGuiExport FREECAD_DECL_IMPORT # endif - -#endif // IMPORT_GLOBAL_H +#endif diff --git a/src/Mod/Inspection/App/InspectionFeature.h b/src/Mod/Inspection/App/InspectionFeature.h index 7b41d9dda4..ff043c325a 100644 --- a/src/Mod/Inspection/App/InspectionFeature.h +++ b/src/Mod/Inspection/App/InspectionFeature.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef INSPECTION_FEATURE_H -#define INSPECTION_FEATURE_H +#pragma once #include #include @@ -290,6 +289,3 @@ public: }; } // namespace Inspection - - -#endif // INSPECTION_FEATURE_H diff --git a/src/Mod/Inspection/App/PreCompiled.h b/src/Mod/Inspection/App/PreCompiled.h index 33afd69fe1..cbccc39cfb 100644 --- a/src/Mod/Inspection/App/PreCompiled.h +++ b/src/Mod/Inspection/App/PreCompiled.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef INSPECTION_APP_PRECOMPILED_H -#define INSPECTION_APP_PRECOMPILED_H +#pragma once #include @@ -47,5 +46,3 @@ #include #include #include - -#endif diff --git a/src/Mod/Inspection/Gui/PreCompiled.h b/src/Mod/Inspection/Gui/PreCompiled.h index 8903c7ce62..224f3e5531 100644 --- a/src/Mod/Inspection/Gui/PreCompiled.h +++ b/src/Mod/Inspection/Gui/PreCompiled.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef INSPECTION_GUI_PRECOMPILED_H -#define INSPECTION_GUI_PRECOMPILED_H +#pragma once #include @@ -53,5 +52,3 @@ #include #include #include - -#endif // GUI_PRECOMPILED_H diff --git a/src/Mod/Inspection/Gui/ViewProviderInspection.h b/src/Mod/Inspection/Gui/ViewProviderInspection.h index 01ca6f4123..071950697d 100644 --- a/src/Mod/Inspection/Gui/ViewProviderInspection.h +++ b/src/Mod/Inspection/Gui/ViewProviderInspection.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef INSPECTIOGUI_VIEWPROVIDERINSPECTION_H -#define INSPECTIOGUI_VIEWPROVIDERINSPECTION_H +#pragma once #include @@ -129,6 +128,3 @@ public: }; } // namespace InspectionGui - - -#endif // INSPECTIOGUI_VIEWPROVIDERINSPECTION_H diff --git a/src/Mod/Inspection/Gui/VisualInspection.h b/src/Mod/Inspection/Gui/VisualInspection.h index 3f07b42087..378183ef81 100644 --- a/src/Mod/Inspection/Gui/VisualInspection.h +++ b/src/Mod/Inspection/Gui/VisualInspection.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef INSPECTIONGUI_VISUALINSPECTION_H -#define INSPECTIONGUI_VISUALINSPECTION_H +#pragma once #include @@ -55,5 +54,3 @@ private: }; } // namespace InspectionGui - -#endif // INSPECTIONGUI_VISUALINSPECTION_H diff --git a/src/Mod/Inspection/Gui/Workbench.h b/src/Mod/Inspection/Gui/Workbench.h index e28ad89388..a18dbedb53 100644 --- a/src/Mod/Inspection/Gui/Workbench.h +++ b/src/Mod/Inspection/Gui/Workbench.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef Inspection_WORKBENCH_H -#define Inspection_WORKBENCH_H +#pragma once #include @@ -45,6 +44,3 @@ protected: }; } // namespace InspectionGui - - -#endif // Inspection_WORKBENCH_H diff --git a/src/Mod/Inspection/InspectionGlobal.h b/src/Mod/Inspection/InspectionGlobal.h index 20f4e29ca5..2426a7f02e 100644 --- a/src/Mod/Inspection/InspectionGlobal.h +++ b/src/Mod/Inspection/InspectionGlobal.h @@ -24,26 +24,23 @@ #include -#ifndef INSPECTION_GLOBAL_H -# define INSPECTION_GLOBAL_H +#pragma once // Inspection -# ifndef InspectionExport -# ifdef Inspection_EXPORTS -# define InspectionExport FREECAD_DECL_EXPORT -# else -# define InspectionExport FREECAD_DECL_IMPORT -# endif +#ifndef InspectionExport +# ifdef Inspection_EXPORTS +# define InspectionExport FREECAD_DECL_EXPORT +# else +# define InspectionExport FREECAD_DECL_IMPORT # endif +#endif // InspectionGui -# ifndef InspectionGuiExport -# ifdef InspectionGui_EXPORTS -# define InspectionGuiExport FREECAD_DECL_EXPORT -# else -# define InspectionGuiExport FREECAD_DECL_IMPORT -# endif +#ifndef InspectionGuiExport +# ifdef InspectionGui_EXPORTS +# define InspectionGuiExport FREECAD_DECL_EXPORT +# else +# define InspectionGuiExport FREECAD_DECL_IMPORT # endif - -#endif // INSPECTION_GLOBAL_H +#endif diff --git a/src/Mod/JtReader/App/FcLodHandler.h b/src/Mod/JtReader/App/FcLodHandler.h index 1299ad3a87..6d935b0208 100644 --- a/src/Mod/JtReader/App/FcLodHandler.h +++ b/src/Mod/JtReader/App/FcLodHandler.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef FcLodHandler_HEADER -#define FcLodHandler_HEADER +#pragma once #include "JrJt/LodHandler.h" @@ -32,6 +31,3 @@ class FcLodHandler: public LodHandler public: virtual void startLod(); }; - - -#endif diff --git a/src/Mod/JtReader/App/JrJt/Context.h b/src/Mod/JtReader/App/JrJt/Context.h index 80c4a629a7..f6c8fb03d4 100644 --- a/src/Mod/JtReader/App/JrJt/Context.h +++ b/src/Mod/JtReader/App/JrJt/Context.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef Context_HEADER -#define Context_HEADER +#pragma once #include #include @@ -40,6 +39,3 @@ public: istream& Strm; }; - - -#endif diff --git a/src/Mod/JtReader/App/JrJt/Element_Header.h b/src/Mod/JtReader/App/JrJt/Element_Header.h index 2af0cc1648..9e85092672 100644 --- a/src/Mod/JtReader/App/JrJt/Element_Header.h +++ b/src/Mod/JtReader/App/JrJt/Element_Header.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef Element_Header_HEADER -#define Element_Header_HEADER +#pragma once #include #include @@ -61,6 +60,3 @@ struct Element_Header GUID Object_Type_ID; UChar Object_Base_Type; }; - - -#endif diff --git a/src/Mod/JtReader/App/JrJt/GUID.h b/src/Mod/JtReader/App/JrJt/GUID.h index 419f2b753a..7ced4df91d 100644 --- a/src/Mod/JtReader/App/JrJt/GUID.h +++ b/src/Mod/JtReader/App/JrJt/GUID.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUID_HEADER -#define GUID_HEADER +#pragma once #include #include @@ -124,6 +123,3 @@ struct GUID U8 _C7; U8 _C8; }; - - -#endif diff --git a/src/Mod/JtReader/App/JrJt/I32.h b/src/Mod/JtReader/App/JrJt/I32.h index e91c52028c..2189fa5110 100644 --- a/src/Mod/JtReader/App/JrJt/I32.h +++ b/src/Mod/JtReader/App/JrJt/I32.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef I32_HEADER -#define I32_HEADER +#pragma once #include "Context.h" #include @@ -52,6 +51,3 @@ struct I32 int32_t _I32; }; - - -#endif diff --git a/src/Mod/JtReader/App/JrJt/LodHandler.h b/src/Mod/JtReader/App/JrJt/LodHandler.h index ceeb83a303..6201d4c9d5 100644 --- a/src/Mod/JtReader/App/JrJt/LodHandler.h +++ b/src/Mod/JtReader/App/JrJt/LodHandler.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef LodHandler_HEADER -#define LodHandler_HEADER +#pragma once class LodHandler @@ -31,6 +30,3 @@ class LodHandler public: virtual void startLod() {}; }; - - -#endif diff --git a/src/Mod/JtReader/App/JrJt/Segment_Header.h b/src/Mod/JtReader/App/JrJt/Segment_Header.h index 1bf392f043..6c312b9e9c 100644 --- a/src/Mod/JtReader/App/JrJt/Segment_Header.h +++ b/src/Mod/JtReader/App/JrJt/Segment_Header.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef Segment_Header_HEADER -#define Segment_Header_HEADER +#pragma once #include #include @@ -58,6 +57,3 @@ struct Segment_Header I32 Segment_Type; I32 Segment_Length; }; - - -#endif diff --git a/src/Mod/JtReader/App/JrJt/TOC_Entry.h b/src/Mod/JtReader/App/JrJt/TOC_Entry.h index cec96db4c9..934f8c42d4 100644 --- a/src/Mod/JtReader/App/JrJt/TOC_Entry.h +++ b/src/Mod/JtReader/App/JrJt/TOC_Entry.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef TOC_Entry_HEADER -#define TOC_Entry_HEADER +#pragma once #include #include @@ -74,6 +73,3 @@ struct TOC_Entry I32 Segment_Length; U32 Segment_Attributes; }; - - -#endif diff --git a/src/Mod/JtReader/App/JrJt/U16.h b/src/Mod/JtReader/App/JrJt/U16.h index 2b315c5277..3710fc62e9 100644 --- a/src/Mod/JtReader/App/JrJt/U16.h +++ b/src/Mod/JtReader/App/JrJt/U16.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef U16_HEADER -#define U16_HEADER +#pragma once #include "Context.h" #include @@ -56,6 +55,3 @@ struct U16 uint16_t _U16; }; - - -#endif diff --git a/src/Mod/JtReader/App/JrJt/U32.h b/src/Mod/JtReader/App/JrJt/U32.h index a26f871ece..99062c80a1 100644 --- a/src/Mod/JtReader/App/JrJt/U32.h +++ b/src/Mod/JtReader/App/JrJt/U32.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef U32_HEADER -#define U32_HEADER +#pragma once #include "Context.h" #include @@ -56,6 +55,3 @@ struct U32 uint32_t _U32; }; - - -#endif diff --git a/src/Mod/JtReader/App/JrJt/U8.h b/src/Mod/JtReader/App/JrJt/U8.h index d227adaf4a..5b3cf7671e 100644 --- a/src/Mod/JtReader/App/JrJt/U8.h +++ b/src/Mod/JtReader/App/JrJt/U8.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef U8_HEADER -#define U8_HEADER +#pragma once #include "Context.h" #include @@ -57,6 +56,3 @@ struct U8 uint8_t _U8; }; - - -#endif diff --git a/src/Mod/JtReader/App/JrJt/UChar.h b/src/Mod/JtReader/App/JrJt/UChar.h index 4272559958..e221bf4381 100644 --- a/src/Mod/JtReader/App/JrJt/UChar.h +++ b/src/Mod/JtReader/App/JrJt/UChar.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef UChar_HEADER -#define UChar_HEADER +#pragma once #include "Context.h" #include @@ -52,6 +51,3 @@ struct UChar uint8_t _UChar; }; - - -#endif diff --git a/src/Mod/JtReader/App/JtReader.h b/src/Mod/JtReader/App/JtReader.h index 1253c23ade..034d122785 100644 --- a/src/Mod/JtReader/App/JtReader.h +++ b/src/Mod/JtReader/App/JtReader.h @@ -6,8 +6,7 @@ ***************************************************************************/ -#ifndef __JtReader_h__ -#define __JtReader_h__ +#pragma once /** simple facet structure */ @@ -35,5 +34,3 @@ unsigned int iterSize(void); /** clears the internal structure */ void clearData(void); - -#endif // __JtReader_h__ diff --git a/src/Mod/JtReader/App/PreCompiled.h b/src/Mod/JtReader/App/PreCompiled.h index 254bf0e7a4..ade04882a0 100644 --- a/src/Mod/JtReader/App/PreCompiled.h +++ b/src/Mod/JtReader/App/PreCompiled.h @@ -5,8 +5,7 @@ * LGPL * ***************************************************************************/ -#ifndef JTREADER_APP_PRECOMPILED_H -#define JTREADER_APP_PRECOMPILED_H +#pragma once #include @@ -30,5 +29,3 @@ // sys #include - -#endif diff --git a/src/Mod/JtReader/App/TKJtReader.h b/src/Mod/JtReader/App/TKJtReader.h index d26909cc0e..9f491cf92f 100644 --- a/src/Mod/JtReader/App/TKJtReader.h +++ b/src/Mod/JtReader/App/TKJtReader.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef JT_READER_TKJTREADER_H -#define JT_READER_TKJTREADER_H +#pragma once #ifdef JTREADER_HAVE_TKJT # include @@ -72,5 +71,3 @@ private: }; // namespace JtReaderNS #endif // JTREADER_HAVE_TKJT - -#endif // JT_READER_TKJTREADER_H diff --git a/src/Mod/Material/App/Exceptions.h b/src/Mod/Material/App/Exceptions.h index 2bb57357e6..f7e07a029b 100644 --- a/src/Mod/Material/App/Exceptions.h +++ b/src/Mod/Material/App/Exceptions.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATERIAL_EXCEPTIONS_H -#define MATERIAL_EXCEPTIONS_H +#pragma once #include @@ -221,6 +220,4 @@ public: ~ConnectionError() noexcept override; }; -} // namespace Materials - -#endif // MATERIAL_EXCEPTIONS_H +} // namespace Materials \ No newline at end of file diff --git a/src/Mod/Material/App/ExternalManager.h b/src/Mod/Material/App/ExternalManager.h index b7a03c8451..dc21481be2 100644 --- a/src/Mod/Material/App/ExternalManager.h +++ b/src/Mod/Material/App/ExternalManager.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATERIAL_EXTERNALMANAGER_H -#define MATERIAL_EXTERNALMANAGER_H +#pragma once #include #include @@ -137,6 +136,4 @@ private: Py::Object _managerObject; }; -} // namespace Materials - -#endif // MATERIAL_EXTERNALMANAGER_H \ No newline at end of file +} // namespace Materials \ No newline at end of file diff --git a/src/Mod/Material/App/FolderTree.h b/src/Mod/Material/App/FolderTree.h index 83928bb109..5c49ae971d 100644 --- a/src/Mod/Material/App/FolderTree.h +++ b/src/Mod/Material/App/FolderTree.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATERIAL_FOLDERTREE_H -#define MATERIAL_FOLDERTREE_H +#pragma once #include #include @@ -122,6 +121,4 @@ private: bool _readOnly; }; -} // namespace Materials - -#endif // MATERIAL_FOLDERTREE_H +} // namespace Materials \ No newline at end of file diff --git a/src/Mod/Material/App/Library.h b/src/Mod/Material/App/Library.h index 7cf49f87c2..6312b53e1b 100644 --- a/src/Mod/Material/App/Library.h +++ b/src/Mod/Material/App/Library.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATERIAL_LIBRARY_H -#define MATERIAL_LIBRARY_H +#pragma once #include #include @@ -187,6 +186,4 @@ private: QString _name; }; -} // namespace Materials - -#endif // MATERIAL_LIBRARY_H +} // namespace Materials \ No newline at end of file diff --git a/src/Mod/Material/App/MaterialConfigLoader.h b/src/Mod/Material/App/MaterialConfigLoader.h index cdbfea7471..5be496de92 100644 --- a/src/Mod/Material/App/MaterialConfigLoader.h +++ b/src/Mod/Material/App/MaterialConfigLoader.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATERIAL_MATERIALCONFIGLOADER_H -#define MATERIAL_MATERIALCONFIGLOADER_H +#pragma once #include @@ -163,6 +162,4 @@ private: const std::shared_ptr& finalModel); }; -} // namespace Materials - -#endif // MATERIAL_MATERIALCONFIGLOADER_H +} // namespace Materials \ No newline at end of file diff --git a/src/Mod/Material/App/MaterialFilter.h b/src/Mod/Material/App/MaterialFilter.h index 90535fac81..69b3b04c5b 100644 --- a/src/Mod/Material/App/MaterialFilter.h +++ b/src/Mod/Material/App/MaterialFilter.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATERIAL_MATERIALFILTER_H -#define MATERIAL_MATERIALFILTER_H +#pragma once #include @@ -207,6 +206,4 @@ private: } // namespace Materials -Q_DECLARE_METATYPE(Materials::MaterialFilter) - -#endif // MATERIAL_MATERIALFILTER_H +Q_DECLARE_METATYPE(Materials::MaterialFilter) \ No newline at end of file diff --git a/src/Mod/Material/App/MaterialLibrary.h b/src/Mod/Material/App/MaterialLibrary.h index 3ea7df00cc..5fc7e1dd35 100644 --- a/src/Mod/Material/App/MaterialLibrary.h +++ b/src/Mod/Material/App/MaterialLibrary.h @@ -19,8 +19,7 @@ * * **************************************************************************/ -#ifndef MATERIAL_MATERIALLIBRARY_H -#define MATERIAL_MATERIALLIBRARY_H +#pragma once #include @@ -129,6 +128,4 @@ protected: } // namespace Materials Q_DECLARE_METATYPE(std::shared_ptr) -Q_DECLARE_METATYPE(std::shared_ptr) - -#endif // MATERIAL_MATERIALLIBRARY_H +Q_DECLARE_METATYPE(std::shared_ptr) \ No newline at end of file diff --git a/src/Mod/Material/App/MaterialLoader.h b/src/Mod/Material/App/MaterialLoader.h index 37bc8846e0..f07e3321e3 100644 --- a/src/Mod/Material/App/MaterialLoader.h +++ b/src/Mod/Material/App/MaterialLoader.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATERIAL_MATERIALLOADER_H -#define MATERIAL_MATERIALLOADER_H +#pragma once #include @@ -146,6 +145,4 @@ private: std::shared_ptr>> _libraryList; }; -} // namespace Materials - -#endif // MATERIAL_MATERIALLOADER_H +} // namespace Materials \ No newline at end of file diff --git a/src/Mod/Material/App/MaterialManager.h b/src/Mod/Material/App/MaterialManager.h index 044176606e..ec1b7220cb 100644 --- a/src/Mod/Material/App/MaterialManager.h +++ b/src/Mod/Material/App/MaterialManager.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATERIAL_MATERIALMANAGER_H -#define MATERIAL_MATERIALMANAGER_H +#pragma once #include @@ -172,6 +171,4 @@ private: ParameterGrp::handle _hGrp; }; -} // namespace Materials - -#endif // MATERIAL_MATERIALMANAGER_H \ No newline at end of file +} // namespace Materials \ No newline at end of file diff --git a/src/Mod/Material/App/MaterialManagerExternal.h b/src/Mod/Material/App/MaterialManagerExternal.h index e442d63894..f8ef769acf 100644 --- a/src/Mod/Material/App/MaterialManagerExternal.h +++ b/src/Mod/Material/App/MaterialManagerExternal.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATERIAL_MATERIALMANAGEREXTERNAl_H -#define MATERIAL_MATERIALMANAGEREXTERNAl_H +#pragma once #include #include @@ -110,6 +109,4 @@ private: static LRU::Cache> _cache; }; -} // namespace Materials - -#endif // MATERIAL_MATERIALMANAGEREXTERNAl_H \ No newline at end of file +} // namespace Materials \ No newline at end of file diff --git a/src/Mod/Material/App/MaterialManagerLocal.h b/src/Mod/Material/App/MaterialManagerLocal.h index 538f4d6fe2..b06abaa074 100644 --- a/src/Mod/Material/App/MaterialManagerLocal.h +++ b/src/Mod/Material/App/MaterialManagerLocal.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATERIAL_MATERIALMANAGERLOCAL_H -#define MATERIAL_MATERIALMANAGERLOCAL_H +#pragma once #include @@ -129,6 +128,4 @@ private: static void initLibraries(); }; -} // namespace Materials - -#endif // MATERIAL_MATERIALMANAGERLOCAL_H \ No newline at end of file +} // namespace Materials \ No newline at end of file diff --git a/src/Mod/Material/App/MaterialValue.h b/src/Mod/Material/App/MaterialValue.h index 83d4144fc1..26f57d9428 100644 --- a/src/Mod/Material/App/MaterialValue.h +++ b/src/Mod/Material/App/MaterialValue.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATERIAL_MATERIALVALUE_H -#define MATERIAL_MATERIALVALUE_H +#pragma once #include @@ -287,6 +286,4 @@ protected: Q_DECLARE_METATYPE(Materials::MaterialValue) Q_DECLARE_METATYPE(std::shared_ptr) -Q_DECLARE_METATYPE(std::shared_ptr) - -#endif // MATERIAL_MATERIALVALUE_H +Q_DECLARE_METATYPE(std::shared_ptr) \ No newline at end of file diff --git a/src/Mod/Material/App/Materials.h b/src/Mod/Material/App/Materials.h index a99407f7ad..e1f03b5098 100644 --- a/src/Mod/Material/App/Materials.h +++ b/src/Mod/Material/App/Materials.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATERIAL_MATERIALS_H -#define MATERIAL_MATERIALS_H +#pragma once #include @@ -500,6 +499,4 @@ using MaterialTreeNode = FolderTreeNode; } // namespace Materials Q_DECLARE_METATYPE(Materials::Material*) -Q_DECLARE_METATYPE(std::shared_ptr) - -#endif // MATERIAL_MATERIALS_H +Q_DECLARE_METATYPE(std::shared_ptr) \ No newline at end of file diff --git a/src/Mod/Material/App/Model.h b/src/Mod/Material/App/Model.h index 2ec9fb927e..6ba7098c1e 100644 --- a/src/Mod/Material/App/Model.h +++ b/src/Mod/Material/App/Model.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATERIAL_MODEL_H -#define MATERIAL_MODEL_H +#pragma once #include @@ -321,6 +320,4 @@ private: typedef FolderTreeNode ModelTreeNode; -} // namespace Materials - -#endif // MATERIAL_MODEL_H +} // namespace Materials \ No newline at end of file diff --git a/src/Mod/Material/App/ModelLibrary.h b/src/Mod/Material/App/ModelLibrary.h index 9aaad2e2e7..0c70329238 100644 --- a/src/Mod/Material/App/ModelLibrary.h +++ b/src/Mod/Material/App/ModelLibrary.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATERIAL_MODELLIBRARY_H -#define MATERIAL_MODELLIBRARY_H +#pragma once #include @@ -100,6 +99,4 @@ private: } // namespace Materials Q_DECLARE_METATYPE(std::shared_ptr) -Q_DECLARE_METATYPE(std::shared_ptr) - -#endif // MATERIAL_MODELLIBRARY_H +Q_DECLARE_METATYPE(std::shared_ptr) \ No newline at end of file diff --git a/src/Mod/Material/App/ModelLoader.h b/src/Mod/Material/App/ModelLoader.h index ce65289e7e..2e3d0f8f78 100644 --- a/src/Mod/Material/App/ModelLoader.h +++ b/src/Mod/Material/App/ModelLoader.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATERIAL_MODELLOADER_H -#define MATERIAL_MODELLOADER_H +#pragma once #include @@ -132,6 +131,4 @@ private: std::shared_ptr>> _libraryList; }; -} // namespace Materials - -#endif // MATERIAL_MODELLOADER_H +} // namespace Materials \ No newline at end of file diff --git a/src/Mod/Material/App/ModelManager.h b/src/Mod/Material/App/ModelManager.h index 3d0f6878de..b087630dbd 100644 --- a/src/Mod/Material/App/ModelManager.h +++ b/src/Mod/Material/App/ModelManager.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATERIAL_MODELMANAGER_H -#define MATERIAL_MODELMANAGER_H +#pragma once #include @@ -120,6 +119,4 @@ private: ParameterGrp::handle _hGrp; }; -} // namespace Materials - -#endif // MATERIAL_MODELMANAGER_H \ No newline at end of file +} // namespace Materials \ No newline at end of file diff --git a/src/Mod/Material/App/ModelManagerExternal.h b/src/Mod/Material/App/ModelManagerExternal.h index acf45088a4..1878cf5fe9 100644 --- a/src/Mod/Material/App/ModelManagerExternal.h +++ b/src/Mod/Material/App/ModelManagerExternal.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATERIAL_MODELMANAGEREXTERNAL_H -#define MATERIAL_MODELMANAGEREXTERNAL_H +#pragma once #include #include @@ -84,6 +83,4 @@ private: static LRU::Cache> _cache; }; -} // namespace Materials - -#endif // MATERIAL_MODELMANAGEREXTERNAL_H \ No newline at end of file +} // namespace Materials \ No newline at end of file diff --git a/src/Mod/Material/App/ModelManagerLocal.h b/src/Mod/Material/App/ModelManagerLocal.h index c366bd0f0a..38b6e04620 100644 --- a/src/Mod/Material/App/ModelManagerLocal.h +++ b/src/Mod/Material/App/ModelManagerLocal.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATERIAL_MODELMANAGERLOCAL_H -#define MATERIAL_MODELMANAGERLOCAL_H +#pragma once #include @@ -84,6 +83,4 @@ private: static QMutex _mutex; }; -} // namespace Materials - -#endif // MATERIAL_MODELMANAGERLOCAL_H \ No newline at end of file +} // namespace Materials \ No newline at end of file diff --git a/src/Mod/Material/App/ModelUuids.h b/src/Mod/Material/App/ModelUuids.h index 2d74beeddb..5f6050d03b 100644 --- a/src/Mod/Material/App/ModelUuids.h +++ b/src/Mod/Material/App/ModelUuids.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATERIAL_MODELUUIDS_H -#define MATERIAL_MODELUUIDS_H +#pragma once #include @@ -105,6 +104,4 @@ public: static const QString ModelUUID_Test_Model; }; -} // namespace Materials - -#endif // MATERIAL_MODELUUIDS_H +} // namespace Materials \ No newline at end of file diff --git a/src/Mod/Material/App/PreCompiled.h b/src/Mod/Material/App/PreCompiled.h index 353917f159..21ba7bcab2 100644 --- a/src/Mod/Material/App/PreCompiled.h +++ b/src/Mod/Material/App/PreCompiled.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATERIAL_PRECOMPILED_H -#define MATERIAL_PRECOMPILED_H +#pragma once #include @@ -56,7 +55,4 @@ #include #include #include -#include - - -#endif // MATERIAL_PRECOMPILED_H +#include \ No newline at end of file diff --git a/src/Mod/Material/App/PropertyMaterial.h b/src/Mod/Material/App/PropertyMaterial.h index ec07ff9b33..2bfeec1676 100644 --- a/src/Mod/Material/App/PropertyMaterial.h +++ b/src/Mod/Material/App/PropertyMaterial.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATERIAL_PROPERTYMATERIAL_H -#define MATERIAL_PROPERTYMATERIAL_H +#pragma once #include #include @@ -98,6 +97,4 @@ private: Material _material; }; -} // namespace Materials - -#endif // MATERIAL_PROPERTYMATERIAL_H +} // namespace Materials \ No newline at end of file diff --git a/src/Mod/Material/App/PyVariants.h b/src/Mod/Material/App/PyVariants.h index c006084273..ad7b5bd146 100644 --- a/src/Mod/Material/App/PyVariants.h +++ b/src/Mod/Material/App/PyVariants.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATERIAL_PYVARIANTS_H -#define MATERIAL_PYVARIANTS_H +#pragma once #include @@ -39,6 +38,4 @@ namespace Materials extern MaterialsExport PyObject* _pyObjectFromVariant(const QVariant& value); extern MaterialsExport Py::List getList(const QVariant& value); -} // namespace Materials - -#endif // MATERIAL_PYVARIANTS_H +} // namespace Materials \ No newline at end of file diff --git a/src/Mod/Material/App/trim.h b/src/Mod/Material/App/trim.h index 720e51864e..176944ab21 100644 --- a/src/Mod/Material/App/trim.h +++ b/src/Mod/Material/App/trim.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATERIAL_TRIM_H -#define MATERIAL_TRIM_H +#pragma once #include #include @@ -78,6 +77,4 @@ static inline std::string trim_copy(std::string s) return s; } -} // namespace Materials - -#endif // MATERIAL_TRIM_H +} // namespace Materials \ No newline at end of file diff --git a/src/Mod/Material/Gui/AppearancePreview.h b/src/Mod/Material/Gui/AppearancePreview.h index 26e5682d54..db47d5fd9d 100644 --- a/src/Mod/Material/Gui/AppearancePreview.h +++ b/src/Mod/Material/Gui/AppearancePreview.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATGUI_APPEARANCEPREVIEW_H -#define MATGUI_APPEARANCEPREVIEW_H +#pragma once #include #include @@ -88,6 +87,4 @@ private: void setCoinMaterial(); }; -} // namespace MatGui - -#endif // MATGUI_APPEARANCEPREVIEW_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/Gui/Array2D.h b/src/Mod/Material/Gui/Array2D.h index 9bb317dfe9..fe33388e34 100644 --- a/src/Mod/Material/Gui/Array2D.h +++ b/src/Mod/Material/Gui/Array2D.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATGUI_ARRAY2D_H -#define MATGUI_ARRAY2D_H +#pragma once #include @@ -79,6 +78,4 @@ private: void deleteSelected(); }; -} // namespace MatGui - -#endif // MATGUI_ARRAY2D_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/Gui/Array3D.h b/src/Mod/Material/Gui/Array3D.h index add5686876..d614351d76 100644 --- a/src/Mod/Material/Gui/Array3D.h +++ b/src/Mod/Material/Gui/Array3D.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATGUI_ARRAY3D_H -#define MATGUI_ARRAY3D_H +#pragma once #include #include @@ -85,6 +84,4 @@ private: void update2DArray(); }; -} // namespace MatGui - -#endif // MATGUI_ARRAY3D_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/Gui/ArrayDelegate.h b/src/Mod/Material/Gui/ArrayDelegate.h index 0f7e923211..2f8bbf8e60 100644 --- a/src/Mod/Material/Gui/ArrayDelegate.h +++ b/src/Mod/Material/Gui/ArrayDelegate.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATGUI_ArrayDelegate_H -#define MATGUI_ArrayDelegate_H +#pragma once #include #include @@ -62,6 +61,4 @@ private: QWidget* createWidget(QWidget* parent, const QVariant& item) const; }; -} // namespace MatGui - -#endif // MATGUI_ArrayDelegate_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/Gui/ArrayModel.h b/src/Mod/Material/Gui/ArrayModel.h index de3817f8fd..f612557e84 100644 --- a/src/Mod/Material/Gui/ArrayModel.h +++ b/src/Mod/Material/Gui/ArrayModel.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATGUI_ARRAYMODEL_H -#define MATGUI_ARRAYMODEL_H +#pragma once #include @@ -143,6 +142,4 @@ private: std::shared_ptr _value; }; -} // namespace MatGui - -#endif // MATGUI_ARRAYMODEL_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/Gui/BaseDelegate.h b/src/Mod/Material/Gui/BaseDelegate.h index 616382a0fe..326c6fd316 100644 --- a/src/Mod/Material/Gui/BaseDelegate.h +++ b/src/Mod/Material/Gui/BaseDelegate.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATGUI_BASEDELEGATE_H -#define MATGUI_BASEDELEGATE_H +#pragma once #include #include @@ -101,6 +100,4 @@ protected: QWidget* createWidget(QWidget* parent, const QVariant& item, const QModelIndex& index) const; }; -} // namespace MatGui - -#endif // MATGUI_BASEDELEGATE_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/Gui/DlgDisplayPropertiesImp.h b/src/Mod/Material/Gui/DlgDisplayPropertiesImp.h index 0c5bd7e4a9..2a7823d48a 100644 --- a/src/Mod/Material/Gui/DlgDisplayPropertiesImp.h +++ b/src/Mod/Material/Gui/DlgDisplayPropertiesImp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef MATGUI_DIALOG_DLGDISPLAYPROPERTIES_IMP_H -#define MATGUI_DIALOG_DLGDISPLAYPROPERTIES_IMP_H +#pragma once #include #include @@ -133,6 +132,4 @@ private: DlgDisplayPropertiesImp* widget; }; -} // namespace MatGui - -#endif // MATGUI_DIALOG_DLGDISPLAYPROPERTIES_IMP_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/Gui/DlgInspectAppearance.h b/src/Mod/Material/Gui/DlgInspectAppearance.h index 01b8a7a2df..ccc1bd68d5 100644 --- a/src/Mod/Material/Gui/DlgInspectAppearance.h +++ b/src/Mod/Material/Gui/DlgInspectAppearance.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATGUI_DLGINSPECTAPPEARANCE_H -#define MATGUI_DLGINSPECTAPPEARANCE_H +#pragma once #include @@ -109,6 +108,4 @@ private: DlgInspectAppearance* widget; }; -} // namespace MatGui - -#endif // MATGUI_DLGINSPECTAPPEARANCE_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/Gui/DlgInspectMaterial.h b/src/Mod/Material/Gui/DlgInspectMaterial.h index 3f92411e45..f716adc904 100644 --- a/src/Mod/Material/Gui/DlgInspectMaterial.h +++ b/src/Mod/Material/Gui/DlgInspectMaterial.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATGUI_DLGINSPECTMATERIAL_H -#define MATGUI_DLGINSPECTMATERIAL_H +#pragma once #include @@ -118,6 +117,4 @@ private: DlgInspectMaterial* widget; }; -} // namespace MatGui - -#endif // MATGUI_DLGINSPECTMATERIAL_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/Gui/DlgMaterialImp.h b/src/Mod/Material/Gui/DlgMaterialImp.h index fd8817589d..9c8efd5e05 100644 --- a/src/Mod/Material/Gui/DlgMaterialImp.h +++ b/src/Mod/Material/Gui/DlgMaterialImp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef MATGUI_DIALOGMATERIALIMP_H -#define MATGUI_DIALOGMATERIALIMP_H +#pragma once #include #include @@ -116,6 +115,4 @@ private: Gui::TaskView::TaskBox* taskbox; }; -} // namespace MatGui - -#endif // MATGUI_DIALOGMATERIALIMP_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/Gui/DlgSettingsDefaultMaterial.h b/src/Mod/Material/Gui/DlgSettingsDefaultMaterial.h index cbe5de167a..b9a7fe9bc0 100644 --- a/src/Mod/Material/Gui/DlgSettingsDefaultMaterial.h +++ b/src/Mod/Material/Gui/DlgSettingsDefaultMaterial.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATGUI_DLGSETTINGSDEFAULTMATERIAL_H -#define MATGUI_DLGSETTINGSDEFAULTMATERIAL_H +#pragma once #include #include @@ -51,6 +50,4 @@ private: void setupFilters(); }; -} // namespace MatGui - -#endif // MATGUI_DLGSETTINGSDEFAULTMATERIAL_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/Gui/DlgSettingsExternal.h b/src/Mod/Material/Gui/DlgSettingsExternal.h index 22933b1f59..bc15fa87f4 100644 --- a/src/Mod/Material/Gui/DlgSettingsExternal.h +++ b/src/Mod/Material/Gui/DlgSettingsExternal.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATGUI_DLGSETTINGSEXTERNAL_H -#define MATGUI_DLGSETTINGSEXTERNAL_H +#pragma once #include #include @@ -55,6 +54,4 @@ private: std::unique_ptr ui; }; -} // namespace MatGui - -#endif // MATGUI_DLGSETTINGSDATABASE_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/Gui/DlgSettingsMaterial.h b/src/Mod/Material/Gui/DlgSettingsMaterial.h index 46b62be714..16797589f6 100644 --- a/src/Mod/Material/Gui/DlgSettingsMaterial.h +++ b/src/Mod/Material/Gui/DlgSettingsMaterial.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATGUI_DLGSETTINGSMATERIAL_H -#define MATGUI_DLGSETTINGSMATERIAL_H +#pragma once #include #include @@ -49,6 +48,4 @@ private: std::unique_ptr ui; }; -} // namespace MatGui - -#endif // MATGUI_DLGSETTINGSMATERIAL_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/Gui/ImageEdit.h b/src/Mod/Material/Gui/ImageEdit.h index ecacfe00d0..ee02160b71 100644 --- a/src/Mod/Material/Gui/ImageEdit.h +++ b/src/Mod/Material/Gui/ImageEdit.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATGUI_IMAGEEDIT_H -#define MATGUI_IMAGEEDIT_H +#pragma once #include @@ -99,6 +98,4 @@ private: void onFileSelectSVG(); }; -} // namespace MatGui - -#endif // MATGUI_IMAGEEDIT_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/Gui/ListDelegate.h b/src/Mod/Material/Gui/ListDelegate.h index 45708b48ac..44302ad37d 100644 --- a/src/Mod/Material/Gui/ListDelegate.h +++ b/src/Mod/Material/Gui/ListDelegate.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATGUI_LISTDELEGATE_H -#define MATGUI_LISTDELEGATE_H +#pragma once #include #include @@ -75,6 +74,4 @@ private: QString _units; }; -} // namespace MatGui - -#endif // MATGUI_LISTDELEGATE_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/Gui/ListEdit.h b/src/Mod/Material/Gui/ListEdit.h index e9477f7efc..509c2da078 100644 --- a/src/Mod/Material/Gui/ListEdit.h +++ b/src/Mod/Material/Gui/ListEdit.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATGUI_LISTEDIT_H -#define MATGUI_LISTEDIT_H +#pragma once #include @@ -80,6 +79,4 @@ private: void onSelectionChanged(const QItemSelection& selected, const QItemSelection& deselected); }; -} // namespace MatGui - -#endif // MATGUI_LISTEDIT_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/Gui/ListModel.h b/src/Mod/Material/Gui/ListModel.h index 0016a6ce8f..48ef755967 100644 --- a/src/Mod/Material/Gui/ListModel.h +++ b/src/Mod/Material/Gui/ListModel.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATGUI_LISTMODEL_H -#define MATGUI_LISTMODEL_H +#pragma once #include @@ -66,6 +65,4 @@ private: QList* _valuePtr; }; -} // namespace MatGui - -#endif // MATGUI_LISTMODEL_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/Gui/MaterialDelegate.h b/src/Mod/Material/Gui/MaterialDelegate.h index af28ffc01e..a702c32562 100644 --- a/src/Mod/Material/Gui/MaterialDelegate.h +++ b/src/Mod/Material/Gui/MaterialDelegate.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATGUI_MATERIALDELEGATE_H -#define MATGUI_MATERIALDELEGATE_H +#pragma once #include #include @@ -88,6 +87,4 @@ private: void showArray3DModal(const QString& propertyName, QStandardItem* item); }; -} // namespace MatGui - -#endif // MATGUI_MATERIALDELEGATE_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/Gui/MaterialSave.h b/src/Mod/Material/Gui/MaterialSave.h index a1cc3a1478..4804045c12 100644 --- a/src/Mod/Material/Gui/MaterialSave.h +++ b/src/Mod/Material/Gui/MaterialSave.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATGUI_MATERIALSAVE_H -#define MATGUI_MATERIALSAVE_H +#pragma once #include @@ -103,6 +102,4 @@ private: void removeSelectedFromTree(); }; -} // namespace MatGui - -#endif // MATGUI_MATERIALSAVE_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/Gui/MaterialTreeWidget.h b/src/Mod/Material/Gui/MaterialTreeWidget.h index a33b54989d..3b34e1b10b 100644 --- a/src/Mod/Material/Gui/MaterialTreeWidget.h +++ b/src/Mod/Material/Gui/MaterialTreeWidget.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATGUI_MATERIALTREEWIDGET_H -#define MATGUI_MATERIALTREEWIDGET_H +#pragma once #include @@ -287,6 +286,4 @@ protected: void savePreferences() override; }; -} // namespace MatGui - -#endif // MATGUI_MATERIALTREEWIDGET_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/Gui/MaterialsEditor.h b/src/Mod/Material/Gui/MaterialsEditor.h index 9f74371653..3152e421b5 100644 --- a/src/Mod/Material/Gui/MaterialsEditor.h +++ b/src/Mod/Material/Gui/MaterialsEditor.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATGUI_MATERIALSEDITOR_H -#define MATGUI_MATERIALSEDITOR_H +#pragma once #include @@ -240,6 +239,4 @@ private: } }; -} // namespace MatGui - -#endif // MATGUI_MATERIALSEDITOR_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/Gui/ModelSelect.h b/src/Mod/Material/Gui/ModelSelect.h index 6c0eb23a20..5c4e96ff00 100644 --- a/src/Mod/Material/Gui/ModelSelect.h +++ b/src/Mod/Material/Gui/ModelSelect.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATGUI_MODELSELECT_H -#define MATGUI_MODELSELECT_H +#pragma once #include @@ -102,6 +101,4 @@ private: int _recentMax; }; -} // namespace MatGui - -#endif // MATGUI_MODELSELECT_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/Gui/PreCompiled.h b/src/Mod/Material/Gui/PreCompiled.h index 1be378c3f1..04cc28d042 100644 --- a/src/Mod/Material/Gui/PreCompiled.h +++ b/src/Mod/Material/Gui/PreCompiled.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATGUI_PRECOMPILED_H -#define MATGUI_PRECOMPILED_H +#pragma once #include @@ -47,8 +46,4 @@ #include // Inventor includes OpenGL -# include - - - -#endif // MATGUI_PRECOMPILED_H +# include \ No newline at end of file diff --git a/src/Mod/Material/Gui/TaskMigrateExternal.h b/src/Mod/Material/Gui/TaskMigrateExternal.h index fa10419c93..f4b783aeb5 100644 --- a/src/Mod/Material/Gui/TaskMigrateExternal.h +++ b/src/Mod/Material/Gui/TaskMigrateExternal.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef MATGUI_TASKMIGRATEEXTERNAL_H -#define MATGUI_TASKMIGRATEEXTERNAL_H +#pragma once #include @@ -75,6 +74,4 @@ private: QPushButton* _closeButton; }; -} // namespace MatGui - -#endif // MATGUI_TASKMIGRATEEXTERNAL_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/Gui/TextEdit.h b/src/Mod/Material/Gui/TextEdit.h index 0052f3396d..b0cdde38b2 100644 --- a/src/Mod/Material/Gui/TextEdit.h +++ b/src/Mod/Material/Gui/TextEdit.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MATGUI_TEXTEDIT_H -#define MATGUI_TEXTEDIT_H +#pragma once #include @@ -63,6 +62,4 @@ private: QString _value; }; -} // namespace MatGui - -#endif // MATGUI_TEXTEDIT_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/Gui/Workbench.h b/src/Mod/Material/Gui/Workbench.h index 54979e2a5e..2f0b4ac1d8 100644 --- a/src/Mod/Material/Gui/Workbench.h +++ b/src/Mod/Material/Gui/Workbench.h @@ -22,8 +22,7 @@ **************************************************************************/ -#ifndef MATGUI_WORKBENCH_H -#define MATGUI_WORKBENCH_H +#pragma once #include #include @@ -48,7 +47,4 @@ protected: Gui::ToolBarItem* setupCommandBars() const override; }; -} // namespace MatGui - - -#endif // MATGUI_WORKBENCH_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/Gui/WorkbenchManipulator.h b/src/Mod/Material/Gui/WorkbenchManipulator.h index 0ca5e7fd76..824112b2db 100644 --- a/src/Mod/Material/Gui/WorkbenchManipulator.h +++ b/src/Mod/Material/Gui/WorkbenchManipulator.h @@ -22,8 +22,7 @@ **************************************************************************/ -#ifndef MATGUI_WORKBENCHMANIPULATOR_H -#define MATGUI_WORKBENCHMANIPULATOR_H +#pragma once #include @@ -48,7 +47,4 @@ private: static void addCommandsToTree(Gui::MenuItem* menuBar); }; -} // namespace MatGui - - -#endif // MATGUI_WORKBENCHMANIPULATOR_H +} // namespace MatGui \ No newline at end of file diff --git a/src/Mod/Material/MaterialGlobal.h b/src/Mod/Material/MaterialGlobal.h index 7fc4066ebb..a3e4c140cf 100644 --- a/src/Mod/Material/MaterialGlobal.h +++ b/src/Mod/Material/MaterialGlobal.h @@ -23,8 +23,7 @@ #include -#ifndef MATERIAL_GLOBAL_H -#define MATERIAL_GLOBAL_H +#pragma once // Material #ifndef MaterialsExport @@ -42,6 +41,4 @@ #else #define MatGuiExport FREECAD_DECL_IMPORT #endif -#endif - -#endif // MATERIAL_GLOBAL_H +#endif \ No newline at end of file diff --git a/src/Mod/Measure/App/MeasureAngle.h b/src/Mod/Measure/App/MeasureAngle.h index be26b690c8..609eaff2f1 100644 --- a/src/Mod/Measure/App/MeasureAngle.h +++ b/src/Mod/Measure/App/MeasureAngle.h @@ -22,8 +22,7 @@ **************************************************************************/ -#ifndef APP_MEASUREANGLE_H -#define APP_MEASUREANGLE_H +#pragma once #include @@ -96,6 +95,3 @@ private: }; } // namespace Measure - - -#endif // APP_MEASUREANGLE_H diff --git a/src/Mod/Measure/App/MeasureArea.h b/src/Mod/Measure/App/MeasureArea.h index 60c7231958..59b8fd3576 100644 --- a/src/Mod/Measure/App/MeasureArea.h +++ b/src/Mod/Measure/App/MeasureArea.h @@ -22,8 +22,7 @@ **************************************************************************/ -#ifndef MEASURE_MEASUREAREA_H -#define MEASURE_MEASUREAREA_H +#pragma once #include @@ -86,6 +85,3 @@ private: }; } // namespace Measure - - -#endif // MEASURE_MEASUREAREA_H diff --git a/src/Mod/Measure/App/MeasureBase.h b/src/Mod/Measure/App/MeasureBase.h index b1314e5fec..d2ca304676 100644 --- a/src/Mod/Measure/App/MeasureBase.h +++ b/src/Mod/Measure/App/MeasureBase.h @@ -22,8 +22,7 @@ **************************************************************************/ -#ifndef MEASURE_MEASUREBASE_H -#define MEASURE_MEASUREBASE_H +#pragma once #include @@ -163,6 +162,3 @@ private: } // namespace Measure - - -#endif // MEASURE_MEASUREBASE_H diff --git a/src/Mod/Measure/App/MeasureDiameter.h b/src/Mod/Measure/App/MeasureDiameter.h index 3acf5c5659..5fb04208c0 100644 --- a/src/Mod/Measure/App/MeasureDiameter.h +++ b/src/Mod/Measure/App/MeasureDiameter.h @@ -20,8 +20,7 @@ ***************************************************************************/ -#ifndef MEASURE_MEASUREDIAMETER_H -#define MEASURE_MEASUREDIAMETER_H +#pragma once #include @@ -79,5 +78,3 @@ private: }; } // namespace Measure - -#endif // MEASURE_MEASUREDIAMETER_H diff --git a/src/Mod/Measure/App/MeasureDistance.h b/src/Mod/Measure/App/MeasureDistance.h index 44fe0cf045..a358885fd7 100644 --- a/src/Mod/Measure/App/MeasureDistance.h +++ b/src/Mod/Measure/App/MeasureDistance.h @@ -22,8 +22,7 @@ **************************************************************************/ -#ifndef MEASUREAPP_MEASUREDISTANCE_H -#define MEASUREAPP_MEASUREDISTANCE_H +#pragma once #include @@ -166,6 +165,3 @@ private: } // namespace Measure - - -#endif // MEASUREAPP_MEASUREDISTANCE_H diff --git a/src/Mod/Measure/App/MeasureLength.h b/src/Mod/Measure/App/MeasureLength.h index f25e6c0a70..80892873f9 100644 --- a/src/Mod/Measure/App/MeasureLength.h +++ b/src/Mod/Measure/App/MeasureLength.h @@ -22,8 +22,7 @@ **************************************************************************/ -#ifndef MEASURE_MEASURELENGTH_H -#define MEASURE_MEASURELENGTH_H +#pragma once #include @@ -82,6 +81,3 @@ private: }; } // namespace Measure - - -#endif // MEASURE_MEASURELENGTH_H diff --git a/src/Mod/Measure/App/MeasurePosition.h b/src/Mod/Measure/App/MeasurePosition.h index 047ce62e3f..3b4f4625c5 100644 --- a/src/Mod/Measure/App/MeasurePosition.h +++ b/src/Mod/Measure/App/MeasurePosition.h @@ -22,8 +22,7 @@ **************************************************************************/ -#ifndef APP_MEASUREPOSITION_H -#define APP_MEASUREPOSITION_H +#pragma once #include @@ -84,6 +83,3 @@ private: }; } // namespace Measure - - -#endif // APP_MEASUREPOSITION_H diff --git a/src/Mod/Measure/App/MeasureRadius.h b/src/Mod/Measure/App/MeasureRadius.h index 41687094ff..1216126606 100644 --- a/src/Mod/Measure/App/MeasureRadius.h +++ b/src/Mod/Measure/App/MeasureRadius.h @@ -22,8 +22,7 @@ **************************************************************************/ -#ifndef MEASURE_MEASURERADIUS_H -#define MEASURE_MEASURERADIUS_H +#pragma once #include @@ -88,6 +87,3 @@ private: }; } // namespace Measure - - -#endif // MEASURE_MEASURERADIUS_H diff --git a/src/Mod/Measure/App/Measurement.h b/src/Mod/Measure/App/Measurement.h index f557943811..9aebab0889 100644 --- a/src/Mod/Measure/App/Measurement.h +++ b/src/Mod/Measure/App/Measurement.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MEASURE_MEASUREMENT_H -#define MEASURE_MEASUREMENT_H +#pragma once #include #include @@ -146,6 +145,3 @@ private: } // namespace Measure - - -#endif // MEASURE_MEASUREMENT_H diff --git a/src/Mod/Measure/App/PreCompiled.h b/src/Mod/Measure/App/PreCompiled.h index 2854b63be7..5dce95b3ff 100644 --- a/src/Mod/Measure/App/PreCompiled.h +++ b/src/Mod/Measure/App/PreCompiled.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MEASUREGUI_PRECOMPILED_H -#define MEASUREGUI_PRECOMPILED_H +#pragma once #include @@ -42,6 +41,3 @@ // OpenCasCade #include - - -#endif // MEASUREGUI_PRECOMPILED_H diff --git a/src/Mod/Measure/App/Preferences.h b/src/Mod/Measure/App/Preferences.h index 71a5930004..02859342c3 100644 --- a/src/Mod/Measure/App/Preferences.h +++ b/src/Mod/Measure/App/Preferences.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef Preferences_h_ -#define Preferences_h_ +#pragma once #include @@ -54,4 +53,3 @@ public: } // end namespace Measure -#endif diff --git a/src/Mod/Measure/App/ShapeFinder.h b/src/Mod/Measure/App/ShapeFinder.h index 3d869038c4..daf7115a4f 100644 --- a/src/Mod/Measure/App/ShapeFinder.h +++ b/src/Mod/Measure/App/ShapeFinder.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef MEASURE_SHAPEFINDER_H -#define MEASURE_SHAPEFINDER_H +#pragma once #include @@ -143,5 +142,3 @@ private: }; } // namespace Measure - -#endif // MEASURE_SHAPEFINDER_H diff --git a/src/Mod/Measure/App/SubnameHelper.h b/src/Mod/Measure/App/SubnameHelper.h index 51417e9891..69467f88c4 100644 --- a/src/Mod/Measure/App/SubnameHelper.h +++ b/src/Mod/Measure/App/SubnameHelper.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef MEASURE_SUBNAMEMANIPULATOR_H -#define MEASURE_SUBNAMEMANIPULATOR_H +#pragma once #include @@ -53,5 +52,3 @@ public: }; } // namespace Measure - -#endif // MEASURE_SUBNAMEMANIPULATOR_H diff --git a/src/Mod/Measure/Gui/DlgPrefsMeasureAppearanceImp.h b/src/Mod/Measure/Gui/DlgPrefsMeasureAppearanceImp.h index 5914153b46..8839abb092 100644 --- a/src/Mod/Measure/Gui/DlgPrefsMeasureAppearanceImp.h +++ b/src/Mod/Measure/Gui/DlgPrefsMeasureAppearanceImp.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MeasureGui_DlgPrefsAppearanceImp_H -#define MeasureGui_DlgPrefsAppearanceImp_H +#pragma once #include @@ -53,5 +52,3 @@ private: }; } // namespace MeasureGui - -#endif // MeasureGui_DlgPrefsAppearanceImp_H diff --git a/src/Mod/Measure/Gui/PreCompiled.h b/src/Mod/Measure/Gui/PreCompiled.h index 5ab47a5620..872c1a3d3b 100644 --- a/src/Mod/Measure/Gui/PreCompiled.h +++ b/src/Mod/Measure/Gui/PreCompiled.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MEASUREGUI_PRECOMPILED_H -#define MEASUREGUI_PRECOMPILED_H +#pragma once #include @@ -74,5 +73,3 @@ // Inventor includes OpenGL #include - -#endif diff --git a/src/Mod/Measure/Gui/QuickMeasure.h b/src/Mod/Measure/Gui/QuickMeasure.h index 5764ca70ff..b24f2a82e9 100644 --- a/src/Mod/Measure/Gui/QuickMeasure.h +++ b/src/Mod/Measure/Gui/QuickMeasure.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef MEASUREGUI_QUICKMEASURE_H -#define MEASUREGUI_QUICKMEASURE_H +#pragma once #include @@ -69,5 +68,3 @@ private: }; } // namespace MeasureGui - -#endif // MEASUREGUI_QUICKMEASURE_H diff --git a/src/Mod/Measure/Gui/TaskMeasure.h b/src/Mod/Measure/Gui/TaskMeasure.h index 415650424b..900f55616b 100644 --- a/src/Mod/Measure/Gui/TaskMeasure.h +++ b/src/Mod/Measure/Gui/TaskMeasure.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef MEASURE_TASKMEASURE_H -#define MEASURE_TASKMEASURE_H +#pragma once #include #include @@ -120,5 +119,3 @@ private: }; } // namespace MeasureGui - -#endif // MEASURE_TASKMEASURE_H diff --git a/src/Mod/Measure/Gui/ViewProviderMeasureAngle.h b/src/Mod/Measure/Gui/ViewProviderMeasureAngle.h index 70542990ed..1ba45f9a5e 100644 --- a/src/Mod/Measure/Gui/ViewProviderMeasureAngle.h +++ b/src/Mod/Measure/Gui/ViewProviderMeasureAngle.h @@ -22,8 +22,7 @@ **************************************************************************/ -#ifndef GUI_VIEWPROVIDERMEASUREANGLE_H -#define GUI_VIEWPROVIDERMEASUREANGLE_H +#pragma once #include @@ -69,6 +68,3 @@ private: } // namespace MeasureGui - - -#endif // GUI_VIEWPROVIDERMEASUREANGLE_H diff --git a/src/Mod/Measure/Gui/ViewProviderMeasureBase.h b/src/Mod/Measure/Gui/ViewProviderMeasureBase.h index d836e58af8..b4b3083cbd 100644 --- a/src/Mod/Measure/Gui/ViewProviderMeasureBase.h +++ b/src/Mod/Measure/Gui/ViewProviderMeasureBase.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef GUI_VIEWPROVIDER_MEASUREMENTBASE_H -#define GUI_VIEWPROVIDER_MEASUREMENTBASE_H +#pragma once #include @@ -269,5 +268,3 @@ public: } // namespace MeasureGui - -#endif // GUI_VIEWPROVIDER_MEASUREMENTBASE_H diff --git a/src/Mod/Measure/Gui/ViewProviderMeasureDistance.h b/src/Mod/Measure/Gui/ViewProviderMeasureDistance.h index 73b2e53f5b..521e9a8a84 100644 --- a/src/Mod/Measure/Gui/ViewProviderMeasureDistance.h +++ b/src/Mod/Measure/Gui/ViewProviderMeasureDistance.h @@ -23,8 +23,7 @@ **************************************************************************/ -#ifndef MEASUREGUI_VIEWPROVIDERMEASUREDISTANCE_H -#define MEASUREGUI_VIEWPROVIDERMEASUREDISTANCE_H +#pragma once #include @@ -120,6 +119,3 @@ private: }; } // namespace MeasureGui - - -#endif // MEASUREGUI_VIEWPROVIDERMEASUREDISTANCE_H diff --git a/src/Mod/Measure/MeasureGlobal.h b/src/Mod/Measure/MeasureGlobal.h index c50846635d..bd3ae92cc7 100644 --- a/src/Mod/Measure/MeasureGlobal.h +++ b/src/Mod/Measure/MeasureGlobal.h @@ -24,26 +24,23 @@ #include -#ifndef MEASURE_GLOBAL_H -# define MEASURE_GLOBAL_H +#pragma once // Measure -# ifndef MeasureExport -# ifdef Measure_EXPORTS -# define MeasureExport FREECAD_DECL_EXPORT -# else -# define MeasureExport FREECAD_DECL_IMPORT -# endif +#ifndef MeasureExport +# ifdef Measure_EXPORTS +# define MeasureExport FREECAD_DECL_EXPORT +# else +# define MeasureExport FREECAD_DECL_IMPORT # endif +#endif // MeasureGui -# ifndef MeasureGuiExport -# ifdef MeasureGui_EXPORTS -# define MeasureGuiExport FREECAD_DECL_EXPORT -# else -# define MeasureGuiExport FREECAD_DECL_IMPORT -# endif +#ifndef MeasureGuiExport +# ifdef MeasureGui_EXPORTS +# define MeasureGuiExport FREECAD_DECL_EXPORT +# else +# define MeasureGuiExport FREECAD_DECL_IMPORT # endif - -#endif // MEASURE_GLOBAL_H +#endif diff --git a/src/Mod/Mesh/App/Core/Algorithm.h b/src/Mod/Mesh/App/Core/Algorithm.h index e4f4436940..f42706f58d 100644 --- a/src/Mod/Mesh/App/Core/Algorithm.h +++ b/src/Mod/Mesh/App/Core/Algorithm.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHALGORITHM_H -#define MESHALGORITHM_H +#pragma once #include #include @@ -706,5 +705,3 @@ private: }; } // namespace MeshCore - -#endif // MESH_ALGORITHM_H diff --git a/src/Mod/Mesh/App/Core/Approximation.h b/src/Mod/Mesh/App/Core/Approximation.h index 14c85ad423..44a131a6b7 100644 --- a/src/Mod/Mesh/App/Core/Approximation.h +++ b/src/Mod/Mesh/App/Core/Approximation.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_APPROXIMATION_H -#define MESH_APPROXIMATION_H +#pragma once #include #ifndef MESH_GLOBAL_H @@ -736,5 +735,3 @@ private: }; } // namespace MeshCore - -#endif // MESH_APPROXIMATION_H diff --git a/src/Mod/Mesh/App/Core/Builder.h b/src/Mod/Mesh/App/Core/Builder.h index fa5eed8d32..c203cd95a7 100644 --- a/src/Mod/Mesh/App/Core/Builder.h +++ b/src/Mod/Mesh/App/Core/Builder.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_BUILDER_H -#define MESH_BUILDER_H +#pragma once #include #include @@ -233,5 +232,3 @@ private: }; } // namespace MeshCore - -#endif diff --git a/src/Mod/Mesh/App/Core/Curvature.h b/src/Mod/Mesh/App/Core/Curvature.h index 2a386e761d..74e7475e12 100644 --- a/src/Mod/Mesh/App/Core/Curvature.h +++ b/src/Mod/Mesh/App/Core/Curvature.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHCORE_CURVATURE_H -#define MESHCORE_CURVATURE_H +#pragma once #include "Definitions.h" #include @@ -84,5 +83,3 @@ private: }; } // namespace MeshCore - -#endif // MESHCORE_CURVATURE_H diff --git a/src/Mod/Mesh/App/Core/CylinderFit.h b/src/Mod/Mesh/App/Core/CylinderFit.h index ade27e4d19..3757dfc94f 100644 --- a/src/Mod/Mesh/App/Core/CylinderFit.h +++ b/src/Mod/Mesh/App/Core/CylinderFit.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_CYLINDER_FIT_H -#define MESH_CYLINDER_FIT_H +#pragma once #include @@ -191,5 +190,3 @@ private: } // namespace MeshCoreFit - -#endif // MESH_CYLINDER_FIT_H diff --git a/src/Mod/Mesh/App/Core/Decimation.h b/src/Mod/Mesh/App/Core/Decimation.h index 694cf78b68..be8e0c66e5 100644 --- a/src/Mod/Mesh/App/Core/Decimation.h +++ b/src/Mod/Mesh/App/Core/Decimation.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef MESH_DECIMATION_H -#define MESH_DECIMATION_H +#pragma once #include @@ -44,6 +43,3 @@ private: }; } // namespace MeshCore - - -#endif // MESH_DECIMATION_H diff --git a/src/Mod/Mesh/App/Core/Definitions.h b/src/Mod/Mesh/App/Core/Definitions.h index 7d225cf48e..520b578ebc 100644 --- a/src/Mod/Mesh/App/Core/Definitions.h +++ b/src/Mod/Mesh/App/Core/Definitions.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_DEFINITIONS_H -#define MESH_DEFINITIONS_H +#pragma once #ifndef MESH_GLOBAL_H # include @@ -81,5 +80,3 @@ public: }; } // namespace MeshCore - -#endif // MESH_DEFINITIONS_H diff --git a/src/Mod/Mesh/App/Core/Degeneration.h b/src/Mod/Mesh/App/Core/Degeneration.h index 92339fcbaa..3e436bb4df 100644 --- a/src/Mod/Mesh/App/Core/Degeneration.h +++ b/src/Mod/Mesh/App/Core/Degeneration.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_DEGENERATION_H -#define MESH_DEGENERATION_H +#pragma once #include #include @@ -790,5 +789,3 @@ private: }; } // namespace MeshCore - -#endif // MESH_DEGENERATION_H diff --git a/src/Mod/Mesh/App/Core/Elements.h b/src/Mod/Mesh/App/Core/Elements.h index 787126c2d1..7b4f9ecbe3 100644 --- a/src/Mod/Mesh/App/Core/Elements.h +++ b/src/Mod/Mesh/App/Core/Elements.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_ELEMENTS_H -#define MESH_ELEMENTS_H +#pragma once #include #include @@ -1298,5 +1297,3 @@ public: }; } // namespace MeshCore - -#endif // MESH_ELEMENTS_H diff --git a/src/Mod/Mesh/App/Core/Evaluation.h b/src/Mod/Mesh/App/Core/Evaluation.h index e869deca4c..32f13244b5 100644 --- a/src/Mod/Mesh/App/Core/Evaluation.h +++ b/src/Mod/Mesh/App/Core/Evaluation.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_EVALUATION_H -#define MESH_EVALUATION_H +#pragma once #include #include @@ -426,5 +425,3 @@ private: }; } // namespace MeshCore - -#endif // MESH_EVALUATION_H diff --git a/src/Mod/Mesh/App/Core/Functional.h b/src/Mod/Mesh/App/Core/Functional.h index 7913a6fc81..ed16f42b80 100644 --- a/src/Mod/Mesh/App/Core/Functional.h +++ b/src/Mod/Mesh/App/Core/Functional.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_FUNCTIONAL_H -#define MESH_FUNCTIONAL_H +#pragma once #include #include @@ -63,6 +62,3 @@ static void parallel_sort(Iter begin, Iter end, Pred comp, int threads) } } // namespace MeshCore - - -#endif // MESH_FUNCTIONAL_H diff --git a/src/Mod/Mesh/App/Core/Grid.h b/src/Mod/Mesh/App/Core/Grid.h index 11e641f8b1..d3cca04b95 100644 --- a/src/Mod/Mesh/App/Core/Grid.h +++ b/src/Mod/Mesh/App/Core/Grid.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_GRID_H -#define MESH_GRID_H +#pragma once #include #include @@ -649,5 +648,3 @@ inline void MeshFacetGrid::AddFacet(const MeshGeomFacet& rclFacet, ElementIndex } } // namespace MeshCore - -#endif // MESH_GRID_H diff --git a/src/Mod/Mesh/App/Core/Helpers.h b/src/Mod/Mesh/App/Core/Helpers.h index ae06b19be0..0e25a86491 100644 --- a/src/Mod/Mesh/App/Core/Helpers.h +++ b/src/Mod/Mesh/App/Core/Helpers.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_HELPERS_H -#define MESH_HELPERS_H +#pragma once #include "Elements.h" @@ -180,5 +179,3 @@ inline void MeshEdgeBuilder::Add(PointIndex ulInd1, PointIndex ulInd2, FacetInde } } // namespace MeshCore - -#endif // MESH_HELPERS_H diff --git a/src/Mod/Mesh/App/Core/IO/Reader3MF.h b/src/Mod/Mesh/App/Core/IO/Reader3MF.h index d838eff1c5..28199c07f0 100644 --- a/src/Mod/Mesh/App/Core/IO/Reader3MF.h +++ b/src/Mod/Mesh/App/Core/IO/Reader3MF.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef MESH_IO_READER_3MF_H -#define MESH_IO_READER_3MF_H +#pragma once #include #include @@ -126,6 +125,3 @@ private: }; } // namespace MeshCore - - -#endif // MESH_IO_READER_3MF_H diff --git a/src/Mod/Mesh/App/Core/IO/ReaderOBJ.h b/src/Mod/Mesh/App/Core/IO/ReaderOBJ.h index 1e37083289..2b8c2d04f2 100644 --- a/src/Mod/Mesh/App/Core/IO/ReaderOBJ.h +++ b/src/Mod/Mesh/App/Core/IO/ReaderOBJ.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef MESH_IO_READER_OBJ_H -#define MESH_IO_READER_OBJ_H +#pragma once #include #include @@ -75,6 +74,3 @@ private: }; } // namespace MeshCore - - -#endif // MESH_IO_READER_OBJ_H diff --git a/src/Mod/Mesh/App/Core/IO/ReaderPLY.h b/src/Mod/Mesh/App/Core/IO/ReaderPLY.h index e4ca967ace..2626425626 100644 --- a/src/Mod/Mesh/App/Core/IO/ReaderPLY.h +++ b/src/Mod/Mesh/App/Core/IO/ReaderPLY.h @@ -22,8 +22,7 @@ **************************************************************************/ -#ifndef MESH_IO_READER_PLY_H -#define MESH_IO_READER_PLY_H +#pragma once #include #include @@ -136,6 +135,3 @@ private: }; } // namespace MeshCore - - -#endif // MESH_IO_READER_PLY_H diff --git a/src/Mod/Mesh/App/Core/IO/Writer3MF.h b/src/Mod/Mesh/App/Core/IO/Writer3MF.h index 18ecc1c23a..3a1931a9b4 100644 --- a/src/Mod/Mesh/App/Core/IO/Writer3MF.h +++ b/src/Mod/Mesh/App/Core/IO/Writer3MF.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef MESH_IO_WRITER_3MF_H -#define MESH_IO_WRITER_3MF_H +#pragma once #include #include @@ -111,6 +110,3 @@ private: }; } // namespace MeshCore - - -#endif // MESH_IO_WRITER_3MF_H diff --git a/src/Mod/Mesh/App/Core/IO/WriterInventor.h b/src/Mod/Mesh/App/Core/IO/WriterInventor.h index 3fd8c10b1b..9b45141730 100644 --- a/src/Mod/Mesh/App/Core/IO/WriterInventor.h +++ b/src/Mod/Mesh/App/Core/IO/WriterInventor.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef MESH_IO_WRITER_IV_H -#define MESH_IO_WRITER_IV_H +#pragma once #include #include @@ -58,6 +57,3 @@ private: }; } // namespace MeshCore - - -#endif // MESH_IO_WRITER_IV_H diff --git a/src/Mod/Mesh/App/Core/IO/WriterOBJ.h b/src/Mod/Mesh/App/Core/IO/WriterOBJ.h index 77e0d7385e..155a398d69 100644 --- a/src/Mod/Mesh/App/Core/IO/WriterOBJ.h +++ b/src/Mod/Mesh/App/Core/IO/WriterOBJ.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef MESH_IO_WRITER_OBJ_H -#define MESH_IO_WRITER_OBJ_H +#pragma once #include #include @@ -73,6 +72,3 @@ private: }; } // namespace MeshCore - - -#endif // MESH_IO_WRITER_OBJ_H diff --git a/src/Mod/Mesh/App/Core/Info.h b/src/Mod/Mesh/App/Core/Info.h index 0b86e79c5f..7139d50eb7 100644 --- a/src/Mod/Mesh/App/Core/Info.h +++ b/src/Mod/Mesh/App/Core/Info.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef MESH_INFO_H -#define MESH_INFO_H +#pragma once #include "MeshKernel.h" @@ -94,5 +93,3 @@ public: } // namespace MeshCore - -#endif diff --git a/src/Mod/Mesh/App/Core/Iterator.h b/src/Mod/Mesh/App/Core/Iterator.h index 89e67b77dd..d91008ded5 100644 --- a/src/Mod/Mesh/App/Core/Iterator.h +++ b/src/Mod/Mesh/App/Core/Iterator.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_ITERATOR_H -#define MESH_ITERATOR_H +#pragma once #include @@ -624,6 +623,3 @@ inline MeshPointIterator& MeshPointIterator::operator=(MeshPointIterator&& rpI) } // namespace MeshCore - - -#endif // MESH_ITERATOR_H diff --git a/src/Mod/Mesh/App/Core/KDTree.h b/src/Mod/Mesh/App/Core/KDTree.h index 5e1f7596ba..5b1b60731a 100644 --- a/src/Mod/Mesh/App/Core/KDTree.h +++ b/src/Mod/Mesh/App/Core/KDTree.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef MESH_KDTREE_H -#define MESH_KDTREE_H +#pragma once #include "Elements.h" @@ -63,6 +62,3 @@ private: }; } // namespace MeshCore - - -#endif // MESH_KDTREE_H diff --git a/src/Mod/Mesh/App/Core/MeshIO.h b/src/Mod/Mesh/App/Core/MeshIO.h index 11039fc964..c1474e0425 100644 --- a/src/Mod/Mesh/App/Core/MeshIO.h +++ b/src/Mod/Mesh/App/Core/MeshIO.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_IO_H -#define MESH_IO_H +#pragma once #include #include @@ -348,5 +347,3 @@ private: } // namespace MeshCore - -#endif // MESH_IO_H diff --git a/src/Mod/Mesh/App/Core/MeshKernel.h b/src/Mod/Mesh/App/Core/MeshKernel.h index 500a7d0ee8..137c2845c1 100644 --- a/src/Mod/Mesh/App/Core/MeshKernel.h +++ b/src/Mod/Mesh/App/Core/MeshKernel.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_KERNEL_H -#define MESH_KERNEL_H +#pragma once #include #include @@ -640,5 +639,3 @@ inline void MeshKernel::SetFacetPoints( } // namespace MeshCore - -#endif // MESH_KERNEL_H diff --git a/src/Mod/Mesh/App/Core/Projection.h b/src/Mod/Mesh/App/Core/Projection.h index 47e8a2fb12..f435202bc7 100644 --- a/src/Mod/Mesh/App/Core/Projection.h +++ b/src/Mod/Mesh/App/Core/Projection.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_PROJECTION_H -#define MESH_PROJECTION_H +#pragma once #include #include @@ -84,5 +83,3 @@ private: }; } // namespace MeshCore - -#endif // MESH_PROJECTION_H diff --git a/src/Mod/Mesh/App/Core/Segmentation.h b/src/Mod/Mesh/App/Core/Segmentation.h index 08539acd66..096b3dcc1e 100644 --- a/src/Mod/Mesh/App/Core/Segmentation.h +++ b/src/Mod/Mesh/App/Core/Segmentation.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHCORE_SEGMENTATION_H -#define MESHCORE_SEGMENTATION_H +#pragma once #include #include @@ -407,5 +406,3 @@ private: }; } // namespace MeshCore - -#endif // MESHCORE_SEGMENTATION_H diff --git a/src/Mod/Mesh/App/Core/SetOperations.h b/src/Mod/Mesh/App/Core/SetOperations.h index 4d9e35f656..c3f1cd9fe0 100644 --- a/src/Mod/Mesh/App/Core/SetOperations.h +++ b/src/Mod/Mesh/App/Core/SetOperations.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_SETOPERATIONS_H -#define MESH_SETOPERATIONS_H +#pragma once #include #include @@ -252,5 +251,3 @@ private: } // namespace MeshCore - -#endif // MESH_SETOPERATIONS_H diff --git a/src/Mod/Mesh/App/Core/Smoothing.h b/src/Mod/Mesh/App/Core/Smoothing.h index 77956974ed..ea5569e9c1 100644 --- a/src/Mod/Mesh/App/Core/Smoothing.h +++ b/src/Mod/Mesh/App/Core/Smoothing.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_SMOOTHING_H -#define MESH_SMOOTHING_H +#pragma once #include #include @@ -164,6 +163,3 @@ private: }; } // namespace MeshCore - - -#endif // MESH_SMOOTHING_H diff --git a/src/Mod/Mesh/App/Core/SphereFit.h b/src/Mod/Mesh/App/Core/SphereFit.h index 1ef1bb54fa..3e72538e12 100644 --- a/src/Mod/Mesh/App/Core/SphereFit.h +++ b/src/Mod/Mesh/App/Core/SphereFit.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_SPHERE_FIT_H -#define MESH_SPHERE_FIT_H +#pragma once #include "Approximation.h" #include @@ -143,5 +142,3 @@ private: } // namespace MeshCoreFit - -#endif // MESH_SPHERE_FIT_H diff --git a/src/Mod/Mesh/App/Core/Tools.h b/src/Mod/Mesh/App/Core/Tools.h index be4709404d..58522d0820 100644 --- a/src/Mod/Mesh/App/Core/Tools.h +++ b/src/Mod/Mesh/App/Core/Tools.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_TOOLS_H -#define MESH_TOOLS_H +#pragma once #include #include @@ -227,6 +226,3 @@ private: }; } // namespace MeshCore - - -#endif // MESH_TOOLS_H diff --git a/src/Mod/Mesh/App/Core/TopoAlgorithm.h b/src/Mod/Mesh/App/Core/TopoAlgorithm.h index b8713af766..d9f38fa2fb 100644 --- a/src/Mod/Mesh/App/Core/TopoAlgorithm.h +++ b/src/Mod/Mesh/App/Core/TopoAlgorithm.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_TOPOALGORITHM_H -#define MESH_TOPOALGORITHM_H +#pragma once #include #include @@ -369,5 +368,3 @@ private: }; } // namespace MeshCore - -#endif // MESH_TOPOALGORITHM_H diff --git a/src/Mod/Mesh/App/Core/Triangulation.h b/src/Mod/Mesh/App/Core/Triangulation.h index 57abf26c22..459542a853 100644 --- a/src/Mod/Mesh/App/Core/Triangulation.h +++ b/src/Mod/Mesh/App/Core/Triangulation.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_TRIANGULATION_H -#define MESH_TRIANGULATION_H +#pragma once #include "Elements.h" @@ -282,6 +281,3 @@ protected: #endif } // namespace MeshCore - - -#endif // MESH_TRIANGULATION_H diff --git a/src/Mod/Mesh/App/Core/Trim.h b/src/Mod/Mesh/App/Core/Trim.h index 0eb93d63c8..efcd121ffd 100644 --- a/src/Mod/Mesh/App/Core/Trim.h +++ b/src/Mod/Mesh/App/Core/Trim.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHTRIM_H -#define MESHTRIM_H +#pragma once #include @@ -124,5 +123,3 @@ private: }; } // namespace MeshCore - -#endif // MESHTRIM_H diff --git a/src/Mod/Mesh/App/Core/TrimByPlane.h b/src/Mod/Mesh/App/Core/TrimByPlane.h index a26245c67c..d6f1226d60 100644 --- a/src/Mod/Mesh/App/Core/TrimByPlane.h +++ b/src/Mod/Mesh/App/Core/TrimByPlane.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHTRIM_BY_PLANE_H -#define MESHTRIM_BY_PLANE_H +#pragma once #include "MeshKernel.h" @@ -85,5 +84,3 @@ private: }; } // namespace MeshCore - -#endif // MESHTRIM_BY_PLANE_H diff --git a/src/Mod/Mesh/App/Core/Utilities.h b/src/Mod/Mesh/App/Core/Utilities.h index 110ea862ad..13a840f8f7 100644 --- a/src/Mod/Mesh/App/Core/Utilities.h +++ b/src/Mod/Mesh/App/Core/Utilities.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_UTILITIES_H -#define MESH_UTILITIES_H +#pragma once #include #include @@ -66,6 +65,3 @@ private: const vec_type& v; }; } // namespace Base - - -#endif // MESH_UTILITIES_H diff --git a/src/Mod/Mesh/App/Core/Visitor.h b/src/Mod/Mesh/App/Core/Visitor.h index be47edb930..81be1027bb 100644 --- a/src/Mod/Mesh/App/Core/Visitor.h +++ b/src/Mod/Mesh/App/Core/Visitor.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef VISITOR_H -#define VISITOR_H +#pragma once #include "MeshKernel.h" #include @@ -221,5 +220,3 @@ public: }; } // namespace MeshCore - -#endif // VISITOR_H diff --git a/src/Mod/Mesh/App/Edge.h b/src/Mod/Mesh/App/Edge.h index 3d9a51fe77..1504972c80 100644 --- a/src/Mod/Mesh/App/Edge.h +++ b/src/Mod/Mesh/App/Edge.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_EDGE_H -#define MESH_EDGE_H +#pragma once #include @@ -63,6 +62,3 @@ public: }; } // namespace Mesh - - -#endif // MESH_EDGE_H diff --git a/src/Mod/Mesh/App/Exporter.h b/src/Mod/Mesh/App/Exporter.h index 5228c6c140..853d7d9218 100644 --- a/src/Mod/Mesh/App/Exporter.h +++ b/src/Mod/Mesh/App/Exporter.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_EXPORTER_H -#define MESH_EXPORTER_H +#pragma once #include #include @@ -271,5 +270,3 @@ private: }; // class ExporterAMF } // namespace Mesh - -#endif // MESH_EXPORTER_H diff --git a/src/Mod/Mesh/App/Facet.h b/src/Mod/Mesh/App/Facet.h index a8bbc5bff7..cb377b5983 100644 --- a/src/Mod/Mesh/App/Facet.h +++ b/src/Mod/Mesh/App/Facet.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_FACET_H -#define MESH_FACET_H +#pragma once #include "Edge.h" @@ -65,6 +64,3 @@ public: }; } // namespace Mesh - - -#endif // MESH_FACET_H diff --git a/src/Mod/Mesh/App/FeatureMeshCurvature.h b/src/Mod/Mesh/App/FeatureMeshCurvature.h index a747f6b938..1882505a90 100644 --- a/src/Mod/Mesh/App/FeatureMeshCurvature.h +++ b/src/Mod/Mesh/App/FeatureMeshCurvature.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef FeatureMeshCurvature_H -#define FeatureMeshCurvature_H +#pragma once #include #include @@ -62,5 +61,3 @@ public: }; } // namespace Mesh - -#endif // Curvature_H diff --git a/src/Mod/Mesh/App/FeatureMeshDefects.h b/src/Mod/Mesh/App/FeatureMeshDefects.h index 0d2c6c38eb..4c57d91872 100644 --- a/src/Mod/Mesh/App/FeatureMeshDefects.h +++ b/src/Mod/Mesh/App/FeatureMeshDefects.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_FEATURE_MESH_DEFECTS_H -#define MESH_FEATURE_MESH_DEFECTS_H +#pragma once #include @@ -261,6 +260,3 @@ public: }; } // namespace Mesh - - -#endif // MESH_FEATURE_MESH_DEFECTS_H diff --git a/src/Mod/Mesh/App/FeatureMeshExport.h b/src/Mod/Mesh/App/FeatureMeshExport.h index 33da53d337..7267523cbc 100644 --- a/src/Mod/Mesh/App/FeatureMeshExport.h +++ b/src/Mod/Mesh/App/FeatureMeshExport.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_FEATUREMESHEXPORT_H -#define MESH_FEATUREMESHEXPORT_H +#pragma once #include #include @@ -63,5 +62,3 @@ public: }; } // namespace Mesh - -#endif // MESH_FEATUREMESHEXPORT_H diff --git a/src/Mod/Mesh/App/FeatureMeshImport.h b/src/Mod/Mesh/App/FeatureMeshImport.h index e4e7a7c5af..81bb46a366 100644 --- a/src/Mod/Mesh/App/FeatureMeshImport.h +++ b/src/Mod/Mesh/App/FeatureMeshImport.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef FEATURE_MESH_IMPORT_H -#define FEATURE_MESH_IMPORT_H +#pragma once #include "MeshFeature.h" @@ -56,5 +55,3 @@ public: }; } // namespace Mesh - -#endif // FEATURE_MESH_IMPORT_H diff --git a/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.h b/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.h index 1c862cfa56..cf8a767553 100644 --- a/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.h +++ b/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef FEATURE_MESH_SEGMENTBYMESH_H -#define FEATURE_MESH_SEGMENTBYMESH_H +#pragma once #include @@ -60,5 +59,3 @@ public: }; } // namespace Mesh - -#endif // FEATURE_MESH_SEGMENTBYMESH_H diff --git a/src/Mod/Mesh/App/FeatureMeshSetOperations.h b/src/Mod/Mesh/App/FeatureMeshSetOperations.h index ff66368ab7..d0b86e1c73 100644 --- a/src/Mod/Mesh/App/FeatureMeshSetOperations.h +++ b/src/Mod/Mesh/App/FeatureMeshSetOperations.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef FEATURE_MESH_SETOPERATIONS_H -#define FEATURE_MESH_SETOPERATIONS_H +#pragma once #include @@ -58,5 +57,3 @@ public: }; } // namespace Mesh - -#endif // FEATURE_MESH_SEGMENT_H diff --git a/src/Mod/Mesh/App/FeatureMeshSolid.h b/src/Mod/Mesh/App/FeatureMeshSolid.h index c77668d989..f9674a9d6e 100644 --- a/src/Mod/Mesh/App/FeatureMeshSolid.h +++ b/src/Mod/Mesh/App/FeatureMeshSolid.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef FEATURE_MESH_SOLID_H -#define FEATURE_MESH_SOLID_H +#pragma once #include "MeshFeature.h" @@ -195,5 +194,3 @@ public: }; } // namespace Mesh - -#endif // FEATURE_MESH_SOLID_H diff --git a/src/Mod/Mesh/App/FeatureMeshTransform.h b/src/Mod/Mesh/App/FeatureMeshTransform.h index e233ffd2e3..5b8ebb819b 100644 --- a/src/Mod/Mesh/App/FeatureMeshTransform.h +++ b/src/Mod/Mesh/App/FeatureMeshTransform.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef FEATURE_MESH_TRANSFORM_H -#define FEATURE_MESH_TRANSFORM_H +#pragma once #include @@ -62,5 +61,3 @@ public: }; } // namespace Mesh - -#endif // FEATURE_MESH_TRANSFORM_H diff --git a/src/Mod/Mesh/App/FeatureMeshTransformDemolding.h b/src/Mod/Mesh/App/FeatureMeshTransformDemolding.h index e5d0163e5f..4b511cc3fe 100644 --- a/src/Mod/Mesh/App/FeatureMeshTransformDemolding.h +++ b/src/Mod/Mesh/App/FeatureMeshTransformDemolding.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef FEATURE_MESH_TRANSFORM_DEMOLDING_H -#define FEATURE_MESH_TRANSFORM_DEMOLDING_H +#pragma once #include @@ -60,5 +59,3 @@ public: }; } // namespace Mesh - -#endif // FEATURE_MESH_TRANSFORM_H diff --git a/src/Mod/Mesh/App/Importer.h b/src/Mod/Mesh/App/Importer.h index d39fb091d7..5cfa57f1de 100644 --- a/src/Mod/Mesh/App/Importer.h +++ b/src/Mod/Mesh/App/Importer.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_IMPORTER_H -#define MESH_IMPORTER_H +#pragma once #include #include @@ -61,5 +60,3 @@ private: }; } // namespace Mesh - -#endif // MESH_IMPORTER_H diff --git a/src/Mod/Mesh/App/Mesh.h b/src/Mod/Mesh/App/Mesh.h index 674273e64d..bf7d54242e 100644 --- a/src/Mod/Mesh/App/Mesh.h +++ b/src/Mod/Mesh/App/Mesh.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_MESH_H -#define MESH_MESH_H +#pragma once #include #include @@ -500,6 +499,3 @@ private: }; } // namespace Mesh - - -#endif // MESH_MESH_H diff --git a/src/Mod/Mesh/App/MeshFeature.h b/src/Mod/Mesh/App/MeshFeature.h index 7dc8596b97..9093359c16 100644 --- a/src/Mod/Mesh/App/MeshFeature.h +++ b/src/Mod/Mesh/App/MeshFeature.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_FEATURE_H -#define MESH_FEATURE_H +#pragma once #include #include @@ -94,6 +93,3 @@ using FeatureCustom = App::FeatureCustomT; using FeaturePython = App::FeaturePythonT; } // namespace Mesh - - -#endif diff --git a/src/Mod/Mesh/App/MeshPoint.h b/src/Mod/Mesh/App/MeshPoint.h index a6886145d1..ae571fd45c 100644 --- a/src/Mod/Mesh/App/MeshPoint.h +++ b/src/Mod/Mesh/App/MeshPoint.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_MESHPOINT_H -#define MESH_MESHPOINT_H +#pragma once #include @@ -71,6 +70,3 @@ public: }; } // namespace Mesh - - -#endif // MESH_MESHPOINT_H diff --git a/src/Mod/Mesh/App/MeshProperties.h b/src/Mod/Mesh/App/MeshProperties.h index 63f2775b9a..49ff6a6991 100644 --- a/src/Mod/Mesh/App/MeshProperties.h +++ b/src/Mod/Mesh/App/MeshProperties.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_MESHPROPERTIES_H -#define MESH_MESHPROPERTIES_H +#pragma once #include #include @@ -328,5 +327,3 @@ private: }; } // namespace Mesh - -#endif // MESH_MESHPROPERTIES_H diff --git a/src/Mod/Mesh/App/MeshTexture.h b/src/Mod/Mesh/App/MeshTexture.h index 854c1b85da..06ea1333fc 100644 --- a/src/Mod/Mesh/App/MeshTexture.h +++ b/src/Mod/Mesh/App/MeshTexture.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_MESHTEXTURE_H -#define MESH_MESHTEXTURE_H +#pragma once #include @@ -111,5 +110,3 @@ private: }; } // namespace Mesh - -#endif // MESH_MESHTEXTURE_H diff --git a/src/Mod/Mesh/App/PreCompiled.h b/src/Mod/Mesh/App/PreCompiled.h index 6550e5f72e..f7674f26c2 100644 --- a/src/Mod/Mesh/App/PreCompiled.h +++ b/src/Mod/Mesh/App/PreCompiled.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef MESH_PRECOMPILED_H -#define MESH_PRECOMPILED_H +#pragma once #include @@ -73,5 +72,3 @@ #include #include #include - -#endif diff --git a/src/Mod/Mesh/App/Segment.h b/src/Mod/Mesh/App/Segment.h index eb824a4d64..d52654ea67 100644 --- a/src/Mod/Mesh/App/Segment.h +++ b/src/Mod/Mesh/App/Segment.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_SEGMENT_H -#define MESH_SEGMENT_H +#pragma once #include #include @@ -134,6 +133,3 @@ public: }; } // namespace Mesh - - -#endif // MESH_SEGMENT_H diff --git a/src/Mod/Mesh/App/Types.h b/src/Mod/Mesh/App/Types.h index fa47904ddc..8e95f7a1e2 100644 --- a/src/Mod/Mesh/App/Types.h +++ b/src/Mod/Mesh/App/Types.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_TYPES_H -#define MESH_TYPES_H +#pragma once #include "Core/Definitions.h" @@ -36,5 +35,3 @@ using FacetIndex = MeshCore::FacetIndex; using PointIndex = MeshCore::PointIndex; } // namespace Mesh - -#endif // MESH_TYPES_H diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4ApprCylinderFit3.h b/src/Mod/Mesh/App/WildMagic4/Wm4ApprCylinderFit3.h index b7c2f5d5af..520c90e9f5 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4ApprCylinderFit3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4ApprCylinderFit3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4APPRCYLINDERFIT3_H -#define WM4APPRCYLINDERFIT3_H +#pragma once // Least-squares fit of a finite cylinder to (x,y,z) data. The cylinder has // center C, unit-length axis direction U, radius r, and height h. The end @@ -79,6 +78,4 @@ private: typedef CylinderFit3 CylinderFit3f; typedef CylinderFit3 CylinderFit3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4ApprGaussPointsFit2.h b/src/Mod/Mesh/App/WildMagic4/Wm4ApprGaussPointsFit2.h index 2c2fcb5e48..2e2b703fc8 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4ApprGaussPointsFit2.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4ApprGaussPointsFit2.h @@ -8,8 +8,7 @@ // // File Version: 4.10.0 (2009/11/18) -#ifndef WM4APPRGAUSSPOINTSFIT2_H -#define WM4APPRGAUSSPOINTSFIT2_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Box2.h" @@ -25,6 +24,4 @@ namespace Wm4 template WM4_FOUNDATION_ITEM Box2 GaussPointsFit2 (int iQuantity, const Vector2* akPoint); -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4ApprGaussPointsFit3.h b/src/Mod/Mesh/App/WildMagic4/Wm4ApprGaussPointsFit3.h index eb37019572..4f35a53d56 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4ApprGaussPointsFit3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4ApprGaussPointsFit3.h @@ -8,8 +8,7 @@ // // File Version: 4.10.0 (2009/11/18) -#ifndef WM4APPRGAUSSPOINTSFIT3_H -#define WM4APPRGAUSSPOINTSFIT3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Box3.h" @@ -25,6 +24,4 @@ namespace Wm4 template WM4_FOUNDATION_ITEM Box3 GaussPointsFit3 (int iQuantity, const Vector3* akPoint); -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4ApprLineFit3.h b/src/Mod/Mesh/App/WildMagic4/Wm4ApprLineFit3.h index 60bd6bf3c6..b974ca228e 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4ApprLineFit3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4ApprLineFit3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4APPRLINEFIT3_H -#define WM4APPRLINEFIT3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Line3.h" @@ -30,6 +29,4 @@ namespace Wm4 template WM4_FOUNDATION_ITEM Line3 OrthogonalLineFit3 (int iQuantity, const Vector3* akPoint); -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4ApprPlaneFit3.h b/src/Mod/Mesh/App/WildMagic4/Wm4ApprPlaneFit3.h index 088afbf820..4263f8754e 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4ApprPlaneFit3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4ApprPlaneFit3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4APPRPLANEFIT3_H -#define WM4APPRPLANEFIT3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Plane3.h" @@ -40,6 +39,4 @@ template WM4_FOUNDATION_ITEM Plane3 OrthogonalPlaneFit3 (int iQuantity, const Vector3* akPoint); -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4ApprPolyFit3.h b/src/Mod/Mesh/App/WildMagic4/Wm4ApprPolyFit3.h index be47c496a8..a56487e8cd 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4ApprPolyFit3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4ApprPolyFit3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4APPRPOLYFIT3_H -#define WM4APPRPOLYFIT3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4System.h" @@ -55,6 +54,4 @@ template WM4_FOUNDATION_ITEM Real* PolyFit3 (int iSamples, const Real* afX, const Real* afY, const Real* afW, int iXDegree, int iYDegree); -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4ApprQuadraticFit3.h b/src/Mod/Mesh/App/WildMagic4/Wm4ApprQuadraticFit3.h index 09a1c85447..c06397813a 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4ApprQuadraticFit3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4ApprQuadraticFit3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4APPRQUADRATICFIT3_H -#define WM4APPRQUADRATICFIT3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Vector3.h" @@ -72,6 +71,4 @@ template WM4_FOUNDATION_ITEM Real QuadraticSphereFit3 (int iQuantity, const Vector3* akPoint, Vector3& rkCenter, Real& rfRadius); -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4ApprSphereFit3.h b/src/Mod/Mesh/App/WildMagic4/Wm4ApprSphereFit3.h index 6b39e121ee..e81917ec19 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4ApprSphereFit3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4ApprSphereFit3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4APPRSPHEREFIT3_H -#define WM4APPRSPHEREFIT3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Sphere3.h" @@ -42,6 +41,4 @@ bool SphereFit3 (int iQuantity, const Vector3* akPoint, int iMaxIterations, Sphere3& rkSphere, bool bInitialCenterIsAverage); -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4BandedMatrix.h b/src/Mod/Mesh/App/WildMagic4/Wm4BandedMatrix.h index 76defde59c..dcc650fde9 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4BandedMatrix.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4BandedMatrix.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4BANDEDMATRIX_H -#define WM4BANDEDMATRIX_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4System.h" @@ -74,6 +73,4 @@ namespace Wm4 { typedef BandedMatrix BandedMatrixf; typedef BandedMatrix BandedMatrixd; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Box2.h b/src/Mod/Mesh/App/WildMagic4/Wm4Box2.h index a1d0bc733b..c2be7be720 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Box2.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Box2.h @@ -8,8 +8,7 @@ // // File Version: 4.10.0 (2009/11/18) -#ifndef WM4BOX2_H -#define WM4BOX2_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Vector2.h" @@ -45,6 +44,4 @@ public: typedef Box2 Box2f; typedef Box2 Box2d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Box3.h b/src/Mod/Mesh/App/WildMagic4/Wm4Box3.h index 4a1b2c3519..2fbcfb2b34 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Box3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Box3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4BOX3_H -#define WM4BOX3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Vector3.h" @@ -57,6 +56,4 @@ namespace Wm4 { typedef Box3 Box3f; typedef Box3 Box3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4ContBox2.h b/src/Mod/Mesh/App/WildMagic4/Wm4ContBox2.h index 7f63a57c1e..00b70412ac 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4ContBox2.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4ContBox2.h @@ -8,8 +8,7 @@ // // File Version: 4.10.0 (2009/11/18) -#ifndef WM4CONTBOX2_H -#define WM4CONTBOX2_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Box2.h" @@ -47,6 +46,4 @@ bool InBox (const Vector2& rkPoint, const Box2& rkBox); template WM4_FOUNDATION_ITEM Box2 MergeBoxes (const Box2& rkBox0, const Box2& rkBox1); -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4ContBox3.h b/src/Mod/Mesh/App/WildMagic4/Wm4ContBox3.h index 960b71ee4f..f59930b452 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4ContBox3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4ContBox3.h @@ -8,8 +8,7 @@ // // File Version: 4.10.0 (2009/11/18) -#ifndef WM4CONTBOX3_H -#define WM4CONTBOX3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Box3.h" @@ -45,6 +44,4 @@ bool InBox (const Vector3& rkPoint, const Box3& rkBox); template WM4_FOUNDATION_ITEM Box3 MergeBoxes (const Box3& rkBox0, const Box3& rkBox1); -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4ConvexHull.h b/src/Mod/Mesh/App/WildMagic4/Wm4ConvexHull.h index 7b5c52fd5a..15f82f1a79 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4ConvexHull.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4ConvexHull.h @@ -8,8 +8,7 @@ // // File Version: 4.10.0 (2009/11/18) -#ifndef WM4CONVEXHULL_H -#define WM4CONVEXHULL_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4System.h" @@ -97,6 +96,4 @@ protected: typedef ConvexHull ConvexHullf; typedef ConvexHull ConvexHulld; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4ConvexHull1.h b/src/Mod/Mesh/App/WildMagic4/Wm4ConvexHull1.h index 1d169f8ae4..1fc1b8fe0d 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4ConvexHull1.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4ConvexHull1.h @@ -8,8 +8,7 @@ // // File Version: 4.10.0 (2009/11/18) -#ifndef WM4CONVEXHULL1_H -#define WM4CONVEXHULL1_H +#pragma once // A fancy class to compute the minimum and maximum of a collection of // real-valued numbers, but this provides some convenience for ConvexHull2 and @@ -70,6 +69,4 @@ private: typedef ConvexHull1 ConvexHull1f; typedef ConvexHull1 ConvexHull1d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4ConvexHull2.h b/src/Mod/Mesh/App/WildMagic4/Wm4ConvexHull2.h index 05b496388a..72f8b1228b 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4ConvexHull2.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4ConvexHull2.h @@ -8,8 +8,7 @@ // // File Version: 4.10.0 (2009/11/18) -#ifndef WM4CONVEXHULL2_H -#define WM4CONVEXHULL2_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4ConvexHull1.h" @@ -93,6 +92,4 @@ private: typedef ConvexHull2 ConvexHull2f; typedef ConvexHull2 ConvexHull2d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4ConvexHull3.h b/src/Mod/Mesh/App/WildMagic4/Wm4ConvexHull3.h index ada4e7912e..8c3dd9d8b7 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4ConvexHull3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4ConvexHull3.h @@ -8,8 +8,7 @@ // // File Version: 4.10.0 (2009/11/18) -#ifndef WM4CONVEXHULL3_H -#define WM4CONVEXHULL3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4ConvexHull1.h" @@ -123,6 +122,4 @@ private: typedef ConvexHull3 ConvexHull3f; typedef ConvexHull3 ConvexHull3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4DelPolygonEdge.h b/src/Mod/Mesh/App/WildMagic4/Wm4DelPolygonEdge.h index 138a5dcd68..4a106c1ab8 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4DelPolygonEdge.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4DelPolygonEdge.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4DELPOLYGONEDGE_H -#define WM4DELPOLYGONEDGE_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4VEManifoldMesh.h" @@ -42,6 +41,4 @@ public: typedef DelPolygonEdge DelPolygonEdgef; typedef DelPolygonEdge DelPolygonEdged; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4DelPolyhedronFace.h b/src/Mod/Mesh/App/WildMagic4/Wm4DelPolyhedronFace.h index 3fae63b89d..78db50aaa5 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4DelPolyhedronFace.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4DelPolyhedronFace.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4DELPOLYHEDRONFACE_H -#define WM4DELPOLYHEDRONFACE_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4ETManifoldMesh.h" @@ -42,6 +41,4 @@ public: typedef DelPolyhedronFace DelPolyhedronFacef; typedef DelPolyhedronFace DelPolyhedronFaced; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4DelTetrahedron.h b/src/Mod/Mesh/App/WildMagic4/Wm4DelTetrahedron.h index fc3283f1a4..9aa14f963f 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4DelTetrahedron.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4DelTetrahedron.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4DELTETRAHEDRON_H -#define WM4DELTETRAHEDRON_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Query3.h" @@ -45,6 +44,4 @@ public: typedef DelTetrahedron DelTetrahedronf; typedef DelTetrahedron DelTetrahedrond; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4DelTriangle.h b/src/Mod/Mesh/App/WildMagic4/Wm4DelTriangle.h index 64e7341aae..f9096958a7 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4DelTriangle.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4DelTriangle.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4DELTRIANGLE_H -#define WM4DELTRIANGLE_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Query2.h" @@ -45,6 +44,4 @@ public: typedef DelTriangle DelTrianglef; typedef DelTriangle DelTriangled; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Delaunay.h b/src/Mod/Mesh/App/WildMagic4/Wm4Delaunay.h index 8b47db6620..d2435770aa 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Delaunay.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Delaunay.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4DELAUNAY_H -#define WM4DELAUNAY_H +#pragma once // The base class for Delaunay algorithms stores the number of mesh components // and the connectivity information for the mesh. @@ -166,6 +165,4 @@ protected: typedef Delaunay Delaunayf; typedef Delaunay Delaunayd; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Delaunay1.h b/src/Mod/Mesh/App/WildMagic4/Wm4Delaunay1.h index 3d83146b9e..d32f662aab 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Delaunay1.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Delaunay1.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4DELAUNAY1_H -#define WM4DELAUNAY1_H +#pragma once // A fancy class to sort a collection of real-valued numbers, but this // provides some convenience for Delaunay2 and Delaunay3 when the input point @@ -114,6 +113,4 @@ private: typedef Delaunay1 Delaunay1f; typedef Delaunay1 Delaunay1d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Delaunay2.h b/src/Mod/Mesh/App/WildMagic4/Wm4Delaunay2.h index 9902d7cceb..04b6d7ebed 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Delaunay2.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Delaunay2.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4DELAUNAY2_H -#define WM4DELAUNAY2_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Delaunay1.h" @@ -172,6 +171,4 @@ private: typedef Delaunay2 Delaunay2f; typedef Delaunay2 Delaunay2d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Delaunay3.h b/src/Mod/Mesh/App/WildMagic4/Wm4Delaunay3.h index 197c4cb7d5..7e67eaf47c 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Delaunay3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Delaunay3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4DELAUNAY3_H -#define WM4DELAUNAY3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Delaunay1.h" @@ -187,6 +186,4 @@ private: typedef Delaunay3 Delaunay3f; typedef Delaunay3 Delaunay3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4DistLine3Segment3.h b/src/Mod/Mesh/App/WildMagic4/Wm4DistLine3Segment3.h index bcefb793ea..ef0e7d52be 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4DistLine3Segment3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4DistLine3Segment3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4DISTLINE3SEGMENT3_H -#define WM4DISTLINE3SEGMENT3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Distance.h" @@ -68,6 +67,4 @@ private: typedef DistLine3Segment3 DistLine3Segment3f; typedef DistLine3Segment3 DistLine3Segment3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4DistLine3Triangle3.h b/src/Mod/Mesh/App/WildMagic4/Wm4DistLine3Triangle3.h index 87bbbf3601..d5f25f8209 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4DistLine3Triangle3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4DistLine3Triangle3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4DISTLINE4TRIANGLE3_H -#define WM4DISTLINE4TRIANGLE3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Distance.h" @@ -68,6 +67,4 @@ private: typedef DistLine3Triangle3 DistLine3Triangle3f; typedef DistLine3Triangle3 DistLine3Triangle3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4DistSegment3Segment3.h b/src/Mod/Mesh/App/WildMagic4/Wm4DistSegment3Segment3.h index a74c0dca4f..cdda26dfb0 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4DistSegment3Segment3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4DistSegment3Segment3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4DISTSEGMENT3SEGMENT3_H -#define WM4DISTSEGMENT3SEGMENT3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Distance.h" @@ -67,6 +66,4 @@ private: typedef DistSegment3Segment3 DistSegment3Segment3f; typedef DistSegment3Segment3 DistSegment3Segment3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4DistSegment3Triangle3.h b/src/Mod/Mesh/App/WildMagic4/Wm4DistSegment3Triangle3.h index 155cd109d8..6a2d4ad7f3 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4DistSegment3Triangle3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4DistSegment3Triangle3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4DISTSEGMENT3TRIANGLE3_H -#define WM4DISTSEGMENT3TRIANGLE3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Distance.h" @@ -68,6 +67,4 @@ private: typedef DistSegment3Triangle3 DistSegment3Triangle3f; typedef DistSegment3Triangle3 DistSegment3Triangle3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4DistVector3Plane3.h b/src/Mod/Mesh/App/WildMagic4/Wm4DistVector3Plane3.h index 1cbd27c98a..454ed42c9d 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4DistVector3Plane3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4DistVector3Plane3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4DISTVECTOR3PLANE3_H -#define WM4DISTVECTOR3PLANE3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Distance.h" @@ -59,6 +58,4 @@ private: typedef DistVector3Plane3 DistVector3Plane3f; typedef DistVector3Plane3 DistVector3Plane3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4DistVector3Segment3.h b/src/Mod/Mesh/App/WildMagic4/Wm4DistVector3Segment3.h index 6436170389..44541e3f36 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4DistVector3Segment3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4DistVector3Segment3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4DISTVECTOR3SEGMENT3_H -#define WM4DISTVECTOR3SEGMENT3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Distance.h" @@ -65,6 +64,4 @@ private: typedef DistVector3Segment3 DistVector3Segment3f; typedef DistVector3Segment3 DistVector3Segment3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4DistVector3Triangle3.h b/src/Mod/Mesh/App/WildMagic4/Wm4DistVector3Triangle3.h index e6129e3185..5c134fb918 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4DistVector3Triangle3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4DistVector3Triangle3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4DISTVECTOR3TRIANGLE3_H -#define WM4DISTVECTOR3TRIANGLE3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Distance.h" @@ -65,6 +64,4 @@ private: typedef DistVector3Triangle3 DistVector3Triangle3f; typedef DistVector3Triangle3 DistVector3Triangle3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Distance.h b/src/Mod/Mesh/App/WildMagic4/Wm4Distance.h index 307192dff1..d8fd0bfd0d 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Distance.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Distance.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4DISTANCE_H -#define WM4DISTANCE_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Vector2.h" @@ -97,6 +96,4 @@ typedef Distance Distance3f; typedef Distance Distance2d; typedef Distance Distance3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4ETManifoldMesh.h b/src/Mod/Mesh/App/WildMagic4/Wm4ETManifoldMesh.h index c8bd69ce4b..0386cf2d2d 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4ETManifoldMesh.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4ETManifoldMesh.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4ETMANIFOLDMESH_H -#define WM4ETMANIFOLDMESH_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4EdgeKey.h" @@ -113,6 +112,4 @@ protected: } //namespace Wm4 -#include "Wm4ETManifoldMesh.inl" - -#endif +#include "Wm4ETManifoldMesh.inl" \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4EdgeKey.h b/src/Mod/Mesh/App/WildMagic4/Wm4EdgeKey.h index 6e014dab4d..ab2ee8bacd 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4EdgeKey.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4EdgeKey.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4EDGEKEY_H -#define WM4EDGEKEY_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4System.h" @@ -36,6 +35,4 @@ public: } -#include "Wm4EdgeKey.inl" - -#endif +#include "Wm4EdgeKey.inl" \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Eigen.h b/src/Mod/Mesh/App/WildMagic4/Wm4Eigen.h index 439fcf534f..5426d3452e 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Eigen.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Eigen.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4EIGEN_H -#define WM4EIGEN_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Matrix2.h" @@ -112,6 +111,4 @@ private: typedef Eigen Eigenf; typedef Eigen Eigend; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Foundation.h b/src/Mod/Mesh/App/WildMagic4/Wm4Foundation.h index 74390ad613..3c15f10198 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Foundation.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Foundation.h @@ -16,8 +16,7 @@ // // Version: 4.0.6 (2006/11/05) -#ifndef WM4FOUNDATION_H -#define WM4FOUNDATION_H +#pragma once // approximation #include "Wm4ApprCircleFit2.h" @@ -376,6 +375,4 @@ #include "Wm4TMinHeap.h" #include "Wm4TSmallUnorderedSet.h" #include "Wm4TStringHashTable.h" -#include "Wm4TTuple.h" - -#endif +#include "Wm4TTuple.h" \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4FoundationLIB.h b/src/Mod/Mesh/App/WildMagic4/Wm4FoundationLIB.h index 4c62d8b308..0d1dba86d4 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4FoundationLIB.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4FoundationLIB.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4FOUNDATIONLIB_H -#define WM4FOUNDATIONLIB_H +#pragma once // For the DLL library. #ifdef WM4_FOUNDATION_DLL_EXPORT @@ -33,5 +32,4 @@ #define WM4_FOUNDATION_ITEM #endif -#endif -#endif +#endif \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4FoundationPCH.h b/src/Mod/Mesh/App/WildMagic4/Wm4FoundationPCH.h index 5f41f47b3c..faa8b68ae5 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4FoundationPCH.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4FoundationPCH.h @@ -16,8 +16,7 @@ // // Version: 4.0.5 (2006/11/05) -#ifndef WM4FOUNDATIONPCH_H -#define WM4FOUNDATIONPCH_H +#pragma once #ifdef WM4_USE_PRECOMPILED_HEADERS @@ -379,6 +378,4 @@ #include "Wm4TSmallUnorderedSet.h" #include "Wm4TStringHashTable.h" #include "Wm4TTuple.h" -#endif - -#endif +#endif \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4GMatrix.h b/src/Mod/Mesh/App/WildMagic4/Wm4GMatrix.h index f6e0a35469..e4cd0f791d 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4GMatrix.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4GMatrix.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4GMATRIX_H -#define WM4GMATRIX_H +#pragma once // Matrix operations are applied on the left. For example, given a matrix M // and a vector V, matrix-times-vector is M*V. That is, V is treated as a @@ -146,6 +145,4 @@ namespace Wm4 { typedef GMatrix GMatrixf; typedef GMatrix GMatrixd; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4GVector.h b/src/Mod/Mesh/App/WildMagic4/Wm4GVector.h index 8286d5fa87..bea52953ea 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4GVector.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4GVector.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4GVECTOR_H -#define WM4GVECTOR_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Math.h" @@ -92,6 +91,4 @@ namespace Wm4 { typedef GVector GVectorf; typedef GVector GVectord; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4ImplicitSurface.h b/src/Mod/Mesh/App/WildMagic4/Wm4ImplicitSurface.h index 65cc00be91..751a8abedc 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4ImplicitSurface.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4ImplicitSurface.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4IMPLICITSURFACE_H -#define WM4IMPLICITSURFACE_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Matrix3.h" @@ -81,6 +80,4 @@ protected: typedef ImplicitSurface ImplicitSurfacef; typedef ImplicitSurface ImplicitSurfaced; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Intersector.h b/src/Mod/Mesh/App/WildMagic4/Wm4Intersector.h index 152b4938c8..1e7b1f9471 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Intersector.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Intersector.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4INTERSECTOR_H -#define WM4INTERSECTOR_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4LinComp.h" @@ -81,6 +80,4 @@ typedef Intersector > Intersector3f; typedef Intersector > Intersector2d; typedef Intersector > Intersector3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Intersector1.h b/src/Mod/Mesh/App/WildMagic4/Wm4Intersector1.h index 7be8e4a98e..aaaf0ccc2d 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Intersector1.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Intersector1.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4INTERSECTOR1_H -#define WM4INTERSECTOR1_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Math.h" @@ -72,6 +71,4 @@ protected: typedef Intersector1 Intersector1f; typedef Intersector1 Intersector1d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4IntrLine3Box3.h b/src/Mod/Mesh/App/WildMagic4/Wm4IntrLine3Box3.h index 99e6b166ef..95483f7abf 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4IntrLine3Box3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4IntrLine3Box3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4INTRLINE3BOX3_H -#define WM4INTRLINE3BOX3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Intersector.h" @@ -73,6 +72,4 @@ public: typedef IntrLine3Box3 IntrLine3Box3f; typedef IntrLine3Box3 IntrLine3Box3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4IntrLine3Plane3.h b/src/Mod/Mesh/App/WildMagic4/Wm4IntrLine3Plane3.h index 7820aa9044..1b5e00797a 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4IntrLine3Plane3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4IntrLine3Plane3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4INTRLINE3PLANE3_H -#define WM4INTRLINE3PLANE3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Intersector.h" @@ -63,6 +62,4 @@ private: typedef IntrLine3Plane3 IntrLine3Plane3f; typedef IntrLine3Plane3 IntrLine3Plane3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4IntrSegment3Box3.h b/src/Mod/Mesh/App/WildMagic4/Wm4IntrSegment3Box3.h index 7235bf4480..4bf00837ee 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4IntrSegment3Box3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4IntrSegment3Box3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4INTRSEGMENT3BOX3_H -#define WM4INTRSEGMENT3BOX3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Intersector.h" @@ -63,6 +62,4 @@ private: typedef IntrSegment3Box3 IntrSegment3Box3f; typedef IntrSegment3Box3 IntrSegment3Box3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4IntrSegment3Plane3.h b/src/Mod/Mesh/App/WildMagic4/Wm4IntrSegment3Plane3.h index 3c0721a320..605dd91b96 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4IntrSegment3Plane3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4IntrSegment3Plane3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4INTRSEGMENT3PLANE3_H -#define WM4INTRSEGMENT3PLANE3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Intersector.h" @@ -65,6 +64,4 @@ private: typedef IntrSegment3Plane3 IntrSegment3Plane3f; typedef IntrSegment3Plane3 IntrSegment3Plane3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4IntrTriangle2Triangle2.h b/src/Mod/Mesh/App/WildMagic4/Wm4IntrTriangle2Triangle2.h index 563b1f0e95..1aba177a26 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4IntrTriangle2Triangle2.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4IntrTriangle2Triangle2.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4INTRTRIANGLE2TRIANGLE2_H -#define WM4INTRTRIANGLE2TRIANGLE2_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Intersector.h" @@ -105,6 +104,4 @@ private: typedef IntrTriangle2Triangle2 IntrTriangle2Triangle2f; typedef IntrTriangle2Triangle2 IntrTriangle2Triangle2d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4IntrTriangle3Triangle3.h b/src/Mod/Mesh/App/WildMagic4/Wm4IntrTriangle3Triangle3.h index 2dde256b67..ac05455fa9 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4IntrTriangle3Triangle3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4IntrTriangle3Triangle3.h @@ -16,8 +16,7 @@ // // Version: 4.0.1 (2006/07/25) -#ifndef WM4INTRTRIANGLE3TRIANGLE3_H -#define WM4INTRTRIANGLE3TRIANGLE3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Intersector.h" @@ -141,6 +140,4 @@ private: typedef IntrTriangle3Triangle3 IntrTriangle3Triangle3f; typedef IntrTriangle3Triangle3 IntrTriangle3Triangle3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4LinComp.h b/src/Mod/Mesh/App/WildMagic4/Wm4LinComp.h index abad66a394..fc500a138a 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4LinComp.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4LinComp.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4LINCOMP_H -#define WM4LINCOMP_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Math.h" @@ -121,6 +120,4 @@ namespace Wm4 { typedef LinComp LinCompf; typedef LinComp LinCompd; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Line3.h b/src/Mod/Mesh/App/WildMagic4/Wm4Line3.h index 56c53b8cb5..b79b98bd88 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Line3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Line3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4LINE3_H -#define WM4LINE3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Vector3.h" @@ -48,6 +47,4 @@ namespace Wm4 { typedef Line3 Line3f; typedef Line3 Line3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4LinearSystem.h b/src/Mod/Mesh/App/WildMagic4/Wm4LinearSystem.h index dbaae4de60..610862b6f4 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4LinearSystem.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4LinearSystem.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4LINEARSYSTEM_H -#define WM4LINEARSYSTEM_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4BandedMatrix.h" @@ -144,6 +143,4 @@ private: typedef LinearSystem LinearSystemf; typedef LinearSystem LinearSystemd; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Mapper2.h b/src/Mod/Mesh/App/WildMagic4/Wm4Mapper2.h index 6b5542505d..939ca37308 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Mapper2.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Mapper2.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4MAPPER2_H -#define WM4MAPPER2_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Vector2.h" @@ -99,6 +98,4 @@ namespace Wm4 { typedef Mapper2 Mapper2f; typedef Mapper2 Mapper2d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Mapper3.h b/src/Mod/Mesh/App/WildMagic4/Wm4Mapper3.h index 49a24ad6a8..da1587991b 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Mapper3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Mapper3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4MAPPER3_H -#define WM4MAPPER3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Vector3.h" @@ -105,6 +104,4 @@ namespace Wm4 { typedef Mapper3 Mapper3f; typedef Mapper3 Mapper3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Math.h b/src/Mod/Mesh/App/WildMagic4/Wm4Math.h index 226a16115d..1fe2497627 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Math.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Math.h @@ -16,8 +16,7 @@ // // Version: 4.0.1 (2006/08/22) -#ifndef WM4MATH_H -#define WM4MATH_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4System.h" @@ -154,6 +153,4 @@ namespace Wm4 typedef Math Mathf; typedef Math Mathd; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4MathMCR.h b/src/Mod/Mesh/App/WildMagic4/Wm4MathMCR.h index 90ae37dff4..d71bdde801 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4MathMCR.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4MathMCR.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4MATHMCR_H -#define WM4MATHMCR_H +#pragma once //---------------------------------------------------------------------------- @@ -44,8 +43,4 @@ { \ iInt = 0; \ } \ -} - -//---------------------------------------------------------------------------- - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Matrix2.h b/src/Mod/Mesh/App/WildMagic4/Wm4Matrix2.h index 1c8ccb0b53..64f63a37f4 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Matrix2.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Matrix2.h @@ -16,8 +16,7 @@ // // Version: 4.0.1 (2006/08/19) -#ifndef WM4MATRIX2_H -#define WM4MATRIX2_H +#pragma once // Matrix operations are applied on the left. For example, given a matrix M // and a vector V, matrix-times-vector is M*V. That is, V is treated as a @@ -185,6 +184,4 @@ namespace Wm4 { typedef Matrix2 Matrix2f; typedef Matrix2 Matrix2d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Matrix3.h b/src/Mod/Mesh/App/WildMagic4/Wm4Matrix3.h index bb0ab8a5ea..d356568417 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Matrix3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Matrix3.h @@ -16,8 +16,7 @@ // // Version: 4.0.2 (2006/09/05) -#ifndef WM4MATRIX3_H -#define WM4MATRIX3_H +#pragma once // Matrix operations are applied on the left. For example, given a matrix M // and a vector V, matrix-times-vector is M*V. That is, V is treated as a @@ -257,6 +256,4 @@ namespace Wm4 { typedef Matrix3 Matrix3f; typedef Matrix3 Matrix3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Matrix4.h b/src/Mod/Mesh/App/WildMagic4/Wm4Matrix4.h index 9f915110e4..a2bf3978eb 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Matrix4.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Matrix4.h @@ -16,8 +16,7 @@ // // Version: 4.0.1 (2006/08/19) -#ifndef WM4MATRIX4_H -#define WM4MATRIX4_H +#pragma once // Matrix operations are applied on the left. For example, given a matrix M // and a vector V, matrix-times-vector is M*V. That is, V is treated as a @@ -161,6 +160,4 @@ namespace Wm4 { typedef Matrix4 Matrix4f; typedef Matrix4 Matrix4d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Memory.h b/src/Mod/Mesh/App/WildMagic4/Wm4Memory.h index bcf432f217..46bd9b27e0 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Memory.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Memory.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4MEMORY_H -#define WM4MEMORY_H +#pragma once #ifndef WM4_MEMORY_MANAGER @@ -137,5 +136,4 @@ void operator delete[] (void* pvAddr); void operator delete (void* pvAddr, char* acFile, unsigned int uiLine); void operator delete[] (void* pvAddr, char* acFile, unsigned int uiLine); -#endif -#endif +#endif \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4MeshCurvature.h b/src/Mod/Mesh/App/WildMagic4/Wm4MeshCurvature.h index 5860931b31..0c0e8091ac 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4MeshCurvature.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4MeshCurvature.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4MESHCURVATURE_H -#define WM4MESHCURVATURE_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Matrix3.h" @@ -65,6 +64,4 @@ protected: typedef MeshCurvature MeshCurvaturef; typedef MeshCurvature MeshCurvatured; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4MeshSmoother.h b/src/Mod/Mesh/App/WildMagic4/Wm4MeshSmoother.h index b8052daf15..9a10bf45f7 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4MeshSmoother.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4MeshSmoother.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4MESHSMOOTHER_H -#define WM4MESHSMOOTHER_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Vector3.h" @@ -74,6 +73,4 @@ protected: typedef MeshSmoother MeshSmootherf; typedef MeshSmoother MeshSmootherd; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4ParametricSurface.h b/src/Mod/Mesh/App/WildMagic4/Wm4ParametricSurface.h index f1f524734c..5b594878c2 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4ParametricSurface.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4ParametricSurface.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4PARAMETRICSURFACE_H -#define WM4PARAMETRICSURFACE_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Surface.h" @@ -76,6 +75,4 @@ protected: typedef ParametricSurface ParametricSurfacef; typedef ParametricSurface ParametricSurfaced; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Plane3.h b/src/Mod/Mesh/App/WildMagic4/Wm4Plane3.h index c5b402d181..f2e18bc739 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Plane3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Plane3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4PLANE3_H -#define WM4PLANE3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Vector3.h" @@ -76,6 +75,4 @@ namespace Wm4 { typedef Plane3 Plane3f; typedef Plane3 Plane3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Platforms.h b/src/Mod/Mesh/App/WildMagic4/Wm4Platforms.h index efb4084588..b1b5dc35c9 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Platforms.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Platforms.h @@ -16,8 +16,7 @@ // // Version: 4.0.1 (2006/11/14) -#ifndef WM4PLATFORMS_H -#define WM4PLATFORMS_H +#pragma once // Platform-specific information goes in this header file. The defines to // control which platform is included are: @@ -122,7 +121,4 @@ typedef int64_t Integer64; #include typedef int64_t Integer64; -#endif -//---------------------------------------------------------------------------- - -#endif +#endif \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Polynomial1.h b/src/Mod/Mesh/App/WildMagic4/Wm4Polynomial1.h index be9b1d38b4..94b515cc6a 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Polynomial1.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Polynomial1.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4POLYNOMIAL1_H -#define WM4POLYNOMIAL1_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Math.h" @@ -104,6 +103,4 @@ namespace Wm4 { typedef Polynomial1 Polynomial1f; typedef Polynomial1 Polynomial1d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4PolynomialRoots.h b/src/Mod/Mesh/App/WildMagic4/Wm4PolynomialRoots.h index 35136992db..0087cc28c2 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4PolynomialRoots.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4PolynomialRoots.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4POLYNOMIALROOTS_H -#define WM4POLYNOMIALROOTS_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4GMatrix.h" @@ -161,6 +160,4 @@ private: typedef PolynomialRoots PolynomialRootsf; typedef PolynomialRoots PolynomialRootsd; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4QuadricSurface.h b/src/Mod/Mesh/App/WildMagic4/Wm4QuadricSurface.h index 473fea5b82..27b56dcf17 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4QuadricSurface.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4QuadricSurface.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4QUADRICSURFACE_H -#define WM4QUADRICSURFACE_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4ImplicitSurface.h" @@ -156,6 +155,4 @@ private: typedef QuadricSurface QuadricSurfacef; typedef QuadricSurface QuadricSurfaced; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Quaternion.h b/src/Mod/Mesh/App/WildMagic4/Wm4Quaternion.h index 118411aa07..046fc448bd 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Quaternion.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Quaternion.h @@ -8,8 +8,7 @@ // // File Version: 4.10.0 (2009/11/18) -#ifndef WM4QUATERNION_H -#define WM4QUATERNION_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Matrix3.h" @@ -323,6 +322,4 @@ inline Quaternion operator* (Real fScalar, const Quaternion& rkQ); typedef Quaternion Quaternionf; typedef Quaternion Quaterniond; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Query.h b/src/Mod/Mesh/App/WildMagic4/Wm4Query.h index 768b806428..ccc3fa6dce 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Query.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Query.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4QUERY_H -#define WM4QUERY_H +#pragma once #include "Wm4FoundationLIB.h" @@ -48,6 +47,4 @@ protected: } -#include "Wm4Query.inl" - -#endif +#include "Wm4Query.inl" \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Query2.h b/src/Mod/Mesh/App/WildMagic4/Wm4Query2.h index c586421b5c..120d29556b 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Query2.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Query2.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4QUERY2_H -#define WM4QUERY2_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Query.h" @@ -87,6 +86,4 @@ namespace Wm4 { typedef Query2 Query2f; typedef Query2 Query2d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Query2Filtered.h b/src/Mod/Mesh/App/WildMagic4/Wm4Query2Filtered.h index 955f48a838..82a9b56e74 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Query2Filtered.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Query2Filtered.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4QUERY2FILTERED_H -#define WM4QUERY2FILTERED_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Query2TRational.h" @@ -69,6 +68,4 @@ namespace Wm4 typedef Query2Filtered Query2Filteredf; typedef Query2Filtered Query2Filteredd; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Query2Int64.h b/src/Mod/Mesh/App/WildMagic4/Wm4Query2Int64.h index 7a49b67a45..3f65169de5 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Query2Int64.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Query2Int64.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4QUERY2INT64_H -#define WM4QUERY2INT64_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Query2.h" @@ -67,6 +66,4 @@ namespace Wm4 typedef Query2Int64 Query2Int64f; typedef Query2Int64 Query2Int64d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Query2TInteger.h b/src/Mod/Mesh/App/WildMagic4/Wm4Query2TInteger.h index e1e8bb125a..bb873fa899 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Query2TInteger.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Query2TInteger.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4QUERY2TINTEGER_H -#define WM4QUERY2TINTEGER_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Query2.h" @@ -71,6 +70,4 @@ namespace Wm4 typedef Query2TInteger Query2TIntegerf; typedef Query2TInteger Query2TIntegerd; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Query2TRational.h b/src/Mod/Mesh/App/WildMagic4/Wm4Query2TRational.h index fd135569d7..4ae0049229 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Query2TRational.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Query2TRational.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4QUERY2TRATIONAL_H -#define WM4QUERY2TRATIONAL_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Query2.h" @@ -89,6 +88,4 @@ namespace Wm4 typedef Query2TRational Query2TRationalf; typedef Query2TRational Query2TRationald; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Query3.h b/src/Mod/Mesh/App/WildMagic4/Wm4Query3.h index 7d728bde77..6d730b32a3 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Query3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Query3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4QUERY3_H -#define WM4QUERY3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Query.h" @@ -94,6 +93,4 @@ namespace Wm4 typedef Query3 Query3f; typedef Query3 Query3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Query3Filtered.h b/src/Mod/Mesh/App/WildMagic4/Wm4Query3Filtered.h index b24c99e24b..448cdc2a48 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Query3Filtered.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Query3Filtered.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4QUERY3FILTERED_H -#define WM4QUERY3FILTERED_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Query3TRational.h" @@ -70,6 +69,4 @@ namespace Wm4 typedef Query3Filtered Query3Filteredf; typedef Query3Filtered Query3Filteredd; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Query3Int64.h b/src/Mod/Mesh/App/WildMagic4/Wm4Query3Int64.h index b3d1d20dc2..4c6db0dd8f 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Query3Int64.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Query3Int64.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4QUERY3INT64_H -#define WM4QUERY3INT64_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Query3.h" @@ -71,6 +70,4 @@ namespace Wm4 typedef Query3Int64 Query3Int64f; typedef Query3Int64 Query3Int64d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Query3TInteger.h b/src/Mod/Mesh/App/WildMagic4/Wm4Query3TInteger.h index 0fa0f4274e..4607aa3015 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Query3TInteger.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Query3TInteger.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4QUERY3TINTEGER_H -#define WM4QUERY3TINTEGER_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Query3.h" @@ -77,6 +76,4 @@ namespace Wm4 typedef Query3TInteger Query3TIntegerf; typedef Query3TInteger Query3TIntegerd; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Query3TRational.h b/src/Mod/Mesh/App/WildMagic4/Wm4Query3TRational.h index 79efe20ee5..cf7002a4d3 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Query3TRational.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Query3TRational.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4QUERY3TRATIONAL_H -#define WM4QUERY3TRATIONAL_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Query3.h" @@ -97,6 +96,4 @@ namespace Wm4 typedef Query3TRational Query3TRationalf; typedef Query3TRational Query3TRationald; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4RVector2.h b/src/Mod/Mesh/App/WildMagic4/Wm4RVector2.h index 46fd39c71d..723c897e82 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4RVector2.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4RVector2.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4RVECTOR2_H -#define WM4RVECTOR2_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4TRVector.h" @@ -110,7 +109,4 @@ protected: } -#include "Wm4RVector2.inl" - - -#endif +#include "Wm4RVector2.inl" \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4RVector3.h b/src/Mod/Mesh/App/WildMagic4/Wm4RVector3.h index 8f8e247fa4..a0cb1d8caf 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4RVector3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4RVector3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4RVECTOR3_H -#define WM4RVECTOR3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4TRVector.h" @@ -116,7 +115,4 @@ protected: } -#include "Wm4RVector3.inl" - - -#endif +#include "Wm4RVector3.inl" \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Segment3.h b/src/Mod/Mesh/App/WildMagic4/Wm4Segment3.h index 509d0ca091..eb6603110d 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Segment3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Segment3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4SEGMENT3_H -#define WM4SEGMENT3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Vector3.h" @@ -59,6 +58,4 @@ namespace Wm4 typedef Segment3 Segment3f; typedef Segment3 Segment3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Sphere3.h b/src/Mod/Mesh/App/WildMagic4/Wm4Sphere3.h index e8ef1473aa..f4709213ed 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Sphere3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Sphere3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4SPHERE3_H -#define WM4SPHERE3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Vector3.h" @@ -52,6 +51,4 @@ namespace Wm4 typedef Sphere3 Sphere3f; typedef Sphere3 Sphere3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Surface.h b/src/Mod/Mesh/App/WildMagic4/Wm4Surface.h index 274344ee7d..1ec41caa84 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Surface.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Surface.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4SURFACE_H -#define WM4SURFACE_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4System.h" @@ -39,6 +38,4 @@ protected: typedef Surface Surfacef; typedef Surface Surfaced; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4System.h b/src/Mod/Mesh/App/WildMagic4/Wm4System.h index d6cc9f1c75..8c5e279601 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4System.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4System.h @@ -16,8 +16,7 @@ // // Version: 4.0.1 (2006/08/15) -#ifndef WM4SYSTEM_H -#define WM4SYSTEM_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Platforms.h" @@ -210,6 +209,4 @@ template void Deallocate (T***& raaatArray); #include "Wm4TMinHeap.h" #include "Wm4TStringHashTable.h" #include "Wm4TSmallUnorderedSet.h" // useful for meshes -#include "Wm4TTuple.h" // tuples in any type and any dimension - -#endif +#include "Wm4TTuple.h" // tuples in any type and any dimension \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4THashSet.h b/src/Mod/Mesh/App/WildMagic4/Wm4THashSet.h index bd73c9e0c0..c0f72afbca 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4THashSet.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4THashSet.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4THASHSET_H -#define WM4THASHSET_H +#pragma once #include "Wm4FoundationLIB.h" @@ -93,6 +92,4 @@ private: } -#include "Wm4THashSet.inl" - -#endif +#include "Wm4THashSet.inl" \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4THashTable.h b/src/Mod/Mesh/App/WildMagic4/Wm4THashTable.h index f7397704b3..44c32d5bad 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4THashTable.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4THashTable.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4THASHTABLE_H -#define WM4THASHTABLE_H +#pragma once #include "Wm4FoundationLIB.h" @@ -96,6 +95,4 @@ private: } -#include "Wm4THashTable.inl" - -#endif +#include "Wm4THashTable.inl" \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4TInteger.h b/src/Mod/Mesh/App/WildMagic4/Wm4TInteger.h index f06120e0f0..50206f9f91 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4TInteger.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4TInteger.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4TINTEGER_H -#define WM4TINTEGER_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4System.h" @@ -118,6 +117,4 @@ TInteger operator* (int i, const TInteger& rkI); } -#include "Wm4TInteger.inl" - -#endif +#include "Wm4TInteger.inl" \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4TMinHeap.h b/src/Mod/Mesh/App/WildMagic4/Wm4TMinHeap.h index 96c1058def..8c33c3c1a0 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4TMinHeap.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4TMinHeap.h @@ -16,8 +16,7 @@ // // Version: 4.0.2 (2006/10/15) -#ifndef WM4TMINHEAP_H -#define WM4TMINHEAP_H +#pragma once #include "Wm4System.h" @@ -94,6 +93,4 @@ private: } -#include "Wm4TMinHeap.inl" - -#endif +#include "Wm4TMinHeap.inl" \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4TRVector.h b/src/Mod/Mesh/App/WildMagic4/Wm4TRVector.h index 95803e5c4a..5f4147e4d4 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4TRVector.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4TRVector.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4TRVECTOR_H -#define WM4TRVECTOR_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4TRational.h" @@ -80,6 +79,4 @@ TRVector operator* (const TRational& rkR, } -#include "Wm4TRVector.inl" - -#endif +#include "Wm4TRVector.inl" \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4TRational.h b/src/Mod/Mesh/App/WildMagic4/Wm4TRational.h index 3b9227ec20..5b4931e7f7 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4TRational.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4TRational.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4TRATIONAL_H -#define WM4TRATIONAL_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4TInteger.h" @@ -109,6 +108,4 @@ TRational operator/ (const TInteger& rkI, const TRational& rkR); } -#include "Wm4TRational.inl" - -#endif +#include "Wm4TRational.inl" \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4TSmallUnorderedSet.h b/src/Mod/Mesh/App/WildMagic4/Wm4TSmallUnorderedSet.h index 2f1de94786..4b48f31456 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4TSmallUnorderedSet.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4TSmallUnorderedSet.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4TSET_H -#define WM4TSET_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Memory.h" @@ -78,6 +77,4 @@ private: } -#include "Wm4TSmallUnorderedSet.inl" - -#endif +#include "Wm4TSmallUnorderedSet.inl" \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4TStringHashTable.h b/src/Mod/Mesh/App/WildMagic4/Wm4TStringHashTable.h index 9d5deaa6a9..222bbb8244 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4TStringHashTable.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4TStringHashTable.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4TSTRINGHASHTABLE_H -#define WM4TSTRINGHASHTABLE_H +#pragma once #include "Wm4FoundationLIB.h" @@ -82,6 +81,4 @@ private: } -#include "Wm4TStringHashTable.inl" - -#endif +#include "Wm4TStringHashTable.inl" \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4TTuple.h b/src/Mod/Mesh/App/WildMagic4/Wm4TTuple.h index 5681c73fcd..12ae8a6172 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4TTuple.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4TTuple.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4TTUPLE_H -#define WM4TTUPLE_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4System.h" @@ -67,6 +66,4 @@ private: } -#include "Wm4TTuple.inl" - -#endif +#include "Wm4TTuple.inl" \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Triangle2.h b/src/Mod/Mesh/App/WildMagic4/Wm4Triangle2.h index 2d6dc61121..e9b70b16ce 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Triangle2.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Triangle2.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4TRIANGLE2_H -#define WM4TRIANGLE2_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Vector2.h" @@ -53,6 +52,4 @@ namespace Wm4 typedef Triangle2 Triangle2f; typedef Triangle2 Triangle2d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Triangle3.h b/src/Mod/Mesh/App/WildMagic4/Wm4Triangle3.h index 950208aa72..a587c19814 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Triangle3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Triangle3.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4TRIANGLE3_H -#define WM4TRIANGLE3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Vector3.h" @@ -53,6 +52,4 @@ namespace Wm4 typedef Triangle3 Triangle3f; typedef Triangle3 Triangle3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4TriangleKey.h b/src/Mod/Mesh/App/WildMagic4/Wm4TriangleKey.h index fc86714a59..742e44f916 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4TriangleKey.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4TriangleKey.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4TRIANGLEKEY_H -#define WM4TRIANGLEKEY_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4System.h" @@ -36,6 +35,4 @@ public: } -#include "Wm4TriangleKey.inl" - -#endif +#include "Wm4TriangleKey.inl" \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4TriangulateEC.h b/src/Mod/Mesh/App/WildMagic4/Wm4TriangulateEC.h index b62bf7fa8c..e0e8299f39 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4TriangulateEC.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4TriangulateEC.h @@ -16,8 +16,7 @@ // // Version: 4.0.2 (2006/08/30) -#ifndef WM4TRIANGULATEEC_H -#define WM4TRIANGULATEEC_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Query2.h" @@ -290,6 +289,4 @@ private: std::vector >m_kSPositions; }; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4UniqueVerticesTriangles.h b/src/Mod/Mesh/App/WildMagic4/Wm4UniqueVerticesTriangles.h index 7ae9110c46..1fa71c7077 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4UniqueVerticesTriangles.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4UniqueVerticesTriangles.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4UNIQUEVERTICESTRIANGLES_H -#define WM4UNIQUEVERTICESTRIANGLES_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4System.h" @@ -88,6 +87,4 @@ private: } -#include "Wm4UniqueVerticesTriangles.inl" - -#endif +#include "Wm4UniqueVerticesTriangles.inl" \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4VEManifoldMesh.h b/src/Mod/Mesh/App/WildMagic4/Wm4VEManifoldMesh.h index 1efe41a781..8f8c4871d5 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4VEManifoldMesh.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4VEManifoldMesh.h @@ -16,8 +16,7 @@ // // Version: 4.0.0 (2006/06/28) -#ifndef WM4VEMANIFOLDMESH_H -#define WM4VEMANIFOLDMESH_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4System.h" @@ -105,6 +104,4 @@ protected: } -#include "Wm4VEManifoldMesh.inl" - -#endif +#include "Wm4VEManifoldMesh.inl" \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Vector2.h b/src/Mod/Mesh/App/WildMagic4/Wm4Vector2.h index 2363b94bee..23671f1157 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Vector2.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Vector2.h @@ -16,8 +16,7 @@ // // Version: 4.0.2 (2006/07/25) -#ifndef WM4VECTOR2_H -#define WM4VECTOR2_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Math.h" @@ -132,6 +131,4 @@ namespace Wm4 typedef Vector2 Vector2f; typedef Vector2 Vector2d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Vector3.h b/src/Mod/Mesh/App/WildMagic4/Wm4Vector3.h index c1aa2bc92f..4250290c17 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Vector3.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Vector3.h @@ -16,8 +16,7 @@ // // Version: 4.0.2 (2006/07/25) -#ifndef WM4VECTOR3_H -#define WM4VECTOR3_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Math.h" @@ -145,6 +144,4 @@ namespace Wm4 typedef Vector3 Vector3f; typedef Vector3 Vector3d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Vector4.h b/src/Mod/Mesh/App/WildMagic4/Wm4Vector4.h index 48e4949f57..4849b60c81 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Vector4.h +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Vector4.h @@ -16,8 +16,7 @@ // // Version: 4.0.1 (2006/07/25) -#ifndef WM4VECTOR4_H -#define WM4VECTOR4_H +#pragma once #include "Wm4FoundationLIB.h" #include "Wm4Math.h" @@ -111,6 +110,4 @@ namespace Wm4 typedef Vector4 Vector4f; typedef Vector4 Vector4d; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Mesh/Gui/DlgDecimating.h b/src/Mod/Mesh/Gui/DlgDecimating.h index 089be6d20d..0653862788 100644 --- a/src/Mod/Mesh/Gui/DlgDecimating.h +++ b/src/Mod/Mesh/Gui/DlgDecimating.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef MESHGUI_DLGDECIMATING_H -#define MESHGUI_DLGDECIMATING_H +#pragma once #include @@ -86,5 +85,3 @@ private: }; } // namespace MeshGui - -#endif // MESHGUI_DLGDECIMATING_H diff --git a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h index e5c294f369..1ce50bd474 100644 --- a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h +++ b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHGUI_DLG_EVALUATE_MESH_IMP_H -#define MESHGUI_DLG_EVALUATE_MESH_IMP_H +#pragma once #include @@ -174,5 +173,3 @@ private: }; } // namespace MeshGui - -#endif // MESHGUI_DLG_EVALUATE_MESH_IMP_H diff --git a/src/Mod/Mesh/Gui/DlgEvaluateSettings.h b/src/Mod/Mesh/Gui/DlgEvaluateSettings.h index 911e291e1f..c0e8ee14f3 100644 --- a/src/Mod/Mesh/Gui/DlgEvaluateSettings.h +++ b/src/Mod/Mesh/Gui/DlgEvaluateSettings.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef MESHGUI_DLG_EVALUATE_SETTINGS_H -#define MESHGUI_DLG_EVALUATE_SETTINGS_H +#pragma once #include @@ -62,5 +61,3 @@ private: }; } // namespace MeshGui - -#endif // MESHGUI_DLG_EVALUATE_SETTINGS_H diff --git a/src/Mod/Mesh/Gui/DlgRegularSolidImp.h b/src/Mod/Mesh/Gui/DlgRegularSolidImp.h index 888b7a0f12..d0542d5452 100644 --- a/src/Mod/Mesh/Gui/DlgRegularSolidImp.h +++ b/src/Mod/Mesh/Gui/DlgRegularSolidImp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef MESHGUI_DLGREGULARSOLID_IMP_H -#define MESHGUI_DLGREGULARSOLID_IMP_H +#pragma once #include @@ -55,5 +54,3 @@ private: }; } // namespace MeshGui - -#endif // MESHGUI_DLGREGULARSOLID_IMP_H diff --git a/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.h b/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.h index 912c696a8b..342a7372d3 100644 --- a/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.h +++ b/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHGUI_DLGSETTINGSIMPORTEXPORTIMP_H -#define MESHGUI_DLGSETTINGSIMPORTEXPORTIMP_H +#pragma once #ifndef MESH_GLOBAL_H # include @@ -59,5 +58,3 @@ private: }; // end class DlgSettingsImportExport } // namespace MeshGui - -#endif // MESHGUI_DLGSETTINGSIMPORTEXPORTIMP_H diff --git a/src/Mod/Mesh/Gui/DlgSettingsMeshView.h b/src/Mod/Mesh/Gui/DlgSettingsMeshView.h index dfa60fd839..068a31fe66 100644 --- a/src/Mod/Mesh/Gui/DlgSettingsMeshView.h +++ b/src/Mod/Mesh/Gui/DlgSettingsMeshView.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHGUI_DLGSETTINGSMESHVIEW_H -#define MESHGUI_DLGSETTINGSMESHVIEW_H +#pragma once #ifndef MESH_GLOBAL_H # include @@ -61,5 +60,3 @@ private: }; } // namespace MeshGui - -#endif // MESHGUI_DLGSETTINGSMESHVIEW_H diff --git a/src/Mod/Mesh/Gui/DlgSmoothing.h b/src/Mod/Mesh/Gui/DlgSmoothing.h index 02be703035..e5dc26b4a7 100644 --- a/src/Mod/Mesh/Gui/DlgSmoothing.h +++ b/src/Mod/Mesh/Gui/DlgSmoothing.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef MESHGUI_DLGSMOOTHING_H -#define MESHGUI_DLGSMOOTHING_H +#pragma once #include #include @@ -142,5 +141,3 @@ private: }; } // namespace MeshGui - -#endif // MESHGUI_DLGSMOOTHING_H diff --git a/src/Mod/Mesh/Gui/MeshEditor.h b/src/Mod/Mesh/Gui/MeshEditor.h index b6ae51d793..3f50dfab0c 100644 --- a/src/Mod/Mesh/Gui/MeshEditor.h +++ b/src/Mod/Mesh/Gui/MeshEditor.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHGUI_MESHEDITOR_H -#define MESHGUI_MESHEDITOR_H +#pragma once #include @@ -188,6 +187,3 @@ private: }; } // namespace MeshGui - - -#endif // MESHGUI_MESHEDITOR_H diff --git a/src/Mod/Mesh/Gui/MeshSelection.h b/src/Mod/Mesh/Gui/MeshSelection.h index 7ecc22a080..6da24f38a6 100644 --- a/src/Mod/Mesh/Gui/MeshSelection.h +++ b/src/Mod/Mesh/Gui/MeshSelection.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHGUI_MESHSELECTION_H -#define MESHGUI_MESHSELECTION_H +#pragma once #include #include @@ -110,5 +109,3 @@ private: }; } // namespace MeshGui - -#endif // MESHGUI_MESHSELECTION_H diff --git a/src/Mod/Mesh/Gui/PreCompiled.h b/src/Mod/Mesh/Gui/PreCompiled.h index 08e3c7743a..2825724a76 100644 --- a/src/Mod/Mesh/Gui/PreCompiled.h +++ b/src/Mod/Mesh/Gui/PreCompiled.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHGUI_PRECOMPILED_H -#define MESHGUI_PRECOMPILED_H +#pragma once #include @@ -49,5 +48,3 @@ #if defined(FC_OS_WIN32) # include #endif - -#endif // MESHGUI_PRECOMPILED_H diff --git a/src/Mod/Mesh/Gui/PropertyEditorMesh.h b/src/Mod/Mesh/Gui/PropertyEditorMesh.h index fc84042cc6..8e8cfc9870 100644 --- a/src/Mod/Mesh/Gui/PropertyEditorMesh.h +++ b/src/Mod/Mesh/Gui/PropertyEditorMesh.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHGUI_PROPERTYEDITOR_MESH_H -#define MESHGUI_PROPERTYEDITOR_MESH_H +#pragma once #include #ifndef MESH_GLOBAL_H @@ -76,6 +75,3 @@ private: }; } // namespace MeshGui - - -#endif // MESHGUI_PROPERTYEDITOR_MESH_H diff --git a/src/Mod/Mesh/Gui/RemeshGmsh.h b/src/Mod/Mesh/Gui/RemeshGmsh.h index 3a805a4590..e616e61ee2 100644 --- a/src/Mod/Mesh/Gui/RemeshGmsh.h +++ b/src/Mod/Mesh/Gui/RemeshGmsh.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHGUI_REMESHGMSH_H -#define MESHGUI_REMESHGMSH_H +#pragma once #include @@ -144,5 +143,3 @@ private: }; } // namespace MeshGui - -#endif // MESHGUI_REMESHGMSH_H diff --git a/src/Mod/Mesh/Gui/RemoveComponents.h b/src/Mod/Mesh/Gui/RemoveComponents.h index d40d1b96c5..6d456c2b94 100644 --- a/src/Mod/Mesh/Gui/RemoveComponents.h +++ b/src/Mod/Mesh/Gui/RemoveComponents.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef MESHGUI_REMOVECOMPONENTS_H -#define MESHGUI_REMOVECOMPONENTS_H +#pragma once #include #include @@ -129,5 +128,3 @@ private: }; } // namespace MeshGui - -#endif // MESHGUI_REMOVECOMPONENTS_H diff --git a/src/Mod/Mesh/Gui/Segmentation.h b/src/Mod/Mesh/Gui/Segmentation.h index fff3b11811..01e5298bfd 100644 --- a/src/Mod/Mesh/Gui/Segmentation.h +++ b/src/Mod/Mesh/Gui/Segmentation.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHGUI_SEGMENTATION_H -#define MESHGUI_SEGMENTATION_H +#pragma once #include @@ -86,5 +85,3 @@ private: }; } // namespace MeshGui - -#endif // MESHGUI_SEGMENTATION_H diff --git a/src/Mod/Mesh/Gui/SegmentationBestFit.h b/src/Mod/Mesh/Gui/SegmentationBestFit.h index d686458a84..1829a3c250 100644 --- a/src/Mod/Mesh/Gui/SegmentationBestFit.h +++ b/src/Mod/Mesh/Gui/SegmentationBestFit.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHGUI_SEGMENTATIONBESTFIT_H -#define MESHGUI_SEGMENTATIONBESTFIT_H +#pragma once #include #include @@ -152,5 +151,3 @@ private: }; } // namespace MeshGui - -#endif // MESHGUI_SEGMENTATIONBESTFIT_H diff --git a/src/Mod/Mesh/Gui/Selection.h b/src/Mod/Mesh/Gui/Selection.h index 307d7fc5a1..b449e72e47 100644 --- a/src/Mod/Mesh/Gui/Selection.h +++ b/src/Mod/Mesh/Gui/Selection.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHGUI_SELECTION_H -#define MESHGUI_SELECTION_H +#pragma once #include @@ -65,5 +64,3 @@ private: }; } // namespace MeshGui - -#endif // MESHGUI_SELECTION_H diff --git a/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.h b/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.h index 2e578d0560..9d31098242 100644 --- a/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.h +++ b/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHGUI_SOFCINDEXEDFACESET_H -#define MESHGUI_SOFCINDEXEDFACESET_H +#pragma once #include #include @@ -153,6 +152,3 @@ private: // NOLINTEND } // namespace MeshGui - - -#endif // MESHGUI_SOFCINDEXEDFACESET_H diff --git a/src/Mod/Mesh/Gui/SoFCMeshObject.h b/src/Mod/Mesh/Gui/SoFCMeshObject.h index 084349b0ae..6f6ad3b056 100644 --- a/src/Mod/Mesh/Gui/SoFCMeshObject.h +++ b/src/Mod/Mesh/Gui/SoFCMeshObject.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHGUI_SOFCMESHOBJECT_H -#define MESHGUI_SOFCMESHOBJECT_H +#pragma once #include #include @@ -315,6 +314,3 @@ private: // NOLINTEND(cppcoreguidelines-special-member-functions,cppcoreguidelines-virtual-class-destructor) } // namespace MeshGui - - -#endif // MESHGUI_SOFCMESHOBJECT_H diff --git a/src/Mod/Mesh/Gui/SoPolygon.h b/src/Mod/Mesh/Gui/SoPolygon.h index f6ddc2109a..f299108e4f 100644 --- a/src/Mod/Mesh/Gui/SoPolygon.h +++ b/src/Mod/Mesh/Gui/SoPolygon.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHGUI_SOPOLYGON_H -#define MESHGUI_SOPOLYGON_H +#pragma once #include #include @@ -66,6 +65,3 @@ private: // NOLINTEND } // namespace MeshGui - - -#endif // MESHGUI_SOPOLYGON_H diff --git a/src/Mod/Mesh/Gui/ThumbnailExtension.h b/src/Mod/Mesh/Gui/ThumbnailExtension.h index bd3ddb7535..9cbcc06c5a 100644 --- a/src/Mod/Mesh/Gui/ThumbnailExtension.h +++ b/src/Mod/Mesh/Gui/ThumbnailExtension.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHGUI_THUMBNAIL_EXTENSION_H -#define MESHGUI_THUMBNAIL_EXTENSION_H +#pragma once #include #include @@ -55,6 +54,3 @@ public: }; } // namespace MeshGui - - -#endif // MESHGUI_THUMBNAIL_EXTENSION_H diff --git a/src/Mod/Mesh/Gui/ViewProvider.h b/src/Mod/Mesh/Gui/ViewProvider.h index e35110042d..80672f9b40 100644 --- a/src/Mod/Mesh/Gui/ViewProvider.h +++ b/src/Mod/Mesh/Gui/ViewProvider.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHGUI_VIEWPROVIDERMESH_H -#define MESHGUI_VIEWPROVIDERMESH_H +#pragma once #include @@ -382,6 +381,3 @@ private: }; } // namespace MeshGui - - -#endif // MESHGUI_VIEWPROVIDERMESH_H diff --git a/src/Mod/Mesh/Gui/ViewProviderCurvature.h b/src/Mod/Mesh/Gui/ViewProviderCurvature.h index 478a1025f0..7578ff6134 100644 --- a/src/Mod/Mesh/Gui/ViewProviderCurvature.h +++ b/src/Mod/Mesh/Gui/ViewProviderCurvature.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHGUI_VIEWPROVIDER_MESH_CURVATURE_H -#define MESHGUI_VIEWPROVIDER_MESH_CURVATURE_H +#pragma once #include #include @@ -133,6 +132,3 @@ private: }; } // namespace MeshGui - - -#endif // MESHGUI_VIEWPROVIDER_MESH_CURVATURE_H diff --git a/src/Mod/Mesh/Gui/ViewProviderDefects.h b/src/Mod/Mesh/Gui/ViewProviderDefects.h index 16c8b0aac9..331c9f7fcc 100644 --- a/src/Mod/Mesh/Gui/ViewProviderDefects.h +++ b/src/Mod/Mesh/Gui/ViewProviderDefects.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHGUI_VIEWPROVIDER_MESH_DEFECTS_H -#define MESHGUI_VIEWPROVIDER_MESH_DEFECTS_H +#pragma once #include "ViewProvider.h" @@ -241,6 +240,3 @@ private: }; } // namespace MeshGui - - -#endif // MESHGUI_VIEWPROVIDER_MESH_DEFECTS_H diff --git a/src/Mod/Mesh/Gui/ViewProviderMeshFaceSet.h b/src/Mod/Mesh/Gui/ViewProviderMeshFaceSet.h index 60598abbe4..85fb4b3a06 100644 --- a/src/Mod/Mesh/Gui/ViewProviderMeshFaceSet.h +++ b/src/Mod/Mesh/Gui/ViewProviderMeshFaceSet.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHGUI_VIEWPROVIDERMESHFACESET_H -#define MESHGUI_VIEWPROVIDERMESHFACESET_H +#pragma once #include @@ -77,6 +76,3 @@ private: }; } // namespace MeshGui - - -#endif // MESHGUI_VIEWPROVIDERMESHFACESET_H diff --git a/src/Mod/Mesh/Gui/ViewProviderPython.h b/src/Mod/Mesh/Gui/ViewProviderPython.h index e5c01e9322..82b0c8fcd6 100644 --- a/src/Mod/Mesh/Gui/ViewProviderPython.h +++ b/src/Mod/Mesh/Gui/ViewProviderPython.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef MESHGUI_VIEWPROVIDERPYTHON_H -#define MESHGUI_VIEWPROVIDERPYTHON_H +#pragma once #include #include @@ -35,6 +34,3 @@ namespace MeshGui using ViewProviderPython = Gui::ViewProviderFeaturePythonT; } // namespace MeshGui - - -#endif // MESHGUI_VIEWPROVIDERPYTHON_H diff --git a/src/Mod/Mesh/Gui/ViewProviderTransform.h b/src/Mod/Mesh/Gui/ViewProviderTransform.h index cb22d81fe0..6d5c0819e0 100644 --- a/src/Mod/Mesh/Gui/ViewProviderTransform.h +++ b/src/Mod/Mesh/Gui/ViewProviderTransform.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHGUI_VIEWPROVIDERMESHTRANSFORM_H -#define MESHGUI_VIEWPROVIDERMESHTRANSFORM_H +#pragma once #include "ViewProvider.h" @@ -79,6 +78,3 @@ private: }; } // namespace MeshGui - - -#endif // MESHGUI_VIEWPROVIDERMESHTRANSFORM_H diff --git a/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.h b/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.h index 85b47d8e55..a55d1ad199 100644 --- a/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.h +++ b/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESGUI_VIEWPROVIDERMESHTRANSFORMDEMOLDING_H -#define MESGUI_VIEWPROVIDERMESHTRANSFORMDEMOLDING_H +#pragma once #include "ViewProvider.h" @@ -96,6 +95,3 @@ private: }; } // namespace MeshGui - - -#endif // MESGUI_VIEWPROVIDERMESHTRANSFORMDEMOLDING_H diff --git a/src/Mod/Mesh/Gui/Workbench.h b/src/Mod/Mesh/Gui/Workbench.h index b1019ca63d..2567a8576b 100644 --- a/src/Mod/Mesh/Gui/Workbench.h +++ b/src/Mod/Mesh/Gui/Workbench.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_WORKBENCH_H -#define MESH_WORKBENCH_H +#pragma once #include #ifndef MESH_GLOBAL_H @@ -55,6 +54,3 @@ protected: }; } // namespace MeshGui - - -#endif // MESH_WORKBENCH_H diff --git a/src/Mod/Mesh/MeshGlobal.h b/src/Mod/Mesh/MeshGlobal.h index 76c72ed6ac..8970ef9a62 100644 --- a/src/Mod/Mesh/MeshGlobal.h +++ b/src/Mod/Mesh/MeshGlobal.h @@ -24,26 +24,23 @@ #include -#ifndef MESH_GLOBAL_H -# define MESH_GLOBAL_H +#pragma once // Mesh -# ifndef MeshExport -# ifdef Mesh_EXPORTS -# define MeshExport FREECAD_DECL_EXPORT -# else -# define MeshExport FREECAD_DECL_IMPORT -# endif +#ifndef MeshExport +# ifdef Mesh_EXPORTS +# define MeshExport FREECAD_DECL_EXPORT +# else +# define MeshExport FREECAD_DECL_IMPORT # endif +#endif // MeshGui -# ifndef MeshGuiExport -# ifdef MeshGui_EXPORTS -# define MeshGuiExport FREECAD_DECL_EXPORT -# else -# define MeshGuiExport FREECAD_DECL_IMPORT -# endif +#ifndef MeshGuiExport +# ifdef MeshGui_EXPORTS +# define MeshGuiExport FREECAD_DECL_EXPORT +# else +# define MeshGuiExport FREECAD_DECL_IMPORT # endif - -#endif // MESH_GLOBAL_H +#endif diff --git a/src/Mod/MeshPart/App/CurveProjector.h b/src/Mod/MeshPart/App/CurveProjector.h index 6f5fcd9c5e..da5458b85e 100644 --- a/src/Mod/MeshPart/App/CurveProjector.h +++ b/src/Mod/MeshPart/App/CurveProjector.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef _CurveProjector_h_ -#define _CurveProjector_h_ +#pragma once #include @@ -276,5 +275,3 @@ private: }; } // namespace MeshPart - -#endif diff --git a/src/Mod/MeshPart/App/MeshAlgos.h b/src/Mod/MeshPart/App/MeshAlgos.h index e342bb1338..e82f1aa8a4 100644 --- a/src/Mod/MeshPart/App/MeshAlgos.h +++ b/src/Mod/MeshPart/App/MeshAlgos.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef _MeshAlgos_h_ -#define _MeshAlgos_h_ +#pragma once #include @@ -94,5 +93,3 @@ public: }; } // namespace MeshPart - -#endif diff --git a/src/Mod/MeshPart/App/MeshFlattening.h b/src/Mod/MeshPart/App/MeshFlattening.h index 9ac97fdac4..43d86fdb4c 100644 --- a/src/Mod/MeshPart/App/MeshFlattening.h +++ b/src/Mod/MeshPart/App/MeshFlattening.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHFLATTENING -#define MESHFLATTENING +#pragma once // idea: // - unwrap any meshed shells and output a 2d face (meshing is done externally) @@ -79,5 +78,3 @@ public: }; // clang-format on - -#endif // MESHFLATTENING diff --git a/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.h b/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.h index d4efea1344..9744756574 100644 --- a/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.h +++ b/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.h @@ -27,8 +27,7 @@ // LeastSquareConformalMapping + fem relaxing // ------------------------------------------ // -#ifndef UNWRAP_H -#define UNWRAP_H +#pragma once // 1: local coordinates 2d representation q_l_0 // 2: least square conformal map -> flat_vertices_0 @@ -125,5 +124,4 @@ public: } -#endif // clang-format on diff --git a/src/Mod/MeshPart/App/MeshFlatteningNurbs.h b/src/Mod/MeshPart/App/MeshFlatteningNurbs.h index 35013320f0..9427ccdb8e 100644 --- a/src/Mod/MeshPart/App/MeshFlatteningNurbs.h +++ b/src/Mod/MeshPart/App/MeshFlatteningNurbs.h @@ -23,8 +23,7 @@ ***************************************************************************/ // clang-format off -#ifndef NURBS_H -#define NURBS_H +#pragma once #include @@ -117,5 +116,4 @@ struct NurbsBase1D } -#endif // clang-format on diff --git a/src/Mod/MeshPart/App/Mesher.h b/src/Mod/MeshPart/App/Mesher.h index 1a133f53f0..8fcdb84111 100644 --- a/src/Mod/MeshPart/App/Mesher.h +++ b/src/Mod/MeshPart/App/Mesher.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHPART_MESHER_H -#define MESHPART_MESHER_H +#pragma once #include @@ -259,5 +258,3 @@ private: }; } // namespace MeshPart - -#endif // MESHPART_MESHER_H diff --git a/src/Mod/MeshPart/App/PreCompiled.h b/src/Mod/MeshPart/App/PreCompiled.h index fc4d0a8448..f5ae0473d1 100644 --- a/src/Mod/MeshPart/App/PreCompiled.h +++ b/src/Mod/MeshPart/App/PreCompiled.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_PART_APP_PRECOMPILED_H -#define MESH_PART_APP_PRECOMPILED_H +#pragma once #include @@ -71,5 +70,3 @@ #include #include #include - -#endif diff --git a/src/Mod/MeshPart/Gui/CrossSections.h b/src/Mod/MeshPart/Gui/CrossSections.h index ca7fdcb884..70f4a6b330 100644 --- a/src/Mod/MeshPart/Gui/CrossSections.h +++ b/src/Mod/MeshPart/Gui/CrossSections.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHPARTGUI_CROSSSECTIONS_H -#define MESHPARTGUI_CROSSSECTIONS_H +#pragma once #include #include @@ -114,5 +113,3 @@ private: }; } // namespace MeshPartGui - -#endif // MESHPARTGUI_CROSSSECTIONS_H diff --git a/src/Mod/MeshPart/Gui/CurveOnMesh.h b/src/Mod/MeshPart/Gui/CurveOnMesh.h index f33d4dcd65..8b34022402 100644 --- a/src/Mod/MeshPart/Gui/CurveOnMesh.h +++ b/src/Mod/MeshPart/Gui/CurveOnMesh.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHPARTGUI_CURVEONMESH_H -#define MESHPARTGUI_CURVEONMESH_H +#pragma once #include #include @@ -105,5 +104,3 @@ private: }; } // namespace MeshPartGui - -#endif // MESHPARTGUI_CURVEONMESH_H diff --git a/src/Mod/MeshPart/Gui/PreCompiled.h b/src/Mod/MeshPart/Gui/PreCompiled.h index cfe8193ddc..2538e4c594 100644 --- a/src/Mod/MeshPart/Gui/PreCompiled.h +++ b/src/Mod/MeshPart/Gui/PreCompiled.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESH_PART_GUI_PRECOMPILED_H -#define MESH_PART_GUI_PRECOMPILED_H +#pragma once #include @@ -68,5 +67,3 @@ #include #include #include - -#endif // __PRECOMPILED_GUI__ diff --git a/src/Mod/MeshPart/Gui/TaskCurveOnMesh.h b/src/Mod/MeshPart/Gui/TaskCurveOnMesh.h index 6fe65675b4..5dd7633ecd 100644 --- a/src/Mod/MeshPart/Gui/TaskCurveOnMesh.h +++ b/src/Mod/MeshPart/Gui/TaskCurveOnMesh.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHPART_GUI_TASKCURVEONMESH_H -#define MESHPART_GUI_TASKCURVEONMESH_H +#pragma once #include @@ -85,5 +84,3 @@ private: }; } // namespace MeshPartGui - -#endif // MESHPART_GUI_TASKCURVEONMESH_H diff --git a/src/Mod/MeshPart/Gui/Tessellation.h b/src/Mod/MeshPart/Gui/Tessellation.h index d4b8f8fe87..1913511e4a 100644 --- a/src/Mod/MeshPart/Gui/Tessellation.h +++ b/src/Mod/MeshPart/Gui/Tessellation.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MESHPARTGUI_TESSELLATION_H -#define MESHPARTGUI_TESSELLATION_H +#pragma once #include #include @@ -144,5 +143,3 @@ private: }; } // namespace MeshPartGui - -#endif // MESHPARTGUI_TESSELLATION_H diff --git a/src/Mod/MeshPart/Gui/Workbench.h b/src/Mod/MeshPart/Gui/Workbench.h index 911152b21d..9a294a65aa 100644 --- a/src/Mod/MeshPart/Gui/Workbench.h +++ b/src/Mod/MeshPart/Gui/Workbench.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef MESHPARTGUI_WORKBENCH_H -#define MESHPARTGUI_WORKBENCH_H +#pragma once #include @@ -48,6 +47,3 @@ protected: }; } // namespace MeshPartGui - - -#endif // MESHPARTGUI_WORKBENCH_H diff --git a/src/Mod/MeshPart/MeshPartGlobal.h b/src/Mod/MeshPart/MeshPartGlobal.h index 65bb4d0d70..74d4b95817 100644 --- a/src/Mod/MeshPart/MeshPartGlobal.h +++ b/src/Mod/MeshPart/MeshPartGlobal.h @@ -24,26 +24,23 @@ #include -#ifndef MESHPART_GLOBAL_H -# define MESHPART_GLOBAL_H +#pragma once // MeshPart -# ifndef MeshPartExport -# ifdef MeshPart_EXPORTS -# define MeshPartExport FREECAD_DECL_EXPORT -# else -# define MeshPartExport FREECAD_DECL_IMPORT -# endif +#ifndef MeshPartExport +# ifdef MeshPart_EXPORTS +# define MeshPartExport FREECAD_DECL_EXPORT +# else +# define MeshPartExport FREECAD_DECL_IMPORT # endif +#endif // MeshPartGui -# ifndef MeshPartGuiExport -# ifdef MeshPartGui_EXPORTS -# define MeshPartGuiExport FREECAD_DECL_EXPORT -# else -# define MeshPartGuiExport FREECAD_DECL_IMPORT -# endif +#ifndef MeshPartGuiExport +# ifdef MeshPartGui_EXPORTS +# define MeshPartGuiExport FREECAD_DECL_EXPORT +# else +# define MeshPartGuiExport FREECAD_DECL_IMPORT # endif - -#endif // MESHPART_GLOBAL_H +#endif diff --git a/src/Mod/Part/App/AttachExtension.h b/src/Mod/Part/App/AttachExtension.h index 83d79c325e..5cef35f5f6 100644 --- a/src/Mod/Part/App/AttachExtension.h +++ b/src/Mod/Part/App/AttachExtension.h @@ -26,8 +26,7 @@ * them attachable. */ -#ifndef PARTATTACHABLEOBJECT_H -#define PARTATTACHABLEOBJECT_H +#pragma once #include #include @@ -173,5 +172,3 @@ private: using AttachExtensionPython = App::ExtensionPythonT; } // namespace Part - -#endif // PARTATTACHABLEOBJECT_H diff --git a/src/Mod/Part/App/Attacher.h b/src/Mod/Part/App/Attacher.h index 2b2263bed0..3e33073c80 100644 --- a/src/Mod/Part/App/Attacher.h +++ b/src/Mod/Part/App/Attacher.h @@ -27,8 +27,7 @@ *plane placement. */ -#ifndef PARTATTACHER_H -#define PARTATTACHER_H +#pragma once #include @@ -584,5 +583,3 @@ public: }; } // namespace Attacher - -#endif // PARTATTACHER_H diff --git a/src/Mod/Part/App/BRepMesh.h b/src/Mod/Part/App/BRepMesh.h index 7322ad3aa9..6a6e3db9c2 100644 --- a/src/Mod/Part/App/BRepMesh.h +++ b/src/Mod/Part/App/BRepMesh.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef PART_BREPMESH_H -#define PART_BREPMESH_H +#pragma once #include #include @@ -49,5 +48,3 @@ private: }; } // namespace Part - -#endif // PART_BREPMESH_H diff --git a/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.h b/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.h index 5d2e4185ce..756bc0deb3 100644 --- a/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.h +++ b/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_BREPOFFSETAPI_MAKEOFFSETFIX_H -#define PART_BREPOFFSETAPI_MAKEOFFSETFIX_H +#pragma once #include #include @@ -118,5 +117,3 @@ private: }; } // namespace Part - -#endif // PART_BREPOFFSETAPI_MAKEOFFSETFIX_H diff --git a/src/Mod/Part/App/BSplineCurveBiArcs.h b/src/Mod/Part/App/BSplineCurveBiArcs.h index c33174c4c1..fde483a394 100644 --- a/src/Mod/Part/App/BSplineCurveBiArcs.h +++ b/src/Mod/Part/App/BSplineCurveBiArcs.h @@ -29,8 +29,7 @@ // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. -#ifndef PART_BSPLINECURVEBIARCS_H -#define PART_BSPLINECURVEBIARCS_H +#pragma once #include @@ -83,5 +82,3 @@ private: }; } // namespace Part - -#endif // PART_BSPLINECURVEBIARCS_H diff --git a/src/Mod/Part/App/BodyBase.h b/src/Mod/Part/App/BodyBase.h index 5d9bff79ec..4f0c8de04b 100644 --- a/src/Mod/Part/App/BodyBase.h +++ b/src/Mod/Part/App/BodyBase.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_BodyBase_H -#define PART_BodyBase_H +#pragma once #include #include @@ -97,6 +96,3 @@ protected: }; } // namespace Part - - -#endif // PART_BodyBase_H diff --git a/src/Mod/Part/App/CrossSection.h b/src/Mod/Part/App/CrossSection.h index 9a9d255262..da29e5429d 100644 --- a/src/Mod/Part/App/CrossSection.h +++ b/src/Mod/Part/App/CrossSection.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_CROSSSECTION_H -#define PART_CROSSSECTION_H +#pragma once #include #include @@ -74,5 +73,3 @@ private: }; } // namespace Part - -#endif // PART_CROSSSECTION_H diff --git a/src/Mod/Part/App/CustomFeature.h b/src/Mod/Part/App/CustomFeature.h index 91e2ffd428..a0256651e6 100644 --- a/src/Mod/Part/App/CustomFeature.h +++ b/src/Mod/Part/App/CustomFeature.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PART_CUSTOMFEATURE_H -#define PART_CUSTOMFEATURE_H +#pragma once #include @@ -62,6 +61,3 @@ public: using CustomFeaturePython = App::FeaturePythonT; } // namespace Part - - -#endif // PART_CUSTOMFEATURE_H diff --git a/src/Mod/Part/App/DatumFeature.h b/src/Mod/Part/App/DatumFeature.h index e1ffecfc00..248550eafd 100644 --- a/src/Mod/Part/App/DatumFeature.h +++ b/src/Mod/Part/App/DatumFeature.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef PART_DATUMFEATURE_H -#define PART_DATUMFEATURE_H +#pragma once #include @@ -68,6 +67,3 @@ protected: }; } // namespace Part - - -#endif // PART_DATUMFEATURE_H diff --git a/src/Mod/Part/App/Datums.h b/src/Mod/Part/App/Datums.h index 750d4bb59f..19672485fa 100644 --- a/src/Mod/Part/App/Datums.h +++ b/src/Mod/Part/App/Datums.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_DATUMS_H -#define PART_DATUMS_H +#pragma once #include @@ -87,6 +86,3 @@ public: }; } // namespace Part - - -#endif // PART_DATUMS_H diff --git a/src/Mod/Part/App/ExtrusionHelper.h b/src/Mod/Part/App/ExtrusionHelper.h index cde4328ff6..5354327a5f 100644 --- a/src/Mod/Part/App/ExtrusionHelper.h +++ b/src/Mod/Part/App/ExtrusionHelper.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_EXTRUSIONHELPER_H -#define PART_EXTRUSIONHELPER_H +#pragma once #include #include @@ -121,5 +120,3 @@ public: }; } // namespace Part - -#endif // PART_EXTRUSIONHELPER_H diff --git a/src/Mod/Part/App/FCBRepAlgoAPI_BooleanOperation.h b/src/Mod/Part/App/FCBRepAlgoAPI_BooleanOperation.h index 0167625976..f98530bb46 100644 --- a/src/Mod/Part/App/FCBRepAlgoAPI_BooleanOperation.h +++ b/src/Mod/Part/App/FCBRepAlgoAPI_BooleanOperation.h @@ -26,8 +26,7 @@ * FCBRepAlgoAPI provides a wrapper for various OCCT functions. */ -#ifndef FCREPALGOAPIBOOLEANOPERATION_H -#define FCREPALGOAPIBOOLEANOPERATION_H +#pragma once #include #include @@ -78,4 +77,3 @@ private: ); Standard_EXPORT void RecursiveCutCompound(const TopoDS_Shape& theArgument); }; -#endif diff --git a/src/Mod/Part/App/FCBRepAlgoAPI_Common.h b/src/Mod/Part/App/FCBRepAlgoAPI_Common.h index 83693acc22..1a02a8ad4f 100644 --- a/src/Mod/Part/App/FCBRepAlgoAPI_Common.h +++ b/src/Mod/Part/App/FCBRepAlgoAPI_Common.h @@ -26,8 +26,7 @@ * FCBRepAlgoAPI provides a wrapper for various OCCT functions. */ -#ifndef FCREPALGOAPICOMMON_H -#define FCREPALGOAPICOMMON_H +#pragma once #include #include @@ -46,4 +45,3 @@ public: //! - the type of the operation Standard_EXPORT FCBRepAlgoAPI_Common(const TopoDS_Shape& S1, const TopoDS_Shape& S2); }; -#endif diff --git a/src/Mod/Part/App/FCBRepAlgoAPI_Cut.h b/src/Mod/Part/App/FCBRepAlgoAPI_Cut.h index a39322dae7..5cad8b26dc 100644 --- a/src/Mod/Part/App/FCBRepAlgoAPI_Cut.h +++ b/src/Mod/Part/App/FCBRepAlgoAPI_Cut.h @@ -26,8 +26,7 @@ * FCBRepAlgoAPI provides a wrapper for various OCCT functions. */ -#ifndef FCREPALGOAPICUT_H -#define FCREPALGOAPICUT_H +#pragma once #include #include @@ -46,4 +45,3 @@ public: //! - the type of the operation Standard_EXPORT FCBRepAlgoAPI_Cut(const TopoDS_Shape& S1, const TopoDS_Shape& S2); }; -#endif diff --git a/src/Mod/Part/App/FCBRepAlgoAPI_Fuse.h b/src/Mod/Part/App/FCBRepAlgoAPI_Fuse.h index cf98d71eee..3ea111187a 100644 --- a/src/Mod/Part/App/FCBRepAlgoAPI_Fuse.h +++ b/src/Mod/Part/App/FCBRepAlgoAPI_Fuse.h @@ -26,8 +26,7 @@ * FCBRepAlgoAPI provides a wrapper for various OCCT functions. */ -#ifndef FCREPALGOAPIFUSE_H -#define FCREPALGOAPIFUSE_H +#pragma once #include #include @@ -47,4 +46,3 @@ public: //! - the type of the operation Standard_EXPORT FCBRepAlgoAPI_Fuse(const TopoDS_Shape& S1, const TopoDS_Shape& S2); }; -#endif diff --git a/src/Mod/Part/App/FCBRepAlgoAPI_Section.h b/src/Mod/Part/App/FCBRepAlgoAPI_Section.h index 9cf3654f7a..5aa2be207e 100644 --- a/src/Mod/Part/App/FCBRepAlgoAPI_Section.h +++ b/src/Mod/Part/App/FCBRepAlgoAPI_Section.h @@ -26,8 +26,7 @@ * FCBRepAlgoAPI provides a wrapper for various OCCT functions. */ -#ifndef FCREPALGOAPISECTION_H -#define FCREPALGOAPISECTION_H +#pragma once #include #include #include @@ -69,4 +68,3 @@ public: // set fuzzyness based on size void setAutoFuzzy(); }; -#endif diff --git a/src/Mod/Part/App/FT2FC.h b/src/Mod/Part/App/FT2FC.h index c322121bd0..0c42a04c86 100644 --- a/src/Mod/Part/App/FT2FC.h +++ b/src/Mod/Part/App/FT2FC.h @@ -29,8 +29,7 @@ // Public header for FT2FC.cpp -#ifndef FT2FC_H -#define FT2FC_H +#pragma once // public functions PyObject* FT2FC( const Py_UCS4* unichars, @@ -48,5 +47,3 @@ PyObject* FT2FC( const double stringheight, const double tracking ); - -#endif // FT2FC_H diff --git a/src/Mod/Part/App/FaceMaker.h b/src/Mod/Part/App/FaceMaker.h index 4632ef0699..a3f72fcd55 100644 --- a/src/Mod/Part/App/FaceMaker.h +++ b/src/Mod/Part/App/FaceMaker.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FACEMAKER_H -#define PART_FACEMAKER_H +#pragma once #include #include @@ -177,4 +176,3 @@ protected: } // namespace Part -#endif // PART_FACEMAKER_H diff --git a/src/Mod/Part/App/FaceMakerBullseye.h b/src/Mod/Part/App/FaceMakerBullseye.h index 4df5ad609e..79c0ba061a 100644 --- a/src/Mod/Part/App/FaceMakerBullseye.h +++ b/src/Mod/Part/App/FaceMakerBullseye.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FACEMAKER_BULLSEYE_H -#define PART_FACEMAKER_BULLSEYE_H +#pragma once #include "FaceMaker.h" @@ -167,4 +166,3 @@ public: }; } // namespace Part -#endif // PART_FACEMAKER_BULLSEYE_H diff --git a/src/Mod/Part/App/FaceMakerCheese.h b/src/Mod/Part/App/FaceMakerCheese.h index 7a7c565830..beb87aff47 100644 --- a/src/Mod/Part/App/FaceMakerCheese.h +++ b/src/Mod/Part/App/FaceMakerCheese.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FACEMAKER_CHEESE_H -#define PART_FACEMAKER_CHEESE_H +#pragma once #include "FaceMaker.h" #include @@ -74,4 +73,3 @@ protected: } // namespace Part -#endif // PART_FACEMAKER_CHEESE_H diff --git a/src/Mod/Part/App/FeatureChamfer.h b/src/Mod/Part/App/FeatureChamfer.h index 81d0e7aa37..5a972dd74e 100644 --- a/src/Mod/Part/App/FeatureChamfer.h +++ b/src/Mod/Part/App/FeatureChamfer.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FEATURECHAMFER_H -#define PART_FEATURECHAMFER_H +#pragma once #include "PartFeature.h" @@ -52,6 +51,3 @@ public: }; } // namespace Part - - -#endif // PART_FEATURECHAMFER_H diff --git a/src/Mod/Part/App/FeatureCompound.h b/src/Mod/Part/App/FeatureCompound.h index 322327aef9..2cdec23708 100644 --- a/src/Mod/Part/App/FeatureCompound.h +++ b/src/Mod/Part/App/FeatureCompound.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FEATURECOMPOUND_H -#define PART_FEATURECOMPOUND_H +#pragma once #include @@ -69,6 +68,3 @@ public: }; } // namespace Part - - -#endif // PART_FEATURECOMPOUND_H diff --git a/src/Mod/Part/App/FeatureExtrusion.h b/src/Mod/Part/App/FeatureExtrusion.h index 732602ced5..90a57ee262 100644 --- a/src/Mod/Part/App/FeatureExtrusion.h +++ b/src/Mod/Part/App/FeatureExtrusion.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FEATUREEXTRUSION_H -#define PART_FEATUREEXTRUSION_H +#pragma once #include #include @@ -151,6 +150,3 @@ protected: }; } // namespace Part - - -#endif // PART_FEATUREEXTRUSION_H diff --git a/src/Mod/Part/App/FeatureFace.h b/src/Mod/Part/App/FeatureFace.h index 5c771fb378..080b80b8ce 100644 --- a/src/Mod/Part/App/FeatureFace.h +++ b/src/Mod/Part/App/FeatureFace.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FACE_H -#define PART_FACE_H +#pragma once #include @@ -58,6 +57,3 @@ public: }; } // namespace Part - - -#endif // PART_FACE_H diff --git a/src/Mod/Part/App/FeatureFillet.h b/src/Mod/Part/App/FeatureFillet.h index a53fc9bf27..7bcfcfcf8c 100644 --- a/src/Mod/Part/App/FeatureFillet.h +++ b/src/Mod/Part/App/FeatureFillet.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FEATUREFILLET_H -#define PART_FEATUREFILLET_H +#pragma once #include @@ -53,6 +52,3 @@ public: }; } // namespace Part - - -#endif // PART_FEATUREFILLET_H diff --git a/src/Mod/Part/App/FeatureGeometrySet.h b/src/Mod/Part/App/FeatureGeometrySet.h index 8447d1b2ca..fbeb4da36e 100644 --- a/src/Mod/Part/App/FeatureGeometrySet.h +++ b/src/Mod/Part/App/FeatureGeometrySet.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FeatureGeometrySet_H -#define PART_FeatureGeometrySet_H +#pragma once #include @@ -56,6 +55,3 @@ public: }; } // namespace Part - - -#endif // PART_FeatureGeometrySet_H diff --git a/src/Mod/Part/App/FeatureMirroring.h b/src/Mod/Part/App/FeatureMirroring.h index 73909c1642..06ee3b6be0 100644 --- a/src/Mod/Part/App/FeatureMirroring.h +++ b/src/Mod/Part/App/FeatureMirroring.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FEATUREMIRRORING_H -#define PART_FEATUREMIRRORING_H +#pragma once #include @@ -70,6 +69,3 @@ protected: }; } // namespace Part - - -#endif // PART_FEATUREMIRRORING_H diff --git a/src/Mod/Part/App/FeatureOffset.h b/src/Mod/Part/App/FeatureOffset.h index d9138bc282..a022a10612 100644 --- a/src/Mod/Part/App/FeatureOffset.h +++ b/src/Mod/Part/App/FeatureOffset.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FEATUREOFFSET_H -#define PART_FEATUREOFFSET_H +#pragma once #include @@ -88,4 +87,3 @@ public: }; } // namespace Part -#endif // PART_FEATUREOFFSET_H diff --git a/src/Mod/Part/App/FeaturePartBoolean.h b/src/Mod/Part/App/FeaturePartBoolean.h index bf6a6b28fd..e5f902a5de 100644 --- a/src/Mod/Part/App/FeaturePartBoolean.h +++ b/src/Mod/Part/App/FeaturePartBoolean.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PART_FEATUREPARTBOOLEAN_H -#define PART_FEATUREPARTBOOLEAN_H +#pragma once #include @@ -69,5 +68,3 @@ protected: }; } // namespace Part - -#endif // PART_FEATUREPARTBOOLEAN_H diff --git a/src/Mod/Part/App/FeaturePartBox.h b/src/Mod/Part/App/FeaturePartBox.h index 8d0a4eec7b..27fdec6a19 100644 --- a/src/Mod/Part/App/FeaturePartBox.h +++ b/src/Mod/Part/App/FeaturePartBox.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FEATUREPARTBOX_H -#define PART_FEATUREPARTBOX_H +#pragma once #include @@ -64,6 +63,3 @@ protected: }; } // namespace Part - - -#endif // PART_FEATUREPARTBOX_H diff --git a/src/Mod/Part/App/FeaturePartCircle.h b/src/Mod/Part/App/FeaturePartCircle.h index 08a4a3c81c..f4e39cdfdc 100644 --- a/src/Mod/Part/App/FeaturePartCircle.h +++ b/src/Mod/Part/App/FeaturePartCircle.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FEATUREPARTCIRCLE_H -#define PART_FEATUREPARTCIRCLE_H +#pragma once #include @@ -71,5 +70,3 @@ private: }; } // namespace Part - -#endif // PART_FEATUREPARTCIRCLE_H diff --git a/src/Mod/Part/App/FeaturePartCommon.h b/src/Mod/Part/App/FeaturePartCommon.h index a92342cad0..ad1c284de3 100644 --- a/src/Mod/Part/App/FeaturePartCommon.h +++ b/src/Mod/Part/App/FeaturePartCommon.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FEATUREPARTCOMMON_H -#define PART_FEATUREPARTCOMMON_H +#pragma once #include @@ -87,5 +86,3 @@ private: }; } // namespace Part - -#endif // PART_FEATUREPARTCOMMON_H diff --git a/src/Mod/Part/App/FeaturePartCurveNet.h b/src/Mod/Part/App/FeaturePartCurveNet.h index 35227fb5a5..67058cc255 100644 --- a/src/Mod/Part/App/FeaturePartCurveNet.h +++ b/src/Mod/Part/App/FeaturePartCurveNet.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FeaturePartCurveNet_H -#define PART_FeaturePartCurveNet_H +#pragma once #include "PartFeature.h" @@ -54,6 +53,3 @@ public: }; } // namespace Part - - -#endif // PART_FeaturePartCurveNet_H diff --git a/src/Mod/Part/App/FeaturePartCut.h b/src/Mod/Part/App/FeaturePartCut.h index 050ce171bf..a9df80131a 100644 --- a/src/Mod/Part/App/FeaturePartCut.h +++ b/src/Mod/Part/App/FeaturePartCut.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FEATUREPARTCUT_H -#define PART_FEATUREPARTCUT_H +#pragma once #include "FeaturePartBoolean.h" @@ -48,5 +47,3 @@ protected: }; } // namespace Part - -#endif // PART_FEATUREPARTCUT_H diff --git a/src/Mod/Part/App/FeaturePartFuse.h b/src/Mod/Part/App/FeaturePartFuse.h index 10582e9169..96998f9bc8 100644 --- a/src/Mod/Part/App/FeaturePartFuse.h +++ b/src/Mod/Part/App/FeaturePartFuse.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FEATUREPARTFUSE_H -#define PART_FEATUREPARTFUSE_H +#pragma once #include @@ -74,5 +73,3 @@ public: }; } // namespace Part - -#endif // PART_FEATUREPARTFUSE_H diff --git a/src/Mod/Part/App/FeaturePartImportBrep.h b/src/Mod/Part/App/FeaturePartImportBrep.h index 33b27aa1fd..b929225e5f 100644 --- a/src/Mod/Part/App/FeaturePartImportBrep.h +++ b/src/Mod/Part/App/FeaturePartImportBrep.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FEATUREPARTIMPORTBREP_H -#define PART_FEATUREPARTIMPORTBREP_H +#pragma once #include "PartFeature.h" @@ -54,6 +53,3 @@ public: }; } // namespace Part - - -#endif // PART_FEATUREPARTIMPORTBREP_H diff --git a/src/Mod/Part/App/FeaturePartImportIges.h b/src/Mod/Part/App/FeaturePartImportIges.h index 0f79e2ce47..fd8f354701 100644 --- a/src/Mod/Part/App/FeaturePartImportIges.h +++ b/src/Mod/Part/App/FeaturePartImportIges.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FEATUREPARTIMPORTIGES_H -#define PART_FEATUREPARTIMPORTIGES_H +#pragma once #include "PartFeature.h" @@ -54,6 +53,3 @@ public: }; } // namespace Part - - -#endif // PART_FEATUREPARTIMPORTIGES_H diff --git a/src/Mod/Part/App/FeaturePartImportStep.h b/src/Mod/Part/App/FeaturePartImportStep.h index 30637eb5ce..0c676a39fe 100644 --- a/src/Mod/Part/App/FeaturePartImportStep.h +++ b/src/Mod/Part/App/FeaturePartImportStep.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FEATUREPARTIMPORTSTEP_H -#define PART_FEATUREPARTIMPORTSTEP_H +#pragma once #include @@ -56,6 +55,3 @@ public: }; } // namespace Part - - -#endif // PART_FEATUREPARTIMPORTSTEP_H diff --git a/src/Mod/Part/App/FeaturePartPolygon.h b/src/Mod/Part/App/FeaturePartPolygon.h index 26735e31e2..e7a7983fc2 100644 --- a/src/Mod/Part/App/FeaturePartPolygon.h +++ b/src/Mod/Part/App/FeaturePartPolygon.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FEATUREPARTPOLYGON_H -#define PART_FEATUREPARTPOLYGON_H +#pragma once #include @@ -53,5 +52,3 @@ public: }; } // namespace Part - -#endif // PART_FEATUREPARTPOLYGON_H diff --git a/src/Mod/Part/App/FeaturePartSection.h b/src/Mod/Part/App/FeaturePartSection.h index 0a764d6d63..3e8ae180ab 100644 --- a/src/Mod/Part/App/FeaturePartSection.h +++ b/src/Mod/Part/App/FeaturePartSection.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FEATUREPARTSECTION_H -#define PART_FEATUREPARTSECTION_H +#pragma once #include @@ -54,5 +53,3 @@ protected: }; } // namespace Part - -#endif // PART_FEATUREPARTSECTION_H diff --git a/src/Mod/Part/App/FeaturePartSpline.h b/src/Mod/Part/App/FeaturePartSpline.h index a05879e6f3..3758db5db4 100644 --- a/src/Mod/Part/App/FeaturePartSpline.h +++ b/src/Mod/Part/App/FeaturePartSpline.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FEATUREPARTSPLINE_H -#define PART_FEATUREPARTSPLINE_H +#pragma once #include @@ -47,6 +46,3 @@ public: }; } // namespace Part - - -#endif // PART_FEATUREPARTSPLINE_H diff --git a/src/Mod/Part/App/FeatureProjectOnSurface.h b/src/Mod/Part/App/FeatureProjectOnSurface.h index de24a9482a..0dd4a0af5e 100644 --- a/src/Mod/Part/App/FeatureProjectOnSurface.h +++ b/src/Mod/Part/App/FeatureProjectOnSurface.h @@ -22,8 +22,7 @@ * * **************************************************************************/ -#ifndef PART_FEATUREPROJECTONSURFACE_H -#define PART_FEATUREPROJECTONSURFACE_H +#pragma once #include "PartFeature.h" #include @@ -100,6 +99,3 @@ private: }; } // namespace Part - - -#endif // PART_FEATUREPROJECTONSURFACE_H diff --git a/src/Mod/Part/App/FeatureRevolution.h b/src/Mod/Part/App/FeatureRevolution.h index 522895a76e..d7eff3046d 100644 --- a/src/Mod/Part/App/FeatureRevolution.h +++ b/src/Mod/Part/App/FeatureRevolution.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FEATUREREVOLUTION_H -#define PART_FEATUREREVOLUTION_H +#pragma once #include #include @@ -94,6 +93,3 @@ protected: }; } // namespace Part - - -#endif // PART_FEATUREREVOLUTION_H diff --git a/src/Mod/Part/App/FeatureScale.h b/src/Mod/Part/App/FeatureScale.h index 330f8e4686..2f68b967fb 100644 --- a/src/Mod/Part/App/FeatureScale.h +++ b/src/Mod/Part/App/FeatureScale.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FEATURESCALE_H -#define PART_FEATURESCALE_H +#pragma once #include #include @@ -89,6 +88,3 @@ public: }; } // namespace Part - - -#endif // PART_FEATURESCALE_H diff --git a/src/Mod/Part/App/FuzzyHelper.h b/src/Mod/Part/App/FuzzyHelper.h index 735e506229..6c8a83470e 100644 --- a/src/Mod/Part/App/FuzzyHelper.h +++ b/src/Mod/Part/App/FuzzyHelper.h @@ -22,8 +22,7 @@ * * **************************************************************************/ -#ifndef PART_FUZZYHELPER_H -#define PART_FUZZYHELPER_H +#pragma once #include #include @@ -42,5 +41,3 @@ void PartExport withBooleanFuzzy(double base, std::function func); } // namespace FuzzyHelper } // namespace Part - -#endif // PART_FUZZYHELPER_H diff --git a/src/Mod/Part/App/Geometry.h b/src/Mod/Part/App/Geometry.h index f38f44bc60..c4cd77849f 100644 --- a/src/Mod/Part/App/Geometry.h +++ b/src/Mod/Part/App/Geometry.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_GEOMETRY_H -#define PART_GEOMETRY_H +#pragma once #include #include @@ -1419,5 +1418,3 @@ PartExport std::unique_ptr makeFromTrimmedCurve( PartExport std::unique_ptr makeFromCurveAdaptor(const Adaptor3d_Curve&, bool silent = false); } // namespace Part - -#endif // PART_GEOMETRY_H diff --git a/src/Mod/Part/App/Geometry2d.h b/src/Mod/Part/App/Geometry2d.h index bdc31ad29d..c056b22cbe 100644 --- a/src/Mod/Part/App/Geometry2d.h +++ b/src/Mod/Part/App/Geometry2d.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_GEOMETRY2D_H -#define PART_GEOMETRY2D_H +#pragma once #include #include @@ -614,5 +613,3 @@ std::unique_ptr makeFromTrimmedCurve2d(const Handle(Geom2d_Curve) & std::unique_ptr makeFromCurveAdaptor2d(const Adaptor2d_Curve2d&); } // namespace Part - -#endif // PART_GEOMETRY2D_H diff --git a/src/Mod/Part/App/GeometryDefaultExtension.h b/src/Mod/Part/App/GeometryDefaultExtension.h index 11d4280565..49456fd1a4 100644 --- a/src/Mod/Part/App/GeometryDefaultExtension.h +++ b/src/Mod/Part/App/GeometryDefaultExtension.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_GEOMETRYDEFAULTEXTENSION_H -#define PART_GEOMETRYDEFAULTEXTENSION_H +#pragma once #include #include "GeometryExtension.h" @@ -140,5 +139,3 @@ using GeometryStringExtension = GeometryDefaultExtension; using GeometryBoolExtension = GeometryDefaultExtension; using GeometryDoubleExtension = GeometryDefaultExtension; } // namespace Part - -#endif // PART_GEOMETRYDEFAULTEXTENSION_H diff --git a/src/Mod/Part/App/GeometryExtension.h b/src/Mod/Part/App/GeometryExtension.h index 066a0caee9..cee79fd690 100644 --- a/src/Mod/Part/App/GeometryExtension.h +++ b/src/Mod/Part/App/GeometryExtension.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_GEOMETRYEXTENSION_H -#define PART_GEOMETRYEXTENSION_H +#pragma once #include #include @@ -94,5 +93,3 @@ protected: }; } // namespace Part - -#endif // PART_GEOMETRYEXTENSION_H diff --git a/src/Mod/Part/App/GeometryMigrationExtension.h b/src/Mod/Part/App/GeometryMigrationExtension.h index 761347d6ac..d074b5d9ed 100644 --- a/src/Mod/Part/App/GeometryMigrationExtension.h +++ b/src/Mod/Part/App/GeometryMigrationExtension.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_GEOMETRYMIGRATIONEXTENSION_H -#define PART_GEOMETRYMIGRATIONEXTENSION_H +#pragma once #include #include "Geometry.h" @@ -151,6 +150,3 @@ public: }; } // namespace Part - - -#endif // PART_GEOMETRYMIGRATIONEXTENSION_H diff --git a/src/Mod/Part/App/GizmoHelper.h b/src/Mod/Part/App/GizmoHelper.h index f16e4bfbe0..9af33173e2 100644 --- a/src/Mod/Part/App/GizmoHelper.h +++ b/src/Mod/Part/App/GizmoHelper.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GIZMO_HELPER_H -#define GIZMO_HELPER_H +#pragma once #include #include @@ -89,5 +88,3 @@ struct PartExport DraggerPlacementPropsWithNormals }; std::optional PartExport getDraggerPlacementFromPlaneAndFace(Part::TopoShape& face, gp_Pln& plane); - -#endif /* GIZMO_HELPER_H */ diff --git a/src/Mod/Part/App/IGES/ImportExportSettings.h b/src/Mod/Part/App/IGES/ImportExportSettings.h index 2bb57f40af..82b8a99d3c 100644 --- a/src/Mod/Part/App/IGES/ImportExportSettings.h +++ b/src/Mod/Part/App/IGES/ImportExportSettings.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_IGES_IMPORTEXPORTSETTINGS_H -#define PART_IGES_IMPORTEXPORTSETTINGS_H +#pragma once #include #include @@ -65,5 +64,3 @@ private: } // namespace IGES } // namespace Part - -#endif diff --git a/src/Mod/Part/App/ImportIges.h b/src/Mod/Part/App/ImportIges.h index 7801d0af4a..05d6b0450b 100644 --- a/src/Mod/Part/App/ImportIges.h +++ b/src/Mod/Part/App/ImportIges.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_IMPORT_IGES_H -#define PART_IMPORT_IGES_H +#pragma once #include @@ -39,5 +38,3 @@ namespace Part PartExport int ImportIgesParts(App::Document* pcDoc, const char* Name); } // namespace Part - -#endif // PART_IMPORT_IGES_H diff --git a/src/Mod/Part/App/ImportStep.h b/src/Mod/Part/App/ImportStep.h index 3e226643b5..d0827eae16 100644 --- a/src/Mod/Part/App/ImportStep.h +++ b/src/Mod/Part/App/ImportStep.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef _ImportStep_h_ -#define _ImportStep_h_ +#pragma once #include @@ -51,6 +50,3 @@ inline std::list supportedSTEPSchemes() } } // namespace Part - - -#endif diff --git a/src/Mod/Part/App/Interface.h b/src/Mod/Part/App/Interface.h index 1900243eb7..da4044d3ca 100644 --- a/src/Mod/Part/App/Interface.h +++ b/src/Mod/Part/App/Interface.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_INTERFACE_H -#define PART_INTERFACE_H +#pragma once #include #include @@ -80,5 +79,3 @@ public: }; } // namespace Part - -#endif diff --git a/src/Mod/Part/App/MeasureClient.h b/src/Mod/Part/App/MeasureClient.h index 8b3cb2932b..949453e35b 100644 --- a/src/Mod/Part/App/MeasureClient.h +++ b/src/Mod/Part/App/MeasureClient.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef PART_MEASURE_H -#define PART_MEASURE_H +#pragma once #include @@ -48,5 +47,3 @@ public: } // namespace Part - -#endif diff --git a/src/Mod/Part/App/MeasureInfo.h b/src/Mod/Part/App/MeasureInfo.h index c605c327c0..b393011064 100644 --- a/src/Mod/Part/App/MeasureInfo.h +++ b/src/Mod/Part/App/MeasureInfo.h @@ -24,8 +24,7 @@ //! MeasureInfo.h //! ancestor class and the various flavours of MeasureXXXXXInfo. -#ifndef PART_MEASUREINFO_H -#define PART_MEASUREINFO_H +#pragma once #include @@ -191,5 +190,3 @@ public: using CallbackRegistrationList = std::vector; } // end namespace Part - -#endif diff --git a/src/Mod/Part/App/OCAF/ImportExportSettings.h b/src/Mod/Part/App/OCAF/ImportExportSettings.h index f88a31ac3e..5ddfbc2a17 100644 --- a/src/Mod/Part/App/OCAF/ImportExportSettings.h +++ b/src/Mod/Part/App/OCAF/ImportExportSettings.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_OCAF_IMPORTEXPORTSETTINGS_H -#define PART_OCAF_IMPORTEXPORTSETTINGS_H +#pragma once #include #include @@ -157,5 +156,3 @@ private: } // namespace OCAF } // namespace Part - -#endif diff --git a/src/Mod/Part/App/OCCError.h b/src/Mod/Part/App/OCCError.h index af7839e9e2..0584ba645d 100644 --- a/src/Mod/Part/App/OCCError.h +++ b/src/Mod/Part/App/OCCError.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef _OCCError_h_ -#define _OCCError_h_ +#pragma once #include #include @@ -63,4 +62,3 @@ PartExport extern PyObject* PartExceptionOCCDimensionError; } // namespace Part #define PY_CATCH_OCC _PY_CATCH_OCC(return (NULL)) -#endif // _OCCError_h_ diff --git a/src/Mod/Part/App/OCCTProgressIndicator.h b/src/Mod/Part/App/OCCTProgressIndicator.h index ab95e25d7f..6fac204fe3 100644 --- a/src/Mod/Part/App/OCCTProgressIndicator.h +++ b/src/Mod/Part/App/OCCTProgressIndicator.h @@ -20,8 +20,7 @@ * * **************************************************************************/ -#ifndef PART_OCCTPROGRESSINDICATOR_H -#define PART_OCCTPROGRESSINDICATOR_H +#pragma once #include #include @@ -78,5 +77,3 @@ public: #endif } // namespace Part - -#endif // PART_OCCTPROGRESSINDICATOR_H diff --git a/src/Mod/Part/App/OpenCascadeAll.h b/src/Mod/Part/App/OpenCascadeAll.h index 869cc38698..4ac180b07c 100644 --- a/src/Mod/Part/App/OpenCascadeAll.h +++ b/src/Mod/Part/App/OpenCascadeAll.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef __OpenCascadeAll__ -#define __OpenCascadeAll__ +#pragma once // OpenCASCADE @@ -516,5 +515,3 @@ #include #include #include - -#endif // __OpenCascadeAll__ diff --git a/src/Mod/Part/App/Part2DObject.h b/src/Mod/Part/App/Part2DObject.h index 2852b70d52..743321f441 100644 --- a/src/Mod/Part/App/Part2DObject.h +++ b/src/Mod/Part/App/Part2DObject.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_PART2DOBJECT_H -#define PART_PART2DOBJECT_H +#pragma once #include #include @@ -109,6 +108,3 @@ public: using Part2DObjectPython = App::FeaturePythonT; } // namespace Part - - -#endif // PART_PART2DOBJECT_H diff --git a/src/Mod/Part/App/PartFeature.h b/src/Mod/Part/App/PartFeature.h index a36130abe0..03178f731c 100644 --- a/src/Mod/Part/App/PartFeature.h +++ b/src/Mod/Part/App/PartFeature.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FEATURE_H -#define PART_FEATURE_H +#pragma once #include #include @@ -347,5 +346,3 @@ PartExport bool checkIntersection( } // namespace Part ENABLE_BITMASK_OPERATORS(Part::ShapeOption) - -#endif // PART_FEATURE_H diff --git a/src/Mod/Part/App/PartFeatureReference.h b/src/Mod/Part/App/PartFeatureReference.h index e2a0cc31de..3f61d9ff73 100644 --- a/src/Mod/Part/App/PartFeatureReference.h +++ b/src/Mod/Part/App/PartFeatureReference.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FeatureReference_H -#define PART_FeatureReference_H +#pragma once #include @@ -69,6 +68,3 @@ protected: } // namespace Part - - -#endif // PART_FeatureReference_H diff --git a/src/Mod/Part/App/PartFeatures.h b/src/Mod/Part/App/PartFeatures.h index 29ff9e5ddf..9f11460bbf 100644 --- a/src/Mod/Part/App/PartFeatures.h +++ b/src/Mod/Part/App/PartFeatures.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_FEATURES_H -#define PART_FEATURES_H +#pragma once #include #include @@ -210,6 +209,3 @@ public: }; } // namespace Part - - -#endif // PART_FEATURES_H diff --git a/src/Mod/Part/App/PartPyCXX.h b/src/Mod/Part/App/PartPyCXX.h index 4e9f709c0e..08ed93db62 100644 --- a/src/Mod/Part/App/PartPyCXX.h +++ b/src/Mod/Part/App/PartPyCXX.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_PYCXX_H -#define PART_PYCXX_H +#pragma once #include @@ -45,5 +44,3 @@ PartExport Py::Object shape2pyshape(const TopoDS_Shape& shape); PartExport void getPyShapes(PyObject* obj, std::vector& shapes); PartExport std::vector getPyShapes(PyObject* obj); } // namespace Part - -#endif // PART_PYCXX_H diff --git a/src/Mod/Part/App/PreCompiled.h b/src/Mod/Part/App/PreCompiled.h index 41cbd409b5..cc497173b9 100644 --- a/src/Mod/Part/App/PreCompiled.h +++ b/src/Mod/Part/App/PreCompiled.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_PRECOMPILED_H -#define PART_PRECOMPILED_H +#pragma once #include @@ -73,5 +72,3 @@ #ifndef _Standard_Version_HeaderFile # include #endif - -#endif diff --git a/src/Mod/Part/App/PreviewExtension.h b/src/Mod/Part/App/PreviewExtension.h index 7b8926af0f..466dfdd137 100644 --- a/src/Mod/Part/App/PreviewExtension.h +++ b/src/Mod/Part/App/PreviewExtension.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef PART_PREVIEWEXTENSION_H -#define PART_PREVIEWEXTENSION_H +#pragma once #include "PropertyTopoShape.h" @@ -108,5 +107,3 @@ public: using PreviewExtensionPython = App::ExtensionPythonT>; } // namespace Part - -#endif // PART_PREVIEWEXTENSION_H diff --git a/src/Mod/Part/App/PrimitiveFeature.h b/src/Mod/Part/App/PrimitiveFeature.h index 4149b59af2..f2a4a1bc19 100644 --- a/src/Mod/Part/App/PrimitiveFeature.h +++ b/src/Mod/Part/App/PrimitiveFeature.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_PRIMITIVEFEATURE_H -#define PART_PRIMITIVEFEATURE_H +#pragma once #include @@ -453,6 +452,3 @@ private: }; } // namespace Part - - -#endif // PART_PRIMITIVEFEATURE_H diff --git a/src/Mod/Part/App/PrismExtension.h b/src/Mod/Part/App/PrismExtension.h index 354223dca0..f8b659524c 100644 --- a/src/Mod/Part/App/PrismExtension.h +++ b/src/Mod/Part/App/PrismExtension.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_PRISM_EXTENSION_H -#define PART_PRISM_EXTENSION_H +#pragma once #include #include @@ -57,5 +56,3 @@ protected: }; } // namespace Part - -#endif // PART_PRISM_EXTENSION_H diff --git a/src/Mod/Part/App/PropertyGeometryList.h b/src/Mod/Part/App/PropertyGeometryList.h index 43c7865432..740a11b5cf 100644 --- a/src/Mod/Part/App/PropertyGeometryList.h +++ b/src/Mod/Part/App/PropertyGeometryList.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef APP_PropertyGeometryList_H -#define APP_PropertyGeometryList_H +#pragma once #include @@ -104,6 +103,3 @@ private: }; } // namespace Part - - -#endif // APP_PropertyGeometryList_H diff --git a/src/Mod/Part/App/PropertyTopoShape.h b/src/Mod/Part/App/PropertyTopoShape.h index 92638bc1b9..72e54572b9 100644 --- a/src/Mod/Part/App/PropertyTopoShape.h +++ b/src/Mod/Part/App/PropertyTopoShape.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_PROPERTYTOPOSHAPE_H -#define PART_PROPERTYTOPOSHAPE_H +#pragma once #include #include @@ -314,6 +313,3 @@ private: }; } // namespace Part - - -#endif // PART_PROPERTYTOPOSHAPE_H diff --git a/src/Mod/Part/App/PropertyTopoShapeList.h b/src/Mod/Part/App/PropertyTopoShapeList.h index 77befe768b..2dd2b7ea1f 100644 --- a/src/Mod/Part/App/PropertyTopoShapeList.h +++ b/src/Mod/Part/App/PropertyTopoShapeList.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PropertyTopoShapeList_H -#define PropertyTopoShapeList_H +#pragma once #include @@ -110,6 +109,3 @@ private: }; } // namespace Part - - -#endif // APP_PropertyTopoShapeList_H diff --git a/src/Mod/Part/App/STEP/ImportExportSettings.h b/src/Mod/Part/App/STEP/ImportExportSettings.h index 993358c50a..bcde26acc2 100644 --- a/src/Mod/Part/App/STEP/ImportExportSettings.h +++ b/src/Mod/Part/App/STEP/ImportExportSettings.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_STEP_IMPORTEXPORTSETTINGS_H -#define PART_STEP_IMPORTEXPORTSETTINGS_H +#pragma once #include #include @@ -70,5 +69,3 @@ private: } // namespace STEP } // namespace Part - -#endif diff --git a/src/Mod/Part/App/Services.h b/src/Mod/Part/App/Services.h index b331c5eea3..e9a0107b01 100644 --- a/src/Mod/Part/App/Services.h +++ b/src/Mod/Part/App/Services.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef PART_SERVICES_H -#define PART_SERVICES_H +#pragma once #include #include @@ -44,5 +43,3 @@ public: std::optional ofDocumentObject(App::DocumentObject* object) const override; bool supports(App::DocumentObject* object) const override; }; - -#endif // PART_SERVICES_H diff --git a/src/Mod/Part/App/ShapeMapHasher.h b/src/Mod/Part/App/ShapeMapHasher.h index fbfa4f22ac..1c9810568a 100644 --- a/src/Mod/Part/App/ShapeMapHasher.h +++ b/src/Mod/Part/App/ShapeMapHasher.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef PART_SHAPEMAPHASHER_H -#define PART_SHAPEMAPHASHER_H +#pragma once #include @@ -49,5 +48,3 @@ public: }; } // namespace Part - -#endif // PART_SHAPEMAPHASHER_H diff --git a/src/Mod/Part/App/Tools.h b/src/Mod/Part/App/Tools.h index 88bed90f18..63ca56cb56 100644 --- a/src/Mod/Part/App/Tools.h +++ b/src/Mod/Part/App/Tools.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_TOOLS_H -#define PART_TOOLS_H +#pragma once #include #include @@ -365,6 +364,3 @@ public: }; } // namespace Part - - -#endif // PART_TOOLS_H diff --git a/src/Mod/Part/App/TopoShape.h b/src/Mod/Part/App/TopoShape.h index 0f154716b3..1739af3a10 100644 --- a/src/Mod/Part/App/TopoShape.h +++ b/src/Mod/Part/App/TopoShape.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_TOPOSHAPE_H -#define PART_TOPOSHAPE_H +#pragma once #include #include @@ -3052,5 +3051,3 @@ struct PartExport MapperHistory: TopoShape::Mapper }; } // namespace Part - -#endif // PART_TOPOSHAPE_H diff --git a/src/Mod/Part/App/TopoShapeCache.h b/src/Mod/Part/App/TopoShapeCache.h index 75aff066a2..4974a4058f 100644 --- a/src/Mod/Part/App/TopoShapeCache.h +++ b/src/Mod/Part/App/TopoShapeCache.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef FREECAD_TOPOSHAPECACHE_H -#define FREECAD_TOPOSHAPECACHE_H +#pragma once #include #include @@ -144,5 +143,3 @@ public: }; } // namespace Part - -#endif // FREECAD_TOPOSHAPECACHE_H diff --git a/src/Mod/Part/App/TopoShapeOpCode.h b/src/Mod/Part/App/TopoShapeOpCode.h index 5ba56fde4a..1ea1441fe3 100644 --- a/src/Mod/Part/App/TopoShapeOpCode.h +++ b/src/Mod/Part/App/TopoShapeOpCode.h @@ -22,8 +22,7 @@ * * ****************************************************************************/ -#ifndef PART_TOPOSHAPE_OPCODE_H -#define PART_TOPOSHAPE_OPCODE_H +#pragma once #include @@ -102,5 +101,3 @@ public: }; } // namespace Part - -#endif // PART_TOPOSHAPE_OPCODE_H diff --git a/src/Mod/Part/App/VectorAdapter.h b/src/Mod/Part/App/VectorAdapter.h index 2c32b753b3..5926cfba77 100644 --- a/src/Mod/Part/App/VectorAdapter.h +++ b/src/Mod/Part/App/VectorAdapter.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_VECTORADAPTER_H -#define PART_VECTORADAPTER_H +#pragma once #include @@ -99,5 +98,3 @@ private: } // namespace Part - -#endif diff --git a/src/Mod/Part/App/WireJoiner.h b/src/Mod/Part/App/WireJoiner.h index 6d4eb6fc48..203d184473 100644 --- a/src/Mod/Part/App/WireJoiner.h +++ b/src/Mod/Part/App/WireJoiner.h @@ -22,8 +22,7 @@ * * ****************************************************************************/ -#ifndef PART_WIRE_JOINER_H -#define PART_WIRE_JOINER_H +#pragma once #include #include @@ -69,5 +68,3 @@ private: }; } // namespace Part - -#endif // PART_WIRE_JOINER_H diff --git a/src/Mod/Part/App/edgecluster.h b/src/Mod/Part/App/edgecluster.h index 559b899872..4a4b1bb381 100644 --- a/src/Mod/Part/App/edgecluster.h +++ b/src/Mod/Part/App/edgecluster.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_EDGECLUSTER_H -#define PART_EDGECLUSTER_H +#pragma once #include #include @@ -89,5 +88,3 @@ private: }; } // namespace Part - -#endif // PART_EDGECLUSTER_H diff --git a/src/Mod/Part/App/encodeFilename.h b/src/Mod/Part/App/encodeFilename.h index 3989a95a76..0dfe9c233f 100644 --- a/src/Mod/Part/App/encodeFilename.h +++ b/src/Mod/Part/App/encodeFilename.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PART_ENCODEFILENAME_H -#define PART_ENCODEFILENAME_H +#pragma once namespace Part { @@ -34,5 +33,3 @@ inline std::string encodeFilename(std::string fn) } } // namespace Part - -#endif // PART_ENCODEFILENAME_H diff --git a/src/Mod/Part/App/modelRefine.h b/src/Mod/Part/App/modelRefine.h index b89adb0cb3..19f607766d 100644 --- a/src/Mod/Part/App/modelRefine.h +++ b/src/Mod/Part/App/modelRefine.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef MODELREFINE_H -#define MODELREFINE_H +#pragma once #include #include @@ -259,5 +258,3 @@ protected: TopTools_ListOfShape myDeleted; }; } // namespace Part - -#endif // MODELREFINE_H diff --git a/src/Mod/Part/Gui/AttacherTexts.h b/src/Mod/Part/Gui/AttacherTexts.h index 1a254a0ddb..1b6a7fad69 100644 --- a/src/Mod/Part/Gui/AttacherTexts.h +++ b/src/Mod/Part/Gui/AttacherTexts.h @@ -27,8 +27,7 @@ * of attachment modes, as well as help texts, and the like. */ -#ifndef PARTATTACHERTEXTS_H -#define PARTATTACHERTEXTS_H +#pragma once #include #include @@ -68,4 +67,3 @@ public: }; } // namespace AttacherGui -#endif diff --git a/src/Mod/Part/Gui/BoxSelection.h b/src/Mod/Part/Gui/BoxSelection.h index 4c69793750..e682ad3528 100644 --- a/src/Mod/Part/Gui/BoxSelection.h +++ b/src/Mod/Part/Gui/BoxSelection.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_BOXSELECTION_H -#define PARTGUI_BOXSELECTION_H +#pragma once #include @@ -74,5 +73,3 @@ private: }; } // namespace PartGui - -#endif // PARTGUI_BOXSELECTION_H diff --git a/src/Mod/Part/Gui/CrossSections.h b/src/Mod/Part/Gui/CrossSections.h index ba0dd9bdc9..3af21354f0 100644 --- a/src/Mod/Part/Gui/CrossSections.h +++ b/src/Mod/Part/Gui/CrossSections.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PARTGUI_CROSSSECTIONS_H -#define PARTGUI_CROSSSECTIONS_H +#pragma once #include #include @@ -114,5 +113,3 @@ private: }; } // namespace PartGui - -#endif // PARTGUI_CROSSSECTIONS_H diff --git a/src/Mod/Part/Gui/DlgBooleanOperation.h b/src/Mod/Part/Gui/DlgBooleanOperation.h index 0b43c70c18..92f58da915 100644 --- a/src/Mod/Part/Gui/DlgBooleanOperation.h +++ b/src/Mod/Part/Gui/DlgBooleanOperation.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PARTGUI_DLGBOOLEANOPERATION_H -#define PARTGUI_DLGBOOLEANOPERATION_H +#pragma once #include #include @@ -99,5 +98,3 @@ private: }; } // namespace PartGui - -#endif // PARTGUI_DLGBOOLEANOPERATION_H diff --git a/src/Mod/Part/Gui/DlgExportStep.h b/src/Mod/Part/Gui/DlgExportStep.h index 0e95d7def6..589f6f9c4d 100644 --- a/src/Mod/Part/Gui/DlgExportStep.h +++ b/src/Mod/Part/Gui/DlgExportStep.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_DLGEXPORTSTEP_H -#define PARTGUI_DLGEXPORTSTEP_H +#pragma once #include #include @@ -107,5 +106,3 @@ private: }; } // namespace PartGui - -#endif // PARTGUI_DLGEXPORTSTEP_H diff --git a/src/Mod/Part/Gui/DlgExtrusion.h b/src/Mod/Part/Gui/DlgExtrusion.h index 83de97af4c..1f98ca9360 100644 --- a/src/Mod/Part/Gui/DlgExtrusion.h +++ b/src/Mod/Part/Gui/DlgExtrusion.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PARTGUI_DLGEXTRUSION_H -#define PARTGUI_DLGEXTRUSION_H +#pragma once #include #include @@ -126,5 +125,3 @@ private: }; } // namespace PartGui - -#endif // PARTGUI_DLGEXTRUSION_H diff --git a/src/Mod/Part/Gui/DlgFilletEdges.h b/src/Mod/Part/Gui/DlgFilletEdges.h index 2511775a30..2b89294047 100644 --- a/src/Mod/Part/Gui/DlgFilletEdges.h +++ b/src/Mod/Part/Gui/DlgFilletEdges.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PARTGUI_DLGFILLETEDGES_H -#define PARTGUI_DLGFILLETEDGES_H +#pragma once #include #include @@ -229,5 +228,3 @@ private: }; } // namespace PartGui - -#endif // PARTGUI_DLGFILLETEDGES_H diff --git a/src/Mod/Part/Gui/DlgImportStep.h b/src/Mod/Part/Gui/DlgImportStep.h index b2dd2f486c..b8c71e5789 100644 --- a/src/Mod/Part/Gui/DlgImportStep.h +++ b/src/Mod/Part/Gui/DlgImportStep.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_DLGIMPORTSTEP_H -#define PARTGUI_DLGIMPORTSTEP_H +#pragma once #include #include @@ -90,5 +89,3 @@ private: }; } // namespace PartGui - -#endif // PARTGUI_DLGIMPORTSTEP_H diff --git a/src/Mod/Part/Gui/DlgPartBoxImp.h b/src/Mod/Part/Gui/DlgPartBoxImp.h index 87d3441d17..5146d08448 100644 --- a/src/Mod/Part/Gui/DlgPartBoxImp.h +++ b/src/Mod/Part/Gui/DlgPartBoxImp.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PARTGUI_DLGPARTBOXIMP_H -#define PARTGUI_DLGPARTBOXIMP_H +#pragma once #include @@ -42,5 +41,3 @@ public: }; } // namespace PartGui - -#endif // PARTGUI_DLGPARTBOXIMP_H diff --git a/src/Mod/Part/Gui/DlgPartCylinderImp.h b/src/Mod/Part/Gui/DlgPartCylinderImp.h index cea6330d07..ee6d2a36bc 100644 --- a/src/Mod/Part/Gui/DlgPartCylinderImp.h +++ b/src/Mod/Part/Gui/DlgPartCylinderImp.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PARTGUI_DLGPARTCYLINDERIMP_H -#define PARTGUI_DLGPARTCYLINDERIMP_H +#pragma once #include @@ -48,5 +47,3 @@ private: }; } // namespace PartGui - -#endif // PARTGUI_DLGPARTCYLINDERIMP_H diff --git a/src/Mod/Part/Gui/DlgPartImportIgesImp.h b/src/Mod/Part/Gui/DlgPartImportIgesImp.h index a0a9341209..81843c1989 100644 --- a/src/Mod/Part/Gui/DlgPartImportIgesImp.h +++ b/src/Mod/Part/Gui/DlgPartImportIgesImp.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef DlgPartImportIgesImp_H -#define DlgPartImportIgesImp_H +#pragma once #include #include @@ -48,5 +47,3 @@ private: }; } // namespace PartGui - -#endif // DlgPartImportIgesImp_H diff --git a/src/Mod/Part/Gui/DlgPartImportStepImp.h b/src/Mod/Part/Gui/DlgPartImportStepImp.h index ed71cd6dc7..09426e3d87 100644 --- a/src/Mod/Part/Gui/DlgPartImportStepImp.h +++ b/src/Mod/Part/Gui/DlgPartImportStepImp.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef DlgPartImportStepImp_H -#define DlgPartImportStepImp_H +#pragma once #include #include @@ -49,5 +48,3 @@ private: }; } // namespace PartGui - -#endif // DlgPartImportStepImp_H diff --git a/src/Mod/Part/Gui/DlgPrimitives.h b/src/Mod/Part/Gui/DlgPrimitives.h index 95302f992e..3fedc67959 100644 --- a/src/Mod/Part/Gui/DlgPrimitives.h +++ b/src/Mod/Part/Gui/DlgPrimitives.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PARTGUI_DLGPRIMITIVES_H -#define PARTGUI_DLGPRIMITIVES_H +#pragma once #include #include @@ -489,5 +488,3 @@ private: }; } // namespace PartGui - -#endif // PARTGUI_DLGPRIMITIVES_H diff --git a/src/Mod/Part/Gui/DlgProjectionOnSurface.h b/src/Mod/Part/Gui/DlgProjectionOnSurface.h index e7011ed4e5..0c87c6f69f 100644 --- a/src/Mod/Part/Gui/DlgProjectionOnSurface.h +++ b/src/Mod/Part/Gui/DlgProjectionOnSurface.h @@ -21,8 +21,7 @@ * Suite 330, Boston, MA 02111-1307, USA * * * ***************************************************************************/ -#ifndef PARTGUI_DLGPROJECTIONONSURFACE_H -#define PARTGUI_DLGPROJECTIONONSURFACE_H +#pragma once #include "gp_Dir.hxx" #include "TopoDS_Edge.hxx" @@ -260,4 +259,3 @@ private: } // namespace PartGui -#endif // PARTGUI_DLGPROJECTIONONSURFACE_H diff --git a/src/Mod/Part/Gui/DlgRevolution.h b/src/Mod/Part/Gui/DlgRevolution.h index 1e3a7ece44..989adb10f4 100644 --- a/src/Mod/Part/Gui/DlgRevolution.h +++ b/src/Mod/Part/Gui/DlgRevolution.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PARTGUI_DLGREVOLUTION_H -#define PARTGUI_DLGREVOLUTION_H +#pragma once #include #include @@ -106,5 +105,3 @@ private: }; } // namespace PartGui - -#endif // PARTGUI_DLGREVOLUTION_H diff --git a/src/Mod/Part/Gui/DlgScale.h b/src/Mod/Part/Gui/DlgScale.h index b66370d952..8f7a3173ea 100644 --- a/src/Mod/Part/Gui/DlgScale.h +++ b/src/Mod/Part/Gui/DlgScale.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PARTGUI_DLGSCALE_H -#define PARTGUI_DLGSCALE_H +#pragma once #include #include @@ -94,5 +93,3 @@ private: }; } // namespace PartGui - -#endif // PARTGUI_DLGSCALE_H diff --git a/src/Mod/Part/Gui/DlgSettings3DViewPartImp.h b/src/Mod/Part/Gui/DlgSettings3DViewPartImp.h index 0719b2009b..3272317690 100644 --- a/src/Mod/Part/Gui/DlgSettings3DViewPartImp.h +++ b/src/Mod/Part/Gui/DlgSettings3DViewPartImp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_DLGSETTINGS3DVIEWIMP_H -#define PARTGUI_DLGSETTINGS3DVIEWIMP_H +#pragma once #include #include @@ -60,5 +59,3 @@ private: }; } // namespace PartGui - -#endif // PARTGUI_DLGSETTINGS3DVIEWIMP_H diff --git a/src/Mod/Part/Gui/DlgSettingsGeneral.h b/src/Mod/Part/Gui/DlgSettingsGeneral.h index 8216b9fe07..d22fdb3db3 100644 --- a/src/Mod/Part/Gui/DlgSettingsGeneral.h +++ b/src/Mod/Part/Gui/DlgSettingsGeneral.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_DLGSETTINGSGENERAL_H -#define PARTGUI_DLGSETTINGSGENERAL_H +#pragma once #include @@ -93,5 +92,3 @@ private: }; } // namespace PartGui - -#endif // PARTGUI_DLGSETTINGSGENERAL_H diff --git a/src/Mod/Part/Gui/DlgSettingsObjectColor.h b/src/Mod/Part/Gui/DlgSettingsObjectColor.h index ad03b09985..bc73f6e9e2 100644 --- a/src/Mod/Part/Gui/DlgSettingsObjectColor.h +++ b/src/Mod/Part/Gui/DlgSettingsObjectColor.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_DIALOG_DLGSETTINGSOBJECTCOLOR_H -#define PARTGUI_DIALOG_DLGSETTINGSOBJECTCOLOR_H +#pragma once #include #include @@ -57,5 +56,3 @@ private: }; } // namespace PartGui - -#endif // PARTGUI_DIALOG_DLGSETTINGSOBJECTCOLOR_H diff --git a/src/Mod/Part/Gui/Mirroring.h b/src/Mod/Part/Gui/Mirroring.h index fac59c54df..e9a6cd438d 100644 --- a/src/Mod/Part/Gui/Mirroring.h +++ b/src/Mod/Part/Gui/Mirroring.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PARTGUI_MIRRORING_H -#define PARTGUI_MIRRORING_H +#pragma once #include #include @@ -91,5 +90,3 @@ private: }; } // namespace PartGui - -#endif // PARTGUI_MIRRORING_H diff --git a/src/Mod/Part/Gui/PatternParametersWidget.h b/src/Mod/Part/Gui/PatternParametersWidget.h index 537a8c55a9..ea1900c03a 100644 --- a/src/Mod/Part/Gui/PatternParametersWidget.h +++ b/src/Mod/Part/Gui/PatternParametersWidget.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef PARTGUI_PATTERNPARAMETERSWIDGET_H -#define PARTGUI_PATTERNPARAMETERSWIDGET_H +#pragma once #include #include // For Property types @@ -224,6 +223,3 @@ private: }; } // namespace PartGui - - -#endif // PARTGUI_PATTERNPARAMETERSWIDGET_H diff --git a/src/Mod/Part/Gui/PreCompiled.h b/src/Mod/Part/Gui/PreCompiled.h index 62b9e99977..93dc81a609 100644 --- a/src/Mod/Part/Gui/PreCompiled.h +++ b/src/Mod/Part/Gui/PreCompiled.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PARTGUI_PRECOMPILED_H -#define PARTGUI_PRECOMPILED_H +#pragma once #include @@ -78,6 +77,3 @@ // Inventor includes OpenGL #include - - -#endif // PARTGUI_PRECOMPILED_H diff --git a/src/Mod/Part/Gui/PreviewUpdateScheduler.h b/src/Mod/Part/Gui/PreviewUpdateScheduler.h index f229ec0f89..e4698791e7 100644 --- a/src/Mod/Part/Gui/PreviewUpdateScheduler.h +++ b/src/Mod/Part/Gui/PreviewUpdateScheduler.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FREECAD_PREVIEWUPDATESCHEDULER_H -#define FREECAD_PREVIEWUPDATESCHEDULER_H +#pragma once #include "App/DocumentObserver.h" @@ -67,5 +66,3 @@ private: }; } // namespace PartGui - -#endif // FREECAD_PREVIEWUPDATESCHEDULER_H diff --git a/src/Mod/Part/Gui/PropertyEnumAttacherItem.h b/src/Mod/Part/Gui/PropertyEnumAttacherItem.h index d5580df912..a87a8a67ea 100644 --- a/src/Mod/Part/Gui/PropertyEnumAttacherItem.h +++ b/src/Mod/Part/Gui/PropertyEnumAttacherItem.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PART_PropertyEnumAttacherItem_H -#define PART_PropertyEnumAttacherItem_H +#pragma once #include @@ -63,5 +62,3 @@ protected: }; } // namespace PartGui - -#endif // PART_PropertyEnumAttacherItem_H diff --git a/src/Mod/Part/Gui/ReferenceHighlighter.h b/src/Mod/Part/Gui/ReferenceHighlighter.h index 4ae790ec67..b15a2e99e8 100644 --- a/src/Mod/Part/Gui/ReferenceHighlighter.h +++ b/src/Mod/Part/Gui/ReferenceHighlighter.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PARTGUI_REFERENCEHIGHLIGHTER_H -#define PARTGUI_REFERENCEHIGHLIGHTER_H +#pragma once #include @@ -119,6 +118,3 @@ private: } // namespace PartGui - - -#endif // PARTGUI_REFERENCEHIGHLIGHTER_H diff --git a/src/Mod/Part/Gui/SectionCutting.h b/src/Mod/Part/Gui/SectionCutting.h index e5723f31f5..7a03eef8f9 100644 --- a/src/Mod/Part/Gui/SectionCutting.h +++ b/src/Mod/Part/Gui/SectionCutting.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PARTGUI_SECTIONCUTTING_H -#define PARTGUI_SECTIONCUTTING_H +#pragma once #include #include @@ -210,5 +209,3 @@ private: }; } // namespace PartGui - -#endif // PARTGUI_SECTIONCUTTING_H diff --git a/src/Mod/Part/Gui/ShapeFromMesh.h b/src/Mod/Part/Gui/ShapeFromMesh.h index bf7bb9d7c4..1829ba2065 100644 --- a/src/Mod/Part/Gui/ShapeFromMesh.h +++ b/src/Mod/Part/Gui/ShapeFromMesh.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PARTGUI_SHAPEFROMMESH_H -#define PARTGUI_SHAPEFROMMESH_H +#pragma once #include #include @@ -48,5 +47,3 @@ private: }; } // namespace PartGui - -#endif // PARTGUI_SHAPEFROMMESH_H diff --git a/src/Mod/Part/Gui/SoBrepEdgeSet.h b/src/Mod/Part/Gui/SoBrepEdgeSet.h index 63b08c8fa1..023dcbabd1 100644 --- a/src/Mod/Part/Gui/SoBrepEdgeSet.h +++ b/src/Mod/Part/Gui/SoBrepEdgeSet.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PARTGUI_SOBREPEDGESET_H -#define PARTGUI_SOBREPEDGESET_H +#pragma once #include #include @@ -96,6 +95,3 @@ private: }; } // namespace PartGui - - -#endif // PARTGUI_SOBREPEDGESET_H diff --git a/src/Mod/Part/Gui/SoBrepFaceSet.h b/src/Mod/Part/Gui/SoBrepFaceSet.h index 3e307786d9..3069b88720 100644 --- a/src/Mod/Part/Gui/SoBrepFaceSet.h +++ b/src/Mod/Part/Gui/SoBrepFaceSet.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PARTGUI_SOBREPFACESET_H -#define PARTGUI_SOBREPFACESET_H +#pragma once #include #include @@ -180,5 +179,3 @@ private: }; } // namespace PartGui - -#endif // PARTGUI_SOBREPFACESET_H diff --git a/src/Mod/Part/Gui/SoBrepPointSet.h b/src/Mod/Part/Gui/SoBrepPointSet.h index f0eee1712a..a49df0b3e6 100644 --- a/src/Mod/Part/Gui/SoBrepPointSet.h +++ b/src/Mod/Part/Gui/SoBrepPointSet.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PARTGUI_SOBREPPOINTSET_H -#define PARTGUI_SOBREPPOINTSET_H +#pragma once #include #include @@ -81,6 +80,3 @@ private: }; } // namespace PartGui - - -#endif // PARTGUI_SOBREPPOINTSET_H diff --git a/src/Mod/Part/Gui/SoFCShapeObject.h b/src/Mod/Part/Gui/SoFCShapeObject.h index ff4cd90333..442d793230 100644 --- a/src/Mod/Part/Gui/SoFCShapeObject.h +++ b/src/Mod/Part/Gui/SoFCShapeObject.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PARTGUI_SOFCSHAPEOBJECT_H -#define PARTGUI_SOFCSHAPEOBJECT_H +#pragma once #include "SoBrepEdgeSet.h" #include "SoBrepFaceSet.h" @@ -85,6 +84,3 @@ private: }; } // namespace PartGui - - -#endif // PARTGUI_SOFCSHAPEOBJECT_H diff --git a/src/Mod/Part/Gui/TaskAttacher.h b/src/Mod/Part/Gui/TaskAttacher.h index dc70c3558e..af34b84101 100644 --- a/src/Mod/Part/Gui/TaskAttacher.h +++ b/src/Mod/Part/Gui/TaskAttacher.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskAttacher_H -#define GUI_TASKVIEW_TaskAttacher_H +#pragma once #include #include @@ -238,5 +237,3 @@ protected: }; } // namespace PartGui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/Part/Gui/TaskCheckGeometry.h b/src/Mod/Part/Gui/TaskCheckGeometry.h index 01fec0a8a9..5a49866c19 100644 --- a/src/Mod/Part/Gui/TaskCheckGeometry.h +++ b/src/Mod/Part/Gui/TaskCheckGeometry.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef TASKCHECKGEOMETRY_H -#define TASKCHECKGEOMETRY_H +#pragma once #include #include @@ -241,5 +240,3 @@ private: QProgressDialog* myProgress; }; } // namespace PartGui - -#endif // TASKCHECKGEOMETRY_H diff --git a/src/Mod/Part/Gui/TaskFaceAppearances.h b/src/Mod/Part/Gui/TaskFaceAppearances.h index cf1733d695..8c9ffc9434 100644 --- a/src/Mod/Part/Gui/TaskFaceAppearances.h +++ b/src/Mod/Part/Gui/TaskFaceAppearances.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PARTGUI_TASKSETCOLORS_H -#define PARTGUI_TASKSETCOLORS_H +#pragma once #include #include @@ -101,5 +100,3 @@ private: }; } // namespace PartGui - -#endif // PARTGUI_TASKSETCOLORS_H diff --git a/src/Mod/Part/Gui/TaskLoft.h b/src/Mod/Part/Gui/TaskLoft.h index 1c8924f1cc..3406633cf0 100644 --- a/src/Mod/Part/Gui/TaskLoft.h +++ b/src/Mod/Part/Gui/TaskLoft.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_TASKLOFT_H -#define PARTGUI_TASKLOFT_H +#pragma once #include #include @@ -81,5 +80,3 @@ private: }; } // namespace PartGui - -#endif // PARTGUI_TASKLOFT_H diff --git a/src/Mod/Part/Gui/TaskOffset.h b/src/Mod/Part/Gui/TaskOffset.h index d3739b1b2b..6f542cc47b 100644 --- a/src/Mod/Part/Gui/TaskOffset.h +++ b/src/Mod/Part/Gui/TaskOffset.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_TASKOFFSET_H -#define PARTGUI_TASKOFFSET_H +#pragma once #include #include @@ -91,5 +90,3 @@ private: }; } // namespace PartGui - -#endif // PARTGUI_TASKOFFSET_H diff --git a/src/Mod/Part/Gui/TaskShapeBuilder.h b/src/Mod/Part/Gui/TaskShapeBuilder.h index 34ed7689af..a4977611cd 100644 --- a/src/Mod/Part/Gui/TaskShapeBuilder.h +++ b/src/Mod/Part/Gui/TaskShapeBuilder.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PARTGUI_TASKSHAPEBUILDER_H -#define PARTGUI_TASKSHAPEBUILDER_H +#pragma once #include #include @@ -90,5 +89,3 @@ private: }; } // namespace PartGui - -#endif // PARTGUI_TASKSHAPEBUILDER_H diff --git a/src/Mod/Part/Gui/TaskSweep.h b/src/Mod/Part/Gui/TaskSweep.h index 3eb7c7a2e0..a5d88af0bc 100644 --- a/src/Mod/Part/Gui/TaskSweep.h +++ b/src/Mod/Part/Gui/TaskSweep.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_TASKSWEEP_H -#define PARTGUI_TASKSWEEP_H +#pragma once #include #include @@ -89,5 +88,3 @@ private: }; } // namespace PartGui - -#endif // PARTGUI_TASKSWEEP_H diff --git a/src/Mod/Part/Gui/TaskThickness.h b/src/Mod/Part/Gui/TaskThickness.h index e2ceb3bc93..f3af7e1b29 100644 --- a/src/Mod/Part/Gui/TaskThickness.h +++ b/src/Mod/Part/Gui/TaskThickness.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_TASKTHICKNESS_H -#define PARTGUI_TASKTHICKNESS_H +#pragma once #include #include @@ -101,5 +100,3 @@ private: }; } // namespace PartGui - -#endif // PARTGUI_TASKTHICKNESS_H diff --git a/src/Mod/Part/Gui/ViewProvider.h b/src/Mod/Part/Gui/ViewProvider.h index 9024984a3e..522753c473 100644 --- a/src/Mod/Part/Gui/ViewProvider.h +++ b/src/Mod/Part/Gui/ViewProvider.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERPART_H -#define PARTGUI_VIEWPROVIDERPART_H +#pragma once #include @@ -83,6 +82,3 @@ protected: }; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDERPART_H diff --git a/src/Mod/Part/Gui/ViewProvider2DObject.h b/src/Mod/Part/Gui/ViewProvider2DObject.h index 1ec135cab5..7ef636b83f 100644 --- a/src/Mod/Part/Gui/ViewProvider2DObject.h +++ b/src/Mod/Part/Gui/ViewProvider2DObject.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDER2DOBJECT_H -#define PARTGUI_VIEWPROVIDER2DOBJECT_H +#pragma once #include "ViewProvider.h" #include @@ -125,6 +124,3 @@ private: using ViewProvider2DObjectPython = Gui::ViewProviderFeaturePythonT; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDER2DOBJECT_H diff --git a/src/Mod/Part/Gui/ViewProviderAttachExtension.h b/src/Mod/Part/Gui/ViewProviderAttachExtension.h index dbe2c16446..d807ec99ff 100644 --- a/src/Mod/Part/Gui/ViewProviderAttachExtension.h +++ b/src/Mod/Part/Gui/ViewProviderAttachExtension.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_VIEWPROVIDERATTACHEXTENSION_H -#define GUI_VIEWPROVIDERATTACHEXTENSION_H +#pragma once #include #include @@ -53,5 +52,3 @@ using ViewProviderAttachExtensionPython = Gui::ViewProviderExtensionPythonT; } // namespace PartGui - -#endif // GUI_VIEWPROVIDERATTACHMENTEXTENSION_H diff --git a/src/Mod/Part/Gui/ViewProviderBoolean.h b/src/Mod/Part/Gui/ViewProviderBoolean.h index cbe8e75609..b3970b52d0 100644 --- a/src/Mod/Part/Gui/ViewProviderBoolean.h +++ b/src/Mod/Part/Gui/ViewProviderBoolean.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderBoolean_H -#define PARTGUI_ViewProviderBoolean_H +#pragma once #include @@ -105,6 +104,3 @@ public: } // namespace PartGui - - -#endif // PARTGUI_ViewProviderBoolean_H diff --git a/src/Mod/Part/Gui/ViewProviderBox.h b/src/Mod/Part/Gui/ViewProviderBox.h index 4fa22b82f0..bdb56cc65c 100644 --- a/src/Mod/Part/Gui/ViewProviderBox.h +++ b/src/Mod/Part/Gui/ViewProviderBox.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERBOX_H -#define PARTGUI_VIEWPROVIDERBOX_H +#pragma once #include @@ -57,6 +56,3 @@ protected: }; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDERBOX_H diff --git a/src/Mod/Part/Gui/ViewProviderCircleParametric.h b/src/Mod/Part/Gui/ViewProviderCircleParametric.h index b024d8ddbb..fec104b711 100644 --- a/src/Mod/Part/Gui/ViewProviderCircleParametric.h +++ b/src/Mod/Part/Gui/ViewProviderCircleParametric.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERCIRCLEPARAMETRIC_H -#define PARTGUI_VIEWPROVIDERCIRCLEPARAMETRIC_H +#pragma once #include @@ -57,6 +56,3 @@ protected: }; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDERCIRCLEPARAMETRIC_H diff --git a/src/Mod/Part/Gui/ViewProviderCompound.h b/src/Mod/Part/Gui/ViewProviderCompound.h index a209ffc996..943d6b70a2 100644 --- a/src/Mod/Part/Gui/ViewProviderCompound.h +++ b/src/Mod/Part/Gui/ViewProviderCompound.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERCOMPOUND_H -#define PARTGUI_VIEWPROVIDERCOMPOUND_H +#pragma once #include @@ -59,6 +58,3 @@ protected: }; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDERCOMPOUND_H diff --git a/src/Mod/Part/Gui/ViewProviderConeParametric.h b/src/Mod/Part/Gui/ViewProviderConeParametric.h index 700fb711e1..b699918061 100644 --- a/src/Mod/Part/Gui/ViewProviderConeParametric.h +++ b/src/Mod/Part/Gui/ViewProviderConeParametric.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERCONEPARAMETRIC_H -#define PARTGUI_VIEWPROVIDERCONEPARAMETRIC_H +#pragma once #include @@ -57,6 +56,3 @@ protected: }; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDERCONEPARAMETRIC_H diff --git a/src/Mod/Part/Gui/ViewProviderCurveNet.h b/src/Mod/Part/Gui/ViewProviderCurveNet.h index cfc9c2c64b..97c9df2fd2 100644 --- a/src/Mod/Part/Gui/ViewProviderCurveNet.h +++ b/src/Mod/Part/Gui/ViewProviderCurveNet.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERCURVENET_H -#define PARTGUI_VIEWPROVIDERCURVENET_H +#pragma once #include @@ -95,6 +94,3 @@ protected: }; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDERCURVENET_H diff --git a/src/Mod/Part/Gui/ViewProviderCylinderParametric.h b/src/Mod/Part/Gui/ViewProviderCylinderParametric.h index f5ac5f226c..95bb542aef 100644 --- a/src/Mod/Part/Gui/ViewProviderCylinderParametric.h +++ b/src/Mod/Part/Gui/ViewProviderCylinderParametric.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERCYLINDERPARAMETRIC_H -#define PARTGUI_VIEWPROVIDERCYLINDERPARAMETRIC_H +#pragma once #include @@ -57,6 +56,3 @@ protected: }; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDERCYLINDERPARAMETRIC_H diff --git a/src/Mod/Part/Gui/ViewProviderDatum.h b/src/Mod/Part/Gui/ViewProviderDatum.h index 6e640fc8ba..affa2fb295 100644 --- a/src/Mod/Part/Gui/ViewProviderDatum.h +++ b/src/Mod/Part/Gui/ViewProviderDatum.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderDatum_H -#define PARTGUI_ViewProviderDatum_H +#pragma once #include #include @@ -88,6 +87,3 @@ public: }; } // namespace PartGui - - -#endif // PARTGUI_ViewProviderDatum_H diff --git a/src/Mod/Part/Gui/ViewProviderEllipseParametric.h b/src/Mod/Part/Gui/ViewProviderEllipseParametric.h index bbaea3316a..0465f81c5c 100644 --- a/src/Mod/Part/Gui/ViewProviderEllipseParametric.h +++ b/src/Mod/Part/Gui/ViewProviderEllipseParametric.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERELLIPSEPARAMETRIC_H -#define PARTGUI_VIEWPROVIDERELLIPSEPARAMETRIC_H +#pragma once #include @@ -57,6 +56,3 @@ protected: }; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDERELLIPSEPARAMETRIC_H diff --git a/src/Mod/Part/Gui/ViewProviderExt.h b/src/Mod/Part/Gui/ViewProviderExt.h index b5bc9d547b..a0d8034252 100644 --- a/src/Mod/Part/Gui/ViewProviderExt.h +++ b/src/Mod/Part/Gui/ViewProviderExt.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERPARTEXT_H -#define PARTGUI_VIEWPROVIDERPARTEXT_H +#pragma once #include "SoFCShapeObject.h" @@ -260,5 +259,3 @@ private: }; } // namespace PartGui - -#endif // PARTGUI_VIEWPROVIDERPARTEXT_H diff --git a/src/Mod/Part/Gui/ViewProviderExtrusion.h b/src/Mod/Part/Gui/ViewProviderExtrusion.h index c7a146c109..4ca5943b6a 100644 --- a/src/Mod/Part/Gui/ViewProviderExtrusion.h +++ b/src/Mod/Part/Gui/ViewProviderExtrusion.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDEREXTRUSION_H -#define PARTGUI_VIEWPROVIDEREXTRUSION_H +#pragma once #include @@ -49,6 +48,3 @@ public: }; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDEREXTRUSION_H diff --git a/src/Mod/Part/Gui/ViewProviderGridExtension.h b/src/Mod/Part/Gui/ViewProviderGridExtension.h index 660c817e21..3cabd5cc47 100644 --- a/src/Mod/Part/Gui/ViewProviderGridExtension.h +++ b/src/Mod/Part/Gui/ViewProviderGridExtension.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERGRIDEXTENSION_H -#define PARTGUI_VIEWPROVIDERGRIDEXTENSION_H +#pragma once #include #include @@ -101,6 +100,3 @@ using ViewProviderGridExtensionPython } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDERGRIDEXTENSION_H diff --git a/src/Mod/Part/Gui/ViewProviderHelixParametric.h b/src/Mod/Part/Gui/ViewProviderHelixParametric.h index 06efaf82ef..db3c8d36a3 100644 --- a/src/Mod/Part/Gui/ViewProviderHelixParametric.h +++ b/src/Mod/Part/Gui/ViewProviderHelixParametric.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERHELIXPARAMETRIC_H -#define PARTGUI_VIEWPROVIDERHELIXPARAMETRIC_H +#pragma once #include "ViewProviderSpline.h" #include "ViewProviderPrimitive.h" @@ -68,6 +67,3 @@ private: }; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDERHELIXPARAMETRIC_H diff --git a/src/Mod/Part/Gui/ViewProviderImport.h b/src/Mod/Part/Gui/ViewProviderImport.h index a561a99680..20748d7071 100644 --- a/src/Mod/Part/Gui/ViewProviderImport.h +++ b/src/Mod/Part/Gui/ViewProviderImport.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_VIEVPROVIDERIMPORT_H -#define PARTGUI_VIEVPROVIDERIMPORT_H +#pragma once #include @@ -57,6 +56,3 @@ protected: }; } // namespace PartGui - - -#endif // PARTGUI_VIEVPROVIDERIMPORT_H diff --git a/src/Mod/Part/Gui/ViewProviderLineParametric.h b/src/Mod/Part/Gui/ViewProviderLineParametric.h index ea5407b2e5..cf41baadec 100644 --- a/src/Mod/Part/Gui/ViewProviderLineParametric.h +++ b/src/Mod/Part/Gui/ViewProviderLineParametric.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERLINEPARAMETRIC_H -#define PARTGUI_VIEWPROVIDERLINEPARAMETRIC_H +#pragma once #include @@ -57,6 +56,3 @@ protected: }; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDERLINEPARAMETRIC_H diff --git a/src/Mod/Part/Gui/ViewProviderMirror.h b/src/Mod/Part/Gui/ViewProviderMirror.h index 1de8c6a1f2..83d9408989 100644 --- a/src/Mod/Part/Gui/ViewProviderMirror.h +++ b/src/Mod/Part/Gui/ViewProviderMirror.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERMIRROR_H -#define PARTGUI_VIEWPROVIDERMIRROR_H +#pragma once #include @@ -222,6 +221,3 @@ public: }; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDERMIRROR_H diff --git a/src/Mod/Part/Gui/ViewProviderPlaneParametric.h b/src/Mod/Part/Gui/ViewProviderPlaneParametric.h index 58bed59c34..0d6b2adfd5 100644 --- a/src/Mod/Part/Gui/ViewProviderPlaneParametric.h +++ b/src/Mod/Part/Gui/ViewProviderPlaneParametric.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERPLANEPARAMETRIC_H -#define PARTGUI_VIEWPROVIDERPLANEPARAMETRIC_H +#pragma once #include @@ -74,6 +73,3 @@ public: }; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDERPLANEPARAMETRIC_H diff --git a/src/Mod/Part/Gui/ViewProviderPointParametric.h b/src/Mod/Part/Gui/ViewProviderPointParametric.h index 070b643ad9..958b2dd2cc 100644 --- a/src/Mod/Part/Gui/ViewProviderPointParametric.h +++ b/src/Mod/Part/Gui/ViewProviderPointParametric.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERPOINTPARAMETRIC_H -#define PARTGUI_VIEWPROVIDERPOINTPARAMETRIC_H +#pragma once #include @@ -57,6 +56,3 @@ protected: }; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDERPOINTPARAMETRIC_H diff --git a/src/Mod/Part/Gui/ViewProviderPreviewExtension.h b/src/Mod/Part/Gui/ViewProviderPreviewExtension.h index 368dfb44bb..870c0f87f2 100644 --- a/src/Mod/Part/Gui/ViewProviderPreviewExtension.h +++ b/src/Mod/Part/Gui/ViewProviderPreviewExtension.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERPREVIEWEXTENSION_H -#define PARTGUI_VIEWPROVIDERPREVIEWEXTENSION_H +#pragma once #include "SoBrepEdgeSet.h" #include "SoBrepFaceSet.h" @@ -118,6 +117,3 @@ using ViewProviderPreviewExtensionPython = Gui::ViewProviderExtensionPythonT; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDERPREVIEWEXTENSION_H diff --git a/src/Mod/Part/Gui/ViewProviderPrimitive.h b/src/Mod/Part/Gui/ViewProviderPrimitive.h index 3f5ddff566..18a315c77d 100644 --- a/src/Mod/Part/Gui/ViewProviderPrimitive.h +++ b/src/Mod/Part/Gui/ViewProviderPrimitive.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERPRIMITIVE_H -#define PARTGUI_VIEWPROVIDERPRIMITIVE_H +#pragma once #include #include @@ -55,6 +54,3 @@ private: }; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDERPRIMITIVE_H diff --git a/src/Mod/Part/Gui/ViewProviderPrism.h b/src/Mod/Part/Gui/ViewProviderPrism.h index 0bd1849c35..f445ca9339 100644 --- a/src/Mod/Part/Gui/ViewProviderPrism.h +++ b/src/Mod/Part/Gui/ViewProviderPrism.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERPRISM_H -#define PARTGUI_VIEWPROVIDERPRISM_H +#pragma once #include @@ -66,6 +65,3 @@ protected: }; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDERPRISM_H diff --git a/src/Mod/Part/Gui/ViewProviderProjectOnSurface.h b/src/Mod/Part/Gui/ViewProviderProjectOnSurface.h index aba24543cf..a70df5b302 100644 --- a/src/Mod/Part/Gui/ViewProviderProjectOnSurface.h +++ b/src/Mod/Part/Gui/ViewProviderProjectOnSurface.h @@ -23,8 +23,7 @@ **************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERPROJECTONSURFACE_H -#define PARTGUI_VIEWPROVIDERPROJECTONSURFACE_H +#pragma once #include @@ -51,6 +50,3 @@ public: }; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDERPROJECTONSURFACE_H diff --git a/src/Mod/Part/Gui/ViewProviderPython.h b/src/Mod/Part/Gui/ViewProviderPython.h index 2d77e7d393..87bb777b9e 100644 --- a/src/Mod/Part/Gui/ViewProviderPython.h +++ b/src/Mod/Part/Gui/ViewProviderPython.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERPYTHON_H -#define PARTGUI_VIEWPROVIDERPYTHON_H +#pragma once #include #include @@ -54,6 +53,3 @@ using ViewProviderPython = Gui::ViewProviderFeaturePythonT; using ViewProviderCustomPython = Gui::ViewProviderFeaturePythonT; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDERPYTHON_H diff --git a/src/Mod/Part/Gui/ViewProviderReference.h b/src/Mod/Part/Gui/ViewProviderReference.h index 18e9b96955..b184860bc2 100644 --- a/src/Mod/Part/Gui/ViewProviderReference.h +++ b/src/Mod/Part/Gui/ViewProviderReference.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderPartReference_H -#define PARTGUI_ViewProviderPartReference_H +#pragma once #include #include @@ -109,6 +108,3 @@ private: } // namespace PartGui - - -#endif // PARTGUI_ViewProviderPartReference_H diff --git a/src/Mod/Part/Gui/ViewProviderRegularPolygon.h b/src/Mod/Part/Gui/ViewProviderRegularPolygon.h index 2c20516005..572c8d603c 100644 --- a/src/Mod/Part/Gui/ViewProviderRegularPolygon.h +++ b/src/Mod/Part/Gui/ViewProviderRegularPolygon.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERREGULARPOLYGON_H -#define PARTGUI_VIEWPROVIDERREGULARPOLYGON_H +#pragma once #include @@ -51,6 +50,3 @@ protected: }; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDERREGULARPOLYGON_H diff --git a/src/Mod/Part/Gui/ViewProviderRuledSurface.h b/src/Mod/Part/Gui/ViewProviderRuledSurface.h index 995bd654a2..de619854da 100644 --- a/src/Mod/Part/Gui/ViewProviderRuledSurface.h +++ b/src/Mod/Part/Gui/ViewProviderRuledSurface.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERRULEDSURFACE_H -#define PARTGUI_VIEWPROVIDERRULEDSURFACE_H +#pragma once #include @@ -53,6 +52,3 @@ protected: }; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDERRULEDSURFACE_H diff --git a/src/Mod/Part/Gui/ViewProviderScale.h b/src/Mod/Part/Gui/ViewProviderScale.h index ade862a6f4..057d8f5258 100644 --- a/src/Mod/Part/Gui/ViewProviderScale.h +++ b/src/Mod/Part/Gui/ViewProviderScale.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERSCALE_H -#define PARTGUI_VIEWPROVIDERSCALE_H +#pragma once #include @@ -49,6 +48,3 @@ public: }; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDERSCALE_H diff --git a/src/Mod/Part/Gui/ViewProviderSphereParametric.h b/src/Mod/Part/Gui/ViewProviderSphereParametric.h index 63139ea812..a5aa1bbbcb 100644 --- a/src/Mod/Part/Gui/ViewProviderSphereParametric.h +++ b/src/Mod/Part/Gui/ViewProviderSphereParametric.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERSPHEREPARAMETRIC_H -#define PARTGUI_VIEWPROVIDERSPHEREPARAMETRIC_H +#pragma once #include @@ -61,6 +60,3 @@ public: }; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDERSPHEREPARAMETRIC_H diff --git a/src/Mod/Part/Gui/ViewProviderSpline.h b/src/Mod/Part/Gui/ViewProviderSpline.h index 9965afac0d..5b1f3f5aff 100644 --- a/src/Mod/Part/Gui/ViewProviderSpline.h +++ b/src/Mod/Part/Gui/ViewProviderSpline.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERPARTSPLINE_H -#define PARTGUI_VIEWPROVIDERPARTSPLINE_H +#pragma once #include #include @@ -77,6 +76,3 @@ using ViewProviderSplineExtensionPython = Gui::ViewProviderExtensionPythonT; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDERPARTSPLINE_H diff --git a/src/Mod/Part/Gui/ViewProviderTorusParametric.h b/src/Mod/Part/Gui/ViewProviderTorusParametric.h index 3403fae6d1..c84d1864e4 100644 --- a/src/Mod/Part/Gui/ViewProviderTorusParametric.h +++ b/src/Mod/Part/Gui/ViewProviderTorusParametric.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_VIEWPROVIDERTORUSPARAMETRIC_H -#define PARTGUI_VIEWPROVIDERTORUSPARAMETRIC_H +#pragma once #include @@ -57,6 +56,3 @@ protected: }; } // namespace PartGui - - -#endif // PARTGUI_VIEWPROVIDERTORUSPARAMETRIC_H diff --git a/src/Mod/Part/Gui/Workbench.h b/src/Mod/Part/Gui/Workbench.h index 3bfe449076..0c4ea0b10c 100644 --- a/src/Mod/Part/Gui/Workbench.h +++ b/src/Mod/Part/Gui/Workbench.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PART_WORKBENCH_H -#define PART_WORKBENCH_H +#pragma once #include #include @@ -53,6 +52,3 @@ protected: }; } // namespace PartGui - - -#endif // PART_WORKBENCH_H diff --git a/src/Mod/Part/Gui/WorkbenchManipulator.h b/src/Mod/Part/Gui/WorkbenchManipulator.h index 4b9a22bbc3..8fcc3859c7 100644 --- a/src/Mod/Part/Gui/WorkbenchManipulator.h +++ b/src/Mod/Part/Gui/WorkbenchManipulator.h @@ -22,8 +22,7 @@ **************************************************************************/ -#ifndef PARTGUI_WORKBENCHMANIPULATOR_H -#define PARTGUI_WORKBENCHMANIPULATOR_H +#pragma once #include @@ -58,6 +57,3 @@ private: }; } // namespace PartGui - - -#endif // PARTGUI_WORKBENCHMANIPULATOR_H diff --git a/src/Mod/Part/PartGlobal.h b/src/Mod/Part/PartGlobal.h index 2c9a09bed2..5d54ba589b 100644 --- a/src/Mod/Part/PartGlobal.h +++ b/src/Mod/Part/PartGlobal.h @@ -24,29 +24,26 @@ #include -#ifndef PART_GLOBAL_H -# define PART_GLOBAL_H +#pragma once // Part -# ifndef PartExport -# ifdef Part_EXPORTS -# define PartExport FREECAD_DECL_EXPORT -# else -# define PartExport FREECAD_DECL_IMPORT -# endif +#ifndef PartExport +# ifdef Part_EXPORTS +# define PartExport FREECAD_DECL_EXPORT +# else +# define PartExport FREECAD_DECL_IMPORT # endif +#endif -# ifndef AttacherExport -# define AttacherExport PartExport -# endif +#ifndef AttacherExport +# define AttacherExport PartExport +#endif // PartGui -# ifndef PartGuiExport -# ifdef PartGui_EXPORTS -# define PartGuiExport FREECAD_DECL_EXPORT -# else -# define PartGuiExport FREECAD_DECL_IMPORT -# endif +#ifndef PartGuiExport +# ifdef PartGui_EXPORTS +# define PartGuiExport FREECAD_DECL_EXPORT +# else +# define PartGuiExport FREECAD_DECL_IMPORT # endif - -#endif // PART_GLOBAL_H +#endif diff --git a/src/Mod/PartDesign/App/Body.h b/src/Mod/PartDesign/App/Body.h index e4dce826a7..c05496de31 100644 --- a/src/Mod/PartDesign/App/Body.h +++ b/src/Mod/PartDesign/App/Body.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_Body_H -#define PARTDESIGN_Body_H +#pragma once #include #include @@ -168,6 +167,3 @@ private: }; } // namespace PartDesign - - -#endif // PART_Body_H diff --git a/src/Mod/PartDesign/App/DatumCS.h b/src/Mod/PartDesign/App/DatumCS.h index e9bbbf8780..731434f366 100644 --- a/src/Mod/PartDesign/App/DatumCS.h +++ b/src/Mod/PartDesign/App/DatumCS.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_DATUMCS_H -#define PARTDESIGN_DATUMCS_H +#pragma once #include #include @@ -59,6 +58,3 @@ public: }; } // namespace PartDesign - - -#endif // PARTDESIGN_DATUMCS_H diff --git a/src/Mod/PartDesign/App/DatumLine.h b/src/Mod/PartDesign/App/DatumLine.h index 8c008ff85f..229934d669 100644 --- a/src/Mod/PartDesign/App/DatumLine.h +++ b/src/Mod/PartDesign/App/DatumLine.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_DATUMLINE_H -#define PARTDESIGN_DATUMLINE_H +#pragma once #include #include @@ -58,6 +57,3 @@ private: }; } // namespace PartDesign - - -#endif // PARTDESIGN_DATUMLINE_H diff --git a/src/Mod/PartDesign/App/DatumPlane.h b/src/Mod/PartDesign/App/DatumPlane.h index 286b5d918b..153fc77e7f 100644 --- a/src/Mod/PartDesign/App/DatumPlane.h +++ b/src/Mod/PartDesign/App/DatumPlane.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_DATUMPLANE_H -#define PARTDESIGN_DATUMPLANE_H +#pragma once #include #include @@ -62,6 +61,3 @@ private: }; } // namespace PartDesign - - -#endif // PARTDESIGN_DATUMPLANE_H diff --git a/src/Mod/PartDesign/App/DatumPoint.h b/src/Mod/PartDesign/App/DatumPoint.h index ee2d731487..bee4bf3068 100644 --- a/src/Mod/PartDesign/App/DatumPoint.h +++ b/src/Mod/PartDesign/App/DatumPoint.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_DATUMPOINT_H -#define PARTDESIGN_DATUMPOINT_H +#pragma once #include #include @@ -59,6 +58,3 @@ private: }; } // namespace PartDesign - - -#endif // PARTDESIGN_DATUMPOINT_H diff --git a/src/Mod/PartDesign/App/Feature.h b/src/Mod/PartDesign/App/Feature.h index 986c47de62..7a30710159 100644 --- a/src/Mod/PartDesign/App/Feature.h +++ b/src/Mod/PartDesign/App/Feature.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_Feature_H -#define PARTDESIGN_Feature_H +#pragma once #include #include @@ -159,6 +158,3 @@ protected: using FeaturePython = App::FeaturePythonT; } // namespace PartDesign - - -#endif // PARTDESIGN_Feature_H diff --git a/src/Mod/PartDesign/App/FeatureAddSub.h b/src/Mod/PartDesign/App/FeatureAddSub.h index 8c7392002c..1d0e917230 100644 --- a/src/Mod/PartDesign/App/FeatureAddSub.h +++ b/src/Mod/PartDesign/App/FeatureAddSub.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_FeatureAdditive_H -#define PARTDESIGN_FeatureAdditive_H +#pragma once #include "FeatureRefine.h" @@ -85,6 +84,3 @@ public: }; } // namespace PartDesign - - -#endif // PARTDESIGN_FeatureAdditive_H diff --git a/src/Mod/PartDesign/App/FeatureBase.h b/src/Mod/PartDesign/App/FeatureBase.h index 73e1b2437a..09433322d0 100644 --- a/src/Mod/PartDesign/App/FeatureBase.h +++ b/src/Mod/PartDesign/App/FeatureBase.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_FeatureBase_H -#define PARTDESIGN_FeatureBase_H +#pragma once #include "Feature.h" @@ -57,6 +56,3 @@ private: }; } // namespace PartDesign - - -#endif // PARTDESIGN_FeatureBase_H diff --git a/src/Mod/PartDesign/App/FeatureBoolean.h b/src/Mod/PartDesign/App/FeatureBoolean.h index a725862ec0..4fd9e56f40 100644 --- a/src/Mod/PartDesign/App/FeatureBoolean.h +++ b/src/Mod/PartDesign/App/FeatureBoolean.h @@ -23,8 +23,7 @@ ******************************************************************************/ -#ifndef PARTDESIGN_FeatureBoolean_H -#define PARTDESIGN_FeatureBoolean_H +#pragma once #include #include @@ -75,6 +74,3 @@ private: }; } // namespace PartDesign - - -#endif // PARTDESIGN_FeatureBoolean_H diff --git a/src/Mod/PartDesign/App/FeatureChamfer.h b/src/Mod/PartDesign/App/FeatureChamfer.h index 8f70081acb..338f4aadf2 100644 --- a/src/Mod/PartDesign/App/FeatureChamfer.h +++ b/src/Mod/PartDesign/App/FeatureChamfer.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_FEATURECHAMFER_H -#define PARTDESIGN_FEATURECHAMFER_H +#pragma once #include #include @@ -78,6 +77,3 @@ protected: }; } // namespace PartDesign - - -#endif // PARTDESIGN_FEATURECHAMFER_H diff --git a/src/Mod/PartDesign/App/FeatureDraft.h b/src/Mod/PartDesign/App/FeatureDraft.h index 81bb11db65..2d3d41414d 100644 --- a/src/Mod/PartDesign/App/FeatureDraft.h +++ b/src/Mod/PartDesign/App/FeatureDraft.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_FEATUREDRAFT_H -#define PARTDESIGN_FEATUREDRAFT_H +#pragma once #include #include @@ -90,6 +89,3 @@ private: }; } // namespace PartDesign - - -#endif // PARTDESIGN_FEATUREDRAFT_H diff --git a/src/Mod/PartDesign/App/FeatureDressUp.h b/src/Mod/PartDesign/App/FeatureDressUp.h index 5c2c569469..c6a07a263a 100644 --- a/src/Mod/PartDesign/App/FeatureDressUp.h +++ b/src/Mod/PartDesign/App/FeatureDressUp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_DressUp_H -#define PARTDESIGN_DressUp_H +#pragma once #include "FeatureAddSub.h" @@ -74,6 +73,3 @@ protected: }; } // namespace PartDesign - - -#endif // PARTDESIGN_DressUp_H diff --git a/src/Mod/PartDesign/App/FeatureExtrude.h b/src/Mod/PartDesign/App/FeatureExtrude.h index 38ba883359..e20d0dcae9 100644 --- a/src/Mod/PartDesign/App/FeatureExtrude.h +++ b/src/Mod/PartDesign/App/FeatureExtrude.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_FEATURE_EXTRUDE_H -#define PARTDESIGN_FEATURE_EXTRUDE_H +#pragma once #include #include @@ -126,5 +125,3 @@ protected: } // namespace PartDesign ENABLE_BITMASK_OPERATORS(PartDesign::FeatureExtrude::ExtrudeOption) - -#endif // PARTDESIGN_FEATURE_EXTRUDE_H diff --git a/src/Mod/PartDesign/App/FeatureFillet.h b/src/Mod/PartDesign/App/FeatureFillet.h index ef4884125c..591e7f976a 100644 --- a/src/Mod/PartDesign/App/FeatureFillet.h +++ b/src/Mod/PartDesign/App/FeatureFillet.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_FEATUREFILLET_H -#define PARTDESIGN_FEATUREFILLET_H +#pragma once #include #include @@ -65,6 +64,3 @@ protected: }; } // namespace PartDesign - - -#endif // PARTDESIGN_FEATUREFILLET_H diff --git a/src/Mod/PartDesign/App/FeatureGroove.h b/src/Mod/PartDesign/App/FeatureGroove.h index 5d722fd673..ead179a7df 100644 --- a/src/Mod/PartDesign/App/FeatureGroove.h +++ b/src/Mod/PartDesign/App/FeatureGroove.h @@ -23,8 +23,7 @@ ******************************************************************************/ -#ifndef PARTDESIGN_Groove_H -#define PARTDESIGN_Groove_H +#pragma once #include #include "FeatureSketchBased.h" @@ -137,6 +136,3 @@ private: }; } // namespace PartDesign - - -#endif // PART_Groove_H diff --git a/src/Mod/PartDesign/App/FeatureHelix.h b/src/Mod/PartDesign/App/FeatureHelix.h index 828d33149e..530521cdb8 100644 --- a/src/Mod/PartDesign/App/FeatureHelix.h +++ b/src/Mod/PartDesign/App/FeatureHelix.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_Helix_H -#define PARTDESIGN_Helix_H +#pragma once #include #include "FeatureSketchBased.h" @@ -134,6 +133,3 @@ public: }; } // namespace PartDesign - - -#endif // PART_Helix_H diff --git a/src/Mod/PartDesign/App/FeatureHole.h b/src/Mod/PartDesign/App/FeatureHole.h index c5aa58d3cb..da8f7fe085 100644 --- a/src/Mod/PartDesign/App/FeatureHole.h +++ b/src/Mod/PartDesign/App/FeatureHole.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_Hole_H -#define PARTDESIGN_Hole_H +#pragma once #include #include @@ -303,6 +302,3 @@ private: }; } // namespace PartDesign - - -#endif // PART_Hole_H diff --git a/src/Mod/PartDesign/App/FeatureLinearPattern.h b/src/Mod/PartDesign/App/FeatureLinearPattern.h index 7b5595446c..a92176ca02 100644 --- a/src/Mod/PartDesign/App/FeatureLinearPattern.h +++ b/src/Mod/PartDesign/App/FeatureLinearPattern.h @@ -23,8 +23,7 @@ ******************************************************************************/ -#ifndef PARTDESIGN_FeatureLinearPattern_H -#define PARTDESIGN_FeatureLinearPattern_H +#pragma once #include #include "FeatureTransformed.h" @@ -127,6 +126,3 @@ private: }; } // namespace PartDesign - - -#endif // PARTDESIGN_FeatureLinearPattern_H diff --git a/src/Mod/PartDesign/App/FeatureLoft.h b/src/Mod/PartDesign/App/FeatureLoft.h index 92e63c279a..658fb8176f 100644 --- a/src/Mod/PartDesign/App/FeatureLoft.h +++ b/src/Mod/PartDesign/App/FeatureLoft.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_Loft_H -#define PARTDESIGN_Loft_H +#pragma once #include "FeatureSketchBased.h" @@ -92,6 +91,3 @@ public: }; } // namespace PartDesign - - -#endif // PART_Loft_H diff --git a/src/Mod/PartDesign/App/FeatureMirrored.h b/src/Mod/PartDesign/App/FeatureMirrored.h index c1098c9f9b..d9668a1660 100644 --- a/src/Mod/PartDesign/App/FeatureMirrored.h +++ b/src/Mod/PartDesign/App/FeatureMirrored.h @@ -23,8 +23,7 @@ ******************************************************************************/ -#ifndef PARTDESIGN_FeatureMirrored_H -#define PARTDESIGN_FeatureMirrored_H +#pragma once #include "FeatureTransformed.h" @@ -65,6 +64,3 @@ private: }; } // namespace PartDesign - - -#endif // PARTDESIGN_FeatureMirrored_H diff --git a/src/Mod/PartDesign/App/FeatureMultiTransform.h b/src/Mod/PartDesign/App/FeatureMultiTransform.h index d35d08be2f..249b7636d8 100644 --- a/src/Mod/PartDesign/App/FeatureMultiTransform.h +++ b/src/Mod/PartDesign/App/FeatureMultiTransform.h @@ -23,8 +23,7 @@ ******************************************************************************/ -#ifndef PARTDESIGN_FeatureMultiTransform_H -#define PARTDESIGN_FeatureMultiTransform_H +#pragma once #include "FeatureTransformed.h" @@ -66,6 +65,3 @@ protected: }; } // namespace PartDesign - - -#endif // PARTDESIGN_FeatureMultiTransform_H diff --git a/src/Mod/PartDesign/App/FeaturePad.h b/src/Mod/PartDesign/App/FeaturePad.h index c963ade9ec..1d0d438413 100644 --- a/src/Mod/PartDesign/App/FeaturePad.h +++ b/src/Mod/PartDesign/App/FeaturePad.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_Pad_H -#define PARTDESIGN_Pad_H +#pragma once #include "FeatureExtrude.h" @@ -64,6 +63,3 @@ private: }; } // namespace PartDesign - - -#endif // PART_Pad_H diff --git a/src/Mod/PartDesign/App/FeaturePipe.h b/src/Mod/PartDesign/App/FeaturePipe.h index 4c04838ef4..cab0beaed8 100644 --- a/src/Mod/PartDesign/App/FeaturePipe.h +++ b/src/Mod/PartDesign/App/FeaturePipe.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_Pipe_H -#define PARTDESIGN_Pipe_H +#pragma once #include "FeatureSketchBased.h" #include @@ -119,6 +118,3 @@ public: }; } // namespace PartDesign - - -#endif // PARTDESIGN_Pipe_H diff --git a/src/Mod/PartDesign/App/FeaturePocket.h b/src/Mod/PartDesign/App/FeaturePocket.h index 818102af5f..4388aaeafe 100644 --- a/src/Mod/PartDesign/App/FeaturePocket.h +++ b/src/Mod/PartDesign/App/FeaturePocket.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_Pocket_H -#define PARTDESIGN_Pocket_H +#pragma once #include "FeatureExtrude.h" @@ -64,6 +63,3 @@ private: }; } // namespace PartDesign - - -#endif // PART_Pocket_H diff --git a/src/Mod/PartDesign/App/FeaturePolarPattern.h b/src/Mod/PartDesign/App/FeaturePolarPattern.h index 4685cefdcc..92dfedc06b 100644 --- a/src/Mod/PartDesign/App/FeaturePolarPattern.h +++ b/src/Mod/PartDesign/App/FeaturePolarPattern.h @@ -23,8 +23,7 @@ ******************************************************************************/ -#ifndef PARTDESIGN_FeaturePolarPattern_H -#define PARTDESIGN_FeaturePolarPattern_H +#pragma once #include #include @@ -110,6 +109,3 @@ private: }; } // namespace PartDesign - - -#endif // PARTDESIGN_FeaturePolarPattern_H diff --git a/src/Mod/PartDesign/App/FeaturePrimitive.h b/src/Mod/PartDesign/App/FeaturePrimitive.h index 2f8a261f4d..f6c5552746 100644 --- a/src/Mod/PartDesign/App/FeaturePrimitive.h +++ b/src/Mod/PartDesign/App/FeaturePrimitive.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_FeaturePrimitive_H -#define PARTDESIGN_FeaturePrimitive_H +#pragma once #include "FeatureAddSub.h" #include @@ -418,6 +417,3 @@ class PartDesignExport SubtractiveWedge: public Wedge }; } // namespace PartDesign - - -#endif // PARTDESIGN_FeaturePrimitive_H diff --git a/src/Mod/PartDesign/App/FeatureRefine.h b/src/Mod/PartDesign/App/FeatureRefine.h index 4349986736..8f91ae3b04 100644 --- a/src/Mod/PartDesign/App/FeatureRefine.h +++ b/src/Mod/PartDesign/App/FeatureRefine.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_FeatureRefine_H -#define PARTDESIGN_FeatureRefine_H +#pragma once #include "Feature.h" @@ -70,6 +69,3 @@ protected: using FeatureRefinePython = App::FeaturePythonT; } // namespace PartDesign - - -#endif // PARTDESIGN_FeatureRefine_H diff --git a/src/Mod/PartDesign/App/FeatureRevolution.h b/src/Mod/PartDesign/App/FeatureRevolution.h index e7353391f4..34a25af622 100644 --- a/src/Mod/PartDesign/App/FeatureRevolution.h +++ b/src/Mod/PartDesign/App/FeatureRevolution.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_Revolution_H -#define PARTDESIGN_Revolution_H +#pragma once #include #include "FeatureSketchBased.h" @@ -152,6 +151,3 @@ private: }; } // namespace PartDesign - - -#endif // PART_Revolution_H diff --git a/src/Mod/PartDesign/App/FeatureScaled.h b/src/Mod/PartDesign/App/FeatureScaled.h index 8c9389073c..b3d79e15c7 100644 --- a/src/Mod/PartDesign/App/FeatureScaled.h +++ b/src/Mod/PartDesign/App/FeatureScaled.h @@ -23,8 +23,7 @@ ******************************************************************************/ -#ifndef PARTDESIGN_FeatureScaled_H -#define PARTDESIGN_FeatureScaled_H +#pragma once #include #include "FeatureTransformed.h" @@ -69,6 +68,3 @@ public: }; } // namespace PartDesign - - -#endif // PARTDESIGN_FeatureScaled_H diff --git a/src/Mod/PartDesign/App/FeatureSketchBased.h b/src/Mod/PartDesign/App/FeatureSketchBased.h index 16cab74865..134cf092a9 100644 --- a/src/Mod/PartDesign/App/FeatureSketchBased.h +++ b/src/Mod/PartDesign/App/FeatureSketchBased.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_SketchBased_H -#define PARTDESIGN_SketchBased_H +#pragma once #include #include "FeatureAddSub.h" @@ -219,6 +218,3 @@ private: }; } // namespace PartDesign - - -#endif // PARTDESIGN_SketchBased_H diff --git a/src/Mod/PartDesign/App/FeatureSolid.h b/src/Mod/PartDesign/App/FeatureSolid.h index 7bf1409573..ae4a6d9ba6 100644 --- a/src/Mod/PartDesign/App/FeatureSolid.h +++ b/src/Mod/PartDesign/App/FeatureSolid.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_FeatureSolid_H -#define PARTDESIGN_FeatureSolid_H +#pragma once #include "Feature.h" @@ -48,6 +47,3 @@ protected: }; } // namespace PartDesign - - -#endif // PARTDESIGN_Feature_H diff --git a/src/Mod/PartDesign/App/FeatureThickness.h b/src/Mod/PartDesign/App/FeatureThickness.h index 0e99da3bab..a661d025e8 100644 --- a/src/Mod/PartDesign/App/FeatureThickness.h +++ b/src/Mod/PartDesign/App/FeatureThickness.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_FEATURETHICKNESS_H -#define PARTDESIGN_FEATURETHICKNESS_H +#pragma once #include #include @@ -63,6 +62,3 @@ private: }; } // namespace PartDesign - - -#endif // PARTDESIGN_FEATURETHICKNESS_H diff --git a/src/Mod/PartDesign/App/FeatureTransformed.h b/src/Mod/PartDesign/App/FeatureTransformed.h index fca4c66f93..4cb112621b 100644 --- a/src/Mod/PartDesign/App/FeatureTransformed.h +++ b/src/Mod/PartDesign/App/FeatureTransformed.h @@ -23,8 +23,7 @@ ******************************************************************************/ -#ifndef PARTDESIGN_FeatureTransformed_H -#define PARTDESIGN_FeatureTransformed_H +#pragma once #include @@ -119,6 +118,3 @@ private: }; } // namespace PartDesign - - -#endif // PARTDESIGN_FeatureTransformed_H diff --git a/src/Mod/PartDesign/App/Measure.h b/src/Mod/PartDesign/App/Measure.h index 7a96dae14f..e585b6e276 100644 --- a/src/Mod/PartDesign/App/Measure.h +++ b/src/Mod/PartDesign/App/Measure.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef PARTDESIGN_MEASURE_H -#define PARTDESIGN_MEASURE_H +#pragma once #include @@ -39,5 +38,3 @@ public: } // namespace PartDesign - -#endif diff --git a/src/Mod/PartDesign/App/PreCompiled.h b/src/Mod/PartDesign/App/PreCompiled.h index e333689777..a9e50d63f3 100644 --- a/src/Mod/PartDesign/App/PreCompiled.h +++ b/src/Mod/PartDesign/App/PreCompiled.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_DESIGN_APP_PRECOMPILED_H -#define PART_DESIGN_APP_PRECOMPILED_H +#pragma once #include @@ -32,5 +31,3 @@ // OpenCasCade #include - -#endif diff --git a/src/Mod/PartDesign/App/ShapeBinder.h b/src/Mod/PartDesign/App/ShapeBinder.h index 9d2190c003..5673d6ef1a 100644 --- a/src/Mod/PartDesign/App/ShapeBinder.h +++ b/src/Mod/PartDesign/App/ShapeBinder.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_DATUMSHAPE_H -#define PARTDESIGN_DATUMSHAPE_H +#pragma once #include #include @@ -184,6 +183,3 @@ protected: using SubShapeBinderPython = App::FeaturePythonT; } // namespace PartDesign - - -#endif // PARTDESIGN_DATUMSHAPE_H diff --git a/src/Mod/PartDesign/Gui/DlgActiveBody.h b/src/Mod/PartDesign/Gui/DlgActiveBody.h index 0452c9d56a..b6f47f46c8 100644 --- a/src/Mod/PartDesign/Gui/DlgActiveBody.h +++ b/src/Mod/PartDesign/Gui/DlgActiveBody.h @@ -25,8 +25,7 @@ ***************************************************************************/ -#ifndef PARTDESIGNGUI_DLGACTIVEBODY_H -#define PARTDESIGNGUI_DLGACTIVEBODY_H +#pragma once #include #include @@ -63,5 +62,3 @@ private: }; } // namespace PartDesignGui - -#endif // PARTDESIGNGUI_DLGACTIVEBODY_H diff --git a/src/Mod/PartDesign/Gui/EnumFlags.h b/src/Mod/PartDesign/Gui/EnumFlags.h index b508d75158..ad7ab51ee8 100644 --- a/src/Mod/PartDesign/Gui/EnumFlags.h +++ b/src/Mod/PartDesign/Gui/EnumFlags.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTDESIGNGUI_ENUMFLAGS_H -#define PARTDESIGNGUI_ENUMFLAGS_H +#pragma once namespace PartDesignGui { @@ -49,5 +48,3 @@ Q_DECLARE_FLAGS(AllowSelectionFlags, AllowSelection) } // namespace PartDesignGui Q_DECLARE_OPERATORS_FOR_FLAGS(PartDesignGui::AllowSelectionFlags) - -#endif // PARTDESIGNGUI_ENUMFLAGS_H diff --git a/src/Mod/PartDesign/Gui/PreCompiled.h b/src/Mod/PartDesign/Gui/PreCompiled.h index e9f80c990f..8354285621 100644 --- a/src/Mod/PartDesign/Gui/PreCompiled.h +++ b/src/Mod/PartDesign/Gui/PreCompiled.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PART_DESIGN_PRECOMPILED_H -#define PART_DESIGN_PRECOMPILED_H +#pragma once #include @@ -56,5 +55,3 @@ // Inventor #include - -#endif // PART_DESIGN_PRECOMPILED_H diff --git a/src/Mod/PartDesign/Gui/ReferenceSelection.h b/src/Mod/PartDesign/Gui/ReferenceSelection.h index 93f7eafcf9..694701659d 100644 --- a/src/Mod/PartDesign/Gui/ReferenceSelection.h +++ b/src/Mod/PartDesign/Gui/ReferenceSelection.h @@ -23,8 +23,7 @@ ******************************************************************************/ -#ifndef GUI_ReferenceSelection_H -#define GUI_ReferenceSelection_H +#pragma once #include #include @@ -128,5 +127,3 @@ std::string buildLinkSubListPythonStr( const std::vector& subs ); } // namespace PartDesignGui - -#endif // GUI_ReferenceSelection_H diff --git a/src/Mod/PartDesign/Gui/SketchWorkflow.h b/src/Mod/PartDesign/Gui/SketchWorkflow.h index 5a520ac27c..05fcfbd14d 100644 --- a/src/Mod/PartDesign/Gui/SketchWorkflow.h +++ b/src/Mod/PartDesign/Gui/SketchWorkflow.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PARTDESIGNGUI_SKETCHWORKFLOW_H -#define PARTDESIGNGUI_SKETCHWORKFLOW_H +#pragma once #include #include @@ -65,5 +64,3 @@ private: }; } // namespace PartDesignGui - -#endif // PARTDESIGNGUI_SKETCHWORKFLOW_H diff --git a/src/Mod/PartDesign/Gui/StyleParameters.h b/src/Mod/PartDesign/Gui/StyleParameters.h index 9da7d399e2..8044d6c2d0 100644 --- a/src/Mod/PartDesign/Gui/StyleParameters.h +++ b/src/Mod/PartDesign/Gui/StyleParameters.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef STYLEPARAMETERS_H -#define STYLEPARAMETERS_H +#pragma once #include @@ -44,5 +43,3 @@ DEFINE_STYLE_PARAMETER(PreviewShapeOpacity, Gui::StyleParameters::Numeric(0.2)); DEFINE_STYLE_PARAMETER(PreviewLineWidth, Gui::StyleParameters::Numeric(2)); } // namespace PartDesignGui::StyleParameters - -#endif // STYLEPARAMETERS_H diff --git a/src/Mod/PartDesign/Gui/TaskBooleanParameters.h b/src/Mod/PartDesign/Gui/TaskBooleanParameters.h index 790e205f86..12d66c4a51 100644 --- a/src/Mod/PartDesign/Gui/TaskBooleanParameters.h +++ b/src/Mod/PartDesign/Gui/TaskBooleanParameters.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskBooleanParameters_H -#define GUI_TASKVIEW_TaskBooleanParameters_H +#pragma once #include "TaskFeatureParameters.h" @@ -132,5 +131,3 @@ protected: }; } // namespace PartDesignGui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/PartDesign/Gui/TaskChamferParameters.h b/src/Mod/PartDesign/Gui/TaskChamferParameters.h index 9cb187d1ce..f2e91c4d94 100644 --- a/src/Mod/PartDesign/Gui/TaskChamferParameters.h +++ b/src/Mod/PartDesign/Gui/TaskChamferParameters.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskChamferParameters_H -#define GUI_TASKVIEW_TaskChamferParameters_H +#pragma once #include @@ -106,5 +105,3 @@ public: }; } // namespace PartDesignGui - -#endif // GUI_TASKVIEW_TaskChamferParameters_H diff --git a/src/Mod/PartDesign/Gui/TaskDatumParameters.h b/src/Mod/PartDesign/Gui/TaskDatumParameters.h index 88e44ce86a..ee855aede0 100644 --- a/src/Mod/PartDesign/Gui/TaskDatumParameters.h +++ b/src/Mod/PartDesign/Gui/TaskDatumParameters.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskDatumParameters_H -#define GUI_TASKVIEW_TaskDatumParameters_H +#pragma once #include #include @@ -72,5 +71,3 @@ public: }; } // namespace PartDesignGui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/PartDesign/Gui/TaskDraftParameters.h b/src/Mod/PartDesign/Gui/TaskDraftParameters.h index 43af0efd18..d3fe02190a 100644 --- a/src/Mod/PartDesign/Gui/TaskDraftParameters.h +++ b/src/Mod/PartDesign/Gui/TaskDraftParameters.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskDraftParameters_H -#define GUI_TASKVIEW_TaskDraftParameters_H +#pragma once #include "TaskDressUpParameters.h" #include "ViewProviderDraft.h" @@ -93,5 +92,3 @@ public: }; } // namespace PartDesignGui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/PartDesign/Gui/TaskDressUpParameters.h b/src/Mod/PartDesign/Gui/TaskDressUpParameters.h index 5ab27d9a26..39342a4c49 100644 --- a/src/Mod/PartDesign/Gui/TaskDressUpParameters.h +++ b/src/Mod/PartDesign/Gui/TaskDressUpParameters.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskDressUpParameters_H -#define GUI_TASKVIEW_TaskDressUpParameters_H +#pragma once #include #include @@ -144,5 +143,3 @@ protected: }; } // namespace PartDesignGui - -#endif // GUI_TASKVIEW_TaskDressUpParameters_H diff --git a/src/Mod/PartDesign/Gui/TaskExtrudeParameters.h b/src/Mod/PartDesign/Gui/TaskExtrudeParameters.h index f57710aa49..46ac898075 100644 --- a/src/Mod/PartDesign/Gui/TaskExtrudeParameters.h +++ b/src/Mod/PartDesign/Gui/TaskExtrudeParameters.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskExtrudeParameters_H -#define GUI_TASKVIEW_TaskExtrudeParameters_H +#pragma once #include @@ -298,5 +297,3 @@ protected: }; } // namespace PartDesignGui - -#endif // GUI_TASKVIEW_TaskExtrudeParameters_H diff --git a/src/Mod/PartDesign/Gui/TaskFeatureParameters.h b/src/Mod/PartDesign/Gui/TaskFeatureParameters.h index d172db423e..3746aec053 100644 --- a/src/Mod/PartDesign/Gui/TaskFeatureParameters.h +++ b/src/Mod/PartDesign/Gui/TaskFeatureParameters.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef TASKFEATUREPARAMETERS_H_NAHKE2YZ -#define TASKFEATUREPARAMETERS_H_NAHKE2YZ +#pragma once #include @@ -184,6 +183,3 @@ private: }; } // namespace PartDesignGui - - -#endif /* end of include guard: TASKFEATUREPARAMETERS_H_NAHKE2YZ */ diff --git a/src/Mod/PartDesign/Gui/TaskFeaturePick.h b/src/Mod/PartDesign/Gui/TaskFeaturePick.h index c145832252..6f6f564c63 100644 --- a/src/Mod/PartDesign/Gui/TaskFeaturePick.h +++ b/src/Mod/PartDesign/Gui/TaskFeaturePick.h @@ -22,8 +22,7 @@ * * ******************************************************************************/ -#ifndef PARTDESIGNGUI_FeaturePickDialog_H -#define PARTDESIGNGUI_FeaturePickDialog_H +#pragma once #include #include @@ -154,5 +153,3 @@ protected: }; } // namespace PartDesignGui - -#endif // PARTDESIGNGUI_FeaturePickDialog_H diff --git a/src/Mod/PartDesign/Gui/TaskFilletParameters.h b/src/Mod/PartDesign/Gui/TaskFilletParameters.h index 0e311478d7..a98648603e 100644 --- a/src/Mod/PartDesign/Gui/TaskFilletParameters.h +++ b/src/Mod/PartDesign/Gui/TaskFilletParameters.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskFilletParameters_H -#define GUI_TASKVIEW_TaskFilletParameters_H +#pragma once #include @@ -89,5 +88,3 @@ public: }; } // namespace PartDesignGui - -#endif // GUI_TASKVIEW_TaskFilletParameters_H diff --git a/src/Mod/PartDesign/Gui/TaskHelixParameters.h b/src/Mod/PartDesign/Gui/TaskHelixParameters.h index 17282c4837..37ca0800ff 100644 --- a/src/Mod/PartDesign/Gui/TaskHelixParameters.h +++ b/src/Mod/PartDesign/Gui/TaskHelixParameters.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskHelixParameters_H -#define GUI_TASKVIEW_TaskHelixParameters_H +#pragma once #include @@ -150,5 +149,3 @@ public: }; } // namespace PartDesignGui - -#endif // GUI_TASKVIEW_TaskHelixParameters_H diff --git a/src/Mod/PartDesign/Gui/TaskHoleParameters.h b/src/Mod/PartDesign/Gui/TaskHoleParameters.h index 933c114b4a..7b3117eb7b 100644 --- a/src/Mod/PartDesign/Gui/TaskHoleParameters.h +++ b/src/Mod/PartDesign/Gui/TaskHoleParameters.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskHoleParameters_H -#define GUI_TASKVIEW_TaskHoleParameters_H +#pragma once #include "TaskSketchBasedParameters.h" #include "ViewProviderHole.h" @@ -173,5 +172,3 @@ protected: }; } // namespace PartDesignGui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/PartDesign/Gui/TaskLoftParameters.h b/src/Mod/PartDesign/Gui/TaskLoftParameters.h index 7b781fecd1..a4ef2f4d02 100644 --- a/src/Mod/PartDesign/Gui/TaskLoftParameters.h +++ b/src/Mod/PartDesign/Gui/TaskLoftParameters.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskLoftParameters_H -#define GUI_TASKVIEW_TaskLoftParameters_H +#pragma once #include "TaskSketchBasedParameters.h" #include "ViewProviderLoft.h" @@ -111,5 +110,3 @@ protected: }; } // namespace PartDesignGui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/PartDesign/Gui/TaskMirroredParameters.h b/src/Mod/PartDesign/Gui/TaskMirroredParameters.h index 455e68367f..793bdc6c7f 100644 --- a/src/Mod/PartDesign/Gui/TaskMirroredParameters.h +++ b/src/Mod/PartDesign/Gui/TaskMirroredParameters.h @@ -22,8 +22,7 @@ * * ******************************************************************************/ -#ifndef GUI_TASKVIEW_TaskMirroredParameters_H -#define GUI_TASKVIEW_TaskMirroredParameters_H +#pragma once #include "TaskTransformedParameters.h" #include "ViewProviderMirrored.h" @@ -89,5 +88,3 @@ public: }; } // namespace PartDesignGui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h index 005e512011..e95970e8ff 100644 --- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h +++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h @@ -22,8 +22,7 @@ * * ******************************************************************************/ -#ifndef GUI_TASKVIEW_TaskMultiTransformParameters_H -#define GUI_TASKVIEW_TaskMultiTransformParameters_H +#pragma once #include "TaskTransformedParameters.h" #include "ViewProviderMultiTransform.h" @@ -120,5 +119,3 @@ public: }; } // namespace PartDesignGui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/PartDesign/Gui/TaskPadParameters.h b/src/Mod/PartDesign/Gui/TaskPadParameters.h index 2464a45398..d1d88cf641 100644 --- a/src/Mod/PartDesign/Gui/TaskPadParameters.h +++ b/src/Mod/PartDesign/Gui/TaskPadParameters.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskPadParameters_H -#define GUI_TASKVIEW_TaskPadParameters_H +#pragma once #include "TaskExtrudeParameters.h" #include "ViewProviderPad.h" @@ -79,5 +78,3 @@ private: }; } // namespace PartDesignGui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/PartDesign/Gui/TaskPatternParameters.h b/src/Mod/PartDesign/Gui/TaskPatternParameters.h index a647b5aed9..9f1cd28209 100644 --- a/src/Mod/PartDesign/Gui/TaskPatternParameters.h +++ b/src/Mod/PartDesign/Gui/TaskPatternParameters.h @@ -22,8 +22,7 @@ * * ******************************************************************************/ -#ifndef GUI_TASKVIEW_TaskPatternParameters_H -#define GUI_TASKVIEW_TaskPatternParameters_H +#pragma once #include "TaskTransformedParameters.h" #include "ViewProviderTransformed.h" @@ -103,5 +102,3 @@ public: }; } // namespace PartDesignGui - -#endif // GUI_TASKVIEW_TaskPatternParameters_H diff --git a/src/Mod/PartDesign/Gui/TaskPipeParameters.h b/src/Mod/PartDesign/Gui/TaskPipeParameters.h index 92766c7e00..54c2da9359 100644 --- a/src/Mod/PartDesign/Gui/TaskPipeParameters.h +++ b/src/Mod/PartDesign/Gui/TaskPipeParameters.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskPipeParameters_H -#define GUI_TASKVIEW_TaskPipeParameters_H +#pragma once #include "TaskSketchBasedParameters.h" #include "ViewProviderPipe.h" @@ -223,5 +222,3 @@ protected: }; } // namespace PartDesignGui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/PartDesign/Gui/TaskPocketParameters.h b/src/Mod/PartDesign/Gui/TaskPocketParameters.h index 73dd6f1394..405e7f45fd 100644 --- a/src/Mod/PartDesign/Gui/TaskPocketParameters.h +++ b/src/Mod/PartDesign/Gui/TaskPocketParameters.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskPocketParameters_H -#define GUI_TASKVIEW_TaskPocketParameters_H +#pragma once #include "TaskExtrudeParameters.h" #include "ViewProviderPocket.h" @@ -83,5 +82,3 @@ private: }; } // namespace PartDesignGui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.h b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.h index 592ca89f19..a0b0c48eca 100644 --- a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.h +++ b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskPrimitiveParameters_H -#define GUI_TASKVIEW_TaskPrimitiveParameters_H +#pragma once #include #include @@ -158,5 +157,3 @@ private: }; } // namespace PartDesignGui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.h b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.h index 0766d18bba..cae77742a0 100644 --- a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.h +++ b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskRevolutionParameters_H -#define GUI_TASKVIEW_TaskRevolutionParameters_H +#pragma once #include #include @@ -159,5 +158,3 @@ public: }; } // namespace PartDesignGui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/PartDesign/Gui/TaskScaledParameters.h b/src/Mod/PartDesign/Gui/TaskScaledParameters.h index 1a292aa52d..2141a005f3 100644 --- a/src/Mod/PartDesign/Gui/TaskScaledParameters.h +++ b/src/Mod/PartDesign/Gui/TaskScaledParameters.h @@ -22,8 +22,7 @@ * * ******************************************************************************/ -#ifndef GUI_TASKVIEW_TaskScaledParameters_H -#define GUI_TASKVIEW_TaskScaledParameters_H +#pragma once #include "TaskTransformedParameters.h" #include "ViewProviderScaled.h" @@ -87,5 +86,3 @@ public: }; } // namespace PartDesignGui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/PartDesign/Gui/TaskShapeBinder.h b/src/Mod/PartDesign/Gui/TaskShapeBinder.h index 5880f3c800..190537eba2 100644 --- a/src/Mod/PartDesign/Gui/TaskShapeBinder.h +++ b/src/Mod/PartDesign/Gui/TaskShapeBinder.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskDatumShapeBinder_H -#define GUI_TASKVIEW_TaskDatumShapeBinder_H +#pragma once #include #include @@ -120,5 +119,3 @@ protected: }; } // namespace PartDesignGui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.h b/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.h index 806fef3988..cc9053723e 100644 --- a/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.h +++ b/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskSketchBasedParameters_H -#define GUI_TASKVIEW_TaskSketchBasedParameters_H +#pragma once #include #include "ViewProvider.h" @@ -101,5 +100,3 @@ public: }; } // namespace PartDesignGui - -#endif // GUI_TASKVIEW_TaskSketchBasedParameters_H diff --git a/src/Mod/PartDesign/Gui/TaskThicknessParameters.h b/src/Mod/PartDesign/Gui/TaskThicknessParameters.h index 6c322a9c24..541b9d3c6b 100644 --- a/src/Mod/PartDesign/Gui/TaskThicknessParameters.h +++ b/src/Mod/PartDesign/Gui/TaskThicknessParameters.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskThicknessParameters_H -#define GUI_TASKVIEW_TaskThicknessParameters_H +#pragma once #include @@ -107,5 +106,3 @@ public: }; } // namespace PartDesignGui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/PartDesign/Gui/TaskTransformedMessages.h b/src/Mod/PartDesign/Gui/TaskTransformedMessages.h index 3cba88f21f..5feb05658e 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedMessages.h +++ b/src/Mod/PartDesign/Gui/TaskTransformedMessages.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskTransformedMessages_H -#define GUI_TASKVIEW_TaskTransformedMessages_H +#pragma once #include @@ -63,5 +62,3 @@ private: }; } // namespace PartDesignGui - -#endif // GUI_TASKVIEW_TaskTransformedMessages_H diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.h b/src/Mod/PartDesign/Gui/TaskTransformedParameters.h index fec8a538d4..8f322224db 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.h +++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.h @@ -23,8 +23,7 @@ ******************************************************************************/ -#ifndef GUI_TASKVIEW_TaskTransformedParameters_H -#define GUI_TASKVIEW_TaskTransformedParameters_H +#pragma once #include #include @@ -243,5 +242,3 @@ protected: }; } // namespace PartDesignGui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/PartDesign/Gui/Utils.h b/src/Mod/PartDesign/Gui/Utils.h index e1081dabca..894a901de7 100644 --- a/src/Mod/PartDesign/Gui/Utils.h +++ b/src/Mod/PartDesign/Gui/Utils.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef UTILS_H_CS5LK2ZQ -#define UTILS_H_CS5LK2ZQ +#pragma once /** \file PartDesign/Gui/Utils.h * This file contains some utility function used over PartDesignGui module @@ -124,5 +123,3 @@ std::vector collectMovableDependencies( void relinkToOrigin(App::DocumentObject* feature, PartDesign::Body* body); } // namespace PartDesignGui - -#endif /* end of include guard: UTILS_H_CS5LK2ZQ */ diff --git a/src/Mod/PartDesign/Gui/ViewProvider.h b/src/Mod/PartDesign/Gui/ViewProvider.h index 2c167e6c30..ad594f5d97 100644 --- a/src/Mod/PartDesign/Gui/ViewProvider.h +++ b/src/Mod/PartDesign/Gui/ViewProvider.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProvider_H -#define PARTGUI_ViewProvider_H +#pragma once #include #include @@ -122,6 +121,3 @@ private: using ViewProviderPython = Gui::ViewProviderFeaturePythonT; } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderHole_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderBase.h b/src/Mod/PartDesign/Gui/ViewProviderBase.h index 97881bd728..771cb77901 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderBase.h +++ b/src/Mod/PartDesign/Gui/ViewProviderBase.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderBase_H -#define PARTGUI_ViewProviderBase_H +#pragma once #include "ViewProvider.h" @@ -51,6 +50,3 @@ protected: }; } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderBase_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderBody.h b/src/Mod/PartDesign/Gui/ViewProviderBody.h index defc22fd61..58447e9d48 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderBody.h +++ b/src/Mod/PartDesign/Gui/ViewProviderBody.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderBody_H -#define PARTGUI_ViewProviderBody_H +#pragma once #include #include @@ -114,6 +113,3 @@ private: } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderHole_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderBoolean.h b/src/Mod/PartDesign/Gui/ViewProviderBoolean.h index 940f5cc86b..e93cd25c38 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderBoolean.h +++ b/src/Mod/PartDesign/Gui/ViewProviderBoolean.h @@ -25,8 +25,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderBoolean_H -#define PARTGUI_ViewProviderBoolean_H +#pragma once #include "ViewProvider.h" #include @@ -74,6 +73,3 @@ private: }; } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderBoolean_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderChamfer.h b/src/Mod/PartDesign/Gui/ViewProviderChamfer.h index c78dc2696e..1b7048895c 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderChamfer.h +++ b/src/Mod/PartDesign/Gui/ViewProviderChamfer.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderChamfer_H -#define PARTGUI_ViewProviderChamfer_H +#pragma once #include "ViewProviderDressUp.h" @@ -56,6 +55,3 @@ protected: } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderChamfer_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatum.h b/src/Mod/PartDesign/Gui/ViewProviderDatum.h index c565ca1ccc..90f0b4cbc9 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDatum.h +++ b/src/Mod/PartDesign/Gui/ViewProviderDatum.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderDatum_H -#define PARTGUI_ViewProviderDatum_H +#pragma once #include "Gui/ViewProviderGeometryObject.h" #include @@ -152,6 +151,3 @@ private: }; } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderDatum_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatumCS.h b/src/Mod/PartDesign/Gui/ViewProviderDatumCS.h index 83321e4377..36663fb511 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDatumCS.h +++ b/src/Mod/PartDesign/Gui/ViewProviderDatumCS.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderDatumCoordinateSystem_H -#define PARTGUI_ViewProviderDatumCoordinateSystem_H +#pragma once #include "ViewProviderDatum.h" @@ -76,6 +75,3 @@ private: }; } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderDatumCoordinateSystem_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatumLine.h b/src/Mod/PartDesign/Gui/ViewProviderDatumLine.h index f8d80c2787..339cf4832f 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDatumLine.h +++ b/src/Mod/PartDesign/Gui/ViewProviderDatumLine.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderDatumLine_H -#define PARTGUI_ViewProviderDatumLine_H +#pragma once #include "ViewProviderDatum.h" @@ -54,6 +53,3 @@ private: }; } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderDatumLine_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatumPlane.h b/src/Mod/PartDesign/Gui/ViewProviderDatumPlane.h index 8d02ece77f..93d6c0217a 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDatumPlane.h +++ b/src/Mod/PartDesign/Gui/ViewProviderDatumPlane.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderDatumPlane_H -#define PARTGUI_ViewProviderDatumPlane_H +#pragma once #include "ViewProviderDatum.h" @@ -52,6 +51,3 @@ private: }; } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderDatumPlane_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatumPoint.h b/src/Mod/PartDesign/Gui/ViewProviderDatumPoint.h index f96cb1dac1..3f87882e53 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDatumPoint.h +++ b/src/Mod/PartDesign/Gui/ViewProviderDatumPoint.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderDatumPoint_H -#define PARTGUI_ViewProviderDatumPoint_H +#pragma once #include "ViewProviderDatum.h" @@ -50,6 +49,3 @@ protected: }; } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderDatumPoint_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderDraft.h b/src/Mod/PartDesign/Gui/ViewProviderDraft.h index 7606aa9aad..88566aec65 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDraft.h +++ b/src/Mod/PartDesign/Gui/ViewProviderDraft.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderDraft_H -#define PARTGUI_ViewProviderDraft_H +#pragma once #include "ViewProviderDressUp.h" @@ -56,6 +55,3 @@ protected: }; } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderDraft_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderDressUp.h b/src/Mod/PartDesign/Gui/ViewProviderDressUp.h index fded1da373..b452bd0d26 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDressUp.h +++ b/src/Mod/PartDesign/Gui/ViewProviderDressUp.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderDressUp_H -#define PARTGUI_ViewProviderDressUp_H +#pragma once #include "ViewProvider.h" @@ -70,6 +69,3 @@ protected: } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderDressUp_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderExtrude.h b/src/Mod/PartDesign/Gui/ViewProviderExtrude.h index 4497cdb5b9..c18243bfe5 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderExtrude.h +++ b/src/Mod/PartDesign/Gui/ViewProviderExtrude.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderExtrude_H -#define PARTGUI_ViewProviderExtrude_H +#pragma once #include "ViewProviderSketchBased.h" @@ -45,6 +44,3 @@ public: } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderExtrude_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderFillet.h b/src/Mod/PartDesign/Gui/ViewProviderFillet.h index 9d3f30b61a..7ce531cab1 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderFillet.h +++ b/src/Mod/PartDesign/Gui/ViewProviderFillet.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderFillet_H -#define PARTGUI_ViewProviderFillet_H +#pragma once #include "ViewProviderDressUp.h" @@ -55,6 +54,3 @@ protected: }; } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderFillet_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderGroove.h b/src/Mod/PartDesign/Gui/ViewProviderGroove.h index 35514cb900..20128aa424 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderGroove.h +++ b/src/Mod/PartDesign/Gui/ViewProviderGroove.h @@ -23,8 +23,7 @@ ******************************************************************************/ -#ifndef PARTGUI_ViewProviderGroove_H -#define PARTGUI_ViewProviderGroove_H +#pragma once #include "ViewProviderSketchBased.h" @@ -54,6 +53,3 @@ protected: } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderGroove_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderHelix.h b/src/Mod/PartDesign/Gui/ViewProviderHelix.h index 94ee35e6de..dd4f048239 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderHelix.h +++ b/src/Mod/PartDesign/Gui/ViewProviderHelix.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderHelix_H -#define PARTGUI_ViewProviderHelix_H +#pragma once #include "ViewProvider.h" @@ -56,6 +55,3 @@ protected: } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderHelix_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderHole.h b/src/Mod/PartDesign/Gui/ViewProviderHole.h index 1755d7afd6..990731dac3 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderHole.h +++ b/src/Mod/PartDesign/Gui/ViewProviderHole.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderHole_H -#define PARTGUI_ViewProviderHole_H +#pragma once #include "ViewProvider.h" @@ -52,6 +51,3 @@ protected: } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderHole_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h b/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h index 6463b418a4..8a60836f99 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h +++ b/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h @@ -23,8 +23,7 @@ ******************************************************************************/ -#ifndef PARTGUI_ViewProviderLinearPattern_H -#define PARTGUI_ViewProviderLinearPattern_H +#pragma once #include "ViewProviderTransformed.h" @@ -53,6 +52,3 @@ protected: } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderLinearPattern_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderLoft.h b/src/Mod/PartDesign/Gui/ViewProviderLoft.h index d387d7566b..15105fef14 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderLoft.h +++ b/src/Mod/PartDesign/Gui/ViewProviderLoft.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderLoft_H -#define PARTGUI_ViewProviderLoft_H +#pragma once #include "ViewProvider.h" @@ -69,6 +68,3 @@ private: } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderLoft_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderMainPart.h b/src/Mod/PartDesign/Gui/ViewProviderMainPart.h index ce13ba17f7..d62aa9e281 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderMainPart.h +++ b/src/Mod/PartDesign/Gui/ViewProviderMainPart.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderMainPart_H -#define PARTGUI_ViewProviderMainPart_H +#pragma once #include @@ -48,6 +47,3 @@ public: } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderMainPart_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderMirrored.h b/src/Mod/PartDesign/Gui/ViewProviderMirrored.h index f11ce57750..4f6f8e4b9a 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderMirrored.h +++ b/src/Mod/PartDesign/Gui/ViewProviderMirrored.h @@ -23,8 +23,7 @@ ******************************************************************************/ -#ifndef PARTGUI_ViewProviderMirrored_H -#define PARTGUI_ViewProviderMirrored_H +#pragma once #include "ViewProviderTransformed.h" @@ -53,6 +52,3 @@ protected: } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderMirrored_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h index 98e8dfddae..aaf226f823 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h +++ b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h @@ -23,8 +23,7 @@ ******************************************************************************/ -#ifndef PARTGUI_ViewProviderMultiTransform_H -#define PARTGUI_ViewProviderMultiTransform_H +#pragma once #include "ViewProviderTransformed.h" @@ -56,6 +55,3 @@ protected: } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderMultiTransform_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderPad.h b/src/Mod/PartDesign/Gui/ViewProviderPad.h index 726ace6ac4..aa9216ca50 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPad.h +++ b/src/Mod/PartDesign/Gui/ViewProviderPad.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderPad_H -#define PARTGUI_ViewProviderPad_H +#pragma once #include "ViewProviderExtrude.h" @@ -50,6 +49,3 @@ protected: } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderPad_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderPipe.h b/src/Mod/PartDesign/Gui/ViewProviderPipe.h index 121d43ae5d..727775a1e6 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPipe.h +++ b/src/Mod/PartDesign/Gui/ViewProviderPipe.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderPipe_H -#define PARTGUI_ViewProviderPipe_H +#pragma once #include "ViewProvider.h" @@ -70,6 +69,3 @@ private: } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderPipe_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderPocket.h b/src/Mod/PartDesign/Gui/ViewProviderPocket.h index c4b3b08182..93ad28d536 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPocket.h +++ b/src/Mod/PartDesign/Gui/ViewProviderPocket.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderPocket_H -#define PARTGUI_ViewProviderPocket_H +#pragma once #include "ViewProviderExtrude.h" @@ -51,6 +50,3 @@ protected: } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderPocket_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h b/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h index de714cc392..e72eee212b 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h +++ b/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h @@ -23,8 +23,7 @@ ******************************************************************************/ -#ifndef PARTGUI_ViewProviderPolarPattern_H -#define PARTGUI_ViewProviderPolarPattern_H +#pragma once #include "ViewProviderTransformed.h" @@ -53,6 +52,3 @@ protected: } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderPolarPattern_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderPrimitive.h b/src/Mod/PartDesign/Gui/ViewProviderPrimitive.h index f84ae3b2f9..9d9e665550 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPrimitive.h +++ b/src/Mod/PartDesign/Gui/ViewProviderPrimitive.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderPrimitive_H -#define PARTGUI_ViewProviderPrimitive_H +#pragma once #include "ViewProvider.h" @@ -51,6 +50,3 @@ protected: }; } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderBoolean_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderRevolution.h b/src/Mod/PartDesign/Gui/ViewProviderRevolution.h index 55bbb9cdc7..5e0dc2249e 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderRevolution.h +++ b/src/Mod/PartDesign/Gui/ViewProviderRevolution.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderRevolution_H -#define PARTGUI_ViewProviderRevolution_H +#pragma once #include "ViewProviderSketchBased.h" @@ -51,6 +50,3 @@ protected: } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderRevolution_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderScaled.h b/src/Mod/PartDesign/Gui/ViewProviderScaled.h index e5ec84e83a..42f48b0958 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderScaled.h +++ b/src/Mod/PartDesign/Gui/ViewProviderScaled.h @@ -23,8 +23,7 @@ ******************************************************************************/ -#ifndef PARTGUI_ViewProviderScaled_H -#define PARTGUI_ViewProviderScaled_H +#pragma once #include "ViewProviderTransformed.h" @@ -53,6 +52,3 @@ protected: } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderScaled_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h index 520ffe3af3..19f48eecab 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h +++ b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PARTGUI_ViewProviderShapeBinder_H -#define PARTGUI_ViewProviderShapeBinder_H +#pragma once #include #include @@ -104,6 +103,3 @@ private: using ViewProviderSubShapeBinderPython = Gui::ViewProviderFeaturePythonT; } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderShapeBinder_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderSketchBased.h b/src/Mod/PartDesign/Gui/ViewProviderSketchBased.h index 14d4a15c09..f5b73270ca 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderSketchBased.h +++ b/src/Mod/PartDesign/Gui/ViewProviderSketchBased.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef VIEWPROVIDERSKETCHBASED_H_QKP3UG9A -#define VIEWPROVIDERSKETCHBASED_H_QKP3UG9A +#pragma once #include "ViewProvider.h" @@ -68,5 +67,3 @@ private: }; } // namespace PartDesignGui - -#endif /* end of include guard: VIEWPROVIDERSKETCHBASED_H_QKP3UG9A */ diff --git a/src/Mod/PartDesign/Gui/ViewProviderThickness.h b/src/Mod/PartDesign/Gui/ViewProviderThickness.h index 945efcfa9c..c60fc78bf6 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderThickness.h +++ b/src/Mod/PartDesign/Gui/ViewProviderThickness.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTGUI_ViewProviderThickness_H -#define PARTGUI_ViewProviderThickness_H +#pragma once #include "ViewProviderDressUp.h" @@ -55,6 +54,3 @@ protected: }; } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderThickness_H diff --git a/src/Mod/PartDesign/Gui/ViewProviderTransformed.h b/src/Mod/PartDesign/Gui/ViewProviderTransformed.h index cbda67c905..bc2f5ed084 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderTransformed.h +++ b/src/Mod/PartDesign/Gui/ViewProviderTransformed.h @@ -23,8 +23,7 @@ ******************************************************************************/ -#ifndef PARTGUI_ViewProviderTransformed_H -#define PARTGUI_ViewProviderTransformed_H +#pragma once #include "ViewProvider.h" @@ -83,6 +82,3 @@ protected: } // namespace PartDesignGui - - -#endif // PARTGUI_ViewProviderTransformed_H diff --git a/src/Mod/PartDesign/Gui/Workbench.h b/src/Mod/PartDesign/Gui/Workbench.h index edb58faf13..815aeb9139 100644 --- a/src/Mod/PartDesign/Gui/Workbench.h +++ b/src/Mod/PartDesign/Gui/Workbench.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_WORKBENCH_H -#define PARTDESIGN_WORKBENCH_H +#pragma once #include #include @@ -64,6 +63,3 @@ protected: }; } // namespace PartDesignGui - - -#endif // PARTDESIGN_WORKBENCH_H diff --git a/src/Mod/PartDesign/Gui/WorkflowManager.h b/src/Mod/PartDesign/Gui/WorkflowManager.h index 89d4ae9b7f..72a098cf10 100644 --- a/src/Mod/PartDesign/Gui/WorkflowManager.h +++ b/src/Mod/PartDesign/Gui/WorkflowManager.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef WORKFLOWMANAGER_H_PB7A5GCM -#define WORKFLOWMANAGER_H_PB7A5GCM +#pragma once namespace App { @@ -134,5 +133,3 @@ inline bool isModernWorkflow(App::Document* doc) } } // namespace PartDesignGui - -#endif /* end of include guard: WORKFLOWMANAGER_H_PB7A5GCM */ diff --git a/src/Mod/PartDesign/PartDesignGlobal.h b/src/Mod/PartDesign/PartDesignGlobal.h index bab3c59e03..a0e6288511 100644 --- a/src/Mod/PartDesign/PartDesignGlobal.h +++ b/src/Mod/PartDesign/PartDesignGlobal.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef PARTDESIGN_GLOBAL_H -#define PARTDESIGN_GLOBAL_H +#pragma once #include @@ -46,5 +45,3 @@ # define PartDesignGuiExport FREECAD_DECL_IMPORT # endif #endif - -#endif // PARTDESIGN_GLOBAL_H diff --git a/src/Mod/Points/App/Points.h b/src/Mod/Points/App/Points.h index 670bad9dd8..6ab0a00c9b 100644 --- a/src/Mod/Points/App/Points.h +++ b/src/Mod/Points/App/Points.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef POINTS_POINT_H -#define POINTS_POINT_H +#pragma once #include #include @@ -238,6 +237,3 @@ public: }; } // namespace Points - - -#endif // POINTS_POINTPROPERTIES_H diff --git a/src/Mod/Points/App/PointsAlgos.h b/src/Mod/Points/App/PointsAlgos.h index 5a83f1fbb4..9ed37e09d7 100644 --- a/src/Mod/Points/App/PointsAlgos.h +++ b/src/Mod/Points/App/PointsAlgos.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef _PointsAlgos_h_ -#define _PointsAlgos_h_ +#pragma once #include @@ -203,6 +202,3 @@ public: }; } // namespace Points - - -#endif diff --git a/src/Mod/Points/App/PointsFeature.h b/src/Mod/Points/App/PointsFeature.h index ec54989d24..60971b6866 100644 --- a/src/Mod/Points/App/PointsFeature.h +++ b/src/Mod/Points/App/PointsFeature.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef POINTS_FEATURE_H -#define POINTS_FEATURE_H +#pragma once #include #include @@ -90,6 +89,3 @@ using FeatureCustom = App::FeatureCustomT; using FeaturePython = App::FeaturePythonT; } // namespace Points - - -#endif diff --git a/src/Mod/Points/App/PointsGrid.h b/src/Mod/Points/App/PointsGrid.h index d447628be6..b480d9e878 100644 --- a/src/Mod/Points/App/PointsGrid.h +++ b/src/Mod/Points/App/PointsGrid.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef POINTS_GRID_H -#define POINTS_GRID_H +#pragma once #include #include @@ -377,5 +376,3 @@ inline bool PointsGrid::CheckPos(unsigned long ulX, unsigned long ulY, unsigned // -------------------------------------------------------------- } // namespace Points - -#endif // POINTS_GRID_H diff --git a/src/Mod/Points/App/PreCompiled.h b/src/Mod/Points/App/PreCompiled.h index fc8d81ac20..ea81f95782 100644 --- a/src/Mod/Points/App/PreCompiled.h +++ b/src/Mod/Points/App/PreCompiled.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef POINTS_PRECOMPILED_H -#define POINTS_PRECOMPILED_H +#pragma once #include @@ -47,5 +46,3 @@ // Qt #include - -#endif diff --git a/src/Mod/Points/App/Properties.h b/src/Mod/Points/App/Properties.h index c50988e5ed..5fa5068fbc 100644 --- a/src/Mod/Points/App/Properties.h +++ b/src/Mod/Points/App/Properties.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef POINTS_POINTPROPERTIES_H -#define POINTS_POINTPROPERTIES_H +#pragma once #include @@ -239,6 +238,3 @@ private: }; } // namespace Points - - -#endif // POINTS_POINTPROPERTIES_H diff --git a/src/Mod/Points/App/PropertyPointKernel.h b/src/Mod/Points/App/PropertyPointKernel.h index c0ee260432..c330f4301d 100644 --- a/src/Mod/Points/App/PropertyPointKernel.h +++ b/src/Mod/Points/App/PropertyPointKernel.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef POINTS_PROPERTYPOINTKERNEL_H -#define POINTS_PROPERTYPOINTKERNEL_H +#pragma once #include "Points.h" @@ -94,6 +93,3 @@ private: }; } // namespace Points - - -#endif // POINTS_PROPERTYPOINTKERNEL_H diff --git a/src/Mod/Points/App/Structured.h b/src/Mod/Points/App/Structured.h index 7e01231ac8..935b5af281 100644 --- a/src/Mod/Points/App/Structured.h +++ b/src/Mod/Points/App/Structured.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef POINTS_VIEW_FEATURE_H -#define POINTS_VIEW_FEATURE_H +#pragma once #include "PointsFeature.h" @@ -62,6 +61,3 @@ public: using StructuredCustom = App::FeatureCustomT; } // namespace Points - - -#endif diff --git a/src/Mod/Points/App/Tools.h b/src/Mod/Points/App/Tools.h index ab6087cfc2..079fc5bdd5 100644 --- a/src/Mod/Points/App/Tools.h +++ b/src/Mod/Points/App/Tools.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef POINTS_TOOLS_H -#define POINTS_TOOLS_H +#pragma once #include #include @@ -64,5 +63,3 @@ bool copyProperty( } } // namespace Points - -#endif // POINTS_TOOLS_H diff --git a/src/Mod/Points/Gui/DlgPointsReadImp.h b/src/Mod/Points/Gui/DlgPointsReadImp.h index 5b648b337f..150d7cb1ab 100644 --- a/src/Mod/Points/Gui/DlgPointsReadImp.h +++ b/src/Mod/Points/Gui/DlgPointsReadImp.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef POINTSGUI_DLGREADPOINTS_H -#define POINTSGUI_DLGREADPOINTS_H +#pragma once #include @@ -57,5 +56,3 @@ private: }; } // namespace PointsGui - -#endif // POINTSGUI_DLGREADPOINTS_H diff --git a/src/Mod/Points/Gui/PreCompiled.h b/src/Mod/Points/Gui/PreCompiled.h index ab972ec2d3..4d403d85de 100644 --- a/src/Mod/Points/Gui/PreCompiled.h +++ b/src/Mod/Points/Gui/PreCompiled.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef POINTSGUI_PRECOMPILED_H -#define POINTSGUI_PRECOMPILED_H +#pragma once #include @@ -53,5 +52,3 @@ #include #include #include - -#endif // POINTSGUI_PRECOMPILED_H diff --git a/src/Mod/Points/Gui/ViewProvider.h b/src/Mod/Points/Gui/ViewProvider.h index b6522d4a32..556fd15af7 100644 --- a/src/Mod/Points/Gui/ViewProvider.h +++ b/src/Mod/Points/Gui/ViewProvider.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef POINTSGUI_VIEWPROVIDERPOINTS_H -#define POINTSGUI_VIEWPROVIDERPOINTS_H +#pragma once #include @@ -178,6 +177,3 @@ protected: using ViewProviderPython = Gui::ViewProviderFeaturePythonT; } // namespace PointsGui - - -#endif // POINTSGUI_VIEWPROVIDERPOINTS_H diff --git a/src/Mod/Points/Gui/Workbench.h b/src/Mod/Points/Gui/Workbench.h index 99e14f6ff4..84d78eedf2 100644 --- a/src/Mod/Points/Gui/Workbench.h +++ b/src/Mod/Points/Gui/Workbench.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef POINTS_WORKBENCH_H -#define POINTS_WORKBENCH_H +#pragma once #include #include @@ -50,6 +49,3 @@ protected: }; } // namespace PointsGui - - -#endif // POINTS_WORKBENCH_H diff --git a/src/Mod/Points/PointsGlobal.h b/src/Mod/Points/PointsGlobal.h index acca989228..12be3b249c 100644 --- a/src/Mod/Points/PointsGlobal.h +++ b/src/Mod/Points/PointsGlobal.h @@ -24,26 +24,23 @@ #include -#ifndef POINTS_GLOBAL_H -# define POINTS_GLOBAL_H +#pragma once // Points -# ifndef PointsExport -# ifdef Points_EXPORTS -# define PointsExport FREECAD_DECL_EXPORT -# else -# define PointsExport FREECAD_DECL_IMPORT -# endif +#ifndef PointsExport +# ifdef Points_EXPORTS +# define PointsExport FREECAD_DECL_EXPORT +# else +# define PointsExport FREECAD_DECL_IMPORT # endif +#endif // PointsGui -# ifndef PointsGuiExport -# ifdef PointsGui_EXPORTS -# define PointsGuiExport FREECAD_DECL_EXPORT -# else -# define PointsGuiExport FREECAD_DECL_IMPORT -# endif +#ifndef PointsGuiExport +# ifdef PointsGui_EXPORTS +# define PointsGuiExport FREECAD_DECL_EXPORT +# else +# define PointsGuiExport FREECAD_DECL_IMPORT # endif - -#endif // POINTS_GLOBAL_H +#endif diff --git a/src/Mod/ReverseEngineering/App/ApproxSurface.h b/src/Mod/ReverseEngineering/App/ApproxSurface.h index f588dbb75b..61e72fe47a 100644 --- a/src/Mod/ReverseEngineering/App/ApproxSurface.h +++ b/src/Mod/ReverseEngineering/App/ApproxSurface.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef REEN_APPROXSURFACE_H -#define REEN_APPROXSURFACE_H +#pragma once #include #include @@ -509,5 +508,3 @@ protected: }; } // namespace Reen - -#endif // REEN_APPROXSURFACE_H diff --git a/src/Mod/ReverseEngineering/App/BSplineFitting.h b/src/Mod/ReverseEngineering/App/BSplineFitting.h index 613e34c881..1e24b8f968 100644 --- a/src/Mod/ReverseEngineering/App/BSplineFitting.h +++ b/src/Mod/ReverseEngineering/App/BSplineFitting.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef REEN_BSPLINEFITTING_H -#define REEN_BSPLINEFITTING_H +#pragma once #if defined(HAVE_PCL_OPENNURBS) # include @@ -63,5 +62,3 @@ private: } // namespace Reen #endif // HAVE_PCL_OPENNURBS - -#endif // REEN_BSPLINEFITTING_H diff --git a/src/Mod/ReverseEngineering/App/PreCompiled.h b/src/Mod/ReverseEngineering/App/PreCompiled.h index 5d62635317..2229150919 100644 --- a/src/Mod/ReverseEngineering/App/PreCompiled.h +++ b/src/Mod/ReverseEngineering/App/PreCompiled.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef REVERSE_ENGINEERING_APP_PRECOMPILED_H -#define REVERSE_ENGINEERING_APP_PRECOMPILED_H +#pragma once #include @@ -50,5 +49,3 @@ #include #include #include - -#endif diff --git a/src/Mod/ReverseEngineering/App/RegionGrowing.h b/src/Mod/ReverseEngineering/App/RegionGrowing.h index efb0ee515b..ef88bc975e 100644 --- a/src/Mod/ReverseEngineering/App/RegionGrowing.h +++ b/src/Mod/ReverseEngineering/App/RegionGrowing.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef REEN_REGIONGROWING_H -#define REEN_REGIONGROWING_H +#pragma once #include #include @@ -58,5 +57,3 @@ private: }; } // namespace Reen - -#endif // REEN_REGIONGROWING_H diff --git a/src/Mod/ReverseEngineering/App/SampleConsensus.h b/src/Mod/ReverseEngineering/App/SampleConsensus.h index 6a06522b14..a88a50f88c 100644 --- a/src/Mod/ReverseEngineering/App/SampleConsensus.h +++ b/src/Mod/ReverseEngineering/App/SampleConsensus.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef REEN_SAMPLECONSENSUS_H -#define REEN_SAMPLECONSENSUS_H +#pragma once #include @@ -62,5 +61,3 @@ private: }; } // namespace Reen - -#endif // REEN_SAMPLECONSENSUS_H diff --git a/src/Mod/ReverseEngineering/App/Segmentation.h b/src/Mod/ReverseEngineering/App/Segmentation.h index 55e5184a61..fba182b5dd 100644 --- a/src/Mod/ReverseEngineering/App/Segmentation.h +++ b/src/Mod/ReverseEngineering/App/Segmentation.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef REEN_SEGMENTATION_H -#define REEN_SEGMENTATION_H +#pragma once #include #include @@ -86,5 +85,3 @@ private: }; } // namespace Reen - -#endif // REEN_SEGMENTATION_H diff --git a/src/Mod/ReverseEngineering/App/SurfaceTriangulation.h b/src/Mod/ReverseEngineering/App/SurfaceTriangulation.h index 02d871053a..dfc0df84e2 100644 --- a/src/Mod/ReverseEngineering/App/SurfaceTriangulation.h +++ b/src/Mod/ReverseEngineering/App/SurfaceTriangulation.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef REEN_SURFACETRIANGULATION_H -#define REEN_SURFACETRIANGULATION_H +#pragma once #include @@ -211,5 +210,3 @@ private: }; } // namespace Reen - -#endif // REEN_SURFACETRIANGULATION_H diff --git a/src/Mod/ReverseEngineering/Gui/FitBSplineCurve.h b/src/Mod/ReverseEngineering/Gui/FitBSplineCurve.h index ce340e4523..f0c4a27d76 100644 --- a/src/Mod/ReverseEngineering/Gui/FitBSplineCurve.h +++ b/src/Mod/ReverseEngineering/Gui/FitBSplineCurve.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef REENGUI_FITBSPLINECURVE_H -#define REENGUI_FITBSPLINECURVE_H +#pragma once #include #include @@ -77,5 +76,3 @@ private: }; } // namespace ReenGui - -#endif // REENGUI_FITBSPLINECURVE_H diff --git a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h index e475a04f2a..95e6cb5508 100644 --- a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h +++ b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef REENGUI_FITBSPLINESURFACE_H -#define REENGUI_FITBSPLINESURFACE_H +#pragma once #include #include @@ -76,5 +75,3 @@ private: }; } // namespace ReenGui - -#endif // REENGUI_FITBSPLINESURFACE_H diff --git a/src/Mod/ReverseEngineering/Gui/Poisson.h b/src/Mod/ReverseEngineering/Gui/Poisson.h index 4650c0778f..7909b1bfcb 100644 --- a/src/Mod/ReverseEngineering/Gui/Poisson.h +++ b/src/Mod/ReverseEngineering/Gui/Poisson.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef REENGUI_POISSON_H -#define REENGUI_POISSON_H +#pragma once #include #include @@ -72,5 +71,3 @@ private: }; } // namespace ReenGui - -#endif // REENGUI_POISSON_H diff --git a/src/Mod/ReverseEngineering/Gui/PreCompiled.h b/src/Mod/ReverseEngineering/Gui/PreCompiled.h index 41729a5c24..239c8a8bca 100644 --- a/src/Mod/ReverseEngineering/Gui/PreCompiled.h +++ b/src/Mod/ReverseEngineering/Gui/PreCompiled.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef REVERSE_ENGINEERING_GUI_PRECOMPILED_H -#define REVERSE_ENGINEERING_GUI_PRECOMPILED_H +#pragma once #include @@ -44,5 +43,3 @@ #include #include #include - -#endif // __PRECOMPILED_GUI__ diff --git a/src/Mod/ReverseEngineering/Gui/Segmentation.h b/src/Mod/ReverseEngineering/Gui/Segmentation.h index 53011add18..2e299f413c 100644 --- a/src/Mod/ReverseEngineering/Gui/Segmentation.h +++ b/src/Mod/ReverseEngineering/Gui/Segmentation.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef REVERSEENGINEERINGGUI_SEGMENTATION_H -#define REVERSEENGINEERINGGUI_SEGMENTATION_H +#pragma once #include @@ -85,5 +84,3 @@ private: }; } // namespace ReverseEngineeringGui - -#endif // REVERSEENGINEERINGGUI_SEGMENTATION_H diff --git a/src/Mod/ReverseEngineering/Gui/SegmentationManual.h b/src/Mod/ReverseEngineering/Gui/SegmentationManual.h index d64a0125d8..92bbfbadfa 100644 --- a/src/Mod/ReverseEngineering/Gui/SegmentationManual.h +++ b/src/Mod/ReverseEngineering/Gui/SegmentationManual.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef REVERSEENGINEERINGGUI_SEGMENTATIONMANUAL_H -#define REVERSEENGINEERINGGUI_SEGMENTATIONMANUAL_H +#pragma once #include @@ -107,5 +106,3 @@ private: }; } // namespace ReverseEngineeringGui - -#endif // REVERSEENGINEERINGGUI_SEGMENTATIONMANUAL_H diff --git a/src/Mod/ReverseEngineering/Gui/Workbench.h b/src/Mod/ReverseEngineering/Gui/Workbench.h index be3761fa1e..6e1d250ea5 100644 --- a/src/Mod/ReverseEngineering/Gui/Workbench.h +++ b/src/Mod/ReverseEngineering/Gui/Workbench.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef REENGUI_WORKBENCH_H -#define REENGUI_WORKBENCH_H +#pragma once #include @@ -49,6 +48,3 @@ protected: }; } // namespace ReverseEngineeringGui - - -#endif // REENGUI_WORKBENCH_H diff --git a/src/Mod/ReverseEngineering/ReverseEngineeringGlobal.h b/src/Mod/ReverseEngineering/ReverseEngineeringGlobal.h index 4764eefda2..efeaafc83d 100644 --- a/src/Mod/ReverseEngineering/ReverseEngineeringGlobal.h +++ b/src/Mod/ReverseEngineering/ReverseEngineeringGlobal.h @@ -24,26 +24,23 @@ #include -#ifndef REEN_GLOBAL_H -# define REEN_GLOBAL_H +#pragma once // Reen -# ifndef ReenExport -# ifdef ReverseEngineering_EXPORTS -# define ReenExport FREECAD_DECL_EXPORT -# else -# define ReenExport FREECAD_DECL_IMPORT -# endif +#ifndef ReenExport +# ifdef ReverseEngineering_EXPORTS +# define ReenExport FREECAD_DECL_EXPORT +# else +# define ReenExport FREECAD_DECL_IMPORT # endif +#endif // ReenGui -# ifndef ReenGuiExport -# ifdef ReverseEngineeringGui_EXPORTS -# define ReenGuiExport FREECAD_DECL_EXPORT -# else -# define ReenGuiExport FREECAD_DECL_IMPORT -# endif +#ifndef ReenGuiExport +# ifdef ReverseEngineeringGui_EXPORTS +# define ReenGuiExport FREECAD_DECL_EXPORT +# else +# define ReenGuiExport FREECAD_DECL_IMPORT # endif - -#endif // REEN_GLOBAL_H +#endif diff --git a/src/Mod/Robot/App/Edge2TracObject.h b/src/Mod/Robot/App/Edge2TracObject.h index 566122a7e8..5e959e660e 100644 --- a/src/Mod/Robot/App/Edge2TracObject.h +++ b/src/Mod/Robot/App/Edge2TracObject.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef ROBOT_Edge2TracObject_H -#define ROBOT_Edge2TracObject_H +#pragma once #include @@ -65,6 +64,3 @@ protected: }; } // namespace Robot - - -#endif // ROBOT_ROBOTOBJECT_H diff --git a/src/Mod/Robot/App/PreCompiled.h b/src/Mod/Robot/App/PreCompiled.h index f7ede66619..2117f87f5c 100644 --- a/src/Mod/Robot/App/PreCompiled.h +++ b/src/Mod/Robot/App/PreCompiled.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef ROBOT_PRECOMPILED_H -#define ROBOT_PRECOMPILED_H +#pragma once #include @@ -51,5 +50,3 @@ #include #include #include - -#endif diff --git a/src/Mod/Robot/App/PropertyTrajectory.h b/src/Mod/Robot/App/PropertyTrajectory.h index e0fad1f9ee..2877ca8310 100644 --- a/src/Mod/Robot/App/PropertyTrajectory.h +++ b/src/Mod/Robot/App/PropertyTrajectory.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PROPERTYTRAJECTORY_H -#define PROPERTYTRAJECTORY_H +#pragma once #include #include @@ -84,6 +83,3 @@ private: } // namespace Robot - - -#endif // PROPERTYTOPOSHAPE_H diff --git a/src/Mod/Robot/App/Robot6Axis.h b/src/Mod/Robot/App/Robot6Axis.h index df8352d70d..59bbc11754 100644 --- a/src/Mod/Robot/App/Robot6Axis.h +++ b/src/Mod/Robot/App/Robot6Axis.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef ROBOT_ROBOT6AXIS_H -#define ROBOT_ROBOT6AXIS_H +#pragma once #include "kdl_cp/chain.hpp" #include "kdl_cp/jntarray.hpp" @@ -94,5 +93,3 @@ protected: }; } // namespace Robot - -#endif // ROBOT_ROBOT6AXIS_H diff --git a/src/Mod/Robot/App/RobotAlgos.h b/src/Mod/Robot/App/RobotAlgos.h index 8704775e9b..10b7b2428f 100644 --- a/src/Mod/Robot/App/RobotAlgos.h +++ b/src/Mod/Robot/App/RobotAlgos.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef _RobotAlgos_h_ -#define _RobotAlgos_h_ +#pragma once #include "kdl_cp/frames_io.hpp" #include @@ -51,5 +50,3 @@ KDL::Frame toFrame(const Base::Placement& To); Base::Placement toPlacement(const KDL::Frame& frame); } // namespace Robot - -#endif diff --git a/src/Mod/Robot/App/RobotObject.h b/src/Mod/Robot/App/RobotObject.h index 5519dc7990..f94a302b22 100644 --- a/src/Mod/Robot/App/RobotObject.h +++ b/src/Mod/Robot/App/RobotObject.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef ROBOT_ROBOTOBJECT_H -#define ROBOT_ROBOTOBJECT_H +#pragma once #include #include @@ -89,6 +88,3 @@ protected: }; } // namespace Robot - - -#endif // ROBOT_ROBOTOBJECT_H diff --git a/src/Mod/Robot/App/Simulation.h b/src/Mod/Robot/App/Simulation.h index 18372d59ef..c9fbb2768c 100644 --- a/src/Mod/Robot/App/Simulation.h +++ b/src/Mod/Robot/App/Simulation.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef _Simulation_h_ -#define _Simulation_h_ +#pragma once #include @@ -81,6 +80,3 @@ public: } // namespace Robot - - -#endif diff --git a/src/Mod/Robot/App/Trajectory.h b/src/Mod/Robot/App/Trajectory.h index bbfe9368e4..b7e8519dd1 100644 --- a/src/Mod/Robot/App/Trajectory.h +++ b/src/Mod/Robot/App/Trajectory.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef ROBOT_Trajectory_H -#define ROBOT_Trajectory_H +#pragma once #include @@ -96,6 +95,3 @@ protected: }; } // namespace Robot - - -#endif // PART_TOPOSHAPE_H diff --git a/src/Mod/Robot/App/TrajectoryCompound.h b/src/Mod/Robot/App/TrajectoryCompound.h index ca2bafe9e3..0d0a51a39c 100644 --- a/src/Mod/Robot/App/TrajectoryCompound.h +++ b/src/Mod/Robot/App/TrajectoryCompound.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef ROBOT_TrajectoryCompound_H -#define ROBOT_TrajectoryCompound_H +#pragma once #include @@ -58,6 +57,3 @@ protected: }; } // namespace Robot - - -#endif // ROBOT_ROBOTOBJECT_H diff --git a/src/Mod/Robot/App/TrajectoryDressUpObject.h b/src/Mod/Robot/App/TrajectoryDressUpObject.h index d051872ac6..bae8c2ae19 100644 --- a/src/Mod/Robot/App/TrajectoryDressUpObject.h +++ b/src/Mod/Robot/App/TrajectoryDressUpObject.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef ROBOT_TrajectoryDressUpObject_H -#define ROBOT_TrajectoryDressUpObject_H +#pragma once #include #include @@ -70,6 +69,3 @@ protected: }; } // namespace Robot - - -#endif // ROBOT_ROBOTOBJECT_H diff --git a/src/Mod/Robot/App/TrajectoryObject.h b/src/Mod/Robot/App/TrajectoryObject.h index 1f3d8a2ec2..7bd543c456 100644 --- a/src/Mod/Robot/App/TrajectoryObject.h +++ b/src/Mod/Robot/App/TrajectoryObject.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef ROBOT_TrajectoryObject_H -#define ROBOT_TrajectoryObject_H +#pragma once #include #include @@ -67,6 +66,3 @@ protected: }; } // namespace Robot - - -#endif // ROBOT_ROBOTOBJECT_H diff --git a/src/Mod/Robot/App/Waypoint.h b/src/Mod/Robot/App/Waypoint.h index 03a17d5d4d..75da7f6a4d 100644 --- a/src/Mod/Robot/App/Waypoint.h +++ b/src/Mod/Robot/App/Waypoint.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef ROBOT_WAYPOINT_H -#define ROBOT_WAYPOINT_H +#pragma once #include #include @@ -80,6 +79,3 @@ public: }; } // namespace Robot - - -#endif // ROBOT_WAYPOINT_H diff --git a/src/Mod/Robot/App/kdl_cp/articulatedbodyinertia.hpp b/src/Mod/Robot/App/kdl_cp/articulatedbodyinertia.hpp index 272ba2e415..d82c05e114 100644 --- a/src/Mod/Robot/App/kdl_cp/articulatedbodyinertia.hpp +++ b/src/Mod/Robot/App/kdl_cp/articulatedbodyinertia.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_ARTICULATEDBODYINERTIA_HPP -#define KDL_ARTICULATEDBODYINERTIA_HPP +#pragma once #include "frames.hpp" @@ -123,5 +122,4 @@ namespace KDL { */ ArticulatedBodyInertia operator*(const Rotation& R,const ArticulatedBodyInertia& I); -} -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/chain.hpp b/src/Mod/Robot/App/kdl_cp/chain.hpp index fc745520fa..591ae58596 100644 --- a/src/Mod/Robot/App/kdl_cp/chain.hpp +++ b/src/Mod/Robot/App/kdl_cp/chain.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_CHAIN_HPP -#define KDL_CHAIN_HPP +#pragma once #include "segment.hpp" #include @@ -92,6 +91,4 @@ namespace KDL { -}//end of namespace KDL - -#endif +}//end of namespace KDL \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/chaindynparam.hpp b/src/Mod/Robot/App/kdl_cp/chaindynparam.hpp index e2fb38824c..179135cf44 100644 --- a/src/Mod/Robot/App/kdl_cp/chaindynparam.hpp +++ b/src/Mod/Robot/App/kdl_cp/chaindynparam.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDLCHAINDYNPARAM_HPP -#define KDLCHAINDYNPARAM_HPP +#pragma once #include "chainidsolver_recursive_newton_euler.hpp" #include "articulatedbodyinertia.hpp" @@ -75,6 +74,4 @@ namespace KDL { }; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/chainfksolver.hpp b/src/Mod/Robot/App/kdl_cp/chainfksolver.hpp index d3dec6ce65..f496419a3c 100644 --- a/src/Mod/Robot/App/kdl_cp/chainfksolver.hpp +++ b/src/Mod/Robot/App/kdl_cp/chainfksolver.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_CHAIN_FKSOLVER_HPP -#define KDL_CHAIN_FKSOLVER_HPP +#pragma once #include "chain.hpp" #include "framevel.hpp" @@ -108,6 +107,4 @@ namespace KDL { }; -}//end of namespace KDL - -#endif +}//end of namespace KDL \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/chainfksolverpos_recursive.hpp b/src/Mod/Robot/App/kdl_cp/chainfksolverpos_recursive.hpp index 3ce14b2c9c..3ad67d5596 100644 --- a/src/Mod/Robot/App/kdl_cp/chainfksolverpos_recursive.hpp +++ b/src/Mod/Robot/App/kdl_cp/chainfksolverpos_recursive.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDLCHAINFKSOLVERPOS_RECURSIVE_HPP -#define KDLCHAINFKSOLVERPOS_RECURSIVE_HPP +#pragma once #include "chainfksolver.hpp" @@ -47,6 +46,4 @@ namespace KDL { const Chain chain; }; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/chainfksolvervel_recursive.hpp b/src/Mod/Robot/App/kdl_cp/chainfksolvervel_recursive.hpp index 6bf9a9ffe6..47b1d6587d 100644 --- a/src/Mod/Robot/App/kdl_cp/chainfksolvervel_recursive.hpp +++ b/src/Mod/Robot/App/kdl_cp/chainfksolvervel_recursive.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_CHAIN_FKSOLVERVEL_RECURSIVE_HPP -#define KDL_CHAIN_FKSOLVERVEL_RECURSIVE_HPP +#pragma once #include "chainfksolver.hpp" @@ -46,6 +45,4 @@ namespace KDL private: const Chain chain; }; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/chainidsolver.hpp b/src/Mod/Robot/App/kdl_cp/chainidsolver.hpp index e37166c02a..3acb38f2ab 100644 --- a/src/Mod/Robot/App/kdl_cp/chainidsolver.hpp +++ b/src/Mod/Robot/App/kdl_cp/chainidsolver.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_CHAIN_IDSOLVER_HPP -#define KDL_CHAIN_IDSOLVER_HPP +#pragma once #include "chain.hpp" #include "frames.hpp" @@ -60,6 +59,4 @@ namespace KDL // Need functions to return the manipulator mass, coriolis and gravity matrices - Lagrangian Formulation. }; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/chainidsolver_recursive_newton_euler.hpp b/src/Mod/Robot/App/kdl_cp/chainidsolver_recursive_newton_euler.hpp index 92554e2211..a0c4efc0a5 100644 --- a/src/Mod/Robot/App/kdl_cp/chainidsolver_recursive_newton_euler.hpp +++ b/src/Mod/Robot/App/kdl_cp/chainidsolver_recursive_newton_euler.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_CHAIN_IKSOLVER_RECURSIVE_NEWTON_EULER_HPP -#define KDL_CHAIN_IKSOLVER_RECURSIVE_NEWTON_EULER_HPP +#pragma once #include "chainidsolver.hpp" @@ -72,6 +71,4 @@ namespace KDL{ std::vector f; Twist ag; }; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/chainidsolver_vereshchagin.hpp b/src/Mod/Robot/App/kdl_cp/chainidsolver_vereshchagin.hpp index 933c15cde5..6479ccb448 100644 --- a/src/Mod/Robot/App/kdl_cp/chainidsolver_vereshchagin.hpp +++ b/src/Mod/Robot/App/kdl_cp/chainidsolver_vereshchagin.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_CHAINIDSOLVER_VERESHCHAGIN_HPP -#define KDL_CHAINIDSOLVER_VERESHCHAGIN_HPP +#pragma once #include "chainidsolver.hpp" #include "frames.hpp" @@ -184,6 +183,4 @@ private: std::vector results; }; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/chainiksolver.hpp b/src/Mod/Robot/App/kdl_cp/chainiksolver.hpp index 5c97170402..07467c72d4 100644 --- a/src/Mod/Robot/App/kdl_cp/chainiksolver.hpp +++ b/src/Mod/Robot/App/kdl_cp/chainiksolver.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_CHAIN_IKSOLVER_HPP -#define KDL_CHAIN_IKSOLVER_HPP +#pragma once #include "chain.hpp" #include "frames.hpp" @@ -164,6 +163,4 @@ namespace KDL { }; -}//end of namespace KDL - -#endif +}//end of namespace KDL \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/chainiksolverpos_lma.hpp b/src/Mod/Robot/App/kdl_cp/chainiksolverpos_lma.hpp index 2b4530405f..9be58a26aa 100644 --- a/src/Mod/Robot/App/kdl_cp/chainiksolverpos_lma.hpp +++ b/src/Mod/Robot/App/kdl_cp/chainiksolverpos_lma.hpp @@ -1,7 +1,5 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#ifndef KDL_CHAINIKSOLVERPOS_GN_HPP -#define KDL_CHAINIKSOLVERPOS_GN_HPP /** \file chainiksolverpos_lma.hpp \brief computing inverse position kinematics using Levenberg-Marquardt. @@ -31,7 +29,7 @@ * Suite 330, Boston, MA 02111-1307 USA * * * ***************************************************************************/ - +#pragma once #include "chainiksolver.hpp" #include "chain.hpp" @@ -239,11 +237,4 @@ private: -} // namespace KDL - - - - - - -#endif +} // namespace KDL \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/chainiksolverpos_nr.hpp b/src/Mod/Robot/App/kdl_cp/chainiksolverpos_nr.hpp index 43e2f08456..0b98c719be 100644 --- a/src/Mod/Robot/App/kdl_cp/chainiksolverpos_nr.hpp +++ b/src/Mod/Robot/App/kdl_cp/chainiksolverpos_nr.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDLCHAINIKSOLVERPOS_NR_HPP -#define KDLCHAINIKSOLVERPOS_NR_HPP +#pragma once #include "chainiksolver.hpp" #include "chainfksolver.hpp" @@ -89,6 +88,4 @@ namespace KDL { double eps; }; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/chainiksolverpos_nr_jl.hpp b/src/Mod/Robot/App/kdl_cp/chainiksolverpos_nr_jl.hpp index ba2167fdff..87e9698e88 100644 --- a/src/Mod/Robot/App/kdl_cp/chainiksolverpos_nr_jl.hpp +++ b/src/Mod/Robot/App/kdl_cp/chainiksolverpos_nr_jl.hpp @@ -23,8 +23,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDLCHAINIKSOLVERPOS_NR_JL_HPP -#define KDLCHAINIKSOLVERPOS_NR_JL_HPP +#pragma once #include "chainiksolver.hpp" #include "chainfksolver.hpp" @@ -79,6 +78,4 @@ namespace KDL { }; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/chainiksolvervel_pinv.hpp b/src/Mod/Robot/App/kdl_cp/chainiksolvervel_pinv.hpp index 3bc1ba5503..7c21cd5475 100644 --- a/src/Mod/Robot/App/kdl_cp/chainiksolvervel_pinv.hpp +++ b/src/Mod/Robot/App/kdl_cp/chainiksolvervel_pinv.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_CHAIN_IKSOLVERVEL_PINV_HPP -#define KDL_CHAIN_IKSOLVERVEL_PINV_HPP +#pragma once #include "chainiksolver.hpp" #include "chainjnttojacsolver.hpp" @@ -113,6 +112,4 @@ namespace KDL int svdResult; }; -} -#endif - +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/chainiksolvervel_pinv_givens.hpp b/src/Mod/Robot/App/kdl_cp/chainiksolvervel_pinv_givens.hpp index 19c1d1b4f0..bc7ed1f9a6 100644 --- a/src/Mod/Robot/App/kdl_cp/chainiksolvervel_pinv_givens.hpp +++ b/src/Mod/Robot/App/kdl_cp/chainiksolvervel_pinv_givens.hpp @@ -2,8 +2,7 @@ // Copyright (C) 2007 Ruben Smits -#ifndef KDL_CHAIN_IKSOLVERVEL_PINV_GIVENS_HPP -#define KDL_CHAIN_IKSOLVERVEL_PINV_GIVENS_HPP +#pragma once #include "chainiksolver.hpp" #include "chainjnttojacsolver.hpp" @@ -51,5 +50,4 @@ namespace KDL MatrixXd jac_eigen,U,V,B; VectorXd S,tempi,tempj,UY,SUY,qdot_eigen,v_in_eigen; }; -} -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/chainiksolvervel_pinv_nso.hpp b/src/Mod/Robot/App/kdl_cp/chainiksolvervel_pinv_nso.hpp index 56b35e343d..dd8dfffd37 100644 --- a/src/Mod/Robot/App/kdl_cp/chainiksolvervel_pinv_nso.hpp +++ b/src/Mod/Robot/App/kdl_cp/chainiksolvervel_pinv_nso.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_CHAIN_IKSOLVERVEL_PINV_NSO_HPP -#define KDL_CHAIN_IKSOLVERVEL_PINV_NSO_HPP +#pragma once #include "chainiksolver.hpp" #include "chainjnttojacsolver.hpp" @@ -121,6 +120,4 @@ namespace KDL JntArray weights; JntArray opt_pos; }; -} -#endif - +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/chainiksolvervel_wdls.hpp b/src/Mod/Robot/App/kdl_cp/chainiksolvervel_wdls.hpp index 3cacc78208..5c58787818 100644 --- a/src/Mod/Robot/App/kdl_cp/chainiksolvervel_wdls.hpp +++ b/src/Mod/Robot/App/kdl_cp/chainiksolvervel_wdls.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_CHAIN_IKSOLVERVEL_WDLS_HPP -#define KDL_CHAIN_IKSOLVERVEL_WDLS_HPP +#pragma once #include "chainiksolver.hpp" #include "chainjnttojacsolver.hpp" @@ -226,6 +225,4 @@ namespace KDL int svdResult; double sigmaMin; }; -} -#endif - +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/chainjnttojacsolver.hpp b/src/Mod/Robot/App/kdl_cp/chainjnttojacsolver.hpp index 157c9cedad..3bfe2970ed 100644 --- a/src/Mod/Robot/App/kdl_cp/chainjnttojacsolver.hpp +++ b/src/Mod/Robot/App/kdl_cp/chainjnttojacsolver.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_CHAINJNTTOJACSOLVER_HPP -#define KDL_CHAINJNTTOJACSOLVER_HPP +#pragma once #include "solveri.hpp" #include "frames.hpp" @@ -72,6 +71,4 @@ namespace KDL std::vector locked_joints_; unsigned int nr_of_unlocked_joints_; }; -} -#endif - +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/config.h.in b/src/Mod/Robot/App/kdl_cp/config.h.in index d44938aa80..7e237a1cb5 100644 --- a/src/Mod/Robot/App/kdl_cp/config.h.in +++ b/src/Mod/Robot/App/kdl_cp/config.h.in @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_CONFIG_H -#define KDL_CONFIG_H +#pragma once #define KDL_VERSION_MAJOR @KDL_VERSION_MAJOR@ #define KDL_VERSION_MINOR @KDL_VERSION_MINOR@ @@ -34,6 +33,4 @@ //Set which version of the Tree Interface to use #cmakedefine HAVE_STL_CONTAINER_INCOMPLETE_TYPES -#cmakedefine KDL_USE_NEW_TREE_INTERFACE - -#endif //#define KDL_CONFIG_H +#cmakedefine KDL_USE_NEW_TREE_INTERFACE \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/frameacc.hpp b/src/Mod/Robot/App/kdl_cp/frameacc.hpp index 0c48ec9898..eec18f6f8a 100644 --- a/src/Mod/Robot/App/kdl_cp/frameacc.hpp +++ b/src/Mod/Robot/App/kdl_cp/frameacc.hpp @@ -29,8 +29,7 @@ ****************************************************************************/ // clazy:excludeall=rule-of-two-soft -#ifndef RRFRAMES_H -#define RRFRAMES_H +#pragma once #include "utilities/rall2d.h" @@ -268,12 +267,4 @@ public: #ifdef KDL_INLINE #include "frameacc.inl" -#endif - - - - - - - -#endif +#endif \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/frameacc_io.hpp b/src/Mod/Robot/App/kdl_cp/frameacc_io.hpp index 3eddd83c46..3f2fc6f83c 100644 --- a/src/Mod/Robot/App/kdl_cp/frameacc_io.hpp +++ b/src/Mod/Robot/App/kdl_cp/frameacc_io.hpp @@ -18,8 +18,7 @@ * $Id: rrframes_io.h,v 1.1.1.1 2002/08/26 14:14:21 rmoreas Exp $ * $Name: $ ****************************************************************************/ -#ifndef RRFRAMES_IO -#define RRFRAMES_IO +#pragma once #include "utilities/utility_io.h" #include "utilities/rall2d_io.h" @@ -53,8 +52,4 @@ inline std::ostream& operator << (std::ostream& os,const TwistAcc& r) { } -} // namespace Frame - - - -#endif +} // namespace Frame \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/frames.hpp b/src/Mod/Robot/App/kdl_cp/frames.hpp index f65ab8c940..ce4a771d14 100644 --- a/src/Mod/Robot/App/kdl_cp/frames.hpp +++ b/src/Mod/Robot/App/kdl_cp/frames.hpp @@ -123,8 +123,7 @@ * Erwin Aertbelien, Div. PMA, Dep. of Mech. Eng., K.U.Leuven * ****************************************************************************/ -#ifndef KDL_FRAMES_H -#define KDL_FRAMES_H +#pragma once #include "utilities/kdl-config.h" @@ -1263,8 +1262,4 @@ IMETHOD Wrench addDelta(const Wrench& a,const Wrench&da,double dt=1); //#include "rotation2.inl" //#include "frame2.inl" #include "frames.inl" -#endif - - - -#endif +#endif \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/frames_io.hpp b/src/Mod/Robot/App/kdl_cp/frames_io.hpp index 6d9970ca81..9c01113232 100644 --- a/src/Mod/Robot/App/kdl_cp/frames_io.hpp +++ b/src/Mod/Robot/App/kdl_cp/frames_io.hpp @@ -75,8 +75,7 @@ // * ****************************************************************************/ -#ifndef FRAMES_IO_H -#define FRAMES_IO_H +#pragma once #include "utilities/utility_io.h" #include "frames.hpp" @@ -111,6 +110,4 @@ namespace KDL { std::istream& operator >> (std::istream& is,Frame2& T); -} // namespace Frame - -#endif +} // namespace Frame \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/framevel.hpp b/src/Mod/Robot/App/kdl_cp/framevel.hpp index 3c6de86501..390f117f74 100644 --- a/src/Mod/Robot/App/kdl_cp/framevel.hpp +++ b/src/Mod/Robot/App/kdl_cp/framevel.hpp @@ -23,8 +23,7 @@ ****************************************************************************/ // clazy:excludeall=rule-of-two-soft -#ifndef KDL_FRAMEVEL_H -#define KDL_FRAMEVEL_H +#pragma once #include "utilities/utility.h" #include "utilities/rall1d.h" @@ -390,10 +389,4 @@ IMETHOD void posrandom(FrameVel& F) { #ifdef KDL_INLINE #include "framevel.inl" -#endif - -#endif - - - - +#endif \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/framevel_io.hpp b/src/Mod/Robot/App/kdl_cp/framevel_io.hpp index 76d0e2d1ac..97a51953c1 100644 --- a/src/Mod/Robot/App/kdl_cp/framevel_io.hpp +++ b/src/Mod/Robot/App/kdl_cp/framevel_io.hpp @@ -17,8 +17,7 @@ * $Id: rframes_io.h,v 1.1.1.1 2002/08/26 14:14:21 rmoreas Exp $ * $Name: $ ****************************************************************************/ -#ifndef KDL_FRAMESVEL_IO -#define KDL_FRAMESVEL_IO +#pragma once #include "utilities/utility_io.h" #include "utilities/rall1d_io.h" @@ -51,8 +50,4 @@ inline std::ostream& operator << (std::ostream& os,const TwistVel& r) { } -} // namespace Frame - - - -#endif +} // namespace Frame \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/jacobian.hpp b/src/Mod/Robot/App/kdl_cp/jacobian.hpp index bd8536c918..482ad21822 100644 --- a/src/Mod/Robot/App/kdl_cp/jacobian.hpp +++ b/src/Mod/Robot/App/kdl_cp/jacobian.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_JACOBIAN_HPP -#define KDL_JACOBIAN_HPP +#pragma once #include "frames.hpp" #include @@ -84,6 +83,4 @@ namespace KDL bool changeRefFrame(const Jacobian& src1,const Frame& frame, Jacobian& dest); -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/jntarray.hpp b/src/Mod/Robot/App/kdl_cp/jntarray.hpp index 6a35162090..ccaacd74c2 100644 --- a/src/Mod/Robot/App/kdl_cp/jntarray.hpp +++ b/src/Mod/Robot/App/kdl_cp/jntarray.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_JNTARRAY_HPP -#define KDL_JNTARRAY_HPP +#pragma once #include "frames.hpp" #include "jacobian.hpp" @@ -235,6 +234,4 @@ class MyTask : public RTT::TaskContext */ bool Equal(const JntArray& src1,const JntArray& src2,double eps=epsilon); -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/jntarrayacc.hpp b/src/Mod/Robot/App/kdl_cp/jntarrayacc.hpp index 459ebc4063..4bfa7c7957 100644 --- a/src/Mod/Robot/App/kdl_cp/jntarrayacc.hpp +++ b/src/Mod/Robot/App/kdl_cp/jntarrayacc.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_JNTARRAYACC_HPP -#define KDL_JNTARRAYACC_HPP +#pragma once #include "utilities/utility.h" #include "jntarray.hpp" @@ -84,6 +83,4 @@ namespace KDL }; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/jntarrayvel.hpp b/src/Mod/Robot/App/kdl_cp/jntarrayvel.hpp index bae1864f97..ef2daf8072 100644 --- a/src/Mod/Robot/App/kdl_cp/jntarrayvel.hpp +++ b/src/Mod/Robot/App/kdl_cp/jntarrayvel.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_JNTARRAYVEL_HPP -#define KDL_JNTARRAYVEL_HPP +#pragma once #include "utilities/utility.h" #include "jntarray.hpp" @@ -73,6 +72,4 @@ namespace KDL }; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/jntspaceinertiamatrix.hpp b/src/Mod/Robot/App/kdl_cp/jntspaceinertiamatrix.hpp index 7bec40d40f..e939b768d4 100644 --- a/src/Mod/Robot/App/kdl_cp/jntspaceinertiamatrix.hpp +++ b/src/Mod/Robot/App/kdl_cp/jntspaceinertiamatrix.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_JNTSPACEINERTIAMATRIX_HPP -#define KDL_JNTSPACEINERTIAMATRIX_HPP +#pragma once #include "frames.hpp" #include "jacobian.hpp" @@ -229,6 +228,4 @@ class MyTask : public RTT::TaskContext bool operator==(const JntSpaceInertiaMatrix& src1,const JntSpaceInertiaMatrix& src2); -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/joint.hpp b/src/Mod/Robot/App/kdl_cp/joint.hpp index f74365ff2b..0aa223f63d 100644 --- a/src/Mod/Robot/App/kdl_cp/joint.hpp +++ b/src/Mod/Robot/App/kdl_cp/joint.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_JOINT_HPP -#define KDL_JOINT_HPP +#pragma once #include "frames.hpp" #include @@ -221,6 +220,4 @@ namespace KDL { }; -} // end of namespace KDL - -#endif +} // end of namespace KDL \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/kinfam_io.hpp b/src/Mod/Robot/App/kdl_cp/kinfam_io.hpp index f0fdb9297a..f8cfc8c8c8 100644 --- a/src/Mod/Robot/App/kdl_cp/kinfam_io.hpp +++ b/src/Mod/Robot/App/kdl_cp/kinfam_io.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_KINFAM_IO_HPP -#define KDL_KINFAM_IO_HPP +#pragma once #include #include @@ -72,6 +71,4 @@ std::istream& operator >>(std::istream& is, std::vector& vec) { } ; */ -} -#endif - +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/path.hpp b/src/Mod/Robot/App/kdl_cp/path.hpp index 4f27595272..b0a5e6347a 100644 --- a/src/Mod/Robot/App/kdl_cp/path.hpp +++ b/src/Mod/Robot/App/kdl_cp/path.hpp @@ -43,8 +43,7 @@ * $Name: $ ****************************************************************************/ -#ifndef KDL_MOTION_PATH_H -#define KDL_MOTION_PATH_H +#pragma once #include "frames.hpp" @@ -132,7 +131,4 @@ class Path virtual ~Path() {} }; -} - - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/path_circle.hpp b/src/Mod/Robot/App/kdl_cp/path_circle.hpp index 7645f3de81..c9a8a7bdd5 100644 --- a/src/Mod/Robot/App/kdl_cp/path_circle.hpp +++ b/src/Mod/Robot/App/kdl_cp/path_circle.hpp @@ -44,8 +44,7 @@ * $Name: $ ****************************************************************************/ -#ifndef KDL_MOTION_PATHCIRCLE_H -#define KDL_MOTION_PATHCIRCLE_H +#pragma once #include "path.hpp" #include "rotational_interpolation.hpp" @@ -114,7 +113,4 @@ class Path_Circle : public Path }; -} - - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/path_composite.hpp b/src/Mod/Robot/App/kdl_cp/path_composite.hpp index 0e15e08024..c07cfc44bf 100644 --- a/src/Mod/Robot/App/kdl_cp/path_composite.hpp +++ b/src/Mod/Robot/App/kdl_cp/path_composite.hpp @@ -43,8 +43,7 @@ * $Name: $ ****************************************************************************/ -#ifndef KDL_PATHCOMPOSITE_H -#define KDL_PATHCOMPOSITE_H +#pragma once #include "frames.hpp" #include "frames_io.hpp" @@ -167,7 +166,4 @@ namespace KDL { -} - - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/path_cyclic_closed.hpp b/src/Mod/Robot/App/kdl_cp/path_cyclic_closed.hpp index 38da3ebd16..bd0ee69dd0 100644 --- a/src/Mod/Robot/App/kdl_cp/path_cyclic_closed.hpp +++ b/src/Mod/Robot/App/kdl_cp/path_cyclic_closed.hpp @@ -43,8 +43,7 @@ * $Name: $ ****************************************************************************/ -#ifndef KDL_MOTION_PATH_CYCLIC_CLOSED_H -#define KDL_MOTION_PATH_CYCLIC_CLOSED_H +#pragma once #include "frames.hpp" #include "frames_io.hpp" @@ -86,7 +85,4 @@ namespace KDL { -} - - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/path_line.hpp b/src/Mod/Robot/App/kdl_cp/path_line.hpp index 59ea34dde6..ce638600d9 100644 --- a/src/Mod/Robot/App/kdl_cp/path_line.hpp +++ b/src/Mod/Robot/App/kdl_cp/path_line.hpp @@ -44,8 +44,7 @@ * $Name: $ ****************************************************************************/ -#ifndef KDL_MOTION_PATH_LINE_H -#define KDL_MOTION_PATH_LINE_H +#pragma once #include "path.hpp" #include "rotational_interpolation.hpp" @@ -134,7 +133,4 @@ class Path_Line : public Path }; -} - - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/path_point.hpp b/src/Mod/Robot/App/kdl_cp/path_point.hpp index 687a1a0e09..c63556dcfa 100644 --- a/src/Mod/Robot/App/kdl_cp/path_point.hpp +++ b/src/Mod/Robot/App/kdl_cp/path_point.hpp @@ -45,8 +45,7 @@ * $Name: $ ****************************************************************************/ -#ifndef KDL_MOTION_PATH_POINT_H -#define KDL_MOTION_PATH_POINT_H +#pragma once #include "path.hpp" #include "rotational_interpolation.hpp" @@ -85,7 +84,4 @@ class Path_Point : public Path virtual ~Path_Point(); }; -} - - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/path_roundedcomposite.hpp b/src/Mod/Robot/App/kdl_cp/path_roundedcomposite.hpp index fadb6e184c..289308b7b2 100644 --- a/src/Mod/Robot/App/kdl_cp/path_roundedcomposite.hpp +++ b/src/Mod/Robot/App/kdl_cp/path_roundedcomposite.hpp @@ -43,8 +43,7 @@ * $Name: $ ****************************************************************************/ -#ifndef KDL_MOTION_ROUNDEDCOMPOSITE_H -#define KDL_MOTION_ROUNDEDCOMPOSITE_H +#pragma once #include "path.hpp" #include "path_composite.hpp" @@ -199,7 +198,4 @@ class Path_RoundedComposite : public Path -} - - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/rigidbodyinertia.hpp b/src/Mod/Robot/App/kdl_cp/rigidbodyinertia.hpp index a2af9a36ce..793899a184 100644 --- a/src/Mod/Robot/App/kdl_cp/rigidbodyinertia.hpp +++ b/src/Mod/Robot/App/kdl_cp/rigidbodyinertia.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_RIGIDBODYINERTIA_HPP -#define KDL_RIGIDBODYINERTIA_HPP +#pragma once #include "frames.hpp" @@ -128,7 +127,4 @@ namespace KDL { -}//namespace - - -#endif +}//namespace \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/rotational_interpolation.hpp b/src/Mod/Robot/App/kdl_cp/rotational_interpolation.hpp index 6f577be219..a301fc5656 100644 --- a/src/Mod/Robot/App/kdl_cp/rotational_interpolation.hpp +++ b/src/Mod/Robot/App/kdl_cp/rotational_interpolation.hpp @@ -43,8 +43,7 @@ * $Name: $ ****************************************************************************/ -#ifndef KDL_ROTATIONALINTERPOLATION_H -#define KDL_ROTATIONALINTERPOLATION_H +#pragma once #include "frames.hpp" #include "frames_io.hpp" @@ -114,7 +113,4 @@ class RotationalInterpolation virtual ~RotationalInterpolation() {} }; -} - - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/rotational_interpolation_sa.hpp b/src/Mod/Robot/App/kdl_cp/rotational_interpolation_sa.hpp index 2b4c7335f4..6b05789125 100644 --- a/src/Mod/Robot/App/kdl_cp/rotational_interpolation_sa.hpp +++ b/src/Mod/Robot/App/kdl_cp/rotational_interpolation_sa.hpp @@ -43,8 +43,7 @@ * $Name: $ ****************************************************************************/ -#ifndef KDL_ROTATIONALINTERPOLATION_SINGLEAXIS_H -#define KDL_ROTATIONALINTERPOLATION_SINGLEAXIS_H +#pragma once #include "frames.hpp" #include "frames_io.hpp" @@ -80,7 +79,4 @@ class RotationalInterpolation_SingleAxis: public RotationalInterpolation ~RotationalInterpolation_SingleAxis() override; }; -} - - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/rotationalinertia.hpp b/src/Mod/Robot/App/kdl_cp/rotationalinertia.hpp index 7650331b45..ce331efb45 100644 --- a/src/Mod/Robot/App/kdl_cp/rotationalinertia.hpp +++ b/src/Mod/Robot/App/kdl_cp/rotationalinertia.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_ROTATIONALINERTIA_HPP -#define KDL_ROTATIONALINERTIA_HPP +#pragma once #include "frames.hpp" @@ -70,7 +69,4 @@ namespace KDL RotationalInertia operator*(double a, const RotationalInertia& I); RotationalInertia operator+(const RotationalInertia& Ia, const RotationalInertia& Ib); -} - -#endif - +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/segment.hpp b/src/Mod/Robot/App/kdl_cp/segment.hpp index 17dbcb78de..505b812ee8 100644 --- a/src/Mod/Robot/App/kdl_cp/segment.hpp +++ b/src/Mod/Robot/App/kdl_cp/segment.hpp @@ -22,8 +22,7 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_SEGMENT_HPP -#define KDL_SEGMENT_HPP +#pragma once #include "frames.hpp" #include "rigidbodyinertia.hpp" @@ -155,6 +154,4 @@ namespace KDL { } }; -}//end of namespace KDL - -#endif +}//end of namespace KDL \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/solveri.hpp b/src/Mod/Robot/App/kdl_cp/solveri.hpp index 60a4d877c7..4d14ec4877 100644 --- a/src/Mod/Robot/App/kdl_cp/solveri.hpp +++ b/src/Mod/Robot/App/kdl_cp/solveri.hpp @@ -16,8 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef __SOLVERI_HPP -#define __SOLVERI_HPP +#pragma once namespace KDL { @@ -126,6 +125,4 @@ protected: int error; }; -} // namespaces - -#endif +} // namespaces \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/stiffness.hpp b/src/Mod/Robot/App/kdl_cp/stiffness.hpp index bf296211cf..87c3827bd3 100644 --- a/src/Mod/Robot/App/kdl_cp/stiffness.hpp +++ b/src/Mod/Robot/App/kdl_cp/stiffness.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_STIFFNESS_H -#define KDL_STIFFNESS_H +#pragma once #include "frames.hpp" @@ -115,8 +114,4 @@ inline void random(Stiffness& F) { } -} -#endif - - - +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/trajectory.hpp b/src/Mod/Robot/App/kdl_cp/trajectory.hpp index 7cc83014a0..537a77a9fa 100644 --- a/src/Mod/Robot/App/kdl_cp/trajectory.hpp +++ b/src/Mod/Robot/App/kdl_cp/trajectory.hpp @@ -56,8 +56,7 @@ * CONSEQUENCE : everything has to be declared public. ****************************************************************************/ -#ifndef TRAJECTORY_H -#define TRAJECTORY_H +#pragma once #include "frames.hpp" #include "frames_io.hpp" @@ -107,7 +106,4 @@ namespace KDL { -} - - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/trajectory_composite.hpp b/src/Mod/Robot/App/kdl_cp/trajectory_composite.hpp index 93403b2440..a89ffec3f8 100644 --- a/src/Mod/Robot/App/kdl_cp/trajectory_composite.hpp +++ b/src/Mod/Robot/App/kdl_cp/trajectory_composite.hpp @@ -16,8 +16,7 @@ ****************************************************************************/ -#ifndef TRAJECTORY_COMPOSITE_H -#define TRAJECTORY_COMPOSITE_H +#pragma once #include "trajectory.hpp" #include "path_composite.hpp" @@ -66,6 +65,4 @@ class Trajectory_Composite: public Trajectory }; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/trajectory_segment.hpp b/src/Mod/Robot/App/kdl_cp/trajectory_segment.hpp index e481c09929..512988d995 100644 --- a/src/Mod/Robot/App/kdl_cp/trajectory_segment.hpp +++ b/src/Mod/Robot/App/kdl_cp/trajectory_segment.hpp @@ -43,8 +43,7 @@ * $Name: $ ****************************************************************************/ -#ifndef KDL_MOTION_TRAJECTORY_SEGMENT_H -#define KDL_MOTION_TRAJECTORY_SEGMENT_H +#pragma once #include "frames.hpp" #include "frames_io.hpp" @@ -108,7 +107,4 @@ namespace KDL { -} - - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/trajectory_stationary.hpp b/src/Mod/Robot/App/kdl_cp/trajectory_stationary.hpp index eec00cd6d0..c8e8f320bf 100644 --- a/src/Mod/Robot/App/kdl_cp/trajectory_stationary.hpp +++ b/src/Mod/Robot/App/kdl_cp/trajectory_stationary.hpp @@ -15,8 +15,7 @@ * $Name: $ ****************************************************************************/ -#ifndef TRAJECTORY_STATIONARY_H -#define TRAJECTORY_STATIONARY_H +#pragma once #include "trajectory.hpp" @@ -69,6 +68,4 @@ namespace KDL { }; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/tree.hpp b/src/Mod/Robot/App/kdl_cp/tree.hpp index 866d9f875d..efedc7fa46 100644 --- a/src/Mod/Robot/App/kdl_cp/tree.hpp +++ b/src/Mod/Robot/App/kdl_cp/tree.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_TREE_HPP -#define KDL_TREE_HPP +#pragma once // This file comes along with oce but not with occ. //#include "config.h" @@ -213,10 +212,4 @@ namespace KDL virtual ~Tree(){}; }; -} -#endif - - - - - +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/treefksolver.hpp b/src/Mod/Robot/App/kdl_cp/treefksolver.hpp index 8869b56f42..78ea5dc722 100644 --- a/src/Mod/Robot/App/kdl_cp/treefksolver.hpp +++ b/src/Mod/Robot/App/kdl_cp/treefksolver.hpp @@ -22,8 +22,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_TREE_FKSOLVER_HPP -#define KDL_TREE_FKSOLVER_HPP +#pragma once #include @@ -107,6 +106,4 @@ namespace KDL { // }; -}//end of namespace KDL - -#endif +}//end of namespace KDL \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/treefksolverpos_recursive.hpp b/src/Mod/Robot/App/kdl_cp/treefksolverpos_recursive.hpp index 880d6cf2f4..7bbede91a7 100644 --- a/src/Mod/Robot/App/kdl_cp/treefksolverpos_recursive.hpp +++ b/src/Mod/Robot/App/kdl_cp/treefksolverpos_recursive.hpp @@ -22,8 +22,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDLTREEFKSOLVERPOS_RECURSIVE_HPP -#define KDLTREEFKSOLVERPOS_RECURSIVE_HPP +#pragma once #include "treefksolver.hpp" @@ -50,6 +49,4 @@ namespace KDL { Frame recursiveFk(const JntArray& q_in, const SegmentMap::const_iterator& it); }; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/treeiksolver.hpp b/src/Mod/Robot/App/kdl_cp/treeiksolver.hpp index e44a8ab3ad..f3c10e2441 100644 --- a/src/Mod/Robot/App/kdl_cp/treeiksolver.hpp +++ b/src/Mod/Robot/App/kdl_cp/treeiksolver.hpp @@ -7,8 +7,7 @@ * Author: rubensmits */ -#ifndef TREEIKSOLVER_HPP_ -#define TREEIKSOLVER_HPP_ +#pragma once #include "tree.hpp" #include "jntarray.hpp" @@ -74,6 +73,4 @@ public: }; -} - -#endif /* TREEIKSOLVER_HPP_ */ +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/treeiksolverpos_nr_jl.hpp b/src/Mod/Robot/App/kdl_cp/treeiksolverpos_nr_jl.hpp index b5df584592..c95d9a29a8 100644 --- a/src/Mod/Robot/App/kdl_cp/treeiksolverpos_nr_jl.hpp +++ b/src/Mod/Robot/App/kdl_cp/treeiksolverpos_nr_jl.hpp @@ -23,8 +23,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDLTREEIKSOLVERPOS_NR_JL_HPP -#define KDLTREEIKSOLVERPOS_NR_JL_HPP +#pragma once #include "treeiksolver.hpp" #include "treefksolver.hpp" @@ -81,6 +80,4 @@ private: double eps; }; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/treeiksolverpos_online.hpp b/src/Mod/Robot/App/kdl_cp/treeiksolverpos_online.hpp index be45ed55da..cff7267455 100644 --- a/src/Mod/Robot/App/kdl_cp/treeiksolverpos_online.hpp +++ b/src/Mod/Robot/App/kdl_cp/treeiksolverpos_online.hpp @@ -24,8 +24,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDLTREEIKSOLVERPOS_ONLINE_HPP -#define KDLTREEIKSOLVERPOS_ONLINE_HPP +#pragma once #include #include @@ -104,7 +103,4 @@ private: Twists delta_twists_; }; -} // namespace - -#endif /* KDLTREEIKSOLVERPOS_ONLINE_HPP */ - +} // namespace \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/treeiksolvervel_wdls.hpp b/src/Mod/Robot/App/kdl_cp/treeiksolvervel_wdls.hpp index 648d3c5403..c1b68eaf50 100644 --- a/src/Mod/Robot/App/kdl_cp/treeiksolvervel_wdls.hpp +++ b/src/Mod/Robot/App/kdl_cp/treeiksolvervel_wdls.hpp @@ -7,8 +7,7 @@ * Author: rubensmits */ -#ifndef TREEIKSOLVERVEL_WDLS_HPP_ -#define TREEIKSOLVERVEL_WDLS_HPP_ +#pragma once #include "treeiksolver.hpp" #include "treejnttojacsolver.hpp" @@ -91,6 +90,4 @@ namespace KDL { double lambda; }; -} - -#endif /* TREEIKSOLVERVEL_WDLS_HPP_ */ +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/treejnttojacsolver.hpp b/src/Mod/Robot/App/kdl_cp/treejnttojacsolver.hpp index 74d8e5111b..f4c3ad3fcd 100644 --- a/src/Mod/Robot/App/kdl_cp/treejnttojacsolver.hpp +++ b/src/Mod/Robot/App/kdl_cp/treejnttojacsolver.hpp @@ -7,8 +7,7 @@ * Author: rubensmits */ -#ifndef TREEJNTTOJACSOLVER_HPP_ -#define TREEJNTTOJACSOLVER_HPP_ +#pragma once #include "tree.hpp" #include "jacobian.hpp" @@ -35,6 +34,4 @@ private: }; -}//End of namespace - -#endif /* TREEJNTTOJACSOLVER_H_ */ +}//End of namespace \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/utilities/error.h b/src/Mod/Robot/App/kdl_cp/utilities/error.h index 7d981a9ec4..5f808e7ef9 100644 --- a/src/Mod/Robot/App/kdl_cp/utilities/error.h +++ b/src/Mod/Robot/App/kdl_cp/utilities/error.h @@ -44,8 +44,7 @@ * $Id: error.h,v 1.1.1.1.2.2 2003/04/04 15:39:43 pissaris Exp $ * $Name: $ ****************************************************************************/ -#ifndef ERROR_H_84822 // to make it unique, a random number -#define ERROR_H_84822 +#pragma once #include "utility.h" #include @@ -246,6 +245,4 @@ public: -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/utilities/error_stack.h b/src/Mod/Robot/App/kdl_cp/utilities/error_stack.h index 22723f84db..87f4bceba5 100644 --- a/src/Mod/Robot/App/kdl_cp/utilities/error_stack.h +++ b/src/Mod/Robot/App/kdl_cp/utilities/error_stack.h @@ -37,8 +37,7 @@ * \par history * - changed layout of the comments to accommodate doxygen */ -#ifndef ERROR_STACK_H -#define ERROR_STACK_H +#pragma once #include "utility.h" #include "utility_io.h" @@ -66,7 +65,4 @@ void IOTraceOutput(std::ostream& os); void IOTracePopStr(char* buffer,int size); -} - -#endif - +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/utilities/rall1d.h b/src/Mod/Robot/App/kdl_cp/utilities/rall1d.h index 1e3bfed77e..7ff62bb1a0 100644 --- a/src/Mod/Robot/App/kdl_cp/utilities/rall1d.h +++ b/src/Mod/Robot/App/kdl_cp/utilities/rall1d.h @@ -24,8 +24,7 @@ * $Name: $ ****************************************************************************/ -#ifndef Rall1D_H -#define Rall1D_H +#pragma once #include #include "utility.h" @@ -472,8 +471,4 @@ INLINE bool Equal(const Rall1d& y,const Rall1d& x,double eps=epsi return (Equal(x.t,y.t,eps)&&Equal(x.grad,y.grad,eps)); } -} - - - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/utilities/rall1d_io.h b/src/Mod/Robot/App/kdl_cp/utilities/rall1d_io.h index 981fea9961..1776a49847 100644 --- a/src/Mod/Robot/App/kdl_cp/utilities/rall1d_io.h +++ b/src/Mod/Robot/App/kdl_cp/utilities/rall1d_io.h @@ -17,8 +17,7 @@ * $Id: rall1d_io.h,v 1.1.1.1 2002/08/26 14:14:21 rmoreas Exp $ * $Name: $ ****************************************************************************/ -#ifndef Rall_IO_H -#define Rall_IO_H +#pragma once #include "utility_io.h" #include "rall1d.h" @@ -33,7 +32,4 @@ inline std::ostream& operator << (std::ostream& os,const Rall1d& r) } -} - - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/utilities/rall2d.h b/src/Mod/Robot/App/kdl_cp/utilities/rall2d.h index 5f3a292a2e..ae277616df 100644 --- a/src/Mod/Robot/App/kdl_cp/utilities/rall2d.h +++ b/src/Mod/Robot/App/kdl_cp/utilities/rall2d.h @@ -24,8 +24,7 @@ * $Name: $ ****************************************************************************/ -#ifndef Rall2D_H -#define Rall2D_H +#pragma once #include #include @@ -533,7 +532,4 @@ INLINE bool Equal(const Rall2d& y,const Rall2d& x,double eps=epsi } -} - - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/utilities/rall2d_io.h b/src/Mod/Robot/App/kdl_cp/utilities/rall2d_io.h index 05975fef3c..31750cbdea 100644 --- a/src/Mod/Robot/App/kdl_cp/utilities/rall2d_io.h +++ b/src/Mod/Robot/App/kdl_cp/utilities/rall2d_io.h @@ -17,8 +17,7 @@ * $Id: rall2d_io.h,v 1.1.1.1 2002/08/26 14:14:21 rmoreas Exp $ * $Name: $ ****************************************************************************/ -#ifndef Rall2d_IO_H -#define Rall2d_IO_H +#pragma once @@ -35,6 +34,4 @@ std::ostream& operator << (std::ostream& os,const Rall2d& r) } -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/utilities/rallNd.h b/src/Mod/Robot/App/kdl_cp/utilities/rallNd.h index 96fdd32768..70cb11fd1e 100644 --- a/src/Mod/Robot/App/kdl_cp/utilities/rallNd.h +++ b/src/Mod/Robot/App/kdl_cp/utilities/rallNd.h @@ -1,7 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#ifndef RALLND_H -#define RALLND_H +#pragma once #include "rall1d.h" #include "rall1d_io.h" @@ -98,7 +97,4 @@ public: t = value; grad = d[0]; } -}; - -#endif - +}; \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/utilities/svd_HH.hpp b/src/Mod/Robot/App/kdl_cp/utilities/svd_HH.hpp index c5df8f8a25..e5e075f6f8 100644 --- a/src/Mod/Robot/App/kdl_cp/utilities/svd_HH.hpp +++ b/src/Mod/Robot/App/kdl_cp/utilities/svd_HH.hpp @@ -21,8 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef KDL_SVD_HH_HPP -#define KDL_SVD_HH_HPP +#pragma once #include "../jacobian.hpp" #include "../jntarray.hpp" @@ -42,7 +41,4 @@ namespace KDL private: JntArray tmp; }; -} -#endif - - +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/utilities/svd_eigen_HH.hpp b/src/Mod/Robot/App/kdl_cp/utilities/svd_eigen_HH.hpp index b8b84e1a9d..1ef756725e 100644 --- a/src/Mod/Robot/App/kdl_cp/utilities/svd_eigen_HH.hpp +++ b/src/Mod/Robot/App/kdl_cp/utilities/svd_eigen_HH.hpp @@ -23,8 +23,7 @@ //Based on the svd of the KDL-0.2 library by Erwin Aertbelien -#ifndef SVD_EIGEN_HH_HPP -#define SVD_EIGEN_HH_HPP +#pragma once #include @@ -69,5 +68,4 @@ namespace KDL * @return -2 if maxiter exceeded, 0 otherwise */ int svd_eigen_HH(const MatrixXd& A,MatrixXd& U,VectorXd& S,MatrixXd& V,VectorXd& tmp,int maxiter=150,double epsilon=1e-300); -} -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/utilities/svd_eigen_Macie.hpp b/src/Mod/Robot/App/kdl_cp/utilities/svd_eigen_Macie.hpp index f59b87cd5b..f315b51a62 100644 --- a/src/Mod/Robot/App/kdl_cp/utilities/svd_eigen_Macie.hpp +++ b/src/Mod/Robot/App/kdl_cp/utilities/svd_eigen_Macie.hpp @@ -30,8 +30,7 @@ * provides Maciejewski's implementation for SVD. */ -#ifndef SVD_BOOST_MACIE -#define SVD_BOOST_MACIE +#pragma once #include using namespace Eigen; @@ -197,5 +196,4 @@ namespace KDL } -} -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/utilities/traits.h b/src/Mod/Robot/App/kdl_cp/utilities/traits.h index abe8d1af10..4024f92799 100644 --- a/src/Mod/Robot/App/kdl_cp/utilities/traits.h +++ b/src/Mod/Robot/App/kdl_cp/utilities/traits.h @@ -1,7 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#ifndef KDLPV_TRAITS_H -#define KDLPV_TRAITS_H +#pragma once #include "utility.h" @@ -103,11 +102,4 @@ template <> struct Traits { typedef KDL::Vector valueType; typedef KDL::VectorVel derivType; -}; - - - -#endif - - - +}; \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/utilities/utility.h b/src/Mod/Robot/App/kdl_cp/utilities/utility.h index b024074809..6ce0b2c2fe 100644 --- a/src/Mod/Robot/App/kdl_cp/utilities/utility.h +++ b/src/Mod/Robot/App/kdl_cp/utilities/utility.h @@ -22,8 +22,7 @@ */ -#ifndef KDL_UTILITY_H -#define KDL_UTILITY_H +#pragma once #include "kdl-config.h" #include @@ -294,8 +293,4 @@ inline double addDelta(double a,double da,double dt) { //} -} - - - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/utilities/utility_io.h b/src/Mod/Robot/App/kdl_cp/utilities/utility_io.h index 643b00bcdf..7e2822beba 100644 --- a/src/Mod/Robot/App/kdl_cp/utilities/utility_io.h +++ b/src/Mod/Robot/App/kdl_cp/utilities/utility_io.h @@ -19,8 +19,7 @@ * functions and macro definitions related to file/stream I/O. */ -#ifndef KDL_UTILITY_IO_H_84822 -#define KDL_UTILITY_IO_H_84822 +#pragma once //#include @@ -75,7 +74,4 @@ void EatEnd( std::istream& is, int delim ); -} - - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/velocityprofile.hpp b/src/Mod/Robot/App/kdl_cp/velocityprofile.hpp index 83a99e6fd5..06cf6d2669 100644 --- a/src/Mod/Robot/App/kdl_cp/velocityprofile.hpp +++ b/src/Mod/Robot/App/kdl_cp/velocityprofile.hpp @@ -44,8 +44,7 @@ * $Name: $ ****************************************************************************/ -#ifndef KDL_VELOCITYPROFILE_H -#define KDL_VELOCITYPROFILE_H +#pragma once #include "utilities/utility.h" #include "utilities/utility_io.h" @@ -103,7 +102,4 @@ class VelocityProfile virtual ~VelocityProfile() {} }; -} - - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/velocityprofile_dirac.hpp b/src/Mod/Robot/App/kdl_cp/velocityprofile_dirac.hpp index f44aed2102..5348ea01a2 100644 --- a/src/Mod/Robot/App/kdl_cp/velocityprofile_dirac.hpp +++ b/src/Mod/Robot/App/kdl_cp/velocityprofile_dirac.hpp @@ -28,8 +28,7 @@ ***************************************************************************/ -#ifndef MOTIONPROFILE_DIRAC_H -#define MOTIONPROFILE_DIRAC_H +#pragma once #include "velocityprofile.hpp" @@ -67,7 +66,4 @@ namespace KDL { virtual ~VelocityProfile_Dirac() {} }; -} - - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/velocityprofile_rect.hpp b/src/Mod/Robot/App/kdl_cp/velocityprofile_rect.hpp index 29bec39714..8961e562ea 100644 --- a/src/Mod/Robot/App/kdl_cp/velocityprofile_rect.hpp +++ b/src/Mod/Robot/App/kdl_cp/velocityprofile_rect.hpp @@ -43,8 +43,7 @@ * $Name: $ ****************************************************************************/ -#ifndef MOTIONPROFILE_RECT_H -#define MOTIONPROFILE_RECT_H +#pragma once #include "velocityprofile.hpp" @@ -86,7 +85,4 @@ namespace KDL { virtual ~VelocityProfile_Rectangular() {} }; -} - - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/velocityprofile_spline.hpp b/src/Mod/Robot/App/kdl_cp/velocityprofile_spline.hpp index d6da806d5a..5d3e38dbf0 100644 --- a/src/Mod/Robot/App/kdl_cp/velocityprofile_spline.hpp +++ b/src/Mod/Robot/App/kdl_cp/velocityprofile_spline.hpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#ifndef VELOCITYPROFILE_SPLINE_H -#define VELOCITYPROFILE_SPLINE_H +#pragma once #include "velocityprofile.hpp" @@ -65,5 +64,4 @@ private: double coeff_[6]; double duration_; }; -} -#endif // VELOCITYPROFILE_CUBICSPLINE_H +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/velocityprofile_trap.hpp b/src/Mod/Robot/App/kdl_cp/velocityprofile_trap.hpp index ad83c84d5d..35f2e2abc7 100644 --- a/src/Mod/Robot/App/kdl_cp/velocityprofile_trap.hpp +++ b/src/Mod/Robot/App/kdl_cp/velocityprofile_trap.hpp @@ -43,8 +43,7 @@ * $Name: $ ****************************************************************************/ -#ifndef KDL_MOTION_VELOCITYPROFILE_TRAP_H -#define KDL_MOTION_VELOCITYPROFILE_TRAP_H +#pragma once #include "velocityprofile.hpp" @@ -138,7 +137,4 @@ class VelocityProfile_Trap : public VelocityProfile }; */ -} - - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/App/kdl_cp/velocityprofile_traphalf.hpp b/src/Mod/Robot/App/kdl_cp/velocityprofile_traphalf.hpp index 87d0b28ffa..3d4c8b7667 100644 --- a/src/Mod/Robot/App/kdl_cp/velocityprofile_traphalf.hpp +++ b/src/Mod/Robot/App/kdl_cp/velocityprofile_traphalf.hpp @@ -45,8 +45,7 @@ * Experimental ****************************************************************************/ -#ifndef KDL_MOTION_VELOCITYPROFILE_TRAPHALF_H -#define KDL_MOTION_VELOCITYPROFILE_TRAPHALF_H +#pragma once #include "velocityprofile.hpp" @@ -132,7 +131,4 @@ class VelocityProfile_TrapHalf : public VelocityProfile -} - - -#endif +} \ No newline at end of file diff --git a/src/Mod/Robot/Gui/PreCompiled.h b/src/Mod/Robot/Gui/PreCompiled.h index bfc2d61389..2e5569108f 100644 --- a/src/Mod/Robot/Gui/PreCompiled.h +++ b/src/Mod/Robot/Gui/PreCompiled.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef ROBOTGUI_PRECOMPILED_H -#define ROBOTGUI_PRECOMPILED_H +#pragma once #include @@ -57,5 +56,3 @@ #include #include #include - -#endif // ROBOTGUI_PRECOMPILED_H diff --git a/src/Mod/Robot/Gui/TaskDlgEdge2Trac.h b/src/Mod/Robot/Gui/TaskDlgEdge2Trac.h index 2aaeba6622..2daa3f1c9a 100644 --- a/src/Mod/Robot/Gui/TaskDlgEdge2Trac.h +++ b/src/Mod/Robot/Gui/TaskDlgEdge2Trac.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef ROBOTGUI_TaskDlgEdge2Trac_H -#define ROBOTGUI_TaskDlgEdge2Trac_H +#pragma once #include #include @@ -79,5 +78,3 @@ protected: } // namespace RobotGui - -#endif // ROBOTGUI_TASKDLGSIMULATE_H diff --git a/src/Mod/Robot/Gui/TaskDlgSimulate.h b/src/Mod/Robot/Gui/TaskDlgSimulate.h index e1c62151a1..6dfd4e1481 100644 --- a/src/Mod/Robot/Gui/TaskDlgSimulate.h +++ b/src/Mod/Robot/Gui/TaskDlgSimulate.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef ROBOTGUI_TASKDLGSIMULATE_H -#define ROBOTGUI_TASKDLGSIMULATE_H +#pragma once #include #include @@ -74,5 +73,3 @@ protected: } // namespace RobotGui - -#endif // ROBOTGUI_TASKDLGSIMULATE_H diff --git a/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.h b/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.h index 97fc3f92a9..e44c68149c 100644 --- a/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.h +++ b/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef ROBOTGUI_TaskDlgTrajectoryCompound_H -#define ROBOTGUI_TaskDlgTrajectoryCompound_H +#pragma once #include @@ -74,5 +73,3 @@ protected: } // namespace RobotGui - -#endif // ROBOTGUI_TASKDLGSIMULATE_H diff --git a/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h b/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h index 3d96ed5c15..e4983d40d5 100644 --- a/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h +++ b/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef ROBOTGUI_TaskDlgTrajectoryDressUp_H -#define ROBOTGUI_TaskDlgTrajectoryDressUp_H +#pragma once #include #include @@ -78,5 +77,3 @@ protected: } // namespace RobotGui - -#endif // ROBOTGUI_TASKDLGSIMULATE_H diff --git a/src/Mod/Robot/Gui/TaskEdge2TracParameter.h b/src/Mod/Robot/Gui/TaskEdge2TracParameter.h index d745b1cf65..a1d8fa9080 100644 --- a/src/Mod/Robot/Gui/TaskEdge2TracParameter.h +++ b/src/Mod/Robot/Gui/TaskEdge2TracParameter.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskEdge2TracParameter_H -#define GUI_TASKVIEW_TaskEdge2TracParameter_H +#pragma once #include #include @@ -71,5 +70,3 @@ private: }; } // namespace RobotGui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/Robot/Gui/TaskRobot6Axis.h b/src/Mod/Robot/Gui/TaskRobot6Axis.h index d2303eb146..5b8b41cdd0 100644 --- a/src/Mod/Robot/Gui/TaskRobot6Axis.h +++ b/src/Mod/Robot/Gui/TaskRobot6Axis.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskRobot6Axis_H -#define GUI_TASKVIEW_TaskRobot6Axis_H +#pragma once #include #include @@ -80,5 +79,3 @@ private: }; } // namespace RobotGui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/Robot/Gui/TaskRobotControl.h b/src/Mod/Robot/Gui/TaskRobotControl.h index c3ec9aeb31..efbf3f8789 100644 --- a/src/Mod/Robot/Gui/TaskRobotControl.h +++ b/src/Mod/Robot/Gui/TaskRobotControl.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskRobotControl_H -#define GUI_TASKVIEW_TaskRobotControl_H +#pragma once #include @@ -67,5 +66,3 @@ private: }; } // namespace RobotGui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/Robot/Gui/TaskRobotMessages.h b/src/Mod/Robot/Gui/TaskRobotMessages.h index 56c23cf100..f2cff03ad5 100644 --- a/src/Mod/Robot/Gui/TaskRobotMessages.h +++ b/src/Mod/Robot/Gui/TaskRobotMessages.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskRobotMessages_H -#define GUI_TASKVIEW_TaskRobotMessages_H +#pragma once #include #include @@ -65,5 +64,3 @@ private: }; } // namespace RobotGui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/Robot/Gui/TaskTrajectory.h b/src/Mod/Robot/Gui/TaskTrajectory.h index 3f58ba3012..7457df70cd 100644 --- a/src/Mod/Robot/Gui/TaskTrajectory.h +++ b/src/Mod/Robot/Gui/TaskTrajectory.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskTrajectory_H -#define GUI_TASKVIEW_TaskTrajectory_H +#pragma once #include #include @@ -103,5 +102,3 @@ private: }; } // namespace RobotGui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.h b/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.h index 04cf9cfab0..e2a40a1915 100644 --- a/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.h +++ b/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskTrajectoryDressUpParameter_h -#define GUI_TASKVIEW_TaskTrajectoryDressUpParameter_h +#pragma once #include #include @@ -64,5 +63,3 @@ private: }; } // namespace RobotGui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/Robot/Gui/TaskWatcher.h b/src/Mod/Robot/Gui/TaskWatcher.h index 285ba80741..3a68af7491 100644 --- a/src/Mod/Robot/Gui/TaskWatcher.h +++ b/src/Mod/Robot/Gui/TaskWatcher.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef ROBOTGUI_TASKWATCHER_H -#define ROBOTGUI_TASKWATCHER_H +#pragma once #include @@ -56,5 +55,3 @@ protected: } // namespace RobotGui - -#endif // ROBOTGUI_TASKWATCHER_H diff --git a/src/Mod/Robot/Gui/TrajectorySimulate.h b/src/Mod/Robot/Gui/TrajectorySimulate.h index 0be18c5cd7..d2b908bdbc 100644 --- a/src/Mod/Robot/Gui/TrajectorySimulate.h +++ b/src/Mod/Robot/Gui/TrajectorySimulate.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TrajectorySimulate_H -#define GUI_TASKVIEW_TrajectorySimulate_H +#pragma once #include #include @@ -84,5 +83,3 @@ private: }; } // namespace RobotGui - -#endif // GUI_TASKVIEW_TrajectorySimulate_H diff --git a/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.h b/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.h index bedce6e86a..6166ee653e 100644 --- a/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.h +++ b/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef ROBOT_VIEWPROVIDEREDGE2TRACOBJECT_H -#define ROBOT_VIEWPROVIDEREDGE2TRACOBJECT_H +#pragma once #include @@ -46,6 +45,3 @@ protected: }; } // namespace RobotGui - - -#endif // ROBOT_VIEWPROVIDEREDGE2TRACOBJECT_H diff --git a/src/Mod/Robot/Gui/ViewProviderRobotObject.h b/src/Mod/Robot/Gui/ViewProviderRobotObject.h index ac3ebed2c2..d1b775bd7c 100644 --- a/src/Mod/Robot/Gui/ViewProviderRobotObject.h +++ b/src/Mod/Robot/Gui/ViewProviderRobotObject.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef ROBOT_VIEWPROVIDERROBOTOBJECT_H -#define ROBOT_VIEWPROVIDERROBOTOBJECT_H +#pragma once #include #include @@ -92,6 +91,3 @@ protected: }; } // namespace RobotGui - - -#endif // ROBOT_VIEWPROVIDERROBOTOBJECT_H diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectory.h b/src/Mod/Robot/Gui/ViewProviderTrajectory.h index c74077aa6c..11c0d53340 100644 --- a/src/Mod/Robot/Gui/ViewProviderTrajectory.h +++ b/src/Mod/Robot/Gui/ViewProviderTrajectory.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef ROBOT_ViewProviderTrajectory_H -#define ROBOT_ViewProviderTrajectory_H +#pragma once #include #include @@ -64,6 +63,3 @@ protected: }; } // namespace RobotGui - - -#endif // ROBOT_VIEWPROVIDERROBOTOBJECT_H diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.h b/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.h index 92f7efbd93..cab538e626 100644 --- a/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.h +++ b/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef ROBOT_ViewProviderTrajectoryCompound_H -#define ROBOT_ViewProviderTrajectoryCompound_H +#pragma once #include @@ -47,6 +46,3 @@ protected: }; } // namespace RobotGui - - -#endif // ROBOT_ViewProviderTrajectoryCompound_H diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.h b/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.h index 927d04e49d..1359aea24f 100644 --- a/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.h +++ b/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef ROBOT_ViewProviderTrajectoryDressUp_H -#define ROBOT_ViewProviderTrajectoryDressUp_H +#pragma once #include @@ -49,6 +48,3 @@ protected: }; } // namespace RobotGui - - -#endif // ROBOT_ViewProviderTrajectoryDressUp_H diff --git a/src/Mod/Robot/Gui/Workbench.h b/src/Mod/Robot/Gui/Workbench.h index d5093f4fb8..8cc73588a3 100644 --- a/src/Mod/Robot/Gui/Workbench.h +++ b/src/Mod/Robot/Gui/Workbench.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef ROBOT_WORKBENCH_H -#define ROBOT_WORKBENCH_H +#pragma once #include #include @@ -58,6 +57,3 @@ protected: }; } // namespace RobotGui - - -#endif // ROBOT_WORKBENCH_H diff --git a/src/Mod/Robot/RobotGlobal.h b/src/Mod/Robot/RobotGlobal.h index eebddf32cb..9c206e40ae 100644 --- a/src/Mod/Robot/RobotGlobal.h +++ b/src/Mod/Robot/RobotGlobal.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef ROBOT_GLOBAL_H -#define ROBOT_GLOBAL_H +#pragma once #include @@ -44,5 +43,3 @@ # define RobotGuiExport FREECAD_DECL_IMPORT # endif #endif - -#endif // ROBOT_GLOBAL_H diff --git a/src/Mod/Sandbox/App/DocumentProtector.h b/src/Mod/Sandbox/App/DocumentProtector.h index d1177ccadd..01546b54a6 100644 --- a/src/Mod/Sandbox/App/DocumentProtector.h +++ b/src/Mod/Sandbox/App/DocumentProtector.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SANDBOX_DOCUMENTPROTECTOR_H -#define SANDBOX_DOCUMENTPROTECTOR_H +#pragma once #include #include @@ -128,7 +127,4 @@ private: App::DocumentObject* obj; }; -} - -#endif // SANDBOX_DOCUMENTPROTECTOR_H - +} \ No newline at end of file diff --git a/src/Mod/Sandbox/App/DocumentProtectorPy.h b/src/Mod/Sandbox/App/DocumentProtectorPy.h index c7747069a4..7c8d1e5ff5 100644 --- a/src/Mod/Sandbox/App/DocumentProtectorPy.h +++ b/src/Mod/Sandbox/App/DocumentProtectorPy.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SANDBOX_DOCUMENTPROTECTORPY_H -#define SANDBOX_DOCUMENTPROTECTORPY_H +#pragma once #include @@ -83,7 +82,4 @@ private: friend class DocumentObjectProtector; }; -} - -#endif // SANDBOX_DOCUMENTPROTECTORPY_H - +} \ No newline at end of file diff --git a/src/Mod/Sandbox/App/DocumentThread.h b/src/Mod/Sandbox/App/DocumentThread.h index 9ba580117a..a4473cfe34 100644 --- a/src/Mod/Sandbox/App/DocumentThread.h +++ b/src/Mod/Sandbox/App/DocumentThread.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SANDBOX_DOCUMENTTHREAD_H -#define SANDBOX_DOCUMENTTHREAD_H +#pragma once #include #include @@ -128,7 +127,4 @@ private: App::Document* doc; }; -} - -#endif // SANDBOX_DOCUMENTTHREAD_H - +} \ No newline at end of file diff --git a/src/Mod/Sandbox/App/PreCompiled.h b/src/Mod/Sandbox/App/PreCompiled.h index 60d9e2c408..65c4072a71 100644 --- a/src/Mod/Sandbox/App/PreCompiled.h +++ b/src/Mod/Sandbox/App/PreCompiled.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SANDBOX_APP_PRECOMPILED_H -#define SANDBOX_APP_PRECOMPILED_H +#pragma once #include @@ -56,7 +55,4 @@ #include #include #include -#include - -#endif - +#include \ No newline at end of file diff --git a/src/Mod/Sandbox/Gui/GLGraphicsView.h b/src/Mod/Sandbox/Gui/GLGraphicsView.h index db2114df9f..4ce50af358 100644 --- a/src/Mod/Sandbox/Gui/GLGraphicsView.h +++ b/src/Mod/Sandbox/Gui/GLGraphicsView.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_GRAPHICSVIEW_H -#define GUI_GRAPHICSVIEW_H +#pragma once #include #include @@ -161,7 +160,4 @@ private: ParameterGrp::handle hGrp; }; -} // namespace Gui - -#endif // GUI_GRAPHICSVIEW_H - +} // namespace Gui \ No newline at end of file diff --git a/src/Mod/Sandbox/Gui/Overlay.h b/src/Mod/Sandbox/Gui/Overlay.h index c1ce9464c8..633159e259 100644 --- a/src/Mod/Sandbox/Gui/Overlay.h +++ b/src/Mod/Sandbox/Gui/Overlay.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SANDBOXGUI_OVERLAY_H -#define SANDBOXGUI_OVERLAY_H +#pragma once #include #include @@ -59,6 +58,4 @@ private: QOpenGLFramebufferObject* fbo; }; -} // SandboxGui - -#endif // SANDBOXGUI_OVERLAY_H +} // SandboxGui \ No newline at end of file diff --git a/src/Mod/Sandbox/Gui/PreCompiled.h b/src/Mod/Sandbox/Gui/PreCompiled.h index 781d78b4c6..31a5db97f6 100644 --- a/src/Mod/Sandbox/Gui/PreCompiled.h +++ b/src/Mod/Sandbox/Gui/PreCompiled.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SANDBOX_GUI_PRECOMPILED_H -#define SANDBOX_GUI_PRECOMPILED_H +#pragma once #include @@ -55,6 +54,4 @@ #include #include #include -#include - -#endif // GUI_PRECOMPILED_H +#include \ No newline at end of file diff --git a/src/Mod/Sandbox/Gui/TaskPanelView.h b/src/Mod/Sandbox/Gui/TaskPanelView.h index 2e1ec3f251..626824f248 100644 --- a/src/Mod/Sandbox/Gui/TaskPanelView.h +++ b/src/Mod/Sandbox/Gui/TaskPanelView.h @@ -24,8 +24,7 @@ -#ifndef SANDBOXGUI_TASKPANELVIEW_H -#define SANDBOXGUI_TASKPANELVIEW_H +#pragma once #include @@ -62,6 +61,4 @@ private: QWidget* actionGroup; }; -} // namespace SandboxGui - -#endif // SANDBOXGUI_TASKPANELVIEW_H +} // namespace SandboxGui \ No newline at end of file diff --git a/src/Mod/Sandbox/Gui/Workbench.h b/src/Mod/Sandbox/Gui/Workbench.h index 641f13ed4c..9af39d83de 100644 --- a/src/Mod/Sandbox/Gui/Workbench.h +++ b/src/Mod/Sandbox/Gui/Workbench.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef Sandbox_WORKBENCH_H -#define Sandbox_WORKBENCH_H +#pragma once #include #include @@ -70,7 +69,4 @@ private: QImage image; }; -} // namespace SandboxGui - - -#endif // Sandbox_WORKBENCH_H +} // namespace SandboxGui \ No newline at end of file diff --git a/src/Mod/Sketcher/App/Analyse.h b/src/Mod/Sketcher/App/Analyse.h index 4257687b26..64438d456a 100644 --- a/src/Mod/Sketcher/App/Analyse.h +++ b/src/Mod/Sketcher/App/Analyse.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef SKETCHER_ANALYSE_H -#define SKETCHER_ANALYSE_H +#pragma once #include @@ -67,5 +66,3 @@ struct Constraint_Equal }; } // namespace Sketcher - -#endif // SKETCHER_ANALYSE_H diff --git a/src/Mod/Sketcher/App/Constraint.h b/src/Mod/Sketcher/App/Constraint.h index 0426b3a3db..cd75bb6098 100644 --- a/src/Mod/Sketcher/App/Constraint.h +++ b/src/Mod/Sketcher/App/Constraint.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHER_CONSTRAINT_H -#define SKETCHER_CONSTRAINT_H +#pragma once #include @@ -249,6 +248,3 @@ protected: }; } // namespace Sketcher - - -#endif // SKETCHER_CONSTRAINT_H diff --git a/src/Mod/Sketcher/App/ExternalGeometryExtension.h b/src/Mod/Sketcher/App/ExternalGeometryExtension.h index 96969addc5..2e43b4a8cb 100644 --- a/src/Mod/Sketcher/App/ExternalGeometryExtension.h +++ b/src/Mod/Sketcher/App/ExternalGeometryExtension.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHER_EXTERNALGEOMETRYEXTENSION_H -#define SKETCHER_EXTERNALGEOMETRYEXTENSION_H +#pragma once #include #include @@ -178,6 +177,3 @@ private: }; } // namespace Sketcher - - -#endif // SKETCHER_EXTERNALGEOMETRYEXTENSION_H diff --git a/src/Mod/Sketcher/App/ExternalGeometryFacade.h b/src/Mod/Sketcher/App/ExternalGeometryFacade.h index 9b5d746a98..8942a0fc41 100644 --- a/src/Mod/Sketcher/App/ExternalGeometryFacade.h +++ b/src/Mod/Sketcher/App/ExternalGeometryFacade.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHER_GEOMETRYEXTERNALFACADE_H -#define SKETCHER_GEOMETRYEXTERNALFACADE_H +#pragma once #include @@ -330,6 +329,3 @@ private: } // namespace Sketcher - - -#endif // SKETCHER_GEOMETRYEXTERNALFACADE_H diff --git a/src/Mod/Sketcher/App/GeoEnum.h b/src/Mod/Sketcher/App/GeoEnum.h index 70f3be9d83..b740608a02 100644 --- a/src/Mod/Sketcher/App/GeoEnum.h +++ b/src/Mod/Sketcher/App/GeoEnum.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHER_GeoEnum_H -#define SKETCHER_GeoEnum_H +#pragma once #include @@ -178,5 +177,3 @@ struct less } }; } // namespace std - -#endif // SKETCHER_GeoEnum_H diff --git a/src/Mod/Sketcher/App/GeoList.h b/src/Mod/Sketcher/App/GeoList.h index b346aa4a5a..21c7f0ab88 100644 --- a/src/Mod/Sketcher/App/GeoList.h +++ b/src/Mod/Sketcher/App/GeoList.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHER_GeoList_H -#define SKETCHER_GeoList_H +#pragma once #include #include @@ -274,6 +273,3 @@ using GeoListFacade = GeoListModel; GeoListFacade getGeoListFacade(const GeoList& geolist); } // namespace Sketcher - - -#endif // SKETCHER_GeoList_H diff --git a/src/Mod/Sketcher/App/GeometryFacade.h b/src/Mod/Sketcher/App/GeometryFacade.h index e233824a1d..fd2466ad1b 100644 --- a/src/Mod/Sketcher/App/GeometryFacade.h +++ b/src/Mod/Sketcher/App/GeometryFacade.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHER_GEOMETRYFACADE_H -#define SKETCHER_GEOMETRYFACADE_H +#pragma once #include @@ -462,6 +461,3 @@ public: // Factory methods } // namespace Sketcher - - -#endif // SKETCHER_GEOMETRYFACADE_H diff --git a/src/Mod/Sketcher/App/Measure.h b/src/Mod/Sketcher/App/Measure.h index e6522b3150..cffdc04032 100644 --- a/src/Mod/Sketcher/App/Measure.h +++ b/src/Mod/Sketcher/App/Measure.h @@ -23,8 +23,7 @@ //! a class for establishing our connection with the unified measurement facility -#ifndef SKETCHER_MEASURE_H -#define SKETCHER_MEASURE_H +#pragma once #include @@ -41,5 +40,3 @@ public: } // namespace Sketcher - -#endif diff --git a/src/Mod/Sketcher/App/PreCompiled.h b/src/Mod/Sketcher/App/PreCompiled.h index ab665d0f6e..41dd301fca 100644 --- a/src/Mod/Sketcher/App/PreCompiled.h +++ b/src/Mod/Sketcher/App/PreCompiled.h @@ -22,93 +22,90 @@ * * ***************************************************************************/ -#ifndef SKETCHER_APP_PRECOMPILED_H -# define SKETCHER_APP_PRECOMPILED_H +#pragma once -# include +#include // standard -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // Qt -# include +#include // Boost -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // OpenCasCade -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #elif defined(FC_OS_WIN32) # include - -#endif diff --git a/src/Mod/Sketcher/App/PropertyConstraintList.h b/src/Mod/Sketcher/App/PropertyConstraintList.h index c561b11857..9253117080 100644 --- a/src/Mod/Sketcher/App/PropertyConstraintList.h +++ b/src/Mod/Sketcher/App/PropertyConstraintList.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef APP_PropertyConstraintList_H -#define APP_PropertyConstraintList_H +#pragma once #include #include @@ -186,6 +185,3 @@ private: }; } // namespace Sketcher - - -#endif // APP_PropertyConstraintList_H diff --git a/src/Mod/Sketcher/App/PythonConverter.h b/src/Mod/Sketcher/App/PythonConverter.h index 636e389399..29bff00712 100644 --- a/src/Mod/Sketcher/App/PythonConverter.h +++ b/src/Mod/Sketcher/App/PythonConverter.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SKETCHER_PythonConverter_H -#define SKETCHER_PythonConverter_H +#pragma once #include #include @@ -104,6 +103,3 @@ private: }; } // namespace Sketcher - - -#endif // SKETCHER_PythonConverter_H diff --git a/src/Mod/Sketcher/App/Sketch.h b/src/Mod/Sketcher/App/Sketch.h index 7d659e548a..e8705e60e3 100644 --- a/src/Mod/Sketcher/App/Sketch.h +++ b/src/Mod/Sketcher/App/Sketch.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHER_SKETCH_H -#define SKETCHER_SKETCH_H +#pragma once #include #include @@ -844,6 +843,3 @@ private: }; } // namespace Sketcher - - -#endif // SKETCHER_SKETCH_H diff --git a/src/Mod/Sketcher/App/SketchAnalysis.h b/src/Mod/Sketcher/App/SketchAnalysis.h index e32b0a21c9..d96f01c041 100644 --- a/src/Mod/Sketcher/App/SketchAnalysis.h +++ b/src/Mod/Sketcher/App/SketchAnalysis.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef SKETCHER_SKETCHANALYSIS_H -#define SKETCHER_SKETCHANALYSIS_H +#pragma once #include #include @@ -211,5 +210,3 @@ private: }; } // namespace Sketcher - -#endif // SKETCHER_SKETCHANALYSIS_H diff --git a/src/Mod/Sketcher/App/SketchGeometryExtension.h b/src/Mod/Sketcher/App/SketchGeometryExtension.h index 522620dcfb..04450f5b9c 100644 --- a/src/Mod/Sketcher/App/SketchGeometryExtension.h +++ b/src/Mod/Sketcher/App/SketchGeometryExtension.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHER_SKETCHGEOMETRYEXTENSION_H -#define SKETCHER_SKETCHGEOMETRYEXTENSION_H +#pragma once #include #include @@ -182,6 +181,3 @@ private: }; } // namespace Sketcher - - -#endif // SKETCHER_SKETCHGEOMETRYEXTENSION_H diff --git a/src/Mod/Sketcher/App/SketchObject.h b/src/Mod/Sketcher/App/SketchObject.h index de3b6bda8e..1dec11d910 100644 --- a/src/Mod/Sketcher/App/SketchObject.h +++ b/src/Mod/Sketcher/App/SketchObject.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHER_SKETCHOBJECT_H -#define SKETCHER_SKETCHOBJECT_H +#pragma once #include #include @@ -1265,6 +1264,3 @@ using SketchObjectPython = App::FeaturePythonT; // --------------------------------------------------------- } // namespace Sketcher - - -#endif // SKETCHER_SKETCHOBJECT_H diff --git a/src/Mod/Sketcher/App/SketchObjectSF.h b/src/Mod/Sketcher/App/SketchObjectSF.h index 0e3c710a2f..8254568f18 100644 --- a/src/Mod/Sketcher/App/SketchObjectSF.h +++ b/src/Mod/Sketcher/App/SketchObjectSF.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCH_SKETCHOBJECTSF_H -#define SKETCH_SKETCHOBJECTSF_H +#pragma once #include #include @@ -59,6 +58,3 @@ public: }; } // namespace Sketcher - - -#endif // SKETCH_SKETCHOBJECTSF_H diff --git a/src/Mod/Sketcher/App/SolverGeometryExtension.h b/src/Mod/Sketcher/App/SolverGeometryExtension.h index a36bdfb209..09150005bf 100644 --- a/src/Mod/Sketcher/App/SolverGeometryExtension.h +++ b/src/Mod/Sketcher/App/SolverGeometryExtension.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHER_SOLVERGEOMETRYEXTENSION_H -#define SKETCHER_SOLVERGEOMETRYEXTENSION_H +#pragma once #include #include @@ -504,6 +503,3 @@ private: }; } // namespace Sketcher - - -#endif // SKETCHER_SOLVERGEOMETRYEXTENSION_H diff --git a/src/Mod/Sketcher/App/planegcs/Constraints.h b/src/Mod/Sketcher/App/planegcs/Constraints.h index 4cbad2c2a3..da1b057317 100644 --- a/src/Mod/Sketcher/App/planegcs/Constraints.h +++ b/src/Mod/Sketcher/App/planegcs/Constraints.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PLANEGCS_CONSTRAINTS_H -#define PLANEGCS_CONSTRAINTS_H +#pragma once #include "../../SketcherGlobal.h" #include "Geo.h" @@ -1358,5 +1357,3 @@ public: }; } // namespace GCS - -#endif // PLANEGCS_CONSTRAINTS_H diff --git a/src/Mod/Sketcher/App/planegcs/GCS.h b/src/Mod/Sketcher/App/planegcs/GCS.h index 6ce451f212..99fb74a03c 100644 --- a/src/Mod/Sketcher/App/planegcs/GCS.h +++ b/src/Mod/Sketcher/App/planegcs/GCS.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PLANEGCS_GCS_H -#define PLANEGCS_GCS_H +#pragma once #include @@ -675,5 +674,3 @@ void deleteAllContent(std::vector& constrvec); void deleteAllContent(std::vector& subsysvec); } // namespace GCS - -#endif // PLANEGCS_GCS_H diff --git a/src/Mod/Sketcher/App/planegcs/Geo.h b/src/Mod/Sketcher/App/planegcs/Geo.h index 6198cb6034..528800c747 100644 --- a/src/Mod/Sketcher/App/planegcs/Geo.h +++ b/src/Mod/Sketcher/App/planegcs/Geo.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PLANEGCS_GEO_H -#define PLANEGCS_GEO_H +#pragma once #include "Util.h" #include @@ -416,5 +415,3 @@ public: } // namespace GCS // NOLINTEND(readability-math-missing-parentheses) - -#endif // PLANEGCS_GEO_H diff --git a/src/Mod/Sketcher/App/planegcs/SubSystem.h b/src/Mod/Sketcher/App/planegcs/SubSystem.h index d10ced235f..69fbd4ac3e 100644 --- a/src/Mod/Sketcher/App/planegcs/SubSystem.h +++ b/src/Mod/Sketcher/App/planegcs/SubSystem.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PLANEGCS_SUBSYSTEM_H -#define PLANEGCS_SUBSYSTEM_H +#pragma once #undef min #undef max @@ -96,5 +95,3 @@ public: double lineSearch(SubSystem* subsys, Eigen::VectorXd& xdir); } // namespace GCS - -#endif // PLANEGCS_SUBSYSTEM_H diff --git a/src/Mod/Sketcher/App/planegcs/Util.h b/src/Mod/Sketcher/App/planegcs/Util.h index 658fd733dc..c8ad58133e 100644 --- a/src/Mod/Sketcher/App/planegcs/Util.h +++ b/src/Mod/Sketcher/App/planegcs/Util.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PLANEGCS_UTIL_H -#define PLANEGCS_UTIL_H +#pragma once #include #include @@ -41,5 +40,3 @@ using MAP_pD_I = std::map; using SET_pD = std::set; using SET_I = std::set; } // namespace GCS - -#endif // PLANEGCS_UTIL_H diff --git a/src/Mod/Sketcher/Gui/AutoConstraint.h b/src/Mod/Sketcher/Gui/AutoConstraint.h index 3202e5e193..e88d9a6b02 100644 --- a/src/Mod/Sketcher/Gui/AutoConstraint.h +++ b/src/Mod/Sketcher/Gui/AutoConstraint.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SKETCHERGUI_AutoConstraint_H -#define SKETCHERGUI_AutoConstraint_H +#pragma once #include @@ -46,6 +45,3 @@ struct AutoConstraint }; } // namespace SketcherGui - - -#endif // SKETCHERGUI_AutoConstraint_H diff --git a/src/Mod/Sketcher/Gui/CircleEllipseConstructionMethod.h b/src/Mod/Sketcher/Gui/CircleEllipseConstructionMethod.h index a1853ee3ae..9be2dcfabc 100644 --- a/src/Mod/Sketcher/Gui/CircleEllipseConstructionMethod.h +++ b/src/Mod/Sketcher/Gui/CircleEllipseConstructionMethod.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SKETCHERGUI_CircleEllipseConstructionMethod_H -#define SKETCHERGUI_CircleEllipseConstructionMethod_H +#pragma once namespace SketcherGui::ConstructionMethods { @@ -37,6 +36,3 @@ enum class CircleEllipseConstructionMethod }; } // namespace SketcherGui::ConstructionMethods - - -#endif // SKETCHERGUI_CircleEllipseConstructionMethod_H diff --git a/src/Mod/Sketcher/Gui/Command.h b/src/Mod/Sketcher/Gui/Command.h index 844c9baa05..ad66815476 100644 --- a/src/Mod/Sketcher/Gui/Command.h +++ b/src/Mod/Sketcher/Gui/Command.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SKETCHERGUI_CommandConstraints_H -#define SKETCHERGUI_CommandConstraints_H +#pragma once #include #include @@ -119,4 +118,3 @@ private: }; } // namespace SketcherGui -#endif // SKETCHERGUI_Command_H diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.h b/src/Mod/Sketcher/Gui/CommandConstraints.h index 325b0ed8a0..4d83b05958 100644 --- a/src/Mod/Sketcher/Gui/CommandConstraints.h +++ b/src/Mod/Sketcher/Gui/CommandConstraints.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SKETCHERGUI_CommandConstraints_H -#define SKETCHERGUI_CommandConstraints_H +#pragma once #include #include @@ -139,4 +138,3 @@ void doEndpointToEdgeTangency( void notifyConstraintSubstitutions(const QString& message); } // namespace SketcherGui -#endif // SKETCHERGUI_CommandConstraints_H diff --git a/src/Mod/Sketcher/Gui/CommandSketcherTools.h b/src/Mod/Sketcher/Gui/CommandSketcherTools.h index d8c3ddc8da..a004ce3254 100644 --- a/src/Mod/Sketcher/Gui/CommandSketcherTools.h +++ b/src/Mod/Sketcher/Gui/CommandSketcherTools.h @@ -1,7 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#ifndef SKETCHERGUI_CommandSketcherTools_H -#define SKETCHERGUI_CommandSketcherTools_H +#pragma once #include @@ -15,4 +14,3 @@ namespace SketcherGui void centerScale(double scale_factor); } // namespace SketcherGui -#endif // SKETCHERGUI_CommandSketcherTools_H diff --git a/src/Mod/Sketcher/Gui/ConstraintFilters.h b/src/Mod/Sketcher/Gui/ConstraintFilters.h index 356dc7f654..366465d4f7 100644 --- a/src/Mod/Sketcher/Gui/ConstraintFilters.h +++ b/src/Mod/Sketcher/Gui/ConstraintFilters.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_ConstraintFilters_H -#define SKETCHERGUI_ConstraintFilters_H +#pragma once #include #include @@ -196,5 +195,3 @@ constexpr std::array filterAggregates { } // namespace ConstraintFilter } // namespace SketcherGui - -#endif // SKETCHERGUI_ConstraintFilters_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchControllableHandler.h b/src/Mod/Sketcher/Gui/DrawSketchControllableHandler.h index 36641969fd..fbfd89bac5 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchControllableHandler.h +++ b/src/Mod/Sketcher/Gui/DrawSketchControllableHandler.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchControllableHandler_H -#define SKETCHERGUI_DrawSketchControllableHandler_H +#pragma once #include @@ -215,6 +214,3 @@ protected: }; } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchControllableHandler_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchController.h b/src/Mod/Sketcher/Gui/DrawSketchController.h index 23cc40e8c7..ff43dc3daf 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchController.h +++ b/src/Mod/Sketcher/Gui/DrawSketchController.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchController_H -#define SKETCHERGUI_DrawSketchController_H +#pragma once #include #include @@ -890,6 +889,3 @@ private: } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchController_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchDefaultHandler.h b/src/Mod/Sketcher/Gui/DrawSketchDefaultHandler.h index ccd6ae69ac..394a2b00b5 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchDefaultHandler.h +++ b/src/Mod/Sketcher/Gui/DrawSketchDefaultHandler.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchDefaultHandler_H -#define SKETCHERGUI_DrawSketchDefaultHandler_H +#pragma once #include @@ -1297,6 +1296,3 @@ protected: }; } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchDefaultHandler_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchDefaultWidgetController.h b/src/Mod/Sketcher/Gui/DrawSketchDefaultWidgetController.h index be54124263..357f7719af 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchDefaultWidgetController.h +++ b/src/Mod/Sketcher/Gui/DrawSketchDefaultWidgetController.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchDefaultWidgetController_H -#define SKETCHERGUI_DrawSketchDefaultWidgetController_H +#pragma once #include #include @@ -462,6 +461,3 @@ private: } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchDefaultWidgetController_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandler.h b/src/Mod/Sketcher/Gui/DrawSketchHandler.h index c654d857d6..fc122dce00 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandler.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandler.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandler_H -#define SKETCHERGUI_DrawSketchHandler_H +#pragma once #include #include @@ -348,6 +347,3 @@ protected: } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchHandler_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h index 6ea86fdc0d..c9ab4740ef 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandlerArc_H -#define SKETCHERGUI_DrawSketchHandlerArc_H +#pragma once #include #include @@ -991,6 +990,3 @@ void DSHArcController::doConstructionMethodChanged() } } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchHandlerArc_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h index e561828d83..b8f9b78f81 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandlerArcOfEllipse_H -#define SKETCHERGUI_DrawSketchHandlerArcOfEllipse_H +#pragma once #include #include @@ -487,6 +486,3 @@ private: }; } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchHandlerArcOfEllipse_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfHyperbola.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfHyperbola.h index 6c8e00362a..21021139ae 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfHyperbola.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfHyperbola.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandlerArcOfHyperbola_H -#define SKETCHERGUI_DrawSketchHandlerArcOfHyperbola_H +#pragma once #include @@ -464,6 +463,3 @@ protected: }; } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchHandlerArcOfHyperbola_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfParabola.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfParabola.h index cb2e26f88b..ec73b7da1c 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfParabola.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfParabola.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandlerArcOfParabola_H -#define SKETCHERGUI_DrawSketchHandlerArcOfParabola_H +#pragma once #include @@ -379,5 +378,3 @@ private: }; } // namespace SketcherGui - -#endif // SKETCHERGUI_DrawSketchHandlerArcOfParabola_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcSlot.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcSlot.h index 7e2a0aa073..3cb5036a76 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcSlot.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcSlot.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandlerArcSlot_H -#define SKETCHERGUI_DrawSketchHandlerArcSlot_H +#pragma once #include @@ -1036,6 +1035,3 @@ void DSHArcSlotController::addConstraints() } } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchHandlerArcSlot_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h index a1bec1f997..e2cde8f747 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandlerBSpline_H -#define SKETCHERGUI_DrawSketchHandlerBSpline_H +#pragma once #include @@ -1314,6 +1313,3 @@ void DSHBSplineController::addConstraints() } } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchHandlerBSpline_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h index 614a5ba0f8..a3e20936c1 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandlerCarbonCopy_H -#define SKETCHERGUI_DrawSketchHandlerCarbonCopy_H +#pragma once #include @@ -249,6 +248,3 @@ public: }; } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchHandlerCarbonCopy_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h index cd8ecc4da3..f0ebb228a4 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandlerCircle_H -#define SKETCHERGUI_DrawSketchHandlerCircle_H +#pragma once #include #include @@ -812,6 +811,3 @@ void DSHCircleController::addConstraints() } } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchHandlerCircle_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h index 714f17f819..b1b209ba58 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandlerEllipse_H -#define SKETCHERGUI_DrawSketchHandlerEllipse_H +#pragma once #include @@ -1047,6 +1046,3 @@ void DSHEllipseController::addConstraints() // No constraint possible for 3 rim ellipse. } } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchHandlerEllipse_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h index 325bcc7052..c819138cd9 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandlerExtend_H -#define SKETCHERGUI_DrawSketchHandlerExtend_H +#pragma once #include #include @@ -410,5 +409,3 @@ private: }; } // namespace SketcherGui - -#endif // SKETCHERGUI_DrawSketchHandlerExtend_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h index 98bb1a798a..391dc86d52 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandlerExternal_H -#define SKETCHERGUI_DrawSketchHandlerExternal_H +#pragma once #include #include @@ -267,6 +266,3 @@ public: }; } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchHandlerExternal_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h index 668f9279bc..4b35166046 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandlerFillet_H -#define SKETCHERGUI_DrawSketchHandlerFillet_H +#pragma once #include #include @@ -504,5 +503,3 @@ void DSHFilletController::adaptDrawingToCheckboxChange(int checkboxindex, bool v } } // namespace SketcherGui - -#endif // SKETCHERGUI_DrawSketchHandlerFillet_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h index 1a8069007d..4c21b958fc 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandlerLine_H -#define SKETCHERGUI_DrawSketchHandlerLine_H +#pragma once #include #include @@ -889,6 +888,3 @@ void DSHLineController::addConstraints() } } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchHandlerLine_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h index 27507a8f33..d6438f276c 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandlerLineSet_H -#define SKETCHERGUI_DrawSketchHandlerLineSet_H +#pragma once #include @@ -879,6 +878,3 @@ protected: } }; } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchHandlerLineSet_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerOffset.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerOffset.h index 407739b2f7..cfcc48dce4 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerOffset.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerOffset.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandlerOffset_H -#define SKETCHERGUI_DrawSketchHandlerOffset_H +#pragma once #include @@ -1332,6 +1331,3 @@ void DSHOffsetController::computeNextDrawSketchHandlerMode() } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchHandlerOffset_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h index 3a79348824..bf3f1d64af 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandlerPoint_H -#define SKETCHERGUI_DrawSketchHandlerPoint_H +#pragma once #include #include @@ -304,6 +303,3 @@ void DSHPointController::addConstraints() } } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchHandlerPoint_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h index 4301581715..c34d56342a 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandlerPolygon_H -#define SKETCHERGUI_DrawSketchHandlerPolygon_H +#pragma once #include @@ -578,6 +577,3 @@ void DSHPolygonController::addConstraints() } } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchHandlerPolygon_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h index 02292b21fc..419e9f4dcb 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandlerRectangle_H -#define SKETCHERGUI_DrawSketchHandlerRectangle_H +#pragma once #include @@ -3157,6 +3156,3 @@ void DSHRectangleController::doConstructionMethodChanged() } } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchHandlerRectangle_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerRotate.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerRotate.h index b5ba2b248b..005e738238 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerRotate.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerRotate.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandlerRotate_H -#define SKETCHERGUI_DrawSketchHandlerRotate_H +#pragma once #include @@ -674,6 +673,3 @@ void DSHRotateController::computeNextDrawSketchHandlerMode() } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchHandlerRotate_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerScale.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerScale.h index 874eeace1e..b0acd825ea 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerScale.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerScale.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandlerScale_H -#define SKETCHERGUI_DrawSketchHandlerScale_H +#pragma once #include @@ -772,6 +771,3 @@ void DSHScaleController::computeNextDrawSketchHandlerMode() } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchHandlerScale_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h index e6aaef71cf..7c58b6e276 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandlerSlot_H -#define SKETCHERGUI_DrawSketchHandlerSlot_H +#pragma once #include @@ -717,6 +716,3 @@ void DSHSlotController::addConstraints() } } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchHandlerSlot_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h index 2a70652f5a..394c665cee 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandlerSplitting_H -#define SKETCHERGUI_DrawSketchHandlerSplitting_H +#pragma once #include #include @@ -218,6 +217,3 @@ public: }; } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchHandlerSplitting_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerSymmetry.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerSymmetry.h index 79a3091e6f..bb05b471e8 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerSymmetry.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerSymmetry.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandlerSymmetry_H -#define SKETCHERGUI_DrawSketchHandlerSymmetry_H +#pragma once #include @@ -323,6 +322,3 @@ void DSHSymmetryController::adaptDrawingToCheckboxChange(int checkboxindex, bool } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchHandlerSymmetry_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerTranslate.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerTranslate.h index d1441109ac..ab54515084 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerTranslate.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerTranslate.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandlerTranslate_H -#define SKETCHERGUI_DrawSketchHandlerTranslate_H +#pragma once #include #include @@ -796,6 +795,3 @@ void DSHTranslateController::computeNextDrawSketchHandlerMode() } } // namespace SketcherGui - - -#endif // SKETCHERGUI_DrawSketchHandlerTranslate_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h index af983275f6..3452c358bd 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_DrawSketchHandlerTrimming_H -#define SKETCHERGUI_DrawSketchHandlerTrimming_H +#pragma once #include #include @@ -231,5 +230,3 @@ public: }; } // namespace SketcherGui - -#endif // SKETCHERGUI_DrawSketchHandlerTrimming_H diff --git a/src/Mod/Sketcher/Gui/DrawSketchKeyboardManager.h b/src/Mod/Sketcher/Gui/DrawSketchKeyboardManager.h index bf38a15859..e6742342b4 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchKeyboardManager.h +++ b/src/Mod/Sketcher/Gui/DrawSketchKeyboardManager.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SketcherGui_DrawSketchKeyboardManager_H -#define SketcherGui_DrawSketchKeyboardManager_H +#pragma once #include @@ -102,5 +101,3 @@ private: }; } // namespace SketcherGui - -#endif // SketcherGui_DrawSketchKeyboardManager_H diff --git a/src/Mod/Sketcher/Gui/EditDatumDialog.h b/src/Mod/Sketcher/Gui/EditDatumDialog.h index 53a514bb0f..c527e851aa 100644 --- a/src/Mod/Sketcher/Gui/EditDatumDialog.h +++ b/src/Mod/Sketcher/Gui/EditDatumDialog.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_EditDatumDialog_H -#define SKETCHERGUI_EditDatumDialog_H +#pragma once #include #include @@ -74,4 +73,3 @@ private: }; } // namespace SketcherGui -#endif // SKETCHERGUI_DrawSketchHandler_H diff --git a/src/Mod/Sketcher/Gui/EditModeCoinManager.h b/src/Mod/Sketcher/Gui/EditModeCoinManager.h index 552a27617b..fac41e0fe6 100644 --- a/src/Mod/Sketcher/Gui/EditModeCoinManager.h +++ b/src/Mod/Sketcher/Gui/EditModeCoinManager.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_EditModeCoinManager_H -#define SKETCHERGUI_EditModeCoinManager_H +#pragma once #include #include @@ -327,6 +326,3 @@ private: } // namespace SketcherGui - - -#endif // SKETCHERGUI_EditModeCoinManager_H diff --git a/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.h b/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.h index ae3fe19b26..78ee6f83e6 100644 --- a/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.h +++ b/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_EditModeCoinManagerParameters_H -#define SKETCHERGUI_EditModeCoinManagerParameters_H +#pragma once #include #include @@ -593,5 +592,3 @@ struct CoinMapping }; } // namespace SketcherGui - -#endif // SKETCHERGUI_EditModeCoinManagerParameters_H diff --git a/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.h b/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.h index 7efe7caf29..ca1d427a47 100644 --- a/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.h +++ b/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_EditModeConstraintCoinManager_H -#define SKETCHERGUI_EditModeConstraintCoinManager_H +#pragma once #include #include @@ -279,6 +278,3 @@ private: } // namespace SketcherGui - - -#endif // SKETCHERGUI_EditModeConstraintCoinManager_H diff --git a/src/Mod/Sketcher/Gui/EditModeGeometryCoinConverter.h b/src/Mod/Sketcher/Gui/EditModeGeometryCoinConverter.h index d47e3c72ab..c97b7bfdba 100644 --- a/src/Mod/Sketcher/Gui/EditModeGeometryCoinConverter.h +++ b/src/Mod/Sketcher/Gui/EditModeGeometryCoinConverter.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_GeometryCoinConverter_H -#define SKETCHERGUI_GeometryCoinConverter_H +#pragma once #include @@ -194,6 +193,3 @@ private: } // namespace SketcherGui - - -#endif // SKETCHERGUI_GeometryCoinConverter_H diff --git a/src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.h b/src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.h index 029015e644..399108c22e 100644 --- a/src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.h +++ b/src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_EditModeGeometryCoinManager_H -#define SKETCHERGUI_EditModeGeometryCoinManager_H +#pragma once #include #include @@ -130,6 +129,3 @@ private: } // namespace SketcherGui - - -#endif // SKETCHERGUI_EditModeGeometryCoinManager_H diff --git a/src/Mod/Sketcher/Gui/EditModeInformationOverlayCoinConverter.h b/src/Mod/Sketcher/Gui/EditModeInformationOverlayCoinConverter.h index deab12902e..e59926bf25 100644 --- a/src/Mod/Sketcher/Gui/EditModeInformationOverlayCoinConverter.h +++ b/src/Mod/Sketcher/Gui/EditModeInformationOverlayCoinConverter.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_InformationOverlayCoinConverter_H -#define SKETCHERGUI_InformationOverlayCoinConverter_H +#pragma once #include @@ -220,6 +219,3 @@ private: } // namespace SketcherGui - - -#endif // SKETCHERGUI_InformationOverlayCoinConverter_H diff --git a/src/Mod/Sketcher/Gui/GeometryCreationMode.h b/src/Mod/Sketcher/Gui/GeometryCreationMode.h index 8789e7ad57..fe53e030a8 100644 --- a/src/Mod/Sketcher/Gui/GeometryCreationMode.h +++ b/src/Mod/Sketcher/Gui/GeometryCreationMode.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_GEOMETRYCREATIONMODE_H -#define SKETCHERGUI_GEOMETRYCREATIONMODE_H +#pragma once /***** Creation Mode ************/ namespace SketcherGui @@ -34,5 +33,3 @@ enum class GeometryCreationMode Construction = 1 }; } // namespace SketcherGui - -#endif // SKETCHERGUI_GEOMETRYCREATIONMODE_H diff --git a/src/Mod/Sketcher/Gui/PreCompiled.h b/src/Mod/Sketcher/Gui/PreCompiled.h index 3ed24cea00..0bb65f7b94 100644 --- a/src/Mod/Sketcher/Gui/PreCompiled.h +++ b/src/Mod/Sketcher/Gui/PreCompiled.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHER_GUI_PRECOMPILED_H -#define SKETCHER_GUI_PRECOMPILED_H +#pragma once #include @@ -70,5 +69,3 @@ // all of Inventor #include - -#endif // SKETCHER_GUI_PRECOMPILED_H diff --git a/src/Mod/Sketcher/Gui/PropertyConstraintListItem.h b/src/Mod/Sketcher/Gui/PropertyConstraintListItem.h index 8c442cd630..cc66de54c9 100644 --- a/src/Mod/Sketcher/Gui/PropertyConstraintListItem.h +++ b/src/Mod/Sketcher/Gui/PropertyConstraintListItem.h @@ -21,8 +21,7 @@ * Suite 330, Boston, MA 02111-1307, USA * * * ***************************************************************************/ -#ifndef PROPERTYCONSTRAINTLISTITEM_H -#define PROPERTYCONSTRAINTLISTITEM_H +#pragma once #include #include @@ -65,6 +64,3 @@ protected: }; } // namespace SketcherGui - - -#endif diff --git a/src/Mod/Sketcher/Gui/PropertyVisualLayerList.h b/src/Mod/Sketcher/Gui/PropertyVisualLayerList.h index fad6d2f3dd..bce150248e 100644 --- a/src/Mod/Sketcher/Gui/PropertyVisualLayerList.h +++ b/src/Mod/Sketcher/Gui/PropertyVisualLayerList.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_PropertyVisualLayerList_H -#define SKETCHERGUI_PropertyVisualLayerList_H +#pragma once #include @@ -73,6 +72,3 @@ protected: }; } // namespace SketcherGui - - -#endif // SKETCHERGUI_PropertyVisualLayerList_H diff --git a/src/Mod/Sketcher/Gui/ShortcutListener.h b/src/Mod/Sketcher/Gui/ShortcutListener.h index fa86637bd2..c41cec10d9 100644 --- a/src/Mod/Sketcher/Gui/ShortcutListener.h +++ b/src/Mod/Sketcher/Gui/ShortcutListener.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_SHORTCUTLISTENER_H -#define SKETCHERGUI_SHORTCUTLISTENER_H +#pragma once #include @@ -48,6 +47,3 @@ protected: }; } // namespace SketcherGui - - -#endif // SKETCHERGUI_SHORTCUTLISTENER_H diff --git a/src/Mod/Sketcher/Gui/SketchMirrorDialog.h b/src/Mod/Sketcher/Gui/SketchMirrorDialog.h index 24f3239369..1e014d9db4 100644 --- a/src/Mod/Sketcher/Gui/SketchMirrorDialog.h +++ b/src/Mod/Sketcher/Gui/SketchMirrorDialog.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_SketchMirrorDialog_H -#define SKETCHERGUI_SketchMirrorDialog_H +#pragma once #include @@ -52,5 +51,3 @@ private: }; } // namespace SketcherGui - -#endif // SKETCHERGUI_SketchMirrorDialog_H diff --git a/src/Mod/Sketcher/Gui/SketchOrientationDialog.h b/src/Mod/Sketcher/Gui/SketchOrientationDialog.h index ffbe24628f..2e4f27bab6 100644 --- a/src/Mod/Sketcher/Gui/SketchOrientationDialog.h +++ b/src/Mod/Sketcher/Gui/SketchOrientationDialog.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_SketchOrientationDialog_H -#define SKETCHERGUI_SketchOrientationDialog_H +#pragma once #include @@ -56,5 +55,3 @@ private: }; } // namespace SketcherGui - -#endif // SKETCHERGUI_SketchOrientationDialog_H diff --git a/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.h b/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.h index c2b09608aa..fe2abea6af 100644 --- a/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.h +++ b/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_SketchRectangularArrayDialog_H -#define SKETCHERGUI_SketchRectangularArrayDialog_H +#pragma once #include @@ -56,5 +55,3 @@ private: }; } // namespace SketcherGui - -#endif // SKETCHERGUI_SketchRectangularArrayDialog_H diff --git a/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.h b/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.h index 34d5045c18..109b2e7499 100644 --- a/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.h +++ b/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_SketcherRegularPolygonDialog_H -#define SKETCHERGUI_SketcherRegularPolygonDialog_H +#pragma once #include @@ -52,5 +51,3 @@ private: }; } // namespace SketcherGui - -#endif // SKETCHERGUI_SketcherRegularPolygonDialog_H diff --git a/src/Mod/Sketcher/Gui/SketcherSettings.h b/src/Mod/Sketcher/Gui/SketcherSettings.h index f6a7202b19..cdafcfb0cc 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettings.h +++ b/src/Mod/Sketcher/Gui/SketcherSettings.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_SKETCHERSETTINGS_H -#define SKETCHERGUI_SKETCHERSETTINGS_H +#pragma once #include #include @@ -144,5 +143,3 @@ enum class AutoScaleMode : int }; } // namespace SketcherGui - -#endif // SKETCHERGUI_SKETCHERSETTINGS_H diff --git a/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.h b/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.h index 472943b348..d5946aa5b8 100644 --- a/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.h +++ b/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SketcherGui_SketcherToolDefaultWidget_H -#define SketcherGui_SketcherToolDefaultWidget_H +#pragma once #include #include @@ -237,5 +236,3 @@ private: } // namespace SketcherGui - -#endif // SketcherGui_SketcherToolDefaultWidget_H diff --git a/src/Mod/Sketcher/Gui/SketcherTransformationExpressionHelper.h b/src/Mod/Sketcher/Gui/SketcherTransformationExpressionHelper.h index 03f34e7213..be69989a0b 100644 --- a/src/Mod/Sketcher/Gui/SketcherTransformationExpressionHelper.h +++ b/src/Mod/Sketcher/Gui/SketcherTransformationExpressionHelper.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_SketcherTransformationExpressionHelper_H -#define SKETCHERGUI_SketcherTransformationExpressionHelper_H +#pragma once #include #include @@ -118,5 +117,3 @@ private: }; } // namespace SketcherGui - -#endif // SKETCHERGUI_SketcherTransformationExpressionHelper_H diff --git a/src/Mod/Sketcher/Gui/SnapManager.h b/src/Mod/Sketcher/Gui/SnapManager.h index 32876ff4b3..0ae319af9d 100644 --- a/src/Mod/Sketcher/Gui/SnapManager.h +++ b/src/Mod/Sketcher/Gui/SnapManager.h @@ -23,8 +23,7 @@ * SnapManager initially funded by the Open Toolchain Foundation * ***************************************************************************/ -#ifndef SKETCHERGUI_SnapManager_H -#define SKETCHERGUI_SnapManager_H +#pragma once #include @@ -155,6 +154,3 @@ private: } // namespace SketcherGui - - -#endif // SKETCHERGUI_SnapManager_H diff --git a/src/Mod/Sketcher/Gui/SoZoomTranslation.h b/src/Mod/Sketcher/Gui/SoZoomTranslation.h index 61bd858a34..cd3427c7c6 100644 --- a/src/Mod/Sketcher/Gui/SoZoomTranslation.h +++ b/src/Mod/Sketcher/Gui/SoZoomTranslation.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_SOZOOMTRANSLATION_H -#define SKETCHERGUI_SOZOOMTRANSLATION_H +#pragma once #include @@ -64,4 +63,3 @@ protected: }; } // namespace SketcherGui -#endif // SKETCHERGUI_SOZOOMTRANSLATION_H diff --git a/src/Mod/Sketcher/Gui/StyleParameters.h b/src/Mod/Sketcher/Gui/StyleParameters.h index f003bf8405..6e45390451 100644 --- a/src/Mod/Sketcher/Gui/StyleParameters.h +++ b/src/Mod/Sketcher/Gui/StyleParameters.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHER_STYLEPARAMETERS_H -#define SKETCHER_STYLEPARAMETERS_H +#pragma once #include @@ -39,5 +38,3 @@ DEFINE_STYLE_PARAMETER( Base::Color(0.0F, 0.4F, 1.0F, 1.0F) ); // blue for window selection (left to right) } // namespace SketcherGui::StyleParameters - -#endif // SKETCHER_STYLEPARAMETERS_H diff --git a/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h b/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h index c2d928a123..60ded23f77 100644 --- a/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h +++ b/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_TaskDlgEditSketch_H -#define SKETCHERGUI_TaskDlgEditSketch_H +#pragma once #include @@ -101,5 +100,3 @@ private: } // namespace SketcherGui - -#endif // SKETCHERGUI_TaskDlgEditSketch_H diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.h b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.h index 64d5ca6318..55d14ba827 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskSketcherConstraints_H -#define GUI_TASKVIEW_TaskSketcherConstraints_H +#pragma once #include @@ -238,5 +237,3 @@ private: }; } // namespace SketcherGui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.h b/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.h index d0b5b79294..bff1ba8ffd 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskSketcherCreateCommands_H -#define GUI_TASKVIEW_TaskSketcherCreateCommands_H +#pragma once #include #include @@ -66,5 +65,3 @@ private: } // namespace TaskView } // namespace Gui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.h b/src/Mod/Sketcher/Gui/TaskSketcherElements.h index e94c8db839..0d68df6e14 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherElements.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskSketcherElements_H -#define GUI_TASKVIEW_TaskSketcherElements_H +#pragma once #include #include @@ -182,5 +181,3 @@ private: }; } // namespace SketcherGui - -#endif // GUI_TASKVIEW_TASKAPPERANCE_H diff --git a/src/Mod/Sketcher/Gui/TaskSketcherMessages.h b/src/Mod/Sketcher/Gui/TaskSketcherMessages.h index cd0cff8b83..45756aa4a5 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherMessages.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherMessages.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskSketcherMessages_H -#define GUI_TASKVIEW_TaskSketcherMessages_H +#pragma once #include @@ -51,5 +50,3 @@ protected: }; } // namespace SketcherGui - -#endif // GUI_TASKVIEW_TaskSketcherMessages_H diff --git a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.h b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.h index 08c90b80b5..57e313cd72 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskSketcherSolverAdvanced_H -#define GUI_TASKVIEW_TaskSketcherSolverAdvanced_H +#pragma once #include @@ -87,5 +86,3 @@ private: }; } // namespace SketcherGui - -#endif // GUI_TASKVIEW_TaskSketcherSolverAdvanced_H diff --git a/src/Mod/Sketcher/Gui/TaskSketcherTool.h b/src/Mod/Sketcher/Gui/TaskSketcherTool.h index edca94e71d..2c5fb8ac06 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherTool.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherTool.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_TASKVIEW_TaskSketcherTool_H -#define GUI_TASKVIEW_TaskSketcherTool_H +#pragma once #include #include @@ -77,5 +76,3 @@ private: }; } // namespace SketcherGui - -#endif // GUI_TASKVIEW_TaskSketcherTool_H diff --git a/src/Mod/Sketcher/Gui/TaskSketcherValidation.h b/src/Mod/Sketcher/Gui/TaskSketcherValidation.h index dd00f6233a..a1795223af 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherValidation.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherValidation.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_TASKSKETCHERVALIDATION_H -#define SKETCHERGUI_TASKSKETCHERVALIDATION_H +#pragma once #include #include @@ -93,5 +92,3 @@ public: }; } // namespace SketcherGui - -#endif // SKETCHERGUI_TASKSKETCHERVALIDATION_H diff --git a/src/Mod/Sketcher/Gui/Utils.h b/src/Mod/Sketcher/Gui/Utils.h index bfb769bb74..cde12e77df 100644 --- a/src/Mod/Sketcher/Gui/Utils.h +++ b/src/Mod/Sketcher/Gui/Utils.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_Recompute_H -#define SKETCHERGUI_Recompute_H +#pragma once #include #include @@ -313,5 +312,3 @@ void setSafeGeomLayerId(T geom, int layerindex) vpext->setVisualLayerId(layerindex); } - -#endif // SKETCHERGUI_Recompute_H diff --git a/src/Mod/Sketcher/Gui/ViewProviderPython.h b/src/Mod/Sketcher/Gui/ViewProviderPython.h index 41121a9bdc..1444cc1180 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderPython.h +++ b/src/Mod/Sketcher/Gui/ViewProviderPython.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SketcherGui_VIEWPROVIDERPYTHON_H -#define SketcherGui_VIEWPROVIDERPYTHON_H +#pragma once #include #include @@ -52,6 +51,3 @@ using ViewProviderPython = Gui::ViewProviderFeaturePythonT; using ViewProviderCustomPython = Gui::ViewProviderFeaturePythonT; } // namespace SketcherGui - - -#endif // SketcherGui_VIEWPROVIDERPYTHON_H diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.h b/src/Mod/Sketcher/Gui/ViewProviderSketch.h index c0447d55bc..33d87b0f9f 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.h +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_VIEWPROVIDERSKETCH_H -#define SKETCHERGUI_VIEWPROVIDERSKETCH_H +#pragma once #include @@ -1019,6 +1018,3 @@ private: }; } // namespace SketcherGui - - -#endif // SKETCHERGUI_VIEWPROVIDERSKETCH_H diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketchCoinAttorney.h b/src/Mod/Sketcher/Gui/ViewProviderSketchCoinAttorney.h index 2e55192ea6..4025f7199b 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketchCoinAttorney.h +++ b/src/Mod/Sketcher/Gui/ViewProviderSketchCoinAttorney.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_ViewProviderSketchCoinAttorney_H -#define SKETCHERGUI_ViewProviderSketchCoinAttorney_H +#pragma once #include #include @@ -294,6 +293,3 @@ inline void ViewProviderSketchCoinAttorney::executeOnSelectionPointSet( } } // namespace SketcherGui - - -#endif // SKETCHERGUI_ViewProviderSketchCoinAttorney_H diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.h b/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.h index f7fec29534..6a9992e278 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.h +++ b/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHER_VIEWPROVIDERSKETCHGEOMETRYEXTENSION_H -#define SKETCHER_VIEWPROVIDERSKETCHGEOMETRYEXTENSION_H +#pragma once #include #include @@ -84,6 +83,3 @@ private: }; } // namespace SketcherGui - - -#endif // SKETCHER_VIEWPROVIDERSKETCHGEOMETRYEXTENSION_H diff --git a/src/Mod/Sketcher/Gui/VisualLayer.h b/src/Mod/Sketcher/Gui/VisualLayer.h index f7d10e5906..1b5281b2c4 100644 --- a/src/Mod/Sketcher/Gui/VisualLayer.h +++ b/src/Mod/Sketcher/Gui/VisualLayer.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHERGUI_VisualLayer_H -#define SKETCHERGUI_VisualLayer_H +#pragma once #include #include @@ -74,6 +73,3 @@ bool operator==(VisualLayer const& lhs, VisualLayer const& rhs) } } // namespace SketcherGui - - -#endif // SKETCHERGUI_VisualLayer_H diff --git a/src/Mod/Sketcher/Gui/Workbench.h b/src/Mod/Sketcher/Gui/Workbench.h index 8d181e2eb4..48a1c866ea 100644 --- a/src/Mod/Sketcher/Gui/Workbench.h +++ b/src/Mod/Sketcher/Gui/Workbench.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SKETCHER_WORKBENCH_H -#define SKETCHER_WORKBENCH_H +#pragma once #include #include @@ -73,5 +72,3 @@ SketcherGuiExport void addSketcherWorkbenchBSplines(Gui::ToolBarItem& bspline); SketcherGuiExport void addSketcherWorkbenchVisual(Gui::ToolBarItem& visual); } // namespace SketcherGui - -#endif // SKETCHER_WORKBENCH_H diff --git a/src/Mod/Sketcher/SketcherGlobal.h b/src/Mod/Sketcher/SketcherGlobal.h index 69339145cf..fa0299a2ce 100644 --- a/src/Mod/Sketcher/SketcherGlobal.h +++ b/src/Mod/Sketcher/SketcherGlobal.h @@ -24,26 +24,23 @@ #include -#ifndef SKETCHER_GLOBAL_H -# define SKETCHER_GLOBAL_H +#pragma once // Sketcher -# ifndef SketcherExport -# ifdef Sketcher_EXPORTS -# define SketcherExport FREECAD_DECL_EXPORT -# else -# define SketcherExport FREECAD_DECL_IMPORT -# endif +#ifndef SketcherExport +# ifdef Sketcher_EXPORTS +# define SketcherExport FREECAD_DECL_EXPORT +# else +# define SketcherExport FREECAD_DECL_IMPORT # endif +#endif // SketcherGui -# ifndef SketcherGuiExport -# ifdef SketcherGui_EXPORTS -# define SketcherGuiExport FREECAD_DECL_EXPORT -# else -# define SketcherGuiExport FREECAD_DECL_IMPORT -# endif +#ifndef SketcherGuiExport +# ifdef SketcherGui_EXPORTS +# define SketcherGuiExport FREECAD_DECL_EXPORT +# else +# define SketcherGuiExport FREECAD_DECL_IMPORT # endif - -#endif // SKETCHER_GLOBAL_H +#endif diff --git a/src/Mod/Spreadsheet/App/Cell.h b/src/Mod/Spreadsheet/App/Cell.h index e4fad0afa5..3e51f44a45 100644 --- a/src/Mod/Spreadsheet/App/Cell.h +++ b/src/Mod/Spreadsheet/App/Cell.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef CELL_H -#define CELL_H +#pragma once #include #include @@ -215,5 +214,3 @@ private: }; } // namespace Spreadsheet - -#endif // CELL_H diff --git a/src/Mod/Spreadsheet/App/DisplayUnit.h b/src/Mod/Spreadsheet/App/DisplayUnit.h index d0ffb6959d..f3116cd891 100644 --- a/src/Mod/Spreadsheet/App/DisplayUnit.h +++ b/src/Mod/Spreadsheet/App/DisplayUnit.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef DISPLAYUNIT_H -#define DISPLAYUNIT_H +#pragma once #include #include @@ -65,5 +64,3 @@ public: }; } // namespace Spreadsheet - -#endif // DISPLAYUNIT_H diff --git a/src/Mod/Spreadsheet/App/PreCompiled.h b/src/Mod/Spreadsheet/App/PreCompiled.h index 02547f212b..3680f3bb16 100644 --- a/src/Mod/Spreadsheet/App/PreCompiled.h +++ b/src/Mod/Spreadsheet/App/PreCompiled.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef SPREADSHEET_APP_PRECOMPILED_H -#define SPREADSHEET_APP_PRECOMPILED_H +#pragma once #include @@ -47,5 +46,3 @@ // Qt #include - -#endif // SPREADSHEET_APP_PRECOMPILED_H diff --git a/src/Mod/Spreadsheet/App/PropertyColumnWidths.h b/src/Mod/Spreadsheet/App/PropertyColumnWidths.h index bfc8f96278..5e81585263 100644 --- a/src/Mod/Spreadsheet/App/PropertyColumnWidths.h +++ b/src/Mod/Spreadsheet/App/PropertyColumnWidths.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PROPERTYCOLUMNWIDTHS_H -#define PROPERTYCOLUMNWIDTHS_H +#pragma once #include #include @@ -97,5 +96,3 @@ private: }; } // namespace Spreadsheet - -#endif // PROPERTYCOLUMNWIDTHS_H diff --git a/src/Mod/Spreadsheet/App/PropertyRowHeights.h b/src/Mod/Spreadsheet/App/PropertyRowHeights.h index 5d5c8e954e..d404fa7073 100644 --- a/src/Mod/Spreadsheet/App/PropertyRowHeights.h +++ b/src/Mod/Spreadsheet/App/PropertyRowHeights.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PROPERTYROWHEIGHTS_H -#define PROPERTYROWHEIGHTS_H +#pragma once #include #include @@ -96,5 +95,3 @@ private: }; } // namespace Spreadsheet - -#endif // PROPERTYROWHEIGHTS_H diff --git a/src/Mod/Spreadsheet/App/PropertySheet.h b/src/Mod/Spreadsheet/App/PropertySheet.h index eed815c477..98871e27bb 100644 --- a/src/Mod/Spreadsheet/App/PropertySheet.h +++ b/src/Mod/Spreadsheet/App/PropertySheet.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PROPERTYSHEET_H -#define PROPERTYSHEET_H +#pragma once #ifdef _MSC_VER # ifdef PropertySheet @@ -360,4 +359,3 @@ private: }; } // namespace Spreadsheet -#endif // PROPERTYSHEET_H diff --git a/src/Mod/Spreadsheet/App/Sheet.h b/src/Mod/Spreadsheet/App/Sheet.h index 74ff2c11cc..afa5dd8ac0 100644 --- a/src/Mod/Spreadsheet/App/Sheet.h +++ b/src/Mod/Spreadsheet/App/Sheet.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SRC_MOD_SPREADSHEET_APP_SHEET_H_ -#define SRC_MOD_SPREADSHEET_APP_SHEET_H_ +#pragma once #ifdef signals # undef signals @@ -317,6 +316,3 @@ protected: using SheetPython = App::FeaturePythonT; } // namespace Spreadsheet - - -#endif // SRC_MOD_SPREADSHEET_APP_SHEET_H_ diff --git a/src/Mod/Spreadsheet/App/SheetObserver.h b/src/Mod/Spreadsheet/App/SheetObserver.h index 9dce56aa74..b8656ea7be 100644 --- a/src/Mod/Spreadsheet/App/SheetObserver.h +++ b/src/Mod/Spreadsheet/App/SheetObserver.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SHEETOBSERVER_H -#define SHEETOBSERVER_H +#pragma once #include @@ -55,5 +54,3 @@ private: }; } // namespace Spreadsheet - -#endif // SHEETOBSERVER_H diff --git a/src/Mod/Spreadsheet/App/Utils.h b/src/Mod/Spreadsheet/App/Utils.h index db17239a79..20fea1b9f2 100644 --- a/src/Mod/Spreadsheet/App/Utils.h +++ b/src/Mod/Spreadsheet/App/Utils.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef UTILS_H -#define UTILS_H +#pragma once #include #include @@ -47,5 +46,3 @@ SpreadsheetExport std::string quote(const std::string& input); SpreadsheetExport std::string unquote(const std::string& input); } // namespace Spreadsheet - -#endif // UTILS_H diff --git a/src/Mod/Spreadsheet/Gui/DlgBindSheet.h b/src/Mod/Spreadsheet/Gui/DlgBindSheet.h index 9198576e18..78af340e24 100644 --- a/src/Mod/Spreadsheet/Gui/DlgBindSheet.h +++ b/src/Mod/Spreadsheet/Gui/DlgBindSheet.h @@ -22,8 +22,7 @@ * * ****************************************************************************/ -#ifndef DLG_BINDSHEET_H -#define DLG_BINDSHEET_H +#pragma once #include #include @@ -60,5 +59,3 @@ private: }; } // namespace SpreadsheetGui - -#endif // DLG_BINDSHEET_H diff --git a/src/Mod/Spreadsheet/Gui/DlgSettingsImp.h b/src/Mod/Spreadsheet/Gui/DlgSettingsImp.h index b4c0a47802..7ab216c603 100644 --- a/src/Mod/Spreadsheet/Gui/DlgSettingsImp.h +++ b/src/Mod/Spreadsheet/Gui/DlgSettingsImp.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef SPREADSHEETGUI_DLGSETTINGSIMP_H -#define SPREADSHEETGUI_DLGSETTINGSIMP_H +#pragma once #include #include @@ -56,5 +55,3 @@ private: }; } // namespace SpreadsheetGui - -#endif // SPREADSHEETGUI_DLGSETTINGSIMP_H diff --git a/src/Mod/Spreadsheet/Gui/DlgSheetConf.h b/src/Mod/Spreadsheet/Gui/DlgSheetConf.h index d5ab0db2cf..17f1b6b0cd 100644 --- a/src/Mod/Spreadsheet/Gui/DlgSheetConf.h +++ b/src/Mod/Spreadsheet/Gui/DlgSheetConf.h @@ -22,8 +22,7 @@ * * ****************************************************************************/ -#ifndef DLG_SHEETCONF_H -#define DLG_SHEETCONF_H +#pragma once #include #include @@ -63,5 +62,3 @@ private: }; } // namespace SpreadsheetGui - -#endif // DLG_SHEETCONF_H diff --git a/src/Mod/Spreadsheet/Gui/LineEdit.h b/src/Mod/Spreadsheet/Gui/LineEdit.h index c1dcbff04a..80847c5b7e 100644 --- a/src/Mod/Spreadsheet/Gui/LineEdit.h +++ b/src/Mod/Spreadsheet/Gui/LineEdit.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef LINEEDIT_H -#define LINEEDIT_H +#pragma once #include #include @@ -69,5 +68,3 @@ protected: }; } // namespace SpreadsheetGui - -#endif // LINEEDIT_H diff --git a/src/Mod/Spreadsheet/Gui/PreCompiled.h b/src/Mod/Spreadsheet/Gui/PreCompiled.h index 0cf699cc28..762ae4cab7 100644 --- a/src/Mod/Spreadsheet/Gui/PreCompiled.h +++ b/src/Mod/Spreadsheet/Gui/PreCompiled.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef SPREADSHEET_GUI_PRECOMPILED_H -#define SPREADSHEET_GUI_PRECOMPILED_H +#pragma once #include @@ -41,5 +40,3 @@ // Qt Toolkit #include - -#endif // SPREADSHEET_GUI_PRECOMPILED_H diff --git a/src/Mod/Spreadsheet/Gui/PropertiesDialog.h b/src/Mod/Spreadsheet/Gui/PropertiesDialog.h index bdd6987250..84ee17f96c 100644 --- a/src/Mod/Spreadsheet/Gui/PropertiesDialog.h +++ b/src/Mod/Spreadsheet/Gui/PropertiesDialog.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PROPERTIESDIALOG_H -#define PROPERTIESDIALOG_H +#pragma once #include #include @@ -82,5 +81,3 @@ private: }; } // namespace SpreadsheetGui - -#endif // PROPERTIESDIALOG_H diff --git a/src/Mod/Spreadsheet/Gui/SheetModel.h b/src/Mod/Spreadsheet/Gui/SheetModel.h index 9defe58696..2b69c79dc7 100644 --- a/src/Mod/Spreadsheet/Gui/SheetModel.h +++ b/src/Mod/Spreadsheet/Gui/SheetModel.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SHEETMODEL_H -#define SHEETMODEL_H +#pragma once #include @@ -74,5 +73,3 @@ private: }; } // namespace SpreadsheetGui - -#endif // SHEETMODEL_H diff --git a/src/Mod/Spreadsheet/Gui/SheetTableView.h b/src/Mod/Spreadsheet/Gui/SheetTableView.h index 07890b5a32..263891d43f 100644 --- a/src/Mod/Spreadsheet/Gui/SheetTableView.h +++ b/src/Mod/Spreadsheet/Gui/SheetTableView.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SHEETTABLEVIEW_H -#define SHEETTABLEVIEW_H +#pragma once #include #include @@ -130,5 +129,3 @@ protected: }; } // namespace SpreadsheetGui - -#endif // SHEETTABLEVIEW_H diff --git a/src/Mod/Spreadsheet/Gui/SheetTableViewAccessibleInterface.h b/src/Mod/Spreadsheet/Gui/SheetTableViewAccessibleInterface.h index 76ffa7ff02..56c0a82ec0 100644 --- a/src/Mod/Spreadsheet/Gui/SheetTableViewAccessibleInterface.h +++ b/src/Mod/Spreadsheet/Gui/SheetTableViewAccessibleInterface.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef SHEETTABLEVIEW_INTERFACE_H -#define SHEETTABLEVIEW_INTERFACE_H +#pragma once #include #include @@ -57,5 +56,3 @@ public: static QAccessibleInterface* ifactory(const QString& key, QObject* obj); }; } // namespace SpreadsheetGui - -#endif // SHEETTABLEVIEW_INTERFACE_H diff --git a/src/Mod/Spreadsheet/Gui/SpreadsheetDelegate.h b/src/Mod/Spreadsheet/Gui/SpreadsheetDelegate.h index 60ed2cf5cd..e22e2881eb 100644 --- a/src/Mod/Spreadsheet/Gui/SpreadsheetDelegate.h +++ b/src/Mod/Spreadsheet/Gui/SpreadsheetDelegate.h @@ -24,8 +24,7 @@ * * ***************************************************************************/ -#ifndef SPREADSHEETDELEGATE_H -#define SPREADSHEETDELEGATE_H +#pragma once #include @@ -66,5 +65,3 @@ private: }; } // namespace SpreadsheetGui - -#endif // SPREADSHEETDELEGATE_H diff --git a/src/Mod/Spreadsheet/Gui/SpreadsheetView.h b/src/Mod/Spreadsheet/Gui/SpreadsheetView.h index 6231733e6b..4fbefca62b 100644 --- a/src/Mod/Spreadsheet/Gui/SpreadsheetView.h +++ b/src/Mod/Spreadsheet/Gui/SpreadsheetView.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SpreadsheetView_H -#define SpreadsheetView_H +#pragma once #include @@ -174,5 +173,3 @@ protected: }; } // namespace SpreadsheetGui - -#endif // SpreadsheetView_H diff --git a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.h b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.h index 3b57e04b1b..ffd12d6d8c 100644 --- a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.h +++ b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef SPREADSHEET_ViewProviderImagePlane_H -#define SPREADSHEET_ViewProviderImagePlane_H +#pragma once #include @@ -93,6 +92,3 @@ private: using ViewProviderSheetPython = Gui::ViewProviderFeaturePythonT; } // namespace SpreadsheetGui - - -#endif // SPREADSHEET_ViewProviderSpreadsheet_H diff --git a/src/Mod/Spreadsheet/Gui/Workbench.h b/src/Mod/Spreadsheet/Gui/Workbench.h index c1ac808dd1..b6f1495b97 100644 --- a/src/Mod/Spreadsheet/Gui/Workbench.h +++ b/src/Mod/Spreadsheet/Gui/Workbench.h @@ -24,8 +24,7 @@ ***************************************************************************/ -#ifndef SPREADSHEET_WORKBENCH_H -#define SPREADSHEET_WORKBENCH_H +#pragma once #include #include @@ -69,6 +68,3 @@ protected: }; } // namespace SpreadsheetGui - - -#endif // SPREADSHEET_WORKBENCH_H diff --git a/src/Mod/Spreadsheet/Gui/ZoomableView.h b/src/Mod/Spreadsheet/Gui/ZoomableView.h index 673d84ba97..6aec336b97 100644 --- a/src/Mod/Spreadsheet/Gui/ZoomableView.h +++ b/src/Mod/Spreadsheet/Gui/ZoomableView.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef ZOOMABLEVIEW_H -#define ZOOMABLEVIEW_H +#pragma once #include @@ -79,5 +78,3 @@ protected: static constexpr int zoom_step_mwheel {5}, zoom_step_kb {10}; }; - -#endif // ZOOMABLEVIEW_H diff --git a/src/Mod/Spreadsheet/Gui/qtcolorpicker.h b/src/Mod/Spreadsheet/Gui/qtcolorpicker.h index 96aaed0d4f..7ef7b03231 100644 --- a/src/Mod/Spreadsheet/Gui/qtcolorpicker.h +++ b/src/Mod/Spreadsheet/Gui/qtcolorpicker.h @@ -47,8 +47,7 @@ ****************************************************************************/ // clang-format off -#ifndef QTCOLORPICKER_H -#define QTCOLORPICKER_H +#pragma once #include #include #include @@ -122,5 +121,4 @@ private: bool firstInserted; }; -#endif // clang-format on diff --git a/src/Mod/Spreadsheet/SpreadsheetGlobal.h b/src/Mod/Spreadsheet/SpreadsheetGlobal.h index c0e9b15e27..d3ff9ec8b3 100644 --- a/src/Mod/Spreadsheet/SpreadsheetGlobal.h +++ b/src/Mod/Spreadsheet/SpreadsheetGlobal.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SPREADSHEET_GLOBAL_H -#define SPREADSHEET_GLOBAL_H +#pragma once #include @@ -45,5 +44,3 @@ # define SpreadsheetGuiExport FREECAD_DECL_IMPORT # endif #endif - -#endif // SPREADSHEET_GLOBAL_H diff --git a/src/Mod/Start/App/CustomFolderModel.h b/src/Mod/Start/App/CustomFolderModel.h index 050090967e..871eed9b85 100644 --- a/src/Mod/Start/App/CustomFolderModel.h +++ b/src/Mod/Start/App/CustomFolderModel.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FREECAD_START_CUSTOMFOLDERMODEL_H -#define FREECAD_START_CUSTOMFOLDERMODEL_H +#pragma once #include #include @@ -50,5 +49,3 @@ private: }; } // namespace Start - -#endif // FREECAD_START_CUSTOMFOLDERMODEL_H diff --git a/src/Mod/Start/App/DisplayedFilesModel.h b/src/Mod/Start/App/DisplayedFilesModel.h index e9bca126f9..8219090c27 100644 --- a/src/Mod/Start/App/DisplayedFilesModel.h +++ b/src/Mod/Start/App/DisplayedFilesModel.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FREECAD_START_DISPLAYED_FILES_MODEL_H -#define FREECAD_START_DISPLAYED_FILES_MODEL_H +#pragma once #include #include @@ -78,5 +77,3 @@ private: }; } // namespace Start - -#endif // FREECAD_START_DISPLAYED_FILES_MODEL_H diff --git a/src/Mod/Start/App/ExamplesModel.h b/src/Mod/Start/App/ExamplesModel.h index 73d36bcdf7..19959575c3 100644 --- a/src/Mod/Start/App/ExamplesModel.h +++ b/src/Mod/Start/App/ExamplesModel.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FREECAD_START_EXAMPLESMODEL_H -#define FREECAD_START_EXAMPLESMODEL_H +#pragma once #include #include @@ -49,5 +48,3 @@ private: }; } // namespace Start - -#endif // FREECAD_START_EXAMPLESMODEL_H diff --git a/src/Mod/Start/App/FileUtilities.h b/src/Mod/Start/App/FileUtilities.h index 7d46c2c691..ddc07cf9b4 100644 --- a/src/Mod/Start/App/FileUtilities.h +++ b/src/Mod/Start/App/FileUtilities.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FREECAD_FILEUTILITIES_H -#define FREECAD_FILEUTILITIES_H +#pragma once #include "Base/FileInfo.h" #include "Mod/Start/StartGlobal.h" @@ -62,5 +61,3 @@ StartExport std::string humanReadableSize(std::uint64_t bytes); StartExport std::string getLastModifiedAsString(const Base::FileInfo& file); } // namespace Start - -#endif // FREECAD_FILEUTILITIES_H diff --git a/src/Mod/Start/App/PreCompiled.h b/src/Mod/Start/App/PreCompiled.h index 3e7db2aa11..35c5ef1ded 100644 --- a/src/Mod/Start/App/PreCompiled.h +++ b/src/Mod/Start/App/PreCompiled.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef START_PRECOMPILED_H -#define START_PRECOMPILED_H +#pragma once #include @@ -59,5 +58,3 @@ #include #include #include - -#endif // START_PRECOMPILED_H diff --git a/src/Mod/Start/App/RecentFilesModel.h b/src/Mod/Start/App/RecentFilesModel.h index b487bd2817..935196a74c 100644 --- a/src/Mod/Start/App/RecentFilesModel.h +++ b/src/Mod/Start/App/RecentFilesModel.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FREECAD_START_RECENTFILESMODEL_H -#define FREECAD_START_RECENTFILESMODEL_H +#pragma once #include #include @@ -48,5 +47,3 @@ private: }; } // namespace Start - -#endif // FREECAD_START_RECENTFILESMODEL_H diff --git a/src/Mod/Start/App/ThumbnailSource.h b/src/Mod/Start/App/ThumbnailSource.h index 17b491ba83..dfb6ca80dc 100644 --- a/src/Mod/Start/App/ThumbnailSource.h +++ b/src/Mod/Start/App/ThumbnailSource.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FREECAD_THUMBNAIL_SOURCE_H -#define FREECAD_THUMBNAIL_SOURCE_H +#pragma once #include #include @@ -81,5 +80,3 @@ private: }; } // namespace Start - -#endif // FREECAD_THUMBNAIL_SOURCE_H diff --git a/src/Mod/Start/Gui/DlgStartPreferencesImp.h b/src/Mod/Start/Gui/DlgStartPreferencesImp.h index 5f42b50281..b55abde230 100644 --- a/src/Mod/Start/Gui/DlgStartPreferencesImp.h +++ b/src/Mod/Start/Gui/DlgStartPreferencesImp.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef STARTGUI_DLGSTARTPREFERENCESIMP_H -#define STARTGUI_DLGSTARTPREFERENCESIMP_H +#pragma once #include #include @@ -50,5 +49,3 @@ private: }; } // namespace StartGui - -#endif // STARTGUI_DLGSTARTPREFERENCESIMP_H diff --git a/src/Mod/Start/Gui/FileCardDelegate.h b/src/Mod/Start/Gui/FileCardDelegate.h index 0e12b64ced..f074f1f472 100644 --- a/src/Mod/Start/Gui/FileCardDelegate.h +++ b/src/Mod/Start/Gui/FileCardDelegate.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FREECAD_START_FILECARDDELEGATE_H -#define FREECAD_START_FILECARDDELEGATE_H +#pragma once #include #include @@ -61,6 +60,3 @@ private: static QCache _thumbnailCache; // cache key structure: "path:modtime:size" static constexpr const int CACHE_SIZE_MB = 50; // 50MB cache limit }; - - -#endif // FREECAD_START_FILECARDDELEGATE_H diff --git a/src/Mod/Start/Gui/FileCardView.h b/src/Mod/Start/Gui/FileCardView.h index febeedd7a9..c030c770cc 100644 --- a/src/Mod/Start/Gui/FileCardView.h +++ b/src/Mod/Start/Gui/FileCardView.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FREECAD_START_FILECARDVIEW_H -#define FREECAD_START_FILECARDVIEW_H +#pragma once #include @@ -45,5 +44,3 @@ private: }; } // namespace StartGui - -#endif // FREECAD_START_FILECARDVIEW_H diff --git a/src/Mod/Start/Gui/FirstStartWidget.h b/src/Mod/Start/Gui/FirstStartWidget.h index 7a5b4505c6..e101b4ef5d 100644 --- a/src/Mod/Start/Gui/FirstStartWidget.h +++ b/src/Mod/Start/Gui/FirstStartWidget.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FREECAD_FIRSTSTARTWIDGET_H -#define FREECAD_FIRSTSTARTWIDGET_H +#pragma once #include #include @@ -57,5 +56,3 @@ private: }; } // namespace StartGui - -#endif // FREECAD_FIRSTSTARTWIDGET_H diff --git a/src/Mod/Start/Gui/FlowLayout.h b/src/Mod/Start/Gui/FlowLayout.h index 575a348d6b..01941e1090 100644 --- a/src/Mod/Start/Gui/FlowLayout.h +++ b/src/Mod/Start/Gui/FlowLayout.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef FREECAD_FLOWLAYOUT_H -#define FREECAD_FLOWLAYOUT_H +#pragma once #include #include @@ -68,5 +67,3 @@ private: }; } // namespace StartGui - -#endif // FREECAD_FLOWLAYOUT_H diff --git a/src/Mod/Start/Gui/GeneralSettingsWidget.h b/src/Mod/Start/Gui/GeneralSettingsWidget.h index 7f596d83ee..d43bf732f6 100644 --- a/src/Mod/Start/Gui/GeneralSettingsWidget.h +++ b/src/Mod/Start/Gui/GeneralSettingsWidget.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FREECAD_START_GENERALSETTINGSWIDGET_H -#define FREECAD_START_GENERALSETTINGSWIDGET_H +#pragma once #include #include @@ -68,5 +67,3 @@ private: }; } // namespace StartGui - -#endif // FREECAD_START_GENERALSETTINGSWIDGET_H diff --git a/src/Mod/Start/Gui/Manipulator.h b/src/Mod/Start/Gui/Manipulator.h index a2e08e9a98..f4fbb6430a 100644 --- a/src/Mod/Start/Gui/Manipulator.h +++ b/src/Mod/Start/Gui/Manipulator.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FREECAD_MANIPULATOR_H -#define FREECAD_MANIPULATOR_H +#pragma once #include @@ -39,5 +38,3 @@ protected: }; } // namespace StartGui - -#endif // FREECAD_MANIPULATOR_H diff --git a/src/Mod/Start/Gui/NewFileButton.h b/src/Mod/Start/Gui/NewFileButton.h index 452e78923a..b25b391cec 100644 --- a/src/Mod/Start/Gui/NewFileButton.h +++ b/src/Mod/Start/Gui/NewFileButton.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FREECAD_NEWFILEBUTTON_H -#define FREECAD_NEWFILEBUTTON_H +#pragma once #include #include @@ -60,5 +59,3 @@ protected: }; } // namespace StartGui - -#endif // FREECAD_NEWFILEBUTTON_H diff --git a/src/Mod/Start/Gui/PreCompiled.h b/src/Mod/Start/Gui/PreCompiled.h index d5af8c97d3..e3bbea5be7 100644 --- a/src/Mod/Start/Gui/PreCompiled.h +++ b/src/Mod/Start/Gui/PreCompiled.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef STARTGUI_PRECOMPILED_H -#define STARTGUI_PRECOMPILED_H +#pragma once #include @@ -69,5 +68,3 @@ #include #include #include - -#endif // STARTGUI_PRECOMPILED_H diff --git a/src/Mod/Start/Gui/StartView.h b/src/Mod/Start/Gui/StartView.h index 59d63aeda1..943f57f677 100644 --- a/src/Mod/Start/Gui/StartView.h +++ b/src/Mod/Start/Gui/StartView.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FREECAD_STARTVIEW_H -#define FREECAD_STARTVIEW_H +#pragma once #include #include @@ -123,5 +122,3 @@ private: }; // namespace StartGui } // namespace StartGui - -#endif // FREECAD_STARTVIEW_H diff --git a/src/Mod/Start/Gui/ThemeSelectorWidget.h b/src/Mod/Start/Gui/ThemeSelectorWidget.h index 0819d34aba..abb084b89a 100644 --- a/src/Mod/Start/Gui/ThemeSelectorWidget.h +++ b/src/Mod/Start/Gui/ThemeSelectorWidget.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef FREECAD_START_THEMESELECTORWIDGET_H -#define FREECAD_START_THEMESELECTORWIDGET_H +#pragma once #include #include @@ -65,5 +64,3 @@ private: }; } // namespace StartGui - -#endif // FREECAD_START_THEMESELECTORWIDGET_H diff --git a/src/Mod/Start/StartGlobal.h b/src/Mod/Start/StartGlobal.h index 1be93dbfbb..09ff359cab 100644 --- a/src/Mod/Start/StartGlobal.h +++ b/src/Mod/Start/StartGlobal.h @@ -23,26 +23,23 @@ #include -#ifndef LAUNCHER_GLOBAL_H -# define LAUNCHER_GLOBAL_H +#pragma once // Start -# ifndef StartExport -# ifdef Start_EXPORTS -# define StartExport FREECAD_DECL_EXPORT -# else -# define StartExport FREECAD_DECL_IMPORT -# endif +#ifndef StartExport +# ifdef Start_EXPORTS +# define StartExport FREECAD_DECL_EXPORT +# else +# define StartExport FREECAD_DECL_IMPORT # endif +#endif // StartGui -# ifndef StartGuiExport -# ifdef StartGui_EXPORTS -# define StartGuiExport FREECAD_DECL_EXPORT -# else -# define StartGuiExport FREECAD_DECL_IMPORT -# endif +#ifndef StartGuiExport +# ifdef StartGui_EXPORTS +# define StartGuiExport FREECAD_DECL_EXPORT +# else +# define StartGuiExport FREECAD_DECL_IMPORT # endif - -#endif // LAUNCHER_GLOBAL_H +#endif diff --git a/src/Mod/Surface/App/Blending/BlendCurve.h b/src/Mod/Surface/App/Blending/BlendCurve.h index 6408285ba1..56dbec8256 100644 --- a/src/Mod/Surface/App/Blending/BlendCurve.h +++ b/src/Mod/Surface/App/Blending/BlendCurve.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SURFACE_BLEND_CURVE_H -#define SURFACE_BLEND_CURVE_H +#pragma once #include #include @@ -60,5 +59,3 @@ public: void setSize(int, double, bool); }; } // namespace Surface - -#endif diff --git a/src/Mod/Surface/App/Blending/BlendPoint.h b/src/Mod/Surface/App/Blending/BlendPoint.h index 460c36e4f9..df9b64a230 100644 --- a/src/Mod/Surface/App/Blending/BlendPoint.h +++ b/src/Mod/Surface/App/Blending/BlendPoint.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SURFACE_BLEND_POINT_H -#define SURFACE_BLEND_POINT_H +#pragma once #include @@ -73,5 +72,3 @@ public: private: }; } // namespace Surface - -#endif diff --git a/src/Mod/Surface/App/Blending/FeatureBlendCurve.h b/src/Mod/Surface/App/Blending/FeatureBlendCurve.h index 212695e9fd..407369f5be 100644 --- a/src/Mod/Surface/App/Blending/FeatureBlendCurve.h +++ b/src/Mod/Surface/App/Blending/FeatureBlendCurve.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef FEATURE_BLEND_CURVE_H -#define FEATURE_BLEND_CURVE_H +#pragma once #include #include @@ -74,5 +73,3 @@ protected: }; } // Namespace Surface - -#endif diff --git a/src/Mod/Surface/App/FeatureCut.h b/src/Mod/Surface/App/FeatureCut.h index b4167472a7..28654b8ccd 100644 --- a/src/Mod/Surface/App/FeatureCut.h +++ b/src/Mod/Surface/App/FeatureCut.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SURFACE_FEATURECUT_H -#define SURFACE_FEATURECUT_H +#pragma once #include #include @@ -52,5 +51,3 @@ public: }; } // Namespace Surface - -#endif diff --git a/src/Mod/Surface/App/FeatureExtend.h b/src/Mod/Surface/App/FeatureExtend.h index 33cad12425..96b054d88f 100644 --- a/src/Mod/Surface/App/FeatureExtend.h +++ b/src/Mod/Surface/App/FeatureExtend.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SURFACE_FEATUREEXTEND_H -#define SURFACE_FEATUREEXTEND_H +#pragma once #include #include @@ -73,5 +72,3 @@ private: }; } // Namespace Surface - -#endif diff --git a/src/Mod/Surface/App/FeatureFilling.h b/src/Mod/Surface/App/FeatureFilling.h index 635024f547..61061a4048 100644 --- a/src/Mod/Surface/App/FeatureFilling.h +++ b/src/Mod/Surface/App/FeatureFilling.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SURFACE_FEATUREFILLING_H -#define SURFACE_FEATUREFILLING_H +#pragma once #include #include @@ -94,5 +93,3 @@ private: }; } // Namespace Surface - -#endif diff --git a/src/Mod/Surface/App/FeatureGeomFillSurface.h b/src/Mod/Surface/App/FeatureGeomFillSurface.h index 840316d6d9..127e81af7e 100644 --- a/src/Mod/Surface/App/FeatureGeomFillSurface.h +++ b/src/Mod/Surface/App/FeatureGeomFillSurface.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef FEATUREGEOMFILLSURFACE_H -#define FEATUREGEOMFILLSURFACE_H +#pragma once #include #include @@ -98,5 +97,3 @@ private: }; } // namespace Surface - -#endif // FEATUREGEOMFILLSURFACE_H diff --git a/src/Mod/Surface/App/FeatureSections.h b/src/Mod/Surface/App/FeatureSections.h index 2e70516eae..a215c0686c 100644 --- a/src/Mod/Surface/App/FeatureSections.h +++ b/src/Mod/Surface/App/FeatureSections.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SURFACE_FEATURESECTIONS_H -#define SURFACE_FEATURESECTIONS_H +#pragma once #include #include @@ -52,5 +51,3 @@ public: }; } // Namespace Surface - -#endif diff --git a/src/Mod/Surface/App/FeatureSewing.h b/src/Mod/Surface/App/FeatureSewing.h index 086098fb43..9811a5ca51 100644 --- a/src/Mod/Surface/App/FeatureSewing.h +++ b/src/Mod/Surface/App/FeatureSewing.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SURFACE_FEATURESEWING_H -#define SURFACE_FEATURESEWING_H +#pragma once #include #include @@ -54,5 +53,3 @@ public: }; } // Namespace Surface - -#endif // SURFACE_FEATURESEWING_H diff --git a/src/Mod/Surface/App/Measure.h b/src/Mod/Surface/App/Measure.h index bd6122b840..7d3b36d4c2 100644 --- a/src/Mod/Surface/App/Measure.h +++ b/src/Mod/Surface/App/Measure.h @@ -21,8 +21,7 @@ //! a class for establishing our connection with the unified measurement facility -#ifndef SURFACE_MEASURE_H -#define SURFACE_MEASURE_H +#pragma once #include @@ -39,5 +38,3 @@ public: } // namespace Surface - -#endif diff --git a/src/Mod/Surface/App/PreCompiled.h b/src/Mod/Surface/App/PreCompiled.h index fd1ae8e3a7..79924f3ee3 100644 --- a/src/Mod/Surface/App/PreCompiled.h +++ b/src/Mod/Surface/App/PreCompiled.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef PRECOMPILED_H -#define PRECOMPILED_H +#pragma once #include @@ -32,5 +31,3 @@ // opencascade #include - -#endif diff --git a/src/Mod/Surface/Gui/Blending/TaskBlendCurve.h b/src/Mod/Surface/Gui/Blending/TaskBlendCurve.h index 25cb2451a1..594af867d2 100644 --- a/src/Mod/Surface/Gui/Blending/TaskBlendCurve.h +++ b/src/Mod/Surface/Gui/Blending/TaskBlendCurve.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef SURFACEGUI_TASKBLENDCURVE_H -#define SURFACEGUI_TASKBLENDCURVE_H +#pragma once #include @@ -127,5 +126,3 @@ private: }; } // namespace SurfaceGui - -#endif // SURFACEGUI_TASKBLENDCURVE_H diff --git a/src/Mod/Surface/Gui/Blending/ViewProviderBlendCurve.h b/src/Mod/Surface/Gui/Blending/ViewProviderBlendCurve.h index 523bd5a31d..eab29e9360 100644 --- a/src/Mod/Surface/Gui/Blending/ViewProviderBlendCurve.h +++ b/src/Mod/Surface/Gui/Blending/ViewProviderBlendCurve.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SURFACEGUI_VIEWPROVIDERBLENDCURVE_H -#define SURFACEGUI_VIEWPROVIDERBLENDCURVE_H +#pragma once #include @@ -44,5 +43,3 @@ protected: }; } // namespace SurfaceGui - -#endif // SURFACEGUI_VIEWPROVIDEREXTEND_H diff --git a/src/Mod/Surface/Gui/PreCompiled.h b/src/Mod/Surface/Gui/PreCompiled.h index a38b1d12d7..bebe8fa0e8 100644 --- a/src/Mod/Surface/Gui/PreCompiled.h +++ b/src/Mod/Surface/Gui/PreCompiled.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SURFACE_GUI_PRECOMPILED_H -#define SURFACE_GUI_PRECOMPILED_H +#pragma once #include @@ -47,5 +46,3 @@ #include #include #include - -#endif // GUI_PRECOMPILED_H diff --git a/src/Mod/Surface/Gui/SelectionMode.h b/src/Mod/Surface/Gui/SelectionMode.h index aaba5f9f3f..3b06b35781 100644 --- a/src/Mod/Surface/Gui/SelectionMode.h +++ b/src/Mod/Surface/Gui/SelectionMode.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SURFACEGUI_SELECTIONMODE_H -#define SURFACEGUI_SELECTIONMODE_H +#pragma once namespace SurfaceGui { @@ -41,5 +40,3 @@ enum SelectionMode }; } // namespace SurfaceGui - -#endif // SURFACEGUI_SELECTIONMODE_H diff --git a/src/Mod/Surface/Gui/TaskFilling.h b/src/Mod/Surface/Gui/TaskFilling.h index 66089103ec..fc63b5f384 100644 --- a/src/Mod/Surface/Gui/TaskFilling.h +++ b/src/Mod/Surface/Gui/TaskFilling.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SURFACEGUI_TASKFILLING_H -#define SURFACEGUI_TASKFILLING_H +#pragma once #include #include @@ -154,5 +153,3 @@ private: }; } // namespace SurfaceGui - -#endif // SURFACEGUI_TASKFILLING_H diff --git a/src/Mod/Surface/Gui/TaskFillingEdge.h b/src/Mod/Surface/Gui/TaskFillingEdge.h index 1ced410036..ef42aeebf7 100644 --- a/src/Mod/Surface/Gui/TaskFillingEdge.h +++ b/src/Mod/Surface/Gui/TaskFillingEdge.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef SURFACEGUI_TASKFILLINGEDGE_H -#define SURFACEGUI_TASKFILLINGEDGE_H +#pragma once #include #include @@ -103,5 +102,3 @@ private: }; } // namespace SurfaceGui - -#endif // SURFACEGUI_TASKFILLINGEDGE_H diff --git a/src/Mod/Surface/Gui/TaskFillingVertex.h b/src/Mod/Surface/Gui/TaskFillingVertex.h index 79349bf579..c45992e95c 100644 --- a/src/Mod/Surface/Gui/TaskFillingVertex.h +++ b/src/Mod/Surface/Gui/TaskFillingVertex.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SURFACEGUI_TASKFILLINGVERTEX_H -#define SURFACEGUI_TASKFILLINGVERTEX_H +#pragma once #include #include @@ -97,5 +96,3 @@ private: }; } // namespace SurfaceGui - -#endif // SURFACEGUI_TASKFILLINGVERTEX_H diff --git a/src/Mod/Surface/Gui/TaskGeomFillSurface.h b/src/Mod/Surface/Gui/TaskGeomFillSurface.h index 0bde913692..676ff2423d 100644 --- a/src/Mod/Surface/Gui/TaskGeomFillSurface.h +++ b/src/Mod/Surface/Gui/TaskGeomFillSurface.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SURFACEGUI_TASKGEOMFILLSURFACE_H -#define SURFACEGUI_TASKGEOMFILLSURFACE_H +#pragma once #include @@ -140,5 +139,3 @@ private: }; } // namespace SurfaceGui - -#endif // SURFACEGUI_TASKGEOMFILLSURFACE_H diff --git a/src/Mod/Surface/Gui/TaskSections.h b/src/Mod/Surface/Gui/TaskSections.h index b40648151f..9053d886cd 100644 --- a/src/Mod/Surface/Gui/TaskSections.h +++ b/src/Mod/Surface/Gui/TaskSections.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SURFACEGUI_TASKSECTIONS_H -#define SURFACEGUI_TASKSECTIONS_H +#pragma once #include @@ -143,5 +142,3 @@ private: }; } // namespace SurfaceGui - -#endif // SURFACEGUI_TASKSECTIONS_H diff --git a/src/Mod/Surface/Gui/ViewProviderExtend.h b/src/Mod/Surface/Gui/ViewProviderExtend.h index e4e7f56c2b..0087a0be06 100644 --- a/src/Mod/Surface/Gui/ViewProviderExtend.h +++ b/src/Mod/Surface/Gui/ViewProviderExtend.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef SURFACEGUI_VIEWPROVIDEREXTEND_H -#define SURFACEGUI_VIEWPROVIDEREXTEND_H +#pragma once #include @@ -40,5 +39,3 @@ public: }; } // namespace SurfaceGui - -#endif // SURFACEGUI_VIEWPROVIDEREXTEND_H diff --git a/src/Mod/Surface/Gui/Workbench.h b/src/Mod/Surface/Gui/Workbench.h index 5b3e1087dd..19f666e400 100644 --- a/src/Mod/Surface/Gui/Workbench.h +++ b/src/Mod/Surface/Gui/Workbench.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef Surface_WORKBENCH_H -#define Surface_WORKBENCH_H +#pragma once #include @@ -45,6 +44,3 @@ protected: }; } // namespace SurfaceGui - - -#endif // Surface_WORKBENCH_H diff --git a/src/Mod/Surface/SurfaceGlobal.h b/src/Mod/Surface/SurfaceGlobal.h index 051ad62b73..df4a1c1c96 100644 --- a/src/Mod/Surface/SurfaceGlobal.h +++ b/src/Mod/Surface/SurfaceGlobal.h @@ -23,26 +23,23 @@ #include -#ifndef SURFACE_GLOBAL_H -# define SURFACE_GLOBAL_H +#pragma once // Surface -# ifndef SurfaceExport -# ifdef Surface_EXPORTS -# define SurfaceExport FREECAD_DECL_EXPORT -# else -# define SurfaceExport FREECAD_DECL_IMPORT -# endif +#ifndef SurfaceExport +# ifdef Surface_EXPORTS +# define SurfaceExport FREECAD_DECL_EXPORT +# else +# define SurfaceExport FREECAD_DECL_IMPORT # endif +#endif // SurfaceGui -# ifndef SurfaceGuiExport -# ifdef SurfaceGui_EXPORTS -# define SurfaceGuiExport FREECAD_DECL_EXPORT -# else -# define SurfaceGuiExport FREECAD_DECL_IMPORT -# endif +#ifndef SurfaceGuiExport +# ifdef SurfaceGui_EXPORTS +# define SurfaceGuiExport FREECAD_DECL_EXPORT +# else +# define SurfaceGuiExport FREECAD_DECL_IMPORT # endif - -#endif // SURFACE_GLOBAL_H +#endif diff --git a/src/Mod/TechDraw/App/ArrowPropEnum.h b/src/Mod/TechDraw/App/ArrowPropEnum.h index 7048f5bad7..8340c72edc 100644 --- a/src/Mod/TechDraw/App/ArrowPropEnum.h +++ b/src/Mod/TechDraw/App/ArrowPropEnum.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef ARROWENUMS_H_ -#define ARROWENUMS_H_ +#pragma once #include #include @@ -57,5 +56,4 @@ private: }; -} //end namespace TechDraw -#endif +} //end namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/BalloonPropEnum.h b/src/Mod/TechDraw/App/BalloonPropEnum.h index f60ddb014d..9e00843686 100644 --- a/src/Mod/TechDraw/App/BalloonPropEnum.h +++ b/src/Mod/TechDraw/App/BalloonPropEnum.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef BALLOONENUMS_H_ -#define BALLOONENUMS_H_ +#pragma once #include #include @@ -56,5 +55,4 @@ private: }; -} //end namespace TechDraw -#endif +} //end namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/CenterLine.h b/src/Mod/TechDraw/App/CenterLine.h index efdd9b6e0f..11548b2efd 100644 --- a/src/Mod/TechDraw/App/CenterLine.h +++ b/src/Mod/TechDraw/App/CenterLine.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAW_CENTERLINE_H -#define TECHDRAW_CENTERLINE_H +#pragma once #include #include @@ -182,6 +181,4 @@ protected: Py::Object PythonObject; }; -} // namespace TechDraw - -#endif // TECHDRAW_CENTERLINE_H +} // namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/Cosmetic.h b/src/Mod/TechDraw/App/Cosmetic.h index 7dca90306a..191fd1ef6c 100644 --- a/src/Mod/TechDraw/App/Cosmetic.h +++ b/src/Mod/TechDraw/App/Cosmetic.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAW_COSMETIC_H -#define TECHDRAW_COSMETIC_H +#pragma once #include @@ -119,6 +118,4 @@ protected: Py::Object PythonObject; }; -} //end namespace TechDraw - -#endif //TECHDRAW_COSMETIC_H +} //end namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/CosmeticExtension.h b/src/Mod/TechDraw/App/CosmeticExtension.h index 7b37e704dc..e7b8647fb7 100644 --- a/src/Mod/TechDraw/App/CosmeticExtension.h +++ b/src/Mod/TechDraw/App/CosmeticExtension.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAW_COSMETICEXTENSION_H -#define TECHDRAW_COSMETICEXTENSION_H +#pragma once #include #include @@ -107,6 +106,4 @@ private: using CosmeticExtensionPython = App::ExtensionPythonT; -} //end namespace TechDraw - -#endif //TECHDRAW_COSMETICEXTENSION_H +} //end namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/CosmeticVertex.h b/src/Mod/TechDraw/App/CosmeticVertex.h index 21e67315fa..58d478b11d 100644 --- a/src/Mod/TechDraw/App/CosmeticVertex.h +++ b/src/Mod/TechDraw/App/CosmeticVertex.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAW_COSMETIC_VERTEX_H -#define TECHDRAW_COSMETIC_VERTEX_H +#pragma once #include #include @@ -80,6 +79,4 @@ protected: Py::Object PythonObject; }; -} //end namespace TechDraw - -#endif // TECHDRAW_COSMETIC_VERTEX_H +} //end namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DimensionAutoCorrect.h b/src/Mod/TechDraw/App/DimensionAutoCorrect.h index fc56725108..77ebb66b4b 100644 --- a/src/Mod/TechDraw/App/DimensionAutoCorrect.h +++ b/src/Mod/TechDraw/App/DimensionAutoCorrect.h @@ -22,8 +22,7 @@ ***************************************************************************/ // a class to validate and correct dimension references -#ifndef DIMAUTOCORRECT_H -#define DIMAUTOCORRECT_H +#pragma once #include @@ -93,5 +92,4 @@ private: std::set m_3dObjectCache; }; -} // end namespace TechDraw -#endif +} // end namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DimensionFormatter.h b/src/Mod/TechDraw/App/DimensionFormatter.h index b348dfc7af..27c7f77b23 100644 --- a/src/Mod/TechDraw/App/DimensionFormatter.h +++ b/src/Mod/TechDraw/App/DimensionFormatter.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DIMENSIONFORMATTER_H -#define DIMENSIONFORMATTER_H +#pragma once #include @@ -66,5 +65,4 @@ private: DrawViewDimension* m_dimension {nullptr}; }; -} // end namespace TechDraw -#endif +} // end namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DimensionGeometry.h b/src/Mod/TechDraw/App/DimensionGeometry.h index da9dc69da9..b6e62ecedf 100644 --- a/src/Mod/TechDraw/App/DimensionGeometry.h +++ b/src/Mod/TechDraw/App/DimensionGeometry.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAW_DIMENSIONGEOMETRY_h_ -#define TECHDRAW_DIMENSIONGEOMETRY_h_ +#pragma once #include @@ -179,6 +178,4 @@ public: Base::Vector3d center; // this is geometric center of the outer face }; -} //end namespace TechDraw - -#endif +} //end namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DimensionReferences.h b/src/Mod/TechDraw/App/DimensionReferences.h index 6ddad92e51..9d7b56619e 100644 --- a/src/Mod/TechDraw/App/DimensionReferences.h +++ b/src/Mod/TechDraw/App/DimensionReferences.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAW_DIMENSIONREFERENCES_H -#define TECHDRAW_DIMENSIONREFERENCES_H +#pragma once #include @@ -101,6 +100,4 @@ private: using ReferenceVector = std::vector; -} // end namespace - -#endif //TECHDRAW_DIMENSIONREFERENCES_H +} // end namespace \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawBrokenView.h b/src/Mod/TechDraw/App/DrawBrokenView.h index 560e805f5b..3bd3b03369 100644 --- a/src/Mod/TechDraw/App/DrawBrokenView.h +++ b/src/Mod/TechDraw/App/DrawBrokenView.h @@ -25,8 +25,7 @@ //! DrawBrokenView produces a view of the Source shapes after a portion of the shapes //! has been removed. -#ifndef DRAWBROKENVIEW_H_ -#define DRAWBROKENVIEW_H_ +#pragma once #include @@ -174,7 +173,4 @@ private: using DrawBrokenViewPython = App::FeaturePythonT; -}//namespace TechDraw - -#endif - +}//namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawComplexSection.h b/src/Mod/TechDraw/App/DrawComplexSection.h index f81e4718c9..696dbcd3d5 100644 --- a/src/Mod/TechDraw/App/DrawComplexSection.h +++ b/src/Mod/TechDraw/App/DrawComplexSection.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DrawComplexSection_h_ -#define DrawComplexSection_h_ +#pragma once #include @@ -197,6 +196,4 @@ private: using DrawComplexSectionPython = App::FeaturePythonT; -}//namespace TechDraw - -#endif +}//namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawDimHelper.h b/src/Mod/TechDraw/App/DrawDimHelper.h index 6490ecfbc4..6b8f2b3a87 100644 --- a/src/Mod/TechDraw/App/DrawDimHelper.h +++ b/src/Mod/TechDraw/App/DrawDimHelper.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DrawDimHelper_h_ -#define DrawDimHelper_h_ +#pragma once #include #include @@ -78,5 +77,4 @@ class TechDrawExport DrawDimHelper { int direction); }; -} //end namespace TechDraw -#endif +} //end namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawGeomHatch.h b/src/Mod/TechDraw/App/DrawGeomHatch.h index 82dcc101bd..ab3ce40cb1 100644 --- a/src/Mod/TechDraw/App/DrawGeomHatch.h +++ b/src/Mod/TechDraw/App/DrawGeomHatch.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TechDraw_DrawGeomHatch_h_ -#define TechDraw_DrawGeomHatch_h_ +#pragma once #include #include @@ -124,5 +123,4 @@ using DrawGeomHatchPython = App::FeaturePythonT; -} //namespace TechDraw -#endif +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawHatch.h b/src/Mod/TechDraw/App/DrawHatch.h index 9414d1bb69..5a4af9733d 100644 --- a/src/Mod/TechDraw/App/DrawHatch.h +++ b/src/Mod/TechDraw/App/DrawHatch.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TechDraw_DrawHatch_h_ -#define TechDraw_DrawHatch_h_ +#pragma once #include #include @@ -84,5 +83,4 @@ private: using DrawHatchPython = App::FeaturePythonT; -} //namespace TechDraw -#endif +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawLeaderLine.h b/src/Mod/TechDraw/App/DrawLeaderLine.h index c7e8bb7381..f548411df7 100644 --- a/src/Mod/TechDraw/App/DrawLeaderLine.h +++ b/src/Mod/TechDraw/App/DrawLeaderLine.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TechDraw_DrawLeaderLine_h_ -#define TechDraw_DrawLeaderLine_h_ +#pragma once #include #include @@ -102,5 +101,4 @@ private: using DrawLeaderLinePython = App::FeaturePythonT; -} //namespace TechDraw -#endif +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawPage.h b/src/Mod/TechDraw/App/DrawPage.h index 4971539853..739f1f9b17 100644 --- a/src/Mod/TechDraw/App/DrawPage.h +++ b/src/Mod/TechDraw/App/DrawPage.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DrawPage_h_ -#define DrawPage_h_ +#pragma once #include @@ -131,7 +130,4 @@ private: using DrawPagePython = App::FeaturePythonT; -}//namespace TechDraw - - -#endif +}//namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawParametricTemplate.h b/src/Mod/TechDraw/App/DrawParametricTemplate.h index 38a22347fd..c305f066e9 100644 --- a/src/Mod/TechDraw/App/DrawParametricTemplate.h +++ b/src/Mod/TechDraw/App/DrawParametricTemplate.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAW_DrawParametricTemplate_h_ -#define TECHDRAW_DrawParametricTemplate_h_ +#pragma once #include #include @@ -91,8 +90,4 @@ private: using DrawParametricTemplatePython = App::FeaturePythonT; -} //namespace TechDraw - - - -#endif //_TECHDRAW_DrawParametricTemplate_h_ +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawProjGroup.h b/src/Mod/TechDraw/App/DrawProjGroup.h index 9589493699..83456d850c 100644 --- a/src/Mod/TechDraw/App/DrawProjGroup.h +++ b/src/Mod/TechDraw/App/DrawProjGroup.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAW_FEATUREVIEWGROUP_H_ -#define TECHDRAW_FEATUREVIEWGROUP_H_ +#pragma once #include @@ -208,6 +207,4 @@ protected: std::array bboxes); }; -} //namespace TechDraw - -#endif // TECHDRAW_FEATUREVIEWGROUP_H_ +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawProjGroupItem.h b/src/Mod/TechDraw/App/DrawProjGroupItem.h index 9c7131fd6b..a4c81e1ac4 100644 --- a/src/Mod/TechDraw/App/DrawProjGroupItem.h +++ b/src/Mod/TechDraw/App/DrawProjGroupItem.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DrawProjGroupItem_h_ -#define DrawProjGroupItem_h_ +#pragma once #include @@ -93,6 +92,4 @@ private: static const char* TypeEnums[]; }; -} //namespace TechDraw - -#endif +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawProjectSplit.h b/src/Mod/TechDraw/App/DrawProjectSplit.h index 6783e737f1..c9d86da687 100644 --- a/src/Mod/TechDraw/App/DrawProjectSplit.h +++ b/src/Mod/TechDraw/App/DrawProjectSplit.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DrawProjectSplit_h_ -#define DrawProjectSplit_h_ +#pragma once #include #include @@ -136,6 +135,4 @@ public: using DrawProjectSplitPython = App::FeaturePythonT; -} //namespace TechDraw - -#endif // #ifndef DrawProjectSplit_h_ +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawRichAnno.h b/src/Mod/TechDraw/App/DrawRichAnno.h index 52949406f1..199c20c791 100644 --- a/src/Mod/TechDraw/App/DrawRichAnno.h +++ b/src/Mod/TechDraw/App/DrawRichAnno.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TechDraw_DrawRichAnno_h_ -#define TechDraw_DrawRichAnno_h_ +#pragma once #include #include @@ -67,5 +66,4 @@ private: using DrawRichAnnoPython = App::FeaturePythonT; -} //namespace TechDraw -#endif +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawSVGTemplate.h b/src/Mod/TechDraw/App/DrawSVGTemplate.h index dc120eb361..b9d3d5deef 100644 --- a/src/Mod/TechDraw/App/DrawSVGTemplate.h +++ b/src/Mod/TechDraw/App/DrawSVGTemplate.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAW_DrawSVGTemplate_h_ -#define TECHDRAW_DrawSVGTemplate_h_ +#pragma once # include @@ -81,6 +80,4 @@ private: using DrawSVGTemplatePython = App::FeaturePythonT; -} //namespace TechDraw - -#endif //TECHDRAW_DrawSVGTemplate_h_ +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawTemplate.h b/src/Mod/TechDraw/App/DrawTemplate.h index 5178aeec26..b428cf655b 100644 --- a/src/Mod/TechDraw/App/DrawTemplate.h +++ b/src/Mod/TechDraw/App/DrawTemplate.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAW_DrawTemplate_h_ -#define TECHDRAW_DrawTemplate_h_ +#pragma once #include #include @@ -91,8 +90,4 @@ private: using DrawTemplatePython = App::FeaturePythonT; -} //namespace TechDraw - - - -#endif //TECHDRAW_DrawTemplate_h_ +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawTile.h b/src/Mod/TechDraw/App/DrawTile.h index 04c30e1323..e8a03802b2 100644 --- a/src/Mod/TechDraw/App/DrawTile.h +++ b/src/Mod/TechDraw/App/DrawTile.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TechDraw_DrawTile_h_ -#define TechDraw_DrawTile_h_ +#pragma once #include #include @@ -64,5 +63,4 @@ private: using DrawTilePython = App::FeaturePythonT; -} //namespace TechDraw -#endif +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawTileWeld.h b/src/Mod/TechDraw/App/DrawTileWeld.h index d8dd312087..a1be972c11 100644 --- a/src/Mod/TechDraw/App/DrawTileWeld.h +++ b/src/Mod/TechDraw/App/DrawTileWeld.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TechDraw_DrawTileWeld_h_ -#define TechDraw_DrawTileWeld_h_ +#pragma once #include #include @@ -68,5 +67,4 @@ private: using DrawTileWeldPython = App::FeaturePythonT; -} //namespace TechDraw -#endif +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawUtil.h b/src/Mod/TechDraw/App/DrawUtil.h index bcded6a3c5..a2b21f3139 100644 --- a/src/Mod/TechDraw/App/DrawUtil.h +++ b/src/Mod/TechDraw/App/DrawUtil.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DrawUtil_h_ -#define DrawUtil_h_ +#pragma once #include #include @@ -274,5 +273,4 @@ public: // GCC BUG 85282, wanting this to be outside class body. This is only the declaration, the definition .cpp //template<> std::string DrawUtil::formatVector(const Base::Vector3d &v); -}//end namespace TechDraw -#endif +}//end namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawView.h b/src/Mod/TechDraw/App/DrawView.h index e3a4a32573..832b7e4932 100644 --- a/src/Mod/TechDraw/App/DrawView.h +++ b/src/Mod/TechDraw/App/DrawView.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DrawView_h_ -#define DrawView_h_ +#pragma once #include #include @@ -151,6 +150,4 @@ private: using DrawViewPython = App::FeaturePythonT; -} //namespace TechDraw - -#endif +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawViewAnnotation.h b/src/Mod/TechDraw/App/DrawViewAnnotation.h index 8cf2711a6d..aef16f9fe1 100644 --- a/src/Mod/TechDraw/App/DrawViewAnnotation.h +++ b/src/Mod/TechDraw/App/DrawViewAnnotation.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef DrawViewAnnotation_h_ -#define DrawViewAnnotation_h_ +#pragma once #include #include @@ -82,7 +81,4 @@ private: using DrawViewAnnotationPython = App::FeaturePythonT; -} //namespace TechDraw - - -#endif +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawViewArch.h b/src/Mod/TechDraw/App/DrawViewArch.h index ba0899ac98..5b0117f737 100644 --- a/src/Mod/TechDraw/App/DrawViewArch.h +++ b/src/Mod/TechDraw/App/DrawViewArch.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DrawViewArch_h_ -#define DrawViewArch_h_ +#pragma once #include #include @@ -80,7 +79,4 @@ private: static const char* RenderModeEnums[]; }; -} //namespace TechDraw - - -#endif +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawViewBalloon.h b/src/Mod/TechDraw/App/DrawViewBalloon.h index f9781854eb..d94c25b9ca 100644 --- a/src/Mod/TechDraw/App/DrawViewBalloon.h +++ b/src/Mod/TechDraw/App/DrawViewBalloon.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TechDraw_DrawViewBalloon_h_ -#define TechDraw_DrawViewBalloon_h_ +#pragma once #include #include @@ -95,5 +94,4 @@ private: static App::PropertyFloatConstraint::Constraints SymbolScaleRange; }; -}//namespace TechDraw -#endif +}//namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawViewClip.h b/src/Mod/TechDraw/App/DrawViewClip.h index c9bfbbec06..c3faa963fd 100644 --- a/src/Mod/TechDraw/App/DrawViewClip.h +++ b/src/Mod/TechDraw/App/DrawViewClip.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef DrawViewClip_h_ -#define DrawViewClip_h_ +#pragma once #include #include @@ -80,7 +79,4 @@ protected: using DrawViewClipPython = App::FeaturePythonT; -} //namespace TechDraw - - -#endif +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawViewCollection.h b/src/Mod/TechDraw/App/DrawViewCollection.h index 43fd8c78ad..d0bdf3d3f6 100644 --- a/src/Mod/TechDraw/App/DrawViewCollection.h +++ b/src/Mod/TechDraw/App/DrawViewCollection.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAW_FEATUREVIEWCOLLECTION_h_ -#define TECHDRAW_FEATUREVIEWCOLLECTION_h_ +#pragma once #include #include @@ -72,6 +71,4 @@ protected: bool nowUnsetting; }; -} //namespace TechDraw - -#endif // TECHDRAW_FEATUREVIEWCOLLECTION_h_ +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawViewDetail.h b/src/Mod/TechDraw/App/DrawViewDetail.h index 0f9cbfef3b..e091e0845d 100644 --- a/src/Mod/TechDraw/App/DrawViewDetail.h +++ b/src/Mod/TechDraw/App/DrawViewDetail.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DrawViewDetail_h_ -#define DrawViewDetail_h_ +#pragma once #include #include @@ -120,6 +119,4 @@ protected: using DrawViewDetailPython = App::FeaturePythonT; -} //namespace TechDraw - -#endif +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawViewDimExtent.h b/src/Mod/TechDraw/App/DrawViewDimExtent.h index bb30a1ac49..3bba54703d 100644 --- a/src/Mod/TechDraw/App/DrawViewDimExtent.h +++ b/src/Mod/TechDraw/App/DrawViewDimExtent.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TechDraw_DrawViewDimExtent_h_ -#define TechDraw_DrawViewDimExtent_h_ +#pragma once #include @@ -62,5 +61,4 @@ protected: private: }; -} //namespace TechDraw -#endif +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawViewDimension.h b/src/Mod/TechDraw/App/DrawViewDimension.h index 963fdfff1b..f621d5f6dc 100644 --- a/src/Mod/TechDraw/App/DrawViewDimension.h +++ b/src/Mod/TechDraw/App/DrawViewDimension.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TechDraw_DrawViewDimension_h_ -#define TechDraw_DrawViewDimension_h_ +#pragma once #include #include @@ -285,5 +284,4 @@ private: std::set m_3dObjectCache; }; -} // namespace TechDraw -#endif +} // namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawViewDraft.h b/src/Mod/TechDraw/App/DrawViewDraft.h index 062a4be8c3..f3945141a8 100644 --- a/src/Mod/TechDraw/App/DrawViewDraft.h +++ b/src/Mod/TechDraw/App/DrawViewDraft.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DrawViewDraft_h_ -#define DrawViewDraft_h_ +#pragma once #include #include @@ -76,7 +75,4 @@ protected: using DrawViewDraftPython = App::FeaturePythonT; -} //namespace TechDraw - - -#endif +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawViewImage.h b/src/Mod/TechDraw/App/DrawViewImage.h index 54225ecee9..e1c2b0caf5 100644 --- a/src/Mod/TechDraw/App/DrawViewImage.h +++ b/src/Mod/TechDraw/App/DrawViewImage.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DrawViewImage_h_ -#define DrawViewImage_h_ +#pragma once #include #include @@ -75,7 +74,4 @@ protected: using DrawViewImagePython = App::FeaturePythonT; -} //namespace TechDraw - - -#endif +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawViewMulti.h b/src/Mod/TechDraw/App/DrawViewMulti.h index aec80171f8..c35433bb67 100644 --- a/src/Mod/TechDraw/App/DrawViewMulti.h +++ b/src/Mod/TechDraw/App/DrawViewMulti.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef DrawViewMulti_h_ -#define DrawViewMulti_h_ +#pragma once #include @@ -81,6 +80,4 @@ protected: using DrawViewMultiPython = App::FeaturePythonT; -} //namespace TechDraw - -#endif +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawViewPart.h b/src/Mod/TechDraw/App/DrawViewPart.h index 83936c70eb..8e1953f65e 100644 --- a/src/Mod/TechDraw/App/DrawViewPart.h +++ b/src/Mod/TechDraw/App/DrawViewPart.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef DrawViewPart_h_ -#define DrawViewPart_h_ +#pragma once #include #include @@ -295,6 +294,4 @@ private: using DrawViewPartPython = App::FeaturePythonT; -}//namespace TechDraw - -#endif// #ifndef DrawViewPart_h_ +}//namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawViewSection.h b/src/Mod/TechDraw/App/DrawViewSection.h index d2d8ef05df..fef32eea1a 100644 --- a/src/Mod/TechDraw/App/DrawViewSection.h +++ b/src/Mod/TechDraw/App/DrawViewSection.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef DrawViewSection_h_ -#define DrawViewSection_h_ +#pragma once #include #include @@ -220,6 +219,4 @@ protected: using DrawViewSectionPython = App::FeaturePythonT; -}//namespace TechDraw - -#endif +}//namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawViewSpreadsheet.h b/src/Mod/TechDraw/App/DrawViewSpreadsheet.h index 6ca008f43e..00366c63f1 100644 --- a/src/Mod/TechDraw/App/DrawViewSpreadsheet.h +++ b/src/Mod/TechDraw/App/DrawViewSpreadsheet.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DrawViewSpreadsheet_h_ -#define DrawViewSpreadsheet_h_ +#pragma once #include #include @@ -76,7 +75,4 @@ private: using DrawViewSpreadsheetPython = App::FeaturePythonT; -} //namespace TechDraw - - -#endif +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawViewSymbol.h b/src/Mod/TechDraw/App/DrawViewSymbol.h index b5090ccd55..14c6af8479 100644 --- a/src/Mod/TechDraw/App/DrawViewSymbol.h +++ b/src/Mod/TechDraw/App/DrawViewSymbol.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DrawViewSymbol_h_ -#define DrawViewSymbol_h_ +#pragma once #include @@ -81,7 +80,4 @@ protected: using DrawViewSymbolPython = App::FeaturePythonT; -} //namespace TechDraw - - -#endif +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/DrawWeldSymbol.h b/src/Mod/TechDraw/App/DrawWeldSymbol.h index bf6d50a3cc..250c76a6ad 100644 --- a/src/Mod/TechDraw/App/DrawWeldSymbol.h +++ b/src/Mod/TechDraw/App/DrawWeldSymbol.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TechDraw_DrawWeldSymbol_h_ -#define TechDraw_DrawWeldSymbol_h_ +#pragma once #include #include @@ -72,5 +71,4 @@ private: using DrawWeldSymbolPython = App::FeaturePythonT; -} //namespace TechDraw -#endif +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/EdgeWalker.h b/src/Mod/TechDraw/App/EdgeWalker.h index 726f449026..8c06c07aed 100644 --- a/src/Mod/TechDraw/App/EdgeWalker.h +++ b/src/Mod/TechDraw/App/EdgeWalker.h @@ -25,8 +25,7 @@ // http://www.boost.org/LICENSE_1_0.txt) //************************************************************************** -#ifndef TECHDRAW_EDGEWALKER_H -#define TECHDRAW_EDGEWALKER_H +#pragma once #include @@ -190,6 +189,4 @@ private: TechDraw::graph m_g; }; -} //end namespace TechDraw - -#endif //TECHDRAW_EDGEWALKER_H +} //end namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/FeatureProjection.h b/src/Mod/TechDraw/App/FeatureProjection.h index 9ac49ef3a0..9ad266078d 100644 --- a/src/Mod/TechDraw/App/FeatureProjection.h +++ b/src/Mod/TechDraw/App/FeatureProjection.h @@ -22,8 +22,7 @@ //this file originally part of TechDraw workbench //migrated to TechDraw workbench 2022-01-26 by Wandererfan -#ifndef TECHDRAW_FEATUREPROJECTION -#define TECHDRAW_FEATUREPROJECTION +#pragma once #include @@ -65,8 +64,4 @@ public: //@} }; -} //namespace TechDraw - - - -#endif // TECHDRAW_FEATUREPROJECTION +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/Geometry.h b/src/Mod/TechDraw/App/Geometry.h index 9833d8ed65..d1e293f894 100644 --- a/src/Mod/TechDraw/App/Geometry.h +++ b/src/Mod/TechDraw/App/Geometry.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAW_GEOMETRY_H -#define TECHDRAW_GEOMETRY_H +#pragma once #include #include @@ -473,6 +472,4 @@ class TechDrawExport GeometryUtils }; -} //end namespace TechDraw - -#endif //TECHDRAW_GEOMETRY_H +} //end namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/GeometryMatcher.h b/src/Mod/TechDraw/App/GeometryMatcher.h index ebc3fee2e6..a68b844df5 100644 --- a/src/Mod/TechDraw/App/GeometryMatcher.h +++ b/src/Mod/TechDraw/App/GeometryMatcher.h @@ -21,8 +21,7 @@ ***************************************************************************/ // a class to handle changes to dimension reference geometry -#ifndef GEOMETRYMATCHER_H -#define GEOMETRYMATCHER_H +#pragma once #include @@ -70,5 +69,4 @@ private: double m_pointTolerance {EWTOLERANCE}; }; -} // end namespace TechDraw -#endif +} // end namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/GeometryObject.h b/src/Mod/TechDraw/App/GeometryObject.h index 877d3c2f0c..c25568156d 100644 --- a/src/Mod/TechDraw/App/GeometryObject.h +++ b/src/Mod/TechDraw/App/GeometryObject.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAW_GEOMETRYOBJECT_H -#define TECHDRAW_GEOMETRYOBJECT_H +#pragma once //! a class to the projection of shapes, removal/identifying hidden lines and // converting the output for OCC HLR into the BaseGeom intermediate representation. @@ -169,7 +168,4 @@ protected: using GeometryObjectPtr = std::shared_ptr; -}//namespace TechDraw - -#endif - +}//namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/HatchLine.h b/src/Mod/TechDraw/App/HatchLine.h index 68cb3a77de..d2247651d6 100644 --- a/src/Mod/TechDraw/App/HatchLine.h +++ b/src/Mod/TechDraw/App/HatchLine.h @@ -22,8 +22,7 @@ //! HatchLine - Classes related to processing PAT files -#ifndef TechDraw_HATCHLINE_H_ -#define TechDraw_HATCHLINE_H_ +#pragma once #include #include @@ -156,6 +155,4 @@ private: }; -} //end namespace - -#endif +} //end namespace \ No newline at end of file diff --git a/src/Mod/TechDraw/App/LandmarkDimension.h b/src/Mod/TechDraw/App/LandmarkDimension.h index 54716f1ab5..56542f6bbb 100644 --- a/src/Mod/TechDraw/App/LandmarkDimension.h +++ b/src/Mod/TechDraw/App/LandmarkDimension.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TechDraw_LandmarkDimension_h_ -#define TechDraw_LandmarkDimension_h_ +#pragma once # include #include @@ -70,5 +69,4 @@ protected: private: }; -} //namespace TechDraw -#endif +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/LineFormat.h b/src/Mod/TechDraw/App/LineFormat.h index bf98ddae8d..322453dc9b 100644 --- a/src/Mod/TechDraw/App/LineFormat.h +++ b/src/Mod/TechDraw/App/LineFormat.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAW_LINEFORMAT_H -#define TECHDRAW_LINEFORMAT_H +#pragma once #include @@ -90,7 +89,4 @@ private: int m_lineNumber {1}; }; -} //end namespace TechDraw - -#endif //TECHDRAW_LINEFORMAT_H - +} //end namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/LineGenerator.h b/src/Mod/TechDraw/App/LineGenerator.h index c0037c5689..4b7951476c 100644 --- a/src/Mod/TechDraw/App/LineGenerator.h +++ b/src/Mod/TechDraw/App/LineGenerator.h @@ -35,8 +35,7 @@ //! chosen values generally equal to those for ISO128 -#ifndef DASHEDLINEGENERATOR_H -#define DASHEDLINEGENERATOR_H +#pragma once #include #include @@ -85,6 +84,4 @@ private: std::vector< std::string > m_lineDescs; }; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/TechDraw/App/LineGroup.h b/src/Mod/TechDraw/App/LineGroup.h index 125d691d9d..8ecab17bce 100644 --- a/src/Mod/TechDraw/App/LineGroup.h +++ b/src/Mod/TechDraw/App/LineGroup.h @@ -22,8 +22,7 @@ //! LineGroup - Classes related to processing LineGroup definition CSV files -#ifndef TechDraw_LINEGROUP_H_ -#define TechDraw_LINEGROUP_H_ +#pragma once #include @@ -71,5 +70,4 @@ protected: double m_extra; }; -} -#endif +} \ No newline at end of file diff --git a/src/Mod/TechDraw/App/LineNameEnum.h b/src/Mod/TechDraw/App/LineNameEnum.h index 3f42676312..dbcd695cab 100644 --- a/src/Mod/TechDraw/App/LineNameEnum.h +++ b/src/Mod/TechDraw/App/LineNameEnum.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef STDLINEENUMS_H_ -#define STDLINEENUMS_H_ +#pragma once #include #include @@ -125,6 +124,4 @@ public: private: }; -} //end namespace TechDraw -#endif - +} //end namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/MattingPropEnum.h b/src/Mod/TechDraw/App/MattingPropEnum.h index 80e22eff0e..b8169369f9 100644 --- a/src/Mod/TechDraw/App/MattingPropEnum.h +++ b/src/Mod/TechDraw/App/MattingPropEnum.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef MATTINGENUMS_H_ -#define MATTINGENUMS_H_ +#pragma once #include #include @@ -45,5 +44,4 @@ private: }; -} //end namespace TechDraw -#endif +} //end namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/PreCompiled.h b/src/Mod/TechDraw/App/PreCompiled.h index 9d0a0c392e..837647fe51 100644 --- a/src/Mod/TechDraw/App/PreCompiled.h +++ b/src/Mod/TechDraw/App/PreCompiled.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAW_PRECOMPILED_H -#define TECHDRAW_PRECOMPILED_H +#pragma once #include @@ -60,6 +59,4 @@ #include // OpenCasCade -#include - -#endif +#include \ No newline at end of file diff --git a/src/Mod/TechDraw/App/Preferences.h b/src/Mod/TechDraw/App/Preferences.h index 6afcc7074d..3dbc394a0b 100644 --- a/src/Mod/TechDraw/App/Preferences.h +++ b/src/Mod/TechDraw/App/Preferences.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef Preferences_h_ -#define Preferences_h_ +#pragma once #include #include @@ -174,5 +173,4 @@ public: }; -}//end namespace TechDraw -#endif +}//end namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/ProjectionAlgos.h b/src/Mod/TechDraw/App/ProjectionAlgos.h index 771661e0c8..dd9720465e 100644 --- a/src/Mod/TechDraw/App/ProjectionAlgos.h +++ b/src/Mod/TechDraw/App/ProjectionAlgos.h @@ -22,8 +22,7 @@ //this file originally part of Drawing workbench //migrated to TechDraw workbench 2022-01-26 by Wandererfan -#ifndef TechDrawProjectionAlgos_h_ -#define TechDrawProjectionAlgos_h_ +#pragma once #include #include @@ -84,7 +83,4 @@ public: TopoDS_Shape HI;// isoparamtriques invisibly }; -} //namespace TechDraw - - -#endif +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/PropertyCenterLineList.h b/src/Mod/TechDraw/App/PropertyCenterLineList.h index 7fbf2146cf..557c3bd90e 100644 --- a/src/Mod/TechDraw/App/PropertyCenterLineList.h +++ b/src/Mod/TechDraw/App/PropertyCenterLineList.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAW_PropertyCenterLineList_H -#define TECHDRAW_PropertyCenterLineList_H +#pragma once #include @@ -77,7 +76,4 @@ private: std::vector _lValueList; }; -} // namespace TechDraw - - -#endif // TECHDRAW_PropertyCenterLineList_H +} // namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/PropertyCosmeticEdgeList.h b/src/Mod/TechDraw/App/PropertyCosmeticEdgeList.h index 63f7c7849f..b72d51bb85 100644 --- a/src/Mod/TechDraw/App/PropertyCosmeticEdgeList.h +++ b/src/Mod/TechDraw/App/PropertyCosmeticEdgeList.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAW_PropertyCosmeticEdgeList_H -#define TECHDRAW_PropertyCosmeticEdgeList_H +#pragma once #include @@ -87,7 +86,4 @@ private: std::vector _lValueList; }; -} // namespace TechDraw - - -#endif // TECHDRAW_PropertyCosmeticEdgeList_H +} // namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/PropertyCosmeticVertexList.h b/src/Mod/TechDraw/App/PropertyCosmeticVertexList.h index 385556bccc..6548c8d32e 100644 --- a/src/Mod/TechDraw/App/PropertyCosmeticVertexList.h +++ b/src/Mod/TechDraw/App/PropertyCosmeticVertexList.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAW_PropertyCosmeticVertexList_H -#define TECHDRAW_PropertyCosmeticVertexList_H +#pragma once #include @@ -88,7 +87,4 @@ private: std::vector _lValueList; }; -} // namespace TechDraw - - -#endif // TECHDRAW_PropertyCosmeticVertexList_H +} // namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/PropertyGeomFormatList.h b/src/Mod/TechDraw/App/PropertyGeomFormatList.h index 7e2e6d61e7..93644f1ddd 100644 --- a/src/Mod/TechDraw/App/PropertyGeomFormatList.h +++ b/src/Mod/TechDraw/App/PropertyGeomFormatList.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAW_PropertyGeomFormatList_H -#define TECHDRAW_PropertyGeomFormatList_H +#pragma once #include @@ -85,7 +84,4 @@ private: std::vector _lValueList; }; -} // namespace TechDraw - - -#endif // TECHDRAW_PropertyGeomFormatList_H +} // namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/ShapeExtractor.h b/src/Mod/TechDraw/App/ShapeExtractor.h index 05adae8630..93c5f7e791 100644 --- a/src/Mod/TechDraw/App/ShapeExtractor.h +++ b/src/Mod/TechDraw/App/ShapeExtractor.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef ShapeExtractor_h_ -#define ShapeExtractor_h_ +#pragma once #include @@ -72,6 +71,4 @@ private: }; -} //namespace TechDraw - -#endif // #ifndef ShapeExtractor_h_ +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/ShapeUtils.h b/src/Mod/TechDraw/App/ShapeUtils.h index 755da53d98..1a2935cef8 100644 --- a/src/Mod/TechDraw/App/ShapeUtils.h +++ b/src/Mod/TechDraw/App/ShapeUtils.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAW_SHAPEUTILS_H -#define TECHDRAW_SHAPEUTILS_H +#pragma once #include @@ -119,5 +118,4 @@ public: static TopoDS_Face fromQtAsFace(const TopoDS_Shape& inShape); }; -} -#endif +} \ No newline at end of file diff --git a/src/Mod/TechDraw/App/Tag.h b/src/Mod/TechDraw/App/Tag.h index 132cb86737..6d7a9d5ff2 100644 --- a/src/Mod/TechDraw/App/Tag.h +++ b/src/Mod/TechDraw/App/Tag.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAW_TAG_H -#define TECHDRAW_TAG_H +#pragma once #include #include @@ -61,6 +60,4 @@ private: void createNewTag(); boost::uuids::uuid tag{}; }; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/TechDraw/App/TechDrawExport.h b/src/Mod/TechDraw/App/TechDrawExport.h index e965637c1b..6220952ea3 100644 --- a/src/Mod/TechDraw/App/TechDrawExport.h +++ b/src/Mod/TechDraw/App/TechDrawExport.h @@ -22,8 +22,7 @@ //this file originally part of Drawing workbench //migrated to TechDraw workbench 2022-01-26 by Wandererfan -#ifndef TECHDRAW_EXPORT_H -#define TECHDRAW_EXPORT_H +#pragma once #include #include @@ -75,6 +74,4 @@ private: void printGeneric(const BRepAdaptor_Curve&, int id, std::ostream&); }; -} //namespace TechDraw - -#endif // TECHDRAW_EXPORT_H +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/App/XMLQuery.h b/src/Mod/TechDraw/App/XMLQuery.h index c9da888148..a958a51a47 100644 --- a/src/Mod/TechDraw/App/XMLQuery.h +++ b/src/Mod/TechDraw/App/XMLQuery.h @@ -21,8 +21,7 @@ * * **************************************************************************/ -#ifndef TECHDRAW_XMLQuery_h_ -#define TECHDRAW_XMLQuery_h_ +#pragma once #include #include @@ -45,6 +44,4 @@ private: QDomDocument& domDocument; }; -} //namespace TechDraw - -#endif //TECHDRAW_XMLQuery_h_ +} //namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/CommandExtensionDims.h b/src/Mod/TechDraw/Gui/CommandExtensionDims.h index aff7159c71..1248cce3c5 100644 --- a/src/Mod/TechDraw/Gui/CommandExtensionDims.h +++ b/src/Mod/TechDraw/Gui/CommandExtensionDims.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_CommandExtensionDims_H -#define TECHDRAWGUI_CommandExtensionDims_H +#pragma once #include @@ -36,6 +35,4 @@ namespace TechDrawGui { std::vector makeObliqueChainDimension(std::vector refs); std::vector makeObliqueCoordDimension(std::vector refs); -} - -#endif // TECHDRAWGUI_CommandExtensionDims_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/CommandHelpers.h b/src/Mod/TechDraw/Gui/CommandHelpers.h index a23872607b..032b657d06 100644 --- a/src/Mod/TechDraw/Gui/CommandHelpers.h +++ b/src/Mod/TechDraw/Gui/CommandHelpers.h @@ -24,8 +24,7 @@ -#ifndef COMMANDHELPERS_H -#define COMMANDHELPERS_H +#pragma once #include #include @@ -61,6 +60,4 @@ std::pair faceFromSelection(); } // end namespace CommandHelpers -} // end namespace TechDraw - -#endif +} // end namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/DimensionValidators.h b/src/Mod/TechDraw/Gui/DimensionValidators.h index 7b98fa1ee0..95963df552 100644 --- a/src/Mod/TechDraw/Gui/DimensionValidators.h +++ b/src/Mod/TechDraw/Gui/DimensionValidators.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAW_DIMENSIONVALIDATORS_H -#define TECHDRAW_DIMENSIONVALIDATORS_H +#pragma once #include #include @@ -105,6 +104,4 @@ DimensionGeometry lineOrientation(const Base::Vector3d& point0, const Base::Vector3d& point1); -} -#endif //TECHDRAW_DIMENSIONVALIDATORS_H - +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/DlgPageChooser.h b/src/Mod/TechDraw/Gui/DlgPageChooser.h index 3c9be5c668..24a84c82d4 100644 --- a/src/Mod/TechDraw/Gui/DlgPageChooser.h +++ b/src/Mod/TechDraw/Gui/DlgPageChooser.h @@ -19,8 +19,7 @@ * Suite 330, Boston, MA 02111-1307, USA * * * ****************************************************************************/ -#ifndef GUI_DLGPAGECHOOSER_H -#define GUI_DLGPAGECHOOSER_H +#pragma once #include @@ -55,8 +54,4 @@ private: Ui_DlgPageChooser* ui; }; -} // namespace Gui - - -#endif // GUI_DLGPAGECHOOSER_H - +} // namespace Gui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.h index 2970e45dd4..b918c0b2d4 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_DLGPREFSTECHDRAWIMPADVANCED_H -#define DRAWINGGUI_DLGPREFSTECHDRAWIMPADVANCED_H +#pragma once #include #include @@ -62,6 +61,4 @@ private: std::unique_ptr ui; }; -} // namespace TechDrawGui - -#endif // DRAWINGGUI_DLGPREFSTECHDRAWIMPADVANCED_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h index 71c4cb70fb..da07a2275a 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_DLGPREFSTECHDRAWIMPANNOTATION_H -#define DRAWINGGUI_DLGPREFSTECHDRAWIMPANNOTATION_H +#pragma once #include #include @@ -64,6 +63,4 @@ private: TechDraw::LineGenerator* m_lineGenerator; }; -} // namespace TechDrawGui - -#endif // DRAWINGGUI_DLGPREFSTECHDRAWIMPANNOTATION_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.h index efbc81d145..b13dec6650 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_DLGPREFSTECHDRAWIMPCOLORS_H -#define DRAWINGGUI_DLGPREFSTECHDRAWIMPCOLORS_H +#pragma once #include @@ -50,6 +49,4 @@ private: std::unique_ptr ui; }; -} // namespace TechDrawGui - -#endif // DRAWINGGUI_DLGPREFSTECHDRAWIMPCOLORS_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.h index 8e80875bfd..0c575ad063 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_DLGPREFSTECHDRAWIMPDIMENSIONS_H -#define DRAWINGGUI_DLGPREFSTECHDRAWIMPDIMENSIONS_H +#pragma once #include @@ -58,6 +57,4 @@ private: std::unique_ptr ui; }; -} // namespace TechDrawGui - -#endif // DRAWINGGUI_DLGPREFSTECHDRAWIMPDIMENSIONS_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.h index d3b5f46546..07c34d4124 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_DLGPREFSTECHDRAWIMPGENERAL_H -#define DRAWINGGUI_DLGPREFSTECHDRAWIMPGENERAL_H +#pragma once #include @@ -50,6 +49,4 @@ private: std::unique_ptr ui; }; -} // namespace TechDrawGui - -#endif // DRAWINGGUI_DLGPREFSTECHDRAWIMPGENERAL_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.h index 0d27b17a6e..3e4b61238b 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_DLGPREFSTECHDRAWIMPHLR_H -#define DRAWINGGUI_DLGPREFSTECHDRAWIMPHLR_H +#pragma once #include @@ -50,6 +49,4 @@ private: std::unique_ptr ui; }; -} // namespace TechDrawGui - -#endif // DRAWINGGUI_DLGPREFSTECHDRAWIMPHLR_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.h index 08ea177f48..506de30c8f 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_DLGPREFSTECHDRAWIMPSCALE_H -#define DRAWINGGUI_DLGPREFSTECHDRAWIMPSCALE_H +#pragma once #include @@ -53,6 +52,4 @@ private: std::unique_ptr ui; }; -} // namespace TechDrawGui - -#endif // DRAWINGGUI_DLGPREFSTECHDRAWIMPSCALE_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/DlgTemplateField.h b/src/Mod/TechDraw/Gui/DlgTemplateField.h index abe4248bee..3049935837 100644 --- a/src/Mod/TechDraw/Gui/DlgTemplateField.h +++ b/src/Mod/TechDraw/Gui/DlgTemplateField.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_DLGTEMPLATEFIELD_H -#define DRAWINGGUI_DLGTEMPLATEFIELD_H +#pragma once #include @@ -59,6 +58,4 @@ private: std::shared_ptr ui; }; -} // namespace TechDrawGui - -#endif // DRAWINGGUI_DLGTEMPLATEFIELD_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/DrawGuiUtil.h b/src/Mod/TechDraw/Gui/DrawGuiUtil.h index 95f571a8ac..c215fcca33 100644 --- a/src/Mod/TechDraw/Gui/DrawGuiUtil.h +++ b/src/Mod/TechDraw/Gui/DrawGuiUtil.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DrawGuiUtil_h_ -#define DrawGuiUtil_h_ +#pragma once #include #include @@ -110,5 +109,4 @@ class TechDrawGuiExport DrawGuiUtil { }; -} //end namespace TechDrawGui -#endif +} //end namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/Enums.h b/src/Mod/TechDraw/Gui/Enums.h index 78c5e7c7ec..aecc17daf9 100644 --- a/src/Mod/TechDraw/Gui/Enums.h +++ b/src/Mod/TechDraw/Gui/Enums.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAW_ENUMS_H -#define TECHDRAW_ENUMS_H +#pragma once namespace TechDrawGui { @@ -32,6 +31,4 @@ enum class DragState : int { Dragging }; -} - -#endif +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/Grabber3d.h b/src/Mod/TechDraw/Gui/Grabber3d.h index e1edc5fc3c..c7e07a2b98 100644 --- a/src/Mod/TechDraw/Gui/Grabber3d.h +++ b/src/Mod/TechDraw/Gui/Grabber3d.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef Grabber3d_h_ -#define Grabber3d_h_ +#pragma once #include @@ -47,5 +46,4 @@ public: QImage &image); }; -} //end namespace TechDrawGui -#endif +} //end namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.h b/src/Mod/TechDraw/Gui/MDIViewPage.h index 6e63fbf8ab..93b2f6db46 100644 --- a/src/Mod/TechDraw/Gui/MDIViewPage.h +++ b/src/Mod/TechDraw/Gui/MDIViewPage.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_MDIVIEWPAGE_H -#define TECHDRAWGUI_MDIVIEWPAGE_H +#pragma once #include @@ -183,6 +182,4 @@ protected: }; -} // namespace MDIViewPageGui - -#endif // TECHDRAWGUI_MDIVIEWPAGE_H +} // namespace MDIViewPageGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/PATPathMaker.h b/src/Mod/TechDraw/Gui/PATPathMaker.h index be5df7f72a..1848eef36f 100644 --- a/src/Mod/TechDraw/Gui/PATPathMaker.h +++ b/src/Mod/TechDraw/Gui/PATPathMaker.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_PATPATHMAKER_H -#define TECHDRAWGUI_PATPATHMAKER_H +#pragma once #include @@ -72,6 +71,4 @@ private: long int m_maxSeg; }; -} -#endif // TECHDRAWGUI_PATPATHMAKER_H - +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/PagePrinter.h b/src/Mod/TechDraw/Gui/PagePrinter.h index 2575ee8d34..fc28ab80df 100644 --- a/src/Mod/TechDraw/Gui/PagePrinter.h +++ b/src/Mod/TechDraw/Gui/PagePrinter.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_PAGEPRINTER_H -#define TECHDRAWGUI_PAGEPRINTER_H +#pragma once #include @@ -115,7 +114,4 @@ public: static void savePDF(ViewProviderPage* vpPage, const std::string& file); }; -} // namespace TechDrawGui - -#endif // TECHDRAWGUI_PAGEPRINTER_H - +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/PathBuilder.h b/src/Mod/TechDraw/Gui/PathBuilder.h index 1ad348b5f4..98f28c20df 100644 --- a/src/Mod/TechDraw/Gui/PathBuilder.h +++ b/src/Mod/TechDraw/Gui/PathBuilder.h @@ -23,8 +23,7 @@ // a class for converting geometry into QPainterPaths -#ifndef PATHBUILDER_H -#define PATHBUILDER_H +#pragma once #include @@ -52,5 +51,4 @@ private: }; -} //end namespace TechDraw -#endif +} //end namespace TechDraw \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/PreCompiled.h b/src/Mod/TechDraw/Gui/PreCompiled.h index ee31732a50..3e580a3aa3 100644 --- a/src/Mod/TechDraw/Gui/PreCompiled.h +++ b/src/Mod/TechDraw/Gui/PreCompiled.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_PRECOMPILED_H -#define DRAWINGGUI_PRECOMPILED_H +#pragma once #include @@ -63,6 +62,4 @@ #include // Open Inventor -#include - -#endif // DRAWINGGUI_PRECOMPILED_H +#include \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/PreferencesGui.h b/src/Mod/TechDraw/Gui/PreferencesGui.h index de1e1c537a..01e9ce2908 100644 --- a/src/Mod/TechDraw/Gui/PreferencesGui.h +++ b/src/Mod/TechDraw/Gui/PreferencesGui.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef PreferencesGui_h_ -#define PreferencesGui_h_ +#pragma once #include @@ -103,5 +102,4 @@ static void setViewFrameMode(ViewFrameMode newMode); }; -} //end namespace TechDrawGui -#endif +} //end namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGCustomBorder.h b/src/Mod/TechDraw/Gui/QGCustomBorder.h index 8654978fc3..cc1924930e 100644 --- a/src/Mod/TechDraw/Gui/QGCustomBorder.h +++ b/src/Mod/TechDraw/Gui/QGCustomBorder.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGCUSTOMBORDER_H -#define DRAWINGGUI_QGCUSTOMBORDER_H +#pragma once #include @@ -58,6 +57,4 @@ private: }; -} // namespace MDIViewPageGui - -#endif // DRAWINGGUI_QGCUSTOMBORDER_H +} // namespace MDIViewPageGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGCustomClip.h b/src/Mod/TechDraw/Gui/QGCustomClip.h index cede55ed75..9437c0a2cb 100644 --- a/src/Mod/TechDraw/Gui/QGCustomClip.h +++ b/src/Mod/TechDraw/Gui/QGCustomClip.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGCUSTOMCLIP_H -#define DRAWINGGUI_QGCUSTOMCLIP_H +#pragma once #include @@ -67,7 +66,4 @@ private: }; -} // namespace MDIViewPageGui - -#endif // DRAWINGGUI_QGCUSTOMCLIP_H - +} // namespace MDIViewPageGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGCustomImage.h b/src/Mod/TechDraw/Gui/QGCustomImage.h index c82f13cc09..ac0806f019 100644 --- a/src/Mod/TechDraw/Gui/QGCustomImage.h +++ b/src/Mod/TechDraw/Gui/QGCustomImage.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGCUSTOMIMAGE_H -#define DRAWINGGUI_QGCUSTOMIMAGE_H +#pragma once #include @@ -64,6 +63,4 @@ protected: }; -} // namespace TechDrawGui - -#endif // DRAWINGGUI_QGCUSTOMIMAGE_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGCustomLabel.h b/src/Mod/TechDraw/Gui/QGCustomLabel.h index 069ba7ee5c..1a79722101 100644 --- a/src/Mod/TechDraw/Gui/QGCustomLabel.h +++ b/src/Mod/TechDraw/Gui/QGCustomLabel.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGCUSTOMLABEL_H -#define DRAWINGGUI_QGCUSTOMLABEL_H +#pragma once #include @@ -58,6 +57,4 @@ private: }; -} - -#endif // DRAWINGGUI_QGCUSTOMLABEL_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGCustomRect.h b/src/Mod/TechDraw/Gui/QGCustomRect.h index 1d1a0aa652..028f2069f8 100644 --- a/src/Mod/TechDraw/Gui/QGCustomRect.h +++ b/src/Mod/TechDraw/Gui/QGCustomRect.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGCUSTOMRECT_H -#define DRAWINGGUI_QGCUSTOMRECT_H +#pragma once #include @@ -58,7 +57,4 @@ private: }; -} // namespace MDIViewPageGui - -#endif // DRAWINGGUI_QGCUSTOMRECT_H - +} // namespace MDIViewPageGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGCustomSvg.h b/src/Mod/TechDraw/Gui/QGCustomSvg.h index 91d42904b3..0a16545ce5 100644 --- a/src/Mod/TechDraw/Gui/QGCustomSvg.h +++ b/src/Mod/TechDraw/Gui/QGCustomSvg.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGCUSTOMSVG_H -#define DRAWINGGUI_QGCUSTOMSVG_H +#pragma once #include @@ -62,6 +61,4 @@ protected: QSvgRenderer *m_svgRender; }; -} // namespace TechDrawGui - -#endif // DRAWINGGUI_QGCUSTOMSVG_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGCustomText.h b/src/Mod/TechDraw/Gui/QGCustomText.h index f946749e54..f0b48ef649 100644 --- a/src/Mod/TechDraw/Gui/QGCustomText.h +++ b/src/Mod/TechDraw/Gui/QGCustomText.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGCUSTOMTEXT_H -#define DRAWINGGUI_QGCUSTOMTEXT_H +#pragma once #include @@ -96,6 +95,4 @@ private: }; -} - -#endif // DRAWINGGUI_QGCUSTOMTEXT_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGDisplayArea.h b/src/Mod/TechDraw/Gui/QGDisplayArea.h index fc787010a8..c471c97edd 100644 --- a/src/Mod/TechDraw/Gui/QGDisplayArea.h +++ b/src/Mod/TechDraw/Gui/QGDisplayArea.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGDISPLAYAREA_H -#define DRAWINGGUI_QGDISPLAYAREA_H +#pragma once #include @@ -59,7 +58,4 @@ private: }; -} - -#endif // DRAWINGGUI_QGDISPLAYAREA_H - +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGEPath.h b/src/Mod/TechDraw/Gui/QGEPath.h index ff9cbffbda..21ee74bde3 100644 --- a/src/Mod/TechDraw/Gui/QGEPath.h +++ b/src/Mod/TechDraw/Gui/QGEPath.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_EDITABLEPATH_H -#define TECHDRAWGUI_EDITABLEPATH_H +#pragma once #include @@ -139,6 +138,4 @@ private: double m_endAdj; }; -} - -#endif // TECHDRAWGUI_EDITABLEPATH_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIArrow.h b/src/Mod/TechDraw/Gui/QGIArrow.h index 5bae99901d..96063acd83 100644 --- a/src/Mod/TechDraw/Gui/QGIArrow.h +++ b/src/Mod/TechDraw/Gui/QGIArrow.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGRAPHICSITEMARROW_H -#define DRAWINGGUI_QGRAPHICSITEMARROW_H +#pragma once #include #include @@ -90,6 +89,4 @@ private: Base::Vector3d m_dir; }; -} - -#endif // DRAWINGGUI_QGRAPHICSITEMARROW_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIBreakLine.h b/src/Mod/TechDraw/Gui/QGIBreakLine.h index 37ff8a3ae3..9ba1c39b33 100644 --- a/src/Mod/TechDraw/Gui/QGIBreakLine.h +++ b/src/Mod/TechDraw/Gui/QGIBreakLine.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_QGIBREAKLINE_H -#define TECHDRAWGUI_QGIBREAKLINE_H +#pragma once #include @@ -89,7 +88,4 @@ private: BreakType m_breakType = BreakType::NONE; }; -} - -#endif // TECHDRAWGUI_QGIBREAKLINE_H - +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGICMark.h b/src/Mod/TechDraw/Gui/QGICMark.h index a5cee8a30d..15c87aa28d 100644 --- a/src/Mod/TechDraw/Gui/QGICMark.h +++ b/src/Mod/TechDraw/Gui/QGICMark.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGRAPHICSITEMCMARK_H -#define DRAWINGGUI_QGRAPHICSITEMCMARK_H +#pragma once #include @@ -60,6 +59,4 @@ private: float m_size; }; -} - -#endif // DRAWINGGUI_QGRAPHICSITEMCMARK_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGICaption.h b/src/Mod/TechDraw/Gui/QGICaption.h index 3c06410e3e..d98f13725d 100644 --- a/src/Mod/TechDraw/Gui/QGICaption.h +++ b/src/Mod/TechDraw/Gui/QGICaption.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGICAPTION_H -#define DRAWINGGUI_QGICAPTION_H +#pragma once #include @@ -42,6 +41,4 @@ public: }; -} - -#endif // DRAWINGGUI_QGICAPTION_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGICenterLine.h b/src/Mod/TechDraw/Gui/QGICenterLine.h index 26b9246eca..b57e09ca18 100644 --- a/src/Mod/TechDraw/Gui/QGICenterLine.h +++ b/src/Mod/TechDraw/Gui/QGICenterLine.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_QGICENTERLINE_H -#define TECHDRAWGUI_QGICENTERLINE_H +#pragma once #include @@ -65,6 +64,4 @@ private: bool m_isintersection; }; -} - -#endif // TECHDRAWGUI_QGICENTERLINE_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIDatumLabel.h b/src/Mod/TechDraw/Gui/QGIDatumLabel.h index 3df40007a0..cda11d28ad 100644 --- a/src/Mod/TechDraw/Gui/QGIDatumLabel.h +++ b/src/Mod/TechDraw/Gui/QGIDatumLabel.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_QGRAPHICSITEMVIEWDATUMLABEL_H -#define TECHDRAWGUI_QGRAPHICSITEMVIEWDATUMLABEL_H +#pragma once #include @@ -129,6 +128,4 @@ private: private: }; -} // namespace TechDrawGui - -#endif +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIDecoration.h b/src/Mod/TechDraw/Gui/QGIDecoration.h index 6c20d0f6af..f8b27371c6 100644 --- a/src/Mod/TechDraw/Gui/QGIDecoration.h +++ b/src/Mod/TechDraw/Gui/QGIDecoration.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGIDECORATION_H -#define DRAWINGGUI_QGIDECORATION_H +#pragma once #include @@ -91,5 +90,4 @@ protected: private: }; -} -#endif +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIDimLines.h b/src/Mod/TechDraw/Gui/QGIDimLines.h index c4b682529e..0024629529 100644 --- a/src/Mod/TechDraw/Gui/QGIDimLines.h +++ b/src/Mod/TechDraw/Gui/QGIDimLines.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGRAPHICSITEMDIMLINES_H -#define DRAWINGGUI_QGRAPHICSITEMDIMLINES_H +#pragma once #include @@ -62,6 +61,4 @@ protected: private: }; -} - -#endif // DRAWINGGUI_QGRAPHICSITEMDIMLINES_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIDrawingTemplate.h b/src/Mod/TechDraw/Gui/QGIDrawingTemplate.h index b15742389f..df6b9a3ab8 100644 --- a/src/Mod/TechDraw/Gui/QGIDrawingTemplate.h +++ b/src/Mod/TechDraw/Gui/QGIDrawingTemplate.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGRAPHICSITEMDRAWINGTEMPLATE_H -#define DRAWINGGUI_QGRAPHICSITEMDRAWINGTEMPLATE_H +#pragma once #include @@ -63,6 +62,4 @@ protected: QGraphicsPathItem *pathItem; }; -} // namespace MDIViewPageGui - -#endif // DRAWINGGUI_QGRAPHICSITEMDRAWINGTEMPLATE_H +} // namespace MDIViewPageGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIEdge.h b/src/Mod/TechDraw/Gui/QGIEdge.h index 86d60a3ac9..1f7d3c138e 100644 --- a/src/Mod/TechDraw/Gui/QGIEdge.h +++ b/src/Mod/TechDraw/Gui/QGIEdge.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGRAPHICSITEMEDGE_H -#define DRAWINGGUI_QGRAPHICSITEMEDGE_H +#pragma once #include #include @@ -78,6 +77,4 @@ private: TechDraw::SourceType m_source{TechDraw::SourceType::GEOMETRY}; }; -} - -#endif // DRAWINGGUI_QGRAPHICSITEMEDGE_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIFace.h b/src/Mod/TechDraw/Gui/QGIFace.h index 8fa6b5931c..3c402b7b93 100644 --- a/src/Mod/TechDraw/Gui/QGIFace.h +++ b/src/Mod/TechDraw/Gui/QGIFace.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGRAPHICSITEMFACE_H -#define DRAWINGGUI_QGRAPHICSITEMFACE_H +#pragma once #include @@ -175,5 +174,4 @@ private: }; -} -#endif // DRAWINGGUI_QGRAPHICSITEMFACE_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIGhostHighlight.h b/src/Mod/TechDraw/Gui/QGIGhostHighlight.h index 304b896ed7..0a55daaf0d 100644 --- a/src/Mod/TechDraw/Gui/QGIGhostHighlight.h +++ b/src/Mod/TechDraw/Gui/QGIGhostHighlight.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_QGIGHOSTHIGHLIGHT_H -#define TECHDRAWGUI_QGIGHOSTHIGHLIGHT_H +#pragma once #include @@ -63,6 +62,4 @@ protected: private: }; -} - -#endif // TECHDRAWGUI_QGIGHOSTHIGHLIGHT_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIHighlight.h b/src/Mod/TechDraw/Gui/QGIHighlight.h index 01f1c00d91..a1d5ee9692 100644 --- a/src/Mod/TechDraw/Gui/QGIHighlight.h +++ b/src/Mod/TechDraw/Gui/QGIHighlight.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_QGIHIGHLIGHT_H -#define TECHDRAWGUI_QGIHIGHLIGHT_H +#pragma once #include @@ -87,6 +86,4 @@ private: double m_referenceAngle; }; -} - -#endif // TECHDRAWGUI_QGIHIGHLIGHT_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGILeaderLine.h b/src/Mod/TechDraw/Gui/QGILeaderLine.h index 6693a94f37..9b8828d00d 100644 --- a/src/Mod/TechDraw/Gui/QGILeaderLine.h +++ b/src/Mod/TechDraw/Gui/QGILeaderLine.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGRAPHICSITEMLEADERLINE_H -#define DRAWINGGUI_QGRAPHICSITEMLEADERLINE_H +#pragma once #include @@ -144,6 +143,4 @@ private: bool m_blockDraw;//prevent redraws while updating. }; -}// namespace TechDrawGui - -#endif// DRAWINGGUI_QGRAPHICSITEMLEADERLINE_H +}// namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIMatting.h b/src/Mod/TechDraw/Gui/QGIMatting.h index 8b531ebbc3..0d69aa7b9d 100644 --- a/src/Mod/TechDraw/Gui/QGIMatting.h +++ b/src/Mod/TechDraw/Gui/QGIMatting.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGIMATTING_H -#define DRAWINGGUI_QGIMATTING_H +#pragma once #include @@ -78,6 +77,4 @@ private: }; -} // namespace MDIViewPageGui - -#endif // DRAWINGGUI_QGIMATTING_H +} // namespace MDIViewPageGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIPrimPath.h b/src/Mod/TechDraw/Gui/QGIPrimPath.h index b75bc47e7f..4ecfe7595b 100644 --- a/src/Mod/TechDraw/Gui/QGIPrimPath.h +++ b/src/Mod/TechDraw/Gui/QGIPrimPath.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGIPRIMPATH_H -#define DRAWINGGUI_QGIPRIMPATH_H +#pragma once #include @@ -111,6 +110,4 @@ private: }; -} // namespace MDIViewPageGui - -#endif // DRAWINGGUI_QGIPRIMPATH_H +} // namespace MDIViewPageGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIProjGroup.h b/src/Mod/TechDraw/Gui/QGIProjGroup.h index 4d3a3a6a31..42d108bb6f 100644 --- a/src/Mod/TechDraw/Gui/QGIProjGroup.h +++ b/src/Mod/TechDraw/Gui/QGIProjGroup.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGIProjGroup_H -#define DRAWINGGUI_QGIProjGroup_H +#pragma once #include @@ -83,6 +82,4 @@ private: QPoint mousePos; }; -} // namespace MDIViewPageGui - -#endif // DRAWINGGUI_QGIProjGroup_H +} // namespace MDIViewPageGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIRichAnno.h b/src/Mod/TechDraw/Gui/QGIRichAnno.h index 13c8d4dde5..7cd8762a5e 100644 --- a/src/Mod/TechDraw/Gui/QGIRichAnno.h +++ b/src/Mod/TechDraw/Gui/QGIRichAnno.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_QGIRICHANNO_H -#define TECHDRAWGUI_QGIRICHANNO_H +#pragma once #include @@ -97,6 +96,4 @@ protected: }; -} - -#endif // TECHDRAWGUI_QGIRICHANNO_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGISVGTemplate.h b/src/Mod/TechDraw/Gui/QGISVGTemplate.h index b42526d6ba..5334e2337b 100644 --- a/src/Mod/TechDraw/Gui/QGISVGTemplate.h +++ b/src/Mod/TechDraw/Gui/QGISVGTemplate.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGRAPHICSITEMSVGTEMPLATE_H -#define DRAWINGGUI_QGRAPHICSITEMSVGTEMPLATE_H +#pragma once #include @@ -76,6 +75,4 @@ private: };// class QGISVGTemplate -}// namespace TechDrawGui - -#endif// DRAWINGGUI_QGRAPHICSITEMSVGTEMPLATE_H +}// namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGISectionLine.h b/src/Mod/TechDraw/Gui/QGISectionLine.h index a35dae590e..1a497bcebd 100644 --- a/src/Mod/TechDraw/Gui/QGISectionLine.h +++ b/src/Mod/TechDraw/Gui/QGISectionLine.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_QGISECTIONLINE_H -#define TECHDRAWGUI_QGISECTIONLINE_H +#pragma once #include @@ -129,6 +128,4 @@ private: bool m_showLine{true}; }; -} - -#endif // TECHDRAWGUI_QGISECTIONLINE_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGITemplate.h b/src/Mod/TechDraw/Gui/QGITemplate.h index b45ea99383..e70c1853d0 100644 --- a/src/Mod/TechDraw/Gui/QGITemplate.h +++ b/src/Mod/TechDraw/Gui/QGITemplate.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGRAPHICSITEMTEMPLATE_H -#define DRAWINGGUI_QGRAPHICSITEMTEMPLATE_H +#pragma once #include @@ -72,6 +71,4 @@ protected: std::vector textFields; }; -} // namespace - -#endif // DRAWINGGUI_QGRAPHICSITEMTEMPLATE_H +} // namespace \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGITile.h b/src/Mod/TechDraw/Gui/QGITile.h index c8af1118d1..457e240132 100644 --- a/src/Mod/TechDraw/Gui/QGITile.h +++ b/src/Mod/TechDraw/Gui/QGITile.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_QGITILE_H -#define TECHDRAWGUI_QGITILE_H +#pragma once #include @@ -119,6 +118,4 @@ private: Base::Vector3d m_leaderYDirection; }; -} - -#endif // TECHDRAWGUI_QGITILE_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIUserTypes.h b/src/Mod/TechDraw/Gui/QGIUserTypes.h index c9bf0178f2..ba334daa03 100644 --- a/src/Mod/TechDraw/Gui/QGIUserTypes.h +++ b/src/Mod/TechDraw/Gui/QGIUserTypes.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_USERTYPES_H -#define TECHDRAWGUI_USERTYPES_H +#pragma once #include @@ -100,6 +99,4 @@ pixmap 7 text 8 simpletext 9 group 10 -*/ - -#endif +*/ \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIVertex.h b/src/Mod/TechDraw/Gui/QGIVertex.h index ace8d6654d..aff0fc4057 100644 --- a/src/Mod/TechDraw/Gui/QGIVertex.h +++ b/src/Mod/TechDraw/Gui/QGIVertex.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGRAPHICSITEMVERTEX_H -#define DRAWINGGUI_QGRAPHICSITEMVERTEX_H +#pragma once #include @@ -60,6 +59,4 @@ protected: double m_radius; }; -} - -#endif // DRAWINGGUI_QGRAPHICSITEMVERTEX_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIView.h b/src/Mod/TechDraw/Gui/QGIView.h index f7a62f29dd..f4a68a0a91 100644 --- a/src/Mod/TechDraw/Gui/QGIView.h +++ b/src/Mod/TechDraw/Gui/QGIView.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGRAPHICSITEMVIEW_H -#define DRAWINGGUI_QGRAPHICSITEMVIEW_H +#pragma once #include @@ -246,6 +245,4 @@ private: QPointF& outLockPos) const; }; -} // namespace - -#endif // DRAWINGGUI_QGRAPHICSITEMVIEW_H +} // namespace \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIViewAnnotation.h b/src/Mod/TechDraw/Gui/QGIViewAnnotation.h index 2d47ba6c71..7ae4d63e7c 100644 --- a/src/Mod/TechDraw/Gui/QGIViewAnnotation.h +++ b/src/Mod/TechDraw/Gui/QGIViewAnnotation.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGRAPHICSITEMVIEWANNOTATION_H -#define DRAWINGGUI_QGRAPHICSITEMVIEWANNOTATION_H +#pragma once #include @@ -66,6 +65,4 @@ protected: QColor m_colPre; }; -} // end namespace TechDrawGui - -#endif // DRAWINGGUI_QGRAPHICSITEMVIEWANNOTATION_H +} // end namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIViewBalloon.h b/src/Mod/TechDraw/Gui/QGIViewBalloon.h index e6f2d78558..0bfd1d9e83 100644 --- a/src/Mod/TechDraw/Gui/QGIViewBalloon.h +++ b/src/Mod/TechDraw/Gui/QGIViewBalloon.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_QGIVBALLOON_H -#define TECHDRAWGUI_QGIVBALLOON_H +#pragma once #include @@ -252,6 +251,4 @@ private: Base::Vector3d m_savePosition; }; -}// namespace TechDrawGui - -#endif// TECHDRAWGUI_QGIVBALLOON_H +}// namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIViewClip.h b/src/Mod/TechDraw/Gui/QGIViewClip.h index cbb67bb83d..d7f06e6872 100644 --- a/src/Mod/TechDraw/Gui/QGIViewClip.h +++ b/src/Mod/TechDraw/Gui/QGIViewClip.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGRAPHICSITEMCLIP_H -#define DRAWINGGUI_QGRAPHICSITEMCLIP_H +#pragma once #include @@ -66,6 +65,4 @@ private: }; -} // namespace MDIViewPageGui - -#endif // DRAWINGGUI_QGRAPHICSITEMCLIP_H +} // namespace MDIViewPageGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIViewCollection.h b/src/Mod/TechDraw/Gui/QGIViewCollection.h index 4baee16253..2e9ffddd6a 100644 --- a/src/Mod/TechDraw/Gui/QGIViewCollection.h +++ b/src/Mod/TechDraw/Gui/QGIViewCollection.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGRAPHICSITEMVIEWCOLLECTION_H -#define DRAWINGGUI_QGRAPHICSITEMVIEWCOLLECTION_H +#pragma once #include @@ -46,6 +45,4 @@ public: int type() const override { return Type;} }; -} // namespace MDIViewPageGui - -#endif // DRAWINGGUI_QGRAPHICSITEMVIEWCOLLECTION_H +} // namespace MDIViewPageGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.h b/src/Mod/TechDraw/Gui/QGIViewDimension.h index 7846be916e..326e32ce90 100644 --- a/src/Mod/TechDraw/Gui/QGIViewDimension.h +++ b/src/Mod/TechDraw/Gui/QGIViewDimension.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGRAPHICSITEMVIEWDIMENSION_H -#define DRAWINGGUI_QGRAPHICSITEMVIEWDIMENSION_H +#pragma once #include @@ -226,6 +225,4 @@ private: }; -} // namespace MDIViewPageGui - -#endif // DRAWINGGUI_QGRAPHICSITEMVIEWDIMENSION_H +} // namespace MDIViewPageGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIViewImage.h b/src/Mod/TechDraw/Gui/QGIViewImage.h index 64076fb650..cc4d2ebe93 100644 --- a/src/Mod/TechDraw/Gui/QGIViewImage.h +++ b/src/Mod/TechDraw/Gui/QGIViewImage.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGRAPHICSITEMVIEWIMAGE_H -#define DRAWINGGUI_QGRAPHICSITEMVIEWIMAGE_H +#pragma once #include @@ -59,5 +58,4 @@ protected: QGCustomClip* m_cliparea; }; -} // namespace -#endif // DRAWINGGUI_QGRAPHICSITEMVIEWIMAGE_H +} // namespace \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIViewPart.h b/src/Mod/TechDraw/Gui/QGIViewPart.h index 191b857985..15176f9193 100644 --- a/src/Mod/TechDraw/Gui/QGIViewPart.h +++ b/src/Mod/TechDraw/Gui/QGIViewPart.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGRAPHICSITEMVIEWPART_H -#define DRAWINGGUI_QGRAPHICSITEMVIEWPART_H +#pragma once #include @@ -164,6 +163,4 @@ private: }; -} // namespace - -#endif // DRAWINGGUI_QGRAPHICSITEMVIEWPART_H +} // namespace \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIViewSection.h b/src/Mod/TechDraw/Gui/QGIViewSection.h index 4220cae382..3b27a453ff 100644 --- a/src/Mod/TechDraw/Gui/QGIViewSection.h +++ b/src/Mod/TechDraw/Gui/QGIViewSection.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGRAPHICSITEMVIEWSECTION_H -#define DRAWINGGUI_QGRAPHICSITEMVIEWSECTION_H +#pragma once #include @@ -47,6 +46,4 @@ protected: void drawSectionFace(); }; -} // end namespace TechDrawGui - -#endif // #ifndef DRAWINGGUI_QGRAPHICSITEMVIEWSECTION_H +} // end namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.h b/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.h index 0baa13ece6..d39d238701 100644 --- a/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.h +++ b/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGRAPHICSITEMVIEWSPREADSHEET_H -#define DRAWINGGUI_QGRAPHICSITEMVIEWSPREADSHEET_H +#pragma once #include @@ -48,6 +47,4 @@ public: }; -} // end namespace TechDrawGui - -#endif // DRAWINGGUI_QGRAPHICSITEMVIEWSPREADSHEET_H +} // end namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIViewSymbol.h b/src/Mod/TechDraw/Gui/QGIViewSymbol.h index a865d881ea..efa5801e02 100644 --- a/src/Mod/TechDraw/Gui/QGIViewSymbol.h +++ b/src/Mod/TechDraw/Gui/QGIViewSymbol.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGRAPHICSITEMVIEWSYMBOL_H -#define DRAWINGGUI_QGRAPHICSITEMVIEWSYMBOL_H +#pragma once #include @@ -67,5 +66,4 @@ protected: QGCustomSvg *m_svgItem; }; -} // namespace -#endif // DRAWINGGUI_QGRAPHICSITEMVIEWSYMBOL_H +} // namespace \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGIWeldSymbol.h b/src/Mod/TechDraw/Gui/QGIWeldSymbol.h index f2b194406c..13c53fb136 100644 --- a/src/Mod/TechDraw/Gui/QGIWeldSymbol.h +++ b/src/Mod/TechDraw/Gui/QGIWeldSymbol.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_QGRAPHICSITEMWELDSYMBOL_H -#define DRAWINGGUI_QGRAPHICSITEMWELDSYMBOL_H +#pragma once #include @@ -133,6 +132,4 @@ private: }; -} - -#endif // DRAWINGGUI_QGRAPHICSITEMWELDSYMBOL_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGMText.h b/src/Mod/TechDraw/Gui/QGMText.h index c99d40e4d0..71dfb53898 100644 --- a/src/Mod/TechDraw/Gui/QGMText.h +++ b/src/Mod/TechDraw/Gui/QGMText.h @@ -23,8 +23,7 @@ //QGMText.h //a movable, editable text item -#ifndef TECHDRAWGUI_MOVABLETEXT_H -#define TECHDRAWGUI_MOVABLETEXT_H +#pragma once #include @@ -81,6 +80,4 @@ private: }; -} - -#endif // TECHDRAWGUI_MOVABLETEXT_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGSPage.h b/src/Mod/TechDraw/Gui/QGSPage.h index d5d0fbdacd..2e25683803 100644 --- a/src/Mod/TechDraw/Gui/QGSPage.h +++ b/src/Mod/TechDraw/Gui/QGSPage.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_QGSCENE_H -#define TECHDRAWGUI_QGSCENE_H +#pragma once #include @@ -168,6 +167,4 @@ private: bool m_exportingPdf{false}; }; -}// namespace TechDrawGui - -#endif// TECHDRAWGUI_QGSCENE_H +}// namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGTracker.h b/src/Mod/TechDraw/Gui/QGTracker.h index 67368484b1..a82882a562 100644 --- a/src/Mod/TechDraw/Gui/QGTracker.h +++ b/src/Mod/TechDraw/Gui/QGTracker.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_TRACKER_H -#define DRAWINGGUI_TRACKER_H +#pragma once #include @@ -122,6 +121,4 @@ private: QPointF m_lastClick; }; -} // namespace - -#endif // DRAWINGGUI_TRACKER_H +} // namespace \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGVNavStyle.h b/src/Mod/TechDraw/Gui/QGVNavStyle.h index db6b7c6561..96d36d1792 100644 --- a/src/Mod/TechDraw/Gui/QGVNavStyle.h +++ b/src/Mod/TechDraw/Gui/QGVNavStyle.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef TECHDRAW_NAVIGATIONSTYLE_H -#define TECHDRAW_NAVIGATIONSTYLE_H +#pragma once #include @@ -130,5 +129,4 @@ private: }; -} -#endif // TECHDRAW_NAVIGATIONSTYLE_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleBlender.h b/src/Mod/TechDraw/Gui/QGVNavStyleBlender.h index 0d16d33462..d878751875 100644 --- a/src/Mod/TechDraw/Gui/QGVNavStyleBlender.h +++ b/src/Mod/TechDraw/Gui/QGVNavStyleBlender.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef TECHDRAW_BLENDERNAVSTYLE_H -#define TECHDRAW_BLENDERNAVSTYLE_H +#pragma once #include @@ -51,5 +50,4 @@ private: }; -} -#endif // TECHDRAW_BLENDERNAVSTYLE_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleCAD.h b/src/Mod/TechDraw/Gui/QGVNavStyleCAD.h index 6d27bcbf7a..f1bf4522bb 100644 --- a/src/Mod/TechDraw/Gui/QGVNavStyleCAD.h +++ b/src/Mod/TechDraw/Gui/QGVNavStyleCAD.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef TECHDRAW_CADNAVSTYLE_H -#define TECHDRAW_CADNAVSTYLE_H +#pragma once #include @@ -51,5 +50,4 @@ private: }; -} -#endif // TECHDRAW_CADNAVSTYLE_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleGesture.h b/src/Mod/TechDraw/Gui/QGVNavStyleGesture.h index 47571390ac..7f01afd317 100644 --- a/src/Mod/TechDraw/Gui/QGVNavStyleGesture.h +++ b/src/Mod/TechDraw/Gui/QGVNavStyleGesture.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef TECHDRAW_GESTURENAVSTYLE_H -#define TECHDRAW_GESTURENAVSTYLE_H +#pragma once #include @@ -49,5 +48,4 @@ private: }; -} -#endif // TECHDRAW_GESTURENAVSTYLE_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleInventor.h b/src/Mod/TechDraw/Gui/QGVNavStyleInventor.h index 3d9ed0c33d..3d5a3d4168 100644 --- a/src/Mod/TechDraw/Gui/QGVNavStyleInventor.h +++ b/src/Mod/TechDraw/Gui/QGVNavStyleInventor.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef TECHDRAW_INVENTORNAVSTYLE_H -#define TECHDRAW_INVENTORNAVSTYLE_H +#pragma once #include @@ -47,5 +46,4 @@ private: }; -} -#endif // TECHDRAW_INVENTORNAVSTYLE_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleMaya.h b/src/Mod/TechDraw/Gui/QGVNavStyleMaya.h index 4d9b2afad7..d9130d25b8 100644 --- a/src/Mod/TechDraw/Gui/QGVNavStyleMaya.h +++ b/src/Mod/TechDraw/Gui/QGVNavStyleMaya.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef TECHDRAW_MAYANAVSTYLE_H -#define TECHDRAW_MAYANAVSTYLE_H +#pragma once #include @@ -50,5 +49,4 @@ private: }; -} -#endif // TECHDRAW_MAYANAVSTYLE_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleOCC.h b/src/Mod/TechDraw/Gui/QGVNavStyleOCC.h index 71b4825075..42476987b4 100644 --- a/src/Mod/TechDraw/Gui/QGVNavStyleOCC.h +++ b/src/Mod/TechDraw/Gui/QGVNavStyleOCC.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef TECHDRAW_OCCNAVSTYLE_H -#define TECHDRAW_OCCNAVSTYLE_H +#pragma once #include @@ -51,5 +50,4 @@ private: }; -} -#endif // TECHDRAW_OCCNAVSTYLE_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleOpenSCAD.h b/src/Mod/TechDraw/Gui/QGVNavStyleOpenSCAD.h index 0417da9432..3fc9db9eb8 100644 --- a/src/Mod/TechDraw/Gui/QGVNavStyleOpenSCAD.h +++ b/src/Mod/TechDraw/Gui/QGVNavStyleOpenSCAD.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef TECHDRAW_OPENSCADNAVSTYLE_H -#define TECHDRAW_OPENSCADNAVSTYLE_H +#pragma once #include @@ -50,5 +49,4 @@ private: }; -} -#endif // TECHDRAW_OPENSCADNAVSTYLE_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleRevit.h b/src/Mod/TechDraw/Gui/QGVNavStyleRevit.h index 07608270d3..0a7941ed4c 100644 --- a/src/Mod/TechDraw/Gui/QGVNavStyleRevit.h +++ b/src/Mod/TechDraw/Gui/QGVNavStyleRevit.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef TECHDRAW_REVITNAVSTYLE_H -#define TECHDRAW_REVITNAVSTYLE_H +#pragma once #include @@ -49,5 +48,4 @@ private: }; -} -#endif // TECHDRAW_REVITNAVSTYLE_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleSolidWorks.h b/src/Mod/TechDraw/Gui/QGVNavStyleSolidWorks.h index 9276590d88..a5bb387092 100644 --- a/src/Mod/TechDraw/Gui/QGVNavStyleSolidWorks.h +++ b/src/Mod/TechDraw/Gui/QGVNavStyleSolidWorks.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef TECHDRAW_SOLIDWORKSNAVSTYLE_H -#define TECHDRAW_SOLIDWORKSNAVSTYLE_H +#pragma once #include @@ -48,5 +47,4 @@ private: }; -} -#endif // TECHDRAW_SOLIDWORKSNAVSTYLE_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleTinkerCAD.h b/src/Mod/TechDraw/Gui/QGVNavStyleTinkerCAD.h index 84c4ce00f7..05732e356e 100644 --- a/src/Mod/TechDraw/Gui/QGVNavStyleTinkerCAD.h +++ b/src/Mod/TechDraw/Gui/QGVNavStyleTinkerCAD.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef TECHDRAW_TINKERNAVSTYLE_H -#define TECHDRAW_TINKERNAVSTYLE_H +#pragma once #include @@ -49,5 +48,4 @@ private: }; -} -#endif // TECHDRAW_TINKERNAVSTYLE_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleTouchpad.h b/src/Mod/TechDraw/Gui/QGVNavStyleTouchpad.h index 9968580966..eda955fedc 100644 --- a/src/Mod/TechDraw/Gui/QGVNavStyleTouchpad.h +++ b/src/Mod/TechDraw/Gui/QGVNavStyleTouchpad.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef TECHDRAW_TOUCHPADNAVSTYLE_H -#define TECHDRAW_TOUCHPADNAVSTYLE_H +#pragma once #include @@ -49,5 +48,4 @@ private: }; -} -#endif // TECHDRAW_TOUCHPADNAVSTYLE_H +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/QGVPage.h b/src/Mod/TechDraw/Gui/QGVPage.h index aaa9d14984..9a6a922783 100644 --- a/src/Mod/TechDraw/Gui/QGVPage.h +++ b/src/Mod/TechDraw/Gui/QGVPage.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_QGVIEW_H -#define TECHDRAWGUI_QGVIEW_H +#pragma once #include @@ -204,6 +203,4 @@ private: std::unique_ptr toolHandler; }; -}// namespace TechDrawGui - -#endif// TECHDRAWGUI_QGVIEW_H +}// namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/Rez.h b/src/Mod/TechDraw/Gui/Rez.h index 24da0f6b46..4bc1fbff03 100644 --- a/src/Mod/TechDraw/Gui/Rez.h +++ b/src/Mod/TechDraw/Gui/Rez.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_REZ_H -#define DRAWINGGUI_REZ_H +#pragma once #include #include @@ -64,5 +63,4 @@ private: static double m_rezFactor; }; -} //end namespace TechDrawGui -#endif +} //end namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/SymbolChooser.h b/src/Mod/TechDraw/Gui/SymbolChooser.h index d8ed9a8bae..3625bc9533 100644 --- a/src/Mod/TechDraw/Gui/SymbolChooser.h +++ b/src/Mod/TechDraw/Gui/SymbolChooser.h @@ -19,8 +19,7 @@ * Suite 330, Boston, MA 02111-1307, USA * * * ***************************************************************************/ -#ifndef TECHDRAWGUI_SYMBOLCHOOSER_H -#define TECHDRAWGUI_SYMBOLCHOOSER_H +#pragma once #include @@ -62,6 +61,4 @@ private: QString m_source; }; -} -#endif // #ifndef TECHDRAWGUI_SYMBOLCHOOSER_H - +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/TaskActiveView.h b/src/Mod/TechDraw/Gui/TaskActiveView.h index d7102559b0..9c43df1464 100644 --- a/src/Mod/TechDraw/Gui/TaskActiveView.h +++ b/src/Mod/TechDraw/Gui/TaskActiveView.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_TASKACTIVEVIEW_H -#define TECHDRAWGUI_TASKACTIVEVIEW_H +#pragma once #include #include @@ -121,6 +120,4 @@ private: }; -} //namespace TechDrawGui - -#endif // #ifndef TECHDRAWGUI_TASKACTIVEVIEW_H +} //namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/TaskBalloon.h b/src/Mod/TechDraw/Gui/TaskBalloon.h index 3ce1768c7b..945b4bdedb 100644 --- a/src/Mod/TechDraw/Gui/TaskBalloon.h +++ b/src/Mod/TechDraw/Gui/TaskBalloon.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TASKBALLOON_H -#define GUI_TASKVIEW_TASKBALLOON_H +#pragma once #include #include @@ -109,6 +108,4 @@ private: Gui::TaskView::TaskBox* taskbox; }; -} //namespace TechDrawGui - -#endif // #ifndef GUI_TASKVIEW_TASKBALLOON_H +} //namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.h b/src/Mod/TechDraw/Gui/TaskCenterLine.h index 2515e97d5e..d8627e1674 100644 --- a/src/Mod/TechDraw/Gui/TaskCenterLine.h +++ b/src/Mod/TechDraw/Gui/TaskCenterLine.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_TASKCENTERLINE_H -#define TECHDRAWGUI_TASKCENTERLINE_H +#pragma once #include #include @@ -162,6 +161,4 @@ private: }; -} //namespace TechDrawGui - -#endif // #ifndef TECHDRAWGUI_TASKCENTERLINE_H +} //namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/TaskComplexSection.h b/src/Mod/TechDraw/Gui/TaskComplexSection.h index ba80c36ee7..8dab5d9f97 100644 --- a/src/Mod/TechDraw/Gui/TaskComplexSection.h +++ b/src/Mod/TechDraw/Gui/TaskComplexSection.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_TASKCOMPLEXSECTION_H -#define TECHDRAWGUI_TASKCOMPLEXSECTION_H +#pragma once #include @@ -184,6 +183,4 @@ private: Gui::TaskView::TaskBox* taskbox; }; -} //namespace TechDrawGui - -#endif // #ifndef TECHDRAWGUI_TASKCOMPLEXSECTION_H +} //namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/TaskCosVertex.h b/src/Mod/TechDraw/Gui/TaskCosVertex.h index 1e00c36e72..f25eb4e405 100644 --- a/src/Mod/TechDraw/Gui/TaskCosVertex.h +++ b/src/Mod/TechDraw/Gui/TaskCosVertex.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_TASKCOSVERTEX_H -#define TECHDRAWGUI_TASKCOSVERTEX_H +#pragma once #include "QGTracker.h" @@ -142,6 +141,4 @@ private: Gui::TaskView::TaskBox* taskbox; }; -} //namespace TechDrawGui - -#endif // #ifndef TECHDRAWGUI_TASKCOSVERTEX_H +} //namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/TaskCosmeticCircle.h b/src/Mod/TechDraw/Gui/TaskCosmeticCircle.h index c65597d77a..b88e31a5cc 100644 --- a/src/Mod/TechDraw/Gui/TaskCosmeticCircle.h +++ b/src/Mod/TechDraw/Gui/TaskCosmeticCircle.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_TASKCOSMETICCIRCLE_H -#define TECHDRAWGUI_TASKCOSMETICCIRCLE_H +#pragma once #include #include @@ -128,7 +127,4 @@ private: Gui::TaskView::TaskBox* taskbox; }; -} //namespace TechDrawGui - -#endif // #ifndef TECHDRAWGUI_TASKCOSMETICCIRCLE_H - +} //namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/TaskCosmeticLine.h b/src/Mod/TechDraw/Gui/TaskCosmeticLine.h index be589a6142..7cadc4fa8a 100644 --- a/src/Mod/TechDraw/Gui/TaskCosmeticLine.h +++ b/src/Mod/TechDraw/Gui/TaskCosmeticLine.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_TASKCOSMETICLINE_H -#define TECHDRAWGUI_TASKCOSMETICLINE_H +#pragma once #include #include @@ -123,6 +122,4 @@ private: Gui::TaskView::TaskBox* taskbox; }; -} //namespace TechDrawGui - -#endif // #ifndef TECHDRAWGUI_TASKCOSMETICLINE_H +} //namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.h b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.h index 9b8dc3e0d7..232a09d76e 100644 --- a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.h +++ b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_TASKCUSTOMIZEFORMAT_H -#define TECHDRAWGUI_TASKCUSTOMIZEFORMAT_H +#pragma once #include #include @@ -115,7 +114,4 @@ private: Gui::TaskView::TaskBox* taskbox; }; // class TaskDlgCustomizeFormat -} // namespace TechDrawGui - -#endif // #ifndef TECHDRAWGUI_TASKCUSTOMIZEFORMAT_H - +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/TaskDetail.h b/src/Mod/TechDraw/Gui/TaskDetail.h index bbd0abc62b..d1460d7e30 100644 --- a/src/Mod/TechDraw/Gui/TaskDetail.h +++ b/src/Mod/TechDraw/Gui/TaskDetail.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_TASKDETAIL_H -#define TECHDRAWGUI_TASKDETAIL_H +#pragma once #include #include @@ -160,6 +159,4 @@ private: Gui::TaskView::TaskBox* taskbox; }; -} //namespace TechDrawGui - -#endif // #ifndef TECHDRAWGUI_TASKDETAIL_H +} //namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/TaskDimRepair.h b/src/Mod/TechDraw/Gui/TaskDimRepair.h index bb8c97bf2d..fd35df32e1 100644 --- a/src/Mod/TechDraw/Gui/TaskDimRepair.h +++ b/src/Mod/TechDraw/Gui/TaskDimRepair.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAW_TASKDIMREPAIR_H -#define TECHDRAW_TASKDIMREPAIR_H +#pragma once #include #include @@ -117,6 +116,4 @@ private: Gui::TaskView::TaskBox* taskbox; }; -}//namespace TechDrawGui - -#endif// #ifndef TECHDRAW_TASKDIMREPAIR_H +}//namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/TaskDimension.h b/src/Mod/TechDraw/Gui/TaskDimension.h index 4c214d8822..a73a88fd22 100644 --- a/src/Mod/TechDraw/Gui/TaskDimension.h +++ b/src/Mod/TechDraw/Gui/TaskDimension.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TASKDIMENSION_H -#define GUI_TASKVIEW_TASKDIMENSION_H +#pragma once #include #include @@ -113,6 +112,4 @@ private: Gui::TaskView::TaskBox* taskbox; }; -} //namespace TechDrawGui - -#endif // #ifndef GUI_TASKVIEW_TASKDIMENSION_H +} //namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/TaskGeomHatch.h b/src/Mod/TechDraw/Gui/TaskGeomHatch.h index 32b5b3e343..9396182afd 100644 --- a/src/Mod/TechDraw/Gui/TaskGeomHatch.h +++ b/src/Mod/TechDraw/Gui/TaskGeomHatch.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TASKGEOMHATCH_H -#define GUI_TASKVIEW_TASKGEOMHATCH_H +#pragma once #include #include @@ -128,6 +127,4 @@ private: Gui::TaskView::TaskBox* taskbox; }; -} //namespace TechDrawGui - -#endif // #ifndef GUI_TASKVIEW_TASKGEOMHATCH_H +} //namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/TaskHatch.h b/src/Mod/TechDraw/Gui/TaskHatch.h index 4d4144c1a9..486b2f5b94 100644 --- a/src/Mod/TechDraw/Gui/TaskHatch.h +++ b/src/Mod/TechDraw/Gui/TaskHatch.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TASKHATCH_H -#define GUI_TASKVIEW_TASKHATCH_H +#pragma once #include #include @@ -126,6 +125,4 @@ private: Gui::TaskView::TaskBox* taskbox; }; -} //namespace TechDrawGui - -#endif // #ifndef GUI_TASKVIEW_TASKHATCH_H +} //namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.h b/src/Mod/TechDraw/Gui/TaskLeaderLine.h index 56054c8ee9..6f99baa621 100644 --- a/src/Mod/TechDraw/Gui/TaskLeaderLine.h +++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_TASKTEXTLEADER_H -#define TECHDRAWGUI_TASKTEXTLEADER_H +#pragma once #include "QGTracker.h" @@ -174,6 +173,4 @@ private: Gui::TaskView::TaskBox* taskbox; }; -} //namespace TechDrawGui - -#endif // #ifndef TECHDRAWGUI_TASKTEXTLEADER_H +} //namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/TaskLineDecor.h b/src/Mod/TechDraw/Gui/TaskLineDecor.h index 75cfc50393..7060f78ecb 100644 --- a/src/Mod/TechDraw/Gui/TaskLineDecor.h +++ b/src/Mod/TechDraw/Gui/TaskLineDecor.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TASKLINEDECOR_H -#define GUI_TASKVIEW_TASKLINEDECOR_H +#pragma once #include #include @@ -163,6 +162,4 @@ private: Gui::TaskView::TaskBox* restoreBox; }; -} //namespace TechDrawGui - -#endif // #ifndef GUI_TASKVIEW_TASKLINEDECOR_H +} //namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/TaskLinkDim.h b/src/Mod/TechDraw/Gui/TaskLinkDim.h index b98a538015..3a8fcf59d4 100644 --- a/src/Mod/TechDraw/Gui/TaskLinkDim.h +++ b/src/Mod/TechDraw/Gui/TaskLinkDim.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TASKLINKDIM_H -#define GUI_TASKVIEW_TASKLINKDIM_H +#pragma once #include #include @@ -97,6 +96,4 @@ private: Gui::TaskView::TaskBox* taskbox; }; -} //namespace TechDrawGui - -#endif // #ifndef GUI_TASKVIEW_TASKLINKDIM_H +} //namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.h b/src/Mod/TechDraw/Gui/TaskProjGroup.h index dd793b0abc..7b601ebcc9 100644 --- a/src/Mod/TechDraw/Gui/TaskProjGroup.h +++ b/src/Mod/TechDraw/Gui/TaskProjGroup.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TASKVIEWGROUP_H -#define GUI_TASKVIEW_TASKVIEWGROUP_H +#pragma once #include #include @@ -201,6 +200,4 @@ private: void createUI(); }; -} //namespace TechDrawGui - -#endif // #ifndef GUI_TASKVIEW_TASKVIEWGROUP_H +} //namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/TaskProjection.h b/src/Mod/TechDraw/Gui/TaskProjection.h index 7558de6857..363038bce3 100644 --- a/src/Mod/TechDraw/Gui/TaskProjection.h +++ b/src/Mod/TechDraw/Gui/TaskProjection.h @@ -22,8 +22,7 @@ //this file originally part of Drawing workbench //migrated to TechDraw workbench 2022-01-26 by Wandererfan -#ifndef TECHDRAWGUI_TASKDIALOG -#define TECHDRAWGUI_TASKDIALOG +#pragma once #include @@ -91,8 +90,4 @@ private: Gui::TaskView::TaskBox* taskbox; }; -} //namespace TechDrawGui - - - -#endif // TECHDRAWGUI_TASKDIALOG +} //namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/TaskRichAnno.h b/src/Mod/TechDraw/Gui/TaskRichAnno.h index d881a2b90a..ff1eadf0f7 100644 --- a/src/Mod/TechDraw/Gui/TaskRichAnno.h +++ b/src/Mod/TechDraw/Gui/TaskRichAnno.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_TASKRICHANNO_H -#define TECHDRAWGUI_TASKRICHANNO_H +#pragma once #include #include @@ -151,6 +150,4 @@ private: Gui::TaskView::TaskBox* taskbox; }; -} //namespace TechDrawGui - -#endif // #ifndef TECHDRAWGUI_TASKRICHANNO_H +} //namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/TaskSectionView.h b/src/Mod/TechDraw/Gui/TaskSectionView.h index f2ed7bb828..5b466c353d 100644 --- a/src/Mod/TechDraw/Gui/TaskSectionView.h +++ b/src/Mod/TechDraw/Gui/TaskSectionView.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_TASKVIEW_TASKSECTIONVIEW_H -#define GUI_TASKVIEW_TASKSECTIONVIEW_H +#pragma once #include #include @@ -166,6 +165,4 @@ private: Gui::TaskView::TaskBox* taskbox; }; -} //namespace TechDrawGui - -#endif // #ifndef GUI_TASKVIEW_TASKSECTIONVIEW_H +} //namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h index adf89cbf99..0e5833d773 100644 --- a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h +++ b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_TASKSELECTLINEATTRIBUTES_H -#define TECHDRAWGUI_TASKSELECTLINEATTRIBUTES_H +#pragma once #include #include @@ -142,6 +141,4 @@ private: Gui::TaskView::TaskBox* taskbox; }; // class TaskDlgSelectLineAttributes -} // namespace TechDrawGui - -#endif // #ifndef TECHDRAWGUI_TASKSELECTLINEATTRIBUTES_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.h b/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.h index 69b6f6ac03..561b6cc9f9 100644 --- a/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.h +++ b/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_TASKSURFACEFINISHSYMBOLS_H -#define TECHDRAWGUI_TASKSURFACEFINISHSYMBOLS_H +#pragma once #include #include @@ -149,6 +148,4 @@ private: Gui::TaskView::TaskBox* taskbox; }; // class TaskDlgSurfaceFinishSymbols -} // namespace TechDrawGui - -#endif // #ifndef TECHDRAWGUI_TASKSURFACEFINISHSYMBOLS_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h index 25a5925244..817be66a94 100644 --- a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h +++ b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_TASKWELDINGSYMBOL_H -#define TECHDRAWGUI_TASKWELDINGSYMBOL_H +#pragma once #include #include @@ -194,6 +193,4 @@ private: }; -} //namespace TechDrawGui - -#endif // #ifndef TECHDRAWGUI_TASKWELDINGSYMBOL_H +} //namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/TechDrawHandler.h b/src/Mod/TechDraw/Gui/TechDrawHandler.h index 3e3c8a81ea..47f2392b9e 100644 --- a/src/Mod/TechDraw/Gui/TechDrawHandler.h +++ b/src/Mod/TechDraw/Gui/TechDrawHandler.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TechDrawGUI_TechDrawHandler_H -#define TechDrawGUI_TechDrawHandler_H +#pragma once #include @@ -61,7 +60,4 @@ protected: }; -} // namespace TechDrawGui - - -#endif // TechDrawGUI_TechDrawHandler_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/TemplateTextField.h b/src/Mod/TechDraw/Gui/TemplateTextField.h index ea97913c83..c47eb12c3c 100644 --- a/src/Mod/TechDraw/Gui/TemplateTextField.h +++ b/src/Mod/TechDraw/Gui/TemplateTextField.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_TEMPLATETEXTFIELD_H -#define DRAWINGGUI_TEMPLATETEXTFIELD_H +#pragma once #include @@ -82,6 +81,4 @@ class TechDrawGuiExport TemplateTextField : public QGraphicsItemGroup QGraphicsRectItem* m_rect; QGraphicsPathItem* m_line; }; -} // namespace TechDrawGui - -#endif // #ifndef DRAWINGGUI_TEMPLATETEXTFIELD_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.h b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.h index 4bdba5ccc4..b2c05c6eff 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.h +++ b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_VIEWPROVIDERANNOTATION_H -#define DRAWINGGUI_VIEWPROVIDERANNOTATION_H +#pragma once #include @@ -56,7 +55,4 @@ public: bool setEdit(int ModNum) override; }; -}// namespace TechDrawGui - - -#endif// DRAWINGGUI_VIEWPROVIDERANNOTATION_H +}// namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/ViewProviderBalloon.h b/src/Mod/TechDraw/Gui/ViewProviderBalloon.h index d0d8e86d84..90b1b79807 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderBalloon.h +++ b/src/Mod/TechDraw/Gui/ViewProviderBalloon.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_VIEWPROVIDERBALLOON_H -#define DRAWINGGUI_VIEWPROVIDERBALLOON_H +#pragma once #include @@ -69,7 +68,4 @@ protected: void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop) override; }; -} // namespace TechDrawGui - - -#endif // DRAWINGGUI_VIEWPROVIDERBALLOON_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.h b/src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.h index 51cb09013b..8c2ab9d06a 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.h +++ b/src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef GUI_VIEWPROVIDERCOSMETICEXTENSION_H -#define GUI_VIEWPROVIDERCOSMETICEXTENSION_H +#pragma once #include @@ -44,6 +43,4 @@ public: using ViewProviderCosmeticExtensionPython = Gui::ViewProviderExtensionPythonT; -} //namespace TechDrawGui - -#endif // GUI_VIEWPROVIDERCOSMETICEXTENSION_H +} //namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/ViewProviderDimension.h b/src/Mod/TechDraw/Gui/ViewProviderDimension.h index 8ea232e243..15418c7f01 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDimension.h +++ b/src/Mod/TechDraw/Gui/ViewProviderDimension.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_VIEWPROVIDERDIMENSION_H -#define DRAWINGGUI_VIEWPROVIDERDIMENSION_H +#pragma once #include #include @@ -106,7 +105,4 @@ private: }; -} // namespace TechDrawGui - - -#endif // DRAWINGGUI_VIEWPROVIDERDIMENSION_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h index b682ea359c..ccd85276ab 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h +++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_VIEWPROVIDERVIEW_H -#define TECHDRAWGUI_VIEWPROVIDERVIEW_H +#pragma once #include @@ -117,7 +116,4 @@ private: std::string m_myName; }; -} // namespace TechDrawGui - - -#endif // TECHDRAWGUI_VIEWPROVIDERVIEW_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.h b/src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.h index e00f5505fb..c02345f3a3 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.h +++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_VIEWPROVIDERDRAWINGVIEWEXTENSION_H -#define TECHDRAWGUI_VIEWPROVIDERDRAWINGVIEWEXTENSION_H +#pragma once #include #include @@ -57,6 +56,4 @@ private: using ViewProviderDrawingViewExtensionPython = Gui::ViewProviderExtensionPythonT; -}// namespace TechDrawGui - -#endif// TECHDRAWGUI_VIEWPROVIDERDRAWINGVIEWEXTENSION_H +}// namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h index 868ac4e1d5..0a5f67b2df 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h +++ b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_VIEWPROVIDERCROSSHATCH_H -#define DRAWINGGUI_VIEWPROVIDERCROSSHATCH_H +#pragma once #include @@ -67,6 +66,4 @@ public: Gui::MDIView *getMDIView() const override; }; -} // namespace TechDrawGui - -#endif // DRAWINGGUI_VIEWPROVIDERHATCH_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/ViewProviderHatch.h b/src/Mod/TechDraw/Gui/ViewProviderHatch.h index 6904616ac2..e5b0a92f57 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderHatch.h +++ b/src/Mod/TechDraw/Gui/ViewProviderHatch.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef DRAWINGGUI_VIEWPROVIDERHATCH_H -#define DRAWINGGUI_VIEWPROVIDERHATCH_H +#pragma once #include #include @@ -68,7 +67,4 @@ private: }; -} // namespace TechDrawGui - - -#endif // DRAWINGGUI_VIEWPROVIDERHATCH_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/ViewProviderImage.h b/src/Mod/TechDraw/Gui/ViewProviderImage.h index c362047148..28d30d422b 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderImage.h +++ b/src/Mod/TechDraw/Gui/ViewProviderImage.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_VIEWPROVIDERIMAGE_H -#define DRAWINGGUI_VIEWPROVIDERIMAGE_H +#pragma once #include @@ -54,7 +53,4 @@ public: }; -} // namespace TechDrawGui - - -#endif // DRAWINGGUI_VIEWPROVIDERIMAGE_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/ViewProviderLeader.h b/src/Mod/TechDraw/Gui/ViewProviderLeader.h index f7d5305073..44c08279f0 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderLeader.h +++ b/src/Mod/TechDraw/Gui/ViewProviderLeader.h @@ -22,8 +22,7 @@ ***************************************************************************/ -#ifndef DRAWINGGUI_VIEWPROVIDERLEADER_H -#define DRAWINGGUI_VIEWPROVIDERLEADER_H +#pragma once #include @@ -79,7 +78,4 @@ private: }; -} // namespace TechDrawGui - - -#endif // DRAWINGGUI_VIEWPROVIDERLEADER_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.h b/src/Mod/TechDraw/Gui/ViewProviderPage.h index c04d70a86d..2cc5ca5f31 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPage.h +++ b/src/Mod/TechDraw/Gui/ViewProviderPage.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_VIEWPROVIDERPAGE_H -#define DRAWINGGUI_VIEWPROVIDERPAGE_H +#pragma once #include #include @@ -156,7 +155,4 @@ private: bool m_frameToggle{false}; // replacement for ShowFrame property to avoid marking document changed }; -}// namespace TechDrawGui - - -#endif// DRAWINGGUI_VIEWPROVIDERPAGE_H +}// namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/ViewProviderPageExtension.h b/src/Mod/TechDraw/Gui/ViewProviderPageExtension.h index 0971827105..1b958056db 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPageExtension.h +++ b/src/Mod/TechDraw/Gui/ViewProviderPageExtension.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_VIEWPROVIDERPAGEEXTENSION_H -#define TECHDRAWGUI_VIEWPROVIDERPAGEEXTENSION_H +#pragma once #include #include @@ -62,6 +61,4 @@ private: using ViewProviderPageExtensionPython = Gui::ViewProviderExtensionPythonT; -}// namespace TechDrawGui - -#endif// TECHDRAWGUI_VIEWPROVIDERPAGEEXTENSION_H +}// namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.h b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.h index 0e50652312..8c9dd443fd 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.h +++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_VIEWPROVIDERVIEWGROUP_H -#define DRAWINGGUI_VIEWPROVIDERVIEWGROUP_H +#pragma once #include @@ -64,6 +63,4 @@ protected: }; -} // namespace TechDrawGui - -#endif // DRAWINGGUI_VIEWPROVIDERVIEWGROUP_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.h b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.h index edc0f683e7..b752243113 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.h +++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.h @@ -20,10 +20,9 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_VIEWPROVIDERVIEWGROUPITEM_H -#define DRAWINGGUI_VIEWPROVIDERVIEWGROUPITEM_H - -#include +#pragma once + +#include #include @@ -61,6 +60,4 @@ protected: }; -} // namespace TechDrawGui - -#endif // DRAWINGGUI_VIEWPROVIDERVIEWGROUPITEM_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/ViewProviderRichAnno.h b/src/Mod/TechDraw/Gui/ViewProviderRichAnno.h index 10ce1aac57..d1da2db8c5 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderRichAnno.h +++ b/src/Mod/TechDraw/Gui/ViewProviderRichAnno.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_VIEWPROVIDERRICHANNO_H -#define TECHDRAWGUI_VIEWPROVIDERRICHANNO_H +#pragma once #include @@ -81,6 +80,4 @@ private: }; -} // namespace TechDrawGui - -#endif // TECHDRAWGUI_VIEWPROVIDERRICHANNO_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.h b/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.h index 065cc4a090..088acae4b4 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.h +++ b/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_VIEWPROVIDERSPREADSHEET_H -#define DRAWINGGUI_VIEWPROVIDERSPREADSHEET_H +#pragma once #include @@ -51,7 +50,4 @@ public: TechDraw::DrawViewSpreadsheet* getViewObject() const override; }; -} // namespace TechDrawGui - - -#endif // DRAWINGGUI_VIEWPROVIDERSPREADSHEET_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/ViewProviderSymbol.h b/src/Mod/TechDraw/Gui/ViewProviderSymbol.h index fa16bd498e..819a8ca055 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderSymbol.h +++ b/src/Mod/TechDraw/Gui/ViewProviderSymbol.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_VIEWPROVIDERSYMBOL_H -#define DRAWINGGUI_VIEWPROVIDERSYMBOL_H +#pragma once #include @@ -81,7 +80,4 @@ public: ~ViewProviderArch() override = default ; }; -} // namespace TechDrawGui - - -#endif // DRAWINGGUI_VIEWPROVIDERSYMBOL_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/ViewProviderTemplate.h b/src/Mod/TechDraw/Gui/ViewProviderTemplate.h index f9c6819ca5..961696127a 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderTemplate.h +++ b/src/Mod/TechDraw/Gui/ViewProviderTemplate.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_VIEWPROVIDERTEMPLATE_H -#define DRAWINGGUI_VIEWPROVIDERTEMPLATE_H +#pragma once #include @@ -69,8 +68,4 @@ private: std::string m_myName; }; -} // namespace TechDrawGui - - -#endif // DRAWINGGUI_VIEWPROVIDERTEMPLATE_H - +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.h b/src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.h index 6dbf02684d..97e708b83d 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.h +++ b/src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_VIEWPROVIDERTEMPLATEEXTENSION_H -#define TECHDRAWGUI_VIEWPROVIDERTEMPLATEEXTENSION_H +#pragma once #include #include @@ -55,6 +54,4 @@ private: using ViewProviderTemplateExtensionPython = Gui::ViewProviderExtensionPythonT; -}// namespace TechDrawGui - -#endif// TECHDRAWGUI_VIEWPROVIDERTEMPLATEEXTENSION_H +}// namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/ViewProviderTile.h b/src/Mod/TechDraw/Gui/ViewProviderTile.h index 4e1e6d0ccf..c030a17e20 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderTile.h +++ b/src/Mod/TechDraw/Gui/ViewProviderTile.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_VIEWPROVIDERTILE_H -#define DRAWINGGUI_VIEWPROVIDERTILE_H +#pragma once #include @@ -47,7 +46,4 @@ public: virtual TechDraw::DrawTile* getFeature() const; }; -} // namespace TechDrawGui - - -#endif // DRAWINGGUI_VIEWPROVIDERTILE_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewClip.h b/src/Mod/TechDraw/Gui/ViewProviderViewClip.h index 5f4d32cbb3..eb83726042 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewClip.h +++ b/src/Mod/TechDraw/Gui/ViewProviderViewClip.h @@ -21,8 +21,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_VIEWPROVIDERCLIP_H -#define DRAWINGGUI_VIEWPROVIDERCLIP_H +#pragma once #include @@ -63,6 +62,4 @@ public: void dragObject(App::DocumentObject* docObj) override; void dropObject(App::DocumentObject* docObj) override; }; -} // namespace TechDrawGui - -#endif // DRAWINGGUI_VIEWPROVIDERCLIP_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewPart.h b/src/Mod/TechDraw/Gui/ViewProviderViewPart.h index 32da198788..c6a9a7467f 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewPart.h +++ b/src/Mod/TechDraw/Gui/ViewProviderViewPart.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_VIEWPROVIDERVIEWPART_H -#define DRAWINGGUI_VIEWPROVIDERVIEWPART_H +#pragma once #include @@ -86,7 +85,4 @@ public: TechDraw::DrawViewPart* getViewPart() const; }; -} // namespace TechDrawGui - - -#endif // DRAWINGGUI_VIEWPROVIDERVIEWPART_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewSection.h b/src/Mod/TechDraw/Gui/ViewProviderViewSection.h index 719d8862e2..3e73c9d229 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewSection.h +++ b/src/Mod/TechDraw/Gui/ViewProviderViewSection.h @@ -21,10 +21,9 @@ * * ***************************************************************************/ -#ifndef TECHDRAWGUI_VIEWPROVIDERVIEWSECTION_H -#define TECHDRAWGUI_VIEWPROVIDERVIEWSECTION_H - -#include +#pragma once + +#include #include @@ -63,7 +62,4 @@ public: TechDraw::DrawViewSection* getViewObject() const override; }; -} // namespace TechDrawGui - - -#endif // TECHDRAWGUI_VIEWPROVIDERVIEWSECTION_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/ViewProviderWeld.h b/src/Mod/TechDraw/Gui/ViewProviderWeld.h index 5aa3b5dced..0f3c6adb46 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderWeld.h +++ b/src/Mod/TechDraw/Gui/ViewProviderWeld.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef DRAWINGGUI_VIEWPROVIDERWELD_H -#define DRAWINGGUI_VIEWPROVIDERWELD_H +#pragma once #include @@ -65,7 +64,4 @@ public: }; -} // namespace TechDrawGui - - -#endif // DRAWINGGUI_VIEWPROVIDERWELD_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/Widgets/CompassDialWidget.h b/src/Mod/TechDraw/Gui/Widgets/CompassDialWidget.h index 181d891ddb..016070446c 100644 --- a/src/Mod/TechDraw/Gui/Widgets/CompassDialWidget.h +++ b/src/Mod/TechDraw/Gui/Widgets/CompassDialWidget.h @@ -23,8 +23,7 @@ //based on a python widget from: //https://github.com/tcalmant/demo-ipopo-qt/blob/master/pc/details/compass.py -#ifndef COMPASSDIALWIDGET_H -#define COMPASSDIALWIDGET_H +#pragma once #include #include @@ -67,5 +66,4 @@ private: int m_designDiameter; }; -} //namespace TechDrawGui -#endif // COMPASSDIALWIDGET_H +} //namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/Widgets/CompassWidget.h b/src/Mod/TechDraw/Gui/Widgets/CompassWidget.h index b29f31a130..e7a13eb3a6 100644 --- a/src/Mod/TechDraw/Gui/Widgets/CompassWidget.h +++ b/src/Mod/TechDraw/Gui/Widgets/CompassWidget.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef COMPASSWIDGET_H -#define COMPASSWIDGET_H +#pragma once #include #include @@ -104,5 +103,4 @@ private: QPushButton* pbCCWAdvance; }; -}//namespace TechDrawGui -#endif// COMPASSWIDGET_H +}//namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/Widgets/VectorEditWidget.h b/src/Mod/TechDraw/Gui/Widgets/VectorEditWidget.h index 696e60d952..c02745d7a4 100644 --- a/src/Mod/TechDraw/Gui/Widgets/VectorEditWidget.h +++ b/src/Mod/TechDraw/Gui/Widgets/VectorEditWidget.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef VECTOREDITWIDGET_H -#define VECTOREDITWIDGET_H +#pragma once #include #include @@ -103,5 +102,4 @@ private: QSpacerItem *verticalSpacer; }; -} //namespace TechDrawGui -#endif // VECTOREDITWIDGET_H +} //namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/Workbench.h b/src/Mod/TechDraw/Gui/Workbench.h index 6633b73e6e..ba1e441918 100644 --- a/src/Mod/TechDraw/Gui/Workbench.h +++ b/src/Mod/TechDraw/Gui/Workbench.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef TECHDRAW_WORKBENCH_H -#define TECHDRAW_WORKBENCH_H +#pragma once #include @@ -47,7 +46,4 @@ protected: Gui::ToolBarItem* setupCommandBars() const override; }; -} // namespace TechDrawGui - - -#endif // TECHDRAW_WORKBENCH_H +} // namespace TechDrawGui \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/ZVALUE.h b/src/Mod/TechDraw/Gui/ZVALUE.h index 36497cbf1a..5f8728d75a 100644 --- a/src/Mod/TechDraw/Gui/ZVALUE.h +++ b/src/Mod/TechDraw/Gui/ZVALUE.h @@ -1,5 +1,4 @@ -#ifndef TECHDRAW_ZVALUE_ -#define TECHDRAW_ZVALUE_ +#pragma once namespace ZVALUE { const int BACKGROUND = -999999; const int TEMPLATE = -1000; @@ -20,5 +19,4 @@ namespace ZVALUE { const int ANNOTATION = 120; const int TRACKER = 125; const int LOCK = 200; -} -#endif +} \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/mrichtextedit.h b/src/Mod/TechDraw/Gui/mrichtextedit.h index 6c5f3bf6a4..741242aaab 100644 --- a/src/Mod/TechDraw/Gui/mrichtextedit.h +++ b/src/Mod/TechDraw/Gui/mrichtextedit.h @@ -26,8 +26,7 @@ ********************************/ -#ifndef MRICHTEXTEDIT_H_ -#define MRICHTEXTEDIT_H_ +#pragma once #include @@ -121,6 +120,4 @@ private: int m_defFontSize; QString m_defFont; -}; - -#endif +}; \ No newline at end of file diff --git a/src/Mod/TechDraw/Gui/mtextedit.h b/src/Mod/TechDraw/Gui/mtextedit.h index a8eca1ff9c..e1c24fe2f1 100644 --- a/src/Mod/TechDraw/Gui/mtextedit.h +++ b/src/Mod/TechDraw/Gui/mtextedit.h @@ -20,8 +20,7 @@ ** ** $QT_END_LICENSE$ */ -#ifndef MTEXTEDIT_H_ -#define MTEXTEDIT_H_ +#pragma once #include @@ -42,6 +41,4 @@ class MTextEdit : public QTextEdit { void insertFromMimeData(const QMimeData *source) override; QMimeData *createMimeDataFromSelection() const override; -}; - -#endif +}; \ No newline at end of file diff --git a/src/Mod/TechDraw/TechDrawGlobal.h b/src/Mod/TechDraw/TechDrawGlobal.h index e356ceb0e6..40671ebd25 100644 --- a/src/Mod/TechDraw/TechDrawGlobal.h +++ b/src/Mod/TechDraw/TechDrawGlobal.h @@ -22,8 +22,7 @@ #include -#ifndef TECHDRAW_GLOBAL_H -#define TECHDRAW_GLOBAL_H +#pragma once // TechDraw @@ -42,6 +41,4 @@ #else # define TechDrawGuiExport FREECAD_DECL_IMPORT #endif -#endif - -#endif //TECHDRAW_GLOBAL_H +#endif \ No newline at end of file diff --git a/src/Mod/Test/Gui/PreCompiled.h b/src/Mod/Test/Gui/PreCompiled.h index b9024a2dd3..cfc57e9df4 100644 --- a/src/Mod/Test/Gui/PreCompiled.h +++ b/src/Mod/Test/Gui/PreCompiled.h @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#ifndef TEST_GUI_PRECOMPILED_H -#define TEST_GUI_PRECOMPILED_H +#pragma once #include @@ -29,5 +28,3 @@ #include #include #include - -#endif // TEST_GUI_PRECOMPILED_H diff --git a/src/Mod/Test/Gui/UnitTestImp.h b/src/Mod/Test/Gui/UnitTestImp.h index 1b77347a22..5510366999 100644 --- a/src/Mod/Test/Gui/UnitTestImp.h +++ b/src/Mod/Test/Gui/UnitTestImp.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef TESTGUI_UNITTESTIMP_H -#define TESTGUI_UNITTESTIMP_H +#pragma once #include #include @@ -80,6 +79,3 @@ private: }; } // namespace TestGui - - -#endif // TESTGUI_UNITTESTIMP_H diff --git a/src/Mod/Test/Gui/UnitTestPy.h b/src/Mod/Test/Gui/UnitTestPy.h index 438e42baba..4d635a3878 100644 --- a/src/Mod/Test/Gui/UnitTestPy.h +++ b/src/Mod/Test/Gui/UnitTestPy.h @@ -21,8 +21,7 @@ ***************************************************************************/ -#ifndef TESTGUI_UNITTESTPY_H -#define TESTGUI_UNITTESTPY_H +#pragma once #include #include @@ -66,6 +65,3 @@ private: }; } // namespace TestGui - - -#endif diff --git a/src/Mod/Web/App/PreCompiled.h b/src/Mod/Web/App/PreCompiled.h index 8aa426712b..a4e7d5c4f9 100644 --- a/src/Mod/Web/App/PreCompiled.h +++ b/src/Mod/Web/App/PreCompiled.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef WEB_APP_PRECOMPILED_H -#define WEB_APP_PRECOMPILED_H +#pragma once #include @@ -37,5 +36,3 @@ // Qt #include #include - -#endif diff --git a/src/Mod/Web/App/Server.h b/src/Mod/Web/App/Server.h index 1d0d1b7709..2ec6e5e8f2 100644 --- a/src/Mod/Web/App/Server.h +++ b/src/Mod/Web/App/Server.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef WEB_SERVER_H -#define WEB_SERVER_H +#pragma once #include #include @@ -104,5 +103,3 @@ private: }; } // namespace Web - -#endif // Web_SERVER_H diff --git a/src/Mod/Web/WebGlobal.h b/src/Mod/Web/WebGlobal.h index 7f6714ddd6..559235d34e 100644 --- a/src/Mod/Web/WebGlobal.h +++ b/src/Mod/Web/WebGlobal.h @@ -24,26 +24,23 @@ #include -#ifndef WEB_GLOBAL_H -# define WEB_GLOBAL_H +#pragma once // Web -# ifndef WebExport -# ifdef Web_EXPORTS -# define WebExport FREECAD_DECL_EXPORT -# else -# define WebExport FREECAD_DECL_IMPORT -# endif +#ifndef WebExport +# ifdef Web_EXPORTS +# define WebExport FREECAD_DECL_EXPORT +# else +# define WebExport FREECAD_DECL_IMPORT # endif +#endif // WebGui -# ifndef WebGuiExport -# ifdef WebGui_EXPORTS -# define WebGuiExport FREECAD_DECL_EXPORT -# else -# define WebGuiExport FREECAD_DECL_IMPORT -# endif +#ifndef WebGuiExport +# ifdef WebGui_EXPORTS +# define WebGuiExport FREECAD_DECL_EXPORT +# else +# define WebGuiExport FREECAD_DECL_IMPORT # endif - -#endif // WEB_GLOBAL_H +#endif diff --git a/src/QtCore.h.cmake b/src/QtCore.h.cmake index a54db38330..54a044f37f 100644 --- a/src/QtCore.h.cmake +++ b/src/QtCore.h.cmake @@ -21,13 +21,10 @@ * * **************************************************************************/ +#pragma once -#ifndef FREECAD_QTCORE_H -#define FREECAD_QTCORE_H /* QtCore.h. Generated from QtCore.h.cmake by cmake. */ /* Define to 1 Qt provides the macro Q_DISABLE_COPY_MOVE. */ #cmakedefine HAVE_Q_DISABLE_COPY_MOVE - -#endif // FREECAD_QTCORE_H diff --git a/src/QtWidgets.h.cmake b/src/QtWidgets.h.cmake index c7d64c59f1..b79a977550 100644 --- a/src/QtWidgets.h.cmake +++ b/src/QtWidgets.h.cmake @@ -1,5 +1,4 @@ -#ifndef FREECAD_QTWIDGETS_H -#define FREECAD_QTWIDGETS_H +#pragma once #include @@ -7,5 +6,3 @@ #if QT_VERSION >= QT_VERSION_CHECK(6,0,0) && QT_VERSION < QT_VERSION_CHECK(6,8,1) # define HAS_QTBUG_129596 #endif - -#endif // FREECAD_QTWIDGETS_H diff --git a/src/SMESH_Version.h.cmake b/src/SMESH_Version.h.cmake index 6f518dd439..4d322041a0 100644 --- a/src/SMESH_Version.h.cmake +++ b/src/SMESH_Version.h.cmake @@ -1,7 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#ifndef SMESH_VERSION_H -#define SMESH_VERSION_H +#pragma once /* SMESH_Version.h. Generated from SMESH_Version.h.cmake by cmake. */ @@ -12,5 +11,3 @@ #define SMESH_VERSION_TWEAK ${SMESH_VERSION_TWEAK} #define SMESH_VERSION_STR "${SMESH_VERSION_MAJOR}.${SMESH_VERSION_MINOR}.${SMESH_VERSION_PATCH}.${SMESH_VERSION_TWEAK}" - -#endif // SMESH_VERSION_H diff --git a/src/Tools/ThumbnailProvider/FCConfig.h b/src/Tools/ThumbnailProvider/FCConfig.h index 375c4b6408..7ebe37c540 100644 --- a/src/Tools/ThumbnailProvider/FCConfig.h +++ b/src/Tools/ThumbnailProvider/FCConfig.h @@ -29,8 +29,7 @@ */ -#ifndef FC_CONFIG_H -#define FC_CONFIG_H +#pragma once //************************************************************************** @@ -170,6 +169,3 @@ typedef unsigned __int64 uint64_t; # pragma warning(disable : 4267) # endif #endif - - -#endif // FC_CONFIG_H diff --git a/src/Tools/_TEMPLATE_/App/PreCompiled.h b/src/Tools/_TEMPLATE_/App/PreCompiled.h index b1733b8303..5a5b0f6947 100644 --- a/src/Tools/_TEMPLATE_/App/PreCompiled.h +++ b/src/Tools/_TEMPLATE_/App/PreCompiled.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef TEMPLATE_APP_PRECOMPILED_H -#define TEMPLATE_APP_PRECOMPILED_H +#pragma once #include @@ -54,5 +53,3 @@ // Xerces #include - -#endif diff --git a/src/Tools/_TEMPLATE_/Gui/PreCompiled.h b/src/Tools/_TEMPLATE_/Gui/PreCompiled.h index e407e0b549..b5d971b339 100644 --- a/src/Tools/_TEMPLATE_/Gui/PreCompiled.h +++ b/src/Tools/_TEMPLATE_/Gui/PreCompiled.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef TEMPLATE_GUI_PRECOMPILED_H -#define TEMPLATE_GUI_PRECOMPILED_H +#pragma once #include @@ -62,5 +61,3 @@ // Qt Toolkit #include - -#endif // GUI_PRECOMPILED_H diff --git a/src/Tools/_TEMPLATE_/Gui/Workbench.h b/src/Tools/_TEMPLATE_/Gui/Workbench.h index 8d2694c093..5cd749fb42 100644 --- a/src/Tools/_TEMPLATE_/Gui/Workbench.h +++ b/src/Tools/_TEMPLATE_/Gui/Workbench.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef _TEMPLATE__WORKBENCH_H -#define _TEMPLATE__WORKBENCH_H +#pragma once #include @@ -45,6 +44,3 @@ protected: }; } // namespace _TEMPLATE_Gui - - -#endif // _TEMPLATE__WORKBENCH_H diff --git a/src/Tools/_TEMPLATE_/_TEMPLATE_Global.h b/src/Tools/_TEMPLATE_/_TEMPLATE_Global.h index b1f8a9ef28..5c238bea08 100644 --- a/src/Tools/_TEMPLATE_/_TEMPLATE_Global.h +++ b/src/Tools/_TEMPLATE_/_TEMPLATE_Global.h @@ -24,26 +24,23 @@ #include -#ifndef _TEMPLATE__GLOBAL_H -# define _TEMPLATE__GLOBAL_H +#pragma once // _TEMPLATE_ -# ifndef _TEMPLATE_Export -# ifdef _TEMPLATE__EXPORTS -# define _TEMPLATE_Export FREECAD_DECL_EXPORT -# else -# define _TEMPLATE_Export FREECAD_DECL_IMPORT -# endif +#ifndef _TEMPLATE_Export +# ifdef _TEMPLATE__EXPORTS +# define _TEMPLATE_Export FREECAD_DECL_EXPORT +# else +# define _TEMPLATE_Export FREECAD_DECL_IMPORT # endif +#endif // _TEMPLATE_Gui -# ifndef _TEMPLATE_GuiExport -# ifdef _TEMPLATE_Gui_EXPORTS -# define _TEMPLATE_GuiExport FREECAD_DECL_EXPORT -# else -# define _TEMPLATE_GuiExport FREECAD_DECL_IMPORT -# endif +#ifndef _TEMPLATE_GuiExport +# ifdef _TEMPLATE_Gui_EXPORTS +# define _TEMPLATE_GuiExport FREECAD_DECL_EXPORT +# else +# define _TEMPLATE_GuiExport FREECAD_DECL_IMPORT # endif - -#endif //_TEMPLATE__GLOBAL_H +#endif diff --git a/src/Tools/embedded/Qt/cxx/PreCompiled.h b/src/Tools/embedded/Qt/cxx/PreCompiled.h index d758b7c15a..e2b17c629f 100644 --- a/src/Tools/embedded/Qt/cxx/PreCompiled.h +++ b/src/Tools/embedded/Qt/cxx/PreCompiled.h @@ -1,7 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#ifndef QT_CXX_PRECOMPILED_H -#define QT_CXX_PRECOMPILED_H +#pragma once #ifdef FC_OS_WIN32 // cmake generates this define @@ -15,6 +14,3 @@ # define FC_PLUGIN_EXPORT # define MeshExport #endif - - -#endif diff --git a/src/Tools/embedded/Qt/mainwindow.h b/src/Tools/embedded/Qt/mainwindow.h index 93e950737c..56ee9627e8 100644 --- a/src/Tools/embedded/Qt/mainwindow.h +++ b/src/Tools/embedded/Qt/mainwindow.h @@ -1,7 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#ifndef MAINWINDOW_H -#define MAINWINDOW_H +#pragma once #include @@ -37,5 +36,3 @@ private: QAction* exitAct; QAction* aboutAct; }; - -#endif diff --git a/src/Tools/plugins/widget/customwidgets.h b/src/Tools/plugins/widget/customwidgets.h index a97413761c..b39af1a823 100644 --- a/src/Tools/plugins/widget/customwidgets.h +++ b/src/Tools/plugins/widget/customwidgets.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef GUI_CUSTOMWIDGETS_H -#define GUI_CUSTOMWIDGETS_H +#pragma once #include #include @@ -922,5 +921,3 @@ private: QByteArray m_sPrefGrp; }; } // namespace Gui - -#endif // GUI_CUSTOMWIDGETS_H diff --git a/src/Tools/plugins/widget/wizard.h b/src/Tools/plugins/widget/wizard.h index a8eed3ad66..96c043b442 100644 --- a/src/Tools/plugins/widget/wizard.h +++ b/src/Tools/plugins/widget/wizard.h @@ -23,8 +23,7 @@ ***************************************************************************/ -#ifndef WIZARD_H -#define WIZARD_H +#pragma once #include @@ -117,5 +116,3 @@ public: protected: QObject* createExtension(QObject* object, const QString& iid, QObject* parent) const; }; - -#endif diff --git a/src/boost_graph_adjacency_list.hpp b/src/boost_graph_adjacency_list.hpp index a340ab9bc8..453847be32 100644 --- a/src/boost_graph_adjacency_list.hpp +++ b/src/boost_graph_adjacency_list.hpp @@ -1,11 +1,9 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#ifndef FREECAD_ADJACENCY_LIST_HPP_WORKAROUND -#define FREECAD_ADJACENCY_LIST_HPP_WORKAROUND +#pragma once // Workaround for boost >= 1.75 #define BOOST_ALLOW_DEPRECATED_HEADERS #include #undef BOOST_ALLOW_DEPRECATED_HEADERS -#endif // #ifndef FREECAD_ADJACENCY_LIST_HPP_WORKAROUND diff --git a/src/boost_graph_reverse_graph.hpp b/src/boost_graph_reverse_graph.hpp index 34069782fe..d5947541a4 100644 --- a/src/boost_graph_reverse_graph.hpp +++ b/src/boost_graph_reverse_graph.hpp @@ -1,11 +1,9 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#ifndef FREECAD_REVERSE_GRAPH_HPP_WORKAROUND -#define FREECAD_REVERSE_GRAPH_HPP_WORKAROUND +#pragma once // Workaround for boost >= 1.75 #define BOOST_ALLOW_DEPRECATED_HEADERS #include #undef BOOST_ALLOW_DEPRECATED_HEADERS -#endif // #ifndef FREECAD_REVERSE_GRAPH_HPP_WORKAROUND diff --git a/src/boost_regex.hpp b/src/boost_regex.hpp index d9151c212c..87dfd483bb 100644 --- a/src/boost_regex.hpp +++ b/src/boost_regex.hpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#ifndef FREECAD_REGEX_HPP_WORKAROUND -#define FREECAD_REGEX_HPP_WORKAROUND +#pragma once #include @@ -17,5 +16,3 @@ #endif #include - -#endif // #ifndef FREECAD_REGEX_HPP_WORKAROUND diff --git a/tests/src/App/InitApplication.h b/tests/src/App/InitApplication.h index 1f363be7ee..c3335ec0df 100644 --- a/tests/src/App/InitApplication.h +++ b/tests/src/App/InitApplication.h @@ -1,7 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#ifndef TEST_APPLICATION_H -#define TEST_APPLICATION_H +#pragma once #include @@ -19,5 +18,3 @@ static void initApplication() } } // namespace tests - -#endif // TEST_APPLICATION_H diff --git a/tests/src/App/Property.h b/tests/src/App/Property.h index f27608fda7..3f16a38125 100644 --- a/tests/src/App/Property.h +++ b/tests/src/App/Property.h @@ -21,8 +21,7 @@ * Suite 330, Boston, MA 02111-1307, USA * * * ****************************************************************************/ -#ifndef TEST_PROPERTY_H -#define TEST_PROPERTY_H +#pragma once #include @@ -68,5 +67,3 @@ protected: static std::string _docName; static App::Document* _doc; }; - -#endif