remove obsolete eConfig

diff --git a/lib/base/Makefile.am b/lib/base/Makefile.am
index f7176e27e00177206ab4baece4a49b370e00f355..d667296af47e9bb8656bd27e9469add7bbac0818 100644 (file)
--- a/lib/base/Makefile.am
+++ b/lib/base/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = \
 noinst_LIBRARIES = libenigma_base.a
 
 libenigma_base_a_SOURCES = \
 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
        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 (file)
index e69de29..0000000

diff --git a/lib/base/econfig.h b/lib/base/econfig.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/lib/driver/avswitch.cpp b/lib/driver/avswitch.cpp
index 09b1ec33fe2aad5a253966f2a7e06c889ec40fac..2556ab0d32b12f6e24a6ddedd1e3d9655dd0c567 100644 (file)
--- 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/init.h>
 #include <lib/base/init_num.h>

-#include <lib/base/econfig.h>

 #include <lib/base/eerror.h>
 
 eAVSwitch *eAVSwitch::instance = 0;
 #include <lib/base/eerror.h>
 
 eAVSwitch *eAVSwitch::instance = 0;

diff --git a/lib/driver/rc.cpp b/lib/driver/rc.cpp
index d4664896fa75225722954ec1e657e32aa59e5625..1a2cc1d8f3754f489d529cae1800eec307281093 100644 (file)
--- 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/init.h>
 #include <lib/base/init_num.h>

-#include <lib/base/econfig.h>

 #include <lib/base/eerror.h>
 
 /*
 #include <lib/base/eerror.h>
 
 /*


@@ -158,15 +157,10 @@ void eRCConfig::reload()
 {
        rdelay=500;
        rrate=100;
 {
        rdelay=500;
        rrate=100;

-       if ( eConfig::getInstance()->getKey("/ezap/rc/repeatRate", rrate) )
-               save();
-       eConfig::getInstance()->getKey("/ezap/rc/repeatDelay", rdelay);

 }
 
 void eRCConfig::save()
 {
 }
 
 void eRCConfig::save()
 {

-       eConfig::getInstance()->setKey("/ezap/rc/repeatRate", rrate);
-       eConfig::getInstance()->setKey("/ezap/rc/repeatDelay", rdelay);

 }
 
 eRCInput *eRCInput::instance;
 }
 
 eRCInput *eRCInput::instance;

diff --git a/lib/driver/rfmod.cpp b/lib/driver/rfmod.cpp
index b71d2fe9ca58a0896dae028f011a43349cbfa449..071343ed595eb8a7292c8d56a65b45fa37b5dc80 100644 (file)
--- 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/init.h>
 #include <lib/base/init_num.h>

-#include <lib/base/econfig.h>

 #include <lib/base/eerror.h>
 
 #define IOCTL_SET_CHANNEL                                              0
 #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 d36ea6ec5d7a300333ec2726b8e9773e348c9a87..4ff047def18a31edf39157eadb31e08f76407670 100644 (file)
--- 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/init.h>
 #include <lib/base/init_num.h>

-#include <lib/base/econfig.h>

 #include <lib/base/eerror.h>
 
 eDVBCI_UI *eDVBCI_UI::instance = 0;
 #include <lib/base/eerror.h>
 
 eDVBCI_UI *eDVBCI_UI::instance = 0;

diff --git a/lib/gdi/fb.cpp b/lib/gdi/fb.cpp
index c8fd94be286567f4946825d69a5ed915bb20a278..727042dd81ada0693220fab894537a9df357208e 100644 (file)
--- a/lib/gdi/fb.cpp
+++ b/lib/gdi/fb.cpp
@@ -7,7 +7,6 @@
 #include <memory.h>
 #include <linux/kd.h>
 
 #include <memory.h>
 #include <linux/kd.h>
 

-#include <lib/base/econfig.h>

 #include <lib/gdi/fb.h>
 
 #ifndef FBIO_WAITFORVSYNC
 #include <lib/gdi/fb.h>
 
 #ifndef FBIO_WAITFORVSYNC

diff --git a/lib/gdi/gfbdc.cpp b/lib/gdi/gfbdc.cpp
index ee2227cfabcbef1b4b80ed3d460ca73f7cd7d91a..bd259bd2abe585e548807e9155613565be548ebc 100644 (file)
--- 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/init.h>
 #include <lib/base/init_num.h>

-#include <lib/base/econfig.h>

 
 #include <lib/gdi/accel.h>
 
 
 #include <lib/gdi/accel.h>
 


@@ -206,19 +205,13 @@ void gFBDC::setGamma(int g)
 
 void gFBDC::saveSettings()
 {
 
 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()
 {
 }
 
 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();
 
        calcRamp();
        setPalette();