remove unneeded workaround

diff --git a/lib/actions/action.h b/lib/actions/action.h
index 7bd7125..834dc20 100644 (file)
--- a/lib/actions/action.h
+++ b/lib/actions/action.h
@@ -79,7 +79,7 @@ private:
        std::multimap<std::string, ePythonKeyBinding> m_python_keys;
 #endif
 };
        std::multimap<std::string, ePythonKeyBinding> m_python_keys;
 #endif
 };

-SWIG_TEMPLATE_TYPEDEF_REPLACE(ePtr<eActionMap>, eActionMap);
+SWIG_TEMPLATE_TYPEDEF(ePtr<eActionMap>, eActionMap);

 SWIG_EXTEND(ePtr<eActionMap>,
        static ePtr<eActionMap> getInstance()
        {
 SWIG_EXTEND(ePtr<eActionMap>,
        static ePtr<eActionMap> getInstance()
        {

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index fde9f74..692ae83 100644 (file)
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -211,7 +211,7 @@ public:
        PSignal1<void,int> frontendUseMaskChanged;
        SWIG_VOID(RESULT) allocateRawChannel(eUsePtr<iDVBChannel> &SWIG_OUTPUT, int frontend_index);
 };
        PSignal1<void,int> frontendUseMaskChanged;
        SWIG_VOID(RESULT) allocateRawChannel(eUsePtr<iDVBChannel> &SWIG_OUTPUT, int frontend_index);
 };

-SWIG_TEMPLATE_TYPEDEF_REPLACE(ePtr<eDVBResourceManager>, eDVBResourceManager);
+SWIG_TEMPLATE_TYPEDEF(ePtr<eDVBResourceManager>, eDVBResourceManager);

 SWIG_EXTEND(ePtr<eDVBResourceManager>,
        static ePtr<eDVBResourceManager> getInstance()
        {
 SWIG_EXTEND(ePtr<eDVBResourceManager>,
        static ePtr<eDVBResourceManager> getInstance()
        {

diff --git a/lib/gui/ewindowstyle.h b/lib/gui/ewindowstyle.h
index a2a9e67..c204a03 100644 (file)
--- a/lib/gui/ewindowstyle.h
+++ b/lib/gui/ewindowstyle.h
@@ -73,7 +73,7 @@ private:
        static eWindowStyleManager *m_instance;
        std::map<int, ePtr<eWindowStyle> > m_current_style;
 };
        static eWindowStyleManager *m_instance;
        std::map<int, ePtr<eWindowStyle> > m_current_style;
 };

-SWIG_TEMPLATE_TYPEDEF_REPLACE(ePtr<eWindowStyleManager>, eWindowStyleManager);
+SWIG_TEMPLATE_TYPEDEF(ePtr<eWindowStyleManager>, eWindowStyleManager);

 SWIG_EXTEND(ePtr<eWindowStyleManager>,
        static ePtr<eWindowStyleManager> getInstance()
        {
 SWIG_EXTEND(ePtr<eWindowStyleManager>,
        static ePtr<eWindowStyleManager> getInstance()
        {

diff --git a/lib/python/enigma_py_patcher.py b/lib/python/enigma_py_patcher.py
index 52f9d23..1d49cc6 100644 (file)
--- a/lib/python/enigma_py_patcher.py
+++ b/lib/python/enigma_py_patcher.py
@@ -11,7 +11,6 @@ line=1
 for str in source.readlines():
        oldstr = str[:]
        str = str.replace('_ENUMS)', ')')
 for str in source.readlines():
        oldstr = str[:]
        str = str.replace('_ENUMS)', ')')

-       str = str.replace('_REPLACE)', ')')

 
        pos = str.find('_ENUMS')
        if pos != -1:
 
        pos = str.find('_ENUMS')
        if pos != -1:


@@ -22,16 +21,6 @@ for str in source.readlines():
                if tmpstr.find('_enigma.') == -1:
                        str = str[:pos]+str[pos+6:]
 
                if tmpstr.find('_enigma.') == -1:
                        str = str[:pos]+str[pos+6:]
 

-       pos = str.find('_REPLACE')
-       if pos != -1:
-               spacepos = pos
-               while spacepos > 0 and str[spacepos] != ' ':
-                       spacepos -= 1
-               tmpstr = str[spacepos:pos]
-               if tmpstr.find('_enigma.') == -1:
-                       str = str[:pos]+str[pos+8:]
-
-

        if oldstr != str:
                print "!!! Patch enigma.py line %d\n%s\n%s" %(line, oldstr[:len(oldstr)-1], str)
 
        if oldstr != str:
                print "!!! Patch enigma.py line %d\n%s\n%s" %(line, oldstr[:len(oldstr)-1], str)
 

diff --git a/lib/python/swig.h b/lib/python/swig.h
index da787ee..370c6ab 100644 (file)
--- a/lib/python/swig.h
+++ b/lib/python/swig.h
@@ -5,7 +5,6 @@
 #define SWIG_IGNORE(x) %ignore x
 #define SWIG_EXTEND(x, code) %extend x { code }
 #define SWIG_TEMPLATE_TYPEDEF(x, y) %template(y) x; %typemap_output_ptr(x)
 #define SWIG_IGNORE(x) %ignore x
 #define SWIG_EXTEND(x, code) %extend x { code }
 #define SWIG_TEMPLATE_TYPEDEF(x, y) %template(y) x; %typemap_output_ptr(x)

-#define SWIG_TEMPLATE_TYPEDEF_REPLACE(x, y) %template(y##_REPLACE) x; %typemap_output_ptr(x)

 #define SWIG_ALLOW_OUTPUT_SIMPLE(x) %typemap_output_simple(x)
 #define SWIG_INPUT INPUT
 #define SWIG_OUTPUT OUTPUT
 #define SWIG_ALLOW_OUTPUT_SIMPLE(x) %typemap_output_simple(x)
 #define SWIG_INPUT INPUT
 #define SWIG_OUTPUT OUTPUT


@@ -16,7 +15,6 @@
 #define SWIG_IGNORE(x)
 #define SWIG_EXTEND(x, code)
 #define SWIG_TEMPLATE_TYPEDEF(x, y)
 #define SWIG_IGNORE(x)
 #define SWIG_EXTEND(x, code)
 #define SWIG_TEMPLATE_TYPEDEF(x, y)

-#define SWIG_TEMPLATE_TYPEDEF_REPLACE(x, y)

 #define SWIG_ALLOW_OUTPUT_SIMPLE(x)
 #define SWIG_INPUT
 #define SWIG_OUTPUT
 #define SWIG_ALLOW_OUTPUT_SIMPLE(x)
 #define SWIG_INPUT
 #define SWIG_OUTPUT