declare some methods as const

KDE · Oct 30, 2017 · bffd0dc · bffd0dc
1 parent 643e85c
commit bffd0dc
Show file tree

Hide file tree

Showing 20 changed files with 36 additions and 36 deletions.
diff --git a/src/lib/marble/GeoPainter.cpp b/src/lib/marble/GeoPainter.cpp
@@ -548,7 +548,7 @@ QRegion GeoPainter::regionFromPixmapRect(const GeoDataCoordinates & centerCoordi
 }
 
 void GeoPainter::polygonsFromLineString( const GeoDataLineString &lineString,
-                                         QVector<QPolygonF*> &polygons )
+                                         QVector<QPolygonF*> &polygons ) const
 {
     // Immediately leave this method now if:
     // - the object is not visible in the viewport or if

diff --git a/src/lib/marble/GeoPainter.h b/src/lib/marble/GeoPainter.h
@@ -321,7 +321,7 @@ class MARBLE_EXPORT GeoPainter : public ClipPainter
     \see GeoDataLineString
 */
     void polygonsFromLineString( const GeoDataLineString &lineString,
-                                       QVector<QPolygonF*> &polygons );
+                                       QVector<QPolygonF*> &polygons) const;
 
 
 /*!

diff --git a/src/lib/marble/MarbleInputHandler.cpp b/src/lib/marble/MarbleInputHandler.cpp
@@ -973,7 +973,7 @@ void MarbleDefaultInputHandler::handlePressAndHold()
     handleMouseButtonPressAndHold(QPoint(d->m_leftPressedX, d->m_leftPressedY));
 }
 
-QPointer<AbstractDataPluginItem> MarbleDefaultInputHandler::lastToolTipItem()
+const AbstractDataPluginItem *MarbleDefaultInputHandler::lastToolTipItem() const
 {
     return d->m_lastToolTipItem;
 }
@@ -983,7 +983,7 @@ QTimer* MarbleDefaultInputHandler::toolTipTimer()
     return &d->m_toolTipTimer;
 }
 
-QPoint MarbleDefaultInputHandler::toolTipPosition()
+QPoint MarbleDefaultInputHandler::toolTipPosition() const
 {
     return d->m_toolTipPosition;
 }

diff --git a/src/lib/marble/MarbleInputHandler.h b/src/lib/marble/MarbleInputHandler.h
@@ -130,9 +130,9 @@ class MARBLE_EXPORT MarbleDefaultInputHandler  : public MarbleInputHandler
     bool handlePinch(const QPointF &center, qreal scaleFactor, Qt::GestureState state);
 
     //FIXME - refactor (abstraction & composition)
-    QPointer<AbstractDataPluginItem> lastToolTipItem();
+    const AbstractDataPluginItem *lastToolTipItem() const;
     QTimer* toolTipTimer();
-    QPoint toolTipPosition();
+    QPoint toolTipPosition() const;
 
     virtual bool handleKeyPress(QKeyEvent *e);
     virtual void handleMouseButtonPressAndHold(const QPoint &position);

diff --git a/src/lib/marble/MarbleMap.cpp b/src/lib/marble/MarbleMap.cpp
@@ -451,13 +451,13 @@ void MarbleMap::setRadius( int radius )
 }
 
 
-int MarbleMap::preferredRadiusCeil( int radius )
+int MarbleMap::preferredRadiusCeil(int radius) const
 {
     return d->m_textureLayer.preferredRadiusCeil( radius );
 }
 
 
-int MarbleMap::preferredRadiusFloor( int radius )
+int MarbleMap::preferredRadiusFloor(int radius) const
 {
     return d->m_textureLayer.preferredRadiusFloor( radius );
 }

diff --git a/src/lib/marble/MarbleMap.h b/src/lib/marble/MarbleMap.h
@@ -166,8 +166,8 @@ class MARBLE_EXPORT MarbleMap : public QObject
      */
     int radius() const;
 
-    int preferredRadiusCeil( int radius );
-    int preferredRadiusFloor( int radius );
+    int preferredRadiusCeil(int radius) const;
+    int preferredRadiusFloor(int radius) const;
 
     int tileZoomLevel() const;
 

diff --git a/src/lib/marble/MarbleWidgetInputHandler.cpp b/src/lib/marble/MarbleWidgetInputHandler.cpp
@@ -217,7 +217,7 @@ void MarbleWidgetInputHandler::showRmbMenu(int x, int y)
 
 void MarbleWidgetInputHandler::openItemToolTip()
 {
-    if (!lastToolTipItem().isNull())
+    if (lastToolTipItem())
     {
         QToolTip::showText(d->m_marbleWidget->mapToGlobal(toolTipPosition()),
                             lastToolTipItem()->toolTip(),

diff --git a/src/lib/marble/declarative/MarbleQuickItem.cpp b/src/lib/marble/declarative/MarbleQuickItem.cpp
@@ -523,7 +523,7 @@ namespace Marble
         return d->m_model.positionTracking()->status() == PositionProviderStatusAvailable;
     }
 
-    bool MarbleQuickItem::positionVisible()
+    bool MarbleQuickItem::positionVisible() const
     {
         return d->m_positionVisible;
     }

diff --git a/src/lib/marble/declarative/MarbleQuickItem.h b/src/lib/marble/declarative/MarbleQuickItem.h
@@ -177,7 +177,7 @@ namespace Marble
         bool showOutdoorActivities() const;
         QString positionProvider() const;
         bool positionAvailable() const;
-        bool positionVisible();
+        bool positionVisible() const;
         Q_INVOKABLE qreal distanceFromPointToCurrentLocation(const QPoint & position) const;
         Q_INVOKABLE qreal angleFromPointToCurrentLocation(const QPoint & position) const;
         Placemark* currentPosition() const;

diff --git a/src/lib/marble/declarative/Navigation.cpp b/src/lib/marble/declarative/Navigation.cpp
@@ -47,7 +47,7 @@ class NavigationPrivate
     double m_screenAccuracy;
     QPointF m_screenPosition;
 
-    RouteSegment nextRouteSegment();
+    RouteSegment nextRouteSegment() const;
 
     void updateNextInstructionDistance( const Route &route );
 
@@ -110,7 +110,7 @@ MarbleModel * NavigationPrivate::model() const
     return m_marbleQuickItem ? m_marbleQuickItem->model() : nullptr;
 }
 
-RouteSegment NavigationPrivate::nextRouteSegment()
+RouteSegment NavigationPrivate::nextRouteSegment() const
 {
     // Not using m_currentSegment on purpose
     return m_marbleQuickItem ? model()->routingManager()->routingModel()->route().currentSegment().nextRouteSegment() : RouteSegment();

diff --git a/src/lib/marble/geodata/graphicsitem/AbstractGeoPolygonGraphicsItem.cpp b/src/lib/marble/geodata/graphicsitem/AbstractGeoPolygonGraphicsItem.cpp
@@ -80,7 +80,7 @@ void AbstractGeoPolygonGraphicsItem::paint( GeoPainter* painter, const ViewportP
 
     bool isValid = true;
     if (s_previousStyle != style().data()) {
-        isValid = configurePainter(painter, viewport);
+        isValid = configurePainter(painter, *viewport);
     }
     s_previousStyle = style().data();
 
@@ -127,7 +127,7 @@ bool AbstractGeoPolygonGraphicsItem::contains(const QPoint &screenPosition, cons
     return false;
 }
 
-bool AbstractGeoPolygonGraphicsItem::configurePainter(GeoPainter *painter, const ViewportParams *viewport)
+bool AbstractGeoPolygonGraphicsItem::configurePainter(GeoPainter *painter, const ViewportParams &viewport) const
 {
     QPen currentPen = painter->pen();
     GeoDataStyle::ConstPtr style = this->style();
@@ -173,7 +173,7 @@ bool AbstractGeoPolygonGraphicsItem::configurePainter(GeoPainter *painter, const
                 if (!polyStyle.texturePath().isEmpty() || !polyStyle.textureImage().isNull()) {
                     GeoDataCoordinates coords = latLonAltBox().center();
                     qreal x, y;
-                    viewport->screenCoordinates(coords, x, y);
+                    viewport.screenCoordinates(coords, x, y);
                     QBrush brush(texture(polyStyle.texturePath(), paintedColor));
                     painter->setBrush(brush);
                     painter->setBrushOrigin(QPoint(x,y));
@@ -202,7 +202,7 @@ int AbstractGeoPolygonGraphicsItem::extractElevation(const GeoDataPlacemark &pla
     return elevation;
 }
 
-QPixmap AbstractGeoPolygonGraphicsItem::texture(const QString &texturePath, const QColor &color)
+QPixmap AbstractGeoPolygonGraphicsItem::texture(const QString &texturePath, const QColor &color) const
 {
     QString const key = QString::number(color.rgba()) + '/' + texturePath;
     QPixmap texture;

diff --git a/src/lib/marble/geodata/graphicsitem/AbstractGeoPolygonGraphicsItem.h b/src/lib/marble/geodata/graphicsitem/AbstractGeoPolygonGraphicsItem.h
@@ -44,7 +44,7 @@ class MARBLE_EXPORT AbstractGeoPolygonGraphicsItem : public GeoGraphicsItem
     static const void *s_previousStyle;
 
 protected:
-    bool configurePainter(GeoPainter* painter, const ViewportParams *viewport);
+    bool configurePainter(GeoPainter* painter, const ViewportParams &viewport) const;
     inline
     const GeoDataPolygon *polygon() const { return m_polygon; }
     inline
@@ -55,7 +55,7 @@ class MARBLE_EXPORT AbstractGeoPolygonGraphicsItem : public GeoGraphicsItem
     static int extractElevation(const GeoDataPlacemark &placemark);
 
 private:
-    QPixmap texture(const QString &path, const QColor &color);
+    QPixmap texture(const QString &path, const QColor &color) const;
 
     const GeoDataPolygon * m_polygon;
     const GeoDataLinearRing * m_ring;

diff --git a/src/lib/marble/geodata/graphicsitem/BuildingGraphicsItem.cpp b/src/lib/marble/geodata/graphicsitem/BuildingGraphicsItem.cpp
@@ -69,24 +69,24 @@ void BuildingGraphicsItem::initializeBuildingPainting(const GeoPainter* painter,
     drawAccurate3D = painter->mapQuality() == HighQuality ? maxOffset > pixelSize : maxOffset > 1.5 * pixelSize;
 }
 
-void BuildingGraphicsItem::updatePolygons(const ViewportParams *viewport,
+void BuildingGraphicsItem::updatePolygons(const ViewportParams &viewport,
                                           QVector<QPolygonF*>& outerPolygons,
                                           QVector<QPolygonF*>& innerPolygons,
-                                          bool &hasInnerBoundaries )
+                                          bool &hasInnerBoundaries) const
 {
     // Since subtracting one fully contained polygon from another results in a single
     // polygon with a "connecting line" between the inner and outer part we need
     // to first paint the inner area with no pen and then the outlines with the correct pen.
     hasInnerBoundaries = polygon() ? !polygon()->innerBoundaries().isEmpty() : false;
     if (polygon()) {
         if (hasInnerBoundaries) {
-            screenPolygons(*viewport, polygon(), innerPolygons, outerPolygons);
+            screenPolygons(viewport, polygon(), innerPolygons, outerPolygons);
         }
         else {
-            viewport->screenCoordinates(polygon()->outerBoundary(), outerPolygons);
+            viewport.screenCoordinates(polygon()->outerBoundary(), outerPolygons);
         }
     } else if (ring()) {
-        viewport->screenCoordinates(*ring(), outerPolygons);
+        viewport.screenCoordinates(*ring(), outerPolygons);
     }
 }
 
@@ -164,7 +164,7 @@ void BuildingGraphicsItem::paint(GeoPainter* painter, const ViewportParams* view
         m_cachedInnerPolygons.clear();
         m_cachedOuterRoofPolygons.clear();
         m_cachedInnerRoofPolygons.clear();
-        updatePolygons(viewport, m_cachedOuterPolygons,
+        updatePolygons(*viewport, m_cachedOuterPolygons,
                                  m_cachedInnerPolygons,
                                  m_hasInnerBoundaries);
         if (m_cachedOuterPolygons.isEmpty()) {
@@ -192,7 +192,7 @@ void BuildingGraphicsItem::paintRoof(GeoPainter* painter, const ViewportParams*
 
     bool isValid = true;
     if (s_previousStyle != style().data()) {
-        isValid = configurePainter(painter, viewport);
+        isValid = configurePainter(painter, *viewport);
 
         QFont font = painter->font(); // TODO: better font configuration
         if (font.pointSize() != 10) {

diff --git a/src/lib/marble/geodata/graphicsitem/BuildingGraphicsItem.h b/src/lib/marble/geodata/graphicsitem/BuildingGraphicsItem.h
@@ -35,10 +35,10 @@ class MARBLE_EXPORT BuildingGraphicsItem : public AbstractGeoPolygonGraphicsItem
     bool configurePainterForFrame(GeoPainter *painter) const;
     void initializeBuildingPainting(const GeoPainter* painter, const ViewportParams *viewport,
                                     bool &drawAccurate3D, bool &isCameraAboveBuilding) const;
-    void updatePolygons( const ViewportParams *viewport,
+    void updatePolygons(const ViewportParams &viewport,
                          QVector<QPolygonF*>& outlinePolygons,
                          QVector<QPolygonF*>& innerPolygons,
-                         bool &hasInnerBoundaries);
+                         bool &hasInnerBoundaries) const;
 
     QPointF buildingOffset(const QPointF &point, const ViewportParams *viewport, bool* isCameraAboveBuilding = nullptr) const;
 

diff --git a/src/lib/marble/layers/PlacemarkLayer.cpp b/src/lib/marble/layers/PlacemarkLayer.cpp
@@ -310,7 +310,7 @@ bool PlacemarkLayer::testXBug()
     return true;
 }
 
-void PlacemarkLayer::renderDebug(GeoPainter *painter, ViewportParams *viewport, const QVector<VisiblePlacemark *> &placemarks)
+void PlacemarkLayer::renderDebug(GeoPainter *painter, ViewportParams *viewport, const QVector<VisiblePlacemark *> &placemarks) const
 {
     painter->save();
     painter->setFont(QFont(QStringLiteral("Sans Serif"), 7));

diff --git a/src/lib/marble/layers/PlacemarkLayer.h b/src/lib/marble/layers/PlacemarkLayer.h
@@ -113,7 +113,7 @@ class PlacemarkLayer : public QObject, public LayerInterface
    void repaintNeeded();
 
  private:
-    void renderDebug(GeoPainter *painter, ViewportParams *viewport, const QVector<VisiblePlacemark*> & placemarks);
+    void renderDebug(GeoPainter *painter, ViewportParams *viewport, const QVector<VisiblePlacemark*> & placemarks) const;
     static bool testXBug();
 
     PlacemarkLayout m_layout;

diff --git a/src/plugins/render/annotate/AnnotatePlugin.cpp b/src/plugins/render/annotate/AnnotatePlugin.cpp
@@ -1777,7 +1777,7 @@ void AnnotatePlugin::pasteItem()
     m_pasteGraphicItem->setVisible( false );
 }
 
-const GeoDataCoordinates AnnotatePlugin::mouseGeoDataCoordinates( QMouseEvent *mouseEvent )
+const GeoDataCoordinates AnnotatePlugin::mouseGeoDataCoordinates(QMouseEvent *mouseEvent) const
 {
     qreal lon, lat;
     m_marbleWidget->geoCoordinates( mouseEvent->pos().x(),

diff --git a/src/plugins/render/annotate/AnnotatePlugin.h b/src/plugins/render/annotate/AnnotatePlugin.h
@@ -171,7 +171,7 @@ private Q_SLOTS:
     void announceStateChanged( SceneGraphicsItem::ActionState newState );
     void setupCursor( SceneGraphicsItem *item );
 
-    const GeoDataCoordinates mouseGeoDataCoordinates( QMouseEvent *mouseEvent );
+    const GeoDataCoordinates mouseGeoDataCoordinates(QMouseEvent *mouseEvent) const;
 
     bool m_isInitialized;
     bool m_widgetInitialized;

diff --git a/src/plugins/render/graticule/GraticulePlugin.cpp b/src/plugins/render/graticule/GraticulePlugin.cpp
@@ -591,7 +591,7 @@ void GraticulePlugin::renderLongitudeLines( GeoPainter *painter,
                                             const GeoDataLatLonAltBox& viewLatLonAltBox, 
                                             qreal step, qreal skipStep,
                                             qreal northPolarGap, qreal southPolarGap,
-                                            LabelPositionFlags labelPositionFlags )
+                                            LabelPositionFlags labelPositionFlags) const
 {
     if ( step <= 0 ) {
         return;

diff --git a/src/plugins/render/graticule/GraticulePlugin.h b/src/plugins/render/graticule/GraticulePlugin.h
@@ -176,7 +176,7 @@ class GraticulePlugin : public RenderPlugin, public DialogConfigurationInterface
                               qreal step, qreal skipStep,
                               qreal northPolarGap = 0.0, qreal southPolarGap = 0.0,
                               LabelPositionFlags labelPositionFlags = LineCenter
-                             );
+                             ) const;
 
     /**
      * @brief Renders UTM exceptions that are visible within the defined view bounding box.