From 41f63196dd0642327c581dc22e0c206b35a22cb7 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 (cherry picked from commit 8dac8f1a52cf3a2983af451aff69ca268cfbd6d7) --- kompare/tests/diff/edm.diff | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kompare/tests/diff/edm.diff') 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"; -- cgit v1.2.3