From 6876dcdf23a515d16c392649ed515a2a51e1678d Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Thu, 15 Jan 2015 15:16:39 +0300
Subject: [PATCH] zapit/src/zapit.cpp: rename CONFIGFILE to ZAPITCONFIGFILE to
 avoid conflicts

---
 src/zapit/include/zapit/settings.h | 2 +-
 src/zapit/src/zapit.cpp            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/zapit/include/zapit/settings.h b/src/zapit/include/zapit/settings.h
index 9ec4a9990..48b1e5e28 100644
--- a/src/zapit/include/zapit/settings.h
+++ b/src/zapit/include/zapit/settings.h
@@ -31,7 +31,7 @@
 #define CONFIGDIR       "/var/tuxbox/config"
 #endif
 
-#define CONFIGFILE      CONFIGDIR "/zapit/zapit.conf"
+#define ZAPITCONFIGFILE      CONFIGDIR "/zapit/zapit.conf"
 #define MOTORCONFIGFILE CONFIGDIR "/zapit/motor.conf"
 #define SATCONFIG CONFIGDIR "/zapit/sat.conf"
 #define SERVICES_XML    CONFIGDIR "/zapit/services.xml"
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index 7effd06d5..9f6bc993b 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -206,7 +206,7 @@ void CZapit::SaveSettings(bool write)
 		configfile.setInt32("motorRotationSpeed", config.motorRotationSpeed);
 #endif
 		if (configfile.getModifiedFlag())
-			configfile.saveConfig(CONFIGFILE);
+			configfile.saveConfig(ZAPITCONFIGFILE);
 	}
 }
 
@@ -303,8 +303,8 @@ void CZapit::ClearVolumeMap()
 
 void CZapit::LoadSettings()
 {
-	if (!configfile.loadConfig(CONFIGFILE))
-		WARN("%s not found", CONFIGFILE);
+	if (!configfile.loadConfig(ZAPITCONFIGFILE))
+		WARN("%s not found", ZAPITCONFIGFILE);
 
 	live_channel_id				= configfile.getInt64("lastChannel", 0);
 	lastChannelRadio			= configfile.getInt64("lastChannelRadio", 0);