Hello community, here is the log from the commit of package kcalutils for openSUSE:Factory checked in at 2016-05-31 12:15:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcalutils (Old) and /work/SRC/openSUSE:Factory/.kcalutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcalutils" Changes: -------- --- /work/SRC/openSUSE:Factory/kcalutils/kcalutils.changes 2016-03-26 15:14:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kcalutils.new/kcalutils.changes 2016-05-31 12:15:58.000000000 +0200 @@ -1,0 +2,24 @@ +Sat May 7 10:19:54 UTC 2016 - [email protected] + +- Update to KDE Applications 16.04.1 + * KDE Applications 16.04.1 + * https://www.kde.org/announcements/announce-applications-16.04.1.php + + +------------------------------------------------------------------- +Sun Apr 17 05:58:28 UTC 2016 - [email protected] + +- Update to KDE Applications 16.04.0 + * KDE Applications 16.04.0 + * https://www.kde.org/announcements/announce-applications-16.04.0.php + + +------------------------------------------------------------------- +Mon Apr 11 06:35:40 UTC 2016 - [email protected] + +- Update to KDE Applications 16.03.90 + * KDE Applications 16.04.0 RC + * https://www.kde.org/announcements/announce-applications-16.04-rc.php + + +------------------------------------------------------------------- Old: ---- kcalutils-15.12.3.tar.xz New: ---- kcalutils-16.04.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcalutils.spec ++++++ --- /var/tmp/diff_new_pack.FfHNg3/_old 2016-05-31 12:15:59.000000000 +0200 +++ /var/tmp/diff_new_pack.FfHNg3/_new 2016-05-31 12:15:59.000000000 +0200 @@ -17,7 +17,7 @@ Name: kcalutils -Version: 15.12.3 +Version: 16.04.1 Release: 0 %define kf5_version 5.1.0 Summary: KDE PIM Libraries: KCalUtils @@ -50,7 +50,7 @@ BuildRequires: kwallet-devel >= %{kf5_version} BuildRequires: kwidgetsaddons-devel >= %{kf5_version} BuildRequires: kxmlgui-devel >= %{kf5_version} -BuildRequires: libKF5AkonadiPrivate-devel >= 1.72.43 +BuildRequires: akonadi-server-devel BuildRequires: libassuan-devel BuildRequires: libical-devel >= 0.42 BuildRequires: libxslt-devel ++++++ kcalutils-15.12.3.tar.xz -> kcalutils-16.04.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-15.12.3/CMakeLists.txt new/kcalutils-16.04.1/CMakeLists.txt --- old/kcalutils-15.12.3/CMakeLists.txt 2015-12-28 14:42:58.000000000 +0100 +++ new/kcalutils-16.04.1/CMakeLists.txt 2016-04-26 22:16:43.000000000 +0200 @@ -3,7 +3,7 @@ project(KCalUtils) # ECM setup -find_package(ECM 5.14.0 CONFIG REQUIRED) +find_package(ECM 5.19.0 CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(ECMGenerateHeaders) @@ -13,13 +13,13 @@ include(FeatureSummary) include(KDEInstallDirs) include(KDECMakeSettings) -include(KDEFrameworkCompilerSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMQtDeclareLoggingCategory) -set(KF5_VERSION "5.14.0") -set(CALENDARUTILS_LIB_VERSION "4.80.0") -set(CALENDARCORE_LIB_VERSION "4.81.0") -set(IDENTITYMANAGER_LIB_VERSION "4.80.0") +set(KF5_VERSION "5.19.0") +set(CALENDARUTILS_LIB_VERSION "5.2.1") +set(CALENDARCORE_LIB_VERSION "5.2.0") +set(IDENTITYMANAGER_LIB_VERSION "5.2.0") ecm_setup_version(${CALENDARUTILS_LIB_VERSION} VARIABLE_PREFIX KCALUTILS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kcalutils_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5CalendarUtilsConfigVersion.cmake" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-15.12.3/autotests/testincidenceformatter.cpp new/kcalutils-16.04.1/autotests/testincidenceformatter.cpp --- old/kcalutils-15.12.3/autotests/testincidenceformatter.cpp 2015-12-28 14:42:58.000000000 +0100 +++ new/kcalutils-16.04.1/autotests/testincidenceformatter.cpp 2016-04-26 22:16:43.000000000 +0200 @@ -145,7 +145,6 @@ // qDebug() << "recurrenceString=" << IncidenceFormatter::recurrenceString( e3 ); } - KCalCore::Calendar::Ptr IncidenceFormatterTest::loadCalendar(const QString &name) { auto calendar = KCalCore::MemoryCalendar::Ptr::create(KDateTime::UTC); @@ -161,14 +160,14 @@ bool IncidenceFormatterTest::validateHtml(const QString &name, const QString &_html) { QString html = QStringLiteral("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\";>\n" - "<html xmlns=\"http://www.w3.org/1999/xhtml\";>\n" - " <head>\n" - " <title></title>\n" - " <style></style>\n" - " </head>\n" - "<body>") - + _html - + QStringLiteral("</body>\n</html>"); + "<html xmlns=\"http://www.w3.org/1999/xhtml\";>\n" + " <head>\n" + " <title></title>\n" + " <style></style>\n" + " </head>\n" + "<body>") + + _html + + QStringLiteral("</body>\n</html>"); const QString outFileName = QStringLiteral(TEST_DATA_DIR "/%1.out").arg(name); const QString htmlFileName = QStringLiteral(TEST_DATA_DIR "/%1.out.html").arg(name); @@ -247,9 +246,9 @@ GrantleeTemplateManager::instance()->setTemplatePath(QStringLiteral(TEST_TEMPLATE_PATH)); const QString expected = QStringLiteral( - "<h1>Template parsing error</h1>\n" - "<b>Template:</b> broken-template.html<br>\n" - "<b>Error message:</b> Unclosed tag in template broken-template.html. Expected one of: (else endif), line 2, broken-template.html"); + "<h1>Template parsing error</h1>\n" + "<b>Template:</b> broken-template.html<br>\n" + "<b>Error message:</b> Unclosed tag in template broken-template.html. Expected one of: (else endif), line 2, broken-template.html"); QCOMPARE(html, expected); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-15.12.3/src/dndfactory.cpp new/kcalutils-16.04.1/src/dndfactory.cpp --- old/kcalutils-15.12.3/src/dndfactory.cpp 2015-12-28 14:42:58.000000000 +0100 +++ new/kcalutils-16.04.1/src/dndfactory.cpp 2016-04-26 22:16:43.000000000 +0200 @@ -68,7 +68,7 @@ Incidence::Ptr pasteIncidence(const Incidence::Ptr &incidence, KDateTime newDateTime, - const QFlags<DndFactory::PasteFlag> &pasteOptions) + QFlags<DndFactory::PasteFlag> pasteOptions) { Incidence::Ptr inc(incidence); @@ -330,7 +330,7 @@ } Incidence::List DndFactory::pasteIncidences(const KDateTime &newDateTime, - const QFlags<PasteFlag> &pasteOptions) + QFlags<KCalUtils::DndFactory::PasteFlag> pasteOptions) { QClipboard *clipboard = QApplication::clipboard(); Q_ASSERT(clipboard); @@ -373,7 +373,7 @@ } Incidence::Ptr DndFactory::pasteIncidence(const KDateTime &newDateTime, - const QFlags<PasteFlag> &pasteOptions) + QFlags<KCalUtils::DndFactory::PasteFlag> pasteOptions) { QClipboard *clipboard = QApplication::clipboard(); MemoryCalendar::Ptr calendar(createDropCalendar(clipboard->mimeData())); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-15.12.3/src/dndfactory.h new/kcalutils-16.04.1/src/dndfactory.h --- old/kcalutils-15.12.3/src/dndfactory.h 2015-12-28 14:42:58.000000000 +0100 +++ new/kcalutils-16.04.1/src/dndfactory.h 2016-04-26 22:16:43.000000000 +0200 @@ -158,7 +158,7 @@ */ KCalCore::Incidence::List pasteIncidences( const KDateTime &newDateTime = KDateTime(), - const QFlags<PasteFlag> &pasteOptions = QFlags<PasteFlag>()); + QFlags<KCalUtils::DndFactory::PasteFlag> pasteOptions = QFlags<PasteFlag>()); /** This function clones the incidence that's in the clipboard and sets the clone's @@ -176,7 +176,7 @@ */ KCalCore::Incidence::Ptr pasteIncidence( const KDateTime &newDateTime = KDateTime(), - const QFlags<PasteFlag> &pasteOptions = QFlags<PasteFlag>()); + QFlags<KCalUtils::DndFactory::PasteFlag> pasteOptions = QFlags<PasteFlag>()); private: //@cond PRIVATE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-15.12.3/src/grantlee_plugin/datetimefilters.cpp new/kcalutils-16.04.1/src/grantlee_plugin/datetimefilters.cpp --- old/kcalutils-15.12.3/src/grantlee_plugin/datetimefilters.cpp 2015-12-28 14:42:58.000000000 +0100 +++ new/kcalutils-16.04.1/src/grantlee_plugin/datetimefilters.cpp 2016-04-26 22:16:43.000000000 +0200 @@ -57,8 +57,6 @@ return true; } - - KTimeFilter::KTimeFilter() : Grantlee::Filter() { @@ -83,7 +81,7 @@ const bool shortFmt = (argument.value<Grantlee::SafeString>().get().compare(QLatin1String("short"), Qt::CaseInsensitive) == 0); - return Grantlee::SafeString( KCalUtils::IncidenceFormatter::timeToString(KDateTime(QDate(), time), shortFmt)); + return Grantlee::SafeString(KCalUtils::IncidenceFormatter::timeToString(KDateTime(QDate(), time), shortFmt)); } bool KTimeFilter::isSafe() const @@ -91,8 +89,6 @@ return true; } - - KDateTimeFilter::KDateTimeFilter() : Grantlee::Filter() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-15.12.3/src/grantlee_plugin/datetimefilters.h new/kcalutils-16.04.1/src/grantlee_plugin/datetimefilters.h --- old/kcalutils-15.12.3/src/grantlee_plugin/datetimefilters.h 2015-12-28 14:42:58.000000000 +0100 +++ new/kcalutils-16.04.1/src/grantlee_plugin/datetimefilters.h 2016-04-26 22:16:43.000000000 +0200 @@ -31,6 +31,8 @@ QVariant doFilter(const QVariant &input, const QVariant &argument = QVariant(), bool autoescape = false) const Q_DECL_OVERRIDE; bool isSafe() const Q_DECL_OVERRIDE; +private: + Q_DISABLE_COPY(KDateFilter) }; class KTimeFilter : public Grantlee::Filter @@ -42,6 +44,8 @@ QVariant doFilter(const QVariant &input, const QVariant &argument = QVariant(), bool autoescape = false) const Q_DECL_OVERRIDE; bool isSafe() const Q_DECL_OVERRIDE; +private: + Q_DISABLE_COPY(KTimeFilter) }; class KDateTimeFilter : public Grantlee::Filter @@ -53,6 +57,8 @@ QVariant doFilter(const QVariant &input, const QVariant &argument = QVariant(), bool autoescape = false) const Q_DECL_OVERRIDE; bool isSafe() const Q_DECL_OVERRIDE; +private: + Q_DISABLE_COPY(KDateTimeFilter) }; #endif // DATETIMEFILTERS_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-15.12.3/src/grantlee_plugin/icon.cpp new/kcalutils-16.04.1/src/grantlee_plugin/icon.cpp --- old/kcalutils-15.12.3/src/grantlee_plugin/icon.cpp 2015-12-28 14:42:58.000000000 +0100 +++ new/kcalutils-16.04.1/src/grantlee_plugin/icon.cpp 2016-04-26 22:16:43.000000000 +0200 @@ -25,7 +25,7 @@ #include <KIconLoader> -IconTag::IconTag(QObject* parent) +IconTag::IconTag(QObject *parent) : Grantlee::AbstractNodeFactory(parent) { } @@ -39,19 +39,19 @@ Q_UNUSED(p); static QHash<QString, int> sizeOrGroupLookup - = { { QStringLiteral("desktop"), KIconLoader::Desktop }, - { QStringLiteral("toolbar"), KIconLoader::Toolbar }, - { QStringLiteral("maintoolbar"), KIconLoader::MainToolbar }, - { QStringLiteral("small"), KIconLoader::Small }, - { QStringLiteral("panel"), KIconLoader::Panel }, - { QStringLiteral("dialog"), KIconLoader::Dialog }, - { QStringLiteral("sizesmall"), KIconLoader::SizeSmall }, - { QStringLiteral("sizesmallmedium"), KIconLoader::SizeSmallMedium }, - { QStringLiteral("sizemedium"), KIconLoader::SizeMedium }, - { QStringLiteral("sizelarge"), KIconLoader::SizeLarge }, - { QStringLiteral("sizehuge"), KIconLoader::SizeHuge }, - { QStringLiteral("sizeenormous"), KIconLoader::SizeEnormous } - }; + = { { QStringLiteral("desktop"), KIconLoader::Desktop }, + { QStringLiteral("toolbar"), KIconLoader::Toolbar }, + { QStringLiteral("maintoolbar"), KIconLoader::MainToolbar }, + { QStringLiteral("small"), KIconLoader::Small }, + { QStringLiteral("panel"), KIconLoader::Panel }, + { QStringLiteral("dialog"), KIconLoader::Dialog }, + { QStringLiteral("sizesmall"), KIconLoader::SizeSmall }, + { QStringLiteral("sizesmallmedium"), KIconLoader::SizeSmallMedium }, + { QStringLiteral("sizemedium"), KIconLoader::SizeMedium }, + { QStringLiteral("sizelarge"), KIconLoader::SizeLarge }, + { QStringLiteral("sizehuge"), KIconLoader::SizeHuge }, + { QStringLiteral("sizeenormous"), KIconLoader::SizeEnormous } + }; const QStringList parts = smartSplit(tagContent); const int partsSize = parts.size(); @@ -87,9 +87,7 @@ return new IconNode(parts.at(1), sizeOrGroup, altText); } - - -IconNode::IconNode(QObject* parent) +IconNode::IconNode(QObject *parent) : Grantlee::Node(parent) { } @@ -134,10 +132,10 @@ } const QString html = QStringLiteral("<img src=\"file://%1\" align=\"top\" height=\"%2\" width=\"%2\" alt=\"%3\" title=\"%4\" />") - .arg(KIconLoader::global()->iconPath(iconName, mSizeOrGroup)) - .arg(mSizeOrGroup < KIconLoader::LastGroup ? - IconSize(static_cast<KIconLoader::Group>(mSizeOrGroup)) - : mSizeOrGroup) - .arg(altText.isEmpty() ? iconName : altText, altText); // title is intentionally blank if no alt is provided + .arg(KIconLoader::global()->iconPath(iconName, mSizeOrGroup)) + .arg(mSizeOrGroup < KIconLoader::LastGroup ? + IconSize(static_cast<KIconLoader::Group>(mSizeOrGroup)) + : mSizeOrGroup) + .arg(altText.isEmpty() ? iconName : altText, altText); // title is intentionally blank if no alt is provided (*stream) << Grantlee::SafeString(html, Grantlee::SafeString::IsSafe); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-15.12.3/src/grantlee_plugin/icon.h new/kcalutils-16.04.1/src/grantlee_plugin/icon.h --- old/kcalutils-15.12.3/src/grantlee_plugin/icon.h 2015-12-28 14:42:58.000000000 +0100 +++ new/kcalutils-16.04.1/src/grantlee_plugin/icon.h 2016-04-26 22:16:43.000000000 +0200 @@ -49,9 +49,9 @@ * tags, but makes it easier to use {% icon %} in sub-templates. */ - class IconTag : public Grantlee::AbstractNodeFactory { + Q_OBJECT public: explicit IconTag(QObject *parent = Q_NULLPTR); ~IconTag(); @@ -75,5 +75,4 @@ int mSizeOrGroup; }; - #endif // ICON_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-15.12.3/src/grantlee_plugin/kcalendargrantleeplugin.cpp new/kcalutils-16.04.1/src/grantlee_plugin/kcalendargrantleeplugin.cpp --- old/kcalutils-15.12.3/src/grantlee_plugin/kcalendargrantleeplugin.cpp 2015-12-28 14:42:58.000000000 +0100 +++ new/kcalutils-16.04.1/src/grantlee_plugin/kcalendargrantleeplugin.cpp 2016-04-26 22:16:43.000000000 +0200 @@ -41,7 +41,7 @@ return nodeFactories; } -QHash<QString, Grantlee::Filter *> KCalendarGrantleePlugin::filters(const QString& name) +QHash<QString, Grantlee::Filter *> KCalendarGrantleePlugin::filters(const QString &name) { Q_UNUSED(name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-15.12.3/src/grantlee_plugin/kcalendargrantleeplugin.h new/kcalutils-16.04.1/src/grantlee_plugin/kcalendargrantleeplugin.h --- old/kcalutils-15.12.3/src/grantlee_plugin/kcalendargrantleeplugin.h 2015-12-28 14:42:58.000000000 +0100 +++ new/kcalutils-16.04.1/src/grantlee_plugin/kcalendargrantleeplugin.h 2016-04-26 22:16:43.000000000 +0200 @@ -23,7 +23,7 @@ #include <grantlee/taglibraryinterface.h> class KCalendarGrantleePlugin : public QObject - , public Grantlee::TagLibraryInterface + , public Grantlee::TagLibraryInterface { Q_OBJECT Q_INTERFACES(Grantlee::TagLibraryInterface) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-15.12.3/src/grantleeki18nlocalizer.cpp new/kcalutils-16.04.1/src/grantleeki18nlocalizer.cpp --- old/kcalutils-15.12.3/src/grantleeki18nlocalizer.cpp 2015-12-28 14:42:58.000000000 +0100 +++ new/kcalutils-16.04.1/src/grantleeki18nlocalizer.cpp 2016-04-26 22:16:43.000000000 +0200 @@ -36,9 +36,8 @@ { } - QString GrantleeKi18nLocalizer::processArguments(const KLocalizedString &kstr, - const QVariantList &arguments) const + const QVariantList &arguments) const { KLocalizedString str = kstr; for (auto iter = arguments.cbegin(), end = arguments.cend(); iter != end; ++iter) { @@ -69,7 +68,7 @@ str = str.subs(iter->value<Grantlee::SafeString>().get()); break; } - // fall-through + // fall-through default: qCWarning(KCALUTILS_LOG) << "Unknown type" << iter->typeName() << "(" << iter->type() << ")"; break; @@ -93,14 +92,14 @@ } QString GrantleeKi18nLocalizer::localizePluralContextString(const QString &string, const QString &pluralForm, - const QString &context, const QVariantList &arguments) const + const QString &context, const QVariantList &arguments) const { const KLocalizedString str = kxi18ncp(qPrintable(context), qPrintable(string), qPrintable(pluralForm)); return processArguments(str, arguments); } QString GrantleeKi18nLocalizer::localizePluralString(const QString &string, const QString &pluralForm, - const QVariantList &arguments) const + const QVariantList &arguments) const { const KLocalizedString str = kxi18np(qPrintable(string), qPrintable(pluralForm)); return processArguments(str, arguments); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-15.12.3/src/grantleetemplatemanager.cpp new/kcalutils-16.04.1/src/grantleetemplatemanager.cpp --- old/kcalutils-15.12.3/src/grantleetemplatemanager.cpp 2015-12-28 14:42:58.000000000 +0100 +++ new/kcalutils-16.04.1/src/grantleetemplatemanager.cpp 2016-04-26 22:16:43.000000000 +0200 @@ -40,7 +40,7 @@ , mLocalizer(new GrantleeKi18nLocalizer) { const QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kcalendar/templates"), - QStandardPaths::LocateDirectory); + QStandardPaths::LocateDirectory); if (path.isEmpty()) { qFatal("Cannot find KCalendarUtils templates, check your instalation"); } @@ -59,7 +59,7 @@ delete mEngine; } -GrantleeTemplateManager * GrantleeTemplateManager::instance() +GrantleeTemplateManager *GrantleeTemplateManager::instance() { if (!sInstance) { sInstance = new GrantleeTemplateManager; @@ -89,14 +89,14 @@ } QString GrantleeTemplateManager::errorTemplate(const QString &reason, - const QString &origTemplateName, - const Grantlee::Template &failedTemplate) const + const QString &origTemplateName, + const Grantlee::Template &failedTemplate) const { Grantlee::Template tpl = mEngine->newTemplate( - QStringLiteral("<h1>{{ error }}</h1>\n" - "<b>%1:</b> {{ templateName }}<br>\n" - "<b>%2:</b> {{ errorMessage }}") - .arg(i18n("Template"), i18n("Error message")), QStringLiteral("TemplateError")); + QStringLiteral("<h1>{{ error }}</h1>\n" + "<b>%1:</b> {{ templateName }}<br>\n" + "<b>%2:</b> {{ errorMessage }}") + .arg(i18n("Template"), i18n("Error message")), QStringLiteral("TemplateError")); Grantlee::Context ctx = createContext(); ctx.insert(QStringLiteral("error"), reason); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-15.12.3/src/grantleetemplatemanager_p.h new/kcalutils-16.04.1/src/grantleetemplatemanager_p.h --- old/kcalutils-15.12.3/src/grantleetemplatemanager_p.h 2015-12-28 14:42:58.000000000 +0100 +++ new/kcalutils-16.04.1/src/grantleetemplatemanager_p.h 2016-04-26 22:16:43.000000000 +0200 @@ -22,7 +22,8 @@ #include <QSharedPointer> -namespace Grantlee { +namespace Grantlee +{ class Engine; class FileSystemTemplateLoader; class TemplateImpl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-15.12.3/src/htmlexport.cpp new/kcalutils-16.04.1/src/htmlexport.cpp --- old/kcalutils-15.12.3/src/htmlexport.cpp 2015-12-28 14:42:58.000000000 +0100 +++ new/kcalutils-16.04.1/src/htmlexport.cpp 2016-04-26 22:16:43.000000000 +0200 @@ -302,7 +302,7 @@ void HtmlExport::createEvent(QTextStream *ts, const Event::Ptr &event, - const QDate &date, + QDate date, bool withDescription) { qCDebug(KCALUTILS_LOG) << event->summary(); @@ -755,7 +755,7 @@ return css; } -void HtmlExport::addHoliday(const QDate &date, const QString &name) +void HtmlExport::addHoliday(QDate date, const QString &name) { if (d->mHolidayMap[date].isEmpty()) { d->mHolidayMap[date] = name; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-15.12.3/src/htmlexport.h new/kcalutils-16.04.1/src/htmlexport.h --- old/kcalutils-15.12.3/src/htmlexport.h 2015-12-28 14:42:58.000000000 +0100 +++ new/kcalutils-16.04.1/src/htmlexport.h 2016-04-26 22:16:43.000000000 +0200 @@ -65,7 +65,7 @@ */ bool save(QTextStream *ts); - void addHoliday(const QDate &date, const QString &name); + void addHoliday(QDate date, const QString &name); protected: void createWeekView(QTextStream *ts); @@ -78,7 +78,7 @@ void createTodo(QTextStream *ts, const KCalCore::Todo::Ptr &todo); void createEvent(QTextStream *ts, const KCalCore::Event::Ptr &event, - const QDate &date, bool withDescription = true); + QDate date, bool withDescription = true); void createFooter(QTextStream *ts); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-15.12.3/src/incidenceformatter.cpp new/kcalutils-16.04.1/src/incidenceformatter.cpp --- old/kcalutils-15.12.3/src/incidenceformatter.cpp 2015-12-28 14:42:58.000000000 +0100 +++ new/kcalutils-16.04.1/src/incidenceformatter.cpp 2016-04-26 22:16:43.000000000 +0200 @@ -113,8 +113,8 @@ if (path.isEmpty() || path.startsWith(QLatin1Char('"'))) { path = email; } - QUrl mailto; - mailto.setScheme(QStringLiteral("mailto")); + QUrl mailto; + mailto.setScheme(QStringLiteral("mailto")); mailto.setPath(path); // static for performance @@ -311,7 +311,7 @@ //@cond PRIVATE static QVariantHash displayViewFormatPerson(const QString &email, const QString &name, - const QString &uid, const QString &iconName) + const QString &uid, const QString &iconName) { // Search for new print name or uid, if needed. QPair<QString, QString> s = searchNameAndUid(email, name, uid); @@ -342,7 +342,7 @@ } static QVariantHash displayViewFormatPerson(const QString &email, const QString &name, - const QString &uid, Attendee::PartStat status) + const QString &uid, Attendee::PartStat status) { return displayViewFormatPerson(email, name, uid, rsvpStatusIconName(status)); } @@ -373,10 +373,9 @@ return QString(); } - static QVariantList displayViewFormatAttendeeRoleList(const Incidence::Ptr &incidence, - Attendee::Role role, - bool showStatus) + Attendee::Role role, + bool showStatus) { QVariantList attendeeDataList; attendeeDataList.reserve(incidence->attendeeCount()); @@ -395,7 +394,7 @@ continue; } QVariantHash attendeeData = displayViewFormatPerson(a->email(), a->name(), a->uid(), - showStatus ? a->status() : Attendee::None); + showStatus ? a->status() : Attendee::None); if (!a->delegator().isEmpty()) { attendeeData[QStringLiteral("delegator")] = a->delegator(); } @@ -495,7 +494,7 @@ // It's callees duty to ensure this Q_ASSERT(event->customProperty("KABC", "BIRTHDAY") == QLatin1String("YES") || - event->customProperty("KABC", "ANNIVERSARY") == QLatin1String("YES")); + event->customProperty("KABC", "ANNIVERSARY") == QLatin1String("YES")); const QString uid_1 = event->customProperty("KABC", "UID-1"); const QString name_1 = event->customProperty("KABC", "NAME-1"); @@ -527,7 +526,7 @@ static QString displayViewFormatEvent(const Calendar::Ptr &calendar, const QString &sourceName, const Event::Ptr &event, - const QDate &date, const KDateTime::Spec &spec) + QDate date, const KDateTime::Spec &spec) { if (!event) { return QString(); @@ -538,7 +537,6 @@ incidence[QStringLiteral("calendar")] = calendar ? resourceString(calendar, event) : sourceName; incidence[QStringLiteral("location")] = event->richLocation(); - KDateTime startDt = event->dtStart(); KDateTime endDt = event->dtEnd(); if (event->recurs()) { @@ -602,7 +600,7 @@ static QString displayViewFormatTodo(const Calendar::Ptr &calendar, const QString &sourceName, const Todo::Ptr &todo, - const QDate &ocurrenceDueDate, const KDateTime::Spec &spec) + QDate ocurrenceDueDate, const KDateTime::Spec &spec) { if (!todo) { qCDebug(KCALUTILS_LOG) << "IncidenceFormatter::displayViewFormatTodo was called without to-do, quitting"; @@ -676,11 +674,11 @@ incidence[QStringLiteral("categories")] = todo->categories(); incidence[QStringLiteral("priority")] = todo->priority(); - if (todo->isCompleted()) { + if (todo->isCompleted()) { incidence[QStringLiteral("completedDate")] = todo->completed().dateTime(); - } else { + } else { incidence[QStringLiteral("percent")] = todo->percentComplete(); - } + } incidence[QStringLiteral("attachments")] = displayViewFormatAttachments(todo); incidence[QStringLiteral("creationDate")] = todo->created().toTimeSpec(spec).dateTime(); @@ -721,7 +719,7 @@ Period::List periods = fb->busyPeriods(); QVariantList periodsData; periodsData.reserve(periods.size()); - for ( auto it = periods.cbegin(), end = periods.cend(); it != end; ++it) { + for (auto it = periods.cbegin(), end = periods.cend(); it != end; ++it) { const Period per = *it; QVariantHash periodData; if (per.hasDuration()) { @@ -771,7 +769,7 @@ ~EventViewerVisitor(); - bool act(const Calendar::Ptr &calendar, const IncidenceBase::Ptr &incidence, const QDate &date, + bool act(const Calendar::Ptr &calendar, const IncidenceBase::Ptr &incidence, QDate date, const KDateTime::Spec &spec = KDateTime::Spec()) { mCalendar = calendar; @@ -782,7 +780,7 @@ return incidence->accept(*this, incidence); } - bool act(const QString &sourceName, const IncidenceBase::Ptr &incidence, const QDate &date, + bool act(const QString &sourceName, const IncidenceBase::Ptr &incidence, QDate date, const KDateTime::Spec &spec = KDateTime::Spec()) { mSourceName = sourceName; @@ -798,23 +796,19 @@ } protected: - bool visit(const Event::Ptr &event) Q_DECL_OVERRIDE - { + bool visit(const Event::Ptr &event) Q_DECL_OVERRIDE { mResult = displayViewFormatEvent(mCalendar, mSourceName, event, mDate, mSpec); return !mResult.isEmpty(); } - bool visit(const Todo::Ptr &todo) Q_DECL_OVERRIDE - { + bool visit(const Todo::Ptr &todo) Q_DECL_OVERRIDE { mResult = displayViewFormatTodo(mCalendar, mSourceName, todo, mDate, mSpec); return !mResult.isEmpty(); } - bool visit(const Journal::Ptr &journal) Q_DECL_OVERRIDE - { + bool visit(const Journal::Ptr &journal) Q_DECL_OVERRIDE { mResult = displayViewFormatJournal(mCalendar, mSourceName, journal, mSpec); return !mResult.isEmpty(); } - bool visit(const FreeBusy::Ptr &fb) Q_DECL_OVERRIDE - { + bool visit(const FreeBusy::Ptr &fb) Q_DECL_OVERRIDE { mResult = displayViewFormatFreeBusy(mCalendar, mSourceName, fb, mSpec); return !mResult.isEmpty(); } @@ -832,7 +826,7 @@ QString IncidenceFormatter::extensiveDisplayStr(const Calendar::Ptr &calendar, const IncidenceBase::Ptr &incidence, - const QDate &date, + QDate date, const KDateTime::Spec &spec) { if (!incidence) { @@ -849,7 +843,7 @@ QString IncidenceFormatter::extensiveDisplayStr(const QString &sourceName, const IncidenceBase::Ptr &incidence, - const QDate &date, + QDate date, const KDateTime::Spec &spec) { if (!incidence) { @@ -1622,7 +1616,7 @@ } static QString invitationDetailsFreeBusy(const FreeBusy::Ptr &fb, bool noHtmlMode, - const KDateTime::Spec &spec) + const KDateTime::Spec &spec) { Q_UNUSED(noHtmlMode); @@ -2285,23 +2279,19 @@ ~InvitationHeaderVisitor(); protected: - bool visit(const Event::Ptr &event) Q_DECL_OVERRIDE - { + bool visit(const Event::Ptr &event) Q_DECL_OVERRIDE { mResult = invitationHeaderEvent(event, mExistingIncidence, mMessage, mSender); return !mResult.isEmpty(); } - bool visit(const Todo::Ptr &todo) Q_DECL_OVERRIDE - { + bool visit(const Todo::Ptr &todo) Q_DECL_OVERRIDE { mResult = invitationHeaderTodo(todo, mExistingIncidence, mMessage, mSender); return !mResult.isEmpty(); } - bool visit(const Journal::Ptr &journal) Q_DECL_OVERRIDE - { + bool visit(const Journal::Ptr &journal) Q_DECL_OVERRIDE { mResult = invitationHeaderJournal(journal, mMessage); return !mResult.isEmpty(); } - bool visit(const FreeBusy::Ptr &fb) Q_DECL_OVERRIDE - { + bool visit(const FreeBusy::Ptr &fb) Q_DECL_OVERRIDE { mResult = invitationHeaderFreeBusy(fb, mMessage); return !mResult.isEmpty(); } @@ -2319,26 +2309,22 @@ ~InvitationBodyVisitor(); protected: - bool visit(const Event::Ptr &event) Q_DECL_OVERRIDE - { + bool visit(const Event::Ptr &event) Q_DECL_OVERRIDE { Event::Ptr oldevent = mExistingIncidence.dynamicCast<Event>(); mResult = invitationDetailsEvent(event, oldevent, mMessage, mNoHtmlMode, mSpec); return !mResult.isEmpty(); } - bool visit(const Todo::Ptr &todo) Q_DECL_OVERRIDE - { + bool visit(const Todo::Ptr &todo) Q_DECL_OVERRIDE { Todo::Ptr oldtodo = mExistingIncidence.dynamicCast<Todo>(); mResult = invitationDetailsTodo(todo, oldtodo, mMessage, mNoHtmlMode, mSpec); return !mResult.isEmpty(); } - bool visit(const Journal::Ptr &journal) Q_DECL_OVERRIDE - { + bool visit(const Journal::Ptr &journal) Q_DECL_OVERRIDE { Journal::Ptr oldjournal = mExistingIncidence.dynamicCast<Journal>(); mResult = invitationDetailsJournal(journal, oldjournal, mNoHtmlMode, mSpec); return !mResult.isEmpty(); } - bool visit(const FreeBusy::Ptr &fb) Q_DECL_OVERRIDE - { + bool visit(const FreeBusy::Ptr &fb) Q_DECL_OVERRIDE { mResult = invitationDetailsFreeBusy(fb, FreeBusy::Ptr(), mNoHtmlMode, mSpec); return !mResult.isEmpty(); } @@ -2399,25 +2385,21 @@ } protected: - bool visit(const Event::Ptr &event) Q_DECL_OVERRIDE - { + bool visit(const Event::Ptr &event) Q_DECL_OVERRIDE { compareEvents(event, mExistingIncidence.dynamicCast<Event>()); compareIncidences(event, mExistingIncidence); return !mChanges.isEmpty(); } - bool visit(const Todo::Ptr &todo) Q_DECL_OVERRIDE - { + bool visit(const Todo::Ptr &todo) Q_DECL_OVERRIDE { compareTodos(todo, mExistingIncidence.dynamicCast<Todo>()); compareIncidences(todo, mExistingIncidence); return !mChanges.isEmpty(); } - bool visit(const Journal::Ptr &journal) Q_DECL_OVERRIDE - { + bool visit(const Journal::Ptr &journal) Q_DECL_OVERRIDE { compareIncidences(journal, mExistingIncidence); return !mChanges.isEmpty(); } - bool visit(const FreeBusy::Ptr &fb) Q_DECL_OVERRIDE - { + bool visit(const FreeBusy::Ptr &fb) Q_DECL_OVERRIDE { Q_UNUSED(fb); return !mChanges.isEmpty(); } @@ -2777,7 +2759,7 @@ // Determine if this incidence is in my calendar (and owned by me) Incidence::Ptr existingIncidence; if (incBase && helper->calendar()) { - existingIncidence = helper->calendar()->incidence(incBase->uid()); + existingIncidence = helper->calendar()->incidence(incBase->uid(), incBase->recurrenceId()); if (!incidenceOwnedByMe(helper->calendar(), existingIncidence)) { existingIncidence.clear(); @@ -2786,7 +2768,8 @@ const Incidence::List list = helper->calendar()->incidences(); for (Incidence::List::ConstIterator it = list.begin(), end = list.end(); it != end; ++it) { if ((*it)->schedulingID() == incBase->uid() && - incidenceOwnedByMe(helper->calendar(), *it)) { + incidenceOwnedByMe(helper->calendar(), *it) && + (*it)->recurrenceId() == incBase->recurrenceId()) { existingIncidence = *it; break; } @@ -3093,7 +3076,7 @@ bool act(const MemoryCalendar::Ptr &calendar, const IncidenceBase::Ptr &incidence, - const QDate &date = QDate(), bool richText = true, + QDate date = QDate(), bool richText = true, const KDateTime::Spec &spec = KDateTime::Spec()) { mCalendar = calendar; @@ -3106,7 +3089,7 @@ } bool act(const QString &location, const IncidenceBase::Ptr &incidence, - const QDate &date = QDate(), bool richText = true, + QDate date = QDate(), bool richText = true, const KDateTime::Spec &spec = KDateTime::Spec()) { mLocation = location; @@ -3128,8 +3111,8 @@ bool visit(const Journal::Ptr &journal) Q_DECL_OVERRIDE; bool visit(const FreeBusy::Ptr &fb) Q_DECL_OVERRIDE; - QString dateRangeText(const Event::Ptr &event, const QDate &date); - QString dateRangeText(const Todo::Ptr &todo, const QDate &date); + QString dateRangeText(const Event::Ptr &event, QDate date); + QString dateRangeText(const Todo::Ptr &todo, QDate date); QString dateRangeText(const Journal::Ptr &journal); QString dateRangeText(const FreeBusy::Ptr &fb); @@ -3145,7 +3128,7 @@ }; QString IncidenceFormatter::ToolTipVisitor::dateRangeText(const Event::Ptr &event, - const QDate &date) + QDate date) { //FIXME: support mRichText==false QString ret; @@ -3201,7 +3184,7 @@ } QString IncidenceFormatter::ToolTipVisitor::dateRangeText(const Todo::Ptr &todo, - const QDate &date) + QDate date) { //FIXME: support mRichText==false QString ret; @@ -3431,7 +3414,7 @@ } QString IncidenceFormatter::ToolTipVisitor::generateToolTip(const Incidence::Ptr &incidence, - const QString &dtRangeText) + const QString &dtRangeText) { int maxDescLen = 120; // maximum description chars to print (before elipsis) @@ -3522,7 +3505,7 @@ QString IncidenceFormatter::toolTipStr(const QString &sourceName, const IncidenceBase::Ptr &incidence, - const QDate &date, + QDate date, bool richText, const KDateTime::Spec &spec) { @@ -3577,8 +3560,7 @@ bool visit(const Event::Ptr &event) Q_DECL_OVERRIDE; bool visit(const Todo::Ptr &todo) Q_DECL_OVERRIDE; bool visit(const Journal::Ptr &journal) Q_DECL_OVERRIDE; - bool visit(const FreeBusy::Ptr &) Q_DECL_OVERRIDE - { + bool visit(const FreeBusy::Ptr &) Q_DECL_OVERRIDE { mResult = i18n("This is a Free Busy Object"); return !mResult.isEmpty(); } @@ -3863,7 +3845,7 @@ dayNames.append(i18nc("separator for list of days", ", ")); } dayNames.append(QLocale::system().dayName(((i + weekStart + 6) % 7) + 1, - QLocale::ShortFormat)); + QLocale::ShortFormat)); addSpace = true; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-15.12.3/src/incidenceformatter.h new/kcalutils-16.04.1/src/incidenceformatter.h --- old/kcalutils-15.12.3/src/incidenceformatter.h 2015-12-28 14:42:58.000000000 +0100 +++ new/kcalutils-16.04.1/src/incidenceformatter.h 2016-04-26 22:16:43.000000000 +0200 @@ -85,7 +85,7 @@ */ KCALUTILS_EXPORT QString toolTipStr(const QString &sourceName, const KCalCore::IncidenceBase::Ptr &incidence, - const QDate &date = QDate(), + QDate date = QDate(), bool richText = true, const KDateTime::Spec &spec = KDateTime::Spec()); @@ -101,7 +101,7 @@ */ KCALUTILS_EXPORT QString extensiveDisplayStr(const KCalCore::Calendar::Ptr &calendar, const KCalCore::IncidenceBase::Ptr &incidence, - const QDate &date = QDate(), + QDate date = QDate(), const KDateTime::Spec &spec = KDateTime::Spec()); /** @@ -116,7 +116,7 @@ */ KCALUTILS_EXPORT QString extensiveDisplayStr(const QString &sourceName, const KCalCore::IncidenceBase::Ptr &incidence, - const QDate &date = QDate(), + QDate date = QDate(), const KDateTime::Spec &spec = KDateTime::Spec()); /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-15.12.3/src/recurrenceactions.cpp new/kcalutils-16.04.1/src/recurrenceactions.cpp --- old/kcalutils-15.12.3/src/recurrenceactions.cpp 2015-12-28 14:42:58.000000000 +0100 +++ new/kcalutils-16.04.1/src/recurrenceactions.cpp 2016-04-26 22:16:43.000000000 +0200 @@ -44,6 +44,7 @@ class ScopeWidget : public QWidget { + Q_OBJECT public: ScopeWidget(int availableChoices, const KDateTime &dateTime, QWidget *parent) : QWidget(parent), mAvailableChoices(availableChoices) @@ -148,7 +149,7 @@ return result; } -static QDialog* createDialog(QDialogButtonBox::StandardButtons buttons, +static QDialog *createDialog(QDialogButtonBox::StandardButtons buttons, const QString &caption, QWidget *mainWidget, QDialogButtonBox **buttonBox, QWidget *parent) { @@ -165,8 +166,9 @@ QObject::connect(*buttonBox, &QDialogButtonBox::rejected, dialog.data(), &QDialog::reject); (*buttonBox)->button(QDialogButtonBox::Ok)->setDefault(true); - if (mainWidget) + if (mainWidget) { mainLayout->addWidget(mainWidget); + } mainLayout->addWidget(*buttonBox); @@ -205,33 +207,40 @@ const KGuiItem &actionSelected, const KGuiItem &actionAll, QWidget *parent) { - QDialogButtonBox::StandardButtons buttons = QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::No | QDialogButtonBox::Yes; - QDialogButtonBox *buttonBox = 0; - auto dialog = createDialog(buttons, caption, Q_NULLPTR, &buttonBox, parent); + QPointer<QDialog> dialog = new QDialog(parent); + dialog->setWindowTitle(caption); + QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::No | QDialogButtonBox::Yes, parent); dialog->setObjectName(QStringLiteral("RecurrenceActions::questionSelectedAllCancel")); KGuiItem::assign(buttonBox->button(QDialogButtonBox::Yes), actionSelected); KGuiItem::assign(buttonBox->button(QDialogButtonBox::Ok), actionAll); - bool checkboxResult = false; - int result = KMessageBox::createKMessageBox( - dialog, - buttonBox, - QMessageBox::Question, - message, - QStringList(), - QString(), - &checkboxResult, - KMessageBox::Notify ); - - switch (result) { - case QDialogButtonBox::Yes: - return SelectedOccurrence; - case QDialogButtonBox::Ok: - return AllOccurrences; - default: - return NoOccurrence; - } + QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok); + okButton->setDefault(true); + okButton->setShortcut(Qt::CTRL | Qt::Key_Return); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, dialog.data(), &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, dialog.data(), &QDialog::reject); + buttonBox->button(QDialogButtonBox::Ok)->setDefault(true); + + bool checkboxResult = false; + int result = KMessageBox::createKMessageBox( + dialog, + buttonBox, + QMessageBox::Question, + message, + QStringList(), + QString(), + &checkboxResult, + KMessageBox::Notify); + + switch (result) { + case QDialogButtonBox::Yes: + return SelectedOccurrence; + case QDialogButtonBox::Ok: + return AllOccurrences; + default: + return NoOccurrence; + } return NoOccurrence; } @@ -243,37 +252,44 @@ const KGuiItem &actionAll, QWidget *parent) { - QDialogButtonBox::StandardButtons buttons = QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::No | QDialogButtonBox::Yes; - QDialogButtonBox *buttonBox = 0; - auto dialog = createDialog(buttons, caption, Q_NULLPTR, &buttonBox, parent); + QPointer<QDialog> dialog = new QDialog(parent); + dialog->setWindowTitle(caption); + QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::No | QDialogButtonBox::Yes, parent); dialog->setObjectName(QStringLiteral("RecurrenceActions::questionSelectedFutureAllCancel")); KGuiItem::assign(buttonBox->button(QDialogButtonBox::Yes), actionSelected); KGuiItem::assign(buttonBox->button(QDialogButtonBox::No), actionFuture); KGuiItem::assign(buttonBox->button(QDialogButtonBox::Ok), actionAll); - - bool checkboxResult = false; - int result = KMessageBox::createKMessageBox( - dialog, - buttonBox, - QMessageBox::Question, - message, - QStringList(), - QString(), - &checkboxResult, - KMessageBox::Notify ); - - switch (result) { - case QDialogButtonBox::Yes: - return SelectedOccurrence; - case QDialogButtonBox::No: - return FutureOccurrences; - case QDialogButtonBox::Ok: - return AllOccurrences; - default: - return NoOccurrence; - } + QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok); + okButton->setDefault(true); + okButton->setShortcut(Qt::CTRL | Qt::Key_Return); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, dialog.data(), &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, dialog.data(), &QDialog::reject); + buttonBox->button(QDialogButtonBox::Ok)->setDefault(true); + + bool checkboxResult = false; + int result = KMessageBox::createKMessageBox( + dialog, + buttonBox, + QMessageBox::Question, + message, + QStringList(), + QString(), + &checkboxResult, + KMessageBox::Notify); + + switch (result) { + case QDialogButtonBox::Yes: + return SelectedOccurrence; + case QDialogButtonBox::No: + return FutureOccurrences; + case QDialogButtonBox::Ok: + return AllOccurrences; + default: + return NoOccurrence; + } return NoOccurrence; } +#include "recurrenceactions.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-15.12.3/src/scheduler.cpp new/kcalutils-16.04.1/src/scheduler.cpp --- old/kcalutils-15.12.3/src/scheduler.cpp 2015-12-28 14:42:58.000000000 +0100 +++ new/kcalutils-16.04.1/src/scheduler.cpp 2016-04-26 22:16:43.000000000 +0200 @@ -110,7 +110,7 @@ qCDebug(KCALUTILS_LOG) << "status=" << Stringify::scheduleMessageStatus(status); - Incidence::Ptr newInc = newIncBase.staticCast<Incidence>() ; + Incidence::Ptr newInc = newIncBase.staticCast<Incidence>(); Incidence::Ptr calInc = mCalendar->incidence(newIncBase->uid()); switch (status) { case ScheduleMessage::Unknown: @@ -148,7 +148,7 @@ ScheduleMessage::Status status, const QString &email) { - Incidence::Ptr inc = incidence.staticCast<Incidence>() ; + Incidence::Ptr inc = incidence.staticCast<Incidence>(); if (!inc) { qCWarning(KCALUTILS_LOG) << "Accept what?"; return false; @@ -171,7 +171,7 @@ << "; incidence count = " << mCalendar->incidences().count(); } Incidence::List::ConstIterator incit = existingIncidences.begin(); - for (; incit != existingIncidences.end() ; ++incit) { + for (; incit != existingIncidences.end(); ++incit) { Incidence::Ptr existingIncidence = *incit; qCDebug(KCALUTILS_LOG) << "Considering this found event (" << (existingIncidence->isReadOnly() ? "readonly" : "readwrite") @@ -290,7 +290,7 @@ bool ret = false; Incidence::List::ConstIterator incit = existingIncidences.begin(); - for (; incit != existingIncidences.end() ; ++incit) { + for (; incit != existingIncidences.end(); ++incit) { Incidence::Ptr i = *incit; qCDebug(KCALUTILS_LOG) << "Considering this found event (" << (i->isReadOnly() ? "readonly" : "readwrite") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-15.12.3/src/stringify.cpp new/kcalutils-16.04.1/src/stringify.cpp --- old/kcalutils-15.12.3/src/stringify.cpp 2015-12-28 14:42:58.000000000 +0100 +++ new/kcalutils-16.04.1/src/stringify.cpp 2016-04-26 22:16:43.000000000 +0200 @@ -66,7 +66,7 @@ bool shortfmt) { return QLocale::system().toString(todo->completed().dateTime(), - (shortfmt ? QLocale::ShortFormat: QLocale::LongFormat)); + (shortfmt ? QLocale::ShortFormat : QLocale::LongFormat)); } QString Stringify::incidenceSecrecy(Incidence::Secrecy secrecy)
