diff options
| author | tamasmeszaros <meszaros.q@gmail.com> | 2018-08-30 16:21:41 +0300 |
|---|---|---|
| committer | tamasmeszaros <meszaros.q@gmail.com> | 2018-08-30 18:35:49 +0300 |
| commit | 4f53fc2a5f2ed179f857398e9f9ff3fe5956e52f (patch) | |
| tree | ea6a927058fc7e4fe2095b7a9f89ccd7c7df246d /xs/src/libslic3r | |
| parent | 3750bd781eb2b48bc9ac6ac5acf8ce1bf99da0be (diff) | |
| parent | f5b1729af3e09ffc5ac64d2540227a0286cdb465 (diff) | |
Merge remote-tracking branch 'origin/cpp_progress_status_bar' into dev
# Conflicts:
# lib/Slic3r/GUI/MainFrame.pm
# xs/src/slic3r/AppController.cpp
# xs/src/slic3r/AppControllerWx.cpp
# xs/src/slic3r/GUI/GUI.hpp
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 |