From 2366375b23b770db27544720910e6c74093db638 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 9 Jun 2012 20:12:21 -0500
Subject: Use tqtinterface-provided values for DCOP text types This resolves
 Bug 994

---
 dcop/testdcop.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'dcop/testdcop.cpp')

diff --git a/dcop/testdcop.cpp b/dcop/testdcop.cpp
index 0de10d1cd..5e4cd00c7 100644
--- a/dcop/testdcop.cpp
+++ b/dcop/testdcop.cpp
@@ -57,7 +57,7 @@ bool MyDCOPObject::process(const TQCString &fun, const TQByteArray &data,
 
     printf("Rect x = %d, y = %d, w = %d, h = %d\n", arg1.x(), arg1.y(), arg1.width(), arg1.height());
 
-    replyType = "TQRect";
+    replyType = TQRECT_OBJECT_NAME_STRING;
     TQDataStream reply( replyData, IO_WriteOnly );
     TQRect r(10,20,100,200);
     reply << r;
@@ -74,7 +74,7 @@ bool MyDCOPObject::process(const TQCString &fun, const TQByteArray &data,
 tqDebug("countDown() countDownAction = %p", countDownAction);
     if (countDownAction2)
     {
-       replyType = "TQString";
+       replyType = TQSTRING_OBJECT_NAME_STRING;
        TQDataStream reply( replyData, IO_WriteOnly );
        reply << TQString("Hey");
        return true;
@@ -104,7 +104,7 @@ void MyDCOPObject::slotTimeout()
   countDownCount--;
   if (countDownCount == 0)
   {
-     TQCString replyType = "TQString";
+     TQCString replyType = TQSTRING_OBJECT_NAME_STRING;
      TQByteArray replyData;
      TQDataStream reply( replyData, IO_WriteOnly );
      reply << TQString("Hello World");
@@ -123,7 +123,7 @@ void MyDCOPObject::slotTimeout2()
   countDownCount2--;
   if (countDownCount2 == 0)
   {
-     TQCString replyType = "TQString";
+     TQCString replyType = TQSTRING_OBJECT_NAME_STRING;
      TQByteArray replyData;
      TQDataStream reply( replyData, IO_WriteOnly );
      reply << TQString("Hello World");
@@ -139,7 +139,7 @@ void MyDCOPObject::slotTimeout2()
 QCStringList MyDCOPObject::functions()
 {
    QCStringList result = DCOPObject::functions();
-   result << "TQRect canLaunchRockets(TQRect)";
+   result << TQRECT_OBJECT_NAME_STRING " canLaunchRockets(" TQRECT_OBJECT_NAME_STRING ")";
    return result;
 }
 
-- 
cgit v1.2.1