fixed includes

7 years ago · 603dbf823a
parent ae494cc425
commit 603dbf823a
24 changed files with 42 additions and 43 deletions
--- a/application/argumentparser.cpp
+++ b/application/argumentparser.cpp
@ -2,8 +2,8 @@
 #include "commandlineutils.h"
 #include "failure.h"

-#include "../conversion/stringconversion.h"
-#include "../misc/random.h"
+#include "c++utilities/conversion/stringconversion.h"
+#include "c++utilities/misc/random.h"

 #include <algorithm>
 #include <vector>
--- a/chrono/datetime.cpp
+++ b/chrono/datetime.cpp
@ -1,6 +1,6 @@
 #include "datetime.h"

-#include "../conversion/stringconversion.h"
+#include "c++utilities/conversion/stringconversion.h"

 #include <sstream>
 #include <iomanip>
@ -49,9 +49,13 @@ inline bool inRangeExclMax(num1 val, num2 min, num3 max)
 */
 DateTime DateTime::fromTimeStamp(time_t timeStamp)
 {
-    struct tm *timeinfo = localtime(&timeStamp);
-    return DateTime::fromDateAndTime(timeinfo->tm_year + 1900, timeinfo->tm_mon + 1, timeinfo->tm_mday,
-                    timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec < 60 ? timeinfo->tm_sec : 59, 0);
+    if(timeStamp) {
+        struct tm *timeinfo = localtime(&timeStamp);
+        return DateTime::fromDateAndTime(timeinfo->tm_year + 1900, timeinfo->tm_mon + 1, timeinfo->tm_mday,
+                        timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec < 60 ? timeinfo->tm_sec : 59, 0);
+    } else {
+        return DateTime();
+    }
 }

 /*!
--- a/chrono/datetime.h
+++ b/chrono/datetime.h
@ -3,7 +3,7 @@

 #include "timespan.h"

-#include "../conversion/types.h"
+#include "c++utilities/conversion/types.h"

 #include <string>

--- a/chrono/period.h
+++ b/chrono/period.h
@ -3,7 +3,7 @@

 #include "datetime.h"

-#include "../application/global.h"
+#include "c++utilities/application/global.h"

 namespace ChronoUtilities {

--- a/chrono/timespan.cpp
+++ b/chrono/timespan.cpp
@ -1,6 +1,6 @@
 #include "timespan.h"

-#include "../conversion/stringconversion.h"
+#include "c++utilities/conversion/stringconversion.h"

 #include <sstream>
 #include <cmath>
--- a/chrono/timespan.h
+++ b/chrono/timespan.h
@ -1,8 +1,8 @@
 #ifndef TIMESPAN_H
 #define TIMESPAN_H

-#include "../application/global.h"
-#include "../conversion/types.h"
+#include "c++utilities/application/global.h"
+#include "c++utilities/conversion/types.h"

 #include <string>

--- a/conversion/binaryconversion.h
+++ b/conversion/binaryconversion.h
@ -3,7 +3,7 @@

 #include "types.h"

-#include "../application/global.h"
+#include "c++utilities/application/global.h"

 #if defined(__BYTE_ORDER__) && defined(__FLOAT_WORD_ORDER__)
 #   if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
--- a/conversion/binaryconversionprivate.h
+++ b/conversion/binaryconversionprivate.h
@ -6,7 +6,7 @@

 #include "types.h"

-#include "../application/global.h"
+#include "c++utilities/application/global.h"

 /*!
 * \brief Returns a 16-bit signed integer converted from two bytes at a specified position in a char array.
--- a/conversion/conversionexception.h
+++ b/conversion/conversionexception.h
@ -1,7 +1,7 @@
 #ifndef CONVERSIONEXCEPTION_H
 #define CONVERSIONEXCEPTION_H

-#include "../application/global.h"
+#include "c++utilities/application/global.h"

 #include <stdexcept>
 #include <string>
--- a/conversion/stringconversion.cpp
+++ b/conversion/stringconversion.cpp
@ -1,6 +1,6 @@
 #include "stringconversion.h"

-#include "../misc/memory.h"
+#include "c++utilities/misc/memory.h"

 #include <sstream>
 #include <iomanip>
--- a/conversion/widen.h
+++ b/conversion/widen.h
@ -1,7 +1,7 @@
 #ifndef WIDEN_H
 #define WIDEN_H

-#include "../application/global.h"
+#include "c++utilities/application/global.h"

 #include <string>
 #include <vector>
--- a/io/ansiescapecodes.cpp
+++ b/io/ansiescapecodes.cpp
@ -1,3 +1 @@
 #include "ansiescapecodes.h"
-
-
--- a/io/ansiescapecodes.h
+++ b/io/ansiescapecodes.h
@ -1,7 +1,7 @@
 #ifndef ANSIESCAPECODES
 #define ANSIESCAPECODES

-#include "../application/global.h"
+#include "c++utilities/application/global.h"

 #include <ostream>

--- a/io/binaryreader.cpp
+++ b/io/binaryreader.cpp
@ -1,7 +1,7 @@
 #include "binaryreader.h"
-#include "misc/memory.h"

-#include <conversion/conversionexception.h>
+#include "c++utilities/misc/memory.h"
+#include "c++utilities/conversion/conversionexception.h"

 #include <sstream>
 #include <cstring>
--- a/io/binaryreader.h
+++ b/io/binaryreader.h
@ -1,9 +1,9 @@
 #ifndef BINERYREADER_H
 #define BINERYREADER_H

-#include "../application/global.h"
-#include "../conversion/types.h"
-#include "../conversion/binaryconversion.h"
+#include "c++utilities/application/global.h"
+#include "c++utilities/conversion/types.h"
+#include "c++utilities/conversion/binaryconversion.h"

 #include <vector>
 #include <string>
--- a/io/binarywriter.cpp
+++ b/io/binarywriter.cpp
@ -1,6 +1,6 @@
 #include "binarywriter.h"

-#include "../conversion/conversionexception.h"
+#include "c++utilities/conversion/conversionexception.h"

 #include <cstring>
 #include <memory>
--- a/io/binarywriter.h
+++ b/io/binarywriter.h
@ -1,9 +1,9 @@
 #ifndef BINARYWRITER_H
 #define BINARYWRITER_H

-#include "../application/global.h"
-#include "../conversion/types.h"
-#include "../conversion/binaryconversion.h"
+#include "c++utilities/application/global.h"
+#include "c++utilities/conversion/types.h"
+#include "c++utilities/conversion/binaryconversion.h"

 #include <vector>
 #include <string>
--- a/io/bitreader.h
+++ b/io/bitreader.h
@ -1,8 +1,8 @@
 #ifndef IOUTILITIES_BITREADER_H
 #define IOUTILITIES_BITREADER_H

-#include "../conversion/types.h"
-#include "../application/global.h"
+#include "c++utilities/conversion/types.h"
+#include "c++utilities/application/global.h"

 #include <ios>

--- a/io/copy.h
+++ b/io/copy.h
@ -1,7 +1,7 @@
 #ifndef IOUTILITIES_COPY_H
 #define IOUTILITIES_COPY_H

-#include "../application/global.h"
+#include "c++utilities/application/global.h"

 #include <iostream>
 #include <functional>
--- a/io/inifile.h
+++ b/io/inifile.h
@ -1,7 +1,7 @@
 #ifndef IOUTILITIES_INIFILE_H
 #define IOUTILITIES_INIFILE_H

-#include "../application/global.h"
+#include "c++utilities/application/global.h"

 #include <map>
 #include <string>
--- a/io/path.cpp
+++ b/io/path.cpp
@ -1,7 +1,7 @@
 #include "path.h"

-#include "../application/global.h"
-#include "../conversion/widen.h"
+#include "c++utilities/application/global.h"
+#include "c++utilities/conversion/widen.h"

 #include <string>
 #include <sstream>
--- a/io/path.h
+++ b/io/path.h
@ -4,12 +4,11 @@
 #include "binarywriter.h"
 #include "binaryreader.h"

-#include "../application/global.h"
+#include "c++utilities/application/global.h"

 #include <string>

-namespace IoUtilities
-{
+namespace IoUtilities {

 LIB_EXPORT std::string fileName(const std::string &path);
 LIB_EXPORT void removeInvalidChars(std::string &path);
--- a/math/math.h
+++ b/math/math.h
@ -1,10 +1,9 @@
 #ifndef MATHUTILITIES_H
 #define MATHUTILITIES_H

-#include "application/global.h"
+#include "c++utilities/application/global.h"

-namespace MathUtilities
-{
+namespace MathUtilities {

 LIB_EXPORT int random(int lowerbounds, int upperbounds);

--- a/misc/random.h
+++ b/misc/random.h
@ -1,12 +1,11 @@
 #ifndef RANDOMUTILS_H
 #define RANDOMUTILS_H

-#include "../application/global.h"
+#include "c++utilities/application/global.h"

 #include <functional>

-namespace RandomUtilities
-{
+namespace RandomUtilities {

 LIB_EXPORT void generateRandomCharacterSequence(char *result, int length, bool useSmallLetters = true, bool useCapitalLetters = true, bool useNumbers = true, bool useSymbols = true, bool useAtLeastOneOfEachCategory = true);
 LIB_EXPORT void generateRandomCharacterSequence(char *result, int length, std::function<int ()> randomizer, int maximalRandomNumber, bool useSmallLetters = true, bool useCapitalLetters = true, bool useNumbers = true, bool useSymbols = true, bool useAtLeastOneOfEachCategory = true);