diff --git a/mapeditor/scenelayer.cpp b/mapeditor/scenelayer.cpp index 706c0e2a7..49a25f452 100644 --- a/mapeditor/scenelayer.cpp +++ b/mapeditor/scenelayer.cpp @@ -194,7 +194,7 @@ void AbstractViewportLayer::redraw(const std::vector & areas) redrawSectors(intersectingSectors); } -QRectF AbstractViewportLayer::getObjectArea(const CGObjectInstance * object) +QRectF AbstractViewportLayer::getObjectArea(const CGObjectInstance * object) const { auto pos = object->pos; int x = ((pos.x + 1) * tileSize) - (object->getWidth() * tileSize); //Qt set 0,0 point on the top right corner, CGObjectInstance on the bottom left @@ -233,13 +233,13 @@ void AbstractViewportLayer::redrawSectors(std::set & sectors) } } -const QList AbstractViewportLayer::getAllSectors() //returning const is necessary to avoid "range-loop might detach Qt container" problem +const QList AbstractViewportLayer::getAllSectors() const //returning const is necessary to avoid "range-loop might detach Qt container" problem { QList emptyList; return items ? items->childItems() : emptyList; } -std::set AbstractViewportLayer::getContainingSectors(const std::vector & tiles) +std::set AbstractViewportLayer::getContainingSectors(const std::vector & tiles) const { std::set result; for (QGraphicsItem * existingSector : getAllSectors()) { @@ -255,7 +255,7 @@ std::set AbstractViewportLayer::getContainingSectors(const std: return result; } -std::set AbstractViewportLayer::getIntersectingSectors(const std::vector & areas) +std::set AbstractViewportLayer::getIntersectingSectors(const std::vector & areas) const { std::set result; for (QGraphicsItem * existingSector : getAllSectors()) { diff --git a/mapeditor/scenelayer.h b/mapeditor/scenelayer.h index c832f23da..ec55682a3 100644 --- a/mapeditor/scenelayer.h +++ b/mapeditor/scenelayer.h @@ -75,15 +75,15 @@ protected: void redrawWithSurroundingTiles(const std::vector & tiles); void redraw(const std::set & objects); void redraw(const std::vector & areas); - QRectF getObjectArea(const CGObjectInstance * object); + QRectF getObjectArea(const CGObjectInstance * object) const; private: void addSector(QGraphicsItem * item); void removeSector(QGraphicsItem * item); void redrawSectors(std::set & items); - const QList getAllSectors(); + const QList getAllSectors() const; - std::set getContainingSectors(const std::vector & tiles); - std::set getIntersectingSectors(const std::vector & areas); + std::set getContainingSectors(const std::vector & tiles) const; + std::set getIntersectingSectors(const std::vector & areas) const; std::unique_ptr items; const int sectorSizeInTiles = 10; const int sectorSize = sectorSizeInTiles * tileSize;