Pass table object to handler by reference.

Add override attribute where missing in parsers

13 files changed, 27 insertions, 27 deletions

diff --git a/p2pvr/daemon/maintenance/events.cpp b/p2pvr/daemon/maintenance/events.cpp
index 8a642f9..05c9149 100644
--- a/p2pvr/daemon/maintenance/events.cpp
+++ b/p2pvr/daemon/maintenance/events.cpp
@@ -20,7 +20,7 @@ class SiEventsStream : public Slicer::Stream<::DVBSI::EventPtr> {
 				{
 				}
 
-				bool HandleTable(::DVBSI::EventPtr e) override
+				bool HandleTable(const ::DVBSI::EventPtr & e) override
 				{
 					logger->messagebf(LOG::DEBUG, "Service Id: %d Program Id: %d Title: %s Time: %s - %s",
 							e->ServiceId, e->EventId, e->Title, e->StartTime, e->StopTime);
diff --git a/p2pvr/daemon/maintenance/network.cpp b/p2pvr/daemon/maintenance/network.cpp
index 56f3754..3e08628 100644
--- a/p2pvr/daemon/maintenance/network.cpp
+++ b/p2pvr/daemon/maintenance/network.cpp
@@ -15,7 +15,7 @@ class SiNetworkInformationMerger : public DVBSI::SiNetworkInformationParser {
 		{
 		}
 
-		bool HandleTable(::DVBSI::NetworkPtr n)
+		bool HandleTable(const ::DVBSI::NetworkPtr & n)
 		{
 			logger->messagebf(LOG::DEBUG, "Network Id: %d Name: %s", n->NetworkId, *n->Name);
 			for (const auto & ts : n->TransportStreams) {
diff --git a/p2pvr/daemon/maintenance/services.cpp b/p2pvr/daemon/maintenance/services.cpp
index e04c200..d83e68a 100644
--- a/p2pvr/daemon/maintenance/services.cpp
+++ b/p2pvr/daemon/maintenance/services.cpp
@@ -16,7 +16,7 @@ class SiServicesMerger : public DVBSI::SiServicesParser {
 		{
 		}
 
-		bool HandleTable(::DVBSI::TransportStreamPtr ts)
+		bool HandleTable(const ::DVBSI::TransportStreamPtr & ts)
 		{
 			logger->messagebf(LOG::DEBUG, "Transport Stream Id: %d Original Network Id: %s", ts->TransportStreamId, ts->OriginalNetworkId);
 			for (const auto & s : ts->Services) {
diff --git a/p2pvr/daemon/unittests/testErrorHandling.cpp b/p2pvr/daemon/unittests/testErrorHandling.cpp
index 3758aff..db07293 100644
--- a/p2pvr/daemon/unittests/testErrorHandling.cpp
+++ b/p2pvr/daemon/unittests/testErrorHandling.cpp
@@ -48,7 +48,7 @@ class FailingTestClient : public RawDataClient {
 
 class TestNetworkParser : public SiNetworkInformationParser {
 	public:
-		bool HandleTable(::DVBSI::NetworkPtr) override
+		bool HandleTable(const ::DVBSI::NetworkPtr &) override
 		{
 			return false;
 		}
@@ -56,7 +56,7 @@ class TestNetworkParser : public SiNetworkInformationParser {
 
 class FailingTestNetworkParser : public SiNetworkInformationParser {
 	public:
-		bool HandleTable(::DVBSI::NetworkPtr) override
+		bool HandleTable(const ::DVBSI::NetworkPtr &) override
 		{
 			throw DataHandlingException();
 		}
diff --git a/p2pvr/dvb/siParsers/event.cpp b/p2pvr/dvb/siParsers/event.cpp
index 435fee1..fe51379 100644
--- a/p2pvr/dvb/siParsers/event.cpp
+++ b/p2pvr/dvb/siParsers/event.cpp
@@ -222,7 +222,7 @@ SiEpgParser::CheckTableId(u_char tableId) const
 }
 
 bool
-SiEpgParser::HandleTable(::DVBSI::EitInformationPtr)
+SiEpgParser::HandleTable(const ::DVBSI::EitInformationPtr &)
 {
 	return false;
 }
diff --git a/p2pvr/dvb/siParsers/event.h b/p2pvr/dvb/siParsers/event.h
index 5c331be..dc71a9e 100644
--- a/p2pvr/dvb/siParsers/event.h
+++ b/p2pvr/dvb/siParsers/event.h
@@ -18,13 +18,13 @@ struct EventInformation {
 
 class DLL_PUBLIC SiEpgParser : public SiTableParser<EventInformation, ::DVBSI::EitInformationPtr, int> {
 	protected:
-		bool CheckTableId(u_char tableId) const;
-		int SectionNumberShift() const { return 3; }
-		uint8_t FirstTableId(const EventInformation * ei) { return (ei->header.tableid >= 0x60 ? 0x60 : 0x50); }
-		uint8_t LastTableId(const EventInformation * ei) { return ei->LastTableId; }
-		void ParseSiTable(const EventInformation * eit, ::DVBSI::EitInformationPtr);
-		bool HandleTable(::DVBSI::EitInformationPtr);
-		virtual bool HandleTable(::DVBSI::EventPtr) = 0;
+		bool CheckTableId(u_char tableId) const override;
+		int SectionNumberShift() const override { return 3; }
+		uint8_t FirstTableId(const EventInformation * ei) override { return (ei->header.tableid >= 0x60 ? 0x60 : 0x50); }
+		uint8_t LastTableId(const EventInformation * ei) override { return ei->LastTableId; }
+		void ParseSiTable(const EventInformation * eit, ::DVBSI::EitInformationPtr) override;
+		bool HandleTable(const ::DVBSI::EitInformationPtr &) override;
+		virtual bool HandleTable(const ::DVBSI::EventPtr &) = 0;
 
 	private:
 		DLL_PRIVATE static void parseStartTimeAndDuration(::DVBSI::EventPtr, const u_char * data);
diff --git a/p2pvr/dvb/siParsers/network.h b/p2pvr/dvb/siParsers/network.h
index fa2db82..f466fe5 100644
--- a/p2pvr/dvb/siParsers/network.h
+++ b/p2pvr/dvb/siParsers/network.h
@@ -22,8 +22,8 @@ struct NetworkInformation {
 
 class DLL_PUBLIC SiNetworkInformationParser : public SiTableParser<NetworkInformation, ::DVBSI::NetworkPtr, u_char> {
 	protected:
-		bool CheckTableId(u_char tableId) const;
-		void ParseSiTable(const struct NetworkInformation * nit, ::DVBSI::NetworkPtr);
+		bool CheckTableId(u_char tableId) const override;
+		void ParseSiTable(const struct NetworkInformation * nit, ::DVBSI::NetworkPtr) override;
 
 	private:
 		DLL_PRIVATE static void parseDescriptor_NetworkName(::DVBSI::NetworkPtr, const u_char *data, size_t len);
diff --git a/p2pvr/dvb/siParsers/programAssociation.h b/p2pvr/dvb/siParsers/programAssociation.h
index 8588e3d..8651bf1 100644
--- a/p2pvr/dvb/siParsers/programAssociation.h
+++ b/p2pvr/dvb/siParsers/programAssociation.h
@@ -17,8 +17,8 @@ typedef boost::shared_ptr<ProgramAssociationMap> ProgramAssociationMapPtr;
 
 class DLL_PUBLIC SiProgramAssociationParser : public SiTableParser<ProgramAssociationSection, ProgramAssociationMapPtr, int> {
 	protected:
-		bool CheckTableId(u_char tableId) const;
-		void ParseSiTable(const struct ProgramAssociationSection * pas, ProgramAssociationMapPtr);
+		bool CheckTableId(u_char tableId) const override;
+		void ParseSiTable(const struct ProgramAssociationSection * pas, ProgramAssociationMapPtr) override;
 };
 }
 }
diff --git a/p2pvr/dvb/siParsers/programMap.h b/p2pvr/dvb/siParsers/programMap.h
index 89f8633..c665c93 100644
--- a/p2pvr/dvb/siParsers/programMap.h
+++ b/p2pvr/dvb/siParsers/programMap.h
@@ -30,8 +30,8 @@ struct ProgramMap {
 
 class DLL_PUBLIC SiProgramMapParser : public SiTableParser<ProgramMap, ::DVBSI::ProgramMapPtr, u_char> {
 	protected:
-		bool CheckTableId(u_char tableId) const;
-		void ParseSiTable(const struct ProgramMap * nit, ::DVBSI::ProgramMapPtr);
+		bool CheckTableId(u_char tableId) const override;
+		void ParseSiTable(const struct ProgramMap * nit, ::DVBSI::ProgramMapPtr) override;
 };
 }
 }
diff --git a/p2pvr/dvb/siParsers/service.h b/p2pvr/dvb/siParsers/service.h
index 39dd9d7..016e2eb 100644
--- a/p2pvr/dvb/siParsers/service.h
+++ b/p2pvr/dvb/siParsers/service.h
@@ -16,8 +16,8 @@ struct TransportStreamDescriptor {
 
 class DLL_PUBLIC SiServicesParser : public SiTableParser<TransportStreamDescriptor, ::DVBSI::TransportStreamPtr, int> {
 	protected:
-		bool CheckTableId(u_char tableId) const;
-		void ParseSiTable(const struct TransportStreamDescriptor * nit, ::DVBSI::TransportStreamPtr);
+		bool CheckTableId(u_char tableId) const override;
+		void ParseSiTable(const struct TransportStreamDescriptor * nit, ::DVBSI::TransportStreamPtr) override;
 
 	private:
 		DLL_PRIVATE static void parseDescriptor_Service(::DVBSI::ServicePtr, const u_char *data, size_t len);
diff --git a/p2pvr/dvb/siParsers/table.h b/p2pvr/dvb/siParsers/table.h
index bbf84f6..17a1fc0 100644
--- a/p2pvr/dvb/siParsers/table.h
+++ b/p2pvr/dvb/siParsers/table.h
@@ -32,7 +32,7 @@ class DLL_PUBLIC SiTableParserBase : public P2PVR::RawDataClient {
 
 		typedef boost::shared_ptr<Glib::ustring> StrPtr;
 
-		bool NewData(const P2PVR::Data & bytes, const Ice::Current&);
+		bool NewData(const P2PVR::Data & bytes, const Ice::Current&) override;
 
 		virtual bool IsFinished() const;
 
@@ -99,7 +99,7 @@ class SiTableParser : public SiTableParserBase {
 		virtual uint8_t LastTableId(const TableType * t) { return t->header.tableid; }
 		virtual uint8_t FirstTableId(const TableType * t) { return t->header.tableid; }
 
-		bool ParseInfoTable(const u_char * data, size_t len);
+		bool ParseInfoTable(const u_char * data, size_t len) override;
 
 		static void ParseDescriptor(const SiDescriptorHeader * descriptor);
 
@@ -117,7 +117,7 @@ class SiTableParser : public SiTableParserBase {
 
 		virtual bool CheckTableId(u_char tableId) const = 0;
 		virtual void ParseSiTable(const TableType *, TargetType) = 0;
-		virtual bool HandleTable(TargetType table) = 0;
+		virtual bool HandleTable(const TargetType & table) = 0;
 
 	private:
 		mutable Contents contents;
diff --git a/p2pvr/dvb/unittests/createSamples.cpp b/p2pvr/dvb/unittests/createSamples.cpp
index 6c4ef5c..6c477c9 100644
--- a/p2pvr/dvb/unittests/createSamples.cpp
+++ b/p2pvr/dvb/unittests/createSamples.cpp
@@ -42,7 +42,7 @@ class SiSampleCollector : public Base {
 		{
 		}
 
-		bool HandleTable(Object) override
+		bool HandleTable(const Object &) override
 		{
 			return false;
 		}
diff --git a/p2pvr/lib/bindSiParserHandler.h b/p2pvr/lib/bindSiParserHandler.h
index d5fadf7..20d8dfd 100644
--- a/p2pvr/lib/bindSiParserHandler.h
+++ b/p2pvr/lib/bindSiParserHandler.h
@@ -8,13 +8,13 @@ namespace DVBSI {
 template <typename SIObject, typename Base>
 class BindSiParserHandler : public Base {
 	public:
-		typedef boost::function<bool(SIObject)> Callback;
+		typedef boost::function<bool(const SIObject &)> Callback;
 		BindSiParserHandler(const Callback & cb) :
 			callBack(cb)
 		{
 		}
 
-		bool HandleTable(SIObject siObject)
+		bool HandleTable(const SIObject & siObject) override
 		{
 			return callBack(siObject);
 		}