From b0f8eef013163b2098c2bb07e93cb9b194338b80 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 14 Jan 2024 12:33:20 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro (cherry picked from commit 3b3f9ec8f31978030c17309fae48335bea5c1587) --- libkpimexchange/core/exchangemonitor.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'libkpimexchange/core/exchangemonitor.cpp') diff --git a/libkpimexchange/core/exchangemonitor.cpp b/libkpimexchange/core/exchangemonitor.cpp index df52fdabd..aadfb7c86 100644 --- a/libkpimexchange/core/exchangemonitor.cpp +++ b/libkpimexchange/core/exchangemonitor.cpp @@ -94,7 +94,7 @@ ExchangeMonitor::ExchangeMonitor( ExchangeAccount* account, int pollMode, const kdDebug() << "bind() returned false" << endl; mSocket->setBlocking( false ); mNotifier = new TQSocketNotifier( mSocket->socket(), TQSocketNotifier::Read ); - connect( mNotifier, TQT_SIGNAL(activated( int )), this, TQT_SLOT( slotActivated(int))); + connect( mNotifier, TQ_SIGNAL(activated( int )), this, TQ_SLOT( slotActivated(int))); //mSocket.setSocketFlags( KExtendedSocket::inetSocket | KExtendedSocket::passiveSocket | KExtendedSocket::datagramSocket | KExtendedSocket::bufferedSocket ); //mSocket.setHost( "jupiter.tbm.tudelft.nl" ); // Does this work? @@ -110,12 +110,12 @@ ExchangeMonitor::ExchangeMonitor( ExchangeAccount* account, int pollMode, const if ( mPollMode == Poll ) { mPollTimer = new TQTimer( this, "mPollTimer" ); - connect( mPollTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotPollTimer()) ); + connect( mPollTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotPollTimer()) ); mPollTimer->start( 60000 ); // 1 minute timer } mRenewTimer = new TQTimer( this, "mRenewTimer" ); - connect( mRenewTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRenewTimer()) ); + connect( mRenewTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRenewTimer()) ); mRenewTimer->start( mSubscriptionLifetime * 900 ); // 10% early so as to be in time } @@ -133,7 +133,7 @@ ExchangeMonitor::~ExchangeMonitor() job->addMetaData( "customHTTPHeader", headers ); // Can't do, this is a destructor! // job->addMetaData( "PropagateHttpHeader", "true" ); - // connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotUnsubscribeResult(TDEIO::Job *))); + // connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotUnsubscribeResult(TDEIO::Job *))); } kdDebug() << "Finished ExchangeMonitor destructor" << endl; @@ -161,7 +161,7 @@ void ExchangeMonitor::addWatch( const KURL &url, int mode, int depth ) TDEIO::DavJob *job = new TDEIO::DavJob( myURL, (int) TDEIO::DAV_SUBSCRIBE, TQString(), false ); job->addMetaData( "customHTTPHeader", headers ); job->addMetaData( "PropagateHttpHeader", "true" ); - connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotSubscribeResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotSubscribeResult(TDEIO::Job *))); } void ExchangeMonitor::removeWatch( const KURL &url ) @@ -182,7 +182,7 @@ void ExchangeMonitor::removeWatch( ID id ) TDEIO::DavJob *job = new TDEIO::DavJob( mAccount->calendarURL(), (int) TDEIO::DAV_UNSUBSCRIBE, TQString(), false ); job->addMetaData( "customHTTPHeader", "Subscription-id: " + TQString::number( id )); job->addMetaData( "PropagateHttpHeader", "true" ); - connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotUnsubscribeResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotUnsubscribeResult(TDEIO::Job *))); } void ExchangeMonitor::slotSubscribeResult( TDEIO::Job * job ) @@ -323,7 +323,7 @@ void ExchangeMonitor::poll( const IDList& IDs ) { // confirm it TDEIO::DavJob *job = new TDEIO::DavJob( mAccount->calendarURL(), (int) TDEIO::DAV_POLL, TQString(), false ); job->addMetaData( "customHTTPHeader", "Subscription-ID: " + makeIDString( IDs ) ); - connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotPollResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotPollResult(TDEIO::Job *))); } void ExchangeMonitor::slotPollResult( TDEIO::Job * job ) @@ -368,7 +368,7 @@ void ExchangeMonitor::slotRenewTimer() TDEIO::DavJob *job = new TDEIO::DavJob( mAccount->calendarURL(), (int) TDEIO::DAV_SUBSCRIBE, TQString(), false ); job->addMetaData( "customHTTPHeader", "Subscription-id: " + makeIDString( mSubscriptionMap.keys() ) ); - connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotRenewResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotRenewResult(TDEIO::Job *))); } void ExchangeMonitor::slotRenewResult( TDEIO::Job* job ) -- cgit v1.2.1