From 2ea5a6376f1445fc9e8daf5696e6fa5b74dbc1ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 3 Sep 2016 15:49:18 +0200 Subject: [PATCH] Fix FTBFS with GCC6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit dcf83fa05df5be638bd93b7b13e2ad7d1335ec65) --- .../specialdates/specialdates_plugin.h | 2 +- .../groupwise/soap/incidenceconverter.cpp | 2 +- .../newexchange/exchangeconvertercalendar.cpp | 20 +++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/kontact/plugins/specialdates/specialdates_plugin.h b/kontact/plugins/specialdates/specialdates_plugin.h index e0ac8a0e..a0da6938 100644 --- a/kontact/plugins/specialdates/specialdates_plugin.h +++ b/kontact/plugins/specialdates/specialdates_plugin.h @@ -42,7 +42,7 @@ class SpecialdatesPlugin : public Kontact::Plugin virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget ); protected: - virtual KParts::ReadOnlyPart *createPart() { return false; } + virtual KParts::ReadOnlyPart *createPart() { return 0; } private: TDEAboutData *mAboutData; diff --git a/tderesources/groupwise/soap/incidenceconverter.cpp b/tderesources/groupwise/soap/incidenceconverter.cpp index 3f08a534..84e28e69 100644 --- a/tderesources/groupwise/soap/incidenceconverter.cpp +++ b/tderesources/groupwise/soap/incidenceconverter.cpp @@ -460,7 +460,7 @@ void IncidenceConverter::setAttendees( KCal::Incidence *incidence, item->distribution->sendoptions->statusTracking = soap_new_ngwt__StatusTracking( soap(), -1 ); - item->distribution->sendoptions->statusTracking->autoDelete = false; + item->distribution->sendoptions->statusTracking->autoDelete = 0; item->distribution->sendoptions->statusTracking->__item = All_; item->distribution->recipients = soap_new_ngwt__RecipientList( soap(), -1 ); diff --git a/tderesources/newexchange/exchangeconvertercalendar.cpp b/tderesources/newexchange/exchangeconvertercalendar.cpp index bf2a66db..85baf974 100644 --- a/tderesources/newexchange/exchangeconvertercalendar.cpp +++ b/tderesources/newexchange/exchangeconvertercalendar.cpp @@ -63,15 +63,15 @@ void ExchangeConverterCalendar::setTimeZone( const TQString &id ) } #define propertyDAV( prop ) \ - WebdavHandler::addElement( doc, root, "d:"prop ) + WebdavHandler::addElement( doc, root, "d:" prop ) #define propertyNS( ns, prop ) \ WebdavHandler::addElementNS( doc, root, ns, prop ) #define propertyCalendar( prop ) \ - WebdavHandler::addElement( doc, root, "c:"prop ) + WebdavHandler::addElement( doc, root, "c:" prop ) #define propertyHTTPMail( prop ) \ - WebdavHandler::addElement( doc, root, "m:"prop ) + WebdavHandler::addElement( doc, root, "m:" prop ) #define propertyMailHeader( prop ) \ - WebdavHandler::addElement( doc, root, "h:"prop ) + WebdavHandler::addElement( doc, root, "h:" prop ) #define property( prop ) \ WebdavHandler::addElement( doc, root, prop ) @@ -128,9 +128,9 @@ void ExchangeConverterCalendar::createRequestAppointment( TQDomDocument &doc, TQ } #define propertyTask1( prop ) \ - WebdavHandler::addElement( doc, props, "t1:"prop ) + WebdavHandler::addElement( doc, props, "t1:" prop ) #define propertyTask2( prop ) \ - WebdavHandler::addElement( doc, props, "t2:"prop ) + WebdavHandler::addElement( doc, props, "t2:" prop ) void ExchangeConverterCalendar::createRequestTask( TQDomDocument &doc, TQDomElement &props ) { @@ -564,15 +564,15 @@ Incidence::List ExchangeConverterCalendar::parseWebDAV( const TQDomDocument& dav #define domDavProperty( name, value ) \ - WebdavHandler::addElement( mDoc, mElement, "d:"name, value ) + WebdavHandler::addElement( mDoc, mElement, "d:" name, value ) #define domProperty( NS, name, value ) \ WebdavHandler::addElementNS( mDoc, mElement, NS, name, value ) #define domCalendarProperty( name, value ) \ - WebdavHandler::addElement( mDoc, mElement, "c:"name, value ) + WebdavHandler::addElement( mDoc, mElement, "c:" name, value ) #define domHTTPMailProperty( name, value ) \ - WebdavHandler::addElement( mDoc, mElement, "m:"name, value ) + WebdavHandler::addElement( mDoc, mElement, "m:" name, value ) #define domMailHeaderProperty( name, value ) \ - WebdavHandler::addElement( mDoc, mElement, "h:"name, value ) + WebdavHandler::addElement( mDoc, mElement, "h:" name, value )