Skip to content
Permalink
Browse files

Validation hint shouldn't be shared

(cherry picked from commit b01f0ec)
  • Loading branch information
nyalldawson committed Jan 21, 2020
1 parent 934b767 commit d5eb52385cf0eaf71bf330c7a695d22351eb366f
@@ -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();
d->mValidationHint = html;
mValidationHint = html;
}

QString QgsCoordinateReferenceSystem::validationHint()
{
return d->mValidationHint;
return mValidationHint;
}

/// Copied from QgsCustomProjectionDialog ///
@@ -960,6 +960,8 @@ class CORE_EXPORT QgsCoordinateReferenceSystem

QExplicitlySharedDataPointer<QgsCoordinateReferenceSystemPrivate> d;

QString mValidationHint;

#if PROJ_VERSION_MAJOR>=6
friend class QgsProjContext;

@@ -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

0 comments on commit d5eb523

Please sign in to comment.
You can’t perform that action at this time.