Commit c5eba0f8 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

GIT_SILENT: When depending against qt5.7 we can use override directly

parent 24e4e7a8
......@@ -49,13 +49,13 @@ Q_SIGNALS:
void needUpdateConfigDialogBox();
public Q_SLOTS:
void configure(WId windowId) Q_DECL_OVERRIDE;
void configure(WId windowId) override;
void reload();
void pause();
void resume();
protected:
void doSetOnline(bool online) Q_DECL_OVERRIDE;
void doSetOnline(bool online) override;
private:
void mailCollectionRemoved(const Akonadi::Collection &collection);
......
......@@ -39,23 +39,23 @@ class ArchiveMailKernel : public QObject, public MailCommon::IKernel, public Mai
public:
explicit ArchiveMailKernel(QObject *parent = nullptr);
KIdentityManagement::IdentityManager *identityManager() Q_DECL_OVERRIDE;
MessageComposer::MessageSender *msgSender() Q_DECL_OVERRIDE;
KIdentityManagement::IdentityManager *identityManager() override;
MessageComposer::MessageSender *msgSender() override;
Akonadi::EntityMimeTypeFilterModel *collectionModel() const Q_DECL_OVERRIDE;
KSharedConfig::Ptr config() Q_DECL_OVERRIDE;
void syncConfig() Q_DECL_OVERRIDE;
MailCommon::JobScheduler *jobScheduler() const Q_DECL_OVERRIDE;
Akonadi::ChangeRecorder *folderCollectionMonitor() const Q_DECL_OVERRIDE;
void updateSystemTray() Q_DECL_OVERRIDE;
Akonadi::EntityMimeTypeFilterModel *collectionModel() const override;
KSharedConfig::Ptr config() override;
void syncConfig() override;
MailCommon::JobScheduler *jobScheduler() const override;
Akonadi::ChangeRecorder *folderCollectionMonitor() const override;
void updateSystemTray() override;
qreal closeToQuotaThreshold() Q_DECL_OVERRIDE;
bool excludeImportantMailFromExpiry() Q_DECL_OVERRIDE;
QStringList customTemplates() Q_DECL_OVERRIDE;
Akonadi::Collection::Id lastSelectedFolder() Q_DECL_OVERRIDE;
void setLastSelectedFolder(Akonadi::Collection::Id col) Q_DECL_OVERRIDE;
bool showPopupAfterDnD() Q_DECL_OVERRIDE;
void expunge(Akonadi::Collection::Id col, bool sync) Q_DECL_OVERRIDE;
qreal closeToQuotaThreshold() override;
bool excludeImportantMailFromExpiry() override;
QStringList customTemplates() override;
Akonadi::Collection::Id lastSelectedFolder() override;
void setLastSelectedFolder(Akonadi::Collection::Id col) override;
bool showPopupAfterDnD() override;
void expunge(Akonadi::Collection::Id col, bool sync) override;
private:
KIdentityManagement::IdentityManager *mIdentityManager;
......
......@@ -33,8 +33,8 @@ public:
explicit ArchiveJob(ArchiveMailManager *manager, ArchiveMailInfo *info, const Akonadi::Collection &folder, bool immediate);
~ArchiveJob();
void execute() Q_DECL_OVERRIDE;
void kill() Q_DECL_OVERRIDE;
void execute() override;
void kill() override;
private:
void slotBackupDone(const QString &info);
......@@ -61,9 +61,9 @@ public:
{
}
MailCommon::ScheduledJob *run() Q_DECL_OVERRIDE;
MailCommon::ScheduledJob *run() override;
int taskTypeId() const Q_DECL_OVERRIDE
int taskTypeId() const override
{
return 2;
}
......
......@@ -37,11 +37,11 @@ public:
QString printDebugInfo();
public Q_SLOTS:
void configure(WId windowId) Q_DECL_OVERRIDE;
void configure(WId windowId) override;
void reload();
protected:
void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) override;
private:
FollowUpReminderManager *mManager;
......
......@@ -19,23 +19,23 @@ class DummyKernel : public QObject, public MailCommon::IKernel, public MailCommo
public:
explicit DummyKernel(QObject *parent = nullptr);
KIdentityManagement::IdentityManager *identityManager() Q_DECL_OVERRIDE;
MessageComposer::MessageSender *msgSender() Q_DECL_OVERRIDE;
Akonadi::EntityMimeTypeFilterModel *collectionModel() const Q_DECL_OVERRIDE;
KSharedConfig::Ptr config() Q_DECL_OVERRIDE;
void syncConfig() Q_DECL_OVERRIDE;
MailCommon::JobScheduler *jobScheduler() const Q_DECL_OVERRIDE;
Akonadi::ChangeRecorder *folderCollectionMonitor() const Q_DECL_OVERRIDE;
void updateSystemTray() Q_DECL_OVERRIDE;
qreal closeToQuotaThreshold() Q_DECL_OVERRIDE;
bool excludeImportantMailFromExpiry() Q_DECL_OVERRIDE;
QStringList customTemplates() Q_DECL_OVERRIDE;
Akonadi::Collection::Id lastSelectedFolder() Q_DECL_OVERRIDE;
void setLastSelectedFolder(Akonadi::Collection::Id col) Q_DECL_OVERRIDE;
bool showPopupAfterDnD() Q_DECL_OVERRIDE;
void expunge(Akonadi::Collection::Id id, bool sync) Q_DECL_OVERRIDE;
KIdentityManagement::IdentityManager *identityManager() override;
MessageComposer::MessageSender *msgSender() override;
Akonadi::EntityMimeTypeFilterModel *collectionModel() const override;
KSharedConfig::Ptr config() override;
void syncConfig() override;
MailCommon::JobScheduler *jobScheduler() const override;
Akonadi::ChangeRecorder *folderCollectionMonitor() const override;
void updateSystemTray() override;
qreal closeToQuotaThreshold() override;
bool excludeImportantMailFromExpiry() override;
QStringList customTemplates() override;
Akonadi::Collection::Id lastSelectedFolder() override;
void setLastSelectedFolder(Akonadi::Collection::Id col) override;
bool showPopupAfterDnD() override;
void expunge(Akonadi::Collection::Id id, bool sync) override;
private:
KIdentityManagement::IdentityManager *mIdentityManager;
......
......@@ -186,7 +186,7 @@ void MailFilterAgent::clearMessage()
void MailFilterAgent::itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection)
{
/* The monitor mimetype filter would Q_DECL_OVERRIDE the collection filter, therefor we have to check
/* The monitor mimetype filter would override the collection filter, therefor we have to check
* for the mimetype of the item here.
*/
if (item.mimeType() != KMime::Message::mimeType()) {
......
......@@ -62,7 +62,7 @@ public:
void expunge(qint64 collectionId);
protected:
void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) override;
private Q_SLOTS:
void initializeCollections();
......@@ -78,7 +78,7 @@ private Q_SLOTS:
void slotItemChanged(const Akonadi::Item &item);
public Q_SLOTS:
void configure(WId windowId) Q_DECL_OVERRIDE;
void configure(WId windowId) override;
private:
FilterManager *m_filterManager;
......
......@@ -44,12 +44,12 @@ Q_SIGNALS:
public Q_SLOTS:
void reload();
void configure(WId windowId) Q_DECL_OVERRIDE;
void configure(WId windowId) override;
protected:
void itemsRemoved(const Akonadi::Item::List &item) Q_DECL_OVERRIDE;
void itemsMoved(const Akonadi::Item::List &items, const Akonadi::Collection &sourceCollection, const Akonadi::Collection &destinationCollection) Q_DECL_OVERRIDE;
void doSetOnline(bool online) Q_DECL_OVERRIDE;
void itemsRemoved(const Akonadi::Item::List &item) override;
void itemsMoved(const Akonadi::Item::List &items, const Akonadi::Collection &sourceCollection, const Akonadi::Collection &destinationCollection) override;
void doSetOnline(bool online) override;
private:
void slotSendNow(Akonadi::Item::Id id);
......
......@@ -46,7 +46,7 @@ public:
void loadFile(const QString &filename);
protected:
void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE;
void contextMenuEvent(QContextMenuEvent *event) override;
protected Q_SLOTS:
void openFile();
......
......@@ -40,8 +40,8 @@ Q_SIGNALS:
void dragRequested(const QList<KTNEFAttach *> &list);
protected:
void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE;
void startDrag(Qt::DropActions dropAction) Q_DECL_OVERRIDE;
void resizeEvent(QResizeEvent *e) override;
void startDrag(Qt::DropActions dropAction) override;
private Q_SLOTS:
void adjustColumnWidth();
......
......@@ -63,7 +63,7 @@ public:
class WinObjBrushHandle: public WinObjHandle
{
public:
void apply(QPainter &p) Q_DECL_OVERRIDE;
void apply(QPainter &p) override;
QBrush brush;
virtual ~WinObjBrushHandle() {}
};
......@@ -71,7 +71,7 @@ public:
class WinObjPenHandle: public WinObjHandle
{
public:
void apply(QPainter &p) Q_DECL_OVERRIDE;
void apply(QPainter &p) override;
QPen pen;
virtual ~WinObjPenHandle() {}
};
......@@ -79,7 +79,7 @@ public:
class WinObjPatternBrushHandle: public WinObjHandle
{
public:
void apply(QPainter &p) Q_DECL_OVERRIDE;
void apply(QPainter &p) override;
QBrush brush;
QImage image;
virtual ~WinObjPatternBrushHandle() {}
......@@ -88,7 +88,7 @@ public:
class WinObjFontHandle: public WinObjHandle
{
public:
void apply(QPainter &p) Q_DECL_OVERRIDE;
void apply(QPainter &p) override;
QFont font;
int rotation;
virtual ~WinObjFontHandle() {}
......
......@@ -28,13 +28,13 @@ public:
TaskAttribute(Akonadi::Item::Id id);
~TaskAttribute();
QByteArray type() const Q_DECL_OVERRIDE;
QByteArray type() const override;
TaskAttribute *clone() const Q_DECL_OVERRIDE;
TaskAttribute *clone() const override;
QByteArray serialized() const Q_DECL_OVERRIDE;
QByteArray serialized() const override;
void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
void deserialize(const QByteArray &data) override;
void setTaskId(Akonadi::Item::Id id);
Akonadi::Item::Id taskId() const;
......
......@@ -44,10 +44,10 @@ public:
explicit CollectionMailingListPage(QWidget *parent = nullptr);
~CollectionMailingListPage();
void load(const Akonadi::Collection &col) Q_DECL_OVERRIDE;
void save(Akonadi::Collection &col) Q_DECL_OVERRIDE;
void load(const Akonadi::Collection &col) override;
void save(Akonadi::Collection &col) override;
bool canHandle(const Akonadi::Collection &col) const Q_DECL_OVERRIDE;
bool canHandle(const Akonadi::Collection &col) const override;
protected:
void init(const Akonadi::Collection &);
......
......@@ -43,9 +43,9 @@ class CollectionQuotaPage : public Akonadi::CollectionPropertiesPage
Q_OBJECT
public:
explicit CollectionQuotaPage(QWidget *parent = nullptr);
void load(const Akonadi::Collection &col) Q_DECL_OVERRIDE;
void save(Akonadi::Collection &col) Q_DECL_OVERRIDE;
bool canHandle(const Akonadi::Collection &collection) const Q_DECL_OVERRIDE;
void load(const Akonadi::Collection &col) override;
void save(Akonadi::Collection &col) override;
bool canHandle(const Akonadi::Collection &collection) const override;
protected:
void init();
......
......@@ -35,8 +35,8 @@ public:
explicit CollectionShortcutPage(QWidget *parent = nullptr);
~CollectionShortcutPage();
void load(const Akonadi::Collection &col) Q_DECL_OVERRIDE;
void save(Akonadi::Collection &col) Q_DECL_OVERRIDE;
void load(const Akonadi::Collection &col) override;
void save(Akonadi::Collection &col) override;
private:
void slotShortcutChanged();
......
......@@ -36,9 +36,9 @@ public:
explicit CollectionTemplatesPage(QWidget *parent = nullptr);
~CollectionTemplatesPage();
void load(const Akonadi::Collection &col) Q_DECL_OVERRIDE;
void save(Akonadi::Collection &col) Q_DECL_OVERRIDE;
bool canHandle(const Akonadi::Collection &collection) const Q_DECL_OVERRIDE;
void load(const Akonadi::Collection &col) override;
void save(Akonadi::Collection &col) override;
bool canHandle(const Akonadi::Collection &collection) const override;
private:
void slotCopyGlobal();
......
......@@ -46,8 +46,8 @@ public:
explicit CollectionViewPage(QWidget *parent = nullptr);
~CollectionViewPage();
void load(const Akonadi::Collection &col) Q_DECL_OVERRIDE;
void save(Akonadi::Collection &col) Q_DECL_OVERRIDE;
void load(const Akonadi::Collection &col) override;
void save(Akonadi::Collection &col) override;
private Q_SLOTS:
void slotChangeIcon(const QString &icon);
......
......@@ -46,10 +46,10 @@ Q_SIGNALS:
void changed();
protected:
void dragEnterEvent(QDragEnterEvent *e) Q_DECL_OVERRIDE;
void dragLeaveEvent(QDragLeaveEvent *e) Q_DECL_OVERRIDE;
void dragMoveEvent(QDragMoveEvent *e) Q_DECL_OVERRIDE;
void dropEvent(QDropEvent *e) Q_DECL_OVERRIDE;
void dragEnterEvent(QDragEnterEvent *e) override;
void dragLeaveEvent(QDragLeaveEvent *e) override;
void dragMoveEvent(QDragMoveEvent *e) override;
void dropEvent(QDropEvent *e) override;
private:
void newColor(const QModelIndex &index);
......
......@@ -38,10 +38,10 @@ class ConfigAgentDelegate : public QStyledItemDelegate
public:
explicit ConfigAgentDelegate(QObject *parent = nullptr);
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index) Q_DECL_OVERRIDE;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index) override;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
Q_SIGNALS:
void optionsClicked(const QString &, const QPoint &);
......
......@@ -35,7 +35,7 @@ public:
{}
~ConfigModule() {}
void defaults() Q_DECL_OVERRIDE {}
void defaults() override {}
/** Should return the help anchor for this page or tab */
virtual QString helpAnchor() const = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment