diff --git a/ui/style/style_core_icon.h b/ui/style/style_core_icon.h index a9707ca..16b2837 100644 --- a/ui/style/style_core_icon.h +++ b/ui/style/style_core_icon.h @@ -83,10 +83,8 @@ private: class IconData { public: - struct FromIcons { - }; template - IconData(FromIcons, MonoIcons &&...icons) { + IconData(std::in_place_t, MonoIcons &&...icons) { created(); _parts.reserve(sizeof...(MonoIcons)); addIcons(std::forward(icons)...); @@ -151,14 +149,12 @@ private: class Icon { public: - Icon(Qt::Initialization) { + Icon(Qt::Initialization = Qt::Uninitialized) { } template - Icon(MonoIcons&&... icons) - : _data(new IconData( - IconData::FromIcons{}, - std::forward(icons)...)) + Icon(std::in_place_t, MonoIcons&&... icons) + : _data(new IconData(std::in_place, std::forward(icons)...)) , _owner(true) { } Icon(const Icon &other) : _data(other._data) {