summaryrefslogtreecommitdiffstats
path: root/qtruby
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2019-06-01 18:17:20 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2019-06-01 18:17:20 +0900
commit245d13f9d1ecf2d4ab6ab321709e10c8c261f7a7 (patch)
treec0e496204cda4a895921ccd48320719d0041aa23 /qtruby
parent9055b21d6a4e7da5a959336eec39471b63490ee3 (diff)
downloadtdebindings-245d13f9d1ecf2d4ab6ab321709e10c8c261f7a7.tar.gz
tdebindings-245d13f9d1ecf2d4ab6ab321709e10c8c261f7a7.zip
Adjusted to use new TQStringVariantMap type.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'qtruby')
-rw-r--r--qtruby/ChangeLog4
-rw-r--r--qtruby/rubylib/qtruby/Qt.cpp2
-rw-r--r--qtruby/rubylib/qtruby/handlers.cpp10
3 files changed, 8 insertions, 8 deletions
diff --git a/qtruby/ChangeLog b/qtruby/ChangeLog
index cd9455da..3443e3b3 100644
--- a/qtruby/ChangeLog
+++ b/qtruby/ChangeLog
@@ -1047,12 +1047,12 @@
* The parsing of types passed to slots, (or returned from dcop slots) didn't
work with template types containing commas such as 'TQMap<TQString,TQString>'.
- * Added 'TQMap<TQString,TQString>&' and 'TQMap<TQString,TQVariant>&' to the
+ * Added 'TQMap<TQString,TQString>&' and 'TQStringVariantMap&' to the
handlers.cpp string to marshaller lookup table.
2004-07-26 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
- * Added marshallers for TQMap<TQString,TQString> and TQMap<TQString,TQVariant> to and from ruby hashes
+ * Added marshallers for TQMap<TQString,TQString> and TQStringVariantMap to and from ruby hashes
2004-07-26 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp
index 715110f2..834cc3b2 100644
--- a/qtruby/rubylib/qtruby/Qt.cpp
+++ b/qtruby/rubylib/qtruby/Qt.cpp
@@ -1377,7 +1377,7 @@ static Smoke::Index new_qvariant_qmap = 0;
if (tqstrcmp(argType, "const TQValueList<TQVariant>&" ) == 0) {
new_qvariant_qlist = qt_Smoke->ambiguousMethodList[i];
- } else if (tqstrcmp(argType, "const TQMap<TQString,TQVariant>&" ) == 0) {
+ } else if (tqstrcmp(argType, "const TQStringVariantMap&" ) == 0) {
new_qvariant_qmap = qt_Smoke->ambiguousMethodList[i];
}
diff --git a/qtruby/rubylib/qtruby/handlers.cpp b/qtruby/rubylib/qtruby/handlers.cpp
index fa789e9e..4759e7fc 100644
--- a/qtruby/rubylib/qtruby/handlers.cpp
+++ b/qtruby/rubylib/qtruby/handlers.cpp
@@ -1574,7 +1574,7 @@ void marshall_TQMapTQStringTQVariant(Marshall *m) {
break;
}
- TQMap<TQString,TQVariant> * map = new TQMap<TQString,TQVariant>;
+ TQStringVariantMap * map = new TQStringVariantMap;
// Convert the ruby hash to an array of key/value arrays
VALUE temp = rb_funcall(hash, rb_intern("to_a"), 0);
@@ -1609,7 +1609,7 @@ void marshall_TQMapTQStringTQVariant(Marshall *m) {
break;
case Marshall::ToVALUE:
{
- TQMap<TQString,TQVariant> *map = (TQMap<TQString,TQVariant>*)m->item().s_voidp;
+ TQStringVariantMap *map = (TQStringVariantMap*)m->item().s_voidp;
if(!map) {
*(m->var()) = Qnil;
break;
@@ -1617,7 +1617,7 @@ void marshall_TQMapTQStringTQVariant(Marshall *m) {
VALUE hv = rb_hash_new();
- TQMap<TQString,TQVariant>::Iterator it;
+ TQStringVariantMap::Iterator it;
for (it = map->begin(); it != map->end(); ++it) {
void *p = new TQVariant(it.data());
VALUE obj = getPointerObject(p);
@@ -1942,8 +1942,8 @@ TypeHandler Qt_handlers[] = {
{ "TQCanvasItemList", marshall_TQCanvasItemList },
{ "TQMap<TQString,TQString>", marshall_TQMapTQStringTQString },
{ "TQMap<TQString,TQString>&", marshall_TQMapTQStringTQString },
- { "TQMap<TQString,TQVariant>", marshall_TQMapTQStringTQVariant },
- { "TQMap<TQString,TQVariant>&", marshall_TQMapTQStringTQVariant },
+ { "TQStringVariantMap", marshall_TQMapTQStringTQVariant },
+ { "TQStringVariantMap&", marshall_TQMapTQStringTQVariant },
#if TQT_VERSION >= 0x030200
{ "TQWidgetList", marshall_TQWidgetList },
{ "TQWidgetList*", marshall_TQWidgetList },