remove operator= base types

It requires a complicated assigment syntax for a simple thing.
Matroska-Org · Dec 29, 2023 · 1f47d86 · 1f47d86
1 parent c4c69db
commit 1f47d86
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 33 deletions.
diff --git a/ebml/EbmlFloat.h b/ebml/EbmlFloat.h
@@ -45,9 +45,6 @@ class EBML_DLL_API EbmlFloat : public EbmlElement {
     }
 
 
-//    EbmlFloat & operator=(const float NewValue) { Value = NewValue; return *this;}
-    EbmlFloat & operator=(const double NewValue) { Value = NewValue; SetValueIsSet(); return *this;}
-
     bool IsSmallerThan(const EbmlElement *Cmp) const override;
 
     using EbmlElement::operator const EbmlId &;

diff --git a/ebml/EbmlSInteger.h b/ebml/EbmlSInteger.h
@@ -28,8 +28,6 @@ class EBML_DLL_API EbmlSInteger : public EbmlElement {
     EbmlSInteger(const EbmlCallbacks &);
     explicit EbmlSInteger(const EbmlCallbacks &, std::int64_t DefaultValue);
 
-    EbmlSInteger & operator = (std::int64_t NewValue) {Value = NewValue; SetValueIsSet(); return *this;}
-
     /*!
       Set the default size of the integer (usually 1,2,4 or 8)
     */

diff --git a/ebml/EbmlString.h b/ebml/EbmlString.h
@@ -29,7 +29,6 @@ class EBML_DLL_API EbmlString : public EbmlElement {
     filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA) override;
     filepos_t UpdateSize(ShouldWrite writeFilter = WriteSkipDefault, bool bForceRender = false) override;
 
-    EbmlString & operator=(const std::string &);
     using EbmlElement::operator const EbmlId &;
     explicit operator const std::string &() const;
 

diff --git a/ebml/EbmlUInteger.h b/ebml/EbmlUInteger.h
@@ -26,8 +26,6 @@ class EBML_DLL_API EbmlUInteger : public EbmlElement {
     EbmlUInteger(const EbmlCallbacks &);
     explicit EbmlUInteger(const EbmlCallbacks &, std::uint64_t DefaultValue);
 
-    EbmlUInteger & operator=(std::uint64_t NewValue) {Value = NewValue; SetValueIsSet(); return *this;}
-
     /*!
       Set the default size of the integer (usually 1,2,4 or 8)
     */

diff --git a/ebml/EbmlUnicodeString.h b/ebml/EbmlUnicodeString.h
@@ -75,7 +75,6 @@ class EBML_DLL_API EbmlUnicodeString : public EbmlElement {
     filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA) override;
     filepos_t UpdateSize(ShouldWrite writeFilter = WriteSkipDefault, bool bForceRender = false) override;
 
-    EbmlUnicodeString & operator=(const UTFstring &); ///< platform dependant code
     using EbmlElement::operator const EbmlId &;
     explicit operator const UTFstring &() const;
 

diff --git a/src/EbmlFloat.cpp b/src/EbmlFloat.cpp
@@ -44,7 +44,9 @@ EbmlFloat::operator double() const {return (Value);}
 double EbmlFloat::GetValue() const {return Value;}
 
 EbmlFloat & EbmlFloat::SetValue(double NewValue) {
-  return *this = NewValue;
+  Value = NewValue;
+  SetValueIsSet();
+  return *this;
 }
 
 /*!

diff --git a/src/EbmlSInteger.cpp b/src/EbmlSInteger.cpp
@@ -49,7 +49,9 @@ EbmlSInteger::operator std::int64_t() const {return Value;}
 std::int64_t EbmlSInteger::GetValue() const {return Value;}
 
 EbmlSInteger & EbmlSInteger::SetValue(std::int64_t NewValue) {
-  return *this = NewValue;
+  Value = NewValue;
+  SetValueIsSet();
+  return *this;
 }
 
 /*!

diff --git a/src/EbmlString.cpp b/src/EbmlString.cpp
@@ -71,21 +71,12 @@ filepos_t EbmlString::RenderData(IOCallback & output, bool /* bForceRender */, S
 
 EbmlString::operator const std::string &() const {return Value;}
 
-EbmlString & EbmlString::operator=(const std::string & NewString)
-{
-  Value = NewString;
+EbmlString &EbmlString::SetValue(std::string const &NewValue) {
+  Value = NewValue;
   SetValueIsSet();
-/* done automatically
-  SetSize_(Value.length());
-  if (GetDefaultSize() > GetSize())
-    SetSize_(GetDefaultSize());*/
   return *this;
 }
 
-EbmlString &EbmlString::SetValue(std::string const &NewValue) {
-  return *this = NewValue;
-}
-
 std::string EbmlString::GetValue() const {
   return Value;
 }

diff --git a/src/EbmlUInteger.cpp b/src/EbmlUInteger.cpp
@@ -44,7 +44,9 @@ EbmlUInteger::operator std::uint64_t() const {return Value;}
 std::uint64_t EbmlUInteger::GetValue() const {return Value;}
 
 EbmlUInteger & EbmlUInteger::SetValue(std::uint64_t NewValue) {
-  return *this = NewValue;
+  Value = NewValue;
+  SetValueIsSet();
+  return *this;
 }
 
 /*!

diff --git a/src/EbmlUnicodeString.cpp b/src/EbmlUnicodeString.cpp
@@ -151,21 +151,16 @@ filepos_t EbmlUnicodeString::RenderData(IOCallback & output, bool /* bForceRende
 
 EbmlUnicodeString::operator const UTFstring &() const {return Value;}
 
-EbmlUnicodeString & EbmlUnicodeString::operator=(const UTFstring & NewString)
-{
-  Value = NewString;
+EbmlUnicodeString &EbmlUnicodeString::SetValue(UTFstring const &NewValue) {
+  Value = NewValue;
   SetValueIsSet();
   return *this;
 }
 
-EbmlUnicodeString &EbmlUnicodeString::SetValue(UTFstring const &NewValue) {
-  return *this = NewValue;
-}
-
 EbmlUnicodeString &EbmlUnicodeString::SetValueUTF8(std::string const &NewValue) {
-  UTFstring NewValueUTFstring;
-  NewValueUTFstring.SetUTF8(NewValue);
-  return *this = NewValueUTFstring;
+  Value.SetUTF8(NewValue);
+  SetValueIsSet();
+  return *this;
 }
 
 UTFstring EbmlUnicodeString::GetValue() const {