From 109fdce8c8268da417ae158d20d2bc1d1418818f Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Tue, 5 Jun 2018 22:39:48 -0500 Subject: [PATCH] refactored to accept a t_config_option_keys for initializer. --- xs/src/libslic3r/Config.cpp | 6 ++++++ xs/src/libslic3r/Config.hpp | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/xs/src/libslic3r/Config.cpp b/xs/src/libslic3r/Config.cpp index d9f99cbbc..91e68cc40 100644 --- a/xs/src/libslic3r/Config.cpp +++ b/xs/src/libslic3r/Config.cpp @@ -10,6 +10,12 @@ Config::new_from_defaults() } std::shared_ptr Config::new_from_defaults(std::initializer_list init) +{ + return Config::new_from_defaults(t_config_option_keys(init)); +} + +std::shared_ptr +Config::new_from_defaults(t_config_option_keys init) { auto my_config(std::make_shared()); for (auto& opt_key : init) { diff --git a/xs/src/libslic3r/Config.hpp b/xs/src/libslic3r/Config.hpp index e2049cd32..f8c5e05a4 100644 --- a/xs/src/libslic3r/Config.hpp +++ b/xs/src/libslic3r/Config.hpp @@ -5,13 +5,18 @@ #include #include "PrintConfig.hpp" +#include "ConfigBase.hpp" namespace Slic3r { +class Config; +using config_ptr = std::shared_ptr; + class Config : public DynamicPrintConfig { public: static std::shared_ptr new_from_defaults(); static std::shared_ptr new_from_defaults(std::initializer_list init); + static std::shared_ptr new_from_defaults(t_config_option_keys init); static std::shared_ptr new_from_cli(const int& argc, const char* argv[]); void write_ini(const std::string& file) { save(file); }