summaryrefslogtreecommitdiffstats
path: root/libkpimexchange/core
diff options
context:
space:
mode:
Diffstat (limited to 'libkpimexchange/core')
-rw-r--r--libkpimexchange/core/exchangeaccount.cpp6
-rw-r--r--libkpimexchange/core/exchangeclient.cpp2
-rw-r--r--libkpimexchange/core/exchangedownload.cpp4
-rw-r--r--libkpimexchange/core/exchangemonitor.cpp8
-rw-r--r--libkpimexchange/core/exchangeupload.cpp12
5 files changed, 16 insertions, 16 deletions
diff --git a/libkpimexchange/core/exchangeaccount.cpp b/libkpimexchange/core/exchangeaccount.cpp
index 14b465605..acff34f12 100644
--- a/libkpimexchange/core/exchangeaccount.cpp
+++ b/libkpimexchange/core/exchangeaccount.cpp
@@ -217,7 +217,7 @@ void ExchangeAccount::calcFolderURLs()
{
kdDebug() << "ExchangeAccount::calcFolderURLs" << endl;
TQDomDocument doc;
- TQDomElement root = addElement( doc, doc, "DAV:", "proptqfind" );
+ TQDomElement root = addElement( doc, doc, "DAV:", "propfind" );
TQDomElement prop = addElement( doc, root, "DAV:", "prop" );
addElement( doc, prop, "urn:schemas:httpmail:", "calendar" );
// For later use:
@@ -313,10 +313,10 @@ TQString ExchangeAccount::tryMailbox( const TQString &_url, const TQString &user
TQString result;
while ( !stream.eof() ) {
line = stream.readLine(); // line of text excluding '\n'
- int pos = line.tqfind( "<BASE href=\"", 0, FALSE );
+ int pos = line.find( "<BASE href=\"", 0, FALSE );
if ( pos < 0 )
continue;
- int end = line.tqfind( "\"", pos+12, FALSE );
+ int end = line.find( "\"", pos+12, FALSE );
if ( pos < 0 ) {
kdWarning() << "Strange, found no closing quote in " << line << endl;
continue;
diff --git a/libkpimexchange/core/exchangeclient.cpp b/libkpimexchange/core/exchangeclient.cpp
index cc84822ec..1047f36ef 100644
--- a/libkpimexchange/core/exchangeclient.cpp
+++ b/libkpimexchange/core/exchangeclient.cpp
@@ -100,7 +100,7 @@ void ExchangeClient::test()
TQString query =
"<propfind xmlns=\"DAV:\" xmlns:h=\"urn:schemas:httpmail:\">\r\n"
" <allprop/>\r\n"
- "</proptqfind>\r\n";
+ "</propfind>\r\n";
KIO::DavJob* job = new KIO::DavJob( url, (int) KIO::DAV_PROPFIND, query, false );
job->addMetaData( "davDepth", "0" );
diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp
index cb941711f..e5a09b530 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.tqcontains( uid ) ) {
+ if ( ! m_uids.contains( uid ) ) {
m_uids[uid] = 1;
handleRecurrence(uid);
successCount++;
@@ -308,7 +308,7 @@ void ExchangeDownload::handleRecurrence( TQString uid )
void ExchangeDownload::readAppointment( const KURL& url )
{
TQDomDocument doc;
- TQDomElement root = addElement( doc, doc, "DAV:", "proptqfind" );
+ TQDomElement root = addElement( doc, doc, "DAV:", "propfind" );
TQDomElement prop = addElement( doc, root, "DAV:", "prop" );
addElement( doc, prop, "urn:schemas:calendar:", "uid" );
addElement( doc, prop, "urn:schemas:calendar:", "timezoneid" );
diff --git a/libkpimexchange/core/exchangemonitor.cpp b/libkpimexchange/core/exchangemonitor.cpp
index b88510daf..c9f8c627a 100644
--- a/libkpimexchange/core/exchangemonitor.cpp
+++ b/libkpimexchange/core/exchangemonitor.cpp
@@ -200,7 +200,7 @@ void ExchangeMonitor::slotSubscribeResult( KIO::Job * job )
TQStringList headers = TQStringList::split( "\n", job->queryMetaData( "HTTP-Headers" ) );
for ( TQStringList::Iterator it = headers.begin(); it != headers.end(); ++it ) {
- int colon = (*it).tqfind( ": " );
+ int colon = (*it).find( ": " );
if ( colon<0 ) continue;
TQString tag = (*it).left( colon ).stripWhiteSpace().lower();
TQString value = (*it).mid( colon+1 ).stripWhiteSpace();
@@ -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().tqcontains( "200" ) || !ok) {
+ if ( ! status.text().contains( "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() );
}
@@ -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().tqcontains( "200" ) ) {
+ if ( status.text().contains( "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().tqcontains( "204" ) ) {
+ } else if ( ! status.text().contains( "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 50159fecf..4317a2565 100644
--- a/libkpimexchange/core/exchangeupload.cpp
+++ b/libkpimexchange/core/exchangeupload.cpp
@@ -139,7 +139,7 @@ void ExchangeUpload::tryExist()
kdDebug() << "Trying to see whether " << url.prettyURL() << " exists" << endl;
TQDomDocument doc;
- TQDomElement root = addElement( doc, doc, "DAV:", "proptqfind" );
+ TQDomElement root = addElement( doc, doc, "DAV:", "propfind" );
TQDomElement prop = addElement( doc, root, "DAV:", "prop" );
addElement( doc, prop, "DAV:", "displayname" );
addElement( doc, prop, "urn:schemas:calendar", "uid" );
@@ -256,7 +256,7 @@ void ExchangeUpload::startUpload( const KURL &url )
offsetString = TQString( "+%1:%2" ).tqarg(tzOffset/60, 2).tqarg( tzOffset%60, 2 );
else
offsetString = TQString( "-%1:%2" ).tqarg((-tzOffset)/60, 2).tqarg( (-tzOffset)%60, 2 );
- offsetString = offsetString.tqreplace( TQRegExp(" "), "0" );
+ offsetString = offsetString.replace( 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.tqreplace( TQRegExp("^[A-Z]*[\\s]*:"), "").stripWhiteSpace();
- kdDebug() << "Recurrence rule after tqreplace: \"" << recurstr << "\"" << endl;
+ recurstr = recurstr.replace( TQRegExp("^[A-Z]*[\\s]*:"), "").stripWhiteSpace();
+ kdDebug() << "Recurrence rule after replace: \"" << 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().tqcontains( "201" ) ||
- propstat.text().tqcontains( "200" ) ) )
+ if ( ! ( status.text().contains( "201" ) ||
+ propstat.text().contains( "200" ) ) )
emit finished( this, ExchangeClient::EventWriteError,
"Upload error response: \n" + response.toString() );
else
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-18 22:29:28 +0000