[epg] adds new method SetEpg() to CEpgInfoTag to drop the use of frie…

…nd class in CEpg
mkortstiege · Mar 1, 2015 · dc1aacf · dc1aacf
1 parent 841204b
commit dc1aacf
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/xbmc/epg/Epg.cpp b/xbmc/epg/Epg.cpp
@@ -302,7 +302,7 @@ void CEpg::AddEntry(const CEpgInfoTag &tag)
   {
     newTag->Update(tag);
     newTag->SetPVRChannel(m_pvrChannel);
-    newTag->m_epg          = this;
+    newTag->SetEpg(this);
     UpdateRecording(newTag);
   }
 }
@@ -327,7 +327,7 @@ bool CEpg::UpdateEntry(const CEpgInfoTag &tag, bool bUpdateDatabase /* = false *
   }
 
   infoTag->Update(tag, bNewTag);
-  infoTag->m_epg          = this;
+  infoTag->SetEpg(this);
   infoTag->SetPVRChannel(m_pvrChannel);
   UpdateRecording(infoTag);
 

diff --git a/xbmc/epg/Epg.h b/xbmc/epg/Epg.h
@@ -40,7 +40,6 @@ namespace EPG
   class CEpg : public Observable
   {
     friend class CEpgDatabase;
-    friend class CEpgInfoTag;
 
   public:
     /*!

diff --git a/xbmc/epg/EpgInfoTag.cpp b/xbmc/epg/EpgInfoTag.cpp
@@ -739,3 +739,8 @@ CPVRRecordingPtr CEpgInfoTag::Recording(void) const
 {
   return m_recording;
 }
+
+void CEpgInfoTag::SetEpg(CEpg *epg)
+{
+  m_epg = epg;
+}
diff --git a/xbmc/epg/EpgInfoTag.h b/xbmc/epg/EpgInfoTag.h
@@ -134,6 +134,12 @@ namespace EPG
 
     const int EpgID(void) const;
 
+    /*!
+     * @brief Sets the epg reference of this event
+     * @param epg The epg item
+     */
+    void SetEpg(CEpg *epg);
+
     /*!
      * @brief Change the unique broadcast ID of this event.
      * @param iUniqueBroadcastId The new unique broadcast ID.
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,6 @@ namespace EPG @@
       class CEpg : public Observable
       {
         friend class CEpgDatabase;
-        friend class CEpgInfoTag;
       public:
         /*!
@@ Expand Down @@