TQt4 port basket

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/basket@1232416 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 12 insertions, 12 deletions

diff --git a/kontact_plugin/uniqueapphandler.cpp b/kontact_plugin/uniqueapphandler.cpp
index 29dc888..2f80a86 100644
--- a/kontact_plugin/uniqueapphandler.cpp
+++ b/kontact_plugin/uniqueapphandler.cpp
@@ -82,8 +82,8 @@ int UniqueAppHandler::newInstance()
   return 0;
 }
 
-bool UniqueAppHandler::process( const QCString &fun, const QByteArray &data,
-                                QCString& replyType, QByteArray &replyData )
+bool UniqueAppHandler::process( const TQCString &fun, const TQByteArray &data,
+                                TQCString& replyType, TQByteArray &replyData )
 {
   if ( fun == "newInstance()" ) {
     replyType = "int";
@@ -92,21 +92,21 @@ bool UniqueAppHandler::process( const QCString &fun, const QByteArray &data,
     loadCommandLineOptions();
 
     // This bit is duplicated from KUniqueApplication::processDelayed()
-    QDataStream ds( data, IO_ReadOnly );
+    TQDataStream ds( data, IO_ReadOnly );
     KCmdLineArgs::loadAppArgs( ds );
     if ( !ds.atEnd() ) { // backwards compatibility
-      QCString asn_id;
+      TQCString asn_id;
       ds >> asn_id;
       kapp->setStartupId( asn_id );
     }
 
-    QDataStream _replyStream( replyData, IO_WriteOnly );
+    TQDataStream _replyStream( replyData, IO_WriteOnly );
     _replyStream << newInstance( );
   } else if ( fun == "load()" ) {
     replyType = "bool";
     (void)mPlugin->part(); // load the part without bringing it to front
 
-    QDataStream _replyStream( replyData, IO_WriteOnly );
+    TQDataStream _replyStream( replyData, IO_WriteOnly );
     _replyStream << true;
   } else {
     return DCOPObject::process( fun, data, replyType, replyData );
@@ -130,7 +130,7 @@ QCStringList UniqueAppHandler::functions()
 }
 
 UniqueAppWatcher::UniqueAppWatcher( UniqueAppHandlerFactoryBase* factory, Plugin* plugin )
-    : QObject( plugin ), mFactory( factory ), mPlugin( plugin )
+    : TQObject( plugin ), mFactory( factory ), mPlugin( plugin )
 {
   // The app is running standalone if 1) that name is known to DCOP
   mRunningStandalone = kapp->dcopClient()->isApplicationRegistered( plugin->name() );
@@ -141,8 +141,8 @@ UniqueAppWatcher::UniqueAppWatcher( UniqueAppHandlerFactoryBase* factory, Plugin
 
   if ( mRunningStandalone ) {
     kapp->dcopClient()->setNotifications( true );
-    connect( kapp->dcopClient(), SIGNAL( applicationRemoved( const QCString& ) ),
-             this, SLOT( unregisteredFromDCOP( const QCString& ) ) );
+    connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ),
+             this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
   } else {
     mFactory->createHandler( mPlugin );
   }
@@ -156,11 +156,11 @@ UniqueAppWatcher::~UniqueAppWatcher()
   delete mFactory;
 }
 
-void UniqueAppWatcher::unregisteredFromDCOP( const QCString& appId )
+void UniqueAppWatcher::unregisteredFromDCOP( const TQCString& appId )
 {
   if ( appId == mPlugin->name() && mRunningStandalone ) {
-    disconnect( kapp->dcopClient(), SIGNAL( applicationRemoved( const QCString& ) ),
-                this, SLOT( unregisteredFromDCOP( const QCString& ) ) );
+    disconnect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ),
+                this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
     kdDebug(5601) << k_funcinfo << appId << endl;
     mFactory->createHandler( mPlugin );
     kapp->dcopClient()->setNotifications( false );