Const correctness for QgsGeometry::Error

This commit is contained in:
Matthias Kuhn 2018-09-07 10:57:37 +02:00
parent a6e0e39bcd
commit 8ba442f14a
3 changed files with 32 additions and 15 deletions

View File

@ -1481,9 +1481,10 @@ by calling `error()` on the returned geometry.
explicit Error( const QString &m );
Error( const QString &m, const QgsPointXY &p );
QString what();
QgsPointXY where();
bool hasWhere();
QString what() const;
QgsPointXY where() const;
bool hasWhere() const;
};
enum ValidationMethod

View File

@ -3288,3 +3288,18 @@ QDataStream &operator>>( QDataStream &in, QgsGeometry &geometry )
return in;
}
QString QgsGeometry::Error::what() const
{
return mMessage;
}
QgsPointXY QgsGeometry::Error::where() const
{
return mLocation;
}
bool QgsGeometry::Error::hasWhere() const
{
return mHasLocation;
}

View File

@ -1418,27 +1418,28 @@ class CORE_EXPORT QgsGeometry
*/
class CORE_EXPORT Error
{
QString message;
QgsPointXY location;
bool hasLocation = false;
public:
Error()
: message( QStringLiteral( "none" ) )
: mMessage( QStringLiteral( "none" ) )
{}
explicit Error( const QString &m )
: message( m )
: mMessage( m )
{}
Error( const QString &m, const QgsPointXY &p )
: message( m )
, location( p )
, hasLocation( true ) {}
: mMessage( m )
, mLocation( p )
, mHasLocation( true ) {}
QString what() { return message; }
QgsPointXY where() { return location; }
bool hasWhere() { return hasLocation; }
QString what() const;
QgsPointXY where() const;
bool hasWhere() const;
private:
QString mMessage;
QgsPointXY mLocation;
bool mHasLocation = false;
};
/**