Move utility classes to util/ subdirectory

Author: tstenner

CMakeLists.txt

@@ -43,8 +43,6 @@ add_library(lslobj OBJECT
 	src/cancellable_streambuf.h
 	src/cancellation.h
 	src/cancellation.cpp
-	src/cast.h
-	src/cast.cpp
 	src/common.cpp
 	src/common.h
 	src/consumer_queue.cpp
@@ -54,8 +52,6 @@ add_library(lslobj OBJECT
 	src/forward.h
 	src/info_receiver.cpp
 	src/info_receiver.h
-	src/inireader.h
-	src/inireader.cpp
 	src/inlet_connection.cpp
 	src/inlet_connection.h
 	src/lsl_resolver_c.cpp
@@ -92,6 +88,10 @@ add_library(lslobj OBJECT
 	src/time_receiver.h
 	src/udp_server.cpp
 	src/udp_server.h
+	src/util/cast.hpp
+	src/util/cast.cpp
+	src/util/inireader.hpp
+	src/util/inireader.cpp
 	thirdparty/loguru/loguru.cpp
 	$<$<BOOL:${LSL_LEGACY_CPP_ABI}>:src/legacy/legacy_abi.cpp src/legacy/legacy_abi.h>
 	# headers

src/api_config.cpp

@@ -1,6 +1,6 @@
 #include "api_config.h"
 #include "common.h"
-#include "inireader.h"
+#include "util/inireader.hpp"
 #include <algorithm>
 #include <cstdlib>
 #include <fstream>

src/data_receiver.cpp

@@ -1,10 +1,10 @@
 #include "data_receiver.h"
 #include "api_config.h"
 #include "cancellable_streambuf.h"
-#include "cast.h"
 #include "inlet_connection.h"
 #include "sample.h"
 #include "socket_utils.h"
+#include "util/cast.hpp"
 #include <iostream>
 #include <loguru.hpp>
 #include <memory>

src/sample.h

@@ -1,8 +1,8 @@
 #ifndef SAMPLE_H
 #define SAMPLE_H
-#include "cast.h"
 #include "common.h"
 #include "forward.h"
+#include "util/cast.hpp"
 #include <atomic>
 #include <boost/endian/conversion.hpp>
 #include <boost/serialization/split_member.hpp>

src/stream_info_impl.cpp

@@ -1,6 +1,6 @@
 #include "stream_info_impl.h"
 #include "api_config.h"
-#include "cast.h"
+#include "util/cast.hpp"
 #include <algorithm>
 #include <boost/uuid/random_generator.hpp>
 #include <boost/uuid/uuid_io.hpp>

src/tcp_server.cpp

@@ -1,11 +1,11 @@
 #include "tcp_server.h"
 #include "api_config.h"
-#include "cast.h"
 #include "consumer_queue.h"
 #include "sample.h"
 #include "send_buffer.h"
 #include "socket_utils.h"
 #include "stream_info_impl.h"
+#include "util/cast.hpp"
 #include <boost/asio/io_context.hpp>
 #include <boost/asio/ip/host_name.hpp>
 #include <boost/asio/ip/tcp.hpp>

src/cast.cpp renamed to src/util/cast.cpp

@@ -1,4 +1,4 @@
-#include "cast.h"
+#include "cast.hpp"
 #include <iomanip>
 #include <locale>
 #include <sstream>

src/cast.h renamed to src/util/cast.hpp

@@ -1,4 +1,4 @@
-#include "inireader.h"
+#include "inireader.hpp"
 #include <istream>
 #include <stdexcept>
 

src/inireader.cpp renamed to src/util/inireader.cpp

@@ -1,4 +1,4 @@
-#include "cast.h"
+#include "cast.hpp"
 #include <iosfwd>
 #include <unordered_map>