Vutils

vic4key · Sep 28, 2023 · ddaffc7 · ddaffc7
1 parent dc76007
commit ddaffc7
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 33 deletions.
diff --git a/include/Vutils.h b/include/Vutils.h
@@ -2748,17 +2748,17 @@ class PEFileTW : public PEFileTX<T>
 };
 
 /**
- * Fundamental
+ * Variant
  */
 
-class FundamentalA
+class VariantA
 {
 public:
-  FundamentalA();
-  virtual ~FundamentalA();
+  VariantA();
+  virtual ~VariantA();
 
   template<typename T>
-  friend FundamentalA& operator<<(FundamentalA& stream, T v)
+  friend VariantA& operator<<(VariantA& stream, T v)
   {
     stream.m_data << v;
     return stream;
@@ -2776,14 +2776,14 @@ class FundamentalA
   std::stringstream m_data;
 };
 
-class FundamentalW
+class VariantW
 {
 public:
-  FundamentalW();
-  virtual ~FundamentalW();
+  VariantW();
+  virtual ~VariantW();
 
   template<typename T>
-  friend FundamentalW& operator<<(FundamentalW& stream, T v)
+  friend VariantW& operator<<(VariantW& stream, T v)
   {
     stream.m_data << v;
     return stream;
@@ -2892,7 +2892,7 @@ class InputDialog : public WDTDialog
 
   void placeholder(const std::wstring& pl);
   void label(const std::wstring& label);
-  FundamentalW& input();
+  VariantW& input();
 
   INT_PTR do_modal();
 
@@ -2901,7 +2901,7 @@ class InputDialog : public WDTDialog
 private:
   std::wstring m_placeholder;
   std::wstring m_label;
-  FundamentalW m_input;
+  VariantW m_input;
   bool m_number_only;
 };
 
@@ -3562,7 +3562,7 @@ class Debouncer : public SingletonT<Debouncer>
 #define Path PathW
 #define ScopeStopWatch ScopeStopWatchW
 #define WMIProvider WMIProviderW
-#define Fundamental FundamentalW
+#define Variant VariantW
 #define Picker PickerW
 #define RESTClient RESTClientW
 #else // _UNICODE
@@ -3581,7 +3581,7 @@ class Debouncer : public SingletonT<Debouncer>
 #define Path PathA
 #define ScopeStopWatch ScopeStopWatchA
 #define WMIProvider WMIProviderA
-#define Fundamental FundamentalA
+#define Variant VariantA
 #define Picker PickerA
 #define RESTClient RESTClientA
 #endif // _UNICODE

diff --git a/src/details/strfmt.cpp b/src/details/strfmt.cpp
@@ -654,93 +654,97 @@ void vuapi url_decode_W(const std::wstring& text, std::wstring& result)
 }
 
 /**
- * FundamentalA
+ * VariantA
  */
 
-FundamentalA::FundamentalA()
+VariantA::VariantA()
 {
   m_data.clear();
 }
 
-FundamentalA::~FundamentalA()
+VariantA::~VariantA()
 {
 }
 
-std::stringstream& FundamentalA::data()
+std::stringstream& VariantA::data()
 {
   return m_data;
 }
 
-std::string FundamentalA::to_string() const
+std::string VariantA::to_string() const
 {
   return m_data.str();
 }
 
-bool FundamentalA::to_boolean() const
+bool VariantA::to_boolean() const
 {
   return to_integer() != 0;
 }
 
-int FundamentalA::to_integer() const
+int VariantA::to_integer() const
 {
   return atoi(m_data.str().c_str());
 }
 
-long FundamentalA::to_long() const
+long VariantA::to_long() const
 {
   return atol(m_data.str().c_str());
 }
 
-float FundamentalA::to_float() const
+float VariantA::to_float() const
 {
   return float(to_double());
 }
 
-double FundamentalA::to_double() const
+double VariantA::to_double() const
 {
   return atof(m_data.str().c_str());
 }
 
-FundamentalW::FundamentalW()
+/**
+ * VariantW
+ */
+
+VariantW::VariantW()
 {
   m_data.clear();
 }
 
-FundamentalW::~FundamentalW()
+VariantW::~VariantW()
 {
 }
 
-std::wstringstream& FundamentalW::data()
+std::wstringstream& VariantW::data()
 {
   return m_data;
 }
 
-std::wstring FundamentalW::to_string() const
+std::wstring VariantW::to_string() const
 {
   return m_data.str();
 }
 
-bool FundamentalW::to_boolean() const
+bool VariantW::to_boolean() const
 {
   return to_integer() != 0;
 }
 
-int FundamentalW::to_integer() const
+int VariantW::to_integer() const
 {
   return atoi(to_string_A(m_data.str()).c_str());
 }
 
-long FundamentalW::to_long() const
+long VariantW::to_long() const
 {
   return atol(to_string_A(m_data.str()).c_str());
 }
 
-float FundamentalW::to_float() const
+float VariantW::to_float() const
 {
   return float(to_double());
 }
 
-double FundamentalW::to_double() const
+double VariantW::to_double() const
 {
   return atof(to_string_A(m_data.str()).c_str());
 }

diff --git a/src/details/window.cpp b/src/details/window.cpp
@@ -477,7 +477,7 @@ void InputDialog::label(const std::wstring& label)
   m_label = label;
 }
 
-vu::FundamentalW& InputDialog::input()
+vu::VariantW& InputDialog::input()
 {
   return m_input;
 }