From f9a3dffb604e66e7842aabd238cd0e6940cb3125 Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Sun, 12 Jan 2014 16:55:31 +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.


Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/ed818c7c141a8f423cc1265915e62e99366ec74d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)



------------------
This commit was generated by Migit
---
 src/driver/record.cpp    | 3 ++-
 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, 22 insertions(+), 8 deletions(-)

diff --git a/src/driver/record.cpp b/src/driver/record.cpp
index c348a9a36..8962b183d 100644
--- a/src/driver/record.cpp
+++ b/src/driver/record.cpp
@@ -3,7 +3,7 @@
 
 	Copyright (C) 2001 Steffen Hehn 'McClean'
 	Copyright (C) 2011 CoolStream International Ltd
-	Copyright (C) 2011-2012 Stefan Seyfried
+	Copyright (C) 2011-2014 Stefan Seyfried
 
 	License: GPLv2
 
@@ -59,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 366037b78..ca2c7b539 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 b12f229b6..d5f673fc4 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
 
@@ -33,6 +34,7 @@
 #include <gui/epgplus.h>
 #include <gui/epgview.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 566e69dde..7e3f4a234 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
 
@@ -49,6 +49,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 b064023b8..add781f81 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
 
@@ -53,6 +54,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 d522a5fd2..bf62c12e6 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
 
 ****************************************************************************/
 
@@ -66,6 +66,8 @@
 #include <driver/display.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 7349c9ac2..71d000fb9 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 f66dbd3d8..6f2fdee07 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/
 
@@ -72,6 +73,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 aeacfae89..d33f1cba5 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -4,7 +4,7 @@
 	Copyright (C) 2001 Steffen Hehn 'McClean'
 							 and some other guys
 
-	Copyright (C) 2006-2012 Stefan Seyfried
+	Copyright (C) 2006-2014 Stefan Seyfried
 
 	Copyright (C) 2011 CoolStream International Ltd
 
@@ -112,7 +112,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>