mirror of
https://github.com/ciphervance/supercell-wx.git
synced 2025-10-30 17:40:05 +00:00
Removing boost log from Boost.Log -> spdlog - settings, types, util, view
This commit is contained in:
parent
e6bddc79db
commit
c6281d799f
13 changed files with 109 additions and 127 deletions
|
|
@ -1,7 +1,6 @@
|
|||
#include <scwx/qt/settings/general_settings.hpp>
|
||||
#include <scwx/qt/util/json.hpp>
|
||||
|
||||
#include <boost/log/trivial.hpp>
|
||||
#include <scwx/util/logger.hpp>
|
||||
|
||||
namespace scwx
|
||||
{
|
||||
|
|
@ -10,7 +9,8 @@ namespace qt
|
|||
namespace settings
|
||||
{
|
||||
|
||||
static const std::string logPrefix_ = "[scwx::qt::settings::general_settings] ";
|
||||
static const std::string logPrefix_ = "scwx::qt::settings::general_settings";
|
||||
static const auto logger_ = scwx::util::Logger::Create(logPrefix_);
|
||||
|
||||
static const std::string DEFAULT_DEFAULT_RADAR_SITE = "KLSX";
|
||||
static const int64_t DEFAULT_GRID_WIDTH = 1;
|
||||
|
|
@ -115,13 +115,11 @@ GeneralSettings::Load(const boost::json::value* json, bool& jsonDirty)
|
|||
{
|
||||
if (json == nullptr)
|
||||
{
|
||||
BOOST_LOG_TRIVIAL(warning)
|
||||
<< logPrefix_ << "Key is not present, resetting to defaults";
|
||||
logger_->warn("Key is not present, resetting to defaults");
|
||||
}
|
||||
else if (!json->is_object())
|
||||
{
|
||||
BOOST_LOG_TRIVIAL(warning)
|
||||
<< logPrefix_ << "Invalid json, resetting to defaults";
|
||||
logger_->warn("Invalid json, resetting to defaults");
|
||||
}
|
||||
|
||||
generalSettings->p->SetDefaults();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue