mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-05 14:51:06 +00:00
HanifKoh
1a5f91d727
* Add Missing Includes Across src/slic3r/GUI Every GUI source and header now directly includes the headers declaring what it uses, rather than relying on the precompiled header or transitive includes. Generated with clang-tidy misc-include-cleaner, plus one hand edit making CalibrationPanel.hpp self-contained. * Drop the OS-Specific Includes Added Outside Their Platform Guards GLib, GTK, D-Bus and POSIX headers are only used inside platform #if blocks, which already include them. Added unconditionally at the top of the file they broke the Windows build. * Add the clang-tidy Configuration That Generated These Includes Only misc-include-cleaner's missing-include check, with the headers it must never suggest: per-platform, internal and OS-specific ones that would break other platforms or are not meant to be included directly. * Match Windows Paths in the clang-tidy Ignore List Header paths use backslashes on Windows, so every / in a pattern is now [/\\]. The Windows SDK headers are ignored alongside the other OS-specific ones, and the list is one pattern per line. Suggested by @raistlin7447 from a Windows clang-cl run.
86 lines
2.9 KiB
C++
86 lines
2.9 KiB
C++
#ifndef slic3r_GUI_format_hpp_
|
|
#define slic3r_GUI_format_hpp_
|
|
|
|
// Functional wrapper around boost::format.
|
|
// One day we may replace this wrapper with C++20 format
|
|
// https://en.cppreference.com/w/cpp/utility/format/format
|
|
// though C++20 format uses a different template pattern for position independent parameters.
|
|
// This wrapper also manages implicit conversion from wxString to UTF8 and format_wxstr() variants are provided to format into wxString.
|
|
|
|
#include <libslic3r/format.hpp>
|
|
|
|
#include <string>
|
|
#include <ostream>
|
|
#include <wx/string.h>
|
|
|
|
namespace Slic3r {
|
|
namespace GUI {
|
|
|
|
// Format input mixing UTF8 encoded strings (const char*, std::string) and wxStrings, return a wxString.
|
|
template<typename... TArgs>
|
|
inline wxString format_wxstr(const char* fmt, TArgs&&... args) {
|
|
boost::format message(fmt);
|
|
return wxString::FromUTF8(Slic3r::internal::format::format_recursive(message, std::forward<TArgs>(args)...).c_str());
|
|
}
|
|
template<typename... TArgs>
|
|
inline wxString format_wxstr(const std::string& fmt, TArgs&&... args) {
|
|
boost::format message(fmt);
|
|
return wxString::FromUTF8(Slic3r::internal::format::format_recursive(message, std::forward<TArgs>(args)...).c_str());
|
|
}
|
|
template<typename... TArgs>
|
|
inline wxString format_wxstr(const wxString& fmt, TArgs&&... args) {
|
|
return format_wxstr(fmt.ToUTF8().data(), std::forward<TArgs>(args)...);
|
|
}
|
|
template<typename... TArgs>
|
|
inline std::string format(const char* fmt, TArgs&&... args) {
|
|
return Slic3r::format(fmt, std::forward<TArgs>(args)...);
|
|
}
|
|
template<typename... TArgs>
|
|
inline std::string format(const std::string& fmt, TArgs&&... args) {
|
|
return Slic3r::format(fmt, std::forward<TArgs>(args)...);
|
|
}
|
|
template<typename... TArgs>
|
|
inline std::string format(const wxString& fmt, TArgs&&... args) {
|
|
return Slic3r::format(fmt.ToUTF8().data(), std::forward<TArgs>(args)...);
|
|
}
|
|
|
|
} // namespace GUI
|
|
|
|
namespace internal {
|
|
namespace format {
|
|
// Wrapper around wxScopedCharBuffer to indicate that the content is UTF8 formatted.
|
|
struct utf8_buffer {
|
|
// wxScopedCharBuffer is reference counted, therefore copying by value is cheap.
|
|
wxScopedCharBuffer data;
|
|
};
|
|
// Accept wxString and convert it to UTF8 to be processed by Slic3r::format().
|
|
inline const utf8_buffer cook(const wxString &arg) {
|
|
return utf8_buffer { arg.ToUTF8() };
|
|
}
|
|
// Vojtech seemingly does not understand perfect forwarding:
|
|
// Why Slic3r::internal::format::cook(T&& arg) is taken for non-const wxString reference?
|
|
inline const utf8_buffer cook(wxString &arg) {
|
|
return utf8_buffer { arg.ToUTF8() };
|
|
}
|
|
inline const utf8_buffer cook(wxString &&arg) {
|
|
return utf8_buffer{ arg.ToUTF8() };
|
|
}
|
|
}
|
|
}
|
|
|
|
} // namespace Slic3r
|
|
|
|
namespace boost {
|
|
namespace io {
|
|
namespace detail {
|
|
// Adaptor for boost::format to accept wxString converted to UTF8.
|
|
inline std::ostream& operator<<(std::ostream& os, const Slic3r::internal::format::utf8_buffer& str) {
|
|
os << str.data.data();
|
|
return os;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#endif /* slic3r_GUI_format_hpp_ */
|