|
|
@ -214,9 +214,9 @@ TQString Query::marshal( const TQVariant &arg )
|
|
|
|
}
|
|
|
|
}
|
|
|
|
case TQVariant::Map: {
|
|
|
|
case TQVariant::Map: {
|
|
|
|
s += "<struct>";
|
|
|
|
s += "<struct>";
|
|
|
|
TQMap<TQString, TQVariant> map = arg.toMap();
|
|
|
|
TQStringVariantMap map = arg.toMap();
|
|
|
|
TQMap<TQString, TQVariant>::ConstIterator it = map.begin();
|
|
|
|
TQStringVariantMap::ConstIterator it = map.begin();
|
|
|
|
TQMap<TQString, TQVariant>::ConstIterator end = map.end();
|
|
|
|
TQStringVariantMap::ConstIterator end = map.end();
|
|
|
|
for ( ; it != end; ++it ) {
|
|
|
|
for ( ; it != end; ++it ) {
|
|
|
|
s += "<member>";
|
|
|
|
s += "<member>";
|
|
|
|
s += "<name>" + it.key() + "</name>";
|
|
|
|
s += "<name>" + it.key() + "</name>";
|
|
|
@ -267,7 +267,7 @@ TQVariant Query::demarshal( const TQDomElement &elem )
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return TQVariant( values );
|
|
|
|
return TQVariant( values );
|
|
|
|
} else if ( typeName == "struct" ) {
|
|
|
|
} else if ( typeName == "struct" ) {
|
|
|
|
TQMap<TQString, TQVariant> map;
|
|
|
|
TQStringVariantMap map;
|
|
|
|
TQDomNode memberNode = typeElement.firstChild();
|
|
|
|
TQDomNode memberNode = typeElement.firstChild();
|
|
|
|
while ( !memberNode.isNull() ) {
|
|
|
|
while ( !memberNode.isNull() ) {
|
|
|
|
const TQString key = memberNode.toElement().elementsByTagName( "name" ).item( 0 ).toElement().text();
|
|
|
|
const TQString key = memberNode.toElement().elementsByTagName( "name" ).item( 0 ).toElement().text();
|
|
|
|