qtbindings 4.8.6.2 → 4.8.6.3

data/ext/ruby/qtruby/src/marshall_complex.h

@@ -1,175 +1,175 @@
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License as        *
- *   published by the Free Software Foundation; either version 2 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef MARSHALL_COMPLEX_H
-#define MARSHALL_COMPLEX_H
-
-#include <QtCore/qlist.h>
-#include <QtCore/qlinkedlist.h>
-#include <QtCore/qvector.h>
-
-template <>
-void marshall_from_ruby<long long>(Marshall *m) 
-{
-	VALUE obj = *(m->var());
-	m->item().s_voidp = new long long;
-	*(long long *)m->item().s_voidp = ruby_to_primitive<long long>(obj);
-	
-	m->next();
-	
-	if(m->cleanup() && m->type().isConst()) {
-		delete (long long int *) m->item().s_voidp;
-	}	
-}
-
-template <>
-void marshall_from_ruby<unsigned long long>(Marshall *m) 
-{
-	VALUE obj = *(m->var());
-	m->item().s_voidp = new unsigned long long;
-	*(long long *)m->item().s_voidp = ruby_to_primitive<unsigned long long>(obj);
-
-	m->next();
-	
-	if(m->cleanup() && m->type().isConst()) {
-		delete (long long int *) m->item().s_voidp;
-	}	
-}
-
-template <>
-void marshall_from_ruby<int *>(Marshall *m) 
-{
-	VALUE rv = *(m->var());
-	int *i = new int;
-	
-	if (rv == Qnil) {
-		m->item().s_voidp = 0;
-		return;
-	} else if (TYPE(rv) == T_OBJECT) {
-		// A Qt::Integer has been passed as an integer value
-		VALUE temp = rb_funcall(qt_internal_module, rb_intern("get_qinteger"), 1, rv);
-		*i = NUM2INT(temp);
-		m->item().s_voidp = i;
-		m->next();
-		rb_funcall(qt_internal_module, rb_intern("set_qinteger"), 2, rv, INT2NUM(*i));
-		rv = temp;
-	} else {
-		*i = NUM2INT(rv);
-		m->item().s_voidp = i;
-		m->next();
-	}
-
-	if(m->cleanup() && m->type().isConst()) {
-		delete i;
-	} else {
-		m->item().s_voidp = new int((int)NUM2INT(rv));
-	}
-}
-
-template <>
-void marshall_to_ruby<int *>(Marshall *m)
-{
-	int *ip = (int*)m->item().s_voidp;
-	VALUE rv = *(m->var());
-	if(!ip) {
-		rv = Qnil;
-		return;
-	}
-	
-	*(m->var()) = INT2NUM(*ip);
-	m->next();
-	if(!m->type().isConst())
-		*ip = NUM2INT(*(m->var()));
-}
-
-template <>
-void marshall_from_ruby<unsigned int *>(Marshall *m) 
-{
-	VALUE rv = *(m->var());
-	unsigned int *i = new unsigned int;
-	
-	if (rv == Qnil) {
-		m->item().s_voidp = 0;
-		return;
-	} else if (TYPE(rv) == T_OBJECT) {
-		// A Qt::Integer has been passed as an integer value
-		VALUE temp = rb_funcall(qt_internal_module, rb_intern("get_qinteger"), 1, rv);
-		*i = NUM2INT(temp);
-		m->item().s_voidp = i;
-		m->next();
-		rb_funcall(qt_internal_module, rb_intern("set_qinteger"), 2, rv, INT2NUM(*i));
-		rv = temp;
-	} else {
-		*i = NUM2UINT(rv);
-		m->item().s_voidp = i;
-		m->next();
-	}
-
-	if(m->cleanup() && m->type().isConst()) {
-		delete i;
-	} else {
-		m->item().s_voidp = new int((int)NUM2UINT(rv));
-	}
-}
-
-template <>
-void marshall_to_ruby<unsigned int *>(Marshall *m)
-{
-	unsigned int *ip = (unsigned int*) m->item().s_voidp;
-	VALUE rv = *(m->var());
-	if (ip == 0) {
-		rv = Qnil;
-		return;
-	}
-	
-	*(m->var()) = UINT2NUM(*ip);
-	m->next();
-	if(!m->type().isConst())
-		*ip = NUM2UINT(*(m->var()));
-}
-
-template <>
-void marshall_from_ruby<bool *>(Marshall *m) 
-{
-   VALUE rv = *(m->var());
-	bool * b = new bool;
-
-	if (TYPE(rv) == T_OBJECT) {
-		// A Qt::Boolean has been passed as a value
-		VALUE temp = rb_funcall(qt_internal_module, rb_intern("get_qboolean"), 1, rv);
-		*b = (temp == Qtrue ? true : false);
-		m->item().s_voidp = b;
-		m->next();
-		rb_funcall(qt_internal_module, rb_intern("set_qboolean"), 2, rv, (*b ? Qtrue : Qfalse));
-	} else {
-		*b = (rv == Qtrue ? true : false);
-		m->item().s_voidp = b;
-		m->next();
-	}
-
-	if(m->cleanup() && m->type().isConst()) {
-		delete b;
-	}
-}
-
-template <>
-void marshall_to_ruby<bool *>(Marshall *m)
-{
-	bool *ip = (bool*)m->item().s_voidp;
-	if(!ip) {
-		*(m->var()) = Qnil;
-		return;
-	}
-	*(m->var()) = (*ip?Qtrue:Qfalse);
-	m->next();
-	if(!m->type().isConst())
-	*ip = *(m->var()) == Qtrue ? true : false;
-}
-
-#endif
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License as        *
+ *   published by the Free Software Foundation; either version 2 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef MARSHALL_COMPLEX_H
+#define MARSHALL_COMPLEX_H
+
+#include <QtCore/qlist.h>
+#include <QtCore/qlinkedlist.h>
+#include <QtCore/qvector.h>
+
+template <>
+void marshall_from_ruby<long long>(Marshall *m) 
+{
+	VALUE obj = *(m->var());
+	m->item().s_voidp = new long long;
+	*(long long *)m->item().s_voidp = ruby_to_primitive<long long>(obj);
+	
+	m->next();
+	
+	if(m->cleanup() && m->type().isConst()) {
+		delete (long long int *) m->item().s_voidp;
+	}	
+}
+
+template <>
+void marshall_from_ruby<unsigned long long>(Marshall *m) 
+{
+	VALUE obj = *(m->var());
+	m->item().s_voidp = new unsigned long long;
+	*(long long *)m->item().s_voidp = ruby_to_primitive<unsigned long long>(obj);
+
+	m->next();
+	
+	if(m->cleanup() && m->type().isConst()) {
+		delete (long long int *) m->item().s_voidp;
+	}	
+}
+
+template <>
+void marshall_from_ruby<int *>(Marshall *m) 
+{
+	VALUE rv = *(m->var());
+	int *i = new int;
+	
+	if (rv == Qnil) {
+		m->item().s_voidp = 0;
+		return;
+	} else if (TYPE(rv) == T_OBJECT) {
+		// A Qt::Integer has been passed as an integer value
+		VALUE temp = rb_funcall(qt_internal_module, rb_intern("get_qinteger"), 1, rv);
+		*i = NUM2INT(temp);
+		m->item().s_voidp = i;
+		m->next();
+		rb_funcall(qt_internal_module, rb_intern("set_qinteger"), 2, rv, INT2NUM(*i));
+		rv = temp;
+	} else {
+		*i = NUM2INT(rv);
+		m->item().s_voidp = i;
+		m->next();
+	}
+
+	if(m->cleanup() && m->type().isConst()) {
+		delete i;
+	} else {
+		m->item().s_voidp = new int((int)NUM2INT(rv));
+	}
+}
+
+template <>
+void marshall_to_ruby<int *>(Marshall *m)
+{
+	int *ip = (int*)m->item().s_voidp;
+	VALUE rv = *(m->var());
+	if(!ip) {
+		rv = Qnil;
+		return;
+	}
+	
+	*(m->var()) = INT2NUM(*ip);
+	m->next();
+	if(!m->type().isConst())
+		*ip = NUM2INT(*(m->var()));
+}
+
+template <>
+void marshall_from_ruby<unsigned int *>(Marshall *m) 
+{
+	VALUE rv = *(m->var());
+	unsigned int *i = new unsigned int;
+	
+	if (rv == Qnil) {
+		m->item().s_voidp = 0;
+		return;
+	} else if (TYPE(rv) == T_OBJECT) {
+		// A Qt::Integer has been passed as an integer value
+		VALUE temp = rb_funcall(qt_internal_module, rb_intern("get_qinteger"), 1, rv);
+		*i = NUM2INT(temp);
+		m->item().s_voidp = i;
+		m->next();
+		rb_funcall(qt_internal_module, rb_intern("set_qinteger"), 2, rv, INT2NUM(*i));
+		rv = temp;
+	} else {
+		*i = NUM2UINT(rv);
+		m->item().s_voidp = i;
+		m->next();
+	}
+
+	if(m->cleanup() && m->type().isConst()) {
+		delete i;
+	} else {
+		m->item().s_voidp = new int((int)NUM2UINT(rv));
+	}
+}
+
+template <>
+void marshall_to_ruby<unsigned int *>(Marshall *m)
+{
+	unsigned int *ip = (unsigned int*) m->item().s_voidp;
+	VALUE rv = *(m->var());
+	if (ip == 0) {
+		rv = Qnil;
+		return;
+	}
+	
+	*(m->var()) = UINT2NUM(*ip);
+	m->next();
+	if(!m->type().isConst())
+		*ip = NUM2UINT(*(m->var()));
+}
+
+template <>
+void marshall_from_ruby<bool *>(Marshall *m) 
+{
+   VALUE rv = *(m->var());
+	bool * b = new bool;
+
+	if (TYPE(rv) == T_OBJECT) {
+		// A Qt::Boolean has been passed as a value
+		VALUE temp = rb_funcall(qt_internal_module, rb_intern("get_qboolean"), 1, rv);
+		*b = (temp == Qtrue ? true : false);
+		m->item().s_voidp = b;
+		m->next();
+		rb_funcall(qt_internal_module, rb_intern("set_qboolean"), 2, rv, (*b ? Qtrue : Qfalse));
+	} else {
+		*b = (rv == Qtrue ? true : false);
+		m->item().s_voidp = b;
+		m->next();
+	}
+
+	if(m->cleanup() && m->type().isConst()) {
+		delete b;
+	}
+}
+
+template <>
+void marshall_to_ruby<bool *>(Marshall *m)
+{
+	bool *ip = (bool*)m->item().s_voidp;
+	if(!ip) {
+		*(m->var()) = Qnil;
+		return;
+	}
+	*(m->var()) = (*ip?Qtrue:Qfalse);
+	m->next();
+	if(!m->type().isConst())
+	*ip = *(m->var()) == Qtrue ? true : false;
+}
+
+#endif

data/ext/ruby/qtruby/src/marshall_macros.h

@@ -1,647 +1,647 @@
-/***************************************************************************
-  marshall_macros.h  -  Useful template based marshallers for QLists, QVectors
-                        and QLinkedLists
-                             -------------------
-    begin                : Thurs Jun 8 2008
-    copyright            : (C) 2008 by Richard Dale
-    email                : richard.j.dale@gmail.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License as        *
- *   published by the Free Software Foundation; either version 2 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef MARSHALL_MACROS_H
-#define MARSHALL_MACROS_H
-
-#include <QtCore/qlist.h>
-#include <QtCore/qlinkedlist.h>
-#include <QtCore/qvector.h>
-#include <QtCore/qhash.h>
-#include <QtCore/qmap.h>
-
-#include "qtruby.h"
-#include "marshall.h"
-
-#define DEF_HASH_MARSHALLER(HashIdent,Item) namespace { char HashIdent##STR[] = #Item; }  \
-        Marshall::HandlerFn marshall_##HashIdent = marshall_Hash<Item,HashIdent##STR>;
-
-#define DEF_MAP_MARSHALLER(MapIdent,Item) namespace { char MapIdent##STR[] = #Item; }  \
-        Marshall::HandlerFn marshall_##MapIdent = marshall_Map<Item,MapIdent##STR>;
-
-#define DEF_LIST_MARSHALLER(ListIdent,ItemList,Item) namespace { char ListIdent##STR[] = #Item; }  \
-        Marshall::HandlerFn marshall_##ListIdent = marshall_ItemList<Item,ItemList,ListIdent##STR>;
-
-#define DEF_VALUELIST_MARSHALLER(ListIdent,ItemList,Item) namespace { char ListIdent##STR[] = #Item; }  \
-        Marshall::HandlerFn marshall_##ListIdent = marshall_ValueListItem<Item,ItemList,ListIdent##STR>;
-
-#define DEF_LINKED_LIST_MARSHALLER(ListIdent,ItemList,Item) namespace { char ListIdent##STR[] = #Item; }  \
-        Marshall::HandlerFn marshall_##ListIdent = marshall_LinkedItemList<Item,ItemList,ListIdent##STR>;
-
-#define DEF_LINKED_VALUELIST_MARSHALLER(ListIdent,ItemList,Item) namespace { char ListIdent##STR[] = #Item; }  \
-        Marshall::HandlerFn marshall_##ListIdent = marshall_LinkedValueListItem<Item,ItemList,ListIdent##STR>;
-
-template <class Item, class ItemList, const char *ItemSTR >
-void marshall_ItemList(Marshall *m) {
-	switch(m->action()) {
-		case Marshall::FromVALUE:
-		{
-			VALUE list = *(m->var());
-			if (TYPE(list) != T_ARRAY) {
-				m->item().s_voidp = 0;
-				break;
-			}
-
-			int count = RARRAY_LEN(list);
-			ItemList *cpplist = new ItemList;
-			long i;
-			for(i = 0; i < count; i++) {
-				VALUE item = rb_ary_entry(list, i);
-				// TODO do type checking!
-				smokeruby_object *o = value_obj_info(item);
-				if(!o || !o->ptr)
-					continue;
-				void *ptr = o->ptr;
-				ptr = o->smoke->cast(
-					ptr,				// pointer
-					o->classId,				// from
-		    		o->smoke->idClass(ItemSTR, true).index	// to
-				);
-				cpplist->append((Item*)ptr);
-			}
-
-			m->item().s_voidp = cpplist;
-			m->next();
-
-			if (!m->type().isConst()) {
-				rb_ary_clear(list);
-	
-				for(int i = 0; i < cpplist->size(); ++i ) {
-					VALUE obj = getPointerObject( (void *) cpplist->at(i) );
-					rb_ary_push(list, obj);
-				}
-			}
-
-			if (m->cleanup()) {
-				delete cpplist;
-			}
-		}
-		break;
-      
-		case Marshall::ToVALUE:
-		{
-			ItemList * cpplist = (ItemList *) m->item().s_voidp;
-			if (cpplist == 0) {
-				*(m->var()) = Qnil;
-				break;
-			}
-
-			VALUE av = rb_ary_new();
-
-            Smoke::ModuleIndex mi = Smoke::findClass(ItemSTR);
-
-			for (int i=0; i < cpplist->size(); ++i) {
-				void *p = (void *) cpplist->at(i);
-
-				if (m->item().s_voidp == 0) {
-					*(m->var()) = Qnil;
-					break;
-				}
-
-				VALUE obj = getPointerObject(p);
-				if (obj == Qnil) {
-					smokeruby_object  * o = alloc_smokeruby_object(	false, 
-																	mi.smoke,
-																	mi.index, 
-																	p );
-
-					obj = set_obj_info(resolve_classname(o), o);
-				}
-			
-				rb_ary_push(av, obj);
-			}
-
-			*(m->var()) = av;
-			m->next();
-
-			if (!m->type().isConst()) {
-			  int count = RARRAY_LEN(av);
-			  long i;
-			  cpplist->clear();
-			  for (i = 0; i < count; i++) {
-				  VALUE item = rb_ary_entry(av, i);
-				  // TODO do type checking!
-				  smokeruby_object *o = value_obj_info(item);
-				  if(!o || !o->ptr)
-					  continue;
-				  void *ptr = o->ptr;
-				  ptr = o->smoke->cast(
-					  ptr,				// pointer
-					  o->classId,				// from
-					  o->smoke->idClass(ItemSTR, true).index	// to
-				  );
-
-				  cpplist->append((Item*)ptr);
-			  }
-			}
-
-			if (m->cleanup()) {
-				delete cpplist;
-			}
-		}
-		break;
-
-		default:
-			m->unsupported();
-		break;
-   }
-}
-
-template <class Item, class ItemList, const char *ItemSTR >
-void marshall_ValueListItem(Marshall *m) {
-	switch(m->action()) {
-		case Marshall::FromVALUE:
-		{
-			VALUE list = *(m->var());
-			if (TYPE(list) != T_ARRAY) {
-				m->item().s_voidp = 0;
-				break;
-			}
-			int count = RARRAY_LEN(list);
-			ItemList *cpplist = new ItemList;
-			long i;
-			for(i = 0; i < count; i++) {
-				VALUE item = rb_ary_entry(list, i);
-				// TODO do type checking!
-				smokeruby_object *o = value_obj_info(item);
-
-				// Special case for the QList<QVariant> type
-				if (	qstrcmp(ItemSTR, "QVariant") == 0 
-						&& (!o || !o->ptr || o->classId != o->smoke->idClass("QVariant", true).index) ) 
-				{
-					// If the value isn't a Qt::Variant, then try and construct
-					// a Qt::Variant from it
-					item = rb_funcall(qvariant_class, rb_intern("fromValue"), 1, item);
-					if (item == Qnil) {
-						continue;
-					}
-					o = value_obj_info(item);
-				}
-
-				if (!o || !o->ptr)
-					continue;
-				
-				void *ptr = o->ptr;
-				ptr = o->smoke->cast(
-					ptr,				// pointer
-					o->classId,				// from
-					o->smoke->idClass(ItemSTR, true).index	        // to
-				);
-				cpplist->append(*(Item*)ptr);
-			}
-
-			m->item().s_voidp = cpplist;
-			m->next();
-
-			if (!m->type().isConst()) {
-				rb_ary_clear(list);
-				for(int i=0; i < cpplist->size(); ++i) {
-					VALUE obj = getPointerObject((void*)&(cpplist->at(i)));
-					rb_ary_push(list, obj);
-				}
-			}
-
-			if (m->cleanup()) {
-				delete cpplist;
-			}
-		}
-		break;
-      
-		case Marshall::ToVALUE:
-		{
-			ItemList *valuelist = (ItemList*)m->item().s_voidp;
-			if(!valuelist) {
-				*(m->var()) = Qnil;
-				break;
-			}
-
-			VALUE av = rb_ary_new();
-
-			Smoke::ModuleIndex mi = Smoke::findClass(ItemSTR);
-			const char * className = qtruby_modules[mi.smoke].binding->className(mi.index);
-
-			for(int i=0; i < valuelist->size() ; ++i) {
-				void *p = (void *) &(valuelist->at(i));
-
-				if(m->item().s_voidp == 0) {
-				*(m->var()) = Qnil;
-				break;
-				}
-
-				VALUE obj = getPointerObject(p);
-				if(obj == Qnil) {
-					smokeruby_object  * o = alloc_smokeruby_object(	false, 
-																	mi.smoke, 
-																	mi.index, 
-																	p );
-					obj = set_obj_info(className, o);
-				}
-		
-				rb_ary_push(av, obj);
-			}
-
-			*(m->var()) = av;
-			m->next();
-
-			if (m->cleanup()) {
-				delete valuelist;
-			}
-
-		}
-		break;
-      
-		default:
-			m->unsupported();
-		break;
-	}
-}
-
-/*
-	The code for the QLinkedList marshallers is identical to the QList and QVector marshallers apart
-	from the use of iterators instead of at(), and so it really should be possible to code one marshaller
-	to work with all three types.
-*/
-
-template <class Item, class ItemList, const char *ItemSTR >
-void marshall_LinkedItemList(Marshall *m) {
-	switch(m->action()) {
-		case Marshall::FromVALUE:
-		{
-			VALUE list = *(m->var());
-			if (TYPE(list) != T_ARRAY) {
-				m->item().s_voidp = 0;
-				break;
-			}
-
-			int count = RARRAY_LEN(list);
-			ItemList *cpplist = new ItemList;
-			long i;
-			for (i = 0; i < count; i++) {
-				VALUE item = rb_ary_entry(list, i);
-				// TODO do type checking!
-				smokeruby_object *o = value_obj_info(item);
-				if (o == 0 || o->ptr == 0)
-					continue;
-				void *ptr = o->ptr;
-				ptr = o->smoke->cast(
-					ptr,				// pointer
-					o->classId,				// from
-		    		o->smoke->idClass(ItemSTR, true).index	// to
-				);
-				cpplist->append((Item*)ptr);
-			}
-
-			m->item().s_voidp = cpplist;
-			m->next();
-
-			if (!m->type().isConst()) {
-				rb_ary_clear(list);
-
-				QLinkedListIterator<Item*> iter(*cpplist);
-				while (iter.hasNext()) {
-					VALUE obj = getPointerObject((void *) iter.next());
-					rb_ary_push(list, obj);
-				}	
-			}
-
-			if (m->cleanup()) {
-				delete cpplist;
-			}
-		}
-		break;
-      
-		case Marshall::ToVALUE:
-		{
-			ItemList *valuelist = (ItemList*)m->item().s_voidp;
-			if (valuelist == 0) {
-				*(m->var()) = Qnil;
-				break;
-			}
-
-			VALUE av = rb_ary_new();
-
-            Smoke::ModuleIndex mi = Smoke::findClass(ItemSTR);
-
-			QLinkedListIterator<Item*> iter(*valuelist);
-			while (iter.hasNext()) {
-				void * p = (void *) iter.next();
-
-				if (m->item().s_voidp == 0) {
-					*(m->var()) = Qnil;
-					break;
-				}
-
-				VALUE obj = getPointerObject(p);
-				if (obj == Qnil) {
-					smokeruby_object  * o = alloc_smokeruby_object(	false, 
-																	mi.smoke,
-																	mi.index, 
-																	p );
-
-					obj = set_obj_info(resolve_classname(o), o);
-				}
-			
-				rb_ary_push(av, obj);
-			}
-
-			*(m->var()) = av;
-			m->next();
-
-			if (m->cleanup()) {
-				delete valuelist;
-			}
-		}
-		break;
-
-		default:
-			m->unsupported();
-		break;
-   }
-}
-
-template <class Item, class ItemList, const char *ItemSTR >
-void marshall_LinkedValueListItem(Marshall *m) {
-	switch(m->action()) {
-		case Marshall::FromVALUE:
-		{
-			VALUE list = *(m->var());
-			if (TYPE(list) != T_ARRAY) {
-				m->item().s_voidp = 0;
-				break;
-			}
-			int count = RARRAY_LEN(list);
-			ItemList *cpplist = new ItemList;
-			long i;
-			for(i = 0; i < count; i++) {
-				VALUE item = rb_ary_entry(list, i);
-				// TODO do type checking!
-				smokeruby_object *o = value_obj_info(item);
-
-				// Special case for the QList<QVariant> type
-				if (	qstrcmp(ItemSTR, "QVariant") == 0 
-						&& (o == 0 || o->ptr == 0 || o->classId != o->smoke->idClass("QVariant", true).index) ) 
-				{
-					// If the value isn't a Qt::Variant, then try and construct
-					// a Qt::Variant from it
-					item = rb_funcall(qvariant_class, rb_intern("fromValue"), 1, item);
-					if (item == Qnil) {
-						continue;
-					}
-					o = value_obj_info(item);
-				}
-
-				if (o == 0 || o->ptr == 0)
-					continue;
-				
-				void *ptr = o->ptr;
-				ptr = o->smoke->cast(
-					ptr,				// pointer
-					o->classId,				// from
-					o->smoke->idClass(ItemSTR, true).index	        // to
-				);
-				cpplist->append(*(Item*)ptr);
-			}
-
-			m->item().s_voidp = cpplist;
-			m->next();
-
-			if (!m->type().isConst()) {
-				rb_ary_clear(list);
-
-				QLinkedListIterator<Item> iter(*cpplist);
-				while (iter.hasNext()) {
-					VALUE obj = getPointerObject((void*)&(iter.next()));
-					rb_ary_push(list, obj);
-				}
-			}
-
-			if (m->cleanup()) {
-				delete cpplist;
-			}
-		}
-		break;
-      
-		case Marshall::ToVALUE:
-		{
-			ItemList *valuelist = (ItemList*)m->item().s_voidp;
-			if (valuelist == 0) {
-				*(m->var()) = Qnil;
-				break;
-			}
-
-			VALUE av = rb_ary_new();
-
-			Smoke::ModuleIndex mi = Smoke::findClass(ItemSTR);
-			const char * className = qtruby_modules[mi.smoke].binding->className(mi.index);
-
-			QLinkedListIterator<Item> iter(*valuelist);
-			while (iter.hasNext()) {
-				void * p = (void*) &(iter.next());
-
-				if(m->item().s_voidp == 0) {
-					*(m->var()) = Qnil;
-					break;
-				}
-
-				VALUE obj = getPointerObject(p);
-				if(obj == Qnil) {
-					smokeruby_object  * o = alloc_smokeruby_object(	false, 
-																	mi.smoke,
-																	mi.index, 
-																	p );
-					obj = set_obj_info(className, o);
-				}
-		
-				rb_ary_push(av, obj);
-			}
-
-			*(m->var()) = av;
-			m->next();
-
-			if (m->cleanup()) {
-				delete valuelist;
-			}
-
-		}
-		break;
-      
-		default:
-			m->unsupported();
-		break;
-	}
-}
-
-template <class Value, const char *ValueSTR >
-void marshall_Hash(Marshall *m) {
-	switch(m->action()) {
-	case Marshall::FromVALUE:
-	{
-		VALUE hv = *(m->var());
-		if (TYPE(hv) != T_HASH) {
-			m->item().s_voidp = 0;
-			break;
-		}
-		
-		QHash<QString, Value*> * hash = new QHash<QString, Value*>;
-		
-		// Convert the ruby hash to an array of key/value arrays
-		VALUE temp = rb_funcall(hv, rb_intern("to_a"), 0);
-
-		for (long i = 0; i < RARRAY_LEN(temp); i++) {
-			VALUE key = rb_ary_entry(rb_ary_entry(temp, i), 0);
-			VALUE value = rb_ary_entry(rb_ary_entry(temp, i), 1);
-			
-			smokeruby_object *o = value_obj_info(value);
-			if( !o || !o->ptr)
-				continue;
-			void * val_ptr = o->ptr;
-			val_ptr = o->smoke->cast(val_ptr, o->classId, o->smoke->idClass(ValueSTR, true).index);
-			
-			(*hash)[QString(StringValuePtr(key))] = (Value*)val_ptr;
-		}
-	    
-		m->item().s_voidp = hash;
-		m->next();
-		
-		if (m->cleanup())
-			delete hash;
-	}
-	break;
-	case Marshall::ToVALUE:
-	{
-		QHash<QString, Value*> *hash = (QHash<QString, Value*>*) m->item().s_voidp;
-		if (hash == 0) {
-			*(m->var()) = Qnil;
-			break;
-	    }
-		
-		VALUE hv = rb_hash_new();
-		
-		Smoke::ModuleIndex val_mi = Smoke::findClass(ValueSTR);
-	    const char * val_className = qtruby_modules[val_mi.smoke].binding->className(val_mi.index);
-			
-		for (QHashIterator<QString, Value*> it(*hash); it.hasNext(); it.next()) {
-			void *val_p = it.value();
-			VALUE value_obj = getPointerObject(val_p);
-				
-			if (value_obj == Qnil) {
-				smokeruby_object *o = ALLOC(smokeruby_object);
-				o->classId = val_mi.index;
-				o->smoke = val_mi.smoke;
-				o->ptr = val_p;
-				o->allocated = false;
-				value_obj = set_obj_info(val_className, o);
-			}
-			rb_hash_aset(hv, rb_str_new2(((QString*)&(it.key()))->toLatin1()), value_obj);
-        }
-		
-		*(m->var()) = hv;
-		m->next();
-		
-		if (m->cleanup())
-			delete hash;
-	}
-	break;
-      default:
-	m->unsupported();
-	break;
-    }
-}
-
-template <class Value, const char *ValueSTR >
-void marshall_Map(Marshall *m) {
-	switch(m->action()) {
-	case Marshall::FromVALUE:
-	{
-		VALUE hv = *(m->var());
-		if (TYPE(hv) != T_HASH) {
-			m->item().s_voidp = 0;
-			break;
-		}
-		
-		QMap<QString, Value> * map = new QMap<QString, Value>;
-		
-		// Convert the ruby hash to an array of key/value arrays
-		VALUE temp = rb_funcall(hv, rb_intern("to_a"), 0);
-
-		for (long i = 0; i < RARRAY_LEN(temp); i++) {
-			VALUE key = rb_ary_entry(rb_ary_entry(temp, i), 0);
-			VALUE value = rb_ary_entry(rb_ary_entry(temp, i), 1);
-			
-			smokeruby_object *o = value_obj_info(value);
-			if (o == 0 || o->ptr == 0) {
-				continue;
-			}
-			void * val_ptr = o->ptr;
-			val_ptr = o->smoke->cast(val_ptr, o->classId, o->smoke->idClass(ValueSTR, true).index);
-			
-			(*map)[QString(StringValuePtr(key))] = *((Value*)val_ptr);
-		}
-	    
-		m->item().s_voidp = map;
-		m->next();
-		
-		if (m->cleanup()) {
-			delete map;
-		}
-	}
-	break;
-	case Marshall::ToVALUE:
-	{
-		QMap<QString, Value> *map = (QMap<QString, Value>*) m->item().s_voidp;
-		if (map == 0) {
-			*(m->var()) = Qnil;
-			break;
-		}
-		
-		VALUE hv = rb_hash_new();
-		
-        Smoke::ModuleIndex val_mi = Smoke::findClass(ValueSTR);
-        const char * val_className = qtruby_modules[val_mi.smoke].binding->className(val_mi.index);
-		QMapIterator<QString, Value> it(*map);
-		while (it.hasNext()) {
-			it.next();
-			void *val_p = (void *) &(it.value());
-			VALUE value_obj = getPointerObject(val_p);
-				
-			if (value_obj == Qnil) {
-				smokeruby_object *o = ALLOC(smokeruby_object);
-				o->classId = val_mi.index;
-				o->smoke = val_mi.smoke;
-				o->ptr = val_p;
-				o->allocated = false;
-				value_obj = set_obj_info(val_className, o);
-			}
-			rb_hash_aset(hv, rb_str_new2(((QString*)&(it.key()))->toLatin1()), value_obj);
-        }
-		
-		*(m->var()) = hv;
-		m->next();
-		
-		if (m->cleanup()) {
-			delete map;
-		}
-	}
-	break;
-      default:
-	m->unsupported();
-	break;
-    }
-}
-
-#endif
+/***************************************************************************
+  marshall_macros.h  -  Useful template based marshallers for QLists, QVectors
+                        and QLinkedLists
+                             -------------------
+    begin                : Thurs Jun 8 2008
+    copyright            : (C) 2008 by Richard Dale
+    email                : richard.j.dale@gmail.com
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License as        *
+ *   published by the Free Software Foundation; either version 2 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef MARSHALL_MACROS_H
+#define MARSHALL_MACROS_H
+
+#include <QtCore/qlist.h>
+#include <QtCore/qlinkedlist.h>
+#include <QtCore/qvector.h>
+#include <QtCore/qhash.h>
+#include <QtCore/qmap.h>
+
+#include "qtruby.h"
+#include "marshall.h"
+
+#define DEF_HASH_MARSHALLER(HashIdent,Item) namespace { char HashIdent##STR[] = #Item; }  \
+        Marshall::HandlerFn marshall_##HashIdent = marshall_Hash<Item,HashIdent##STR>;
+
+#define DEF_MAP_MARSHALLER(MapIdent,Item) namespace { char MapIdent##STR[] = #Item; }  \
+        Marshall::HandlerFn marshall_##MapIdent = marshall_Map<Item,MapIdent##STR>;
+
+#define DEF_LIST_MARSHALLER(ListIdent,ItemList,Item) namespace { char ListIdent##STR[] = #Item; }  \
+        Marshall::HandlerFn marshall_##ListIdent = marshall_ItemList<Item,ItemList,ListIdent##STR>;
+
+#define DEF_VALUELIST_MARSHALLER(ListIdent,ItemList,Item) namespace { char ListIdent##STR[] = #Item; }  \
+        Marshall::HandlerFn marshall_##ListIdent = marshall_ValueListItem<Item,ItemList,ListIdent##STR>;
+
+#define DEF_LINKED_LIST_MARSHALLER(ListIdent,ItemList,Item) namespace { char ListIdent##STR[] = #Item; }  \
+        Marshall::HandlerFn marshall_##ListIdent = marshall_LinkedItemList<Item,ItemList,ListIdent##STR>;
+
+#define DEF_LINKED_VALUELIST_MARSHALLER(ListIdent,ItemList,Item) namespace { char ListIdent##STR[] = #Item; }  \
+        Marshall::HandlerFn marshall_##ListIdent = marshall_LinkedValueListItem<Item,ItemList,ListIdent##STR>;
+
+template <class Item, class ItemList, const char *ItemSTR >
+void marshall_ItemList(Marshall *m) {
+	switch(m->action()) {
+		case Marshall::FromVALUE:
+		{
+			VALUE list = *(m->var());
+			if (TYPE(list) != T_ARRAY) {
+				m->item().s_voidp = 0;
+				break;
+			}
+
+			int count = RARRAY_LEN(list);
+			ItemList *cpplist = new ItemList;
+			long i;
+			for(i = 0; i < count; i++) {
+				VALUE item = rb_ary_entry(list, i);
+				// TODO do type checking!
+				smokeruby_object *o = value_obj_info(item);
+				if(!o || !o->ptr)
+					continue;
+				void *ptr = o->ptr;
+				ptr = o->smoke->cast(
+					ptr,				// pointer
+					o->classId,				// from
+		    		o->smoke->idClass(ItemSTR, true).index	// to
+				);
+				cpplist->append((Item*)ptr);
+			}
+
+			m->item().s_voidp = cpplist;
+			m->next();
+
+			if (!m->type().isConst()) {
+				rb_ary_clear(list);
+	
+				for(int i = 0; i < cpplist->size(); ++i ) {
+					VALUE obj = getPointerObject( (void *) cpplist->at(i) );
+					rb_ary_push(list, obj);
+				}
+			}
+
+			if (m->cleanup()) {
+				delete cpplist;
+			}
+		}
+		break;
+      
+		case Marshall::ToVALUE:
+		{
+			ItemList * cpplist = (ItemList *) m->item().s_voidp;
+			if (cpplist == 0) {
+				*(m->var()) = Qnil;
+				break;
+			}
+
+			VALUE av = rb_ary_new();
+
+            Smoke::ModuleIndex mi = Smoke::findClass(ItemSTR);
+
+			for (int i=0; i < cpplist->size(); ++i) {
+				void *p = (void *) cpplist->at(i);
+
+				if (m->item().s_voidp == 0) {
+					*(m->var()) = Qnil;
+					break;
+				}
+
+				VALUE obj = getPointerObject(p);
+				if (obj == Qnil) {
+					smokeruby_object  * o = alloc_smokeruby_object(	false, 
+																	mi.smoke,
+																	mi.index, 
+																	p );
+
+					obj = set_obj_info(resolve_classname(o), o);
+				}
+			
+				rb_ary_push(av, obj);
+			}
+
+			*(m->var()) = av;
+			m->next();
+
+			if (!m->type().isConst()) {
+			  int count = RARRAY_LEN(av);
+			  long i;
+			  cpplist->clear();
+			  for (i = 0; i < count; i++) {
+				  VALUE item = rb_ary_entry(av, i);
+				  // TODO do type checking!
+				  smokeruby_object *o = value_obj_info(item);
+				  if(!o || !o->ptr)
+					  continue;
+				  void *ptr = o->ptr;
+				  ptr = o->smoke->cast(
+					  ptr,				// pointer
+					  o->classId,				// from
+					  o->smoke->idClass(ItemSTR, true).index	// to
+				  );
+
+				  cpplist->append((Item*)ptr);
+			  }
+			}
+
+			if (m->cleanup()) {
+				delete cpplist;
+			}
+		}
+		break;
+
+		default:
+			m->unsupported();
+		break;
+   }
+}
+
+template <class Item, class ItemList, const char *ItemSTR >
+void marshall_ValueListItem(Marshall *m) {
+	switch(m->action()) {
+		case Marshall::FromVALUE:
+		{
+			VALUE list = *(m->var());
+			if (TYPE(list) != T_ARRAY) {
+				m->item().s_voidp = 0;
+				break;
+			}
+			int count = RARRAY_LEN(list);
+			ItemList *cpplist = new ItemList;
+			long i;
+			for(i = 0; i < count; i++) {
+				VALUE item = rb_ary_entry(list, i);
+				// TODO do type checking!
+				smokeruby_object *o = value_obj_info(item);
+
+				// Special case for the QList<QVariant> type
+				if (	qstrcmp(ItemSTR, "QVariant") == 0 
+						&& (!o || !o->ptr || o->classId != o->smoke->idClass("QVariant", true).index) ) 
+				{
+					// If the value isn't a Qt::Variant, then try and construct
+					// a Qt::Variant from it
+					item = rb_funcall(qvariant_class, rb_intern("fromValue"), 1, item);
+					if (item == Qnil) {
+						continue;
+					}
+					o = value_obj_info(item);
+				}
+
+				if (!o || !o->ptr)
+					continue;
+				
+				void *ptr = o->ptr;
+				ptr = o->smoke->cast(
+					ptr,				// pointer
+					o->classId,				// from
+					o->smoke->idClass(ItemSTR, true).index	        // to
+				);
+				cpplist->append(*(Item*)ptr);
+			}
+
+			m->item().s_voidp = cpplist;
+			m->next();
+
+			if (!m->type().isConst()) {
+				rb_ary_clear(list);
+				for(int i=0; i < cpplist->size(); ++i) {
+					VALUE obj = getPointerObject((void*)&(cpplist->at(i)));
+					rb_ary_push(list, obj);
+				}
+			}
+
+			if (m->cleanup()) {
+				delete cpplist;
+			}
+		}
+		break;
+      
+		case Marshall::ToVALUE:
+		{
+			ItemList *valuelist = (ItemList*)m->item().s_voidp;
+			if(!valuelist) {
+				*(m->var()) = Qnil;
+				break;
+			}
+
+			VALUE av = rb_ary_new();
+
+			Smoke::ModuleIndex mi = Smoke::findClass(ItemSTR);
+			const char * className = qtruby_modules[mi.smoke].binding->className(mi.index);
+
+			for(int i=0; i < valuelist->size() ; ++i) {
+				void *p = (void *) &(valuelist->at(i));
+
+				if(m->item().s_voidp == 0) {
+				*(m->var()) = Qnil;
+				break;
+				}
+
+				VALUE obj = getPointerObject(p);
+				if(obj == Qnil) {
+					smokeruby_object  * o = alloc_smokeruby_object(	false, 
+																	mi.smoke, 
+																	mi.index, 
+																	p );
+					obj = set_obj_info(className, o);
+				}
+		
+				rb_ary_push(av, obj);
+			}
+
+			*(m->var()) = av;
+			m->next();
+
+			if (m->cleanup()) {
+				delete valuelist;
+			}
+
+		}
+		break;
+      
+		default:
+			m->unsupported();
+		break;
+	}
+}
+
+/*
+	The code for the QLinkedList marshallers is identical to the QList and QVector marshallers apart
+	from the use of iterators instead of at(), and so it really should be possible to code one marshaller
+	to work with all three types.
+*/
+
+template <class Item, class ItemList, const char *ItemSTR >
+void marshall_LinkedItemList(Marshall *m) {
+	switch(m->action()) {
+		case Marshall::FromVALUE:
+		{
+			VALUE list = *(m->var());
+			if (TYPE(list) != T_ARRAY) {
+				m->item().s_voidp = 0;
+				break;
+			}
+
+			int count = RARRAY_LEN(list);
+			ItemList *cpplist = new ItemList;
+			long i;
+			for (i = 0; i < count; i++) {
+				VALUE item = rb_ary_entry(list, i);
+				// TODO do type checking!
+				smokeruby_object *o = value_obj_info(item);
+				if (o == 0 || o->ptr == 0)
+					continue;
+				void *ptr = o->ptr;
+				ptr = o->smoke->cast(
+					ptr,				// pointer
+					o->classId,				// from
+		    		o->smoke->idClass(ItemSTR, true).index	// to
+				);
+				cpplist->append((Item*)ptr);
+			}
+
+			m->item().s_voidp = cpplist;
+			m->next();
+
+			if (!m->type().isConst()) {
+				rb_ary_clear(list);
+
+				QLinkedListIterator<Item*> iter(*cpplist);
+				while (iter.hasNext()) {
+					VALUE obj = getPointerObject((void *) iter.next());
+					rb_ary_push(list, obj);
+				}	
+			}
+
+			if (m->cleanup()) {
+				delete cpplist;
+			}
+		}
+		break;
+      
+		case Marshall::ToVALUE:
+		{
+			ItemList *valuelist = (ItemList*)m->item().s_voidp;
+			if (valuelist == 0) {
+				*(m->var()) = Qnil;
+				break;
+			}
+
+			VALUE av = rb_ary_new();
+
+            Smoke::ModuleIndex mi = Smoke::findClass(ItemSTR);
+
+			QLinkedListIterator<Item*> iter(*valuelist);
+			while (iter.hasNext()) {
+				void * p = (void *) iter.next();
+
+				if (m->item().s_voidp == 0) {
+					*(m->var()) = Qnil;
+					break;
+				}
+
+				VALUE obj = getPointerObject(p);
+				if (obj == Qnil) {
+					smokeruby_object  * o = alloc_smokeruby_object(	false, 
+																	mi.smoke,
+																	mi.index, 
+																	p );
+
+					obj = set_obj_info(resolve_classname(o), o);
+				}
+			
+				rb_ary_push(av, obj);
+			}
+
+			*(m->var()) = av;
+			m->next();
+
+			if (m->cleanup()) {
+				delete valuelist;
+			}
+		}
+		break;
+
+		default:
+			m->unsupported();
+		break;
+   }
+}
+
+template <class Item, class ItemList, const char *ItemSTR >
+void marshall_LinkedValueListItem(Marshall *m) {
+	switch(m->action()) {
+		case Marshall::FromVALUE:
+		{
+			VALUE list = *(m->var());
+			if (TYPE(list) != T_ARRAY) {
+				m->item().s_voidp = 0;
+				break;
+			}
+			int count = RARRAY_LEN(list);
+			ItemList *cpplist = new ItemList;
+			long i;
+			for(i = 0; i < count; i++) {
+				VALUE item = rb_ary_entry(list, i);
+				// TODO do type checking!
+				smokeruby_object *o = value_obj_info(item);
+
+				// Special case for the QList<QVariant> type
+				if (	qstrcmp(ItemSTR, "QVariant") == 0 
+						&& (o == 0 || o->ptr == 0 || o->classId != o->smoke->idClass("QVariant", true).index) ) 
+				{
+					// If the value isn't a Qt::Variant, then try and construct
+					// a Qt::Variant from it
+					item = rb_funcall(qvariant_class, rb_intern("fromValue"), 1, item);
+					if (item == Qnil) {
+						continue;
+					}
+					o = value_obj_info(item);
+				}
+
+				if (o == 0 || o->ptr == 0)
+					continue;
+				
+				void *ptr = o->ptr;
+				ptr = o->smoke->cast(
+					ptr,				// pointer
+					o->classId,				// from
+					o->smoke->idClass(ItemSTR, true).index	        // to
+				);
+				cpplist->append(*(Item*)ptr);
+			}
+
+			m->item().s_voidp = cpplist;
+			m->next();
+
+			if (!m->type().isConst()) {
+				rb_ary_clear(list);
+
+				QLinkedListIterator<Item> iter(*cpplist);
+				while (iter.hasNext()) {
+					VALUE obj = getPointerObject((void*)&(iter.next()));
+					rb_ary_push(list, obj);
+				}
+			}
+
+			if (m->cleanup()) {
+				delete cpplist;
+			}
+		}
+		break;
+      
+		case Marshall::ToVALUE:
+		{
+			ItemList *valuelist = (ItemList*)m->item().s_voidp;
+			if (valuelist == 0) {
+				*(m->var()) = Qnil;
+				break;
+			}
+
+			VALUE av = rb_ary_new();
+
+			Smoke::ModuleIndex mi = Smoke::findClass(ItemSTR);
+			const char * className = qtruby_modules[mi.smoke].binding->className(mi.index);
+
+			QLinkedListIterator<Item> iter(*valuelist);
+			while (iter.hasNext()) {
+				void * p = (void*) &(iter.next());
+
+				if(m->item().s_voidp == 0) {
+					*(m->var()) = Qnil;
+					break;
+				}
+
+				VALUE obj = getPointerObject(p);
+				if(obj == Qnil) {
+					smokeruby_object  * o = alloc_smokeruby_object(	false, 
+																	mi.smoke,
+																	mi.index, 
+																	p );
+					obj = set_obj_info(className, o);
+				}
+		
+				rb_ary_push(av, obj);
+			}
+
+			*(m->var()) = av;
+			m->next();
+
+			if (m->cleanup()) {
+				delete valuelist;
+			}
+
+		}
+		break;
+      
+		default:
+			m->unsupported();
+		break;
+	}
+}
+
+template <class Value, const char *ValueSTR >
+void marshall_Hash(Marshall *m) {
+	switch(m->action()) {
+	case Marshall::FromVALUE:
+	{
+		VALUE hv = *(m->var());
+		if (TYPE(hv) != T_HASH) {
+			m->item().s_voidp = 0;
+			break;
+		}
+		
+		QHash<QString, Value*> * hash = new QHash<QString, Value*>;
+		
+		// Convert the ruby hash to an array of key/value arrays
+		VALUE temp = rb_funcall(hv, rb_intern("to_a"), 0);
+
+		for (long i = 0; i < RARRAY_LEN(temp); i++) {
+			VALUE key = rb_ary_entry(rb_ary_entry(temp, i), 0);
+			VALUE value = rb_ary_entry(rb_ary_entry(temp, i), 1);
+			
+			smokeruby_object *o = value_obj_info(value);
+			if( !o || !o->ptr)
+				continue;
+			void * val_ptr = o->ptr;
+			val_ptr = o->smoke->cast(val_ptr, o->classId, o->smoke->idClass(ValueSTR, true).index);
+			
+			(*hash)[QString(StringValuePtr(key))] = (Value*)val_ptr;
+		}
+	    
+		m->item().s_voidp = hash;
+		m->next();
+		
+		if (m->cleanup())
+			delete hash;
+	}
+	break;
+	case Marshall::ToVALUE:
+	{
+		QHash<QString, Value*> *hash = (QHash<QString, Value*>*) m->item().s_voidp;
+		if (hash == 0) {
+			*(m->var()) = Qnil;
+			break;
+	    }
+		
+		VALUE hv = rb_hash_new();
+		
+		Smoke::ModuleIndex val_mi = Smoke::findClass(ValueSTR);
+	    const char * val_className = qtruby_modules[val_mi.smoke].binding->className(val_mi.index);
+			
+		for (QHashIterator<QString, Value*> it(*hash); it.hasNext(); it.next()) {
+			void *val_p = it.value();
+			VALUE value_obj = getPointerObject(val_p);
+				
+			if (value_obj == Qnil) {
+				smokeruby_object *o = ALLOC(smokeruby_object);
+				o->classId = val_mi.index;
+				o->smoke = val_mi.smoke;
+				o->ptr = val_p;
+				o->allocated = false;
+				value_obj = set_obj_info(val_className, o);
+			}
+			rb_hash_aset(hv, rb_str_new2(((QString*)&(it.key()))->toLatin1()), value_obj);
+        }
+		
+		*(m->var()) = hv;
+		m->next();
+		
+		if (m->cleanup())
+			delete hash;
+	}
+	break;
+      default:
+	m->unsupported();
+	break;
+    }
+}
+
+template <class Value, const char *ValueSTR >
+void marshall_Map(Marshall *m) {
+	switch(m->action()) {
+	case Marshall::FromVALUE:
+	{
+		VALUE hv = *(m->var());
+		if (TYPE(hv) != T_HASH) {
+			m->item().s_voidp = 0;
+			break;
+		}
+		
+		QMap<QString, Value> * map = new QMap<QString, Value>;
+		
+		// Convert the ruby hash to an array of key/value arrays
+		VALUE temp = rb_funcall(hv, rb_intern("to_a"), 0);
+
+		for (long i = 0; i < RARRAY_LEN(temp); i++) {
+			VALUE key = rb_ary_entry(rb_ary_entry(temp, i), 0);
+			VALUE value = rb_ary_entry(rb_ary_entry(temp, i), 1);
+			
+			smokeruby_object *o = value_obj_info(value);
+			if (o == 0 || o->ptr == 0) {
+				continue;
+			}
+			void * val_ptr = o->ptr;
+			val_ptr = o->smoke->cast(val_ptr, o->classId, o->smoke->idClass(ValueSTR, true).index);
+			
+			(*map)[QString(StringValuePtr(key))] = *((Value*)val_ptr);
+		}
+	    
+		m->item().s_voidp = map;
+		m->next();
+		
+		if (m->cleanup()) {
+			delete map;
+		}
+	}
+	break;
+	case Marshall::ToVALUE:
+	{
+		QMap<QString, Value> *map = (QMap<QString, Value>*) m->item().s_voidp;
+		if (map == 0) {
+			*(m->var()) = Qnil;
+			break;
+		}
+		
+		VALUE hv = rb_hash_new();
+		
+        Smoke::ModuleIndex val_mi = Smoke::findClass(ValueSTR);
+        const char * val_className = qtruby_modules[val_mi.smoke].binding->className(val_mi.index);
+		QMapIterator<QString, Value> it(*map);
+		while (it.hasNext()) {
+			it.next();
+			void *val_p = (void *) &(it.value());
+			VALUE value_obj = getPointerObject(val_p);
+				
+			if (value_obj == Qnil) {
+				smokeruby_object *o = ALLOC(smokeruby_object);
+				o->classId = val_mi.index;
+				o->smoke = val_mi.smoke;
+				o->ptr = val_p;
+				o->allocated = false;
+				value_obj = set_obj_info(val_className, o);
+			}
+			rb_hash_aset(hv, rb_str_new2(((QString*)&(it.key()))->toLatin1()), value_obj);
+        }
+		
+		*(m->var()) = hv;
+		m->next();
+		
+		if (m->cleanup()) {
+			delete map;
+		}
+	}
+	break;
+      default:
+	m->unsupported();
+	break;
+    }
+}
+
+#endif