From 8dac8f1a52cf3a2983af451aff69ca268cfbd6d7 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 12 Jul 2023 11:34:47 +0900 Subject: Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3. Signed-off-by: Michele Calgaro --- kompare/tests/cvsdiff/contextm.diff | 12 ++++++------ kompare/tests/cvsdiff/edm.diff | 6 +++--- kompare/tests/cvsdiff/normalm.diff | 12 ++++++------ kompare/tests/cvsdiff/rcsm.diff | 6 +++--- kompare/tests/cvsdiff/unifiedm.diff | 12 ++++++------ kompare/tests/diff/contextm.diff | 12 ++++++------ kompare/tests/diff/edm.diff | 6 +++--- kompare/tests/diff/normalm.diff | 12 ++++++------ kompare/tests/diff/rcsm.diff | 6 +++--- kompare/tests/diff/unifiedm.diff | 12 ++++++------ 10 files changed, 48 insertions(+), 48 deletions(-) (limited to 'kompare') diff --git a/kompare/tests/cvsdiff/contextm.diff b/kompare/tests/cvsdiff/contextm.diff index ad3a9132..436f926b 100644 --- a/kompare/tests/cvsdiff/contextm.diff +++ b/kompare/tests/cvsdiff/contextm.diff @@ -827,7 +827,7 @@ diff -c -r1.3 marshall.cpp ! void marshall(QDataStream &arg, int argc, char **argv, int &i, QString type) { -! if (type == TQSTRINGLIST_OBJECT_NAME_STRING) +! if (type == "TQStringList") ! type = "QValueList"; ! if (type == "QCStringList") ! type = "QValueList"; @@ -860,13 +860,13 @@ diff -c -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 ); @@ -936,7 +936,7 @@ diff -c -r1.3 marshall.cpp ! void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) { -! if (type == TQSTRINGLIST_OBJECT_NAME_STRING) +! if (type == "TQStringList") ! type = "QValueList"; ! if (type == "QCStringList") ! type = "QValueList"; @@ -969,13 +969,13 @@ diff -c -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 ); diff --git a/kompare/tests/cvsdiff/edm.diff b/kompare/tests/cvsdiff/edm.diff index a88ddde7..f1c582cb 100644 --- a/kompare/tests/cvsdiff/edm.diff +++ b/kompare/tests/cvsdiff/edm.diff @@ -636,13 +636,13 @@ diff -e -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 ); @@ -673,7 +673,7 @@ diff -e -r1.3 marshall.cpp delim = ")"; . 247,317c - if (type == TQSTRINGLIST_OBJECT_NAME_STRING) + if (type == "TQStringList") type = "QValueList"; if (type == "QCStringList") type = "QValueList"; diff --git a/kompare/tests/cvsdiff/normalm.diff b/kompare/tests/cvsdiff/normalm.diff index 6a62dbb5..cca2cd9a 100644 --- a/kompare/tests/cvsdiff/normalm.diff +++ b/kompare/tests/cvsdiff/normalm.diff @@ -651,7 +651,7 @@ diff -r1.3 marshall.cpp --- > void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) 247,317c247,256 -< if (type == TQSTRINGLIST_OBJECT_NAME_STRING) +< if (type == "TQStringList") < type = "QValueList"; < if (type == "QCStringList") < type = "QValueList"; @@ -684,13 +684,13 @@ diff -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 ); @@ -723,7 +723,7 @@ diff -r1.3 marshall.cpp < QByteArray dummy_data; < QDataStream dummy_arg(dummy_data, IO_WriteOnly); --- -> if (type == TQSTRINGLIST_OBJECT_NAME_STRING) +> if (type == "TQStringList") > type = "QValueList"; > if (type == "QCStringList") > type = "QValueList"; @@ -785,13 +785,13 @@ diff -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 ); diff --git a/kompare/tests/cvsdiff/rcsm.diff b/kompare/tests/cvsdiff/rcsm.diff index 3f4884d5..5ffc4d4f 100644 --- a/kompare/tests/cvsdiff/rcsm.diff +++ b/kompare/tests/cvsdiff/rcsm.diff @@ -573,7 +573,7 @@ a245 1 void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) d247 71 a317 10 - if (type == TQSTRINGLIST_OBJECT_NAME_STRING) + if (type == "TQStringList") type = "QValueList"; if (type == "QCStringList") type = "QValueList"; @@ -607,13 +607,13 @@ a346 57 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 ); 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"; - if (type == "QCStringList") - type = "QValueList"; @@ -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"; + if (type == "QCStringList") + type = "QValueList"; @@ -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 ); diff --git a/kompare/tests/diff/contextm.diff b/kompare/tests/diff/contextm.diff index 5607c94a..2f0fd151 100644 --- a/kompare/tests/diff/contextm.diff +++ b/kompare/tests/diff/contextm.diff @@ -813,7 +813,7 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp ! void marshall(QDataStream &arg, int argc, char **argv, int &i, QString type) { -! if (type == TQSTRINGLIST_OBJECT_NAME_STRING) +! if (type == "TQStringList") ! type = "QValueList"; ! if (type == "QCStringList") ! type = "QValueList"; @@ -846,13 +846,13 @@ diff -cr 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 ); @@ -922,7 +922,7 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp ! void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) { -! if (type == TQSTRINGLIST_OBJECT_NAME_STRING) +! if (type == "TQStringList") ! type = "QValueList"; ! if (type == "QCStringList") ! type = "QValueList"; @@ -955,13 +955,13 @@ diff -cr 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 ); diff --git a/kompare/tests/diff/edm.diff b/kompare/tests/diff/edm.diff index 44489e8d..45d559cc 100644 --- a/kompare/tests/diff/edm.diff +++ b/kompare/tests/diff/edm.diff @@ -623,13 +623,13 @@ diff -er 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 ); @@ -660,7 +660,7 @@ diff -er dcop/client/marshall.cpp dcop2/client/marshall.cpp delim = ")"; . 247,317c - if (type == TQSTRINGLIST_OBJECT_NAME_STRING) + if (type == "TQStringList") type = "QValueList"; if (type == "QCStringList") type = "QValueList"; diff --git a/kompare/tests/diff/normalm.diff b/kompare/tests/diff/normalm.diff index 38676f0e..0344923a 100644 --- a/kompare/tests/diff/normalm.diff +++ b/kompare/tests/diff/normalm.diff @@ -639,7 +639,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp --- > void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) 247,317c247,256 -< if (type == TQSTRINGLIST_OBJECT_NAME_STRING) +< if (type == "TQStringList") < type = "QValueList"; < if (type == "QCStringList") < type = "QValueList"; @@ -672,13 +672,13 @@ diff -r 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 ); @@ -711,7 +711,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp < QByteArray dummy_data; < QDataStream dummy_arg(dummy_data, IO_WriteOnly); --- -> if (type == TQSTRINGLIST_OBJECT_NAME_STRING) +> if (type == "TQStringList") > type = "QValueList"; > if (type == "QCStringList") > type = "QValueList"; @@ -773,13 +773,13 @@ diff -r 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 ); diff --git a/kompare/tests/diff/rcsm.diff b/kompare/tests/diff/rcsm.diff index 588fd7f1..e64fc43f 100644 --- a/kompare/tests/diff/rcsm.diff +++ b/kompare/tests/diff/rcsm.diff @@ -561,7 +561,7 @@ a245 1 void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) d247 71 a317 10 - if (type == TQSTRINGLIST_OBJECT_NAME_STRING) + if (type == "TQStringList") type = "QValueList"; if (type == "QCStringList") type = "QValueList"; @@ -595,13 +595,13 @@ a346 57 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 ); 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"; - if (type == "QCStringList") - type = "QValueList"; @@ -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"; + if (type == "QCStringList") + type = "QValueList"; @@ -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 ); -- cgit v1.2.1