1 files changed, 16 insertions, 16 deletions

diff --git a/dcop/testdcop.cpp b/dcop/testdcop.cpp
index 1e70171d2..583a0255b 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_OBJECT_NAME_STRING;
+    replyType = "TQRect";
     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_OBJECT_NAME_STRING;
+       replyType = "TQString";
        TQDataStream reply( replyData, IO_WriteOnly );
        reply << TQString("Hey");
        return true;
@@ -84,13 +84,13 @@ tqDebug("countDown() countDownAction = %p", countDownAction);
     {
        countDownCount = 10;       
        countDownAction = client->beginTransaction();
-       TQTimer::singleShot(1000, this, TQT_SLOT(slotTimeout()));
+       TQTimer::singleShot(1000, this, TQ_SLOT(slotTimeout()));
     }
     else
     {
        countDownCount2 = 10;       
        countDownAction2 = client->beginTransaction();
-       TQTimer::singleShot(1000, this, TQT_SLOT(slotTimeout2()));
+       TQTimer::singleShot(1000, this, TQ_SLOT(slotTimeout2()));
     }
     return true;
   }
@@ -104,7 +104,7 @@ void MyDCOPObject::slotTimeout()
   countDownCount--;
   if (countDownCount == 0)
   {
-     TQCString replyType = TQSTRING_OBJECT_NAME_STRING;
+     TQCString replyType = "TQString";
      TQByteArray replyData;
      TQDataStream reply( replyData, IO_WriteOnly );
      reply << TQString("Hello World");
@@ -113,7 +113,7 @@ void MyDCOPObject::slotTimeout()
   }
   else
   {
-     TQTimer::singleShot(1000, this, TQT_SLOT(slotTimeout()));
+     TQTimer::singleShot(1000, this, TQ_SLOT(slotTimeout()));
   }
 }
 
@@ -123,7 +123,7 @@ void MyDCOPObject::slotTimeout2()
   countDownCount2--;
   if (countDownCount2 == 0)
   {
-     TQCString replyType = TQSTRING_OBJECT_NAME_STRING;
+     TQCString replyType = "TQString";
      TQByteArray replyData;
      TQDataStream reply( replyData, IO_WriteOnly );
      reply << TQString("Hello World");
@@ -132,21 +132,21 @@ void MyDCOPObject::slotTimeout2()
   }
   else
   {
-     TQTimer::singleShot(1000, this, TQT_SLOT(slotTimeout2()));
+     TQTimer::singleShot(1000, this, TQ_SLOT(slotTimeout2()));
   }
 }
 
 QCStringList MyDCOPObject::functions()
 {
    QCStringList result = DCOPObject::functions();
-   result << TQRECT_OBJECT_NAME_STRING " canLaunchRockets(" TQRECT_OBJECT_NAME_STRING ")";
+   result << "TQRect canLaunchRockets(TQRect)";
    return result;
 }
 
 TestObject::TestObject(const TQCString& app)
  :  m_app(app)
 {
-   TQTimer::singleShot(2500, this, TQT_SLOT(slotTimeout()));
+   TQTimer::singleShot(2500, this, TQ_SLOT(slotTimeout()));
 }
 
 void TestObject::slotTimeout()
@@ -191,10 +191,10 @@ int main(int argc, char **argv)
       TQCString appId = argv[1];
       TestObject obj(appId);
       tqWarning("#1 Calling countDown");
-      int result = client->callAsync(appId, "object1", "countDown()", data, &obj, TQT_SLOT(slotCallBack(int, const TQCString&, const TQByteArray&)));
+      int result = client->callAsync(appId, "object1", "countDown()", data, &obj, TQ_SLOT(slotCallBack(int, const TQCString&, const TQByteArray&)));
       tqDebug("#1 countDown() call id = %d", result);
       tqWarning("#2 Calling countDown");
-      result = client->callAsync(appId, "object1", "countDown()", data, &obj, TQT_SLOT(slotCallBack(int, const TQCString&, const TQByteArray&)));
+      result = client->callAsync(appId, "object1", "countDown()", data, &obj, TQ_SLOT(slotCallBack(int, const TQCString&, const TQByteArray&)));
       tqDebug("#2 countDown() call id = %d", result);
       app.exec();
 
@@ -234,11 +234,11 @@ int main(int argc, char **argv)
   int n = client->registeredApplications().count();
   tqDebug("number of attached applications = %d", n );
 
-  TQObject::connect( client, TQT_SIGNAL( applicationRegistered( const TQCString&)),
-                    obj1, TQT_SLOT( registered( const TQCString& )));
+  TQObject::connect( client, TQ_SIGNAL( applicationRegistered( const TQCString&)),
+                    obj1, TQ_SLOT( registered( const TQCString& )));
 
-  TQObject::connect( client, TQT_SIGNAL( applicationRemoved( const TQCString&)),
-                    obj1, TQT_SLOT( unregistered( const TQCString& )));
+  TQObject::connect( client, TQ_SIGNAL( applicationRemoved( const TQCString&)),
+                    obj1, TQ_SLOT( unregistered( const TQCString& )));
 
   // Enable the above signals
   client->setNotifications( true );