summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin T. H. Sandsmark <martin.sandsmark@kde.org>2016-07-11 20:29:20 (GMT)
committerMartin T. H. Sandsmark <martin.sandsmark@kde.org>2016-07-11 20:29:20 (GMT)
commitd29ec080077962affda48e3518e5a49210dfc961 (patch)
treedfab6f5038491e41ff475234a2815b847892ce6a
parent004f67410ddc23d5e1e36d7a09fa872b5497b9d4 (diff)
remove invalid null pointer checks
-rw-r--r--core/area.h17
1 files changed, 1 insertions, 16 deletions
diff --git a/core/area.h b/core/area.h
index a595f42..ccd9fbe 100644
--- a/core/area.h
+++ b/core/area.h
@@ -656,9 +656,6 @@ void RegularArea<NormalizedShape, Shape>::simplify()
template <class NormalizedShape, class Shape>
bool RegularArea<NormalizedShape, Shape>::isNull() const
{
- if ( !this )
- return false;
-
if ( this->isEmpty() )
return false;
@@ -673,9 +670,6 @@ bool RegularArea<NormalizedShape, Shape>::isNull() const
template <class NormalizedShape, class Shape>
bool RegularArea<NormalizedShape, Shape>::intersects( const NormalizedShape& rect ) const
{
- if ( !this )
- return false;
-
if ( this->isEmpty() )
return false;
@@ -725,9 +719,6 @@ void RegularArea<NormalizedShape, Shape>::appendArea( const RegularArea<Normaliz
template <class NormalizedShape, class Shape>
void RegularArea<NormalizedShape, Shape>::appendShape( const NormalizedShape& shape, MergeSide side )
{
- if ( !this )
- return;
-
int size = this->count();
// if the list is empty, adds the shape normally
if ( size == 0 )
@@ -800,9 +791,6 @@ void RegularArea<NormalizedShape, Shape>::appendShape( const NormalizedShape& sh
template <class NormalizedShape, class Shape>
bool RegularArea<NormalizedShape, Shape>::contains( double x, double y ) const
{
- if ( !this )
- return false;
-
if ( this->isEmpty() )
return false;
@@ -829,7 +817,7 @@ bool RegularArea<NormalizedShape, Shape>::contains( const NormalizedShape& shape
template <class NormalizedShape, class Shape>
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>();
QList<Shape> ret;
@@ -848,9 +836,6 @@ QList<Shape> RegularArea<NormalizedShape, Shape>::geometry( int xScale, int ySca
template <class NormalizedShape, class Shape>
void RegularArea<NormalizedShape, Shape>::transform( const QTransform &matrix )
{
- if ( !this )
- return;
-
if ( this->isEmpty() )
return;