summaryrefslogtreecommitdiffstats
path: root/kresources/groupwise/soap/gwjobs.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kresources/groupwise/soap/gwjobs.cpp')
-rw-r--r--kresources/groupwise/soap/gwjobs.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/kresources/groupwise/soap/gwjobs.cpp b/kresources/groupwise/soap/gwjobs.cpp
index d093497cd..bd2f908e4 100644
--- a/kresources/groupwise/soap/gwjobs.cpp
+++ b/kresources/groupwise/soap/gwjobs.cpp
@@ -82,9 +82,9 @@ void ReadAddressBooksJob::run()
if ( !(*it)->id ) {
kdError() << "No addressbook id" << endl;
} else {
- TQString id = GWConverter::stringToQString( (*it)->id );
+ TQString id = GWConverter::stringToTQString( (*it)->id );
kdDebug() << "Reading ID: " << id << endl;
- if ( mAddressBookIds.find( id ) != mAddressBookIds.end() ) {
+ if ( mAddressBookIds.tqfind( id ) != mAddressBookIds.end() ) {
readAddressBook( *(*it)->id );
mProgress += 100;
}
@@ -156,11 +156,11 @@ void ReadAddressBooksJob::readAddressBook( std::string &id )
if ( !addr.isEmpty() ) {
addr.setResource( mResource );
- addr.insertCustom( "GWRESOURCE", "CONTAINER", converter.stringToQString( id ) );
+ addr.insertCustom( "GWRESOURCE", "CONTAINER", converter.stringToTQString( id ) );
- TQString remoteUid = converter.stringToQString( (*it)->id );
+ TQString remoteUid = converter.stringToTQString( (*it)->id );
- KABC::Addressee oldAddressee = mResource->tqfindByUid( mResource->idMapper().localId( remoteUid ) );
+ KABC::Addressee oldAddressee = mResource->findByUid( mResource->idMapper().localId( remoteUid ) );
if ( oldAddressee.isEmpty() ) // new addressee
mResource->idMapper().setRemoteId( addr.uid(), remoteUid );
else {
@@ -192,7 +192,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id )
cursorRequest.container = id;
cursorRequest.view = 0;
- if ( id.find( "GroupWiseSystemAddressBook" ) == 0 )
+ if ( id.tqfind( "GroupWiseSystemAddressBook" ) == 0 )
{
kdDebug() << " Book: " << id.c_str() << " is a SAB " << endl;
// filter for Contacts until we support Groups
@@ -223,7 +223,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id )
{
if ( cursorResponse.status && cursorResponse.status->code != 0 )
{
- kdDebug() << " Couldn't read " << GWConverter::stringToQString(id ) << " : " << GWConverter::stringToQString(cursorResponse.status->description) << endl;
+ kdDebug() << " Couldn't read " << GWConverter::stringToTQString(id ) << " : " << GWConverter::stringToTQString(cursorResponse.status->description) << endl;
//mError = GroupWise::RefreshNeeded;
}
return;
@@ -252,7 +252,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id )
kdDebug() << "Faults according to GSOAP:" << endl;
soap_print_fault(mSoap, stderr);
kdDebug() << "Unable to read " << *( readCursorRequest.count ) << " items at once, halving number and retrying request" << endl;
- *( readCursorRequest.count ) = QMAX( 1, *( readCursorRequest.count )/2 );
+ *( readCursorRequest.count ) = TQMAX( 1, *( readCursorRequest.count )/2 );
continue;
}
@@ -351,7 +351,7 @@ void ReadCalendarJob::run()
mSoap->header->ngwt__session = mSession;
_ngwm__getFolderListRequest folderListReq;
- folderListReq.parent = "folders";
+ folderListReq.tqparent = "folders";
folderListReq.view = 0;
folderListReq.recurse = true;
_ngwm__getFolderListResponse folderListRes;
@@ -465,7 +465,7 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
itemsRequest.container = id;
std::string *str = soap_new_std__string( mSoap, -1 );
- str->append( "startDate endDate subject alarm allDayEvent place timezone iCalId recipients message recipienStatus recurrenceKey" );
+ str->append( "startDate endDate subject alarm allDayEvent place timezone iCalId recipients message recipientqStatus recurrenceKey" );
itemsRequest.view = str;
itemsRequest.filter = 0;
itemsRequest.items = 0;
@@ -507,7 +507,7 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
}
if ( i ) {
- i->setCustomProperty( "GWRESOURCE", "CONTAINER", conv.stringToQString( id ) );
+ i->setCustomProperty( "GWRESOURCE", "CONTAINER", conv.stringToTQString( id ) );
mCalendar->addIncidence( i );
}
@@ -525,7 +525,7 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
cursorRequest.container = id;
#if 1
cursorRequest.view = soap_new_std__string( mSoap, -1 );
- cursorRequest.view->append( "default message recipients attachments recipienStatus peek completed status" /*"container status source security distribution acceptLevel startDate endDate subject alarm allDayEvent place timezone iCalId recipients message recurrenceKey"*/ );
+ cursorRequest.view->append( "default message recipients attachments recipientqStatus peek completed status" /*"container status source security distribution acceptLevel startDate endDate subject alarm allDayEvent place timezone iCalId recipients message recurrenceKey"*/ );
#else
cursorRequest.view = 0;
@@ -600,7 +600,7 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
}
}
if ( i ) {
- i->setCustomProperty( "GWRESOURCE", "CONTAINER", conv.stringToQString( id ) );
+ i->setCustomProperty( "GWRESOURCE", "CONTAINER", conv.stringToTQString( id ) );
mCalendar->addIncidence( i );
}