Updating: Detect legacy datadir, remove conflicting presets

2018-04-16 16:52:11 +02:00
parent 7dbb2ed6a3
commit c733e3151b
16 changed files with 232 additions and 96 deletions
--- a/xs/src/slic3r/Utils/PresetUpdater.hpp
+++ b/xs/src/slic3r/Utils/PresetUpdater.hpp
@@ -2,6 +2,7 @@
 #define slic3r_PresetUpdate_hpp_

 #include <memory>
+#include <vector>

 namespace Slic3r {

@@ -20,8 +21,8 @@ public:
 	~PresetUpdater();

 	void sync(AppConfig *app_config, PresetBundle *preset_bundle);
-
 	void config_update(AppConfig *app_config);
+	void install_bundles_rsrc(AppConfig *app_config, std::vector<std::string> &&bundles);
 private:
 	struct priv;
 	std::unique_ptr<priv> p;