diff --git a/include/project.h b/include/project.h index 7345b5c3d7..7e296c94cb 100644 --- a/include/project.h +++ b/include/project.h @@ -302,7 +302,7 @@ public: void SetProjectLock( LOCKFILE* aLockFile ); LOCKFILE* GetProjectLock() const; - + private: friend class SETTINGS_MANAGER; // so that SM can set project path friend class TEST_NETLISTS_FIXTURE; // TODO(JE) make this not required @@ -353,7 +353,6 @@ private: private: wxFileName m_project_name; ///< \/\.pro - wxString m_pro_date_and_time; bool m_readOnly; ///< No project files will be written to disk int m_textVarsTicker; ///< Update counter on text vars diff --git a/pcbnew/dialogs/panel_fp_editor_field_defaults.cpp b/pcbnew/dialogs/panel_fp_editor_field_defaults.cpp index e47565ab7d..fab19a3ba6 100644 --- a/pcbnew/dialogs/panel_fp_editor_field_defaults.cpp +++ b/pcbnew/dialogs/panel_fp_editor_field_defaults.cpp @@ -173,10 +173,8 @@ static FOOTPRINT_EDITOR_SETTINGS& GetPgmSettings() } -PANEL_FP_EDITOR_FIELD_DEFAULTS::PANEL_FP_EDITOR_FIELD_DEFAULTS( wxWindow* aParent, - UNITS_PROVIDER* aUnitsProvider ) : +PANEL_FP_EDITOR_FIELD_DEFAULTS::PANEL_FP_EDITOR_FIELD_DEFAULTS( wxWindow* aParent ) : PANEL_FP_EDITOR_FIELD_DEFAULTS_BASE( aParent ), - m_unitProvider( aUnitsProvider ), m_designSettings( GetPgmSettings().m_DesignSettings ) { m_fieldPropsGrid->SetTable( new TEXT_ITEMS_GRID_TABLE( true ), true ); diff --git a/pcbnew/dialogs/panel_fp_editor_field_defaults.h b/pcbnew/dialogs/panel_fp_editor_field_defaults.h index 7a60d4d537..27c12ea0ca 100644 --- a/pcbnew/dialogs/panel_fp_editor_field_defaults.h +++ b/pcbnew/dialogs/panel_fp_editor_field_defaults.h @@ -32,7 +32,7 @@ class UNITS_PROVIDER; class PANEL_FP_EDITOR_FIELD_DEFAULTS : public PANEL_FP_EDITOR_FIELD_DEFAULTS_BASE { public: - PANEL_FP_EDITOR_FIELD_DEFAULTS( wxWindow* aParent, UNITS_PROVIDER* aUnitsProvider ); + PANEL_FP_EDITOR_FIELD_DEFAULTS( wxWindow* aParent ); ~PANEL_FP_EDITOR_FIELD_DEFAULTS() override; bool Show( bool aShow ) override; @@ -49,6 +49,5 @@ private: void loadFPSettings( const FOOTPRINT_EDITOR_SETTINGS* aCfg ); private: - UNITS_PROVIDER* m_unitProvider; BOARD_DESIGN_SETTINGS& m_designSettings; }; diff --git a/pcbnew/pcbnew.cpp b/pcbnew/pcbnew.cpp index 826a2e3776..551ebd870a 100644 --- a/pcbnew/pcbnew.cpp +++ b/pcbnew/pcbnew.cpp @@ -204,7 +204,7 @@ static struct IFACE : public KIFACE_BASE, public UNITS_PROVIDER if( frame ) SetUserUnits( frame->GetUserUnits() ); - return new PANEL_FP_EDITOR_FIELD_DEFAULTS( aParent, this ); + return new PANEL_FP_EDITOR_FIELD_DEFAULTS( aParent ); } case PANEL_FP_DEFAULT_GRAPHICS_VALUES: diff --git a/pcbnew/zone_manager/panel_zone_properties.cpp b/pcbnew/zone_manager/panel_zone_properties.cpp index 948bf377c3..935b1886af 100644 --- a/pcbnew/zone_manager/panel_zone_properties.cpp +++ b/pcbnew/zone_manager/panel_zone_properties.cpp @@ -45,7 +45,6 @@ PANEL_ZONE_PROPERTIES::PANEL_ZONE_PROPERTIES( wxWindow* aParent, PCB_BASE_FRAME* ZONES_CONTAINER& aZoneContainer ) : PANEL_ZONE_PROPERTIES_BASE( aParent ), m_ZoneContainer( aZoneContainer ), - m_PCB_Frame( aPCB_FRAME ), m_cornerSmoothingType( ZONE_SETTINGS::SMOOTHING_UNDEFINED ), m_outlineHatchPitch( aPCB_FRAME, m_stBorderHatchPitchText, m_outlineHatchPitchCtrl, m_outlineHatchUnits ), diff --git a/pcbnew/zone_manager/panel_zone_properties.h b/pcbnew/zone_manager/panel_zone_properties.h index 3ae598e426..3d50add437 100644 --- a/pcbnew/zone_manager/panel_zone_properties.h +++ b/pcbnew/zone_manager/panel_zone_properties.h @@ -82,9 +82,7 @@ private: private: - ZONES_CONTAINER& m_ZoneContainer; - PCB_BASE_FRAME* m_PCB_Frame; - + ZONES_CONTAINER& m_ZoneContainer; std::shared_ptr m_settings; int m_cornerSmoothingType;