|
4 | 4 | #include "./expected.hpp" |
5 | 5 | #include "./types.hpp" |
6 | 6 | #include "./utils.hpp" |
| 7 | +#include "./windows.hpp" |
7 | 8 |
|
8 | 9 | #include <algorithm> |
9 | 10 | #include <cmath> |
@@ -61,17 +62,20 @@ struct HSVColor { |
61 | 62 |
|
62 | 63 | constexpr HSVColor() : HSVColor{ 0.0, 0.0, 0.0, 0 } { } |
63 | 64 |
|
64 | | - [[nodiscard]] static helper::expected<HSVColor, std::string> from_string(const std::string& value); |
| 65 | + OOPETRIS_EXPORTED [[nodiscard]] static helper::expected<HSVColor, std::string> from_string(const std::string& value |
| 66 | + ); |
65 | 67 |
|
66 | 68 | using InfoType = std::tuple<HSVColor, color::SerializeMode, bool>; |
67 | 69 |
|
68 | | - [[nodiscard]] static helper::expected<InfoType, std::string> from_string_with_info(const std::string& value); |
| 70 | + OOPETRIS_EXPORTED [[nodiscard]] static helper::expected<InfoType, std::string> from_string_with_info( |
| 71 | + const std::string& value |
| 72 | + ); |
69 | 73 |
|
70 | | - [[nodiscard]] Color to_rgb_color() const; |
| 74 | + OOPETRIS_EXPORTED [[nodiscard]] Color to_rgb_color() const; |
71 | 75 |
|
72 | | - [[nodiscard]] std::string to_string(bool force_alpha = false) const; |
| 76 | + OOPETRIS_EXPORTED [[nodiscard]] std::string to_string(bool force_alpha = false) const; |
73 | 77 |
|
74 | | - std::ostream& operator<<(std::ostream& os) const; |
| 78 | + OOPETRIS_EXPORTED std::ostream& operator<<(std::ostream& os) const; |
75 | 79 | }; |
76 | 80 |
|
77 | 81 | namespace { //NOLINT(cert-dcl59-cpp,google-build-namespaces) |
@@ -135,14 +139,16 @@ struct Color { |
135 | 139 |
|
136 | 140 | constexpr Color(u8 red, u8 green, u8 blue) : Color{ red, green, blue, 0xFF } { } |
137 | 141 |
|
138 | | - [[nodiscard]] static helper::expected<Color, std::string> from_string(const std::string& value); |
| 142 | + OOPETRIS_EXPORTED [[nodiscard]] static helper::expected<Color, std::string> from_string(const std::string& value); |
139 | 143 |
|
140 | 144 | using InfoType = std::tuple<Color, color::SerializeMode, bool>; |
141 | 145 |
|
142 | | - [[nodiscard]] static helper::expected<InfoType, std::string> from_string_with_info(const std::string& value); |
| 146 | + OOPETRIS_EXPORTED [[nodiscard]] static helper::expected<InfoType, std::string> from_string_with_info( |
| 147 | + const std::string& value |
| 148 | + ); |
143 | 149 |
|
144 | 150 |
|
145 | | - [[nodiscard]] HSVColor to_hsv_color() const; |
| 151 | + OOPETRIS_EXPORTED [[nodiscard]] HSVColor to_hsv_color() const; |
146 | 152 |
|
147 | 153 | constexpr Color(const HSVColor& color) { //NOLINT(google-explicit-constructor) |
148 | 154 |
|
@@ -257,5 +263,5 @@ struct Color { |
257 | 263 | [[nodiscard]] std::string to_string(color::SerializeMode mode = color::SerializeMode::RGB, bool force_alpha = false) |
258 | 264 | const; |
259 | 265 |
|
260 | | - std::ostream& operator<<(std::ostream& os) const; |
| 266 | + OOPETRIS_EXPORTED std::ostream& operator<<(std::ostream& os) const; |
261 | 267 | }; |
0 commit comments