Renamed some private vars to follow coding guidelines

qgis · Jan 9, 2018 · 4dc5b56 · 4dc5b56
1 parent 4302910
commit 4dc5b56
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/src/core/layout/qgslayoutitemnodeitem.cpp b/src/core/layout/qgslayoutitemnodeitem.cpp
@@ -31,7 +31,7 @@ void QgsLayoutNodesItem::setNodes( const QPolygonF &nodes )
 
 QRectF QgsLayoutNodesItem::boundingRect() const
 {
-  return currentRectangle;
+  return mCurrentRectangle;
 }
 
 double QgsLayoutNodesItem::estimatedFrameBleed() const
@@ -336,7 +336,7 @@ void QgsLayoutNodesItem::updateBoundingRect()
 {
   QRectF br = rect();
   br.adjust( -mMaxSymbolBleed, -mMaxSymbolBleed, mMaxSymbolBleed, mMaxSymbolBleed );
-  currentRectangle = br;
+  mCurrentRectangle = br;
 
   // update
   prepareGeometryChange();

diff --git a/src/core/layout/qgslayoutitemnodeitem.h b/src/core/layout/qgslayoutitemnodeitem.h
@@ -165,7 +165,7 @@ class CORE_EXPORT QgsLayoutNodesItem: public QgsLayoutItem
     void updateSceneRect();
 
     //! Current bounding rectangle of shape
-    QRectF currentRectangle;
+    QRectF mCurrentRectangle;
 
   protected slots:
 

diff --git a/src/core/layout/qgslayoutitempolyline.cpp b/src/core/layout/qgslayoutitempolyline.cpp
@@ -420,7 +420,7 @@ void QgsLayoutItemPolyline::updateBoundingRect()
 
   double margin = std::max( mMaxSymbolBleed, computeMarkerMargin() );
   br.adjust( -margin, -margin, margin, margin );
-  currentRectangle = br;
+  mCurrentRectangle = br;
 
   // update
   prepareGeometryChange();

diff --git a/src/core/layout/qgslayoutitempolyline.h b/src/core/layout/qgslayoutitempolyline.h
@@ -261,6 +261,8 @@ class CORE_EXPORT QgsLayoutItemPolyline: public QgsLayoutNodesItem
     double computeMarkerMargin() const;
 
     friend class TestQgsLayoutPolyline;
+    friend class QgsCompositionConverter;
+
 };
 
 #endif // QGSLAYOUTITEMPOLYLINE_H