Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 05cb15b0 authored by Laurent Montel's avatar Laurent Montel 😁

Rename namespace. Rename as override

parent 0aad5f9b
......@@ -19,7 +19,7 @@
#ifndef DAVCOLLECTION_TEST_H
#define DAVCOLLECTION_TEST_H
#include <QtCore/QObject>
#include <QObject>
class DavCollectionTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef DAVITEMFETCHJOB_TEST_H
#define DAVITEMFETCHJOB_TEST_H
#include <QtCore/QObject>
#include <QObject>
class DavItemFetchJobTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef DAVITEMSLISTJOB_TEST_H
#define DAVITEMSLISTJOB_TEST_H
#include <QtCore/QObject>
#include <QObject>
class DavItemsListJobTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef DAVITEM_TEST_H
#define DAVITEM_TEST_H
#include <QtCore/QObject>
#include <QObject>
class DavItemTest : public QObject
{
......
......@@ -19,7 +19,7 @@
#ifndef DAVURL_TEST_H
#define DAVURL_TEST_H
#include <QtCore/QObject>
#include <QObject>
class DavUrlTest : public QObject
{
......
......@@ -112,7 +112,7 @@ public:
*
* @reimp
*/
void run() Q_DECL_OVERRIDE;
void run() override;
/**
* Removes any previously-added scenarios, and adds a new one
......
......@@ -25,8 +25,8 @@
#include <memory>
#include <QtCore/QVector>
#include <QtCore/QString>
#include <QVector>
#include <QString>
class QColor;
......
......@@ -24,7 +24,7 @@
#include "davjobbase.h"
#include "davurl.h"
#include <KCoreAddons/KJob>
#include <KJob>
namespace KDAV
{
......@@ -50,7 +50,7 @@ public:
/**
* Starts the job.
*/
void start() Q_DECL_OVERRIDE;
void start() override;
private Q_SLOTS:
void davJobFinished(KJob *);
......
......@@ -24,10 +24,10 @@
#include "davjobbase.h"
#include "davurl.h"
#include <QtCore/QList>
#include <QtXml/QDomDocument>
#include <QList>
#include <QDomDocument>
#include <KCoreAddons/KJob>
#include <KJob>
namespace KDAV
{
......@@ -71,7 +71,7 @@ public:
/**
* Starts the job.
*/
void start() Q_DECL_OVERRIDE;
void start() override;
private Q_SLOTS:
void davJobFinished(KJob *job);
......
......@@ -29,7 +29,7 @@
#include <KIO/Job>
#include <QColor>
#include <QtCore/QBuffer>
#include <QBuffer>
#include <QtXmlPatterns/QXmlQuery>
using namespace KDAV;
......
......@@ -25,7 +25,7 @@
#include "davjobbase.h"
#include "davurl.h"
#include <KCoreAddons/KJob>
#include <KJob>
namespace KDAV
{
......@@ -52,7 +52,7 @@ public:
/**
* Starts the job.
*/
void start() Q_DECL_OVERRIDE;
void start() override;
/**
* Returns the list of fetched DAV collections.
......
......@@ -24,7 +24,7 @@
#include "davcollection.h"
#include "davurl.h"
#include <KCoreAddons/KJob>
#include <KJob>
namespace KDAV
{
......@@ -54,7 +54,7 @@ public:
/**
* Starts the job.
*/
void start() Q_DECL_OVERRIDE;
void start() override;
/**
* Returns the list of fetched DAV collections.
......
......@@ -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;
......
......@@ -47,7 +47,7 @@ public:
/**
* Starts the job.
*/
void start() Q_DECL_OVERRIDE;
void start() override;
/**
* Returns the created DAV item including the correct identifier url
......
......@@ -47,7 +47,7 @@ public:
/**
* Starts the job.
*/
void start() Q_DECL_OVERRIDE;
void start() override;
/**
* Returns the item that triggered the conflict, if any.
......
......@@ -47,7 +47,7 @@ public:
/**
* Starts the job.
*/
void start() Q_DECL_OVERRIDE;
void start() override;
/**
* Returns the fetched item including current etag information.
......
......@@ -47,7 +47,7 @@ public:
/**
* Starts the job.
*/
void start() Q_DECL_OVERRIDE;
void start() override;
/**
* Returns the modified item including the updated etag information.
......
......@@ -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 @@ public:
/**
* Starts the job.
*/
void start() Q_DECL_OVERRIDE;
void start() override;
/**
* Returns the list of fetched items
......
......@@ -28,8 +28,8 @@
#include <KIO/DavJob>
#include <KIO/Job>
#include <QtCore/QBuffer>
#include <QtCore/QDebug>
#include <QBuffer>
#include <QDebug>
using namespace KDAV;
......
......@@ -27,7 +27,7 @@
#include <memory>
#include <QtCore/QStringList>
#include <QStringList>
class DavItemsListJobPrivate;
......@@ -75,7 +75,7 @@ public:
/**
* Starts the job.
*/
void start() Q_DECL_OVERRIDE;
void start() override;
/**
* Returns the list of items seen including identifier url and etag information.
......
......@@ -23,7 +23,7 @@
#include "kpimkdav_export.h"
#include <KCoreAddons/KJob>
#include <KJob>
class DavJobBasePrivate;
......
......@@ -26,8 +26,8 @@
#include "libkdav_debug.h"
#include <QtCore/QUrl>
#include <QtXml/QDomDocument>
#include <QUrl>
#include <QDomDocument>
using namespace KDAV;
......
......@@ -23,8 +23,8 @@
#include "enums.h"
#include <QtCore/QMap>
#include <QtCore/QString>
#include <QMap>
#include <QString>
namespace KIO
{
......
......@@ -24,9 +24,9 @@
#include "davjobbase.h"
#include "davurl.h"
#include <KCoreAddons/KJob>
#include <KJob>
#include <QtCore/QStringList>
#include <QStringList>
namespace KDAV
{
......@@ -50,7 +50,7 @@ public:
/**
* Starts the job.
*/
void start() Q_DECL_OVERRIDE;
void start() override;
/**
* Returns the found home sets.
......
......@@ -25,7 +25,7 @@
#include <KIO/Job>
#include <KIO/DavJob>
#include <QtCore/QUrl>
#include <QUrl>
using namespace KDAV;
......
......@@ -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 @@ public:
/**
* Starts the job
*/
void start() Q_DECL_OVERRIDE;
void start() override;
/**
* Return the DavUrl used by this job
......
......@@ -23,9 +23,9 @@
#include "davcollection.h"
#include <QtCore/QList>
#include <QtCore/QMap>
#include <QtXml/QDomDocument>
#include <QList>
#include <QMap>
#include <QDomDocument>
#include <QSharedPointer>
#include <QVariant>
......
......@@ -23,8 +23,8 @@
#include "enums.h"
#include <QtCore/QUrl>
#include <QtCore/QVector>
#include <QUrl>
#include <QVector>
namespace KDAV
{
......
......@@ -20,7 +20,7 @@
#define KDAV_ENUMS_H
#include <QtCore/QFlags>
#include <QFlags>
namespace KDAV
{
......
......@@ -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
{
......
......@@ -24,9 +24,9 @@
#include "davmanager.h"
#include "davprotocolbase.h"
#include <QtCore/QByteArray>
#include <QtCore/QDateTime>
#include <QtCore/QString>
#include <QByteArray>
#include <QDateTime>
#include <QString>
#include "libkdav_debug.h"
......
......@@ -23,9 +23,9 @@
#include "enums.h"
#include <QtCore/QUrl>
#include <QtXml/QDomElement>
#include <QtCore/QVector>
#include <QUrl>
#include <QDomElement>
#include <QVector>
namespace KDAV
{
......
......@@ -19,18 +19,18 @@
#include "caldavprotocol.h"
#include "common/utils.h"
#include <QtCore/QDateTime>
#include <QtCore/QStringList>
#include <QtCore/QUrl>
#include <QtCore/QVariant>
#include <QtXml/QDomDocument>
#include <QDateTime>
#include <QStringList>
#include <QUrl>
#include <QVariant>
#include <QDomDocument>
using namespace KDAV;
class CaldavCollectionQueryBuilder : public XMLQueryBuilder
{
public:
QDomDocument buildQuery() const Q_DECL_OVERRIDE
QDomDocument buildQuery() const override
{
QDomDocument document;
......@@ -50,7 +50,7 @@ public:
return document;
}
QString mimeType() const Q_DECL_OVERRIDE
QString mimeType() const override
{
return QString();
}
......@@ -59,7 +59,7 @@ public:
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 +115,7 @@ public:
return document;
}
QString mimeType() const Q_DECL_OVERRIDE
QString mimeType() const override
{
return QStringLiteral("application/x-vnd.akonadi.calendar.event");
}
......@@ -124,7 +124,7 @@ public:
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 +180,7 @@ public:
return document;
}
QString mimeType() const Q_DECL_OVERRIDE
QString mimeType() const override
{
return QStringLiteral("application/x-vnd.akonadi.calendar.todo");
}
......@@ -189,7 +189,7 @@ public:
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 +245,7 @@ public:
return document;
}
QString mimeType() const Q_DECL_OVERRIDE
QString mimeType() const override
{
return QStringLiteral("application/x-vnd.akonadi.calendar.journal");
}
......@@ -254,7 +254,7 @@ public:
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 +283,7 @@ public:
return document;
}
QString mimeType() const Q_DECL_OVERRIDE
QString mimeType() const override
{
return QString();
}
......
......@@ -25,19 +25,19 @@ class CaldavProtocol : public KDAV::DavMultigetProtocol
{
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;
KDAV::DavCollection::ContentTypes collectionContentTypes(const QDomElement &propstat) 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 override;
};
#endif
......@@ -18,17 +18,17 @@
#include "carddavprotocol.h"
#include <QtCore/QStringList>
#include <QtCore/QUrl>
#include <QtCore/QVariant>
#include <QtXml/QDomDocument>
#include <QStringList>
#include <QUrl>
#include <QVariant>
#include <QDomDocument>
using namespace KDAV;
class CarddavCollectionQueryBuilder : public XMLQueryBuilder
{
public:
QDomDocument buildQuery() const Q_DECL_OVERRIDE
QDomDocument buildQuery() const override
{
QDomDocument document;
......@@ -45,7 +45,7 @@ public:
return document;
}
QString mimeType() const Q_DECL_OVERRIDE
QString mimeType() const override
{
return QString();
}
......@@ -54,7 +54,7 @@ public:
class CarddavListItemsQueryBuilder : public XMLQueryBuilder
{
public:
QDomDocument buildQuery() const Q_DECL_OVERRIDE
QDomDocument buildQuery() const override
{
QDomDocument document;
......@@ -71,7 +71,7 @@ public:
return document;
}
QString mimeType() const Q_DECL_OVERRIDE
QString mimeType() const override
{
return QStringLiteral("text/directory");
}
......@@ -80,7 +80,7 @@ public:
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 +111,7 @@ public:
return document;
}
QString mimeType() const Q_DECL_OVERRIDE
QString mimeType() const override
{
return QString();
}
......
......@@ -25,19 +25,19 @@ class CarddavProtocol : public KDAV::DavMultigetProtocol
{
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;
KDAV::DavCollection::ContentTypes collectionContentTypes(const QDomElement &propstat) 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 override;
};
#endif
......@@ -20,15 +20,15 @@
#include "common/utils.h"
#include <QtCore/QVariant>
#include <QtXml/QDomDocument>
#include <QVariant>
#include <QDomDocument>
using namespace KDAV;
class GroupdavCollectionQueryBuilder : public XMLQueryBuilder
{
public:
QDomDocument buildQuery() const Q_DECL_OVERRIDE
QDomDocument buildQuery() const override
{
QDomDocument document;
......@@ -44,7 +44,7 @@ public:
return document;
}
QString mimeType() const Q_DECL_OVERRIDE
QString mimeType() const override
{
return QString();
}
......@@ -53,7 +53,7 @@ public:
class GroupdavItemQueryBuilder : public XMLQueryBuilder
{
public:
QDomDocument buildQuery() const Q_DECL_OVERRIDE
QDomDocument buildQuery() const override
{
QDomDocument document;
......@@ -70,7 +70,7 @@ public: