|
|
@ -203,12 +203,12 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
|
|
|
|
KURL r;
|
|
|
|
KURL r;
|
|
|
|
stream >> r;
|
|
|
|
stream >> r;
|
|
|
|
result = r.url().local8Bit();
|
|
|
|
result = r.url().local8Bit();
|
|
|
|
} else if ( type.left( 11 ) == TQVALUELIST_OBJECT_NAME_STRING "<" )
|
|
|
|
} else if ( type.left( 12 ) == TQVALUELIST_OBJECT_NAME_STRING "<" )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if ( (uint)type.find( '>', 11 ) != type.length() - 1 )
|
|
|
|
if ( (uint)type.find( '>', 12 ) != type.length() - 1 )
|
|
|
|
return result;
|
|
|
|
return result;
|
|
|
|
|
|
|
|
|
|
|
|
TQString nestedType = type.mid( 11, type.length() - 12 );
|
|
|
|
TQString nestedType = type.mid( 12, type.length() - 13 );
|
|
|
|
|
|
|
|
|
|
|
|
if ( nestedType.isEmpty() )
|
|
|
|
if ( nestedType.isEmpty() )
|
|
|
|
return result;
|
|
|
|
return result;
|
|
|
@ -225,9 +225,9 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
|
|
|
|
if ( i < count - 1 )
|
|
|
|
if ( i < count - 1 )
|
|
|
|
result += '\n';
|
|
|
|
result += '\n';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if ( type.left( 5 ) == TQMAP_OBJECT_NAME_STRING "<" )
|
|
|
|
} else if ( type.left( 6 ) == TQMAP_OBJECT_NAME_STRING "<" )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
int commaPos = type.find( ',', 5 );
|
|
|
|
int commaPos = type.find( ',', 6 );
|
|
|
|
|
|
|
|
|
|
|
|
if ( commaPos == -1 )
|
|
|
|
if ( commaPos == -1 )
|
|
|
|
return result;
|
|
|
|
return result;
|
|
|
@ -235,7 +235,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
|
|
|
|
if ( (uint)type.find( '>', commaPos ) != type.length() - 1 )
|
|
|
|
if ( (uint)type.find( '>', commaPos ) != type.length() - 1 )
|
|
|
|
return result;
|
|
|
|
return result;
|
|
|
|
|
|
|
|
|
|
|
|
TQString keyType = type.mid( 5, commaPos - 5 );
|
|
|
|
TQString keyType = type.mid( 6, commaPos - 6 );
|
|
|
|
TQString valueType = type.mid( commaPos + 1, type.length() - commaPos - 2 );
|
|
|
|
TQString valueType = type.mid( commaPos + 1, type.length() - commaPos - 2 );
|
|
|
|
|
|
|
|
|
|
|
|
TQ_UINT32 count;
|
|
|
|
TQ_UINT32 count;
|
|
|
|