Validation hint shouldn't be shared

(cherry picked from commit b01f0ec2d1ddd0614f0ac7032133439c979fc32e)
qgis · Jan 22, 2020 · d5eb523 · d5eb523
1 parent 934b767
commit d5eb523
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -126,12 +126,14 @@ QgsCoordinateReferenceSystem::QgsCoordinateReferenceSystem( const long id, CrsTy
 
 QgsCoordinateReferenceSystem::QgsCoordinateReferenceSystem( const QgsCoordinateReferenceSystem &srs )  //NOLINT
   : d( srs.d )
+  , mValidationHint( srs.mValidationHint )
 {
 }
 
 QgsCoordinateReferenceSystem &QgsCoordinateReferenceSystem::operator=( const QgsCoordinateReferenceSystem &srs )  //NOLINT
 {
   d = srs.d;
+  mValidationHint = srs.mValidationHint;
   return *this;
 }
 
@@ -2235,13 +2237,12 @@ void QgsCoordinateReferenceSystem::debugPrint()
 
 void QgsCoordinateReferenceSystem::setValidationHint( const QString &html )
 {
-  d.detach();
+  mValidationHint = html;
-  d->mValidationHint = html;
 }
 
 QString QgsCoordinateReferenceSystem::validationHint()
 {
-  return d->mValidationHint;
+  return mValidationHint;
 }
 
 /// Copied from QgsCustomProjectionDialog ///

diff --git a/src/core/qgscoordinatereferencesystem.h b/src/core/qgscoordinatereferencesystem.h
@@ -960,6 +960,8 @@ class CORE_EXPORT QgsCoordinateReferenceSystem
 
     QExplicitlySharedDataPointer<QgsCoordinateReferenceSystemPrivate> d;
 
+    QString mValidationHint;
+
 #if PROJ_VERSION_MAJOR>=6
     friend class QgsProjContext;
 

diff --git a/src/core/qgscoordinatereferencesystem_p.h b/src/core/qgscoordinatereferencesystem_p.h
@@ -173,7 +173,6 @@ class QgsCoordinateReferenceSystemPrivate : public QSharedData
     OGRSpatialReferenceH mCRS;
 #endif
 
-    QString mValidationHint;
     mutable QString mProj4;
 
     //! True if presence of an inverted axis needs to be recalculated