diff options
| author | bubnikv <bubnikv@gmail.com> | 2017-05-30 21:09:34 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2017-05-30 21:09:34 +0300 |
| commit | 102329c54da5e02416f3bed4677a2293a44f2164 (patch) | |
| tree | 13f1276209a4777c7d57b5bb1a0f67258017eb97 /xs/src/libslic3r/Config.hpp | |
| parent | e1ca1a82fb57367fb54e417d2ca19d071e43755b (diff) | |
Further refactoring, C++11 conversion and code simplification.
Diffstat (limited to 'xs/src/libslic3r/Config.hpp')
| -rw-r--r-- | xs/src/libslic3r/Config.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xs/src/libslic3r/Config.hpp b/xs/src/libslic3r/Config.hpp index 1de950d54..c5b0fb880 100644 --- a/xs/src/libslic3r/Config.hpp +++ b/xs/src/libslic3r/Config.hpp @@ -660,7 +660,8 @@ public: { return this->optptr(opt_key, create); } virtual ConfigOption* optptr(const t_config_option_key &opt_key, bool create = false) = 0; virtual t_config_option_keys keys() const = 0; - void apply(const ConfigBase &other, bool ignore_nonexistent = false); + void apply(const ConfigBase &other, bool ignore_nonexistent = false) { this->apply(other, other.keys(), ignore_nonexistent); } + void apply(const ConfigBase &other, const t_config_option_keys &keys, bool ignore_nonexistent = false); bool equals(const ConfigBase &other) const { return this->diff(other).empty(); } t_config_option_keys diff(const ConfigBase &other) const; std::string serialize(const t_config_option_key &opt_key) const; |