Commit d29ec080 authored by Martin Tobias Holmedahl Sandsmark's avatar Martin Tobias Holmedahl Sandsmark
Browse files

remove invalid null pointer checks

parent 004f6741
...@@ -656,9 +656,6 @@ void RegularArea<NormalizedShape, Shape>::simplify() ...@@ -656,9 +656,6 @@ void RegularArea<NormalizedShape, Shape>::simplify()
template <class NormalizedShape, class Shape> template <class NormalizedShape, class Shape>
bool RegularArea<NormalizedShape, Shape>::isNull() const bool RegularArea<NormalizedShape, Shape>::isNull() const
{ {
if ( !this )
return false;
if ( this->isEmpty() ) if ( this->isEmpty() )
return false; return false;
...@@ -673,9 +670,6 @@ bool RegularArea<NormalizedShape, Shape>::isNull() const ...@@ -673,9 +670,6 @@ bool RegularArea<NormalizedShape, Shape>::isNull() const
template <class NormalizedShape, class Shape> template <class NormalizedShape, class Shape>
bool RegularArea<NormalizedShape, Shape>::intersects( const NormalizedShape& rect ) const bool RegularArea<NormalizedShape, Shape>::intersects( const NormalizedShape& rect ) const
{ {
if ( !this )
return false;
if ( this->isEmpty() ) if ( this->isEmpty() )
return false; return false;
...@@ -725,9 +719,6 @@ void RegularArea<NormalizedShape, Shape>::appendArea( const RegularArea<Normaliz ...@@ -725,9 +719,6 @@ void RegularArea<NormalizedShape, Shape>::appendArea( const RegularArea<Normaliz
template <class NormalizedShape, class Shape> template <class NormalizedShape, class Shape>
void RegularArea<NormalizedShape, Shape>::appendShape( const NormalizedShape& shape, MergeSide side ) void RegularArea<NormalizedShape, Shape>::appendShape( const NormalizedShape& shape, MergeSide side )
{ {
if ( !this )
return;
int size = this->count(); int size = this->count();
// if the list is empty, adds the shape normally // if the list is empty, adds the shape normally
if ( size == 0 ) if ( size == 0 )
...@@ -800,9 +791,6 @@ void RegularArea<NormalizedShape, Shape>::appendShape( const NormalizedShape& sh ...@@ -800,9 +791,6 @@ void RegularArea<NormalizedShape, Shape>::appendShape( const NormalizedShape& sh
template <class NormalizedShape, class Shape> template <class NormalizedShape, class Shape>
bool RegularArea<NormalizedShape, Shape>::contains( double x, double y ) const bool RegularArea<NormalizedShape, Shape>::contains( double x, double y ) const
{ {
if ( !this )
return false;
if ( this->isEmpty() ) if ( this->isEmpty() )
return false; return false;
...@@ -829,7 +817,7 @@ bool RegularArea<NormalizedShape, Shape>::contains( const NormalizedShape& shape ...@@ -829,7 +817,7 @@ bool RegularArea<NormalizedShape, Shape>::contains( const NormalizedShape& shape
template <class NormalizedShape, class Shape> template <class NormalizedShape, class Shape>
QList<Shape> RegularArea<NormalizedShape, Shape>::geometry( int xScale, int yScale, int dx, int dy ) const QList<Shape> RegularArea<NormalizedShape, Shape>::geometry( int xScale, int yScale, int dx, int dy ) const
{ {
if ( !this || this->isEmpty() ) if ( this->isEmpty() )
return QList<Shape>(); return QList<Shape>();
QList<Shape> ret; QList<Shape> ret;
...@@ -848,9 +836,6 @@ QList<Shape> RegularArea<NormalizedShape, Shape>::geometry( int xScale, int ySca ...@@ -848,9 +836,6 @@ QList<Shape> RegularArea<NormalizedShape, Shape>::geometry( int xScale, int ySca
template <class NormalizedShape, class Shape> template <class NormalizedShape, class Shape>
void RegularArea<NormalizedShape, Shape>::transform( const QTransform &matrix ) void RegularArea<NormalizedShape, Shape>::transform( const QTransform &matrix )
{ {
if ( !this )
return;
if ( this->isEmpty() ) if ( this->isEmpty() )
return; return;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment