From deba961bf7dd9e314e98515ad012b1a1e9040396 Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lenox.joseph@gmail.com>
Date: Wed, 13 Jun 2018 22:17:25 -0500
Subject: [PATCH] finished removing local settings in favor of singleton
 ui_settings

---
 src/GUI/Plater/Plate3D.hpp    | 6 ++----
 src/GUI/Plater/Preview2D.hpp  | 2 +-
 src/GUI/Plater/Preview3D.hpp  | 2 +-
 src/GUI/Plater/PreviewDLP.hpp | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/GUI/Plater/Plate3D.hpp b/src/GUI/Plater/Plate3D.hpp
index 7df04abcb..8e6814d25 100644
--- a/src/GUI/Plater/Plate3D.hpp
+++ b/src/GUI/Plater/Plate3D.hpp
@@ -4,7 +4,6 @@
 #ifndef WX_PRECOMP
     #include <wx/wx.h>
 #endif
-#include "Settings.hpp"
 #include "Model.hpp"
 #include "Config.hpp"
 
@@ -13,14 +12,13 @@ namespace Slic3r { namespace GUI {
 class Plate3D : public wxPanel {
 public:
     void update() {};
-    Plate3D(wxWindow* parent, const wxSize& size, std::vector<PlaterObject>& _objects, std::shared_ptr<Model> _model, std::shared_ptr<Config> _config, std::shared_ptr<Settings> _settings) :
-    wxPanel(parent, wxID_ANY, wxDefaultPosition, size, wxTAB_TRAVERSAL), objects(_objects), model(_model), config(_config), settings(_settings)
+    Plate3D(wxWindow* parent, const wxSize& size, std::vector<PlaterObject>& _objects, std::shared_ptr<Model> _model, std::shared_ptr<Config> _config) :
+    wxPanel(parent, wxID_ANY, wxDefaultPosition, size, wxTAB_TRAVERSAL), objects(_objects), model(_model), config(_config)
     {}
 private:
     std::vector<PlaterObject>& objects; //< reference to parent vector
     std::shared_ptr<Slic3r::Model> model;
     std::shared_ptr<Slic3r::Config> config;
-    std::shared_ptr<Settings> settings;
 };
 
 } } // Namespace Slic3r::GUI
diff --git a/src/GUI/Plater/Preview2D.hpp b/src/GUI/Plater/Preview2D.hpp
index a77239562..9ef459295 100644
--- a/src/GUI/Plater/Preview2D.hpp
+++ b/src/GUI/Plater/Preview2D.hpp
@@ -14,7 +14,7 @@ class Preview2D : public wxPanel {
 public:
     void reload_print() {};
     Preview2D(wxWindow* parent, const wxSize& size, std::vector<PlaterObject>& _objects, std::shared_ptr<Model> _model, std::shared_ptr<Config> _config) :
-    wxPanel(parent, wxID_ANY, wxDefaultPosition, size, wxTAB_TRAVERSAL), objects(_objects), model(_model), config(_config), settings(_settings)
+    wxPanel(parent, wxID_ANY, wxDefaultPosition, size, wxTAB_TRAVERSAL), objects(_objects), model(_model), config(_config)
     {}
 
     void enabled(bool enable = true) {}
diff --git a/src/GUI/Plater/Preview3D.hpp b/src/GUI/Plater/Preview3D.hpp
index 3e2a66ab0..d2ec12b48 100644
--- a/src/GUI/Plater/Preview3D.hpp
+++ b/src/GUI/Plater/Preview3D.hpp
@@ -14,7 +14,7 @@ class Preview3D : public wxPanel {
 public:
     void reload_print() {};
     Preview3D(wxWindow* parent, const wxSize& size, std::vector<PlaterObject>& _objects, std::shared_ptr<Model> _model, std::shared_ptr<Config> _config) :
-    wxPanel(parent, wxID_ANY, wxDefaultPosition, size, wxTAB_TRAVERSAL), objects(_objects), model(_model), config(_config), settings(_settings)
+    wxPanel(parent, wxID_ANY, wxDefaultPosition, size, wxTAB_TRAVERSAL), objects(_objects), model(_model), config(_config)
     {}
 
     void enabled(bool enable = true) {}
diff --git a/src/GUI/Plater/PreviewDLP.hpp b/src/GUI/Plater/PreviewDLP.hpp
index c4d80b99c..8de143174 100644
--- a/src/GUI/Plater/PreviewDLP.hpp
+++ b/src/GUI/Plater/PreviewDLP.hpp
@@ -14,7 +14,7 @@ class PreviewDLP : public wxPanel {
 public:
     void reload_print() {};
     PreviewDLP(wxWindow* parent, const wxSize& size, std::vector<PlaterObject>& _objects, std::shared_ptr<Model> _model, std::shared_ptr<Config> _config) :
-    wxPanel(parent, wxID_ANY, wxDefaultPosition, size, wxTAB_TRAVERSAL), objects(_objects), model(_model), config(_config), settings(_settings)
+    wxPanel(parent, wxID_ANY, wxDefaultPosition, size, wxTAB_TRAVERSAL), objects(_objects), model(_model), config(_config)
     {}
 
     void enabled(bool enable = true) {}