[wpiutil] Split C++ header files

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

@@ -10,7 +10,8 @@
 #include "Handle.hpp"
 #include "Instance.hpp"
 #include "Notifier.hpp"
-#include "wpi/util/timestamp.h"
+#include "wpi/util/string.hpp"
+#include "wpi/util/timestamp.hpp"
 
 using namespace wpi::cs;
 

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

@@ -5,7 +5,7 @@
 #pragma once
 
 #include "wpi/cs/cscore_c.h"
-#include "wpi/util/Synchronization.h"
+#include "wpi/util/Synchronization.hpp"
 
 namespace wpi::cs {
 
@@ -27,8 +27,8 @@ class Handle {
   };
   enum { kIndexMax = 0xffff };
 
-  Handle(CS_Handle handle) : m_handle(handle) {}  // NOLINT
-  operator CS_Handle() const { return m_handle; }
+  Handle(CS_Handle handle) : m_handle(handle) {}   // NOLINT
+  operator CS_Handle() const { return m_handle; }  // NOLINT
 
   Handle(int index, Type type) {
     if (index < 0) {

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

@@ -18,9 +18,9 @@
 #include "Telemetry.hpp"
 #include "c_util.hpp"
 #include "wpi/net/TCPConnector.h"
-#include "wpi/util/MemAlloc.hpp"
 #include "wpi/util/StringExtras.hpp"
-#include "wpi/util/timestamp.h"
+#include "wpi/util/string.hpp"
+#include "wpi/util/timestamp.hpp"
 
 using namespace wpi::cs;
 

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

@@ -23,7 +23,7 @@
 #include "wpi/util/SmallString.hpp"
 #include "wpi/util/StringExtras.hpp"
 #include "wpi/util/fmt/raw_ostream.hpp"
-#include "wpi/util/print.hpp"
+#include "wpi/util/string.hpp"
 
 using namespace wpi::cs;
 

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

@@ -9,6 +9,7 @@
 
 #include "Instance.hpp"
 #include "wpi/cs/cscore_raw.h"
+#include "wpi/util/string.hpp"
 
 using namespace wpi::cs;
 

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

@@ -9,7 +9,8 @@
 #include "Instance.hpp"
 #include "Notifier.hpp"
 #include "wpi/cs/cscore_raw.h"
-#include "wpi/util/timestamp.h"
+#include "wpi/util/string.hpp"
+#include "wpi/util/timestamp.hpp"
 
 using namespace wpi::cs;
 

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

@@ -12,6 +12,7 @@
 #include "c_util.hpp"
 #include "wpi/util/SmallString.hpp"
 #include "wpi/util/json.hpp"
+#include "wpi/util/string.hpp"
 
 using namespace wpi::cs;
 

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

@@ -16,7 +16,7 @@
 #include "Telemetry.hpp"
 #include "wpi/util/StringExtras.hpp"
 #include "wpi/util/json.hpp"
-#include "wpi/util/timestamp.h"
+#include "wpi/util/timestamp.hpp"
 
 using namespace wpi::cs;
 

cscore/src/main/native/cpp/UsbCameraImplCommon.cpp

@@ -9,6 +9,7 @@
 #include "c_util.hpp"
 #include "wpi/cs/cscore_cpp.hpp"
 #include "wpi/util/MemAlloc.hpp"
+#include "wpi/util/string.hpp"
 
 using namespace wpi::cs;
 

cscore/src/main/native/cpp/cscore_c.cpp

@@ -14,6 +14,7 @@
 #include "wpi/cs/cscore_cpp.hpp"
 #include "wpi/util/MemAlloc.hpp"
 #include "wpi/util/SmallString.hpp"
+#include "wpi/util/string.hpp"
 
 static CS_Event ConvertToC(const wpi::cs::RawEvent& rawEvent) {
   CS_Event event;

cscore/src/main/native/include/wpi/cs/cscore_cv.hpp

@@ -4,13 +4,11 @@
 
 #pragma once
 
-#include <functional>
-
 #include <opencv2/core/mat.hpp>
 
 #include "wpi/cs/cscore_oo.hpp"
 #include "wpi/cs/cscore_raw.h"
-#include "wpi/util/RawFrame.h"
+#include "wpi/util/RawFrame.hpp"
 
 namespace wpi::cs {
 /**

cscore/src/main/native/include/wpi/cs/cscore_raw.h

@@ -11,6 +11,7 @@
 // NOLINTBEGIN
 #ifdef __cplusplus
 #include "wpi/cs/cscore_oo.hpp"
+#include "wpi/util/RawFrame.hpp"
 #endif
 
 #ifdef __cplusplus

cscore/src/main/native/linux/RunLoopHelpers.cpp

@@ -3,7 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include "wpi/cs/cscore_runloop.hpp"
-#include "wpi/util/Synchronization.h"
+#include "wpi/util/Synchronization.hpp"
 
 static wpi::util::Event& GetInstance() {
   static wpi::util::Event event;

cscore/src/main/native/linux/UsbCameraImpl.cpp

@@ -34,12 +34,10 @@
 #include "Telemetry.hpp"
 #include "UsbUtil.hpp"
 #include "wpi/cs/cscore_cpp.hpp"
-#include "wpi/util/MemAlloc.hpp"
 #include "wpi/util/SmallString.hpp"
 #include "wpi/util/StringExtras.hpp"
 #include "wpi/util/fs.hpp"
-#include "wpi/util/raw_ostream.hpp"
-#include "wpi/util/timestamp.h"
+#include "wpi/util/timestamp.hpp"
 
 using namespace wpi::cs;
 

cscore/src/main/native/objcpp/UsbCameraDelegate.mm

@@ -5,7 +5,7 @@
 #import "UsbCameraDelegate.hpp"
 #include "UsbCameraImpl.hpp"
 
-#include "wpi/util/timestamp.h"
+#include "wpi/util/timestamp.hpp"
 
 @implementation UsbCameraDelegate
 

cscore/src/main/native/objcpp/UsbCameraImpl.mm

@@ -9,7 +9,7 @@
 
 #include <vector>
 #include <string>
-#include "wpi/util/timestamp.h"
+#include "wpi/util/timestamp.hpp"
 
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #include "Handle.hpp"

cscore/src/main/native/windows/RunLoopHelpers.cpp

@@ -3,7 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include "wpi/cs/cscore_runloop.hpp"
-#include "wpi/util/Synchronization.h"
+#include "wpi/util/Synchronization.hpp"
 
 static wpi::util::Event& GetInstance() {
   static wpi::util::Event event;

cscore/src/main/native/windows/UsbCameraImpl.cpp

@@ -38,7 +38,7 @@
 #include "wpi/util/MemAlloc.hpp"
 #include "wpi/util/SmallString.hpp"
 #include "wpi/util/StringExtras.hpp"
-#include "wpi/util/timestamp.h"
+#include "wpi/util/timestamp.hpp"
 
 #pragma comment(lib, "Mfplat.lib")
 #pragma comment(lib, "Mf.lib")