Martchus
/
cpp-utilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed includes

This commit is contained in:
Martchus 2015-09-06 15:30:16 +02:00
parent ae494cc425
commit 603dbf823a
24 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/argumentparser.cpp
View File

@ -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>

12
chrono/datetime.cpp
View File

@ -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();
}
}
/*!

2
chrono/datetime.h
View File

@ -3,7 +3,7 @@
#include "timespan.h"
#include "../conversion/types.h"
#include "c++utilities/conversion/types.h"
#include <string>

2
chrono/period.h
View File

@ -3,7 +3,7 @@
#include "datetime.h"
#include "../application/global.h"
#include "c++utilities/application/global.h"
namespace ChronoUtilities {

2
chrono/timespan.cpp
View File

@ -1,6 +1,6 @@
#include "timespan.h"
#include "../conversion/stringconversion.h"
#include "c++utilities/conversion/stringconversion.h"
#include <sstream>
#include <cmath>

4
chrono/timespan.h
View File

@ -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>

2
conversion/binaryconversion.h
View File

@ -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__

2
conversion/binaryconversionprivate.h
View File

@ -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.

2
conversion/conversionexception.h
View File

@ -1,7 +1,7 @@
#ifndef CONVERSIONEXCEPTION_H
#define CONVERSIONEXCEPTION_H
#include "../application/global.h"
#include "c++utilities/application/global.h"
#include <stdexcept>
#include <string>

2
conversion/stringconversion.cpp
View File

@ -1,6 +1,6 @@
#include "stringconversion.h"
#include "../misc/memory.h"
#include "c++utilities/misc/memory.h"
#include <sstream>
#include <iomanip>

2
conversion/widen.h
View File

@ -1,7 +1,7 @@
#ifndef WIDEN_H
#define WIDEN_H
#include "../application/global.h"
#include "c++utilities/application/global.h"
#include <string>
#include <vector>

2
io/ansiescapecodes.cpp
View File

@ -1,3 +1 @@
#include "ansiescapecodes.h"

2
io/ansiescapecodes.h
View File

@ -1,7 +1,7 @@
#ifndef ANSIESCAPECODES
#define ANSIESCAPECODES
#include "../application/global.h"
#include "c++utilities/application/global.h"
#include <ostream>

4
io/binaryreader.cpp
View File

@ -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>

6
io/binaryreader.h
View File

@ -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>

2
io/binarywriter.cpp
View File

@ -1,6 +1,6 @@
#include "binarywriter.h"
#include "../conversion/conversionexception.h"
#include "c++utilities/conversion/conversionexception.h"
#include <cstring>
#include <memory>

6
io/binarywriter.h
View File

@ -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>

4
io/bitreader.h
View File

@ -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>

2
io/copy.h
View File

@ -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>

2
io/inifile.h
View File

@ -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>

4
io/path.cpp
View File

@ -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>

5
io/path.h
View File

@ -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);

5
math/math.h
View File

@ -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);

5
misc/random.h
View File

@ -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);