summaryrefslogtreecommitdiffstats
path: root/libkpimexchange
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
commitf4fae92b6768541e2952173c3d4b09040f95bf7e (patch)
treed8c5d93232235cd635f3310b4d95490df181ba2d /libkpimexchange
parent125c0a08265b75a133644d3b55f47e37c919f45d (diff)
downloadtdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz
tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip
Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libkpimexchange')
-rw-r--r--libkpimexchange/core/exchangeaccount.cpp8
-rw-r--r--libkpimexchange/core/exchangeclient.cpp6
-rw-r--r--libkpimexchange/core/exchangedownload.cpp4
-rw-r--r--libkpimexchange/core/exchangemonitor.cpp8
-rw-r--r--libkpimexchange/core/exchangeupload.cpp10
5 files changed, 18 insertions, 18 deletions
diff --git a/libkpimexchange/core/exchangeaccount.cpp b/libkpimexchange/core/exchangeaccount.cpp
index 858169ad8..a974f2645 100644
--- a/libkpimexchange/core/exchangeaccount.cpp
+++ b/libkpimexchange/core/exchangeaccount.cpp
@@ -89,8 +89,8 @@ TQString endecryptStr( const TQString &aStr )
{
TQString result;
for (uint i = 0; i < aStr.length(); i++)
- result += (aStr[i].unicode() < 0x20) ? aStr[i] :
- TQChar(0x1001F - aStr[i].unicode());
+ result += (aStr[i].tqunicode() < 0x20) ? aStr[i] :
+ TQChar(0x1001F - aStr[i].tqunicode());
return result;
}
@@ -163,7 +163,7 @@ bool ExchangeAccount::authenticate( TQWidget *window )
bool ExchangeAccount::authenticate()
{
long windowId;
- TQWidgetList *widgets = TQApplication::topLevelWidgets();
+ TQWidgetList *widgets = TQApplication::tqtopLevelWidgets();
if ( widgets->isEmpty() )
windowId = 0;
else
@@ -206,7 +206,7 @@ bool ExchangeAccount::authenticate( int windowId )
// TODO: Remove this busy loop
TQApplication::setOverrideCursor( KCursor::waitCursor() );
do {
- qApp->processEvents();
+ tqApp->processEvents();
} while ( !mCalendarURL && !mError );
TQApplication::restoreOverrideCursor();
diff --git a/libkpimexchange/core/exchangeclient.cpp b/libkpimexchange/core/exchangeclient.cpp
index 3a1c46cc5..1047f36ef 100644
--- a/libkpimexchange/core/exchangeclient.cpp
+++ b/libkpimexchange/core/exchangeclient.cpp
@@ -226,7 +226,7 @@ int ExchangeClient::downloadSynchronous( KCal::Calendar *calendar,
TQApplication::setOverrideCursor
( KCursor::waitCursor() );
do {
- qApp->processEvents();
+ tqApp->processEvents();
} while ( mClientState == WaitingForResult );
TQApplication::restoreOverrideCursor();
@@ -247,7 +247,7 @@ int ExchangeClient::uploadSynchronous( KCal::Event* event )
// TODO: Remove this busy loop
TQApplication::setOverrideCursor( KCursor::waitCursor() );
do {
- qApp->processEvents();
+ tqApp->processEvents();
} while ( mClientState == WaitingForResult );
TQApplication::restoreOverrideCursor();
disconnect( this, TQT_SIGNAL( uploadFinished( int, const TQString & ) ),
@@ -266,7 +266,7 @@ int ExchangeClient::removeSynchronous( KCal::Event* event )
// TODO: Remove this busy loop
TQApplication::setOverrideCursor( KCursor::waitCursor() );
do {
- qApp->processEvents();
+ tqApp->processEvents();
} while ( mClientState == WaitingForResult );
TQApplication::restoreOverrideCursor();
disconnect( this, TQT_SIGNAL( removeFinished( int, const TQString & ) ),
diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp
index 60879d266..16b1a1a32 100644
--- a/libkpimexchange/core/exchangedownload.cpp
+++ b/libkpimexchange/core/exchangedownload.cpp
@@ -255,7 +255,7 @@ void ExchangeDownload::handleAppointments( const TQDomDocument &response,
continue;
}
TQString uid = uidElement.text();
- if ( ! m_uids.contains( uid ) ) {
+ if ( ! m_uids.tqcontains( uid ) ) {
m_uids[uid] = 1;
handleRecurrence(uid);
successCount++;
@@ -582,7 +582,7 @@ void ExchangeDownload::slotPropFindResult( KIO::Job *job )
if ( mCalendar ) {
KCal::Event *oldEvent = mCalendar->event( event->uid() );
if ( oldEvent ) {
- kdWarning() << "Already got his event, replace it..." << endl;
+ kdWarning() << "Already got his event, tqreplace it..." << endl;
mCalendar->deleteEvent( oldEvent );
}
kdDebug() << "ADD EVENT" << endl;
diff --git a/libkpimexchange/core/exchangemonitor.cpp b/libkpimexchange/core/exchangemonitor.cpp
index 8e5525038..ae33a3693 100644
--- a/libkpimexchange/core/exchangemonitor.cpp
+++ b/libkpimexchange/core/exchangemonitor.cpp
@@ -261,7 +261,7 @@ void ExchangeMonitor::slotUnsubscribeResult( KIO::Job * job )
kdDebug() << "Subscription ID.text(): " << subscriptionID.text() << endl;
bool ok;
ID id = subscriptionID.text().toLong( &ok );
- if ( ! status.text().contains( "200" ) || !ok) {
+ if ( ! status.text().tqcontains( "200" ) || !ok) {
kdError() << "UNSUBSCRIBE result is not 200 or no subscription ID found" << endl;
emit error( ExchangeClient::ServerResponseError, "UNSUBSCRIBE yields an error response: \n" + response.toString() );
}
@@ -285,7 +285,7 @@ void ExchangeMonitor::slotActivated( int )
return;
TQCString response( maxLen+2 );
- Q_LONG len = mSocket->readBlock ( response.data(), maxLen+1 );
+ TQ_LONG len = mSocket->readBlock ( response.data(), maxLen+1 );
if ( len <= 0 ) {
kdDebug() << "Error: len<=0" << endl;
@@ -346,7 +346,7 @@ void ExchangeMonitor::slotPollResult( KIO::Job * job )
TQDomElement item = responses.item( i ).toElement();
TQDomElement status = item.namedItem( "status" ).toElement();
TQDomElement subscriptionID = item.namedItem( "subscriptionID" ).toElement();
- if ( status.text().contains( "200" ) ) {
+ if ( status.text().tqcontains( "200" ) ) {
kdDebug() << "subscriptionID: " << subscriptionID.text() << endl;
IDList IDs = makeIDList( subscriptionID.text() );
TQValueList<KURL> urls;
@@ -355,7 +355,7 @@ void ExchangeMonitor::slotPollResult( KIO::Job * job )
urls += mSubscriptionMap[ *it ];
}
emit notify( IDs, urls );
- } else if ( ! status.text().contains( "204" ) ) {
+ } else if ( ! status.text().tqcontains( "204" ) ) {
kdWarning() << "POLL result is not 200 or 204, what's up?" << endl;
emit error( ExchangeClient::ServerResponseError, "Poll result is wrong: \n" + response.toString() );
}
diff --git a/libkpimexchange/core/exchangeupload.cpp b/libkpimexchange/core/exchangeupload.cpp
index 29a796dd8..f62d6a321 100644
--- a/libkpimexchange/core/exchangeupload.cpp
+++ b/libkpimexchange/core/exchangeupload.cpp
@@ -256,7 +256,7 @@ void ExchangeUpload::startUpload( const KURL &url )
offsetString = TQString( "+%1:%2" ).arg(tzOffset/60, 2).arg( tzOffset%60, 2 );
else
offsetString = TQString( "-%1:%2" ).arg((-tzOffset)/60, 2).arg( (-tzOffset)%60, 2 );
- offsetString = offsetString.replace( TQRegExp(" "), "0" );
+ offsetString = offsetString.tqreplace( TQRegExp(" "), "0" );
kdDebug() << "Timezone offset: " << tzOffset << " : " << offsetString << endl;
kdDebug() << "ExchangeUpload::mTimeZoneId=" << mTimeZoneId << endl;
@@ -292,8 +292,8 @@ void ExchangeUpload::startUpload( const KURL &url )
KCal::ICalFormat *format = new KCal::ICalFormat();
TQString recurstr = format->toString( recurrence->defaultRRule() );
// Strip leading "RRULE\n :" and whitespace
- recurstr = recurstr.replace( TQRegExp("^[A-Z]*[\\s]*:"), "").stripWhiteSpace();
- kdDebug() << "Recurrence rule after replace: \"" << recurstr << "\"" << endl;
+ recurstr = recurstr.tqreplace( TQRegExp("^[A-Z]*[\\s]*:"), "").stripWhiteSpace();
+ kdDebug() << "Recurrence rule after tqreplace: \"" << recurstr << "\"" << endl;
delete format;
TQDomElement rrule = addElement( doc, prop, "urn:schemas:calendar:", "rrule" );
addElement( doc, rrule, "xml:", "v", recurstr );
@@ -360,8 +360,8 @@ void ExchangeUpload::slotPatchResult( KIO::Job *job )
.toElement();
kdDebug() << "status: " << status.text() << endl;
kdDebug() << "propstat: " << propstat.text() << endl;
- if ( ! ( status.text().contains( "201" ) ||
- propstat.text().contains( "200" ) ) )
+ if ( ! ( status.text().tqcontains( "201" ) ||
+ propstat.text().tqcontains( "200" ) ) )
emit finished( this, ExchangeClient::EventWriteError,
"Upload error response: \n" + response.toString() );
else