Hackfest2019: Rm tautological tests

16 files changed, 0 insertions, 17 deletions

diff --git a/src/object/filters/blend.cpp b/src/object/filters/blend.cpp
index f866edf51..9c0aa166c 100644
--- a/src/object/filters/blend.cpp
+++ b/src/object/filters/blend.cpp
@@ -265,7 +265,6 @@ Inkscape::XML::Node* SPFeBlend::write(Inkscape::XML::Document *doc, Inkscape::XM
 }
 
 void SPFeBlend::build_renderer(Inkscape::Filters::Filter* filter) {
-    g_assert(this != nullptr);
     g_assert(filter != nullptr);
 
     int primitive_n = filter->add_primitive(Inkscape::Filters::NR_FILTER_BLEND);
diff --git a/src/object/filters/colormatrix.cpp b/src/object/filters/colormatrix.cpp
index 0783c1887..e35bcb26e 100644
--- a/src/object/filters/colormatrix.cpp
+++ b/src/object/filters/colormatrix.cpp
@@ -134,7 +134,6 @@ Inkscape::XML::Node* SPFeColorMatrix::write(Inkscape::XML::Document *doc, Inksca
 }
 
 void SPFeColorMatrix::build_renderer(Inkscape::Filters::Filter* filter) {
-    g_assert(this != nullptr);
     g_assert(filter != nullptr);
 
     int primitive_n = filter->add_primitive(Inkscape::Filters::NR_FILTER_COLORMATRIX);
diff --git a/src/object/filters/componenttransfer.cpp b/src/object/filters/componenttransfer.cpp
index 1a3ce93f8..344e3436c 100644
--- a/src/object/filters/componenttransfer.cpp
+++ b/src/object/filters/componenttransfer.cpp
@@ -160,7 +160,6 @@ Inkscape::XML::Node* SPFeComponentTransfer::write(Inkscape::XML::Document *doc,
 }
 
 void SPFeComponentTransfer::build_renderer(Inkscape::Filters::Filter* filter) {
-    g_assert(this != nullptr);
     g_assert(filter != nullptr);
 
     int primitive_n = filter->add_primitive(Inkscape::Filters::NR_FILTER_COMPONENTTRANSFER);
diff --git a/src/object/filters/composite.cpp b/src/object/filters/composite.cpp
index 1bd5f3427..181aeb27e 100644
--- a/src/object/filters/composite.cpp
+++ b/src/object/filters/composite.cpp
@@ -303,7 +303,6 @@ Inkscape::XML::Node* SPFeComposite::write(Inkscape::XML::Document *doc, Inkscape
 }
 
 void SPFeComposite::build_renderer(Inkscape::Filters::Filter* filter) {
-    g_assert(this != nullptr);
     g_assert(filter != nullptr);
 
     int primitive_n = filter->add_primitive(Inkscape::Filters::NR_FILTER_COMPOSITE);
diff --git a/src/object/filters/convolvematrix.cpp b/src/object/filters/convolvematrix.cpp
index 9b299b243..658a383c1 100644
--- a/src/object/filters/convolvematrix.cpp
+++ b/src/object/filters/convolvematrix.cpp
@@ -288,7 +288,6 @@ Inkscape::XML::Node* SPFeConvolveMatrix::write(Inkscape::XML::Document *doc, Ink
 }
 
 void SPFeConvolveMatrix::build_renderer(Inkscape::Filters::Filter* filter) {
-    g_assert(this != nullptr);
     g_assert(filter != nullptr);
 
     int primitive_n = filter->add_primitive(Inkscape::Filters::NR_FILTER_CONVOLVEMATRIX);
diff --git a/src/object/filters/diffuselighting.cpp b/src/object/filters/diffuselighting.cpp
index fedf4aef4..bd64c44ba 100644
--- a/src/object/filters/diffuselighting.cpp
+++ b/src/object/filters/diffuselighting.cpp
@@ -277,7 +277,6 @@ static void sp_feDiffuseLighting_children_modified(SPFeDiffuseLighting *sp_diffu
 }
 
 void SPFeDiffuseLighting::build_renderer(Inkscape::Filters::Filter* filter) {
-    g_assert(this != nullptr);
     g_assert(filter != nullptr);
 
     int primitive_n = filter->add_primitive(Inkscape::Filters::NR_FILTER_DIFFUSELIGHTING);
diff --git a/src/object/filters/displacementmap.cpp b/src/object/filters/displacementmap.cpp
index 7621fe2eb..99556571e 100644
--- a/src/object/filters/displacementmap.cpp
+++ b/src/object/filters/displacementmap.cpp
@@ -229,7 +229,6 @@ Inkscape::XML::Node* SPFeDisplacementMap::write(Inkscape::XML::Document *doc, In
 }
 
 void SPFeDisplacementMap::build_renderer(Inkscape::Filters::Filter* filter) {
-    g_assert(this != nullptr);
     g_assert(filter != nullptr);
 
     int primitive_n = filter->add_primitive(Inkscape::Filters::NR_FILTER_DISPLACEMENTMAP);
diff --git a/src/object/filters/flood.cpp b/src/object/filters/flood.cpp
index 3fa09a98a..ed3b94a4b 100644
--- a/src/object/filters/flood.cpp
+++ b/src/object/filters/flood.cpp
@@ -154,7 +154,6 @@ Inkscape::XML::Node* SPFeFlood::write(Inkscape::XML::Document *doc, Inkscape::XM
 }
 
 void SPFeFlood::build_renderer(Inkscape::Filters::Filter* filter) {
-    g_assert(this != nullptr);
     g_assert(filter != nullptr);
 
     int primitive_n = filter->add_primitive(Inkscape::Filters::NR_FILTER_FLOOD);
diff --git a/src/object/filters/image.cpp b/src/object/filters/image.cpp
index c0169c94b..ea88d81c8 100644
--- a/src/object/filters/image.cpp
+++ b/src/object/filters/image.cpp
@@ -232,7 +232,6 @@ Inkscape::XML::Node* SPFeImage::write(Inkscape::XML::Document *doc, Inkscape::XM
 }
 
 void SPFeImage::build_renderer(Inkscape::Filters::Filter* filter) {
-    g_assert(this != nullptr);
     g_assert(filter != nullptr);
 
     int primitive_n = filter->add_primitive(Inkscape::Filters::NR_FILTER_IMAGE);
diff --git a/src/object/filters/merge.cpp b/src/object/filters/merge.cpp
index 9ed668a75..5fd77c5b9 100644
--- a/src/object/filters/merge.cpp
+++ b/src/object/filters/merge.cpp
@@ -82,7 +82,6 @@ Inkscape::XML::Node* SPFeMerge::write(Inkscape::XML::Document *doc, Inkscape::XM
 }
 
 void SPFeMerge::build_renderer(Inkscape::Filters::Filter* filter) {
-    g_assert(this != nullptr);
     g_assert(filter != nullptr);
 
     int primitive_n = filter->add_primitive(Inkscape::Filters::NR_FILTER_MERGE);
diff --git a/src/object/filters/morphology.cpp b/src/object/filters/morphology.cpp
index c7d885e32..02ae0050b 100644
--- a/src/object/filters/morphology.cpp
+++ b/src/object/filters/morphology.cpp
@@ -135,7 +135,6 @@ Inkscape::XML::Node* SPFeMorphology::write(Inkscape::XML::Document *doc, Inkscap
 }
 
 void SPFeMorphology::build_renderer(Inkscape::Filters::Filter* filter) {
-    g_assert(this != nullptr);
     g_assert(filter != nullptr);
 
     int primitive_n = filter->add_primitive(Inkscape::Filters::NR_FILTER_MORPHOLOGY);
diff --git a/src/object/filters/offset.cpp b/src/object/filters/offset.cpp
index 4d71de80d..53703480a 100644
--- a/src/object/filters/offset.cpp
+++ b/src/object/filters/offset.cpp
@@ -111,7 +111,6 @@ Inkscape::XML::Node* SPFeOffset::write(Inkscape::XML::Document *doc, Inkscape::X
 }
 
 void SPFeOffset::build_renderer(Inkscape::Filters::Filter* filter) {
-    g_assert(this != nullptr);
     g_assert(filter != nullptr);
 
     int primitive_n = filter->add_primitive(Inkscape::Filters::NR_FILTER_OFFSET);
diff --git a/src/object/filters/specularlighting.cpp b/src/object/filters/specularlighting.cpp
index e89f247ed..52af6ee68 100644
--- a/src/object/filters/specularlighting.cpp
+++ b/src/object/filters/specularlighting.cpp
@@ -289,7 +289,6 @@ static void sp_feSpecularLighting_children_modified(SPFeSpecularLighting *sp_spe
 }
 
 void SPFeSpecularLighting::build_renderer(Inkscape::Filters::Filter* filter) {
-    g_assert(this != nullptr);
     g_assert(filter != nullptr);
 
     int primitive_n = filter->add_primitive(Inkscape::Filters::NR_FILTER_SPECULARLIGHTING);
diff --git a/src/object/filters/tile.cpp b/src/object/filters/tile.cpp
index 4b1217a22..b8a22b8cd 100644
--- a/src/object/filters/tile.cpp
+++ b/src/object/filters/tile.cpp
@@ -86,7 +86,6 @@ Inkscape::XML::Node* SPFeTile::write(Inkscape::XML::Document *doc, Inkscape::XML
 }
 
 void SPFeTile::build_renderer(Inkscape::Filters::Filter* filter) {
-    g_assert(this != nullptr);
     g_assert(filter != nullptr);
 
     int primitive_n = filter->add_primitive(Inkscape::Filters::NR_FILTER_TILE);
diff --git a/src/object/filters/turbulence.cpp b/src/object/filters/turbulence.cpp
index 9d3f594fb..add65fa1e 100644
--- a/src/object/filters/turbulence.cpp
+++ b/src/object/filters/turbulence.cpp
@@ -199,7 +199,6 @@ Inkscape::XML::Node* SPFeTurbulence::write(Inkscape::XML::Document *doc, Inkscap
 }
 
 void SPFeTurbulence::build_renderer(Inkscape::Filters::Filter* filter) {
-    g_assert(this != nullptr);
     g_assert(filter != nullptr);
 
     int primitive_n = filter->add_primitive(Inkscape::Filters::NR_FILTER_TURBULENCE);
diff --git a/src/object/sp-mask.cpp b/src/object/sp-mask.cpp
index 7b6a49ed6..ca290e013 100644
--- a/src/object/sp-mask.cpp
+++ b/src/object/sp-mask.cpp
@@ -238,7 +238,6 @@ sp_mask_create (std::vector<Inkscape::XML::Node*> &reprs, SPDocument *document)
 }
 
 Inkscape::DrawingItem *SPMask::sp_mask_show(Inkscape::Drawing &drawing, unsigned int key) {
-	g_return_val_if_fail (this != nullptr, NULL);
 	g_return_val_if_fail (SP_IS_MASK (this), NULL);
 
 	Inkscape::DrawingGroup *ai = new Inkscape::DrawingGroup(drawing);
@@ -264,7 +263,6 @@ Inkscape::DrawingItem *SPMask::sp_mask_show(Inkscape::Drawing &drawing, unsigned
 }
 
 void SPMask::sp_mask_hide(unsigned int key) {
-	g_return_if_fail (this != nullptr);
 	g_return_if_fail (SP_IS_MASK (this));
 
 	for (auto& child: children) {