mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-08 16:21:14 +00:00
HanifKoh
73d32d4791
* Stop Leaking json Through Headers and Drop Includes Kept Only for the Name AppConfig.hpp, DeviceManager.hpp and UserManager.hpp carried a global "using namespace nlohmann;", json_diff.hpp a global "using json = nlohmann::json;" and PrinterFileSystem.h a global "using nlohmann::json;". Every file that included one of them, directly or not, could write a bare json, and 63 did without declaring it. The last two also made the include checker treat json_diff.hpp and PrinterFileSystem.h as the headers that provide json, so they were included from files that use nothing else from them: 57 of the 59 includers of json_diff.hpp never name json_diff. The five statements are removed. Headers that use the type now spell nlohmann::json, source files declare their own "using json = nlohmann::json;", and the includes that only supplied the name are dropped or replaced by <nlohmann/json.hpp>. Eight files reached json_diff.hpp only through an include that is now gone and with it lost that header's "using namespace std;". The std names they used unqualified are qualified. * Declare json in OrcaSlicer.cpp on Every Platform OrcaSlicer.cpp had its "using namespace nlohmann;" and the json include inside the Linux-only include block, so on Windows and macOS it took json from AppConfig.hpp's global directive, which is gone. The include and a "using json = nlohmann::json;" now sit outside the block.
29 lines
714 B
C++
29 lines
714 B
C++
#include "DevAxis.h"
|
|
#include "DevUtil.h"
|
|
|
|
#include <nlohmann/json.hpp>
|
|
#include "slic3r/GUI/DeviceManager.hpp"
|
|
#include "slic3r/GUI/DeviceCore/DevDefs.h"
|
|
|
|
using json = nlohmann::json;
|
|
|
|
namespace Slic3r
|
|
{
|
|
|
|
void DevAxis::ParseAxis(const json& print_json)
|
|
{
|
|
DevJsonValParser::ParseVal(print_json, "home_flag", m_home_flag);
|
|
|
|
if (print_json.contains("fun")) {
|
|
const std::string& fun = print_json["fun"].get<std::string>();
|
|
m_is_support_mqtt_homing = DevUtil::get_flag_bits(fun, 32);
|
|
m_is_support_mqtt_axis_ctrl = DevUtil::get_flag_bits(fun, 38);
|
|
}
|
|
}
|
|
|
|
bool DevAxis::IsArchCoreXY() const
|
|
{
|
|
return m_owner->get_printer_arch() == PrinterArch::ARCH_CORE_XY;
|
|
}
|
|
|
|
} // namespace Slic3r
|