From 44f4d41bba35238060f2a6305174406a758672d4 Mon Sep 17 00:00:00 2001
From: Marek Roszko <mark.roszko@gmail.com>
Date: Mon, 23 Nov 2020 11:18:02 -0500
Subject: [PATCH] Fix member variable name

---
 pcbnew/import_gfx/dxf_import_plugin.cpp | 18 +++++++++---------
 pcbnew/import_gfx/dxf_import_plugin.h   |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pcbnew/import_gfx/dxf_import_plugin.cpp b/pcbnew/import_gfx/dxf_import_plugin.cpp
index 304bded42a..30241d1eef 100644
--- a/pcbnew/import_gfx/dxf_import_plugin.cpp
+++ b/pcbnew/import_gfx/dxf_import_plugin.cpp
@@ -306,7 +306,7 @@ void DXF_IMPORT_PLUGIN::addLine( const DL_LineData& aData )
     VECTOR2D end( mapX( aData.x2 ), mapY( aData.y2 ) );
 
     GRAPHICS_IMPORTER_BUFFER* bufferToUse =
-            ( m_currentBlock != nullptr ) ? &m_currentBlock->buffer : &m_internalImporter;
+            ( m_currentBlock != nullptr ) ? &m_currentBlock->m_buffer : &m_internalImporter;
     bufferToUse->AddLine( start, end, lineWidth );
 
     updateImageLimits( start );
@@ -423,7 +423,7 @@ void DXF_IMPORT_PLUGIN::addInsert( const DL_InsertData& aData )
     VECTOR2D translation( mapX( aData.ipx ), mapY( aData.ipy ) );
     VECTOR2D scale( mapX( aData.sx ), mapY( aData.sy ) );
 
-    for( auto& shape : block->buffer.GetShapes() )
+    for( auto& shape : block->m_buffer.GetShapes() )
     {
         std::unique_ptr<IMPORTED_SHAPE> newShape = shape->clone();
 
@@ -440,7 +440,7 @@ void DXF_IMPORT_PLUGIN::addCircle( const DL_CircleData& aData )
     double            lineWidth = lineWeightToWidth( attributes.getWidth(), layer );
 
     GRAPHICS_IMPORTER_BUFFER* bufferToUse =
-            ( m_currentBlock != nullptr ) ? &m_currentBlock->buffer : &m_internalImporter;
+            ( m_currentBlock != nullptr ) ? &m_currentBlock->m_buffer : &m_internalImporter;
     bufferToUse->AddCircle( center, mapDim( aData.radius ), lineWidth, false );
 
     VECTOR2D radiusDelta( mapDim( aData.radius ), mapDim( aData.radius ) );
@@ -477,7 +477,7 @@ void DXF_IMPORT_PLUGIN::addArc( const DL_ArcData& aData )
     double            lineWidth = lineWeightToWidth( attributes.getWidth(), layer );
 
     GRAPHICS_IMPORTER_BUFFER* bufferToUse =
-            ( m_currentBlock != nullptr ) ? &m_currentBlock->buffer : &m_internalImporter;
+            ( m_currentBlock != nullptr ) ? &m_currentBlock->m_buffer : &m_internalImporter;
     bufferToUse->AddArc( center, arcStart, angle, lineWidth );
 
     VECTOR2D radiusDelta( mapDim( aData.radius ), mapDim( aData.radius ) );
@@ -599,7 +599,7 @@ void DXF_IMPORT_PLUGIN::addText( const DL_TextData& aData )
     double sine = sin(angleInRads);
 
     GRAPHICS_IMPORTER_BUFFER* bufferToUse =
-            ( m_currentBlock != nullptr ) ? &m_currentBlock->buffer : &m_internalImporter;
+            ( m_currentBlock != nullptr ) ? &m_currentBlock->m_buffer : &m_internalImporter;
     bufferToUse->AddText( refPoint, text, textHeight, charWidth, textThickness, angle_degree,
                           hJustify, vJustify );
 
@@ -759,7 +759,7 @@ void DXF_IMPORT_PLUGIN::addMText( const DL_MTextData& aData )
 
 
     GRAPHICS_IMPORTER_BUFFER* bufferToUse =
-            ( m_currentBlock != nullptr ) ? &m_currentBlock->buffer : &m_internalImporter;
+            ( m_currentBlock != nullptr ) ? &m_currentBlock->m_buffer : &m_internalImporter;
     bufferToUse->AddText( textpos, text, textHeight, charWidth,
                           textThickness, angle_degree, hJustify, vJustify );
 
@@ -1094,7 +1094,7 @@ void DXF_IMPORT_PLUGIN::insertLine( const VECTOR2D& aSegStart,
     VECTOR2D end( SCALE_FACTOR( aSegEnd.x ), SCALE_FACTOR( aSegEnd.y ) );
 
     GRAPHICS_IMPORTER_BUFFER* bufferToUse =
-            ( m_currentBlock != nullptr ) ? &m_currentBlock->buffer : &m_internalImporter;
+            ( m_currentBlock != nullptr ) ? &m_currentBlock->m_buffer : &m_internalImporter;
     bufferToUse->AddLine( origin, end, aWidth );
 
     updateImageLimits( origin );
@@ -1171,7 +1171,7 @@ void DXF_IMPORT_PLUGIN::insertArc( const VECTOR2D& aSegStart, const VECTOR2D& aS
     }
 
     GRAPHICS_IMPORTER_BUFFER* bufferToUse =
-            ( m_currentBlock != nullptr ) ? &m_currentBlock->buffer : &m_internalImporter;
+            ( m_currentBlock != nullptr ) ? &m_currentBlock->m_buffer : &m_internalImporter;
     bufferToUse->AddArc( center, arc_start, angle, aWidth );
 
     VECTOR2D radiusDelta( SCALE_FACTOR( radius ), SCALE_FACTOR( radius ) );
@@ -1252,7 +1252,7 @@ void DXF_IMPORT_PLUGIN::insertSpline( int aWidth )
             end = bezierControl2;
 
         GRAPHICS_IMPORTER_BUFFER* bufferToUse =
-                ( m_currentBlock != nullptr ) ? &m_currentBlock->buffer : &m_internalImporter;
+                ( m_currentBlock != nullptr ) ? &m_currentBlock->m_buffer : &m_internalImporter;
         bufferToUse->AddSpline( start, bezierControl1, bezierControl2, end, aWidth );
     }
 #endif
diff --git a/pcbnew/import_gfx/dxf_import_plugin.h b/pcbnew/import_gfx/dxf_import_plugin.h
index e5cae34909..106e6d0d77 100644
--- a/pcbnew/import_gfx/dxf_import_plugin.h
+++ b/pcbnew/import_gfx/dxf_import_plugin.h
@@ -140,7 +140,7 @@ public:
     wxString m_name;
     double m_x, m_y;
 
-    GRAPHICS_IMPORTER_BUFFER buffer;
+    GRAPHICS_IMPORTER_BUFFER m_buffer;
 
     DXF_IMPORT_BLOCK( wxString aName, double aX, double aY )
     {