From 036d2ec4dc7a66f9d591c00f65fa54bbddb24769 Mon Sep 17 00:00:00 2001
From: Felix Domke <tmbinc@elitedvb.net>
Date: Fri, 27 Jan 2006 23:27:33 +0000
Subject: [PATCH] remove obsolete eConfig

---
 lib/base/Makefile.am    |  2 +-
 lib/base/econfig.cpp    |  0
 lib/base/econfig.h      |  0
 lib/driver/avswitch.cpp |  1 -
 lib/driver/rc.cpp       |  6 ------
 lib/driver/rfmod.cpp    |  1 -
 lib/dvb_ci/dvbci_ui.cpp |  1 -
 lib/gdi/fb.cpp          |  1 -
 lib/gdi/gfbdc.cpp       | 13 +++----------
 9 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 lib/base/econfig.cpp
 delete mode 100644 lib/base/econfig.h

diff --git a/lib/base/Makefile.am b/lib/base/Makefile.am
index f7176e27..d667296a 100644
--- a/lib/base/Makefile.am
+++ b/lib/base/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = \
 noinst_LIBRARIES = libenigma_base.a
 
 libenigma_base_a_SOURCES = \
-	buffer.cpp ebase.cpp econfig.cpp eerror.cpp elock.cpp \
+	buffer.cpp ebase.cpp eerror.cpp elock.cpp \
 	init.cpp message.cpp thread.cpp \
 	smartptr.cpp estring.cpp connection.cpp \
 	filepush.cpp encoding.cpp
diff --git a/lib/base/econfig.cpp b/lib/base/econfig.cpp
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/base/econfig.h b/lib/base/econfig.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/driver/avswitch.cpp b/lib/driver/avswitch.cpp
index 09b1ec33..2556ab0d 100644
--- a/lib/driver/avswitch.cpp
+++ b/lib/driver/avswitch.cpp
@@ -6,7 +6,6 @@
 
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
-#include <lib/base/econfig.h>
 #include <lib/base/eerror.h>
 
 eAVSwitch *eAVSwitch::instance = 0;
diff --git a/lib/driver/rc.cpp b/lib/driver/rc.cpp
index d4664896..1a2cc1d8 100644
--- a/lib/driver/rc.cpp
+++ b/lib/driver/rc.cpp
@@ -8,7 +8,6 @@
 
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
-#include <lib/base/econfig.h>
 #include <lib/base/eerror.h>
 
 /*
@@ -158,15 +157,10 @@ void eRCConfig::reload()
 {
 	rdelay=500;
 	rrate=100;
-	if ( eConfig::getInstance()->getKey("/ezap/rc/repeatRate", rrate) )
-		save();
-	eConfig::getInstance()->getKey("/ezap/rc/repeatDelay", rdelay);
 }
 
 void eRCConfig::save()
 {
-	eConfig::getInstance()->setKey("/ezap/rc/repeatRate", rrate);
-	eConfig::getInstance()->setKey("/ezap/rc/repeatDelay", rdelay);
 }
 
 eRCInput *eRCInput::instance;
diff --git a/lib/driver/rfmod.cpp b/lib/driver/rfmod.cpp
index b71d2fe9..071343ed 100644
--- a/lib/driver/rfmod.cpp
+++ b/lib/driver/rfmod.cpp
@@ -6,7 +6,6 @@
 
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
-#include <lib/base/econfig.h>
 #include <lib/base/eerror.h>
 
 #define IOCTL_SET_CHANNEL						0
diff --git a/lib/dvb_ci/dvbci_ui.cpp b/lib/dvb_ci/dvbci_ui.cpp
index d36ea6ec..4ff047de 100644
--- a/lib/dvb_ci/dvbci_ui.cpp
+++ b/lib/dvb_ci/dvbci_ui.cpp
@@ -9,7 +9,6 @@
 
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
-#include <lib/base/econfig.h>
 #include <lib/base/eerror.h>
 
 eDVBCI_UI *eDVBCI_UI::instance = 0;
diff --git a/lib/gdi/fb.cpp b/lib/gdi/fb.cpp
index c8fd94be..727042dd 100644
--- a/lib/gdi/fb.cpp
+++ b/lib/gdi/fb.cpp
@@ -7,7 +7,6 @@
 #include <memory.h>
 #include <linux/kd.h>
 
-#include <lib/base/econfig.h>
 #include <lib/gdi/fb.h>
 
 #ifndef FBIO_WAITFORVSYNC
diff --git a/lib/gdi/gfbdc.cpp b/lib/gdi/gfbdc.cpp
index ee2227cf..bd259bd2 100644
--- a/lib/gdi/gfbdc.cpp
+++ b/lib/gdi/gfbdc.cpp
@@ -2,7 +2,6 @@
 
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
-#include <lib/base/econfig.h>
 
 #include <lib/gdi/accel.h>
 
@@ -206,19 +205,13 @@ void gFBDC::setGamma(int g)
 
 void gFBDC::saveSettings()
 {
-	eConfig::getInstance()->setKey("/ezap/osd/alpha", alpha);
-	eConfig::getInstance()->setKey("/ezap/osd/gamma", gamma);
-	eConfig::getInstance()->setKey("/ezap/osd/brightness", brightness);
 }
 
 void gFBDC::reloadSettings()
 {
-	if (eConfig::getInstance()->getKey("/ezap/osd/alpha", alpha))
-		alpha=255;
-	if (eConfig::getInstance()->getKey("/ezap/osd/gamma", gamma))
-		gamma=128;
-	if (eConfig::getInstance()->getKey("/ezap/osd/brightness", brightness))
-		brightness=128;
+	alpha=255;
+	gamma=128;
+	brightness=128;
 
 	calcRamp();
 	setPalette();
-- 
2.30.2