From fffa3d696305e5466100bd69e449ecd61a7ae695 Mon Sep 17 00:00:00 2001
From: "J. Krieg" <bellum07@googlemail.com>
Date: Tue, 13 Nov 2018 20:45:06 +0100
Subject: [PATCH] webtv/webradio: move defines for webtv and webradio path to a
 more appropriate place

Signed-off-by: Thilo Graf <dbt@novatux.de>
---
 src/gui/webtv_setup.cpp            | 1 -
 src/gui/webtv_setup.h              | 3 +++
 src/zapit/include/zapit/settings.h | 2 --
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gui/webtv_setup.cpp b/src/gui/webtv_setup.cpp
index 088a6b32c..fa02db935 100644
--- a/src/gui/webtv_setup.cpp
+++ b/src/gui/webtv_setup.cpp
@@ -40,7 +40,6 @@
 #include <dirent.h>
 #include <mymenu.h>
 #include <system/helpers.h>
-#include <zapit/settings.h>
 
 CWebTVSetup::CWebTVSetup()
 {
diff --git a/src/gui/webtv_setup.h b/src/gui/webtv_setup.h
index 5735277e7..ceb53697a 100644
--- a/src/gui/webtv_setup.h
+++ b/src/gui/webtv_setup.h
@@ -28,6 +28,9 @@
 #include <string.h>
 #include <gui/widget/menue.h>
 
+#define WEBTV_XML	CONFIGDIR "/webtv_usr.xml"
+#define WEBRADIO_XML	CONFIGDIR "/webradio_usr.xml"
+
 class CWebTVSetup : public CMenuTarget, CChangeObserver
 {
 	private:
diff --git a/src/zapit/include/zapit/settings.h b/src/zapit/include/zapit/settings.h
index 570e0c72a..db27c9032 100644
--- a/src/zapit/include/zapit/settings.h
+++ b/src/zapit/include/zapit/settings.h
@@ -48,8 +48,6 @@
 #define CABLES_XML      CONFIGDIR "/cables.xml"
 #define SATELLITES_XML  CONFIGDIR "/satellites.xml" 
 #define TERRESTRIAL_XML CONFIGDIR "/terrestrial.xml"
-#define WEBTV_XML	CONFIGDIR "/webtv_usr.xml"
-#define WEBRADIO_XML	CONFIGDIR "/webradio_usr.xml"
 
 #if HAVE_TRIPLEDRAGON == 0
 #define AUDIO_DEVICE          "/dev/dvb/adapter0/audio0"