From 728b7db2846d191399122c440671fd007cdbd0ae Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 1 Jun 2019 15:22:21 +0900 Subject: Adjusted to use new TQStringVariantMap type. Signed-off-by: Michele Calgaro --- lib/kross/ruby/rubyvariant.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'lib/kross/ruby/rubyvariant.h') diff --git a/lib/kross/ruby/rubyvariant.h b/lib/kross/ruby/rubyvariant.h index f36d943c8..cba4a2c36 100644 --- a/lib/kross/ruby/rubyvariant.h +++ b/lib/kross/ruby/rubyvariant.h @@ -496,28 +496,28 @@ namespace Kross { #if 0 /// \internal template<> - struct RubyType + struct RubyType { - inline static VALUE toVALUE(const TQVariantMap& map) { + inline static VALUE toVALUE(const TQStringVariantMap& map) { VALUE h = rb_hash_new(); - TQMap::ConstIterator it(map.constBegin()), end(map.end()); + TQStringVariantMap::ConstIterator it(map.constBegin()), end(map.end()); for(; it != end; ++it) rb_hash_aset(h, RubyType::toVALUE(it.key()), RubyType::toVALUE(it.value()) ); return h; } inline static int convertHash(VALUE key, VALUE value, VALUE vmap) { - TQVariantMap* map; - Data_Get_Struct(vmap, TQVariantMap, map); + TQStringVariantMap* map; + Data_Get_Struct(vmap, TQStringVariantMap, map); if (key != TQundef) map->insert(STR2CSTR(key), RubyType::toVariant(value)); return ST_CONTINUE; } - inline static TQVariantMap toVariant(VALUE value) { + inline static TQStringVariantMap toVariant(VALUE value) { if( TYPE(value) != T_HASH ) { - rb_raise(rb_eTypeError, "TQVariantMap must be a hash"); - return TQVariantMap(); + rb_raise(rb_eTypeError, "TQStringVariantMap must be a hash"); + return TQStringVariantMap(); } - TQVariantMap map; + TQStringVariantMap map; VALUE vmap = Data_Wrap_Struct(rb_cObject, 0,0, &map); rb_hash_foreach(value, (int (*)(...))convertHash, vmap); return map; -- cgit v1.2.3