From c1b029ee77466aab34207d06dd2e7a475bbbb053 Mon Sep 17 00:00:00 2001
From: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>
Date: Sun, 13 Jan 2008 23:25:40 +0100
Subject: A little bit of cleanup in epg_events.[h|cpp] after the last changes.
---
epg_events.h | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
(limited to 'epg_events.h')
diff --git a/epg_events.h b/epg_events.h
index f1b8bdf..8678eef 100644
--- a/epg_events.h
+++ b/epg_events.h
@@ -35,7 +35,7 @@ namespace vdrlive
virtual std::string const LongDescr() const = 0;
- virtual const cChannel* Channel() const = 0;
+ virtual cChannel const * Channel() const { return 0; }
virtual std::string const Archived() const { return ""; }
@@ -84,8 +84,6 @@ namespace vdrlive
virtual time_t GetEndTime() const;
- virtual const cChannel* Channel() const;
-
private:
const std::string m_info;
};
@@ -99,7 +97,7 @@ namespace vdrlive
protected:
EpgEvent(std::string const &id,
cEvent const *event,
- const char* channelName);
+ char const *channelName);
public:
virtual ~EpgEvent();
@@ -114,10 +112,10 @@ namespace vdrlive
virtual time_t GetEndTime() const { return m_event->EndTime(); }
- virtual const cChannel* Channel() const { return Channels.GetByChannelID(m_event->ChannelID());}
+ virtual cChannel const * Channel() const { return Channels.GetByChannelID(m_event->ChannelID());}
private:
- const cEvent* m_event;
+ cEvent const * m_event;
};
// -------------------------------------------------------------------------
@@ -150,8 +148,6 @@ namespace vdrlive
virtual time_t GetEndTime() const;
- virtual const cChannel* Channel() const;
-
private:
const cRecording* m_recording;
bool m_ownCaption;
--
cgit v1.2.3