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,49 +1,49 @@
-#ifndef DATAINTERFACE_DATAIMPORTER_H
-#define DATAINTERFACE_DATAIMPORTER_H
-
-#include <string>
-#include <vector>
-
-
-namespace MySQL {
-
-class MySQLClient;
-
-} // namespace MySQL
-
-namespace SQLite {
-
-class SQLiteClient;
-
-} // namespace SQLite
-
-namespace DataStorageInterface {
-namespace DataInterface {
-
-class DataImporter
-{
-public:
-	DataImporter(MySQL::MySQLClient* pMySQLClient, SQLite::SQLiteClient* pSQLiteClient);
-
-	void ImportData();
-
-private:
-	std::vector<std::string> GetTables();
-	std::vector<int> GetDevices(const std::string& table);
-	void ImportData(const std::string& table, int device);
-
-	int GetMaximumMySQLPacketSize();
-	int StringStreamSize(std::stringstream& ss);
-	void InitializeInsertQuery(std::stringstream& query);
-	void ExecuteInsertQuery(std::stringstream& query);
-	int GetMaximumTimestamp(const std::string& table, int device);
-
-private:
-	MySQL::MySQLClient* m_pMySQLClient;
-	SQLite::SQLiteClient* m_pSQLiteClient;
-};
-
-} // namespace DataInterface
-} // namespace DataStorageInterface
-
-#endif // DATAINTERFACE_DATAIMPORTER_H
+#ifndef DATAINTERFACE_DATAIMPORTER_H
+#define DATAINTERFACE_DATAIMPORTER_H
+
+#include <string>
+#include <vector>
+
+
+namespace MySQL {
+
+class MySQLClient;
+
+} // namespace MySQL
+
+namespace SQLite {
+
+class SQLiteClient;
+
+} // namespace SQLite
+
+namespace DataStorageInterface {
+namespace DataInterface {
+
+class DataImporter
+{
+public:
+	DataImporter(MySQL::MySQLClient* pMySQLClient, SQLite::SQLiteClient* pSQLiteClient);
+
+	void ImportData();
+
+private:
+	std::vector<std::string> GetTables();
+	std::vector<int> GetDevices(const std::string& table);
+	void ImportData(const std::string& table, int device);
+
+	int GetMaximumMySQLPacketSize();
+	int StringStreamSize(std::stringstream& ss);
+	void InitializeInsertQuery(std::stringstream& query);
+	void ExecuteInsertQuery(std::stringstream& query);
+	int GetMaximumTimestamp(const std::string& table, int device);
+
+private:
+	MySQL::MySQLClient* m_pMySQLClient;
+	SQLite::SQLiteClient* m_pSQLiteClient;
+};
+
+} // namespace DataInterface
+} // namespace DataStorageInterface
+
+#endif // DATAINTERFACE_DATAIMPORTER_H