Fix copy constructor, equality operators for Qgs3DAxisSettings ignore…

…s some members
qgis · Apr 17, 2023 · dc44813 · dc44813
1 parent 100f6b9
commit dc44813
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 23 deletions.
diff --git a/src/3d/qgs3daxissettings.cpp b/src/3d/qgs3daxissettings.cpp
@@ -14,34 +14,19 @@
  ***************************************************************************/
 
 #include "qgs3daxissettings.h"
-
-#include <QDomDocument>
-
 #include "qgsreadwritecontext.h"
-#include "qgssymbollayerutils.h"
-
-Qgs3DAxisSettings::Qgs3DAxisSettings( const Qgs3DAxisSettings &other )
-  : mMode( other.mMode )
-  , mHorizontalPosition( other.mHorizontalPosition )
-  , mVerticalPosition( other.mVerticalPosition )
-{
 
-}
-
-Qgs3DAxisSettings &Qgs3DAxisSettings::operator=( Qgs3DAxisSettings const &rhs )
-{
-  this->mMode = rhs.mMode;
-  this->mHorizontalPosition = rhs.mHorizontalPosition;
-  this->mVerticalPosition = rhs.mVerticalPosition;
-  return *this;
-}
+#include <QDomDocument>
 
 bool Qgs3DAxisSettings::operator==( Qgs3DAxisSettings const &rhs ) const
 {
   bool out = true;
   out &= this->mMode == rhs.mMode;
   out &= this->mHorizontalPosition == rhs.mHorizontalPosition;
   out &= this->mVerticalPosition == rhs.mVerticalPosition;
+  out &= this->mDefaultViewportSize == rhs.mDefaultViewportSize;
+  out &= this->mMaxViewportRatio == rhs.mMaxViewportRatio;
+  out &= this->mMinViewportRatio == rhs.mMinViewportRatio;
   return out;
 }
 

diff --git a/src/3d/qgs3daxissettings.h b/src/3d/qgs3daxissettings.h
@@ -48,10 +48,6 @@ class _3D_EXPORT Qgs3DAxisSettings
 
     //! default constructor
     Qgs3DAxisSettings() = default;
-    //! copy constructor
-    Qgs3DAxisSettings( const Qgs3DAxisSettings &other );
-    //! delete assignment operator
-    Qgs3DAxisSettings &operator=( Qgs3DAxisSettings const &rhs );
 
     //! Returns true if both objects are equal
     bool operator==( Qgs3DAxisSettings const &rhs ) const;