diff options
Diffstat (limited to 'kompare/tests/diff/unifiedm.diff')
| -rw-r--r-- | kompare/tests/diff/unifiedm.diff | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kompare/tests/diff/unifiedm.diff b/kompare/tests/diff/unifiedm.diff index 1b62d739..49aff880 100644 --- a/kompare/tests/diff/unifiedm.diff +++ b/kompare/tests/diff/unifiedm.diff @@ -702,7 +702,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp -void marshall(QDataStream &arg, int argc, char **argv, int &i, QString type) +void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) { -- if (type == TQSTRINGLIST_OBJECT_NAME_STRING) +- if (type == "TQStringList") - type = "QValueList<QString>"; - if (type == "QCStringList") - type = "QValueList<QCString>"; @@ -735,13 +735,13 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp - arg << s.toDouble(); - else if ( type == "bool" ) - arg << mkBool( s ); -- else if ( type == TQSTRING_OBJECT_NAME_STRING ) +- else if ( type == "TQString" ) - arg << s; - else if ( type == "QCString" ) - arg << QCString( argv[i] ); - else if ( type == "QColor" ) - arg << mkColor( s ); -- else if ( type == TQPOINT_OBJECT_NAME_STRING ) +- else if ( type == "TQPoint" ) - arg << mkPoint( s ); - else if ( type == "QSize" ) - arg << mkSize( s ); @@ -773,7 +773,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp - i++; - QByteArray dummy_data; - QDataStream dummy_arg(dummy_data, IO_WriteOnly); -+ if (type == TQSTRINGLIST_OBJECT_NAME_STRING) ++ if (type == "TQStringList") + type = "QValueList<QString>"; + if (type == "QCStringList") + type = "QValueList<QCString>"; @@ -834,13 +834,13 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp + arg << s.toDouble(); + else if ( type == "bool" ) + arg << mkBool( s ); -+ else if ( type == TQSTRING_OBJECT_NAME_STRING ) ++ else if ( type == "TQString" ) + arg << s; + else if ( type == "QCString" ) + arg << QCString( args[ i ] ); + else if ( type == "QColor" ) + arg << mkColor( s ); -+ else if ( type == TQPOINT_OBJECT_NAME_STRING ) ++ else if ( type == "TQPoint" ) + arg << mkPoint( s ); + else if ( type == "QSize" ) + arg << mkSize( s ); |