From f7f75be3326b7849c30803bbc7454b0ca1cbea18 Mon Sep 17 00:00:00 2001 From: scorpio810 Date: Sat, 16 Apr 2016 17:20:57 +0000 Subject: [PATCH] Fix GCC 6 warnings, thanks Remi Collet for this patch git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4441 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/diagramcontent.cpp | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/sources/diagramcontent.cpp b/sources/diagramcontent.cpp index 7e68d2c2d..f18d29acd 100644 --- a/sources/diagramcontent.cpp +++ b/sources/diagramcontent.cpp @@ -89,16 +89,27 @@ int DiagramContent::removeNonMovableItems() { int count_ = 0; - foreach(Element *elmt, elements) - if (!elmt->isMovable()) elements.remove(elmt); ++count_; - foreach(DiagramImageItem *img, images) - if (!img->isMovable()) images.remove(img); ++count_; - foreach (QetShapeItem *shape, shapes) - if (!shape->isMovable()) shapes.remove(shape); ++count_; + foreach(Element *elmt, elements) { + if (!elmt->isMovable()) { + elements.remove(elmt); + ++count_; + } + } + foreach(DiagramImageItem *img, images) { + if (!img->isMovable()) { + images.remove(img); + ++count_; + } + } + foreach (QetShapeItem *shape, shapes) { + if (!shape->isMovable()) { + shapes.remove(shape); + ++count_; + } + } return count_; } - /** @param filter Types desires @return la liste des items formant le contenu du schema