Skip to content

Commit 4dc5b56

Browse files
committed
Renamed some private vars to follow coding guidelines
1 parent 4302910 commit 4dc5b56

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

src/core/layout/qgslayoutitemnodeitem.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ void QgsLayoutNodesItem::setNodes( const QPolygonF &nodes )
3131

3232
QRectF QgsLayoutNodesItem::boundingRect() const
3333
{
34-
return currentRectangle;
34+
return mCurrentRectangle;
3535
}
3636

3737
double QgsLayoutNodesItem::estimatedFrameBleed() const
@@ -336,7 +336,7 @@ void QgsLayoutNodesItem::updateBoundingRect()
336336
{
337337
QRectF br = rect();
338338
br.adjust( -mMaxSymbolBleed, -mMaxSymbolBleed, mMaxSymbolBleed, mMaxSymbolBleed );
339-
currentRectangle = br;
339+
mCurrentRectangle = br;
340340

341341
// update
342342
prepareGeometryChange();

src/core/layout/qgslayoutitemnodeitem.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ class CORE_EXPORT QgsLayoutNodesItem: public QgsLayoutItem
165165
void updateSceneRect();
166166

167167
//! Current bounding rectangle of shape
168-
QRectF currentRectangle;
168+
QRectF mCurrentRectangle;
169169

170170
protected slots:
171171

src/core/layout/qgslayoutitempolyline.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ void QgsLayoutItemPolyline::updateBoundingRect()
420420

421421
double margin = std::max( mMaxSymbolBleed, computeMarkerMargin() );
422422
br.adjust( -margin, -margin, margin, margin );
423-
currentRectangle = br;
423+
mCurrentRectangle = br;
424424

425425
// update
426426
prepareGeometryChange();

src/core/layout/qgslayoutitempolyline.h

+2
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,8 @@ class CORE_EXPORT QgsLayoutItemPolyline: public QgsLayoutNodesItem
261261
double computeMarkerMargin() const;
262262

263263
friend class TestQgsLayoutPolyline;
264+
friend class QgsCompositionConverter;
265+
264266
};
265267

266268
#endif // QGSLAYOUTITEMPOLYLINE_H

0 commit comments

Comments
 (0)