diff options
Diffstat (limited to 'kresources/groupwise/soap/groupwiseserver.cpp')
-rw-r--r-- | kresources/groupwise/soap/groupwiseserver.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/kresources/groupwise/soap/groupwiseserver.cpp b/kresources/groupwise/soap/groupwiseserver.cpp index 83a75f6b8..bd908c442 100644 --- a/kresources/groupwise/soap/groupwiseserver.cpp +++ b/kresources/groupwise/soap/groupwiseserver.cpp @@ -60,7 +60,7 @@ static TQMap<struct soap *,GroupwiseServer *> mServerMap; int myOpen( struct soap *soap, const char *endpoint, const char *host, int port ) { TQMap<struct soap *,GroupwiseServer *>::ConstIterator it; - it = mServerMap.find( soap ); + it = mServerMap.tqfind( soap ); if ( it == mServerMap.end() ) { soap->error = SOAP_FAULT; return SOAP_INVALID_SOCKET; @@ -72,7 +72,7 @@ int myOpen( struct soap *soap, const char *endpoint, const char *host, int port int myClose( struct soap *soap ) { TQMap<struct soap *,GroupwiseServer *>::ConstIterator it; - it = mServerMap.find( soap ); + it = mServerMap.tqfind( soap ); if ( it == mServerMap.end() ) return SOAP_FAULT; return (*it)->gSoapClose( soap ); @@ -81,7 +81,7 @@ int myClose( struct soap *soap ) int mySendCallback( struct soap *soap, const char *s, size_t n ) { TQMap<struct soap *,GroupwiseServer *>::ConstIterator it; - it = mServerMap.find( soap ); + it = mServerMap.tqfind( soap ); if ( it == mServerMap.end() ) return SOAP_FAULT; return (*it)->gSoapSendCallback( soap, s, n ); @@ -90,7 +90,7 @@ int mySendCallback( struct soap *soap, const char *s, size_t n ) size_t myReceiveCallback( struct soap *soap, char *s, size_t n ) { TQMap<struct soap *,GroupwiseServer *>::ConstIterator it; - it = mServerMap.find( soap ); + it = mServerMap.tqfind( soap ); if ( it == mServerMap.end() ) { kdDebug() << "No soap object found" << endl; soap->error = SOAP_FAULT; @@ -118,7 +118,7 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *, } else { m_sock = new KExtendedSocket(); } - mErrorText = TQString::null; + mErrorText = TQString(); m_sock->reset(); m_sock->setBlockingMode( false ); @@ -264,8 +264,8 @@ size_t GroupwiseServer::gSoapReceiveCallback( struct soap *soap, char *s, } GroupwiseServer::GroupwiseServer( const TQString &url, const TQString &user, - const TQString &password, TQObject *parent ) - : TQObject( parent, "GroupwiseServer" ), + const TQString &password, TQObject *tqparent ) + : TQObject( tqparent, "GroupwiseServer" ), mUrl( url ), mUser( user ), mPassword( password ), mSSL( url.left(6)=="https:" ), m_sock( 0 ), mError( 0 ) @@ -354,9 +354,9 @@ bool GroupwiseServer::login() ngwt__UserInfo *userinfo = loginResp.userinfo; if ( userinfo ) { kdDebug() << "HAS USERINFO" << endl; - mUserName = conv.stringToQString( userinfo->name ); - if ( userinfo->email ) mUserEmail = conv.stringToQString( userinfo->email ); - if ( userinfo->uuid ) mUserUuid = conv.stringToQString( userinfo->uuid ); + mUserName = conv.stringToTQString( userinfo->name ); + if ( userinfo->email ) mUserEmail = conv.stringToTQString( userinfo->email ); + if ( userinfo->uuid ) mUserUuid = conv.stringToTQString( userinfo->uuid ); // can also get userid here in GW7 (userinfo->userid) } @@ -477,7 +477,7 @@ void GroupwiseServer::dumpFolderList() { mSoap->header->ngwt__session = mSession; _ngwm__getFolderListRequest folderListReq; - folderListReq.parent = "folders"; + folderListReq.tqparent = "folders"; folderListReq.recurse = true; _ngwm__getFolderListResponse folderListRes; soap_call___ngw__getFolderListRequest( mSoap, mUrl.latin1(), 0, @@ -518,7 +518,7 @@ void GroupwiseServer::dumpCalendarFolder( const std::string &id ) itemsRequest.container = soap_new_std__string( mSoap, -1 ); *(itemsRequest.container) = id; std::string *str = soap_new_std__string( mSoap, -1 ); - str->append( "recipients message recipienStatus" ); + str->append( "recipients message recipientqStatus" ); itemsRequest.view = str; itemsRequest.filter = 0; @@ -589,7 +589,7 @@ void GroupwiseServer::dumpAppointment( ngwt__Appointment *a ) void GroupwiseServer::dumpFolder( ngwt__Folder *f ) { dumpItem( f ); - kdDebug() << " PARENT: " << f->parent.c_str() << endl; + kdDebug() << " PARENT: " << f->tqparent.c_str() << endl; if ( f->description ) { kdDebug() << " DESCRIPTION: " << f->description->c_str() << endl; } @@ -705,9 +705,9 @@ GroupWise::AddressBook::List GroupwiseServer::addressBookList() std::vector<class ngwt__AddressBook * >::const_iterator it; for ( it = addressBooks->begin(); it != addressBooks->end(); ++it ) { GroupWise::AddressBook ab; - ab.id = GWConverter::stringToQString( (*it)->id ); - ab.name = GWConverter::stringToQString( (*it)->name ); - ab.description = GWConverter::stringToQString( (*it)->description ); + ab.id = GWConverter::stringToTQString( (*it)->id ); + ab.name = GWConverter::stringToTQString( (*it)->name ); + ab.description = GWConverter::stringToTQString( (*it)->description ); if ( (*it)->isPersonal ) ab.isPersonal = (*it)->isPersonal; if ( (*it)->isFrequentContacts ) { ab.isFrequentContacts = (*it)->isFrequentContacts; @@ -763,7 +763,7 @@ std::string GroupwiseServer::getFullIDFor( const TQString & gwRecordIDFromIcal ) std::string calendarFolderID; _ngwm__getFolderListRequest folderListReq; _ngwm__getFolderListResponse folderListRes; - folderListReq.parent = "folders"; + folderListReq.tqparent = "folders"; folderListReq.view = soap_new_std__string( mSoap, -1 ); folderListReq.view->append( "id type" ); folderListReq.recurse = false; @@ -953,7 +953,7 @@ bool GroupwiseServer::addIncidence( KCal::Incidence *incidence, converter.setFrom( mUserName, mUserEmail, mUserUuid ); incidence->setCustomProperty( "GWRESOURCE", "CONTAINER", - converter.stringToQString( mCalendarFolder ) ); + converter.stringToTQString( mCalendarFolder ) ); ngwt__Item *item; if ( incidence->type() == "Event" ) { @@ -1007,7 +1007,7 @@ bool GroupwiseServer::changeIncidence( KCal::Incidence *incidence ) converter.setFrom( mUserName, mUserEmail, mUserUuid ); incidence->setCustomProperty( "GWRESOURCE", "CONTAINER", - converter.stringToQString( mCalendarFolder ) ); + converter.stringToTQString( mCalendarFolder ) ); ngwt__Item *item; if ( incidence->type() == "Event" ) { @@ -1097,7 +1097,7 @@ bool GroupwiseServer::changeIncidence( KCal::Incidence *incidence ) return success; } -bool GroupwiseServer::checkResponse( int result, ngwt__Status *status ) +bool GroupwiseServer::checkResponse( int result, ngwt__tqStatus *status ) { if ( result != 0 ) { soap_print_fault( mSoap, stderr ); @@ -1106,7 +1106,7 @@ bool GroupwiseServer::checkResponse( int result, ngwt__Status *status ) kdDebug() << "SOAP call succeeded" << endl; } if ( status && status->code != 0 ) { - TQString msg = "SOAP Response Status: " + TQString::number( status->code ); + TQString msg = "SOAP Response tqStatus: " + TQString::number( status->code ); if ( status->description ) { msg += " "; msg += status->description->c_str(); @@ -1184,7 +1184,7 @@ bool GroupwiseServer::retractRequest( KCal::Incidence *incidence, RetractCause c converter.setFrom( mUserName, mUserEmail, mUserUuid ); incidence->setCustomProperty( "GWRESOURCE", "CONTAINER", - converter.stringToQString( mCalendarFolder ) ); + converter.stringToTQString( mCalendarFolder ) ); ngwt__Item *item; if ( incidence->type() == "Event" ) { @@ -1408,8 +1408,8 @@ bool GroupwiseServer::readFreeBusy( const TQString &email, if ( blocks ) { std::vector<class ngwt__FreeBusyBlock *>::const_iterator it2; for( it2 = blocks->begin(); it2 != blocks->end(); ++it2 ) { - TQDateTime blockStart = conv.charToQDateTime( (*it2)->startDate ); - TQDateTime blockEnd = conv.charToQDateTime( (*it2)->endDate ); + TQDateTime blockStart = conv.charToTQDateTime( (*it2)->startDate ); + TQDateTime blockEnd = conv.charToTQDateTime( (*it2)->endDate ); ngwt__AcceptLevel acceptLevel = *(*it2)->acceptLevel; /* TODO: show Free/Busy subject in diagram - we need to support these as people use it for checking others' calendars */ |