Added ObjectTypeReferenceConverter, so object-types can be used as references.

2 files changed, 20 insertions, 0 deletions

diff --git a/headergenerator.cpp b/headergenerator.cpp
index 670e633f7..a44e53ed0 100644
--- a/headergenerator.cpp
+++ b/headergenerator.cpp
@@ -188,6 +188,13 @@ void HeaderGenerator::writeTypeConverterDecl(QTextStream& s, const TypeEntry* ty
         }
     }
     s << "};" << endl;
+
+    // write value-type like converter to object-types
+    if (isAbstractOrObjectType) {
+        s << endl << "template<>" << endl;
+        s << "struct Converter<" << type->name() << "& > : ObjectTypeReferenceConverter<" << type->name() << " >" << endl << '{' << endl;
+        s << "};" << endl << endl;
+    }
 }
 
 void HeaderGenerator::writeTypeIndexDefineLine(QTextStream& s, const TypeEntry* typeEntry, int& idx)
diff --git a/libshiboken/conversions.h b/libshiboken/conversions.h
index 600280c9f..97c73fd7d 100644
--- a/libshiboken/conversions.h
+++ b/libshiboken/conversions.h
@@ -270,6 +270,19 @@ struct ObjectTypeConverter
     }
 };
 
+template <typename T>
+struct ObjectTypeReferenceConverter : ObjectTypeConverter<T>
+{
+    static inline bool isConvertible(PyObject* pyObj) { return PyObject_TypeCheck(pyObj, SbkType<T>()); }
+    static inline PyObject* toPython(const T& cppobj) { return Converter<T*>::toPython(&cppobj); }
+    static inline T& toCpp(PyObject* pyobj)
+    {
+        T* t = Converter<T*>::toCpp(pyobj);
+        assert(t);
+        return *t;
+    }
+};
+
 // PyObject* specialization to avoid converting what doesn't need to be converted.
 template<>
 struct Converter<PyObject*> : ObjectTypeConverter<PyObject*>