From 235ff70fe7ce28d79728efb2f00d68fea4ee2220 Mon Sep 17 00:00:00 2001
From: ahcorde <ahcorde@gmail.com>
Date: Thu, 27 May 2021 21:11:09 +0200
Subject: [PATCH] Cleanup and alphabetize plugin headers

Signed-off-by: ahcorde <ahcorde@gmail.com>
---
 src/gui/plugins/align_tool/AlignTool.cc          | 16 +++++++++-------
 src/gui/plugins/align_tool/AlignTool.hh          |  2 +-
 src/gui/plugins/grid_config/GridConfig.cc        |  2 +-
 .../playback_scrubber/PlaybackScrubber.cc        |  8 +++-----
 .../playback_scrubber/PlaybackScrubber.hh        |  2 +-
 .../plugins/resource_spawner/ResourceSpawner.cc  |  7 +++----
 src/gui/plugins/shapes/Shapes.cc                 |  1 -
 .../transform_control/TransformControl.cc        | 11 ++++-------
 8 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/src/gui/plugins/align_tool/AlignTool.cc b/src/gui/plugins/align_tool/AlignTool.cc
index ca3520fde5..8a720e44bc 100644
--- a/src/gui/plugins/align_tool/AlignTool.cc
+++ b/src/gui/plugins/align_tool/AlignTool.cc
@@ -24,24 +24,26 @@
 #include <queue>
 #include <string>
 #include <vector>
+
+#include <ignition/common/Console.hh>
 #include <ignition/gui/Application.hh>
 #include <ignition/gui/MainWindow.hh>
-#include <ignition/gazebo/rendering/RenderUtil.hh>
-#include <ignition/common/Console.hh>
 #include <ignition/plugin/Register.hh>
-#include <ignition/transport/Node.hh>
-#include <ignition/rendering/Visual.hh>
 #include <ignition/rendering/Geometry.hh>
 #include <ignition/rendering/Material.hh>
+#include <ignition/rendering/RenderEngine.hh>
 #include <ignition/rendering/RenderTypes.hh>
 #include <ignition/rendering/RenderingIface.hh>
-#include <ignition/rendering/RenderEngine.hh>
 #include <ignition/rendering/Scene.hh>
-#include "ignition/gazebo/components/World.hh"
-#include "ignition/gazebo/components/Name.hh"
+#include <ignition/rendering/Visual.hh>
+#include <ignition/transport/Node.hh>
 
 #include "ignition/gazebo/EntityComponentManager.hh"
+#include "ignition/gazebo/components/Name.hh"
+#include "ignition/gazebo/components/World.hh"
 #include "ignition/gazebo/gui/GuiEvents.hh"
+#include "ignition/gazebo/rendering/RenderUtil.hh"
+
 #include "AlignTool.hh"
 
 namespace ignition::gazebo
diff --git a/src/gui/plugins/align_tool/AlignTool.hh b/src/gui/plugins/align_tool/AlignTool.hh
index 0f3c525d36..41a0d4d726 100644
--- a/src/gui/plugins/align_tool/AlignTool.hh
+++ b/src/gui/plugins/align_tool/AlignTool.hh
@@ -20,8 +20,8 @@
 
 #include <memory>
 
-#include <ignition/gui/Plugin.hh>
 #include <ignition/gazebo/gui/GuiSystem.hh>
+#include <ignition/gui/Plugin.hh>
 #include <ignition/rendering/Node.hh>
 
 namespace ignition
diff --git a/src/gui/plugins/grid_config/GridConfig.cc b/src/gui/plugins/grid_config/GridConfig.cc
index aa7fac9280..740ee7b299 100644
--- a/src/gui/plugins/grid_config/GridConfig.cc
+++ b/src/gui/plugins/grid_config/GridConfig.cc
@@ -18,9 +18,9 @@
 #include <ignition/common/Console.hh>
 #include <ignition/gui/Application.hh>
 #include <ignition/gui/MainWindow.hh>
-#include <ignition/plugin/Register.hh>
 #include <ignition/math/Color.hh>
 #include <ignition/math/Pose3.hh>
+#include <ignition/plugin/Register.hh>
 #include <ignition/rendering.hh>
 
 #include "ignition/gazebo/gui/GuiEvents.hh"
diff --git a/src/gui/plugins/playback_scrubber/PlaybackScrubber.cc b/src/gui/plugins/playback_scrubber/PlaybackScrubber.cc
index 5edadd3145..9f4606091b 100644
--- a/src/gui/plugins/playback_scrubber/PlaybackScrubber.cc
+++ b/src/gui/plugins/playback_scrubber/PlaybackScrubber.cc
@@ -27,19 +27,17 @@
 #include <string>
 #include <utility>
 
-#include <ignition/math/Helpers.hh>
-
 #include <ignition/common/Console.hh>
 #include <ignition/gui/Application.hh>
 #include <ignition/gui/Helpers.hh>
 #include <ignition/gui/MainWindow.hh>
+#include <ignition/math/Helpers.hh>
 #include <ignition/plugin/Register.hh>
 #include <ignition/transport/Node.hh>
 #include <ignition/transport/Publisher.hh>
-#include "ignition/gazebo/components/LogPlaybackStatistics.hh"
-#include "ignition/gazebo/components/World.hh"
-#include "ignition/gazebo/components/Name.hh"
+
 #include "ignition/gazebo/EntityComponentManager.hh"
+#include "ignition/gazebo/components/LogPlaybackStatistics.hh"
 #include "ignition/gazebo/gui/GuiEvents.hh"
 
 namespace ignition::gazebo
diff --git a/src/gui/plugins/playback_scrubber/PlaybackScrubber.hh b/src/gui/plugins/playback_scrubber/PlaybackScrubber.hh
index f770a735b3..f722669e92 100644
--- a/src/gui/plugins/playback_scrubber/PlaybackScrubber.hh
+++ b/src/gui/plugins/playback_scrubber/PlaybackScrubber.hh
@@ -21,8 +21,8 @@
 #include <chrono>
 #include <memory>
 
-#include <ignition/gui/Plugin.hh>
 #include <ignition/gazebo/gui/GuiSystem.hh>
+#include <ignition/gui/Plugin.hh>
 
 namespace ignition
 {
diff --git a/src/gui/plugins/resource_spawner/ResourceSpawner.cc b/src/gui/plugins/resource_spawner/ResourceSpawner.cc
index a567b3cb8f..8d7a2b1b61 100644
--- a/src/gui/plugins/resource_spawner/ResourceSpawner.cc
+++ b/src/gui/plugins/resource_spawner/ResourceSpawner.cc
@@ -28,17 +28,16 @@
 #include <sdf/parser.hh>
 
 #include <ignition/common/Console.hh>
-#include <ignition/common/Profiler.hh>
 #include <ignition/common/Filesystem.hh>
+#include <ignition/common/Profiler.hh>
+#include <ignition/fuel_tools/ClientConfig.hh>
+#include <ignition/fuel_tools/FuelClient.hh>
 #include <ignition/gui/Application.hh>
 #include <ignition/gui/MainWindow.hh>
 #include <ignition/plugin/Register.hh>
 #include <ignition/transport/Node.hh>
 #include <ignition/transport/Publisher.hh>
-#include <ignition/fuel_tools/FuelClient.hh>
-#include <ignition/fuel_tools/ClientConfig.hh>
 
-#include "ignition/gazebo/EntityComponentManager.hh"
 #include "ignition/gazebo/gui/GuiEvents.hh"
 
 namespace ignition::gazebo
diff --git a/src/gui/plugins/shapes/Shapes.cc b/src/gui/plugins/shapes/Shapes.cc
index 489ec3d988..3b9165e5e3 100644
--- a/src/gui/plugins/shapes/Shapes.cc
+++ b/src/gui/plugins/shapes/Shapes.cc
@@ -31,7 +31,6 @@
 #include <ignition/transport/Node.hh>
 #include <ignition/transport/Publisher.hh>
 
-#include "ignition/gazebo/EntityComponentManager.hh"
 #include "ignition/gazebo/gui/GuiEvents.hh"
 
 namespace ignition::gazebo
diff --git a/src/gui/plugins/transform_control/TransformControl.cc b/src/gui/plugins/transform_control/TransformControl.cc
index cf2a39738e..8c5835469d 100644
--- a/src/gui/plugins/transform_control/TransformControl.cc
+++ b/src/gui/plugins/transform_control/TransformControl.cc
@@ -27,19 +27,16 @@
 #include <ignition/gui/Application.hh>
 #include <ignition/gui/MainWindow.hh>
 #include <ignition/plugin/Register.hh>
-#include <ignition/transport/Node.hh>
-#include <ignition/transport/Publisher.hh>
-#include <ignition/rendering/Visual.hh>
 #include <ignition/rendering/Geometry.hh>
 #include <ignition/rendering/Grid.hh>
+#include <ignition/rendering/RenderEngine.hh>
 #include <ignition/rendering/RenderTypes.hh>
 #include <ignition/rendering/RenderingIface.hh>
-#include <ignition/rendering/RenderEngine.hh>
 #include <ignition/rendering/Scene.hh>
+#include <ignition/rendering/Visual.hh>
+#include <ignition/transport/Node.hh>
+#include <ignition/transport/Publisher.hh>
 
-#include "ignition/gazebo/components/Name.hh"
-#include "ignition/gazebo/components/ParentEntity.hh"
-#include "ignition/gazebo/EntityComponentManager.hh"
 #include "ignition/gazebo/gui/GuiEvents.hh"
 
 namespace ignition::gazebo