diff options
| author | Enrico Turri <enricoturri@seznam.cz> | 2018-08-31 09:46:47 +0300 |
|---|---|---|
| committer | Enrico Turri <enricoturri@seznam.cz> | 2018-08-31 09:46:47 +0300 |
| commit | ae9355e634b8665874b4ea454ed54cb7084db3c0 (patch) | |
| tree | e9c7c8bbdb6a81761d47a18df24dddfca16eb234 /xs/src/libslic3r | |
| parent | bb4329c8d015e44b7017310c7c940943b85f7452 (diff) | |
| parent | 4f53fc2a5f2ed179f857398e9f9ff3fe5956e52f (diff) | |
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev
Diffstat (limited to 'xs/src/libslic3r')
| -rw-r--r-- | xs/src/libslic3r/Print.cpp | 2 | ||||
| -rw-r--r-- | xs/src/libslic3r/Print.hpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xs/src/libslic3r/Print.cpp b/xs/src/libslic3r/Print.cpp index 54a7539db..aeb034378 100644 --- a/xs/src/libslic3r/Print.cpp +++ b/xs/src/libslic3r/Print.cpp @@ -13,7 +13,7 @@ #include <boost/lexical_cast.hpp> #include <boost/log/trivial.hpp> -#include "slic3r/IProgressIndicator.hpp" +#include "slic3r/ProgressIndicator.hpp" #include "PrintExport.hpp" //! macro used to mark string used at localization, diff --git a/xs/src/libslic3r/Print.hpp b/xs/src/libslic3r/Print.hpp index 61e77b572..86dca2e26 100644 --- a/xs/src/libslic3r/Print.hpp +++ b/xs/src/libslic3r/Print.hpp @@ -227,8 +227,8 @@ private: typedef std::vector<PrintObject*> PrintObjectPtrs; typedef std::vector<PrintRegion*> PrintRegionPtrs; -class IProgressIndicator; -using ProgressIndicatorPtr = std::shared_ptr<IProgressIndicator>; +class ProgressIndicator; +using ProgressIndicatorPtr = std::shared_ptr<ProgressIndicator>; // The complete print tray with possibly multiple objects. class Print |