Cleanup rebase fns

pcbnew/pcb_edit_frame.cpp

@@ -1635,8 +1635,6 @@ void PCB_EDIT_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVars
 void PCB_EDIT_FRAME::ThemeChanged()
 {
     PCB_BASE_EDIT_FRAME::ThemeChanged();
-
-    PythonPluginsReload();
 }
 
 

pcbnew/pcb_edit_frame.h

@@ -93,11 +93,6 @@ public:
      */
     bool IsContentModified() const override;
 
-    /**
-     * Open the plugins folder in the default system file browser.
-     */
-    void PythonPluginsShowFolder();
-
     /**
      * Synchronize the environment variables from KiCad's environment into the Python interpreter.
      */
@@ -715,25 +710,6 @@ protected:
      */
     void OnActionPluginButton( wxCommandEvent& aEvent );
 
-    /**
-     * Refresh plugin list (reload Python plugins).
-     *
-     * @param aEvent sent by wx
-     */
-    void OnActionPluginRefresh( wxCommandEvent& aEvent)
-    {
-       PythonPluginsReload();
-    }
-
-    /**
-     * Refresh plugin list (reload Python plugins).
-     *
-     * @param aEvent sent by wx
-     */
-    void OnActionPluginShowFolder( wxCommandEvent& aEvent)
-    {
-       PythonPluginsShowFolder();
-    }
 
     /**
      * Has meaning only if KICAD_SCRIPTING_WXPYTHON option is not defined.

pcbnew/python/scripting/pcb_scripting_tool.cpp

@@ -27,6 +27,7 @@
 #include <gestfich.h>
 #include <kiface_ids.h>
 #include <kiway.h>
+#include <macros.h>
 #include <python_scripting.h>
 #include <tools/pcb_actions.h>
 

pcbnew/python/scripting/pcbnew_scripting.cpp

@@ -27,7 +27,7 @@
  * @brief methods to add scripting capabilities inside pcbnew
  */
 
-#include "../../scripting/python_scripting.h"
+#include <python_scripting.h>
 
 #include <cstdlib>
 #include <cstring>
@@ -38,7 +38,7 @@
 #include <gal/color4d.h>
 #include <trace_helpers.h>
 #include <kicad_string.h>
-
+#include <macros.h>
 #include <paths.h>
 #include <pgm_base.h>
 #include <settings/settings_manager.h>