diff options
Diffstat (limited to 'source/blender/freestyle/intern/system')
18 files changed, 18 insertions, 78 deletions
diff --git a/source/blender/freestyle/intern/system/BaseIterator.h b/source/blender/freestyle/intern/system/BaseIterator.h index 651f2bf4387..7792fded4cb 100644 --- a/source/blender/freestyle/intern/system/BaseIterator.h +++ b/source/blender/freestyle/intern/system/BaseIterator.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_BASE_ITERATOR_H__ -#define __FREESTYLE_BASE_ITERATOR_H__ +#pragma once /** \file * \ingroup freestyle @@ -103,5 +102,3 @@ template<class Traits, class IteratorTagTraits> class IteratorBase { }; } /* namespace Freestyle */ - -#endif // BASEITERATOR_H diff --git a/source/blender/freestyle/intern/system/BaseObject.h b/source/blender/freestyle/intern/system/BaseObject.h index 335221223dc..76d30aa74e2 100644 --- a/source/blender/freestyle/intern/system/BaseObject.h +++ b/source/blender/freestyle/intern/system/BaseObject.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_BASE_OBJECT_H__ -#define __FREESTYLE_BASE_OBJECT_H__ +#pragma once /** \file * \ingroup freestyle @@ -72,5 +71,3 @@ class BaseObject { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_BASE_OBJECT_H__ diff --git a/source/blender/freestyle/intern/system/Cast.h b/source/blender/freestyle/intern/system/Cast.h index 44fd86a9b43..db0defbae22 100644 --- a/source/blender/freestyle/intern/system/Cast.h +++ b/source/blender/freestyle/intern/system/Cast.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_CAST_H__ -#define __FREESTYLE_CAST_H__ +#pragma once /** \file * \ingroup freestyle @@ -35,5 +34,3 @@ template<class T, class U> U *cast(T *in) } // end of namespace Cast } /* namespace Freestyle */ - -#endif // __FREESTYLE_CAST_H__ diff --git a/source/blender/freestyle/intern/system/Exception.h b/source/blender/freestyle/intern/system/Exception.h index 0efd136af8f..618c2171fb9 100644 --- a/source/blender/freestyle/intern/system/Exception.h +++ b/source/blender/freestyle/intern/system/Exception.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_EXCEPTION_H__ -#define __FREESTYLE_EXCEPTION_H__ +#pragma once /** \file * \ingroup freestyle @@ -62,5 +61,3 @@ class Exception { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_EXCEPTION_H__ diff --git a/source/blender/freestyle/intern/system/FreestyleConfig.h b/source/blender/freestyle/intern/system/FreestyleConfig.h index 34db7121eaf..032da864e6c 100644 --- a/source/blender/freestyle/intern/system/FreestyleConfig.h +++ b/source/blender/freestyle/intern/system/FreestyleConfig.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_CONFIG_H__ -#define __FREESTYLE_CONFIG_H__ +#pragma once /** \file * \ingroup freestyle @@ -43,5 +42,3 @@ static const string PATH_SEP(":"); } // end of namespace Config } /* namespace Freestyle */ - -#endif // __FREESTYLE_CONFIG_H__ diff --git a/source/blender/freestyle/intern/system/Id.h b/source/blender/freestyle/intern/system/Id.h index 549def6cabb..f94e044de29 100644 --- a/source/blender/freestyle/intern/system/Id.h +++ b/source/blender/freestyle/intern/system/Id.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_ID_H__ -#define __FREESTYLE_ID_H__ +#pragma once /** \file * \ingroup freestyle @@ -138,5 +137,3 @@ inline std::ostream &operator<<(std::ostream &s, const Id &id) } } /* namespace Freestyle */ - -#endif // __FREESTYLE_ID_H__ diff --git a/source/blender/freestyle/intern/system/Interpreter.h b/source/blender/freestyle/intern/system/Interpreter.h index 911d03318e5..0a5c0302fe6 100644 --- a/source/blender/freestyle/intern/system/Interpreter.h +++ b/source/blender/freestyle/intern/system/Interpreter.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_INTERPRETER_H__ -#define __FREESTYLE_INTERPRETER_H__ +#pragma once /** \file * \ingroup freestyle @@ -61,5 +60,3 @@ class Interpreter { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_INTERPRETER_H__ diff --git a/source/blender/freestyle/intern/system/Iterator.h b/source/blender/freestyle/intern/system/Iterator.h index 75d49521f96..d2086f637d9 100644 --- a/source/blender/freestyle/intern/system/Iterator.h +++ b/source/blender/freestyle/intern/system/Iterator.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_ITERATOR_H__ -#define __FREESTYLE_ITERATOR_H__ +#pragma once /** \file * \ingroup freestyle @@ -73,5 +72,3 @@ class Iterator { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_ITERATOR_H__ diff --git a/source/blender/freestyle/intern/system/PointerSequence.h b/source/blender/freestyle/intern/system/PointerSequence.h index d136632f060..c2301ee740d 100644 --- a/source/blender/freestyle/intern/system/PointerSequence.h +++ b/source/blender/freestyle/intern/system/PointerSequence.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_POINTER_SEQUENCE_H__ -#define __FREESTYLE_POINTER_SEQUENCE_H__ +#pragma once /** \file * \ingroup freestyle @@ -91,5 +90,3 @@ template<typename C, typename T> class PointerSequence : public C { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_POINTER_SEQUENCE_H__ diff --git a/source/blender/freestyle/intern/system/Precision.h b/source/blender/freestyle/intern/system/Precision.h index c6695f207cc..6a6435299ca 100644 --- a/source/blender/freestyle/intern/system/Precision.h +++ b/source/blender/freestyle/intern/system/Precision.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_PRECISION_H__ -#define __FREESTYLE_PRECISION_H__ +#pragma once /** \file * \ingroup freestyle @@ -31,5 +30,3 @@ static const real M_EPSILON = 0.00000001; #endif // SWIG } /* namespace Freestyle */ - -#endif // __FREESTYLE_PRECISION_H__ diff --git a/source/blender/freestyle/intern/system/ProgressBar.h b/source/blender/freestyle/intern/system/ProgressBar.h index b3a1f98f15e..d7b02c48359 100644 --- a/source/blender/freestyle/intern/system/ProgressBar.h +++ b/source/blender/freestyle/intern/system/ProgressBar.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_PROGRESS_BAR_H__ -#define __FREESTYLE_PROGRESS_BAR_H__ +#pragma once /** \file * \ingroup freestyle @@ -92,5 +91,3 @@ class ProgressBar { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_PROGRESS_BAR_H__ diff --git a/source/blender/freestyle/intern/system/PseudoNoise.h b/source/blender/freestyle/intern/system/PseudoNoise.h index 53fe54754c8..38270016675 100644 --- a/source/blender/freestyle/intern/system/PseudoNoise.h +++ b/source/blender/freestyle/intern/system/PseudoNoise.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_PSEUDO_NOISE_H__ -#define __FREESTYLE_PSEUDO_NOISE_H__ +#pragma once /** \file * \ingroup freestyle @@ -56,5 +55,3 @@ class PseudoNoise { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_PSEUDO_NOISE_H__ diff --git a/source/blender/freestyle/intern/system/PythonInterpreter.h b/source/blender/freestyle/intern/system/PythonInterpreter.h index 4bc6ba9db38..bae69aa0a42 100644 --- a/source/blender/freestyle/intern/system/PythonInterpreter.h +++ b/source/blender/freestyle/intern/system/PythonInterpreter.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_PYTHON_INTERPRETER_H__ -#define __FREESTYLE_PYTHON_INTERPRETER_H__ +#pragma once /** \file * \ingroup freestyle @@ -34,7 +33,6 @@ extern "C" { #include "MEM_guardedalloc.h" // soc -extern "C" { #include "DNA_text_types.h" #include "BKE_context.h" @@ -47,7 +45,6 @@ extern "C" { #include "BPY_extern.h" #include "bpy_capi_utils.h" -} namespace Freestyle { @@ -149,5 +146,3 @@ class PythonInterpreter : public Interpreter { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_PYTHON_INTERPRETER_H__ diff --git a/source/blender/freestyle/intern/system/RandGen.h b/source/blender/freestyle/intern/system/RandGen.h index 43f36b0a2fd..e514f4cfc9f 100644 --- a/source/blender/freestyle/intern/system/RandGen.h +++ b/source/blender/freestyle/intern/system/RandGen.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_RAND_GEN_H__ -#define __FREESTYLE_RAND_GEN_H__ +#pragma once /** \file * \ingroup freestyle @@ -46,5 +45,3 @@ class RandGen { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_RAND_GEN_H__ diff --git a/source/blender/freestyle/intern/system/RenderMonitor.h b/source/blender/freestyle/intern/system/RenderMonitor.h index 709df6c2d8e..5d543f32dfb 100644 --- a/source/blender/freestyle/intern/system/RenderMonitor.h +++ b/source/blender/freestyle/intern/system/RenderMonitor.h @@ -14,17 +14,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_RENDER_MONITOR_H__ -#define __FREESTYLE_RENDER_MONITOR_H__ +#pragma once /** \file * \ingroup freestyle * \brief Classes defining the basic "Iterator" design pattern */ -extern "C" { #include "render_types.h" -} #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" @@ -73,5 +70,3 @@ class RenderMonitor { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_RENDER_MONITOR_H__ diff --git a/source/blender/freestyle/intern/system/StringUtils.h b/source/blender/freestyle/intern/system/StringUtils.h index aeacddd64c8..dc63f20f294 100644 --- a/source/blender/freestyle/intern/system/StringUtils.h +++ b/source/blender/freestyle/intern/system/StringUtils.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_STRING_UTILS_H__ -#define __FREESTYLE_STRING_UTILS_H__ +#pragma once /** \file * \ingroup freestyle @@ -28,10 +27,8 @@ #include <string> #include <vector> -extern "C" { #include "BLI_path_util.h" #include "BLI_string.h" -} using namespace std; @@ -52,5 +49,3 @@ struct ltstr { } // end of namespace StringUtils } /* namespace Freestyle */ - -#endif // __FREESTYLE_STRING_UTILS_H__ diff --git a/source/blender/freestyle/intern/system/TimeStamp.h b/source/blender/freestyle/intern/system/TimeStamp.h index 2fbf83d226d..5560bf8be8d 100644 --- a/source/blender/freestyle/intern/system/TimeStamp.h +++ b/source/blender/freestyle/intern/system/TimeStamp.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_TIME_STAMP_H__ -#define __FREESTYLE_TIME_STAMP_H__ +#pragma once /** \file * \ingroup freestyle @@ -70,5 +69,3 @@ class TimeStamp { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_TIME_STAMP_H__ diff --git a/source/blender/freestyle/intern/system/TimeUtils.h b/source/blender/freestyle/intern/system/TimeUtils.h index 6d4c56ab15e..3c8a28e9e43 100644 --- a/source/blender/freestyle/intern/system/TimeUtils.h +++ b/source/blender/freestyle/intern/system/TimeUtils.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_TIME_UTILS_H__ -#define __FREESTYLE_TIME_UTILS_H__ +#pragma once /** \file * \ingroup freestyle @@ -60,5 +59,3 @@ class Chronometer { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_TIME_UTILS_H__ |