config: rename and restrict CLayoutValueData::fromAny to fromAnyPv

This is only for casting `any` variables that represent a void * to a CLayoutValueData*, not just any any.
hyprwm · Nov 3, 2024 · 742c4fc · 742c4fc
1 parent 683220f
commit 742c4fc
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/src/config/ConfigDataValues.hpp b/src/config/ConfigDataValues.hpp
@@ -31,7 +31,8 @@ class CLayoutValueData : ICustomConfigValueData {
         return std::format("{}{},{}{}", m_vValues.x, (m_sIsRelative.x) ? "%" : "px", m_vValues.y, (m_sIsRelative.y) ? "%" : "px");
     }
 
-    static CLayoutValueData* fromAny(const std::any& v) {
+    static CLayoutValueData* fromAnyPv(const std::any& v) {
+        RASSERT(v.type() == typeid(void*), "Invalid config value type");
         const auto P = (CLayoutValueData*)std::any_cast<void*>(v);
         RASSERT(P, "Empty config value");
         return P;

diff --git a/src/renderer/widgets/Image.cpp b/src/renderer/widgets/Image.cpp
@@ -87,7 +87,7 @@ CImage::CImage(const Vector2D& viewport_, COutput* output_, const std::string& r
         rounding = std::any_cast<Hyprlang::INT>(props.at("rounding"));
         border   = std::any_cast<Hyprlang::INT>(props.at("border_size"));
         color    = std::any_cast<Hyprlang::INT>(props.at("border_color"));
-        pos      = CLayoutValueData::fromAny(props.at("position"))->getAbsolute(viewport_);
+        pos      = CLayoutValueData::fromAnyPv(props.at("position"))->getAbsolute(viewport_);
         halign   = std::any_cast<Hyprlang::STRING>(props.at("halign"));
         valign   = std::any_cast<Hyprlang::STRING>(props.at("valign"));
         angle    = std::any_cast<Hyprlang::FLOAT>(props.at("rotate"));

diff --git a/src/renderer/widgets/Label.cpp b/src/renderer/widgets/Label.cpp
@@ -73,7 +73,7 @@ void CLabel::plantTimer() {
 CLabel::CLabel(const Vector2D& viewport_, const std::unordered_map<std::string, std::any>& props, const std::string& output) :
     outputStringPort(output), shadow(this, props, viewport_) {
     try {
-        pos            = CLayoutValueData::fromAny(props.at("position"))->getAbsolute(viewport_);
+        pos            = CLayoutValueData::fromAnyPv(props.at("position"))->getAbsolute(viewport_);
         labelPreFormat = std::any_cast<Hyprlang::STRING>(props.at("text"));
         halign         = std::any_cast<Hyprlang::STRING>(props.at("halign"));
         valign         = std::any_cast<Hyprlang::STRING>(props.at("valign"));

diff --git a/src/renderer/widgets/PasswordInputField.cpp b/src/renderer/widgets/PasswordInputField.cpp
@@ -13,8 +13,8 @@ using namespace Hyprutils::String;
 CPasswordInputField::CPasswordInputField(const Vector2D& viewport_, const std::unordered_map<std::string, std::any>& props, const std::string& output) :
     viewport(viewport_), outputStringPort(output), shadow(this, props, viewport_) {
     try {
-        pos                      = CLayoutValueData::fromAny(props.at("position"))->getAbsolute(viewport_);
-        size                     = CLayoutValueData::fromAny(props.at("size"))->getAbsolute(viewport_);
+        pos                      = CLayoutValueData::fromAnyPv(props.at("position"))->getAbsolute(viewport_);
+        size                     = CLayoutValueData::fromAnyPv(props.at("size"))->getAbsolute(viewport_);
         halign                   = std::any_cast<Hyprlang::STRING>(props.at("halign"));
         valign                   = std::any_cast<Hyprlang::STRING>(props.at("valign"));
         outThick                 = std::any_cast<Hyprlang::INT>(props.at("outline_thickness"));

diff --git a/src/renderer/widgets/Shape.cpp b/src/renderer/widgets/Shape.cpp
@@ -7,12 +7,12 @@
 CShape::CShape(const Vector2D& viewport_, const std::unordered_map<std::string, std::any>& props) : shadow(this, props, viewport_) {
 
     try {
-        size        = CLayoutValueData::fromAny(props.at("size"))->getAbsolute(viewport_);
+        size        = CLayoutValueData::fromAnyPv(props.at("size"))->getAbsolute(viewport_);
         rounding    = std::any_cast<Hyprlang::INT>(props.at("rounding"));
         border      = std::any_cast<Hyprlang::INT>(props.at("border_size"));
         color       = std::any_cast<Hyprlang::INT>(props.at("color"));
         borderColor = std::any_cast<Hyprlang::INT>(props.at("border_color"));
-        pos         = CLayoutValueData::fromAny(props.at("position"))->getAbsolute(viewport_);
+        pos         = CLayoutValueData::fromAnyPv(props.at("position"))->getAbsolute(viewport_);
         halign      = std::any_cast<Hyprlang::STRING>(props.at("halign"));
         valign      = std::any_cast<Hyprlang::STRING>(props.at("valign"));
         angle       = std::any_cast<Hyprlang::FLOAT>(props.at("rotate"));