From f5fb58c9a20cb9d450fe924874ea764fc773a367 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Thu, 3 Aug 2017 01:40:28 +0100 Subject: Reduce visibility of lots of things where possible --- p2pvr/daemon/Jamfile.jam | 1 + p2pvr/daemon/globalDevices.h | 3 +-- p2pvr/daemon/maintenance.h | 3 +-- p2pvr/daemon/recorder.h | 3 +-- p2pvr/daemon/recordings.h | 3 +-- p2pvr/daemon/schedules.h | 3 +-- p2pvr/daemon/si.h | 3 +-- p2pvr/daemon/storage.h | 4 ++-- 8 files changed, 9 insertions(+), 14 deletions(-) diff --git a/p2pvr/daemon/Jamfile.jam b/p2pvr/daemon/Jamfile.jam index 318a585..f276437 100644 --- a/p2pvr/daemon/Jamfile.jam +++ b/p2pvr/daemon/Jamfile.jam @@ -24,6 +24,7 @@ lib p2pvrdaemon : slicer slicer-db yes + hidden . $(me) P2PVR diff --git a/p2pvr/daemon/globalDevices.h b/p2pvr/daemon/globalDevices.h index c5097b3..43a7dc3 100644 --- a/p2pvr/daemon/globalDevices.h +++ b/p2pvr/daemon/globalDevices.h @@ -6,10 +6,9 @@ #include #include -#include namespace P2PVR { -class DLL_PUBLIC GlobalDevices : public Devices { +class GlobalDevices : public Devices { public: class Options : public IceTray::Options { public: diff --git a/p2pvr/daemon/maintenance.h b/p2pvr/daemon/maintenance.h index 5299139..ff53ca6 100644 --- a/p2pvr/daemon/maintenance.h +++ b/p2pvr/daemon/maintenance.h @@ -6,10 +6,9 @@ #include #include #include -#include namespace P2PVR { -class DLL_PUBLIC MaintenanceI : public Maintenance, public IceTray::AbstractDatabaseClient { +class MaintenanceI : public Maintenance, public IceTray::AbstractDatabaseClient { public: class Options : public IceTray::Options { public: diff --git a/p2pvr/daemon/recorder.h b/p2pvr/daemon/recorder.h index 215732f..b2d581c 100644 --- a/p2pvr/daemon/recorder.h +++ b/p2pvr/daemon/recorder.h @@ -6,11 +6,10 @@ #include #include #include "serviceStreamer.h" -#include #include namespace P2PVR { -class DLL_PUBLIC RecorderI : public Recorder { +class RecorderI : public Recorder { public: typedef std::vector Pendings; diff --git a/p2pvr/daemon/recordings.h b/p2pvr/daemon/recordings.h index 4c3a54b..e705e43 100644 --- a/p2pvr/daemon/recordings.h +++ b/p2pvr/daemon/recordings.h @@ -3,12 +3,11 @@ #include #include -#include #include #include namespace P2PVR { -class DLL_PUBLIC RecordingsI : public Recordings, public IceTray::AbstractDatabaseClient { +class RecordingsI : public Recordings, public IceTray::AbstractDatabaseClient { public: RecordingsI(IceTray::DatabasePoolPtr db); diff --git a/p2pvr/daemon/schedules.h b/p2pvr/daemon/schedules.h index 558c127..f1fcde2 100644 --- a/p2pvr/daemon/schedules.h +++ b/p2pvr/daemon/schedules.h @@ -5,7 +5,6 @@ #include #include #include -#include #include #include @@ -65,7 +64,7 @@ class EpisodeGroup { Showings selected; }; -class DLL_PUBLIC SchedulesI : public Schedules, public IceTray::AbstractDatabaseClient { +class SchedulesI : public Schedules, public IceTray::AbstractDatabaseClient { public: class Options : public IceTray::Options { public: diff --git a/p2pvr/daemon/si.h b/p2pvr/daemon/si.h index 4ee7629..820118d 100644 --- a/p2pvr/daemon/si.h +++ b/p2pvr/daemon/si.h @@ -3,11 +3,10 @@ #include #include -#include #include namespace P2PVR { -class DLL_PUBLIC SII : public SI, public IceTray::AbstractDatabaseClient { +class SII : public SI, public IceTray::AbstractDatabaseClient { public: SII(IceTray::DatabasePoolPtr); diff --git a/p2pvr/daemon/storage.h b/p2pvr/daemon/storage.h index 305fb68..3dae5d4 100644 --- a/p2pvr/daemon/storage.h +++ b/p2pvr/daemon/storage.h @@ -12,9 +12,9 @@ #include namespace P2PVR { -class DLL_PUBLIC StorageI : public Storage, IceTray::AbstractDatabaseClient { +class StorageI : public Storage, IceTray::AbstractDatabaseClient { public: - class Options : public IceTray::Options { + class DLL_PUBLIC Options : public IceTray::Options { public: Options(); -- cgit v1.2.3