Update to use Libraries and fix include order

2020-03-07 14:46:26 +01:00
parent 3b7491f57d
commit 157b1ceb51
32 changed files with 114 additions and 1405 deletions
@@ -1,12 +1,12 @@
 #ifndef UNIFI_DEVICE_H
 #define UNIFI_DEVICE_H

+#include "Util/Device.h"
+#include <HttpClient.h>
+#include <Timer.h>
 #include <mutex>
 #include <string>
 #include <vector>
-#include "Util/Device.h"
-#include "Util/Timer.h"
-#include "Util/HttpClient.h"


 namespace PresenceDetection {
@@ -32,9 +32,9 @@ private:
 	void SendStateChange(bool present, const std::string& macAddress);

 private:
-	Util::Timer m_deviceTimer;
-	Util::Timer m_inventoryTimer;
-	Util::HttpClient m_httpClient;
+	Timer::Timer m_deviceTimer;
+	Timer::Timer m_inventoryTimer;
+	Http::HttpClient m_httpClient;

 	std::mutex m_mutex;
 	bool m_loggedIn;