From e8f0e1cca14a23e09a367012d0cb6dc2b6c71ef4 Mon Sep 17 00:00:00 2001
From: Martin Dobias <wonder.sk@gmail.com>
Date: Thu, 20 Jul 2023 09:14:21 +0200
Subject: [PATCH] fixes after rebase

---
 python/core/auto_generated/geometry/qgsbox3d.sip.in |  8 ++++----
 src/core/geometry/qgsbox3d.cpp                      | 12 ++++++------
 src/core/geometry/qgsbox3d.h                        |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/python/core/auto_generated/geometry/qgsbox3d.sip.in b/python/core/auto_generated/geometry/qgsbox3d.sip.in
index fc681d18eed..bd9eb220c47 100644
--- a/python/core/auto_generated/geometry/qgsbox3d.sip.in
+++ b/python/core/auto_generated/geometry/qgsbox3d.sip.in
@@ -385,13 +385,13 @@ If the specified precision is less than 0, a suitable minimum precision is used.
 .. versionadded:: 3.34
 %End
 
-    QgsBox3d operator-( const QgsVector3D &v ) const;
+    QgsBox3D operator-( const QgsVector3D &v ) const;
 
-    QgsBox3d operator+( const QgsVector3D &v ) const;
+    QgsBox3D operator+( const QgsVector3D &v ) const;
 
-    QgsBox3d &operator-=( const QgsVector3D &v );
+    QgsBox3D &operator-=( const QgsVector3D &v );
 
-    QgsBox3d &operator+=( const QgsVector3D &v );
+    QgsBox3D &operator+=( const QgsVector3D &v );
 
 };
 
diff --git a/src/core/geometry/qgsbox3d.cpp b/src/core/geometry/qgsbox3d.cpp
index 78bda1ce354..d9c6139d7a9 100644
--- a/src/core/geometry/qgsbox3d.cpp
+++ b/src/core/geometry/qgsbox3d.cpp
@@ -304,19 +304,19 @@ QString QgsBox3D::toString( int precision ) const
   return rep;
 }
 
-QgsBox3d QgsBox3d::operator-( const QgsVector3D &v ) const
+QgsBox3D QgsBox3D::operator-( const QgsVector3D &v ) const
 {
-  return QgsBox3d( mBounds2d.xMinimum() - v.x(), mBounds2d.yMinimum() - v.y(), mZmin - v.z(),
+  return QgsBox3D( mBounds2d.xMinimum() - v.x(), mBounds2d.yMinimum() - v.y(), mZmin - v.z(),
                    mBounds2d.xMaximum() - v.x(), mBounds2d.yMaximum() - v.y(), mZmax - v.z() );
 }
 
-QgsBox3d QgsBox3d::operator+( const QgsVector3D &v ) const
+QgsBox3D QgsBox3D::operator+( const QgsVector3D &v ) const
 {
-  return QgsBox3d( mBounds2d.xMinimum() + v.x(), mBounds2d.yMinimum() + v.y(), mZmin + v.z(),
+  return QgsBox3D( mBounds2d.xMinimum() + v.x(), mBounds2d.yMinimum() + v.y(), mZmin + v.z(),
                    mBounds2d.xMaximum() + v.x(), mBounds2d.yMaximum() + v.y(), mZmax + v.z() );
 }
 
-QgsBox3d &QgsBox3d::operator-=( const QgsVector3D &v )
+QgsBox3D &QgsBox3D::operator-=( const QgsVector3D &v )
 {
   mBounds2d.set( mBounds2d.xMinimum() - v.x(), mBounds2d.yMinimum() - v.y(),
                  mBounds2d.xMaximum() - v.x(), mBounds2d.yMaximum() - v.y() );
@@ -325,7 +325,7 @@ QgsBox3d &QgsBox3d::operator-=( const QgsVector3D &v )
   return *this;
 }
 
-QgsBox3d &QgsBox3d::operator+=( const QgsVector3D &v )
+QgsBox3D &QgsBox3D::operator+=( const QgsVector3D &v )
 {
   mBounds2d.set( mBounds2d.xMinimum() + v.x(), mBounds2d.yMinimum() + v.y(),
                  mBounds2d.xMaximum() + v.x(), mBounds2d.yMaximum() + v.y() );
diff --git a/src/core/geometry/qgsbox3d.h b/src/core/geometry/qgsbox3d.h
index dfb78f9c89d..7b24dd3ff37 100644
--- a/src/core/geometry/qgsbox3d.h
+++ b/src/core/geometry/qgsbox3d.h
@@ -388,25 +388,25 @@ class CORE_EXPORT QgsBox3D
      * Returns a box offset from this one in the direction of the reversed vector.
      * \since QGIS 3.34
      */
-    QgsBox3d operator-( const QgsVector3D &v ) const;
+    QgsBox3D operator-( const QgsVector3D &v ) const;
 
     /**
      * Returns a box offset from this one in the direction of the vector.
      * \since QGIS 3.34
      */
-    QgsBox3d operator+( const QgsVector3D &v ) const;
+    QgsBox3D operator+( const QgsVector3D &v ) const;
 
     /**
      * Moves this box in the direction of the reversed vector.
      * \since QGIS 3.34
      */
-    QgsBox3d &operator-=( const QgsVector3D &v );
+    QgsBox3D &operator-=( const QgsVector3D &v );
 
     /**
      * Moves this box in the direction of the vector.
      * \since QGIS 3.34
      */
-    QgsBox3d &operator+=( const QgsVector3D &v );
+    QgsBox3D &operator+=( const QgsVector3D &v );
 
   private: