SCRIPT Run cc include replacements

glass/src/libnt/native/cpp/NTAlerts.cpp

@@ -2,7 +2,7 @@
 // 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 "glass/networktables/NTAlerts.h"
+#include "wpi/glass/networktables/NTAlerts.hpp"
 
 #include <utility>
 

glass/src/libnt/native/cpp/NTCommandScheduler.cpp

@@ -2,12 +2,12 @@
 // 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 "glass/networktables/NTCommandScheduler.h"
+#include "wpi/glass/networktables/NTCommandScheduler.hpp"
 
 #include <utility>
 
 #include <fmt/format.h>
-#include <wpi/StringExtras.h>
+#include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
 

glass/src/libnt/native/cpp/NTCommandSelector.cpp

@@ -2,12 +2,12 @@
 // 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 "glass/networktables/NTCommandSelector.h"
+#include "wpi/glass/networktables/NTCommandSelector.hpp"
 
 #include <utility>
 
 #include <fmt/format.h>
-#include <wpi/StringExtras.h>
+#include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
 

glass/src/libnt/native/cpp/NTDifferentialDrive.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 "glass/networktables/NTDifferentialDrive.h"
+#include "wpi/glass/networktables/NTDifferentialDrive.hpp"
 
 #include <utility>
 
 #include <fmt/format.h>
 #include <imgui.h>
-#include <wpi/MathExtras.h>
-#include <wpi/StringExtras.h>
+#include "wpi/util/MathExtras.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
 

glass/src/libnt/native/cpp/NTDigitalInput.cpp

@@ -2,12 +2,12 @@
 // 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 "glass/networktables/NTDigitalInput.h"
+#include "wpi/glass/networktables/NTDigitalInput.hpp"
 
 #include <utility>
 
 #include <fmt/format.h>
-#include <wpi/StringExtras.h>
+#include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
 

glass/src/libnt/native/cpp/NTDigitalOutput.cpp

@@ -2,7 +2,7 @@
 // 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 "glass/networktables/NTDigitalOutput.h"
+#include "wpi/glass/networktables/NTDigitalOutput.hpp"
 
 #include <utility>
 

glass/src/libnt/native/cpp/NTFMS.cpp

@@ -2,15 +2,15 @@
 // 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 "glass/networktables/NTFMS.h"
+#include "wpi/glass/networktables/NTFMS.hpp"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include <fmt/format.h>
-#include <wpi/SmallVector.h>
-#include <wpi/timestamp.h>
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/timestamp.h"
 
 using namespace glass;
 

glass/src/libnt/native/cpp/NTField2D.cpp

@@ -2,7 +2,7 @@
 // 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 "glass/networktables/NTField2D.h"
+#include "wpi/glass/networktables/NTField2D.hpp"
 
 #include <algorithm>
 #include <memory>
@@ -11,13 +11,13 @@
 #include <vector>
 
 #include <fmt/format.h>
-#include <networktables/DoubleArrayTopic.h>
-#include <networktables/MultiSubscriber.h>
-#include <ntcore_cpp.h>
-#include <wpi/Endian.h>
-#include <wpi/MathExtras.h>
-#include <wpi/SmallVector.h>
-#include <wpi/StringExtras.h>
+#include "wpi/nt/DoubleArrayTopic.hpp"
+#include "wpi/nt/MultiSubscriber.hpp"
+#include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/Endian.hpp"
+#include "wpi/util/MathExtras.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
 

glass/src/libnt/native/cpp/NTGyro.cpp

@@ -2,12 +2,12 @@
 // 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 "glass/networktables/NTGyro.h"
+#include "wpi/glass/networktables/NTGyro.hpp"
 
 #include <utility>
 
 #include <fmt/format.h>
-#include <wpi/StringExtras.h>
+#include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
 

glass/src/libnt/native/cpp/NTMecanumDrive.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 "glass/networktables/NTMecanumDrive.h"
+#include "wpi/glass/networktables/NTMecanumDrive.hpp"
 
 #include <utility>
 
 #include <fmt/format.h>
 #include <imgui.h>
-#include <wpi/MathExtras.h>
-#include <wpi/StringExtras.h>
+#include "wpi/util/MathExtras.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
 

glass/src/libnt/native/cpp/NTMechanism2D.cpp

@@ -2,7 +2,7 @@
 // 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 "glass/networktables/NTMechanism2D.h"
+#include "wpi/glass/networktables/NTMechanism2D.hpp"
 
 #include <algorithm>
 #include <memory>
@@ -12,10 +12,10 @@
 
 #include <fmt/format.h>
 #include <imgui.h>
-#include <ntcore_cpp.h>
-#include <wpi/StringExtras.h>
+#include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/StringExtras.hpp"
 
-#include "glass/other/Mechanism2D.h"
+#include "wpi/glass/other/Mechanism2D.hpp"
 
 using namespace glass;
 

glass/src/libnt/native/cpp/NTMotorController.cpp

@@ -2,12 +2,12 @@
 // 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 "glass/networktables/NTMotorController.h"
+#include "wpi/glass/networktables/NTMotorController.hpp"
 
 #include <utility>
 
 #include <fmt/format.h>
-#include <wpi/StringExtras.h>
+#include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
 

glass/src/libnt/native/cpp/NTPIDController.cpp

@@ -2,12 +2,12 @@
 // 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 "glass/networktables/NTPIDController.h"
+#include "wpi/glass/networktables/NTPIDController.hpp"
 
 #include <utility>
 
 #include <fmt/format.h>
-#include <wpi/StringExtras.h>
+#include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
 

glass/src/libnt/native/cpp/NTProfiledPIDController.cpp

@@ -2,12 +2,12 @@
 // 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 "glass/networktables/NTProfiledPIDController.h"
+#include "wpi/glass/networktables/NTProfiledPIDController.hpp"
 
 #include <utility>
 
 #include <fmt/format.h>
-#include <wpi/StringExtras.h>
+#include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
 

glass/src/libnt/native/cpp/NTStringChooser.cpp

@@ -2,12 +2,12 @@
 // 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 "glass/networktables/NTStringChooser.h"
+#include "wpi/glass/networktables/NTStringChooser.hpp"
 
 #include <utility>
 
 #include <fmt/format.h>
-#include <wpi/json.h>
+#include "wpi/util/json.hpp"
 
 using namespace glass;
 

glass/src/libnt/native/cpp/NTSubsystem.cpp

@@ -2,7 +2,7 @@
 // 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 "glass/networktables/NTSubsystem.h"
+#include "wpi/glass/networktables/NTSubsystem.hpp"
 
 #include <utility>
 

glass/src/libnt/native/cpp/NetworkTables.cpp

@@ -2,7 +2,7 @@
 // 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 "glass/networktables/NetworkTables.h"
+#include "wpi/glass/networktables/NetworkTables.hpp"
 
 #include <algorithm>
 #include <cinttypes>
@@ -20,29 +20,29 @@
 #include <fmt/format.h>
 #include <imgui.h>
 #include <imgui_stdlib.h>
-#include <networktables/NetworkTableInstance.h>
-#include <networktables/NetworkTableValue.h>
-#include <ntcore_c.h>
-#include <ntcore_cpp.h>
-#include <ntcore_cpp_types.h>
+#include "wpi/nt/NetworkTableInstance.hpp"
+#include "wpi/nt/NetworkTableValue.hpp"
+#include "wpi/nt/ntcore_c.h"
+#include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/nt/ntcore_cpp_types.hpp"
 #include <upb/message/message.h>
 #include <upb/mini_table/message.h>
 #include <upb/reflection/def.h>
 #include <upb/reflection/message.h>
 #include <upb/reflection/stage0/google/protobuf/descriptor.upb.h>
 #include <upb/wire/decode.h>
-#include <wpi/MessagePack.h>
-#include <wpi/SmallString.h>
-#include <wpi/SpanExtras.h>
-#include <wpi/StringExtras.h>
-#include <wpi/mpack.h>
-#include <wpi/print.h>
-#include <wpi/raw_ostream.h>
+#include "wpi/util/MessagePack.hpp"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/SpanExtras.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/mpack.h"
+#include "wpi/util/print.hpp"
+#include "wpi/util/raw_ostream.hpp"
 
-#include "glass/Context.h"
-#include "glass/DataSource.h"
-#include "glass/Storage.h"
-#include "glass/support/ExtraGuiWidgets.h"
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/DataSource.hpp"
+#include "wpi/glass/Storage.hpp"
+#include "wpi/glass/support/ExtraGuiWidgets.hpp"
 
 using namespace glass;
 using namespace mpack;

glass/src/libnt/native/cpp/NetworkTablesProvider.cpp

@@ -2,19 +2,19 @@
 // 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 "glass/networktables/NetworkTablesProvider.h"
+#include "wpi/glass/networktables/NetworkTablesProvider.hpp"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 
 #include <fmt/format.h>
-#include <ntcore_cpp.h>
-#include <wpi/SmallString.h>
-#include <wpi/StringExtras.h>
-#include <wpigui.h>
+#include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/gui/wpigui.hpp"
 
-#include "glass/Storage.h"
+#include "wpi/glass/Storage.hpp"
 
 using namespace glass;
 

glass/src/libnt/native/cpp/NetworkTablesSettings.cpp

@@ -2,7 +2,7 @@
 // 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 "glass/networktables/NetworkTablesSettings.h"
+#include "wpi/glass/networktables/NetworkTablesSettings.hpp"
 
 #include <optional>
 #include <string_view>
@@ -11,11 +11,11 @@
 
 #include <imgui.h>
 #include <imgui_stdlib.h>
-#include <ntcore_cpp.h>
-#include <wpi/StringExtras.h>
+#include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/StringExtras.hpp"
 
-#include "glass/Context.h"
-#include "glass/Storage.h"
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/Storage.hpp"
 
 using namespace glass;
 

glass/src/libnt/native/cpp/StandardNetworkTables.cpp

@@ -4,23 +4,23 @@
 
 #include <memory>
 
-#include "glass/networktables/NTAlerts.h"
-#include "glass/networktables/NTCommandScheduler.h"
-#include "glass/networktables/NTCommandSelector.h"
-#include "glass/networktables/NTDifferentialDrive.h"
-#include "glass/networktables/NTDigitalInput.h"
-#include "glass/networktables/NTDigitalOutput.h"
-#include "glass/networktables/NTFMS.h"
-#include "glass/networktables/NTField2D.h"
-#include "glass/networktables/NTGyro.h"
-#include "glass/networktables/NTMecanumDrive.h"
-#include "glass/networktables/NTMechanism2D.h"
-#include "glass/networktables/NTMotorController.h"
-#include "glass/networktables/NTPIDController.h"
-#include "glass/networktables/NTProfiledPIDController.h"
-#include "glass/networktables/NTStringChooser.h"
-#include "glass/networktables/NTSubsystem.h"
-#include "glass/networktables/NetworkTablesProvider.h"
+#include "wpi/glass/networktables/NTAlerts.hpp"
+#include "wpi/glass/networktables/NTCommandScheduler.hpp"
+#include "wpi/glass/networktables/NTCommandSelector.hpp"
+#include "wpi/glass/networktables/NTDifferentialDrive.hpp"
+#include "wpi/glass/networktables/NTDigitalInput.hpp"
+#include "wpi/glass/networktables/NTDigitalOutput.hpp"
+#include "wpi/glass/networktables/NTFMS.hpp"
+#include "wpi/glass/networktables/NTField2D.hpp"
+#include "wpi/glass/networktables/NTGyro.hpp"
+#include "wpi/glass/networktables/NTMecanumDrive.hpp"
+#include "wpi/glass/networktables/NTMechanism2D.hpp"
+#include "wpi/glass/networktables/NTMotorController.hpp"
+#include "wpi/glass/networktables/NTPIDController.hpp"
+#include "wpi/glass/networktables/NTProfiledPIDController.hpp"
+#include "wpi/glass/networktables/NTStringChooser.hpp"
+#include "wpi/glass/networktables/NTSubsystem.hpp"
+#include "wpi/glass/networktables/NetworkTablesProvider.hpp"
 
 using namespace glass;