mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2025-12-17 20:50:34 +01:00
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
This commit is contained in:
@@ -89,16 +89,27 @@ int DiagramContent::removeNonMovableItems()
|
|||||||
{
|
{
|
||||||
int count_ = 0;
|
int count_ = 0;
|
||||||
|
|
||||||
foreach(Element *elmt, elements)
|
foreach(Element *elmt, elements) {
|
||||||
if (!elmt->isMovable()) elements.remove(elmt); ++count_;
|
if (!elmt->isMovable()) {
|
||||||
foreach(DiagramImageItem *img, images)
|
elements.remove(elmt);
|
||||||
if (!img->isMovable()) images.remove(img); ++count_;
|
++count_;
|
||||||
foreach (QetShapeItem *shape, shapes)
|
}
|
||||||
if (!shape->isMovable()) shapes.remove(shape); ++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_;
|
return count_;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@param filter Types desires
|
@param filter Types desires
|
||||||
@return la liste des items formant le contenu du schema
|
@return la liste des items formant le contenu du schema
|
||||||
|
|||||||
Reference in New Issue
Block a user