From 05a6cdb8047e9ffedeb27ebc025ea7b700402e29 Mon Sep 17 00:00:00 2001 From: Alexander Valavanis Date: Mon, 27 May 2019 11:35:12 +0100 Subject: Hackfest2019: Rm tautological tests --- src/gradient-drag.cpp | 4 ++-- src/live_effects/lpeobject.cpp | 1 - src/object/filters/blend.cpp | 1 - src/object/filters/colormatrix.cpp | 1 - src/object/filters/componenttransfer.cpp | 1 - src/object/filters/composite.cpp | 1 - src/object/filters/convolvematrix.cpp | 1 - src/object/filters/diffuselighting.cpp | 1 - src/object/filters/displacementmap.cpp | 1 - src/object/filters/flood.cpp | 1 - src/object/filters/image.cpp | 1 - src/object/filters/merge.cpp | 1 - src/object/filters/morphology.cpp | 1 - src/object/filters/offset.cpp | 1 - src/object/filters/specularlighting.cpp | 1 - src/object/filters/tile.cpp | 1 - src/object/filters/turbulence.cpp | 1 - src/object/sp-mask.cpp | 2 -- src/style-internal.cpp | 1 - src/ui/dialog/filedialogimpl-win32.cpp | 2 -- src/ui/tools/pen-tool.cpp | 1 - 21 files changed, 2 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp index 9f9a29765..681268991 100644 --- a/src/gradient-drag.cpp +++ b/src/gradient-drag.cpp @@ -1546,7 +1546,7 @@ void GrDragger::moveThisToDraggable(SPItem *item, GrPointType point_type, gint p for (std::vector::const_iterator j = draggables.begin(); j != draggables.end(); ++j ) { GrDraggable *da = *j; if ( (da->item == item) && - (point_type == -1 || da->point_type == point_type) && + (da->point_type == point_type) && (point_i == -1 || da->point_i == point_i) && (da->fill_or_stroke == fill_or_stroke) ) { // Don't move initial draggable @@ -1743,7 +1743,7 @@ GrDragger *GrDrag::getDraggerFor(SPItem *item, GrPointType point_type, gint poin for (std::vector::const_iterator j = dragger->draggables.begin(); j != dragger->draggables.end(); ++j ) { GrDraggable *da2 = *j; if ( (da2->item == item) && - (point_type == -1 || da2->point_type == point_type) && // -1 means this does not matter + (da2->point_type == point_type) && (point_i == -1 || da2->point_i == point_i) && // -1 means this does not matter (da2->fill_or_stroke == fill_or_stroke)) { return (dragger); diff --git a/src/live_effects/lpeobject.cpp b/src/live_effects/lpeobject.cpp index cb3e4ff55..efd5c0219 100644 --- a/src/live_effects/lpeobject.cpp +++ b/src/live_effects/lpeobject.cpp @@ -45,7 +45,6 @@ LivePathEffectObject::~LivePathEffectObject() = default; * Virtual build: set livepatheffect attributes from its associated XML node. */ void LivePathEffectObject::build(SPDocument *document, Inkscape::XML::Node *repr) { - g_assert(this != nullptr); g_assert(SP_IS_OBJECT(this)); SPObject::build(document, repr); 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 &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) { diff --git a/src/style-internal.cpp b/src/style-internal.cpp index beee8161d..e88cad5c0 100644 --- a/src/style-internal.cpp +++ b/src/style-internal.cpp @@ -377,7 +377,6 @@ SPILength::merge( const SPIBase* const parent ) { switch (p->unit) { case SP_CSS_UNIT_EM: case SP_CSS_UNIT_EX: - g_assert( &style->font_size != nullptr && &p->style->font_size != nullptr ); value *= p->style->font_size.computed / style->font_size.computed; /** \todo * FIXME: Have separate ex ratio parameter. diff --git a/src/ui/dialog/filedialogimpl-win32.cpp b/src/ui/dialog/filedialogimpl-win32.cpp index d993c2113..3964091cc 100644 --- a/src/ui/dialog/filedialogimpl-win32.cpp +++ b/src/ui/dialog/filedialogimpl-win32.cpp @@ -462,7 +462,6 @@ void FileOpenDialogImplWin32::GetOpenFileName_thread() { OPENFILENAMEW ofn; - g_assert(this != NULL); g_assert(_mutex != NULL); WCHAR* current_directory_string = (WCHAR*)g_utf8_to_utf16( @@ -1753,7 +1752,6 @@ void FileSaveDialogImplWin32::GetSaveFileName_thread() { OPENFILENAMEW ofn; - g_assert(this != NULL); g_assert(_main_loop != NULL); WCHAR* current_directory_string = (WCHAR*)g_utf8_to_utf16( diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp index 726703ebd..70ab0f8db 100644 --- a/src/ui/tools/pen-tool.cpp +++ b/src/ui/tools/pen-tool.cpp @@ -1285,7 +1285,6 @@ void PenTool::_setInitialPoint(Geom::Point const p) { * two parameters ("angle %3.2f°, distance %s"). */ void PenTool::_setAngleDistanceStatusMessage(Geom::Point const p, int pc_point_to_compare, gchar const *message) { - g_assert(this != nullptr); g_assert((pc_point_to_compare == 0) || (pc_point_to_compare == 3)); // exclude control handles g_assert(message != nullptr); -- cgit v1.2.3