1 files changed, 16 insertions, 16 deletions

diff --git a/tvguideosd.c b/tvguideosd.c
index 782bbab..ee239de 100644
--- a/tvguideosd.c
+++ b/tvguideosd.c
@@ -152,7 +152,7 @@ void cTvGuideOsd::readChannels(const cChannel *channelStart) {
             if (channelGroups->IsInLastGroup(channel)) {
                 break;
             }
-            cChannelColumn *column = new cChannelColumn(i, channel, myTime);
+            cChannelEpg *column = new cChannelEpg(i, channel, myTime);
             if (column->readGrids()) {
                 columns.Add(column);
                 i++;
@@ -189,7 +189,7 @@ void cTvGuideOsd::drawGridsChannelJump(int offset) {
     if (config.displayChannelGroups) {
         channelGroups->DrawChannelGroups(columns.First()->getChannel(), columns.Last()->getChannel());
     }
-    for (cChannelColumn *column = columns.First(); column; column = columns.Next(column)) {
+    for (cChannelEpg *column = columns.First(); column; column = columns.Next(column)) {
         column->createHeader();
         column->drawGrids();
     }
@@ -198,13 +198,13 @@ void cTvGuideOsd::drawGridsChannelJump(int offset) {
 void cTvGuideOsd::drawGridsTimeJump() {
     if (columns.Count() == 0)
         return;
-    cChannelColumn *colActive = NULL;
+    cChannelEpg *colActive = NULL;
     if (activeGrid) {
         colActive = activeGrid->column;
     } else {
         colActive = columns.First();
     }
-    for (cChannelColumn *column = columns.First(); column; column = columns.Next(column)) {
+    for (cChannelEpg *column = columns.First(); column; column = columns.Next(column)) {
         column->clearGrids();
         column->readGrids();
         column->drawGrids();
@@ -234,7 +234,7 @@ void cTvGuideOsd::setNextActiveGrid(cGrid *next) {
 }
 
 void cTvGuideOsd::channelForward() {
-    cChannelColumn *colRight = columns.Next(activeGrid->column);
+    cChannelEpg *colRight = columns.Next(activeGrid->column);
     bool colAdded = false;
     if (!colRight) {
         const cChannel *channelRight = activeGrid->column->getChannel();
@@ -252,7 +252,7 @@ void cTvGuideOsd::channelForward() {
                 if (channelGroups->IsInLastGroup(channelRight)) {
                     break;
                 }
-                colRight = new cChannelColumn(config.numGrids - 1, channelRight, myTime);
+                colRight = new cChannelEpg(config.numGrids - 1, channelRight, myTime);
                 if (colRight->readGrids()) {
                     break;
                 } else {
@@ -264,10 +264,10 @@ void cTvGuideOsd::channelForward() {
         if (colRight) {
             colAdded = true;
             if (columns.Count() == config.numGrids) {
-                cChannelColumn *cFirst = columns.First();
+                cChannelEpg *cFirst = columns.First();
                 columns.Del(cFirst);
             }
-            for (cChannelColumn *column = columns.First(); column; column = columns.Next(column)) {
+            for (cChannelEpg *column = columns.First(); column; column = columns.Next(column)) {
                 column->SetNum(column->GetNum() - 1);
                 column->drawHeader();
                 column->drawGrids();
@@ -293,7 +293,7 @@ void cTvGuideOsd::channelForward() {
 }
 
 void cTvGuideOsd::channelBack() {
-    cChannelColumn *colLeft = columns.Prev(activeGrid->column);
+    cChannelEpg *colLeft = columns.Prev(activeGrid->column);
     bool colAdded = false;
     if (!colLeft) {
         const cChannel *channelLeft = activeGrid->column->getChannel();
@@ -308,7 +308,7 @@ void cTvGuideOsd::channelBack() {
 #endif
         while (channelLeft = channels->Prev(channelLeft)) {
             if (!channelLeft->GroupSep()) {
-                colLeft = new cChannelColumn(0, channelLeft, myTime);
+                colLeft = new cChannelEpg(0, channelLeft, myTime);
                 if (colLeft->readGrids()) {
                     break;
                 } else {
@@ -320,10 +320,10 @@ void cTvGuideOsd::channelBack() {
         if (colLeft) {
             colAdded = true;
             if (columns.Count() == config.numGrids) {
-                cChannelColumn *cLast = columns.Last();
+                cChannelEpg *cLast = columns.Last();
                 columns.Del(cLast);
             }
-            for (cChannelColumn *column = columns.First(); column; column = columns.Next(column)) {
+            for (cChannelEpg *column = columns.First(); column; column = columns.Next(column)) {
                 column->SetNum(column->GetNum() + 1);
                 column->drawHeader();
                 column->drawGrids();
@@ -375,7 +375,7 @@ void cTvGuideOsd::ScrollForward() {
     timeLine->drawDateViewer();
     timeLine->drawClock();
     timeLine->setTimeline();
-    for (cChannelColumn *column = columns.First(); column; column = columns.Next(column)) {
+    for (cChannelEpg *column = columns.First(); column; column = columns.Next(column)) {
         column->AddNewGridsAtEnd();
         column->ClearOutdatedStart();
         column->drawGrids();
@@ -410,7 +410,7 @@ void cTvGuideOsd::ScrollBack() {
     timeLine->drawDateViewer();
     timeLine->drawClock();
     timeLine->setTimeline();
-    for (cChannelColumn *column = columns.First(); column; column = columns.Next(column)) {
+    for (cChannelEpg *column = columns.First(); column; column = columns.Next(column)) {
         column->AddNewGridsAtStart();
         column->ClearOutdatedEnd();
         column->drawGrids();
@@ -708,7 +708,7 @@ void cTvGuideOsd::CheckTimeout(void) {
 }
 
 void cTvGuideOsd::SetTimers() {
-    for (cChannelColumn *column = columns.First(); column; column = columns.Next(column)) {
+    for (cChannelEpg *column = columns.First(); column; column = columns.Next(column)) {
         column->SetTimers();
     }
 }
@@ -782,7 +782,7 @@ void cTvGuideOsd::dump() {
     esyslog("tvguide: ------Dumping Content---------");
     activeGrid->debug();
 //    int i=1;
-    for (cChannelColumn *col = columns.First(); col; col = columns.Next(col)) {
+    for (cChannelEpg *col = columns.First(); col; col = columns.Next(col)) {
         col->dumpGrids();
     }
 }