Merged with Vojtech's branch

This commit is contained in:
bubnikv 2018-04-13 16:19:27 +02:00
commit c5af8bfe78
18 changed files with 365 additions and 100 deletions

View file

@ -59,7 +59,8 @@ public:
};
std::vector<PrinterModel> models;
VendorProfile(std::string id) : id(std::move(id)), config_version(0, 0, 0) {}
VendorProfile() {}
VendorProfile(std::string id) : id(std::move(id)) {}
static VendorProfile from_ini(const boost::filesystem::path &path, bool load_all=true);
static VendorProfile from_ini(const boost::property_tree::ptree &tree, const boost::filesystem::path &path, bool load_all=true);