Update to use Libraries and fix include order

This commit is contained in:
2020-03-07 14:46:26 +01:00
parent 3b7491f57d
commit 157b1ceb51
32 changed files with 114 additions and 1405 deletions
+12 -12
View File
@@ -1,9 +1,9 @@
#include "Device.h"
#include "Functions.h"
#include "Util/JSON.h"
#include <Logging.h>
#include <algorithm>
#include <sstream>
#include "Util/JSON.h"
#include "Util/Logger.h"
#include "Functions.h"
#include "Device.h"
namespace PresenceDetection {
@@ -62,7 +62,7 @@ void Device::ClearDevices()
{
std::stringstream ss;
ss << "Bluetooth::Device::ClearDevices() - Error: " << e.what() << std::endl;
Util::Logger::Log(Util::Logger::Severity::Error, ss.str());
Logging::Log(Logging::Severity::Error, ss.str());
}
}
@@ -78,7 +78,7 @@ void Device::ClearDevices()
{
std::stringstream ss;
ss << "Bluetooth::Device::ClearDevices() - Error: " << e.what() << std::endl;
Util::Logger::Log(Util::Logger::Severity::Error, ss.str());
Logging::Log(Logging::Severity::Error, ss.str());
}
}
}
@@ -104,7 +104,7 @@ void Device::UpdateDevicesFromInventory()
{
std::stringstream ss;
ss << "Bluetooth::Device::GetDevicesFromInventory() - Error: " << e.what() << std::endl;
Util::Logger::Log(Util::Logger::Severity::Error, ss.str());
Logging::Log(Logging::Severity::Error, ss.str());
}
}
@@ -147,7 +147,7 @@ void Device::UpdatePresentDevices(bool updateOnlineDevices)
{
std::stringstream ss;
ss << "Bluetooth::Device::UpdatePresentDevices() - Error: " << e.what() << std::endl;
Util::Logger::Log(Util::Logger::Severity::Error, ss.str());
Logging::Log(Logging::Severity::Error, ss.str());
}
}
@@ -177,7 +177,7 @@ void Device::UpdatePresentDevices(bool updateOnlineDevices)
{
std::stringstream ss;
ss << "Bluetooth::Device::UpdatePresentDevices() - Error: " << e.what() << std::endl;
Util::Logger::Log(Util::Logger::Severity::Error, ss.str());
Logging::Log(Logging::Severity::Error, ss.str());
}
}
}
@@ -204,7 +204,7 @@ void Device::SendStateChange(bool present, const std::string& macAddress)
std::stringstream ss;
ss << "Bluetooth: " << sign << " " << macAddress;
Util::Logger::Log(Util::Logger::Severity::Info, ss.str());
Logging::Log(Logging::Severity::Info, ss.str());
if (!m_target.empty())
{
@@ -219,7 +219,7 @@ void Device::SendStateChange(bool present, const std::string& macAddress)
{
std::stringstream ss;
ss << "Bluetooth::Device::SendStateChange() - Error: " << e.what() << std::endl;
Util::Logger::Log(Util::Logger::Severity::Error, ss.str());
Logging::Log(Logging::Severity::Error, ss.str());
}
}
@@ -256,7 +256,7 @@ void Device::SendStateChange(bool present, const std::string& macAddress)
{
std::stringstream ss;
ss << "Bluetooth::Device::SendStateChange() - Error: " << e.what() << std::endl;
Util::Logger::Log(Util::Logger::Severity::Error, ss.str());
Logging::Log(Logging::Severity::Error, ss.str());
}
}
}