Remove boost::filesystem in favour of std::filesystemp2pvr-0.3.3

24 files changed, 46 insertions, 69 deletions

diff --git a/libtmdb/Jamfile.jam b/libtmdb/Jamfile.jam
index f6c8366..9c7a40e 100644
--- a/libtmdb/Jamfile.jam
+++ b/libtmdb/Jamfile.jam
@@ -5,8 +5,7 @@ lib slicer-json : : : : <include>/usr/include/slicer ;
 lib Ice : : <name>Ice++11 ;
 lib jsonpp ;
 lib pthread ;
-lib boost_system ;
-lib boost_filesystem ;
+lib stdc++fs ;
 lib curl ;
 lib boost_utf : : <name>boost_unit_test_framework ;
 lib adhocutil : : : : <include>/usr/include/adhocutil ;
@@ -18,7 +17,6 @@ lib tmdb :
 	<library>pthread
 	<library>slicer
 	<library>slicer-json
-	<library>boost_system
 	<library>..//glibmm
 	<library>curl
 	<library>adhocutil
@@ -46,8 +44,7 @@ run
 	<library>tmdb
 	<library>slicer
 	<library>slicer-json
-	<library>boost_filesystem
-	<library>boost_system
+	<library>stdc++fs
 	<implicit-dependency>tmdb
 	:
 	testModels
@@ -61,8 +58,7 @@ run
 	<library>tmdb
 	<library>slicer
 	<library>slicer-json
-	<library>boost_filesystem
-	<library>boost_system
+	<library>stdc++fs
 	<implicit-dependency>tmdb
 	:
 	testFormatUrls
@@ -76,8 +72,7 @@ run
 	<library>tmdb
 	<library>slicer
 	<library>slicer-json
-	<library>boost_filesystem
-	<library>boost_system
+	<library>stdc++fs
 	<implicit-dependency>tmdb
 	:
 	testCallMockApi
diff --git a/p2pvr/daemon/storage.h b/p2pvr/daemon/storage.h
index c9c984d..f062b28 100644
--- a/p2pvr/daemon/storage.h
+++ b/p2pvr/daemon/storage.h
@@ -5,7 +5,7 @@
 #include <options.h>
 #include <string>
 #include <set>
-#include <boost/filesystem/path.hpp>
+#include <filesystem>
 #include "temporaryIceAdapterObject.h"
 #include <visibility.h>
 #include <logger.h>
diff --git a/p2pvr/daemon/unittests/Jamfile.jam b/p2pvr/daemon/unittests/Jamfile.jam
index 8c25c07..017beb1 100644
--- a/p2pvr/daemon/unittests/Jamfile.jam
+++ b/p2pvr/daemon/unittests/Jamfile.jam
@@ -1,7 +1,7 @@
 import testing ;
 
 lib boost_system ;
-lib boost_filesystem ;
+lib stdc++fs ;
 lib Ice : : <name>Ice++11 ;
 lib IceBox : : <name>IceBox++11 ;
 lib dbppcore : : : : <include>/usr/include/dbpp ;
@@ -41,7 +41,7 @@ lib testCommon :
 	<library>../../devices//p2pvrMockTuner
 	<library>../../devices//p2pvrdevices
 	<library>boost_system
-	<library>boost_filesystem
+	<library>stdc++fs
 	<implicit-dependency>../../ice
 	<library>../../ice
 	: :
@@ -55,7 +55,7 @@ lib testCommon :
 	<library>Ice
 	<library>IceBox
 	<library>boost_system
-	<library>boost_filesystem
+	<library>stdc++fs
 	<library>../..//boost_utf
 	<library>../../devices//p2pvrMockTuner
 	<library>../../devices//mockdata
diff --git a/p2pvr/daemon/unittests/mockDevices.cpp b/p2pvr/daemon/unittests/mockDevices.cpp
index 135664f..b374e20 100644
--- a/p2pvr/daemon/unittests/mockDevices.cpp
+++ b/p2pvr/daemon/unittests/mockDevices.cpp
@@ -11,7 +11,7 @@ namespace P2PVR {
 		}
 
 		TunerPtr
-		MockDevices::openTuner(const boost::filesystem::path & path) const
+		MockDevices::openTuner(const std::filesystem::path & path) const
 		{
 			return std::make_shared<P2PVR::DVB::Testing::MockTuner>(path, ic);
 		}
diff --git a/p2pvr/daemon/unittests/mockDevices.h b/p2pvr/daemon/unittests/mockDevices.h
index a9ed170..596a7bd 100644
--- a/p2pvr/daemon/unittests/mockDevices.h
+++ b/p2pvr/daemon/unittests/mockDevices.h
@@ -11,7 +11,7 @@ namespace P2PVR {
 			public:
 				MockDevices(Ice::CommunicatorPtr ic);
 
-				TunerPtr openTuner(const boost::filesystem::path &) const override;
+				TunerPtr openTuner(const std::filesystem::path &) const override;
 
 			private:
 				Ice::CommunicatorPtr ic;
diff --git a/p2pvr/daemon/unittests/testErrorHandling.cpp b/p2pvr/daemon/unittests/testErrorHandling.cpp
index e38ac8e..0cb71bf 100644
--- a/p2pvr/daemon/unittests/testErrorHandling.cpp
+++ b/p2pvr/daemon/unittests/testErrorHandling.cpp
@@ -1,6 +1,6 @@
 #define BOOST_TEST_MODULE ErrorHandling
 #include <boost/test/unit_test.hpp>
-#include <boost/filesystem/operations.hpp>
+#include <filesystem>
 #include <options.h>
 #include <Ice/ObjectAdapter.h>
 #include <Ice/Service.h>
diff --git a/p2pvr/daemon/unittests/testMaint.cpp b/p2pvr/daemon/unittests/testMaint.cpp
index feb5153..4c72933 100644
--- a/p2pvr/daemon/unittests/testMaint.cpp
+++ b/p2pvr/daemon/unittests/testMaint.cpp
@@ -1,6 +1,6 @@
 #define BOOST_TEST_MODULE Maintenance
 #include <boost/test/unit_test.hpp>
-#include <boost/filesystem/operations.hpp>
+#include <filesystem>
 #include <boost/algorithm/string/predicate.hpp>
 #include <options.h>
 #include <Ice/ObjectAdapter.h>
diff --git a/p2pvr/daemon/unittests/testRecording.cpp b/p2pvr/daemon/unittests/testRecording.cpp
index 533859a..63a54ad 100644
--- a/p2pvr/daemon/unittests/testRecording.cpp
+++ b/p2pvr/daemon/unittests/testRecording.cpp
@@ -1,6 +1,6 @@
 #define BOOST_TEST_MODULE Recording
 #include <boost/test/unit_test.hpp>
-#include <boost/filesystem/operations.hpp>
+#include <filesystem>
 #include <options.h>
 #include <Ice/ObjectAdapter.h>
 #include <Ice/Service.h>
diff --git a/p2pvr/daemon/unittests/testRecordings.cpp b/p2pvr/daemon/unittests/testRecordings.cpp
index b68a2a3..4c78ac9 100644
--- a/p2pvr/daemon/unittests/testRecordings.cpp
+++ b/p2pvr/daemon/unittests/testRecordings.cpp
@@ -1,6 +1,6 @@
 #define BOOST_TEST_MODULE Recordings
 #include <boost/test/unit_test.hpp>
-#include <boost/filesystem/operations.hpp>
+#include <filesystem>
 #include <options.h>
 #include <Ice/ObjectAdapter.h>
 #include <Ice/Service.h>
diff --git a/p2pvr/daemon/unittests/testSched.cpp b/p2pvr/daemon/unittests/testSched.cpp
index 8450a4c..f263d39 100644
--- a/p2pvr/daemon/unittests/testSched.cpp
+++ b/p2pvr/daemon/unittests/testSched.cpp
@@ -1,6 +1,6 @@
 #define BOOST_TEST_MODULE Scheduler
 #include <boost/test/unit_test.hpp>
-#include <boost/filesystem/operations.hpp>
+#include <filesystem>
 #include <options.h>
 #include <Ice/ObjectAdapter.h>
 #include <Ice/Service.h>
diff --git a/p2pvr/daemon/unittests/testSi.cpp b/p2pvr/daemon/unittests/testSi.cpp
index a894155..fc37681 100644
--- a/p2pvr/daemon/unittests/testSi.cpp
+++ b/p2pvr/daemon/unittests/testSi.cpp
@@ -1,6 +1,6 @@
 #define BOOST_TEST_MODULE SI
 #include <boost/test/unit_test.hpp>
-#include <boost/filesystem/operations.hpp>
+#include <filesystem>
 #include <options.h>
 #include <Ice/ObjectAdapter.h>
 #include <Ice/Service.h>
diff --git a/p2pvr/daemon/unittests/testStorage.cpp b/p2pvr/daemon/unittests/testStorage.cpp
index f186f4f..5e7032c 100644
--- a/p2pvr/daemon/unittests/testStorage.cpp
+++ b/p2pvr/daemon/unittests/testStorage.cpp
@@ -1,6 +1,6 @@
 #define BOOST_TEST_MODULE Storage
 #include <boost/test/unit_test.hpp>
-#include <boost/filesystem/operations.hpp>
+#include <filesystem>
 #include <options.h>
 #include <Ice/ObjectAdapter.h>
 #include <Ice/Service.h>
@@ -16,7 +16,6 @@
 using namespace P2PVR;
 using namespace P2PVR::Testing;
 
-const boost::filesystem::path storageRootDir = "/tmp/ut/p2pvr/recordings";
 namespace P2PVR {
 namespace Testing {
 class TestService : public StandardMockDatabase {
diff --git a/p2pvr/devices/Jamfile.jam b/p2pvr/devices/Jamfile.jam
index bb9f70e..363215c 100644
--- a/p2pvr/devices/Jamfile.jam
+++ b/p2pvr/devices/Jamfile.jam
@@ -2,17 +2,14 @@ import type ;
 import generators ;
 import testing ;
 
-lib boost_system ;
-lib boost_thread ;
-lib boost_filesystem ;
+lib stdc++fs ;
 lib boost_program_options ;
 lib lzma ;
 
 lib p2pvrdevices :
 	[ glob-tree *.cpp : mock*.cpp ]
 	:
-	<library>boost_system
-	<library>boost_filesystem
+	<library>stdc++fs
 	<library>boost_program_options
 	<library>../dvb//p2pvrdvb
 	<library>../ice//p2pvrice
@@ -21,9 +18,8 @@ lib p2pvrdevices :
 	<library>..//icetray
 	<implicit-dependency>../ice//p2pvrice
 	: :
-	<library>boost_filesystem
+	<library>stdc++fs
 	<implicit-dependency>../ice//p2pvrice
-	<library>boost_system
 	<include>.
 	;
 
@@ -43,9 +39,7 @@ lib p2pvrMockTuner :
 	mockTuner.cpp
 	:
 	<library>mockdata
-	<library>boost_system
-	<library>boost_thread
-	<library>boost_filesystem
+	<library>stdc++fs
 	<library>p2pvrdevices
 	<library>../dvb//p2pvrdvb
 	<library>../ice//p2pvrice
@@ -54,9 +48,8 @@ lib p2pvrMockTuner :
 	<library>..//icetray
 	<implicit-dependency>../ice//p2pvrice
 	: :
-	<library>boost_filesystem
+	<library>stdc++fs
 	<implicit-dependency>../ice//p2pvrice
-	<library>boost_system
 	<include>.
 	;
 
@@ -77,8 +70,7 @@ run
 	<library>..//adhocutil
 	<library>..//icetray
 	<library>mockdata
-	<library>boost_filesystem
-	<library>boost_system
+	<library>stdc++fs
 	<library>..//boost_utf
 	<define>BOOST_TEST_DYN_LINK
 	;
diff --git a/p2pvr/devices/devices.cpp b/p2pvr/devices/devices.cpp
index 4e7bb09..2906c64 100644
--- a/p2pvr/devices/devices.cpp
+++ b/p2pvr/devices/devices.cpp
@@ -114,7 +114,7 @@ DevicesI::getTuner(const DeliveryProvider & provider)
 }
 
 TunerPtr
-DevicesI::openTuner(const boost::filesystem::path & path) const
+DevicesI::openTuner(const std::filesystem::path & path) const
 {
 	return std::make_shared<DVB::TunerI>(path);
 }
diff --git a/p2pvr/devices/devices.h b/p2pvr/devices/devices.h
index f734012..9647c40 100644
--- a/p2pvr/devices/devices.h
+++ b/p2pvr/devices/devices.h
@@ -9,7 +9,7 @@
 #include <mutex>
 #include <visibility.h>
 #include <logger.h>
-#include <boost/filesystem/path.hpp>
+#include <filesystem>
 
 namespace P2PVR {
 class OpenTuner;
@@ -21,7 +21,7 @@ class DLL_PUBLIC DevicesI : public Tuners {
 
 				ICETRAY_OPTIONS_DECLARE;
 
-				std::vector<boost::filesystem::path> devices;
+				std::vector<std::filesystem::path> devices;
 		};
 
 		DevicesI();
@@ -44,7 +44,7 @@ class DLL_PUBLIC DevicesI : public Tuners {
 		::Ice::Int TunerCount(const Ice::Current &) override;
 
 	protected:
-		virtual TunerPtr openTuner(const boost::filesystem::path &) const;
+		virtual TunerPtr openTuner(const std::filesystem::path &) const;
 
 		typedef boost::function<DVBSI::DeliveryPtr()> DeliveryProvider;
 		typedef boost::function<void(TunerPtr)> Target;
@@ -60,7 +60,7 @@ class DLL_PUBLIC DevicesI : public Tuners {
 
 		OpenDevices openDevices;
 		BackgroundOperations backgroundOperations;
-		std::vector<boost::filesystem::path> devices;
+		std::vector<std::filesystem::path> devices;
 		std::mutex lock;
 		IceTray::OptionsResolver<Options> options;
 
diff --git a/p2pvr/devices/mockTuner.cpp b/p2pvr/devices/mockTuner.cpp
index 531e6a1..3533861 100644
--- a/p2pvr/devices/mockTuner.cpp
+++ b/p2pvr/devices/mockTuner.cpp
@@ -45,7 +45,7 @@ class MockFrontend : public DVB::Frontend {
 		}
 };
 
-MockTuner::MockTuner(const boost::filesystem::path & deviceFrontend, Ice::CommunicatorPtr c) :
+MockTuner::MockTuner(const std::filesystem::path & deviceFrontend, Ice::CommunicatorPtr c) :
 	TunerI(deviceFrontend, DVB::FrontendPtr(new MockFrontend(this, dvb_frontend_info(), logger))),
 	MockData(c),
 	ic(c)
diff --git a/p2pvr/devices/mockTuner.h b/p2pvr/devices/mockTuner.h
index 2277deb..ec73d25 100644
--- a/p2pvr/devices/mockTuner.h
+++ b/p2pvr/devices/mockTuner.h
@@ -14,7 +14,7 @@ namespace DVB {
 namespace Testing {
 class DLL_PUBLIC MockTuner : public DVB::TunerI, MockData {
 	public:
-		MockTuner(const boost::filesystem::path & deviceFrontend, Ice::CommunicatorPtr);
+		MockTuner(const std::filesystem::path & deviceFrontend, Ice::CommunicatorPtr);
 
 		AdHoc::FileUtils::FileHandle OpenDemux() const override;
 		void RequestPID(int, int) const override;
diff --git a/p2pvr/devices/tuner.cpp b/p2pvr/devices/tuner.cpp
index 531397d..7983adb 100644
--- a/p2pvr/devices/tuner.cpp
+++ b/p2pvr/devices/tuner.cpp
@@ -17,9 +17,9 @@ namespace P2PVR {
 namespace DVB {
 IceTray::Logging::LoggerPtr TunerI::logger = LOGMANAGER()->getLogger<TunerI>();
 
-TunerI::TunerI(const boost::filesystem::path & df, FrontendPtr pfe) :
+TunerI::TunerI(const std::filesystem::path & df, FrontendPtr pfe) :
 	deviceFrontend(df),
-	deviceRoot(df.branch_path()),
+	deviceRoot(df.parent_path()),
 	frontendFD(deviceFrontend, O_RDWR),
 	backgroundThread(NULL)
 {
diff --git a/p2pvr/devices/tuner.h b/p2pvr/devices/tuner.h
index 11fbf07..7e852f1 100644
--- a/p2pvr/devices/tuner.h
+++ b/p2pvr/devices/tuner.h
@@ -2,7 +2,7 @@
 #define P2PVR_TUNER_H
 
 #include <dvb.h>
-#include <boost/filesystem/path.hpp>
+#include <filesystem>
 #include <fileUtils.h>
 #include <poll.h>
 #include "frontend.h"
@@ -42,7 +42,7 @@ class DLL_PUBLIC TunerI : public Tuner {
 		typedef std::shared_ptr<IDataSender> BackgroundClient;
 		typedef std::map<int, BackgroundClient> BackgroundClients;
 
-		TunerI(const boost::filesystem::path & deviceFrontend, FrontendPtr = FrontendPtr());
+		TunerI(const std::filesystem::path & deviceFrontend, FrontendPtr = FrontendPtr());
 		~TunerI();
 
 		void TuneTo(const DVBSI::DeliveryPtr &) override;
@@ -76,8 +76,8 @@ class DLL_PUBLIC TunerI : public Tuner {
 		void senderThread();
 		static void setBufferSize(int fd, unsigned long bytes);
 
-		const boost::filesystem::path deviceFrontend;
-		const boost::filesystem::path deviceRoot;
+		const std::filesystem::path deviceFrontend;
+		const std::filesystem::path deviceRoot;
 		AdHoc::FileUtils::FileHandle frontendFD;
 		BackgroundClients backgroundClients;
 		std::thread * backgroundThread;
diff --git a/p2pvr/dvb/Jamfile.jam b/p2pvr/dvb/Jamfile.jam
index b3176bb..7c99c83 100644
--- a/p2pvr/dvb/Jamfile.jam
+++ b/p2pvr/dvb/Jamfile.jam
@@ -1,12 +1,9 @@
-lib boost_system ;
-
 lib p2pvrdvb :
 	[ glob-tree *.cpp : unittests ]
 	:
 	<library>../ice//p2pvrice
 	<library>..//adhocutil
 	<library>..//icetray
-	<library>boost_system
 	<library>../..//glibmm
 	<implicit-dependency>../ice//p2pvrice
 	: :
diff --git a/p2pvr/dvb/unittests/Jamfile.jam b/p2pvr/dvb/unittests/Jamfile.jam
index c812c5c..b724fa5 100644
--- a/p2pvr/dvb/unittests/Jamfile.jam
+++ b/p2pvr/dvb/unittests/Jamfile.jam
@@ -1,8 +1,7 @@
 import testing ;
 
 lib adhocutil ;
-lib boost_system ;
-lib boost_filesystem ;
+lib stdc++fs ;
 lib Ice : : <name>Ice++11 ;
 
 path-constant me : . ;
@@ -15,8 +14,7 @@ exe createSamples :
 	<library>..//p2pvrdvb
 	<library>../../ice//p2pvrice
 	<library>Ice
-	<library>boost_system
-	<library>boost_filesystem
+	<library>stdc++fs
 	<library>../..//boost_utf
 	<define>ROOT=\"$(me)\"
 	;
@@ -30,8 +28,7 @@ exe createBroadcast :
 	<library>../../lib//p2pvrlib
 	<library>../../ice//p2pvrice
 	<library>Ice
-	<library>boost_system
-	<library>boost_filesystem
+	<library>stdc++fs
 	<library>../..//boost_utf
 	<define>ROOT=\"$(me)\"
 	;
diff --git a/p2pvr/dvb/unittests/createBroadcast.cpp b/p2pvr/dvb/unittests/createBroadcast.cpp
index b7e047b..bf1de2d 100644
--- a/p2pvr/dvb/unittests/createBroadcast.cpp
+++ b/p2pvr/dvb/unittests/createBroadcast.cpp
@@ -1,6 +1,6 @@
 #define BOOST_TEST_MODULE CreateSamples
 #include <boost/test/unit_test.hpp>
-#include <boost/filesystem/operations.hpp>
+#include <filesystem>
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
 #include <boost/tuple/tuple.hpp>
@@ -81,7 +81,7 @@ class Sampler {
 		}
 
 	private:
-		void Save(Ice::CommunicatorPtr ic, const Sampled & s, const boost::filesystem::path & fileName)
+		void Save(Ice::CommunicatorPtr ic, const Sampled & s, const std::filesystem::path & fileName)
 		{
 			Ice::OutputStream out(ic);
 			out.write(s);
diff --git a/p2pvr/dvb/unittests/createSamples.cpp b/p2pvr/dvb/unittests/createSamples.cpp
index c36b49d..523cccb 100644
--- a/p2pvr/dvb/unittests/createSamples.cpp
+++ b/p2pvr/dvb/unittests/createSamples.cpp
@@ -1,6 +1,6 @@
 #define BOOST_TEST_MODULE CreateSamples
 #include <boost/test/unit_test.hpp>
-#include <boost/filesystem/operations.hpp>
+#include <filesystem>
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
 #include <boost/tuple/tuple.hpp>
@@ -67,7 +67,7 @@ class SiSampleCollector : public Base {
 template <class Base, class Object, class ... P>
 static
 std::shared_ptr<SiSampleCollector<Base, Object>>
-CaptureAndSave(const boost::filesystem::path & fileName, const boost::function<void(TunersPrxPtr, ::DVBSI::DeliveryPtr, RawDataClientPrxPtr)> & method, const P & ... pp)
+CaptureAndSave(const std::filesystem::path & fileName, const boost::function<void(TunersPrxPtr, ::DVBSI::DeliveryPtr, RawDataClientPrxPtr)> & method, const P & ... pp)
 {
 	auto icp = standardConfig<SiSampleCollector<Base, Object>>(pp...);
 	auto ic = std::get<0>(icp);
diff --git a/p2pvr/lib/Jamfile.jam b/p2pvr/lib/Jamfile.jam
index 0e15277..818a496 100644
--- a/p2pvr/lib/Jamfile.jam
+++ b/p2pvr/lib/Jamfile.jam
@@ -1,12 +1,10 @@
 lib slicer : : <name>slicer : : <include>/usr/include/slicer ;
-lib boost_system ;
-lib boost_filesystem ;
+lib stdc++fs ;
 
 lib p2pvrlib :
 	[ glob-tree *.cpp ]
 	:
-	<library>boost_system
-	<library>boost_filesystem
+	<library>stdc++fs
 	<library>../ice//p2pvrice
 	<library>../dvb//p2pvrdvb
 	<library>..//icetray
@@ -14,8 +12,7 @@ lib p2pvrlib :
 	<implicit-dependency>../ice//p2pvrice
 	<library>slicer
 	: :
-	<library>boost_filesystem
+	<library>stdc++fs
 	<implicit-dependency>../ice//p2pvrice
-	<library>boost_system
 	<include>.
 	;