From e99b0100a09cbd02d122a9dabfac5005353a7487 Mon Sep 17 00:00:00 2001
From: thewildmage <cecilia@hey.com>
Date: Thu, 13 Jul 2023 20:24:15 -0600
Subject: [PATCH] Move mp_gcodegen into line method alone

---
 src/libslic3r/calib.cpp |  4 ----
 src/libslic3r/calib.hpp | 11 +++++------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/libslic3r/calib.cpp b/src/libslic3r/calib.cpp
index 336e258478..91ef56d756 100644
--- a/src/libslic3r/calib.cpp
+++ b/src/libslic3r/calib.cpp
@@ -3,10 +3,6 @@
 #include "Model.hpp"
 
 namespace Slic3r {
-CalibPressureAdvance::CalibPressureAdvance(GCode* gcodegen) :
-    mp_gcodegen(gcodegen)
-{ };
-
 std::string CalibPressureAdvance::move_to(Vec2d pt, GCodeWriter writer, std::string comment)
 {
     std::stringstream gcode;
diff --git a/src/libslic3r/calib.hpp b/src/libslic3r/calib.hpp
index be284caaae..23e38f799b 100644
--- a/src/libslic3r/calib.hpp
+++ b/src/libslic3r/calib.hpp
@@ -27,9 +27,8 @@ struct Calib_Params {
 
 class CalibPressureAdvance {
 protected:
-    CalibPressureAdvance() { };
-    CalibPressureAdvance(GCode* gcodegen);
-    ~CalibPressureAdvance() { };
+    CalibPressureAdvance() =default;
+    ~CalibPressureAdvance() =default;
 
     enum class DrawDigitMode {
         Left_To_Right,
@@ -68,8 +67,6 @@ protected:
         double layer_height,
         GCodeWriter& writer
     );
-
-    GCode* mp_gcodegen {nullptr};
     
     Vec3d m_last_pos;
 
@@ -82,7 +79,7 @@ protected:
 class CalibPressureAdvanceLine : public CalibPressureAdvance {
 public:
     CalibPressureAdvanceLine(GCode* gcodegen) :
-        CalibPressureAdvance(gcodegen),
+        mp_gcodegen(gcodegen),
         m_nozzle_diameter(gcodegen->config().nozzle_diameter.get_at(0))
     { };
     ~CalibPressureAdvanceLine() { };
@@ -103,6 +100,8 @@ private:
     
     void delta_modify_start(double& startx, double& starty, int count);
 
+    GCode* mp_gcodegen;
+
     double m_nozzle_diameter;
     double m_slow_speed, m_fast_speed;