mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-12 02:11:39 +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.
34 lines
599 B
C++
34 lines
599 B
C++
#ifndef slic3r_UserManager_hpp_
|
|
#define slic3r_UserManager_hpp_
|
|
|
|
#include <map>
|
|
#include <mutex>
|
|
#include <vector>
|
|
#include <string>
|
|
#include <memory>
|
|
#include <chrono>
|
|
#include <boost/thread.hpp>
|
|
#include "nlohmann/json.hpp"
|
|
#include "slic3r/Utils/NetworkAgent.hpp"
|
|
|
|
|
|
namespace Slic3r {
|
|
|
|
class NetworkAgent;
|
|
|
|
class UserManager
|
|
{
|
|
private:
|
|
NetworkAgent* m_agent { nullptr };
|
|
|
|
public:
|
|
UserManager(NetworkAgent* agent = nullptr);
|
|
~UserManager();
|
|
|
|
void set_agent(NetworkAgent* agent);
|
|
int parse_json(std::string payload);
|
|
};
|
|
} // namespace Slic3r
|
|
|
|
#endif // slic3r_UserManager_hpp_
|