SCRIPT Run cc include replacements

cscore/src/main/native/cpp/ConfigurableSourceImpl.cpp

@@ -2,16 +2,16 @@
 // 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 "ConfigurableSourceImpl.h"
+#include "ConfigurableSourceImpl.hpp"
 
 #include <memory>
 #include <string>
 
-#include <wpi/timestamp.h>
+#include "wpi/util/timestamp.h"
 
-#include "Handle.h"
-#include "Instance.h"
-#include "Notifier.h"
+#include "Handle.hpp"
+#include "Instance.hpp"
+#include "Notifier.hpp"
 
 using namespace cs;
 

cscore/src/main/native/cpp/ConfigurableSourceImpl.hpp

@@ -13,7 +13,7 @@
 #include <string_view>
 #include <vector>
 
-#include "SourceImpl.h"
+#include "SourceImpl.hpp"
 
 namespace cs {
 

cscore/src/main/native/cpp/Frame.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 "Frame.h"
+#include "Frame.hpp"
 
 #include <cstdlib>
 #include <memory>
@@ -11,8 +11,8 @@
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
 
-#include "Instance.h"
-#include "SourceImpl.h"
+#include "Instance.hpp"
+#include "SourceImpl.hpp"
 
 using namespace cs;
 

cscore/src/main/native/cpp/Frame.hpp

@@ -12,11 +12,11 @@
 #include <utility>
 #include <vector>
 
-#include <wpi/SmallVector.h>
-#include <wpi/mutex.h>
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/mutex.hpp"
 
-#include "Image.h"
-#include "cscore_cpp.h"
+#include "Image.hpp"
+#include "wpi/cs/cscore_cpp.hpp"
 
 namespace cs {
 

cscore/src/main/native/cpp/Handle.hpp

@@ -5,9 +5,9 @@
 #ifndef CSCORE_HANDLE_H_
 #define CSCORE_HANDLE_H_
 
-#include <wpi/Synchronization.h>
+#include "wpi/util/Synchronization.h"
 
-#include "cscore_c.h"
+#include "wpi/cs/cscore_c.h"
 
 namespace cs {
 

cscore/src/main/native/cpp/HttpCameraImpl.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 "HttpCameraImpl.h"
+#include "HttpCameraImpl.hpp"
 
 #include <memory>
 #include <string>
@@ -10,17 +10,17 @@
 #include <vector>
 
 #include <fmt/format.h>
-#include <wpi/MemAlloc.h>
-#include <wpi/StringExtras.h>
-#include <wpi/timestamp.h>
-#include <wpinet/TCPConnector.h>
+#include "wpi/util/MemAlloc.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/timestamp.h"
+#include "wpi/net/TCPConnector.h"
 
-#include "Instance.h"
-#include "JpegUtil.h"
-#include "Log.h"
-#include "Notifier.h"
-#include "Telemetry.h"
-#include "c_util.h"
+#include "Instance.hpp"
+#include "JpegUtil.hpp"
+#include "Log.hpp"
+#include "Notifier.hpp"
+#include "Telemetry.hpp"
+#include "c_util.hpp"
 
 using namespace cs;
 

cscore/src/main/native/cpp/HttpCameraImpl.hpp

@@ -15,13 +15,13 @@
 #include <thread>
 #include <vector>
 
-#include <wpi/StringMap.h>
-#include <wpi/condition_variable.h>
-#include <wpi/raw_istream.h>
-#include <wpinet/HttpUtil.h>
+#include "wpi/util/StringMap.hpp"
+#include "wpi/util/condition_variable.hpp"
+#include "wpi/util/raw_istream.hpp"
+#include "wpi/net/HttpUtil.hpp"
 
-#include "SourceImpl.h"
-#include "cscore_cpp.h"
+#include "SourceImpl.hpp"
+#include "wpi/cs/cscore_cpp.hpp"
 
 namespace cs {
 

cscore/src/main/native/cpp/Image.hpp

@@ -10,8 +10,8 @@
 
 #include <opencv2/core/core.hpp>
 
-#include "cscore_cpp.h"
-#include "default_init_allocator.h"
+#include "wpi/cs/cscore_cpp.hpp"
+#include "default_init_allocator.hpp"
 
 namespace cs {
 

cscore/src/main/native/cpp/Instance.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 "Instance.h"
+#include "Instance.hpp"
 
 #include <memory>
 #include <string_view>
 #include <utility>
 
 #include <fmt/format.h>
-#include <wpi/fs.h>
-#include <wpi/print.h>
+#include "wpi/util/fs.hpp"
+#include "wpi/util/print.hpp"
 
 using namespace cs;
 

cscore/src/main/native/cpp/Instance.hpp

@@ -8,17 +8,17 @@
 #include <memory>
 #include <utility>
 
-#include <wpi/Logger.h>
-#include <wpinet/EventLoopRunner.h>
+#include "wpi/util/Logger.hpp"
+#include "wpi/net/EventLoopRunner.hpp"
 
-#include "Log.h"
-#include "NetworkListener.h"
-#include "Notifier.h"
-#include "SinkImpl.h"
-#include "SourceImpl.h"
-#include "Telemetry.h"
-#include "UnlimitedHandleResource.h"
-#include "UsbCameraListener.h"
+#include "Log.hpp"
+#include "NetworkListener.hpp"
+#include "Notifier.hpp"
+#include "SinkImpl.hpp"
+#include "SourceImpl.hpp"
+#include "Telemetry.hpp"
+#include "UnlimitedHandleResource.hpp"
+#include "UsbCameraListener.hpp"
 
 namespace cs {
 

cscore/src/main/native/cpp/JpegUtil.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 "JpegUtil.h"
+#include "JpegUtil.hpp"
 
 #include <string>
 
-#include <wpi/StringExtras.h>
-#include <wpi/raw_istream.h>
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/raw_istream.hpp"
 
 namespace cs {
 

cscore/src/main/native/cpp/Log.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 "Log.h"
+#include "Log.hpp"
 
 void cs::NamedLogV(wpi::Logger& logger, unsigned int level, const char* file,
                    unsigned int line, std::string_view name,

cscore/src/main/native/cpp/Log.hpp

@@ -7,7 +7,7 @@
 
 #include <string_view>
 
-#include <wpi/Logger.h>
+#include "wpi/util/Logger.hpp"
 
 namespace cs {
 

cscore/src/main/native/cpp/MjpegServerImpl.cpp

@@ -2,29 +2,29 @@
 // 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 "MjpegServerImpl.h"
+#include "MjpegServerImpl.hpp"
 
 #include <chrono>
 #include <memory>
 #include <string>
 #include <utility>
 
-#include <wpi/SmallString.h>
-#include <wpi/StringExtras.h>
-#include <wpi/fmt/raw_ostream.h>
-#include <wpi/print.h>
-#include <wpinet/HttpUtil.h>
-#include <wpinet/TCPAcceptor.h>
-#include <wpinet/raw_socket_istream.h>
-#include <wpinet/raw_socket_ostream.h>
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/fmt/raw_ostream.hpp"
+#include "wpi/util/print.hpp"
+#include "wpi/net/HttpUtil.hpp"
+#include "wpi/net/TCPAcceptor.h"
+#include "wpi/net/raw_socket_istream.hpp"
+#include "wpi/net/raw_socket_ostream.hpp"
 
-#include "Instance.h"
-#include "JpegUtil.h"
-#include "Log.h"
-#include "Notifier.h"
-#include "SourceImpl.h"
-#include "c_util.h"
-#include "cscore_cpp.h"
+#include "Instance.hpp"
+#include "JpegUtil.hpp"
+#include "Log.hpp"
+#include "Notifier.hpp"
+#include "SourceImpl.hpp"
+#include "c_util.hpp"
+#include "wpi/cs/cscore_cpp.hpp"
 
 using namespace cs;
 

cscore/src/main/native/cpp/MjpegServerImpl.hpp

@@ -12,15 +12,15 @@
 #include <thread>
 #include <vector>
 
-#include <wpi/SafeThread.h>
-#include <wpi/SmallVector.h>
-#include <wpi/raw_istream.h>
-#include <wpi/raw_ostream.h>
-#include <wpinet/NetworkAcceptor.h>
-#include <wpinet/NetworkStream.h>
-#include <wpinet/raw_socket_ostream.h>
+#include "wpi/util/SafeThread.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/raw_istream.hpp"
+#include "wpi/util/raw_ostream.hpp"
+#include "wpi/net/NetworkAcceptor.hpp"
+#include "wpi/net/NetworkStream.hpp"
+#include "wpi/net/raw_socket_ostream.hpp"
 
-#include "SinkImpl.h"
+#include "SinkImpl.hpp"
 
 namespace cs {
 

cscore/src/main/native/cpp/NetworkListener.hpp

@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include <wpi/Logger.h>
+#include "wpi/util/Logger.hpp"
 
 namespace cs {
 

cscore/src/main/native/cpp/Notifier.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 "Notifier.h"
+#include "Notifier.hpp"
 
 #include <utility>
 
-#include "Handle.h"
-#include "Instance.h"
-#include "SinkImpl.h"
-#include "SourceImpl.h"
+#include "Handle.hpp"
+#include "Instance.hpp"
+#include "SinkImpl.hpp"
+#include "SourceImpl.hpp"
 
 using namespace cs;
 

cscore/src/main/native/cpp/Notifier.hpp

@@ -8,10 +8,10 @@
 #include <functional>
 #include <utility>
 
-#include <wpi/CallbackManager.h>
+#include "wpi/util/CallbackManager.hpp"
 
-#include "Handle.h"
-#include "cscore_cpp.h"
+#include "Handle.hpp"
+#include "wpi/cs/cscore_cpp.hpp"
 
 namespace cs {
 

cscore/src/main/native/cpp/PropertyContainer.cpp

@@ -2,16 +2,16 @@
 // 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 "PropertyContainer.h"
+#include "PropertyContainer.hpp"
 
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <wpi/Logger.h>
-#include <wpi/SmallString.h>
-#include <wpi/SmallVector.h>
-#include <wpi/json.h>
+#include "wpi/util/Logger.hpp"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/json.hpp"
 
 using namespace cs;
 

cscore/src/main/native/cpp/PropertyContainer.hpp

@@ -13,12 +13,12 @@
 #include <string_view>
 #include <vector>
 
-#include <wpi/StringMap.h>
-#include <wpi/json_fwd.h>
-#include <wpi/mutex.h>
+#include "wpi/util/StringMap.hpp"
+#include "wpi/util/json_fwd.hpp"
+#include "wpi/util/mutex.hpp"
 
-#include "PropertyImpl.h"
-#include "cscore_cpp.h"
+#include "PropertyImpl.hpp"
+#include "wpi/cs/cscore_cpp.hpp"
 
 namespace wpi {
 class Logger;

cscore/src/main/native/cpp/PropertyImpl.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 "PropertyImpl.h"
+#include "PropertyImpl.hpp"
 
 using namespace cs;
 

cscore/src/main/native/cpp/PropertyImpl.hpp

@@ -9,9 +9,9 @@
 #include <string_view>
 #include <vector>
 
-#include <wpi/Signal.h>
+#include "wpi/util/Signal.h"
 
-#include "cscore_c.h"
+#include "wpi/cs/cscore_c.h"
 
 namespace cs {
 

cscore/src/main/native/cpp/RawSinkImpl.cpp

@@ -2,13 +2,13 @@
 // 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 "RawSinkImpl.h"
+#include "RawSinkImpl.hpp"
 
 #include <algorithm>
 #include <memory>
 
-#include "Instance.h"
-#include "cscore_raw.h"
+#include "Instance.hpp"
+#include "wpi/cs/cscore_raw.h"
 
 using namespace cs;
 

cscore/src/main/native/cpp/RawSinkImpl.hpp

@@ -12,11 +12,11 @@
 #include <string_view>
 #include <thread>
 
-#include <wpi/condition_variable.h>
+#include "wpi/util/condition_variable.hpp"
 
-#include "Frame.h"
-#include "SinkImpl.h"
-#include "cscore_raw.h"
+#include "Frame.hpp"
+#include "SinkImpl.hpp"
+#include "wpi/cs/cscore_raw.h"
 
 namespace cs {
 class SourceImpl;

cscore/src/main/native/cpp/RawSourceImpl.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 "RawSourceImpl.h"
+#include "RawSourceImpl.hpp"
 
 #include <memory>
 
-#include <wpi/timestamp.h>
+#include "wpi/util/timestamp.h"
 
-#include "Instance.h"
-#include "Notifier.h"
-#include "cscore_raw.h"
+#include "Instance.hpp"
+#include "Notifier.hpp"
+#include "wpi/cs/cscore_raw.h"
 
 using namespace cs;
 

cscore/src/main/native/cpp/RawSourceImpl.hpp

@@ -12,9 +12,9 @@
 #include <string_view>
 #include <vector>
 
-#include "ConfigurableSourceImpl.h"
-#include "SourceImpl.h"
-#include "cscore_raw.h"
+#include "ConfigurableSourceImpl.hpp"
+#include "SourceImpl.hpp"
+#include "wpi/cs/cscore_raw.h"
 
 namespace cs {
 

cscore/src/main/native/cpp/SinkImpl.cpp

@@ -2,17 +2,17 @@
 // 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 "SinkImpl.h"
+#include "SinkImpl.hpp"
 
 #include <string>
 
-#include <wpi/SmallString.h>
-#include <wpi/json.h>
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/json.hpp"
 
-#include "Instance.h"
-#include "Notifier.h"
-#include "SourceImpl.h"
-#include "c_util.h"
+#include "Instance.hpp"
+#include "Notifier.hpp"
+#include "SourceImpl.hpp"
+#include "c_util.hpp"
 
 using namespace cs;
 

cscore/src/main/native/cpp/SinkImpl.hpp

@@ -9,11 +9,11 @@
 #include <string>
 #include <string_view>
 
-#include <wpi/Logger.h>
-#include <wpi/json_fwd.h>
-#include <wpi/mutex.h>
+#include "wpi/util/Logger.hpp"
+#include "wpi/util/json_fwd.hpp"
+#include "wpi/util/mutex.hpp"
 
-#include "SourceImpl.h"
+#include "SourceImpl.hpp"
 
 namespace cs {
 

cscore/src/main/native/cpp/SourceImpl.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 "SourceImpl.h"
+#include "SourceImpl.hpp"
 
 #include <algorithm>
 #include <cstring>
@@ -11,13 +11,13 @@
 #include <utility>
 #include <vector>
 
-#include <wpi/StringExtras.h>
-#include <wpi/json.h>
-#include <wpi/timestamp.h>
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/json.hpp"
+#include "wpi/util/timestamp.h"
 
-#include "Log.h"
-#include "Notifier.h"
-#include "Telemetry.h"
+#include "Log.hpp"
+#include "Notifier.hpp"
+#include "Telemetry.hpp"
 
 using namespace cs;
 

cscore/src/main/native/cpp/SourceImpl.hpp

@@ -12,17 +12,17 @@
 #include <string_view>
 #include <vector>
 
-#include <wpi/Logger.h>
-#include <wpi/RawFrame.h>
-#include <wpi/condition_variable.h>
-#include <wpi/json_fwd.h>
-#include <wpi/mutex.h>
+#include "wpi/util/Logger.hpp"
+#include "wpi/util/RawFrame.h"
+#include "wpi/util/condition_variable.hpp"
+#include "wpi/util/json_fwd.hpp"
+#include "wpi/util/mutex.hpp"
 
-#include "Frame.h"
-#include "Handle.h"
-#include "Image.h"
-#include "PropertyContainer.h"
-#include "cscore_cpp.h"
+#include "Frame.hpp"
+#include "Handle.hpp"
+#include "Image.hpp"
+#include "PropertyContainer.hpp"
+#include "wpi/cs/cscore_cpp.hpp"
 
 namespace cs {
 

cscore/src/main/native/cpp/Telemetry.cpp

@@ -2,18 +2,18 @@
 // 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 "Telemetry.h"
+#include "Telemetry.hpp"
 
 #include <chrono>
 #include <utility>
 
-#include <wpi/DenseMap.h>
-#include <wpi/timestamp.h>
+#include "wpi/util/DenseMap.hpp"
+#include "wpi/util/timestamp.h"
 
-#include "Handle.h"
-#include "Instance.h"
-#include "Notifier.h"
-#include "SourceImpl.h"
+#include "Handle.hpp"
+#include "Instance.hpp"
+#include "Notifier.hpp"
+#include "SourceImpl.hpp"
 
 using namespace cs;
 

cscore/src/main/native/cpp/Telemetry.hpp

@@ -5,9 +5,9 @@
 #ifndef CSCORE_TELEMETRY_H_
 #define CSCORE_TELEMETRY_H_
 
-#include <wpi/SafeThread.h>
+#include "wpi/util/SafeThread.hpp"
 
-#include "cscore_cpp.h"
+#include "wpi/cs/cscore_cpp.hpp"
 
 namespace cs {
 

cscore/src/main/native/cpp/UnlimitedHandleResource.hpp

@@ -10,8 +10,8 @@
 #include <utility>
 #include <vector>
 
-#include <wpi/SmallVector.h>
-#include <wpi/mutex.h>
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/mutex.hpp"
 
 namespace cs {
 

cscore/src/main/native/cpp/UsbCameraImplCommon.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 "cscore_c.h"  // NOLINT(build/include_order)
+#include "wpi/cs/cscore_c.h"  // NOLINT(build/include_order)
 
-#include <wpi/MemAlloc.h>
+#include "wpi/util/MemAlloc.hpp"
 
-#include "c_util.h"
-#include "cscore_cpp.h"
+#include "c_util.hpp"
+#include "wpi/cs/cscore_cpp.hpp"
 
 using namespace cs;
 

cscore/src/main/native/cpp/UsbCameraListener.hpp

@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include <wpi/Logger.h>
+#include "wpi/util/Logger.hpp"
 
 namespace cs {
 

cscore/src/main/native/cpp/c_util.hpp

@@ -8,7 +8,7 @@
 #include <cstring>
 #include <string_view>
 
-#include <wpi/string.h>
+#include "wpi/util/string.h"
 
 namespace cs {
 

cscore/src/main/native/cpp/cscore_c.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 "cscore_c.h"
+#include "wpi/cs/cscore_c.h"
 
 #include <algorithm>
 #include <cstddef>
@@ -10,11 +10,11 @@
 #include <utility>
 #include <vector>
 
-#include <wpi/MemAlloc.h>
-#include <wpi/SmallString.h>
+#include "wpi/util/MemAlloc.hpp"
+#include "wpi/util/SmallString.hpp"
 
-#include "c_util.h"
-#include "cscore_cpp.h"
+#include "c_util.hpp"
+#include "wpi/cs/cscore_cpp.hpp"
 
 static CS_Event ConvertToC(const cs::RawEvent& rawEvent) {
   CS_Event event;

cscore/src/main/native/cpp/cscore_cpp.cpp

@@ -2,24 +2,24 @@
 // 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 "cscore_cpp.h"
+#include "wpi/cs/cscore_cpp.hpp"
 
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <wpi/SmallString.h>
-#include <wpi/json.h>
-#include <wpinet/hostname.h>
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/json.hpp"
+#include "wpi/net/hostname.hpp"
 
-#include "Handle.h"
-#include "Instance.h"
-#include "NetworkListener.h"
-#include "Notifier.h"
-#include "PropertyContainer.h"
-#include "SinkImpl.h"
-#include "SourceImpl.h"
-#include "Telemetry.h"
+#include "Handle.hpp"
+#include "Instance.hpp"
+#include "NetworkListener.hpp"
+#include "Notifier.hpp"
+#include "PropertyContainer.hpp"
+#include "SinkImpl.hpp"
+#include "SourceImpl.hpp"
+#include "Telemetry.hpp"
 
 using namespace cs;
 

cscore/src/main/native/cpp/cscore_oo.cpp

@@ -2,13 +2,13 @@
 // 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 "cscore_oo.h"
+#include "wpi/cs/cscore_oo.hpp"
 
 #include <string>
 #include <vector>
 
 #include <fmt/format.h>
-#include <wpi/json.h>
+#include "wpi/util/json.hpp"
 
 using namespace cs;
 

cscore/src/main/native/cpp/jni/CameraServerJNI.cpp

@@ -9,12 +9,12 @@
 #include <fmt/format.h>
 
 #define WPI_RAWFRAME_JNI
-#include <wpi/RawFrame.h>
-#include <wpi/SmallString.h>
-#include <wpi/jni_util.h>
+#include "wpi/util/RawFrame.h"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/jni_util.hpp"
 
-#include "cscore_raw.h"
-#include "cscore_runloop.h"
+#include "wpi/cs/cscore_raw.h"
+#include "wpi/cs/cscore_runloop.hpp"
 #include "org_wpilib_vision_camera_CameraServerJNI.h"
 
 namespace cv {