Skip to content

Commit 99178d7

Browse files
adlarkinadlarkin
authored
Resolve updated codecheck issues (#443)
Signed-off-by: Ashton Larkin <[email protected]>
1 parent 8856e72 commit 99178d7

File tree

46 files changed

+213
-75
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+213
-75
lines changed

‎src/LevelManager.cc

+4-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
*
1616
*/
1717

18+
#include "LevelManager.hh"
19+
20+
#include <algorithm>
21+
1822
#include <sdf/Light.hh>
1923
#include <sdf/Model.hh>
2024
#include <sdf/World.hh>
@@ -44,7 +48,6 @@
4448
#include "ignition/gazebo/components/Wind.hh"
4549
#include "ignition/gazebo/components/World.hh"
4650

47-
#include "LevelManager.hh"
4851
#include "SimulationRunner.hh"
4952

5053
using namespace ignition;

‎src/SdfGenerator.cc

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414
* limitations under the License.
1515
*
1616
*/
17+
18+
#include "SdfGenerator.hh"
19+
1720
#include <memory>
21+
#include <vector>
1822

1923
#include <sdf/sdf.hh>
2024

@@ -28,7 +32,6 @@
2832
#include "ignition/gazebo/components/SourceFilePath.hh"
2933
#include "ignition/gazebo/components/World.hh"
3034

31-
#include "SdfGenerator.hh"
3235

3336
namespace ignition
3437
{

‎src/SimulationRunner.cc

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
#include "SimulationRunner.hh"
1919

20+
#include <algorithm>
21+
2022
#include "ignition/common/Profiler.hh"
2123

2224
#include "ignition/gazebo/components/Model.hh"

‎src/gui/PathManager.cc

+5-1
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@
1515
*
1616
*/
1717

18+
#include "PathManager.hh"
19+
1820
#include <ignition/msgs/sdf_generator_config.pb.h>
1921

22+
#include <string>
23+
#include <vector>
24+
2025
#include <ignition/common/Console.hh>
2126
#include <ignition/common/Profiler.hh>
2227
#include <ignition/gui/Application.hh>
2328

2429
#include "ignition/gazebo/Util.hh"
25-
#include "PathManager.hh"
2630

2731
using namespace ignition;
2832
using namespace gazebo;

‎src/gui/PathManager.hh

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <ignition/transport/Node.hh>
2323

2424
#include "ignition/gazebo/Export.hh"
25+
#include "ignition/gazebo/config.hh"
2526

2627
namespace ignition
2728
{

‎src/gui/plugins/entity_tree/EntityTree.cc

+4-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515
*
1616
*/
1717

18+
#include "EntityTree.hh"
19+
1820
#include <iostream>
21+
#include <vector>
22+
1923
#include <ignition/common/Console.hh>
2024
#include <ignition/common/Profiler.hh>
2125
#include <ignition/gui/Application.hh>
@@ -37,8 +41,6 @@
3741
#include "ignition/gazebo/EntityComponentManager.hh"
3842
#include "ignition/gazebo/gui/GuiEvents.hh"
3943

40-
#include "EntityTree.hh"
41-
4244
namespace ignition::gazebo
4345
{
4446
class EntityTreePrivate

‎src/gui/plugins/modules/EntityContextMenu.cc

+5-2
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,22 @@
1414
* limitations under the License.
1515
*
1616
*/
17+
18+
#include "EntityContextMenu.hh"
19+
1720
#include <ignition/msgs/boolean.pb.h>
1821
#include <ignition/msgs/stringmsg.pb.h>
1922
#include <ignition/msgs/entity.pb.h>
2023

2124
#include <iostream>
25+
#include <string>
26+
2227
#include <ignition/common/Console.hh>
2328
#include <ignition/gazebo/gui/GuiRunner.hh>
2429
#include <ignition/gazebo/Conversions.hh>
2530
#include <ignition/gui/Application.hh>
2631
#include <ignition/transport/Node.hh>
2732

28-
#include "EntityContextMenu.hh"
29-
3033
namespace ignition::gazebo
3134
{
3235
/// \brief Private data class for EntityContextMenu

‎src/gui/plugins/playback_scrubber/PlaybackScrubber.cc

+8-3
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,21 @@
1414
* limitations under the License.
1515
*
1616
*/
17+
18+
#include "PlaybackScrubber.hh"
19+
1720
#include <ignition/msgs/boolean.pb.h>
1821
#include <ignition/msgs/stringmsg.pb.h>
19-
#include <ignition/math/Helpers.hh>
2022

2123
#include <chrono>
2224
#include <ctime>
2325
#include <iostream>
2426
#include <regex>
27+
#include <string>
28+
#include <utility>
29+
30+
#include <ignition/math/Helpers.hh>
31+
2532
#include <ignition/common/Console.hh>
2633
#include <ignition/gui/Application.hh>
2734
#include <ignition/gui/Helpers.hh>
@@ -35,8 +42,6 @@
3542
#include "ignition/gazebo/EntityComponentManager.hh"
3643
#include "ignition/gazebo/gui/GuiEvents.hh"
3744

38-
#include "PlaybackScrubber.hh"
39-
4045
namespace ignition::gazebo
4146
{
4247
class PlaybackScrubberPrivate

‎src/gui/plugins/resource_spawner/ResourceSpawner.cc

+5-4
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,14 @@
1515
*
1616
*/
1717

18+
#include "ResourceSpawner.hh"
19+
1820
#include <ignition/msgs/boolean.pb.h>
1921
#include <ignition/msgs/stringmsg.pb.h>
2022

23+
#include <set>
24+
#include <unordered_map>
25+
2126
#include <sdf/Root.hh>
2227
#include <sdf/parser.hh>
2328

@@ -32,13 +37,9 @@
3237
#include <ignition/fuel_tools/FuelClient.hh>
3338
#include <ignition/fuel_tools/ClientConfig.hh>
3439

35-
#include <set>
36-
3740
#include "ignition/gazebo/EntityComponentManager.hh"
3841
#include "ignition/gazebo/gui/GuiEvents.hh"
3942

40-
#include "ResourceSpawner.hh"
41-
4243
namespace ignition::gazebo
4344
{
4445
class ResourceSpawnerPrivate

‎src/gui/plugins/scene3d/Scene3D.cc

+5-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,15 @@
1515
*
1616
*/
1717

18+
#include "Scene3D.hh"
19+
20+
#include <algorithm>
1821
#include <cmath>
22+
#include <limits>
1923
#include <map>
2024
#include <sstream>
2125
#include <string>
26+
#include <utility>
2227
#include <vector>
2328

2429
#include <sdf/Link.hh>
@@ -59,8 +64,6 @@
5964
#include "ignition/gazebo/EntityComponentManager.hh"
6065
#include "ignition/gazebo/rendering/RenderUtil.hh"
6166

62-
#include "Scene3D.hh"
63-
6467
Q_DECLARE_METATYPE(std::string)
6568

6669
namespace ignition

‎src/gui/plugins/shapes/Shapes.cc

+6-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,16 @@
1414
* limitations under the License.
1515
*
1616
*/
17+
18+
#include "Shapes.hh"
19+
1720
#include <ignition/msgs/boolean.pb.h>
1821
#include <ignition/msgs/stringmsg.pb.h>
1922

23+
#include <algorithm>
2024
#include <iostream>
25+
#include <string>
26+
2127
#include <ignition/common/Console.hh>
2228
#include <ignition/gui/Application.hh>
2329
#include <ignition/gui/MainWindow.hh>
@@ -28,8 +34,6 @@
2834
#include "ignition/gazebo/EntityComponentManager.hh"
2935
#include "ignition/gazebo/gui/GuiEvents.hh"
3036

31-
#include "Shapes.hh"
32-
3337
namespace ignition::gazebo
3438
{
3539
class ShapesPrivate

‎src/gui/plugins/transform_control/TransformControl.cc

+5-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,15 @@
1414
* limitations under the License.
1515
*
1616
*/
17+
18+
#include "TransformControl.hh"
19+
1720
#include <ignition/msgs/boolean.pb.h>
1821
#include <ignition/msgs/stringmsg.pb.h>
1922

2023
#include <iostream>
24+
#include <string>
25+
2126
#include <ignition/common/Console.hh>
2227
#include <ignition/gui/Application.hh>
2328
#include <ignition/gui/MainWindow.hh>
@@ -30,8 +35,6 @@
3035
#include "ignition/gazebo/EntityComponentManager.hh"
3136
#include "ignition/gazebo/gui/GuiEvents.hh"
3237

33-
#include "TransformControl.hh"
34-
3538
namespace ignition::gazebo
3639
{
3740
class TransformControlPrivate

‎src/gui/plugins/video_recorder/VideoRecorder.cc

+5-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,15 @@
1414
* limitations under the License.
1515
*
1616
*/
17+
18+
#include "VideoRecorder.hh"
19+
1720
#include <ignition/msgs/boolean.pb.h>
1821
#include <ignition/msgs/video_record.pb.h>
1922

2023
#include <iostream>
24+
#include <string>
25+
2126
#include <ignition/common/Console.hh>
2227
#include <ignition/common/Filesystem.hh>
2328
#include <ignition/gui/Application.hh>
@@ -29,8 +34,6 @@
2934
#include "ignition/gazebo/components/ParentEntity.hh"
3035
#include "ignition/gazebo/EntityComponentManager.hh"
3136

32-
#include "VideoRecorder.hh"
33-
3437
namespace ignition::gazebo
3538
{
3639
class VideoRecorderPrivate

‎src/gui/plugins/view_angle/ViewAngle.cc

+5-2
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,19 @@
1414
* limitations under the License.
1515
*
1616
*/
17+
18+
#include "ViewAngle.hh"
19+
1720
#include <ignition/msgs/boolean.pb.h>
1821
#include <ignition/msgs/vector3d.pb.h>
1922

2023
#include <iostream>
24+
#include <string>
25+
2126
#include <ignition/common/Console.hh>
2227
#include <ignition/plugin/Register.hh>
2328
#include <ignition/transport/Node.hh>
2429

25-
#include "ViewAngle.hh"
26-
2730
namespace ignition::gazebo
2831
{
2932
class ViewAnglePrivate

‎src/ign.cc

+6-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,13 @@
1414
* limitations under the License.
1515
*
1616
*/
17+
18+
#include "ign.hh"
19+
1720
#include <cstring>
21+
#include <string>
22+
#include <vector>
23+
1824
#include <ignition/common/Console.hh>
1925
#include <ignition/common/Filesystem.hh>
2026
#include <ignition/fuel_tools/FuelClient.hh>
@@ -27,7 +33,6 @@
2733
#include "ignition/gazebo/ServerConfig.hh"
2834

2935
#include "ignition/gazebo/gui/Gui.hh"
30-
#include "ign.hh"
3136

3237
//////////////////////////////////////////////////
3338
extern "C" IGNITION_GAZEBO_VISIBLE char *ignitionGazeboVersion()

‎src/network/NetworkManagerPrimary.cc

+4-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,12 @@
1515
*
1616
*/
1717

18+
#include "NetworkManagerPrimary.hh"
19+
1820
#include <algorithm>
21+
#include <set>
1922
#include <string>
23+
#include <utility>
2024

2125
#include <ignition/common/Console.hh>
2226
#include <ignition/common/Util.hh>
@@ -32,7 +36,6 @@
3236
#include "ignition/gazebo/EntityComponentManager.hh"
3337
#include "ignition/gazebo/Events.hh"
3438

35-
#include "NetworkManagerPrimary.hh"
3639
#include "NetworkManagerPrivate.hh"
3740
#include "PeerTracker.hh"
3841

‎src/network/PeerTracker.cc

+3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
*/
1717
#include "PeerTracker.hh"
1818

19+
#include <algorithm>
20+
#include <utility>
21+
1922
using namespace ignition;
2023
using namespace gazebo;
2124

‎src/systems/air_pressure/AirPressure.cc

+7-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,15 @@
1414
* limitations under the License.
1515
*
1616
*/
17+
18+
#include "AirPressure.hh"
19+
1720
#include <ignition/msgs/air_pressure_sensor.pb.h>
1821

22+
#include <string>
23+
#include <unordered_map>
24+
#include <utility>
25+
1926
#include <ignition/plugin/Register.hh>
2027

2128
#include <ignition/common/Profiler.hh>
@@ -35,8 +42,6 @@
3542
#include "ignition/gazebo/EntityComponentManager.hh"
3643
#include "ignition/gazebo/Util.hh"
3744

38-
#include "AirPressure.hh"
39-
4045
using namespace ignition;
4146
using namespace gazebo;
4247
using namespace systems;

0 commit comments

Comments
 (0)