From 1bcdc9d95741fb2cbdb61f6e448a5d671c251118 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Mon, 9 Nov 2026 20:16:27 -0300 Subject: Replace zero pointers in GroupWise SOAP code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- tderesources/groupwise/soap/contactconverter.cpp | 100 +++++----- tderesources/groupwise/soap/groupwiseserver.cpp | 110 +++++------ tderesources/groupwise/soap/gwjobs.cpp | 46 ++--- tderesources/groupwise/soap/incidenceconverter.cpp | 210 ++++++++++----------- tderesources/groupwise/soap/ksslsocket.cpp | 6 +- 5 files changed, 236 insertions(+), 236 deletions(-) diff --git a/tderesources/groupwise/soap/contactconverter.cpp b/tderesources/groupwise/soap/contactconverter.cpp index 2076ccb6f..3dc0e0ccf 100644 --- a/tderesources/groupwise/soap/contactconverter.cpp +++ b/tderesources/groupwise/soap/contactconverter.cpp @@ -31,36 +31,36 @@ ContactConverter::ContactConverter( struct soap* soap ) ngwt__Contact* ContactConverter::convertToContact( const TDEABC::Addressee &addr ) { if ( addr.isEmpty() ) - return 0; + return nullptr; ngwt__Contact* contact = soap_new_ngwt__Contact( soap(), -1 ); // ngwt__Contact - contact->fullName = 0; - contact->emailList = 0; - contact->imList = 0; - contact->addressList = 0; - contact->officeInfo = 0; - contact->personalInfo = 0; - contact->referenceInfo = 0; + contact->fullName = nullptr; + contact->emailList = nullptr; + contact->imList = nullptr; + contact->addressList = nullptr; + contact->officeInfo = nullptr; + contact->personalInfo = nullptr; + contact->referenceInfo = nullptr; // ngwt__AddressBookItem - contact->uuid = 0; - contact->comment = 0; - contact->sync = 0; - contact->domain = 0; - contact->postOffice = 0; - contact->distinguishedName = 0; - contact->userid = 0; + contact->uuid = nullptr; + contact->comment = nullptr; + contact->sync = nullptr; + contact->domain = nullptr; + contact->postOffice = nullptr; + contact->distinguishedName = nullptr; + contact->userid = nullptr; // ngwt__ContainerItem - contact->categories = 0; - contact->created = 0; - contact->customs = 0; + contact->categories = nullptr; + contact->created = nullptr; + contact->customs = nullptr; // ngwt__contact - contact->id = 0; - contact->name = 0; - contact->version = 0; - contact->modified = 0; - contact->changes = 0; + contact->id = nullptr; + contact->name = nullptr; + contact->version = nullptr; + contact->modified = nullptr; + contact->changes = nullptr; // Uid contact->id = qStringToString( addr.custom( "GWRESOURCE", "UID" ) ); @@ -69,7 +69,7 @@ ngwt__Contact* ContactConverter::convertToContact( const TDEABC::Addressee &addr if ( !addr.custom( "GWRESOURCE", "CONTAINER" ).isEmpty() ) { std::vector* container = soap_new_std__vectorTemplateOfPointerTongwt__ContainerRef( soap(), -1 ); ngwt__ContainerRef* containerRef = soap_new_ngwt__ContainerRef( soap(), -1 ); - containerRef->deleted = 0; + containerRef->deleted = nullptr; containerRef->__item = addr.custom( "GWRESOURCE", "CONTAINER" ).utf8().data(); container->push_back( containerRef ); @@ -78,12 +78,12 @@ ngwt__Contact* ContactConverter::convertToContact( const TDEABC::Addressee &addr // Name parts ngwt__FullName* fullName = soap_new_ngwt__FullName( soap(), -1 ); - fullName->displayName = 0; - fullName->namePrefix = 0; - fullName->firstName = 0; - fullName->middleName = 0; - fullName->lastName = 0; - fullName->nameSuffix = 0; + fullName->displayName = nullptr; + fullName->namePrefix = nullptr; + fullName->firstName = nullptr; + fullName->middleName = nullptr; + fullName->lastName = nullptr; + fullName->nameSuffix = nullptr; if ( !addr.formattedName().isEmpty() ) fullName->displayName = qStringToString( addr.formattedName() ); @@ -120,12 +120,12 @@ ngwt__Contact* ContactConverter::convertToContact( const TDEABC::Addressee &addr emailList->email = *list; contact->emailList = emailList; } else - contact->emailList = 0; + contact->emailList = nullptr; // Phone numbers if ( !addr.phoneNumbers().isEmpty() ) { ngwt__PhoneList* phoneList = soap_new_ngwt__PhoneList( soap(), -1 ); - phoneList->default_ = 0; + phoneList->default_ = nullptr; std::vector *list = soap_new_std__vectorTemplateOfPointerTongwt__PhoneNumber( soap(), -1 ); TDEABC::PhoneNumber::List phones = addr.phoneNumbers(); @@ -144,7 +144,7 @@ ngwt__Contact* ContactConverter::convertToContact( const TDEABC::Addressee &addr phoneList->phone = *list; contact->phoneList = phoneList; } else - contact->phoneList = 0; + contact->phoneList = nullptr; // Addresses if ( !addr.addresses().isEmpty() ) { @@ -162,7 +162,7 @@ ngwt__Contact* ContactConverter::convertToContact( const TDEABC::Addressee &addr addressList->address = *list; contact->addressList = addressList; } else - contact->addressList = 0; + contact->addressList = nullptr; // IM addresses { @@ -178,19 +178,19 @@ ngwt__Contact* ContactConverter::convertToContact( const TDEABC::Addressee &addr if ( !addr.custom( "KADDRESSBOOK", "X-Department" ).isEmpty() ) info->department = qStringToString( addr.custom( "KADDRESSBOOK", "X-Department" ) ); else - info->department = 0; + info->department = nullptr; if ( !addr.title().isEmpty() ) info->title = qStringToString( addr.title() ); else - info->title = 0; + info->title = nullptr; if ( !addr.url().isEmpty() ) info->website = qStringToString( addr.url().url() ); else - info->website = 0; + info->website = nullptr; - info->organization = 0; + info->organization = nullptr; contact->officeInfo = info; } @@ -202,10 +202,10 @@ ngwt__Contact* ContactConverter::convertToContact( const TDEABC::Addressee &addr if ( addr.birthday().isValid() ) info->birthday = qDateToString( addr.birthday().date() ); else - info->birthday = 0; + info->birthday = nullptr; // don't write back the web site here, otherwise we'll have it twice - info->website = 0; + info->website = nullptr; contact->personalInfo = info; } @@ -453,7 +453,7 @@ TDEABC::PhoneNumber ContactConverter::convertPhoneNumber( ngwt__PhoneNumber *pho ngwt__PhoneNumber* ContactConverter::convertPhoneNumber( const TDEABC::PhoneNumber &number ) const { if ( number.number().isEmpty() ) - return 0; + return nullptr; ngwt__PhoneNumber* phoneNumber = soap_new_ngwt__PhoneNumber( soap(), -1 ); phoneNumber->__item = number.number().utf8().data(); @@ -514,41 +514,41 @@ TDEABC::Address ContactConverter::convertPostalAddress( ngwt__PostalAddress *add ngwt__PostalAddress* ContactConverter::convertPostalAddress( const TDEABC::Address &address ) { if ( address.isEmpty() ) - return 0; + return nullptr; ngwt__PostalAddress* postalAddress = soap_new_ngwt__PostalAddress( soap(), -1 ); - postalAddress->description = 0; + postalAddress->description = nullptr; if ( !address.street().isEmpty() ) postalAddress->streetAddress = qStringToString( address.street() ); else - postalAddress->streetAddress = 0; + postalAddress->streetAddress = nullptr; if ( !address.extended().isEmpty() ) postalAddress->location = qStringToString( address.extended() ); else - postalAddress->location = 0; + postalAddress->location = nullptr; if ( !address.locality().isEmpty() ) postalAddress->city = qStringToString( address.locality() ); else - postalAddress->city = 0; + postalAddress->city = nullptr; if ( !address.region().isEmpty() ) postalAddress->state = qStringToString( address.region() ); else - postalAddress->state = 0; + postalAddress->state = nullptr; if ( !address.postalCode().isEmpty() ) postalAddress->postalCode = qStringToString( address.postalCode() ); else - postalAddress->postalCode = 0; + postalAddress->postalCode = nullptr; if ( !address.country().isEmpty() ) postalAddress->country = qStringToString( address.country() ); else - postalAddress->country = 0; + postalAddress->country = nullptr; if ( address.type() & TDEABC::Address::Home ) { postalAddress->type = Home_; @@ -612,7 +612,7 @@ ngwt__ImAddressList* ContactConverter::convertImAddresses( const TDEABC::Address else { delete imList; - return 0; + return nullptr; } } diff --git a/tderesources/groupwise/soap/groupwiseserver.cpp b/tderesources/groupwise/soap/groupwiseserver.cpp index 79b73fd63..93f94c843 100644 --- a/tderesources/groupwise/soap/groupwiseserver.cpp +++ b/tderesources/groupwise/soap/groupwiseserver.cpp @@ -130,7 +130,7 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *, kdError() << "gSoapOpen: lookup of " << host << " failed " << rc << endl; TQString errorMessage; errorMessage = TQString::fromLatin1( strerror( errno ) ); - perror( 0 ); + perror( nullptr ); soap->error = SOAP_TCP_ERROR; mErrorText = i18n("Connect failed: %1.").arg( errorMessage ); return SOAP_INVALID_SOCKET; @@ -142,7 +142,7 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *, TQString errorMessage; if ( rc == -1 ) { errorMessage = TQString::fromLatin1( strerror( errno ) ); - perror( 0 ); + perror( nullptr ); } //set the soap struct's error here! else { @@ -169,7 +169,7 @@ int GroupwiseServer::gSoapClose( struct soap * ) // kdDebug() << "GroupwiseServer::gSoapClose()" << endl; delete m_sock; - m_sock = 0; + m_sock = nullptr; #if 0 m_sock->close(); @@ -267,7 +267,7 @@ GroupwiseServer::GroupwiseServer( const TQString &url, const TQString &user, const TQString &password, TQObject *parent ) : TQObject( parent, "GroupwiseServer" ), mUrl( url ), mUser( user ), mPassword( password ), - mSSL( url.left(6)=="https:" ), m_sock( 0 ), + mSSL( url.left(6)=="https:" ), m_sock( nullptr ), mError( 0 ) { mBinding = new GroupWiseBinding; @@ -299,7 +299,7 @@ GroupwiseServer::GroupwiseServer( const TQString &url, const TQString &user, GroupwiseServer::~GroupwiseServer() { delete mSoap; - mSoap = 0; + mSoap = nullptr; } bool GroupwiseServer::login() @@ -379,7 +379,7 @@ bool GroupwiseServer::getCategoryList() _ngwm__getCategoryListResponse catListResp; mSoap->header->ngwt__session = mSession; int result = soap_call___ngw__getCategoryListRequest( mSoap, mUrl.latin1(), - 0, &catListReq, &catListResp); + nullptr, &catListReq, &catListResp); if ( !checkResponse( result, catListResp.status ) ) return false; if ( catListResp.categories ) { @@ -425,13 +425,13 @@ bool GroupwiseServer::dumpData() } else { itemsRequest.container = book->id; } - itemsRequest.filter = 0; - itemsRequest.items = 0; + itemsRequest.filter = nullptr; + itemsRequest.items = nullptr; // itemsRequest.count = -1; mSoap->header->ngwt__session = mSession; _ngwm__getItemsResponse itemsResponse; - soap_call___ngw__getItemsRequest( mSoap, mUrl.latin1(), 0, + soap_call___ngw__getItemsRequest( mSoap, mUrl.latin1(), nullptr, &itemsRequest, &itemsResponse ); @@ -449,11 +449,11 @@ bool GroupwiseServer::dumpData() } else { itemRequest.id = *( (*it2)->id ); } - itemRequest.view = 0; + itemRequest.view = nullptr; mSoap->header->ngwt__session = mSession; _ngwm__getItemResponse itemResponse; - soap_call___ngw__getItemRequest( mSoap, mUrl.latin1(), 0, + soap_call___ngw__getItemRequest( mSoap, mUrl.latin1(), nullptr, &itemRequest, &itemResponse ); @@ -480,7 +480,7 @@ void GroupwiseServer::dumpFolderList() folderListReq.parent = "folders"; folderListReq.recurse = true; _ngwm__getFolderListResponse folderListRes; - soap_call___ngw__getFolderListRequest( mSoap, mUrl.latin1(), 0, + soap_call___ngw__getFolderListRequest( mSoap, mUrl.latin1(), nullptr, &folderListReq, &folderListRes ); @@ -521,13 +521,13 @@ void GroupwiseServer::dumpCalendarFolder( const std::string &id ) str->append( "recipients message recipientStatus" ); itemsRequest.view = str; - itemsRequest.filter = 0; - itemsRequest.items = 0; + itemsRequest.filter = nullptr; + itemsRequest.items = nullptr; // itemsRequest.count = 5; mSoap->header->ngwt__session = mSession; _ngwm__getItemsResponse itemsResponse; - soap_call___ngw__getItemsRequest( mSoap, mUrl.latin1(), 0, + soap_call___ngw__getItemsRequest( mSoap, mUrl.latin1(), nullptr, &itemsRequest, &itemsResponse ); soap_print_fault(mSoap, stderr); @@ -639,7 +639,7 @@ bool GroupwiseServer::logout() soap_done( mSoap ); delete mSoap->header; - mSoap->header = 0; + mSoap->header = nullptr; return true; } @@ -769,7 +769,7 @@ std::string GroupwiseServer::getFullIDFor( const TQString & gwRecordIDFromIcal ) folderListReq.recurse = false; mSoap->header->ngwt__session = mSession; - soap_call___ngw__getFolderListRequest( mSoap, mUrl.latin1(), 0, + soap_call___ngw__getFolderListRequest( mSoap, mUrl.latin1(), nullptr, &folderListReq, &folderListRes ); @@ -800,7 +800,7 @@ std::string GroupwiseServer::getFullIDFor( const TQString & gwRecordIDFromIcal ) _ngwm__getItemsRequest getItemRequest; _ngwm__getItemsResponse getItemResponse; //getItemRequest.id.append( gwRecordID.latin1() ); - getItemRequest.view = 0; + getItemRequest.view = nullptr; getItemRequest.filter = soap_new_ngwt__Filter( mSoap, -1 ); ngwt__FilterEntry * fe = soap_new_ngwt__FilterEntry( mSoap, -1 ); fe->op = eq; @@ -808,15 +808,15 @@ std::string GroupwiseServer::getFullIDFor( const TQString & gwRecordIDFromIcal ) fe->field->append( "id" ); fe->value = soap_new_std__string( mSoap, -1 ); fe->value->append( gwRecordIDFromIcal.latin1() ); - fe->custom = 0; - fe->date = 0; + fe->custom = nullptr; + fe->date = nullptr; getItemRequest.filter->element = fe; getItemRequest.container = &calendarFolderID; - getItemRequest.items = 0; + getItemRequest.items = nullptr; getItemRequest.count = 1; mSoap->header->ngwt__session = mSession; - int result = soap_call___ngw__getItemsRequest( mSoap, mUrl.latin1(), 0, + int result = soap_call___ngw__getItemsRequest( mSoap, mUrl.latin1(), nullptr, &getItemRequest, &getItemResponse ); if ( !checkResponse( result, getItemResponse.status ) ) return std::string(); @@ -869,8 +869,8 @@ bool GroupwiseServer::acceptIncidence( KCal::Incidence *incidence ) _ngwm__acceptRequest request; _ngwm__acceptResponse response; - request.comment = 0; - request.acceptLevel = 0; + request.comment = nullptr; + request.acceptLevel = nullptr; request.recurrenceAllInstances = 0; /*FIXME: This should be the recurrence key for recurring events */ request.items = soap_new_ngwt__ItemRefList( mSoap, -1 ); /* std::string acceptedItem; @@ -878,7 +878,7 @@ bool GroupwiseServer::acceptIncidence( KCal::Incidence *incidence ) request.items->item.push_back( gwUID ); mSoap->header->ngwt__session = mSession; - int result = soap_call___ngw__acceptRequest( mSoap, mUrl.latin1(), 0, + int result = soap_call___ngw__acceptRequest( mSoap, mUrl.latin1(), nullptr, &request, &response ); if ( !checkResponse( result, response.status ) ) return false; @@ -914,7 +914,7 @@ bool GroupwiseServer::declineIncidence( KCal::Incidence *incidence ) _ngwm__declineRequest request; _ngwm__declineResponse response; - request.comment = 0; + request.comment = nullptr; request.recurrenceAllInstances = 0; /*FIXME: This should be the recurrence key for recurring events */ request.items = soap_new_ngwt__ItemRefList( mSoap, -1 ); /* std::string acceptedItem; @@ -922,7 +922,7 @@ bool GroupwiseServer::declineIncidence( KCal::Incidence *incidence ) request.items->item.push_back( gwUID ); mSoap->header->ngwt__session = mSession; - int result = soap_call___ngw__declineRequest( mSoap, mUrl.latin1(), 0, + int result = soap_call___ngw__declineRequest( mSoap, mUrl.latin1(), nullptr, &request, &response ); if ( !checkResponse( result, response.status ) ) return false; @@ -974,7 +974,7 @@ bool GroupwiseServer::addIncidence( KCal::Incidence *incidence, _ngwm__sendItemResponse response; mSoap->header->ngwt__session = mSession; - int result = soap_call___ngw__sendItemRequest( mSoap, mUrl.latin1(), 0, + int result = soap_call___ngw__sendItemRequest( mSoap, mUrl.latin1(), nullptr, &request, &response ); if ( !checkResponse( result, response.status ) ) return false; @@ -1031,7 +1031,7 @@ bool GroupwiseServer::changeIncidence( KCal::Incidence *incidence ) return false; } kdDebug() << "GroupwiseServer::changeIncidence() - adding new meeting with attendees" << endl; - if ( !addIncidence( incidence, 0 ) ) { + if ( !addIncidence( incidence, nullptr ) ) { kdDebug() << "GroupwiseServer::changeIncidence() - adding failed." << endl; return false; } @@ -1074,15 +1074,15 @@ bool GroupwiseServer::changeIncidence( KCal::Incidence *incidence ) request.id = *item->id; } request.updates = soap_new_ngwt__ItemChanges( mSoap, -1 ); - request.updates->add = 0; - request.updates->_delete = 0; + request.updates->add = nullptr; + request.updates->_delete = nullptr; request.updates->update = item; - request.notification = 0; + request.notification = nullptr; request.recurrenceAllInstances = 0; _ngwm__modifyItemResponse response; mSoap->header->ngwt__session = mSession; - int result = soap_call___ngw__modifyItemRequest( mSoap, mUrl.latin1(), 0, + int result = soap_call___ngw__modifyItemRequest( mSoap, mUrl.latin1(), nullptr, &request, &response ); success &= checkResponse( result, response.status ); @@ -1166,7 +1166,7 @@ bool GroupwiseServer::deleteIncidence( KCal::Incidence *incidence ) request.container = converter.qStringToString( incidence->customProperty( "GWRESOURCE", "CONTAINER" ) ); request.id = std::string( incidence->customProperty( "GWRESOURCE", "UID" ).utf8() ); - int result = soap_call___ngw__removeItemRequest( mSoap, mUrl.latin1(), 0, + int result = soap_call___ngw__removeItemRequest( mSoap, mUrl.latin1(), nullptr, &request, &response ); return checkResponse( result, response.status ); } @@ -1204,7 +1204,7 @@ bool GroupwiseServer::retractRequest( KCal::Incidence *incidence, RetractCause c mSoap->header->ngwt__session = mSession; request.items = soap_new_ngwt__ItemRefList( mSoap, 1 ); request.items->item.push_back( *( item->id ) ); - request.comment = 0; + request.comment = nullptr; request.retractCausedByResend = (bool*)soap_malloc( mSoap, 1 ); request.retractingAllInstances = (bool*)soap_malloc( mSoap, 1 ); request.retractCausedByResend = ( cause == DueToResend ); @@ -1213,7 +1213,7 @@ bool GroupwiseServer::retractRequest( KCal::Incidence *incidence, RetractCause c *rt = allMailboxes; request.retractType = rt; - int result = soap_call___ngw__retractRequest( mSoap, mUrl.latin1(), 0, + int result = soap_call___ngw__retractRequest( mSoap, mUrl.latin1(), nullptr, &request, &response ); delete rt; return checkResponse( result, response.status ); @@ -1234,13 +1234,13 @@ bool GroupwiseServer::insertAddressee( const TQString &addrBookId, TDEABC::Addre _ngwm__createItemRequest request; request.item = contact; - request.notification = 0; + request.notification = nullptr; _ngwm__createItemResponse response; mSoap->header->ngwt__session = mSession; - int result = soap_call___ngw__createItemRequest( mSoap, mUrl.latin1(), 0, + int result = soap_call___ngw__createItemRequest( mSoap, mUrl.latin1(), nullptr, &request, &response ); if ( !checkResponse( result, response.status ) ) return false; @@ -1268,16 +1268,16 @@ bool GroupwiseServer::changeAddressee( const TDEABC::Addressee &addr ) request.id = *contact->id; } request.updates = soap_new_ngwt__ItemChanges( mSoap, -1 ); - request.updates->add = 0; - request.updates->_delete = 0; + request.updates->add = nullptr; + request.updates->_delete = nullptr; request.updates->update = contact; - request.notification = 0; + request.notification = nullptr; request.recurrenceAllInstances = 0; _ngwm__modifyItemResponse response; mSoap->header->ngwt__session = mSession; - int result = soap_call___ngw__modifyItemRequest( mSoap, mUrl.latin1(), 0, + int result = soap_call___ngw__modifyItemRequest( mSoap, mUrl.latin1(), nullptr, &request, &response ); return checkResponse( result, response.status ); } @@ -1301,7 +1301,7 @@ bool GroupwiseServer::removeAddressee( const TDEABC::Addressee &addr ) request.container = converter.qStringToString( addr.custom( "GWRESOURCE", "CONTAINER" ) ); request.id = std::string( addr.custom( "GWRESOURCE", "UID" ).utf8() ); - int result = soap_call___ngw__removeItemRequest( mSoap, mUrl.latin1(), 0, + int result = soap_call___ngw__removeItemRequest( mSoap, mUrl.latin1(), nullptr, &request, &response ); return checkResponse( result, response.status ); } @@ -1339,8 +1339,8 @@ bool GroupwiseServer::readFreeBusy( const TQString &email, // Setup input data ngwt__NameAndEmail user; - user.displayName = 0; - user.uuid = 0; + user.displayName = nullptr; + user.uuid = nullptr; user.email = conv.qStringToString( email ); std::vector users; @@ -1396,14 +1396,14 @@ bool GroupwiseServer::readFreeBusy( const TQString &email, << " " << stats->total << endl; } - std::vector *infos = 0; + std::vector *infos = nullptr; if ( getFreeBusyResponse.freeBusyInfo ) infos = &getFreeBusyResponse.freeBusyInfo->user; if ( infos ) { std::vector::const_iterator it; for( it = infos->begin(); it != infos->end(); ++it ) { - std::vector *blocks = 0; + std::vector *blocks = nullptr; if ( (*it)->blocks ) blocks = &(*it)->blocks->block; if ( blocks ) { std::vector::const_iterator it2; @@ -1501,7 +1501,7 @@ bool GroupwiseServer::readUserSettings( ngwt__Settings *&returnedSettings ) { if ( mSession.empty() ) { kdError() << "GroupwiseServer::userSettings(): no session." << endl; - returnedSettings = 0; + returnedSettings = nullptr; return returnedSettings; } @@ -1512,18 +1512,18 @@ bool GroupwiseServer::readUserSettings( ngwt__Settings *&returnedSettings ) request.id = soap_new_std__string( mSoap, -1 ); request.id->append("allowSharedFolders"); #else - request.id = 0; + request.id = nullptr; #endif _ngwm__getSettingsResponse response; mSoap->header->ngwt__session = mSession; - int result = soap_call___ngw__getSettingsRequest( mSoap, mUrl.latin1(), 0, &request, &response ); + int result = soap_call___ngw__getSettingsRequest( mSoap, mUrl.latin1(), nullptr, &request, &response ); if ( !checkResponse( result, response.status ) ) { kdDebug() << "GroupwiseServer::userSettings() - checkResponse() failed" << endl; - returnedSettings = 0; + returnedSettings = nullptr; return returnedSettings; } @@ -1580,7 +1580,7 @@ bool GroupwiseServer::modifyUserSettings( TQMap & settings { kdDebug() << " creating Custom for " << it.key() << ", " << it.data() << endl; ngwt__Custom * custom = soap_new_ngwt__Custom( mSoap, -1 ); - custom->locked = 0; + custom->locked = nullptr; custom->field.append( it.key().utf8() ); custom->value = soap_new_std__string( mSoap, -1 ); custom->value->append( it.data().utf8() ); @@ -1590,7 +1590,7 @@ bool GroupwiseServer::modifyUserSettings( TQMap & settings mSoap->header->ngwt__session = mSession; - int result = soap_call___ngw__modifySettingsRequest( mSoap, mUrl.latin1(), 0, &request, &response ); + int result = soap_call___ngw__modifySettingsRequest( mSoap, mUrl.latin1(), nullptr, &request, &response ); if ( !checkResponse( result, response.status ) ) { kdDebug() << "GroupwiseServer::modifyUserSettings() - checkResponse() failed" << endl; @@ -1619,7 +1619,7 @@ bool GroupwiseServer::setCompleted( KCal::Todo * todo ) _ngwm__completeResponse response; mSoap->header->ngwt__session = mSession; request.items = items; - int result = soap_call___ngw__completeRequest( mSoap, mUrl.latin1(), 0, + int result = soap_call___ngw__completeRequest( mSoap, mUrl.latin1(), nullptr, &request, &response ); return checkResponse( result, response.status ); } @@ -1629,7 +1629,7 @@ bool GroupwiseServer::setCompleted( KCal::Todo * todo ) _ngwm__uncompleteResponse response; mSoap->header->ngwt__session = mSession; request.items = items; - int result = soap_call___ngw__uncompleteRequest( mSoap, mUrl.latin1(), 0, + int result = soap_call___ngw__uncompleteRequest( mSoap, mUrl.latin1(), nullptr, &request, &response ); return checkResponse( result, response.status ); } diff --git a/tderesources/groupwise/soap/gwjobs.cpp b/tderesources/groupwise/soap/gwjobs.cpp index 5508a59a6..f89eb54f0 100644 --- a/tderesources/groupwise/soap/gwjobs.cpp +++ b/tderesources/groupwise/soap/gwjobs.cpp @@ -111,8 +111,8 @@ void ReadAddressBooksJob::readAddressBook( std::string &id ) _ngwm__getItemsRequest itemsRequest; itemsRequest.container = &id; itemsRequest.count = -1; - itemsRequest.filter = 0; - itemsRequest.items = 0; + itemsRequest.filter = nullptr; + itemsRequest.items = nullptr; itemsRequest.view = 0; mSoap->header->ngwt__session = mSession; @@ -191,7 +191,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id ) _ngwm__createCursorResponse cursorResponse; cursorRequest.container = id; - cursorRequest.view = 0; + cursorRequest.view = nullptr; if ( id.find( "GroupWiseSystemAddressBook" ) == 0 ) { kdDebug() << " Book: " << id.c_str() << " is a SAB " << endl; @@ -203,18 +203,18 @@ void ReadAddressBooksJob::readAddressBook( std::string &id ) fe->field->append( "@type" ); fe->value = soap_new_std__string( mSoap, -1 ); fe->value->append( "Contact" ); - fe->custom = 0; - fe->date = 0; + fe->custom = nullptr; + fe->date = nullptr; cursorRequest.filter->element = fe; } else { kdDebug() << " Book: " << id.c_str() << " is a personal address book " << endl; - cursorRequest.filter = 0; + cursorRequest.filter = nullptr; } mSoap->header->ngwt__session = mSession; - soap_call___ngw__createCursorRequest( mSoap, mUrl.latin1(), 0, + soap_call___ngw__createCursorRequest( mSoap, mUrl.latin1(), nullptr, &cursorRequest, &cursorResponse ); if ( cursorResponse.cursor ) @@ -234,7 +234,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id ) readCursorRequest.cursor = cursor; readCursorRequest.container = id; readCursorRequest.forward = true; - readCursorRequest.position = 0; + readCursorRequest.position = nullptr; readCursorRequest.count = (int*)soap_malloc( mSoap, sizeof(int) ); *( readCursorRequest.count ) = (int)readChunkSize; @@ -245,7 +245,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id ) mSoap->header->ngwt__session = mSession; kdDebug() << "sending readCursorRequest with session: " << mSession.c_str() << endl; _ngwm__readCursorResponse readCursorResponse; - if ( soap_call___ngw__readCursorRequest( mSoap, mUrl.latin1(), 0, + if ( soap_call___ngw__readCursorRequest( mSoap, mUrl.latin1(), nullptr, &readCursorRequest, &readCursorResponse ) != SOAP_OK ) { @@ -310,7 +310,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id ) destReq.container = id; destReq.cursor = cursor; mSoap->header->ngwt__session = mSession; - if ( soap_call___ngw__destroyCursorRequest( mSoap, mUrl.latin1(), 0, + if ( soap_call___ngw__destroyCursorRequest( mSoap, mUrl.latin1(), nullptr, &destReq, &destResp ) != SOAP_OK ) { @@ -324,7 +324,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id ) ReadCalendarJob::ReadCalendarJob( GroupwiseServer *server, struct soap *soap, const TQString &url, const std::string &session ) - : GWJob( server, soap, url, session ), mCalendar( 0 ) + : GWJob( server, soap, url, session ), mCalendar( nullptr ) { kdDebug() << "ReadCalendarJob()" << endl; } @@ -351,10 +351,10 @@ void ReadCalendarJob::run() mSoap->header->ngwt__session = mSession; _ngwm__getFolderListRequest folderListReq; folderListReq.parent = "folders"; - folderListReq.view = 0; + folderListReq.view = nullptr; folderListReq.recurse = true; _ngwm__getFolderListResponse folderListRes; - int result = soap_call___ngw__getFolderListRequest( mSoap, mUrl.latin1(), 0, + int result = soap_call___ngw__getFolderListRequest( mSoap, mUrl.latin1(), nullptr, &folderListReq, &folderListRes ); @@ -466,8 +466,8 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts std::string *str = soap_new_std__string( mSoap, -1 ); str->append( "startDate endDate subject alarm allDayEvent place timezone iCalId recipients message recipientStatus recurrenceKey" ); itemsRequest.view = str; - itemsRequest.filter = 0; - itemsRequest.items = 0; + itemsRequest.filter = nullptr; + itemsRequest.items = nullptr; itemsRequest.count = -1; /* @@ -529,9 +529,9 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts #else cursorRequest.view = 0; #endif - cursorRequest.filter = 0; + cursorRequest.filter = nullptr; - soap_call___ngw__createCursorRequest( mSoap, mUrl.latin1(), 0, + soap_call___ngw__createCursorRequest( mSoap, mUrl.latin1(), nullptr, &cursorRequest, &cursorResponse ); if ( cursorResponse.cursor ) @@ -548,7 +548,7 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts readCursorRequest.position = (ngwt__CursorSeek*)soap_malloc( mSoap, sizeof(ngwt__CursorSeek) ); *( readCursorRequest.position ) = start; #else - readCursorRequest.position = 0; + readCursorRequest.position = nullptr; #endif readCursorRequest.count = (int*)soap_malloc( mSoap, sizeof(int) ); *( readCursorRequest.count ) = (int)readChunkSize; @@ -560,7 +560,7 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts mSoap->header->ngwt__session = mSession; kdDebug() << "sending readCursorRequest with session: " << mSession.c_str() << endl; _ngwm__readCursorResponse readCursorResponse; - if ( soap_call___ngw__readCursorRequest( mSoap, mUrl.latin1(), 0, + if ( soap_call___ngw__readCursorRequest( mSoap, mUrl.latin1(), nullptr, &readCursorRequest, &readCursorResponse ) != SOAP_OK ) { @@ -578,7 +578,7 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts std::vector::const_iterator it; for( it = readCursorResponse.items->item.begin(); it != readCursorResponse.items->item.end(); ++it ) { - KCal::Incidence *i = 0; + KCal::Incidence *i = nullptr; ngwt__Appointment *a = dynamic_cast( *it ); if ( a ) { i = conv.convertFromAppointment( a ); @@ -622,7 +622,7 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts destReq.container = id; destReq.cursor = cursor; mSoap->header->ngwt__session = mSession; - if ( soap_call___ngw__destroyCursorRequest( mSoap, mUrl.latin1(), 0, + if ( soap_call___ngw__destroyCursorRequest( mSoap, mUrl.latin1(), nullptr, &destReq, &destResp ) != SOAP_OK ) { @@ -675,10 +675,10 @@ void UpdateAddressBooksJob::run() request.deltaInfo->lastTimePORebuild = mLastPORebuildTime; request.deltaInfo->firstSequence = (unsigned long*)soap_malloc( mSoap, sizeof(unsigned long) ); *(request.deltaInfo->firstSequence) = mStartSequenceNumber; - request.deltaInfo->lastSequence = 0; /*(unsigned long*)soap_malloc( mSoap, sizeof(unsigned long) );*/ + request.deltaInfo->lastSequence = nullptr; /*(unsigned long*)soap_malloc( mSoap, sizeof(unsigned long) );*/ //request.view = soap_new_std__string( mSoap, -1 ); //request.view->append("id name version modified ItemChanges"); - request.view = 0; + request.view = nullptr; soap_call___ngw__getDeltasRequest( mSoap, mUrl.latin1(), nullptr, &request, &response); soap_print_fault( mSoap, stderr ); diff --git a/tderesources/groupwise/soap/incidenceconverter.cpp b/tderesources/groupwise/soap/incidenceconverter.cpp index 31eeae896..b41a86ade 100644 --- a/tderesources/groupwise/soap/incidenceconverter.cpp +++ b/tderesources/groupwise/soap/incidenceconverter.cpp @@ -51,23 +51,23 @@ KCal::Event* IncidenceConverter::convertFromAppointment( ngwt__Appointment* appo { kdDebug() << "IncidenceConverter::convertFromAppointment()" << endl; if ( !appointment ) - return 0; + return nullptr; KCal::Event *event = new KCal::Event(); if ( !convertFromCalendarItem( appointment, event ) ) { delete event; - return 0; + return nullptr; } if ( appointment->allDayEvent && (*appointment->allDayEvent) ) { event->setFloats( true ); - if ( appointment->startDay != 0 ) + if ( appointment->startDay != nullptr ) event->setDtStart( stringToTQDate( appointment->startDay ).addDays( 1 ) ); - if ( appointment->endDay != 0 ) + if ( appointment->endDay != nullptr ) event->setDtEnd( stringToTQDate( appointment->endDay) ); kdDebug() << " all day event." << endl; @@ -76,11 +76,11 @@ KCal::Event* IncidenceConverter::convertFromAppointment( ngwt__Appointment* appo { event->setFloats( false ); - if ( appointment->startDate != 0 ) { + if ( appointment->startDate != nullptr ) { event->setDtStart( charToTQDateTime( appointment->startDate, mTimezone ) ); } - if ( appointment->endDate != 0 ) + if ( appointment->endDate != nullptr ) event->setDtEnd( charToTQDateTime( appointment->endDate, mTimezone ) ); } @@ -110,22 +110,22 @@ ngwt__Appointment* IncidenceConverter::convertToAppointment( KCal::Event* event { kdDebug() << "IncidenceConverter::convertToAppointment()" << endl; if ( !event ) - return 0; + return nullptr; ngwt__Appointment* appointment = soap_new_ngwt__Appointment( soap(), -1 ); - appointment->startDate = 0; - appointment->endDate = 0; - appointment->startDay = 0; - appointment->endDay = 0; - appointment->acceptLevel = 0; - appointment->alarm = 0; - appointment->allDayEvent = 0; - appointment->place = 0; - appointment->timezone = 0; + appointment->startDate = nullptr; + appointment->endDate = nullptr; + appointment->startDay = nullptr; + appointment->endDay = nullptr; + appointment->acceptLevel = nullptr; + appointment->alarm = nullptr; + appointment->allDayEvent = nullptr; + appointment->place = nullptr; + appointment->timezone = nullptr; if ( !convertToCalendarItem( event, appointment ) ) { soap_dealloc( soap(), appointment ); - return 0; + return nullptr; } if ( event->doesFloat() ) { @@ -155,7 +155,7 @@ ngwt__Appointment* IncidenceConverter::convertToAppointment( KCal::Event* event else kdDebug() << " event end date not valid " << endl; } else { - appointment->allDayEvent = 0; + appointment->allDayEvent = nullptr; if ( event->dtStart().isValid() ) appointment->startDate = qDateTimeToChar( event->dtStart(), mTimezone ); @@ -178,16 +178,16 @@ ngwt__Appointment* IncidenceConverter::convertToAppointment( KCal::Event* event appointment->alarm = alarm; } else - appointment->alarm = 0; + appointment->alarm = nullptr; if ( !event->location().isEmpty() ) { std::string* location = qStringToString( event->location() ); appointment->place = location; } else - appointment->place = 0; + appointment->place = nullptr; - appointment->timezone = 0; + appointment->timezone = nullptr; return appointment; } @@ -195,13 +195,13 @@ ngwt__Appointment* IncidenceConverter::convertToAppointment( KCal::Event* event KCal::Todo* IncidenceConverter::convertFromTask( ngwt__Task* task ) { if ( !task ) - return 0; + return nullptr; KCal::Todo *todo = new KCal::Todo(); if ( !convertFromCalendarItem( task, todo ) ) { delete todo; - return 0; + return nullptr; } if ( task->startDate ) { @@ -235,17 +235,17 @@ KCal::Todo* IncidenceConverter::convertFromTask( ngwt__Task* task ) ngwt__Task* IncidenceConverter::convertToTask( KCal::Todo* todo ) { if ( !todo ) - return 0; + return nullptr; ngwt__Task* task = soap_new_ngwt__Task( soap(), -1 ); - task->startDate = 0; - task->dueDate = 0; - task->assignedDate = 0; - task->taskPriority = 0; - task->completed = 0; + task->startDate = nullptr; + task->dueDate = nullptr; + task->assignedDate = nullptr; + task->taskPriority = nullptr; + task->completed = nullptr; if ( !convertToCalendarItem( todo, task ) ) { soap_dealloc( soap(), task ); - return 0; + return nullptr; } if ( todo->dtStart().isValid() ) @@ -272,14 +272,14 @@ KCal::Journal* IncidenceConverter::convertFromNote( ngwt__Note* note) { kdDebug() << "IncidenceConverter::convertFromNote()" << endl; if ( !note ) - return 0; + return nullptr; KCal::Journal *journal = new KCal::Journal(); if ( !convertFromCalendarItem( note, journal ) ) { kdDebug() << "Couldn't convert Note to Journal!" << endl; delete journal; - return 0; + return nullptr; } if ( note->startDate ) { @@ -293,13 +293,13 @@ KCal::Journal* IncidenceConverter::convertFromNote( ngwt__Note* note) ngwt__Note* IncidenceConverter::convertToNote( KCal::Journal* journal ) { if ( !journal ) - return 0; + return nullptr; ngwt__Note* note = soap_new_ngwt__Note( soap(), -1 ); - note->startDate = 0; + note->startDate = nullptr; if ( !convertToCalendarItem( journal, note ) ) { soap_dealloc( soap(), note ); - return 0; + return nullptr; } if ( journal->doesFloat() ) { @@ -321,46 +321,46 @@ bool IncidenceConverter::convertToCalendarItem( KCal::Incidence* incidence, ngwt //TODO: support the new iCal standard recurrence rule // ngwt__CalendarItem - item->rdate = 0; - item->rrule = 0; - item->exdate = 0; - item->recurrenceKey = 0; - item->iCalId = 0; + item->rdate = nullptr; + item->rrule = nullptr; + item->exdate = nullptr; + item->recurrenceKey = nullptr; + item->iCalId = nullptr; // ngwt__Mail - item->subject = 0; - item->originalSubject = 0; - item->subjectPrefix = 0; - item->distribution = 0; - item->message = 0; - item->attachments = 0; - item->options = 0; - item->link = 0; + item->subject = nullptr; + item->originalSubject = nullptr; + item->subjectPrefix = nullptr; + item->distribution = nullptr; + item->message = nullptr; + item->attachments = nullptr; + item->options = nullptr; + item->link = nullptr; item->hasAttachment = false; item->size = 0; - item->subType = 0; - item->nntpOrImap = 0; - item->smimeType = 0; + item->subType = nullptr; + item->nntpOrImap = nullptr; + item->smimeType = nullptr; // ngwt__BoxEntry - item->status = 0; - item->thread = 0; - item->msgId = 0; - item->messageId = 0; - item->source = 0; - item->returnSentItemsId = 0; - item->delivered = 0; - item->class_ = 0; - item->security = 0; - item->comment = 0; + item->status = nullptr; + item->thread = nullptr; + item->msgId = nullptr; + item->messageId = nullptr; + item->source = nullptr; + item->returnSentItemsId = nullptr; + item->delivered = nullptr; + item->class_ = nullptr; + item->security = nullptr; + item->comment = nullptr; // ngwt__ContainerItem - item->categories = 0; - item->created = 0; - item->customs = 0; + item->categories = nullptr; + item->created = nullptr; + item->customs = nullptr; // ngwt__Item - item->id = 0; - item->name = 0; - item->version = 0; - item->modified = 0; - item->changes = 0; + item->id = nullptr; + item->name = nullptr; + item->version = nullptr; + item->modified = nullptr; + item->changes = nullptr; TQString id = incidence->customProperty( "GWRESOURCE", "UID" ); if ( !id.isEmpty() ) item->id = qStringToString( id ); @@ -369,7 +369,7 @@ bool IncidenceConverter::convertToCalendarItem( KCal::Incidence* incidence, ngwt if ( !incidence->customProperty( "GWRESOURCE", "CONTAINER" ).isEmpty() ) { std::vector* container = soap_new_std__vectorTemplateOfPointerTongwt__ContainerRef( soap(), -1 ); ngwt__ContainerRef* containerRef = soap_new_ngwt__ContainerRef( soap(), -1 ); - containerRef->deleted = 0; + containerRef->deleted = nullptr; containerRef->__item = incidence->customProperty( "GWRESOURCE", "CONTAINER" ).utf8().data(); container->push_back( containerRef ); @@ -393,10 +393,10 @@ bool IncidenceConverter::convertToCalendarItem( KCal::Incidence* incidence, ngwt // options item->options = soap_new_ngwt__ItemOptions( soap(), -1 ); - item->options->concealSubject = 0; - item->options->delayDeliveryUntil = 0; - item->options->expires = 0; - item->options->hidden = 0; + item->options->concealSubject = nullptr; + item->options->delayDeliveryUntil = nullptr; + item->options->expires = nullptr; + item->options->hidden = nullptr; item->options->priority = Standard; // summary @@ -436,11 +436,11 @@ void IncidenceConverter::setAttendees( KCal::Incidence *incidence, item->distribution->from = soap_new_ngwt__From( soap(), -1 ); // ngwt__From - item->distribution->from->replyTo = 0; + item->distribution->from->replyTo = nullptr; // ngwt__NameAndEmail - item->distribution->from->displayName = 0; - item->distribution->from->email = 0; - item->distribution->from->uuid = 0; + item->distribution->from->displayName = nullptr; + item->distribution->from->email = nullptr; + item->distribution->from->uuid = nullptr; item->distribution->from->displayName = qStringToString( incidence->organizer().name() ); item->distribution->from->email = qStringToString( incidence->organizer().email() ); @@ -453,14 +453,14 @@ void IncidenceConverter::setAttendees( KCal::Incidence *incidence, to += incidence->organizer().name(); item->distribution->sendoptions = soap_new_ngwt__SendOptions( soap(), -1 ); - item->distribution->sendoptions->requestReply = 0; - item->distribution->sendoptions->mimeEncoding = 0; - item->distribution->sendoptions->notification = 0; + item->distribution->sendoptions->requestReply = nullptr; + item->distribution->sendoptions->mimeEncoding = nullptr; + item->distribution->sendoptions->notification = nullptr; item->distribution->sendoptions->statusTracking = soap_new_ngwt__StatusTracking( soap(), -1 ); - item->distribution->sendoptions->statusTracking->autoDelete = 0; + item->distribution->sendoptions->statusTracking->autoDelete = nullptr; item->distribution->sendoptions->statusTracking->__item = All_; item->distribution->recipients = soap_new_ngwt__RecipientList( soap(), -1 ); @@ -479,8 +479,8 @@ void IncidenceConverter::setAttendees( KCal::Incidence *incidence, item->distribution->recipients->recipient.push_back( createRecipient( (*it)->name(), (*it)->email(), uuid ) ); } item->distribution->to = qStringToString( to ); - item->distribution->cc = 0; - item->distribution->bc = 0; + item->distribution->cc = nullptr; + item->distribution->bc = nullptr; } ngwt__Recipient *IncidenceConverter::createRecipient( const TQString &name, @@ -488,24 +488,24 @@ ngwt__Recipient *IncidenceConverter::createRecipient( const TQString &name, { ngwt__Recipient *recipient = soap_new_ngwt__Recipient( soap(), -1 ); - recipient->recipientStatus = 0; + recipient->recipientStatus = nullptr; if ( !uuid.isEmpty() ) recipient->uuid = qStringToString( uuid ); - else recipient->uuid = 0; + else recipient->uuid = nullptr; if ( !name.isEmpty() ) { kdDebug() << "- recipient name: " << name << endl; recipient->displayName = qStringToString( name ); } else { - recipient->displayName = 0; + recipient->displayName = nullptr; } if ( !email.isEmpty() ) { kdDebug() << "- recipient email: " << email << endl; recipient->email = qStringToString( email ); } else { - recipient->email = 0; + recipient->email = nullptr; } recipient->distType = TO; recipient->recipType = User_; - recipient->acceptLevel = 0; + recipient->acceptLevel = nullptr; return recipient; } @@ -524,7 +524,7 @@ bool IncidenceConverter::convertFromCalendarItem( ngwt__CalendarItem* item, kdDebug() << "item created at " << item->created << endl; incidence->setCreated( charToTQDateTime( item->created, mTimezone ) ); } - if ( item->modified != 0 ) { + if ( item->modified != nullptr ) { kdDebug() << "item modified at " << item->created << endl; incidence->setLastModified( charToTQDateTime( item->modified, mTimezone ) ); } @@ -591,20 +591,20 @@ void IncidenceConverter::setItemDescription( KCal::Incidence *incidence, (unsigned char*)qStringToChar( incidence->description().utf8() ); data.__size = incidence->description().utf8().length(); - part->id = 0; + part->id = nullptr; part->__item = data; - part->contentId = 0; + part->contentId = nullptr; std::string *str = soap_new_std__string( soap(), -1 ); str->append( "text/plain" ); part->contentType = str; - part->length = 0; // this is optional and sending the actual length of the source string truncates the data. - part->offset = 0; // optional + part->length = nullptr; // this is optional and sending the actual length of the source string truncates the data. + part->offset = nullptr; // optional message->part.push_back( part ); item->message = message; } else - item->message = 0; + item->message = nullptr; } void IncidenceConverter::getAttendees( ngwt__CalendarItem *item, KCal::Incidence *incidence ) @@ -648,20 +648,20 @@ void IncidenceConverter::getAttendees( ngwt__CalendarItem *item, KCal::Incidence void IncidenceConverter::setRecurrence( KCal::Incidence * incidence, ngwt__CalendarItem * item ) { kdDebug() << k_funcinfo << endl; - ngwt__Frequency * freq = 0; + ngwt__Frequency * freq = nullptr; const KCal::Recurrence * recur = incidence->recurrence(); if ( incidence->doesRecur() ) { item->rrule = soap_new_ngwt__RecurrenceRule( soap(), -1 ); - item->rrule->frequency = 0; // - item->rrule->count = 0; - item->rrule->until = 0; // - item->rrule->interval = 0; // - item->rrule->byDay = 0; - item->rrule->byYearDay = 0; - item->rrule->byMonthDay = 0; - item->rrule->byMonth = 0; + item->rrule->frequency = nullptr; // + item->rrule->count = nullptr; + item->rrule->until = nullptr; // + item->rrule->interval = nullptr; // + item->rrule->byDay = nullptr; + item->rrule->byYearDay = nullptr; + item->rrule->byMonthDay = nullptr; + item->rrule->byMonth = nullptr; freq = (ngwt__Frequency *)soap_malloc( soap(), sizeof( ngwt__Frequency ) ); // interval if ( recur->frequency() > 1 ) { @@ -737,7 +737,7 @@ void IncidenceConverter::setRecurrence( KCal::Incidence * incidence, ngwt__Calen if ( ba[i] ) { ngwt__DayOfYearWeek * day = soap_new_ngwt__DayOfYearWeek( soap(), -1 ); - day->occurrence = 0; + day->occurrence = nullptr; switch( i ) { case 0: diff --git a/tderesources/groupwise/soap/ksslsocket.cpp b/tderesources/groupwise/soap/ksslsocket.cpp index 6a3b84608..0c36bcfbf 100644 --- a/tderesources/groupwise/soap/ksslsocket.cpp +++ b/tderesources/groupwise/soap/ksslsocket.cpp @@ -48,8 +48,8 @@ KSSLSocket::KSSLSocket() : KExtendedSocket() // kdDebug() << "KSSLSocket() " << (void*)this << endl; d = new KSSLSocketPrivate; - d->kssl = 0L; - d->dcc = 0L; + d->kssl = nullptr; + d->dcc = nullptr; d->cc = new KSSLCertificateCache; d->cc->reload(); @@ -129,7 +129,7 @@ void KSSLSocket::slotConnected() { kdError(0) << k_funcinfo << "SSL not functional!" << endl; - d->kssl = 0L; + d->kssl = nullptr; emit sslFailure(); closeNow(); } -- cgit v1.2.3