Tool: minor reduction of transitive includes

common/tool/action_menu.cpp

@@ -24,22 +24,25 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include "tool/action_menu.h"
+
+#include <wx/grid.h>
+#include <wx/listctrl.h>
+#include <wx/log.h>
+#include <wx/textentry.h>
+#include <wx/stc/stc.h>
+
 #include <bitmaps.h>
 #include <eda_base_frame.h>
 #include <functional>
 #include <id.h>
 #include <kiface_base.h>
-#include <tool/action_menu.h>
 #include <tool/actions.h>
 #include <tool/tool_event.h>
 #include <tool/tool_interactive.h>
 #include <tool/tool_manager.h>
 #include <trace_helpers.h>
-#include <wx/log.h>
-#include <wx/stc/stc.h>
 #include <textentry_tricks.h>
-#include <wx/listctrl.h>
-#include <wx/grid.h>
 #include <widgets/ui_common.h>
 
 using namespace std::placeholders;

common/tool/group_tool.cpp

@@ -20,14 +20,15 @@
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
+#include "tool/group_tool.h"
 
 #include <eda_draw_frame.h>
 #include <kiplatform/ui.h>
 #include <tool/actions.h>
 #include <tool/tool_manager.h>
 #include <tool/picker_tool.h>
-#include <tool/group_tool.h>
 #include <tool/selection.h>
+#include <tool/selection_tool.h>
 #include <status_popup.h>
 #include <commit.h>
 #include <bitmaps.h>

common/tool/group_tool.h

@@ -21,13 +21,16 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#ifndef GROUP_TOOL_H
-#define GROUP_TOOL_H
+#pragma once
 
-#include <tool/selection_tool.h>
+#include <tool/tool_interactive.h>
 
 class COMMIT;
 class DIALOG_GROUP_PROPERTIES;
+class EDA_DRAW_FRAME;
+class EDA_GROUP;
+class SELECTION_TOOL;
+
 
 class GROUP_TOOL : public TOOL_INTERACTIVE
 {
@@ -80,5 +83,3 @@ protected:
     SELECTION_TOOL*          m_selectionTool = nullptr;
     std::shared_ptr<COMMIT>  m_commit;
 };
-
-#endif

common/tool/selection_tool.cpp

@@ -427,5 +427,3 @@ bool SELECTION_TOOL::doSelectionMenu( COLLECTOR* aCollector )
 
     return false;
 }
-
-

include/tool/action_menu.h

@@ -25,15 +25,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#ifndef __CONTEXT_MENU_H
-#define __CONTEXT_MENU_H
+#pragma once
 
 #include <map>
 #include <list>
 #include <functional>
 
 #include <wx/menu.h>
-#include <wx/textentry.h>
 #include <tool/tool_event.h>
 
 class KIFACE_BASE;
@@ -285,5 +283,3 @@ protected:
 
     friend class TOOL_INTERACTIVE;
 };
-
-#endif

include/tool/selection_tool.h

@@ -22,12 +22,11 @@
  */
 
 #pragma once
-#ifndef INCLUDE_TOOL_SELECTION_TOOL_H_
-#define INCLUDE_TOOL_SELECTION_TOOL_H_
+
+#include <wx/timer.h>
 
 #include <math/vector2d.h>
 #include <tool/tool_interactive.h>
-#include <wx/timer.h>
 #include <eda_item.h>
 
 class COLLECTOR;
@@ -166,5 +165,3 @@ protected:
 
     VECTOR2I        m_originalCursor;    ///< Location of original cursor when starting click.
 };
-
-#endif /* INCLUDE_TOOL_SELECTION_TOOL_H_ */