Fix errors from new cpplint.py (#7105)

2026-06-21 01:01:43 +00:00 · 2024-09-20 17:43:39 -07:00
parent f1dde8895e
commit 554024767e
464 changed files with 1026 additions and 218 deletions
--- a/simulation/halsim_gui/src/main/native/cpp/AccelerometerSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/AccelerometerSimGui.cpp
@@ -4,11 +4,10 @@

 #include "AccelerometerSimGui.h"

-#include <glass/hardware/Accelerometer.h>
-#include <glass/other/DeviceTree.h>
-
 #include <memory>

+#include <glass/hardware/Accelerometer.h>
+#include <glass/other/DeviceTree.h>
 #include <hal/Value.h>
 #include <hal/simulation/AccelerometerData.h>

--- a/simulation/halsim_gui/src/main/native/cpp/AddressableLEDGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/AddressableLEDGui.cpp
@@ -4,8 +4,10 @@

 #include "AddressableLEDGui.h"

-#include <glass/hardware/LEDDisplay.h>
+#include <memory>
+#include <vector>

+#include <glass/hardware/LEDDisplay.h>
 #include <hal/Ports.h>
 #include <hal/simulation/AddressableLEDData.h>
 #include <imgui.h>
--- a/simulation/halsim_gui/src/main/native/cpp/AnalogGyroSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/AnalogGyroSimGui.cpp
@@ -4,12 +4,11 @@

 #include "AnalogGyroSimGui.h"

-#include <glass/hardware/AnalogGyro.h>
-#include <glass/other/DeviceTree.h>
-
 #include <memory>
 #include <vector>

+#include <glass/hardware/AnalogGyro.h>
+#include <glass/other/DeviceTree.h>
 #include <hal/Ports.h>
 #include <hal/Value.h>
 #include <hal/simulation/AnalogGyroData.h>
--- a/simulation/halsim_gui/src/main/native/cpp/AnalogInputSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/AnalogInputSimGui.cpp
@@ -4,12 +4,11 @@

 #include "AnalogInputSimGui.h"

-#include <glass/View.h>
-#include <glass/hardware/AnalogInput.h>
-
 #include <memory>
 #include <vector>

+#include <glass/View.h>
+#include <glass/hardware/AnalogInput.h>
 #include <hal/Ports.h>
 #include <hal/simulation/AnalogGyroData.h>
 #include <hal/simulation/AnalogInData.h>
--- a/simulation/halsim_gui/src/main/native/cpp/AnalogOutputSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/AnalogOutputSimGui.cpp
@@ -4,12 +4,11 @@

 #include "AnalogOutputSimGui.h"

-#include <glass/hardware/AnalogOutput.h>
-#include <glass/other/DeviceTree.h>
-
 #include <memory>
 #include <vector>

+#include <glass/hardware/AnalogOutput.h>
+#include <glass/other/DeviceTree.h>
 #include <hal/Ports.h>
 #include <hal/simulation/AnalogOutData.h>

--- a/simulation/halsim_gui/src/main/native/cpp/DIOSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/DIOSimGui.cpp
@@ -4,12 +4,11 @@

 #include "DIOSimGui.h"

-#include <glass/hardware/DIO.h>
-#include <glass/hardware/Encoder.h>
-
 #include <memory>
 #include <vector>

+#include <glass/hardware/DIO.h>
+#include <glass/hardware/Encoder.h>
 #include <hal/Ports.h>
 #include <hal/simulation/DIOData.h>
 #include <hal/simulation/DigitalPWMData.h>
--- a/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.cpp
@@ -4,12 +4,6 @@

 #include "DriverStationGui.h"

-#include <glass/Context.h>
-#include <glass/Storage.h>
-#include <glass/other/FMS.h>
-#include <glass/support/ExtraGuiWidgets.h>
-#include <glass/support/NameSetting.h>
-
 #include <algorithm>
 #include <atomic>
 #include <cstring>
@@ -20,6 +14,11 @@

 #include <GLFW/glfw3.h>
 #include <fmt/format.h>
+#include <glass/Context.h>
+#include <glass/Storage.h>
+#include <glass/other/FMS.h>
+#include <glass/support/ExtraGuiWidgets.h>
+#include <glass/support/NameSetting.h>
 #include <hal/DriverStationTypes.h>
 #include <hal/simulation/DriverStationData.h>
 #include <hal/simulation/MockHooks.h>
--- a/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.h
+++ b/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.h
@@ -4,11 +4,11 @@

 #pragma once

-#include <glass/WindowManager.h>
-
 #include <memory>
 #include <string_view>

+#include <glass/WindowManager.h>
+
 namespace halsimgui {

 class DSManager : public glass::WindowManager {
--- a/simulation/halsim_gui/src/main/native/cpp/EncoderSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/EncoderSimGui.cpp
@@ -4,7 +4,6 @@

 #include "EncoderSimGui.h"

-#include <glass/hardware/Encoder.h>
 #include <stdint.h>

 #include <limits>
@@ -13,6 +12,7 @@
 #include <vector>

 #include <fmt/format.h>
+#include <glass/hardware/Encoder.h>
 #include <hal/Ports.h>
 #include <hal/simulation/EncoderData.h>
 #include <hal/simulation/SimDeviceData.h>
--- a/simulation/halsim_gui/src/main/native/cpp/HALProvider.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/HALProvider.cpp
@@ -4,12 +4,11 @@

 #include "HALProvider.h"

+#include <string>
+#include <utility>
+
 #include <glass/Model.h>
 #include <glass/Storage.h>
-
-#include <algorithm>
-#include <string>
-
 #include <hal/simulation/DriverStationData.h>

 using namespace halsimgui;
--- a/simulation/halsim_gui/src/main/native/cpp/HALSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/HALSimGui.cpp
@@ -4,9 +4,11 @@

 #include "HALSimGui.h"

+#include <memory>
+#include <utility>
+
 #include <glass/Context.h>
 #include <glass/Storage.h>
-
 #include <imgui.h>
 #include <wpigui.h>

--- a/simulation/halsim_gui/src/main/native/cpp/NetworkTablesSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/NetworkTablesSimGui.cpp
@@ -4,10 +4,11 @@

 #include "NetworkTablesSimGui.h"

+#include <memory>
+
 #include <glass/Context.h>
 #include <glass/Storage.h>
 #include <glass/networktables/NetworkTables.h>
-
 #include <wpigui.h>

 #include "HALSimGui.h"
--- a/simulation/halsim_gui/src/main/native/cpp/PCMSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/PCMSimGui.cpp
@@ -4,13 +4,12 @@

 #include "PCMSimGui.h"

-#include <glass/hardware/Pneumatic.h>
-#include <glass/other/DeviceTree.h>
-
 #include <cstdio>
 #include <memory>
 #include <vector>

+#include <glass/hardware/Pneumatic.h>
+#include <glass/other/DeviceTree.h>
 #include <hal/Ports.h>
 #include <hal/Value.h>
 #include <hal/simulation/CTREPCMData.h>
--- a/simulation/halsim_gui/src/main/native/cpp/PCMSimGui.h
+++ b/simulation/halsim_gui/src/main/native/cpp/PCMSimGui.h
@@ -3,10 +3,10 @@
 // the WPILib BSD license file in the root directory of this project.

 #pragma once
-#include <glass/hardware/Pneumatic.h>
-
 #include <memory>

+#include <glass/hardware/Pneumatic.h>
+
 namespace halsimgui {

 class PCMSimGui {
--- a/simulation/halsim_gui/src/main/native/cpp/PHSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/PHSimGui.cpp
@@ -4,13 +4,12 @@

 #include "PHSimGui.h"

-#include <glass/hardware/Pneumatic.h>
-#include <glass/other/DeviceTree.h>
-
 #include <cstdio>
 #include <memory>
 #include <vector>

+#include <glass/hardware/Pneumatic.h>
+#include <glass/other/DeviceTree.h>
 #include <hal/Ports.h>
 #include <hal/Value.h>
 #include <hal/simulation/REVPHData.h>
--- a/simulation/halsim_gui/src/main/native/cpp/PHSimGui.h
+++ b/simulation/halsim_gui/src/main/native/cpp/PHSimGui.h
@@ -3,10 +3,10 @@
 // the WPILib BSD license file in the root directory of this project.

 #pragma once
-#include <glass/hardware/Pneumatic.h>
-
 #include <memory>

+#include <glass/hardware/Pneumatic.h>
+
 namespace halsimgui {

 class PHSimGui {
--- a/simulation/halsim_gui/src/main/native/cpp/PWMSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/PWMSimGui.cpp
@@ -4,11 +4,10 @@

 #include "PWMSimGui.h"

-#include <glass/hardware/PWM.h>
-
 #include <memory>
 #include <vector>

+#include <glass/hardware/PWM.h>
 #include <hal/Ports.h>
 #include <hal/simulation/AddressableLEDData.h>
 #include <hal/simulation/PWMData.h>
--- a/simulation/halsim_gui/src/main/native/cpp/PowerDistributionSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/PowerDistributionSimGui.cpp
@@ -4,13 +4,12 @@

 #include "PowerDistributionSimGui.h"

-#include <glass/hardware/PowerDistribution.h>
-
 #include <cstdio>
 #include <cstring>
 #include <memory>
 #include <vector>

+#include <glass/hardware/PowerDistribution.h>
 #include <hal/Ports.h>
 #include <hal/simulation/PowerDistributionData.h>

--- a/simulation/halsim_gui/src/main/native/cpp/RelaySimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/RelaySimGui.cpp
@@ -4,11 +4,10 @@

 #include "RelaySimGui.h"

-#include <glass/hardware/Relay.h>
-
 #include <memory>
 #include <vector>

+#include <glass/hardware/Relay.h>
 #include <hal/Ports.h>
 #include <hal/simulation/RelayData.h>
 #include <wpigui.h>
--- a/simulation/halsim_gui/src/main/native/cpp/RoboRioSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/RoboRioSimGui.cpp
@@ -4,10 +4,9 @@

 #include "RoboRioSimGui.h"

-#include <glass/hardware/RoboRio.h>
-
 #include <memory>

+#include <glass/hardware/RoboRio.h>
 #include <hal/simulation/RoboRioData.h>

 #include "HALDataSource.h"
--- a/simulation/halsim_gui/src/main/native/cpp/SimDeviceGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/SimDeviceGui.cpp
@@ -4,10 +4,13 @@

 #include "SimDeviceGui.h"

-#include <glass/other/DeviceTree.h>
 #include <stdint.h>

+#include <memory>
+#include <utility>
+
 #include <fmt/format.h>
+#include <glass/other/DeviceTree.h>
 #include <hal/SimDevice.h>
 #include <hal/simulation/SimDeviceData.h>
 #include <wpi/DenseMap.h>
--- a/simulation/halsim_gui/src/main/native/cpp/TimingGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/TimingGui.cpp
@@ -4,13 +4,13 @@

 #include "TimingGui.h"

-#include <glass/Model.h>
-#include <glass/View.h>
-
 #include <cstdio>
 #include <cstring>
+#include <memory>
 #include <vector>

+#include <glass/Model.h>
+#include <glass/View.h>
 #include <hal/HALBase.h>
 #include <hal/simulation/MockHooks.h>
 #include <hal/simulation/NotifierData.h>
--- a/simulation/halsim_gui/src/main/native/cpp/main.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/main.cpp
@@ -2,14 +2,14 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.

+#include <cstdio>
+#include <memory>
+#include <string_view>
+
 #include <glass/Context.h>
 #include <glass/Storage.h>
 #include <glass/hardware/Pneumatic.h>
 #include <glass/other/Plot.h>
-
-#include <cstdio>
-#include <string_view>
-
 #include <hal/Extensions.h>
 #include <hal/Main.h>
 #include <imgui.h>