2 ➡️ 3 (#457)

Signed-off-by: Louise Poubel <[email protected]>
gazebosim · Nov 11, 2020 · fb5c2d3 · fb5c2d3
2 parents 432028f + 05bf057
commit fb5c2d3
Show file tree

Hide file tree

Showing 51 changed files with 495 additions and 102 deletions.
diff --git a/src/LevelManager.cc b/src/LevelManager.cc
@@ -15,6 +15,10 @@
  *
  */
 
+#include "LevelManager.hh"
+
+#include <algorithm>
+
 #include <sdf/Actor.hh>
 #include <sdf/Atmosphere.hh>
 #include <sdf/Light.hh>
@@ -50,7 +54,6 @@
 #include "ignition/gazebo/components/Wind.hh"
 #include "ignition/gazebo/components/World.hh"
 
-#include "LevelManager.hh"
 #include "SimulationRunner.hh"
 
 using namespace ignition;

diff --git a/src/SdfGenerator.cc b/src/SdfGenerator.cc
@@ -14,7 +14,11 @@
  * limitations under the License.
  *
  */
+
+#include "SdfGenerator.hh"
+
 #include <memory>
+#include <vector>
 
 #include <sdf/sdf.hh>
 
@@ -29,7 +33,6 @@
 #include "ignition/gazebo/components/SourceFilePath.hh"
 #include "ignition/gazebo/components/World.hh"
 
-#include "SdfGenerator.hh"
 
 namespace ignition
 {
@@ -346,7 +349,7 @@ namespace sdf_generator
               // https://example.org/1.0/test/models/Backpack
               // the path to the directory containing the sdf file (modelDir)
               // will be:
-              // $HOME/.ignition/fuel/example.org/test/models/Backpack/1/
+              // $HOME/.ignition/fuel/example.org/test/models/Backpack/2/
               // and the basename of the directory is "1", which is the model
               // version.
               //

diff --git a/src/SdfGenerator_TEST.cc b/src/SdfGenerator_TEST.cc
@@ -543,13 +543,13 @@ TEST_F(ElementUpdateFixture, WorldWithModelsIncludedNotExpanded)
 TEST_F(ElementUpdateFixture, WorldWithModelsIncludedWithInvalidUris)
 {
   const std::string goodUri =
-      "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Backpack/1";
+      "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Backpack/2";
 
   // These are URIs that are potentially problematic.
   const std::vector<std::string> fuelUris = {
       // Thes following two URIs are valid, but have a trailing '/'
       "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Backpack/",
-      "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Backpack/1/",
+      "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Backpack/2/",
       // Thes following two URIs are invalid, and will not be saved
       "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Backpack/"
       "notInt",

diff --git a/src/SimulationRunner.cc b/src/SimulationRunner.cc
@@ -17,6 +17,8 @@
 
 #include "SimulationRunner.hh"
 
+#include <algorithm>
+
 #include "ignition/common/Profiler.hh"
 
 #include "ignition/gazebo/components/Model.hh"

diff --git a/src/gui/PathManager.cc b/src/gui/PathManager.cc
@@ -15,14 +15,18 @@
  *
  */
 
+#include "PathManager.hh"
+
 #include <ignition/msgs/sdf_generator_config.pb.h>
 
+#include <string>
+#include <vector>
+
 #include <ignition/common/Console.hh>
 #include <ignition/common/Profiler.hh>
 #include <ignition/gui/Application.hh>
 
 #include "ignition/gazebo/Util.hh"
-#include "PathManager.hh"
 
 using namespace ignition;
 using namespace gazebo;

diff --git a/src/gui/PathManager.hh b/src/gui/PathManager.hh
@@ -22,6 +22,7 @@
 #include <ignition/transport/Node.hh>
 
 #include "ignition/gazebo/Export.hh"
+#include "ignition/gazebo/config.hh"
 
 namespace ignition
 {

diff --git a/src/gui/plugins/entity_tree/EntityTree.cc b/src/gui/plugins/entity_tree/EntityTree.cc
@@ -15,7 +15,11 @@
  *
 */
 
+#include "EntityTree.hh"
+
 #include <iostream>
+#include <vector>
+
 #include <ignition/common/Console.hh>
 #include <ignition/common/Profiler.hh>
 #include <ignition/gui/Application.hh>
@@ -38,8 +42,6 @@
 #include "ignition/gazebo/EntityComponentManager.hh"
 #include "ignition/gazebo/gui/GuiEvents.hh"
 
-#include "EntityTree.hh"
-
 namespace ignition::gazebo
 {
   class EntityTreePrivate

diff --git a/src/gui/plugins/modules/EntityContextMenu.cc b/src/gui/plugins/modules/EntityContextMenu.cc
@@ -14,19 +14,22 @@
  * limitations under the License.
  *
 */
+
+#include "EntityContextMenu.hh"
+
 #include <ignition/msgs/boolean.pb.h>
 #include <ignition/msgs/stringmsg.pb.h>
 #include <ignition/msgs/entity.pb.h>
 
 #include <iostream>
+#include <string>
+
 #include <ignition/common/Console.hh>
 #include <ignition/gazebo/gui/GuiRunner.hh>
 #include <ignition/gazebo/Conversions.hh>
 #include <ignition/gui/Application.hh>
 #include <ignition/transport/Node.hh>
 
-#include "EntityContextMenu.hh"
-
 namespace ignition::gazebo
 {
   /// \brief Private data class for EntityContextMenu

diff --git a/src/gui/plugins/playback_scrubber/PlaybackScrubber.cc b/src/gui/plugins/playback_scrubber/PlaybackScrubber.cc
@@ -14,14 +14,21 @@
  * limitations under the License.
  *
 */
+
+#include "PlaybackScrubber.hh"
+
 #include <ignition/msgs/boolean.pb.h>
 #include <ignition/msgs/stringmsg.pb.h>
-#include <ignition/math/Helpers.hh>
 
 #include <chrono>
 #include <ctime>
 #include <iostream>
 #include <regex>
+#include <string>
+#include <utility>
+
+#include <ignition/math/Helpers.hh>
+
 #include <ignition/common/Console.hh>
 #include <ignition/gui/Application.hh>
 #include <ignition/gui/Helpers.hh>
@@ -35,8 +42,6 @@
 #include "ignition/gazebo/EntityComponentManager.hh"
 #include "ignition/gazebo/gui/GuiEvents.hh"
 
-#include "PlaybackScrubber.hh"
-
 namespace ignition::gazebo
 {
   class PlaybackScrubberPrivate

diff --git a/src/gui/plugins/resource_spawner/ResourceSpawner.cc b/src/gui/plugins/resource_spawner/ResourceSpawner.cc
@@ -15,9 +15,14 @@
  *
  */
 
+#include "ResourceSpawner.hh"
+
 #include <ignition/msgs/boolean.pb.h>
 #include <ignition/msgs/stringmsg.pb.h>
 
+#include <set>
+#include <unordered_map>
+
 #include <sdf/Root.hh>
 #include <sdf/parser.hh>
 
@@ -32,13 +37,9 @@
 #include <ignition/fuel_tools/FuelClient.hh>
 #include <ignition/fuel_tools/ClientConfig.hh>
 
-#include <set>
-
 #include "ignition/gazebo/EntityComponentManager.hh"
 #include "ignition/gazebo/gui/GuiEvents.hh"
 
-#include "ResourceSpawner.hh"
-
 namespace ignition::gazebo
 {
   class ResourceSpawnerPrivate

diff --git a/src/gui/plugins/scene3d/Scene3D.cc b/src/gui/plugins/scene3d/Scene3D.cc
@@ -15,10 +15,15 @@
  *
 */
 
+#include "Scene3D.hh"
+
+#include <algorithm>
 #include <cmath>
+#include <limits>
 #include <map>
 #include <sstream>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <sdf/Link.hh>
@@ -60,8 +65,6 @@
 #include "ignition/gazebo/gui/GuiEvents.hh"
 #include "ignition/gazebo/rendering/RenderUtil.hh"
 
-#include "Scene3D.hh"
-
 Q_DECLARE_METATYPE(std::string)
 
 namespace ignition

diff --git a/src/gui/plugins/shapes/Shapes.cc b/src/gui/plugins/shapes/Shapes.cc
@@ -14,10 +14,16 @@
  * limitations under the License.
  *
 */
+
+#include "Shapes.hh"
+
 #include <ignition/msgs/boolean.pb.h>
 #include <ignition/msgs/stringmsg.pb.h>
 
+#include <algorithm>
 #include <iostream>
+#include <string>
+
 #include <ignition/common/Console.hh>
 #include <ignition/gui/Application.hh>
 #include <ignition/gui/MainWindow.hh>
@@ -28,8 +34,6 @@
 #include "ignition/gazebo/EntityComponentManager.hh"
 #include "ignition/gazebo/gui/GuiEvents.hh"
 
-#include "Shapes.hh"
-
 namespace ignition::gazebo
 {
   class ShapesPrivate

diff --git a/src/gui/plugins/transform_control/TransformControl.cc b/src/gui/plugins/transform_control/TransformControl.cc
@@ -14,10 +14,15 @@
  * limitations under the License.
  *
 */
+
+#include "TransformControl.hh"
+
 #include <ignition/msgs/boolean.pb.h>
 #include <ignition/msgs/stringmsg.pb.h>
 
 #include <iostream>
+#include <string>
+
 #include <ignition/common/Console.hh>
 #include <ignition/gui/Application.hh>
 #include <ignition/gui/MainWindow.hh>
@@ -37,8 +42,6 @@
 #include "ignition/gazebo/EntityComponentManager.hh"
 #include "ignition/gazebo/gui/GuiEvents.hh"
 
-#include "TransformControl.hh"
-
 namespace ignition::gazebo
 {
   class TransformControlPrivate

diff --git a/src/gui/plugins/video_recorder/VideoRecorder.cc b/src/gui/plugins/video_recorder/VideoRecorder.cc
@@ -14,10 +14,15 @@
  * limitations under the License.
  *
 */
+
+#include "VideoRecorder.hh"
+
 #include <ignition/msgs/boolean.pb.h>
 #include <ignition/msgs/video_record.pb.h>
 
 #include <iostream>
+#include <string>
+
 #include <ignition/common/Console.hh>
 #include <ignition/common/Filesystem.hh>
 #include <ignition/gui/Application.hh>
@@ -29,8 +34,6 @@
 #include "ignition/gazebo/components/ParentEntity.hh"
 #include "ignition/gazebo/EntityComponentManager.hh"
 
-#include "VideoRecorder.hh"
-
 namespace ignition::gazebo
 {
   class VideoRecorderPrivate

diff --git a/src/gui/plugins/view_angle/ViewAngle.cc b/src/gui/plugins/view_angle/ViewAngle.cc
@@ -14,16 +14,19 @@
  * limitations under the License.
  *
 */
+
+#include "ViewAngle.hh"
+
 #include <ignition/msgs/boolean.pb.h>
 #include <ignition/msgs/vector3d.pb.h>
 
 #include <iostream>
+#include <string>
+
 #include <ignition/common/Console.hh>
 #include <ignition/plugin/Register.hh>
 #include <ignition/transport/Node.hh>
 
-#include "ViewAngle.hh"
-
 namespace ignition::gazebo
 {
   class ViewAnglePrivate

diff --git a/src/ign.cc b/src/ign.cc
@@ -14,7 +14,13 @@
  * limitations under the License.
  *
 */
+
+#include "ign.hh"
+
 #include <cstring>
+#include <string>
+#include <vector>
+
 #include <ignition/common/Console.hh>
 #include <ignition/common/Filesystem.hh>
 #include <ignition/fuel_tools/FuelClient.hh>
@@ -27,7 +33,6 @@
 #include "ignition/gazebo/ServerConfig.hh"
 
 #include "ignition/gazebo/gui/Gui.hh"
-#include "ign.hh"
 
 //////////////////////////////////////////////////
 extern "C" IGNITION_GAZEBO_VISIBLE char *ignitionGazeboVersion()

diff --git a/src/network/NetworkManagerPrimary.cc b/src/network/NetworkManagerPrimary.cc
@@ -15,8 +15,12 @@
  *
 */
 
+#include "NetworkManagerPrimary.hh"
+
 #include <algorithm>
+#include <set>
 #include <string>
+#include <utility>
 
 #include <ignition/common/Console.hh>
 #include <ignition/common/Util.hh>
@@ -32,7 +36,6 @@
 #include "ignition/gazebo/EntityComponentManager.hh"
 #include "ignition/gazebo/Events.hh"
 
-#include "NetworkManagerPrimary.hh"
 #include "NetworkManagerPrivate.hh"
 #include "PeerTracker.hh"
 

diff --git a/src/network/PeerTracker.cc b/src/network/PeerTracker.cc
@@ -16,6 +16,9 @@
 */
 #include "PeerTracker.hh"
 
+#include <algorithm>
+#include <utility>
+
 using namespace ignition;
 using namespace gazebo;