diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-17 22:59:41 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-17 22:59:41 +0400 |
| commit | 2b7ca2304a9b17568fac57a0bceba72b9c9ab580 (patch) | |
| tree | 0cb3492a7d6624bca9390375a5b20bd5b86f76d5 /intern | |
| parent | 99d0ba6299d9f2acdf2446b2f52e812877ebcc70 (diff) | |
unify include guard defines, __$FILENAME__
without the underscores these clogged up the namespace for autocompleation which was annoying.
Diffstat (limited to 'intern')
220 files changed, 587 insertions, 594 deletions
diff --git a/intern/audaspace/FX/AUD_AccumulatorFactory.h b/intern/audaspace/FX/AUD_AccumulatorFactory.h index d49d8f71c05..ac73c5aa6ae 100644 --- a/intern/audaspace/FX/AUD_AccumulatorFactory.h +++ b/intern/audaspace/FX/AUD_AccumulatorFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_ACCUMULATORFACTORY -#define AUD_ACCUMULATORFACTORY +#ifndef __AUD_ACCUMULATORFACTORY_H__ +#define __AUD_ACCUMULATORFACTORY_H__ #include "AUD_EffectFactory.h" class AUD_CallbackIIRFilterReader; @@ -66,4 +66,4 @@ public: static sample_t accumulatorFilter(AUD_CallbackIIRFilterReader* reader, void* useless); }; -#endif //AUD_ACCUMULATORFACTORY +#endif //__AUD_ACCUMULATORFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_BaseIIRFilterReader.h b/intern/audaspace/FX/AUD_BaseIIRFilterReader.h index 5b37f83ddee..43970c96a42 100644 --- a/intern/audaspace/FX/AUD_BaseIIRFilterReader.h +++ b/intern/audaspace/FX/AUD_BaseIIRFilterReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_BASEIIRFILTERREADER -#define AUD_BASEIIRFILTERREADER +#ifndef __AUD_BASEIIRFILTERREADER_H__ +#define __AUD_BASEIIRFILTERREADER_H__ #include "AUD_EffectReader.h" #include "AUD_Buffer.h" @@ -132,4 +132,4 @@ public: virtual void sampleRateChanged(AUD_SampleRate rate); }; -#endif //AUD_BASEIIRFILTERREADER +#endif //__AUD_BASEIIRFILTERREADER_H__ diff --git a/intern/audaspace/FX/AUD_ButterworthFactory.h b/intern/audaspace/FX/AUD_ButterworthFactory.h index aa302e7e82a..d3606270154 100644 --- a/intern/audaspace/FX/AUD_ButterworthFactory.h +++ b/intern/audaspace/FX/AUD_ButterworthFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_BUTTERWORTHFACTORY -#define AUD_BUTTERWORTHFACTORY +#ifndef __AUD_BUTTERWORTHFACTORY_H__ +#define __AUD_BUTTERWORTHFACTORY_H__ #include "AUD_DynamicIIRFilterFactory.h" @@ -60,4 +60,4 @@ public: std::vector<float>& a); }; -#endif //AUD_BUTTERWORTHFACTORY +#endif //__AUD_BUTTERWORTHFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h b/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h index 787fd49b600..7ced73844c9 100644 --- a/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h +++ b/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_CALLBACKIIRFILTERREADER -#define AUD_CALLBACKIIRFILTERREADER +#ifndef __AUD_CALLBACKIIRFILTERREADER_H__ +#define __AUD_CALLBACKIIRFILTERREADER_H__ #include "AUD_BaseIIRFilterReader.h" #include "AUD_Buffer.h" @@ -84,4 +84,4 @@ public: virtual sample_t filter(); }; -#endif //AUD_CALLBACKIIRFILTERREADER +#endif //__AUD_CALLBACKIIRFILTERREADER_H__ diff --git a/intern/audaspace/FX/AUD_DelayFactory.h b/intern/audaspace/FX/AUD_DelayFactory.h index c1b114638f6..26855a05d70 100644 --- a/intern/audaspace/FX/AUD_DelayFactory.h +++ b/intern/audaspace/FX/AUD_DelayFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_DELAYFACTORY -#define AUD_DELAYFACTORY +#ifndef __AUD_DELAYFACTORY_H__ +#define __AUD_DELAYFACTORY_H__ #include "AUD_EffectFactory.h" @@ -63,4 +63,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_DELAYFACTORY +#endif //__AUD_DELAYFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_DelayReader.h b/intern/audaspace/FX/AUD_DelayReader.h index b23bb1438d1..9d9b6619470 100644 --- a/intern/audaspace/FX/AUD_DelayReader.h +++ b/intern/audaspace/FX/AUD_DelayReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_DELAYREADER -#define AUD_DELAYREADER +#ifndef __AUD_DELAYREADER_H__ +#define __AUD_DELAYREADER_H__ #include "AUD_EffectReader.h" #include "AUD_Buffer.h" @@ -67,4 +67,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_DELAYREADER +#endif //__AUD_DELAYREADER_H__ diff --git a/intern/audaspace/FX/AUD_DoubleFactory.h b/intern/audaspace/FX/AUD_DoubleFactory.h index 990c605b2fb..e4d8fbfde8f 100644 --- a/intern/audaspace/FX/AUD_DoubleFactory.h +++ b/intern/audaspace/FX/AUD_DoubleFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_DOUBLEFACTORY -#define AUD_DOUBLEFACTORY +#ifndef __AUD_DOUBLEFACTORY_H__ +#define __AUD_DOUBLEFACTORY_H__ #include "AUD_IFactory.h" @@ -63,4 +63,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_DOUBLEFACTORY +#endif //__AUD_DOUBLEFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_DoubleReader.h b/intern/audaspace/FX/AUD_DoubleReader.h index 4c82d4f85ca..1489f4eb184 100644 --- a/intern/audaspace/FX/AUD_DoubleReader.h +++ b/intern/audaspace/FX/AUD_DoubleReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_DOUBLEREADER -#define AUD_DOUBLEREADER +#ifndef __AUD_DOUBLEREADER_H__ +#define __AUD_DOUBLEREADER_H__ #include "AUD_IReader.h" #include "AUD_Buffer.h" @@ -80,4 +80,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_DOUBLEREADER +#endif //__AUD_DOUBLEREADER_H__ diff --git a/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h b/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h index 2b63e275f0e..fef379f68b1 100644 --- a/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h +++ b/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h @@ -26,8 +26,8 @@ * \ingroup audfx */ -#ifndef AUD_DYNAMICIIRFILTERFACTORY -#define AUD_DYNAMICIIRFILTERFACTORY +#ifndef __AUD_DYNAMICIIRFILTERFACTORY_H__ +#define __AUD_DYNAMICIIRFILTERFACTORY_H__ #include "AUD_EffectFactory.h" #include <vector> @@ -60,4 +60,4 @@ public: std::vector<float>& a)=0; }; -#endif // AUD_DYNAMICIIRFILTERFACTORY +#endif // __AUD_DYNAMICIIRFILTERFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h b/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h index 843cf120011..8a53c15b18f 100644 --- a/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h +++ b/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h @@ -26,8 +26,8 @@ * \ingroup audfx */ -#ifndef AUD_DYNAMICIIRFILTERREADER -#define AUD_DYNAMICIIRFILTERREADER +#ifndef __AUD_DYNAMICIIRFILTERREADER_H__ +#define __AUD_DYNAMICIIRFILTERREADER_H__ #include "AUD_IIRFilterReader.h" #include "AUD_DynamicIIRFilterFactory.h" @@ -51,4 +51,4 @@ public: virtual void sampleRateChanged(AUD_SampleRate rate); }; -#endif // AUD_DYNAMICIIRFILTERREADER +#endif // __AUD_DYNAMICIIRFILTERREADER_H__ diff --git a/intern/audaspace/FX/AUD_EffectFactory.h b/intern/audaspace/FX/AUD_EffectFactory.h index 26d66634d7d..c8d26a1daa7 100644 --- a/intern/audaspace/FX/AUD_EffectFactory.h +++ b/intern/audaspace/FX/AUD_EffectFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_EFFECTFACTORY -#define AUD_EFFECTFACTORY +#ifndef __AUD_EFFECTFACTORY_H__ +#define __AUD_EFFECTFACTORY_H__ #include "AUD_IFactory.h" @@ -79,4 +79,4 @@ public: AUD_Reference<AUD_IFactory> getFactory() const; }; -#endif //AUD_EFFECTFACTORY +#endif //__AUD_EFFECTFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_EffectReader.h b/intern/audaspace/FX/AUD_EffectReader.h index 707031c55ad..b089ec9a318 100644 --- a/intern/audaspace/FX/AUD_EffectReader.h +++ b/intern/audaspace/FX/AUD_EffectReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_EFFECTREADER -#define AUD_EFFECTREADER +#ifndef __AUD_EFFECTREADER_H__ +#define __AUD_EFFECTREADER_H__ #include "AUD_IReader.h" #include "AUD_Reference.h" @@ -70,4 +70,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_EFFECTREADER +#endif //__AUD_EFFECTREADER_H__ diff --git a/intern/audaspace/FX/AUD_EnvelopeFactory.h b/intern/audaspace/FX/AUD_EnvelopeFactory.h index 81038f15560..c8f3dc37cd2 100644 --- a/intern/audaspace/FX/AUD_EnvelopeFactory.h +++ b/intern/audaspace/FX/AUD_EnvelopeFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_ENVELOPEFACTORY -#define AUD_ENVELOPEFACTORY +#ifndef __AUD_ENVELOPEFACTORY_H__ +#define __AUD_ENVELOPEFACTORY_H__ #include "AUD_EffectFactory.h" class AUD_CallbackIIRFilterReader; @@ -82,4 +82,4 @@ public: static void endEnvelopeFilter(EnvelopeParameters* param); }; -#endif //AUD_ENVELOPEFACTORY +#endif //__AUD_ENVELOPEFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_FaderFactory.h b/intern/audaspace/FX/AUD_FaderFactory.h index 7a8954d9e48..8fcd4baa623 100644 --- a/intern/audaspace/FX/AUD_FaderFactory.h +++ b/intern/audaspace/FX/AUD_FaderFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_FADERFACTORY -#define AUD_FADERFACTORY +#ifndef __AUD_FADERFACTORY_H__ +#define __AUD_FADERFACTORY_H__ #include "AUD_EffectFactory.h" @@ -89,4 +89,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_FADERFACTORY +#endif //__AUD_FADERFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_FaderReader.h b/intern/audaspace/FX/AUD_FaderReader.h index 9cad72618ef..788e8539228 100644 --- a/intern/audaspace/FX/AUD_FaderReader.h +++ b/intern/audaspace/FX/AUD_FaderReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_FADERREADER -#define AUD_FADERREADER +#ifndef __AUD_FADERREADER_H__ +#define __AUD_FADERREADER_H__ #include "AUD_EffectReader.h" #include "AUD_Buffer.h" @@ -73,4 +73,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_FADERREADER +#endif //__AUD_FADERREADER_H__ diff --git a/intern/audaspace/FX/AUD_HighpassFactory.h b/intern/audaspace/FX/AUD_HighpassFactory.h index c9d8a0b017a..66aa8091234 100644 --- a/intern/audaspace/FX/AUD_HighpassFactory.h +++ b/intern/audaspace/FX/AUD_HighpassFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_HIGHPASSFACTORY -#define AUD_HIGHPASSFACTORY +#ifndef __AUD_HIGHPASSFACTORY_H__ +#define __AUD_HIGHPASSFACTORY_H__ #include "AUD_DynamicIIRFilterFactory.h" @@ -64,4 +64,4 @@ public: virtual void recalculateCoefficients(AUD_SampleRate rate, std::vector<float> &b, std::vector<float> &a); }; -#endif //AUD_HIGHPASSFACTORY +#endif //__AUD_HIGHPASSFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_IIRFilterFactory.h b/intern/audaspace/FX/AUD_IIRFilterFactory.h index 0b98f34f748..43256a166aa 100644 --- a/intern/audaspace/FX/AUD_IIRFilterFactory.h +++ b/intern/audaspace/FX/AUD_IIRFilterFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_IIRFILTERFACTORY -#define AUD_IIRFILTERFACTORY +#ifndef __AUD_IIRFILTERFACTORY_H__ +#define __AUD_IIRFILTERFACTORY_H__ #include "AUD_EffectFactory.h" @@ -67,4 +67,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_IIRFILTERFACTORY +#endif //__AUD_IIRFILTERFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_IIRFilterReader.h b/intern/audaspace/FX/AUD_IIRFilterReader.h index 01a41385715..d9be52f2919 100644 --- a/intern/audaspace/FX/AUD_IIRFilterReader.h +++ b/intern/audaspace/FX/AUD_IIRFilterReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_IIRFILTERREADER -#define AUD_IIRFILTERREADER +#ifndef __AUD_IIRFILTERREADER_H__ +#define __AUD_IIRFILTERREADER_H__ #include "AUD_BaseIIRFilterReader.h" @@ -70,4 +70,4 @@ public: const std::vector<float>& a); }; -#endif //AUD_IIRFILTERREADER +#endif //__AUD_IIRFILTERREADER_H__ diff --git a/intern/audaspace/FX/AUD_LimiterFactory.h b/intern/audaspace/FX/AUD_LimiterFactory.h index 7128c6d7334..ddc8183ce7a 100644 --- a/intern/audaspace/FX/AUD_LimiterFactory.h +++ b/intern/audaspace/FX/AUD_LimiterFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_LIMITERFACTORY -#define AUD_LIMITERFACTORY +#ifndef __AUD_LIMITERFACTORY_H__ +#define __AUD_LIMITERFACTORY_H__ #include "AUD_EffectFactory.h" @@ -76,4 +76,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_LIMITERFACTORY +#endif //__AUD_LIMITERFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_LimiterReader.h b/intern/audaspace/FX/AUD_LimiterReader.h index 7a2c88e5144..34c4ea7c20e 100644 --- a/intern/audaspace/FX/AUD_LimiterReader.h +++ b/intern/audaspace/FX/AUD_LimiterReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_LIMITERREADER -#define AUD_LIMITERREADER +#ifndef __AUD_LIMITERREADER_H__ +#define __AUD_LIMITERREADER_H__ #include "AUD_EffectReader.h" @@ -68,4 +68,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_LIMITERREADER +#endif //__AUD_LIMITERREADER_H__ diff --git a/intern/audaspace/FX/AUD_LoopFactory.h b/intern/audaspace/FX/AUD_LoopFactory.h index 7d794f313fb..754b780bd99 100644 --- a/intern/audaspace/FX/AUD_LoopFactory.h +++ b/intern/audaspace/FX/AUD_LoopFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_LOOPFACTORY -#define AUD_LOOPFACTORY +#ifndef __AUD_LOOPFACTORY_H__ +#define __AUD_LOOPFACTORY_H__ #include "AUD_EffectFactory.h" @@ -65,4 +65,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_LOOPFACTORY +#endif //__AUD_LOOPFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_LoopReader.h b/intern/audaspace/FX/AUD_LoopReader.h index b062a1781a4..fd2dd71d78f 100644 --- a/intern/audaspace/FX/AUD_LoopReader.h +++ b/intern/audaspace/FX/AUD_LoopReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_LOOPREADER -#define AUD_LOOPREADER +#ifndef __AUD_LOOPREADER_H__ +#define __AUD_LOOPREADER_H__ #include "AUD_EffectReader.h" #include "AUD_Buffer.h" @@ -69,4 +69,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_LOOPREADER +#endif //__AUD_LOOPREADER_H__ diff --git a/intern/audaspace/FX/AUD_LowpassFactory.h b/intern/audaspace/FX/AUD_LowpassFactory.h index 90d6ac5c2d1..7e98720a2db 100644 --- a/intern/audaspace/FX/AUD_LowpassFactory.h +++ b/intern/audaspace/FX/AUD_LowpassFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_LOWPASSFACTORY -#define AUD_LOWPASSFACTORY +#ifndef __AUD_LOWPASSFACTORY_H__ +#define __AUD_LOWPASSFACTORY_H__ #include "AUD_DynamicIIRFilterFactory.h" @@ -64,4 +64,4 @@ public: virtual void recalculateCoefficients(AUD_SampleRate rate, std::vector<float> &b, std::vector<float> &a); }; -#endif //AUD_LOWPASSFACTORY +#endif //__AUD_LOWPASSFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_PingPongFactory.h b/intern/audaspace/FX/AUD_PingPongFactory.h index 4a5f3fcf431..f25624a7c5e 100644 --- a/intern/audaspace/FX/AUD_PingPongFactory.h +++ b/intern/audaspace/FX/AUD_PingPongFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_PINGPONGFACTORY -#define AUD_PINGPONGFACTORY +#ifndef __AUD_PINGPONGFACTORY_H__ +#define __AUD_PINGPONGFACTORY_H__ #include "AUD_EffectFactory.h" @@ -53,4 +53,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_PINGPONGFACTORY +#endif //__AUD_PINGPONGFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_PitchFactory.h b/intern/audaspace/FX/AUD_PitchFactory.h index c311a9e3446..5ad37ad1a6c 100644 --- a/intern/audaspace/FX/AUD_PitchFactory.h +++ b/intern/audaspace/FX/AUD_PitchFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_PITCHFACTORY -#define AUD_PITCHFACTORY +#ifndef __AUD_PITCHFACTORY_H__ +#define __AUD_PITCHFACTORY_H__ #include "AUD_EffectFactory.h" @@ -58,4 +58,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_PITCHFACTORY +#endif //__AUD_PITCHFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_PitchReader.h b/intern/audaspace/FX/AUD_PitchReader.h index dcd23b747fa..3185bfdf30b 100644 --- a/intern/audaspace/FX/AUD_PitchReader.h +++ b/intern/audaspace/FX/AUD_PitchReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_PITCHREADER -#define AUD_PITCHREADER +#ifndef __AUD_PITCHREADER_H__ +#define __AUD_PITCHREADER_H__ #include "AUD_EffectReader.h" @@ -70,4 +70,4 @@ public: void setPitch(float pitch); }; -#endif //AUD_PITCHREADER +#endif //__AUD_PITCHREADER_H__ diff --git a/intern/audaspace/FX/AUD_RectifyFactory.h b/intern/audaspace/FX/AUD_RectifyFactory.h index 2e3dbd17917..5ad41d424d9 100644 --- a/intern/audaspace/FX/AUD_RectifyFactory.h +++ b/intern/audaspace/FX/AUD_RectifyFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_RECTIFYFACTORY -#define AUD_RECTIFYFACTORY +#ifndef __AUD_RECTIFYFACTORY_H__ +#define __AUD_RECTIFYFACTORY_H__ #include "AUD_EffectFactory.h" class AUD_CallbackIIRFilterReader; @@ -55,4 +55,4 @@ public: static sample_t rectifyFilter(AUD_CallbackIIRFilterReader* reader, void* useless); }; -#endif //AUD_RECTIFYFACTORY +#endif //__AUD_RECTIFYFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_ReverseFactory.h b/intern/audaspace/FX/AUD_ReverseFactory.h index 6305fb5d2af..e2d75dc560a 100644 --- a/intern/audaspace/FX/AUD_ReverseFactory.h +++ b/intern/audaspace/FX/AUD_ReverseFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_REVERSEFACTORY -#define AUD_REVERSEFACTORY +#ifndef __AUD_REVERSEFACTORY_H__ +#define __AUD_REVERSEFACTORY_H__ #include "AUD_EffectFactory.h" @@ -53,4 +53,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_REVERSEFACTORY +#endif //__AUD_REVERSEFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_ReverseReader.h b/intern/audaspace/FX/AUD_ReverseReader.h index 1b3dfd7e53f..d1e5179b8ec 100644 --- a/intern/audaspace/FX/AUD_ReverseReader.h +++ b/intern/audaspace/FX/AUD_ReverseReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_REVERSEREADER -#define AUD_REVERSEREADER +#ifndef __AUD_REVERSEREADER_H__ +#define __AUD_REVERSEREADER_H__ #include "AUD_EffectReader.h" #include "AUD_Buffer.h" @@ -69,4 +69,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_REVERSEREADER +#endif //__AUD_REVERSEREADER_H__ diff --git a/intern/audaspace/FX/AUD_SquareFactory.h b/intern/audaspace/FX/AUD_SquareFactory.h index aff24b0f3d9..9c0dea25d2b 100644 --- a/intern/audaspace/FX/AUD_SquareFactory.h +++ b/intern/audaspace/FX/AUD_SquareFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SQUAREFACTORY -#define AUD_SQUAREFACTORY +#ifndef __AUD_SQUAREFACTORY_H__ +#define __AUD_SQUAREFACTORY_H__ #include "AUD_EffectFactory.h" class AUD_CallbackIIRFilterReader; @@ -67,4 +67,4 @@ public: static void endSquareFilter(float* threshold); }; -#endif //AUD_SQUAREFACTORY +#endif //__AUD_SQUAREFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_SumFactory.h b/intern/audaspace/FX/AUD_SumFactory.h index c971730258a..ec17faf3fb2 100644 --- a/intern/audaspace/FX/AUD_SumFactory.h +++ b/intern/audaspace/FX/AUD_SumFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SUMFACTORY -#define AUD_SUMFACTORY +#ifndef __AUD_SUMFACTORY_H__ +#define __AUD_SUMFACTORY_H__ #include "AUD_EffectFactory.h" @@ -52,4 +52,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_SUMFACTORY +#endif //__AUD_SUMFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_SuperposeFactory.h b/intern/audaspace/FX/AUD_SuperposeFactory.h index adfb1c23e1d..2da8e34496d 100644 --- a/intern/audaspace/FX/AUD_SuperposeFactory.h +++ b/intern/audaspace/FX/AUD_SuperposeFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SUPERPOSEFACTORY -#define AUD_SUPERPOSEFACTORY +#ifndef __AUD_SUPERPOSEFACTORY_H__ +#define __AUD_SUPERPOSEFACTORY_H__ #include "AUD_IFactory.h" @@ -65,4 +65,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_SUPERPOSEFACTORY +#endif //__AUD_SUPERPOSEFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_SuperposeReader.h b/intern/audaspace/FX/AUD_SuperposeReader.h index 8a1b2698f9c..d0fde13a267 100644 --- a/intern/audaspace/FX/AUD_SuperposeReader.h +++ b/intern/audaspace/FX/AUD_SuperposeReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SUPERPOSEREADER -#define AUD_SUPERPOSEREADER +#ifndef __AUD_SUPERPOSEREADER_H__ +#define __AUD_SUPERPOSEREADER_H__ #include "AUD_IReader.h" #include "AUD_Buffer.h" @@ -81,4 +81,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_SUPERPOSEREADER +#endif //__AUD_SUPERPOSEREADER_H__ diff --git a/intern/audaspace/FX/AUD_VolumeFactory.h b/intern/audaspace/FX/AUD_VolumeFactory.h index ecfab6f7299..b12838373b3 100644 --- a/intern/audaspace/FX/AUD_VolumeFactory.h +++ b/intern/audaspace/FX/AUD_VolumeFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_VOLUMEFACTORY -#define AUD_VOLUMEFACTORY +#ifndef __AUD_VOLUMEFACTORY_H__ +#define __AUD_VOLUMEFACTORY_H__ #include "AUD_EffectFactory.h" @@ -66,4 +66,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_VOLUMEFACTORY +#endif //__AUD_VOLUMEFACTORY_H__ diff --git a/intern/audaspace/OpenAL/AUD_OpenALDevice.h b/intern/audaspace/OpenAL/AUD_OpenALDevice.h index ff1361c283f..0a409b42462 100644 --- a/intern/audaspace/OpenAL/AUD_OpenALDevice.h +++ b/intern/audaspace/OpenAL/AUD_OpenALDevice.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_OPENALDEVICE -#define AUD_OPENALDEVICE +#ifndef __AUD_OPENALDEVICE_H__ +#define __AUD_OPENALDEVICE_H__ #include "AUD_IDevice.h" #include "AUD_IHandle.h" @@ -277,4 +277,4 @@ public: virtual void setDistanceModel(AUD_DistanceModel model); }; -#endif //AUD_OPENALDEVICE +#endif //__AUD_OPENALDEVICE_H__ diff --git a/intern/audaspace/Python/AUD_PyAPI.h b/intern/audaspace/Python/AUD_PyAPI.h index bcd9e42ede1..7a7e87ec67d 100644 --- a/intern/audaspace/Python/AUD_PyAPI.h +++ b/intern/audaspace/Python/AUD_PyAPI.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_PYAPI -#define AUD_PYAPI +#ifndef __AUD_PYAPI_H__ +#define __AUD_PYAPI_H__ #include "Python.h" @@ -71,4 +71,4 @@ extern Factory* checkFactory(PyObject* factory); } #endif -#endif //AUD_PYAPI +#endif //__AUD_PYAPI_H__ diff --git a/intern/audaspace/SDL/AUD_SDLDevice.h b/intern/audaspace/SDL/AUD_SDLDevice.h index d77d5835086..266edd0dfcc 100644 --- a/intern/audaspace/SDL/AUD_SDLDevice.h +++ b/intern/audaspace/SDL/AUD_SDLDevice.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SDLDEVICE -#define AUD_SDLDEVICE +#ifndef __AUD_SDLDEVICE_H__ +#define __AUD_SDLDEVICE_H__ #include "AUD_SoftwareDevice.h" @@ -72,4 +72,4 @@ public: virtual ~AUD_SDLDevice(); }; -#endif //AUD_SDLDEVICE +#endif //__AUD_SDLDEVICE_H__ diff --git a/intern/audaspace/SRC/AUD_SRCResampleFactory.h b/intern/audaspace/SRC/AUD_SRCResampleFactory.h index d061cf9e12b..858bb0c130a 100644 --- a/intern/audaspace/SRC/AUD_SRCResampleFactory.h +++ b/intern/audaspace/SRC/AUD_SRCResampleFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SRCRESAMPLEFACTORY -#define AUD_SRCRESAMPLEFACTORY +#ifndef __AUD_SRCRESAMPLEFACTORY_H__ +#define __AUD_SRCRESAMPLEFACTORY_H__ #include "AUD_MixerFactory.h" @@ -54,4 +54,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_SRCRESAMPLEFACTORY +#endif //__AUD_SRCRESAMPLEFACTORY_H__ diff --git a/intern/audaspace/SRC/AUD_SRCResampleReader.h b/intern/audaspace/SRC/AUD_SRCResampleReader.h index 26f02be9003..891b28b0993 100644 --- a/intern/audaspace/SRC/AUD_SRCResampleReader.h +++ b/intern/audaspace/SRC/AUD_SRCResampleReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SRCRESAMPLEREADER -#define AUD_SRCRESAMPLEREADER +#ifndef __AUD_SRCRESAMPLEREADER_H__ +#define __AUD_SRCRESAMPLEREADER_H__ #include "AUD_ResampleReader.h" #include "AUD_Buffer.h" @@ -100,4 +100,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_SRCRESAMPLEREADER +#endif //__AUD_SRCRESAMPLEREADER_H__ diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h b/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h index 9d79a5fad23..349f55dd7db 100644 --- a/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h +++ b/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_FFMPEGFACTORY -#define AUD_FFMPEGFACTORY +#ifndef __AUD_FFMPEGFACTORY_H__ +#define __AUD_FFMPEGFACTORY_H__ #include "AUD_IFactory.h" #include "AUD_Reference.h" @@ -75,4 +75,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_FFMPEGFACTORY +#endif //__AUD_FFMPEGFACTORY_H__ diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h index 9a19131efe0..2b354b0b2a1 100644 --- a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h +++ b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_FFMPEGREADER -#define AUD_FFMPEGREADER +#ifndef __AUD_FFMPEGREADER_H__ +#define __AUD_FFMPEGREADER_H__ #include "AUD_ConverterFunctions.h" #include "AUD_IReader.h" @@ -161,4 +161,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_FFMPEGREADER +#endif //__AUD_FFMPEGREADER_H__ diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.h b/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.h index 60200ce363d..17830308fd5 100644 --- a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.h +++ b/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_FFMPEGWRITER -#define AUD_FFMPEGWRITER +#ifndef __AUD_FFMPEGWRITER_H__ +#define __AUD_FFMPEGWRITER_H__ #include "AUD_ConverterFunctions.h" #include "AUD_Buffer.h" @@ -135,4 +135,4 @@ public: virtual void write(unsigned int length, sample_t* buffer); }; -#endif //AUD_FFMPEGWRITER +#endif //__AUD_FFMPEGWRITER_H__ diff --git a/intern/audaspace/fftw/AUD_BandPassFactory.h b/intern/audaspace/fftw/AUD_BandPassFactory.h index 4891947ec3c..75de071403f 100644 --- a/intern/audaspace/fftw/AUD_BandPassFactory.h +++ b/intern/audaspace/fftw/AUD_BandPassFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_BANDPASSFACTORY -#define AUD_BANDPASSFACTORY +#ifndef __AUD_BANDPASSFACTORY_H__ +#define __AUD_BANDPASSFACTORY_H__ #include "AUD_EffectFactory.h" @@ -89,4 +89,4 @@ public: virtual AUD_IReader* createReader(); }; -#endif //AUD_BANDPASSFACTORY +#endif //__AUD_BANDPASSFACTORY_H__ diff --git a/intern/audaspace/fftw/AUD_BandPassReader.h b/intern/audaspace/fftw/AUD_BandPassReader.h index 155b8d7b0bc..55a950818e0 100644 --- a/intern/audaspace/fftw/AUD_BandPassReader.h +++ b/intern/audaspace/fftw/AUD_BandPassReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_BANDPASSREADER -#define AUD_BANDPASSREADER +#ifndef __AUD_BANDPASSREADER_H__ +#define __AUD_BANDPASSREADER_H__ #include <fftw3.h> @@ -99,4 +99,4 @@ public: virtual void read(int & length, sample_t* & buffer); }; -#endif //AUD_BANDPASSREADER +#endif //__AUD_BANDPASSREADER_H__ diff --git a/intern/audaspace/intern/AUD_3DMath.h b/intern/audaspace/intern/AUD_3DMath.h index 18594842108..f39566958cd 100644 --- a/intern/audaspace/intern/AUD_3DMath.h +++ b/intern/audaspace/intern/AUD_3DMath.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_3DMATH -#define AUD_3DMATH +#ifndef __AUD_3DMATH_H__ +#define __AUD_3DMATH_H__ #include <cmath> #include <cstring> @@ -325,4 +325,4 @@ public: } }; -#endif //AUD_3DMATH +#endif //__AUD_3DMATH_H__ diff --git a/intern/audaspace/intern/AUD_AnimateableProperty.h b/intern/audaspace/intern/AUD_AnimateableProperty.h index 5b516384a8f..2f25e330ebd 100644 --- a/intern/audaspace/intern/AUD_AnimateableProperty.h +++ b/intern/audaspace/intern/AUD_AnimateableProperty.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_ANIMATEABLEPROPERTY -#define AUD_ANIMATEABLEPROPERTY +#ifndef __AUD_ANIMATEABLEPROPERTY_H__ +#define __AUD_ANIMATEABLEPROPERTY_H__ #include "AUD_Buffer.h" @@ -103,4 +103,4 @@ public: bool isAnimated() const; }; -#endif //AUD_ANIMATEABLEPROPERTY +#endif //__AUD_ANIMATEABLEPROPERTY_H__ diff --git a/intern/audaspace/intern/AUD_Buffer.h b/intern/audaspace/intern/AUD_Buffer.h index 7a30d3b02d8..d3207f04f83 100644 --- a/intern/audaspace/intern/AUD_Buffer.h +++ b/intern/audaspace/intern/AUD_Buffer.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_BUFFER -#define AUD_BUFFER +#ifndef __AUD_BUFFER_H__ +#define __AUD_BUFFER_H__ #include "AUD_Space.h" @@ -90,4 +90,4 @@ public: void assureSize(int size, bool keep = false); }; -#endif //AUD_BUFFER +#endif //__AUD_BUFFER_H__ diff --git a/intern/audaspace/intern/AUD_BufferReader.h b/intern/audaspace/intern/AUD_BufferReader.h index f648baef30d..0e8c5de9a9d 100644 --- a/intern/audaspace/intern/AUD_BufferReader.h +++ b/intern/audaspace/intern/AUD_BufferReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_BUFFERREADER -#define AUD_BUFFERREADER +#ifndef __AUD_BUFFERREADER_H__ +#define __AUD_BUFFERREADER_H__ #include "AUD_IReader.h" #include "AUD_Reference.h" @@ -77,4 +77,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_BUFFERREADER +#endif //__AUD_BUFFERREADER_H__ diff --git a/intern/audaspace/intern/AUD_C-API.h b/intern/audaspace/intern/AUD_C-API.h index 2b7c94bcc5b..8388af2170d 100644 --- a/intern/audaspace/intern/AUD_C-API.h +++ b/intern/audaspace/intern/AUD_C-API.h @@ -26,8 +26,8 @@ * \ingroup audaspace */ -#ifndef AUD_CAPI -#define AUD_CAPI +#ifndef __AUD_C_API_H__ +#define __AUD_C_API_H__ #ifdef WITH_PYTHON #include "Python.h" @@ -755,4 +755,4 @@ AUD_Reference<AUD_IDevice> AUD_getDevice(); AUD_I3DDevice* AUD_get3DDevice(); #endif -#endif //AUD_CAPI +#endif //__AUD_C_API_H__ diff --git a/intern/audaspace/intern/AUD_ChannelMapperFactory.h b/intern/audaspace/intern/AUD_ChannelMapperFactory.h index 4c88cb85080..b60a32d5510 100644 --- a/intern/audaspace/intern/AUD_ChannelMapperFactory.h +++ b/intern/audaspace/intern/AUD_ChannelMapperFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_CHANNELMAPPERFACTORY -#define AUD_CHANNELMAPPERFACTORY +#ifndef __AUD_CHANNELMAPPERFACTORY_H__ +#define __AUD_CHANNELMAPPERFACTORY_H__ #include "AUD_MixerFactory.h" @@ -54,4 +54,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_CHANNELMAPPERFACTORY +#endif //__AUD_CHANNELMAPPERFACTORY_H__ diff --git a/intern/audaspace/intern/AUD_ChannelMapperReader.h b/intern/audaspace/intern/AUD_ChannelMapperReader.h index 8e3ff0d1e9a..32adb058115 100644 --- a/intern/audaspace/intern/AUD_ChannelMapperReader.h +++ b/intern/audaspace/intern/AUD_ChannelMapperReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_CHANNELMAPPERREADER -#define AUD_CHANNELMAPPERREADER +#ifndef __AUD_CHANNELMAPPERREADER_H__ +#define __AUD_CHANNELMAPPERREADER_H__ #include "AUD_EffectReader.h" #include "AUD_Buffer.h" @@ -133,4 +133,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_CHANNELMAPPERREADER +#endif //__AUD_CHANNELMAPPERREADER_H__ diff --git a/intern/audaspace/intern/AUD_ConverterFactory.h b/intern/audaspace/intern/AUD_ConverterFactory.h index 04dfe9e12d1..3211b607517 100644 --- a/intern/audaspace/intern/AUD_ConverterFactory.h +++ b/intern/audaspace/intern/AUD_ConverterFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_CONVERTERFACTORY -#define AUD_CONVERTERFACTORY +#ifndef __AUD_CONVERTERFACTORY_H__ +#define __AUD_CONVERTERFACTORY_H__ #include "AUD_MixerFactory.h" @@ -54,4 +54,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_CONVERTERFACTORY +#endif //__AUD_CONVERTERFACTORY_H__ diff --git a/intern/audaspace/intern/AUD_ConverterFunctions.h b/intern/audaspace/intern/AUD_ConverterFunctions.h index 35a8012ccd1..1ffcf6c4ef0 100644 --- a/intern/audaspace/intern/AUD_ConverterFunctions.h +++ b/intern/audaspace/intern/AUD_ConverterFunctions.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_CONVERTERFUNCTIONS -#define AUD_CONVERTERFUNCTIONS +#ifndef __AUD_CONVERTERFUNCTIONS_H__ +#define __AUD_CONVERTERFUNCTIONS_H__ #include "AUD_Space.h" @@ -135,4 +135,4 @@ void AUD_convert_double_s32(data_t* target, data_t* source, int length); void AUD_convert_double_float(data_t* target, data_t* source, int length); -#endif //AUD_CONVERTERFUNCTIONS +#endif //__AUD_CONVERTERFUNCTIONS_H__ diff --git a/intern/audaspace/intern/AUD_ConverterReader.h b/intern/audaspace/intern/AUD_ConverterReader.h index 984666453e8..2dedbd89180 100644 --- a/intern/audaspace/intern/AUD_ConverterReader.h +++ b/intern/audaspace/intern/AUD_ConverterReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_CONVERTERREADER -#define AUD_CONVERTERREADER +#ifndef __AUD_CONVERTERREADER_H__ +#define __AUD_CONVERTERREADER_H__ #include "AUD_EffectReader.h" #include "AUD_ConverterFunctions.h" @@ -70,4 +70,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_CONVERTERREADER +#endif //__AUD_CONVERTERREADER_H__ diff --git a/intern/audaspace/intern/AUD_FileFactory.h b/intern/audaspace/intern/AUD_FileFactory.h index b39db27476b..4ea4a9392e9 100644 --- a/intern/audaspace/intern/AUD_FileFactory.h +++ b/intern/audaspace/intern/AUD_FileFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_FILEFACTORY -#define AUD_FILEFACTORY +#ifndef __AUD_FILEFACTORY_H__ +#define __AUD_FILEFACTORY_H__ #include "AUD_IFactory.h" #include "AUD_Reference.h" @@ -73,4 +73,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_FILEFACTORY +#endif //__AUD_FILEFACTORY_H__ diff --git a/intern/audaspace/intern/AUD_FileWriter.h b/intern/audaspace/intern/AUD_FileWriter.h index 9ff083e247f..c9ee2b1ee12 100644 --- a/intern/audaspace/intern/AUD_FileWriter.h +++ b/intern/audaspace/intern/AUD_FileWriter.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_FILEWRITER -#define AUD_FILEWRITER +#ifndef __AUD_FILEWRITER_H__ +#define __AUD_FILEWRITER_H__ #include <string> @@ -70,4 +70,4 @@ public: static void writeReader(AUD_Reference<AUD_IReader> reader, AUD_Reference<AUD_IWriter> writer, unsigned int length, unsigned int buffersize); }; -#endif //AUD_FILEWRITER +#endif //__AUD_FILEWRITER_H__ diff --git a/intern/audaspace/intern/AUD_I3DDevice.h b/intern/audaspace/intern/AUD_I3DDevice.h index 68052627842..1df710b7e5b 100644 --- a/intern/audaspace/intern/AUD_I3DDevice.h +++ b/intern/audaspace/intern/AUD_I3DDevice.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_I3DDEVICE -#define AUD_I3DDEVICE +#ifndef __AUD_I3DDEVICE_H__ +#define __AUD_I3DDEVICE_H__ #include "AUD_Space.h" #include "AUD_3DMath.h" @@ -119,4 +119,4 @@ public: virtual void setDistanceModel(AUD_DistanceModel model)=0; }; -#endif //AUD_I3DDEVICE +#endif //__AUD_I3DDEVICE_H__ diff --git a/intern/audaspace/intern/AUD_I3DHandle.h b/intern/audaspace/intern/AUD_I3DHandle.h index 78be55db82c..69ca985630a 100644 --- a/intern/audaspace/intern/AUD_I3DHandle.h +++ b/intern/audaspace/intern/AUD_I3DHandle.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_I3DHANDLE -#define AUD_I3DHANDLE +#ifndef __AUD_I3DHANDLE_H__ +#define __AUD_I3DHANDLE_H__ #include "AUD_Space.h" #include "AUD_3DMath.h" @@ -213,4 +213,4 @@ public: virtual bool setConeVolumeOuter(float volume)=0; }; -#endif //AUD_I3DHANDLE +#endif //__AUD_I3DHANDLE_H__ diff --git a/intern/audaspace/intern/AUD_IDevice.h b/intern/audaspace/intern/AUD_IDevice.h index 28765e9144c..1d6f8ca6efb 100644 --- a/intern/audaspace/intern/AUD_IDevice.h +++ b/intern/audaspace/intern/AUD_IDevice.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_IDEVICE -#define AUD_IDEVICE +#ifndef __AUD_IDEVICE_H__ +#define __AUD_IDEVICE_H__ #include "AUD_Space.h" #include "AUD_Reference.h" diff --git a/intern/audaspace/intern/AUD_IFactory.h b/intern/audaspace/intern/AUD_IFactory.h index a19a5775dc9..a7c214bb5a1 100644 --- a/intern/audaspace/intern/AUD_IFactory.h +++ b/intern/audaspace/intern/AUD_IFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_IFACTORY -#define AUD_IFACTORY +#ifndef __AUD_IFACTORY_H__ +#define __AUD_IFACTORY_H__ #include "AUD_Space.h" #include "AUD_Reference.h" @@ -57,4 +57,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader()=0; }; -#endif //AUD_IFACTORY +#endif //__AUD_IFACTORY_H__ diff --git a/intern/audaspace/intern/AUD_IHandle.h b/intern/audaspace/intern/AUD_IHandle.h index 33c64f509c2..9dcb743693e 100644 --- a/intern/audaspace/intern/AUD_IHandle.h +++ b/intern/audaspace/intern/AUD_IHandle.h @@ -26,8 +26,8 @@ * \ingroup audaspaceintern */ -#ifndef AUD_IHANDLE -#define AUD_IHANDLE +#ifndef __AUD_IHANDLE_H__ +#define __AUD_IHANDLE_H__ //#include "AUD_Space.h" //#include "AUD_Reference.h" diff --git a/intern/audaspace/intern/AUD_IReader.h b/intern/audaspace/intern/AUD_IReader.h index 2c92e75163e..8e0e03dd95d 100644 --- a/intern/audaspace/intern/AUD_IReader.h +++ b/intern/audaspace/intern/AUD_IReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_IREADER -#define AUD_IREADER +#ifndef __AUD_IREADER_H__ +#define __AUD_IREADER_H__ #include "AUD_Space.h" @@ -94,4 +94,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer)=0; }; -#endif //AUD_IREADER +#endif //__AUD_IREADER_H__ diff --git a/intern/audaspace/intern/AUD_IWriter.h b/intern/audaspace/intern/AUD_IWriter.h index 401faea4813..3c92661c75d 100644 --- a/intern/audaspace/intern/AUD_IWriter.h +++ b/intern/audaspace/intern/AUD_IWriter.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_IWRITER -#define AUD_IWRITER +#ifndef __AUD_IWRITER_H__ +#define __AUD_IWRITER_H__ #include "AUD_Space.h" @@ -64,4 +64,4 @@ public: virtual void write(unsigned int length, sample_t* buffer)=0; }; -#endif //AUD_IWRITER +#endif //__AUD_IWRITER_H__ diff --git a/intern/audaspace/intern/AUD_JOSResampleFactory.h b/intern/audaspace/intern/AUD_JOSResampleFactory.h index a4a303f944d..6d18150d852 100644 --- a/intern/audaspace/intern/AUD_JOSResampleFactory.h +++ b/intern/audaspace/intern/AUD_JOSResampleFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_JOSRESAMPLEFACTORY -#define AUD_JOSRESAMPLEFACTORY +#ifndef __AUD_JOSRESAMPLEFACTORY_H__ +#define __AUD_JOSRESAMPLEFACTORY_H__ #include "AUD_MixerFactory.h" @@ -53,4 +53,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_JOSRESAMPLEFACTORY +#endif //__AUD_JOSRESAMPLEFACTORY_H__ diff --git a/intern/audaspace/intern/AUD_JOSResampleReader.h b/intern/audaspace/intern/AUD_JOSResampleReader.h index c05a160c2da..94524c1db3e 100644 --- a/intern/audaspace/intern/AUD_JOSResampleReader.h +++ b/intern/audaspace/intern/AUD_JOSResampleReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_JOSRESAMPLEREADER -#define AUD_JOSRESAMPLEREADER +#ifndef __AUD_JOSRESAMPLEREADER_H__ +#define __AUD_JOSRESAMPLEREADER_H__ #include "AUD_ResampleReader.h" #include "AUD_Buffer.h" @@ -132,4 +132,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_JOSRESAMPLEREADER +#endif //__AUD_JOSRESAMPLEREADER_H__ diff --git a/intern/audaspace/intern/AUD_LinearResampleFactory.h b/intern/audaspace/intern/AUD_LinearResampleFactory.h index e1e9cc7ec22..7d9efa01d2d 100644 --- a/intern/audaspace/intern/AUD_LinearResampleFactory.h +++ b/intern/audaspace/intern/AUD_LinearResampleFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_LINEARRESAMPLEFACTORY -#define AUD_LINEARRESAMPLEFACTORY +#ifndef __AUD_LINEARRESAMPLEFACTORY_H__ +#define __AUD_LINEARRESAMPLEFACTORY_H__ #include "AUD_MixerFactory.h" @@ -53,4 +53,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_LINEARRESAMPLEFACTORY +#endif //__AUD_LINEARRESAMPLEFACTORY_H__ diff --git a/intern/audaspace/intern/AUD_LinearResampleReader.h b/intern/audaspace/intern/AUD_LinearResampleReader.h index 1370825894b..4f6d422f772 100644 --- a/intern/audaspace/intern/AUD_LinearResampleReader.h +++ b/intern/audaspace/intern/AUD_LinearResampleReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_LINEARRESAMPLEREADER -#define AUD_LINEARRESAMPLEREADER +#ifndef __AUD_LINEARRESAMPLEREADER_H__ +#define __AUD_LINEARRESAMPLEREADER_H__ #include "AUD_ResampleReader.h" #include "AUD_Buffer.h" @@ -83,4 +83,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_LINEARRESAMPLEREADER +#endif //__AUD_LINEARRESAMPLEREADER_H__ diff --git a/intern/audaspace/intern/AUD_Mixer.h b/intern/audaspace/intern/AUD_Mixer.h index e1b67aca5ff..0de9b7fc7dc 100644 --- a/intern/audaspace/intern/AUD_Mixer.h +++ b/intern/audaspace/intern/AUD_Mixer.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_MIXER -#define AUD_MIXER +#ifndef __AUD_MIXER_H__ +#define __AUD_MIXER_H__ #include "AUD_ConverterFunctions.h" #include "AUD_Buffer.h" @@ -108,4 +108,4 @@ public: void clear(int length); }; -#endif //AUD_MIXER +#endif //__AUD_MIXER_H__ diff --git a/intern/audaspace/intern/AUD_MixerFactory.h b/intern/audaspace/intern/AUD_MixerFactory.h index e3627de5b66..d65eb8ef6ae 100644 --- a/intern/audaspace/intern/AUD_MixerFactory.h +++ b/intern/audaspace/intern/AUD_MixerFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_MIXERFACTORY -#define AUD_MIXERFACTORY +#ifndef __AUD_MIXERFACTORY_H__ +#define __AUD_MIXERFACTORY_H__ #include "AUD_IFactory.h" @@ -76,4 +76,4 @@ public: AUD_Reference<AUD_IFactory> getFactory() const; }; -#endif //AUD_MIXERFACTORY +#endif //__AUD_MIXERFACTORY_H__ diff --git a/intern/audaspace/intern/AUD_NULLDevice.h b/intern/audaspace/intern/AUD_NULLDevice.h index 6ac8efd227e..ee97b151ebe 100644 --- a/intern/audaspace/intern/AUD_NULLDevice.h +++ b/intern/audaspace/intern/AUD_NULLDevice.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_NULLDEVICE -#define AUD_NULLDEVICE +#ifndef __AUD_NULLDEVICE_H__ +#define __AUD_NULLDEVICE_H__ #include "AUD_IReader.h" #include "AUD_IDevice.h" @@ -81,4 +81,4 @@ public: virtual void setVolume(float volume); }; -#endif //AUD_NULLDEVICE +#endif //__AUD_NULLDEVICE_H__ diff --git a/intern/audaspace/intern/AUD_PyInit.h b/intern/audaspace/intern/AUD_PyInit.h index dc24571438e..8c045e60f37 100644 --- a/intern/audaspace/intern/AUD_PyInit.h +++ b/intern/audaspace/intern/AUD_PyInit.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_PYINIT -#define AUD_PYINIT +#ifndef __AUD_PYINIT_H__ +#define __AUD_PYINIT_H__ #ifdef WITH_PYTHON #include "Python.h" @@ -48,4 +48,4 @@ extern PyObject* AUD_initPython(void); #endif -#endif //AUD_PYINIT +#endif //__AUD_PYINIT_H__ diff --git a/intern/audaspace/intern/AUD_ReadDevice.h b/intern/audaspace/intern/AUD_ReadDevice.h index 9e362b42d36..0f077fe5d7e 100644 --- a/intern/audaspace/intern/AUD_ReadDevice.h +++ b/intern/audaspace/intern/AUD_ReadDevice.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_READDEVICE -#define AUD_READDEVICE +#ifndef __AUD_READDEVICE_H__ +#define __AUD_READDEVICE_H__ #include "AUD_SoftwareDevice.h" @@ -85,4 +85,4 @@ public: void changeSpecs(AUD_Specs specs); }; -#endif //AUD_READDEVICE +#endif //__AUD_READDEVICE_H__ diff --git a/intern/audaspace/intern/AUD_Reference.h b/intern/audaspace/intern/AUD_Reference.h index 0d1c754f908..2e07417154b 100644 --- a/intern/audaspace/intern/AUD_Reference.h +++ b/intern/audaspace/intern/AUD_Reference.h @@ -26,8 +26,8 @@ * \ingroup audaspaceintern */ -#ifndef AUD_REFERENCE -#define AUD_REFERENCE +#ifndef __AUD_REFERENCE_H__ +#define __AUD_REFERENCE_H__ #include <map> #include <cstddef> @@ -244,4 +244,4 @@ inline bool operator!=(const AUD_Reference<T>& a, const AUD_Reference<U>& b) return a.getOriginal() != b.getOriginal(); } -#endif // AUD_REFERENCE +#endif // __AUD_REFERENCE_H__ diff --git a/intern/audaspace/intern/AUD_ResampleFactory.h b/intern/audaspace/intern/AUD_ResampleFactory.h index 34549c16dfa..11f8dc15f03 100644 --- a/intern/audaspace/intern/AUD_ResampleFactory.h +++ b/intern/audaspace/intern/AUD_ResampleFactory.h @@ -27,11 +27,11 @@ */ -#ifndef AUD_RESAMPLEFACTORY -#define AUD_RESAMPLEFACTORY +#ifndef __AUD_RESAMPLEFACTORY_H__ +#define __AUD_RESAMPLEFACTORY_H__ #include "AUD_MixerFactory.h" typedef AUD_MixerFactory AUD_ResampleFactory; -#endif //AUD_RESAMPLEFACTORY +#endif //__AUD_RESAMPLEFACTORY_H__ diff --git a/intern/audaspace/intern/AUD_ResampleReader.h b/intern/audaspace/intern/AUD_ResampleReader.h index 9c3e671f664..c423326489d 100644 --- a/intern/audaspace/intern/AUD_ResampleReader.h +++ b/intern/audaspace/intern/AUD_ResampleReader.h @@ -26,8 +26,8 @@ * \ingroup audaspaceintern */ -#ifndef AUD_RESAMPLEREADER -#define AUD_RESAMPLEREADER +#ifndef __AUD_RESAMPLEREADER_H__ +#define __AUD_RESAMPLEREADER_H__ #include "AUD_EffectReader.h" @@ -63,4 +63,4 @@ public: virtual AUD_SampleRate getRate(); }; -#endif // AUD_RESAMPLEREADER +#endif // __AUD_RESAMPLEREADER_H__ diff --git a/intern/audaspace/intern/AUD_SequencerEntry.h b/intern/audaspace/intern/AUD_SequencerEntry.h index 3a5a51a41a5..7ff6fffea11 100644 --- a/intern/audaspace/intern/AUD_SequencerEntry.h +++ b/intern/audaspace/intern/AUD_SequencerEntry.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SEQUENCERENTRY -#define AUD_SEQUENCERENTRY +#ifndef __AUD_SEQUENCERENTRY_H__ +#define __AUD_SEQUENCERENTRY_H__ #include "AUD_Reference.h" #include "AUD_AnimateableProperty.h" @@ -315,4 +315,4 @@ public: void setConeVolumeOuter(float volume); }; -#endif //AUD_SEQUENCERENTRY +#endif //__AUD_SEQUENCERENTRY_H__ diff --git a/intern/audaspace/intern/AUD_SequencerFactory.h b/intern/audaspace/intern/AUD_SequencerFactory.h index 08d18fcc925..38241112020 100644 --- a/intern/audaspace/intern/AUD_SequencerFactory.h +++ b/intern/audaspace/intern/AUD_SequencerFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SEQUENCERFACTORY -#define AUD_SEQUENCERFACTORY +#ifndef __AUD_SEQUENCERFACTORY_H__ +#define __AUD_SEQUENCERFACTORY_H__ #include "AUD_IFactory.h" #include "AUD_AnimateableProperty.h" @@ -210,4 +210,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_SEQUENCERFACTORY +#endif //__AUD_SEQUENCERFACTORY_H__ diff --git a/intern/audaspace/intern/AUD_SequencerHandle.h b/intern/audaspace/intern/AUD_SequencerHandle.h index c7fd3f026eb..72d3240a103 100644 --- a/intern/audaspace/intern/AUD_SequencerHandle.h +++ b/intern/audaspace/intern/AUD_SequencerHandle.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SEQUENCERHANDLE -#define AUD_SEQUENCERHANDLE +#ifndef __AUD_SEQUENCERHANDLE_H__ +#define __AUD_SEQUENCERHANDLE_H__ #include "AUD_SequencerEntry.h" #include "AUD_IHandle.h" @@ -103,4 +103,4 @@ public: void seek(float position); }; -#endif //AUD_SEQUENCERHANDLE +#endif //__AUD_SEQUENCERHANDLE_H__ diff --git a/intern/audaspace/intern/AUD_SequencerReader.h b/intern/audaspace/intern/AUD_SequencerReader.h index a4120830e42..b3c3a3ea7a6 100644 --- a/intern/audaspace/intern/AUD_SequencerReader.h +++ b/intern/audaspace/intern/AUD_SequencerReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SEQUENCERREADER -#define AUD_SEQUENCERREADER +#ifndef __AUD_SEQUENCERREADER_H__ +#define __AUD_SEQUENCERREADER_H__ #include "AUD_IReader.h" #include "AUD_ReadDevice.h" @@ -96,4 +96,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_SEQUENCERREADER +#endif //__AUD_SEQUENCERREADER_H__ diff --git a/intern/audaspace/intern/AUD_SilenceFactory.h b/intern/audaspace/intern/AUD_SilenceFactory.h index d1b0f9d6550..3bc7fc067ed 100644 --- a/intern/audaspace/intern/AUD_SilenceFactory.h +++ b/intern/audaspace/intern/AUD_SilenceFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SILENCEFACTORY -#define AUD_SILENCEFACTORY +#ifndef __AUD_SILENCEFACTORY_H__ +#define __AUD_SILENCEFACTORY_H__ #include "AUD_IFactory.h" @@ -51,4 +51,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_SILENCEFACTORY +#endif //__AUD_SILENCEFACTORY_H__ diff --git a/intern/audaspace/intern/AUD_SilenceReader.h b/intern/audaspace/intern/AUD_SilenceReader.h index de4f9df51fb..cac56a0861b 100644 --- a/intern/audaspace/intern/AUD_SilenceReader.h +++ b/intern/audaspace/intern/AUD_SilenceReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SILENCEREADER -#define AUD_SILENCEREADER +#ifndef __AUD_SILENCEREADER_H__ +#define __AUD_SILENCEREADER_H__ #include "AUD_IReader.h" #include "AUD_Buffer.h" @@ -63,4 +63,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_SILENCEREADER +#endif //__AUD_SILENCEREADER_H__ diff --git a/intern/audaspace/intern/AUD_SinusFactory.h b/intern/audaspace/intern/AUD_SinusFactory.h index f73cdd278b5..d83323c6635 100644 --- a/intern/audaspace/intern/AUD_SinusFactory.h +++ b/intern/audaspace/intern/AUD_SinusFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SINUSFACTORY -#define AUD_SINUSFACTORY +#ifndef __AUD_SINUSFACTORY_H__ +#define __AUD_SINUSFACTORY_H__ #include "AUD_IFactory.h" @@ -69,4 +69,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_SINUSFACTORY +#endif //__AUD_SINUSFACTORY_H__ diff --git a/intern/audaspace/intern/AUD_SinusReader.h b/intern/audaspace/intern/AUD_SinusReader.h index ce79470c83d..50487ea94aa 100644 --- a/intern/audaspace/intern/AUD_SinusReader.h +++ b/intern/audaspace/intern/AUD_SinusReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SINUSREADER -#define AUD_SINUSREADER +#ifndef __AUD_SINUSREADER_H__ +#define __AUD_SINUSREADER_H__ #include "AUD_IReader.h" #include "AUD_Buffer.h" @@ -75,4 +75,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_SINUSREADER +#endif //__AUD_SINUSREADER_H__ diff --git a/intern/audaspace/intern/AUD_SoftwareDevice.h b/intern/audaspace/intern/AUD_SoftwareDevice.h index 010f579c86d..c429508b622 100644 --- a/intern/audaspace/intern/AUD_SoftwareDevice.h +++ b/intern/audaspace/intern/AUD_SoftwareDevice.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SOFTWAREDEVICE -#define AUD_SOFTWAREDEVICE +#ifndef __AUD_SOFTWAREDEVICE_H__ +#define __AUD_SOFTWAREDEVICE_H__ #include "AUD_IDevice.h" #include "AUD_IHandle.h" @@ -342,4 +342,4 @@ public: virtual void setDistanceModel(AUD_DistanceModel model); }; -#endif //AUD_SOFTWAREDEVICE +#endif //__AUD_SOFTWAREDEVICE_H__ diff --git a/intern/audaspace/intern/AUD_Space.h b/intern/audaspace/intern/AUD_Space.h index c018d6e68e7..f42cb1ab018 100644 --- a/intern/audaspace/intern/AUD_Space.h +++ b/intern/audaspace/intern/AUD_Space.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SPACE -#define AUD_SPACE +#ifndef __AUD_SPACE_H__ +#define __AUD_SPACE_H__ /// The size of a format in bytes. #define AUD_FORMAT_SIZE(format) (format & 0x0F) @@ -253,4 +253,4 @@ typedef struct // void* userData; - for the case it is needed someday } AUD_Exception; -#endif //AUD_SPACE +#endif //__AUD_SPACE_H__ diff --git a/intern/audaspace/intern/AUD_StreamBufferFactory.h b/intern/audaspace/intern/AUD_StreamBufferFactory.h index f1f1c0f6a66..99795d95d33 100644 --- a/intern/audaspace/intern/AUD_StreamBufferFactory.h +++ b/intern/audaspace/intern/AUD_StreamBufferFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_STREAMBUFFERFACTORY -#define AUD_STREAMBUFFERFACTORY +#ifndef __AUD_STREAMBUFFERFACTORY_H__ +#define __AUD_STREAMBUFFERFACTORY_H__ #include "AUD_IFactory.h" #include "AUD_Reference.h" @@ -67,4 +67,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_STREAMBUFFERFACTORY +#endif //__AUD_STREAMBUFFERFACTORY_H__ diff --git a/intern/audaspace/jack/AUD_JackDevice.h b/intern/audaspace/jack/AUD_JackDevice.h index 6373d4f9d6d..dc90c5249a2 100644 --- a/intern/audaspace/jack/AUD_JackDevice.h +++ b/intern/audaspace/jack/AUD_JackDevice.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_JACKDEVICE -#define AUD_JACKDEVICE +#ifndef __AUD_JACKDEVICE_H__ +#define __AUD_JACKDEVICE_H__ #include "AUD_SoftwareDevice.h" @@ -205,4 +205,4 @@ public: bool doesPlayback(); }; -#endif //AUD_JACKDEVICE +#endif //__AUD_JACKDEVICE_H__ diff --git a/intern/audaspace/sndfile/AUD_SndFileFactory.h b/intern/audaspace/sndfile/AUD_SndFileFactory.h index bd02a596db3..7039c7a2615 100644 --- a/intern/audaspace/sndfile/AUD_SndFileFactory.h +++ b/intern/audaspace/sndfile/AUD_SndFileFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SNDFILEFACTORY -#define AUD_SNDFILEFACTORY +#ifndef __AUD_SNDFILEFACTORY_H__ +#define __AUD_SNDFILEFACTORY_H__ #include "AUD_IFactory.h" #include "AUD_Reference.h" @@ -73,4 +73,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_SNDFILEFACTORY +#endif //__AUD_SNDFILEFACTORY_H__ diff --git a/intern/audaspace/sndfile/AUD_SndFileReader.h b/intern/audaspace/sndfile/AUD_SndFileReader.h index b4552a7d0e5..81d8b45120c 100644 --- a/intern/audaspace/sndfile/AUD_SndFileReader.h +++ b/intern/audaspace/sndfile/AUD_SndFileReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SNDFILEREADER -#define AUD_SNDFILEREADER +#ifndef __AUD_SNDFILEREADER_H__ +#define __AUD_SNDFILEREADER_H__ #include "AUD_IReader.h" #include "AUD_Reference.h" @@ -125,4 +125,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_SNDFILEREADER +#endif //__AUD_SNDFILEREADER_H__ diff --git a/intern/audaspace/sndfile/AUD_SndFileWriter.h b/intern/audaspace/sndfile/AUD_SndFileWriter.h index 9e29fd1a347..0cadbd19a09 100644 --- a/intern/audaspace/sndfile/AUD_SndFileWriter.h +++ b/intern/audaspace/sndfile/AUD_SndFileWriter.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SNDFILEWRITER -#define AUD_SNDFILEWRITER +#ifndef __AUD_SNDFILEWRITER_H__ +#define __AUD_SNDFILEWRITER_H__ #include "AUD_IWriter.h" @@ -83,4 +83,4 @@ public: virtual void write(unsigned int length, sample_t* buffer); }; -#endif //AUD_SNDFILEWRITER +#endif //__AUD_SNDFILEWRITER_H__ diff --git a/intern/boolop/extern/BOP_Interface.h b/intern/boolop/extern/BOP_Interface.h index eee0a2478ca..fbada7dcab5 100644 --- a/intern/boolop/extern/BOP_Interface.h +++ b/intern/boolop/extern/BOP_Interface.h @@ -29,8 +29,8 @@ * \ingroup boolop */ -#ifndef BOP_INTERFACE_H -#define BOP_INTERFACE_H +#ifndef __BOP_INTERFACE_H__ +#define __BOP_INTERFACE_H__ #include "../../bsp/intern/BSP_CSGMesh.h" diff --git a/intern/boolop/intern/BOP_BBox.h b/intern/boolop/intern/BOP_BBox.h index 266ffd9b0b4..c58bb704fc3 100644 --- a/intern/boolop/intern/BOP_BBox.h +++ b/intern/boolop/intern/BOP_BBox.h @@ -30,8 +30,8 @@ */ -#ifndef BOP_BBOX_H -#define BOP_BBOX_H +#ifndef __BOP_BBOX_H__ +#define __BOP_BBOX_H__ #include "MT_Point3.h" #include "BOP_MathUtils.h" diff --git a/intern/boolop/intern/BOP_BSPNode.h b/intern/boolop/intern/BOP_BSPNode.h index 9f924407b62..e8646cd904c 100644 --- a/intern/boolop/intern/BOP_BSPNode.h +++ b/intern/boolop/intern/BOP_BSPNode.h @@ -30,8 +30,8 @@ */ -#ifndef BOP_BSPNODE_H -#define BOP_BSPNODE_H +#ifndef __BOP_BSPNODE_H__ +#define __BOP_BSPNODE_H__ #include "MT_Plane3.h" #include "BOP_Tag.h" diff --git a/intern/boolop/intern/BOP_BSPTree.h b/intern/boolop/intern/BOP_BSPTree.h index 41570de2377..b3abd55bf2a 100644 --- a/intern/boolop/intern/BOP_BSPTree.h +++ b/intern/boolop/intern/BOP_BSPTree.h @@ -30,8 +30,8 @@ */ -#ifndef BOP_BSPTREE_H -#define BOP_BSPTREE_H +#ifndef __BOP_BSPTREE_H__ +#define __BOP_BSPTREE_H__ #include "BOP_BSPNode.h" #include "BOP_Mesh.h" diff --git a/intern/boolop/intern/BOP_Chrono.h b/intern/boolop/intern/BOP_Chrono.h index 1adbfa3edb1..8f09eeae82e 100644 --- a/intern/boolop/intern/BOP_Chrono.h +++ b/intern/boolop/intern/BOP_Chrono.h @@ -30,8 +30,8 @@ */ -#ifndef BOP_CHRONO_H -#define BOP_CHRONO_H +#ifndef __BOP_CHRONO_H__ +#define __BOP_CHRONO_H__ #include <time.h> diff --git a/intern/boolop/intern/BOP_Edge.h b/intern/boolop/intern/BOP_Edge.h index 867ad5df9f1..fd2f53b1aa4 100644 --- a/intern/boolop/intern/BOP_Edge.h +++ b/intern/boolop/intern/BOP_Edge.h @@ -30,8 +30,8 @@ */ -#ifndef BOP_EDGE_H -#define BOP_EDGE_H +#ifndef __BOP_EDGE_H__ +#define __BOP_EDGE_H__ #include "BOP_Indexs.h" #include "BOP_Misc.h" diff --git a/intern/boolop/intern/BOP_Face.h b/intern/boolop/intern/BOP_Face.h index 6f79b8b17c0..4f09618e23a 100644 --- a/intern/boolop/intern/BOP_Face.h +++ b/intern/boolop/intern/BOP_Face.h @@ -30,8 +30,8 @@ */ -#ifndef BOP_FACE_H -#define BOP_FACE_H +#ifndef __BOP_FACE_H__ +#define __BOP_FACE_H__ #include "BOP_Tag.h" #include "MT_Plane3.h" diff --git a/intern/boolop/intern/BOP_Face2Face.h b/intern/boolop/intern/BOP_Face2Face.h index c4404295610..9809084ce3b 100644 --- a/intern/boolop/intern/BOP_Face2Face.h +++ b/intern/boolop/intern/BOP_Face2Face.h @@ -30,8 +30,8 @@ */ -#ifndef BOP_FACE2FACE_H -#define BOP_FACE2FACE_H +#ifndef __BOP_FACE2FACE_H__ +#define __BOP_FACE2FACE_H__ #include "BOP_Mesh.h" #include "BOP_Segment.h" diff --git a/intern/boolop/intern/BOP_Indexs.h b/intern/boolop/intern/BOP_Indexs.h index 4e71c66d4a4..e001f412c9f 100644 --- a/intern/boolop/intern/BOP_Indexs.h +++ b/intern/boolop/intern/BOP_Indexs.h @@ -30,8 +30,8 @@ */ -#ifndef BOP_Indexs_H -#define BOP_Indexs_H +#ifndef __BOP_INDEXS_H__ +#define __BOP_INDEXS_H__ #include <vector> diff --git a/intern/boolop/intern/BOP_MathUtils.h b/intern/boolop/intern/BOP_MathUtils.h index 27e5e100b8c..38acd98dd3d 100644 --- a/intern/boolop/intern/BOP_MathUtils.h +++ b/intern/boolop/intern/BOP_MathUtils.h @@ -32,8 +32,8 @@ */ -#ifndef BOP_MATHUTILS_H -#define BOP_MATHUTILS_H +#ifndef __BOP_MATHUTILS_H__ +#define __BOP_MATHUTILS_H__ #include <math.h> #include <float.h> diff --git a/intern/boolop/intern/BOP_Merge.h b/intern/boolop/intern/BOP_Merge.h index 5a24579e7b5..9d6d7030ba7 100644 --- a/intern/boolop/intern/BOP_Merge.h +++ b/intern/boolop/intern/BOP_Merge.h @@ -30,8 +30,8 @@ */ -#ifndef BOP_MERGE_H -#define BOP_MERGE_H +#ifndef __BOP_MERGE_H__ +#define __BOP_MERGE_H__ #include "BOP_Misc.h" diff --git a/intern/boolop/intern/BOP_Merge2.h b/intern/boolop/intern/BOP_Merge2.h index 78a4caff7d9..1e26a2576be 100644 --- a/intern/boolop/intern/BOP_Merge2.h +++ b/intern/boolop/intern/BOP_Merge2.h @@ -30,8 +30,8 @@ */ -#ifndef BOP_MERGE2_H -#define BOP_MERGE2_H +#ifndef __BOP_MERGE2_H__ +#define __BOP_MERGE2_H__ #include "BOP_Misc.h" diff --git a/intern/boolop/intern/BOP_Mesh.h b/intern/boolop/intern/BOP_Mesh.h index 271e97fe454..381557ec58b 100644 --- a/intern/boolop/intern/BOP_Mesh.h +++ b/intern/boolop/intern/BOP_Mesh.h @@ -32,8 +32,8 @@ */ -#ifndef BOP_MESH_H -#define BOP_MESH_H +#ifndef __BOP_MESH_H__ +#define __BOP_MESH_H__ #include "BOP_Vertex.h" #include "BOP_Edge.h" diff --git a/intern/boolop/intern/BOP_Segment.h b/intern/boolop/intern/BOP_Segment.h index 4a2b4509846..5a49ae844c4 100644 --- a/intern/boolop/intern/BOP_Segment.h +++ b/intern/boolop/intern/BOP_Segment.h @@ -30,8 +30,8 @@ */ -#ifndef BOP_SEGMENT_H -#define BOP_SEGMENT_H +#ifndef __BOP_SEGMENT_H__ +#define __BOP_SEGMENT_H__ #include "BOP_Indexs.h" #include <iostream> diff --git a/intern/boolop/intern/BOP_Splitter.h b/intern/boolop/intern/BOP_Splitter.h index a14f46510d6..8d79b89aa91 100644 --- a/intern/boolop/intern/BOP_Splitter.h +++ b/intern/boolop/intern/BOP_Splitter.h @@ -30,8 +30,8 @@ */ -#ifndef BOP_SPLITTER_H -#define BOP_SPLITTER_H +#ifndef __BOP_SPLITTER_H__ +#define __BOP_SPLITTER_H__ #include "BOP_MathUtils.h" #include "BOP_Segment.h" diff --git a/intern/boolop/intern/BOP_Tag.h b/intern/boolop/intern/BOP_Tag.h index 79d13709cd4..b7438275e90 100644 --- a/intern/boolop/intern/BOP_Tag.h +++ b/intern/boolop/intern/BOP_Tag.h @@ -33,8 +33,8 @@ #include <string.h> #include <stdio.h> -#ifndef BOP_TAG_H -#define BOP_TAG_H +#ifndef __BOP_TAG_H__ +#define __BOP_TAG_H__ #define IN_TAG 0x02 // Below the plane #define ON_TAG 0x00 // On the plane diff --git a/intern/boolop/intern/BOP_Triangulator.h b/intern/boolop/intern/BOP_Triangulator.h index 9fb314f894d..55dd51d09c3 100644 --- a/intern/boolop/intern/BOP_Triangulator.h +++ b/intern/boolop/intern/BOP_Triangulator.h @@ -30,8 +30,8 @@ */ -#ifndef BOP_TRIANGULATOR_H -#define BOP_TRIANGULATOR_H +#ifndef __BOP_TRIANGULATOR_H__ +#define __BOP_TRIANGULATOR_H__ #include "BOP_MathUtils.h" #include "BOP_Mesh.h" diff --git a/intern/boolop/intern/BOP_Vertex.h b/intern/boolop/intern/BOP_Vertex.h index 3f1780c5081..1aae2207972 100644 --- a/intern/boolop/intern/BOP_Vertex.h +++ b/intern/boolop/intern/BOP_Vertex.h @@ -30,8 +30,8 @@ */ -#ifndef BOP_VERTEX_H -#define BOP_VERTEX_H +#ifndef __BOP_VERTEX_H__ +#define __BOP_VERTEX_H__ #include "BOP_Tag.h" #include "BOP_Indexs.h" diff --git a/intern/bsp/extern/CSG_BooleanOps.h b/intern/bsp/extern/CSG_BooleanOps.h index eea0dbc547c..94a74c30536 100644 --- a/intern/bsp/extern/CSG_BooleanOps.h +++ b/intern/bsp/extern/CSG_BooleanOps.h @@ -30,8 +30,8 @@ */ -#ifndef CSG_BOOLEANOPS_H -#define CSG_BOOLEANOPS_H +#ifndef __CSG_BOOLEANOPS_H__ +#define __CSG_BOOLEANOPS_H__ /** diff --git a/intern/bsp/intern/BSP_CSGException.h b/intern/bsp/intern/BSP_CSGException.h index fc1160d60ee..744359c1078 100644 --- a/intern/bsp/intern/BSP_CSGException.h +++ b/intern/bsp/intern/BSP_CSGException.h @@ -30,8 +30,8 @@ */ -#ifndef NAN_INCLUDED_CSGException_h -#define NAN_INCLUDED_CSGException_h +#ifndef __BSP_CSGEXCEPTION_H__ +#define __BSP_CSGEXCEPTION_H__ // stick in more error types as you think of them diff --git a/intern/bsp/intern/BSP_CSGMesh.h b/intern/bsp/intern/BSP_CSGMesh.h index 13a38f26689..3fd1f0cebaf 100644 --- a/intern/bsp/intern/BSP_CSGMesh.h +++ b/intern/bsp/intern/BSP_CSGMesh.h @@ -30,8 +30,8 @@ */ -#ifndef NAN_INCLUDED_BSP_CSGMesh_h -#define NAN_INCLUDED_BSP_CSGMesh_h +#ifndef __BSP_CSGMESH_H__ +#define __BSP_CSGMESH_H__ #include "BSP_MeshPrimitives.h" #include "MEM_SmartPtr.h" diff --git a/intern/bsp/intern/BSP_CSGMesh_CFIterator.h b/intern/bsp/intern/BSP_CSGMesh_CFIterator.h index 3a1a9dbd433..cadd3df4360 100644 --- a/intern/bsp/intern/BSP_CSGMesh_CFIterator.h +++ b/intern/bsp/intern/BSP_CSGMesh_CFIterator.h @@ -30,9 +30,9 @@ */ -#ifndef BSP_CSGMesh_CFIterator_h +#ifndef __BSP_CSGMESH_CFITERATOR_H__ -#define BSP_CSGMesh_CFIterator_h +#define __BSP_CSGMESH_CFITERATOR_H__ #include "BSP_CSGMesh.h" #include "../extern/CSG_BooleanOps.h" diff --git a/intern/bsp/intern/BSP_MeshPrimitives.h b/intern/bsp/intern/BSP_MeshPrimitives.h index 4b795f4cfa2..018677327f4 100644 --- a/intern/bsp/intern/BSP_MeshPrimitives.h +++ b/intern/bsp/intern/BSP_MeshPrimitives.h @@ -30,8 +30,8 @@ */ -#ifndef NAN_INCLUDED_BSP_MeshPrimitives -#define NAN_INCLUDED_BSP_MeshPrimitives +#ifndef __BSP_MESHPRIMITIVES_H__ +#define __BSP_MESHPRIMITIVES_H__ #include "CTR_TaggedIndex.h" #include "MT_Vector3.h" diff --git a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.h b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.h index 26db15fd587..8bfa6d061ee 100644 --- a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.h +++ b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BSP_GhostTest_h -#define BSP_GhostTest_h +#ifndef __BSP_GHOSTTEST3D_H__ +#define __BSP_GHOSTTEST3D_H__ #include "GHOST_IEventConsumer.h" #include "MT_Vector3.h" diff --git a/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.h b/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.h index 443c41a7c85..17aeccc603a 100644 --- a/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.h +++ b/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BSP_MeshDrawer_h -#define BSP_MeshDrawer_h +#ifndef __BSP_MESHDRAWER_H__ +#define __BSP_MESHDRAWER_H__ class BSP_TMesh; class MT_Vector3; diff --git a/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.h b/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.h index 73803ebf921..8fcac29253b 100644 --- a/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.h +++ b/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BSP_PlyLoader_h -#define BSP_PlyLoader_h +#ifndef __BSP_PLYLOADER_H__ +#define __BSP_PLYLOADER_H__ #include "MEM_SmartPtr.h" #include "BSP_TMesh.h" diff --git a/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h b/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h index 3de5fd5df4c..ca4ab106664 100644 --- a/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h +++ b/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BSP_TMesh_h -#define BSP_TMesh_h +#ifndef __BSP_TMESH_H__ +#define __BSP_TMESH_H__ #include "MT_Point3.h" #include "MT_Vector3.h" diff --git a/intern/container/CTR_TaggedIndex.h b/intern/container/CTR_TaggedIndex.h index 00a24d07760..8420414d6c7 100644 --- a/intern/container/CTR_TaggedIndex.h +++ b/intern/container/CTR_TaggedIndex.h @@ -36,8 +36,8 @@ * Simple tagged index class. */ -#ifndef NAN_INCLUDED_CTR_TaggedIndex_h -#define NAN_INCLUDED_CTR_TaggedIndex_h +#ifndef __CTR_TAGGEDINDEX_H__ +#define __CTR_TAGGEDINDEX_H__ /** * This class is supposed to be a simple tagged index class. If these diff --git a/intern/container/CTR_TaggedSetOps.h b/intern/container/CTR_TaggedSetOps.h index 9dc4e4f00db..d30081d2d60 100644 --- a/intern/container/CTR_TaggedSetOps.h +++ b/intern/container/CTR_TaggedSetOps.h @@ -30,8 +30,8 @@ */ -#ifndef NAN_INCLUDED_LOD_TaggedSetOps_h -#define NAN_INCLUDED_LOD_TaggedSetOps_h +#ifndef __CTR_TAGGEDSETOPS_H__ +#define __CTR_TAGGEDSETOPS_H__ #include "MEM_NonCopyable.h" #include <vector> diff --git a/intern/container/CTR_UHeap.h b/intern/container/CTR_UHeap.h index 11813c48331..ad3d7d2bb02 100644 --- a/intern/container/CTR_UHeap.h +++ b/intern/container/CTR_UHeap.h @@ -44,8 +44,8 @@ * */ -#ifndef NAN_INCLUDED_CTR_UHeap_h -#define NAN_INCLUDED_CTR_UHeap_h +#ifndef __CTR_UHEAP_H__ +#define __CTR_UHEAP_H__ #include <vector> diff --git a/intern/decimation/extern/LOD_decimation.h b/intern/decimation/extern/LOD_decimation.h index 1c31e98f3da..4c52cb18577 100644 --- a/intern/decimation/extern/LOD_decimation.h +++ b/intern/decimation/extern/LOD_decimation.h @@ -38,8 +38,8 @@ * This is the external interface for the decimation module. */ -#ifndef NAN_INCLUDED_LOD_decimation_h -#define NAN_INCLUDED_LOD_decimation_h +#ifndef __LOD_DECIMATION_H__ +#define __LOD_DECIMATION_H__ #ifdef __cplusplus extern "C" { @@ -113,5 +113,5 @@ extern int LOD_FreeDecimationData(LOD_Decimation_InfoPtr); } #endif -#endif // NAN_INCLUDED_LOD_decimation_h +#endif // __LOD_DECIMATION_H__ diff --git a/intern/decimation/intern/LOD_DecimationClass.h b/intern/decimation/intern/LOD_DecimationClass.h index a91db1a28e6..ecf2e4e6790 100644 --- a/intern/decimation/intern/LOD_DecimationClass.h +++ b/intern/decimation/intern/LOD_DecimationClass.h @@ -30,8 +30,8 @@ */ -#ifndef NAN_INCLUDED_LOD_DecimationClass_h -#define NAN_INCLUDED_LOD_DecimationClass_h +#ifndef __LOD_DECIMATIONCLASS_H__ +#define __LOD_DECIMATIONCLASS_H__ #include "MEM_SmartPtr.h" #include "MEM_NonCopyable.h" diff --git a/intern/decimation/intern/LOD_EdgeCollapser.h b/intern/decimation/intern/LOD_EdgeCollapser.h index ae4e9072f5b..75a8b70f672 100644 --- a/intern/decimation/intern/LOD_EdgeCollapser.h +++ b/intern/decimation/intern/LOD_EdgeCollapser.h @@ -30,8 +30,8 @@ */ -#ifndef NAN_INCLDUED_EgdeCollapser_h -#define NAN_INCLDUED_EgdeCollapser_h +#ifndef __LOD_EDGECOLLAPSER_H__ +#define __LOD_EDGECOLLAPSER_H__ // This is a helper class that collapses edges of a 2 - manifold mesh. diff --git a/intern/decimation/intern/LOD_ExternBufferEditor.h b/intern/decimation/intern/LOD_ExternBufferEditor.h index 3d7665754f7..c903b255812 100644 --- a/intern/decimation/intern/LOD_ExternBufferEditor.h +++ b/intern/decimation/intern/LOD_ExternBufferEditor.h @@ -35,8 +35,8 @@ * Copyright (C) 2001 NaN Technologies B.V. */ -#ifndef NAN_INCLUDED_LOD_ExternBufferEditor_h -#define NAN_INCLUDED_LOD_ExternBufferEditor_h +#ifndef __LOD_EXTERNBUFFEREDITOR_H__ +#define __LOD_EXTERNBUFFEREDITOR_H__ #include "LOD_MeshPrimitives.h" #include <vector> diff --git a/intern/decimation/intern/LOD_ExternNormalEditor.h b/intern/decimation/intern/LOD_ExternNormalEditor.h index 491cccabf1e..1c637453467 100644 --- a/intern/decimation/intern/LOD_ExternNormalEditor.h +++ b/intern/decimation/intern/LOD_ExternNormalEditor.h @@ -30,8 +30,8 @@ */ -#ifndef NAN_INCLUDED_ExternNormalEditor_h -#define NAN_INCLUDED_ExternNormalEditor_h +#ifndef __LOD_EXTERNNORMALEDITOR_H__ +#define __LOD_EXTERNNORMALEDITOR_H__ #include "MEM_NonCopyable.h" #include "LOD_ManMesh2.h" diff --git a/intern/decimation/intern/LOD_FaceNormalEditor.h b/intern/decimation/intern/LOD_FaceNormalEditor.h index 6fd65e3db62..b2f941f990f 100644 --- a/intern/decimation/intern/LOD_FaceNormalEditor.h +++ b/intern/decimation/intern/LOD_FaceNormalEditor.h @@ -30,8 +30,8 @@ */ -#ifndef NAN_INCLUDED_FaceNormalEditor_h -#define NAN_INCLUDED_FaceNormalEditor_h +#ifndef __LOD_FACENORMALEDITOR_H__ +#define __LOD_FACENORMALEDITOR_H__ #include "MEM_NonCopyable.h" #include "LOD_ManMesh2.h" diff --git a/intern/decimation/intern/LOD_ManMesh2.h b/intern/decimation/intern/LOD_ManMesh2.h index 1377a405ff7..63ea7912c2d 100644 --- a/intern/decimation/intern/LOD_ManMesh2.h +++ b/intern/decimation/intern/LOD_ManMesh2.h @@ -30,8 +30,8 @@ */ -#ifndef NAN_INCLUDED_ManMesh2_h -#define NAN_INCLUDED_ManMesh2_h +#ifndef __LOD_MANMESH2_H__ +#define __LOD_MANMESH2_H__ #include "LOD_MeshPrimitives.h" #include "MEM_SmartPtr.h" diff --git a/intern/decimation/intern/LOD_MeshBounds.h b/intern/decimation/intern/LOD_MeshBounds.h index 116c32efed6..c95e6c7b61f 100644 --- a/intern/decimation/intern/LOD_MeshBounds.h +++ b/intern/decimation/intern/LOD_MeshBounds.h @@ -30,8 +30,8 @@ */ -#ifndef NAN_INCLUDED_MeshBounds_h -#define NAN_INCLUDED_MeshBounds_h +#ifndef __LOD_MESHBOUNDS_H__ +#define __LOD_MESHBOUNDS_H__ #include "MEM_SmartPtr.h" #include "LOD_MeshPrimitives.h" diff --git a/intern/decimation/intern/LOD_MeshException.h b/intern/decimation/intern/LOD_MeshException.h index 15a88777146..67bd8188c41 100644 --- a/intern/decimation/intern/LOD_MeshException.h +++ b/intern/decimation/intern/LOD_MeshException.h @@ -30,8 +30,8 @@ */ -#ifndef NAN_INCLUDED_MeshExceptions_h -#define NAN_INCLUDED_MeshExceptions_h +#ifndef __LOD_MESHEXCEPTION_H__ +#define __LOD_MESHEXCEPTION_H__ class LOD_MeshException { diff --git a/intern/decimation/intern/LOD_MeshPrimitives.h b/intern/decimation/intern/LOD_MeshPrimitives.h index e863f27e071..a43e29f3fe7 100644 --- a/intern/decimation/intern/LOD_MeshPrimitives.h +++ b/intern/decimation/intern/LOD_MeshPrimitives.h @@ -30,8 +30,8 @@ */ -#ifndef NAN_INCLUDED_MeshPrimitives_h -#define NAN_INCLUDED_MeshPrimitives_h +#ifndef __LOD_MESHPRIMITIVES_H__ +#define __LOD_MESHPRIMITIVES_H__ #include "MT_Vector3.h" #include "CTR_TaggedIndex.h" diff --git a/intern/decimation/intern/LOD_QSDecimator.h b/intern/decimation/intern/LOD_QSDecimator.h index d471186a360..2ac223996f2 100644 --- a/intern/decimation/intern/LOD_QSDecimator.h +++ b/intern/decimation/intern/LOD_QSDecimator.h @@ -30,8 +30,8 @@ */ -#ifndef NAN_INCLUDED_LOD_QSDecimator_H -#define NAN_INCLUDED_LOD_QSDecimator_H +#ifndef __LOD_QSDECIMATOR_H__ +#define __LOD_QSDECIMATOR_H__ #include "MEM_NonCopyable.h" #include "LOD_ManMesh2.h" diff --git a/intern/decimation/intern/LOD_Quadric.h b/intern/decimation/intern/LOD_Quadric.h index cb7846da2ca..9dde0502aa3 100644 --- a/intern/decimation/intern/LOD_Quadric.h +++ b/intern/decimation/intern/LOD_Quadric.h @@ -30,8 +30,8 @@ */ -#ifndef NAN_INCLUDED_LOD_Quadric_h -#define NAN_INCLUDED_LOD_Quadric_h +#ifndef __LOD_QUADRIC_H__ +#define __LOD_QUADRIC_H__ #include "MT_Vector3.h" #include "MT_Matrix3x3.h" diff --git a/intern/decimation/intern/LOD_QuadricEditor.h b/intern/decimation/intern/LOD_QuadricEditor.h index 0b0c7eead45..0a66d299e15 100644 --- a/intern/decimation/intern/LOD_QuadricEditor.h +++ b/intern/decimation/intern/LOD_QuadricEditor.h @@ -30,8 +30,8 @@ */ -#ifndef NAN_INCLUDED_LOD_QuadricEditor_h -#define NAN_INCLUDED_LOD_QuadricEditor_h +#ifndef __LOD_QUADRICEDITOR_H__ +#define __LOD_QUADRICEDITOR_H__ #include "MEM_NonCopyable.h" #include "LOD_ManMesh2.h" diff --git a/intern/dualcon/dualcon.h b/intern/dualcon/dualcon.h index 9346adc99b3..53135a7dcc1 100644 --- a/intern/dualcon/dualcon.h +++ b/intern/dualcon/dualcon.h @@ -20,8 +20,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef DUALCON_H -#define DUALCON_H +#ifndef __DUALCON_H__ +#define __DUALCON_H__ #ifdef __cplusplus extern "C" { @@ -92,4 +92,4 @@ void *dualcon(const DualConInput *input_mesh, } #endif -#endif +#endif /* __DUALCON_H__ */ diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h index 582086d130b..bb2c4f2d0a4 100644 --- a/intern/ffmpeg/ffmpeg_compat.h +++ b/intern/ffmpeg/ffmpeg_compat.h @@ -1,8 +1,4 @@ -#ifndef __ffmpeg_compat_h_included__ -#define __ffmpeg_compat_h_included__ 1 - /* - * * compatibility macros to make every ffmpeg installation appear * like the most current installation (wrapping some functionality sometimes) * it also includes all ffmpeg header files at once, no need to do it @@ -22,10 +18,11 @@ * */ +#ifndef __FFMPEG_COMPAT_H__ +#define __FFMPEG_COMPAT_H__ #include <libavformat/avformat.h> - /* check our ffmpeg is new enough, avoids user complaints */ #if (LIBAVFORMAT_VERSION_MAJOR < 52) || ((LIBAVFORMAT_VERSION_MAJOR == 52) && (LIBAVFORMAT_VERSION_MINOR <= 64)) # error "FFmpeg 0.7 or newer is needed, Upgrade your FFmpeg or disable it" diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h index db66a68799e..b47c4444081 100644 --- a/intern/ghost/GHOST_C-api.h +++ b/intern/ghost/GHOST_C-api.h @@ -30,8 +30,8 @@ * \brief GHOST C-API function and type declarations. */ -#ifndef GHOST_C_API_H -#define GHOST_C_API_H +#ifndef __GHOST_C_API_H__ +#define __GHOST_C_API_H__ #include "GHOST_Types.h" diff --git a/intern/ghost/GHOST_IEvent.h b/intern/ghost/GHOST_IEvent.h index 4e181b91c9e..05bd3553e01 100644 --- a/intern/ghost/GHOST_IEvent.h +++ b/intern/ghost/GHOST_IEvent.h @@ -30,8 +30,8 @@ * Declaration of GHOST_IEvent interface class. */ -#ifndef _GHOST_IEVENT_H_ -#define _GHOST_IEVENT_H_ +#ifndef __GHOST_IEVENT_H__ +#define __GHOST_IEVENT_H__ #include <stddef.h> #include "GHOST_Types.h" @@ -92,5 +92,5 @@ public: #endif }; -#endif // _GHOST_IEVENT_H_ +#endif // __GHOST_IEVENT_H__ diff --git a/intern/ghost/GHOST_IEventConsumer.h b/intern/ghost/GHOST_IEventConsumer.h index 9229595c90d..043cb27d1b2 100644 --- a/intern/ghost/GHOST_IEventConsumer.h +++ b/intern/ghost/GHOST_IEventConsumer.h @@ -30,8 +30,8 @@ * Declaration of GHOST_IEventConsumer interface class. */ -#ifndef _GHOST_IEVENT_CONSUMER_H_ -#define _GHOST_IEVENT_CONSUMER_H_ +#ifndef __GHOST_IEVENTCONSUMER_H__ +#define __GHOST_IEVENTCONSUMER_H__ #include "GHOST_IEvent.h" diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h index ee67694760b..be44bbee99a 100644 --- a/intern/ghost/GHOST_ISystem.h +++ b/intern/ghost/GHOST_ISystem.h @@ -32,8 +32,8 @@ * Contains the doxygen documentation main page. */ -#ifndef _GHOST_ISYSTEM_H_ -#define _GHOST_ISYSTEM_H_ +#ifndef __GHOST_ISYSTEM_H__ +#define __GHOST_ISYSTEM_H__ #include "GHOST_Types.h" #include "GHOST_ITimerTask.h" @@ -416,5 +416,5 @@ public: #endif }; -#endif // _GHOST_ISYSTEM_H_ +#endif // __GHOST_ISYSTEM_H__ diff --git a/intern/ghost/GHOST_ISystemPaths.h b/intern/ghost/GHOST_ISystemPaths.h index 804cba721ff..dea5436c485 100644 --- a/intern/ghost/GHOST_ISystemPaths.h +++ b/intern/ghost/GHOST_ISystemPaths.h @@ -28,8 +28,8 @@ * \ingroup GHOST */ -#ifndef _GHOST_ISYSTEMPATHS_H_ -#define _GHOST_ISYSTEMPATHS_H_ +#ifndef __GHOST_ISYSTEMPATHS_H__ +#define __GHOST_ISYSTEMPATHS_H__ #include "GHOST_Types.h" diff --git a/intern/ghost/GHOST_ITimerTask.h b/intern/ghost/GHOST_ITimerTask.h index 95d75663401..bae41cf84d4 100644 --- a/intern/ghost/GHOST_ITimerTask.h +++ b/intern/ghost/GHOST_ITimerTask.h @@ -30,8 +30,8 @@ * Declaration of GHOST_ITimerTask interface class. */ -#ifndef _GHOST_ITIMER_TASK_H_ -#define _GHOST_ITIMER_TASK_H_ +#ifndef __GHOST_ITIMERTASK_H__ +#define __GHOST_ITIMERTASK_H__ #include "GHOST_Types.h" @@ -91,5 +91,5 @@ public: #endif }; -#endif // _GHOST_ITIMER_TASK_H_ +#endif // __GHOST_ITIMERTASK_H__ diff --git a/intern/ghost/GHOST_IWindow.h b/intern/ghost/GHOST_IWindow.h index 6438059287d..4ce8800fef6 100644 --- a/intern/ghost/GHOST_IWindow.h +++ b/intern/ghost/GHOST_IWindow.h @@ -30,8 +30,8 @@ * Declaration of GHOST_IWindow interface class. */ -#ifndef _GHOST_IWINDOW_H_ -#define _GHOST_IWINDOW_H_ +#ifndef __GHOST_IWINDOW_H__ +#define __GHOST_IWINDOW_H__ #include "STR_String.h" #include "GHOST_Rect.h" @@ -312,5 +312,5 @@ public: #endif }; -#endif // _GHOST_IWINDOW_H_ +#endif // __GHOST_IWINDOW_H__ diff --git a/intern/ghost/GHOST_Path-api.h b/intern/ghost/GHOST_Path-api.h index abe837b6290..f1b79a98082 100644 --- a/intern/ghost/GHOST_Path-api.h +++ b/intern/ghost/GHOST_Path-api.h @@ -30,8 +30,8 @@ */ -#ifndef GHOST_PATH_API_H -#define GHOST_PATH_API_H +#ifndef __GHOST_PATH_API_H__ +#define __GHOST_PATH_API_H__ #include "GHOST_Types.h" diff --git a/intern/ghost/GHOST_Rect.h b/intern/ghost/GHOST_Rect.h index c3b9460a14f..bcbcaded364 100644 --- a/intern/ghost/GHOST_Rect.h +++ b/intern/ghost/GHOST_Rect.h @@ -30,8 +30,8 @@ * Macro's used in GHOST debug target. */ -#ifndef _H_GHOST_Rect -#define _H_GHOST_Rect +#ifndef __GHOST_RECT_H__ +#define __GHOST_RECT_H__ #include "GHOST_Types.h" @@ -254,5 +254,5 @@ inline bool GHOST_Rect::isInside(GHOST_TInt32 x, GHOST_TInt32 y) const return (x >= m_l) && (x <= m_r) && (y >= m_t) && (y <= m_b); } -#endif // _H_GHOST_Rect +#endif // __GHOST_RECT_H__ diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h index 41496bca993..583bfdf1f84 100644 --- a/intern/ghost/GHOST_Types.h +++ b/intern/ghost/GHOST_Types.h @@ -30,8 +30,8 @@ */ -#ifndef _GHOST_TYPES_H_ -#define _GHOST_TYPES_H_ +#ifndef __GHOST_TYPES_H__ +#define __GHOST_TYPES_H__ #ifdef WITH_CXX_GUARDEDALLOC #include "MEM_guardedalloc.h" @@ -515,5 +515,5 @@ struct GHOST_TimerTaskHandle__; typedef void (*GHOST_TimerProcPtr)(struct GHOST_TimerTaskHandle__* task, GHOST_TUns64 time); #endif -#endif // _GHOST_TYPES_H_ +#endif // __GHOST_TYPES_H__ diff --git a/intern/ghost/intern/GHOST_Buttons.h b/intern/ghost/intern/GHOST_Buttons.h index 0209dc304e4..ea1cce574b8 100644 --- a/intern/ghost/intern/GHOST_Buttons.h +++ b/intern/ghost/intern/GHOST_Buttons.h @@ -30,8 +30,8 @@ * Declaration of GHOST_Buttons struct. */ -#ifndef _GHOST_BUTTONS_H_ -#define _GHOST_BUTTONS_H_ +#ifndef __GHOST_BUTTONS_H__ +#define __GHOST_BUTTONS_H__ #include "GHOST_Types.h" @@ -74,5 +74,5 @@ struct GHOST_Buttons { GHOST_TUns8 m_ButtonRight : 1; }; -#endif // _GHOST_BUTTONS_H_ +#endif // __GHOST_BUTTONS_H__ diff --git a/intern/ghost/intern/GHOST_CallbackEventConsumer.h b/intern/ghost/intern/GHOST_CallbackEventConsumer.h index 8c16f53025c..e7a1aed507d 100644 --- a/intern/ghost/intern/GHOST_CallbackEventConsumer.h +++ b/intern/ghost/intern/GHOST_CallbackEventConsumer.h @@ -30,8 +30,8 @@ * Declaration of GHOST_CallbackEventConsumer class. */ -#ifndef _GHOST_CALLBACK_EVENT_CONSUMER_H_ -#define _GHOST_CALLBACK_EVENT_CONSUMER_H_ +#ifndef __GHOST_CALLBACKEVENTCONSUMER_H__ +#define __GHOST_CALLBACKEVENTCONSUMER_H__ #include "GHOST_IEventConsumer.h" #include "GHOST_C-api.h" @@ -75,5 +75,5 @@ protected: GHOST_TUserDataPtr m_userData; }; -#endif // _GHOST_CALLBACK_EVENT_CONSUMER_H_ +#endif // __GHOST_CALLBACKEVENTCONSUMER_H__ diff --git a/intern/ghost/intern/GHOST_Debug.h b/intern/ghost/intern/GHOST_Debug.h index 38512f6ce2b..a6392fce9bf 100644 --- a/intern/ghost/intern/GHOST_Debug.h +++ b/intern/ghost/intern/GHOST_Debug.h @@ -30,8 +30,8 @@ * Macro's used in GHOST debug target. */ -#ifndef _GHOST_DEBUG_H_ -#define _GHOST_DEBUG_H_ +#ifndef __GHOST_DEBUG_H__ +#define __GHOST_DEBUG_H__ #if defined(WIN32) && !defined(FREE_WINDOWS) # ifdef DEBUG @@ -72,5 +72,5 @@ # define GHOST_ASSERT(x, info) #endif // GHOST_DEBUG -#endif // _GHOST_DEBUG_H_ +#endif // __GHOST_DEBUG_H__ diff --git a/intern/ghost/intern/GHOST_DisplayManager.h b/intern/ghost/intern/GHOST_DisplayManager.h index b89f303c734..3e867054d01 100644 --- a/intern/ghost/intern/GHOST_DisplayManager.h +++ b/intern/ghost/intern/GHOST_DisplayManager.h @@ -30,8 +30,8 @@ * Declaration of GHOST_DisplayManager class. */ -#ifndef _GHOST_DISPLAY_MANAGER_H_ -#define _GHOST_DISPLAY_MANAGER_H_ +#ifndef __GHOST_DISPLAYMANAGER_H__ +#define __GHOST_DISPLAYMANAGER_H__ #include "GHOST_Types.h" @@ -136,5 +136,5 @@ protected: }; -#endif // _GHOST_DISPLAY_MANAGER_H_ +#endif // __GHOST_DISPLAYMANAGER_H__ diff --git a/intern/ghost/intern/GHOST_DisplayManagerCarbon.h b/intern/ghost/intern/GHOST_DisplayManagerCarbon.h index 1a3c0d995b9..93467b8f462 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerCarbon.h +++ b/intern/ghost/intern/GHOST_DisplayManagerCarbon.h @@ -30,8 +30,8 @@ * Declaration of GHOST_DisplayManagerCarbon class. */ -#ifndef _GHOST_DISPLAY_MANAGER_CARBON_H_ -#define _GHOST_DISPLAY_MANAGER_CARBON_H_ +#ifndef __GHOST_DISPLAYMANAGERCARBON_H__ +#define __GHOST_DISPLAYMANAGERCARBON_H__ #ifndef __APPLE__ #error Apple only! @@ -112,5 +112,5 @@ protected: }; -#endif // _GHOST_DISPLAY_MANAGER_CARBON_H_ +#endif // __GHOST_DISPLAYMANAGERCARBON_H__ diff --git a/intern/ghost/intern/GHOST_DisplayManagerCocoa.h b/intern/ghost/intern/GHOST_DisplayManagerCocoa.h index 7e12ca18aa2..bf194ad0492 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerCocoa.h +++ b/intern/ghost/intern/GHOST_DisplayManagerCocoa.h @@ -30,8 +30,8 @@ * Declaration of GHOST_DisplayManagerCocoa class. */ -#ifndef _GHOST_DISPLAY_MANAGER_COCOA_H_ -#define _GHOST_DISPLAY_MANAGER_COCOA_H_ +#ifndef __GHOST_DISPLAYMANAGERCOCOA_H__ +#define __GHOST_DISPLAYMANAGERCOCOA_H__ #ifndef __APPLE__ #error Apple only! @@ -102,5 +102,5 @@ protected: }; -#endif // _GHOST_DISPLAY_MANAGER_COCOA_H_ +#endif // __GHOST_DISPLAYMANAGERCOCOA_H__ diff --git a/intern/ghost/intern/GHOST_DisplayManagerNULL.h b/intern/ghost/intern/GHOST_DisplayManagerNULL.h index 5d3f0168c52..31fb9faf0cf 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerNULL.h +++ b/intern/ghost/intern/GHOST_DisplayManagerNULL.h @@ -25,8 +25,8 @@ * Declaration of GHOST_DisplayManagerNULL class. */ -#ifndef _GHOST_DISPLAY_MANAGER_NULL_H_ -#define _GHOST_DISPLAY_MANAGER_NULL_H_ +#ifndef __GHOST_DISPLAYMANAGERNULL_H__ +#define __GHOST_DISPLAYMANAGERNULL_H__ #include "GHOST_DisplayManager.h" #include "GHOST_SystemNULL.h" @@ -47,4 +47,4 @@ private : GHOST_SystemNULL * m_system; }; -#endif /* _GHOST_DISPLAY_MANAGER_NULL_H_ */ +#endif /* __GHOST_DISPLAYMANAGERNULL_H__ */ diff --git a/intern/ghost/intern/GHOST_DisplayManagerSDL.h b/intern/ghost/intern/GHOST_DisplayManagerSDL.h index 297a61f41ff..72f756f653a 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerSDL.h +++ b/intern/ghost/intern/GHOST_DisplayManagerSDL.h @@ -25,8 +25,8 @@ * Declaration of GHOST_DisplayManagerSDL class. */ -#ifndef _GHOST_DISPLAY_MANAGER_SDL_H_ -#define _GHOST_DISPLAY_MANAGER_SDL_H_ +#ifndef __GHOST_DISPLAYMANAGERSDL_H__ +#define __GHOST_DISPLAYMANAGERSDL_H__ #include "GHOST_DisplayManager.h" @@ -69,4 +69,4 @@ private : GHOST_SystemSDL * m_system; }; -#endif /* _GHOST_DISPLAY_MANAGER_SDL_H_ */ +#endif /* __GHOST_DISPLAYMANAGERSDL_H__ */ diff --git a/intern/ghost/intern/GHOST_DisplayManagerWin32.h b/intern/ghost/intern/GHOST_DisplayManagerWin32.h index 84749d42dbb..534274ec878 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerWin32.h +++ b/intern/ghost/intern/GHOST_DisplayManagerWin32.h @@ -30,8 +30,8 @@ * Declaration of GHOST_DisplayManagerWin32 class. */ -#ifndef _GHOST_DISPLAY_MANAGER_WIN32_H_ -#define _GHOST_DISPLAY_MANAGER_WIN32_H_ +#ifndef __GHOST_DISPLAYMANAGERWIN32_H__ +#define __GHOST_DISPLAYMANAGERWIN32_H__ #ifndef WIN32 #error WIN32 only! @@ -97,5 +97,5 @@ protected: }; -#endif // _GHOST_DISPLAY_MANAGER_WIN32_H_ +#endif // __GHOST_DISPLAYMANAGERWIN32_H__ diff --git a/intern/ghost/intern/GHOST_DisplayManagerX11.h b/intern/ghost/intern/GHOST_DisplayManagerX11.h index 62374b9170a..c4d2b6dbb0a 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerX11.h +++ b/intern/ghost/intern/GHOST_DisplayManagerX11.h @@ -30,8 +30,8 @@ * Declaration of GHOST_DisplayManagerX11 class. */ -#ifndef _GHOST_DISPLAY_MANAGER_X11_H_ -#define _GHOST_DISPLAY_MANAGER_X11_H_ +#ifndef __GHOST_DISPLAYMANAGERX11_H__ +#define __GHOST_DISPLAYMANAGERX11_H__ #include "GHOST_DisplayManager.h" diff --git a/intern/ghost/intern/GHOST_DropTargetWin32.h b/intern/ghost/intern/GHOST_DropTargetWin32.h index 0e8b2d15991..9f80b82436e 100644 --- a/intern/ghost/intern/GHOST_DropTargetWin32.h +++ b/intern/ghost/intern/GHOST_DropTargetWin32.h @@ -29,8 +29,8 @@ * \ingroup GHOST */ -#ifndef _GHOST_DROP_TARGET_WIN32_H_ -#define _GHOST_DROP_TARGET_WIN32_H_ +#ifndef __GHOST_DROPTARGETWIN32_H__ +#define __GHOST_DROPTARGETWIN32_H__ #include <string.h> #include <GHOST_Types.h> @@ -155,4 +155,4 @@ private: }; -#endif // _GHOST_DROP_TARGET_WIN32_H_ +#endif // __GHOST_DROPTARGETWIN32_H__ diff --git a/intern/ghost/intern/GHOST_DropTargetX11.h b/intern/ghost/intern/GHOST_DropTargetX11.h index 2b08b7ef59c..b9e17dcc93b 100644 --- a/intern/ghost/intern/GHOST_DropTargetX11.h +++ b/intern/ghost/intern/GHOST_DropTargetX11.h @@ -29,8 +29,8 @@ * \ingroup GHOST */ -#ifndef _GHOST_DROP_TARGET_X11_H_ -#define _GHOST_DROP_TARGET_X11_H_ +#ifndef __GHOST_DROPTARGETX11_H__ +#define __GHOST_DROPTARGETX11_H__ #include <GHOST_Types.h> #include "GHOST_WindowX11.h" @@ -132,4 +132,4 @@ private: static int m_refCounter; }; -#endif // _GHOST_DROP_TARGET_X11_H_ +#endif // __GHOST_DROPTARGETX11_H__ diff --git a/intern/ghost/intern/GHOST_Event.h b/intern/ghost/intern/GHOST_Event.h index aa626f8970d..c7f86f2502d 100644 --- a/intern/ghost/intern/GHOST_Event.h +++ b/intern/ghost/intern/GHOST_Event.h @@ -30,8 +30,8 @@ * Declaration of GHOST_Event class. */ -#ifndef _GHOST_EVENT_H_ -#define _GHOST_EVENT_H_ +#ifndef __GHOST_EVENT_H__ +#define __GHOST_EVENT_H__ #include "GHOST_IEvent.h" @@ -103,5 +103,5 @@ protected: GHOST_TEventDataPtr m_data; }; -#endif // _GHOST_EVENT_H_ +#endif // __GHOST_EVENT_H__ diff --git a/intern/ghost/intern/GHOST_EventButton.h b/intern/ghost/intern/GHOST_EventButton.h index 3911e2a8bb5..7c869190b16 100644 --- a/intern/ghost/intern/GHOST_EventButton.h +++ b/intern/ghost/intern/GHOST_EventButton.h @@ -30,8 +30,8 @@ * Declaration of GHOST_EventButton class. */ -#ifndef _GHOST_EVENT_BUTTON_H_ -#define _GHOST_EVENT_BUTTON_H_ +#ifndef __GHOST_EVENTBUTTON_H__ +#define __GHOST_EVENTBUTTON_H__ #include "GHOST_Event.h" @@ -63,5 +63,5 @@ protected: GHOST_TEventButtonData m_buttonEventData; }; -#endif // _GHOST_EVENT_BUTTON_H_ +#endif // __GHOST_EVENTBUTTON_H__ diff --git a/intern/ghost/intern/GHOST_EventCursor.h b/intern/ghost/intern/GHOST_EventCursor.h index 863538b442f..749bd8a6922 100644 --- a/intern/ghost/intern/GHOST_EventCursor.h +++ b/intern/ghost/intern/GHOST_EventCursor.h @@ -30,8 +30,8 @@ * Declaration of GHOST_EventCursor class. */ -#ifndef _GHOST_EVENT_CURSOR_H_ -#define _GHOST_EVENT_CURSOR_H_ +#ifndef __GHOST_EVENTCURSOR_H__ +#define __GHOST_EVENTCURSOR_H__ #include "GHOST_Event.h" @@ -64,5 +64,5 @@ protected: }; -#endif // _GHOST_EVENT_CURSOR_H_ +#endif // __GHOST_EVENTCURSOR_H__ diff --git a/intern/ghost/intern/GHOST_EventDragnDrop.h b/intern/ghost/intern/GHOST_EventDragnDrop.h index 330635de50a..4e256a386c0 100644 --- a/intern/ghost/intern/GHOST_EventDragnDrop.h +++ b/intern/ghost/intern/GHOST_EventDragnDrop.h @@ -30,8 +30,8 @@ */ -#ifndef _GHOST_EVENT_DRAGNDROP_H_ -#define _GHOST_EVENT_DRAGNDROP_H_ +#ifndef __GHOST_EVENTDRAGNDROP_H__ +#define __GHOST_EVENTDRAGNDROP_H__ #include "GHOST_Event.h" extern "C" { @@ -131,5 +131,5 @@ protected: GHOST_TEventDragnDropData m_dragnDropEventData; }; -#endif // _GHOST_EVENT_DRAGNDROP_H_ +#endif // __GHOST_EVENTDRAGNDROP_H__ diff --git a/intern/ghost/intern/GHOST_EventKey.h b/intern/ghost/intern/GHOST_EventKey.h index a602bd65e5a..ae3ef374431 100644 --- a/intern/ghost/intern/GHOST_EventKey.h +++ b/intern/ghost/intern/GHOST_EventKey.h @@ -30,8 +30,8 @@ * Declaration of GHOST_EventKey class. */ -#ifndef _GHOST_EVENT_KEY_H_ -#define _GHOST_EVENT_KEY_H_ +#ifndef __GHOST_EVENTKEY_H__ +#define __GHOST_EVENTKEY_H__ #include "GHOST_Event.h" @@ -88,5 +88,5 @@ protected: GHOST_TEventKeyData m_keyEventData; }; -#endif // _GHOST_EVENT_KEY_H_ +#endif // __GHOST_EVENTKEY_H__ diff --git a/intern/ghost/intern/GHOST_EventManager.h b/intern/ghost/intern/GHOST_EventManager.h index ad2622ae436..bc43a5c5d07 100644 --- a/intern/ghost/intern/GHOST_EventManager.h +++ b/intern/ghost/intern/GHOST_EventManager.h @@ -30,8 +30,8 @@ * Declaration of GHOST_EventManager class. */ -#ifndef _GHOST_EVENT_MANAGER_H_ -#define _GHOST_EVENT_MANAGER_H_ +#ifndef __GHOST_EVENTMANAGER_H__ +#define __GHOST_EVENTMANAGER_H__ #include <deque> #include <vector> @@ -170,5 +170,5 @@ protected: TConsumerVector m_consumers; }; -#endif // _GHOST_EVENT_MANAGER_H_ +#endif // __GHOST_EVENTMANAGER_H__ diff --git a/intern/ghost/intern/GHOST_EventNDOF.h b/intern/ghost/intern/GHOST_EventNDOF.h index fceacce0805..f256f343823 100644 --- a/intern/ghost/intern/GHOST_EventNDOF.h +++ b/intern/ghost/intern/GHOST_EventNDOF.h @@ -25,8 +25,8 @@ * Declaration of GHOST_EventManager class. */ -#ifndef _GHOST_EVENT_NDOF_H_ -#define _GHOST_EVENT_NDOF_H_ +#ifndef __GHOST_EVENTNDOF_H__ +#define __GHOST_EVENTNDOF_H__ #include "GHOST_Event.h" @@ -59,4 +59,4 @@ class GHOST_EventNDOFButton : public GHOST_Event }; -#endif // _GHOST_EVENT_NDOF_H_ +#endif // __GHOST_EVENTNDOF_H__ diff --git a/intern/ghost/intern/GHOST_EventPrinter.h b/intern/ghost/intern/GHOST_EventPrinter.h index 523bd4e3185..7c2378db301 100644 --- a/intern/ghost/intern/GHOST_EventPrinter.h +++ b/intern/ghost/intern/GHOST_EventPrinter.h @@ -30,8 +30,8 @@ * Declaration of GHOST_EventPrinter class. */ -#ifndef _GHOST_EVENT_PRINTER_H_ -#define _GHOST_EVENT_PRINTER_H_ +#ifndef __GHOST_EVENTPRINTER_H__ +#define __GHOST_EVENTPRINTER_H__ #include "GHOST_IEventConsumer.h" @@ -60,5 +60,5 @@ protected: void getKeyString(GHOST_TKey key, char str[32]) const; }; -#endif // _GHOST_EVENT_PRINTER_H_ +#endif // __GHOST_EVENTPRINTER_H__ diff --git a/intern/ghost/intern/GHOST_EventString.h b/intern/ghost/intern/GHOST_EventString.h index e8735fdfbbe..90e914e3b5c 100644 --- a/intern/ghost/intern/GHOST_EventString.h +++ b/intern/ghost/intern/GHOST_EventString.h @@ -30,8 +30,8 @@ * Declaration of GHOST_EventString class. */ -#ifndef _GHOST_EVENTSTRING_H_ -#define _GHOST_EVENTSTRING_H_ +#ifndef __GHOST_EVENTSTRING_H__ +#define __GHOST_EVENTSTRING_H__ #include "GHOST_Event.h" @@ -62,5 +62,5 @@ public: } }; -#endif // _GHOST_EVENTSTRING_H_ +#endif // __GHOST_EVENTSTRING_H__ diff --git a/intern/ghost/intern/GHOST_EventTrackpad.h b/intern/ghost/intern/GHOST_EventTrackpad.h index 55517f0a76c..9a3456bbb57 100644 --- a/intern/ghost/intern/GHOST_EventTrackpad.h +++ b/intern/ghost/intern/GHOST_EventTrackpad.h @@ -31,8 +31,8 @@ * Declaration of GHOST_EventTrackpad class. */ -#ifndef _GHOST_EVENT_TRACKPAD_H_ -#define _GHOST_EVENT_TRACKPAD_H_ +#ifndef __GHOST_EVENTTRACKPAD_H__ +#define __GHOST_EVENTTRACKPAD_H__ #include "GHOST_Event.h" diff --git a/intern/ghost/intern/GHOST_EventWheel.h b/intern/ghost/intern/GHOST_EventWheel.h index 2a82ab8a630..1b7468dbc6e 100644 --- a/intern/ghost/intern/GHOST_EventWheel.h +++ b/intern/ghost/intern/GHOST_EventWheel.h @@ -30,8 +30,8 @@ * Declaration of GHOST_EventWheel class. */ -#ifndef _GHOST_EVENT_WHEEL_H_ -#define _GHOST_EVENT_WHEEL_H_ +#ifndef __GHOST_EVENTWHEEL_H__ +#define __GHOST_EVENTWHEEL_H__ #include "GHOST_Event.h" @@ -64,5 +64,5 @@ protected: }; -#endif // _GHOST_EVENT_WHEEL_H_ +#endif // __GHOST_EVENTWHEEL_H__ diff --git a/intern/ghost/intern/GHOST_ModifierKeys.h b/intern/ghost/intern/GHOST_ModifierKeys.h index 1cb1272290c..0b690323022 100644 --- a/intern/ghost/intern/GHOST_ModifierKeys.h +++ b/intern/ghost/intern/GHOST_ModifierKeys.h @@ -30,8 +30,8 @@ * Declaration of GHOST_ModifierKeys struct. */ -#ifndef _GHOST_MODIFIER_KEYS_H_ -#define _GHOST_MODIFIER_KEYS_H_ +#ifndef __GHOST_MODIFIERKEYS_H__ +#define __GHOST_MODIFIERKEYS_H__ #include "GHOST_Types.h" @@ -100,5 +100,5 @@ struct GHOST_ModifierKeys GHOST_TUns8 m_OS : 1; }; -#endif // _GHOST_MODIFIER_KEYS_H_ +#endif // __GHOST_MODIFIERKEYS_H__ diff --git a/intern/ghost/intern/GHOST_NDOFManager.h b/intern/ghost/intern/GHOST_NDOFManager.h index c4e980bb895..9d72691b746 100644 --- a/intern/ghost/intern/GHOST_NDOFManager.h +++ b/intern/ghost/intern/GHOST_NDOFManager.h @@ -21,8 +21,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef _GHOST_NDOFMANAGER_H_ -#define _GHOST_NDOFMANAGER_H_ +#ifndef __GHOST_NDOFMANAGER_H__ +#define __GHOST_NDOFMANAGER_H__ #include "GHOST_System.h" diff --git a/intern/ghost/intern/GHOST_NDOFManagerCocoa.h b/intern/ghost/intern/GHOST_NDOFManagerCocoa.h index 7a33d8455ce..8d8081ebb5c 100644 --- a/intern/ghost/intern/GHOST_NDOFManagerCocoa.h +++ b/intern/ghost/intern/GHOST_NDOFManagerCocoa.h @@ -21,8 +21,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef _GHOST_NDOFMANAGERCOCOA_H_ -#define _GHOST_NDOFMANAGERCOCOA_H_ +#ifndef __GHOST_NDOFMANAGERCOCOA_H__ +#define __GHOST_NDOFMANAGERCOCOA_H__ #ifdef WITH_INPUT_NDOF diff --git a/intern/ghost/intern/GHOST_NDOFManagerWin32.h b/intern/ghost/intern/GHOST_NDOFManagerWin32.h index 671147625db..9b5192817eb 100644 --- a/intern/ghost/intern/GHOST_NDOFManagerWin32.h +++ b/intern/ghost/intern/GHOST_NDOFManagerWin32.h @@ -22,8 +22,8 @@ */ -#ifndef _GHOST_NDOFMANAGERWIN32_H_ -#define _GHOST_NDOFMANAGERWIN32_H_ +#ifndef __GHOST_NDOFMANAGERWIN32_H__ +#define __GHOST_NDOFMANAGERWIN32_H__ #ifdef WITH_INPUT_NDOF diff --git a/intern/ghost/intern/GHOST_NDOFManagerX11.h b/intern/ghost/intern/GHOST_NDOFManagerX11.h index 6873318f8c5..4629baeb0de 100644 --- a/intern/ghost/intern/GHOST_NDOFManagerX11.h +++ b/intern/ghost/intern/GHOST_NDOFManagerX11.h @@ -21,8 +21,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef _GHOST_NDOFMANAGERX11_H_ -#define _GHOST_NDOFMANAGERX11_H_ +#ifndef __GHOST_NDOFMANAGERX11_H__ +#define __GHOST_NDOFMANAGERX11_H__ #ifdef WITH_INPUT_NDOF diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h index 0bb0387a287..de474fe07a5 100644 --- a/intern/ghost/intern/GHOST_System.h +++ b/intern/ghost/intern/GHOST_System.h @@ -30,8 +30,8 @@ * Declaration of GHOST_System class. */ -#ifndef _GHOST_SYSTEM_H_ -#define _GHOST_SYSTEM_H_ +#ifndef __GHOST_SYSTEM_H__ +#define __GHOST_SYSTEM_H__ #include "GHOST_ISystem.h" @@ -367,5 +367,5 @@ inline GHOST_NDOFManager* GHOST_System::getNDOFManager() const } #endif -#endif // _GHOST_SYSTEM_H_ +#endif // __GHOST_SYSTEM_H__ diff --git a/intern/ghost/intern/GHOST_SystemCarbon.h b/intern/ghost/intern/GHOST_SystemCarbon.h index 1f51b07c7d0..cda09480788 100644 --- a/intern/ghost/intern/GHOST_SystemCarbon.h +++ b/intern/ghost/intern/GHOST_SystemCarbon.h @@ -30,8 +30,8 @@ * Declaration of GHOST_SystemCarbon class. */ -#ifndef _GHOST_SYSTEM_CARBON_H_ -#define _GHOST_SYSTEM_CARBON_H_ +#ifndef __GHOST_SYSTEMCARBON_H__ +#define __GHOST_SYSTEMCARBON_H__ #ifndef __APPLE__ #error Apple OSX only! @@ -285,5 +285,5 @@ protected: bool m_ignoreWindowSizedMessages; }; -#endif // _GHOST_SYSTEM_CARBON_H_ +#endif // __GHOST_SYSTEMCARBON_H__ diff --git a/intern/ghost/intern/GHOST_SystemCocoa.h b/intern/ghost/intern/GHOST_SystemCocoa.h index 581535e82b8..2220955c270 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.h +++ b/intern/ghost/intern/GHOST_SystemCocoa.h @@ -31,8 +31,8 @@ * Declaration of GHOST_SystemCocoa class. */ -#ifndef _GHOST_SYSTEM_COCOA_H_ -#define _GHOST_SYSTEM_COCOA_H_ +#ifndef __GHOST_SYSTEMCOCOA_H__ +#define __GHOST_SYSTEMCOCOA_H__ #ifndef __APPLE__ #error Apple OSX only! @@ -300,5 +300,5 @@ protected: bool m_isGestureInProgress; }; -#endif // _GHOST_SYSTEM_COCOA_H_ +#endif // __GHOST_SYSTEMCOCOA_H__ diff --git a/intern/ghost/intern/GHOST_SystemNULL.h b/intern/ghost/intern/GHOST_SystemNULL.h index f89eb77277b..be16a8286d5 100644 --- a/intern/ghost/intern/GHOST_SystemNULL.h +++ b/intern/ghost/intern/GHOST_SystemNULL.h @@ -25,8 +25,8 @@ * Declaration of GHOST_SystemNULL class. */ -#ifndef _GHOST_SYSTEM_NULL_H_ -#define _GHOST_SYSTEM_NULL_H_ +#ifndef __GHOST_SYSTEMNULL_H__ +#define __GHOST_SYSTEMNULL_H__ #include "GHOST_System.h" #include "../GHOST_Types.h" diff --git a/intern/ghost/intern/GHOST_SystemPaths.h b/intern/ghost/intern/GHOST_SystemPaths.h index 739fd4edfaf..472d6369282 100644 --- a/intern/ghost/intern/GHOST_SystemPaths.h +++ b/intern/ghost/intern/GHOST_SystemPaths.h @@ -28,8 +28,8 @@ * \ingroup GHOST */ -#ifndef _GHOST_SYSTEMPATHS_H_ -#define _GHOST_SYSTEMPATHS_H_ +#ifndef __GHOST_SYSTEMPATHS_H__ +#define __GHOST_SYSTEMPATHS_H__ #include "GHOST_ISystemPaths.h" diff --git a/intern/ghost/intern/GHOST_SystemPathsCarbon.h b/intern/ghost/intern/GHOST_SystemPathsCarbon.h index f660148cd35..4a1f68e9ba7 100644 --- a/intern/ghost/intern/GHOST_SystemPathsCarbon.h +++ b/intern/ghost/intern/GHOST_SystemPathsCarbon.h @@ -29,8 +29,8 @@ */ -#ifndef _GHOST_SYSTEM_PATHS_CARBON_H_ -#define _GHOST_SYSTEM_PATHS_CARBON_H_ +#ifndef __GHOST_SYSTEMPATHSCARBON_H__ +#define __GHOST_SYSTEMPATHSCARBON_H__ #ifndef __APPLE__ #error Apple OSX only! @@ -84,7 +84,4 @@ public: void addToSystemRecentFiles(const char* filename) const; }; -#endif // _GHOST_SYSTEM_CARBON_H_ - - - +#endif // __GHOST_SYSTEMPATHSCARBON_H__ diff --git a/intern/ghost/intern/GHOST_SystemPathsCocoa.h b/intern/ghost/intern/GHOST_SystemPathsCocoa.h index 2b86659c116..1936d705945 100644 --- a/intern/ghost/intern/GHOST_SystemPathsCocoa.h +++ b/intern/ghost/intern/GHOST_SystemPathsCocoa.h @@ -29,8 +29,8 @@ */ -#ifndef _GHOST_SYSTEM_PATHS_COCOA_H_ -#define _GHOST_SYSTEM_PATHS_COCOA_H_ +#ifndef __GHOST_SYSTEMPATHSCOCOA_H__ +#define __GHOST_SYSTEMPATHSCOCOA_H__ #ifndef __APPLE__ #error Apple OSX only! @@ -78,5 +78,4 @@ public: void addToSystemRecentFiles(const char* filename) const; }; -#endif // _GHOST_SYSTEM_COCOA_H_ - +#endif // __GHOST_SYSTEMPATHSCOCOA_H__ diff --git a/intern/ghost/intern/GHOST_SystemPathsWin32.h b/intern/ghost/intern/GHOST_SystemPathsWin32.h index dd875d4abea..a56a2e07b96 100644 --- a/intern/ghost/intern/GHOST_SystemPathsWin32.h +++ b/intern/ghost/intern/GHOST_SystemPathsWin32.h @@ -30,8 +30,8 @@ */ -#ifndef _GHOST_SYSTEM_PATHS_WIN32_H_ -#define _GHOST_SYSTEM_PATHS_WIN32_H_ +#ifndef __GHOST_SYSTEMPATHSWIN32_H__ +#define __GHOST_SYSTEMPATHSWIN32_H__ #ifndef WIN32 #error WIN32 only! @@ -88,5 +88,5 @@ public: void addToSystemRecentFiles(const char* filename) const; }; -#endif // _GHOST_SYSTEM_PATHS_WIN32_H_ +#endif // __GHOST_SYSTEMPATHSWIN32_H__ diff --git a/intern/ghost/intern/GHOST_SystemPathsX11.h b/intern/ghost/intern/GHOST_SystemPathsX11.h index a0a1d28a253..d05cab5de75 100644 --- a/intern/ghost/intern/GHOST_SystemPathsX11.h +++ b/intern/ghost/intern/GHOST_SystemPathsX11.h @@ -29,8 +29,8 @@ */ -#ifndef _GHOST_SYSTEM_PATHS_X11_H_ -#define _GHOST_SYSTEM_PATHS_X11_H_ +#ifndef __GHOST_SYSTEMPATHSX11_H__ +#define __GHOST_SYSTEMPATHSX11_H__ #include "GHOST_SystemPaths.h" #include "../GHOST_Types.h" diff --git a/intern/ghost/intern/GHOST_SystemSDL.h b/intern/ghost/intern/GHOST_SystemSDL.h index 51bca331ba4..e7700649140 100644 --- a/intern/ghost/intern/GHOST_SystemSDL.h +++ b/intern/ghost/intern/GHOST_SystemSDL.h @@ -25,8 +25,8 @@ * Declaration of GHOST_SystemSDL class. */ -#ifndef _GHOST_SYSTEM_SDL_H_ -#define _GHOST_SYSTEM_SDL_H_ +#ifndef __GHOST_SYSTEMSDL_H__ +#define __GHOST_SYSTEMSDL_H__ #include "GHOST_System.h" #include "../GHOST_Types.h" diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.h index 1f40cdd854f..43387f68349 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.h +++ b/intern/ghost/intern/GHOST_SystemWin32.h @@ -30,8 +30,8 @@ * Declaration of GHOST_SystemWin32 class. */ -#ifndef _GHOST_SYSTEM_WIN32_H_ -#define _GHOST_SYSTEM_WIN32_H_ +#ifndef __GHOST_SYSTEMWIN32_H__ +#define __GHOST_SYSTEMWIN32_H__ #ifndef WIN32 #error WIN32 only! @@ -395,4 +395,4 @@ inline void GHOST_SystemWin32::handleKeyboardChange(void) } } } -#endif // _GHOST_SYSTEM_WIN32_H_ +#endif // __GHOST_SYSTEMWIN32_H__ diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h index 8e9131877d3..1aec218d6f1 100644 --- a/intern/ghost/intern/GHOST_SystemX11.h +++ b/intern/ghost/intern/GHOST_SystemX11.h @@ -30,8 +30,8 @@ * Declaration of GHOST_SystemX11 class. */ -#ifndef _GHOST_SYSTEM_X11_H_ -#define _GHOST_SYSTEM_X11_H_ +#ifndef __GHOST_SYSTEMX11_H__ +#define __GHOST_SYSTEMX11_H__ #include <X11/Xlib.h> #include <GL/glx.h> diff --git a/intern/ghost/intern/GHOST_TaskbarWin32.h b/intern/ghost/intern/GHOST_TaskbarWin32.h index 8f301edce31..a5d6fdc745f 100644 --- a/intern/ghost/intern/GHOST_TaskbarWin32.h +++ b/intern/ghost/intern/GHOST_TaskbarWin32.h @@ -1,8 +1,8 @@ /** \file ghost/intern/GHOST_TaskbarWin32.h * \ingroup GHOST */ -#ifndef GHOST_TASKBARWIN32_H_ -#define GHOST_TASKBARWIN32_H_ +#ifndef __GHOST_TASKBARWIN32_H__ +#define __GHOST_TASKBARWIN32_H__ #ifndef WIN32 #error WIN32 only! @@ -69,4 +69,4 @@ typedef enum TBPFLAG {TBPF_NOPROGRESS = 0, TBPF_INDETERMINATE = 0x1, TBPF_NORMA }; #endif /* ITaskbarList3 */ -#endif /*GHOST_TASKBARWIN32_H_*/ +#endif /*__GHOST_TASKBARWIN32_H__*/ diff --git a/intern/ghost/intern/GHOST_TimerManager.h b/intern/ghost/intern/GHOST_TimerManager.h index f7d1726905e..ce4983ca105 100644 --- a/intern/ghost/intern/GHOST_TimerManager.h +++ b/intern/ghost/intern/GHOST_TimerManager.h @@ -30,8 +30,8 @@ * Declaration of GHOST_TimerManager class. */ -#ifndef _GHOST_TIMER_MANAGER_H_ -#define _GHOST_TIMER_MANAGER_H_ +#ifndef __GHOST_TIMERMANAGER_H__ +#define __GHOST_TIMERMANAGER_H__ #include <vector> @@ -121,5 +121,5 @@ protected: TTimerVector m_timers; }; -#endif // _GHOST_TIMER_MANAGER_H_ +#endif // __GHOST_TIMERMANAGER_H__ diff --git a/intern/ghost/intern/GHOST_TimerTask.h b/intern/ghost/intern/GHOST_TimerTask.h index ac86d6c1ce6..e15082ac1ba 100644 --- a/intern/ghost/intern/GHOST_TimerTask.h +++ b/intern/ghost/intern/GHOST_TimerTask.h @@ -30,8 +30,8 @@ * Declaration of GHOST_TimerTask class. */ -#ifndef _GHOST_TIMER_TASK_H_ -#define _GHOST_TIMER_TASK_H_ +#ifndef __GHOST_TIMERTASK_H__ +#define __GHOST_TIMERTASK_H__ #include "GHOST_ITimerTask.h" @@ -192,5 +192,5 @@ protected: GHOST_TUns32 m_auxData; }; -#endif // _GHOST_TIMER_TASK_H_ +#endif // __GHOST_TIMERTASK_H__ diff --git a/intern/ghost/intern/GHOST_Window.h b/intern/ghost/intern/GHOST_Window.h index 646097d42c4..323e0fa3418 100644 --- a/intern/ghost/intern/GHOST_Window.h +++ b/intern/ghost/intern/GHOST_Window.h @@ -30,8 +30,8 @@ * Declaration of GHOST_Window class. */ -#ifndef _GHOST_WINDOW_H_ -#define _GHOST_WINDOW_H_ +#ifndef __GHOST_WINDOW_H__ +#define __GHOST_WINDOW_H__ #include "GHOST_IWindow.h" diff --git a/intern/ghost/intern/GHOST_WindowCarbon.h b/intern/ghost/intern/GHOST_WindowCarbon.h index 331e228a663..2c1c827510a 100644 --- a/intern/ghost/intern/GHOST_WindowCarbon.h +++ b/intern/ghost/intern/GHOST_WindowCarbon.h @@ -30,8 +30,8 @@ * Declaration of GHOST_WindowCarbon class. */ -#ifndef _GHOST_WINDOW_CARBON_H_ -#define _GHOST_WINDOW_CARBON_H_ +#ifndef __GHOST_WINDOWCARBON_H__ +#define __GHOST_WINDOWCARBON_H__ #ifndef __APPLE__ #error Apple OSX only! @@ -308,5 +308,5 @@ protected: #endif // GHOST_DRAW_CARBON_GUTTER }; -#endif // _GHOST_WINDOW_CARBON_H_ +#endif // __GHOST_WINDOWCARBON_H__ diff --git a/intern/ghost/intern/GHOST_WindowCocoa.h b/intern/ghost/intern/GHOST_WindowCocoa.h index 46bded630ff..fec97c2af97 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.h +++ b/intern/ghost/intern/GHOST_WindowCocoa.h @@ -30,8 +30,8 @@ * Declaration of GHOST_WindowCocoa class. */ -#ifndef _GHOST_WINDOW_COCOA_H_ -#define _GHOST_WINDOW_COCOA_H_ +#ifndef __GHOST_WINDOWCOCOA_H__ +#define __GHOST_WINDOWCOCOA_H__ #ifndef __APPLE__ #error Apple OSX only! @@ -325,5 +325,5 @@ protected: GHOST_TabletData m_tablet; }; -#endif // _GHOST_WINDOW_COCOA_H_ +#endif // __GHOST_WINDOWCOCOA_H__ diff --git a/intern/ghost/intern/GHOST_WindowManager.h b/intern/ghost/intern/GHOST_WindowManager.h index 12999badac5..cf27a3bde49 100644 --- a/intern/ghost/intern/GHOST_WindowManager.h +++ b/intern/ghost/intern/GHOST_WindowManager.h @@ -30,8 +30,8 @@ * Declaration of GHOST_WindowManager class. */ -#ifndef _GHOST_WINDOW_MANAGER_H_ -#define _GHOST_WINDOW_MANAGER_H_ +#ifndef __GHOST_WINDOWMANAGER_H__ +#define __GHOST_WINDOWMANAGER_H__ #include <vector> @@ -169,5 +169,5 @@ public: }; -#endif // _GHOST_WINDOW_MANAGER_H_ +#endif // __GHOST_WINDOWMANAGER_H__ diff --git a/intern/ghost/intern/GHOST_WindowNULL.h b/intern/ghost/intern/GHOST_WindowNULL.h index f65b719a385..49f6d14552d 100644 --- a/intern/ghost/intern/GHOST_WindowNULL.h +++ b/intern/ghost/intern/GHOST_WindowNULL.h @@ -25,8 +25,8 @@ * Declaration of GHOST_WindowNULL class. */ -#ifndef _GHOST_WINDOWNULL_H_ -#define _GHOST_WINDOWNULL_H_ +#ifndef __GHOST_WINDOWNULL_H__ +#define __GHOST_WINDOWNULL_H__ #include "GHOST_Window.h" @@ -92,4 +92,4 @@ private : }; -#endif // _GHOST_WINDOWNULL_H_ +#endif // __GHOST_WINDOWNULL_H__ diff --git a/intern/ghost/intern/GHOST_WindowSDL.h b/intern/ghost/intern/GHOST_WindowSDL.h index a8a130f0481..724c59de0b9 100644 --- a/intern/ghost/intern/GHOST_WindowSDL.h +++ b/intern/ghost/intern/GHOST_WindowSDL.h @@ -25,8 +25,8 @@ * Declaration of GHOST_WindowSDL class. */ -#ifndef _GHOST_WINDOWSDL_H_ -#define _GHOST_WINDOWSDL_H_ +#ifndef __GHOST_WINDOWSDL_H__ +#define __GHOST_WINDOWSDL_H__ #include "GHOST_Window.h" #include "GHOST_SystemSDL.h" @@ -163,4 +163,4 @@ protected: }; -#endif // _GHOST_WINDOWSDL_H_ +#endif // __GHOST_WINDOWSDL_H__ diff --git a/intern/ghost/intern/GHOST_WindowWin32.h b/intern/ghost/intern/GHOST_WindowWin32.h index 190966ee485..6eb17affdbf 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.h +++ b/intern/ghost/intern/GHOST_WindowWin32.h @@ -30,8 +30,8 @@ * Declaration of GHOST_WindowWin32 class. */ -#ifndef _GHOST_WINDOW_WIN32_H_ -#define _GHOST_WINDOW_WIN32_H_ +#ifndef __GHOST_WINDOWWIN32_H__ +#define __GHOST_WINDOWWIN32_H__ #ifndef WIN32 #error WIN32 only! @@ -390,4 +390,4 @@ protected: GHOST_TEmbedderWindowID m_parentWindowHwnd; }; -#endif // _GHOST_WINDOW_WIN32_H_ +#endif // __GHOST_WINDOWWIN32_H__ diff --git a/intern/ghost/intern/GHOST_WindowX11.h b/intern/ghost/intern/GHOST_WindowX11.h index f5cbceff7a4..eae6cad5a6d 100644 --- a/intern/ghost/intern/GHOST_WindowX11.h +++ b/intern/ghost/intern/GHOST_WindowX11.h @@ -30,8 +30,8 @@ * Declaration of GHOST_WindowX11 class. */ -#ifndef _GHOST_WINDOWX11_H_ -#define _GHOST_WINDOWX11_H_ +#ifndef __GHOST_WINDOWX11_H__ +#define __GHOST_WINDOWX11_H__ #include "GHOST_Window.h" #include <X11/Xlib.h> @@ -390,4 +390,4 @@ private : }; -#endif // _GHOST_WINDOWX11_H_ +#endif // __GHOST_WINDOWX11_H__ diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h index 7285843aece..83d6549218a 100644 --- a/intern/guardedalloc/MEM_guardedalloc.h +++ b/intern/guardedalloc/MEM_guardedalloc.h @@ -57,8 +57,8 @@ * See \ref MEM_guardedalloc.h */ -#ifndef MEM_MALLOCN_H -#define MEM_MALLOCN_H +#ifndef __MEM_GUARDEDALLOC_H__ +#define __MEM_GUARDEDALLOC_H__ #include <stdio.h> /* needed for FILE* */ #include "MEM_sys_types.h" /* needed for uintptr_t */ diff --git a/intern/guardedalloc/MEM_sys_types.h b/intern/guardedalloc/MEM_sys_types.h index 764d7c6cfa2..b7e17154df0 100644 --- a/intern/guardedalloc/MEM_sys_types.h +++ b/intern/guardedalloc/MEM_sys_types.h @@ -47,8 +47,8 @@ // doxygen would get a conflict */ -#ifndef MEM_SYS_TYPES_H -#define MEM_SYS_TYPES_H +#ifndef __MEM_SYS_TYPES_H__ +#define __MEM_SYS_TYPES_H__ #ifdef __cplusplus extern "C" { @@ -141,5 +141,5 @@ unsigned long __attribute__((__stdcall__)) htonl(unsigned long); } #endif -#endif /* MEM_SYS_TYPES_H */ +#endif /* __MEM_SYS_TYPES_H__ */ diff --git a/intern/guardedalloc/mmap_win.h b/intern/guardedalloc/mmap_win.h index fa8d3b24815..fdbb249a932 100644 --- a/intern/guardedalloc/mmap_win.h +++ b/intern/guardedalloc/mmap_win.h @@ -30,8 +30,8 @@ * \author Andrea Weikert */ -#ifndef MMAP_WIN_H -#define MMAP_WIN_H +#ifndef __MMAP_WIN_H__ +#define __MMAP_WIN_H__ #define PROT_NONE 0 #define PROT_READ 1 diff --git a/intern/iksolver/extern/IK_solver.h b/intern/iksolver/extern/IK_solver.h index 179bd4a95b1..7f780a0a17f 100644 --- a/intern/iksolver/extern/IK_solver.h +++ b/intern/iksolver/extern/IK_solver.h @@ -65,8 +65,8 @@ * This module only depends on Moto. */ -#ifndef NAN_INCLUDED_IK_solver_h -#define NAN_INCLUDED_IK_solver_h +#ifndef __IK_SOLVER_H__ +#define __IK_SOLVER_H__ #ifdef __cplusplus extern "C" { @@ -168,5 +168,5 @@ int IK_Solve(IK_Solver *solver, float tolerance, int max_iterations); } #endif -#endif // NAN_INCLUDED_IK_solver_h +#endif // __IK_SOLVER_H__ diff --git a/intern/iksolver/intern/IK_QJacobian.h b/intern/iksolver/intern/IK_QJacobian.h index c975989309b..b4b5a0402e6 100644 --- a/intern/iksolver/intern/IK_QJacobian.h +++ b/intern/iksolver/intern/IK_QJacobian.h @@ -32,9 +32,9 @@ */ -#ifndef NAN_INCLUDED_IK_QJacobian_h +#ifndef __IK_QJACOBIAN_H__ -#define NAN_INCLUDED_IK_QJacobian_h +#define __IK_QJACOBIAN_H__ #include "TNT/cmat.h" #include <vector> diff --git a/intern/iksolver/intern/IK_QJacobianSolver.h b/intern/iksolver/intern/IK_QJacobianSolver.h index 56d38147e3c..cfcd2849fb2 100644 --- a/intern/iksolver/intern/IK_QJacobianSolver.h +++ b/intern/iksolver/intern/IK_QJacobianSolver.h @@ -31,9 +31,9 @@ */ -#ifndef NAN_INCLUDED_IK_QJacobianSolver_h +#ifndef __IK_QJACOBIANSOLVER_H__ -#define NAN_INCLUDED_IK_QJacobianSolver_h +#define __IK_QJACOBIANSOLVER_H__ /** * @author Laurence Bourn diff --git a/intern/iksolver/intern/IK_QSegment.h b/intern/iksolver/intern/IK_QSegment.h index 9037f8750f4..68d40829137 100644 --- a/intern/iksolver/intern/IK_QSegment.h +++ b/intern/iksolver/intern/IK_QSegment.h @@ -31,8 +31,8 @@ */ -#ifndef NAN_INCLUDED_IK_QSegment_h -#define NAN_INCLUDED_IK_QSegment_h +#ifndef __IK_QSEGMENT_H__ +#define __IK_QSEGMENT_H__ #include "MT_Vector3.h" #include "MT_Transform.h" diff --git a/intern/iksolver/intern/IK_QTask.h b/intern/iksolver/intern/IK_QTask.h index 379866de8f7..3d968cdfe38 100644 --- a/intern/iksolver/intern/IK_QTask.h +++ b/intern/iksolver/intern/IK_QTask.h @@ -31,8 +31,8 @@ */ -#ifndef NAN_INCLUDED_IK_QTask_h -#define NAN_INCLUDED_IK_QTask_h +#ifndef __IK_QTASK_H__ +#define __IK_QTASK_H__ #include "MT_Vector3.h" #include "MT_Transform.h" diff --git a/intern/iksolver/test/ik_glut_test/common/GlutDrawer.h b/intern/iksolver/test/ik_glut_test/common/GlutDrawer.h index 4dfcfa1769e..05d2424dfea 100644 --- a/intern/iksolver/test/ik_glut_test/common/GlutDrawer.h +++ b/intern/iksolver/test/ik_glut_test/common/GlutDrawer.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef NAN_INCLUDED_GlutDrawer -#define NAN_INCLUDED_GlutDrawer +#ifndef __GLUTDRAWER_H__ +#define __GLUTDRAWER_H__ #include "MEM_NonCopyable.h" #include "MEM_SmartPtr.h" diff --git a/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.h b/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.h index 61cd7a25ac0..ea39b6835f6 100644 --- a/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.h +++ b/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef NAN_INCLUDED_GlutKeyboardManager -#define NAN_INCLUDED_GlutKeyboardManager +#ifndef __GLUTKEYBOARDMANAGER_H__ +#define __GLUTKEYBOARDMANAGER_H__ #include "MEM_NonCopyable.h" #include "MEM_SmartPtr.h" diff --git a/intern/iksolver/test/ik_glut_test/common/GlutMouseManager.h b/intern/iksolver/test/ik_glut_test/common/GlutMouseManager.h index 50fb37c267e..4a2344b7c74 100644 --- a/intern/iksolver/test/ik_glut_test/common/GlutMouseManager.h +++ b/intern/iksolver/test/ik_glut_test/common/GlutMouseManager.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef NAN_INCLUDED_GlutMouseManager_h -#define NAN_INCLUDED_GlutMouseManager_h +#ifndef __GLUTMOUSEMANAGER_H__ +#define __GLUTMOUSEMANAGER_H__ #include "MEM_NonCopyable.h" #include "MEM_SmartPtr.h" diff --git a/intern/iksolver/test/ik_glut_test/intern/ChainDrawer.h b/intern/iksolver/test/ik_glut_test/intern/ChainDrawer.h index 5975eaa7c65..f2863806112 100644 --- a/intern/iksolver/test/ik_glut_test/intern/ChainDrawer.h +++ b/intern/iksolver/test/ik_glut_test/intern/ChainDrawer.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef NAN_INCLUDED_ChainDrawer_h -#define NAN_INCLUDED_ChainDrawer_h +#ifndef __CHAINDRAWER_H__ +#define __CHAINDRAWER_H__ #include "../common/GlutDrawer.h" #include "MyGlutMouseHandler.h" diff --git a/intern/iksolver/test/ik_glut_test/intern/MyGlutKeyHandler.h b/intern/iksolver/test/ik_glut_test/intern/MyGlutKeyHandler.h index 2ac9b25d13a..621e0d32869 100644 --- a/intern/iksolver/test/ik_glut_test/intern/MyGlutKeyHandler.h +++ b/intern/iksolver/test/ik_glut_test/intern/MyGlutKeyHandler.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef NAN_INCLUDED_MyGlutKeyHandler_h -#define NAN_INCLUDED_MyGlutKeyHandler_h +#ifndef __MYGLUTKEYHANDLER_H__ +#define __MYGLUTKEYHANDLER_H__ #include "../common/GlutKeyboardManager.h" diff --git a/intern/iksolver/test/ik_glut_test/intern/MyGlutMouseHandler.h b/intern/iksolver/test/ik_glut_test/intern/MyGlutMouseHandler.h index 5d94db44698..205ce38ac23 100644 --- a/intern/iksolver/test/ik_glut_test/intern/MyGlutMouseHandler.h +++ b/intern/iksolver/test/ik_glut_test/intern/MyGlutMouseHandler.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef NAN_INCLUDED_MyGlutMouseHandler_h -#define NAN_INCLUDED_MyGlutMouseHandler_h +#ifndef __MYGLUTMOUSEHANDLER_H__ +#define __MYGLUTMOUSEHANDLER_H__ #include "../common/GlutMouseManager.h" #include <GL/glut.h> diff --git a/intern/memutil/MEM_Allocator.h b/intern/memutil/MEM_Allocator.h index 99d0b5177f3..9541604b680 100644 --- a/intern/memutil/MEM_Allocator.h +++ b/intern/memutil/MEM_Allocator.h @@ -25,8 +25,8 @@ */ -#ifndef MEM_ALLOCATOR_H -#define MEM_ALLOCATOR_H +#ifndef __MEM_ALLOCATOR_H__ +#define __MEM_ALLOCATOR_H__ #include <stddef.h> #include "guardedalloc/MEM_guardedalloc.h" @@ -89,4 +89,4 @@ struct MEM_Allocator } }; -#endif // MEM_ALLOCATOR_H +#endif // __MEM_ALLOCATOR_H__ diff --git a/intern/memutil/MEM_CacheLimiter.h b/intern/memutil/MEM_CacheLimiter.h index 94aca280a0e..9a36b67aa2f 100644 --- a/intern/memutil/MEM_CacheLimiter.h +++ b/intern/memutil/MEM_CacheLimiter.h @@ -25,8 +25,8 @@ */ -#ifndef MEM_CACHELIMITER_H -#define MEM_CACHELIMITER_H +#ifndef __MEM_CACHELIMITER_H__ +#define __MEM_CACHELIMITER_H__ /** * @section MEM_CacheLimiter @@ -63,7 +63,7 @@ template<class T> class MEM_CacheLimiter; -#ifndef __MEM_cache_limiter_c_api_h_included__ +#ifndef __MEM_CACHELIMITERC_API_H__ extern "C" { extern void MEM_CacheLimiter_set_maximum(size_t m); extern size_t MEM_CacheLimiter_get_maximum(); @@ -201,4 +201,4 @@ private: MEM_CacheLimiter_DataSize_Func getDataSize; }; -#endif // MEM_CACHELIMITER_H +#endif // __MEM_CACHELIMITER_H__ diff --git a/intern/memutil/MEM_CacheLimiterC-Api.h b/intern/memutil/MEM_CacheLimiterC-Api.h index c8672fa03fd..4ed692fb55f 100644 --- a/intern/memutil/MEM_CacheLimiterC-Api.h +++ b/intern/memutil/MEM_CacheLimiterC-Api.h @@ -25,8 +25,8 @@ */ -#ifndef MEM_CACHELIMITERC_API_H -#define MEM_CACHELIMITERC_API_H +#ifndef __MEM_CACHELIMITERC_API_H__ +#define __MEM_CACHELIMITERC_API_H__ #ifdef __cplusplus extern "C" { @@ -44,10 +44,10 @@ typedef void(*MEM_CacheLimiter_Destruct_Func)(void*); /* function used to measure stored data element size */ typedef size_t(*MEM_CacheLimiter_DataSize_Func) (void*); -#ifndef MEM_CACHELIMITER_H +#ifndef __MEM_CACHELIMITER_H__ extern void MEM_CacheLimiter_set_maximum(size_t m); extern int MEM_CacheLimiter_get_maximum(void); -#endif // MEM_CACHELIMITER_H +#endif /* __MEM_CACHELIMITER_H__ */ /** * Create new MEM_CacheLimiter object * managed objects are destructed with the data_destructor @@ -145,4 +145,4 @@ extern void * MEM_CacheLimiter_get(MEM_CacheLimiterHandleC * handle); #endif -#endif // MEM_CACHELIMITERC_API_H +#endif // __MEM_CACHELIMITERC_API_H__ diff --git a/intern/memutil/MEM_NonCopyable.h b/intern/memutil/MEM_NonCopyable.h index 7ddd35d6fc4..9378ea7b69d 100644 --- a/intern/memutil/MEM_NonCopyable.h +++ b/intern/memutil/MEM_NonCopyable.h @@ -34,8 +34,8 @@ * Declaration of MEM_NonCopyable class. */ -#ifndef NAN_INCLUDED_NonCopyable_h -#define NAN_INCLUDED_NonCopyable_h +#ifndef __MEM_NONCOPYABLE_H__ +#define __MEM_NONCOPYABLE_H__ /** * Simple class that makes sure sub classes cannot diff --git a/intern/memutil/MEM_RefCountPtr.h b/intern/memutil/MEM_RefCountPtr.h index 43dbc807ae0..4f475345076 100644 --- a/intern/memutil/MEM_RefCountPtr.h +++ b/intern/memutil/MEM_RefCountPtr.h @@ -35,8 +35,8 @@ * @author Laurence */ -#ifndef NAN_INCLUDED_MEM_RefCountPtr_h -#define NAN_INCLUDED_MEM_RefCountPtr_h +#ifndef __MEM_REFCOUNTPTR_H__ +#define __MEM_REFCOUNTPTR_H__ #include <stdlib.h> // for NULL ! diff --git a/intern/memutil/MEM_RefCounted.h b/intern/memutil/MEM_RefCounted.h index 0c3a54122f1..9da0103f6a3 100644 --- a/intern/memutil/MEM_RefCounted.h +++ b/intern/memutil/MEM_RefCounted.h @@ -34,8 +34,8 @@ * Declaration of MEM_RefCounted class. */ -#ifndef MEM_REFCOUNTED_H -#define MEM_REFCOUNTED_H +#ifndef __MEM_REFCOUNTED_H__ +#define __MEM_REFCOUNTED_H__ /** * An object with reference counting. @@ -112,5 +112,5 @@ inline int MEM_RefCounted::decRef() return m_refCount; } -#endif // MEM_REFCOUNTED_H +#endif // __MEM_REFCOUNTED_H__ diff --git a/intern/memutil/MEM_RefCountedC-Api.h b/intern/memutil/MEM_RefCountedC-Api.h index 4b2679cccc2..a611482a991 100644 --- a/intern/memutil/MEM_RefCountedC-Api.h +++ b/intern/memutil/MEM_RefCountedC-Api.h @@ -34,8 +34,8 @@ * Interface for C access to functionality relating to shared objects in the foundation library. */ -#ifndef MEM_REFCOUNTEDC_API_H -#define MEM_REFCOUNTEDC_API_H +#ifndef __MEM_REFCOUNTEDC_API_H__ +#define __MEM_REFCOUNTEDC_API_H__ /** A pointer to a private object. */ typedef struct MEM_TOpaqueObject* MEM_TObjectPtr; @@ -75,4 +75,4 @@ extern int MEM_RefCountedDecRef(MEM_TRefCountedObjectPtr shared); } #endif -#endif // MEM_REFCOUNTEDC_API_H +#endif // __MEM_REFCOUNTEDC_API_H__ diff --git a/intern/memutil/MEM_SmartPtr.h b/intern/memutil/MEM_SmartPtr.h index a2ab273d092..6a0dc1723c4 100644 --- a/intern/memutil/MEM_SmartPtr.h +++ b/intern/memutil/MEM_SmartPtr.h @@ -35,8 +35,8 @@ * @author Laurence */ -#ifndef NAN_INCLUDED_MEM_SmartPtr_h -#define NAN_INCLUDED_MEM_SmartPtr_h +#ifndef __MEM_SMARTPTR_H__ +#define __MEM_SMARTPTR_H__ #include <stdlib.h> // for NULL ! diff --git a/intern/string/STR_HashedString.h b/intern/string/STR_HashedString.h index cd3b0e2b58f..f56e365bdb3 100644 --- a/intern/string/STR_HashedString.h +++ b/intern/string/STR_HashedString.h @@ -37,8 +37,8 @@ * @date November, 14, 2001 */ -#ifndef __STR_HASHSTRING -#define __STR_HASHSTRING +#ifndef __STR_HASHEDSTRING_H__ +#define __STR_HASHEDSTRING_H__ #include "STR_String.h" @@ -150,5 +150,5 @@ private: mutable dword m_CachedHash; }; -#endif //__STR_HASHSTRING +#endif //__STR_HASHEDSTRING_H__ diff --git a/intern/string/STR_String.h b/intern/string/STR_String.h index fa08dc3648e..cbf9d0c1b3b 100644 --- a/intern/string/STR_String.h +++ b/intern/string/STR_String.h @@ -37,8 +37,8 @@ * @date April, 25, 2001 */ -#ifndef _STR_String_H_ -#define _STR_String_H_ +#ifndef __STR_STRING_H__ +#define __STR_STRING_H__ #ifndef STR_NO_ASSERTD #undef assertd @@ -217,5 +217,5 @@ inline STR_String operator+(rcSTR_String lhs, const char *rhs) { return STR_ inline STR_String operator+(const char *lhs, rcSTR_String rhs) { return STR_String(lhs, strlen(lhs), rhs.ReadPtr(), rhs.Length()); } -#endif //_STR_String_H_ +#endif //__STR_STRING_H__ |