Update Makefile.conf and fix Line Endings

2020-05-04 21:45:25 +02:00
parent 9b66a7dd1f
commit 94739511dd
15 changed files with 952 additions and 1025 deletions
@@ -1,37 +1,37 @@
-#ifndef DATAINTERFACE_GRAPHCLIENT_H
-#define DATAINTERFACE_GRAPHCLIENT_H
-
-#include <Timespan.h>
-#include <json.hpp>
-#include <ctime>
-#include <vector>
-
-
-namespace MySQL {
-
-class MySQLClient;
-
-} // namespace MySQL
-
-namespace DataStorageInterface {
-namespace DataInterface {
-
-class GraphClient
-{
-public:
-	GraphClient(MySQL::MySQLClient* pMySQLClient);
-
-	nlohmann::json GetGraphHeader(const std::vector<int>& dataIds, DataStorage::Timespan::type timespan);
-	nlohmann::json GetGraphData(int deviceId, const std::vector<int>& dataIds, DataStorage::Timespan::type timespan);
-
-private:
-	nlohmann::json GetGraphHeader(DataStorage::Timespan::type timespan, std::time_t currentTimestamp);
-
-private:
-	MySQL::MySQLClient* m_pMySQLClient;
-};
-
-} // namespace DataInterface
-} // namespace DataStorageInterface
-
-#endif // DATAINTERFACE_GRAPHCLIENT_H
+#ifndef DATAINTERFACE_GRAPHCLIENT_H
+#define DATAINTERFACE_GRAPHCLIENT_H
+
+#include <Timespan.h>
+#include <json.hpp>
+#include <ctime>
+#include <vector>
+
+
+namespace MySQL {
+
+class MySQLClient;
+
+} // namespace MySQL
+
+namespace DataStorageInterface {
+namespace DataInterface {
+
+class GraphClient
+{
+public:
+	GraphClient(MySQL::MySQLClient* pMySQLClient);
+
+	nlohmann::json GetGraphHeader(const std::vector<int>& dataIds, DataStorage::Timespan::type timespan);
+	nlohmann::json GetGraphData(int deviceId, const std::vector<int>& dataIds, DataStorage::Timespan::type timespan);
+
+private:
+	nlohmann::json GetGraphHeader(DataStorage::Timespan::type timespan, std::time_t currentTimestamp);
+
+private:
+	MySQL::MySQLClient* m_pMySQLClient;
+};
+
+} // namespace DataInterface
+} // namespace DataStorageInterface
+
+#endif // DATAINTERFACE_GRAPHCLIENT_H