From bbcc8409896efd1ea39e00f1b3a999230d26bf51 Mon Sep 17 00:00:00 2001
From: Seth Hillbrand <seth@kipro-pcb.com>
Date: Mon, 5 Apr 2021 12:30:27 -0700
Subject: [PATCH] Cleanup rebase fns

---
 pcbnew/pcb_edit_frame.cpp                     |  2 --
 pcbnew/pcb_edit_frame.h                       | 24 -------------------
 .../python/scripting/pcb_scripting_tool.cpp   |  1 +
 pcbnew/python/scripting/pcbnew_scripting.cpp  |  4 ++--
 4 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp
index 76f49751ca..4cc1b20569 100644
--- a/pcbnew/pcb_edit_frame.cpp
+++ b/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();
 }
 
 
diff --git a/pcbnew/pcb_edit_frame.h b/pcbnew/pcb_edit_frame.h
index 4ba8351ae6..522e2fa006 100644
--- a/pcbnew/pcb_edit_frame.h
+++ b/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.
diff --git a/pcbnew/python/scripting/pcb_scripting_tool.cpp b/pcbnew/python/scripting/pcb_scripting_tool.cpp
index d026ef8e75..fe3939911f 100644
--- a/pcbnew/python/scripting/pcb_scripting_tool.cpp
+++ b/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>
 
diff --git a/pcbnew/python/scripting/pcbnew_scripting.cpp b/pcbnew/python/scripting/pcbnew_scripting.cpp
index be7105cb0d..62892e8843 100644
--- a/pcbnew/python/scripting/pcbnew_scripting.cpp
+++ b/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>