From 4dc5b5698ac605a70dc947ac4bfeb27c08fe61c4 Mon Sep 17 00:00:00 2001
From: Alessandro Pasotti <elpaso@itopen.it>
Date: Mon, 18 Dec 2017 18:59:30 +0100
Subject: [PATCH] Renamed some private vars to follow coding guidelines

---
 src/core/layout/qgslayoutitemnodeitem.cpp | 4 ++--
 src/core/layout/qgslayoutitemnodeitem.h   | 2 +-
 src/core/layout/qgslayoutitempolyline.cpp | 2 +-
 src/core/layout/qgslayoutitempolyline.h   | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/core/layout/qgslayoutitemnodeitem.cpp b/src/core/layout/qgslayoutitemnodeitem.cpp
index 3ad11a616a9..74d49a9f882 100644
--- 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
index eeee77d7bd3..c76a67c872f 100644
--- 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
index 8d412fe7e32..f72516bde5b 100644
--- 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
index d804d840174..31141bc1166 100644
--- 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