diff options
| author | Mavridis Philippe <mavridisf@gmail.com> | 2022-05-20 13:22:09 +0300 |
|---|---|---|
| committer | Mavridis Philippe <mavridisf@gmail.com> | 2022-05-21 11:49:52 +0300 |
| commit | d8e8ebd5643d43f99b71103b20681f53cabc1a84 (patch) | |
| tree | 325c71630a413c3ae8e0a2f69bd243fd3093ee08 | |
| parent | 2c68d7b03e7fe783039dd5858f41cdc6d8090ecb (diff) | |
| download | tdelibs-d8e8ebd5643d43f99b71103b20681f53cabc1a84.tar.gz tdelibs-d8e8ebd5643d43f99b71103b20681f53cabc1a84.zip | |
dcopclient: Fixed TQMap/TQValueList display.
This fixes issue #166.
Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
(cherry picked from commit 46435f6c1c319a2c86a00dd2f4d03553901e7487)
| -rw-r--r-- | dcop/client/marshall.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/dcop/client/marshall.cpp b/dcop/client/marshall.cpp index 4099528f3..b9199531a 100644 --- a/dcop/client/marshall.cpp +++ b/dcop/client/marshall.cpp @@ -203,12 +203,12 @@ TQCString demarshal( TQDataStream &stream, const TQString &type ) KURL r; stream >> r; 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; - TQString nestedType = type.mid( 11, type.length() - 12 ); + TQString nestedType = type.mid( 12, type.length() - 13 ); if ( nestedType.isEmpty() ) return result; @@ -225,9 +225,9 @@ TQCString demarshal( TQDataStream &stream, const TQString &type ) if ( i < count - 1 ) 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 ) return result; @@ -235,7 +235,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type ) if ( (uint)type.find( '>', commaPos ) != type.length() - 1 ) 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 ); TQ_UINT32 count; |