From bff9d78ff3751e35434594c5849c8ba4a085d9d1 Mon Sep 17 00:00:00 2001
From: kamel5 <vdr.kamel5 (at) gmx (dot) net>
Date: Thu, 11 Jul 2019 15:11:26 +0200
Subject: [PATCH] Rename grid.* to gridelement.*

---
 Makefile                | 2 +-
 channelepg.h            | 2 +-
 dummygrid.h             | 2 +-
 epggrid.h               | 2 +-
 grid.c => gridelement.c | 2 +-
 grid.h => gridelement.h | 0
 headergrid.h            | 2 +-
 statusheader.h          | 2 +-
 tvguideosd.h            | 2 +-
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename grid.c => gridelement.c (98%)
 rename grid.h => gridelement.h (100%)

diff --git a/Makefile b/Makefile
index 8fb9824..fe432a1 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ endif
 
 ### The object files (add further files here):
 
-OBJS = $(PLUGIN).o channelepg.o channelgroup.o channelgroups.o channeljump.o config.o detailview.o dummygrid.o epggrid.o fontmanager.o footer.o geometrymanager.o grid.o headergrid.o imagecache.o imageloader.o imagemagickwrapper.o imagescaler.o osdmanager.o recmanager.o recmenu.o recmenuitem.o recmenuview.o recmenus.o searchtimer.o setup.o statusheader.o styledpixmap.o switchtimer.o timeline.o timemanager.o timerconflict.o tools.o tvguideosd.o view.o
+OBJS = $(PLUGIN).o channelepg.o channelgroup.o channelgroups.o channeljump.o config.o detailview.o dummygrid.o epggrid.o fontmanager.o footer.o geometrymanager.o gridelement.o headergrid.o imagecache.o imageloader.o imagemagickwrapper.o imagescaler.o osdmanager.o recmanager.o recmenu.o recmenuitem.o recmenuview.o recmenus.o searchtimer.o setup.o statusheader.o styledpixmap.o switchtimer.o timeline.o timemanager.o timerconflict.o tools.o tvguideosd.o view.o
 
 ### The main target:
 
diff --git a/channelepg.h b/channelepg.h
index 4f05af6..4f20bc9 100644
--- a/channelepg.h
+++ b/channelepg.h
@@ -2,7 +2,7 @@
 #define __TVGUIDE_CHANNELEPG_H
 
 #include <vdr/tools.h>
-#include "grid.h"
+#include "gridelement.h"
 #include "epggrid.h"
 #include "headergrid.h"
 #include "switchtimer.h"
diff --git a/dummygrid.h b/dummygrid.h
index b2af4e9..853afe4 100644
--- a/dummygrid.h
+++ b/dummygrid.h
@@ -1,7 +1,7 @@
 #ifndef __TVGUIDE_DUMMYGRID_H
 #define __TVGUIDE_DUMMYGRID_H
 
-#include "grid.h"
+#include "gridelement.h"
 #include "channelepg.h"
 
 // --- cDummyGrid  -------------------------------------------------------------
diff --git a/epggrid.h b/epggrid.h
index 7fcef29..eb1a6a1 100644
--- a/epggrid.h
+++ b/epggrid.h
@@ -2,7 +2,7 @@
 #define __TVGUIDE_EPGGRID_H
 
 #include <vdr/epg.h>
-#include "grid.h"
+#include "gridelement.h"
 
 // --- cEpgGrid  -------------------------------------------------------------
 
diff --git a/grid.c b/gridelement.c
similarity index 98%
rename from grid.c
rename to gridelement.c
index 26586ae..afc568e 100644
--- a/grid.c
+++ b/gridelement.c
@@ -1,5 +1,5 @@
 #include "channelepg.h"
-#include "grid.h"
+#include "gridelement.h"
 
 cGridElement::cGridElement(cChannelEpg *c) {
     this->column = c;
diff --git a/grid.h b/gridelement.h
similarity index 100%
rename from grid.h
rename to gridelement.h
diff --git a/headergrid.h b/headergrid.h
index e22ed71..95d7c06 100644
--- a/headergrid.h
+++ b/headergrid.h
@@ -1,7 +1,7 @@
 #ifndef __TVGUIDE_HEADERGRID_H
 #define __TVGUIDE_HEADERGRID_H
 
-#include "grid.h"
+#include "gridelement.h"
 
 // --- cHeaderGrid  -------------------------------------------------------------
 
diff --git a/statusheader.h b/statusheader.h
index a490a37..15fb719 100644
--- a/statusheader.h
+++ b/statusheader.h
@@ -2,7 +2,7 @@
 #define __TVGUIDE_STATUSHEADER_H
 
 #include "styledpixmap.h"
-#include "grid.h"
+#include "gridelement.h"
 
 // --- cStatusHeader  -------------------------------------------------------------
 
diff --git a/tvguideosd.h b/tvguideosd.h
index c9e87a6..9ff4c2f 100644
--- a/tvguideosd.h
+++ b/tvguideosd.h
@@ -2,7 +2,7 @@
 #define __TVGUIDE_TVGUIDEOSD_H
 
 #include "timemanager.h"
-#include "grid.h"
+#include "gridelement.h"
 #include "channelepg.h"
 #include "statusheader.h"
 #include "detailview.h"