From 5ff172c987fc2c6c516c38a2d5018ac1726c54b7 Mon Sep 17 00:00:00 2001
From: kamel5 <vdr.kamel5 (at) gmx (dot) net>
Date: Thu, 11 Jul 2019 14:40:41 +0200
Subject: [PATCH] Rename timer.* to timemanager.*

---
 Makefile                 | 2 +-
 styledpixmap.h           | 2 +-
 timeline.h               | 2 +-
 timer.c => timemanager.c | 2 +-
 timer.h => timemanager.h | 0
 timerconflict.c          | 2 +-
 tvguideosd.h             | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename timer.c => timemanager.c (99%)
 rename timer.h => timemanager.h (100%)

diff --git a/Makefile b/Makefile
index 5bf1277..8fb9824 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 timer.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 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
 
 ### The main target:
 
diff --git a/styledpixmap.h b/styledpixmap.h
index af463fe..c0416c5 100644
--- a/styledpixmap.h
+++ b/styledpixmap.h
@@ -3,7 +3,7 @@
 
 #include <vdr/osd.h>
 #include <vdr/epg.h>
-#include "timer.h"
+#include "timemanager.h"
 #include "config.h"
 
 enum eBackgroundType {
diff --git a/timeline.h b/timeline.h
index da207bf..45fe673 100644
--- a/timeline.h
+++ b/timeline.h
@@ -1,7 +1,7 @@
 #ifndef __TVGUIDE_TIMELINE_H
 #define __TVGUIDE_TIMELINE_H
 
-#include "timer.h"
+#include "timemanager.h"
 #include "styledpixmap.h"
 
 // --- cTimeLine  -------------------------------------------------------------
diff --git a/timer.c b/timemanager.c
similarity index 99%
rename from timer.c
rename to timemanager.c
index b236443..a38e57a 100644
--- a/timer.c
+++ b/timemanager.c
@@ -1,7 +1,7 @@
 #include <time.h>
 #include <vdr/tools.h>
 #include "config.h"
-#include "timer.h"
+#include "timemanager.h"
 
 cTimeManager::~cTimeManager(void) {
 }
diff --git a/timer.h b/timemanager.h
similarity index 100%
rename from timer.h
rename to timemanager.h
diff --git a/timerconflict.c b/timerconflict.c
index e57d6ff..1920a9c 100644
--- a/timerconflict.c
+++ b/timerconflict.c
@@ -2,7 +2,7 @@
 #include <vector>
 #include <vdr/timers.h>
 #include "tools.h"
-#include "timer.h"
+#include "timemanager.h"
 #include "timerconflict.h"
 
 cTVGuideTimerConflict::cTVGuideTimerConflict(void) {
diff --git a/tvguideosd.h b/tvguideosd.h
index 9b02c70..ee4b750 100644
--- a/tvguideosd.h
+++ b/tvguideosd.h
@@ -1,7 +1,7 @@
 #ifndef __TVGUIDE_TVGUIDEOSD_H
 #define __TVGUIDE_TVGUIDEOSD_H
 
-#include "timer.h"
+#include "timemanager.h"
 #include "grid.h"
 #include "channelepg.h"
 #include "statusheader.h"