Commit f6ee4e02 authored by Laurent Montel's avatar Laurent Montel 😁

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

parent abeed209
......@@ -27,11 +27,11 @@ public:
explicit Evolutionv1ImportData(QObject *parent, const QList<QVariant> & = QList<QVariant>());
~Evolutionv1ImportData();
TypeSupportedOptions supportedOption() Q_DECL_OVERRIDE;
bool foundMailer() const Q_DECL_OVERRIDE;
TypeSupportedOptions supportedOption() override;
bool foundMailer() const override;
bool importMails() Q_DECL_OVERRIDE;
QString name() const Q_DECL_OVERRIDE;
bool importMails() override;
QString name() const override;
};
#endif /* Evolutionv1ImportData_H */
......@@ -26,11 +26,11 @@ public:
explicit Evolutionv2ImportData(QObject *parent, const QList<QVariant> & = QList<QVariant>());
~Evolutionv2ImportData();
TypeSupportedOptions supportedOption() Q_DECL_OVERRIDE;
bool foundMailer() const Q_DECL_OVERRIDE;
TypeSupportedOptions supportedOption() override;
bool foundMailer() const override;
bool importMails() Q_DECL_OVERRIDE;
QString name() const Q_DECL_OVERRIDE;
bool importMails() override;
QString name() const override;
};
#endif /* Evolutionv2ImportData_H */
......@@ -27,14 +27,14 @@ public:
explicit GearyImportData(QObject *parent, const QList<QVariant> & = QList<QVariant>());
~GearyImportData();
TypeSupportedOptions supportedOption() Q_DECL_OVERRIDE;
bool foundMailer() const Q_DECL_OVERRIDE;
TypeSupportedOptions supportedOption() override;
bool foundMailer() const override;
bool importMails() Q_DECL_OVERRIDE;
bool importSettings() Q_DECL_OVERRIDE;
bool importAddressBook() Q_DECL_OVERRIDE;
bool importMails() override;
bool importSettings() override;
bool importAddressBook() override;
QString name() const Q_DECL_OVERRIDE;
QString name() const override;
};
#endif /* TrojiraImportData_H */
......@@ -27,11 +27,11 @@ public:
explicit MailAppImportData(QObject *parent, const QList<QVariant> & = QList<QVariant>());
~MailAppImportData();
TypeSupportedOptions supportedOption() Q_DECL_OVERRIDE;
bool foundMailer() const Q_DECL_OVERRIDE;
TypeSupportedOptions supportedOption() override;
bool foundMailer() const override;
bool importMails() Q_DECL_OVERRIDE;
QString name() const Q_DECL_OVERRIDE;
bool importMails() override;
QString name() const override;
};
#endif /* MailApp ImportData_H */
......@@ -27,11 +27,11 @@ public:
explicit OeImportData(QObject *parent, const QList<QVariant> & = QList<QVariant>());
~OeImportData();
TypeSupportedOptions supportedOption() Q_DECL_OVERRIDE;
bool foundMailer() const Q_DECL_OVERRIDE;
TypeSupportedOptions supportedOption() override;
bool foundMailer() const override;
bool importMails() Q_DECL_OVERRIDE;
QString name() const Q_DECL_OVERRIDE;
bool importMails() override;
QString name() const override;
};
#endif /* Oe ImportData_H */
......@@ -28,14 +28,14 @@ public:
explicit OperaImportData(QObject *parent, const QList<QVariant> & = QList<QVariant>());
~OperaImportData();
TypeSupportedOptions supportedOption() Q_DECL_OVERRIDE;
bool foundMailer() const Q_DECL_OVERRIDE;
TypeSupportedOptions supportedOption() override;
bool foundMailer() const override;
bool importMails() Q_DECL_OVERRIDE;
bool importAddressBook() Q_DECL_OVERRIDE;
bool importSettings() Q_DECL_OVERRIDE;
bool importMails() override;
bool importAddressBook() override;
bool importSettings() override;
QString name() const Q_DECL_OVERRIDE;
QString name() const override;
};
#endif /* OperaImportData_H */
......@@ -28,13 +28,13 @@ public:
explicit PMailImportData(QObject *parent, const QList<QVariant> & = QList<QVariant>());
~PMailImportData();
TypeSupportedOptions supportedOption() Q_DECL_OVERRIDE;
bool foundMailer() const Q_DECL_OVERRIDE;
TypeSupportedOptions supportedOption() override;
bool foundMailer() const override;
bool importMails() Q_DECL_OVERRIDE;
bool importSettings() Q_DECL_OVERRIDE;
bool importMails() override;
bool importSettings() override;
QString name() const Q_DECL_OVERRIDE;
QString name() const override;
};
#endif /* PMail ImportData_H */
......@@ -27,11 +27,11 @@ public:
explicit TheBatImportData(QObject *parent, const QList<QVariant> & = QList<QVariant>());
~TheBatImportData();
TypeSupportedOptions supportedOption() Q_DECL_OVERRIDE;
bool foundMailer() const Q_DECL_OVERRIDE;
TypeSupportedOptions supportedOption() override;
bool foundMailer() const override;
bool importMails() Q_DECL_OVERRIDE;
QString name() const Q_DECL_OVERRIDE;
bool importMails() override;
QString name() const override;
};
#endif /* TheBatImportData_H */
......@@ -36,11 +36,11 @@ class MixedTreeModel : public Akonadi::EntityTreeModel
public:
MixedTreeModel(Akonadi::Monitor *monitor, QObject *parent = nullptr);
/* reimp */ int entityColumnCount(HeaderGroup headerGroup) const Q_DECL_OVERRIDE;
/* reimp */ QVariant entityHeaderData(int section, Qt::Orientation orientation, int role, HeaderGroup headerGroup) const Q_DECL_OVERRIDE;
/* reimp */ int entityColumnCount(HeaderGroup headerGroup) const override;
/* reimp */ QVariant entityHeaderData(int section, Qt::Orientation orientation, int role, HeaderGroup headerGroup) const override;
/* reimp */ QVariant entityData(const Akonadi::Item &item, int column, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
/* reimp */ QVariant entityData(const Akonadi::Collection &collection, int column, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
/* reimp */ QVariant entityData(const Akonadi::Item &item, int column, int role = Qt::DisplayRole) const override;
/* reimp */ QVariant entityData(const Akonadi::Collection &collection, int column, int role = Qt::DisplayRole) const override;
};
#endif
......@@ -41,7 +41,7 @@ public:
void setIndex(const QPersistentModelIndex &index);
protected:
bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE;
bool eventFilter(QObject *watched, QEvent *event) override;
private Q_SLOTS:
void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
......
......@@ -30,7 +30,7 @@ class TodoCheckableProxyModel : public KCheckableProxyModel
public:
TodoCheckableProxyModel(QObject *parent = nullptr);
void setSourceModel(QAbstractItemModel *sourceModel) Q_DECL_OVERRIDE;
void setSourceModel(QAbstractItemModel *sourceModel) override;
private Q_SLOTS:
void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
......
......@@ -40,14 +40,14 @@ public:
};
explicit TripModel(Akonadi::Monitor *monitor, QObject *parent = nullptr);
bool removeRows(int, int, const QModelIndex & = QModelIndex()) Q_DECL_OVERRIDE;
int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE;
Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE;
bool removeRows(int, int, const QModelIndex & = QModelIndex()) override;
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
QModelIndex parent(const QModelIndex &index) const override;
Qt::ItemFlags flags(const QModelIndex &index) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
private:
Trip *createTrip(const QModelIndex &index, Akonadi::Item::Id id) const;
......
......@@ -36,7 +36,7 @@ class FindingETW : public EntityTreeWidget
public:
FindingETW(QWidget *parent = nullptr);
void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) Q_DECL_OVERRIDE;
void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) override;
Q_SIGNALS:
void initialized();
......
......@@ -37,13 +37,13 @@ public:
explicit MailModel(Monitor *monitor, QObject *parent = nullptr);
virtual ~MailModel();
QVariant entityData(const Item &item, int column, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
QVariant entityData(const Item &item, int column, int role = Qt::DisplayRole) const override;
QVariant entityData(const Collection &collection, int column, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
QVariant entityData(const Collection &collection, int column, int role = Qt::DisplayRole) const override;
int columnCount(const QModelIndex &index = QModelIndex()) const Q_DECL_OVERRIDE;
int columnCount(const QModelIndex &index = QModelIndex()) const override;
QVariant entityHeaderData(int section, Qt::Orientation orientation, int role, HeaderGroup headerGroup) const Q_DECL_OVERRIDE;
QVariant entityHeaderData(int section, Qt::Orientation orientation, int role, HeaderGroup headerGroup) const override;
private:
Q_DECLARE_PRIVATE(MailModel)
......
......@@ -36,11 +36,11 @@ class MixedTreeModel : public Akonadi::EntityTreeModel
public:
MixedTreeModel(Akonadi::Monitor *monitor, QObject *parent = nullptr);
/* reimp */ int entityColumnCount(HeaderGroup headerGroup) const Q_DECL_OVERRIDE;
/* reimp */ QVariant entityHeaderData(int section, Qt::Orientation orientation, int role, HeaderGroup headerGroup) const Q_DECL_OVERRIDE;
/* reimp */ int entityColumnCount(HeaderGroup headerGroup) const override;
/* reimp */ QVariant entityHeaderData(int section, Qt::Orientation orientation, int role, HeaderGroup headerGroup) const override;
/* reimp */ QVariant entityData(const Akonadi::Item &item, int column, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
/* reimp */ QVariant entityData(const Akonadi::Collection &collection, int column, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
/* reimp */ QVariant entityData(const Akonadi::Item &item, int column, int role = Qt::DisplayRole) const override;
/* reimp */ QVariant entityData(const Akonadi::Collection &collection, int column, int role = Qt::DisplayRole) const override;
};
#endif
......@@ -41,7 +41,7 @@ public:
void setIndex(const QPersistentModelIndex &index);
protected:
bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE;
bool eventFilter(QObject *watched, QEvent *event) override;
private Q_SLOTS:
void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
......
......@@ -42,7 +42,7 @@ public:
{
}
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) Q_DECL_OVERRIDE
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) override
{
m_collectionFilter = new Akonadi::EntityMimeTypeFilterModel(this);
m_collectionFilter->addMimeTypeInclusionFilter(Akonadi::Collection::mimeType());
......@@ -51,12 +51,12 @@ public:
tree->setModel(m_collectionFilter);
}
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) Q_DECL_OVERRIDE
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) override
{
return m_collectionFilter->mapToSource(idx);
}
/* reimp */ Akonadi::EntityTreeModel *getETM() Q_DECL_OVERRIDE
/* reimp */ Akonadi::EntityTreeModel *getETM() override
{
return new MixedTreeModel(monitor(), this);
}
......
......@@ -41,7 +41,7 @@ public:
{
}
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) Q_DECL_OVERRIDE
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) override
{
m_collectionFilter = new Akonadi::EntityMimeTypeFilterModel(this);
m_collectionFilter->addMimeTypeInclusionFilter(Akonadi::Collection::mimeType());
......@@ -50,7 +50,7 @@ public:
tree->setModel(m_collectionFilter);
}
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) Q_DECL_OVERRIDE
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) override
{
return m_collectionFilter->mapToSource(idx);
}
......
......@@ -44,7 +44,7 @@ public:
{
}
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) Q_DECL_OVERRIDE
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) override
{
m_collectionFilter = new Akonadi::EntityMimeTypeFilterModel(this);
m_collectionFilter->addMimeTypeInclusionFilter(Akonadi::Collection::mimeType());
......@@ -53,12 +53,12 @@ public:
tree->setModel(m_collectionFilter);
}
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) Q_DECL_OVERRIDE
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) override
{
return m_collectionFilter->mapToSource(idx);
}
/* reimp */ Akonadi::EntityTreeModel *getETM() Q_DECL_OVERRIDE
/* reimp */ Akonadi::EntityTreeModel *getETM() override
{
return new MixedTreeModel(monitor(), this);
}
......
......@@ -44,7 +44,7 @@ public:
{
}
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) Q_DECL_OVERRIDE
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) override
{
m_collectionFilter = new Akonadi::EntityMimeTypeFilterModel(this);
m_collectionFilter->addMimeTypeInclusionFilter(Akonadi::Collection::mimeType());
......@@ -53,12 +53,12 @@ public:
tree->setModel(m_collectionFilter);
}
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) Q_DECL_OVERRIDE
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) override
{
return m_collectionFilter->mapToSource(idx);
}
/* reimp */ Akonadi::EntityTreeModel *getETM() Q_DECL_OVERRIDE
/* reimp */ Akonadi::EntityTreeModel *getETM() override
{
return new MixedTreeModel(monitor(), this);
}
......
......@@ -48,7 +48,7 @@ public:
{
}
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) Q_DECL_OVERRIDE
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) override
{
m_collectionFilter = new Akonadi::EntityMimeTypeFilterModel(this);
m_collectionFilter->addMimeTypeInclusionFilter(Akonadi::Collection::mimeType());
......@@ -57,12 +57,12 @@ public:
tree->setModel(m_collectionFilter);
}
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) Q_DECL_OVERRIDE
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) override
{
return m_collectionFilter->mapToSource(idx);
}
Akonadi::EntityTreeModel *getETM() Q_DECL_OVERRIDE
Akonadi::EntityTreeModel *getETM() override
{
return new CategorisedEntityModel(monitor(), this);
}
......
......@@ -48,7 +48,7 @@ public:
{
}
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) Q_DECL_OVERRIDE
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) override
{
m_collectionFilter = new Akonadi::EntityMimeTypeFilterModel(this);
m_collectionFilter->addMimeTypeInclusionFilter(Akonadi::Collection::mimeType());
......@@ -64,12 +64,12 @@ public:
tree->setModel(m_checkableProxy);
}
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) Q_DECL_OVERRIDE
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) override
{
return m_collectionFilter->mapToSource(idx);
}
Akonadi::EntityTreeModel *getETM() Q_DECL_OVERRIDE
Akonadi::EntityTreeModel *getETM() override
{
MixedTreeModel *model = new MixedTreeModel(monitor(), this);
return model;
......
......@@ -49,7 +49,7 @@ public:
{
}
Akonadi::EntityTreeModel *getModel(Akonadi::Monitor *monitor, QObject *parent) Q_DECL_OVERRIDE
Akonadi::EntityTreeModel *getModel(Akonadi::Monitor *monitor, QObject *parent) override
{
return new CategorisedEntityModel(monitor, parent);
}
......@@ -64,7 +64,7 @@ public:
{
}
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) Q_DECL_OVERRIDE
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) override
{
m_collectionFilter = new Akonadi::EntityMimeTypeFilterModel(this);
m_collectionFilter->addMimeTypeInclusionFilter(Akonadi::Collection::mimeType());
......@@ -73,12 +73,12 @@ public:
tree->setModel(m_collectionFilter);
}
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) Q_DECL_OVERRIDE
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) override
{
return m_collectionFilter->mapToSource(idx);
}
Akonadi::EntityTreeModel *getETM() Q_DECL_OVERRIDE
Akonadi::EntityTreeModel *getETM() override
{
return m_model;
}
......
......@@ -42,7 +42,7 @@ class UnreadMailsInCollectionsProxy : public QSortFilterProxyModel
public:
UnreadMailsInCollectionsProxy(QObject *parent = nullptr);
protected:
bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const Q_DECL_OVERRIDE;
bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
};
class UnreadMailsInCollectionsWidget : public QWidget
......
......@@ -60,7 +60,7 @@ public:
{
}
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) Q_DECL_OVERRIDE
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) override
{
m_collectionFilter = new Akonadi::EntityMimeTypeFilterModel(this);
m_collectionFilter->addMimeTypeInclusionFilter(Akonadi::Collection::mimeType());
......@@ -73,7 +73,7 @@ public:
tree->setModel(m_unreadFilter);
}
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) Q_DECL_OVERRIDE
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) override
{
return m_collectionFilter->mapToSource(m_unreadFilter->mapToSource(idx));
}
......
......@@ -38,7 +38,7 @@ public:
UnreadMailsTree(QObject *parent = nullptr);
protected:
/* reimp */ bool acceptRow(int sourceRow, const QModelIndex &sourceParent) const Q_DECL_OVERRIDE;
/* reimp */ bool acceptRow(int sourceRow, const QModelIndex &sourceParent) const override;
};
class UnreadMailsWidget : public QWidget
......
......@@ -30,7 +30,7 @@ public:
explicit Rot13PluginEditor(QObject *parent = nullptr, const QList<QVariant> & = QList<QVariant>());
~Rot13PluginEditor();
MessageComposer::PluginEditorInterface *createInterface(KActionCollection *ac, QObject *parent = nullptr) Q_DECL_OVERRIDE;
MessageComposer::PluginEditorInterface *createInterface(KActionCollection *ac, QObject *parent = nullptr) override;
};
#endif // ROT13PLUGINEDITOR_H
......@@ -27,8 +27,8 @@ public:
explicit Rot13PluginEditorInterface(QObject *parent = nullptr);
~Rot13PluginEditorInterface();
void createAction(KActionCollection *ac) Q_DECL_OVERRIDE;
void exec() Q_DECL_OVERRIDE;
void createAction(KActionCollection *ac) override;
void exec() override;
private Q_SLOTS:
void slotActivated();
......
......@@ -43,10 +43,10 @@ class CryptoPagePlugin : public Akonadi::ContactEditorPagePlugin
public:
CryptoPagePlugin();
~CryptoPagePlugin();
QString title() const Q_DECL_OVERRIDE;
void loadContact(const KContacts::Addressee &contact) Q_DECL_OVERRIDE;
void storeContact(KContacts::Addressee &contact) const Q_DECL_OVERRIDE;
void setReadOnly(bool readOnly) Q_DECL_OVERRIDE;
QString title() const override;
void loadContact(const KContacts::Addressee &contact) override;
void storeContact(KContacts::Addressee &contact) const override;
void setReadOnly(bool readOnly) override;
private:
enum {
......
......@@ -30,8 +30,8 @@ public:
});
~CSVImportExportPlugin();
PimCommon::AbstractGenericPluginInterface *createInterface(KActionCollection *ac, QObject *parent) Q_DECL_OVERRIDE;
bool hasPopupMenuSupport() const Q_DECL_OVERRIDE;
PimCommon::AbstractGenericPluginInterface *createInterface(KActionCollection *ac, QObject *parent) override;
bool hasPopupMenuSupport() const override;
};
#endif // CSVIMPORTEXPORTPLUGIN_H
......@@ -30,11 +30,11 @@ public:
explicit CSVImportExportPluginInterface(QObject *parent = nullptr);
~CSVImportExportPluginInterface();