From db7b02b1dbff6635dfed053425a123afd8240c1d Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 11 Jun 2016 19:09:14 +0200 Subject: [PATCH] Make header guards more unique and consistent --- application/argumentparser.h | 6 +++--- application/failure.h | 6 +++--- application/global.h | 6 +++--- chrono/datetime.h | 6 +++--- chrono/period.h | 6 +++--- chrono/timespan.h | 6 +++--- conversion/binaryconversion.h | 6 +++--- conversion/conversionexception.h | 6 +++--- conversion/stringconversion.h | 6 +++--- conversion/types.h | 6 +++--- conversion/widen.h | 6 +++--- io/ansiescapecodes.h | 6 +++--- io/binaryreader.h | 6 +++--- io/binarywriter.h | 6 +++--- io/path.h | 6 +++--- 15 files changed, 45 insertions(+), 45 deletions(-) diff --git a/application/argumentparser.h b/application/argumentparser.h index ae39e89..88ac508 100644 --- a/application/argumentparser.h +++ b/application/argumentparser.h @@ -1,5 +1,5 @@ -#ifndef ARGUMENTPARSER_H -#define ARGUMENTPARSER_H +#ifndef APPLICATION_UTILITIES_ARGUMENTPARSER_H +#define APPLICATION_UTILITIES_ARGUMENTPARSER_H #include "./global.h" @@ -662,4 +662,4 @@ public: } -#endif // ARGUMENTPARSER_H +#endif // APPLICATION_UTILITIES_ARGUMENTPARSER_H diff --git a/application/failure.h b/application/failure.h index 391db9a..b062a1b 100644 --- a/application/failure.h +++ b/application/failure.h @@ -1,5 +1,5 @@ -#ifndef FAILURE_H -#define FAILURE_H +#ifndef APPLICATION_UTILITIES_FAILURE_H +#define APPLICATION_UTILITIES_FAILURE_H #include "./global.h" @@ -23,4 +23,4 @@ private: } -#endif // FAILURE_H +#endif // APPLICATION_UTILITIES_FAILURE_H diff --git a/application/global.h b/application/global.h index d264c0e..e8cd448 100644 --- a/application/global.h +++ b/application/global.h @@ -1,5 +1,5 @@ -#ifndef MARTCHUSUTILITY_LIBRARY_GLOBAL_H -#define MARTCHUSUTILITY_LIBRARY_GLOBAL_H +#ifndef APPLICATION_UTILITIES_GLOBAL_H +#define APPLICATION_UTILITIES_GLOBAL_H #ifdef _WIN32 # ifndef PLATFORM_WINDOWS @@ -86,4 +86,4 @@ # define IF_DEBUG_BUILD(x) #endif -#endif // MARTCHUSUTILITY_LIBRARY_GLOBAL_H +#endif // APPLICATION_UTILITIES_GLOBAL_H diff --git a/chrono/datetime.h b/chrono/datetime.h index 753f3da..ac8b1ba 100644 --- a/chrono/datetime.h +++ b/chrono/datetime.h @@ -1,5 +1,5 @@ -#ifndef DATETIME_H -#define DATETIME_H +#ifndef CHRONO_UTILITIES_DATETIME_H +#define CHRONO_UTILITIES_DATETIME_H #include "./timespan.h" @@ -436,4 +436,4 @@ inline DateTime &DateTime::operator -=(const TimeSpan &timeSpan) } -#endif // DATETIME_H +#endif // CHRONO_UTILITIES_DATETIME_H diff --git a/chrono/period.h b/chrono/period.h index 8199a43..eb3f438 100644 --- a/chrono/period.h +++ b/chrono/period.h @@ -1,5 +1,5 @@ -#ifndef PERIOD_H -#define PERIOD_H +#ifndef CHRONO_UTILITIES_PERIOD_H +#define CHRONO_UTILITIES_PERIOD_H #include "./datetime.h" @@ -46,4 +46,4 @@ inline int Period::days() const } -#endif // PERIOD_H +#endif // CHRONO_UTILITIES_PERIOD_H diff --git a/chrono/timespan.h b/chrono/timespan.h index 05e5d47..224062c 100644 --- a/chrono/timespan.h +++ b/chrono/timespan.h @@ -1,5 +1,5 @@ -#ifndef TIMESPAN_H -#define TIMESPAN_H +#ifndef CHRONO_UTILITIES_TIMESPAN_H +#define CHRONO_UTILITIES_TIMESPAN_H #include "../application/global.h" #include "../conversion/types.h" @@ -354,4 +354,4 @@ constexpr inline bool TimeSpan::isInfinity() const } -#endif // TIMESPAN_H +#endif // CHRONO_UTILITIES_TIMESPAN_H diff --git a/conversion/binaryconversion.h b/conversion/binaryconversion.h index aca5e1a..adaea6c 100644 --- a/conversion/binaryconversion.h +++ b/conversion/binaryconversion.h @@ -1,5 +1,5 @@ -#ifndef CONVERSION_UTILITIES_CONVERT_H -#define CONVERSION_UTILITIES_CONVERT_H +#ifndef CONVERSION_UTILITIES_BINARY_CONVERSION_H +#define CONVERSION_UTILITIES_BINARY_CONVERSION_H #include "./types.h" @@ -197,4 +197,4 @@ LIB_EXPORT constexpr uint64 swapOrder(uint64 value) } -#endif // CONVERSION_UTILITIES_CONVERT_H +#endif // CONVERSION_UTILITIES_BINARY_CONVERSION_H diff --git a/conversion/conversionexception.h b/conversion/conversionexception.h index e6b3ee0..0b44fe8 100644 --- a/conversion/conversionexception.h +++ b/conversion/conversionexception.h @@ -1,5 +1,5 @@ -#ifndef CONVERSIONEXCEPTION_H -#define CONVERSIONEXCEPTION_H +#ifndef CONVERSION_UTILITIES_CONVERSIONEXCEPTION_H +#define CONVERSION_UTILITIES_CONVERSIONEXCEPTION_H #include "../application/global.h" @@ -18,4 +18,4 @@ public: } -#endif // CONVERSIONEXCEPTION_H +#endif // CONVERSION_UTILITIES_CONVERSIONEXCEPTION_H diff --git a/conversion/stringconversion.h b/conversion/stringconversion.h index 0c26287..bc1753c 100644 --- a/conversion/stringconversion.h +++ b/conversion/stringconversion.h @@ -1,5 +1,5 @@ -#ifndef STRINGCONVERSION_H -#define STRINGCONVERSION_H +#ifndef CONVERSION_UTILITIES_STRINGCONVERSION_H +#define CONVERSION_UTILITIES_STRINGCONVERSION_H #include "./conversionexception.h" #include "./binaryconversion.h" @@ -201,4 +201,4 @@ LIB_EXPORT std::pair, uint32> decodeBase64(const char *e } -#endif // STRINGCONVERSION_H +#endif // CONVERSION_UTILITIES_STRINGCONVERSION_H diff --git a/conversion/types.h b/conversion/types.h index b937c71..d78ecd2 100644 --- a/conversion/types.h +++ b/conversion/types.h @@ -1,5 +1,5 @@ -#ifndef TYPES_H -#define TYPES_H +#ifndef CONVERSION_UTILITIES_TYPES_H +#define CONVERSION_UTILITIES_TYPES_H #include @@ -71,4 +71,4 @@ typedef double float64; #error "Unable to define float64!" #endif -#endif // TYPES_H +#endif // CONVERSION_UTILITIES_TYPES_H diff --git a/conversion/widen.h b/conversion/widen.h index b1ae22e..fa43382 100644 --- a/conversion/widen.h +++ b/conversion/widen.h @@ -1,5 +1,5 @@ -#ifndef WIDEN_H -#define WIDEN_H +#ifndef CONVERSION_UTILITIES_WIDEN_H +#define CONVERSION_UTILITIES_WIDEN_H #include "../application/global.h" @@ -49,4 +49,4 @@ private: } -#endif // WIDEN_H +#endif // CONVERSION_UTILITIES_WIDEN_H diff --git a/io/ansiescapecodes.h b/io/ansiescapecodes.h index 26c2256..a0cb0e4 100644 --- a/io/ansiescapecodes.h +++ b/io/ansiescapecodes.h @@ -1,5 +1,5 @@ -#ifndef ANSIESCAPECODES -#define ANSIESCAPECODES +#ifndef IOUTILITIES_ANSIESCAPECODES +#define IOUTILITIES_ANSIESCAPECODES #include "../application/global.h" @@ -101,5 +101,5 @@ inline void eraseLine(std::ostream &stream) } -#endif // ANSIESCAPECODES +#endif // IOUTILITIES_ANSIESCAPECODES diff --git a/io/binaryreader.h b/io/binaryreader.h index b5449ba..4f53184 100644 --- a/io/binaryreader.h +++ b/io/binaryreader.h @@ -1,5 +1,5 @@ -#ifndef BINERYREADER_H -#define BINERYREADER_H +#ifndef IOUTILITIES_BINERYREADER_H +#define IOUTILITIES_BINERYREADER_H #include "../application/global.h" #include "../conversion/types.h" @@ -564,4 +564,4 @@ inline float32 BinaryReader::readFixed16LE() } -#endif // BINERYREADER_H +#endif // IOUTILITIES_BINERYREADER_H diff --git a/io/binarywriter.h b/io/binarywriter.h index a82f8fd..6d5b6da 100644 --- a/io/binarywriter.h +++ b/io/binarywriter.h @@ -1,5 +1,5 @@ -#ifndef BINARYWRITER_H -#define BINARYWRITER_H +#ifndef IOUTILITIES_BINARYWRITER_H +#define IOUTILITIES_BINARYWRITER_H #include "../application/global.h" #include "../conversion/types.h" @@ -531,4 +531,4 @@ inline void BinaryWriter::writeFixed16LE(float32 valueToConvertAndWrite) } -#endif // BINARYWRITER_H +#endif // IO_UTILITIES_BINARYWRITER_H diff --git a/io/path.h b/io/path.h index e4248a1..e186696 100644 --- a/io/path.h +++ b/io/path.h @@ -1,5 +1,5 @@ -#ifndef PATHHELPER_H -#define PATHHELPER_H +#ifndef IOUTILITIES_PATHHELPER_H +#define IOUTILITIES_PATHHELPER_H #include "./binarywriter.h" #include "./binaryreader.h" @@ -28,4 +28,4 @@ LIB_EXPORT bool settingsDirectory(std::string &result, std::string applicationDi } -#endif // PATHHELPER_H +#endif // IOUTILITIES_PATHHELPER_H