summaryrefslogtreecommitdiffstats
path: root/kompare/tests/cvsdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kompare/tests/cvsdiff')
-rw-r--r--kompare/tests/cvsdiff/contextm.diff12
-rw-r--r--kompare/tests/cvsdiff/edm.diff6
-rw-r--r--kompare/tests/cvsdiff/normalm.diff12
-rw-r--r--kompare/tests/cvsdiff/rcsm.diff6
-rw-r--r--kompare/tests/cvsdiff/unifiedm.diff12
5 files changed, 24 insertions, 24 deletions
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<QString>";
! if (type == "QCStringList")
! type = "QValueList<QCString>";
@@ -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<QString>";
! if (type == "QCStringList")
! type = "QValueList<QCString>";
@@ -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<QString>";
if (type == "QCStringList")
type = "QValueList<QCString>";
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<QString>";
< if (type == "QCStringList")
< type = "QValueList<QCString>";
@@ -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<QString>";
> if (type == "QCStringList")
> type = "QValueList<QCString>";
@@ -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<QString>";
if (type == "QCStringList")
type = "QValueList<QCString>";
@@ -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<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 );
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-22 23:21:01 +0000