Merged with master

xs/src/slic3r/ProgressIndicator.hpp

@@ -3,7 +3,6 @@
 
 #include <string>
 #include <functional>
-#include "Strings.hpp"
 
 namespace Slic3r {
 
@@ -43,13 +42,13 @@ public:
     }
 
     /// Message shown on the next status update.
-    virtual void message(const string&) = 0;
+    virtual void message(const std::string&) = 0;
 
     /// Title of the operation.
-    virtual void title(const string&) = 0;
+    virtual void title(const std::string&) = 0;
 
     /// Formatted message for the next status update. Works just like sprintf.
-    virtual void message_fmt(const string& fmt, ...);
+    virtual void message_fmt(const std::string& fmt, ...);
 
     /// Set up a cancel callback for the operation if feasible.
     virtual void on_cancel(CancelFn func = CancelFn()) { cancelfunc_ = func; }
@@ -61,7 +60,7 @@ public:
     virtual void cancel() { cancelfunc_(); }
 
     /// Convenience function to call message and status update in one function.
-    void update(float st, const string& msg) {
+    void update(float st, const std::string& msg) {
         message(msg); state(st);
     }
 };