aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>2006-12-19 15:41:53 +0000
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>2006-12-19 15:41:53 +0000
commit12f90800104b06e819eb9a7c2cd6ffcaf2003e0a (patch)
treee2f0e8f79526ddbca3a52f197904bfdeaf62f775 /lib/python
parentb2fe29b773ada2caf62721d7dfe07d9807876055 (diff)
downloadenigma2-12f90800104b06e819eb9a7c2cd6ffcaf2003e0a.tar.gz
enigma2-12f90800104b06e819eb9a7c2cd6ffcaf2003e0a.zip
remove unneeded test object,
export windowstyle enums to python
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/enigma_python.i5
-rw-r--r--lib/python/python.cpp12
-rw-r--r--lib/python/python.h23
3 files changed, 0 insertions, 40 deletions
diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i
index 1debfeed..6c2ece37 100644
--- a/lib/python/enigma_python.i
+++ b/lib/python/enigma_python.i
@@ -262,11 +262,6 @@ RESULT SwigFromPython(ePtr<gPixmap> &result, PyObject *obj)
result = *res;
return 0;
}
-PyObject *New_TestObj()
-{
- TestObj *result = (TestObj *)new TestObj();
- return SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_TestObj, 1);
-}
PyObject *New_eServiceReference(const eServiceReference &ref)
{
eServiceReference *result = new eServiceReference(ref);
diff --git a/lib/python/python.cpp b/lib/python/python.cpp
index 8947bb3c..b5a7abbf 100644
--- a/lib/python/python.cpp
+++ b/lib/python/python.cpp
@@ -114,18 +114,6 @@ void ePyObject::decref(const char *file, int line)
#include <lib/python/python.h>
#undef SKIP_PART1
-DEFINE_REF(TestObj);
-
-TestObj::TestObj()
-{
- eDebug("create %p", this);
-}
-
-TestObj::~TestObj()
-{
- eDebug("destroy %p", this);
-}
-
ePython::ePython()
{
// Py_VerboseFlag = 1;
diff --git a/lib/python/python.h b/lib/python/python.h
index 76d2d197..f5f793ff 100644
--- a/lib/python/python.h
+++ b/lib/python/python.h
@@ -149,18 +149,7 @@ inline void ePyObject::decref()
#endif // !SWIG && !SKIP_PART1
#ifndef SKIP_PART2
-
-class TestObj
-{
-DECLARE_REF(TestObj);
-public:
- TestObj();
- ~TestObj();
-};
-SWIG_TEMPLATE_TYPEDEF(ePtr<TestObj>, TestObjPtr);
-
#ifndef SWIG
-extern PyObject *New_TestObj();
#ifdef PYTHON_REFCOUNT_DEBUG
inline void Impl_Py_DECREF(const char* file, int line, const ePyObject &obj)
{
@@ -233,11 +222,6 @@ inline ePyObject Impl_PyLong_FromLongLong(const char* file, int line, long long
return ePyObject(PyLong_FromLongLong(val), file, line);
}
-inline ePyObject Impl_New_TestObj(const char* file, int line)
-{
- return ePyObject(New_TestObj(), file, line);
-}
-
inline ePyObject Impl_PyList_GET_ITEM(const char *file, int line, ePyObject list, unsigned int pos)
{
return ePyObject(PyList_GET_ITEM(list, pos), file, line);
@@ -319,11 +303,6 @@ inline ePyObject Impl_PyLong_FromLongLong(long long val)
return PyLong_FromLongLong(val);
}
-inline ePyObject Impl_New_TestObj()
-{
- return New_TestObj();
-}
-
inline ePyObject Impl_PyList_GET_ITEM(ePyObject list, unsigned int pos)
{
return PyList_GET_ITEM(list, pos);
@@ -360,7 +339,6 @@ inline void Impl_DECREF(PyObject *ob)
#define PyLong_FromLong(val) Impl_PyLong_FromLong(__FILE__, __LINE__, val)
#define PyLong_FromUnsignedLong(val) Impl_PyLong_FromUnsignedLong(__FILE__, __LINE__, val)
#define PyLong_FromLongLong(val) Impl_PyLong_FromLongLong(__FILE__, __LINE__, val)
-#define NEW_TestObj(...) Impl_New_TestObj(__FILE__, __LINE__)
#define PyList_GET_ITEM(list, pos) Impl_PyList_GET_ITEM(__FILE__, __LINE__, list, pos)
#define PyTuple_GET_ITEM(list, pos) Impl_PyTuple_GET_ITEM(__FILE__, __LINE__, list, pos)
#else
@@ -377,7 +355,6 @@ inline void Impl_DECREF(PyObject *ob)
#define PyLong_FromLong(val) Impl_PyLong_FromLong(val)
#define PyLong_FromUnsignedLong(val) Impl_PyLong_FromUnsignedLong(val)
#define PyLong_FromLongLong(val) Impl_PyLong_FromLongLong(val)
-#define NEW_TestObj(...) Impl_New_TestObj()
#define PyList_GET_ITEM(list, pos) Impl_PyList_GET_ITEM(list, pos)
#define PyTuple_GET_ITEM(list, pos) Impl_PyTuple_GET_ITEM(list, pos)
#endif