diff options
Diffstat (limited to 'libkpimexchange/core')
-rw-r--r-- | libkpimexchange/core/README.download | 4 | ||||
-rw-r--r-- | libkpimexchange/core/exchangeaccount.cpp | 4 | ||||
-rw-r--r-- | libkpimexchange/core/exchangeaccount.h | 4 | ||||
-rw-r--r-- | libkpimexchange/core/exchangeclient.cpp | 44 | ||||
-rw-r--r-- | libkpimexchange/core/exchangeclient.h | 4 | ||||
-rw-r--r-- | libkpimexchange/core/exchangedelete.cpp | 4 | ||||
-rw-r--r-- | libkpimexchange/core/exchangedelete.h | 4 | ||||
-rw-r--r-- | libkpimexchange/core/exchangedownload.cpp | 40 | ||||
-rw-r--r-- | libkpimexchange/core/exchangedownload.h | 2 | ||||
-rw-r--r-- | libkpimexchange/core/exchangemonitor.cpp | 16 | ||||
-rw-r--r-- | libkpimexchange/core/exchangemonitor.h | 2 | ||||
-rw-r--r-- | libkpimexchange/core/exchangeprogress.h | 2 | ||||
-rw-r--r-- | libkpimexchange/core/exchangeupload.cpp | 20 | ||||
-rw-r--r-- | libkpimexchange/core/exchangeupload.h | 4 |
14 files changed, 77 insertions, 77 deletions
diff --git a/libkpimexchange/core/README.download b/libkpimexchange/core/README.download index 07540db8..34f3c528 100644 --- a/libkpimexchange/core/README.download +++ b/libkpimexchange/core/README.download @@ -10,12 +10,12 @@ NOTES: It uses internal state member variables and such. DATA STRUCTURES: -QMap<QString,int> m_uids is in fact a set of known uids telling us +QMap<TQString,int> m_uids is in fact a set of known uids telling us whether we're already busy or finished reading the Master event for this UID. The map contains the UID as key, with a value of 1, if UID is either being or finished downloading. -QMap<QString,DwString *> m_transferJobs maps URLs being downloaded +QMap<TQString,DwString *> m_transferJobs maps URLs being downloaded to strings of data already received. A URL is removed from the map if all data has been received diff --git a/libkpimexchange/core/exchangeaccount.cpp b/libkpimexchange/core/exchangeaccount.cpp index a033b6b0..9c801328 100644 --- a/libkpimexchange/core/exchangeaccount.cpp +++ b/libkpimexchange/core/exchangeaccount.cpp @@ -239,8 +239,8 @@ void ExchangeAccount::calcFolderURLs() TDEIO::DavJob* job = TDEIO::davPropFind( baseURL(), doc, "1", false ); job->addMetaData( "errorPage", "false" ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotFolderResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotFolderResult( TDEIO::Job * ) ) ); } void ExchangeAccount::slotFolderResult( TDEIO::Job *job ) diff --git a/libkpimexchange/core/exchangeaccount.h b/libkpimexchange/core/exchangeaccount.h index 9cd0f576..4c1a7df8 100644 --- a/libkpimexchange/core/exchangeaccount.h +++ b/libkpimexchange/core/exchangeaccount.h @@ -32,9 +32,9 @@ namespace KPIM { -class KDE_EXPORT ExchangeAccount : public TQObject +class TDE_EXPORT ExchangeAccount : public TQObject { - Q_OBJECT + TQ_OBJECT public: ExchangeAccount( const TQString &host, const TQString &port, diff --git a/libkpimexchange/core/exchangeclient.cpp b/libkpimexchange/core/exchangeclient.cpp index 5658c707..c3fdd380 100644 --- a/libkpimexchange/core/exchangeclient.cpp +++ b/libkpimexchange/core/exchangeclient.cpp @@ -131,8 +131,8 @@ void ExchangeClient::download( KCal::Calendar *calendar, const TQDate &start, ExchangeDownload *worker = new ExchangeDownload( mAccount, mWindow ); worker->download( calendar, start, end, showProgress ); connect( worker, - TQT_SIGNAL( finished( ExchangeDownload *, int, const TQString & ) ), - TQT_SLOT( slotDownloadFinished( ExchangeDownload *, int, + TQ_SIGNAL( finished( ExchangeDownload *, int, const TQString & ) ), + TQ_SLOT( slotDownloadFinished( ExchangeDownload *, int, const TQString & ) ) ); } @@ -149,11 +149,11 @@ void ExchangeClient::download( const TQDate &start, const TQDate &end, ExchangeDownload *worker = new ExchangeDownload( mAccount, mWindow ); worker->download( start, end, showProgress ); connect( worker, - TQT_SIGNAL( finished( ExchangeDownload *, int, const TQString & ) ), - TQT_SLOT( slotDownloadFinished( ExchangeDownload *, int, + TQ_SIGNAL( finished( ExchangeDownload *, int, const TQString & ) ), + TQ_SLOT( slotDownloadFinished( ExchangeDownload *, int, const TQString & ) ) ); - connect( worker, TQT_SIGNAL( gotEvent( KCal::Event *, const KURL & ) ), - TQT_SIGNAL( event( KCal::Event *, const KURL & ) ) ); + connect( worker, TQ_SIGNAL( gotEvent( KCal::Event *, const KURL & ) ), + TQ_SIGNAL( event( KCal::Event *, const KURL & ) ) ); } void ExchangeClient::upload( KCal::Event *event ) @@ -167,8 +167,8 @@ void ExchangeClient::upload( KCal::Event *event ) ExchangeUpload *worker = new ExchangeUpload( event, mAccount, mTimeZoneId, mWindow ); - connect( worker, TQT_SIGNAL( finished( ExchangeUpload *, int, const TQString & ) ), - TQT_SLOT( slotUploadFinished( ExchangeUpload *, int, const TQString & ) ) ); + connect( worker, TQ_SIGNAL( finished( ExchangeUpload *, int, const TQString & ) ), + TQ_SLOT( slotUploadFinished( ExchangeUpload *, int, const TQString & ) ) ); } void ExchangeClient::remove( KCal::Event *event ) @@ -179,8 +179,8 @@ void ExchangeClient::remove( KCal::Event *event ) } ExchangeDelete *worker = new ExchangeDelete( event, mAccount, mWindow ); - connect( worker, TQT_SIGNAL( finished( ExchangeDelete *, int, const TQString & ) ), - TQT_SLOT( slotRemoveFinished( ExchangeDelete *, int, const TQString & ) ) ); + connect( worker, TQ_SIGNAL( finished( ExchangeDelete *, int, const TQString & ) ), + TQ_SLOT( slotRemoveFinished( ExchangeDelete *, int, const TQString & ) ) ); } void ExchangeClient::slotDownloadFinished( ExchangeDownload *worker, @@ -217,8 +217,8 @@ int ExchangeClient::downloadSynchronous( KCal::Calendar *calendar, kdDebug() << "ExchangeClient::downloadSynchronous()" << endl; mClientState = WaitingForResult; - connect( this, TQT_SIGNAL( downloadFinished( int, const TQString & ) ), - TQT_SLOT( slotSyncFinished( int, const TQString & ) ) ); + connect( this, TQ_SIGNAL( downloadFinished( int, const TQString & ) ), + TQ_SLOT( slotSyncFinished( int, const TQString & ) ) ); download( calendar, start, end, showProgress ); @@ -230,8 +230,8 @@ int ExchangeClient::downloadSynchronous( KCal::Calendar *calendar, } while ( mClientState == WaitingForResult ); TQApplication::restoreOverrideCursor(); - disconnect( this, TQT_SIGNAL( downloadFinished( int, const TQString & ) ), - this, TQT_SLOT( slotSyncFinished( int, const TQString & ) ) ); + disconnect( this, TQ_SIGNAL( downloadFinished( int, const TQString & ) ), + this, TQ_SLOT( slotSyncFinished( int, const TQString & ) ) ); return mSyncResult; } @@ -239,8 +239,8 @@ int ExchangeClient::downloadSynchronous( KCal::Calendar *calendar, int ExchangeClient::uploadSynchronous( KCal::Event* event ) { mClientState = WaitingForResult; - connect( this, TQT_SIGNAL( uploadFinished( int, const TQString & ) ), - TQT_SLOT( slotSyncFinished( int, const TQString & ) ) ); + connect( this, TQ_SIGNAL( uploadFinished( int, const TQString & ) ), + TQ_SLOT( slotSyncFinished( int, const TQString & ) ) ); upload( event ); @@ -250,16 +250,16 @@ int ExchangeClient::uploadSynchronous( KCal::Event* event ) tqApp->processEvents(); } while ( mClientState == WaitingForResult ); TQApplication::restoreOverrideCursor(); - disconnect( this, TQT_SIGNAL( uploadFinished( int, const TQString & ) ), - this, TQT_SLOT( slotSyncFinished( int, const TQString & ) ) ); + disconnect( this, TQ_SIGNAL( uploadFinished( int, const TQString & ) ), + this, TQ_SLOT( slotSyncFinished( int, const TQString & ) ) ); return mSyncResult; } int ExchangeClient::removeSynchronous( KCal::Event* event ) { mClientState = WaitingForResult; - connect( this, TQT_SIGNAL( removeFinished( int, const TQString & ) ), - TQT_SLOT( slotSyncFinished( int, const TQString & ) ) ); + connect( this, TQ_SIGNAL( removeFinished( int, const TQString & ) ), + TQ_SLOT( slotSyncFinished( int, const TQString & ) ) ); remove( event ); @@ -269,8 +269,8 @@ int ExchangeClient::removeSynchronous( KCal::Event* event ) tqApp->processEvents(); } while ( mClientState == WaitingForResult ); TQApplication::restoreOverrideCursor(); - disconnect( this, TQT_SIGNAL( removeFinished( int, const TQString & ) ), - this, TQT_SLOT( slotSyncFinished( int, const TQString & ) ) ); + disconnect( this, TQ_SIGNAL( removeFinished( int, const TQString & ) ), + this, TQ_SLOT( slotSyncFinished( int, const TQString & ) ) ); return mSyncResult; } diff --git a/libkpimexchange/core/exchangeclient.h b/libkpimexchange/core/exchangeclient.h index 0feab87e..9ad36f5c 100644 --- a/libkpimexchange/core/exchangeclient.h +++ b/libkpimexchange/core/exchangeclient.h @@ -45,8 +45,8 @@ class ExchangeUpload; class ExchangeDelete; //class ExchangeMonitor; -class KDE_EXPORT ExchangeClient : public TQObject { - Q_OBJECT +class TDE_EXPORT ExchangeClient : public TQObject { + TQ_OBJECT public: ExchangeClient( ExchangeAccount* account, const TQString& mTimeZoneId=TQString() ); diff --git a/libkpimexchange/core/exchangedelete.cpp b/libkpimexchange/core/exchangedelete.cpp index 094b3b5c..d9e8c177 100644 --- a/libkpimexchange/core/exchangedelete.cpp +++ b/libkpimexchange/core/exchangedelete.cpp @@ -74,7 +74,7 @@ void ExchangeDelete::findUidSingleMaster( TQString const& uid ) TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", query, false ); job->setWindow( mWindow ); - connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFindUidResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotFindUidResult(TDEIO::Job *))); } void ExchangeDelete::slotFindUidResult( TDEIO::Job * job ) @@ -104,7 +104,7 @@ void ExchangeDelete::startDelete( const KURL& url ) { TDEIO::SimpleJob* job = TDEIO::file_delete( url, false ); // no GUI job->setWindow( mWindow ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotDeleteResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotDeleteResult( TDEIO::Job * ) ) ); } void ExchangeDelete::slotDeleteResult( TDEIO::Job* job ) diff --git a/libkpimexchange/core/exchangedelete.h b/libkpimexchange/core/exchangedelete.h index f8d8d102..32f2c0cc 100644 --- a/libkpimexchange/core/exchangedelete.h +++ b/libkpimexchange/core/exchangedelete.h @@ -33,8 +33,8 @@ namespace KPIM { class ExchangeAccount; -class KDE_EXPORT ExchangeDelete : public TQObject { - Q_OBJECT +class TDE_EXPORT ExchangeDelete : public TQObject { + TQ_OBJECT public: ExchangeDelete( KCal::Event* event, ExchangeAccount* account, TQWidget* window=0 ); diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp index 58bf236e..55cecd1f 100644 --- a/libkpimexchange/core/exchangedownload.cpp +++ b/libkpimexchange/core/exchangedownload.cpp @@ -92,10 +92,10 @@ void ExchangeDownload::download( KCal::Calendar *calendar, const TQDate &start, mProgress = new ExchangeProgress(); mProgress->show(); - connect( this, TQT_SIGNAL( startDownload() ), mProgress, - TQT_SLOT( slotTransferStarted() ) ); - connect( this, TQT_SIGNAL(finishDownload() ), mProgress, - TQT_SLOT( slotTransferFinished() ) ); + connect( this, TQ_SIGNAL( startDownload() ), mProgress, + TQ_SLOT( slotTransferStarted() ) ); + connect( this, TQ_SIGNAL(finishDownload() ), mProgress, + TQ_SLOT( slotTransferFinished() ) ); #endif } @@ -112,8 +112,8 @@ void ExchangeDownload::download( KCal::Calendar *calendar, const TQDate &start, sql, false ); TDEIO::Scheduler::scheduleJob( job ); job->setWindow( mWindow ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotSearchResult( TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotSearchResult( TDEIO::Job *) ) ); } void ExchangeDownload::download( const TQDate& start, const TQDate& end, bool showProgress ) @@ -126,8 +126,8 @@ void ExchangeDownload::download( const TQDate& start, const TQDate& end, bool sh mProgress = new ExchangeProgress(); mProgress->show(); - connect( this, TQT_SIGNAL(startDownload()), mProgress, TQT_SLOT(slotTransferStarted()) ); - connect( this, TQT_SIGNAL(finishDownload()), mProgress, TQT_SLOT(slotTransferFinished()) ); + connect( this, TQ_SIGNAL(startDownload()), mProgress, TQ_SLOT(slotTransferStarted()) ); + connect( this, TQ_SIGNAL(finishDownload()), mProgress, TQ_SLOT(slotTransferFinished()) ); } TQString sql = dateSelectQuery( start, end.addDays( 1 ) ); @@ -137,8 +137,8 @@ void ExchangeDownload::download( const TQDate& start, const TQDate& end, bool sh TDEIO::DavJob *job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", sql, false ); TDEIO::Scheduler::scheduleJob(job); job->setWindow( mWindow ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotSearchResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotSearchResult( TDEIO::Job * ) ) ); } // Original query TODO: make query configurable @@ -301,8 +301,8 @@ void ExchangeDownload::handleRecurrence( TQString uid ) query, false ); TDEIO::Scheduler::scheduleJob( job ); job->setWindow( mWindow ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotMasterResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotMasterResult( TDEIO::Job * ) ) ); } void ExchangeDownload::readAppointment( const KURL& url ) @@ -349,8 +349,8 @@ void ExchangeDownload::readAppointment( const KURL& url ) TDEIO::Scheduler::scheduleJob( job ); job->setWindow( mWindow ); job->addMetaData( "errorPage", "false" ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotPropFindResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotPropFindResult( TDEIO::Job * ) ) ); } void ExchangeDownload::slotPropFindResult( TDEIO::Job *job ) @@ -401,7 +401,7 @@ void ExchangeDownload::slotPropFindResult( TDEIO::Job *job ) TQString lastModified = prop.namedItem( "lastmodified" ).toElement().text(); if ( !lastModified.isEmpty() ) { - TQDateTime dt = utcAsZone( TQDateTime::fromString( lastModified, Qt::ISODate ), localTimeZoneId ); + TQDateTime dt = utcAsZone( TQDateTime::fromString( lastModified, TQt::ISODate ), localTimeZoneId ); event->setLastModified( dt ); kdDebug() << "Got lastModified:" << lastModified << ", " << dt.toString() << endl; } @@ -436,7 +436,7 @@ void ExchangeDownload::slotPropFindResult( TDEIO::Job *job ) TQString created = prop.namedItem( "created" ).toElement().text(); if ( !created.isEmpty() ) { - TQDateTime dt = utcAsZone( TQDateTime::fromString( created, Qt::ISODate ), + TQDateTime dt = utcAsZone( TQDateTime::fromString( created, TQt::ISODate ), localTimeZoneId ); event->setCreated( dt ); kdDebug() << "got created: " << dt.toString() << endl; @@ -444,7 +444,7 @@ void ExchangeDownload::slotPropFindResult( TDEIO::Job *job ) TQString dtstart = prop.namedItem( "dtstart" ).toElement().text(); if ( !dtstart.isEmpty() ) { - TQDateTime dt = utcAsZone( TQDateTime::fromString( dtstart, Qt::ISODate ), + TQDateTime dt = utcAsZone( TQDateTime::fromString( dtstart, TQt::ISODate ), localTimeZoneId ); event->setDtStart( dt ); kdDebug() << "got dtstart: " << dtstart << " becomes in timezone " << dt.toString() << endl; @@ -457,7 +457,7 @@ void ExchangeDownload::slotPropFindResult( TDEIO::Job *job ) TQString dtend = prop.namedItem( "dtend" ).toElement().text(); if ( !dtend.isEmpty() ) { - TQDateTime dt = utcAsZone( TQDateTime::fromString( dtend, Qt::ISODate ), + TQDateTime dt = utcAsZone( TQDateTime::fromString( dtend, TQt::ISODate ), localTimeZoneId ); // Outlook thinks differently about floating event timing than libkcal if ( floats ) dt = dt.addDays( -1 ); @@ -510,7 +510,7 @@ void ExchangeDownload::slotPropFindResult( TDEIO::Job *job ) list = exdate.elementsByTagNameNS( "xml:", "v" ); for( uint i=0; i < list.count(); i++ ) { TQDomElement item = list.item(i).toElement(); - TQDate date = utcAsZone( TQDateTime::fromString( item.text(), Qt::ISODate ), localTimeZoneId ).date(); + TQDate date = utcAsZone( TQDateTime::fromString( item.text(), TQt::ISODate ), localTimeZoneId ).date(); exdates.append( date ); // kdDebug() << "Got exdate: " << date.toString() << endl; } @@ -582,7 +582,7 @@ void ExchangeDownload::slotPropFindResult( TDEIO::Job *job ) if ( mCalendar ) { KCal::Event *oldEvent = mCalendar->event( event->uid() ); if ( oldEvent ) { - kdWarning() << "Already got his event, replace it..." << endl; + kdWarning() << "Already got the event, replace it..." << endl; mCalendar->deleteEvent( oldEvent ); } kdDebug() << "ADD EVENT" << endl; diff --git a/libkpimexchange/core/exchangedownload.h b/libkpimexchange/core/exchangedownload.h index 931d53bf..f0b1dcdd 100644 --- a/libkpimexchange/core/exchangedownload.h +++ b/libkpimexchange/core/exchangedownload.h @@ -36,7 +36,7 @@ class ExchangeProgress; class ExchangeAccount; class ExchangeDownload : public TQObject { - Q_OBJECT + TQ_OBJECT public: ExchangeDownload( ExchangeAccount* account, TQWidget* window=0 ); diff --git a/libkpimexchange/core/exchangemonitor.cpp b/libkpimexchange/core/exchangemonitor.cpp index df52fdab..aadfb7c8 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 ) diff --git a/libkpimexchange/core/exchangemonitor.h b/libkpimexchange/core/exchangemonitor.h index 3ba96a39..d32b595c 100644 --- a/libkpimexchange/core/exchangemonitor.h +++ b/libkpimexchange/core/exchangemonitor.h @@ -40,7 +40,7 @@ namespace KPIM { class ExchangeAccount; class ExchangeMonitor : public TQObject { - Q_OBJECT + TQ_OBJECT public: typedef long ID; diff --git a/libkpimexchange/core/exchangeprogress.h b/libkpimexchange/core/exchangeprogress.h index 4d29c24c..07872449 100644 --- a/libkpimexchange/core/exchangeprogress.h +++ b/libkpimexchange/core/exchangeprogress.h @@ -28,7 +28,7 @@ namespace KPIM { class ExchangeProgress : public KProgressDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/libkpimexchange/core/exchangeupload.cpp b/libkpimexchange/core/exchangeupload.cpp index f134868f..8e49e0aa 100644 --- a/libkpimexchange/core/exchangeupload.cpp +++ b/libkpimexchange/core/exchangeupload.cpp @@ -88,8 +88,8 @@ void ExchangeUpload::findUid( TQString const &uid ) TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", query, false ); job->setWindow( mWindow ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotFindUidResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotFindUidResult( TDEIO::Job * ) ) ); } void ExchangeUpload::slotFindUidResult( TDEIO::Job * job ) @@ -147,8 +147,8 @@ void ExchangeUpload::tryExist() TDEIO::DavJob *job = TDEIO::davPropFind( url, doc, "0", false ); job->setWindow( mWindow ); job->addMetaData( "errorPage", "false" ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotPropFindResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotPropFindResult( TDEIO::Job * ) ) ); } void ExchangeUpload::slotPropFindResult( TDEIO::Job *job ) @@ -262,11 +262,11 @@ void ExchangeUpload::startUpload( const KURL &url ) kdDebug() << "ExchangeUpload::mTimeZoneId=" << mTimeZoneId << endl; addElement( doc, prop, "urn:schemas:calendar:", "dtstart", - zoneAsUtc( event->dtStart(), mTimeZoneId ).toString( Qt::ISODate ) + "Z" ); + zoneAsUtc( event->dtStart(), mTimeZoneId ).toString( TQt::ISODate ) + "Z" ); // event->dtStart().toString( "yyyy-MM-ddThh:mm:ss.zzzZ" ) ); // 2002-06-04T08:00:00.000Z" ); addElement( doc, prop, "urn:schemas:calendar:", "dtend", - zoneAsUtc( event->dtEnd(), mTimeZoneId ).toString( Qt::ISODate ) + "Z" ); + zoneAsUtc( event->dtEnd(), mTimeZoneId ).toString( TQt::ISODate ) + "Z" ); #if 0 addElement( doc, prop, "urn:schemas:calendar:", "dtstart", event->dtStart().toString( "yyyy-MM-ddThh:mm:ss.zzz" )+ offsetString ); @@ -275,7 +275,7 @@ void ExchangeUpload::startUpload( const KURL &url ) addElement( doc, prop, "urn:schemas:calendar:", "dtend", event->dtEnd().toString( "yyyy-MM-ddThh:mm:ss.zzz" ) + offsetString ); #endif - addElement( doc, prop, "urn:schemas:calendar:", "lastmodified", zoneAsUtc( event->lastModified(), mTimeZoneId ).toString( Qt::ISODate )+"Z" ); + addElement( doc, prop, "urn:schemas:calendar:", "lastmodified", zoneAsUtc( event->lastModified(), mTimeZoneId ).toString( TQt::ISODate )+"Z" ); // addElement( doc, prop, "urn:schemas:calendar:", "meetingstatus", "confirmed" ); addElement( doc, prop, "urn:schemas:httpmail:", "textdescription", event->description() ); @@ -308,7 +308,7 @@ void ExchangeUpload::startUpload( const KURL &url ) KCal::DateList::iterator it; for ( it = exdates.begin(); it != exdates.end(); ++it ) { TQString date = (*it).toString( "yyyy-MM-ddT00:00:00.000" )+ offsetString; -// TQString date = zoneAsUtc( (*it), mTimeZoneId ).toString( Qt::ISODate ); +// TQString date = zoneAsUtc( (*it), mTimeZoneId ).toString( TQt::ISODate ); addElement( doc, exdate, "xml:", "v", date ); } } @@ -332,8 +332,8 @@ void ExchangeUpload::startUpload( const KURL &url ) TDEIO::DavJob *job = TDEIO::davPropPatch( url, doc, false ); job->setWindow( mWindow ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotPatchResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotPatchResult( TDEIO::Job * ) ) ); } void ExchangeUpload::slotPatchResult( TDEIO::Job *job ) diff --git a/libkpimexchange/core/exchangeupload.h b/libkpimexchange/core/exchangeupload.h index bbc5b8cf..56635a7c 100644 --- a/libkpimexchange/core/exchangeupload.h +++ b/libkpimexchange/core/exchangeupload.h @@ -33,8 +33,8 @@ namespace KPIM { class ExchangeAccount; -class KDE_EXPORT ExchangeUpload : public TQObject { - Q_OBJECT +class TDE_EXPORT ExchangeUpload : public TQObject { + TQ_OBJECT public: ExchangeUpload( KCal::Event* event, ExchangeAccount* account, const TQString& timeZoneId, TQWidget* window=0 ); |