From 1d0a23dbf3b59f4cc285a72e82683710ce6f0877 Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Mon, 13 Jan 2014 21:01:26 +0100
Subject: [PATCH] reduce direct dependencies on timerdclient.h

Include timerdtypes.h instead of timerdclient.h where feasible, add direct instead of indirect includes of timerdclient.h where necessary. This reduces the number of files which depend on timerdclient.h from 134 to 16. Add/update copyright notices in the affected files.
---
 src/driver/record.cpp    | 2 ++
 src/driver/record.h      | 2 +-
 src/gui/epgplus.cpp      | 2 ++
 src/gui/epgview.cpp      | 3 ++-
 src/gui/eventlist.cpp    | 2 ++
 src/gui/eventlist.h      | 2 +-
 src/gui/moviebrowser.cpp | 4 +++-
 src/gui/record_setup.cpp | 2 ++
 src/gui/timerlist.cpp    | 3 +++
 src/gui/timerlist.h      | 3 ++-
 src/neutrino.cpp         | 4 +++-
 11 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/driver/record.cpp b/src/driver/record.cpp
index 8ba915f9d..da5343fb1 100644
--- a/src/driver/record.cpp
+++ b/src/driver/record.cpp
@@ -3,6 +3,7 @@
 
 	Copyright (C) 2001 Steffen Hehn 'McClean'
 	Copyright (C) 2011 CoolStream International Ltd
+	Copyright (C) 2011-2014 Stefan Seyfried
 
 	License: GPLv2
 
@@ -58,6 +59,7 @@
 #include <zapit/zapit.h>
 #include <zapit/client/zapittools.h>
 #include <eitd/sectionsd.h>
+#include <timerdclient/timerdclient.h>
 
 /* TODO:
  * nextRecording / pending recordings - needs testing
diff --git a/src/driver/record.h b/src/driver/record.h
index a018c66a2..a75c67830 100644
--- a/src/driver/record.h
+++ b/src/driver/record.h
@@ -28,7 +28,7 @@
 #include <list>
 
 #include <sectionsdclient/sectionsdclient.h>
-#include <timerdclient/timerdclient.h>
+#include <timerdclient/timerdtypes.h>
 
 #include <neutrinoMessages.h>
 #include <gui/movieinfo.h>
diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp
index 326c67981..670917254 100644
--- a/src/gui/epgplus.cpp
+++ b/src/gui/epgplus.cpp
@@ -3,6 +3,7 @@
 
 	Copyright (C) 2001 Steffen Hehn 'McClean'
 	Copyright (C) 2004 Martin Griep 'vivamiga'
+	Copyright (C) 2009-2014 Stefan Seyfried
 
 	License: GPL
 
@@ -32,6 +33,7 @@
 
 #include <gui/epgplus.h>
 #include <sectionsdclient/sectionsdclient.h>
+#include <timerdclient/timerdclient.h>
 
 #include <gui/components/cc.h>
 #include <gui/widget/icons.h>
diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp
index e9b117146..1116d8bde 100644
--- a/src/gui/epgview.cpp
+++ b/src/gui/epgview.cpp
@@ -2,7 +2,7 @@
 	Neutrino-GUI  -   DBoxII-Project
 
 	Copyright (C) 2001 Steffen Hehn 'McClean'
-	Copyright (C) 2007-2012 Stefan Seyfried
+	Copyright (C) 2007-2014 Stefan Seyfried
 
 	License: GPL
 
@@ -48,6 +48,7 @@
 #include <zapit/bouquets.h>
 #include <zapit/getservices.h>
 #include <eitd/sectionsd.h>
+#include <timerdclient/timerdclient.h>
 
 extern CPictureViewer * g_PicViewer;
 
diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp
index e73b74165..863533b1b 100644
--- a/src/gui/eventlist.cpp
+++ b/src/gui/eventlist.cpp
@@ -4,6 +4,7 @@
 	Copyright (C) 2001 Steffen Hehn 'McClean'
 	Homepage: http://dbox.cyberphoria.org/
 
+	Copyright (C) 2009-2014 Stefan Seyfried
 
 	License: GPL
 
@@ -51,6 +52,7 @@
 #include <zapit/zapit.h>
 #include <daemonc/remotecontrol.h>
 #include <eitd/sectionsd.h>
+#include <timerdclient/timerdclient.h>
 
 #include <algorithm>
 
diff --git a/src/gui/eventlist.h b/src/gui/eventlist.h
index 7fba30b57..7e83d8391 100644
--- a/src/gui/eventlist.h
+++ b/src/gui/eventlist.h
@@ -27,7 +27,7 @@
 #ifndef __EVENTLIST_HPP__
 #define __EVENTLIST_HPP__
 
-#include <timerdclient/timerdclient.h>
+#include <timerdclient/timerdtypes.h>
 #include <sectionsdclient/sectionsdclient.h>
 
 #include <driver/framebuffer.h>
diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp
index 891daca53..082ee51d4 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -30,7 +30,7 @@
 	Author: Günther@tuxbox.berlios.org
 		based on code of Steffen Hehn 'McClean'
 
-	(C) 2009-2012 Stefan Seyfried
+	(C) 2009-2014 Stefan Seyfried
 
 ****************************************************************************/
 
@@ -65,6 +65,8 @@
 #include <driver/record.h>
 #include <system/helpers.h>
 
+#include <timerdclient/timerdclient.h>
+
 extern CPictureViewer * g_PicViewer;
 static CProgressBar *timescale;
 
diff --git a/src/gui/record_setup.cpp b/src/gui/record_setup.cpp
index 4651df1a9..97812d6d7 100644
--- a/src/gui/record_setup.cpp
+++ b/src/gui/record_setup.cpp
@@ -47,6 +47,8 @@
 #include <gui/widget/stringinput.h>
 #include <gui/widget/stringinput_ext.h>
 
+#include <timerdclient/timerdclient.h>
+
 #include <driver/screen_max.h>
 #include <driver/record.h>
 
diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp
index d21a87425..35180e121 100644
--- a/src/gui/timerlist.cpp
+++ b/src/gui/timerlist.cpp
@@ -2,6 +2,7 @@
 	Neutrino-GUI  -   DBoxII-Project
 
 	Timerliste by Zwen
+	(C) 2009, 2011-2014 Stefan Seyfried
 
 	Homepage: http://dbox.cyberphoria.org/
 
@@ -70,6 +71,8 @@
 #include <zapit/bouquets.h>
 #include <zapit/femanager.h>
 
+#include <timerdclient/timerdclient.h>
+
 #include <eitd/sectionsd.h>
 
 extern CBouquetManager *g_bouquetManager;
diff --git a/src/gui/timerlist.h b/src/gui/timerlist.h
index 8b74bc278..4e752c4e6 100644
--- a/src/gui/timerlist.h
+++ b/src/gui/timerlist.h
@@ -33,7 +33,7 @@
 #ifndef __timerlist__
 #define __timerlist__
 
-#include <timerdclient/timerdclient.h>
+#include <timerdclient/timerdtypes.h>
 
 #include <gui/widget/menue.h>
 
@@ -42,6 +42,7 @@
 #include <string>
 
 
+class CTimerdClient;
 class CTimerList : public CMenuTarget
 {
 	private:
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 09d88c2b7..3a6f2471e 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -5,6 +5,8 @@
 							 and some other guys
 	Homepage: http://dbox.cyberphoria.org/
 
+	Copyright (C) 2006-2014 Stefan Seyfried
+
 	Copyright (C) 2011 CoolStream International Ltd
 
 	License: GPL
@@ -108,7 +110,7 @@
 #include <system/helpers.h>
 #include <system/sysload.h>
 
-#include <timerdclient/timerdmsg.h>
+#include <timerdclient/timerdclient.h>
 
 #include <zapit/debug.h>
 #include <zapit/zapit.h>