sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-21 00:05:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Renamed some private vars to follow coding guidelines

Browse Source
This commit is contained in:
Alessandro Pasotti 2017-12-18 18:59:30 +01:00
parent 4302910f94
commit 4dc5b5698a
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/layout/qgslayoutitemnodeitem.cpp
View File

@ -31,7 +31,7 @@ void QgsLayoutNodesItem::setNodes( const QPolygonF &nodes )
QRectF QgsLayoutNodesItem::boundingRect() const QRectF QgsLayoutNodesItem::boundingRect() const
{ {
return currentRectangle; return mCurrentRectangle;
} }
double QgsLayoutNodesItem::estimatedFrameBleed() const double QgsLayoutNodesItem::estimatedFrameBleed() const
@ -336,7 +336,7 @@ void QgsLayoutNodesItem::updateBoundingRect()
{ {
QRectF br = rect(); QRectF br = rect();
br.adjust( -mMaxSymbolBleed, -mMaxSymbolBleed, mMaxSymbolBleed, mMaxSymbolBleed ); br.adjust( -mMaxSymbolBleed, -mMaxSymbolBleed, mMaxSymbolBleed, mMaxSymbolBleed );
currentRectangle = br; mCurrentRectangle = br;
// update // update
prepareGeometryChange(); prepareGeometryChange();

2
src/core/layout/qgslayoutitemnodeitem.h
View File

@ -165,7 +165,7 @@ class CORE_EXPORT QgsLayoutNodesItem: public QgsLayoutItem
void updateSceneRect(); void updateSceneRect();
//! Current bounding rectangle of shape //! Current bounding rectangle of shape
QRectF currentRectangle; QRectF mCurrentRectangle;
protected slots: protected slots:

2
src/core/layout/qgslayoutitempolyline.cpp
View File

@ -420,7 +420,7 @@ void QgsLayoutItemPolyline::updateBoundingRect()
double margin = std::max( mMaxSymbolBleed, computeMarkerMargin() ); double margin = std::max( mMaxSymbolBleed, computeMarkerMargin() );
br.adjust( -margin, -margin, margin, margin ); br.adjust( -margin, -margin, margin, margin );
currentRectangle = br; mCurrentRectangle = br;
// update // update
prepareGeometryChange(); prepareGeometryChange();

2
src/core/layout/qgslayoutitempolyline.h
View File

@ -261,6 +261,8 @@ class CORE_EXPORT QgsLayoutItemPolyline: public QgsLayoutNodesItem
double computeMarkerMargin() const; double computeMarkerMargin() const;
friend class TestQgsLayoutPolyline; friend class TestQgsLayoutPolyline;
friend class QgsCompositionConverter;
}; };
#endif // QGSLAYOUTITEMPOLYLINE_H #endif // QGSLAYOUTITEMPOLYLINE_H