diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-07-12 11:34:47 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-07-13 10:04:55 +0900 |
| commit | 41f63196dd0642327c581dc22e0c206b35a22cb7 (patch) | |
| tree | 6cdadc0b9a2cbb418848ecb32c289a8c7f7624db /kompare/tests/cvsdiff/unifiedm.diff | |
| parent | 365f31354bad56db26993380120a4d5e26fc133d (diff) | |
| download | tdesdk-41f63196dd0642327c581dc22e0c206b35a22cb7.tar.gz tdesdk-41f63196dd0642327c581dc22e0c206b35a22cb7.zip | |
Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 8dac8f1a52cf3a2983af451aff69ca268cfbd6d7)
Diffstat (limited to 'kompare/tests/cvsdiff/unifiedm.diff')
| -rw-r--r-- | kompare/tests/cvsdiff/unifiedm.diff | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kompare/tests/cvsdiff/unifiedm.diff b/kompare/tests/cvsdiff/unifiedm.diff index b7a319f5..356a7f52 100644 --- a/kompare/tests/cvsdiff/unifiedm.diff +++ b/kompare/tests/cvsdiff/unifiedm.diff @@ -715,7 +715,7 @@ diff -u -r1.3 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>"; @@ -748,13 +748,13 @@ diff -u -r1.3 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 ); @@ -786,7 +786,7 @@ diff -u -r1.3 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>"; @@ -847,13 +847,13 @@ diff -u -r1.3 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 ); |