1 files changed, 23 insertions, 23 deletions

diff --git a/channelcolumn.c b/channelcolumn.c
index 94cb802..2b3e07a 100644
--- a/channelcolumn.c
+++ b/channelcolumn.c
@@ -1,7 +1,7 @@
-#include "channelcolumn.h"
+#include "channelepg.h"
 #include "dummygrid.h"
 
-cChannelColumn::cChannelColumn(int num, const cChannel *channel, cMyTime *myTime) {
+cChannelEpg::cChannelEpg(int num, const cChannel *channel, cMyTime *myTime) {
     this->channel = channel;
     this->num = num;
     this->myTime = myTime;
@@ -15,7 +15,7 @@ cChannelColumn::cChannelColumn(int num, const cChannel *channel, cMyTime *myTime
     header = NULL;
 }
 
-cChannelColumn::~cChannelColumn(void) {
+cChannelEpg::~cChannelEpg(void) {
     if (header)
         delete header;
     grids.Clear();
@@ -24,21 +24,21 @@ cChannelColumn::~cChannelColumn(void) {
 #endif
 }
 
-void cChannelColumn::clearGrids() {
+void cChannelEpg::clearGrids() {
     grids.Clear();
 }
 
-void cChannelColumn::createHeader() {
+void cChannelEpg::createHeader() {
     header = new cHeaderGrid();
     header->createBackground(num);
     header->drawChannel(channel);
 }
 
-void cChannelColumn::drawHeader() {
+void cChannelEpg::drawHeader() {
     header->setPosition(num);
 }
 
-bool cChannelColumn::readGrids() {
+bool cChannelEpg::readGrids() {
 #if VDRVERSNUM >= 20301
     const cSchedules* schedules;
     {
@@ -114,7 +114,7 @@ bool cChannelColumn::readGrids() {
     return false;
 }
 
-void cChannelColumn::drawGrids() {
+void cChannelEpg::drawGrids() {
     for (cGrid *grid = grids.First(); grid; grid = grids.Next(grid)) {
         grid->SetViewportHeight();
         grid->PositionPixmap();
@@ -122,15 +122,15 @@ void cChannelColumn::drawGrids() {
     }
 }
 
-int cChannelColumn::getX() {
+int cChannelEpg::getX() {
     return geoManager.timeLineWidth + num*geoManager.colWidth;
 }
 
-int cChannelColumn::getY() {
+int cChannelEpg::getY() {
     return geoManager.statusHeaderHeight +  geoManager.timeLineHeight + num*geoManager.rowHeight;
 }
 
-cGrid * cChannelColumn::getActive() {
+cGrid * cChannelEpg::getActive() {
     cMyTime t;
     t.Now();
     for (cGrid *grid = grids.First(); grid; grid = grids.Next(grid)) {
@@ -140,7 +140,7 @@ cGrid * cChannelColumn::getActive() {
     return grids.First();
 }
 
-cGrid * cChannelColumn::getNext(cGrid *activeGrid) {
+cGrid * cChannelEpg::getNext(cGrid *activeGrid) {
     if (activeGrid == NULL)
         return NULL;
     cGrid *next = grids.Next(activeGrid);
@@ -149,7 +149,7 @@ cGrid * cChannelColumn::getNext(cGrid *activeGrid) {
     return NULL;
 }
 
-cGrid * cChannelColumn::getPrev(cGrid *activeGrid) {
+cGrid * cChannelEpg::getPrev(cGrid *activeGrid) {
     if (activeGrid == NULL)
         return NULL;
     cGrid *prev = grids.Prev(activeGrid);
@@ -158,7 +158,7 @@ cGrid * cChannelColumn::getPrev(cGrid *activeGrid) {
     return NULL;
 }
 
-cGrid * cChannelColumn::getNeighbor(cGrid *activeGrid) {
+cGrid * cChannelEpg::getNeighbor(cGrid *activeGrid) {
     if (!activeGrid)
         return NULL;
     cGrid *neighbor = NULL;
@@ -184,13 +184,13 @@ cGrid * cChannelColumn::getNeighbor(cGrid *activeGrid) {
     return neighbor;
 }
 
-bool cChannelColumn::isFirst(cGrid *grid) {
+bool cChannelEpg::isFirst(cGrid *grid) {
     if (grid == grids.First())
         return true;
     return false;
 }
 
-void cChannelColumn::AddNewGridsAtStart() {
+void cChannelEpg::AddNewGridsAtStart() {
     cGrid *firstGrid = NULL;
     firstGrid = grids.First();
     if (firstGrid == NULL)
@@ -246,7 +246,7 @@ void cChannelColumn::AddNewGridsAtStart() {
     }
 }
 
-void cChannelColumn::AddNewGridsAtEnd() {
+void cChannelEpg::AddNewGridsAtEnd() {
     cGrid *lastGrid = NULL;
     lastGrid = grids.Last();
     if (lastGrid == NULL)
@@ -301,7 +301,7 @@ void cChannelColumn::AddNewGridsAtEnd() {
     }
 }
 
-void cChannelColumn::ClearOutdatedStart() {
+void cChannelEpg::ClearOutdatedStart() {
     cGrid *firstGrid = NULL;
     while (true) {
         firstGrid = grids.First();
@@ -325,7 +325,7 @@ void cChannelColumn::ClearOutdatedStart() {
     }
 }
 
-void cChannelColumn::ClearOutdatedEnd() {
+void cChannelEpg::ClearOutdatedEnd() {
     cGrid *lastGrid = NULL;
     while (true) {
         lastGrid = grids.Last();    
@@ -349,7 +349,7 @@ void cChannelColumn::ClearOutdatedEnd() {
     }
 }
 
-cGrid *cChannelColumn::addEpgGrid(const cEvent *event, cGrid *firstGrid, bool color) {
+cGrid *cChannelEpg::addEpgGrid(const cEvent *event, cGrid *firstGrid, bool color) {
     cGrid *grid = new cEpgGrid(this, event);
     grid->setText();
     grid->SetColor(color);
@@ -360,7 +360,7 @@ cGrid *cChannelColumn::addEpgGrid(const cEvent *event, cGrid *firstGrid, bool co
     return grid;
 }
 
-cGrid *cChannelColumn::addDummyGrid(time_t start, time_t end, cGrid *firstGrid, bool color) {
+cGrid *cChannelEpg::addDummyGrid(time_t start, time_t end, cGrid *firstGrid, bool color) {
     cGrid *dummy = new cDummyGrid(this, start, end);
     dummy->setText();
     dummy->SetColor(color);
@@ -371,7 +371,7 @@ cGrid *cChannelColumn::addDummyGrid(time_t start, time_t end, cGrid *firstGrid,
     return dummy;
 }
 
-void cChannelColumn::SetTimers() {
+void cChannelEpg::SetTimers() {
 #if VDRVERSNUM < 20301
     hasTimer = channel->HasTimer();
 #endif
@@ -389,7 +389,7 @@ void cChannelColumn::SetTimers() {
     }
 }
 
-void cChannelColumn::dumpGrids() {
+void cChannelEpg::dumpGrids() {
     esyslog("tvguide: ------Channel %s %d: %d entires ---------", channel->Name(), num, grids.Count());
     int i=1;
     for (cGrid *grid = grids.First(); grid; grid = grids.Next(grid)) {