diff options
Diffstat (limited to 'lib/kross/ruby')
-rw-r--r-- | lib/kross/ruby/rubyextension.cpp | 4 | ||||
-rw-r--r-- | lib/kross/ruby/rubyextension.h | 2 | ||||
-rw-r--r-- | lib/kross/ruby/rubyvariant.h | 18 |
3 files changed, 12 insertions, 12 deletions
diff --git a/lib/kross/ruby/rubyextension.cpp b/lib/kross/ruby/rubyextension.cpp index 589a0b27a..9b9969f78 100644 --- a/lib/kross/ruby/rubyextension.cpp +++ b/lib/kross/ruby/rubyextension.cpp @@ -286,10 +286,10 @@ VALUE RubyExtension::toVALUE(TQStringList list) } -VALUE RubyExtension::toVALUE(TQMap<TQString, TQVariant> map) +VALUE RubyExtension::toVALUE(TQStringVariantMap map) { VALUE h = rb_hash_new(); - for(TQMap<TQString, TQVariant>::Iterator it = map.begin(); it != map.end(); ++it) + for(TQStringVariantMap::Iterator it = map.begin(); it != map.end(); ++it) rb_hash_aset(h, toVALUE(it.key()), toVALUE(it.data()) ); return h; diff --git a/lib/kross/ruby/rubyextension.h b/lib/kross/ruby/rubyextension.h index f6287961c..3c79fe226 100644 --- a/lib/kross/ruby/rubyextension.h +++ b/lib/kross/ruby/rubyextension.h @@ -122,7 +122,7 @@ class RubyExtension{ * \param map The TQMap to convert. * \return The converted TQMap. */ - static VALUE toVALUE(TQMap<TQString, TQVariant> map); + static VALUE toVALUE(TQStringVariantMap map); /** * Converts a TQValueList to a VALUE. 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<TQVariantMap> + struct RubyType<TQStringVariantMap> { - inline static VALUE toVALUE(const TQVariantMap& map) { + inline static VALUE toVALUE(const TQStringVariantMap& map) { VALUE h = rb_hash_new(); - TQMap<TQString, TQVariant>::ConstIterator it(map.constBegin()), end(map.end()); + TQStringVariantMap::ConstIterator it(map.constBegin()), end(map.end()); for(; it != end; ++it) rb_hash_aset(h, RubyType<TQString>::toVALUE(it.key()), RubyType<TQVariant>::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<TQVariant>::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; |