Hello community, here is the log from the commit of package kdav for openSUSE:Factory checked in at 2017-12-18 08:49:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdav (Old) and /work/SRC/openSUSE:Factory/.kdav.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdav" Mon Dec 18 08:49:09 2017 rev:9 rq:556165 version:17.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdav/kdav.changes 2017-11-16 14:21:29.413121896 +0100 +++ /work/SRC/openSUSE:Factory/.kdav.new/kdav.changes 2017-12-18 08:49:10.436730808 +0100 @@ -1,0 +2,41 @@ +Sat Dec 09 14:59:03 CET 2017 - lbeltr...@kde.org + +- Update to 17.12.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.12.0.php +- Changes since 17.11.90: + * None + +------------------------------------------------------------------- +Sat Dec 02 10:12:36 CET 2017 - lbeltr...@kde.org + +- Update to 17.11.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.12-rc.php +- Changes since 17.11.80: + * Revert "Use URLs in multiget requests as returned by the Server" + * compile when we use BUILD_TESTING + * Use URLs in multiget requests as returned by the Server + +------------------------------------------------------------------- +Mon Nov 20 06:59:04 CET 2017 - lbeltr...@kde.org + +- Update to 17.11.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.12-beta.php +- Changes since 17.08.3: + * Don't forget to include CMakeFindDependencyMacro. + * Port to new connect api + * Use directly CMakeFindDependencyMacro + * Fix warning found by cppcheck + * Add version here + * Clean up + * Add check + * Fix includes + * Rename namespace. Rename as override + * Allow to run test without install it + +------------------------------------------------------------------- Old: ---- kdav-17.08.3.tar.xz New: ---- kdav-17.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdav.spec ++++++ --- /var/tmp/diff_new_pack.d8Fd2C/_old 2017-12-18 08:49:11.120697790 +0100 +++ /var/tmp/diff_new_pack.d8Fd2C/_new 2017-12-18 08:49:11.124697597 +0100 @@ -17,7 +17,7 @@ Name: kdav -Version: 17.08.3 +Version: 17.12.0 Release: 0 Summary: DAV protocol implementation License: GPL-2.0 ++++++ kdav-17.08.3.tar.xz -> kdav-17.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/CMakeLists.txt new/kdav-17.12.0/CMakeLists.txt --- old/kdav-17.08.3/CMakeLists.txt 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/CMakeLists.txt 2017-12-02 08:27:41.000000000 +0100 @@ -1,18 +1,18 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.0) +set(PIM_VERSION "5.7.0") -project(libkdav) - -set(PIM_VERSION "5.6.3") +project(libkdav VERSION ${PIM_VERSION}) set(LIBKDAV_VERSION ${PIM_VERSION}) configure_file(libkdav-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkdav-version.h @ONLY) -set(KF5_VERSION "5.35.0") -find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE) +set(KF5_VERSION "5.39.0") + +find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) -include(ECMPackageConfigHelpers) +include(CMakeFindDependencyMacro) include(ECMSetupVersion) include(GenerateExportHeader) include(ECMGenerateHeaders) @@ -26,7 +26,7 @@ include(ECMQtDeclareLoggingCategory) include(ECMCoverageOption) -set(QT_REQUIRED_VERSION "5.7.0") +set(QT_REQUIRED_VERSION "5.8.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Gui XmlPatterns Test) @@ -38,6 +38,8 @@ add_definitions( -DQT_NO_CAST_TO_ASCII ) add_definitions( -DQT_NO_URL_CAST_FROM_STRING ) add_definitions( -DQT_DISABLE_DEPRECATED_BEFORE=0x060000 ) +add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) + ecm_setup_version(${LIBKDAV_VERSION} VARIABLE_PREFIX KDAV VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kpimkdav_version.h" @@ -47,7 +49,7 @@ set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPimKDAV") -ecm_configure_package_config_file( +configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KPimKDAVConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KPimKDAVConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} @@ -70,8 +72,10 @@ install(FILES kdav.categories DESTINATION ${KDE_INSTALL_CONFDIR}) add_subdirectory(src) -add_subdirectory(autotests) -add_subdirectory(test) +if(BUILD_TESTING) + add_subdirectory(autotests) + add_subdirectory(test) +endif() feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/KPimKDAVConfig.cmake.in new/kdav-17.12.0/KPimKDAVConfig.cmake.in --- old/kdav-17.08.3/KPimKDAVConfig.cmake.in 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/KPimKDAVConfig.cmake.in 2017-12-02 08:27:41.000000000 +0100 @@ -1,5 +1,6 @@ @PACKAGE_INIT@ +include(CMakeFindDependencyMacro) find_dependency(KF5CoreAddons "@KF5_VERSION@") include("${CMAKE_CURRENT_LIST_DIR}/KPimKDAVTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/autotests/davcollectiontest.cpp new/kdav-17.12.0/autotests/davcollectiontest.cpp --- old/kdav-17.08.3/autotests/davcollectiontest.cpp 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/autotests/davcollectiontest.cpp 2017-12-02 08:27:41.000000000 +0100 @@ -22,8 +22,6 @@ #include <KDAV/DavUrl> #include <QColor> -#include <QDebug> -#include <QDataStream> #include <QTest> void DavCollectionTest::createEmpty() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/autotests/davcollectiontest.h new/kdav-17.12.0/autotests/davcollectiontest.h --- old/kdav-17.08.3/autotests/davcollectiontest.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/autotests/davcollectiontest.h 2017-12-02 08:27:41.000000000 +0100 @@ -19,7 +19,7 @@ #ifndef DAVCOLLECTION_TEST_H #define DAVCOLLECTION_TEST_H -#include <QtCore/QObject> +#include <QObject> class DavCollectionTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/autotests/davitemfetchjobtest.h new/kdav-17.12.0/autotests/davitemfetchjobtest.h --- old/kdav-17.08.3/autotests/davitemfetchjobtest.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/autotests/davitemfetchjobtest.h 2017-12-02 08:27:41.000000000 +0100 @@ -19,7 +19,7 @@ #ifndef DAVITEMFETCHJOB_TEST_H #define DAVITEMFETCHJOB_TEST_H -#include <QtCore/QObject> +#include <QObject> class DavItemFetchJobTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/autotests/davitemslistjobtest.h new/kdav-17.12.0/autotests/davitemslistjobtest.h --- old/kdav-17.08.3/autotests/davitemslistjobtest.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/autotests/davitemslistjobtest.h 2017-12-02 08:27:41.000000000 +0100 @@ -19,7 +19,7 @@ #ifndef DAVITEMSLISTJOB_TEST_H #define DAVITEMSLISTJOB_TEST_H -#include <QtCore/QObject> +#include <QObject> class DavItemsListJobTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/autotests/davitemtest.h new/kdav-17.12.0/autotests/davitemtest.h --- old/kdav-17.08.3/autotests/davitemtest.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/autotests/davitemtest.h 2017-12-02 08:27:41.000000000 +0100 @@ -19,7 +19,7 @@ #ifndef DAVITEM_TEST_H #define DAVITEM_TEST_H -#include <QtCore/QObject> +#include <QObject> class DavItemTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/autotests/davurltest.h new/kdav-17.12.0/autotests/davurltest.h --- old/kdav-17.08.3/autotests/davurltest.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/autotests/davurltest.h 2017-12-02 08:27:41.000000000 +0100 @@ -19,7 +19,7 @@ #ifndef DAVURL_TEST_H #define DAVURL_TEST_H -#include <QtCore/QObject> +#include <QObject> class DavUrlTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/autotests/fakeserver.cpp new/kdav-17.12.0/autotests/fakeserver.cpp --- old/kdav-17.08.3/autotests/fakeserver.cpp 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/autotests/fakeserver.cpp 2017-12-02 08:27:41.000000000 +0100 @@ -70,7 +70,7 @@ QMutexLocker locker(&m_mutex); m_clientSockets << m_tcpServer->nextPendingConnection(); - connect(m_clientSockets.last(), SIGNAL(readyRead()), this, SLOT(dataAvailable())); + connect(m_clientSockets.last(), &QTcpSocket::readyRead, this, &FakeServer::dataAvailable); } void FakeServer::run() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/autotests/fakeserver.h new/kdav-17.12.0/autotests/fakeserver.h --- old/kdav-17.08.3/autotests/fakeserver.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/autotests/fakeserver.h 2017-12-02 08:27:41.000000000 +0100 @@ -112,7 +112,7 @@ * * @reimp */ - void run() Q_DECL_OVERRIDE; + void run() override; /** * Removes any previously-added scenarios, and adds a new one diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/davcollection.h new/kdav-17.12.0/src/common/davcollection.h --- old/kdav-17.08.3/src/common/davcollection.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/davcollection.h 2017-12-02 08:27:41.000000000 +0100 @@ -25,8 +25,8 @@ #include <memory> -#include <QtCore/QVector> -#include <QtCore/QString> +#include <QVector> +#include <QString> class QColor; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/davcollectiondeletejob.h new/kdav-17.12.0/src/common/davcollectiondeletejob.h --- old/kdav-17.08.3/src/common/davcollectiondeletejob.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/davcollectiondeletejob.h 2017-12-02 08:27:41.000000000 +0100 @@ -24,7 +24,7 @@ #include "davjobbase.h" #include "davurl.h" -#include <KCoreAddons/KJob> +#include <KJob> namespace KDAV { @@ -50,7 +50,7 @@ /** * Starts the job. */ - void start() Q_DECL_OVERRIDE; + void start() override; private Q_SLOTS: void davJobFinished(KJob *); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/davcollectionmodifyjob.h new/kdav-17.12.0/src/common/davcollectionmodifyjob.h --- old/kdav-17.08.3/src/common/davcollectionmodifyjob.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/davcollectionmodifyjob.h 2017-12-02 08:27:41.000000000 +0100 @@ -24,10 +24,9 @@ #include "davjobbase.h" #include "davurl.h" -#include <QtCore/QList> -#include <QtXml/QDomDocument> +#include <QDomDocument> -#include <KCoreAddons/KJob> +#include <KJob> namespace KDAV { @@ -71,12 +70,10 @@ /** * Starts the job. */ - void start() Q_DECL_OVERRIDE; - -private Q_SLOTS: - void davJobFinished(KJob *job); + void start() override; private: + void davJobFinished(KJob *job); DavUrl mUrl; QDomDocument mQuery; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/davcollectionsfetchjob.cpp new/kdav-17.12.0/src/common/davcollectionsfetchjob.cpp --- old/kdav-17.08.3/src/common/davcollectionsfetchjob.cpp 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/davcollectionsfetchjob.cpp 2017-12-02 08:27:41.000000000 +0100 @@ -29,7 +29,7 @@ #include <KIO/Job> #include <QColor> -#include <QtCore/QBuffer> +#include <QBuffer> #include <QtXmlPatterns/QXmlQuery> using namespace KDAV; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/davcollectionsfetchjob.h new/kdav-17.12.0/src/common/davcollectionsfetchjob.h --- old/kdav-17.08.3/src/common/davcollectionsfetchjob.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/davcollectionsfetchjob.h 2017-12-02 08:27:41.000000000 +0100 @@ -25,7 +25,7 @@ #include "davjobbase.h" #include "davurl.h" -#include <KCoreAddons/KJob> +#include <KJob> namespace KDAV { @@ -52,7 +52,7 @@ /** * Starts the job. */ - void start() Q_DECL_OVERRIDE; + void start() override; /** * Returns the list of fetched DAV collections. @@ -73,11 +73,9 @@ */ void collectionDiscovered(int protocol, const QString &collectionUrl, const QString &configuredUrl); -private Q_SLOTS: +private: void principalFetchFinished(KJob *); void collectionsFetchFinished(KJob *); - -private: void doCollectionsFetch(const QUrl &url); void subjobFinished(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/davcollectionsmultifetchjob.h new/kdav-17.12.0/src/common/davcollectionsmultifetchjob.h --- old/kdav-17.08.3/src/common/davcollectionsmultifetchjob.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/davcollectionsmultifetchjob.h 2017-12-02 08:27:41.000000000 +0100 @@ -24,7 +24,7 @@ #include "davcollection.h" #include "davurl.h" -#include <KCoreAddons/KJob> +#include <KJob> namespace KDAV { @@ -54,7 +54,7 @@ /** * Starts the job. */ - void start() Q_DECL_OVERRIDE; + void start() override; /** * Returns the list of fetched DAV collections. @@ -70,10 +70,8 @@ */ void collectionDiscovered(int protocol, const QString &collectionUrl, const QString &configuredUrl); -private Q_SLOTS: - void davJobFinished(KJob *); - private: + void davJobFinished(KJob *); DavUrl::List mUrls; DavCollection::List mCollections; uint mSubJobCount; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/davitem.h new/kdav-17.12.0/src/common/davitem.h --- old/kdav-17.08.3/src/common/davitem.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/davitem.h 2017-12-02 08:27:41.000000000 +0100 @@ -23,10 +23,10 @@ #include <memory> -#include <QtCore/QByteArray> -#include <QtCore/QDataStream> -#include <QtCore/QString> -#include <QtCore/QVector> +#include <QByteArray> +#include <QDataStream> +#include <QString> +#include <QVector> class DavItemPrivate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/davitemcreatejob.h new/kdav-17.12.0/src/common/davitemcreatejob.h --- old/kdav-17.08.3/src/common/davitemcreatejob.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/davitemcreatejob.h 2017-12-02 08:27:41.000000000 +0100 @@ -47,7 +47,7 @@ /** * Starts the job. */ - void start() Q_DECL_OVERRIDE; + void start() override; /** * Returns the created DAV item including the correct identifier url @@ -57,11 +57,9 @@ QUrl itemUrl() const; -private Q_SLOTS: +private: void davJobFinished(KJob *); void itemRefreshed(KJob *); - -private: DavItem mItem; int mRedirectCount; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/davitemdeletejob.h new/kdav-17.12.0/src/common/davitemdeletejob.h --- old/kdav-17.08.3/src/common/davitemdeletejob.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/davitemdeletejob.h 2017-12-02 08:27:41.000000000 +0100 @@ -47,7 +47,7 @@ /** * Starts the job. */ - void start() Q_DECL_OVERRIDE; + void start() override; /** * Returns the item that triggered the conflict, if any. @@ -59,11 +59,9 @@ */ int freshResponseCode() const; -private Q_SLOTS: +private: void davJobFinished(KJob *); void conflictingItemFetched(KJob *); - -private: DavItem mItem; DavItem mFreshItem; int mFreshResponseCode; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/davitemfetchjob.h new/kdav-17.12.0/src/common/davitemfetchjob.h --- old/kdav-17.08.3/src/common/davitemfetchjob.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/davitemfetchjob.h 2017-12-02 08:27:41.000000000 +0100 @@ -47,17 +47,15 @@ /** * Starts the job. */ - void start() Q_DECL_OVERRIDE; + void start() override; /** * Returns the fetched item including current etag information. */ DavItem item() const; -private Q_SLOTS: - void davJobFinished(KJob *); - private: + void davJobFinished(KJob *); DavUrl mUrl; DavItem mItem; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/davitemmodifyjob.h new/kdav-17.12.0/src/common/davitemmodifyjob.h --- old/kdav-17.08.3/src/common/davitemmodifyjob.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/davitemmodifyjob.h 2017-12-02 08:27:41.000000000 +0100 @@ -47,7 +47,7 @@ /** * Starts the job. */ - void start() Q_DECL_OVERRIDE; + void start() override; /** * Returns the modified item including the updated etag information. @@ -66,12 +66,10 @@ */ int freshResponseCode() const; -private Q_SLOTS: +private: void davJobFinished(KJob *); void itemRefreshed(KJob *); void conflictingItemFetched(KJob *); - -private: DavItem mItem; DavItem mFreshItem; int mFreshResponseCode; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/davitemsfetchjob.h new/kdav-17.12.0/src/common/davitemsfetchjob.h --- old/kdav-17.08.3/src/common/davitemsfetchjob.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/davitemsfetchjob.h 2017-12-02 08:27:41.000000000 +0100 @@ -26,8 +26,8 @@ #include "davjobbase.h" #include "davurl.h" -#include <QtCore/QMap> -#include <QtCore/QStringList> +#include <QMap> +#include <QStringList> namespace KDAV { @@ -52,7 +52,7 @@ /** * Starts the job. */ - void start() Q_DECL_OVERRIDE; + void start() override; /** * Returns the list of fetched items @@ -64,10 +64,8 @@ */ DavItem item(const QString &url) const; -private Q_SLOTS: - void davJobFinished(KJob *); - private: + void davJobFinished(KJob *); DavUrl mCollectionUrl; QStringList mUrls; QMap<QString, DavItem> mItems; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/davitemslistjob.cpp new/kdav-17.12.0/src/common/davitemslistjob.cpp --- old/kdav-17.08.3/src/common/davitemslistjob.cpp 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/davitemslistjob.cpp 2017-12-02 08:27:41.000000000 +0100 @@ -28,14 +28,12 @@ #include <KIO/DavJob> #include <KIO/Job> -#include <QtCore/QBuffer> -#include <QtCore/QDebug> using namespace KDAV; class DavItemsListJobPrivate { public: - DavItemsListJobPrivate(const DavUrl &url, std::shared_ptr<EtagCache> cache); + DavItemsListJobPrivate(const DavUrl &url, const std::shared_ptr<EtagCache> &cache); DavUrl mUrl; std::shared_ptr<EtagCache> mEtagCache; @@ -49,7 +47,7 @@ uint mSubJobCount; }; -DavItemsListJobPrivate::DavItemsListJobPrivate(const DavUrl &url, std::shared_ptr<EtagCache> cache) +DavItemsListJobPrivate::DavItemsListJobPrivate(const DavUrl &url, const std::shared_ptr<EtagCache> &cache) : mUrl(url) , mEtagCache(cache) , mSubJobCount(0) @@ -57,7 +55,7 @@ } -DavItemsListJob::DavItemsListJob(const DavUrl &url, std::shared_ptr<EtagCache> cache, QObject *parent) +DavItemsListJob::DavItemsListJob(const DavUrl &url, const std::shared_ptr<EtagCache> &cache, QObject *parent) : DavJobBase(parent) , d(std::unique_ptr<DavItemsListJobPrivate>(new DavItemsListJobPrivate(url, cache))) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/davitemslistjob.h new/kdav-17.12.0/src/common/davitemslistjob.h --- old/kdav-17.08.3/src/common/davitemslistjob.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/davitemslistjob.h 2017-12-02 08:27:41.000000000 +0100 @@ -27,7 +27,7 @@ #include <memory> -#include <QtCore/QStringList> +#include <QStringList> class DavItemsListJobPrivate; @@ -51,7 +51,7 @@ * @param url The url of the DAV collection. * @param parent The parent object. */ - DavItemsListJob(const DavUrl &url, std::shared_ptr<EtagCache> cache, QObject *parent = nullptr); + DavItemsListJob(const DavUrl &url, const std::shared_ptr<EtagCache> &cache, QObject *parent = nullptr); ~DavItemsListJob(); @@ -75,7 +75,7 @@ /** * Starts the job. */ - void start() Q_DECL_OVERRIDE; + void start() override; /** * Returns the list of items seen including identifier url and etag information. @@ -93,10 +93,8 @@ */ QStringList deletedItems() const; -private Q_SLOTS: - void davJobFinished(KJob *); - private: + void davJobFinished(KJob *); std::unique_ptr<DavItemsListJobPrivate> d; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/davjobbase.h new/kdav-17.12.0/src/common/davjobbase.h --- old/kdav-17.08.3/src/common/davjobbase.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/davjobbase.h 2017-12-02 08:27:41.000000000 +0100 @@ -23,7 +23,7 @@ #include "kpimkdav_export.h" -#include <KCoreAddons/KJob> +#include <KJob> class DavJobBasePrivate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/davmanager.cpp new/kdav-17.12.0/src/common/davmanager.cpp --- old/kdav-17.08.3/src/common/davmanager.cpp 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/davmanager.cpp 2017-12-02 08:27:41.000000000 +0100 @@ -26,8 +26,8 @@ #include "libkdav_debug.h" -#include <QtCore/QUrl> -#include <QtXml/QDomDocument> +#include <QUrl> +#include <QDomDocument> using namespace KDAV; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/davmanager.h new/kdav-17.12.0/src/common/davmanager.h --- old/kdav-17.08.3/src/common/davmanager.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/davmanager.h 2017-12-02 08:27:41.000000000 +0100 @@ -23,8 +23,8 @@ #include "enums.h" -#include <QtCore/QMap> -#include <QtCore/QString> +#include <QMap> +#include <QString> namespace KIO { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/davprincipalhomesetsfetchjob.h new/kdav-17.12.0/src/common/davprincipalhomesetsfetchjob.h --- old/kdav-17.08.3/src/common/davprincipalhomesetsfetchjob.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/davprincipalhomesetsfetchjob.h 2017-12-02 08:27:41.000000000 +0100 @@ -24,9 +24,9 @@ #include "davjobbase.h" #include "davurl.h" -#include <KCoreAddons/KJob> +#include <KJob> -#include <QtCore/QStringList> +#include <QStringList> namespace KDAV { @@ -50,17 +50,15 @@ /** * Starts the job. */ - void start() Q_DECL_OVERRIDE; + void start() override; /** * Returns the found home sets. */ QStringList homeSets() const; -private Q_SLOTS: - void davJobFinished(KJob *); - private: + void davJobFinished(KJob *); /** * Start the fetch process. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/davprincipalsearchjob.cpp new/kdav-17.12.0/src/common/davprincipalsearchjob.cpp --- old/kdav-17.08.3/src/common/davprincipalsearchjob.cpp 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/davprincipalsearchjob.cpp 2017-12-02 08:27:41.000000000 +0100 @@ -25,7 +25,7 @@ #include <KIO/Job> #include <KIO/DavJob> -#include <QtCore/QUrl> +#include <QUrl> using namespace KDAV; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/davprincipalsearchjob.h new/kdav-17.12.0/src/common/davprincipalsearchjob.h --- old/kdav-17.08.3/src/common/davprincipalsearchjob.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/davprincipalsearchjob.h 2017-12-02 08:27:41.000000000 +0100 @@ -24,11 +24,11 @@ #include "davjobbase.h" #include "davurl.h" -#include <QtCore/QList> -#include <QtCore/QPair> -#include <QtCore/QString> +#include <QList> +#include <QPair> +#include <QString> -#include <KCoreAddons/KJob> +#include <KJob> class QDomDocument; @@ -88,7 +88,7 @@ /** * Starts the job */ - void start() Q_DECL_OVERRIDE; + void start() override; /** * Return the DavUrl used by this job @@ -100,11 +100,9 @@ */ QList<Result> results() const; -private Q_SLOTS: +private: void principalCollectionSetSearchFinished(KJob *job); void principalPropertySearchFinished(KJob *job); - -private: void buildReportQuery(QDomDocument &query); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/davprotocolbase.h new/kdav-17.12.0/src/common/davprotocolbase.h --- old/kdav-17.08.3/src/common/davprotocolbase.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/davprotocolbase.h 2017-12-02 08:27:41.000000000 +0100 @@ -23,9 +23,8 @@ #include "davcollection.h" -#include <QtCore/QList> -#include <QtCore/QMap> -#include <QtXml/QDomDocument> +#include <QMap> +#include <QDomDocument> #include <QSharedPointer> #include <QVariant> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/davurl.h new/kdav-17.12.0/src/common/davurl.h --- old/kdav-17.08.3/src/common/davurl.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/davurl.h 2017-12-02 08:27:41.000000000 +0100 @@ -23,8 +23,8 @@ #include "enums.h" -#include <QtCore/QUrl> -#include <QtCore/QVector> +#include <QUrl> +#include <QVector> namespace KDAV { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/enums.h new/kdav-17.12.0/src/common/enums.h --- old/kdav-17.08.3/src/common/enums.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/enums.h 2017-12-02 08:27:41.000000000 +0100 @@ -20,7 +20,7 @@ #define KDAV_ENUMS_H -#include <QtCore/QFlags> +#include <QFlags> namespace KDAV { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/etagcache.h new/kdav-17.12.0/src/common/etagcache.h --- old/kdav-17.08.3/src/common/etagcache.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/etagcache.h 2017-12-02 08:27:41.000000000 +0100 @@ -21,10 +21,10 @@ #include "kpimkdav_export.h" -#include <QtCore/QMap> -#include <QtCore/QObject> -#include <QtCore/QSet> -#include <QtCore/QStringList> +#include <QMap> +#include <QObject> +#include <QSet> +#include <QStringList> namespace KDAV { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/utils.cpp new/kdav-17.12.0/src/common/utils.cpp --- old/kdav-17.08.3/src/common/utils.cpp 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/utils.cpp 2017-12-02 08:27:41.000000000 +0100 @@ -24,9 +24,8 @@ #include "davmanager.h" #include "davprotocolbase.h" -#include <QtCore/QByteArray> -#include <QtCore/QDateTime> -#include <QtCore/QString> +#include <QDateTime> +#include <QString> #include "libkdav_debug.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/common/utils.h new/kdav-17.12.0/src/common/utils.h --- old/kdav-17.08.3/src/common/utils.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/common/utils.h 2017-12-02 08:27:41.000000000 +0100 @@ -23,9 +23,7 @@ #include "enums.h" -#include <QtCore/QUrl> -#include <QtXml/QDomElement> -#include <QtCore/QVector> +#include <QDomElement> namespace KDAV { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/protocols/caldavprotocol.cpp new/kdav-17.12.0/src/protocols/caldavprotocol.cpp --- old/kdav-17.08.3/src/protocols/caldavprotocol.cpp 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/protocols/caldavprotocol.cpp 2017-12-02 08:27:41.000000000 +0100 @@ -19,18 +19,16 @@ #include "caldavprotocol.h" #include "common/utils.h" -#include <QtCore/QDateTime> -#include <QtCore/QStringList> -#include <QtCore/QUrl> -#include <QtCore/QVariant> -#include <QtXml/QDomDocument> +#include <QStringList> +#include <QUrl> +#include <QDomDocument> using namespace KDAV; class CaldavCollectionQueryBuilder : public XMLQueryBuilder { public: - QDomDocument buildQuery() const Q_DECL_OVERRIDE + QDomDocument buildQuery() const override { QDomDocument document; @@ -50,7 +48,7 @@ return document; } - QString mimeType() const Q_DECL_OVERRIDE + QString mimeType() const override { return QString(); } @@ -59,7 +57,7 @@ class CaldavListEventQueryBuilder : public XMLQueryBuilder { public: - QDomDocument buildQuery() const Q_DECL_OVERRIDE + QDomDocument buildQuery() const override { QString startTime = parameter(QStringLiteral("start")).toString(); QString endTime = parameter(QStringLiteral("end")).toString(); @@ -115,7 +113,7 @@ return document; } - QString mimeType() const Q_DECL_OVERRIDE + QString mimeType() const override { return QStringLiteral("application/x-vnd.akonadi.calendar.event"); } @@ -124,7 +122,7 @@ class CaldavListTodoQueryBuilder : public XMLQueryBuilder { public: - QDomDocument buildQuery() const Q_DECL_OVERRIDE + QDomDocument buildQuery() const override { QString startTime = parameter(QStringLiteral("start")).toString(); QString endTime = parameter(QStringLiteral("end")).toString(); @@ -180,7 +178,7 @@ return document; } - QString mimeType() const Q_DECL_OVERRIDE + QString mimeType() const override { return QStringLiteral("application/x-vnd.akonadi.calendar.todo"); } @@ -189,7 +187,7 @@ class CaldavListJournalQueryBuilder : public XMLQueryBuilder { public: - QDomDocument buildQuery() const Q_DECL_OVERRIDE + QDomDocument buildQuery() const override { QString startTime = parameter(QStringLiteral("start")).toString(); QString endTime = parameter(QStringLiteral("end")).toString(); @@ -245,7 +243,7 @@ return document; } - QString mimeType() const Q_DECL_OVERRIDE + QString mimeType() const override { return QStringLiteral("application/x-vnd.akonadi.calendar.journal"); } @@ -254,7 +252,7 @@ class CaldavMultigetQueryBuilder : public XMLQueryBuilder { public: - QDomDocument buildQuery() const Q_DECL_OVERRIDE + QDomDocument buildQuery() const override { QDomDocument document; const QStringList urls = parameter(QStringLiteral("urls")).toStringList(); @@ -283,7 +281,7 @@ return document; } - QString mimeType() const Q_DECL_OVERRIDE + QString mimeType() const override { return QString(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/protocols/caldavprotocol.h new/kdav-17.12.0/src/protocols/caldavprotocol.h --- old/kdav-17.08.3/src/protocols/caldavprotocol.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/protocols/caldavprotocol.h 2017-12-02 08:27:41.000000000 +0100 @@ -25,19 +25,19 @@ { public: CaldavProtocol(); - bool supportsPrincipals() const Q_DECL_OVERRIDE; - bool useReport() const Q_DECL_OVERRIDE; - bool useMultiget() const Q_DECL_OVERRIDE; - QString principalHomeSet() const Q_DECL_OVERRIDE; - QString principalHomeSetNS() const Q_DECL_OVERRIDE; - KDAV::XMLQueryBuilder::Ptr collectionsQuery() const Q_DECL_OVERRIDE; - QString collectionsXQuery() const Q_DECL_OVERRIDE; - QVector<KDAV::XMLQueryBuilder::Ptr> itemsQueries() const Q_DECL_OVERRIDE; - KDAV::XMLQueryBuilder::Ptr itemsReportQuery(const QStringList &urls) const Q_DECL_OVERRIDE; - QString responseNamespace() const Q_DECL_OVERRIDE; - QString dataTagName() const Q_DECL_OVERRIDE; + bool supportsPrincipals() const override; + bool useReport() const override; + bool useMultiget() const override; + QString principalHomeSet() const override; + QString principalHomeSetNS() const override; + KDAV::XMLQueryBuilder::Ptr collectionsQuery() const override; + QString collectionsXQuery() const override; + QVector<KDAV::XMLQueryBuilder::Ptr> itemsQueries() const override; + KDAV::XMLQueryBuilder::Ptr itemsReportQuery(const QStringList &urls) const override; + QString responseNamespace() const override; + QString dataTagName() const override; - KDAV::DavCollection::ContentTypes collectionContentTypes(const QDomElement &propstat) const Q_DECL_OVERRIDE; + KDAV::DavCollection::ContentTypes collectionContentTypes(const QDomElement &propstat) const override; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/protocols/carddavprotocol.cpp new/kdav-17.12.0/src/protocols/carddavprotocol.cpp --- old/kdav-17.08.3/src/protocols/carddavprotocol.cpp 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/protocols/carddavprotocol.cpp 2017-12-02 08:27:41.000000000 +0100 @@ -18,17 +18,16 @@ #include "carddavprotocol.h" -#include <QtCore/QStringList> -#include <QtCore/QUrl> -#include <QtCore/QVariant> -#include <QtXml/QDomDocument> +#include <QStringList> +#include <QUrl> +#include <QDomDocument> using namespace KDAV; class CarddavCollectionQueryBuilder : public XMLQueryBuilder { public: - QDomDocument buildQuery() const Q_DECL_OVERRIDE + QDomDocument buildQuery() const override { QDomDocument document; @@ -45,7 +44,7 @@ return document; } - QString mimeType() const Q_DECL_OVERRIDE + QString mimeType() const override { return QString(); } @@ -54,7 +53,7 @@ class CarddavListItemsQueryBuilder : public XMLQueryBuilder { public: - QDomDocument buildQuery() const Q_DECL_OVERRIDE + QDomDocument buildQuery() const override { QDomDocument document; @@ -71,7 +70,7 @@ return document; } - QString mimeType() const Q_DECL_OVERRIDE + QString mimeType() const override { return QStringLiteral("text/directory"); } @@ -80,7 +79,7 @@ class CarddavMultigetQueryBuilder : public XMLQueryBuilder { public: - QDomDocument buildQuery() const Q_DECL_OVERRIDE + QDomDocument buildQuery() const override { QDomDocument document; const QStringList urls = parameter(QStringLiteral("urls")).toStringList(); @@ -111,7 +110,7 @@ return document; } - QString mimeType() const Q_DECL_OVERRIDE + QString mimeType() const override { return QString(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/protocols/carddavprotocol.h new/kdav-17.12.0/src/protocols/carddavprotocol.h --- old/kdav-17.08.3/src/protocols/carddavprotocol.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/protocols/carddavprotocol.h 2017-12-02 08:27:41.000000000 +0100 @@ -25,19 +25,19 @@ { public: CarddavProtocol(); - bool supportsPrincipals() const Q_DECL_OVERRIDE; - bool useReport() const Q_DECL_OVERRIDE; - bool useMultiget() const Q_DECL_OVERRIDE; - QString principalHomeSet() const Q_DECL_OVERRIDE; - QString principalHomeSetNS() const Q_DECL_OVERRIDE; - KDAV::XMLQueryBuilder::Ptr collectionsQuery() const Q_DECL_OVERRIDE; - QString collectionsXQuery() const Q_DECL_OVERRIDE; - QVector<KDAV::XMLQueryBuilder::Ptr> itemsQueries() const Q_DECL_OVERRIDE; - KDAV::XMLQueryBuilder::Ptr itemsReportQuery(const QStringList &urls) const Q_DECL_OVERRIDE; - QString responseNamespace() const Q_DECL_OVERRIDE; - QString dataTagName() const Q_DECL_OVERRIDE; + bool supportsPrincipals() const override; + bool useReport() const override; + bool useMultiget() const override; + QString principalHomeSet() const override; + QString principalHomeSetNS() const override; + KDAV::XMLQueryBuilder::Ptr collectionsQuery() const override; + QString collectionsXQuery() const override; + QVector<KDAV::XMLQueryBuilder::Ptr> itemsQueries() const override; + KDAV::XMLQueryBuilder::Ptr itemsReportQuery(const QStringList &urls) const override; + QString responseNamespace() const override; + QString dataTagName() const override; - KDAV::DavCollection::ContentTypes collectionContentTypes(const QDomElement &propstat) const Q_DECL_OVERRIDE; + KDAV::DavCollection::ContentTypes collectionContentTypes(const QDomElement &propstat) const override; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/protocols/groupdavprotocol.cpp new/kdav-17.12.0/src/protocols/groupdavprotocol.cpp --- old/kdav-17.08.3/src/protocols/groupdavprotocol.cpp 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/protocols/groupdavprotocol.cpp 2017-12-02 08:27:41.000000000 +0100 @@ -20,15 +20,14 @@ #include "common/utils.h" -#include <QtCore/QVariant> -#include <QtXml/QDomDocument> +#include <QDomDocument> using namespace KDAV; class GroupdavCollectionQueryBuilder : public XMLQueryBuilder { public: - QDomDocument buildQuery() const Q_DECL_OVERRIDE + QDomDocument buildQuery() const override { QDomDocument document; @@ -44,7 +43,7 @@ return document; } - QString mimeType() const Q_DECL_OVERRIDE + QString mimeType() const override { return QString(); } @@ -53,7 +52,7 @@ class GroupdavItemQueryBuilder : public XMLQueryBuilder { public: - QDomDocument buildQuery() const Q_DECL_OVERRIDE + QDomDocument buildQuery() const override { QDomDocument document; @@ -70,7 +69,7 @@ return document; } - QString mimeType() const Q_DECL_OVERRIDE + QString mimeType() const override { return QString(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/src/protocols/groupdavprotocol.h new/kdav-17.12.0/src/protocols/groupdavprotocol.h --- old/kdav-17.08.3/src/protocols/groupdavprotocol.h 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/src/protocols/groupdavprotocol.h 2017-12-02 08:27:41.000000000 +0100 @@ -25,14 +25,14 @@ { public: GroupdavProtocol(); - bool supportsPrincipals() const Q_DECL_OVERRIDE; - bool useReport() const Q_DECL_OVERRIDE; - bool useMultiget() const Q_DECL_OVERRIDE; - KDAV::XMLQueryBuilder::Ptr collectionsQuery() const Q_DECL_OVERRIDE; - QString collectionsXQuery() const Q_DECL_OVERRIDE; - QVector<KDAV::XMLQueryBuilder::Ptr> itemsQueries() const Q_DECL_OVERRIDE; + bool supportsPrincipals() const override; + bool useReport() const override; + bool useMultiget() const override; + KDAV::XMLQueryBuilder::Ptr collectionsQuery() const override; + QString collectionsXQuery() const override; + QVector<KDAV::XMLQueryBuilder::Ptr> itemsQueries() const override; - KDAV::DavCollection::ContentTypes collectionContentTypes(const QDomElement &propstat) const Q_DECL_OVERRIDE; + KDAV::DavCollection::ContentTypes collectionContentTypes(const QDomElement &propstat) const override; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/test/CMakeLists.txt new/kdav-17.12.0/test/CMakeLists.txt --- old/kdav-17.08.3/test/CMakeLists.txt 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/test/CMakeLists.txt 2017-12-02 08:27:41.000000000 +0100 @@ -10,5 +10,6 @@ target_link_libraries(testserver Qt5::Core KPim::KDAV + Qt5::Xml ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-17.08.3/test/testserver.cpp new/kdav-17.12.0/test/testserver.cpp --- old/kdav-17.08.3/test/testserver.cpp 2017-10-13 07:18:33.000000000 +0200 +++ new/kdav-17.12.0/test/testserver.cpp 2017-12-02 08:27:41.000000000 +0100 @@ -29,8 +29,8 @@ #include <KDAV/EtagCache> #include <KDAV/Utils> -#include <QtCore/QDebug> -#include <QtCore/QStringList> +#include <QDebug> +#include <QStringList> #include <QCoreApplication> int main(int argc, char **argv)
