diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2007-01-14 10:46:54 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2007-01-14 10:46:54 +0000 |
| commit | 6629073331fbe67edfa9f4d591c9df6e41c465a6 (patch) | |
| tree | cfea8781199058ed414e520d7a3bc5a6db732aef | |
| parent | 855949a917ed8cf65397adc49872c99bdb2123c2 (diff) | |
| download | enigma2-6629073331fbe67edfa9f4d591c9df6e41c465a6.tar.gz enigma2-6629073331fbe67edfa9f4d591c9df6e41c465a6.zip | |
remove unneeded workaround
| -rw-r--r-- | lib/actions/action.h | 2 | ||||
| -rw-r--r-- | lib/dvb/dvb.h | 2 | ||||
| -rw-r--r-- | lib/gui/ewindowstyle.h | 2 | ||||
| -rw-r--r-- | lib/python/enigma_py_patcher.py | 11 | ||||
| -rw-r--r-- | lib/python/swig.h | 2 |
5 files changed, 3 insertions, 16 deletions
diff --git a/lib/actions/action.h b/lib/actions/action.h index 7bd71259..834dc209 100644 --- a/lib/actions/action.h +++ b/lib/actions/action.h @@ -79,7 +79,7 @@ private: 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() { diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h index fde9f741..692ae839 100644 --- 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); }; -SWIG_TEMPLATE_TYPEDEF_REPLACE(ePtr<eDVBResourceManager>, eDVBResourceManager); +SWIG_TEMPLATE_TYPEDEF(ePtr<eDVBResourceManager>, eDVBResourceManager); SWIG_EXTEND(ePtr<eDVBResourceManager>, static ePtr<eDVBResourceManager> getInstance() { diff --git a/lib/gui/ewindowstyle.h b/lib/gui/ewindowstyle.h index a2a9e67b..c204a034 100644 --- 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; }; -SWIG_TEMPLATE_TYPEDEF_REPLACE(ePtr<eWindowStyleManager>, eWindowStyleManager); +SWIG_TEMPLATE_TYPEDEF(ePtr<eWindowStyleManager>, eWindowStyleManager); 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 52f9d232..1d49cc6c 100644 --- 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)', ')') - str = str.replace('_REPLACE)', ')') 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:] - 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) diff --git a/lib/python/swig.h b/lib/python/swig.h index da787eea..370c6ab5 100644 --- 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_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 @@ -16,7 +15,6 @@ #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 |